From 7de0d9b82086d4c42ba85873f111572c6659180a Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 16 Dec 2014 22:02:43 +0000
Subject: [PATCH] Merge Twenty Fifteen commits [30834], [30845] to the 4.1
 branch. Built from https://develop.svn.wordpress.org/branches/4.1@30936

git-svn-id: http://core.svn.wordpress.org/branches/4.1@30925 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../twentyfifteen/languages/twentyfifteen.pot | 32 ++++++++++---------
 wp-content/themes/twentyfifteen/single.php    |  8 +++--
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot b/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot
index 9492a45121..2029927dba 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-12-10 23:27:35+00:00\n"
+"POT-Creation-Date: 2014-12-14 12:26:59+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -116,7 +116,7 @@ msgstr ""
 #. 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:157
+#: functions.php:158
 msgctxt "Noto Sans font: on or off"
 msgid "on"
 msgstr ""
@@ -124,7 +124,7 @@ msgstr ""
 #. 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:162
+#: functions.php:163
 msgctxt "Noto Serif font: on or off"
 msgid "on"
 msgstr ""
@@ -132,7 +132,7 @@ msgstr ""
 #. 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:167
+#: functions.php:168
 msgctxt "Inconsolata font: on or off"
 msgid "on"
 msgstr ""
@@ -140,16 +140,16 @@ msgstr ""
 #. 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:172
+#: functions.php:173
 msgctxt "Add new subset (greek, cyrillic, devanagari, vietnamese)"
 msgid "no-subset"
 msgstr ""
 
-#: functions.php:226
+#: functions.php:231
 msgid "expand child menu"
 msgstr ""
 
-#: functions.php:227
+#: functions.php:232
 msgid "collapse child menu"
 msgstr ""
 
@@ -290,17 +290,19 @@ msgid "Search Results for: %s"
 msgstr ""
 
 #: single.php:33
-msgctxt "Next post link"
-msgid ""
-"<span class=\"meta-nav\">Next <span class=\"screen-reader-text\">post: </"
-"span></span><span class=\"post-title\">%title</span>"
+msgid "Next"
 msgstr ""
 
 #: single.php:34
-msgctxt "Previous post link"
-msgid ""
-"<span class=\"meta-nav\">Previous <span class=\"screen-reader-text\">post: </"
-"span></span><span class=\"post-title\">%title</span>"
+msgid "Next post:"
+msgstr ""
+
+#: single.php:36
+msgid "Previous"
+msgstr ""
+
+#: single.php:37
+msgid "Previous post:"
 msgstr ""
 
 #. Theme Name of the plugin/theme
diff --git a/wp-content/themes/twentyfifteen/single.php b/wp-content/themes/twentyfifteen/single.php
index 3094a3b7d5..afbb7b5e4d 100644
--- a/wp-content/themes/twentyfifteen/single.php
+++ b/wp-content/themes/twentyfifteen/single.php
@@ -30,8 +30,12 @@ get_header(); ?>
 
 			// Previous/next post navigation.
 			the_post_navigation( array(
-				'next_text' => _x( '<span class="meta-nav">Next <span class="screen-reader-text">post: </span></span><span class="post-title">%title</span>', 'Next post link', 'twentyfifteen' ),
-				'prev_text' => _x( '<span class="meta-nav">Previous <span class="screen-reader-text">post: </span></span><span class="post-title">%title</span>', 'Previous post link', 'twentyfifteen' )
+				'next_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Next', 'twentyfifteen' ) . '</span> ' .
+					'<span class="screen-reader-text">' . __( 'Next post:', 'twentyfifteen' ) . '</span> ' .
+					'<span class="post-title">%title</span>',
+				'prev_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Previous', 'twentyfifteen' ) . '</span> ' .
+					'<span class="screen-reader-text">' . __( 'Previous post:', 'twentyfifteen' ) . '</span> ' .
+					'<span class="post-title">%title</span>',
 			) );
 
 		// End the loop.