Import translations. DO NOT MERGE am: 18f85e2e47  -s ours am: bc599c4e34  -s ours
am: ecad9c6591  -s ours

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