<!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>[13750] trunk/wp-admin: Change "Blog" to "Site" in the Settings panels.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13750">13750</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-18 17:46:25 +0000 (Thu, 18 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change "Blog" to "Site" in the Settings panels.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminoptionsdiscussionphp">trunk/wp-admin/options-discussion.php</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
<li><a href="#trunkwpadminoptionsmediaphp">trunk/wp-admin/options-media.php</a></li>
<li><a href="#trunkwpadminoptionspermalinkphp">trunk/wp-admin/options-permalink.php</a></li>
<li><a href="#trunkwpadminoptionsprivacyphp">trunk/wp-admin/options-privacy.php</a></li>
<li><a href="#trunkwpadminoptionsreadingphp">trunk/wp-admin/options-reading.php</a></li>
<li><a href="#trunkwpadminoptionswritingphp">trunk/wp-admin/options-writing.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminoptionsdiscussionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-discussion.php (13749 => 13750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-discussion.php 2010-03-18 17:32:27 UTC (rev 13749)
+++ trunk/wp-admin/options-discussion.php 2010-03-18 17:46:25 UTC (rev 13750)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('admin.php');
</span><span class="cx">
</span><del>-if ( ! current_user_can('manage_options') )
- wp_die(__('You do not have sufficient permissions to manage options for this blog.'));
</del><ins>+if ( ! current_user_can( 'manage_options' ) )
+ wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</ins><span class="cx">
</span><span class="cx"> $title = __('Discussion Settings');
</span><span class="cx"> $parent_file = 'options-general.php';
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx">
</span><span class="cx"> <h3><?php _e('Avatars') ?></h3>
</span><span class="cx">
</span><del>-<p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your blog.'); ?></p>
</del><ins>+<p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site.'); ?></p>
</ins><span class="cx">
</span><span class="cx"> <?php // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that? ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (13749 => 13750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2010-03-18 17:32:27 UTC (rev 13749)
+++ trunk/wp-admin/options-general.php 2010-03-18 17:46:25 UTC (rev 13750)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span><del>-if ( ! current_user_can('manage_options') )
- wp_die(__('You do not have sufficient permissions to manage options for this blog.'));
</del><ins>+if ( ! current_user_can( 'manage_options' ) )
+ wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</ins><span class="cx">
</span><span class="cx"> $title = __('General Settings');
</span><span class="cx"> $parent_file = 'options-general.php';
</span><span class="lines">@@ -64,13 +64,13 @@
</span><span class="cx">
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr valign="top">
</span><del>-<th scope="row"><label for="blogname"><?php _e('Blog Title') ?></label></th>
</del><ins>+<th scope="row"><label for="blogname"><?php _e('Site Title') ?></label></th>
</ins><span class="cx"> <td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" class="regular-text" /></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="blogdescription"><?php _e('Tagline') ?></label></th>
</span><span class="cx"> <td><input name="blogdescription" type="text" id="blogdescription" value="<?php form_option('blogdescription'); ?>" class="regular-text" />
</span><del>-<span class="description"><?php _e('In a few words, explain what this blog is about.') ?></span></td>
</del><ins>+<span class="description"><?php _e('In a few words, explain what this site is about.') ?></span></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <?php if ( !is_multisite() ) { ?>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -78,9 +78,9 @@
</span><span class="cx"> <td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><del>-<th scope="row"><label for="home"><?php _e('Blog address (URL)') ?></label></th>
</del><ins>+<th scope="row"><label for="home"><?php _e('Site address (URL)') ?></label></th>
</ins><span class="cx"> <td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
</span><del>-<span class="description"><?php _e('Enter the address here if you want your blog homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></span></td>
</del><ins>+<span class="description"><?php _e('Enter the address here if you want your site homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></span></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="admin_email"><?php _e('E-mail address') ?> </label></th>
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> if ( !empty($lang_files) ) {
</span><span class="cx"> ?>
</span><span class="cx"> <tr valign="top">
</span><del>- <th width="33%" scope="row"><?php _e('Blog language:') ?></th>
</del><ins>+ <th width="33%" scope="row"><?php _e('Site language:') ?></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <select name="WPLANG" id="WPLANG">
</span><span class="cx"> <?php mu_dropdown_languages( $lang_files, get_option('WPLANG') ); ?>
</span></span></pre></div>
<a id="trunkwpadminoptionsmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-media.php (13749 => 13750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-media.php 2010-03-18 17:32:27 UTC (rev 13749)
+++ trunk/wp-admin/options-media.php 2010-03-18 17:46:25 UTC (rev 13750)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('admin.php');
</span><span class="cx">
</span><del>-if ( ! current_user_can('manage_options') )
- wp_die(__('You do not have sufficient permissions to manage options for this blog.'));
</del><ins>+if ( ! current_user_can( 'manage_options' ) )
+ wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</ins><span class="cx">
</span><span class="cx"> $title = __('Media Settings');
</span><span class="cx"> $parent_file = 'options-general.php';
</span></span></pre></div>
<a id="trunkwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-permalink.php (13749 => 13750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-permalink.php 2010-03-18 17:32:27 UTC (rev 13749)
+++ trunk/wp-admin/options-permalink.php 2010-03-18 17:46:25 UTC (rev 13750)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('admin.php');
</span><span class="cx">
</span><del>-if ( ! current_user_can('manage_options') )
- wp_die(__('You do not have sufficient permissions to manage options for this blog.'));
</del><ins>+if ( ! current_user_can( 'manage_options' ) )
+ wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</ins><span class="cx">
</span><span class="cx"> $title = __('Permalink Settings');
</span><span class="cx"> $parent_file = 'options-general.php';
</span></span></pre></div>
<a id="trunkwpadminoptionsprivacyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-privacy.php (13749 => 13750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-privacy.php 2010-03-18 17:32:27 UTC (rev 13749)
+++ trunk/wp-admin/options-privacy.php 2010-03-18 17:46:25 UTC (rev 13750)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> /** Load WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span><del>-if ( ! current_user_can('manage_options') )
- wp_die(__('You do not have sufficient permissions to manage options for this blog.'));
</del><ins>+if ( ! current_user_can( 'manage_options' ) )
+ wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</ins><span class="cx">
</span><span class="cx"> $title = __('Privacy Settings');
</span><span class="cx"> $parent_file = 'options-general.php';
</span><span class="lines">@@ -27,12 +27,12 @@
</span><span class="cx">
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr valign="top">
</span><del>-<th scope="row"><?php _e('Blog Visibility') ?> </th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Blog Visibility') ?> </span></legend>
-<p><input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
-<label for="blog-public"><?php _e('I would like my blog to be visible to everyone, including search engines (like Google, Bing, Technorati) and archivers');?></label></p>
-<p><input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
-<label for="blog-norobots"><?php _e('I would like to block search engines, but allow normal visitors'); ?></label></p>
</del><ins>+<th scope="row"><?php _e('Site Visibility') ?> </th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Site Visibility') ?> </span></legend>
+<input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
+<label for="blog-public"><?php _e('I would like my site to be visible to everyone, including search engines (like Google, Bing, Technorati) and archivers');?></label><br/>
+<input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
+<label for="blog-norobots"><?php _e('I would like to block search engines, but allow normal visitors'); ?></label>
</ins><span class="cx"> <?php do_action('blog_privacy_selector'); ?>
</span><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span></span></pre></div>
<a id="trunkwpadminoptionsreadingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-reading.php (13749 => 13750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-reading.php 2010-03-18 17:32:27 UTC (rev 13749)
+++ trunk/wp-admin/options-reading.php 2010-03-18 17:46:25 UTC (rev 13750)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> require_once( 'admin.php' );
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can( 'manage_options' ) )
</span><del>- wp_die( __( 'You do not have sufficient permissions to manage options for this blog.' ) );
</del><ins>+ wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</ins><span class="cx">
</span><span class="cx"> $title = __( 'Reading Settings' );
</span><span class="cx"> $parent_file = 'options-general.php';
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="blog_charset"><?php _e( 'Encoding for pages and feeds' ); ?></label></th>
</span><span class="cx"> <td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option( 'blog_charset' ); ?>" class="regular-text" />
</span><del>-<span class="description"><?php _e( 'The <a href="http://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your blog (UTF-8 is recommended, if you are adventurous there are some <a href="http://en.wikipedia.org/wiki/Character_set">other encodings</a>)' ); ?></span></td>
</del><ins>+<span class="description"><?php _e( 'The <a href="http://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended, if you are adventurous there are some <a href="http://en.wikipedia.org/wiki/Character_set">other encodings</a>)' ); ?></span></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <?php do_settings_fields( 'reading', 'default' ); ?>
</span><span class="cx"> </table>
</span></span></pre></div>
<a id="trunkwpadminoptionswritingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-writing.php (13749 => 13750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-writing.php 2010-03-18 17:32:27 UTC (rev 13749)
+++ trunk/wp-admin/options-writing.php 2010-03-18 17:46:25 UTC (rev 13750)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('admin.php');
</span><span class="cx">
</span><del>-if ( ! current_user_can('manage_options') )
- wp_die(__('You do not have sufficient permissions to manage options for this blog.'));
</del><ins>+if ( ! current_user_can( 'manage_options' ) )
+ wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</ins><span class="cx">
</span><span class="cx"> $title = __('Writing Settings');
</span><span class="cx"> $parent_file = 'options-general.php';
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx">
</span><span class="cx"> <?php else : ?>
</span><span class="cx">
</span><del>- <p><?php printf(__('WordPress is not notifying any <a href="http://codex.wordpress.org/Update_Services">Update Services</a> because of your blog&#8217;s <a href="%s">privacy settings</a>.'), 'options-privacy.php'); ?></p>
</del><ins>+ <p><?php printf(__('WordPress is not notifying any <a href="http://codex.wordpress.org/Update_Services">Update Services</a> because of your site&#8217;s <a href="%s">privacy settings</a>.'), 'options-privacy.php'); ?></p>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php } // multisite ?>
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (13749 => 13750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-03-18 17:32:27 UTC (rev 13749)
+++ trunk/wp-admin/plugins.php 2010-03-18 17:46:25 UTC (rev 13750)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('admin.php');
</span><span class="cx">
</span><del>-if ( ! current_user_can('activate_plugins') )
- wp_die(__('You do not have sufficient permissions to manage plugins for this blog.'));
</del><ins>+if ( ! current_user_can( 'activate_plugins' ) )
+ wp_die( __( 'You do not have sufficient permissions to manage plugins for this blog.' ) );
</ins><span class="cx">
</span><span class="cx"> if ( isset($_POST['clear-recent-list']) )
</span><span class="cx"> $action = 'clear-recent-list';
</span></span></pre>
</div>
</div>
</body>
</html>