tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2021-03-28 06:49:27 +02:00
parent fec583a198
commit 7b15f2f944
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/connectivity-report/kdeconnect_connectivity_report.json
View file

@ -21,7 +21,8 @@
"Name[sv]": "David Shlemayev", "Name[sv]": "David Shlemayev",
"Name[tr]": "David Shlemayev", "Name[tr]": "David Shlemayev",
"Name[uk]": "Давид Шлемаєв", "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", "Description": "Show your phone's network signal strength",
@ -43,6 +44,7 @@
"Description[tr]": "Telefonunuzun ağ sinyal gücünü gösterin", "Description[tr]": "Telefonunuzun ağ sinyal gücünü gösterin",
"Description[uk]": "Показ потужності сигналу мережі на вашому телефоні", "Description[uk]": "Показ потужності сигналу мережі на вашому телефоні",
"Description[x-test]": "xxShow your phone's network signal strengthxx", "Description[x-test]": "xxShow your phone's network signal strengthxx",
"Description[zh_CN]": "显示您手机的网络信号强度",
"EnabledByDefault": true, "EnabledByDefault": true,
"Icon": "network-wireless", "Icon": "network-wireless",
"Id": "kdeconnect_connectivity_report", "Id": "kdeconnect_connectivity_report",
@ -67,6 +69,7 @@
"Name[tr]": "Bağlantı monitörü", "Name[tr]": "Bağlantı monitörü",
"Name[uk]": "Монітор з'єднання", "Name[uk]": "Монітор з'єднання",
"Name[x-test]": "xxConnectivity monitorxx", "Name[x-test]": "xxConnectivity monitorxx",
"Name[zh_CN]": "信号监视器",
"ServiceTypes": [ "ServiceTypes": [
"KdeConnect/Plugin" "KdeConnect/Plugin"
], ],