From cfe0694f7bf860ea323f64010da0aac98fcf88fa Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Thu, 24 Oct 2013 22:53:14 +0000 Subject: [PATCH] Remove the old wp_auto_updates_maybe_update cron event. Schedule the new wp_maybe_auto_update event at 7 a.m. and 7 p.m. in the site's timezone. see #27704. Built from https://develop.svn.wordpress.org/trunk@25825 git-svn-id: http://core.svn.wordpress.org/trunk@25825 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- author.php | 8 +--- content.php | 8 +++- functions.php | 6 ++- languages/twentytwelve.pot | 84 +++++++++++++++++++------------------- style.css | 2 +- 5 files changed, 55 insertions(+), 53 deletions(-) diff --git a/author.php b/author.php index 6570108e7..9838bad34 100644 --- a/author.php +++ b/author.php @@ -48,13 +48,7 @@ get_header(); ?>
diff --git a/content.php b/content.php index daaad3447..6ba726188 100644 --- a/content.php +++ b/content.php @@ -50,7 +50,13 @@
diff --git a/functions.php b/functions.php index 405448107..aef6414fe 100644 --- a/functions.php +++ b/functions.php @@ -95,13 +95,15 @@ require( get_template_directory() . '/inc/custom-header.php' ); function twentytwelve_get_font_url() { $font_url = ''; - /* 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 Open Sans, translate this to 'off'. Do not translate into your own language. */ if ( 'off' !== _x( 'on', 'Open Sans font: on or off', 'twentytwelve' ) ) { $subsets = 'latin,latin-ext'; - /* translators: To add an additional Open Sans character subset specific to your language, + /* + * translators: To add an additional Open Sans character subset specific to your language, * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language. */ $subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' ); diff --git a/languages/twentytwelve.pot b/languages/twentytwelve.pot index a504372e6..2c1fed399 100644 --- a/languages/twentytwelve.pot +++ b/languages/twentytwelve.pot @@ -2,9 +2,9 @@ # This file is distributed under the GNU General Public License v2 or later. msgid "" msgstr "" -"Project-Id-Version: Twenty Twelve 1.3\n" +"Project-Id-Version: Twenty Twelve 1.2\n" "Report-Msgid-Bugs-To: http://wordpress.org/tags/twentytwelve\n" -"POT-Creation-Date: 2013-10-24 20:32:05+00:00\n" +"POT-Creation-Date: 2013-08-01 18:14:14+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -52,7 +52,7 @@ msgstr "" msgid "Author Archives: %s" msgstr "" -#: author.php:63 content.php:59 +#: author.php:53 content.php:53 msgid "About %s" msgstr "" @@ -83,7 +83,7 @@ msgid "Comments are closed." msgstr "" #: content-aside.php:15 content-image.php:13 content-link.php:14 -#: content-quote.php:13 content-status.php:31 content.php:41 +#: content-quote.php:13 content-status.php:21 content.php:39 msgid "Continue reading →" msgstr "" @@ -93,23 +93,23 @@ msgid "Permalink to %s" msgstr "" #: content-aside.php:23 content-image.php:23 content-link.php:21 -#: content-quote.php:20 content-status.php:37 content.php:30 +#: content-quote.php:20 content-status.php:27 content.php:28 msgid "Leave a reply" msgstr "" #: content-aside.php:23 content-image.php:23 content-link.php:21 -#: content-quote.php:20 content-status.php:37 content.php:30 +#: content-quote.php:20 content-status.php:27 content.php:28 msgid "1 Reply" msgstr "" #: content-aside.php:23 content-image.php:23 content-link.php:21 -#: content-quote.php:20 content-status.php:37 content.php:30 +#: content-quote.php:20 content-status.php:27 content.php:28 msgid "% Replies" msgstr "" #: content-aside.php:26 content-image.php:26 content-link.php:24 -#: content-page.php:24 content-quote.php:23 content-status.php:40 -#: content.php:48 functions.php:349 image.php:37 +#: content-page.php:24 content-quote.php:23 content-status.php:30 +#: content.php:46 functions.php:341 image.php:37 msgid "Edit" msgstr "" @@ -127,29 +127,29 @@ msgid "" "related post." msgstr "" -#: content-page.php:21 content.php:42 image.php:102 +#: content-page.php:21 content.php:40 image.php:92 msgid "Pages:" msgstr "" -#: content.php:16 +#: content.php:14 msgid "Featured post" msgstr "" -#: content.php:63 +#: content.php:57 msgid "View all posts by %s →" msgstr "" -#. #-#-#-#-# twentytwelve.pot (Twenty Twelve 1.3) #-#-#-#-# +#. #-#-#-#-# twentytwelve.pot (Twenty Twelve 1.2) #-#-#-#-# #. Author URI of the plugin/theme -#: footer.php:16 +#: footer.php:17 msgid "http://wordpress.org/" msgstr "" -#: footer.php:16 +#: footer.php:17 msgid "Semantic Personal Publishing Platform" msgstr "" -#: footer.php:16 +#: footer.php:17 msgid "Proudly powered by %s" msgstr "" @@ -158,111 +158,111 @@ msgid "Primary Menu" msgstr "" #. translators: If there are characters in your language that are not supported -#. * by Open Sans, translate this to 'off'. Do not translate into your own +#. by Open Sans, translate this to 'off'. Do not translate into your own #. language. -#: functions.php:101 +#: functions.php:100 msgctxt "Open Sans font: on or off" msgid "on" msgstr "" #. translators: To add an additional Open Sans character subset specific to -#. your language, -#. * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate -#. into your own language. -#: functions.php:107 +#. your language, translate +#. this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your +#. own language. +#: functions.php:105 msgctxt "Open Sans font: add new subset (greek, cyrillic, vietnamese)" msgid "no-subset" msgstr "" -#: functions.php:215 +#: functions.php:213 msgid "Page %s" msgstr "" -#: functions.php:244 +#: functions.php:238 msgid "Main Sidebar" msgstr "" -#: functions.php:246 +#: functions.php:240 msgid "" "Appears on posts and pages except the optional Front Page template, which " "has its own widgets" msgstr "" -#: functions.php:254 +#: functions.php:248 msgid "First Front Page Widget Area" msgstr "" -#: functions.php:256 functions.php:266 +#: functions.php:250 functions.php:260 msgid "" "Appears when using the optional Front Page template with a page set as " "Static Front Page" msgstr "" -#: functions.php:264 +#: functions.php:258 msgid "Second Front Page Widget Area" msgstr "" -#: functions.php:288 single.php:20 +#: functions.php:282 single.php:20 msgid "Post navigation" msgstr "" -#: functions.php:289 +#: functions.php:283 msgid "← Older posts" msgstr "" -#: functions.php:290 +#: functions.php:284 msgid "Newer posts →" msgstr "" -#: functions.php:317 +#: functions.php:309 msgid "Pingback:" msgstr "" -#: functions.php:317 +#: functions.php:309 msgid "(Edit)" msgstr "" -#: functions.php:332 +#: functions.php:324 msgid "Post author" msgstr "" #. translators: 1: date, 2: time -#: functions.php:338 +#: functions.php:330 msgid "%1$s at %2$s" msgstr "" -#: functions.php:344 +#: functions.php:336 msgid "Your comment is awaiting moderation." msgstr "" -#: functions.php:353 +#: functions.php:345 msgid "Reply" msgstr "" #. Translators: used between list items, there is a space after the comma. -#: functions.php:376 functions.php:379 +#: functions.php:364 functions.php:367 msgid ", " msgstr "" -#: functions.php:390 +#: functions.php:378 msgid "View all posts by %s" msgstr "" #. Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's #. name. -#: functions.php:396 +#: functions.php:384 msgid "" "This entry was posted in %1$s and tagged %2$s on %3$s by %4$s." msgstr "" -#: functions.php:398 +#: functions.php:386 msgid "" "This entry was posted in %1$s on %3$s by %4$s." msgstr "" -#: functions.php:400 +#: functions.php:388 msgid "This entry was posted on %3$s by %4$s." msgstr "" diff --git a/style.css b/style.css index 4786b5017..98007d3ad 100644 --- a/style.css +++ b/style.css @@ -4,7 +4,7 @@ Theme URI: http://wordpress.org/themes/twentytwelve Author: the WordPress team Author URI: http://wordpress.org/ Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background. -Version: 1.3 +Version: 1.2 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Tags: light, gray, white, one-column, two-columns, right-sidebar, flexible-width, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready