Commit 808ce345 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 5afbff87
......@@ -41,6 +41,7 @@
"Description[de]": "Sprachunterstützung für Ruby",
"Description[en_GB]": "Ruby Language Support",
"Description[es]": "Implementación del lenguaje Ruby",
"Description[fi]": "Ruby-kielen tuki",
"Description[gl]": "Compatibilidade coa linguaxe Ruby",
"Description[hu]": "Ruby nyelvi támogatás",
"Description[nl]": "Ondersteuning voor de taal Ruby",
......@@ -61,6 +62,7 @@
"Name[de]": "Unterstützung für Ruby",
"Name[en_GB]": "Ruby Support",
"Name[es]": "Implementación de Ruby",
"Name[fi]": "Ruby-tuki",
"Name[gl]": "Compatibilidade con Ruby",
"Name[hu]": "Ruby támogatás",
"Name[nl]": "Ondersteuning voor 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