Commit 250eebd0 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 dda59018
Pipeline #30494 skipped
......@@ -51,6 +51,7 @@
"Description[sv]": "Insticksprogram för storskärm",
"Description[uk]": "Додаток для великих екранів",
"Description[x-test]": "xxBigscreen Pluginxx",
"Description[zh_CN]": "大屏幕插件",
"EnabledByDefault": true,
"Icon": "tvtrusted",
"Id": "kdeconnect_bigscreen",
......@@ -78,6 +79,7 @@
"Name[sv]": "Storskärm",
"Name[uk]": "Великий екран",
"Name[x-test]": "xxBigscreenxx",
"Name[zh_CN]": "大屏幕",
"ServiceTypes": [
......@@ -21,6 +21,7 @@ Name[sl]=Upravitelj naslovov KDE Connect
Name[sv]=KDE-anslut webbadresshanterare
Name[uk]=Обробник адрес KDE Connect
Name[x-test]=xxKDE Connect URL Handlerxx
Name[zh_CN]=KDE Connect URL 处理程序
Exec=kdeconnect-handler %U
Supports Markdown
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