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

@@ -57,6 +57,8 @@
         "Description[eo]": "Montri ekranajn nomojn",
         "Description[es]": "Mostrar nombres de las pantallas",
         "Description[eu]": "Erakutsi pantailen izenak",
+        "Description[fr]": "Afficher le nom des écrans",
+        "Description[gl]": "Amosar os nomes das pantallas.",
         "Description[he]": "הצגת שמות מסכים",
         "Description[ia]": "Monstra nomines de schermo",
         "Description[ka]": "ეკრანის სახელების ჩვენება",
@@ -74,6 +76,8 @@
         "Name[eo]": "Elig-Lokilo",
         "Name[es]": "Localizador de salidas",
         "Name[eu]": "Irteera kokatzailea",
+        "Name[fr]": "Positionnement de la sortie",
+        "Name[gl]": "Localizador de saída",
         "Name[he]": "מאתר פלט",
         "Name[ia]": "Locator de Exito",
         "Name[ka]": "გამოტანის მომძებნი",