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

* commit '8aedf9412532499dddcd965050bb5ac654d83834':
  Import translations. DO NOT MERGE