From c0d5537afb10f09aaa6b47a994e8f8024c1006b4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 8 Dec 2015 10:05:01 +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/settings/kcm/kcmdolphinviewmodes.desktop | 1 + 1 file changed, 1 insertion(+) (limited to 'src/settings/kcm/kcmdolphinviewmodes.desktop') diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index da409bab6..394ad535c 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -58,6 +58,7 @@ Comment[ko]=이 서비스는 Dolphin 보기 모드를 설정합니다. Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin rodymo būdus. Comment[nb]=Med denne tjenesten kan du sette opp Dolphins visningsmåter. Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren. +Comment[nn]=Denne tenesta lèt deg setja opp Dolphin-visingsmodusar. Comment[pl]=Ta usługa umożliwia ustawienie trybów widoku Dolphina. Comment[pt]=Este serviço permite a configuração dos modos de visualização do Dolphin. Comment[pt_BR]=Este serviço permite configurar os modos de exibição do Dolphin. -- cgit v1.3