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 2020-08-13 09:27:39 +02:00
parent 76fefacc8d
commit 15d85987fd
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/bigscreen/kdeconnect_bigscreen.json
View file

@ -51,6 +51,7 @@
"Description[sv]": "Insticksprogram för storskärm", "Description[sv]": "Insticksprogram för storskärm",
"Description[uk]": "Додаток для великих екранів", "Description[uk]": "Додаток для великих екранів",
"Description[x-test]": "xxBigscreen Pluginxx", "Description[x-test]": "xxBigscreen Pluginxx",
"Description[zh_CN]": "大屏幕插件",
"EnabledByDefault": true, "EnabledByDefault": true,
"Icon": "tvtrusted", "Icon": "tvtrusted",
"Id": "kdeconnect_bigscreen", "Id": "kdeconnect_bigscreen",
@ -78,6 +79,7 @@
"Name[sv]": "Storskärm", "Name[sv]": "Storskärm",
"Name[uk]": "Великий екран", "Name[uk]": "Великий екран",
"Name[x-test]": "xxBigscreenxx", "Name[x-test]": "xxBigscreenxx",
"Name[zh_CN]": "大屏幕",
"ServiceTypes": [ "ServiceTypes": [
"KdeConnect/Plugin" "KdeConnect/Plugin"
], ],

1
urlhandler/org.kde.kdeconnect.handler.desktop
View file

@ -17,6 +17,7 @@ Name[pt_BR]=Tratamento de URLs do KDE Connect
Name[sv]=KDE-anslut webbadresshanterare Name[sv]=KDE-anslut webbadresshanterare
Name[uk]=Обробник адрес KDE Connect Name[uk]=Обробник адрес KDE Connect
Name[x-test]=xxKDE Connect URL Handlerxx Name[x-test]=xxKDE Connect URL Handlerxx
Name[zh_CN]=KDE Connect URL 处理程序
Exec=kdeconnect-handler %U Exec=kdeconnect-handler %U
Icon=kdeconnect Icon=kdeconnect
Type=Application Type=Application