am 8ac88edc: (-s ours) am e957cb47: (-s ours) Import translations. DO NOT MERGE

* commit '8ac88edc032abfb3d1105f3f2b66ef5c39d1cf8f':
  Import translations. DO NOT MERGE