Commit d9f0c383 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 22f53af8
Pipeline #151678 skipped
......@@ -7,6 +7,7 @@ Name[ca]=Fitxers Mobipocket
Name[ca@valencia]=Fitxers Mobipocket
Name[cs]=Dokumenty Mobipocket
Name[en_GB]=Mobipocket Files
Name[es]=Archivos de Mobipocket
Name[et]=Mobipocketi failid
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