From e13a47f01ff96e3de87d59dc6d5da61009bba563 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 5 Jan 2024 02:08:48 +0000
Subject: [PATCH] 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/org.kde.dolphin.desktop             | 1 +
 src/settings/kcm/kcmdolphingeneral.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 00e8e7b9b..d8baa93a5 100755
--- 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 f168aadda..cc24b6d88 100644
--- 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",
-- 
2.47.3