am a61ee4d9: (-s ours) am 8c2c1837: am 0308361b: Import translations. DO NOT MERGE

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