<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[30936] branches/4.1/src/wp-content/themes/twentyfifteen: Merge Twenty Fifteen commits [30834], [30845] to the 4.1 branch.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/30936">30936</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/30936","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-12-16 22:01:32 +0000 (Tue, 16 Dec 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Merge Twenty Fifteen commits <a href="https://core.trac.wordpress.org/changeset/30834">[30834]</a>, <a href="https://core.trac.wordpress.org/changeset/30845">[30845]</a> to the 4.1 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches41srcwpcontentthemestwentyfifteenlanguagestwentyfifteenpot">branches/4.1/src/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot</a></li>
<li><a href="#branches41srcwpcontentthemestwentyfifteensinglephp">branches/4.1/src/wp-content/themes/twentyfifteen/single.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches41srcwpcontentthemestwentyfifteenlanguagestwentyfifteenpot"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot 2014-12-16 22:01:07 UTC (rev 30935)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot 2014-12-16 22:01:32 UTC (rev 30936)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr ""
</span><span class="cx" style="display: block; padding: 0 10px"> "Project-Id-Version: Twenty Fifteen 1.0\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyfifteen\n"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-"POT-Creation-Date: 2014-12-10 23:27:35+00:00\n"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+"POT-Creation-Date: 2014-12-14 12:26:59+00:00\n"
</ins><span class="cx" style="display: block; padding: 0 10px"> "MIME-Version: 1.0\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "Content-Type: text/plain; charset=UTF-8\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "Content-Transfer-Encoding: 8bit\n"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #. translators: If there are characters in your language that are not supported
</span><span class="cx" style="display: block; padding: 0 10px"> #. by Noto Sans, translate this to 'off'. Do not translate into your own
</span><span class="cx" style="display: block; padding: 0 10px"> #. language.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#: functions.php:157
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#: functions.php:158
</ins><span class="cx" style="display: block; padding: 0 10px"> msgctxt "Noto Sans font: on or off"
</span><span class="cx" style="display: block; padding: 0 10px"> msgid "on"
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr ""
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #. translators: If there are characters in your language that are not supported
</span><span class="cx" style="display: block; padding: 0 10px"> #. by Noto Serif, translate this to 'off'. Do not translate into your own
</span><span class="cx" style="display: block; padding: 0 10px"> #. language.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#: functions.php:162
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#: functions.php:163
</ins><span class="cx" style="display: block; padding: 0 10px"> msgctxt "Noto Serif font: on or off"
</span><span class="cx" style="display: block; padding: 0 10px"> msgid "on"
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr ""
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #. translators: If there are characters in your language that are not supported
</span><span class="cx" style="display: block; padding: 0 10px"> #. by Inconsolata, translate this to 'off'. Do not translate into your own
</span><span class="cx" style="display: block; padding: 0 10px"> #. language.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#: functions.php:167
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#: functions.php:168
</ins><span class="cx" style="display: block; padding: 0 10px"> msgctxt "Inconsolata font: on or off"
</span><span class="cx" style="display: block; padding: 0 10px"> msgid "on"
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr ""
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,16 +140,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #. translators: To add an additional character subset specific to your
</span><span class="cx" style="display: block; padding: 0 10px"> #. language, translate this to 'greek', 'cyrillic', 'devanagari' or
</span><span class="cx" style="display: block; padding: 0 10px"> #. 'vietnamese'. Do not translate into your own language.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#: functions.php:172
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#: functions.php:173
</ins><span class="cx" style="display: block; padding: 0 10px"> msgctxt "Add new subset (greek, cyrillic, devanagari, vietnamese)"
</span><span class="cx" style="display: block; padding: 0 10px"> msgid "no-subset"
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr ""
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#: functions.php:226
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#: functions.php:231
</ins><span class="cx" style="display: block; padding: 0 10px"> msgid "expand child menu"
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr ""
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#: functions.php:227
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#: functions.php:232
</ins><span class="cx" style="display: block; padding: 0 10px"> msgid "collapse child menu"
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr ""
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,19 +290,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr ""
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> #: single.php:33
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-msgctxt "Next post link"
-msgid ""
-"<span class=\"meta-nav\">Next <span class=\"screen-reader-text\">post: </"
-"span></span><span class=\"post-title\">%title</span>"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+msgid "Next"
</ins><span class="cx" style="display: block; padding: 0 10px"> msgstr ""
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> #: single.php:34
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-msgctxt "Previous post link"
-msgid ""
-"<span class=\"meta-nav\">Previous <span class=\"screen-reader-text\">post: </"
-"span></span><span class=\"post-title\">%title</span>"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+msgid "Next post:"
</ins><span class="cx" style="display: block; padding: 0 10px"> msgstr ""
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#: single.php:36
+msgid "Previous"
+msgstr ""
+
+#: single.php:37
+msgid "Previous post:"
+msgstr ""
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #. Theme Name of the plugin/theme
</span><span class="cx" style="display: block; padding: 0 10px"> msgid "Twenty Fifteen"
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr ""
</span></span></pre></div>
<a id="branches41srcwpcontentthemestwentyfifteensinglephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/single.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/single.php 2014-12-16 22:01:07 UTC (rev 30935)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/single.php 2014-12-16 22:01:32 UTC (rev 30936)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,8 +30,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Previous/next post navigation.
</span><span class="cx" style="display: block; padding: 0 10px"> the_post_navigation( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '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' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '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>',
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // End the loop.
</span></span></pre>
</div>
</div>
</body>
</html>