am f70d0619: (-s ours) am e0bc7603: (-s ours) Import translations. DO NOT MERGE

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