diff options
| author | l10n daemon script <[email protected]> | 2021-10-09 01:19:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-10-09 01:19:17 +0000 |
| commit | 1937681d50d12a8c1a7f21c854aa99d3f4b0277b (patch) | |
| tree | a9c8c03264e9e339c927575e95c020a719d13bcd /src/views | |
| parent | ec031d0f7dfecfe0fb1cd7c17e0e60296f308c3d (diff) | |
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
Diffstat (limited to 'src/views')
| -rw-r--r-- | src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 3867b88a2..d589acd31 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -22,6 +22,7 @@ Comment[hi]=फ़ाइल दृश्यों के लिए संस्� Comment[hu]=Verziókezelő bővítmény a fájlnézetekhez Comment[ia]=Plugin de controlo de version pro vistas de file Comment[id]=Plugin Kendali Versi untuk Tampilan File +Comment[is]=Útgáfustýringar-viðbót fyrir skráasýnir Comment[it]=Estensione di controllo delle versioni per le viste dei file Comment[ja]=ファイルビューのためのバージョン管理プラグイン Comment[ko]=파일 보기용 버전 제어 플러그인 |