Commit 88f5145d 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 94811e9e
......@@ -50,6 +50,13 @@ Name[x-test]=xxKSnakeDuelxx
GenericName=A race in hyperspace
GenericName[ca]=Una carrera a l'hiperespai
GenericName[es]=Una carrera en el hiperespacio
GenericName[nl]=Een race in hyperspace
GenericName[pt]=Uma corrida no hiperespaço
GenericName[pt_BR]=Uma corrida no hiperespaço
GenericName[uk]=Перегони у гіперпросторі
GenericName[x-test]=xxA race in hyperspacexx
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