From c81756873509acb9a2dca38ea978ec6a2b473c73 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 24 Jun 2023 02:48:07 +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" --- src/kcms/scripts/kwinscripts.knsrc | 2 +- .../kdecorations/aurorae/src/config/kcm_auroraeconfig.json | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/kcms/scripts/kwinscripts.knsrc b/src/kcms/scripts/kwinscripts.knsrc index cd65f582a8..39ac9d834c 100644 --- a/src/kcms/scripts/kwinscripts.knsrc +++ b/src/kcms/scripts/kwinscripts.knsrc @@ -17,7 +17,7 @@ Name[et]=Aknahalduri skriptid Name[eu]=Leiho kudeatzailearen scriptak Name[fi]=Ikkunointiohjelman skriptit Name[fr]=Scripts du gestionnaire de fenêtres -Name[gl]=Scripts do xestor de xanelas +Name[gl]=Guións do xestor de xanelas Name[hu]=Ablakkezelő szkriptek Name[ia]=Gerente de scripts de fenestra Name[id]=Skrip Pengelola Jendela diff --git a/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json b/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json index a22bf577f7..c86dcb38d8 100644 --- a/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json +++ b/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json @@ -5,6 +5,7 @@ "Description[bg]": "Основна програма (енджин) на темата за декорации на прозорци", "Description[ca@valencia]": "Motor del tema de decoració de les finestres", "Description[ca]": "Motor de tema de decoració de les finestres", + "Description[cs]": "Stroj motivů dekorace oken", "Description[en_GB]": "Window Decoration Theme Engine", "Description[eo]": "Fenestrodekora Etosmotoro", "Description[es]": "Motor de temas de decoraciones de las ventanas", @@ -23,6 +24,7 @@ "Name[bg]": "Aurorae", "Name[ca@valencia]": "Aurorae", "Name[ca]": "Aurorae", + "Name[cs]": "Aurorae", "Name[de]": "Aurorae", "Name[en_GB]": "Aurorae", "Name[eo]": "Aurorae",