From 586252341ea69a60b64f404dd23ef93e59c1e16c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 31 May 2015 10:13:13 +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 7e64f841b..5f220f640 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -42,6 +42,7 @@ Comment[it]=Questo servizio permette di configurare la navigazione con Dolphin. Comment[ja]=Dolphin でのナビゲーションを設定します 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[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie. Comment[pt]=Este serviço permite a configuração da navegação do Dolphin. -- cgit v1.3.1