am e12b912f: (-s ours) am 99de1b60: Import translations. DO NOT MERGE

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