am d99b9fd3: (-s ours) am 1fcf34d8: (-s ours) Import translations. DO NOT MERGE

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