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

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