am b2339673: (-s ours) am 5186160e: (-s ours) Import translations. DO NOT MERGE

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