Commit 7b15f2f9 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent fec583a1
Pipeline #55754 skipped
......@@ -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"
],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment