From: l10n daemon script <scripty@kde.org>
Date: Tue, 9 Jan 2018 03:56:51 +0000 (+0100)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/c2f6e5d669a002c1ee7bf77ba8e16a545bec171d

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/dolphinpart.desktop b/src/dolphinpart.desktop
index 9bf9f95cf..fb257221c 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -130,7 +130,7 @@ Name[lt]=Kompaktiškas
 Name[nb]=Kompakt
 Name[nl]=Compact
 Name[nn]=Kompakt
-Name[pa]=ਸੰਖਿਪਤ
+Name[pa]=ਸੰਖੇਪ
 Name[pl]=Kompaktowy
 Name[pt]=Compacta
 Name[pt_BR]=Compacto