diff options
| author | l10n daemon script <[email protected]> | 2015-04-04 11:02:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-04-04 11:02:00 +0000 |
| commit | 4e96b1a42f7718d7c2401e5abed3e30267f7e0ea (patch) | |
| tree | bd7347e3f0f25b217f16765c83f708f4bab549ea /src/views | |
| parent | de84f223d4408dc1eaf6f15ebeed2e8acf49ad4c (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 4fedd4e04..8e73788ce 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -16,6 +16,7 @@ Comment[pl]=Wtyczka systemu zarządzania wersjami dla widoku plików Comment[pt]='Plugin' de Controlo de Versões para as Áreas de Ficheiros Comment[pt_BR]=Extensão de controle de versões para as visualizações de arquivos Comment[sk]=Modul pre správu verzií v súborovom zobrazení +Comment[sl]=Vstavek za delo s sistemi za nadzor različic Comment[sr]=Прикључак управљања верзијама за фајл приказе Comment[sr@ijekavian]=Прикључак управљања верзијама за фајл приказе Comment[sr@ijekavianlatin]=Priključak upravljanja verzijama za fajl prikaze |