am 6f4fc5bc: (-s ours) am 05f28558: (-s ours) Import translations. DO NOT MERGE

* commit '6f4fc5bc71be7b6f134759fc8edce6016dc886e1':
  Import translations. DO NOT MERGE