From 54d72abd6eb82db610c072495c40ab962f020ea0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 24 Oct 2023 02:10:20 +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 | 3 +++ .../kwin_colorblindnesscorrection_config.json | 1 + src/plugins/colorblindnesscorrection/metadata.json | 2 ++ 3 files changed, 6 insertions(+) diff --git a/examples/quick-effect/package/metadata.json b/examples/quick-effect/package/metadata.json index f121a01eae..c161ae2ce6 100644 --- a/examples/quick-effect/package/metadata.json +++ b/examples/quick-effect/package/metadata.json @@ -11,6 +11,7 @@ "Name[eu]": "Benetako izena", "Name[fr]": "Nom réel", "Name[ia]": "Nomine real", + "Name[it]": "Nome reale", "Name[ka]": "ნამდვილი სახელი", "Name[nl]": "Echte naam", "Name[pl]": "Rzeczywista nazwa", @@ -30,6 +31,7 @@ "Description[eu]": "Efektu azkarra", "Description[fr]": "Effet rapide", "Description[ia]": "Effecto Rapide", + "Description[it]": "Effetto rapido", "Description[ka]": "სწრაფი ეფექტი", "Description[nl]": "Snel-effect", "Description[pl]": "Szybki Efekt", @@ -48,6 +50,7 @@ "Name[eu]": "Efektu azkarra", "Name[fr]": "Effet rapide", "Name[ia]": "Effecto Rapide", + "Name[it]": "Effetto rapido", "Name[ka]": "სწრაფი ეფექტი", "Name[nl]": "Snel-effect", "Name[pl]": "Szybki Efekt", diff --git a/src/plugins/colorblindnesscorrection/kwin_colorblindnesscorrection_config.json b/src/plugins/colorblindnesscorrection/kwin_colorblindnesscorrection_config.json index 8ab00e8c7d..e9ad984a9e 100644 --- a/src/plugins/colorblindnesscorrection/kwin_colorblindnesscorrection_config.json +++ b/src/plugins/colorblindnesscorrection/kwin_colorblindnesscorrection_config.json @@ -10,6 +10,7 @@ "Name[eu]": "Kolore itsutasunerako zuzenketa", "Name[fr]": "Correction du daltonisme", "Name[ia]": "Correction de cecitate de color", + "Name[it]": "Correzione per il daltonismo", "Name[ka]": "ფერების სიბრმავის შესწორება", "Name[ko]": "색각 이상 보정", "Name[nl]": "Correctie voor kleurenblindheid", diff --git a/src/plugins/colorblindnesscorrection/metadata.json b/src/plugins/colorblindnesscorrection/metadata.json index be9b83dd66..486373413d 100644 --- a/src/plugins/colorblindnesscorrection/metadata.json +++ b/src/plugins/colorblindnesscorrection/metadata.json @@ -10,6 +10,7 @@ "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[it]": "Migliora la percezione del colore per il daltonismo", "Description[ka]": "ფერების გაფართოება ფერებით ბრმა პიროვნებებისთვის", "Description[ko]": "색각 이상 사용자를 위한 색 분별력 향상", "Description[nl]": "Perceptie van kleur verbeteren voor kleurenblindheid", @@ -31,6 +32,7 @@ "Name[eu]": "Kolore itsutasunerako zuzenketa", "Name[fr]": "Correction du daltonisme", "Name[ia]": "Correction de cecitate de color", + "Name[it]": "Correzione per il daltonismo", "Name[ka]": "ფერების სიბრმავის შესწორება", "Name[ko]": "색각 이상 보정", "Name[nl]": "Correctie voor kleurenblindheid",