From 15ceab2647a96fc60542129989bf8d7c561612ac Mon Sep 17 00:00:00 2001 From: nacin Date: Fri, 2 Dec 2011 04:31:01 +0000 Subject: [PATCH] Standardize some final help strings. We're done, aside from typos. props zeo, jane, duck_, fixes #19020. git-svn-id: http://svn.automattic.com/wordpress/trunk@19538 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/custom-background.php | 2 +- wp-admin/index.php | 2 +- wp-admin/options-general.php | 2 +- wp-admin/options-permalink.php | 2 +- .../themes/twentyeleven/inc/theme-options.php | 18 +++++++++--------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php index 6960ef76e..168c65e33 100644 --- a/wp-admin/custom-background.php +++ b/wp-admin/custom-background.php @@ -86,7 +86,7 @@ class Custom_Background { 'content' => '

' . __( 'You can customize the look of your site without touching any of your theme’s code by using a custom background. Your background can be an image or a color.' ) . '

' . '

' . __( 'To use a background image, simply upload it, then choose your display options below. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '

' . - '

' . __( 'You can also choose a background color. If you know the hexadecimal code for the color you want, enter it in the Color field. If not, click on the Select a Color link, and a color picker will allow you to choose the exact shade you want.' ) . '

' . + '

' . __( 'You can also choose a background color. If you know the hexadecimal code for the color you want, enter it in the Background Color field. If not, click on the Select a Color link, and a color picker will allow you to choose the exact shade you want.' ) . '

' . '

' . __( 'Don’t forget to click on the Save Changes button when you are finished.' ) . '

' ) ); diff --git a/wp-admin/index.php b/wp-admin/index.php index f752726a6..b7b40bb87 100644 --- a/wp-admin/index.php +++ b/wp-admin/index.php @@ -28,7 +28,7 @@ else add_screen_option('layout_columns', array('max' => 4, 'default' => 2) ); -$help = '

' . __( 'Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the top bar.' ) . '

'; +$help = '

' . __( 'Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the upper corner.' ) . '

'; get_current_screen()->add_help_tab( array( 'id' => 'overview', diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index e2d120b8d..fff360c62 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -67,7 +67,7 @@ if ( ! is_multisite() ) { } $options_help .= '

' . __('UTC means Coordinated Universal Time.') . '

' . - '

' . __('Remember to click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

'; + '

' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '

'; get_current_screen()->add_help_tab( array( 'id' => 'overview', diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php index dfe2c8cef..7db14487f 100644 --- a/wp-admin/options-permalink.php +++ b/wp-admin/options-permalink.php @@ -20,7 +20,7 @@ get_current_screen()->add_help_tab( array( 'title' => __('Overview'), 'content' => '

' . __('Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change — hence the name permalink.') . '

' . '

' . __('This screen allows you to choose your default permalink structure. You can choose from common settings or create custom URL structures.') . '

' . - '

' . __('When making changes, you must click the Save Changes button at the bottom of the screen for the new settings to take effect.') . '

', + '

' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

', ) ); get_current_screen()->add_help_tab( array( diff --git a/wp-content/themes/twentyeleven/inc/theme-options.php b/wp-content/themes/twentyeleven/inc/theme-options.php index 2f44b09c1..4be7fbf45 100644 --- a/wp-content/themes/twentyeleven/inc/theme-options.php +++ b/wp-content/themes/twentyeleven/inc/theme-options.php @@ -48,15 +48,15 @@ function twentyeleven_theme_options_init() { ); // Register our settings field group - add_settings_section( + add_settings_section( 'general', // Unique identifier for the settings section '', // Section title (we don't want one) - '__return_false', // Section callback (we don't want anything) + '__return_false', // Section callback (we don't want anything) 'theme_options' // Menu slug, used to uniquely identify the page; see twentyeleven_theme_options_add_page() ); // Register our individual settings fields - add_settings_field( + add_settings_field( 'color_scheme', // Unique identifier for the field for this section __( 'Color Scheme', 'twentyeleven' ), // Setting field label 'twentyeleven_settings_field_color_scheme', // Function that renders the settings field @@ -64,8 +64,8 @@ function twentyeleven_theme_options_init() { 'general' // Settings section. Same as the first argument in the add_settings_section() above ); - add_settings_field( 'link_color', __( 'Link Color', 'twentyeleven' ), 'twentyeleven_settings_field_link_color', 'theme_options', 'general' ); - add_settings_field( 'layout', __( 'Layout', 'twentyeleven' ), 'twentyeleven_settings_field_layout', 'theme_options', 'general' ); + add_settings_field( 'link_color', __( 'Link Color', 'twentyeleven' ), 'twentyeleven_settings_field_link_color', 'theme_options', 'general' ); + add_settings_field( 'layout', __( 'Default Layout', 'twentyeleven' ), 'twentyeleven_settings_field_layout', 'theme_options', 'general' ); } add_action( 'admin_init', 'twentyeleven_theme_options_init' ); @@ -118,7 +118,7 @@ function twentyeleven_theme_options_help() { get_current_screen()->add_help_tab( array( 'title' => __( 'Overview', 'twentyeleven' ), 'id' => 'theme-options-help', - 'content' => + 'content' => '

' . __( 'Some themes provide customization options that are grouped together on a Theme Options screen. If you change themes, options may change or disappear, as they are theme-specific. Your current theme, Twenty Eleven, provides the following Theme Options:', 'twentyeleven' ) . '

' . '
    ' . '
  1. ' . __( 'Color Scheme: You can choose a color palette of "Light" (light background with dark text) or "Dark" (dark background with light text) for your site.', 'twentyeleven' ) . '
    2. ' . @@ -237,7 +237,7 @@ function twentyeleven_get_theme_options() { /** * Renders the Color Scheme setting field. - * + * * @since Twenty Eleven 1.3 */ function twentyeleven_settings_field_color_scheme() { @@ -261,7 +261,7 @@ function twentyeleven_settings_field_color_scheme() { /** * Renders the Link Color setting field. - * + * * @since Twenty Eleven 1.3 */ function twentyeleven_settings_field_link_color() { @@ -278,7 +278,7 @@ function twentyeleven_settings_field_link_color() { /** * Renders the Layout setting field. - * + * * @since Twenty Eleven 1.3 */ function twentyeleven_settings_field_layout() {