WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Dominik Schilling 2015-02-22 13:43:24 +00:00
parent 6f97715bea
commit a748574c29
3 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-content/themes/twentyfifteen/functions.php
View File

@ -154,22 +154,34 @@ function twentyfifteen_fonts_url() {
$fonts = array(); $fonts = array();
$subsets = 'latin,latin-ext'; $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' ) ) { if ( 'off' !== _x( 'on', 'Noto Sans font: on or off', 'twentyfifteen' ) ) {
$fonts[] = 'Noto Sans:400italic,700italic,400,700'; $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' ) ) { if ( 'off' !== _x( 'on', 'Noto Serif font: on or off', 'twentyfifteen' ) ) {
$fonts[] = 'Noto Serif:400italic,700italic,400,700'; $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' ) ) { if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentyfifteen' ) ) {
$fonts[] = 'Inconsolata:400,700'; $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' ); $subset = _x( 'no-subset', 'Add new subset (greek, cyrillic, devanagari, vietnamese)', 'twentyfifteen' );
if ( 'cyrillic' == $subset ) { if ( 'cyrillic' == $subset ) {

52
wp-content/themes/twentyfifteen/languages/twentyfifteen.pot
View File

@ -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. # This file is distributed under the GNU General Public License v2 or later.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Twenty Fifteen 1.0\n" "Project-Id-Version: Twenty Fifteen 1.0\n"
"Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyfifteen\n" "Report-Msgid-Bugs-To: http://wordpress.org/support/theme/twentyfifteen\n"
"POT-Creation-Date: 2014-12-14 12:26:59+00:00\n" "POT-Creation-Date: 2015-02-22 13:29:51+00:00\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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 <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -113,51 +113,51 @@ msgstr ""
msgid "Add widgets here to appear in your sidebar." msgid "Add widgets here to appear in your sidebar."
msgstr "" 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 #. by Noto Sans, translate this to 'off'. Do not translate into your own
#. language. #. language.
#: functions.php:158 #: functions.php:161
msgctxt "Noto Sans font: on or off" msgctxt "Noto Sans font: on or off"
msgid "on" msgid "on"
msgstr "" 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 #. by Noto Serif, translate this to 'off'. Do not translate into your own
#. language. #. language.
#: functions.php:163 #: functions.php:169
msgctxt "Noto Serif font: on or off" msgctxt "Noto Serif font: on or off"
msgid "on" msgid "on"
msgstr "" 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 #. by Inconsolata, translate this to 'off'. Do not translate into your own
#. language. #. language.
#: functions.php:168 #: functions.php:177
msgctxt "Inconsolata font: on or off" msgctxt "Inconsolata font: on or off"
msgid "on" msgid "on"
msgstr "" 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 #. language, translate this to 'greek', 'cyrillic', 'devanagari' or
#. 'vietnamese'. Do not translate into your own language. #. 'vietnamese'. Do not translate into your own language.
#: functions.php:173 #: functions.php:185
msgctxt "Add new subset (greek, cyrillic, devanagari, vietnamese)" msgctxt "Add new subset (greek, cyrillic, devanagari, vietnamese)"
msgid "no-subset" msgid "no-subset"
msgstr "" msgstr ""
#: functions.php:231 #: functions.php:255
msgid "expand child menu" msgid "expand child menu"
msgstr "" msgstr ""
#: functions.php:232 #: functions.php:256
msgid "collapse child menu" msgid "collapse child menu"
msgstr "" msgstr ""
#: header.php:27 #: header.php:26
msgid "Skip to content" msgid "Skip to content"
msgstr "" msgstr ""
#: header.php:44 #: header.php:43
msgid "Menu and widgets" msgid "Menu and widgets"
msgstr "" msgstr ""
@ -182,43 +182,43 @@ msgid ""
"version %s. Please upgrade and try again." "version %s. Please upgrade and try again."
msgstr "" msgstr ""
#: inc/customizer.php:36 #: inc/customizer.php:31
msgid "Base Color Scheme" msgid "Base Color Scheme"
msgstr "" msgstr ""
#: inc/customizer.php:51 #: inc/customizer.php:46
msgid "Header and Sidebar Text Color" msgid "Header and Sidebar Text Color"
msgstr "" 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." msgid "Applied to the header on small screens and the sidebar on wide screens."
msgstr "" msgstr ""
#: inc/customizer.php:67 #: inc/customizer.php:62
msgid "Header and Sidebar Background Color" msgid "Header and Sidebar Background Color"
msgstr "" msgstr ""
#: inc/customizer.php:97 #: inc/customizer.php:92
msgid "Default" msgid "Default"
msgstr "" msgstr ""
#: inc/customizer.php:108 #: inc/customizer.php:103
msgid "Dark" msgid "Dark"
msgstr "" msgstr ""
#: inc/customizer.php:119 #: inc/customizer.php:114
msgid "Yellow" msgid "Yellow"
msgstr "" msgstr ""
#: inc/customizer.php:130 #: inc/customizer.php:125
msgid "Pink" msgid "Pink"
msgstr "" msgstr ""
#: inc/customizer.php:141 #: inc/customizer.php:136
msgid "Purple" msgid "Purple"
msgstr "" msgstr ""
#: inc/customizer.php:152 #: inc/customizer.php:147
msgid "Blue" msgid "Blue"
msgstr "" msgstr ""

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.