am 6fb8c107: (-s ours) Import translations. DO NOT MERGE

* commit '6fb8c107970104b02688c3f536e6bef51cf24f88':
  Import translations. DO NOT MERGE