<!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>[13771] trunk/wp-admin: MS admin string improvements.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13771">13771</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-19 22:09:34 +0000 (Fri, 19 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>MS admin string improvements. fixes <a href="http://trac.wordpress.org/ticket/12436">#12436</a>, props mrmist.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
<li><a href="#trunkwpadminmsthemesphp">trunk/wp-admin/ms-themes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (13770 => 13771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-03-19 21:29:21 UTC (rev 13770)
+++ trunk/wp-admin/ms-options.php 2010-03-19 22:09:34 UTC (rev 13771)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> if ( !is_multisite() )
</span><span class="cx"> wp_die( __('Multisite support is not enabled.') );
</span><span class="cx">
</span><del>-$title = __('Options');
</del><ins>+$title = __('Network Options');
</ins><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="cx">
</span><span class="cx"> include('admin-header.php');
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <input name="admin_email" type="text" id="admin_email" style="width: 95%" value="<?php echo esc_attr( get_site_option('admin_email') ) ?>" size="45" />
</span><span class="cx"> <br />
</span><del>- <?php printf( __( 'Registration and support mails will come from this address. Make it generic like "support@%s"' ), $current_site->domain ); ?>
</del><ins>+ <?php printf( __( 'Registration and support emails will come from this address. An address such as "support@%s" is recommended.' ), $current_site->domain ); ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> <input name="dashboard_blog_orig" type="hidden" id="dashboard_blog_orig" value="<?php echo esc_attr($blogname); ?>" />
</span><span class="cx"> <input name="dashboard_blog" type="text" id="dashboard_blog" value="<?php echo esc_attr($blogname); ?>" size="30" />
</span><span class="cx"> <br />
</span><del>- <?php _e( "Blogname ('dashboard', 'control', 'manager', etc) or blog id.<br />New users are added to this site as subscribers (or the user role defined below) if they don't have a site. Leave blank for the main site. 'Subscriber' users on old site will be moved to the new site if changed. New site will be created if it does not exist." ); ?>
</del><ins>+ <?php _e( "Blogname ('dashboard', 'control', 'manager', etc) or blog id.<br />New users are added to this site as subscribers (or the user role defined below) if they don't have a site. Leave blank for the main site. 'Subscriber' users on old site will be moved to the new site if changed. The new site will be created if it does not exist." ); ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> </select>
</span><span class="cx"> <br />
</span><del>- <?php _e( "The default role for new users on the Dashboard site. This should probably be 'Subscriber' or maybe 'Contributor'." ); ?>
</del><ins>+ <?php _e( "The default role for new users on the Dashboard site. 'Subscriber' or 'Contributor' roles are recommended." ); ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> <a name='addnewusers'></a>
</span><span class="cx"> <input name="add_new_users" type="radio" id="add_new_users1" value='1' <?php checked( get_site_option('add_new_users'), 1 ) ?> /> <?php _e('Yes'); ?><br />
</span><span class="cx"> <input name="add_new_users" type="radio" id="add_new_users2" value='0' <?php checked( get_site_option('add_new_users'), 0 ) ?> /> <?php _e('No'); ?><br />
</span><del>- <?php _e('Allow site administrators to add new users to their site via the Users->Add New page.') ?>
</del><ins>+ <?php _e('Allow site administrators to add new users to their site via the "Users->Add New" page.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
</span><span class="cx"> <textarea name="limited_email_domains" id="limited_email_domains" cols='40' rows='5'><?php echo $limited_email_domains == '' ? '' : @implode( "\n", $limited_email_domains ); ?></textarea>
</span><span class="cx"> <br />
</span><del>- <?php _e('If you want to limit site registrations to certain domains. One domain per line.') ?>
</del><ins>+ <?php _e('If you want to limit site registrations to certain domains. Enter one domain per line.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <textarea name="banned_email_domains" id="banned_email_domains" cols='40' rows='5'><?php echo get_site_option('banned_email_domains') == '' ? '' : @implode( "\n", get_site_option('banned_email_domains') ); ?></textarea>
</span><span class="cx"> <br />
</span><del>- <?php _e('If you want to ban certain email domains from site registrations. One domain per line.') ?>
</del><ins>+ <?php _e('If you want to ban domains from site registrations. Enter one domain per line.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <textarea name="first_post" id="first_post" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_post') ) ?></textarea>
</span><span class="cx"> <br />
</span><del>- <?php _e('First post on a new site.') ?>
</del><ins>+ <?php _e('The first post on a new site.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <textarea name="first_page" id="first_page" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_page') ) ?></textarea>
</span><span class="cx"> <br />
</span><del>- <?php _e('First page on a new site.') ?>
</del><ins>+ <?php _e('The first page on a new site.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <textarea name="first_comment" id="first_comment" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_comment') ) ?></textarea>
</span><span class="cx"> <br />
</span><del>- <?php _e('First comment on a new site.') ?>
</del><ins>+ <?php _e('The first comment on a new site.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <input type="text" size='40' name="first_comment_author" id="first_comment_author" value="<?php echo get_site_option('first_comment_author') ?>" />
</span><span class="cx"> <br />
</span><del>- <?php _e('Author of first comment on a new site.') ?>
</del><ins>+ <?php _e('The author of the first comment on a new site.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <input type="text" size='40' name="first_comment_url" id="first_comment_url" value="<?php echo esc_attr(get_site_option('first_comment_url')) ?>" />
</span><span class="cx"> <br />
</span><del>- <?php _e('URL on first comment on a new site.') ?>
</del><ins>+ <?php _e('The URL for the first comment on a new site.') ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span></span></pre></div>
<a id="trunkwpadminmsthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-themes.php (13770 => 13771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-themes.php 2010-03-19 21:29:21 UTC (rev 13770)
+++ trunk/wp-admin/ms-themes.php 2010-03-19 22:09:34 UTC (rev 13771)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> require_once('admin.php');
</span><span class="cx">
</span><del>-$title = __('WordPress &rsaquo; Admin &rsaquo; Themes');
</del><ins>+$title = __('Network Themes');
</ins><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="cx"> require_once('admin-header.php');
</span><span class="cx">
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <form action='ms-edit.php?action=updatethemes' method='post'>
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>- <h2><?php _e('Site Themes') ?></h2>
- <p><?php _e('Disable themes site-wide. You can enable themes on a site by site basis.') ?></p>
</del><ins>+ <h2><?php _e('Network Themes') ?></h2>
+ <p><?php _e('Disable themes network-wide. You can enable themes on a site by site basis.') ?></p>
</ins><span class="cx"> <table class="widefat">
</span><span class="cx"> <thead>
</span><span class="cx"> <tr>
</span></span></pre>
</div>
</div>
</body>
</html>