<!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>[18247] trunk: Add context to _e('Name'), props valentinas, fixes #16531</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/18247">18247</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-06-10 22:13:26 +0000 (Fri, 10 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add context to _e('Name'), props valentinas, fixes <a href="http://trac.wordpress.org/ticket/16531">#16531</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditlinkformphp">trunk/wp-admin/edit-link-form.php</a></li>
<li><a href="#trunkwpadminincludesclasswplinkslisttablephp">trunk/wp-admin/includes/class-wp-links-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpplugininstalllisttablephp">trunk/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswptermslisttablephp">trunk/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpincludesjstinymcelangswplangsphp">trunk/wp-includes/js/tinymce/langs/wp-langs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditlinkformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-link-form.php (18246 => 18247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-link-form.php 2011-06-10 22:01:52 UTC (rev 18246)
+++ trunk/wp-admin/edit-link-form.php 2011-06-10 22:13:26 UTC (rev 18247)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> <div id="post-body">
</span><span class="cx"> <div id="post-body-content">
</span><span class="cx"> <div id="namediv" class="stuffbox">
</span><del>-<h3><label for="link_name"><?php _e('Name') ?></label></h3>
</del><ins>+<h3><label for="link_name"><?php _ex('Name', 'link name') ?></label></h3>
</ins><span class="cx"> <div class="inside">
</span><span class="cx"> <input type="text" name="link_name" size="30" tabindex="1" value="<?php echo esc_attr($link->link_name); ?>" id="link_name" />
</span><span class="cx"> <p><?php _e('Example: Nifty blogging software'); ?></p>
</span></span></pre></div>
<a id="trunkwpadminincludesclasswplinkslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-links-list-table.php (18246 => 18247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-links-list-table.php 2011-06-10 22:01:52 UTC (rev 18246)
+++ trunk/wp-admin/includes/class-wp-links-list-table.php 2011-06-10 22:13:26 UTC (rev 18247)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> function get_columns() {
</span><span class="cx"> return array(
</span><span class="cx"> 'cb' => '<input type="checkbox" />',
</span><del>- 'name' => __( 'Name' ),
</del><ins>+ 'name' => _x( 'Name', 'link name' ),
</ins><span class="cx"> 'url' => __( 'URL' ),
</span><span class="cx"> 'categories' => __( 'Categories' ),
</span><span class="cx"> 'rel' => __( 'Relationship' ),
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpplugininstalllisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-plugin-install-list-table.php (18246 => 18247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-plugin-install-list-table.php 2011-06-10 22:01:52 UTC (rev 18246)
+++ trunk/wp-admin/includes/class-wp-plugin-install-list-table.php 2011-06-10 22:13:26 UTC (rev 18247)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx">
</span><span class="cx"> function get_columns() {
</span><span class="cx"> return array(
</span><del>- 'name' => __( 'Name' ),
</del><ins>+ 'name' => _x( 'Name', 'plugin name' ),
</ins><span class="cx"> 'version' => __( 'Version' ),
</span><span class="cx"> 'rating' => __( 'Rating' ),
</span><span class="cx"> 'description' => __( 'Description' ),
</span></span></pre></div>
<a id="trunkwpadminincludesclasswptermslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-terms-list-table.php (18246 => 18247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-terms-list-table.php 2011-06-10 22:01:52 UTC (rev 18246)
+++ trunk/wp-admin/includes/class-wp-terms-list-table.php 2011-06-10 22:13:26 UTC (rev 18247)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> $columns = array(
</span><span class="cx"> 'cb' => '<input type="checkbox" />',
</span><del>- 'name' => __( 'Name' ),
</del><ins>+ 'name' => _x( 'Name', 'term name' ),
</ins><span class="cx"> 'description' => __( 'Description' ),
</span><span class="cx"> 'slug' => __( 'Slug' ),
</span><span class="cx"> );
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx"> <h4><?php _e( 'Quick Edit' ); ?></h4>
</span><span class="cx">
</span><span class="cx"> <label>
</span><del>- <span class="title"><?php _e( 'Name' ); ?></span>
</del><ins>+ <span class="title"><?php _ex( 'Name', 'term name' ); ?></span>
</ins><span class="cx"> <span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>
</span><span class="cx"> </label>
</span><span class="cx"> <?php if ( !global_terms_enabled() ) { ?>
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (18246 => 18247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2011-06-10 22:01:52 UTC (rev 18246)
+++ trunk/wp-admin/includes/template.php 2011-06-10 22:13:26 UTC (rev 18247)
</span><span class="lines">@@ -425,7 +425,7 @@
</span><span class="cx"> <table id="list-table" style="display: none;">
</span><span class="cx"> <thead>
</span><span class="cx"> <tr>
</span><del>- <th class="left">' . __( 'Name' ) . '</th>
</del><ins>+ <th class="left">' . _x( 'Name', 'meta name' ) . '</th>
</ins><span class="cx"> <th>' . __( 'Value' ) . '</th>
</span><span class="cx"> </tr>
</span><span class="cx"> </thead>
</span><span class="lines">@@ -440,7 +440,7 @@
</span><span class="cx"> <table id="list-table">
</span><span class="cx"> <thead>
</span><span class="cx"> <tr>
</span><del>- <th class="left"><?php _e( 'Name' ) ?></th>
</del><ins>+ <th class="left"><?php _ex( 'Name', 'meta name' ) ?></th>
</ins><span class="cx"> <th><?php _e( 'Value' ) ?></th>
</span><span class="cx"> </tr>
</span><span class="cx"> </thead>
</span><span class="lines">@@ -535,7 +535,7 @@
</span><span class="cx"> <table id="newmeta">
</span><span class="cx"> <thead>
</span><span class="cx"> <tr>
</span><del>-<th class="left"><label for="metakeyselect"><?php _e( 'Name' ) ?></label></th>
</del><ins>+<th class="left"><label for="metakeyselect"><?php _ex( 'Name', 'meta name' ) ?></label></th>
</ins><span class="cx"> <th><label for="metavalue"><?php _e( 'Value' ) ?></label></th>
</span><span class="cx"> </tr>
</span><span class="cx"> </thead>
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (18246 => 18247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2011-06-10 22:01:52 UTC (rev 18246)
+++ trunk/wp-admin/themes.php 2011-06-10 22:13:26 UTC (rev 18247)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx">
</span><span class="cx"> <table id="broken-themes">
</span><span class="cx"> <tr>
</span><del>- <th><?php _e('Name'); ?></th>
</del><ins>+ <th><?php _ex('Name', 'theme name'); ?></th>
</ins><span class="cx"> <th><?php _e('Description'); ?></th>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpincludesjstinymcelangswplangsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/langs/wp-langs.php (18246 => 18247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/langs/wp-langs.php 2011-06-10 22:01:52 UTC (rev 18246)
+++ trunk/wp-includes/js/tinymce/langs/wp-langs.php 2011-06-10 22:13:26 UTC (rev 18247)
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx"> colorpicker_named_tab:"' . mce_escape( __('Named') ) . '",
</span><span class="cx"> colorpicker_named_title:"' . mce_escape( __('Named colors') ) . '",
</span><span class="cx"> colorpicker_color:"' . mce_escape( __('Color:') ) . '",
</span><del>-colorpicker_name:"' . mce_escape( __('Name:') ) . '",
</del><ins>+colorpicker_name:"' . mce_escape( _x('Name:', 'html attribute') ) . '",
</ins><span class="cx"> charmap_title:"' . mce_escape( __('Select custom character') ) . '",
</span><span class="cx"> image_title:"' . mce_escape( __('Insert/edit image') ) . '",
</span><span class="cx"> image_src:"' . mce_escape( __('Image URL') ) . '",
</span><span class="lines">@@ -363,7 +363,7 @@
</span><span class="cx"> constrain_proportions:"' . mce_escape( __('Constrain proportions') ) . '",
</span><span class="cx"> type:"' . mce_escape( __('Type') ) . '",
</span><span class="cx"> id:"' . mce_escape( __('Id') ) . '",
</span><del>-name:"' . mce_escape( __('Name') ) . '",
</del><ins>+name:"' . mce_escape( _x('Name', 'html attribute') ) . '",
</ins><span class="cx"> class_name:"' . mce_escape( __('Class') ) . '",
</span><span class="cx"> vspace:"' . mce_escape( __('V-Space') ) . '",
</span><span class="cx"> hspace:"' . mce_escape( __('H-Space') ) . '",
</span></span></pre>
</div>
</div>
</body>
</html>