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

@@ -47,7 +47,23 @@ Persistence=session
 
 [org.kde.plasma.mobileshell.waydroidhelper.getandroidid]
 Name=Fetch Android ID for Google Services
+Name[ar]=أحضر معرّف أندرويد لخدمات غوغل
+Name[ca]=Recupera l'ID de l'Android per als Google Services
+Name[es]=Obtener ID de Android para los servicios de Google
+Name[he]=משיכת מזהה Android לשירותי Google
+Name[ka]=Android ID-ის მიღება Google-ის სერვისებისთვის
+Name[nl]=Haal Android-ID op voor Google Services
+Name[uk]=Отримання ідентифікатора Android для служб Google
+Name[x-test]=xxFetch Android ID for Google Servicesxx
 Description=Allow get Android ID of Waydroid container to activate Google services
+Description[ar]=اسمح بالحصول على معرف أندرويد لحاوية ويدرويد لتفعيل خدمات غوغل
+Description[ca]=Permet obtenir l'ID de l'Android del contenidor Waydroid per activar els serveis de Google
+Description[es]=Permitir la obtención del ID de Android del contenedor Waydroid para activar los servicios de Google
+Description[he]=לאפשר משיכת מזהה Android של מכולת Waydroid כדי להפעיל שירותי Google
+Description[ka]=Android ID-ის ან Waydroid-ის კონტეინერის მიღების დაშვება Google-ის სერვისების გასააქტიურებლად
+Description[nl]=Sta ophalen van Android-ID van Waydroid-container toe om Google services te activeren
+Description[uk]=Уможливлює отримання ідентифікатора Android контейнера Waydroid для активації служб Google
+Description[x-test]=xxAllow get Android ID of Waydroid container to activate Google servicesxx
 Policy=yes
 PolicyInactive=yes
 Persistence=session

kcms/waydroidintegration/kcm_waydroidintegration.json

@@ -4,6 +4,7 @@
             {
                 "Email": "florian.richer@protonmail.com",
                 "Name": "Florian RICHER",
+                "Name[ar]": "فلوريان ريشر",
                 "Name[ca@valencia]": "Florian RICHER",
                 "Name[ca]": "Florian RICHER",
                 "Name[es]": "Florian RICHER",
@@ -12,12 +13,15 @@
                 "Name[ka]": "Florian RICHER",
                 "Name[nl]": "Florian RICHER",
                 "Name[sl]": "Florian RICHER",
+                "Name[tr]": "Florian RICHER",
                 "Name[uk]": "Florian RICHER",
-                "Name[x-test]": "xxFlorian RICHERxx"
+                "Name[x-test]": "xxFlorian RICHERxx",
+                "Name[zh_CN]": "Florian RICHER"
             }
         ],
         "Category": "Waydroid Integration",
         "Description": "Waydroid configuration",
+        "Description[ar]": "ضبط ويدرويد",
         "Description[ca@valencia]": "Configureu Waydroid",
         "Description[ca]": "Configuració del Waydroid",
         "Description[es]": "Configuración de Waydroid",
@@ -26,8 +30,10 @@
         "Description[ka]": "Waydroid-ის მორგება",
         "Description[nl]": "Waydroid-configuratie",
         "Description[sl]": "Konfiguracija Waydroid",
+        "Description[tr]": "Waydroid yapılandırması",
         "Description[uk]": "Налаштовування Waydroid",
         "Description[x-test]": "xxWaydroid configurationxx",
+        "Description[zh_CN]": "Waydroid 配置",
         "EnabledByDefault": true,
         "FormFactors": [
             "desktop",
@@ -38,6 +44,7 @@
         "Icon": "folder-android-symbolic",
         "License": "GPL",
         "Name": "Waydroid Integration",
+        "Name[ar]": "تكامل ويدرويد",
         "Name[ca@valencia]": "Integració de Waydroid",
         "Name[ca]": "Integració del Waydroid",
         "Name[es]": "Integración con Waydroid",
@@ -46,11 +53,14 @@
         "Name[ka]": "ინტეგრაცია Waydroid-თან",
         "Name[nl]": "Waydroid-integratie",
         "Name[sl]": "Integracija Waydroid",
+        "Name[tr]": "Waydroid Tümleştirmesi",
         "Name[uk]": "Інтеграція з Waydroid",
         "Name[x-test]": "xxWaydroid Integrationxx",
+        "Name[zh_CN]": "Waydroid 集成",
         "Website": "https://plasma-mobile.org/"
     },
     "X-KDE-Keywords": "waydroid",
