am 7e332fe7: (-s ours) am aaedbd4a: (-s ours) Import translations. DO NOT MERGE

* commit '7e332fe72bb6ca5af087a2669ea6473acd739ef2':
  Import translations. DO NOT MERGE