From 3a2f3b343381ff065068d2deb982e4ff959d1d6f Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 1 May 2010 07:09:38 +0000
Subject: [PATCH] s/blog/site/ in more places.

git-svn-id: http://svn.automattic.com/wordpress/trunk@14326 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/import/blogware.php    | 2 +-
 wp-admin/import/textpattern.php | 2 +-
 wp-admin/includes/schema.php    | 4 ++--
 wp-admin/includes/upgrade.php   | 2 +-
 wp-admin/user-new.php           | 2 +-
 wp-includes/default-widgets.php | 2 +-
 wp-includes/ms-functions.php    | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/wp-admin/import/blogware.php b/wp-admin/import/blogware.php
index 43617d2952..6fbecf1512 100644
--- a/wp-admin/import/blogware.php
+++ b/wp-admin/import/blogware.php
@@ -29,7 +29,7 @@ class BW_Import {
 
 	function greet() {
 		echo '<div class="narrow">';
-		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>';
+		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>';
 		wp_import_upload_form("admin.php?import=blogware&amp;step=1");
 		echo '</div>';
 	}
diff --git a/wp-admin/import/textpattern.php b/wp-admin/import/textpattern.php
index 1f1c7c390b..be5f72eedd 100644
--- a/wp-admin/import/textpattern.php
+++ b/wp-admin/import/textpattern.php
@@ -64,7 +64,7 @@ class Textpattern_Import {
 
 	function greet() {
 		echo '<div class="narrow">';
-		echo '<p>'.__('Howdy! This imports categories, users, posts, comments, and links from any Textpattern 4.0.2+ into this blog.').'</p>';
+		echo '<p>'.__('Howdy! This imports categories, users, posts, comments, and links from any Textpattern 4.0.2+ into this site.').'</p>';
 		echo '<p>'.__('This has not been tested on previous versions of Textpattern.  Mileage may vary.').'</p>';
 		echo '<p>'.__('Your Textpattern Configuration settings are as follows:').'</p>';
 		echo '<form action="admin.php?import=textpattern&amp;step=1" method="post">';
diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index 873ecd32b3..80191833cf 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -675,7 +675,7 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
 
 	$welcome_email = __( 'Dear User,
 
-Your new SITE_NAME blog has been successfully set up at:
+Your new SITE_NAME site has been successfully set up at:
 BLOG_URL
 
 You can log in to the administrator account with the following information:
@@ -683,7 +683,7 @@ Username: USERNAME
 Password: PASSWORD
 Login Here: BLOG_URLwp-login.php
 
-We hope you enjoy your new blog.
+We hope you enjoy your new site.
 Thanks!
 
 --The Team @ SITE_NAME' );
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 1dfe1fca74..34a0803a1b 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -320,7 +320,7 @@ You can log in to the administrator account with the following information:
 Username: %2\$s
 Password: %3\$s
 
-We hope you enjoy your new blog. Thanks!
+We hope you enjoy your new site. Thanks!
 
 --The WordPress Team
 http://wordpress.org/
diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
index a4f0fe5cc8..9486241013 100644
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -23,7 +23,7 @@ if ( is_multisite() ) {
 		return sprintf( __( "Hi,
 You've been invited to join '%s' at
 %s as a %s.
-If you do not want to join this blog please ignore
+If you do not want to join this site please ignore
 this email. This invitation will expire in a few days.
 
 Please click the following link to activate your user account:
diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php
index afed93dc94..973d450735 100644
--- a/wp-includes/default-widgets.php
+++ b/wp-includes/default-widgets.php
@@ -15,7 +15,7 @@
 class WP_Widget_Pages extends WP_Widget {
 
 	function WP_Widget_Pages() {
-		$widget_ops = array('classname' => 'widget_pages', 'description' => __( 'Your blog&#8217;s WordPress Pages') );
+		$widget_ops = array('classname' => 'widget_pages', 'description' => __( 'Your site&#8217;s WordPress Pages') );
 		$this->WP_Widget('pages', __('Pages'), $widget_ops);
 	}
 
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 5671d7528a..89a5d4020a 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -974,7 +974,7 @@ function wpmu_welcome_notification($blog_id, $user_id, $password, $title, $meta
 	if ( $welcome_email == false )
 		$welcome_email = stripslashes( __( 'Dear User,
 
-Your new SITE_NAME blog has been successfully set up at:
+Your new SITE_NAME site has been successfully set up at:
 BLOG_URL
 
 You can log in to the administrator account with the following information:
@@ -982,7 +982,7 @@ Username: USERNAME
 Password: PASSWORD
 Login Here: BLOG_URLwp-login.php
 
-We hope you enjoy your new blog.
+We hope you enjoy your new site.
 Thanks!
 
 --The Team @ SITE_NAME' ) );