am 12f855af: (-s ours) am aa8d2f7c: am 84a0746f: Import translations. DO NOT MERGE

* commit '12f855af458e17707e8144026e2ff94cd59cc473':
  Import translations. DO NOT MERGE