am d75d7edf: (-s ours) am 1100c535: (-s ours) Import translations. DO NOT MERGE

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