am c23edbe6: (-s ours) am 766ecd93: am e46af364: Import translations. DO NOT MERGE

* commit 'c23edbe6d997522e8c25ba7f52da500f8decd396':
  Import translations. DO NOT MERGE