am 16b29181: (-s ours) Import translations. DO NOT MERGE

* commit '16b291818825d611ef14770187616911560dedb4':
  Import translations. DO NOT MERGE