am eee4cce0: (-s ours) am 547ac0cc: (-s ours) Import translations. DO NOT MERGE

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