From 3897585976c781b13eb6ead700deeeddbccef3bc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 6 Jul 2022 01:45:57 +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" --- kcms/colors/accentColorService/accentColorService.json | 1 + kcms/region_language/kcm_regionandlang.desktop | 2 ++ kcms/region_language/kcm_regionandlang.json | 2 ++ libcolorcorrect/kded/colorcorrectlocationupdater.json | 1 + lookandfeel.dark/metadata.json | 1 + lookandfeel/metadata.json | 1 + sddm-theme/metadata.desktop | 2 ++ 7 files changed, 10 insertions(+) diff --git a/kcms/colors/accentColorService/accentColorService.json b/kcms/colors/accentColorService/accentColorService.json index f9b946908..943833879 100644 --- a/kcms/colors/accentColorService/accentColorService.json +++ b/kcms/colors/accentColorService/accentColorService.json @@ -54,6 +54,7 @@ "Name[sk]": "accentColorService", "Name[sl]": "accentColorService", "Name[sv]": "Accentfärgtjänst", + "Name[ta]": "சிறப்புநிறச்சேவை", "Name[tr]": "accentColorService", "Name[uk]": "accentColorService", "Name[vi]": "accentColorService", diff --git a/kcms/region_language/kcm_regionandlang.desktop b/kcms/region_language/kcm_regionandlang.desktop index f08077702..8f02d174e 100644 --- a/kcms/region_language/kcm_regionandlang.desktop +++ b/kcms/region_language/kcm_regionandlang.desktop @@ -8,6 +8,7 @@ Name[fr]=Pays et langue Name[nl]=Regio & taal Name[pt]=Região & Língua Name[sl]=Regija in Jezik +Name[ta]=மொழியும் மண்டலமும் Name[tr]=Bölge ve Dil Name[uk]=Регіон та мова Name[x-test]=xxRegion & Languagexx @@ -20,6 +21,7 @@ Comment[fr]=Définir la langue, le format numérique, de monnaie et d'heure Comment[nl]=Formaten bij taal, numerieke getallen, munteenheid en tijd instellen Comment[pt]=Configurar a Língua e os Formatos Numéricos, Monetários e de Datas Comment[sl]=Nastavi jezik, števila, valuta in oblike časa +Comment[ta]=எண்களும் பண மதிப்புகளும் நேரங்களும் எழுதப்படும் வித‍த்தையும், மொழிகளையும் அமையுங்கள் Comment[tr]=Dil, Sayı, Para Birimi ve Zaman Biçimlerini Ayarla Comment[uk]=Встановлення мови, форматів запису чисел, грошових сум та часу Comment[x-test]=xxSet Language, Numeric, Currency and Time Formatsxx diff --git a/kcms/region_language/kcm_regionandlang.json b/kcms/region_language/kcm_regionandlang.json index 8b17f3a58..88767491c 100644 --- a/kcms/region_language/kcm_regionandlang.json +++ b/kcms/region_language/kcm_regionandlang.json @@ -9,6 +9,7 @@ "Description[nl]": "Formaten voor taal, numerieke getallen, munteenheid en tijd", "Description[pt]": "Configuração da Língua, Formatos Numéricos, Monetários e de Datas", "Description[sl]": "Nastavitve jezika, oblike števil, valute in časa", + "Description[ta]": "எண்கள், பண மதிப்புகள், மற்றும் நேரங்கள் எழுதப்படும் விதமும், மொழிகுறித்த அமைப்புகளும்", "Description[tr]": "Dil Ayarı, Sayı, Para Birimi ve Zaman Biçimleri", "Description[uk]": "Параметри мови, формати запису чисел, грошових сум та часу", "Description[x-test]": "xxLanguage Setting, Numeric, Currency and Time Formatsxx", @@ -28,6 +29,7 @@ "Name[nl]": "Regio & taal", "Name[pt]": "Região & Língua", "Name[sl]": "Regija in Jezik", + "Name[ta]": "மொழியும் மண்டலமும்", "Name[tr]": "Bölge ve Dil", "Name[uk]": "Регіон та мова", "Name[x-test]": "xxRegion & Languagexx" diff --git a/libcolorcorrect/kded/colorcorrectlocationupdater.json b/libcolorcorrect/kded/colorcorrectlocationupdater.json index a1b8e6c74..4e3160afa 100644 --- a/libcolorcorrect/kded/colorcorrectlocationupdater.json +++ b/libcolorcorrect/kded/colorcorrectlocationupdater.json @@ -75,6 +75,7 @@ "Name[sr@latin]": "Ažuriranje geografske lokacije za popravku boje", "Name[sr]": "Ажурирање географске локације за поправку боје", "Name[sv]": "Färgriktig uppdatering av geografisk plats", + "Name[ta]": "ColorCorrect புவியிருப்பிட புதுப்பிப்பி", "Name[tr]": "ColorCorrect Coğrafi Konum Güncelleyici", "Name[uk]": "Засіб оновлення географічного розташування для ColorCorrect", "Name[vi]": "Trình cập nhật định vị địa lí ColorCorrect", diff --git a/lookandfeel.dark/metadata.json b/lookandfeel.dark/metadata.json index 0cc227077..06d843cc1 100644 --- a/lookandfeel.dark/metadata.json +++ b/lookandfeel.dark/metadata.json @@ -114,6 +114,7 @@ "Name[sk]": "Vánok Tmavý", "Name[sl]": "Sapica temna", "Name[sv]": "Breeze mörk", + "Name[ta]": "கருப்பு பிரீஸ்", "Name[tg]": "Насими торик", "Name[tr]": "Esinti Koyu", "Name[uk]": "Темна Breeze", diff --git a/lookandfeel/metadata.json b/lookandfeel/metadata.json index 192f567dd..3f7d831ad 100644 --- a/lookandfeel/metadata.json +++ b/lookandfeel/metadata.json @@ -128,6 +128,7 @@ "Name[sr@latin]": "Povetarac", "Name[sr]": "Поветарац", "Name[sv]": "Breeze", + "Name[ta]": "பிரீஸ்", "Name[tg]": "Насим", "Name[tr]": "Esinti", "Name[uk]": "Breeze", diff --git a/sddm-theme/metadata.desktop b/sddm-theme/metadata.desktop index 589ee2256..49d5211f5 100644 --- a/sddm-theme/metadata.desktop +++ b/sddm-theme/metadata.desktop @@ -46,6 +46,7 @@ Name[sr@ijekavian]=Поветарац Name[sr@ijekavianlatin]=Povetarac Name[sr@latin]=Povetarac Name[sv]=Breeze +Name[ta]=பிரீஸ் Name[tg]=Насим Name[tr]=Esinti Name[uk]=Breeze @@ -90,6 +91,7 @@ Description[ru]=Breeze Description[sk]=Vánok Description[sl]=Sapica Description[sv]=Breeze +Description[ta]=பிரீஸ் Description[tg]=Насим Description[tr]=Esinti Description[uk]=Breeze