am acec2e1b: (-s ours) am b82b53c3: (-s ours) Import translations. DO NOT MERGE

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