From 00661fb2e4f7cb857a6f1740b2c070a4a7036dda Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 7 Nov 2020 06:33:16 +0100 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" --- applets/systemmonitor/memory/metadata.desktop | 1 + dataengines/dict/plasma-dataengine-dict.desktop | 2 +- kcms/colors/editor/org.kde.kcolorschemeeditor.desktop | 1 + kcms/colors/kcm_colors.desktop | 1 + kcms/colors/package/metadata.desktop | 1 + kcms/cursortheme/kcm_cursortheme.desktop | 1 + kcms/cursortheme/package/metadata.desktop | 1 + kcms/cursortheme/xcursor/xcursor.knsrc | 1 + kcms/desktoptheme/kcm_desktoptheme.desktop | 1 + kcms/desktoptheme/package/metadata.desktop | 1 + kcms/desktoptheme/plasma-themes.knsrc | 1 + kcms/feedback/kcm_feedback.desktop | 2 +- kcms/icons/icons.knsrc | 1 + kcms/icons/kcm_icons.desktop | 1 + kcms/icons/package/metadata.desktop | 1 + kcms/kfontinst/apps/org.kde.kfontview.desktop | 1 + kcms/kfontinst/kcmfontinst/fontinst.desktop | 1 + kcms/lookandfeel/kcm_lookandfeel.desktop | 1 + kcms/lookandfeel/lookandfeel.knsrc | 1 + kcms/lookandfeel/package/metadata.desktop | 1 + runners/baloo/plasma-runner-baloosearch.desktop | 2 +- runners/recentdocuments/plasma-runner-recentdocuments.desktop | 1 + 22 files changed, 22 insertions(+), 3 deletions(-) diff --git a/applets/systemmonitor/memory/metadata.desktop b/applets/systemmonitor/memory/metadata.desktop index ccd873e51..9b64b778c 100644 --- a/applets/systemmonitor/memory/metadata.desktop +++ b/applets/systemmonitor/memory/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Memory Usage +Name[ast]=Usu de la memoria Name[az]=Yaddaş İstifadəsi Name[ca]=Ús de memòria Name[cs]=Spotřeba paměti diff --git a/dataengines/dict/plasma-dataengine-dict.desktop b/dataengines/dict/plasma-dataengine-dict.desktop index 70f76532a..d13b62ef7 100644 --- a/dataengines/dict/plasma-dataengine-dict.desktop +++ b/dataengines/dict/plasma-dataengine-dict.desktop @@ -82,7 +82,7 @@ Name[zh_TW]=字典 Comment=Look up word meanings Comment[af]=Slaan woordbetekenisse na Comment[ar]=ابحث عن معاني الكلمات -Comment[ast]=Gueta significaos de pallabres +Comment[ast]=Busca significaos de pallabres Comment[az]=Söz və tərcümələrin mənalarını göstərmək Comment[be@latin]=Pošuk značeńniaŭ słovaŭ Comment[bg]=Търсене значението на думи diff --git a/kcms/colors/editor/org.kde.kcolorschemeeditor.desktop b/kcms/colors/editor/org.kde.kcolorschemeeditor.desktop index 67ae853b7..9ca9fe1a9 100644 --- a/kcms/colors/editor/org.kde.kcolorschemeeditor.desktop +++ b/kcms/colors/editor/org.kde.kcolorschemeeditor.desktop @@ -31,6 +31,7 @@ GenericName[vi]=Trình biên tập quy hoạch màu GenericName[x-test]=xxColor scheme editorxx GenericName[zh_CN]=配色编辑器 Name=KColorSchemeEditor +Name[ast]=KColorSchemeEditor Name[az]=KColorSchemeEditor Name[ca]=KColorSchemeEditor Name[cs]=KColorSchemeEditor diff --git a/kcms/colors/kcm_colors.desktop b/kcms/colors/kcm_colors.desktop index b3125a988..004fa5187 100644 --- a/kcms/colors/kcm_colors.desktop +++ b/kcms/colors/kcm_colors.desktop @@ -11,6 +11,7 @@ X-KDE-System-Settings-Parent-Category=appearance X-KDE-Weight=40 Name=Colors +Name[ast]=Colores Name[az]=Rənglər Name[ca]=Colors Name[cs]=Barvy diff --git a/kcms/colors/package/metadata.desktop b/kcms/colors/package/metadata.desktop index 5d99cccd8..a87da23b4 100644 --- a/kcms/colors/package/metadata.desktop +++ b/kcms/colors/package/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Colors +Name[ast]=Colores Name[az]=Rənglər Name[ca]=Colors Name[cs]=Barvy diff --git a/kcms/cursortheme/kcm_cursortheme.desktop b/kcms/cursortheme/kcm_cursortheme.desktop index b4e4d6120..fc6fe5f1b 100644 --- a/kcms/cursortheme/kcm_cursortheme.desktop +++ b/kcms/cursortheme/kcm_cursortheme.desktop @@ -10,6 +10,7 @@ X-DocPath=kcontrol/cursortheme/index.html X-KDE-Weight=70 Name=Cursors +Name[ast]=Cursores Name[az]=Kursorlar Name[ca]=Cursors Name[cs]=Kurzory diff --git a/kcms/cursortheme/package/metadata.desktop b/kcms/cursortheme/package/metadata.desktop index 783e58bc6..3f20a8d81 100644 --- a/kcms/cursortheme/package/metadata.desktop +++ b/kcms/cursortheme/package/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Cursors +Name[ast]=Cursores Name[az]=Kursorlar Name[ca]=Cursors Name[cs]=Kurzory diff --git a/kcms/cursortheme/xcursor/xcursor.knsrc b/kcms/cursortheme/xcursor/xcursor.knsrc index 77e921595..eabe25b93 100644 --- a/kcms/cursortheme/xcursor/xcursor.knsrc +++ b/kcms/cursortheme/xcursor/xcursor.knsrc @@ -1,5 +1,6 @@ [KNewStuff3] Name=Cursors +Name[ast]=Cursores Name[az]=Kursorlar Name[ca]=Cursors Name[cs]=Kurzory diff --git a/kcms/desktoptheme/kcm_desktoptheme.desktop b/kcms/desktoptheme/kcm_desktoptheme.desktop index c57982a76..c97a36024 100644 --- a/kcms/desktoptheme/kcm_desktoptheme.desktop +++ b/kcms/desktoptheme/kcm_desktoptheme.desktop @@ -10,6 +10,7 @@ X-KDE-Weight=20 X-DocPath=kcontrol/desktopthemedetails/index.html Name=Plasma Style +Name[ast]=Estilu de Plasma Name[az]=Plasma Üslubu Name[ca]=Estil del Plasma Name[cs]=Styl Plasma diff --git a/kcms/desktoptheme/package/metadata.desktop b/kcms/desktoptheme/package/metadata.desktop index b2686967a..1eaa70745 100644 --- a/kcms/desktoptheme/package/metadata.desktop +++ b/kcms/desktoptheme/package/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Plasma Style +Name[ast]=Estilu de Plasma Name[az]=Plasma Üslubu Name[ca]=Estil del Plasma Name[cs]=Styl Plasma diff --git a/kcms/desktoptheme/plasma-themes.knsrc b/kcms/desktoptheme/plasma-themes.knsrc index be6a39535..f43c0433b 100644 --- a/kcms/desktoptheme/plasma-themes.knsrc +++ b/kcms/desktoptheme/plasma-themes.knsrc @@ -1,5 +1,6 @@ [KNewStuff3] Name=Plasma Styles +Name[ast]=Estilos de Plasma Name[az]=Plasma Üslubu Name[ca]=Estils del Plasma Name[cs]=Styly Plasma diff --git a/kcms/feedback/kcm_feedback.desktop b/kcms/feedback/kcm_feedback.desktop index 2d8ecb51f..477d61ec1 100644 --- a/kcms/feedback/kcm_feedback.desktop +++ b/kcms/feedback/kcm_feedback.desktop @@ -43,7 +43,7 @@ Name[sl]=Uporabnikov odziv Name[sv]=Användaråterkoppling Name[tg]=Изҳори назари корбар Name[uk]=Відгуки користувача -Name[vi]=Phản hồi của Người dùng +Name[vi]=Phản hồi của người dùng Name[x-test]=xxUser Feedbackxx Name[zh_CN]=用户反馈 Name[zh_TW]=使用者意見回應 diff --git a/kcms/icons/icons.knsrc b/kcms/icons/icons.knsrc index 82602b801..c8bd512de 100644 --- a/kcms/icons/icons.knsrc +++ b/kcms/icons/icons.knsrc @@ -1,5 +1,6 @@ [KNewStuff3] Name=Icons +Name[ast]=Iconos Name[az]=Nişanlar Name[ca]=Icones Name[cs]=Ikony diff --git a/kcms/icons/kcm_icons.desktop b/kcms/icons/kcm_icons.desktop index 50d00558d..e635e5e75 100644 --- a/kcms/icons/kcm_icons.desktop +++ b/kcms/icons/kcm_icons.desktop @@ -11,6 +11,7 @@ X-KDE-System-Settings-Parent-Category=appearance X-KDE-Weight=60 Name=Icons +Name[ast]=Iconos Name[az]=Nişanlar Name[ca]=Icones Name[cs]=Ikony diff --git a/kcms/icons/package/metadata.desktop b/kcms/icons/package/metadata.desktop index a7d487095..2cbdb612e 100644 --- a/kcms/icons/package/metadata.desktop +++ b/kcms/icons/package/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Icons +Name[ast]=Iconos Name[az]=Nişanlar Name[ca]=Icones Name[cs]=Ikony diff --git a/kcms/kfontinst/apps/org.kde.kfontview.desktop b/kcms/kfontinst/apps/org.kde.kfontview.desktop index 86b419d39..b91f5c4e9 100755 --- a/kcms/kfontinst/apps/org.kde.kfontview.desktop +++ b/kcms/kfontinst/apps/org.kde.kfontview.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=KFontView +Name[ast]=KFontView Name[az]=KFontView Name[ca]=KFontView Name[cs]=Prohlížeč písem diff --git a/kcms/kfontinst/kcmfontinst/fontinst.desktop b/kcms/kfontinst/kcmfontinst/fontinst.desktop index c48f08312..f7a18665d 100644 --- a/kcms/kfontinst/kcmfontinst/fontinst.desktop +++ b/kcms/kfontinst/kcmfontinst/fontinst.desktop @@ -11,6 +11,7 @@ Categories=Qt;KDE;X-KDE-settings-system; X-KDE-System-Settings-Parent-Category=font Name=Font Management +Name[ast]=Xestión de fontes Name[az]=Şrift İdarəeetməsi Name[ca]=Gestió dels tipus de lletra Name[cs]=Správa písem diff --git a/kcms/lookandfeel/kcm_lookandfeel.desktop b/kcms/lookandfeel/kcm_lookandfeel.desktop index f663f95a8..aba91db9b 100644 --- a/kcms/lookandfeel/kcm_lookandfeel.desktop +++ b/kcms/lookandfeel/kcm_lookandfeel.desktop @@ -11,6 +11,7 @@ X-KDE-System-Settings-Parent-Category=appearance X-KDE-Weight=1 Name=Global Theme +Name[ast]=Estilu global Name[az]=Qlobal Plasma Görünüşü Name[ca]=Tema global Name[cs]=Celkový motiv diff --git a/kcms/lookandfeel/lookandfeel.knsrc b/kcms/lookandfeel/lookandfeel.knsrc index 772b0d288..1e7d5ea36 100644 --- a/kcms/lookandfeel/lookandfeel.knsrc +++ b/kcms/lookandfeel/lookandfeel.knsrc @@ -1,5 +1,6 @@ [KNewStuff3] Name=Global Themes +Name[ast]=Estilos globales Name[az]=Qlobal Plasma Mövzuları Name[ca]=Temes globals Name[cs]=Celkové motivy diff --git a/kcms/lookandfeel/package/metadata.desktop b/kcms/lookandfeel/package/metadata.desktop index 1821c418f..70d3b7ffe 100644 --- a/kcms/lookandfeel/package/metadata.desktop +++ b/kcms/lookandfeel/package/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Global Theme +Name[ast]=Estilu global Name[az]=Qlobal Plasma Görünüşü Name[ca]=Tema global Name[cs]=Celkový motiv diff --git a/runners/baloo/plasma-runner-baloosearch.desktop b/runners/baloo/plasma-runner-baloosearch.desktop index e1c66a585..348dda9dc 100644 --- a/runners/baloo/plasma-runner-baloosearch.desktop +++ b/runners/baloo/plasma-runner-baloosearch.desktop @@ -51,7 +51,7 @@ Name[x-test]=xxDesktop Searchxx Name[zh_CN]=桌面搜索 Name[zh_TW]=桌面搜尋 Comment=Searches through files, emails and contacts -Comment[ast]=Gueta pente ficheros, correos y contautos +Comment[ast]=Busca pente ficheros, correos y contautos Comment[az]=Fayllar, e-poçtlar və tərkiblər arası axtarış edir Comment[ca]=Cerca pels fitxers, correus electrònics i contactes Comment[ca@valencia]=Busca pels fitxers, correus electrònics i contactes diff --git a/runners/recentdocuments/plasma-runner-recentdocuments.desktop b/runners/recentdocuments/plasma-runner-recentdocuments.desktop index 94dd082cf..95444d98e 100644 --- a/runners/recentdocuments/plasma-runner-recentdocuments.desktop +++ b/runners/recentdocuments/plasma-runner-recentdocuments.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Recent Files +Name[ast]=Ficheros d'apocayá Name[az]=Sonuncu fayllar Name[ca]=Fitxers recents Name[cs]=Nedávné soubory