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

* commit '054041058f9706c95b3d72ca421fcb656ad59d1e':
  Import translations. DO NOT MERGE