am c61223ce: (-s ours) am cd92dd07: Import translations. DO NOT MERGE

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