am 83b06dc3: (-s ours) am 631c46fd: (-s ours) Import translations. DO NOT MERGE

* commit '83b06dc359a96f6935bb64ffa16b4cb19d458ffb':
  Import translations. DO NOT MERGE