Commit 5d00d23d 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 cc2661c6
......@@ -42,6 +42,7 @@
"Description[en_GB]": "Ruby Language Support",
"Description[es]": "Implementación del lenguaje Ruby",
"Description[gl]": "Compatibilidade coa linguaxe Ruby",
"Description[hu]": "Ruby nyelvi támogatás",
"Description[nl]": "Ondersteuning voor de taal Ruby",
"Description[pl]": "Obsługa języka Ruby",
"Description[pt]": "Suporte à Linguagem Ruby",
......@@ -60,6 +61,7 @@
"Name[en_GB]": "Ruby Support",
"Name[es]": "Implementación de Ruby",
"Name[gl]": "Compatibilidade con Ruby",
"Name[hu]": "Ruby támogatás",
"Name[nl]": "Ondersteuning voor Ruby",
"Name[pl]": "Obsługa Ruby",
"Name[pt]": "Suporte para Ruby",
......
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