am 8d2c0c13: (-s ours) am 7857404b: (-s ours) Import translations. DO NOT MERGE

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