From 84997dc00ddbcc1f600aa36a83879341bd523282 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 26 Sep 2022 01:52:45 +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" --- kdecoration/config/kcm_breezedecoration.json | 22 +++++++++++++++++ kstyle/config/breezestyleconfig.json | 22 +++++++++++++++++ wallpapers/Next/metadata.json | 26 ++++++++++++++++++-- 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/kdecoration/config/kcm_breezedecoration.json b/kdecoration/config/kcm_breezedecoration.json index 59308848..18d2d117 100644 --- a/kdecoration/config/kcm_breezedecoration.json +++ b/kdecoration/config/kcm_breezedecoration.json @@ -1,8 +1,30 @@ { "KPlugin": { "Description": "Modify the appearance of window decorations", + "Description[ar]": "عدّل مظهر زخرفات النّوافذ", + "Description[ca@valencia]": "Modifica l'aparença de les decoracions de les finestres", + "Description[ca]": "Modifica l'aparença de les decoracions de les finestres", + "Description[es]": "Modificar el aspecto de las decoraciones de ventanas", + "Description[eu]": "Leiho apainduren itxura aldatzea", + "Description[nl]": "Wijzig het uiterlijk van vensterdecoraties", + "Description[pt]": "Modificar a aparência das decorações das janelas", + "Description[sv]": "Ändra utseendet hos fönsterdekorationer", + "Description[tr]": "Pencere dekorasyonlarının görünüşünü değiştirin", + "Description[uk]": "Внесення змін до обрамлення вікон", + "Description[x-test]": "xxModify the appearance of window decorationsxx", "Icon": "preferences-system-windows", "Name": "Breeze Window Decoration", + "Name[ar]": "زخرفة نوافذ نسيم", + "Name[ca@valencia]": "Decoració Brisa de les finestres", + "Name[ca]": "Decoració Brisa de les finestres", + "Name[es]": "Decoración de ventanas Brisa", + "Name[eu]": "Breeze leihoen apaindura", + "Name[nl]": "Breeze vensterdecoratie", + "Name[pt]": "Decoração de Janelas Brisa", + "Name[sv]": "Breeze fönsterdekoration", + "Name[tr]": "Esinti Pencere Dekorasyonu", + "Name[uk]": "Обрамлення вікон Breeze", + "Name[x-test]": "xxBreeze Window Decorationxx", "ServiceTypes": [ "KCModule" ] diff --git a/kstyle/config/breezestyleconfig.json b/kstyle/config/breezestyleconfig.json index 4c5981bd..e41be207 100644 --- a/kstyle/config/breezestyleconfig.json +++ b/kstyle/config/breezestyleconfig.json @@ -1,8 +1,30 @@ { "KPlugin": { "Description": "Modify the appearance of widgets", + "Description[ar]": "عدّل مظهر الودجات", + "Description[ca@valencia]": "Modifica l'aparença dels ginys", + "Description[ca]": "Modifica l'aparença dels ginys", + "Description[es]": "Modificar el aspecto de los widgets", + "Description[eu]": "Trepeten itxura aldatzea", + "Description[nl]": "Wijzig het uiterlijk van widgets", + "Description[pt]": "Modificar a aparência dos elementos gráficos", + "Description[sv]": "Ändra utseende hos grafiska komponenter", + "Description[tr]": "Araç takımlarının görünüşünü değiştirin", + "Description[uk]": "Внесення змін до вигляду віджетів", + "Description[x-test]": "xxModify the appearance of widgetsxx", "Icon": "preferences-desktop-theme", "Name": "Breeze Widget Style", + "Name[ar]": "نمط ودجات نسيم", + "Name[ca@valencia]": "Estil dels ginys Brisa", + "Name[ca]": "Estil dels ginys Brisa", + "Name[es]": "Estilo de widgets Brisa", + "Name[eu]": "Breeze trepeten estiloa", + "Name[nl]": "Breeze widgetstijl", + "Name[pt]": "Estilo Gráfico Brisa", + "Name[sv]": "Breeze stil för grafiska komponenter", + "Name[tr]": "Esinti Araç Takımı Biçemi", + "Name[uk]": "Стиль віджетів Breeze", + "Name[x-test]": "xxBreeze Widget Stylexx", "ServiceTypes": [ "KCModule" ] diff --git a/wallpapers/Next/metadata.json b/wallpapers/Next/metadata.json index d63209d0..3e39c5c4 100644 --- a/wallpapers/Next/metadata.json +++ b/wallpapers/Next/metadata.json @@ -3,11 +3,33 @@ "Authors": [ { "Email": "foss@louisdurrant.co.uk", - "Name": "Louis Durrant" + "Name": "Louis Durrant", + "Name[ar]": "لويس دورانت", + "Name[ca@valencia]": "Louis Durrant", + "Name[ca]": "Louis Durrant", + "Name[es]": "Louis Durrant", + "Name[eu]": "Louis Durrant", + "Name[nl]": "Louis Durrant", + "Name[pt]": "Louis Durrant", + "Name[sv]": "Louis Durrant", + "Name[tr]": "Louis Durrant", + "Name[uk]": "Louis Durrant", + "Name[x-test]": "xxLouis Durrantxx" } ], "Id": "Next", "License": "CC-BY-SA-4.0", - "Name": "Safe Landing" + "Name": "Safe Landing", + "Name[ar]": "هبوط آمن", + "Name[ca@valencia]": "Aterratge segur", + "Name[ca]": "Aterratge segur", + "Name[es]": "Aterrizaje seguro", + "Name[eu]": "Lurreratze segurua", + "Name[nl]": "Veilige landing", + "Name[pt]": "Aterragem Suave", + "Name[sv]": "Säker landning", + "Name[tr]": "Güvenli İniş", + "Name[uk]": "Безпечне приземлення", + "Name[x-test]": "xxSafe Landingxx" } }