am 11cef1d8: (-s ours) am fa584b69: (-s ours) Import translations. DO NOT MERGE

* commit '11cef1d83a3111cf6ff6359e2a822a6ca17fc4af':
  Import translations. DO NOT MERGE