am 4a842959: (-s ours) am 6d47579d: am 82bdbbfc: Import translations. DO NOT MERGE

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