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

* commit '2396c919e3eba633feb37a84bd195bfde5f48629':
  Import translations. DO NOT MERGE