am 8be31f9c: (-s ours) am 2061b9fa: (-s ours) Import translations. DO NOT MERGE

* commit '8be31f9cee18e0b826b119e8f94409abffcc8c12':
  Import translations. DO NOT MERGE