am 3a66e9b6: (-s ours) am c95a338e: (-s ours) am a1467911: Import translations. DO NOT MERGE

* commit '3a66e9b653dca12fd35fd8c9a26e0bf6f78f192f':
  Import translations. DO NOT MERGE