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/kcmdolphinservices.desktop | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings/kcm/kcmdolphinservices.desktop') diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 1e951222d..516cd48d7 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -19,6 +19,7 @@ Name[ko]=Dolphin 서비스 Name[lt]=Dolphin tarnybos Name[nb]=Dolphin-tjenester Name[nl]=Dolphin-services +Name[nn]=Dolphin-tenester Name[pa]=ਡਾਲਫਿਨ ਸੇਵਾਵਾਂ Name[pl]=Usługi Dolphina Name[pt]=Serviços do Dolphin @@ -68,6 +69,7 @@ Name[ko]=서비스 Name[lt]=Paslaugos Name[nb]=Tjenester Name[nl]=Services +Name[nn]=Tenester Name[pa]=ਸੇਵਾਵਾਂ Name[pl]=Usługi Name[pt]=Serviços -- cgit v1.3