Commit b134b0d9 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 7d5c5691
......@@ -56,6 +56,7 @@ GenericName[de]=Ein Rennen im Hyperraum
GenericName[en_GB]=A race in hyperspace
GenericName[es]=Una carrera en el hiperespacio
GenericName[fi]=Kisa hyperavaruudessa
GenericName[fr]=Une course dans l'hyper-espace
GenericName[gl]=Unha carreira no espazo exterior
GenericName[nl]=Een race in hyperspace
GenericName[nn]=Kappløp i hyperrommet
......
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