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 107e5c235a
commit 7a085f6b0f
  1. 2
      applets/activitybar/metadata.json
  2. 4
      containmentactions/switchactivity/plasma-containmentactions-switchactivity.json
  3. 4
      containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.json
  4. 4
      dataengines/activities/plasma-dataengine-activities.json
  5. 16
      kcms/region_language/kcm_regionandlang.desktop
  6. 18
      kcms/region_language/kcm_regionandlang.json
  7. 4
      menu/desktop/kf5-utilities-desktop.directory
  8. 2
      runners/sessions/plasma-runner-sessions.json
  9. 2
      shell/org.kde.plasmashell.desktop.cmake

@ -46,7 +46,7 @@
"Category": "Windows and Tasks",
"Description": "Tab bar to switch activities",
"Description[ar]": "شريط ألسنة لتبديل الأنشطة",
"Description[az]": "İş Otaqlarına keçid üçün vərəq zolağı",
"Description[az]": "İş otaqlarına keçid üçün vərəq zolağı",
"Description[bg]": "Лента за превключване на дейности",
"Description[ca@valencia]": "Barra de pestanyes per a canviar d'activitat",
"Description[ca]": "Barra de pestanyes per a canviar d'activitat",

@ -44,7 +44,7 @@
],
"Description": "Switch to another activity",
"Description[ar]": "بدّل إلى نشاط آخر",
"Description[az]": "Başqa İş Otağına keçidi təmin edir",
"Description[az]": "Başqa İş otağına keçidi təmin edir",
"Description[bg]": "Превключване към друга дейност",
"Description[ca@valencia]": "Canvia a una altra activitat",
"Description[ca]": "Canvia a una altra activitat",
@ -85,7 +85,7 @@
"License": "GPL",
"Name": "Switch Activity",
"Name[ar]": "بدّل النشاط",
"Name[az]": "İş Otaqlarına keçid",
"Name[az]": "İş otaqlarına keçid",
"Name[bg]": "Превключване на дейност",
"Name[bs]": "Prebacivanje aktivnosti",
"Name[ca@valencia]": "Canvi d'activitat",

@ -44,7 +44,7 @@
],
"Description": "Switch to another virtual desktop",
"Description[ar]": "بدّل إلى سطح مكتب وهمي آخر",
"Description[az]": "Başqa İş Masasına keçidi təmin edir",
"Description[az]": "Başqa İş masasına keçidi təmin edir",
"Description[bg]": "Превключване към друг виртуален работен плот",
"Description[ca@valencia]": "Canvia a un altre escriptori virtual",
"Description[ca]": "Canvia a un altre escriptori virtual",
@ -85,7 +85,7 @@
"License": "GPL",
"Name": "Switch Desktop",
"Name[ar]": "بدّل سطح المكتب",
"Name[az]": "İş Masasına keçid",
"Name[az]": "İş masasına keçid",
"Name[bg]": "Превключване на работен плот",
"Name[bn]": "অনয ডকটপ",
"Name[bs]": "Prebacivanje površi",

@ -45,7 +45,7 @@
"Category": "",
"Description": "Information on Plasma Activities",
"Description[ar]": "معلومات أنشطة بلازما",
"Description[az]": "Plasma İş Otaqları məlumatları",
"Description[az]": "Plasma İş otaqları məlumatları",
"Description[bg]": "Информация за дейности в Plasma",
"Description[ca@valencia]": "Informació quant a activitats de Plasma",
"Description[ca]": "Informació quant a activitats del Plasma",
@ -87,7 +87,7 @@
"Name": "Activities Engine",
"Name[ar]": "محرّك الأنشطة",
"Name[ast]": "Motor d'actividaes",
"Name[az]": "İş Otağı üçün məlumat mənbəyi",
"Name[az]": "İş otağı üçün məlumat mənbəyi",
"Name[bg]": "Енджин за дейности",
"Name[bs]": "Motor aktivnosti",
"Name[ca@valencia]": "Motor d'activitats",

