From 1230c5ef92bbb066c5cc4b81b714e9d7d7abcba7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 14 Feb 2024 01:14:48 +0000
Subject: [PATCH] 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 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/plugins/outputlocator/metadata.json b/src/plugins/outputlocator/metadata.json
index 6fdff7ce2b..3de0857865 100644
--- a/src/plugins/outputlocator/metadata.json
+++ b/src/plugins/outputlocator/metadata.json
@@ -54,13 +54,16 @@
         "Description[ar]": "أظهر أسماء الشاشات",
         "Description[ca@valencia]": "Mostra el nom de les pantalles",
         "Description[ca]": "Mostra els noms de les pantalles",
+        "Description[eo]": "Montri ekranajn nomojn",
         "Description[es]": "Mostrar nombres de las pantallas",
         "Description[eu]": "Erakutsi pantailen izenak",
         "Description[he]": "הצגת שמות מסכים",
+        "Description[ia]": "Monstra nomines de schermo",
         "Description[ka]": "ეკრანის სახელების ჩვენება",
         "Description[nl]": "Schermnamen tonen",
         "Description[sl]": "Prikaži imena zaslonov",
         "Description[tr]": "Ekran adlarını göster",
+        "Description[uk]": "Показувати назви екранів",
         "Description[x-test]": "xxShow screen namesxx",
         "EnabledByDefault": true,
         "License": "GPL",
@@ -68,13 +71,16 @@
         "Name[ar]": "محدد مكان الخرج",
         "Name[ca@valencia]": "Localitzador d'eixides",
         "Name[ca]": "Localitzador de sortides",
+        "Name[eo]": "Elig-Lokilo",
         "Name[es]": "Localizador de salidas",
         "Name[eu]": "Irteera kokatzailea",
         "Name[he]": "מאתר פלט",
+        "Name[ia]": "Locator de Exito",
         "Name[ka]": "გამოტანის მომძებნი",
         "Name[nl]": "Locatie bepalen van uitvoer",
         "Name[sl]": "Lokator izhoda",
         "Name[tr]": "Çıktı Bulucusu",
+        "Name[uk]": "Локатор виведення",
         "Name[x-test]": "xxOutput Locatorxx"
     },
     "org.kde.kwin.effect": {