A big clump of translations and mergings.

With all this at once something is bound to have gone wrong. LOL