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

@@ -68,6 +68,7 @@
         "Description[ko]": "화면 이름 표시",
         "Description[lt]": "Rodyti ekranų pavadinimus",
         "Description[nl]": "Schermnamen tonen",
+        "Description[pl]": "Pokaż nazwy ekranów",
         "Description[sl]": "Prikaži imena zaslonov",
         "Description[ta]": "திரைகளின் பெயர்களைக் காட்டும்",
         "Description[tr]": "Ekran adlarını göster",
@@ -93,6 +94,7 @@
         "Name[ko]": "출력 식별기",
         "Name[lt]": "Išvedimo vietos nustatymas",
         "Name[nl]": "Locatie bepalen van uitvoer",
+        "Name[pl]": "Namierzanie wyjścia",
         "Name[sl]": "Lokator izhoda",
         "Name[ta]": "திரை கண்டுபிடிப்பி",
         "Name[tr]": "Çıktı Bulucusu",