@ -1,6 +1,22 @@
[Desktop Entry]
Name=Region & Language
Name[az]=Bölgə və Dil
Name[ca]=Regió i idioma
Name[ca@valencia]=Regió i idioma
Name[es]=Región e idioma
Name[nl]=Regio & taal
Name[tr]=Bölge ve Dil
Name[uk]=Регіон та мова
Name[x-test]=xxRegion & Languagexx
Comment=Set Language, Numeric, Currency and Time Formats
Comment[az]=Dil, say, valyuta və tarix formatlarının təyin edilməsi
Comment[ca]=Defineix l'idioma i el format numèric, monetari i horari
Comment[ca@valencia]=Establix l'idioma i el format numèric, monetari i horari
Comment[es]=Definir el idioma y los formatos numérico, de moneda y de hora
Comment[nl]=Formaten bij taal, numerieke getallen, munteenheid en tijd instellen
Comment[tr]=Dil, Sayı, Para Birimi ve Zaman Biçimlerini Ayarla
Comment[uk]=Встановлення мови, форматів запису чисел, грошових сум та часу
Comment[x-test]=xxSet Language, Numeric, Currency and Time Formatsxx
Icon=preferences-desktop-locale
Type=Application

@ -1,6 +1,14 @@
{
"KPlugin": {
"Description": "Language Setting, Numeric, Currency and Time Formats",
"Description[az]": "Dil ayarları, say, valyuta və tarix formatları",
"Description[ca@valencia]": "Configuració de l'idioma i el format numèric, monetari i horari",
"Description[ca]": "Configuració de l'idioma i el format numèric, monetari i horari",
"Description[es]": "Preferencia de idiomas, formatos numérico, de moneda y de hora",
"Description[nl]": "Formaten voor taal, numerieke getallen, munteenheid en tijd",
"Description[tr]": "Dil Ayarı, Sayı, Para Birimi ve Zaman Biçimleri",
"Description[uk]": "Параметри мови, формати запису чисел, грошових сум та часу",
"Description[x-test]": "xxLanguage Setting, Numeric, Currency and Time Formatsxx",
"FormFactors": [
"tablet",
"handset",
@ -8,7 +16,15 @@
],
"Icon": "preferences-desktop-locale",
"Id": "kcm_regionandlang",
"Name": "Region & Language"
"Name": "Region & Language",
"Name[az]": "Bölgə və Dil",
"Name[ca@valencia]": "Regió i idioma",
"Name[ca]": "Regió i idioma",
"Name[es]": "Región e idioma",
"Name[nl]": "Regio & taal",
"Name[tr]": "Bölge ve Dil",
"Name[uk]": "Регіон та мова",
"Name[x-test]": "xxRegion & Languagexx"
},
"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",

@ -3,7 +3,7 @@ Type=Directory
Name=Desktop
Name[ar]=سطح المكتب
Name[ast]=Escritoriu
Name[az]=İş Masası
Name[az]=İş masası
Name[bg]=Работен плот
Name[bs]=Radna površina
Name[ca]=Escriptori
@ -64,7 +64,7 @@ Icon=user-desktop
Comment=Desktop
Comment[ar]=سطح المكتب
Comment[ast]=Escritoriu
Comment[az]=İş Masası
Comment[az]=İş masası
Comment[bg]=Работен плот
Comment[bs]=Radna površina
Comment[ca]=Escriptori

@ -86,7 +86,7 @@
"License": "LGPL",
"Name": "Desktop Sessions",
"Name[ar]": "جلسات سطح المكتب",
"Name[az]": "İş Masası sesiyaları",
"Name[az]": "İş masası sesiyaları",
"Name[be@latin]": "Sesii rabočaha stała",
"Name[bg]": "Сесии",
"Name[bn]": "ডকটপ সশন",

@ -3,7 +3,7 @@ Exec=@CMAKE_INSTALL_PREFIX@/bin/plasmashell
X-DBUS-StartupType=Unique
Name=Plasma Desktop Workspace
Name[ar]=مساحة عمل سطح مكتب بلازما
Name[az]=Plasma İş Masası Mühiti
Name[az]=Plasma İş masası Mühiti
Name[bg]=Работен плот на Plasma
Name[bs]=Radni prostor plazma radne površi
Name[ca]=Espai de treball de l'escriptori Plasma

Loading…
Cancel
Save