From 0c904334781084533e699b95f9c2dde3a9833fcf Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 3 Apr 2016 09:50:58 +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/settings/kcm/kcmdolphinviewmodes.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index f421ae5c6..1a1f7e7bb 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -21,6 +21,7 @@ Name[lt]=Dolphin rodymo būdai
 Name[nb]=Dolphin visningsmåter
 Name[nl]=Dolphin-weergavemodussen
 Name[nn]=Dolphin-visingar
+Name[pa]=ਡਾਲਫਿਨ ਝਲਕ ਢੰਗ
 Name[pl]=Tryby widoku Dolphina
 Name[pt]=Modos de Visualização do Dolphin
 Name[pt_BR]=Modos de exibição do Dolphin
-- 
2.47.3