From bd287571e86e868541d163c2d77ad9599116ab4e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 16 Mar 2025 01:30:57 +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" --- initialstart/modules/systemnavigation/metadata.json | 1 + kcms/info/kcm_mobile_info.json | 1 + kcms/mobileshell/kcm_mobileshell.json | 1 + kcms/time/kcm_mobile_time.json | 1 + kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json | 1 + 5 files changed, 5 insertions(+) diff --git a/initialstart/modules/systemnavigation/metadata.json b/initialstart/modules/systemnavigation/metadata.json index b827aada..3a8bb7fc 100644 --- a/initialstart/modules/systemnavigation/metadata.json +++ b/initialstart/modules/systemnavigation/metadata.json @@ -47,6 +47,7 @@ "Description": "System navigation initialstart module for Plasma Mobile", "Description[ca@valencia]": "Mòdul de començament inicial de navegació del sistema per a Plasma Mobile", "Description[ca]": "Mòdul de començament inicial de navegació del sistema per al Plasma Mobile", + "Description[eo]": "Sistemnaviga prakomenca modulo por Plasma Mobile", "Description[es]": "Módulo de navegación del sistema del primer inicio para Plasma Mobile", "Description[fr]": "Module de démarrage initial pour le système de navigation pour Plasma Mobile", "Description[he]": "מודול להפעלה ראשונית של ניווט במערכת לפלזמה לניידים", diff --git a/kcms/info/kcm_mobile_info.json b/kcms/info/kcm_mobile_info.json index 9d36c2e1..c1b259d5 100644 --- a/kcms/info/kcm_mobile_info.json +++ b/kcms/info/kcm_mobile_info.json @@ -87,6 +87,7 @@ "X-KDE-Keywords[ca]": "informació,distribució,sistema", "X-KDE-Keywords[cs]": "informace, distribuce, systém", "X-KDE-Keywords[en_GB]": "info, distro, system", + "X-KDE-Keywords[eo]": "informo, eldono, sistemo", "X-KDE-Keywords[es]": "información,distribución,sistema", "X-KDE-Keywords[eu]": "info,informazioa,distro,banaketa,sistema", "X-KDE-Keywords[fi]": "tietoa,jakelu,distro,järjestelmä", diff --git a/kcms/mobileshell/kcm_mobileshell.json b/kcms/mobileshell/kcm_mobileshell.json index 9136b7ed..2056da79 100644 --- a/kcms/mobileshell/kcm_mobileshell.json +++ b/kcms/mobileshell/kcm_mobileshell.json @@ -138,6 +138,7 @@ "X-KDE-Keywords[ca@valencia]": "sistema,intèrpret d'ordres,quadro", "X-KDE-Keywords[ca]": "sistema,intèrpret d'ordres,plafó", "X-KDE-Keywords[en_GB]": "system,shell,panel", + "X-KDE-Keywords[eo]": "sistemo,ŝelo,panelo", "X-KDE-Keywords[es]": "sistema,intérprete,intérprete de órdenes,panel", "X-KDE-Keywords[eu]": "sistema,shell,oskola,panela", "X-KDE-Keywords[fi]": "järjestelmä,komentotulkki,paneeli", diff --git a/kcms/time/kcm_mobile_time.json b/kcms/time/kcm_mobile_time.json index 25221053..1d79f0f5 100644 --- a/kcms/time/kcm_mobile_time.json +++ b/kcms/time/kcm_mobile_time.json @@ -87,6 +87,7 @@ "X-KDE-Keywords[ca]": "tema,aspecte,comportament", "X-KDE-Keywords[cs]": "motiv,vzhled,chování", "X-KDE-Keywords[en_GB]": "theme, look, feel", + "X-KDE-Keywords[eo]": "etoso, aspekto, sento", "X-KDE-Keywords[es]": "tema,aspecto", "X-KDE-Keywords[eu]": "gaia, itxura, izaera", "X-KDE-Keywords[fi]": "teema,ulkoasu,tuntuma", diff --git a/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json b/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json index 9077cde6..43847312 100644 --- a/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json +++ b/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json @@ -127,6 +127,7 @@ "X-KDE-Keywords[ca@valencia]": "en pantalla,osk,teclat virtual,teclat", "X-KDE-Keywords[ca]": "en pantalla,osk,teclat virtual,teclat", "X-KDE-Keywords[en_GB]": "onscreen,osk,virtualkeyboard,keyboard", + "X-KDE-Keywords[eo]": "surekrana,osk,virtualklavaro,klavaro", "X-KDE-Keywords[es]": "en pantalla,osk,teclado virtual,teclado", "X-KDE-Keywords[eu]": "pantailako,osk,alegiazko teklatua,teklatu birtuala,teklatua", "X-KDE-Keywords[fi]": "ruutunäyttö,näyttönäppäimistö,virtuaalinäppäimistö,näppäimistö",