Commit 18093672 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 97c9a4a6
......@@ -52,6 +52,7 @@ Comment=Find your way
Comment[ast]=Alcuentra'l to camín
Comment[ca]=Trobeu el camí
Comment[ca@valencia]=Trobeu el camí
Comment[cs]=Najděte si cestu
Comment[da]=Find vej
Comment[de]=Routenplanung
Comment[en_GB]=Find your way
......
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