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"

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 00e8e7b9b8feb0824680dd9ec10c214de314006f..d8baa93a5eb9b0e2c452666b4362f45407181122 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -157,6 +157,7 @@ Keywords[lt]=failai;failų valdymas;failu valdymas;failų tvarkymas;failu tvarky
 Keywords[nb]=filer;filbehandling;filutforskning;samba;nettverksressurser;Explorer;Finder;
 Keywords[nl]=bestanden;bestandsbeheer;bladeren in bestanden;samba;netwerk-shares;verkenner;zoeksysteem;
 Keywords[nn]=filer;filhandsaming;filutforsking;samba;nettverksressursar;Explorer;Finder;
+Keywords[pa]=ਫਾਇਲ;ਫਾਈਲ;ਫ਼ਾਇਲ;ਫ਼ਾਈਲਾਂ;ਫਾਇਲ ਪਰਬੰਧ;ਫਾਇਲ ਇੰਤਜ਼ਾਮ;ਫਾਇਲ ਬਰਾਊਜ਼ਰ;ਝਲਕ;ਸਾਂਬਾ;ਨੈ਼ਟਵਰਕ ਸਾਂਝ;ਐਕਸਪਲੋਰਰ;ਫਾਈਡਰ;
 Keywords[pl]=pliki;zarządzenie plikami;przeglądanie plików;samba;udziały sieciowe;Przeglądarka;Finder;
 Keywords[pt]=ficheiros;gestão de ficheiros;navegação de ficheiros;samba;partilhas de rede;Explorador;Pesquisa;
 Keywords[pt_BR]=arquivo;gerenciamento de arquivos;navegação de arquivos;samba;compartilhamentos de rede;explorador;localizador;

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index f168aadda1f30427e95f8722f6d3fb4b7303651d..cc24b6d8886c50d4a6a26a78477d8a94e21e1d31 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -32,6 +32,7 @@
         "Name[nb]": "Generelt",
         "Name[nl]": "Algemeen",
         "Name[nn]": "Generelt",
+        "Name[pa]": "ਸਧਾਰਨ",
         "Name[pl]": "Ogólne",
         "Name[pt]": "Geral",
         "Name[pt_BR]": "Geral",