am 8aa955dc: (-s ours) Import translations. DO NOT MERGE

* commit '8aa955dc6aceb1782c77f746b83eb557134062ed':
  Import translations. DO NOT MERGE