From e499e308ea24eb15ca573dacf3f76f174c276f86 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 22 Jul 2025 01:36:10 +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" --- .../waydroidintegrationplugin/kauth/waydroidhelper.actions | 5 +++++ kcms/waydroidintegration/kcm_waydroidintegration.json | 4 ++++ quicksettings/waydroid/metadata.json | 3 +++ 3 files changed, 12 insertions(+) diff --git a/components/waydroidintegrationplugin/kauth/waydroidhelper.actions b/components/waydroidintegrationplugin/kauth/waydroidhelper.actions index ca8b220c..774aace6 100644 --- a/components/waydroidintegrationplugin/kauth/waydroidhelper.actions +++ b/components/waydroidintegrationplugin/kauth/waydroidhelper.actions @@ -7,6 +7,7 @@ Name[ar]=إدارة ويدرويد Name[ca]=Gestió del Waydroid Name[ca@valencia]=Gestioneu Waydroid Name[es]=Gestión de Waydroid +Name[fr]=Gestion de Waydroid Name[he]=ניהול Waydroid Name[it]=Gestione di Waydroid Name[ka]=Waydroid-ის მართვა @@ -25,6 +26,7 @@ Name[ar]=تمهيد ويدرويد Name[ca]=Inicialitza el Waydroid Name[ca@valencia]=Restablix Waydroid Name[es]=Inicializar Waydroid +Name[fr]=Initialiser Waydroid Name[he]=אתחול Waydroid Name[it]=Inizializza Waydroid Name[ka]=Waydroid-ის ინიციალიზაცია @@ -40,6 +42,7 @@ Description[ar]=السماح بتمهيد ويدرويد Description[ca]=Permet la inicialització del Waydroid Description[ca@valencia]=Permet la inicialització de Waydroid Description[es]=Permitir la inicialización de Waydroid +Description[fr]=Autoriser l'initialisation de Waydroid Description[he]=לאפשר אתחול של Waydroid Description[it]=Permetti l'inizializzazione di Waydroid Description[ka]=Waydroid-ის ინიციალიზაციის დაშვება @@ -60,6 +63,7 @@ Name[ar]=أحضر معرّف أندرويد لخدمات غوغل Name[ca]=Recupera l'ID de l'Android per als Google Services Name[ca@valencia]=Recupera l'ID d'Android per als Google Services Name[es]=Obtener ID de Android para los servicios de Google +Name[fr]=Récupérer l'identifiant Android pour les services de Google Name[he]=משיכת מזהה Android לשירותי Google Name[ka]=Android ID-ის მიღება Google-ის სერვისებისთვის Name[ko]=Google 서비스에 필요한 안드로이드 ID 가져오기 @@ -74,6 +78,7 @@ Description[ar]=اسمح بالحصول على معرف أندرويد لحاو Description[ca]=Permet obtenir l'ID de l'Android del contenidor Waydroid per activar els serveis de Google Description[ca@valencia]=Permet obtindre l'ID d'Android del contenidor Waydroid per a 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[fr]=Autoriser l'obtention de l'identifiant Android du conteneur de Waydroid afin d'activer les services de Google Description[he]=לאפשר משיכת מזהה Android של מכולת Waydroid כדי להפעיל שירותי Google Description[ka]=Android ID-ის ან Waydroid-ის კონტეინერის მიღების დაშვება Google-ის სერვისების გასააქტიურებლად Description[ko]=Google 서비스를 활성화하기 위하여 Waydroid 컨테이너의 안드로이드 ID 가져오기 허용 diff --git a/kcms/waydroidintegration/kcm_waydroidintegration.json b/kcms/waydroidintegration/kcm_waydroidintegration.json index 528e24aa..cec7ecc7 100644 --- a/kcms/waydroidintegration/kcm_waydroidintegration.json +++ b/kcms/waydroidintegration/kcm_waydroidintegration.json @@ -11,6 +11,7 @@ "Name[he]": "פלוריאן רישה", "Name[it]": "Florian RICHER", "Name[ka]": "Florian RICHER", + "Name[ko]": "Florian RICHER", "Name[nl]": "Florian RICHER", "Name[sl]": "Florian RICHER", "Name[tr]": "Florian RICHER", @@ -28,6 +29,7 @@ "Description[he]": "הגדרות Waydroid", "Description[it]": "Configurazione di Waydroid", "Description[ka]": "Waydroid-ის მორგება", + "Description[ko]": "Waydroid 설정", "Description[nl]": "Waydroid-configuratie", "Description[sl]": "Konfiguracija Waydroid", "Description[tr]": "Waydroid yapılandırması", @@ -51,6 +53,7 @@ "Name[he]": "שילוב מול Waydroid", "Name[it]": "Integrazione Waydroid", "Name[ka]": "ინტეგრაცია Waydroid-თან", + "Name[ko]": "Waydroid 통합", "Name[nl]": "Waydroid-integratie", "Name[sl]": "Integracija Waydroid", "Name[tr]": "Waydroid Tümleştirmesi", @@ -67,6 +70,7 @@ "X-KDE-Keywords[he]": "waydroid", "X-KDE-Keywords[it]": "waydroid", "X-KDE-Keywords[ka]": "waydroid", + "X-KDE-Keywords[ko]": "waydroid", "X-KDE-Keywords[nl]": "waydroid", "X-KDE-Keywords[sl]": "waydroid", "X-KDE-Keywords[tr]": "waydroid", diff --git a/quicksettings/waydroid/metadata.json b/quicksettings/waydroid/metadata.json index c0f98010..b3814310 100644 --- a/quicksettings/waydroid/metadata.json +++ b/quicksettings/waydroid/metadata.json @@ -12,6 +12,7 @@ "Name[he]": "פלוריאן רישה", "Name[it]": "Florian RICHER", "Name[ka]": "Florian RICHER", + "Name[ko]": "Florian RICHER", "Name[nl]": "Florian RICHER", "Name[sl]": "Florian RICHER", "Name[tr]": "Florian RICHER", @@ -28,6 +29,7 @@ "Description[he]": "הגדרה מהירה ל־Waydroid לפלזמה לניידים", "Description[it]": "Impostazioni rapide di Waydroid per Plasma Mobile", "Description[ka]": "Waydroid-ის სწრაფი მორგების პარამეტრი Plasma Mobile-სთვის", + "Description[ko]": "Plasma 모바일의 Waydroid 빠른 설정", "Description[nl]": "Waydroid snelle instelling van audio voor Plasma Mobile", "Description[sl]": "Hitre nastavitve za Plasma Mobile", "Description[tr]": "Plasma Cep Waydroid tez ayarı", @@ -45,6 +47,7 @@ "Name[he]": "Waydroid", "Name[it]": "Waydroid", "Name[ka]": "Waydroid", + "Name[ko]": "Waydroid", "Name[nl]": "Waydroid", "Name[sl]": "Waydroid", "Name[tr]": "Waydroid",