Crowdin injections w46 (part 2): Fix format conflicts. Injections 20131116.
Merge branch 'stable/4.0.x' into feature/4.0.x-translation