Import translations. DO NOT MERGE
am: cad7535  -s ours

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