From 1d47e9691330ad40113e3652ab2f158a25665ece Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 14 Sep 2020 06:15:19 +0200 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 7dc7ab875..26d9993fc 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -34,6 +34,7 @@ Comment[pa]=ਫਾਇਲ ਝਲਕ ਲਈ ਵਰਜਨ ਕੰਟਰੋਲ ਪਲ 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[ro]=Extensie de control al versiunilor pentru vizualizări de fișiere Comment[ru]=Расширение для управления версиями для компонента просмотра папки Comment[sk]=Modul pre správu verzií v súborovom zobrazení Comment[sl]=Vstavek za delo s sistemi za nadzor različic -- cgit v1.3