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"

src/plugins/outputlocator/metadata.json

@@ -51,9 +51,31 @@
         ],
         "Category": "Appearance",
         "Description": "Show screen names",
+        "Description[ar]": "أظهر أسماء الشاشات",
+        "Description[ca@valencia]": "Mostra el nom de les pantalles",
+        "Description[ca]": "Mostra els noms de les pantalles",
+        "Description[es]": "Mostrar nombres de las pantallas",
+        "Description[eu]": "Erakutsi pantailen izenak",
+        "Description[he]": "הצגת שמות מסכים",
+        "Description[ka]": "ეკრანის სახელების ჩვენება",
+        "Description[nl]": "Schermnamen tonen",
+        "Description[sl]": "Prikaži imena zaslonov",
+        "Description[tr]": "Ekran adlarını göster",
+        "Description[x-test]": "xxShow screen namesxx",
         "EnabledByDefault": true,
         "License": "GPL",
-        "Name": "Output Locator"
+        "Name": "Output Locator",
+        "Name[ar]": "محدد مكان الخرج",
+        "Name[ca@valencia]": "Localitzador d'eixides",
+        "Name[ca]": "Localitzador de sortides",
+        "Name[es]": "Localizador de salidas",
+        "Name[eu]": "Irteera kokatzailea",
+        "Name[he]": "מאתר פלט",
+        "Name[ka]": "გამოტანის მომძებნი",
+        "Name[nl]": "Locatie bepalen van uitvoer",
+        "Name[sl]": "Lokator izhoda",
+        "Name[tr]": "Çıktı Bulucusu",
+        "Name[x-test]": "xxOutput Locatorxx"
     },
     "org.kde.kwin.effect": {
         "internal": true