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 9bf9f95cf216deae0229826de386302d23510446..fb257221ca496d27d1f42d84862da8faac37373f 100644 (file)
--- 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]=ਸੰà¨\96ਿਪਤ
+Name[pa]=ਸੰà¨\96à©\87ਪ
 Name[pl]=Kompaktowy
 Name[pt]=Compacta
 Name[pt_BR]=Compacto