Import translations. DO NOT MERGE am: ff17c33  -s ours am: 23d5589  -s ours
am: 7163ed6  -s ours

* commit '7163ed6ce8bb4d79b8543e6aa2b2013b4baf9e0a':
  Import translations. DO NOT MERGE