am bbadc6ed: (-s ours) am 20591e43: (-s ours) Import translations. DO NOT MERGE

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