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"

plasmoid/package/metadata.json

@@ -22,7 +22,7 @@
         ],
         "Category": "Windows and Tasks",
         "Description": "Tasks plasmoid from Latte Dock",
-        "Description[az]": "Latte Dokdan Tapşırılar plasmoidi",
+        "Description[az]": "Latte Dokdan Tapşırıqlar plasmoidi",
         "Description[ca@valencia]": "Plasmoide de tasques de Latte Dock",
         "Description[ca]": "Plasmoide de tasques del Latte Dock",
         "Description[es]": "Plasmoide de tareas de Latte Dock",