From 67ff3980fedde82c4c80bb4773a49113b84a27b4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 11 Jul 2022 01:49:30 +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" --- .../paste/plasma-containmentactions-paste.json | 2 +- kcms/cursortheme/kcm_cursortheme.json | 4 ++-- kcms/region_language/kcm_regionandlang.desktop | 4 ++++ kcms/region_language/kcm_regionandlang.json | 6 +++++- plasma-windowed/org.kde.plasmawindowed.desktop.cmake | 4 ++-- runners/windowedwidgets/plasma-runner-windowedwidgets.json | 2 +- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/containmentactions/paste/plasma-containmentactions-paste.json b/containmentactions/paste/plasma-containmentactions-paste.json index 983520da2..168cdd3b7 100644 --- a/containmentactions/paste/plasma-containmentactions-paste.json +++ b/containmentactions/paste/plasma-containmentactions-paste.json @@ -45,7 +45,7 @@ "Description": "Creates a widget from the contents of the clipboard", "Description[ar]": "أنشئ ودجة من محتويات الحافظة", "Description[az]": "Mübadilə buferinin tərkiblərindən vidjet yaradır", - "Description[bg]": "Създава приспособление от съдържанието на клипборда", + "Description[bg]": "Създава уиджет от съдържанието на клипборда", "Description[ca@valencia]": "Crea un giny a partir del contingut del porta-retalls", "Description[ca]": "Crea un giny a partir del contingut del porta-retalls", "Description[cs]": "Vytvoří widget z obsahu schránky", diff --git a/kcms/cursortheme/kcm_cursortheme.json b/kcms/cursortheme/kcm_cursortheme.json index 8c9194ca8..962864eea 100644 --- a/kcms/cursortheme/kcm_cursortheme.json +++ b/kcms/cursortheme/kcm_cursortheme.json @@ -37,7 +37,7 @@ "Description[vi]": "Chọn chủ đề của con trỏ chuột", "Description[x-test]": "xxChoose mouse cursor themexx", "Description[zh_CN]": "选择鼠标光标主题", - "Description[zh_TW]": "選擇滑鼠遊標主題", + "Description[zh_TW]": "選擇滑鼠游標主題", "Icon": "preferences-desktop-cursors", "Name": "Cursors", "Name[ar]": "المؤشرات", @@ -84,7 +84,7 @@ "Name[vi]": "Con trỏ", "Name[x-test]": "xxCursorsxx", "Name[zh_CN]": "光标", - "Name[zh_TW]": "遊標" + "Name[zh_TW]": "游標" }, "X-DocPath": "kcontrol/cursortheme/index.html", "X-KDE-Keywords": "Mouse,Cursor,Theme,Cursor Appearance,Cursor Color,Cursor Theme,Mouse Theme,Mouse Appearance,Mouse Skin,Pointer Colors,Pointer Appearance,cursor skin,cursor style,cursor size,mouse style,pointer,", diff --git a/kcms/region_language/kcm_regionandlang.desktop b/kcms/region_language/kcm_regionandlang.desktop index 8f02d174e..df046c6d1 100644 --- a/kcms/region_language/kcm_regionandlang.desktop +++ b/kcms/region_language/kcm_regionandlang.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=Region & Language Name[az]=Bölgə və Dil +Name[bg]=Език и регионални настройки Name[ca]=Regió i idioma Name[ca@valencia]=Regió i idioma Name[es]=Región e idioma @@ -12,8 +13,10 @@ Name[ta]=மொழியும் மண்டலமும் Name[tr]=Bölge ve Dil Name[uk]=Регіон та мова Name[x-test]=xxRegion & Languagexx +Name[zh_CN]=区域和语言 Comment=Set Language, Numeric, Currency and Time Formats Comment[az]=Dil, say, valyuta və tarix formatlarının təyin edilməsi +Comment[bg]=Задаване на езикови настройки, метрични единици, валута, дата и час 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 @@ -25,6 +28,7 @@ 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 +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 88767491c..f95f34c6e 100644 --- a/kcms/region_language/kcm_regionandlang.json +++ b/kcms/region_language/kcm_regionandlang.json @@ -2,6 +2,7 @@ "KPlugin": { "Description": "Language Setting, Numeric, Currency and Time Formats", "Description[az]": "Dil ayarları, say, valyuta və tarix formatları", + "Description[bg]": "Формат на езикови настройки, метрични единици, валута, дата и час", "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", @@ -13,6 +14,7 @@ "Description[tr]": "Dil Ayarı, Sayı, Para Birimi ve Zaman Biçimleri", "Description[uk]": "Параметри мови, формати запису чисел, грошових сум та часу", "Description[x-test]": "xxLanguage Setting, Numeric, Currency and Time Formatsxx", + "Description[zh_CN]": "语言设置、数字、货币和时间格式", "FormFactors": [ "tablet", "handset", @@ -22,6 +24,7 @@ "Id": "kcm_regionandlang", "Name": "Region & Language", "Name[az]": "Bölgə və Dil", + "Name[bg]": "Език и регионални настройки", "Name[ca@valencia]": "Regió i idioma", "Name[ca]": "Regió i idioma", "Name[es]": "Región e idioma", @@ -32,7 +35,8 @@ "Name[ta]": "மொழியும் மண்டலமும்", "Name[tr]": "Bölge ve Dil", "Name[uk]": "Регіон та мова", - "Name[x-test]": "xxRegion & Languagexx" + "Name[x-test]": "xxRegion & Languagexx", + "Name[zh_CN]": "区域和语言" }, "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", diff --git a/plasma-windowed/org.kde.plasmawindowed.desktop.cmake b/plasma-windowed/org.kde.plasmawindowed.desktop.cmake index 1328f10d5..fe68ba40f 100755 --- a/plasma-windowed/org.kde.plasmawindowed.desktop.cmake +++ b/plasma-windowed/org.kde.plasmawindowed.desktop.cmake @@ -2,7 +2,7 @@ Name=Plasma Windowed Name[ar]=بلازما المؤطرة Name[az]=Pəncərədə Plasma -Name[bg]=Plasma приспособления в самостоятелен прозорец +Name[bg]=Plasma уиджети в самостоятелен прозорец Name[bs]=Plazma uprozorena Name[ca]=Plasma amb finestres Name[ca@valencia]=Plasma amb finestres @@ -55,7 +55,7 @@ Name[zh_TW]=Plasma 視窗 Comment=Run Plasmoids as simple applications Comment[ar]=شغل بلازمويد كتطبيق بسيط Comment[az]=Plasma əlavəsini adi tətbiq kimi başlatmaq -Comment[bg]=Стартиране на приспособленията на Plasma като прости приложения +Comment[bg]=Стартиране на уиджетите на Plasma като прости приложения Comment[bs]=Pokreni plazmoide kao običnu aplikaciju Comment[ca]=Executa els plasmoides com a simples aplicacions Comment[ca@valencia]=Executa els plasmoides com a simples aplicacions diff --git a/runners/windowedwidgets/plasma-runner-windowedwidgets.json b/runners/windowedwidgets/plasma-runner-windowedwidgets.json index 790e6ed6f..a7e4740f1 100644 --- a/runners/windowedwidgets/plasma-runner-windowedwidgets.json +++ b/runners/windowedwidgets/plasma-runner-windowedwidgets.json @@ -46,7 +46,7 @@ "Description": "Find Plasma widgets that can be run as standalone windows", "Description[ar]": "اعثر على ودجات بلازما التي يمكن أن تعمل كنوافذ مستقلّة", "Description[az]": "Müstəqil pəncərə şəklində açıla bilən Plasma vidjetlərini tapmaq", - "Description[bg]": "Намира Plasma приспособления, които могат да се изпълняват в самостоятелен прозорец", + "Description[bg]": "Намира Plasma уиджети, които могат да се изпълняват в самостоятелен прозорец", "Description[ca@valencia]": "Busca ginys de Plasma que es poden executar en finestres autònomes", "Description[ca]": "Cerca ginys del Plasma que es poden executar en finestres autònomes", "Description[cs]": "Najít Plasma widgety, které mohou být spuštěny ve vlastních oknech",