Import translations. DO NOT MERGE am: da8fddc156  -s ours am: de66f8d273  -s ours am: a7221d1  -s ours
am: b334c8f  -s ours

* commit 'b334c8fa5e404f246e41a5ad6d9d98cdfb66bc61':