Commit 3f197881 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 66ebeb57
Pipeline #27136 skipped
......@@ -4,17 +4,74 @@
{
"Email": "aix.m@outlook.com",
"Name": "Aditya Mehra",
"Name[nn]": "Aditya Mehra"
"Name[ca]": "Aditya Mehra",
"Name[cs]": "Aditya Mehra",
"Name[en_GB]": "Aditya Mehra",
"Name[es]": "Aditya Mehra",
"Name[et]": "Aditya Mehra",
"Name[eu]": "Aditya Mehra",
"Name[fi]": "Aditya Mehra",
"Name[fr]": "Aditya Mehra",
"Name[it]": "Aditya Mehra",
"Name[ko]": "Aditya Mehra",
"Name[lt]": "Aditya Mehra",
"Name[nl]": "Aditya Mehra",
"Name[nn]": "Aditya Mehra",
"Name[pt]": "Aditya Mehra",
"Name[pt_BR]": "Aditya Mehra",
"Name[sk]": "Aditya Mehra",
"Name[sl]": "Aditya Mehra",
"Name[sv]": "Aditya Mehra",
"Name[uk]": "Aditya Mehra",
"Name[x-test]": "xxAditya Mehraxx"
}
],
"Description": "Bigscreen Plugin",
"Description[ca]": "Connector de la Bigscreen",
"Description[cs]": "Modul pro velkou obrazovku",
"Description[en_GB]": "Bigscreen Plugin",
"Description[es]": "Complemento Bigscreen",
"Description[et]": "Suurekraani plugin",
"Description[eu]": "Bigscreen plugina",
"Description[fi]": "Bigscreen-liitännäinen",
"Description[fr]": "Module externe « Bigscreen »",
"Description[it]": "Estensione Bigscreen",
"Description[ko]": "큰 화면 플러그인",
"Description[lt]": "Bigscreen papildinys",
"Description[nl]": "Bigscreen plug-in",
"Description[nn]": "Bigscreen-tillegg",
"Description[pt]": "'Plugin' de Ecrã Grande",
"Description[pt_BR]": "Plugin de tela grande",
"Description[sk]": "Doplnok veľkej obrazovky",
"Description[sl]": "Vtičnik velikega zaslona",
"Description[sv]": "Insticksprogram för storskärm",
"Description[uk]": "Додаток для великих екранів",
"Description[x-test]": "xxBigscreen Pluginxx",
"EnabledByDefault": true,
"Icon": "tvtrusted",
"Id": "kdeconnect_bigscreen",
"License": "GPL",
"Name": "Bigscreen",
"Name[ca]": "Bigscreen",
"Name[cs]": "Velká obrazovka",
"Name[en_GB]": "Bigscreen",
"Name[es]": "Bigscreen",
"Name[et]": "Suurekraan",
"Name[eu]": "Bigscreen",
"Name[fi]": "Bigscreen",
"Name[fr]": "Bigscreen",
"Name[it]": "Bigscreen",
"Name[ko]": "큰 화면",
"Name[lt]": "Bigscreen",
"Name[nl]": "Bigscreen",
"Name[nn]": "Bigscreen",
"Name[pt]": "Ecrã grande",
"Name[pt_BR]": "Tela grande",
"Name[sk]": "Veľká obrazovka",
"Name[sl]": "Veliki zaslon",
"Name[sv]": "Storskärm",
"Name[uk]": "Великий екран",
"Name[x-test]": "xxBigscreenxx",
"ServiceTypes": [
"KdeConnect/Plugin"
],
......
[Desktop Entry]
Name=KDE Connect URL Handler
Name[ca]=Gestor d'URL del KDE Connect
Name[fr]=Gestionnaire d'URL de KDE Connect
Name[nl]=URL behandelaar van KDE-Connect
Name[nn]=KDE Connect adressehandsamar
Name[uk]=Обробник адрес KDE Connect
Name[x-test]=xxKDE Connect URL Handlerxx
Exec=kdeconnect-handler %U
Icon=kdeconnect
Type=Application
......
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