am a345868b: (-s ours) am 3c8d7fd9: (-s ours) Import translations. DO NOT MERGE

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