Import translations. DO NOT MERGE
am: 2c29ac6eb5  -s ours

* commit '2c29ac6eb52a767f77541a739a492d60d600e29a':
  Import translations. DO NOT MERGE