From 87ac5476d947a5f10a678614b96d60689bf22e5a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 18 Jun 2023 03:45:16 +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" --- .../aurorae/src/config/kcm_auroraeconfig.json | 10 +++++++++- src/plugins/squash/package/metadata.json | 1 + 2 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 bd97b4b4fa..05ef05ac3e 100644 --- a/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json +++ b/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json @@ -3,25 +3,33 @@ "Description": "Window Decoration Theme Engine", "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[ia]": "Motor de Thema de Decoratione de fenestra", + "Description[it]": "Motore dei temi delle decorazioni delle finestre", + "Description[ka]": "ფანჯრის დეკორაციის თემის ძრავა", "Description[nl]": "Engine voor thema van vensterdecoraties", "Description[sl]": "Stroj za teme okrasitev oken", "Description[tr]": "Pencere Dekorasyon Teması İşletkesi", "Description[uk]": "Рушій тем обрамлення вікон", "Description[x-test]": "xxWindow Decoration Theme Enginexx", + "Description[zh_CN]": "窗口装饰主题引擎", "Name": "Aurorae", "Name[ca@valencia]": "Aurorae", "Name[ca]": "Aurorae", "Name[de]": "Aurorae", + "Name[en_GB]": "Aurorae", "Name[eo]": "Aurorae", "Name[es]": "Aurorae", "Name[ia]": "Aurorae", + "Name[it]": "Aurorae", + "Name[ka]": "ავრორა", "Name[nl]": "Aurorae", "Name[sl]": "Aurorae", "Name[tr]": "Aurorae", "Name[uk]": "Aurorae", - "Name[x-test]": "xxAuroraexx" + "Name[x-test]": "xxAuroraexx", + "Name[zh_CN]": "Aurorae 极光" } } diff --git a/src/plugins/squash/package/metadata.json b/src/plugins/squash/package/metadata.json index 87a8fcb290..95011c2761 100644 --- a/src/plugins/squash/package/metadata.json +++ b/src/plugins/squash/package/metadata.json @@ -57,6 +57,7 @@ "Description[ia]": "Deforma fenestras durante que illes es minimisate", "Description[it]": "Schiaccia le finestre quando vengono minimizzate", "Description[ja]": "最小化時ウィンドウが縮小されます", + "Description[ka]": "ფანჯრების შეჭყლეტა ჩაკეცვისა დროს", "Description[nl]": "Krimp vensters wanneer ze geminimaliseerd zijn", "Description[nn]": "Skvis vindauge når dei vert minimerte", "Description[pl]": "Ściąga okna przy ich minimalizacji",