From d6d398bc89b410391ffa8d4bf24722fd7ab565b6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 8 Aug 2022 03:00:41 +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" --- applets/systemmonitor/coreusage/metadata.json | 2 +- applets/systemmonitor/cpu/metadata.json | 2 +- applets/systemmonitor/diskusage/metadata.json | 2 +- applets/systemmonitor/memory/metadata.json | 2 +- applets/systemmonitor/net/metadata.json | 2 +- components/shellprivate/widgetexplorer/plasmoids.knsrc | 2 +- containmentactions/paste/plasma-containmentactions-paste.json | 2 +- dataengines/weather/ions/envcan/ion-envcan.json | 1 + dataengines/weather/ions/noaa/ion-noaa.json | 1 + dataengines/weather/ions/wetter.com/ion-wettercom.json | 1 + runners/windowedwidgets/plasma-runner-windowedwidgets.json | 4 ++-- 11 files changed, 12 insertions(+), 9 deletions(-) diff --git a/applets/systemmonitor/coreusage/metadata.json b/applets/systemmonitor/coreusage/metadata.json index 01544430f..5b58f47c7 100644 --- a/applets/systemmonitor/coreusage/metadata.json +++ b/applets/systemmonitor/coreusage/metadata.json @@ -78,7 +78,7 @@ "Description[uk]": "Віджет нагляду за системою, який показує використання окремих ядер процесора", "Description[vi]": "Phụ kiện giám sát hệ thống cho biết lượng dùng các lõi CPU riêng lẻ", "Description[x-test]": "xxSystem monitor Widget that shows usage of individual CPU coresxx", - "Description[zh_CN]": "显示单个 CPU 核心使用情况的系统监视部件", + "Description[zh_CN]": "显示单个 CPU 核心使用情况的系统监视挂件", "EnabledByDefault": true, "FormFactors": [ "desktop" diff --git a/applets/systemmonitor/cpu/metadata.json b/applets/systemmonitor/cpu/metadata.json index 0de8e1cb0..338824ef5 100644 --- a/applets/systemmonitor/cpu/metadata.json +++ b/applets/systemmonitor/cpu/metadata.json @@ -78,7 +78,7 @@ "Description[uk]": "Віджет нагляду за системою, який показує загальне використання процесора", "Description[vi]": "Phụ kiện giám sát hệ thống cho biết tổng lượng dùng CPU", "Description[x-test]": "xxSystem monitor Widget that shows the total CPU usagexx", - "Description[zh_CN]": "显示总 CPU 使用情况的系统监视部件", + "Description[zh_CN]": "显示总 CPU 使用率的系统监视挂件", "EnabledByDefault": true, "FormFactors": [ "desktop" diff --git a/applets/systemmonitor/diskusage/metadata.json b/applets/systemmonitor/diskusage/metadata.json index ec06b6791..378c55329 100644 --- a/applets/systemmonitor/diskusage/metadata.json +++ b/applets/systemmonitor/diskusage/metadata.json @@ -78,7 +78,7 @@ "Description[uk]": "Віджет нагляду за системою, який показує використання кореневого розділу", "Description[vi]": "Phụ kiện giám sát hệ thống cho biết lượng dùng của phân vùng gốc", "Description[x-test]": "xxSystem monitor Widget that shows the usage of the root partitionxx", - "Description[zh_CN]": "显示根分区使用情况的系统监视部件", + "Description[zh_CN]": "显示根分区占用率的系统监视挂件", "EnabledByDefault": true, "FormFactors": [ "desktop" diff --git a/applets/systemmonitor/memory/metadata.json b/applets/systemmonitor/memory/metadata.json index 7e4b41656..c4013141c 100644 --- a/applets/systemmonitor/memory/metadata.json +++ b/applets/systemmonitor/memory/metadata.json @@ -77,7 +77,7 @@ "Description[uk]": "Віджет нагляду за системою, який показує використання фізичної пам'яті", "Description[vi]": "Phụ kiện giám sát hệ thống cho biết lượng dùng bộ nhớ vật lí", "Description[x-test]": "xxSystem monitor Widget that shows physical memory usagexx", - "Description[zh_CN]": "显示物理内存使用情况的系统监视部件", + "Description[zh_CN]": "显示物理内存使用率的系统监视挂件", "EnabledByDefault": true, "FormFactors": [ "desktop" diff --git a/applets/systemmonitor/net/metadata.json b/applets/systemmonitor/net/metadata.json index 80e1ec24d..a4ef6bcdd 100644 --- a/applets/systemmonitor/net/metadata.json +++ b/applets/systemmonitor/net/metadata.json @@ -78,7 +78,7 @@ "Description[uk]": "Віджет нагляду за системою, який показує швидкість отримання та вивантаження даних", "Description[vi]": "Phụ kiện giám sát hệ thống cho biết tốc độ tải dữ liệu về và lên", "Description[x-test]": "xxSystem monitor Widget that shows the download and upload data ratexx", - "Description[zh_CN]": "显示下载和上传速率的系统监视部件", + "Description[zh_CN]": "显示下载和上传速率的系统监视挂件", "EnabledByDefault": true, "FormFactors": [ "desktop" diff --git a/components/shellprivate/widgetexplorer/plasmoids.knsrc b/components/shellprivate/widgetexplorer/plasmoids.knsrc index 211b52d47..96afb583b 100644 --- a/components/shellprivate/widgetexplorer/plasmoids.knsrc +++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc @@ -49,7 +49,7 @@ Name[tr]=Plasma Araç Takımları Name[uk]=Віджети Плазми Name[vi]=Phụ kiện Plasma Name[x-test]=xxPlasma Widgetsxx -Name[zh_CN]=Plasma 小部件 +Name[zh_CN]=Plasma 挂件 Name[zh_TW]=Plasma 元件 Categories=Plasma 5 Plasmoid diff --git a/containmentactions/paste/plasma-containmentactions-paste.json b/containmentactions/paste/plasma-containmentactions-paste.json index 168cdd3b7..6fbfe732f 100644 --- a/containmentactions/paste/plasma-containmentactions-paste.json +++ b/containmentactions/paste/plasma-containmentactions-paste.json @@ -78,7 +78,7 @@ "Description[uk]": "Створює віджет з вмістом буфера обміну даними", "Description[vi]": "Tạo một phụ kiện từ nội dung của bảng nháp", "Description[x-test]": "xxCreates a widget from the contents of the clipboardxx", - "Description[zh_CN]": "用剪贴板内容创建小部件", + "Description[zh_CN]": "创建基于剪贴板内容的挂件", "EnabledByDefault": true, "Icon": "edit-paste", "Id": "org.kde.paste", diff --git a/dataengines/weather/ions/envcan/ion-envcan.json b/dataengines/weather/ions/envcan/ion-envcan.json index 4841ff00f..cf947bd25 100644 --- a/dataengines/weather/ions/envcan/ion-envcan.json +++ b/dataengines/weather/ions/envcan/ion-envcan.json @@ -101,6 +101,7 @@ "Name[sr@latin]": "Prirodna sredina Kanada", "Name[sr]": "Природна средина Канада", "Name[sv]": "Environment Canada", + "Name[ta]": "சுற்றுச்சூழல் கனடா", "Name[te]": "కెనడా వాతావరణం", "Name[th]": "Environment Canada", "Name[tr]": "Environment Canada", diff --git a/dataengines/weather/ions/noaa/ion-noaa.json b/dataengines/weather/ions/noaa/ion-noaa.json index 73b1f0b8e..4ab06eba6 100644 --- a/dataengines/weather/ions/noaa/ion-noaa.json +++ b/dataengines/weather/ions/noaa/ion-noaa.json @@ -100,6 +100,7 @@ "Name[sr@latin]": "NOAA‑ova nacionalna meteorološka služba", "Name[sr]": "НОАА‑ова национална метеоролошка служба", "Name[sv]": "NOAA:s nationella vädertjänst", + "Name[ta]": "NOAA-வின் தேசிய வானிலை சேவை", "Name[te]": "NOAA యొక్క జాతీయ వాతావరణ సేవ", "Name[th]": "บริการพยากรณ์อากาศสากล NOAA", "Name[tr]": "NOAA Ulusal Hava Durumu Servisi", diff --git a/dataengines/weather/ions/wetter.com/ion-wettercom.json b/dataengines/weather/ions/wetter.com/ion-wettercom.json index c640ee903..b1bebc63f 100644 --- a/dataengines/weather/ions/wetter.com/ion-wettercom.json +++ b/dataengines/weather/ions/wetter.com/ion-wettercom.json @@ -100,6 +100,7 @@ "Name[sr@latin]": "wetter.com", "Name[sr]": "wetter.com", "Name[sv]": "wetter.com", + "Name[ta]": "wetter.com", "Name[tg]": "wetter.com", "Name[th]": "wetter.com", "Name[tr]": "wetter.com", diff --git a/runners/windowedwidgets/plasma-runner-windowedwidgets.json b/runners/windowedwidgets/plasma-runner-windowedwidgets.json index 455ee9934..2368ad679 100644 --- a/runners/windowedwidgets/plasma-runner-windowedwidgets.json +++ b/runners/windowedwidgets/plasma-runner-windowedwidgets.json @@ -77,7 +77,7 @@ "Description[uk]": "Пошук віджетів Плазми, які можна запускати у окремих вікнах", "Description[vi]": "Tìm các phụ kiện Plasma có thể chạy được như các cửa sổ độc lập", "Description[x-test]": "xxFind Plasma widgets that can be run as standalone windowsxx", - "Description[zh_CN]": "查找可作为独立窗口运行的 Plasma 部件", + "Description[zh_CN]": "查找可作为独立窗口运行的 Plasma 挂件", "EnabledByDefault": true, "Icon": "plasma", "Id": "org.kde.windowedwidgets", @@ -147,7 +147,7 @@ "Name[vi]": "Phụ kiện được cửa sổ hoá", "Name[wa]": "Ahesses metous dins des fniesses", "Name[x-test]": "xxWindowed widgetsxx", - "Name[zh_CN]": "窗口化小部件", + "Name[zh_CN]": "窗口化挂件", "Name[zh_TW]": "視窗元件" } }