Merge "Strings for new Dock settings screen, to get started on the L10N." into eclair