am 69efcee6: (-s ours) am 16d00c4c: (-s ours) Import translations. DO NOT MERGE

* commit '69efcee6611666f4da215a6ebab7f091eaf5e55b':
  Import translations. DO NOT MERGE