am e2ded655: (-s ours) am 1ec0f22d: (-s ours) Import translations. DO NOT MERGE

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