am eb8e9c11: (-s ours) am 2c766ba5: Import translations. DO NOT MERGE

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