am c916c808: (-s ours) am a01e5a4d: (-s ours) Import translations. DO NOT MERGE

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