diff options
| author | l10n daemon script <[email protected]> | 2017-12-28 06:01:08 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2017-12-28 06:01:08 +0100 |
| commit | 09dd74348ed16d90577fd7dcf13ed59bc9116cf7 (patch) | |
| tree | 4c7f274b3f010543e2eb902b10f263ef7df956cf /src/views/versioncontrol/fileviewversioncontrolplugin.desktop | |
| parent | 91eb6aa37ae38c73441b6100a4ea9beb35e982f4 (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/versioncontrol/fileviewversioncontrolplugin.desktop')
| -rw-r--r-- | src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 889c1232a..05b4a6e90 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -17,7 +17,7 @@ Comment[fr]=Module externe pour le contrôle de version applicable aux vues de f Comment[gl]=Complemento de control de versión para vistas de ficheiros. 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 Kontrol Versi untuk Tampilan Berkas +Comment[id]=Plugin Kendali Versi untuk Tampilan Berkas Comment[it]=Estensione di controllo delle versioni per le viste dei file Comment[ja]=ファイルビューのためのバージョン管理プラグイン Comment[ko]=파일 보기를 위한 버전 관리 플러그인 |