Commit 7167a494 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 c871656d
......@@ -21,6 +21,7 @@ GenericName[fr]=Programme Artikulate d'entraînement à la prononciation
GenericName[gl]=Adestrador de pronuncia Artikulate
GenericName[hi]=आर्टिकुलेट उच्चारण प्रशिक्षक
GenericName[hu]=Artikulate kiejtés oktató
GenericName[it]=Allenatore di pronuncia Artikulate
GenericName[ko]=Artikulate 발음 타이머
GenericName[mr]=आर्टिक्युलेट उच्चारण प्रशिक्षक
GenericName[nds]=Artikulate - Utspraak öven
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