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"

components/waydroidintegrationplugin/kauth/waydroidhelper.actions

@@ -3,11 +3,35 @@
 
 [Domain]
 Name=Waydroid Management
+Name[ca]=Gestió del Waydroid
+Name[es]=Gestión de Waydroid
+Name[he]=ניהול Waydroid
+Name[ka]=Waydroid-ის მართვა
+Name[nl]=Waydroid-beheer
+Name[sl]=Upravljanje Waydroid
+Name[uk]=Керування Waydroid
+Name[x-test]=xxWaydroid Managementxx
 Icon=color
 
 [org.kde.plasma.mobileshell.waydroidhelper.initialize]
 Name=Initialize Waydroid
+Name[ca]=Inicialitza el Waydroid
+Name[es]=Inicializar Waydroid
+Name[he]=אתחול Waydroid
+Name[ka]=Waydroid-ის ინიციალიზაცია
+Name[nl]=Waydroid initialiseren
+Name[sl]=Inicializiraj Waydroid
+Name[uk]=Ініціалізувати Waydroid
+Name[x-test]=xxInitialize Waydroidxx
 Description=Allow initialization of Waydroid
+Description[ca]=Permet la inicialització del Waydroid
+Description[es]=Permitir la inicialización de Waydroid
+Description[he]=לאפשר אתחול של Waydroid
+Description[ka]=Waydroid-ის ინიციალიზაციის დაშვება
+Description[nl]=Initialisatie van Waydroid toestaan
+Description[sl]=Dovoli inicializacijo Waydroida
+Description[uk]=Дозволити ініціалізацію Waydroid
+Description[x-test]=xxAllow initialization of Waydroidxx
 Policy=yes
 PolicyInactive=yes
 Persistence=session

kcms/waydroidintegration/kcm_waydroidintegration.json

@@ -3,11 +3,13 @@
         "Authors": [
             {
                 "Email": "florian.richer@protonmail.com",
-                "Name": "Florian RICHER"
+                "Name": "Florian RICHER",
+                "Name[x-test]": "xxFlorian RICHERxx"
             }
         ],
         "Category": "Waydroid Integration",
         "Description": "Waydroid configuration",
+        "Description[x-test]": "xxWaydroid configurationxx",
         "EnabledByDefault": true,
         "FormFactors": [
             "desktop",
@@ -18,8 +20,10 @@
         "Icon": "folder-android-symbolic",
         "License": "GPL",
         "Name": "Waydroid Integration",
+        "Name[x-test]": "xxWaydroid Integrationxx",
         "Website": "https://plasma-mobile.org/"
     },
     "X-KDE-Keywords": "waydroid",
+    "X-KDE-Keywords[x-test]": "xxwaydroidxx",
     "X-KDE-System-Settings-Parent-Category": "system-administration"
 }