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

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