am 6904eac7: (-s ours) Import translations. DO NOT MERGE
* commit '6904eac728cd94007c6d7787c56960c8cffcd4f1': Import translations. DO NOT MERGE
This commit is contained in: