Commit 75461181 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 77681fe1
......@@ -26,7 +26,7 @@
"Description[x-test]": "xxShow your phone battery next to your computer batteryxx",
"Description[zh_CN]": "在计算机电池旁显示手机电池",
"EnabledByDefault": true,
"Icon": "preferences-system-power-management",
"Icon": "preferences-system-power-management",
"Id": "kdeconnect_battery",
"License": "GPL",
"Name": "Battery monitor",
......
......@@ -26,7 +26,7 @@
"Description[x-test]": "xxUse your phone as a touchpad and keyboardxx",
"Description[zh_CN]": "用您的手机作为触摸板和键盘",
"EnabledByDefault": true,
"Icon": "edit-select",
"Icon": "edit-select",
"Id": "kdeconnect_mousepad",
"License": "GPL",
"Name": "Virtual input",
......
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