diff --git a/wp-content/themes/twentyfifteen/inc/customizer.php b/wp-content/themes/twentyfifteen/inc/customizer.php index 40d686b7b5..0022eef556 100644 --- a/wp-content/themes/twentyfifteen/inc/customizer.php +++ b/wp-content/themes/twentyfifteen/inc/customizer.php @@ -49,7 +49,7 @@ function twentyfifteen_customize_register( $wp_customize ) { $wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'sidebar_textcolor', array( 'label' => esc_html__( 'Header and Sidebar Text Color', 'twentyfifteen' ), - 'description' => esc_html__( 'Only applied to the sidebar on wider screens. On small screens the sidebar will become the header.', 'twentyfifteen' ), + 'description' => esc_html__( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ), 'section' => 'colors', ) ) ); @@ -65,12 +65,12 @@ function twentyfifteen_customize_register( $wp_customize ) { $wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'header_background_color', array( 'label' => esc_html__( 'Header and Sidebar Background Color', 'twentyfifteen' ), - 'description' => esc_html__( 'Only applied to the sidebar on wider screens. On small screens the sidebar will become the header.', 'twentyfifteen' ), + 'description' => esc_html__( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ), 'section' => 'colors', ) ) ); // Add an additional description to the header image section. - $wp_customize->get_section( 'header_image' )->description = esc_html__( 'Only applied to the sidebar on wide screens. On small screens it will be applied to the header.', 'twentyfifteen' ); + $wp_customize->get_section( 'header_image' )->description = esc_html__( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ); } add_action( 'customize_register', 'twentyfifteen_customize_register', 11 ); diff --git a/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot b/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot index 199fbccdfa..bfc4f51699 100644 --- a/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot +++ b/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Twenty Fifteen 1.0\n" "Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyfifteen\n" -"POT-Creation-Date: 2014-11-25 16:39:33+00:00\n" +"POT-Creation-Date: 2014-12-04 12:59:53+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,15 +20,15 @@ msgstr "" msgid "It looks like nothing was found at this location. Maybe try a search?" msgstr "" -#: archive.php:50 index.php:46 search.php:38 +#: archive.php:49 index.php:46 search.php:38 msgid "Previous page" msgstr "" -#: archive.php:51 index.php:47 search.php:39 +#: archive.php:50 index.php:47 search.php:39 msgid "Next page" msgstr "" -#: archive.php:52 content-link.php:40 content-page.php:29 content.php:42 +#: archive.php:51 content-link.php:40 content-page.php:29 content.php:42 #: image.php:63 index.php:48 search.php:40 msgid "Page" msgstr "" @@ -53,7 +53,7 @@ msgid "Comments are closed." msgstr "" #. translators: %s: Name of current post -#: content-link.php:31 content.php:33 inc/template-tags.php:235 +#: content-link.php:31 content.php:33 inc/template-tags.php:237 msgid "Continue reading %s" msgstr "" @@ -178,43 +178,35 @@ msgstr "" msgid "Header and Sidebar Text Color" msgstr "" -#: inc/customizer.php:52 inc/customizer.php:68 -msgid "" -"Only applied to the sidebar on wider screens. On small screens the sidebar " -"will become the header." +#: inc/customizer.php:52 inc/customizer.php:68 inc/customizer.php:73 +msgid "Applied to the header on small screens and the sidebar on wide screens." msgstr "" #: inc/customizer.php:67 msgid "Header and Sidebar Background Color" msgstr "" -#: inc/customizer.php:73 -msgid "" -"Only applied to the sidebar on wide screens. On small screens it will be " -"applied to the header." -msgstr "" - -#: inc/customizer.php:96 +#: inc/customizer.php:97 msgid "Default" msgstr "" -#: inc/customizer.php:107 +#: inc/customizer.php:108 msgid "Dark" msgstr "" -#: inc/customizer.php:118 +#: inc/customizer.php:119 msgid "Yellow" msgstr "" -#: inc/customizer.php:129 +#: inc/customizer.php:130 msgid "Pink" msgstr "" -#: inc/customizer.php:140 +#: inc/customizer.php:141 msgid "Purple" msgstr "" -#: inc/customizer.php:151 +#: inc/customizer.php:152 msgid "Blue" msgstr "" diff --git a/wp-includes/version.php b/wp-includes/version.php index 3b3ecca0f9..24aebb727c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30740'; +$wp_version = '4.1-beta2-30741'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.