From 65b67612375ed78329b98b4f341c75c13ef50ab5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 27 Sep 2023 01:23:50 +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" --- containment/package/metadata.json | 3 +++ .../plasma-containmentactions-lattecontextmenu.json | 4 +++- indicators/default/metadata.json | 2 ++ indicators/org.kde.latte.plasma/metadata.json | 2 ++ indicators/org.kde.latte.plasmatabstyle/metadata.json | 2 ++ plasmoid/package/metadata.json | 2 ++ shell/package/metadata.json | 2 ++ 7 files changed, 16 insertions(+), 1 deletion(-) diff --git a/containment/package/metadata.json b/containment/package/metadata.json index af76edc97..d0149e035 100644 --- a/containment/package/metadata.json +++ b/containment/package/metadata.json @@ -11,6 +11,7 @@ "Name[en_GB]": "Michail Vourlakos, Smith Ar", "Name[eo]": "Michail Vourlakos, Smith Ar", "Name[es]": "Michail Vourlakos, Smith Ar", + "Name[eu]": "Michail Vourlakos, Smith Ar", "Name[fi]": "Michail Vourlakos, Smith Ar", "Name[fr]": "Michail Vourlakos, Smith Ar", "Name[gl]": "Michail Vourlakos, Smith Ar", @@ -40,6 +41,7 @@ "Description[en_GB]": "Containment provided for the Latte Dock", "Description[eo]": "Reteno disponigita por la Latte Doko", "Description[es]": "Contenedor proporcionado para Latte Dock", + "Description[eu]": "«Latte dock»erako emandako konfinamendua", "Description[fi]": "Latte-telakalle tarjottu sisällytys", "Description[fr]": "Confinement fourni pour le panneau de Latte", "Description[gl]": "Contedor fornecido para a doca Latte.", @@ -68,6 +70,7 @@ "Name[en_GB]": "Latte Containment", "Name[eo]": "Lakto Enteno", "Name[es]": "Contenedor de Latte", + "Name[eu]": "«Latte» konfinamendua", "Name[fi]": "Latte-säilö", "Name[fr]": "Conteneur pour Latte", "Name[gl]": "Contedor de Latte", diff --git a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json index 1ca2e8146..9170d2ff7 100644 --- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json +++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json @@ -11,6 +11,7 @@ "Name[en_GB]": "Michail Vourlakos", "Name[eo]": "Michail Vourlakos", "Name[es]": "Michail Vourlakos", + "Name[eu]": "Michail Vourlakos", "Name[fi]": "Michail Vourlakos", "Name[fr]": "Michail Vourlakos", "Name[gl]": "Michail Vourlakos", @@ -39,6 +40,7 @@ "Description[en_GB]": "The Latte menu that normally shows on right-click", "Description[eo]": "La latteo-menuo, kiu kutime montras per dekstra klako", "Description[es]": "Este es el menú de Latte que normalmente se muestra tras un clic derecho", + "Description[eu]": "Eskuin botoiarekin klik egitean agertu ohi den «latte» menua", "Description[fi]": "Tavallisesti hiiren oikealla painikkeella näytettävä Latte-valikko", "Description[fr]": "Le menu de Latte s'affichant normalement sur un clic droit", "Description[gl]": "O menú de Latte que adoita amosarse ao facer clic dereito.", @@ -71,7 +73,7 @@ "Name[eo]": "Norma Lattea Menuo", "Name[es]": "Menú estándar de Latte", "Name[et]": "Latte standardmenüü", - "Name[eu]": "Latte menu estandarra", + "Name[eu]": "«Latte» menu estandarra", "Name[fi]": "Latten vakiovalikko", "Name[fr]": "Menu standard de Latte", "Name[gl]": "Menú estándar de Latte", diff --git a/indicators/default/metadata.json b/indicators/default/metadata.json index 2b9e4bc82..57dd45bf1 100644 --- a/indicators/default/metadata.json +++ b/indicators/default/metadata.json @@ -11,6 +11,7 @@ "Name[en_GB]": "Michail Vourlakos", "Name[eo]": "Michail Vourlakos", "Name[es]": "Michail Vourlakos", + "Name[eu]": "Michail Vourlakos", "Name[fi]": "Michail Vourlakos", "Name[fr]": "Michail Vourlakos", "Name[gl]": "Michail Vourlakos", @@ -39,6 +40,7 @@ "Description[en_GB]": "Latte default indicator", "Description[eo]": "Latte defaŭlta indikilo", "Description[es]": "Indicador por omisión de Latte", + "Description[eu]": "«Latte» adierazle lehenetsia", "Description[fi]": "Latte-oletusilmaisin", "Description[fr]": "Indicateur de Latte par défaut", "Description[gl]": "Indicador predeterminado de Latte.", diff --git a/indicators/org.kde.latte.plasma/metadata.json b/indicators/org.kde.latte.plasma/metadata.json index 5912ced17..4864f88bf 100644 --- a/indicators/org.kde.latte.plasma/metadata.json +++ b/indicators/org.kde.latte.plasma/metadata.json @@ -11,6 +11,7 @@ "Name[en_GB]": "Michail Vourlakos", "Name[eo]": "Michail Vourlakos", "Name[es]": "Michail Vourlakos", + "Name[eu]": "Michail Vourlakos", "Name[fi]": "Michail Vourlakos", "Name[fr]": "Michail Vourlakos", "Name[gl]": "Michail Vourlakos", @@ -39,6 +40,7 @@ "Description[en_GB]": "Latte Plasma style indicator", "Description[eo]": "Latte Plasma stila indikilo", "Description[es]": "Estilo del indicador Plasma Latte", + "Description[eu]": "«Latte» plasma estiloko adierazlea", "Description[fi]": "Plasma-tyylin Latte-ilmaisin", "Description[fr]": "Indicateur de Latte dans le style de Plasma", "Description[gl]": "Indicador de estilo Plasma de Latte.", diff --git a/indicators/org.kde.latte.plasmatabstyle/metadata.json b/indicators/org.kde.latte.plasmatabstyle/metadata.json index 676808507..8e73d076f 100644 --- a/indicators/org.kde.latte.plasmatabstyle/metadata.json +++ b/indicators/org.kde.latte.plasmatabstyle/metadata.json @@ -11,6 +11,7 @@ "Name[en_GB]": "Michail Vourlakos", "Name[eo]": "Michail Vourlakos", "Name[es]": "Michail Vourlakos", + "Name[eu]": "Michail Vourlakos", "Name[fi]": "Michail Vourlakos", "Name[fr]": "Michail Vourlakos", "Name[gl]": "Michail Vourlakos", @@ -39,6 +40,7 @@ "Description[en_GB]": "Plasma Tab style indicator for Latte", "Description[eo]": "Plasma Tab stilindikilo por Latte", "Description[es]": "Indicador de estilo de pestaña Plasma para Latte", + "Description[eu]": "«Latte»ako, Plasmako fitxa estiloko adierazlea", "Description[fi]": "Plasma-välilehtityylin ilmaisin Lattelle", "Description[fr]": "Indicateur dans le style des onglets de Plasma pour Latte", "Description[gl]": "Indicador de estilo de separador de Plasma para Latte.", diff --git a/plasmoid/package/metadata.json b/plasmoid/package/metadata.json index fcc446ae4..20097a840 100644 --- a/plasmoid/package/metadata.json +++ b/plasmoid/package/metadata.json @@ -11,6 +11,7 @@ "Name[en_GB]": "Michail Vourlakos, Smith Ar", "Name[eo]": "Michail Vourlakos, Smith Ar", "Name[es]": "Michail Vourlakos, Smith Ar", + "Name[eu]": "Michail Vourlakos, Smith Ar", "Name[fi]": "Michail Vourlakos, Smith Ar", "Name[fr]": "Michail Vourlakos, Smith Ar", "Name[gl]": "Michail Vourlakos, Smith Ar", @@ -39,6 +40,7 @@ "Description[en_GB]": "Tasks plasmoid from Latte Dock", "Description[eo]": "Taskoj plasmoido de Latte Dock", "Description[es]": "Plasmoide de tareas de Latte Dock", + "Description[eu]": "Atazen plasmoidea «Latte Dock»etik", "Description[fi]": "Latte-telakan tehtäväsovelma", "Description[fr]": "Composant graphique de tâches pour le panneau de Latte", "Description[gl]": "Trebellos de tarefas da doca Latte.", diff --git a/shell/package/metadata.json b/shell/package/metadata.json index 7624bf9e7..7758cecff 100644 --- a/shell/package/metadata.json +++ b/shell/package/metadata.json @@ -11,6 +11,7 @@ "Name[en_GB]": "Michail Vourlakos, Smith Ar", "Name[eo]": "Michail Vourlakos, Smith Ar", "Name[es]": "Michail Vourlakos, Smith Ar", + "Name[eu]": "Michail Vourlakos, Smith Ar", "Name[fi]": "Michail Vourlakos, Smith Ar", "Name[fr]": "Michail Vourlakos, Smith Ar", "Name[gl]": "Michail Vourlakos, Smith Ar", @@ -38,6 +39,7 @@ "Description[en_GB]": "Shell provided for the Latte Dock", "Description[eo]": "Ŝelo zorgis pri la Latte Doko", "Description[es]": "Shell proporcionada para Latte Dock", + "Description[eu]": "«Latte Dock»erako emandako oskola (shell)", "Description[fi]": "Latte-telakalle tarjottu käyttöliittymä", "Description[fr]": "Interpréteur de commandes fourni pour le panneau de Latte", "Description[gl]": "Intérprete de ordes fornecido para a doca Latte.",