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

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