Commit 256403c9 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 534f4e39
......@@ -18,6 +18,7 @@ Name[fi]=Mobipocket-tiedostot
Name[fr]=Fichiers « Mobipocket »
Name[ga]=Comhaid Mobipocket
Name[gl]=Ficheiros de Mobipocket
Name[hi]=मोबिपोकेट फाइलें
Name[hr]=Mobipocket datoteke
Name[ia]=Files de Mobipocket
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