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

@@ -67,6 +67,7 @@
         "Description[ko]": "화면 이름 표시",
         "Description[nl]": "Schermnamen tonen",
         "Description[sl]": "Prikaži imena zaslonov",
+        "Description[ta]": "திரைகளின் பெயர்களைக் காட்டும்",
         "Description[tr]": "Ekran adlarını göster",
         "Description[uk]": "Показувати назви екранів",
         "Description[x-test]": "xxShow screen namesxx",
@@ -90,6 +91,7 @@
         "Name[ko]": "출력 식별기",
         "Name[nl]": "Locatie bepalen van uitvoer",
         "Name[sl]": "Lokator izhoda",
+        "Name[ta]": "திரை கண்டுபிடிப்பி",
         "Name[tr]": "Çıktı Bulucusu",
         "Name[uk]": "Локатор виведення",
         "Name[x-test]": "xxOutput Locatorxx",