diff options
| author | l10n daemon script <[email protected]> | 2015-09-08 12:47:01 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-09-08 12:47:01 +0000 |
| commit | c9770e60839f60ffa29e56e9785a9a36b3d4a90c (patch) | |
| tree | 6e191d096a8388e677e7dc3556aa77daf7ac1964 /src/views/versioncontrol/fileviewversioncontrolplugin.desktop | |
| parent | 2a18f450254e5d58152e747fbc150747cd34e218 (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 509fc2cc8..1c673a5d5 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -10,6 +10,7 @@ Comment[es]=Complemento de control de versiones para las vistas de archivos Comment[fi]=Versionhallintaliitännäinen tiedostonäkymille Comment[fr]=Module externe pour le contrôle de version applicable aux vues de fichiers 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[it]=Estensione di controllo delle versioni per le viste dei file |