From bf50cc2b67440d96dc36016e8e905fde63b90ab1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 14 Jul 2023 02:33:35 +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 | 2 ++ src/tabbox/switchers/thumbnail_grid/metadata.json | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json b/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json index 186b17dae5..6684f5fe97 100644 --- a/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json +++ b/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json @@ -10,6 +10,7 @@ "Description[eo]": "Fenestrodekora Etosmotoro", "Description[es]": "Motor de temas de decoraciones de las ventanas", "Description[eu]": "Leiho-apaindura gaien motorra", + "Description[fi]": "Ikkunakoristeluteemamoottori", "Description[fr]": "Moteur pour les thèmes de décorations de fenêtres", "Description[ia]": "Motor de Thema de Decoratione de fenestra", "Description[it]": "Motore dei temi delle decorazioni delle finestre", @@ -32,6 +33,7 @@ "Name[eo]": "Aurorae", "Name[es]": "Aurorae", "Name[eu]": "Aurorae", + "Name[fi]": "Aurorae", "Name[fr]": "Aurorae", "Name[ia]": "Aurorae", "Name[it]": "Aurorae", diff --git a/src/tabbox/switchers/thumbnail_grid/metadata.json b/src/tabbox/switchers/thumbnail_grid/metadata.json index c0746a3215..75e3e01329 100644 --- a/src/tabbox/switchers/thumbnail_grid/metadata.json +++ b/src/tabbox/switchers/thumbnail_grid/metadata.json @@ -15,6 +15,7 @@ "Name[eo]": "Chris Holland", "Name[es]": "Chris Holland", "Name[eu]": "Chris Holland", + "Name[fi]": "Chris Holland", "Name[fr]": "Chris Holland", "Name[ia]": "Chris Holland", "Name[it]": "Chris Holland", @@ -42,6 +43,7 @@ "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[fi]": "Pientä pienoiskuvaruudukkoa käyttävä ikkunavaihto", "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", @@ -70,6 +72,7 @@ "Name[eo]": "Bildeta Krado", "Name[es]": "Cuadrícula de miniaturas", "Name[eu]": "Koadro txikien sareta", + "Name[fi]": "Pienoiskuvaruudukko", "Name[fr]": "Grille de vignettes", "Name[ia]": "Grillia de Miniatura", "Name[it]": "Griglia delle miniature",