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

* commit 'b96f640a77b0c09868e104028d3bb9db3687018b':
  Import translations. DO NOT MERGE