Commit 2b35e29d authored by l10n daemon script's avatar l10n daemon script

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 4c685a70
......@@ -2,6 +2,7 @@
Name=UserFeedback Console
Name[ca]=Consola de l'UserFeedback
Name[ca@valencia]=Consola de l'UserFeedback
Name[en_GB]=UserFeedback Console
Name[es]=Consola de UserFeedback
Name[fr]=Console UserFeedback
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