am bbba6d79: (-s ours) am 184e4d14: (-s ours) Import translations. DO NOT MERGE

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