diff options
| author | l10n daemon script <[email protected]> | 2017-12-28 04:40:23 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2017-12-28 04:40:23 +0100 |
| commit | 7aa6a8ec1e4b0c424a8077fb5eccb26a49de8592 (patch) | |
| tree | 1997db1f6510d8ecbb33d893316e47631c2477b8 | |
| parent | c0e6342b7f69a6c2bff565217445f684743f962f (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"
| -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]=파일 보기를 위한 버전 관리 플러그인 |