From 920cc2a4dc2c7fd2be885665e33ece65badf268c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 22 Jan 2023 01:59:52 +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" --- kcm/kcm_kdeconnect.json | 4 +++- plugins/contacts/kdeconnect_contacts.json | 1 + plugins/findmyphone/kdeconnect_findmyphone.json | 2 +- plugins/findthisdevice/kdeconnect_findthisdevice.json | 2 +- plugins/mmtelephony/kdeconnect_mmtelephony.json | 4 +++- plugins/remotecommands/kdeconnect_remotecommands.json | 2 +- plugins/systemvolume/kdeconnect_systemvolume.json | 2 +- plugins/virtualmonitor/kdeconnect_virtualmonitor.json | 5 ++++- 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/kcm/kcm_kdeconnect.json b/kcm/kcm_kdeconnect.json index 8152ac808..d3a22363f 100644 --- a/kcm/kcm_kdeconnect.json +++ b/kcm/kcm_kdeconnect.json @@ -23,6 +23,7 @@ "Description[tr]": "Aygıtlarını bağla ve eşzamanla", "Description[uk]": "З'єднання і синхронізація ваших пристроїв", "Description[x-test]": "xxConnect and sync your devicesxx", + "Description[zh_TW]": "與您的裝置連線並同步", "Icon": "preferences-kde-connect", "Name": "KDE Connect", "Name[ar]": "كدي المتّصل", @@ -45,7 +46,8 @@ "Name[sl]": "KDE Connect", "Name[tr]": "KDE Connect", "Name[uk]": "KDE Connect", - "Name[x-test]": "xxKDE Connectxx" + "Name[x-test]": "xxKDE Connectxx", + "Name[zh_TW]": "KDE 連線" }, "X-DocPath": "kdeconnect/index.html", "X-KDE-Keywords": "network,kde connect,connect,phone,sync,mobile,android,ios,send files,share files,transfer files,receive files,devices,device,synchronization,calls,telephone,smartphone,contacts,sms,phone notifications,control volume,system volume,ringtone,play sound,presentation,take picture,take photo,shared clipboard,conectivity monitor,remote input,remote mouse,remote keyboard,mpris,phone integration,commands,lock device,multimedia control,sftp,browse phone,share", diff --git a/plugins/contacts/kdeconnect_contacts.json b/plugins/contacts/kdeconnect_contacts.json index df52d9a78..985a044fc 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -79,6 +79,7 @@ "Description[uk]": "Синхронізація контактів зі з'єднаного пристрою на комп'ютер", "Description[x-test]": "xxSynchronize Contacts from the Connected Device to the Desktopxx", "Description[zh_CN]": "同步已连接设备的联系人到桌面", + "Description[zh_TW]": "將聯絡人從連線裝置同步至桌面", "EnabledByDefault": true, "Icon": "tag-people", "Id": "kdeconnect_contacts", diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json index 6f618b9c5..b89b7039a 100644 --- a/plugins/findmyphone/kdeconnect_findmyphone.json +++ b/plugins/findmyphone/kdeconnect_findmyphone.json @@ -142,7 +142,7 @@ "Description[uk]": "Знайти загублений телефон, наказавши йому відтворити дзвінок", "Description[x-test]": "xxFind your lost phone by making it play an alarm soundxx", "Description[zh_CN]": "通过播放闹铃声来找到您不见的手机", - "Description[zh_TW]": "讓您的手機發出警報聲，讓您找到您遺失的手機。", + "Description[zh_TW]": "讓您的手機發出警報聲，讓您找到您遺失的手機", "EnabledByDefault": true, "Icon": "edit-find", "Id": "kdeconnect_findmyphone", diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice.json b/plugins/findthisdevice/kdeconnect_findthisdevice.json index 5d6f67418..e6fcda088 100644 --- a/plugins/findthisdevice/kdeconnect_findthisdevice.json +++ b/plugins/findthisdevice/kdeconnect_findthisdevice.json @@ -86,7 +86,7 @@ "Description[uk]": "Знайти цей пристрій, наказавши йому відтворити дзвінок", "Description[x-test]": "xxFind this device by making it play an alarm soundxx", "Description[zh_CN]": "通过播放铃声来找到您不见的手机", - "Description[zh_TW]": "讓手機發出警報聲，以讓您找到這個裝置。", + "Description[zh_TW]": "讓手機發出警報聲，以讓您找到這個裝置", "EnabledByDefault": true, "Icon": "edit-find", "Id": "kdeconnect_findthisdevice", diff --git a/plugins/mmtelephony/kdeconnect_mmtelephony.json b/plugins/mmtelephony/kdeconnect_mmtelephony.json index 4886ecba9..6c7351fc5 100644 --- a/plugins/mmtelephony/kdeconnect_mmtelephony.json +++ b/plugins/mmtelephony/kdeconnect_mmtelephony.json @@ -24,7 +24,8 @@ "Name[sl]": "Yoram Bar-Haim", "Name[tr]": "Yoram Bar-Haim", "Name[uk]": "Йорам Бар-Хаїм", - "Name[x-test]": "xxYoram Bar-Haimxx" + "Name[x-test]": "xxYoram Bar-Haimxx", + "Name[zh_TW]": "Yoram Bar-Haim" } ], "Description": "Show notifications for incoming calls", @@ -93,6 +94,7 @@ "Name[tr]": "ModemManager Telefon tümleştirmesi", "Name[uk]": "Інтеграція телефонії ModemManager", "Name[x-test]": "xxModemManager Telephony integrationxx", + "Name[zh_TW]": "ModemManager 電話整合", "ServiceTypes": [ "KdeConnect/Plugin" ], diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json index 3bb0eb975..bf3bd40c3 100644 --- a/plugins/remotecommands/kdeconnect_remotecommands.json +++ b/plugins/remotecommands/kdeconnect_remotecommands.json @@ -93,7 +93,7 @@ "Description[uk]": "Запуск команд, попередньо визначених на віддаленому пристрої", "Description[x-test]": "xxTrigger commands predefined on the remote devicexx", "Description[zh_CN]": "出发远程设备的预设命令", - "Description[zh_TW]": "預先設定在遠端裝置上的執行命令", + "Description[zh_TW]": "執行預先設定在遠端裝置上的命令", "EnabledByDefault": true, "Icon": "system-run", "Id": "kdeconnect_remotecommands", diff --git a/plugins/systemvolume/kdeconnect_systemvolume.json b/plugins/systemvolume/kdeconnect_systemvolume.json index 522e122ac..86935869a 100644 --- a/plugins/systemvolume/kdeconnect_systemvolume.json +++ b/plugins/systemvolume/kdeconnect_systemvolume.json @@ -86,7 +86,7 @@ "Description[uk]": "Керування системним томом з вашого телефону", "Description[x-test]": "xxControl the system volume from your phonexx", "Description[zh_CN]": "用手机控制电脑音量", - "Description[zh_TW]": "控制手機的系統音量", + "Description[zh_TW]": "從手機控制系統音量", "EnabledByDefault": true, "Icon": "audio-volume-high", "Id": "kdeconnect_systemvolume", diff --git a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json index 94d70423c..97bfeb700 100644 --- a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json +++ b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json @@ -37,7 +37,8 @@ "Name[tr]": "Aleix Pol i Gonzalez", "Name[uk]": "Aleix Pol i Gonzalez", "Name[x-test]": "xxAleix Pol i Gonzalezxx", - "Name[zh_CN]": "Aleix Pol i Gonzalez" + "Name[zh_CN]": "Aleix Pol i Gonzalez", + "Name[zh_TW]": "Aleix Pol i Gonzalez" } ], "Description": "Use your devices as virtual monitors", @@ -74,6 +75,7 @@ "Description[uk]": "Використання ваших пристроїв як віртуальних моніторів", "Description[x-test]": "xxUse your devices as virtual monitorsxx", "Description[zh_CN]": "使用您的设备作为虚拟显示器", + "Description[zh_TW]": "將您的裝置作為虛擬螢幕使用", "EnabledByDefault": true, "Icon": "video-monitor", "Id": "kdeconnect_virtualmonitor", @@ -112,6 +114,7 @@ "Name[uk]": "Віртуальний монітор", "Name[x-test]": "xxVirtual Monitorxx", "Name[zh_CN]": "虚拟显示器", + "Name[zh_TW]": "虛擬螢幕", "ServiceTypes": [ "KdeConnect/Plugin" ],