am a83129f0: (-s ours) am e5ec4ac4: (-s ours) Import translations. DO NOT MERGE

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