From 7b15f2f944abdf26a2bcc13165911a63974571ee Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 28 Mar 2021 06:49:27 +0200 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" --- .../connectivity-report/kdeconnect_connectivity_report.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/connectivity-report/kdeconnect_connectivity_report.json b/plugins/connectivity-report/kdeconnect_connectivity_report.json index 263a08aca..fc86ada11 100644 --- a/plugins/connectivity-report/kdeconnect_connectivity_report.json +++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json @@ -21,7 +21,8 @@ "Name[sv]": "David Shlemayev", "Name[tr]": "David Shlemayev", "Name[uk]": "Давид Шлемаєв", - "Name[x-test]": "xxDavid Shlemayevxx" + "Name[x-test]": "xxDavid Shlemayevxx", + "Name[zh_CN]": "David Shlemayev" } ], "Description": "Show your phone's network signal strength", @@ -43,6 +44,7 @@ "Description[tr]": "Telefonunuzun ağ sinyal gücünü gösterin", "Description[uk]": "Показ потужності сигналу мережі на вашому телефоні", "Description[x-test]": "xxShow your phone's network signal strengthxx", + "Description[zh_CN]": "显示您手机的网络信号强度", "EnabledByDefault": true, "Icon": "network-wireless", "Id": "kdeconnect_connectivity_report", @@ -67,6 +69,7 @@ "Name[tr]": "Bağlantı monitörü", "Name[uk]": "Монітор з'єднання", "Name[x-test]": "xxConnectivity monitorxx", + "Name[zh_CN]": "信号监视器", "ServiceTypes": [ "KdeConnect/Plugin" ],