am 6795dd59: (-s ours) am 359b2bcc: Check in translations for new Settings strings.  DO NOT MERGE

Merge commit '6795dd59aa1a1d78ea0b3c7fc44107f38cae80d7'

* commit '6795dd59aa1a1d78ea0b3c7fc44107f38cae80d7':
  Check in translations for new Settings strings.  DO NOT MERGE