Commit 36486b72 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 8735e17d
......@@ -4,6 +4,7 @@ Comment=POP3 Resource
Comment[ca]=Recurs POP3
Comment[ca@valencia]=Recurs POP3
Comment[cs]=Zdroj POP3
Comment[de]=POP3-Ressource
Comment[el]=Πόρος POP3
Comment[en_GB]=POP3 Resource
Comment[es]=Recurso POP3
......
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