am 930bb39c: (-s ours) am 12a69237: (-s ours) Import translations. DO NOT MERGE

* commit '930bb39cb246d1eddb94a7cd4b46873b6fc51dce':
  Import translations. DO NOT MERGE