German and French translations updated.

Merge conflict fixed, improvements added.