am f058c3e7: (-s ours) am 705d8085: Import translations. DO NOT MERGE

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