Commit e796a114 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 6af21c62
......@@ -62,6 +62,7 @@ GenericName[nn]=Kappløp i hyperrommet
GenericName[pt]=Uma corrida no hiperespaço
GenericName[pt_BR]=Uma corrida no hiperespaço
GenericName[sk]=Preteky v hyperpriestore
GenericName[sl]=Dirka v hiperprostoru
GenericName[sr]=Трка кроз хиперсвемир
GenericName[sr@ijekavian]=Трка кроз хиперсвемир
GenericName[sr@ijekavianlatin]=Trka kroz hipersvemir
......
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