Various: pull from Pootle
[mr] recover from Mercurial

Fix bug 3046
[mr] Reflow after recovery