Commit a2e56ca0 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 2f33511b
......@@ -54,6 +54,7 @@ GenericName=A race in hyperspace
GenericName[ast]=Una carrera nel hiperespaciu
GenericName[ca]=Una carrera a l'hiperespai
GenericName[ca@valencia]=Una carrera a l'hiperespai
GenericName[da]=Et ræs i hyperspace
GenericName[de]=Ein Rennen im Hyperraum
GenericName[en_GB]=A race in hyperspace
GenericName[es]=Una carrera en el hiperespacio
......
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