Commit 63dad0e8 authored by Script Kiddy's avatar Script Kiddy

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 7638683c
......@@ -27,6 +27,7 @@
"Description[sv]": "Sänd ut datorns underrättelser så att de kan visas på andra enheter.",
"Description[uk]": "Транслювати сповіщення з цього комп’ютера так, щоб їх було показано на інших пристроях.",
"Description[x-test]": "xxBroadcast this computer's notifications, so they can be shown on other devices.xx",
"Description[zh_TW]": "廣播這臺電腦的通知,這樣它們就可以在其他裝置上顯示。",
"EnabledByDefault": false,
"Icon": "preferences-desktop-notification",
"Id": "kdeconnect_sendnotifications",
......@@ -50,6 +51,7 @@
"Name[sv]": "Skicka underrättelser",
"Name[uk]": "Надіслати сповіщення",
"Name[x-test]": "xxSend notificationsxx",
"Name[zh_TW]": "傳送通知",
"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