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/kcmdolphinnavigation.desktop | 1 + 1 file changed, 1 insertion(+) (limited to 'src/settings/kcm/kcmdolphinnavigation.desktop') diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 9564c3cfa..da4edb9de 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -59,6 +59,7 @@ Comment[ko]=이 서비스는 Dolphin 탐색을 설정합니다. Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin navigaciją. Comment[nb]=Med denne tjenesten kan du sette opp navigasjon for Dolphin. Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren. +Comment[nn]=Denne tenesta lèt deg setja opp navigasjonen for Dolphin. Comment[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie. Comment[pt]=Este serviço permite a configuração da navegação do Dolphin. Comment[pt_BR]=Este serviço permite configurar a navegação do Dolphin. -- cgit v1.3