diff options
| author | l10n daemon script <[email protected]> | 2015-04-26 09:44:42 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-04-26 09:44:42 +0000 |
| commit | 06776451a72c395fca4b40196a6617366167ad66 (patch) | |
| tree | 5aa85d73868c4ca5733b5dc02aef7738e7d39291 /src/views | |
| parent | 0daae5336714c2124171ca89415eb8bf6098519d (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index eabf6e467..85744ca1a 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -11,6 +11,8 @@ 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[id]=Plugin Kontrol Versi untuk Tampilan Berkas Comment[it]=Estensione di controllo delle versioni per le viste dei file +Comment[ko]=파일 보기를 위한 버전 관리 플러그인 +Comment[nb]=Versjonskontrollmodul for filvisninger Comment[nl]=Plugin voor versiecontrole op bestandoverzichten Comment[nn]=Versjonskontroll-tillegg for filvisingar Comment[pl]=Wtyczka systemu zarządzania wersjami dla widoku plików |