am 6b79c8f6: (-s ours) am a60177b7: (-s ours) Import translations. DO NOT MERGE

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