am d8cd33b4: (-s ours) am 5173e266: (-s ours) Import translations. DO NOT MERGE

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