From 6ee4f674e7e55cd7443c549345de566e1b65618a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 Jul 2022 01:58:14 +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" --- .../plasma-dataengine-packagekit.json | 2 +- .../region_language/kcm_regionandlang.desktop | 74 ----------------- kcms/region_language/kcm_regionandlang.json | 81 +------------------ 3 files changed, 2 insertions(+), 155 deletions(-) diff --git a/dataengines/packagekit/plasma-dataengine-packagekit.json b/dataengines/packagekit/plasma-dataengine-packagekit.json index bc250be8d..da150b051 100644 --- a/dataengines/packagekit/plasma-dataengine-packagekit.json +++ b/dataengines/packagekit/plasma-dataengine-packagekit.json @@ -47,7 +47,7 @@ "Description[ar]": "محرّك بيانات عُدّة الحزم", "Description[az]": "PackageKit verilənlər mənbəyi", "Description[bg]": "Енджин за данни на PackageKit", - "Description[ca@valencia]": "Motor de dades del PackageKit", + "Description[ca@valencia]": "Motor de dades de PackageKit", "Description[ca]": "Motor de dades del PackageKit", "Description[cs]": "Datový nástroj PackageKit", "Description[da]": "PackageKit datamotor", diff --git a/kcms/region_language/kcm_regionandlang.desktop b/kcms/region_language/kcm_regionandlang.desktop index b32a2c413..cfcc78e42 100644 --- a/kcms/region_language/kcm_regionandlang.desktop +++ b/kcms/region_language/kcm_regionandlang.desktop @@ -1,80 +1,6 @@ [Desktop Entry] Name=Region & Language -Name[ar]=التنسيقات -Name[az]=Formatlar -Name[ca]=Formats -Name[cs]=Formáty -Name[da]=Formater -Name[de]=Formate -Name[en_GB]=Formats -Name[es]=Formatos -Name[eu]=Formatuak -Name[fi]=Muotoilu -Name[fr]=Formats -Name[hi]=प्रारूप -Name[hsb]=Formaty -Name[hu]=Formátumok -Name[ia]=Formatos -Name[id]=Format -Name[it]=Formati -Name[ja]=形式 -Name[ko]=형식 -Name[lt]=Formatai -Name[ml]=ഫോർമാറ്റുകൾ -Name[nl]=Formaten -Name[nn]=Format -Name[pa]=ਫਾਰਮੈਟ -Name[pl]=Formaty -Name[pt]=Formatos -Name[pt_BR]=Formatos -Name[ro]=Formate -Name[ru]=Форматы -Name[sk]=Formáty -Name[sl]=Formati -Name[sv]=Format -Name[ta]=படிவங்கள் -Name[tr]=Biçimler -Name[uk]=Формати -Name[vi]=Dạng thức -Name[x-test]=xxFormatsxx -Name[zh_CN]=格式 Comment=Set Language, Numeric, Currency and Time Formats -Comment[ar]=تنسيقات الأرقام والعملات والوقت -Comment[az]=Say, Valyuta və Vaxt formatları -Comment[ca]=Format numèric, monetari i horari -Comment[cs]=Formáty čísel, měny a času -Comment[da]=Formater for tal, valuta og tid -Comment[de]=Formate für Zahlen, Währung und Zeitangaben -Comment[en_GB]=Numeric, Currency and Time Formats -Comment[es]=Formatos numérico, de moneda y de hora -Comment[eu]=Zenbakizko, diruzko eta denborazko formatuak -Comment[fi]=Lukujen, rahasummien ja ajanilmausten muotoilu -Comment[fr]=Format numérique, de monnaie et d'heure -Comment[hi]=संख्यात्मक, मुद्रा और समय प्रारूप -Comment[hsb]=Numeriske, pjenježne a časowe formaty -Comment[hu]=Numerikus,Pénznem- és időformátumok -Comment[ia]=Formatos numeric, de numerario e de tempore -Comment[it]=Formati numerici, delle valute e dell'orario -Comment[ko]=숫자, 통화, 시간 형식 -Comment[lt]=Skaitmenų, valiutos ir laiko formatai -Comment[ml]=സംഖ്യ, കറൻസി, സമയ ഫോർമാറ്റുകൾ -Comment[nl]=Indeling voor numerieke getallen, valuta en tijd -Comment[nn]=Format for tal, valuta og tid -Comment[pa]=ਅੰਕੀ, ਕਰੰਸੀ ਅਤੇ ਸਮੇਂ ਦੇ ਫਾਰਮੈਟ -Comment[pl]=Formaty liczb, waluty i czasu -Comment[pt]=Formatos Numéricos, Monetários e de Datas -Comment[pt_BR]=Formatos de data/hora, numérico e monetário -Comment[ro]=Formate numerice, valutare și orare -Comment[ru]=Форматы записи чисел, времени и денежных сумм -Comment[sk]=Numerické, mena a časové formáty -Comment[sl]=Številski, valuta in oblike časa -Comment[sv]=Numeriska format, valutaformat och tidsformat -Comment[ta]=எண்களும் பண மதிப்புகளும் நேரங்களும் எழுதப்படும் விதம் -Comment[tr]=Sayısal, Para Birimi ve Saat Biçimleri -Comment[uk]=Формати запису чисел, грошових сум та часу -Comment[vi]=Dạng thức số, tiền tệ và thời gian -Comment[x-test]=xxNumeric, Currency and Time Formatsxx -Comment[zh_CN]=数字、货币和时间格式 Icon=preferences-desktop-locale Type=Application diff --git a/kcms/region_language/kcm_regionandlang.json b/kcms/region_language/kcm_regionandlang.json index 862c911e9..d34ffab6d 100644 --- a/kcms/region_language/kcm_regionandlang.json +++ b/kcms/region_language/kcm_regionandlang.json @@ -1,43 +1,6 @@ { "KPlugin": { "Description": "Language Setting, Numeric, Currency and Time Formats", - "Description[ar]": "تنسيقات الأرقام والعملات والوقت ", - "Description[az]": "Say, Valyuta və Vaxt formatları", - "Description[bg]": "Формат на числа, валута и време", - "Description[ca@valencia]": "Format numèric, monetari i horari", - "Description[ca]": "Format numèric, monetari i horari", - "Description[cs]": "Formáty čísel, měny a času", - "Description[da]": "Formater for tal, valuta og tid", - "Description[de]": "Formate für Zahlen, Währung und Zeitangaben", - "Description[en_GB]": "Numeric, Currency and Time Formats", - "Description[es]": "Formatos numérico, de moneda y de hora", - "Description[eu]": "Zenbakizko, diruzko eta denborazko formatuak", - "Description[fi]": "Lukujen, rahasummien ja ajanilmausten muotoilu", - "Description[fr]": "Format numérique, de monnaie et d'heure", - "Description[hu]": "Numerikus, pénznem- és időformátumok", - "Description[ia]": "Formatos numeric, de numerario e de tempore", - "Description[id]": "Nomerik, Mata Uang dan Format Tanggal", - "Description[it]": "Formati numerici, delle valute e dell'orario", - "Description[ko]": "숫자, 통화, 시간 형식", - "Description[lt]": "Skaitmenų, valiutos ir laiko formatai", - "Description[nl]": "Indeling voor numerieke getallen, valuta en tijd", - "Description[nn]": "Format for tal, valuta og tid", - "Description[pa]": "ਅੰਕੀ, ਕਰੰਸੀ ਅਤੇ ਸਮੇਂ ਦੇ ਫਾਰਮੈਟ", - "Description[pl]": "Formaty liczb, waluty i czasu", - "Description[pt]": "Formatos Numéricos, Monetários e de Datas", - "Description[pt_BR]": "Formatos de data/hora, numérico e monetário", - "Description[ro]": "Formate numerice, valutare și orare", - "Description[ru]": "Форматы записи чисел, времени и денежных сумм", - "Description[sk]": "Numerické, mena a časové formáty", - "Description[sl]": "Oblika števil, valute in časa", - "Description[sv]": "Numeriska format, valutaformat och tidsformat", - "Description[ta]": "எண்களும், பண மதிப்புகளும், நேரங்களும் எழுதப்படும் விதம்", - "Description[tr]": "Sayısal, Para Birimi ve Zaman Biçimleri", - "Description[uk]": "Формати запису чисел, грошових сум та часу", - "Description[vi]": "Định dạng số, tiền tệ và thời gian", - "Description[x-test]": "xxNumeric, Currency and Time Formatsxx", - "Description[zh_CN]": "数字、货币和时间格式", - "Description[zh_TW]": "數值、貨幣與時間格式", "FormFactors": [ "tablet", "handset", @@ -45,49 +8,7 @@ ], "Icon": "preferences-desktop-locale", "Id": "kcm_regionandlang", - "Name": "Region & Language", - "Name[ar]": "التنسيقات", - "Name[az]": "Formatlar", - "Name[bg]": "Формати", - "Name[ca@valencia]": "Formats", - "Name[ca]": "Formats", - "Name[cs]": "Formáty", - "Name[da]": "Formater", - "Name[de]": "Formate", - "Name[en_GB]": "Formats", - "Name[es]": "Formatos", - "Name[eu]": "Formatuak", - "Name[fi]": "Muotoilu", - "Name[fr]": "Formats", - "Name[hi]": "प्रारूप ", - "Name[hsb]": "Formaty", - "Name[hu]": "Formátumok", - "Name[ia]": "Formatos", - "Name[id]": "Format", - "Name[it]": "Formati", - "Name[ja]": "形式", - "Name[ka]": "ფორმატები", - "Name[ko]": "형식", - "Name[lt]": "Formatai", - "Name[ml]": "ഫോർമാറ്റുകൾ", - "Name[nl]": "Formaten", - "Name[nn]": "Format", - "Name[pa]": "ਫਾਰਮੈਟ", - "Name[pl]": "Formaty", - "Name[pt]": "Formatos", - "Name[pt_BR]": "Formatos", - "Name[ro]": "Formate", - "Name[ru]": "Форматы", - "Name[sk]": "Formáty", - "Name[sl]": "Formati", - "Name[sv]": "Format", - "Name[ta]": "படிவங்கள்", - "Name[tr]": "Biçimler", - "Name[uk]": "Формати", - "Name[vi]": "Định dạng", - "Name[x-test]": "xxFormatsxx", - "Name[zh_CN]": "格式", - "Name[zh_TW]": "格式" + "Name": "Region & Language" }, "X-DocPath": "kcontrol/region_language/index.html", "X-KDE-Keywords": "language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,region,measurement units,collation,sorting,date format",