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

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