WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MS admin string improvements. fixes #12436, props mrmist. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-03-19 22:09:34 +00:00
parent 30d6eb32c6
commit 2c80016b6a
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wp-admin/ms-options.php
View File

@ -4,7 +4,7 @@ require_once('admin.php');
if ( !is_multisite() ) if ( !is_multisite() )
wp_die( __('Multisite support is not enabled.') ); wp_die( __('Multisite support is not enabled.') );
$title = __('Options'); $title = __('Network Options');
$parent_file = 'ms-admin.php'; $parent_file = 'ms-admin.php';
include('admin-header.php'); include('admin-header.php');
@ -40,7 +40,7 @@ if (isset($_GET['updated'])) {
<td> <td>
<input name="admin_email" type="text" id="admin_email" style="width: 95%" value="<?php echo esc_attr( get_site_option('admin_email') ) ?>" size="45" /> <input name="admin_email" type="text" id="admin_email" style="width: 95%" value="<?php echo esc_attr( get_site_option('admin_email') ) ?>" size="45" />
<br /> <br />
<?php printf( __( 'Registration and support mails will come from this address. Make it generic like "support@%s"' ), $current_site->domain ); ?> <?php printf( __( 'Registration and support emails will come from this address. An address such as "support@%s" is recommended.' ), $current_site->domain ); ?>
</td> </td>
</tr> </tr>
@ -67,7 +67,7 @@ if (isset($_GET['updated'])) {
<input name="dashboard_blog_orig" type="hidden" id="dashboard_blog_orig" value="<?php echo esc_attr($blogname); ?>" /> <input name="dashboard_blog_orig" type="hidden" id="dashboard_blog_orig" value="<?php echo esc_attr($blogname); ?>" />
<input name="dashboard_blog" type="text" id="dashboard_blog" value="<?php echo esc_attr($blogname); ?>" size="30" /> <input name="dashboard_blog" type="text" id="dashboard_blog" value="<?php echo esc_attr($blogname); ?>" size="30" />
<br /> <br />
<?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." ); ?> <?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." ); ?>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
@ -78,7 +78,7 @@ if (isset($_GET['updated'])) {
?> ?>
</select> </select>
<br /> <br />
<?php _e( "The default role for new users on the Dashboard site. This should probably be 'Subscriber' or maybe 'Contributor'." ); ?> <?php _e( "The default role for new users on the Dashboard site. 'Subscriber' or 'Contributor' roles are recommended." ); ?>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
@ -128,7 +128,7 @@ if (isset($_GET['updated'])) {
<a name='addnewusers'></a> <a name='addnewusers'></a>
<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 /> <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 />
<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 /> <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 />
<?php _e('Allow site administrators to add new users to their site via the Users->Add New page.') ?> <?php _e('Allow site administrators to add new users to their site via the "Users->Add New" page.') ?>
</td> </td>
</tr> </tr>
@ -148,7 +148,7 @@ if (isset($_GET['updated'])) {
$limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?> $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
<textarea name="limited_email_domains" id="limited_email_domains" cols='40' rows='5'><?php echo $limited_email_domains == '' ? '' : @implode( "\n", $limited_email_domains ); ?></textarea> <textarea name="limited_email_domains" id="limited_email_domains" cols='40' rows='5'><?php echo $limited_email_domains == '' ? '' : @implode( "\n", $limited_email_domains ); ?></textarea>
<br /> <br />
<?php _e('If you want to limit site registrations to certain domains. One domain per line.') ?> <?php _e('If you want to limit site registrations to certain domains. Enter one domain per line.') ?>
</td> </td>
</tr> </tr>
@ -157,7 +157,7 @@ if (isset($_GET['updated'])) {
<td> <td>
<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> <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>
<br /> <br />
<?php _e('If you want to ban certain email domains from site registrations. One domain per line.') ?> <?php _e('If you want to ban domains from site registrations. Enter one domain per line.') ?>
</td> </td>
</tr> </tr>
@ -186,7 +186,7 @@ if (isset($_GET['updated'])) {
<td> <td>
<textarea name="first_post" id="first_post" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_post') ) ?></textarea> <textarea name="first_post" id="first_post" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_post') ) ?></textarea>
<br /> <br />
<?php _e('First post on a new site.') ?> <?php _e('The first post on a new site.') ?>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
@ -194,7 +194,7 @@ if (isset($_GET['updated'])) {
<td> <td>
<textarea name="first_page" id="first_page" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_page') ) ?></textarea> <textarea name="first_page" id="first_page" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_page') ) ?></textarea>
<br /> <br />
<?php _e('First page on a new site.') ?> <?php _e('The first page on a new site.') ?>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
@ -202,7 +202,7 @@ if (isset($_GET['updated'])) {
<td> <td>
<textarea name="first_comment" id="first_comment" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_comment') ) ?></textarea> <textarea name="first_comment" id="first_comment" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_comment') ) ?></textarea>
<br /> <br />
<?php _e('First comment on a new site.') ?> <?php _e('The first comment on a new site.') ?>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
@ -210,7 +210,7 @@ if (isset($_GET['updated'])) {
<td> <td>
<input type="text" size='40' name="first_comment_author" id="first_comment_author" value="<?php echo get_site_option('first_comment_author') ?>" /> <input type="text" size='40' name="first_comment_author" id="first_comment_author" value="<?php echo get_site_option('first_comment_author') ?>" />
<br /> <br />
<?php _e('Author of first comment on a new site.') ?> <?php _e('The author of the first comment on a new site.') ?>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
@ -218,7 +218,7 @@ if (isset($_GET['updated'])) {
<td> <td>
<input type="text" size='40' name="first_comment_url" id="first_comment_url" value="<?php echo esc_attr(get_site_option('first_comment_url')) ?>" /> <input type="text" size='40' name="first_comment_url" id="first_comment_url" value="<?php echo esc_attr(get_site_option('first_comment_url')) ?>" />
<br /> <br />
<?php _e('URL on first comment on a new site.') ?> <?php _e('The URL for the first comment on a new site.') ?>
</td> </td>
</tr> </tr>
</table> </table>

6
wp-admin/ms-themes.php
View File

@ -1,7 +1,7 @@
<?php <?php
require_once('admin.php'); require_once('admin.php');
$title = __('WordPress &rsaquo; Admin &rsaquo; Themes'); $title = __('Network Themes');
$parent_file = 'ms-admin.php'; $parent_file = 'ms-admin.php';
require_once('admin-header.php'); require_once('admin-header.php');
@ -20,8 +20,8 @@ $allowed_themes = get_site_allowed_themes();
<div class="wrap"> <div class="wrap">
<form action='ms-edit.php?action=updatethemes' method='post'> <form action='ms-edit.php?action=updatethemes' method='post'>
<?php screen_icon(); ?> <?php screen_icon(); ?>
<h2><?php _e('Site Themes') ?></h2> <h2><?php _e('Network Themes') ?></h2>
<p><?php _e('Disable themes site-wide. You can enable themes on a site by site basis.') ?></p> <p><?php _e('Disable themes network-wide. You can enable themes on a site by site basis.') ?></p>
<table class="widefat"> <table class="widefat">
<thead> <thead>
<tr> <tr>