From d1871eb1b84fa9697b69d98eac02ca0a58874a65 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 26 Jul 2015 19:57:51 +0000 Subject: 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" --- src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 1 + 1 file changed, 1 insertion(+) (limited to 'src/views/versioncontrol/fileviewversioncontrolplugin.desktop') diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 99a933ec9..509fc2cc8 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -22,6 +22,7 @@ Comment[nn]=Versjonskontroll-tillegg for filvisingar 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[ru]=Расширение для управления версиями для компонента просмотра папки Comment[sk]=Modul pre správu verzií v súborovom zobrazení Comment[sl]=Vstavek za delo s sistemi za nadzor različic Comment[sr]=Прикључак управљања верзијама за фајл приказе -- cgit v1.3