<!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>[14326] trunk: s/blog/site/ in more places.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14326">14326</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-01 07:09:38 +0000 (Sat, 01 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>s/blog/site/ in more places.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminimportblogwarephp">trunk/wp-admin/import/blogware.php</a></li>
<li><a href="#trunkwpadminimporttextpatternphp">trunk/wp-admin/import/textpattern.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="#trunkwpadminusernewphp">trunk/wp-admin/user-new.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminimportblogwarephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/blogware.php (14325 => 14326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/blogware.php 2010-05-01 00:21:36 UTC (rev 14325)
+++ trunk/wp-admin/import/blogware.php 2010-05-01 07:09:38 UTC (rev 14326)
</span><span class="lines">@@ -29,7 +29,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 Blogware XML export file into your blog. Pick a Blogware file to upload and click Import.').'</p>';
</del><ins>+ echo '<p>'.__('Howdy! This importer allows you to extract posts from Blogware XML export file into your site. Pick a Blogware file to upload and click Import.').'</p>';
</ins><span class="cx"> wp_import_upload_form("admin.php?import=blogware&amp;step=1");
</span><span class="cx"> echo '</div>';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminimporttextpatternphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/textpattern.php (14325 => 14326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/textpattern.php 2010-05-01 00:21:36 UTC (rev 14325)
+++ trunk/wp-admin/import/textpattern.php 2010-05-01 07:09:38 UTC (rev 14326)
</span><span class="lines">@@ -64,7 +64,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 imports categories, users, posts, comments, and links from any Textpattern 4.0.2+ into this blog.').'</p>';
</del><ins>+ echo '<p>'.__('Howdy! This imports categories, users, posts, comments, and links from any Textpattern 4.0.2+ into this site.').'</p>';
</ins><span class="cx"> echo '<p>'.__('This has not been tested on previous versions of Textpattern. Mileage may vary.').'</p>';
</span><span class="cx"> echo '<p>'.__('Your Textpattern Configuration settings are as follows:').'</p>';
</span><span class="cx"> echo '<form action="admin.php?import=textpattern&amp;step=1" method="post">';
</span></span></pre></div>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (14325 => 14326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-05-01 00:21:36 UTC (rev 14325)
+++ trunk/wp-admin/includes/schema.php 2010-05-01 07:09:38 UTC (rev 14326)
</span><span class="lines">@@ -675,7 +675,7 @@
</span><span class="cx">
</span><span class="cx"> $welcome_email = __( 'Dear User,
</span><span class="cx">
</span><del>-Your new SITE_NAME blog has been successfully set up at:
</del><ins>+Your new SITE_NAME site has been successfully set up at:
</ins><span class="cx"> BLOG_URL
</span><span class="cx">
</span><span class="cx"> You can log in to the administrator account with the following information:
</span><span class="lines">@@ -683,7 +683,7 @@
</span><span class="cx"> Password: PASSWORD
</span><span class="cx"> Login Here: BLOG_URLwp-login.php
</span><span class="cx">
</span><del>-We hope you enjoy your new blog.
</del><ins>+We hope you enjoy your new site.
</ins><span class="cx"> Thanks!
</span><span class="cx">
</span><span class="cx"> --The Team @ SITE_NAME' );
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (14325 => 14326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2010-05-01 00:21:36 UTC (rev 14325)
+++ trunk/wp-admin/includes/upgrade.php 2010-05-01 07:09:38 UTC (rev 14326)
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx"> Username: %2\$s
</span><span class="cx"> Password: %3\$s
</span><span class="cx">
</span><del>-We hope you enjoy your new blog. Thanks!
</del><ins>+We hope you enjoy your new site. Thanks!
</ins><span class="cx">
</span><span class="cx"> --The WordPress Team
</span><span class="cx"> http://wordpress.org/
</span></span></pre></div>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (14325 => 14326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2010-05-01 00:21:36 UTC (rev 14325)
+++ trunk/wp-admin/user-new.php 2010-05-01 07:09:38 UTC (rev 14326)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> return sprintf( __( "Hi,
</span><span class="cx"> You've been invited to join '%s' at
</span><span class="cx"> %s as a %s.
</span><del>-If you do not want to join this blog please ignore
</del><ins>+If you do not want to join this site please ignore
</ins><span class="cx"> this email. This invitation will expire in a few days.
</span><span class="cx">
</span><span class="cx"> Please click the following link to activate your user account:
</span></span></pre></div>
<a id="trunkwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-widgets.php (14325 => 14326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php 2010-05-01 00:21:36 UTC (rev 14325)
+++ trunk/wp-includes/default-widgets.php 2010-05-01 07:09:38 UTC (rev 14326)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> class WP_Widget_Pages extends WP_Widget {
</span><span class="cx">
</span><span class="cx"> function WP_Widget_Pages() {
</span><del>- $widget_ops = array('classname' => 'widget_pages', 'description' => __( 'Your blog&#8217;s WordPress Pages') );
</del><ins>+ $widget_ops = array('classname' => 'widget_pages', 'description' => __( 'Your site&#8217;s WordPress Pages') );
</ins><span class="cx"> $this->WP_Widget('pages', __('Pages'), $widget_ops);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (14325 => 14326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-05-01 00:21:36 UTC (rev 14325)
+++ trunk/wp-includes/ms-functions.php 2010-05-01 07:09:38 UTC (rev 14326)
</span><span class="lines">@@ -974,7 +974,7 @@
</span><span class="cx"> if ( $welcome_email == false )
</span><span class="cx"> $welcome_email = stripslashes( __( 'Dear User,
</span><span class="cx">
</span><del>-Your new SITE_NAME blog has been successfully set up at:
</del><ins>+Your new SITE_NAME site has been successfully set up at:
</ins><span class="cx"> BLOG_URL
</span><span class="cx">
</span><span class="cx"> You can log in to the administrator account with the following information:
</span><span class="lines">@@ -982,7 +982,7 @@
</span><span class="cx"> Password: PASSWORD
</span><span class="cx"> Login Here: BLOG_URLwp-login.php
</span><span class="cx">
</span><del>-We hope you enjoy your new blog.
</del><ins>+We hope you enjoy your new site.
</ins><span class="cx"> Thanks!
</span><span class="cx">
</span><span class="cx"> --The Team @ SITE_NAME' ) );
</span></span></pre>
</div>
</div>
</body>
</html>