Commit 2c32c9ba 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 937b6f5f
......@@ -8,6 +8,7 @@ Name[en_GB]=akonadimailreader
Name[es]=akonadimailreader
Name[et]=akonadimailreader
Name[fi]=akonadimailreader
Name[fr]=Lecteur de courriel Akonadi
Name[gl]=akonadimailreader
Name[it]=akonadimailreader
Name[ko]=akonadimailreader
......
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