am 6d25c934: (-s ours) Import translations. DO NOT MERGE
* commit '6d25c934dcdf7a098d4e9f96cb206789dfd4afb7': Import translations. DO NOT MERGE
This commit is contained in: