<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[15200] trunk/wp-admin/includes/template.php: Revert accidental commit.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15200">15200</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-06-10 20:48:04 +0000 (Thu, 10 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert accidental commit. see <a href="http://trac.wordpress.org/changeset/15199">[15199]</a>, see <a href="http://trac.wordpress.org/ticket/13369">#13369</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (15199 => 15200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-06-10 20:44:54 UTC (rev 15199)
+++ trunk/wp-admin/includes/template.php 2010-06-10 20:48:04 UTC (rev 15200)
</span><span class="lines">@@ -3748,23 +3748,23 @@
</span><span class="cx"> $per_page_label = $post_type_object->labels->name;
</span><span class="cx"> break;
</span><span class="cx"> case 'ms-sites':
</span><del>- $per_page_label = _x( 'Sites', 'sites per page (screen options)' );
</del><ins>+ $per_page_label = __('Sites');
</ins><span class="cx"> break;
</span><span class="cx"> case 'ms-users':
</span><del>- $per_page_label = _x( 'Users', 'users per page (screen options)' );
</del><ins>+ $per_page_label = __('Users');
</ins><span class="cx"> break;
</span><span class="cx"> case 'edit-comments':
</span><del>- $per_page_label = _x( 'Comments', 'comments per page (screen options)' );
</del><ins>+ $per_page_label = __('Comments');
</ins><span class="cx"> break;
</span><span class="cx"> case 'upload':
</span><del>- $per_page_label = _x( 'Media items', 'items per page (screen options)' );
</del><ins>+ $per_page_label = __('Media items');
</ins><span class="cx"> break;
</span><span class="cx"> case 'edit-tags':
</span><span class="cx"> global $tax;
</span><span class="cx"> $per_page_label = $tax->labels->name;
</span><span class="cx"> break;
</span><span class="cx"> case 'plugins':
</span><del>- $per_page_label = _x( 'Plugins', 'plugins per page (screen options)' );
</del><ins>+ $per_page_label = __('Plugins');
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> return '';
</span></span></pre>
</div>
</div>
</body>
</html>