Commit a16c9226 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 41e2ca7c
......@@ -43,6 +43,7 @@
"Description[es]": "Implementación del lenguaje Ruby",
"Description[gl]": "Compatibilidade coa linguaxe Ruby",
"Description[nl]": "Ondersteuning voor de taal Ruby",
"Description[pl]": "Obsługa języka Ruby",
"Description[pt]": "Suporte à Linguagem Ruby",
"Description[pt_BR]": "Suporte à linguagem Ruby",
"Description[sk]": "Podpora jazyka Ruby",
......@@ -59,6 +60,7 @@
"Name[es]": "Implementación de Ruby",
"Name[gl]": "Compatibilidade con Ruby",
"Name[nl]": "Ondersteuning voor Ruby",
"Name[pl]": "Obsługa Ruby",
"Name[pt]": "Suporte para Ruby",
"Name[pt_BR]": "Suporte à Ruby",
"Name[sk]": "Podpora 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