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/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
index 67951cfe7445a1a0b8ef789b7c4b166c17f8e6ff..889c1232aabbd768bc449876f48d45cfde997764 100644 (file)
--- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
+++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
@@ -2,6 +2,7 @@
 Type=ServiceType
 X-KDE-ServiceType=FileViewVersionControlPlugin
 Comment=Version Control Plugin for File Views
+Comment[ar]=ملحقة تحكّم بالإصدارات لمناظير الملفّات
 Comment[ca]=Connector de control de versions per a les vistes de fitxers
 Comment[ca@valencia]=Connector de control de versions per a les vistes de fitxers
 Comment[cs]=Modul pro správu verzí pro pohledy na soubory