am 1496aaaf: (-s ours) am 883bf96b: Import translations. DO NOT MERGE

* commit '1496aaafb2d4ead994e4335512a26252c38f739c':
  Import translations. DO NOT MERGE