From 7b273bb4c66de0d2c4f53bcffa418839eb3b5972 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 1 Nov 2015 10:40:09 +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 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/settings/kcm/kcmdolphinservices.desktop') diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index ed176542a..a8638dc7f 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -17,6 +17,7 @@ Name[ko]=Dolphin 서비스 Name[lt]=Dolphin tarnybos Name[nb]=Dolphin-tjenester Name[nl]=Dolphin-services +Name[pa]=ਡਾਲਫਿਨ ਸੇਵਾਵਾਂ Name[pl]=Usługi Dolphina Name[pt]=Serviços do Dolphin Name[pt_BR]=Serviços do Dolphin @@ -63,6 +64,7 @@ Name[ko]=서비스 Name[lt]=Paslaugos Name[nb]=Tjenester Name[nl]=Services +Name[pa]=ਸੇਵਾਵਾਂ Name[pl]=Usługi Name[pt]=Serviços Name[pt_BR]=Serviços @@ -134,6 +136,7 @@ X-KDE-Keywords[lt]=Failų tvarkyklė X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nn]=filhandsamar +X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ X-KDE-Keywords[pl]=zarządzanie plikami X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos -- cgit v1.3.1