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/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 70e422cf3..2f09e5dfe 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -11,6 +11,7 @@ Name[it]=Servizi di Dolphin Name[ja]=Dolphin サービス Name[ko]=Dolphin 서비스 Name[lt]=Dolphin tarnybos +Name[nb]=Dolphin-tjenester Name[nl]=Dolphin-services Name[pl]=Usługi Dolphina Name[pt]=Serviços do Dolphin @@ -50,6 +51,7 @@ Name[it]=Servizi Name[ja]=サービス Name[ko]=서비스 Name[lt]=Paslaugos +Name[nb]=Tjenester Name[nl]=Services Name[pl]=Usługi Name[pt]=Serviços -- cgit v1.3.1