Commit 8f49496e 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 66d34a6f
......@@ -17,6 +17,7 @@ Comment[nl]=Een mapper voor KMuddy
Comment[pl]=Mapowanie dla KMuddy
Comment[pt]=Um Mapeador do KMuddy
Comment[pt_BR]=Um mapeador do KMuddy
Comment[sl]=Mapper za KMuddy
Comment[sv]=Ett kartverktyg för Kmuddy
Comment[tr]=Bir KMuddy Eşleyicisi
Comment[uk]=Робота з картами у KMuddy
Supports Markdown
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