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"

4 files changed, 11 insertions, 0 deletions

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
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 522fb56dc..0038822e0 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -18,6 +18,7 @@ Name[lt]=Dolphin navigacija
 Name[nb]=Navigasjon i Dolphin
 Name[nl]=Dolphin-navigatie
 Name[nn]=Navigasjon i Dolphin
+Name[pa]=ਡਾਲਫਿਨ ਨੇਵੀਗੇਸ਼ਨ
 Name[pl]=Nawigacja Dolphina
 Name[pt]=Navegação do Dolphin
 Name[pt_BR]=Navegação do Dolphin
@@ -101,6 +102,7 @@ Name[lt]=Navigacija
 Name[nb]=Navigasjon
 Name[nl]=Navigatie
 Name[nn]=Navigasjon
+Name[pa]=ਨੇਵੀਗੇਸ਼ਨ
 Name[pl]=Nawigacja
 Name[pt]=Navegação
 Name[pt_BR]=Navegação
@@ -174,6 +176,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
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
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 11c9bd0d4..d869acfdc 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -101,6 +101,7 @@ Name[lt]=Rodymo būdai
 Name[nb]=Visningsmåter
 Name[nl]=Weergavemodi
 Name[nn]=Visingsmodusar
+Name[pa]=ਵੇਖਣ ਢੰਗ
 Name[pl]=Tryby widoku
 Name[pt]=Modos de Visualização
 Name[pt_BR]=Modos de exibição
@@ -174,6 +175,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