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"
This commit is contained in:
parent
7806fe73cf
commit
84072ff32d
2 changed files with 15 additions and 0 deletions
|
@ -4,16 +4,29 @@
|
||||||
{
|
{
|
||||||
"Email": "aix.m@outlook.com",
|
"Email": "aix.m@outlook.com",
|
||||||
"Name": "Aditya Mehra",
|
"Name": "Aditya Mehra",
|
||||||
|
"Name[cs]": "Aditya Mehra",
|
||||||
|
"Name[lt]": "Aditya Mehra",
|
||||||
|
"Name[nl]": "Aditya Mehra",
|
||||||
|
"Name[pt_BR]": "Aditya Mehra",
|
||||||
|
"Name[uk]": "Aditya Mehra",
|
||||||
"Name[x-test]": "xxAditya Mehraxx"
|
"Name[x-test]": "xxAditya Mehraxx"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"Description": "Bigscreen Plugin",
|
"Description": "Bigscreen Plugin",
|
||||||
|
"Description[cs]": "Modul pro velkou obrazovku",
|
||||||
|
"Description[lt]": "Bigscreen papildinys",
|
||||||
|
"Description[nl]": "Bigscreen plug-in",
|
||||||
|
"Description[uk]": "Додаток для великих екранів",
|
||||||
"Description[x-test]": "xxBigscreen Pluginxx",
|
"Description[x-test]": "xxBigscreen Pluginxx",
|
||||||
"EnabledByDefault": true,
|
"EnabledByDefault": true,
|
||||||
"Icon": "tvtrusted",
|
"Icon": "tvtrusted",
|
||||||
"Id": "kdeconnect_bigscreen",
|
"Id": "kdeconnect_bigscreen",
|
||||||
"License": "GPL",
|
"License": "GPL",
|
||||||
"Name": "Bigscreen",
|
"Name": "Bigscreen",
|
||||||
|
"Name[cs]": "Velká obrazovka",
|
||||||
|
"Name[lt]": "Bigscreen",
|
||||||
|
"Name[nl]": "Bigscreen",
|
||||||
|
"Name[uk]": "Великий екран",
|
||||||
"Name[x-test]": "xxBigscreenxx",
|
"Name[x-test]": "xxBigscreenxx",
|
||||||
"ServiceTypes": [
|
"ServiceTypes": [
|
||||||
"KdeConnect/Plugin"
|
"KdeConnect/Plugin"
|
||||||
|
|
|
@ -5,9 +5,11 @@ Name[cs]=Nástroj pro práci s URL v KDE Connect
|
||||||
Name[es]=Controlador de URL de KDE Connect
|
Name[es]=Controlador de URL de KDE Connect
|
||||||
Name[et]=KDE Connecti URL-ide käitleja
|
Name[et]=KDE Connecti URL-ide käitleja
|
||||||
Name[fr]=Gestionnaire d'URL de KDE Connect
|
Name[fr]=Gestionnaire d'URL de KDE Connect
|
||||||
|
Name[it]=Gestore URL di KDE Connect
|
||||||
Name[lt]=KDE Connect URL doroklė
|
Name[lt]=KDE Connect URL doroklė
|
||||||
Name[nl]=URL behandelaar van KDE-Connect
|
Name[nl]=URL behandelaar van KDE-Connect
|
||||||
Name[pt]=Tratamento de URL's do KDE Connect
|
Name[pt]=Tratamento de URL's do KDE Connect
|
||||||
|
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
|
||||||
|
|
Loading…
Reference in a new issue