From a748574c2982998bc0f34436c26517c15f184a61 Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Sun, 22 Feb 2015 13:43:24 +0000 Subject: [PATCH] Revert [30790] and update POT file for Twenty Fifteen. see #30972, #30603. Built from https://develop.svn.wordpress.org/trunk@31500 git-svn-id: http://core.svn.wordpress.org/trunk@31481 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentyfifteen/functions.php | 20 +++++-- .../twentyfifteen/languages/twentyfifteen.pot | 52 +++++++++---------- wp-includes/version.php | 2 +- 3 files changed, 43 insertions(+), 31 deletions(-) diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php index f0d94ecc53..d96c0270b3 100644 --- a/wp-content/themes/twentyfifteen/functions.php +++ b/wp-content/themes/twentyfifteen/functions.php @@ -154,22 +154,34 @@ function twentyfifteen_fonts_url() { $fonts = array(); $subsets = 'latin,latin-ext'; - /* translators: If there are characters in your language that are not supported by Noto Sans, translate this to 'off'. Do not translate into your own language. */ + /* + * Translators: If there are characters in your language that are not supported + * by Noto Sans, translate this to 'off'. Do not translate into your own language. + */ if ( 'off' !== _x( 'on', 'Noto Sans font: on or off', 'twentyfifteen' ) ) { $fonts[] = 'Noto Sans:400italic,700italic,400,700'; } - /* translators: If there are characters in your language that are not supported by Noto Serif, translate this to 'off'. Do not translate into your own language. */ + /* + * Translators: If there are characters in your language that are not supported + * by Noto Serif, translate this to 'off'. Do not translate into your own language. + */ if ( 'off' !== _x( 'on', 'Noto Serif font: on or off', 'twentyfifteen' ) ) { $fonts[] = 'Noto Serif:400italic,700italic,400,700'; } - /* translators: If there are characters in your language that are not supported by Inconsolata, translate this to 'off'. Do not translate into your own language. */ + /* + * Translators: If there are characters in your language that are not supported + * by Inconsolata, translate this to 'off'. Do not translate into your own language. + */ if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentyfifteen' ) ) { $fonts[] = 'Inconsolata:400,700'; } - /* translators: To add an additional character subset specific to your language, translate this to 'greek', 'cyrillic', 'devanagari' or 'vietnamese'. Do not translate into your own language. */ + /* + * Translators: To add an additional character subset specific to your language, + * translate this to 'greek', 'cyrillic', 'devanagari' or 'vietnamese'. Do not translate into your own language. + */ $subset = _x( 'no-subset', 'Add new subset (greek, cyrillic, devanagari, vietnamese)', 'twentyfifteen' ); if ( 'cyrillic' == $subset ) { diff --git a/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot b/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot index 2029927dba..4c3a499562 100644 --- a/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot +++ b/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot @@ -1,14 +1,14 @@ -# Copyright (C) 2014 the WordPress team +# Copyright (C) 2015 the WordPress team # This file is distributed under the GNU General Public License v2 or later. msgid "" msgstr "" "Project-Id-Version: Twenty Fifteen 1.0\n" -"Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyfifteen\n" -"POT-Creation-Date: 2014-12-14 12:26:59+00:00\n" +"Report-Msgid-Bugs-To: http://wordpress.org/support/theme/twentyfifteen\n" +"POT-Creation-Date: 2015-02-22 13:29:51+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2014-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2015-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -113,51 +113,51 @@ msgstr "" msgid "Add widgets here to appear in your sidebar." msgstr "" -#. translators: If there are characters in your language that are not supported +#. Translators: If there are characters in your language that are not supported #. by Noto Sans, translate this to 'off'. Do not translate into your own #. language. -#: functions.php:158 +#: functions.php:161 msgctxt "Noto Sans font: on or off" msgid "on" msgstr "" -#. translators: If there are characters in your language that are not supported +#. Translators: If there are characters in your language that are not supported #. by Noto Serif, translate this to 'off'. Do not translate into your own #. language. -#: functions.php:163 +#: functions.php:169 msgctxt "Noto Serif font: on or off" msgid "on" msgstr "" -#. translators: If there are characters in your language that are not supported +#. Translators: If there are characters in your language that are not supported #. by Inconsolata, translate this to 'off'. Do not translate into your own #. language. -#: functions.php:168 +#: functions.php:177 msgctxt "Inconsolata font: on or off" msgid "on" msgstr "" -#. translators: To add an additional character subset specific to your +#. Translators: To add an additional character subset specific to your #. language, translate this to 'greek', 'cyrillic', 'devanagari' or #. 'vietnamese'. Do not translate into your own language. -#: functions.php:173 +#: functions.php:185 msgctxt "Add new subset (greek, cyrillic, devanagari, vietnamese)" msgid "no-subset" msgstr "" -#: functions.php:231 +#: functions.php:255 msgid "expand child menu" msgstr "" -#: functions.php:232 +#: functions.php:256 msgid "collapse child menu" msgstr "" -#: header.php:27 +#: header.php:26 msgid "Skip to content" msgstr "" -#: header.php:44 +#: header.php:43 msgid "Menu and widgets" msgstr "" @@ -182,43 +182,43 @@ msgid "" "version %s. Please upgrade and try again." msgstr "" -#: inc/customizer.php:36 +#: inc/customizer.php:31 msgid "Base Color Scheme" msgstr "" -#: inc/customizer.php:51 +#: inc/customizer.php:46 msgid "Header and Sidebar Text Color" msgstr "" -#: inc/customizer.php:52 inc/customizer.php:68 inc/customizer.php:73 +#: inc/customizer.php:47 inc/customizer.php:63 inc/customizer.php:68 msgid "Applied to the header on small screens and the sidebar on wide screens." msgstr "" -#: inc/customizer.php:67 +#: inc/customizer.php:62 msgid "Header and Sidebar Background Color" msgstr "" -#: inc/customizer.php:97 +#: inc/customizer.php:92 msgid "Default" msgstr "" -#: inc/customizer.php:108 +#: inc/customizer.php:103 msgid "Dark" msgstr "" -#: inc/customizer.php:119 +#: inc/customizer.php:114 msgid "Yellow" msgstr "" -#: inc/customizer.php:130 +#: inc/customizer.php:125 msgid "Pink" msgstr "" -#: inc/customizer.php:141 +#: inc/customizer.php:136 msgid "Purple" msgstr "" -#: inc/customizer.php:152 +#: inc/customizer.php:147 msgid "Blue" msgstr "" diff --git a/wp-includes/version.php b/wp-includes/version.php index 4a13b5e7ad..54580918c1 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31499'; +$wp_version = '4.2-alpha-31500'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.