<!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>[14315] trunk: s/blog/site/ in even more places.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14315">14315</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-30 03:17:49 +0000 (Fri, 30 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>s/blog/site/ in even more places. props PeteMall, see <a href="http://trac.wordpress.org/ticket/11644">#11644</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
<li><a href="#trunkwpadminimportbloggerphp">trunk/wp-admin/import/blogger.php</a></li>
<li><a href="#trunkwpadminimportdotclearphp">trunk/wp-admin/import/dotclear.php</a></li>
<li><a href="#trunkwpadminimportrssphp">trunk/wp-admin/import/rss.php</a></li>
<li><a href="#trunkwpadminimportwordpressphp">trunk/wp-admin/import/wordpress.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpadmininstallphp">trunk/wp-admin/install.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadmintoolsphp">trunk/wp-admin/tools.php</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
<li><a href="#trunkwpappphp">trunk/wp-app.php</a></li>
<li><a href="#trunkwpincludesdefaultwidgetsphp">trunk/wp-includes/default-widgets.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
<li><a href="#trunkxmlrpcphp">trunk/xmlrpc.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-admin/custom-header.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -414,7 +414,7 @@
</span><span class="cx"> endif;
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>-<h3><?php _e('Upload New Header Image'); ?></h3><p><?php _e('Here you can upload a custom header image to be shown at the top of your blog instead of the default one. On the next screen you will be able to crop the image.'); ?> <?php printf(__('Images of exactly <strong>%1$d x %2$d pixels</strong> will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?></p>
</del><ins>+<h3><?php _e('Upload New Header Image'); ?></h3><p><?php _e('Here you can upload a custom header image to be shown at the top of your site instead of the default one. On the next screen you will be able to crop the image.'); ?> <?php printf(__('Images of exactly <strong>%1$d x %2$d pixels</strong> will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?></p>
</ins><span class="cx">
</span><span class="cx"> <form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo esc_attr(add_query_arg('step', 2)) ?>">
</span><span class="cx"> <label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" />
</span></span></pre></div>
<a id="trunkwpadminimportbloggerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/blogger.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/blogger.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-admin/import/blogger.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> $next_url = get_option('siteurl') . '/wp-admin/index.php?import=blogger&amp;noheader=true';
</span><span class="cx"> $auth_url = "https://www.google.com/accounts/AuthSubRequest";
</span><span class="cx"> $title = __('Import Blogger');
</span><del>- $welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.');
</del><ins>+ $welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress site.');
</ins><span class="cx"> $prereqs = __('To use this importer, you must have a Google account and an upgraded (New, was Beta) blog hosted on blogspot.com or a custom domain (not FTP).');
</span><span class="cx"> $stepone = __('The first thing you need to do is tell Blogger to let WordPress access your account. You will be sent back here after providing authorization.');
</span><span class="cx"> $auth = esc_attr__('Authorize');
</span></span></pre></div>
<a id="trunkwpadminimportdotclearphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/dotclear.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/dotclear.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-admin/import/dotclear.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> function greet()
</span><span class="cx"> {
</span><del>- echo '<div class="narrow"><p>'.__('Howdy! This importer allows you to extract posts from a DotClear database into your blog. Mileage may vary.').'</p>';
</del><ins>+ echo '<div class="narrow"><p>'.__('Howdy! This importer allows you to extract posts from a DotClear database into your WordPress site. Mileage may vary.').'</p>';
</ins><span class="cx"> echo '<p>'.__('Your DotClear Configuration settings are as follows:').'</p>';
</span><span class="cx"> echo '<form action="admin.php?import=dotclear&amp;step=1" method="post">';
</span><span class="cx"> wp_nonce_field('import-dotclear');
</span></span></pre></div>
<a id="trunkwpadminimportrssphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/rss.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/rss.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-admin/import/rss.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> function greet() {
</span><span class="cx"> echo '<div class="narrow">';
</span><del>- echo '<p>'.__('Howdy! This importer allows you to extract posts from an RSS 2.0 file into your blog. This is useful if you want to import your posts from a system that is not handled by a custom import tool. Pick an RSS file to upload and click Import.').'</p>';
</del><ins>+ echo '<p>'.__('Howdy! This importer allows you to extract posts from an RSS 2.0 file into your WordPress site. This is useful if you want to import your posts from a system that is not handled by a custom import tool. Pick an RSS file to upload and click Import.').'</p>';
</ins><span class="cx"> wp_import_upload_form("admin.php?import=rss&amp;step=1");
</span><span class="cx"> echo '</div>';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminimportwordpressphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/wordpress.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/wordpress.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-admin/import/wordpress.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> function greet() {
</span><span class="cx"> echo '<div class="narrow">';
</span><del>- echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts, pages, comments, custom fields, categories, and tags into this blog.').'</p>';
</del><ins>+ echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts, pages, comments, custom fields, categories, and tags into this site.').'</p>';
</ins><span class="cx"> echo '<p>'.__('Choose a WordPress WXR file to upload, then click Upload file and import.').'</p>';
</span><span class="cx"> wp_import_upload_form("admin.php?import=wordpress&amp;step=1");
</span><span class="cx"> echo '</div>';
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-admin/includes/meta-boxes.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx"> <p><label for="trackback_url"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p>
</span><del>-<p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress blogs they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p>
</del><ins>+<p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress sites they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p>
</ins><span class="cx"> <?php
</span><span class="cx"> if ( ! empty($pings) )
</span><span class="cx"> echo $pings;
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-admin/includes/plugin.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -373,9 +373,9 @@
</span><span class="cx">
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> $dropins['sunrise.php' ] = array( __( 'Executed before Multisite is loaded.' ), 'SUNRISE' ); // SUNRISE
</span><del>- $dropins['blog-deleted.php' ] = array( __( 'Custom blog deleted message.' ), true ); // auto on deleted blog
- $dropins['blog-inactive.php' ] = array( __( 'Custom blog inactive message.' ), true ); // auto on inactive blog
- $dropins['blog-suspended.php'] = array( __( 'Custom blog suspended message.' ), true ); // auto on archived or spammed blog
</del><ins>+ $dropins['blog-deleted.php' ] = array( __( 'Custom site deleted message.' ), true ); // auto on deleted blog
+ $dropins['blog-inactive.php' ] = array( __( 'Custom site inactive message.' ), true ); // auto on inactive blog
+ $dropins['blog-suspended.php'] = array( __( 'Custom site suspended message.' ), true ); // auto on archived or spammed blog
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $dropins;
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-admin/includes/post.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -486,9 +486,9 @@
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( $ptype->edit_type_cap ) ) {
</span><span class="cx"> if ( 'page' == $ptype->name )
</span><del>- return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this blog.' ) );
</del><ins>+ return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) );
</ins><span class="cx"> else
</span><del>- return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this blog.' ) );
</del><ins>+ return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Check for autosave collisions
</span></span></pre></div>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-admin/includes/schema.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx">
</span><span class="cx"> $options = array(
</span><span class="cx"> 'siteurl' => $guessurl,
</span><del>- 'blogname' => __('My Blog'),
</del><ins>+ 'blogname' => __('My Site'),
</ins><span class="cx"> /* translators: blog tagline */
</span><span class="cx"> 'blogdescription' => __('Just another WordPress site'),
</span><span class="cx"> 'users_can_register' => 0,
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-admin/includes/upgrade.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> $user = new WP_User($user_id);
</span><span class="cx"> $email = $user->user_email;
</span><span class="cx"> $name = $user->user_login;
</span><del>- $message = sprintf(__("Your new WordPress blog has been successfully set up at:
</del><ins>+ $message = sprintf(__("Your new WordPress site has been successfully set up at:
</ins><span class="cx">
</span><span class="cx"> %1\$s
</span><span class="cx">
</span><span class="lines">@@ -326,7 +326,7 @@
</span><span class="cx"> http://wordpress.org/
</span><span class="cx"> "), $blog_url, $name, $password);
</span><span class="cx">
</span><del>- @wp_mail($email, __('New WordPress Blog'), $message);
</del><ins>+ @wp_mail($email, __('New WordPress Site'), $message);
</ins><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/install.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/install.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-admin/install.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> <form id="setup" method="post" action="install.php?step=2">
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr>
</span><del>- <th scope="row"><label for="weblog_title"><?php _e( 'Blog Title' ); ?></label></th>
</del><ins>+ <th scope="row"><label for="weblog_title"><?php _e( 'Site Title' ); ?></label></th>
</ins><span class="cx"> <td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> <p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><del>- <td colspan="2"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow my blog to appear in search engines like Google and Technorati.' ); ?></label></td>
</del><ins>+ <td colspan="2"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow my site to appear in search engines like Google and Technorati.' ); ?></label></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx"> <p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button" /></p>
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-admin/ms-sites.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -647,7 +647,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else { ?>
</span><span class="cx"> <tr>
</span><del>- <td colspan="<?php echo (int) count( $sites_columns ); ?>"><?php _e( 'No blogs found.' ) ?></td>
</del><ins>+ <td colspan="<?php echo (int) count( $sites_columns ); ?>"><?php _e( 'No sites found.' ) ?></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <?php
</span><span class="cx"> } // end if ($blogs)
</span></span></pre></div>
<a id="trunkwpadmintoolsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/tools.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/tools.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-admin/tools.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> <h3 class="title"><?php _e('Press This') ?></h3>
</span><span class="cx"> <p><?php _e('Press This is a bookmarklet: a little app that runs in your browser and lets you grab bits of the web.');?></p>
</span><span class="cx">
</span><del>- <p><?php _e('Use Press This to clip text, images and videos from any web page. Then edit and add more straight from Press This before you save or publish it in a post on your blog.'); ?></p>
</del><ins>+ <p><?php _e('Use Press This to clip text, images and videos from any web page. Then edit and add more straight from Press This before you save or publish it in a post on your site.'); ?></p>
</ins><span class="cx"> <p><?php _e('Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut.') ?></p>
</span><span class="cx"> <p class="pressthis"><a href="<?php echo htmlspecialchars( get_shortcut_link() ); ?>" title="<?php echo esc_attr(__('Press This')) ?>"><?php _e('Press This') ?></a></p>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-admin/user-edit.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -223,9 +223,9 @@
</span><span class="cx">
</span><span class="cx"> // print the 'no role' option. Make it selected if the user has no role yet.
</span><span class="cx"> if ( $user_role )
</span><del>- echo '<option value="">' . __('&mdash; No role for this blog &mdash;') . '</option>';
</del><ins>+ echo '<option value="">' . __('&mdash; No role for this site &mdash;') . '</option>';
</ins><span class="cx"> else
</span><del>- echo '<option value="" selected="selected">' . __('&mdash; No role for this blog &mdash;') . '</option>';
</del><ins>+ echo '<option value="" selected="selected">' . __('&mdash; No role for this site &mdash;') . '</option>';
</ins><span class="cx"> ?>
</span><span class="cx"> </select>
</span><span class="cx"> <?php if ( is_multisite() && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?>
</span></span></pre></div>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-admin/user-new.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
</span><span class="cx">
</span><span class="cx"> function admin_created_user_subject( $text ) {
</span><del>- return "[" . get_bloginfo('name') . "] Your blog invite";
</del><ins>+ return "[" . get_bloginfo('name') . "] Your site invite";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> else
</span><span class="cx"> echo '<p>' . sprintf(__('Users cannot currently <a href="%1$s">register themselves</a>, but you can manually create users here.'), admin_url('options-general.php#users_can_register')) . '</p>';
</span><span class="cx"> } else {
</span><del>- echo '<p>' . __( 'You can add new users to your blog in two ways:' ) . '<ol><li> ' . __( 'Enter the username and email address of an existing user on this site.' ) . '</li><li> ' . __( 'Enter the username and the email address of a person who is not already a member of this site. Choose the username carefully, it cannot be changed.' ) . '</li></ol></p>';
</del><ins>+ echo '<p>' . __( 'You can add new users to your site in two ways:' ) . '<ol><li> ' . __( 'Enter the username and email address of an existing user on this site.' ) . '</li><li> ' . __( 'Enter the username and the email address of a person who is not already a member of this site. Choose the username carefully, it cannot be changed.' ) . '</li></ol></p>';
</ins><span class="cx"> echo '<p>' . __( 'That person will be sent an email asking them to click a link confirming the invite. New users will then be sent an email with a randomly generated password and a login link.' ) . '</p>';
</span><span class="cx"> }
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-admin/users.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>-<h2><?php _e('Remove Users from Blog'); ?></h2>
</del><ins>+<h2><?php _e('Remove Users from Site'); ?></h2>
</ins><span class="cx"> <p><?php _e('You have specified these users for removal:'); ?></p>
</span><span class="cx"> <ul>
</span><span class="cx"> <?php
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> $messages[] = '<div id="message" class="updated"><p>' . __('Other users have been deleted.') . '</p></div>';
</span><span class="cx"> break;
</span><span class="cx"> case 'remove':
</span><del>- $messages[] = '<div id="message" class="updated fade"><p>' . __('User removed from this blog.') . '</p></div>';
</del><ins>+ $messages[] = '<div id="message" class="updated fade"><p>' . __('User removed from this site.') . '</p></div>';
</ins><span class="cx"> break;
</span><span class="cx"> case 'err_admin_remove':
</span><span class="cx"> $messages[] = '<div id="message" class="error"><p>' . __("You can't remove the current user.") . '</p></div>';
</span></span></pre></div>
<a id="trunkwpappphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-app.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-app.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-app.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx">
</span><span class="cx"> // check to see if AtomPub is enabled
</span><span class="cx"> if ( !get_option( 'enable_app' ) )
</span><del>- $this->forbidden( sprintf( __( 'AtomPub services are disabled on this blog. An admin user can enable them at %s' ), admin_url('options-writing.php') ) );
</del><ins>+ $this->forbidden( sprintf( __( 'AtomPub services are disabled on this site. An admin user can enable them at %s' ), admin_url('options-writing.php') ) );
</ins><span class="cx">
</span><span class="cx"> // dispatch
</span><span class="cx"> foreach ( $this->selectors as $regex => $funcs ) {
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx"> log_app('function','get_service()');
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'edit_posts' ) )
</span><del>- $this->auth_required( __( 'Sorry, you do not have the right to access this blog.' ) );
</del><ins>+ $this->auth_required( __( 'Sorry, you do not have the right to access this site.' ) );
</ins><span class="cx">
</span><span class="cx"> $entries_url = esc_attr($this->get_entries_url());
</span><span class="cx"> $categories_url = esc_attr($this->get_categories_url());
</span><span class="lines">@@ -362,7 +362,7 @@
</span><span class="cx"> log_app('function','get_categories_xml()');
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'edit_posts' ) )
</span><del>- $this->auth_required( __( 'Sorry, you do not have the right to access this blog.' ) );
</del><ins>+ $this->auth_required( __( 'Sorry, you do not have the right to access this site.' ) );
</ins><span class="cx">
</span><span class="cx"> $home = esc_attr(get_bloginfo_rss('url'));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-widgets.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-includes/default-widgets.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> class WP_Widget_Search extends WP_Widget {
</span><span class="cx">
</span><span class="cx"> function WP_Widget_Search() {
</span><del>- $widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your blog") );
</del><ins>+ $widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your site") );
</ins><span class="cx"> $this->WP_Widget('search', __('Search'), $widget_ops);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> class WP_Widget_Archives extends WP_Widget {
</span><span class="cx">
</span><span class="cx"> function WP_Widget_Archives() {
</span><del>- $widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your blog&#8217;s posts') );
</del><ins>+ $widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your site&#8217;s posts') );
</ins><span class="cx"> $this->WP_Widget('archives', __('Archives'), $widget_ops);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx"> class WP_Widget_Calendar extends WP_Widget {
</span><span class="cx">
</span><span class="cx"> function WP_Widget_Calendar() {
</span><del>- $widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your blog&#8217;s posts') );
</del><ins>+ $widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your site&#8217;s posts') );
</ins><span class="cx"> $this->WP_Widget('calendar', __('Calendar'), $widget_ops);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -511,7 +511,7 @@
</span><span class="cx"> class WP_Widget_Recent_Posts extends WP_Widget {
</span><span class="cx">
</span><span class="cx"> function WP_Widget_Recent_Posts() {
</span><del>- $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your blog") );
</del><ins>+ $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your site") );
</ins><span class="cx"> $this->WP_Widget('recent-posts', __('Recent Posts'), $widget_ops);
</span><span class="cx"> $this->alt_option_name = 'widget_recent_entries';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-includes/ms-functions.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -322,14 +322,14 @@
</span><span class="cx">
</span><span class="cx"> // Check if the domain has been used already. We should return an error message.
</span><span class="cx"> if ( domain_exists($domain, $path, $site_id) )
</span><del>- return __( 'Error: Blog URL already taken.' );
</del><ins>+ return __( 'Error: Site URL already taken.' );
</ins><span class="cx">
</span><span class="cx"> // Need to backup wpdb table names, and create a new wp_blogs entry for new blog.
</span><span class="cx"> // Need to get blog_id from wp_blogs, and create new table names.
</span><span class="cx"> // Must restore table names at the end of function.
</span><span class="cx">
</span><span class="cx"> if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
</span><del>- return __( 'Error: problem creating blog entry.' );
</del><ins>+ return __( 'Error: problem creating site entry.' );
</ins><span class="cx">
</span><span class="cx"> switch_to_blog($blog_id);
</span><span class="cx"> install_blog($blog_id);
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( empty( $blogname ) )
</span><del>- $errors->add('blogname', __('Please enter a blog name'));
</del><ins>+ $errors->add('blogname', __('Please enter a site name'));
</ins><span class="cx">
</span><span class="cx"> $maybe = array();
</span><span class="cx"> preg_match( '/[a-z0-9]+/', $blogname, $maybe );
</span><span class="lines">@@ -568,27 +568,27 @@
</span><span class="cx"> $errors->add('blogname', __('That name is not allowed'));
</span><span class="cx">
</span><span class="cx"> if ( strlen( $blogname ) < 4 && !is_super_admin() )
</span><del>- $errors->add('blogname', __('Blog name must be at least 4 characters'));
</del><ins>+ $errors->add('blogname', __('Site name must be at least 4 characters'));
</ins><span class="cx">
</span><span class="cx"> if ( strpos( ' ' . $blogname, '_' ) != false )
</span><del>- $errors->add( 'blogname', __( 'Sorry, blog names may not contain the character &#8220;_&#8221;!' ) );
</del><ins>+ $errors->add( 'blogname', __( 'Sorry, site names may not contain the character &#8220;_&#8221;!' ) );
</ins><span class="cx">
</span><span class="cx"> // do not allow users to create a blog that conflicts with a page on the main blog.
</span><span class="cx"> if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
</span><del>- $errors->add( 'blogname', __( 'Sorry, you may not use that blog name.' ) );
</del><ins>+ $errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
</ins><span class="cx">
</span><span class="cx"> // all numeric?
</span><span class="cx"> $match = array();
</span><span class="cx"> preg_match( '/[0-9]*/', $blogname, $match );
</span><span class="cx"> if ( $match[0] == $blogname )
</span><del>- $errors->add('blogname', __('Sorry, blog names must have letters too!'));
</del><ins>+ $errors->add('blogname', __('Sorry, site names must have letters too!'));
</ins><span class="cx">
</span><span class="cx"> $blogname = apply_filters( 'newblogname', $blogname );
</span><span class="cx">
</span><span class="cx"> $blog_title = stripslashes( $blog_title );
</span><span class="cx">
</span><span class="cx"> if ( empty( $blog_title ) )
</span><del>- $errors->add('blog_title', __('Please enter a blog title'));
</del><ins>+ $errors->add('blog_title', __('Please enter a site title'));
</ins><span class="cx">
</span><span class="cx"> // Check if the domain/path has been used already.
</span><span class="cx"> if ( is_subdomain_install() ) {
</span><span class="lines">@@ -599,11 +599,11 @@
</span><span class="cx"> $path = $base.$blogname.'/';
</span><span class="cx"> }
</span><span class="cx"> if ( domain_exists($mydomain, $path) )
</span><del>- $errors->add('blogname', __('Sorry, that blog already exists!'));
</del><ins>+ $errors->add('blogname', __('Sorry, that site already exists!'));
</ins><span class="cx">
</span><span class="cx"> if ( username_exists( $blogname ) ) {
</span><span class="cx"> if ( is_object( $user ) == false || ( is_object($user) && ( $user->user_login != $blogname ) ) )
</span><del>- $errors->add( 'blogname', __( 'Sorry, that blog is reserved!' ) );
</del><ins>+ $errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Has someone already signed up for this domain?
</span><span class="lines">@@ -614,7 +614,7 @@
</span><span class="cx"> if ( $diff > 172800 )
</span><span class="cx"> $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) );
</span><span class="cx"> else
</span><del>- $errors->add('blogname', __('That blog is currently reserved but may be available in a couple days.'));
</del><ins>+ $errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $result = array('domain' => $mydomain, 'path' => $path, 'blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors);
</span><span class="lines">@@ -688,7 +688,7 @@
</span><span class="cx"> $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
</span><span class="cx"> $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
</span><span class="cx"> $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
</span><del>- $message = sprintf( apply_filters( 'wpmu_signup_blog_notification_email', __( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your blog here:\n\n%s" ) ), $activate_url, esc_url( "http://{$domain}{$path}" ), $key );
</del><ins>+ $message = sprintf( apply_filters( 'wpmu_signup_blog_notification_email', __( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s" ) ), $activate_url, esc_url( "http://{$domain}{$path}" ), $key );
</ins><span class="cx"> // TODO: Don't hard code activation link.
</span><span class="cx"> $subject = sprintf( apply_filters( 'wpmu_signup_blog_notification_subject', __( '[%1s] Activate %2s' ) ), $from_name, esc_url( 'http://' . $domain . $path ) );
</span><span class="cx"> wp_mail($user_email, $subject, $message, $message_headers);
</span><span class="lines">@@ -721,7 +721,7 @@
</span><span class="cx"> return new WP_Error('invalid_key', __('Invalid activation key.'));
</span><span class="cx">
</span><span class="cx"> if ( $signup->active )
</span><del>- return new WP_Error('already_active', __('The blog is already active.'), $signup);
</del><ins>+ return new WP_Error('already_active', __('The site is already active.'), $signup);
</ins><span class="cx">
</span><span class="cx"> $meta = unserialize($signup->meta);
</span><span class="cx"> $user_login = $wpdb->escape($signup->user_login);
</span><span class="lines">@@ -811,13 +811,13 @@
</span><span class="cx">
</span><span class="cx"> // Check if the domain has been used already. We should return an error message.
</span><span class="cx"> if ( domain_exists($domain, $path, $site_id) )
</span><del>- return new WP_Error('blog_taken', __('Blog already exists.'));
</del><ins>+ return new WP_Error('blog_taken', __('Site already exists.'));
</ins><span class="cx">
</span><span class="cx"> if ( !defined('WP_INSTALLING') )
</span><span class="cx"> define( 'WP_INSTALLING', true );
</span><span class="cx">
</span><span class="cx"> if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
</span><del>- return new WP_Error('insert_blog', __('Could not create blog.'));
</del><ins>+ return new WP_Error('insert_blog', __('Could not create site.'));
</ins><span class="cx">
</span><span class="cx"> switch_to_blog($blog_id);
</span><span class="cx"> install_blog($blog_id, $title);
</span><span class="lines">@@ -859,14 +859,14 @@
</span><span class="cx"> $siteurl = site_url();
</span><span class="cx"> restore_current_blog();
</span><span class="cx">
</span><del>- $msg = sprintf( __( 'New Blog: %1s
</del><ins>+ $msg = sprintf( __( 'New Site: %1s
</ins><span class="cx"> URL: %2s
</span><span class="cx"> Remote IP: %3s
</span><span class="cx">
</span><span class="cx"> Disable these notifications: %4s' ), $blogname, $siteurl, $_SERVER['REMOTE_ADDR'], $options_site_url);
</span><span class="cx"> $msg = apply_filters( 'newblog_notify_siteadmin', $msg );
</span><span class="cx">
</span><del>- wp_mail( $email, sprintf( __( 'New Blog Registration: %s' ), $siteurl ), $msg );
</del><ins>+ wp_mail( $email, sprintf( __( 'New Site Registration: %s' ), $siteurl ), $msg );
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1009,7 +1009,7 @@
</span><span class="cx"> if ( empty( $current_site->site_name ) )
</span><span class="cx"> $current_site->site_name = 'WordPress MU';
</span><span class="cx">
</span><del>- $subject = apply_filters( 'update_welcome_subject', sprintf(__('New %1$s Blog: %2$s'), $current_site->site_name, stripslashes( $title ) ) );
</del><ins>+ $subject = apply_filters( 'update_welcome_subject', sprintf(__('New %1$s Site: %2$s'), $current_site->site_name, stripslashes( $title ) ) );
</ins><span class="cx"> wp_mail($user->user_email, $subject, $message, $message_headers);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-includes/pluggable.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -1197,7 +1197,7 @@
</span><span class="cx"> // we want to reverse this for the plain text arena of emails.
</span><span class="cx"> $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
</span><span class="cx">
</span><del>- $message = sprintf(__('New user registration on your blog %s:'), $blogname) . "\r\n\r\n";
</del><ins>+ $message = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n";
</ins><span class="cx"> $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
</span><span class="cx"> $message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/wp-includes/user.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> if ( !is_super_admin( $userdata->ID ) && isset($userdata->primary_blog) ) {
</span><span class="cx"> $details = get_blog_details( $userdata->primary_blog );
</span><span class="cx"> if ( is_object( $details ) && $details->spam == 1 )
</span><del>- return new WP_Error('blog_suspended', __('Blog Suspended.'));
</del><ins>+ return new WP_Error('blog_suspended', __('Site Suspended.'));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkxmlrpcphp"></a>
<div class="modfile"><h4>Modified: trunk/xmlrpc.php (14314 => 14315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/xmlrpc.php 2010-04-30 01:58:35 UTC (rev 14314)
+++ trunk/xmlrpc.php 2010-04-30 03:17:49 UTC (rev 14315)
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> */
</span><span class="cx"> function login_pass_ok($user_login, $user_pass) {
</span><span class="cx"> if ( !get_option( 'enable_xmlrpc' ) ) {
</span><del>- $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this blog. An admin user can enable them at %s'), admin_url('options-writing.php') ) );
</del><ins>+ $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site. An admin user can enable them at %s'), admin_url('options-writing.php') ) );
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> */
</span><span class="cx"> function login($username, $password) {
</span><span class="cx"> if ( !get_option( 'enable_xmlrpc' ) ) {
</span><del>- $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this blog. An admin user can enable them at %s'), admin_url('options-writing.php') ) );
</del><ins>+ $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site. An admin user can enable them at %s'), admin_url('options-writing.php') ) );
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -391,7 +391,7 @@
</span><span class="cx"> 'value' => $wp_version
</span><span class="cx"> ),
</span><span class="cx"> 'blog_url' => array(
</span><del>- 'desc' => __( 'Blog URL' ),
</del><ins>+ 'desc' => __( 'Site URL' ),
</ins><span class="cx"> 'readonly' => true,
</span><span class="cx"> 'option' => 'siteurl'
</span><span class="cx"> ),
</span><span class="lines">@@ -403,12 +403,12 @@
</span><span class="cx"> 'option' => 'gmt_offset'
</span><span class="cx"> ),
</span><span class="cx"> 'blog_title' => array(
</span><del>- 'desc' => __( 'Blog Title' ),
</del><ins>+ 'desc' => __( 'Site Title' ),
</ins><span class="cx"> 'readonly' => false,
</span><span class="cx"> 'option' => 'blogname'
</span><span class="cx"> ),
</span><span class="cx"> 'blog_tagline' => array(
</span><del>- 'desc' => __( 'Blog Tagline' ),
</del><ins>+ 'desc' => __( 'Site Tagline' ),
</ins><span class="cx"> 'readonly' => false,
</span><span class="cx"> 'option' => 'blogdescription'
</span><span class="cx"> ),
</span><span class="lines">@@ -830,7 +830,7 @@
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can("edit_posts") )
</span><del>- return(new IXR_Error(401, __("Sorry, you cannot edit posts on this blog.")));
</del><ins>+ return(new IXR_Error(401, __("Sorry, you cannot edit posts on this site.")));
</ins><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'wp.getAuthors');
</span><span class="cx">
</span><span class="lines">@@ -865,7 +865,7 @@
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'edit_posts' ) )
</span><del>- return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this blog in order to view tags.' ) );
</del><ins>+ return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view tags.' ) );
</ins><span class="cx">
</span><span class="cx"> do_action( 'xmlrpc_call', 'wp.getKeywords' );
</span><span class="cx">
</span><span class="lines">@@ -988,7 +988,7 @@
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'edit_posts' ) )
</span><del>- return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts to this blog in order to view categories.' ) );
</del><ins>+ return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts to this site in order to view categories.' ) );
</ins><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'wp.suggestCategories');
</span><span class="cx">
</span><span class="lines">@@ -1024,7 +1024,7 @@
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'moderate_comments' ) )
</span><del>- return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this blog.' ) );
</del><ins>+ return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
</ins><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'wp.getComment');
</span><span class="cx">
</span><span class="lines">@@ -1146,7 +1146,7 @@
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'moderate_comments' ) )
</span><del>- return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this blog.' ) );
</del><ins>+ return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
</ins><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'wp.deleteComment');
</span><span class="cx">
</span><span class="lines">@@ -1177,7 +1177,7 @@
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'moderate_comments' ) )
</span><del>- return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this blog.' ) );
</del><ins>+ return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
</ins><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'wp.editComment');
</span><span class="cx">
</span><span class="lines">@@ -1327,7 +1327,7 @@
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'moderate_comments' ) )
</span><del>- return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) );
</del><ins>+ return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
</ins><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'wp.getCommentStatusList');
</span><span class="cx">
</span><span class="lines">@@ -1386,7 +1386,7 @@
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'edit_posts' ) )
</span><del>- return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) );
</del><ins>+ return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
</ins><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'wp.getPostStatusList');
</span><span class="cx">
</span><span class="lines">@@ -1412,7 +1412,7 @@
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'edit_posts' ) )
</span><del>- return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) );
</del><ins>+ return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
</ins><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'wp.getPageStatusList');
</span><span class="cx">
</span><span class="lines">@@ -1438,7 +1438,7 @@
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'edit_pages' ) )
</span><del>- return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) );
</del><ins>+ return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
</ins><span class="cx">
</span><span class="cx"> $templates = get_page_templates( );
</span><span class="cx"> $templates['Default'] = 'default';
</span><span class="lines">@@ -1624,7 +1624,7 @@
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'edit_posts' ) )
</span><del>- return new IXR_Error( 401, __( 'Sorry, you do not have access to user data on this blog.' ) );
</del><ins>+ return new IXR_Error( 401, __( 'Sorry, you do not have access to user data on this site.' ) );
</ins><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'blogger.getUserInfo');
</span><span class="cx">
</span><span class="lines">@@ -1842,7 +1842,7 @@
</span><span class="cx">
</span><span class="cx"> $cap = ($publish) ? 'publish_posts' : 'edit_posts';
</span><span class="cx"> if ( !current_user_can($cap) )
</span><del>- return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.'));
</del><ins>+ return new IXR_Error(401, __('Sorry, you are not allowed to post on this site.'));
</ins><span class="cx">
</span><span class="cx"> $post_status = ($publish) ? 'publish' : 'draft';
</span><span class="cx">
</span><span class="lines">@@ -1989,13 +1989,13 @@
</span><span class="cx"> do_action('xmlrpc_call', 'metaWeblog.newPost');
</span><span class="cx">
</span><span class="cx"> $cap = ( $publish ) ? 'publish_posts' : 'edit_posts';
</span><del>- $error_message = __( 'Sorry, you are not allowed to publish posts on this blog.' );
</del><ins>+ $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
</ins><span class="cx"> $post_type = 'post';
</span><span class="cx"> $page_template = '';
</span><span class="cx"> if ( !empty( $content_struct['post_type'] ) ) {
</span><span class="cx"> if ( $content_struct['post_type'] == 'page' ) {
</span><span class="cx"> $cap = ( $publish ) ? 'publish_pages' : 'edit_pages';
</span><del>- $error_message = __( 'Sorry, you are not allowed to publish pages on this blog.' );
</del><ins>+ $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' );
</ins><span class="cx"> $post_type = 'page';
</span><span class="cx"> if ( !empty( $content_struct['wp_page_template'] ) )
</span><span class="cx"> $page_template = $content_struct['wp_page_template'];
</span><span class="lines">@@ -2264,13 +2264,13 @@
</span><span class="cx"> do_action('xmlrpc_call', 'metaWeblog.editPost');
</span><span class="cx">
</span><span class="cx"> $cap = ( $publish ) ? 'publish_posts' : 'edit_posts';
</span><del>- $error_message = __( 'Sorry, you are not allowed to publish posts on this blog.' );
</del><ins>+ $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
</ins><span class="cx"> $post_type = 'post';
</span><span class="cx"> $page_template = '';
</span><span class="cx"> if ( !empty( $content_struct['post_type'] ) ) {
</span><span class="cx"> if ( $content_struct['post_type'] == 'page' ) {
</span><span class="cx"> $cap = ( $publish ) ? 'publish_pages' : 'edit_pages';
</span><del>- $error_message = __( 'Sorry, you are not allowed to publish pages on this blog.' );
</del><ins>+ $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' );
</ins><span class="cx"> $post_type = 'page';
</span><span class="cx"> if ( !empty( $content_struct['wp_page_template'] ) )
</span><span class="cx"> $page_template = $content_struct['wp_page_template'];
</span><span class="lines">@@ -2720,7 +2720,7 @@
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'edit_posts' ) )
</span><del>- return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this blog in order to view categories.' ) );
</del><ins>+ return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
</ins><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'metaWeblog.getCategories');
</span><span class="cx">
</span><span class="lines">@@ -2908,7 +2908,7 @@
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'edit_posts' ) )
</span><del>- return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this blog in order to view categories.' ) );
</del><ins>+ return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
</ins><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'mt.getCategoryList');
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>