From 07dae709d9fe68283caa71d13468b3edc4f0e2be Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 26 Oct 2015 10:04:54 +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 1c673a5d5..f967fa4f1 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -5,6 +5,7 @@ Comment=Version Control Plugin for File Views Comment[ca]=Connector de control de versions per a les vistes de fitxers Comment[cs]=Modul pro správu verzí pro pohledy na soubory Comment[de]=Versionskontroll-Modul für Dateiansichten +Comment[el]=Πρόσθετο ελέγχου εκδόσεων για προβολές αρχείων Comment[en_GB]=Version Control Plugin for File Views Comment[es]=Complemento de control de versiones para las vistas de archivos Comment[fi]=Versionhallintaliitännäinen tiedostonäkymille -- cgit v1.3