From f3012a3eda4d22cb3c09410709588978bce63aca Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 22 Oct 2023 02:34:36 +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" --- examples/quick-effect/package/metadata.json | 6 ++++++ .../kwin_colorblindnesscorrection_config.json | 1 + src/plugins/colorblindnesscorrection/metadata.json | 4 +++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/examples/quick-effect/package/metadata.json b/examples/quick-effect/package/metadata.json index 398fca7428..1035d5afa6 100644 --- a/examples/quick-effect/package/metadata.json +++ b/examples/quick-effect/package/metadata.json @@ -8,9 +8,11 @@ "Name[ca@valencia]": "Nom real", "Name[ca]": "Nom real", "Name[es]": "Nombre real", + "Name[fr]": "Nom réel", "Name[ia]": "Nomine real", "Name[ka]": "ნამდვილი სახელი", "Name[nl]": "Echte naam", + "Name[pl]": "Rzeczywista nazwa", "Name[sl]": "Pravo ime", "Name[tr]": "Gerçek Adı", "Name[uk]": "Справжнє ім'я", @@ -23,9 +25,11 @@ "Description[ca@valencia]": "Efecte ràpid", "Description[ca]": "Efecte ràpid", "Description[es]": "Efecto rápido", + "Description[fr]": "Effet rapide", "Description[ia]": "Effecto Rapide", "Description[ka]": "სწრაფი ეფექტი", "Description[nl]": "Snel-effect", + "Description[pl]": "Szybki Efekt", "Description[sl]": "Hitri učinek", "Description[tr]": "Tez Efekt", "Description[uk]": "Швидкий ефект", @@ -38,9 +42,11 @@ "Name[ca@valencia]": "Efecte ràpid", "Name[ca]": "Efecte ràpid", "Name[es]": "Efecto rápido", + "Name[fr]": "Effet rapide", "Name[ia]": "Effecto Rapide", "Name[ka]": "სწრაფი ეფექტი", "Name[nl]": "Snel-effect", + "Name[pl]": "Szybki Efekt", "Name[sl]": "Hitri učinek", "Name[tr]": "Tez Efekt", "Name[uk]": "Швидкий ефект", diff --git a/src/plugins/colorblindnesscorrection/kwin_colorblindnesscorrection_config.json b/src/plugins/colorblindnesscorrection/kwin_colorblindnesscorrection_config.json index dbe46e0ea8..8ab00e8c7d 100644 --- a/src/plugins/colorblindnesscorrection/kwin_colorblindnesscorrection_config.json +++ b/src/plugins/colorblindnesscorrection/kwin_colorblindnesscorrection_config.json @@ -8,6 +8,7 @@ "Name[eo]": "Korekto de Kolorblindeco", "Name[es]": "Corrección para daltonismo", "Name[eu]": "Kolore itsutasunerako zuzenketa", + "Name[fr]": "Correction du daltonisme", "Name[ia]": "Correction de cecitate de color", "Name[ka]": "ფერების სიბრმავის შესწორება", "Name[ko]": "색각 이상 보정", diff --git a/src/plugins/colorblindnesscorrection/metadata.json b/src/plugins/colorblindnesscorrection/metadata.json index e0318df319..be9b83dd66 100644 --- a/src/plugins/colorblindnesscorrection/metadata.json +++ b/src/plugins/colorblindnesscorrection/metadata.json @@ -8,6 +8,7 @@ "Description[eo]": "Plibonigas kolorpercepton por kolora blindeco", "Description[es]": "Mejora la percepción del color para el daltonismo", "Description[eu]": "Kolore itsutasunerako koloreen zorroztasuna areagotzen du", + "Description[fr]": "Améliore la perception des couleurs pour le daltonisme", "Description[ia]": "Intensifica perceprion de color per cecitate de color", "Description[ka]": "ფერების გაფართოება ფერებით ბრმა პიროვნებებისთვის", "Description[ko]": "색각 이상 사용자를 위한 색 분별력 향상", @@ -18,7 +19,7 @@ "Description[tr]": "Renk körlüğü aralığında renk algısını iyileştirir", "Description[uk]": "Удосконалює сприйняття кольорів для випадків дальтонізму", "Description[x-test]": "xxEnhances color perception for color blindnessxx", - "Description[zh_CN]": "增强色盲人士的颜色感知", + "Description[zh_CN]": "增强色盲视觉的颜色感知", "EnabledByDefault": false, "License": "GPL-2.0+", "Name": "Colorblindness Correction", @@ -28,6 +29,7 @@ "Name[eo]": "Korekto de Kolorblindeco", "Name[es]": "Corrección para daltonismo", "Name[eu]": "Kolore itsutasunerako zuzenketa", + "Name[fr]": "Correction du daltonisme", "Name[ia]": "Correction de cecitate de color", "Name[ka]": "ფერების სიბრმავის შესწორება", "Name[ko]": "색각 이상 보정",