Commit ae20c7e6 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 b134b0d9
......@@ -70,6 +70,7 @@ GenericName[sr@ijekavian]=Трка кроз хиперсвемир
GenericName[sr@ijekavianlatin]=Trka kroz hipersvemir
GenericName[sr@latin]=Trka kroz hipersvemir
GenericName[sv]=En kapplöpning i hyperrymden
GenericName[tr]=Sonsuz uzayda bir yarış
GenericName[uk]=Перегони у гіперпросторі
GenericName[x-test]=xxA race in hyperspacexx
X-KDE-StartupNotify=true
......
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