am eca9587c: (-s ours) am 830e0701: (-s ours) Import translations. DO NOT MERGE

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