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/kcmdolphingeneral.desktop | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/settings/kcm/kcmdolphingeneral.desktop') diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index dcd2ff9f9..182d09fa8 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -18,6 +18,7 @@ Name[lt]=Dolphin bendrieji Name[nb]=Dolphin generelt Name[nl]=Dolphin algemeen Name[nn]=Generelt for Dolphin +Name[pa]=ਡਾਲਫਿਨ ਆਮ Name[pl]=Ustawienia Dolphina Name[pt]=Geral do Dolphin Name[pt_BR]=Geral do Dolphin @@ -102,6 +103,7 @@ Name[lt]=Bendra Name[nb]=Generelt Name[nl]=Algemeen Name[nn]=Generelt +Name[pa]=ਆਮ Name[pl]=Ogólne Name[pt]=Geral Name[pt_BR]=Geral @@ -172,6 +174,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