Commit 1c8030b8 authored by Script Kiddy's avatar Script Kiddy

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 4c77415b
......@@ -16,6 +16,7 @@ GenericName[en_GB]=Artikulate Pronunciation Trainer
GenericName[eo]=Artikulate Prononciada Trejnilo
GenericName[es]=Entrenador de pronunciación Artikulate
GenericName[et]=Häälduse harjutaja Artikulate
GenericName[eu]=Artikulate ahoskera entrenatzailea
GenericName[fi]=Artikulate ääntämisen harjoitteluohjelma
GenericName[fr]=Programme Artikulate d'entraînement à la prononciation
GenericName[gl]=Adestrador de pronuncia Artikulate
......@@ -54,6 +55,7 @@ Name[en_GB]=Artikulate
Name[eo]=Artikulate
Name[es]=Artikulate
Name[et]=Artikulate
Name[eu]=Artikulate
Name[fi]=Artikulate
Name[fr]=Artikulate
Name[gl]=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