am 9f83fb9c: (-s ours) am 04aee4fb: (-s ours) Import translations. DO NOT MERGE

* commit '9f83fb9c0da7de7eb377a19a1b13a86d8835ccb2':
  Import translations. DO NOT MERGE