am ff83c75b: (-s ours) Import translations. DO NOT MERGE

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