From 5dbe7d7adc1a1c58ac2b4d602a62daf165cd63d8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 23 Jun 2023 02:33:21 +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" --- .../kdecorations/aurorae/src/config/kcm_auroraeconfig.json | 6 ++++++ src/plugins/slidingpopups/metadata.json | 2 +- src/tabbox/switchers/thumbnail_grid/metadata.json | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json b/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json index 05ef05ac3e..a22bf577f7 100644 --- a/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json +++ b/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json @@ -1,11 +1,14 @@ { "KPlugin": { "Description": "Window Decoration Theme Engine", + "Description[ar]": "محرك سمات زخارف النوافذ", + "Description[bg]": "Основна програма (енджин) на темата за декорации на прозорци", "Description[ca@valencia]": "Motor del tema de decoració de les finestres", "Description[ca]": "Motor de tema de decoració de les finestres", "Description[en_GB]": "Window Decoration Theme Engine", "Description[eo]": "Fenestrodekora Etosmotoro", "Description[es]": "Motor de temas de decoraciones de las ventanas", + "Description[eu]": "Leiho-apaindura gaien motorra", "Description[ia]": "Motor de Thema de Decoratione de fenestra", "Description[it]": "Motore dei temi delle decorazioni delle finestre", "Description[ka]": "ფანჯრის დეკორაციის თემის ძრავა", @@ -16,12 +19,15 @@ "Description[x-test]": "xxWindow Decoration Theme Enginexx", "Description[zh_CN]": "窗口装饰主题引擎", "Name": "Aurorae", + "Name[ar]": "أورورا", + "Name[bg]": "Aurorae", "Name[ca@valencia]": "Aurorae", "Name[ca]": "Aurorae", "Name[de]": "Aurorae", "Name[en_GB]": "Aurorae", "Name[eo]": "Aurorae", "Name[es]": "Aurorae", + "Name[eu]": "Aurorae", "Name[ia]": "Aurorae", "Name[it]": "Aurorae", "Name[ka]": "ავრორა", diff --git a/src/plugins/slidingpopups/metadata.json b/src/plugins/slidingpopups/metadata.json index fbcc2d5978..6c6ec9b659 100644 --- a/src/plugins/slidingpopups/metadata.json +++ b/src/plugins/slidingpopups/metadata.json @@ -8,7 +8,7 @@ "Description[bg]": "Плъзгаща се анимация за изскачащи прозорци на Plasma", "Description[ca@valencia]": "Animació de desplaçament per als missatges emergents de Plasma", "Description[ca]": "Animació de desplaçament per als missatges emergents del Plasma", - "Description[cs]": "Animace klouzání vyskakovacích oken plasmy", + "Description[cs]": "Animace klouzání vyskakovacích oken Plasma", "Description[de]": "Effekt zum Hereingleiten von Plasma-Aufklappfenstern", "Description[en_GB]": "Sliding animation for Plasma popups", "Description[eo]": "Glita animacio por Plasma ŝprucfenestroj", diff --git a/src/tabbox/switchers/thumbnail_grid/metadata.json b/src/tabbox/switchers/thumbnail_grid/metadata.json index 44759f730b..c0746a3215 100644 --- a/src/tabbox/switchers/thumbnail_grid/metadata.json +++ b/src/tabbox/switchers/thumbnail_grid/metadata.json @@ -14,6 +14,7 @@ "Name[en_GB]": "Chris Holland", "Name[eo]": "Chris Holland", "Name[es]": "Chris Holland", + "Name[eu]": "Chris Holland", "Name[fr]": "Chris Holland", "Name[ia]": "Chris Holland", "Name[it]": "Chris Holland", @@ -40,6 +41,7 @@ "Description[en_GB]": "A window switcher layout using a small grid of thumbnails", "Description[eo]": "Fenestroŝaltila aranĝo uzante malgrandan kradon de bildetoj", "Description[es]": "Un esquema de selector de ventanas que usa una pequeña cuadrícula de miniaturas", + "Description[eu]": "Koadro txikien sareta txiki bat erabiltzen duen leiho-trukatzaile antolaera bat", "Description[fr]": "Une disposition du sélecteur de fenêtres utilisant une petite grille de vignettes.", "Description[ia]": "Un disposition de commutator de fenestra usante un parve grillia de miniaturas", "Description[it]": "Una disposizione per il cambio finestra che utilizza una piccola griglia di miniature", @@ -67,6 +69,7 @@ "Name[en_GB]": "Thumbnail Grid", "Name[eo]": "Bildeta Krado", "Name[es]": "Cuadrícula de miniaturas", + "Name[eu]": "Koadro txikien sareta", "Name[fr]": "Grille de vignettes", "Name[ia]": "Grillia de Miniatura", "Name[it]": "Griglia delle miniature",