am ac617824: (-s ours) am 804b8b60: Import translations. DO NOT MERGE

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