Commit a6d86c23 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 7b2394e6
......@@ -60,6 +60,7 @@ GenericName[fi]=Kisa hyperavaruudessa
GenericName[fr]=Une course dans l'hyper-espace
GenericName[gl]=Unha carreira no espazo exterior
GenericName[it]=Una gara nell'iperspazio
GenericName[ko]=하이퍼스페이스에서의 경주
GenericName[nl]=Een race in hyperspace
GenericName[nn]=Kappløp i hyperrommet
GenericName[pl]=Wyścig w hiperprzestrzeni
......
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