am 1c4211f9: (-s ours) am bd9a11d2: (-s ours) Import translations. DO NOT MERGE

* commit '1c4211f9ff69676cd9584efe20a90231107657c7':
  Import translations. DO NOT MERGE