am 4fe6117c: (-s ours) am 26310772: (-s ours) Import translations. DO NOT MERGE

* commit '4fe6117cc1ce411dbbcfc1b25dc1ef720901ad4b':
  Import translations. DO NOT MERGE