+    "X-KDE-Keywords[ar]": "ويدرويد",
     "X-KDE-Keywords[ca@valencia]": "waydroid",
     "X-KDE-Keywords[ca]": "waydroid",
     "X-KDE-Keywords[es]": "waydroid",
@@ -59,7 +69,9 @@
     "X-KDE-Keywords[ka]": "waydroid",
     "X-KDE-Keywords[nl]": "waydroid",
     "X-KDE-Keywords[sl]": "waydroid",
+    "X-KDE-Keywords[tr]": "waydroid",
     "X-KDE-Keywords[uk]": "waydroid",
     "X-KDE-Keywords[x-test]": "xxwaydroidxx",
+    "X-KDE-Keywords[zh_CN]": "waydroid",
     "X-KDE-System-Settings-Parent-Category": "system-administration"
 }

quicksettings/waydroid/metadata.json

@@ -5,6 +5,7 @@
             {
                 "Email": "florian.richer@protonmail.com",
                 "Name": "Florian RICHER",
+                "Name[ar]": "فلوريان ريشر",
                 "Name[ca@valencia]": "Florian RICHER",
                 "Name[ca]": "Florian RICHER",
                 "Name[es]": "Florian RICHER",
@@ -13,11 +14,14 @@
                 "Name[ka]": "Florian RICHER",
                 "Name[nl]": "Florian RICHER",
                 "Name[sl]": "Florian RICHER",
+                "Name[tr]": "Florian RICHER",
                 "Name[uk]": "Florian RICHER",
-                "Name[x-test]": "xxFlorian RICHERxx"
+                "Name[x-test]": "xxFlorian RICHERxx",
+                "Name[zh_CN]": "Florian RICHER"
             }
         ],
         "Description": "Waydroid quick setting for Plasma Mobile",
+        "Description[ar]": "إعداد سريع لويدرويد لبلازما الجوال",
         "Description[ca@valencia]": "Configuració ràpida de Waydroid per a Plasma Mobile",
         "Description[ca]": "Configuració ràpida del Waydroid per al Plasma Mobile",
         "Description[es]": "Ajuste rápido de Waydroid para Plasma Mobile",
@@ -25,12 +29,15 @@
         "Description[ka]": "Waydroid-ის სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის",
         "Description[nl]": "Waydroid snelle instelling van audio voor Plasma Mobile",
         "Description[sl]": "Hitre nastavitve za Plasma Mobile",
+        "Description[tr]": "Plasma Cep Waydroid tez ayarı",
         "Description[uk]": "Швидке налаштовування Waydroid для Мобільної Плазми",
         "Description[x-test]": "xxWaydroid quick setting for Plasma Mobilexx",
+        "Description[zh_CN]": "Plasma Mobile 的 Waydroid 快捷设置",
         "Icon": "folder-android-symbolic",
         "Id": "org.kde.plasma.quicksetting.waydroid",
         "License": "GPL-2.0+",
         "Name": "Waydroid",
+        "Name[ar]": "ويدرويد",
         "Name[ca@valencia]": "Waydroid",
         "Name[ca]": "Waydroid",
         "Name[es]": "Waydroid",
@@ -38,8 +45,10 @@
         "Name[ka]": "Waydroid",
         "Name[nl]": "Waydroid",
         "Name[sl]": "Waydroid",
+        "Name[tr]": "Waydroid",
         "Name[uk]": "Waydroid",
         "Name[x-test]": "xxWaydroidxx",
+        "Name[zh_CN]": "Waydroid",
         "Website": "https://kde.org"
     }
 }