am f8512644: (-s ours) am 841ad7ba: Import translations. DO NOT MERGE

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