am f879c86c: (-s ours) am e58e81d9: am de4a6310: Import translations. DO NOT MERGE

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