From 2e4386402b2ae01aeec61b8790050a7fbc99b7ab Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 27 Jul 2025 01:33:55 +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" --- kcms/waydroidintegration/kcm_waydroidintegration.json | 4 ++++ quicksettings/flashlight/kauth/flashlighthelper.actions | 2 ++ quicksettings/waydroid/metadata.json | 3 +++ 3 files changed, 9 insertions(+) diff --git a/kcms/waydroidintegration/kcm_waydroidintegration.json b/kcms/waydroidintegration/kcm_waydroidintegration.json index bf56d107..dfb62a6b 100644 --- a/kcms/waydroidintegration/kcm_waydroidintegration.json +++ b/kcms/waydroidintegration/kcm_waydroidintegration.json @@ -8,6 +8,7 @@ "Name[ca@valencia]": "Florian RICHER", "Name[ca]": "Florian RICHER", "Name[es]": "Florian RICHER", + "Name[eu]": "Florian RICHER", "Name[fr]": "Florian RICHER", "Name[he]": "פלוריאן רישה", "Name[it]": "Florian RICHER", @@ -27,6 +28,7 @@ "Description[ca@valencia]": "Configureu Waydroid", "Description[ca]": "Configuració del Waydroid", "Description[es]": "Configuración de Waydroid", + "Description[eu]": "Waydroid konfigurazioa", "Description[fr]": "Configuration de Waydroid", "Description[he]": "הגדרות Waydroid", "Description[it]": "Configurazione di Waydroid", @@ -52,6 +54,7 @@ "Name[ca@valencia]": "Integració de Waydroid", "Name[ca]": "Integració del Waydroid", "Name[es]": "Integración con Waydroid", + "Name[eu]": "Waydroid bateratzea", "Name[fr]": "Intégration de Waydroid", "Name[he]": "שילוב מול Waydroid", "Name[it]": "Integrazione Waydroid", @@ -70,6 +73,7 @@ "X-KDE-Keywords[ca@valencia]": "waydroid", "X-KDE-Keywords[ca]": "waydroid", "X-KDE-Keywords[es]": "waydroid", + "X-KDE-Keywords[eu]": "waydroid", "X-KDE-Keywords[fr]": "waydroid", "X-KDE-Keywords[he]": "waydroid", "X-KDE-Keywords[it]": "waydroid", diff --git a/quicksettings/flashlight/kauth/flashlighthelper.actions b/quicksettings/flashlight/kauth/flashlighthelper.actions index 40f67b28..dcadd2d0 100644 --- a/quicksettings/flashlight/kauth/flashlighthelper.actions +++ b/quicksettings/flashlight/kauth/flashlighthelper.actions @@ -24,6 +24,7 @@ Icon=color [org.kde.plasma.mobileshell.flashlighthelper.setbrightness] Name=Set flashlight brightness Name[ca]=Estableix la lluminositat del llum de flaix +Name[ca@valencia]=Establix la brillantor del llum de flaix Name[es]=Ajustar el brillo de la linterna Name[eu]=Ezarri esku-argiaren distira Name[he]=הגדרת בהירות פנס @@ -36,6 +37,7 @@ Name[x-test]=xxSet flashlight brightnessxx Name[zh_CN]=设置手电筒亮度 Description=Allow set brightness on led device Description[ca]=Permet establir la lluminositat del dispositiu LED +Description[ca@valencia]=Permet establir la lluminositat del dispositiu LED Description[es]=Permitir ajustar el brillo del led del dispositivo Description[eu]=LED-gailuaren distira ezartzeko aukera eskaintzen du Description[he]=לאפשר להגדיר בהירות על התקן נורית diff --git a/quicksettings/waydroid/metadata.json b/quicksettings/waydroid/metadata.json index ab93a46f..bd93ecd8 100644 --- a/quicksettings/waydroid/metadata.json +++ b/quicksettings/waydroid/metadata.json @@ -9,6 +9,7 @@ "Name[ca@valencia]": "Florian RICHER", "Name[ca]": "Florian RICHER", "Name[es]": "Florian RICHER", + "Name[eu]": "Florian RICHER", "Name[fr]": "Florian RICHER", "Name[he]": "פלוריאן רישה", "Name[it]": "Florian RICHER", @@ -27,6 +28,7 @@ "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", + "Description[eu]": "Waydroid-en ezarpen azkarra Plasma Mugikorrerako", "Description[fr]": "Configuration rapide de Waydroid pour Plasma Mobile", "Description[he]": "הגדרה מהירה ל־Waydroid לפלזמה לניידים", "Description[it]": "Impostazioni rapide di Waydroid per Plasma Mobile", @@ -46,6 +48,7 @@ "Name[ca@valencia]": "Waydroid", "Name[ca]": "Waydroid", "Name[es]": "Waydroid", + "Name[eu]": "Waydroid", "Name[fr]": "Waydroid", "Name[he]": "Waydroid", "Name[it]": "Waydroid",