Import translations. DO NOT MERGE
am: 195e864086  -s ours

* commit '195e8640868c6e9203820fe8f0fdb5706c5c93a4':
  Import translations. DO NOT MERGE