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"

clients/aurorae/src/kwindecoration.desktop

@@ -3,6 +3,7 @@ Type=ServiceType
 X-KDE-ServiceType=KWin/Decoration
 
 Comment=KWin Window Decoration
+Comment[ar]=زخارف نوافذ «نوافذك»
 Comment[bs]=KWin Dekoracije prozora
 Comment[ca]=Decoració de finestres del KWin
 Comment[ca@valencia]=Decoració de finestres del KWin

clients/aurorae/themes/plastik/package/metadata.desktop

@@ -88,6 +88,7 @@ Name[x-test]=xxPlastikxx
 Name[zh_CN]=Plastik
 Name[zh_TW]=Plastik
 Comment=The classic theme known from KDE 3
+Comment[ar]=السّمة الكلاسيكيّة المعروفة من كدي 3
 Comment[bs]=Klasična tema iz KDE 3
 Comment[ca]=El tema clàssic conegut des del KDE 3
 Comment[ca@valencia]=El tema clàssic conegut des del KDE 3

effects/cube/cube_config.desktop

@@ -6,7 +6,7 @@ X-KDE-Library=kwin_cube_config
 X-KDE-ParentComponents=cube
 
 Name=Desktop Cube
-Name[ar]=مكعب سطح المكتب
+Name[ar]=سطح مكتب مكعّب
 Name[be@latin]=Rabočy kub
 Name[bg]=Кубичен работен плот
 Name[bn]=ডেস্কটপ কিউব

effects/cube/cubeslide_config.desktop

@@ -6,7 +6,6 @@ X-KDE-Library=kwin_cubeslide_config
 X-KDE-ParentComponents=cubeslide
 
 Name=Desktop Cube Animation
-Name[ar]=تحريك مكعب سطح المكتب
 Name[bg]=Кубична анимация върху работен плот
 Name[bs]=Animacija kocke površi
 Name[ca]=Animació del cub d'escriptori