From 0daae5336714c2124171ca89415eb8bf6098519d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 24 Apr 2015 09:52:38 +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 8e73788ce..eabf6e467 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -12,6 +12,7 @@ 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[nl]=Plugin voor versiecontrole op bestandoverzichten +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 -- cgit v1.3