am 8ebccb47: (-s ours) am 2d11727e: (-s ours) Import translations. DO NOT MERGE

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