am 9536c340: (-s ours) am 70162341: (-s ours) Import translations. DO NOT MERGE

* commit '9536c340aac1fcc1f74f1e054c648befd120bed8':
  Import translations. DO NOT MERGE