Merge changes Ia9338cf2,I5ef641b5

* changes:
  Import revised translations.
  Remove unreferenced layout that used two deleted strings.