am cb84797d: (-s ours) am 353c5b50: (-s ours) am 7e669a0a: (-s ours) Import translations. DO NOT MERGE

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