am 187d7cc1: (-s ours) am c95b0904: (-s ours) am 1a6aa4e7: (-s ours) Import translations. DO NOT MERGE

* commit '187d7cc129c19177bb570b587788321012e31885':
  Import translations. DO NOT MERGE