Commit 1653ebd8 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 0b34cfc7
......@@ -8,14 +8,24 @@
],
"Category": "Utilities",
"Description": "This plugin helps to obtain projects from GitHub",
"Description[ca]": "Aquest connector ajuda a obtenir els projectes des de GitHub",
"Description[es]": "Este complemento le ayuda a obtener proyectos de GitHub",
"Description[nl]": "Deze plug-in helpt om projecten uit Github te verkrijgen",
"Description[pt]": "Este 'plugin' ajuda a obter projectos do GitHub",
"Description[sk]": "Tento modul pomáha získavať projekty z GitHub",
"Description[sv]": "Insticksprogrammet hjälper till att erhålla projekt från Github",
"Description[uk]": "За допомогою цього додатка можна отримувати проекти з GitHub",
"Description[x-test]": "xxThis plugin helps to obtain projects from GitHubxx",
"Icon": "kdevgh",
"Id": "kdevghprovider",
"License": "GPL",
"Name": "GitHub Provider",
"Name[ca]": "Proveïdor de GitHub",
"Name[es]": "Proveedor de GitHub",
"Name[nl]": "Github-leverancier",
"Name[pt]": "Fornecedor do GitHub",
"Name[sk]": "Poskytovateľ GitHub",
"Name[sv]": "Github-leverantör",
"Name[uk]": "Надавач даних GitHub",
"Name[x-test]": "xxGitHub Providerxx",
"ServiceTypes": [
......
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