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

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