Commit 1c4e78de 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 b387c98e
......@@ -20,6 +20,7 @@ GenericName[et]=Häälduse harjutaja Artikulate
GenericName[fi]=Artikulate ääntämisen harjoitteluohjelma
GenericName[fr]=Programme Artikulate d'entraînement à la prononciation
GenericName[gl]=Entrenador de pronuncia Artikulate
GenericName[hi]=आर्टिकुलेट उच्चारण प्रशिक्षक
GenericName[hu]=Artikulate kiejtés oktató
GenericName[ko]=Artikulate 발음 타이머
GenericName[mr]=आर्टिक्युलेट उच्चारण प्रशिक्षक
......@@ -57,6 +58,7 @@ Name[et]=Artikulate
Name[fi]=Artikulate
Name[fr]=Artikulate
Name[gl]=Artikulate
Name[hi]=आर्टिकुलेट
Name[hu]=Artikulate
Name[it]=Artikulate
Name[ko]=Artikulate
......
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