Import translations. DO NOT MERGE am: b21b778567  -s ours am: b96f640a77  -s ours
am: 816a167b29  -s ours

* commit '816a167b2936a420d96f57f57005982e727745f5':
  Import translations. DO NOT MERGE