am ed459a8f: (-s ours) am 5d95f0c5: (-s ours) Import translations. DO NOT MERGE

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