am fcb089c9: Merge "Reimport Settings translations.  DO NOT MERGE" into gingerbread

* commit 'fcb089c94280dd3b5a1ed8f90610d258a43abb78':
  Reimport Settings translations.  DO NOT MERGE