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"
wilder-5.26
l10n daemon script 4 years ago
parent 134e2d5c98
commit 6ee4f674e7
  1. 2
      dataengines/packagekit/plasma-dataengine-packagekit.json
  2. 74
      kcms/region_language/kcm_regionandlang.desktop
  3. 81
      kcms/region_language/kcm_regionandlang.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",

@ -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

@ -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",

Loading…
Cancel
Save