Merge commit '3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df' * commit '3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df': Strings for new Dock settings screen, to get started on the L10N.
Merge commit '3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df' * commit '3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df': Strings for new Dock settings screen, to get started on the L10N.