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.in b/src/dolphinpart.desktop.in
index 848f847d544a78c901cc37e35d38a65bd6d6d641..619b3c3a8ba08f98c5f08a239d7be3322bec7de6 100644 (file)
--- a/src/dolphinpart.desktop.in
+++ b/src/dolphinpart.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Name=Dolphin View
-Name[ar]=منظور دولفين
+Name[ar]=عرض دولفين
 Name[ast]=Vista de Dolphin
 Name[az]=Dolphin görünüşü
 Name[ca]=Vista del Dolphin