am ad594194: (-s ours) am 29372398: (-s ours) Import translations. DO NOT MERGE

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