From 0bda495e7cf2ab10901569aeda84c4083497e223 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 8 Feb 2025 01:27:47 +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" --- kcms/cellularnetwork/kcm_cellular_network.json | 1 + kcms/info/kcm_mobile_info.json | 1 + kcms/mobileshell/kcm_mobileshell.json | 1 + kcms/powermanagement/kcm_mobile_power.json | 1 + kcms/time/kcm_mobile_time.json | 1 + kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json | 1 + kcms/wifi/kcm_mobile_wifi.json | 1 + 7 files changed, 7 insertions(+) diff --git a/kcms/cellularnetwork/kcm_cellular_network.json b/kcms/cellularnetwork/kcm_cellular_network.json index 48fbfe0b..7433cd4d 100644 --- a/kcms/cellularnetwork/kcm_cellular_network.json +++ b/kcms/cellularnetwork/kcm_cellular_network.json @@ -108,6 +108,7 @@ "X-KDE-Keywords[uk]": "mobile,data,network,мобільний,дані,мережа", "X-KDE-Keywords[x-test]": "xxmobilexx,xxdataxx,xxnetworkxx", "X-KDE-Keywords[zh_CN]": "mobile,data,network,yidong,shuju,wangluo,fengwo,shouji,liuliang,移动,数据,流量,网络,蜂窝,手机", + "X-KDE-Keywords[zh_TW]": "行動,資料,網路", "X-KDE-System-Settings-Parent-Category": "network", "X-KDE-Weight": 70 } diff --git a/kcms/info/kcm_mobile_info.json b/kcms/info/kcm_mobile_info.json index f372226a..9d36c2e1 100644 --- a/kcms/info/kcm_mobile_info.json +++ b/kcms/info/kcm_mobile_info.json @@ -110,5 +110,6 @@ "X-KDE-Keywords[uk]": "info, distro, system, інфо, відомості, дистрибутив, система", "X-KDE-Keywords[x-test]": "xxinfoxx,xx distroxx,xx systemxx", "X-KDE-Keywords[zh_CN]": "info, distro, system, xinxi, faxingban, xitong, 信息, 发行版, 系统", + "X-KDE-Keywords[zh_TW]": "資訊,系統,發行版", "X-KDE-System-Settings-Parent-Category": "system-administration" } diff --git a/kcms/mobileshell/kcm_mobileshell.json b/kcms/mobileshell/kcm_mobileshell.json index 82bebf20..9136b7ed 100644 --- a/kcms/mobileshell/kcm_mobileshell.json +++ b/kcms/mobileshell/kcm_mobileshell.json @@ -166,5 +166,6 @@ "X-KDE-Keywords[uk]": "system,shell,panel,система,оболонка,панель", "X-KDE-Keywords[x-test]": "xxsystemxx,xxshellxx,xxpanelxx", "X-KDE-Keywords[zh_CN]": "system,shell,panel,xitong,waike,mianban,系统,外壳,系统外壳,外壳程序,系统外壳程序,面板,", + "X-KDE-Keywords[zh_TW]": "系統,殼,啟動器,面板", "X-KDE-System-Settings-Parent-Category": "personalization" } diff --git a/kcms/powermanagement/kcm_mobile_power.json b/kcms/powermanagement/kcm_mobile_power.json index 4e48e187..1db69ec7 100644 --- a/kcms/powermanagement/kcm_mobile_power.json +++ b/kcms/powermanagement/kcm_mobile_power.json @@ -108,6 +108,7 @@ "X-KDE-Keywords[uk]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver, відео, монітор, графіка, час очікування, присипляння, блокування, збереження, екран", "X-KDE-Keywords[x-test]": "xxvideoxx,xx monitorxx,xx graphicsxx,xx timeoutxx,xx sleepxx,xx lockxx,xx screenlockerxx,xx screensaverxx", "X-KDE-Keywords[zh_CN]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver, shipin, xianshiqi, jianshiqi, tuxing, tuxiang, chaoshi, shuimian, suoping, pingmubaohu, pingmusuoding, pingbao, suoding, 视频, 显示器, 监视器, 图形, 图像, 超时, 睡眠, 锁屏, 屏幕保护, 屏幕锁定, 屏保, 锁定", + "X-KDE-Keywords[zh_TW]": "影片,螢幕,圖形,逾時,睡眠,鎖定,螢幕鎖定,螢幕保護", "X-KDE-System-Settings-Parent-Category": "system-administration", "X-KDE-Weight": 20 } diff --git a/kcms/time/kcm_mobile_time.json b/kcms/time/kcm_mobile_time.json index bda46d67..25221053 100644 --- a/kcms/time/kcm_mobile_time.json +++ b/kcms/time/kcm_mobile_time.json @@ -110,6 +110,7 @@ "X-KDE-Keywords[uk]": "theme,look,feel,тема,вигляд,поведінка", "X-KDE-Keywords[x-test]": "xxthemexx,xx lookxx,xx feelxx", "X-KDE-Keywords[zh_CN]": "theme, look, feel, zhuti, waiguan, shijuexiaoguo, xianshixiaoguo, yangshi, 主题, 外观, 视觉效果, 显示效果, 样式", + "X-KDE-Keywords[zh_TW]": "主題,外觀,感覺", "X-KDE-System-Settings-Parent-Category": "regionalsettings", "X-KDE-Weight": 70 } diff --git a/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json b/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json index f97d07b5..9077cde6 100644 --- a/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json +++ b/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json @@ -150,5 +150,6 @@ "X-KDE-Keywords[uk]": "onscreen,osk,virtualkeyboard,keyboard,екранна,екран,клавіатура", "X-KDE-Keywords[x-test]": "xxonscreenxx,xxoskxx,xxvirtualkeyboardxx,xxkeyboardxx", "X-KDE-Keywords[zh_CN]": "onscreen,osk,virtualkeyboard,keyboard,pingmujianpan,pingmujianpan,pingshangjianpan,xunijianpan,jianpan,屏幕键盘,屏幕显示,屏上键盘,虚拟键盘,键盘", + "X-KDE-Keywords[zh_TW]": "螢幕上,虛擬鍵盤,小鍵盤", "X-KDE-System-Settings-Parent-Category": "input-devices" } diff --git a/kcms/wifi/kcm_mobile_wifi.json b/kcms/wifi/kcm_mobile_wifi.json index 5c6f0e7b..fe4ec387 100644 --- a/kcms/wifi/kcm_mobile_wifi.json +++ b/kcms/wifi/kcm_mobile_wifi.json @@ -114,6 +114,7 @@ "X-KDE-Keywords[uk]": "wifi,network,вайфай,мережа", "X-KDE-Keywords[x-test]": "xxwifixx,xxnetworkxx", "X-KDE-Keywords[zh_CN]": "wifi,network,wangluo,wuxian,网络,无线", + "X-KDE-Keywords[zh_TW]": "網路,無線網路", "X-KDE-System-Settings-Parent-Category": "network", "X-KDE-Weight": 70 }