Commit 52fd0cbe 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 0b5502e6
......@@ -58,6 +58,10 @@ GenericName[gl]=Unha carreira no espazo exterior
GenericName[nl]=Een race in hyperspace
GenericName[pt]=Uma corrida no hiperespaço
GenericName[pt_BR]=Uma corrida no hiperespaço
GenericName[sr]=Трка кроз хиперсвемир
GenericName[sr@ijekavian]=Трка кроз хиперсвемир
GenericName[sr@ijekavianlatin]=Trka kroz hipersvemir
GenericName[sr@latin]=Trka kroz hipersvemir
GenericName[sv]=En kapplöpning i hyperrymden
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