Merge changes from topic "tc_change_35"

* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8085cb253f
  Import translations. DO NOT MERGE ANYWHERE