From 4e96b1a42f7718d7c2401e5abed3e30267f7e0ea Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 4 Apr 2015 11:02:00 +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/org.kde.dolphin.desktop | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/org.kde.dolphin.desktop') diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 36a9f6a9f..81bf729c6 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -14,6 +14,7 @@ Name[pl]=Dolphin Name[pt]=Dolphin Name[pt_BR]=Dolphin Name[sk]=Dolphin +Name[sl]=Dolphin Name[sr]=Делфин Name[sr@ijekavian]=Делфин Name[sr@ijekavianlatin]=Dolphin @@ -42,6 +43,7 @@ GenericName[pl]=Zarządzanie plikami GenericName[pt]=Gestor de Ficheiros GenericName[pt_BR]=Gerenciador de arquivos GenericName[sk]=Správca súborov +GenericName[sl]=Upravljalnik datotek GenericName[sr]=Менаџер фајлова GenericName[sr@ijekavian]=Менаџер фајлова GenericName[sr@ijekavianlatin]=Menadžer fajlova -- cgit v1.3