Merge changes I5fa6ec7c,Ice1fabb2

* changes:
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE