Commit c888ff14 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 8f49496e
......@@ -2,8 +2,8 @@
Comment=A Mapper for KMuddy
Comment[bs]=Mapper za KMuddy
Comment[ca]=Un mapador pel KMuddy
Comment[ca@valencia]=Un mapador pel KMuddy
Comment[ca]=Un mapador per al KMuddy
Comment[ca@valencia]=Un mapador per al KMuddy
Comment[de]=Ein Mapper für KMuddy
Comment[es]=Mapeador para KMuddy
Comment[et]=KMuddy tasemelooja
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