Index: wp-app.php =================================================================== --- wp-app.php (revision 14314) +++ wp-app.php (working copy) @@ -284,7 +284,7 @@ // check to see if AtomPub is enabled if ( !get_option( 'enable_app' ) ) - $this->forbidden( sprintf( __( 'AtomPub services are disabled on this blog. An admin user can enable them at %s' ), admin_url('options-writing.php') ) ); + $this->forbidden( sprintf( __( 'AtomPub services are disabled on this site. An admin user can enable them at %s' ), admin_url('options-writing.php') ) ); // dispatch foreach ( $this->selectors as $regex => $funcs ) { @@ -321,7 +321,7 @@ log_app('function','get_service()'); if ( !current_user_can( 'edit_posts' ) ) - $this->auth_required( __( 'Sorry, you do not have the right to access this blog.' ) ); + $this->auth_required( __( 'Sorry, you do not have the right to access this site.' ) ); $entries_url = esc_attr($this->get_entries_url()); $categories_url = esc_attr($this->get_categories_url()); @@ -362,7 +362,7 @@ log_app('function','get_categories_xml()'); if ( !current_user_can( 'edit_posts' ) ) - $this->auth_required( __( 'Sorry, you do not have the right to access this blog.' ) ); + $this->auth_required( __( 'Sorry, you do not have the right to access this site.' ) ); $home = esc_attr(get_bloginfo_rss('url')); Index: wp-includes/default-widgets.php =================================================================== --- wp-includes/default-widgets.php (revision 14314) +++ wp-includes/default-widgets.php (working copy) @@ -172,7 +172,7 @@ class WP_Widget_Search extends WP_Widget { function WP_Widget_Search() { - $widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your blog") ); + $widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your site") ); $this->WP_Widget('search', __('Search'), $widget_ops); } @@ -215,7 +215,7 @@ class WP_Widget_Archives extends WP_Widget { function WP_Widget_Archives() { - $widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your blog’s posts') ); + $widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your site’s posts') ); $this->WP_Widget('archives', __('Archives'), $widget_ops); } @@ -328,7 +328,7 @@ class WP_Widget_Calendar extends WP_Widget { function WP_Widget_Calendar() { - $widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your blog’s posts') ); + $widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your site’s posts') ); $this->WP_Widget('calendar', __('Calendar'), $widget_ops); } @@ -511,7 +511,7 @@ class WP_Widget_Recent_Posts extends WP_Widget { function WP_Widget_Recent_Posts() { - $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your blog") ); + $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your site") ); $this->WP_Widget('recent-posts', __('Recent Posts'), $widget_ops); $this->alt_option_name = 'widget_recent_entries'; Index: wp-includes/user.php =================================================================== --- wp-includes/user.php (revision 14314) +++ wp-includes/user.php (working copy) @@ -97,7 +97,7 @@ if ( !is_super_admin( $userdata->ID ) && isset($userdata->primary_blog) ) { $details = get_blog_details( $userdata->primary_blog ); if ( is_object( $details ) && $details->spam == 1 ) - return new WP_Error('blog_suspended', __('Blog Suspended.')); + return new WP_Error('blog_suspended', __('Site Suspended.')); } } Index: wp-includes/pluggable.php =================================================================== --- wp-includes/pluggable.php (revision 14314) +++ wp-includes/pluggable.php (working copy) @@ -1197,7 +1197,7 @@ // we want to reverse this for the plain text arena of emails. $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); - $message = sprintf(__('New user registration on your blog %s:'), $blogname) . "\r\n\r\n"; + $message = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n"; $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; $message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n"; Index: wp-includes/ms-functions.php =================================================================== --- wp-includes/ms-functions.php (revision 14314) +++ wp-includes/ms-functions.php (working copy) @@ -322,14 +322,14 @@ // Check if the domain has been used already. We should return an error message. if ( domain_exists($domain, $path, $site_id) ) - return __( 'Error: Blog URL already taken.' ); + return __( 'Error: Site URL already taken.' ); // Need to backup wpdb table names, and create a new wp_blogs entry for new blog. // Need to get blog_id from wp_blogs, and create new table names. // Must restore table names at the end of function. if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) - return __( 'Error: problem creating blog entry.' ); + return __( 'Error: problem creating site entry.' ); switch_to_blog($blog_id); install_blog($blog_id); @@ -557,7 +557,7 @@ } if ( empty( $blogname ) ) - $errors->add('blogname', __('Please enter a blog name')); + $errors->add('blogname', __('Please enter a site name')); $maybe = array(); preg_match( '/[a-z0-9]+/', $blogname, $maybe ); @@ -568,27 +568,27 @@ $errors->add('blogname', __('That name is not allowed')); if ( strlen( $blogname ) < 4 && !is_super_admin() ) - $errors->add('blogname', __('Blog name must be at least 4 characters')); + $errors->add('blogname', __('Site name must be at least 4 characters')); if ( strpos( ' ' . $blogname, '_' ) != false ) - $errors->add( 'blogname', __( 'Sorry, blog names may not contain the character “_”!' ) ); + $errors->add( 'blogname', __( 'Sorry, site names may not contain the character “_”!' ) ); // do not allow users to create a blog that conflicts with a page on the main blog. 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 ) ) ) - $errors->add( 'blogname', __( 'Sorry, you may not use that blog name.' ) ); + $errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) ); // all numeric? $match = array(); preg_match( '/[0-9]*/', $blogname, $match ); if ( $match[0] == $blogname ) - $errors->add('blogname', __('Sorry, blog names must have letters too!')); + $errors->add('blogname', __('Sorry, site names must have letters too!')); $blogname = apply_filters( 'newblogname', $blogname ); $blog_title = stripslashes( $blog_title ); if ( empty( $blog_title ) ) - $errors->add('blog_title', __('Please enter a blog title')); + $errors->add('blog_title', __('Please enter a site title')); // Check if the domain/path has been used already. if ( is_subdomain_install() ) { @@ -599,11 +599,11 @@ $path = $base.$blogname.'/'; } if ( domain_exists($mydomain, $path) ) - $errors->add('blogname', __('Sorry, that blog already exists!')); + $errors->add('blogname', __('Sorry, that site already exists!')); if ( username_exists( $blogname ) ) { if ( is_object( $user ) == false || ( is_object($user) && ( $user->user_login != $blogname ) ) ) - $errors->add( 'blogname', __( 'Sorry, that blog is reserved!' ) ); + $errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) ); } // Has someone already signed up for this domain? @@ -614,7 +614,7 @@ if ( $diff > 172800 ) $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) ); else - $errors->add('blogname', __('That blog is currently reserved but may be available in a couple days.')); + $errors->add('blogname', __('That site is currently reserved but may be available in a couple days.')); } $result = array('domain' => $mydomain, 'path' => $path, 'blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors); @@ -688,7 +688,7 @@ $admin_email = 'support@' . $_SERVER['SERVER_NAME']; $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) ); $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; - $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 ); + $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 ); // TODO: Don't hard code activation link. $subject = sprintf( apply_filters( 'wpmu_signup_blog_notification_subject', __( '[%1s] Activate %2s' ) ), $from_name, esc_url( 'http://' . $domain . $path ) ); wp_mail($user_email, $subject, $message, $message_headers); @@ -721,7 +721,7 @@ return new WP_Error('invalid_key', __('Invalid activation key.')); if ( $signup->active ) - return new WP_Error('already_active', __('The blog is already active.'), $signup); + return new WP_Error('already_active', __('The site is already active.'), $signup); $meta = unserialize($signup->meta); $user_login = $wpdb->escape($signup->user_login); @@ -811,13 +811,13 @@ // Check if the domain has been used already. We should return an error message. if ( domain_exists($domain, $path, $site_id) ) - return new WP_Error('blog_taken', __('Blog already exists.')); + return new WP_Error('blog_taken', __('Site already exists.')); if ( !defined('WP_INSTALLING') ) define( 'WP_INSTALLING', true ); if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) - return new WP_Error('insert_blog', __('Could not create blog.')); + return new WP_Error('insert_blog', __('Could not create site.')); switch_to_blog($blog_id); install_blog($blog_id, $title); @@ -859,14 +859,14 @@ $siteurl = site_url(); restore_current_blog(); - $msg = sprintf( __( 'New Blog: %1s + $msg = sprintf( __( 'New Site: %1s URL: %2s Remote IP: %3s Disable these notifications: %4s' ), $blogname, $siteurl, $_SERVER['REMOTE_ADDR'], $options_site_url); $msg = apply_filters( 'newblog_notify_siteadmin', $msg ); - wp_mail( $email, sprintf( __( 'New Blog Registration: %s' ), $siteurl ), $msg ); + wp_mail( $email, sprintf( __( 'New Site Registration: %s' ), $siteurl ), $msg ); return true; } @@ -1009,7 +1009,7 @@ if ( empty( $current_site->site_name ) ) $current_site->site_name = 'WordPress MU'; - $subject = apply_filters( 'update_welcome_subject', sprintf(__('New %1$s Blog: %2$s'), $current_site->site_name, stripslashes( $title ) ) ); + $subject = apply_filters( 'update_welcome_subject', sprintf(__('New %1$s Site: %2$s'), $current_site->site_name, stripslashes( $title ) ) ); wp_mail($user->user_email, $subject, $message, $message_headers); return true; } Index: xmlrpc.php =================================================================== --- xmlrpc.php (revision 14314) +++ xmlrpc.php (working copy) @@ -246,7 +246,7 @@ */ function login_pass_ok($user_login, $user_pass) { if ( !get_option( 'enable_xmlrpc' ) ) { - $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') ) ); + $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') ) ); return false; } @@ -268,7 +268,7 @@ */ function login($username, $password) { if ( !get_option( 'enable_xmlrpc' ) ) { - $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') ) ); + $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') ) ); return false; } @@ -391,7 +391,7 @@ 'value' => $wp_version ), 'blog_url' => array( - 'desc' => __( 'Blog URL' ), + 'desc' => __( 'Site URL' ), 'readonly' => true, 'option' => 'siteurl' ), @@ -403,12 +403,12 @@ 'option' => 'gmt_offset' ), 'blog_title' => array( - 'desc' => __( 'Blog Title' ), + 'desc' => __( 'Site Title' ), 'readonly' => false, 'option' => 'blogname' ), 'blog_tagline' => array( - 'desc' => __( 'Blog Tagline' ), + 'desc' => __( 'Site Tagline' ), 'readonly' => false, 'option' => 'blogdescription' ), @@ -830,7 +830,7 @@ return $this->error; if ( !current_user_can("edit_posts") ) - return(new IXR_Error(401, __("Sorry, you cannot edit posts on this blog."))); + return(new IXR_Error(401, __("Sorry, you cannot edit posts on this site."))); do_action('xmlrpc_call', 'wp.getAuthors'); @@ -865,7 +865,7 @@ return $this->error; if ( !current_user_can( 'edit_posts' ) ) - return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this blog in order to view tags.' ) ); + return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view tags.' ) ); do_action( 'xmlrpc_call', 'wp.getKeywords' ); @@ -988,7 +988,7 @@ return $this->error; if ( !current_user_can( 'edit_posts' ) ) - return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts to this blog in order to view categories.' ) ); + return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts to this site in order to view categories.' ) ); do_action('xmlrpc_call', 'wp.suggestCategories'); @@ -1024,7 +1024,7 @@ return $this->error; if ( !current_user_can( 'moderate_comments' ) ) - return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this blog.' ) ); + return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) ); do_action('xmlrpc_call', 'wp.getComment'); @@ -1146,7 +1146,7 @@ return $this->error; if ( !current_user_can( 'moderate_comments' ) ) - return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this blog.' ) ); + return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) ); do_action('xmlrpc_call', 'wp.deleteComment'); @@ -1177,7 +1177,7 @@ return $this->error; if ( !current_user_can( 'moderate_comments' ) ) - return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this blog.' ) ); + return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) ); do_action('xmlrpc_call', 'wp.editComment'); @@ -1327,7 +1327,7 @@ return $this->error; if ( !current_user_can( 'moderate_comments' ) ) - return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) ); + return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) ); do_action('xmlrpc_call', 'wp.getCommentStatusList'); @@ -1386,7 +1386,7 @@ return $this->error; if ( !current_user_can( 'edit_posts' ) ) - return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) ); + return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) ); do_action('xmlrpc_call', 'wp.getPostStatusList'); @@ -1412,7 +1412,7 @@ return $this->error; if ( !current_user_can( 'edit_posts' ) ) - return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) ); + return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) ); do_action('xmlrpc_call', 'wp.getPageStatusList'); @@ -1438,7 +1438,7 @@ return $this->error; if ( !current_user_can( 'edit_pages' ) ) - return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) ); + return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) ); $templates = get_page_templates( ); $templates['Default'] = 'default'; @@ -1624,7 +1624,7 @@ return $this->error; if ( !current_user_can( 'edit_posts' ) ) - return new IXR_Error( 401, __( 'Sorry, you do not have access to user data on this blog.' ) ); + return new IXR_Error( 401, __( 'Sorry, you do not have access to user data on this site.' ) ); do_action('xmlrpc_call', 'blogger.getUserInfo'); @@ -1842,7 +1842,7 @@ $cap = ($publish) ? 'publish_posts' : 'edit_posts'; if ( !current_user_can($cap) ) - return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.')); + return new IXR_Error(401, __('Sorry, you are not allowed to post on this site.')); $post_status = ($publish) ? 'publish' : 'draft'; @@ -1989,13 +1989,13 @@ do_action('xmlrpc_call', 'metaWeblog.newPost'); $cap = ( $publish ) ? 'publish_posts' : 'edit_posts'; - $error_message = __( 'Sorry, you are not allowed to publish posts on this blog.' ); + $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' ); $post_type = 'post'; $page_template = ''; if ( !empty( $content_struct['post_type'] ) ) { if ( $content_struct['post_type'] == 'page' ) { $cap = ( $publish ) ? 'publish_pages' : 'edit_pages'; - $error_message = __( 'Sorry, you are not allowed to publish pages on this blog.' ); + $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' ); $post_type = 'page'; if ( !empty( $content_struct['wp_page_template'] ) ) $page_template = $content_struct['wp_page_template']; @@ -2264,13 +2264,13 @@ do_action('xmlrpc_call', 'metaWeblog.editPost'); $cap = ( $publish ) ? 'publish_posts' : 'edit_posts'; - $error_message = __( 'Sorry, you are not allowed to publish posts on this blog.' ); + $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' ); $post_type = 'post'; $page_template = ''; if ( !empty( $content_struct['post_type'] ) ) { if ( $content_struct['post_type'] == 'page' ) { $cap = ( $publish ) ? 'publish_pages' : 'edit_pages'; - $error_message = __( 'Sorry, you are not allowed to publish pages on this blog.' ); + $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' ); $post_type = 'page'; if ( !empty( $content_struct['wp_page_template'] ) ) $page_template = $content_struct['wp_page_template']; @@ -2720,7 +2720,7 @@ return $this->error; if ( !current_user_can( 'edit_posts' ) ) - return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this blog in order to view categories.' ) ); + return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) ); do_action('xmlrpc_call', 'metaWeblog.getCategories'); @@ -2908,7 +2908,7 @@ return $this->error; if ( !current_user_can( 'edit_posts' ) ) - return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this blog in order to view categories.' ) ); + return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) ); do_action('xmlrpc_call', 'mt.getCategoryList'); Index: wp-admin/users.php =================================================================== --- wp-admin/users.php (revision 14314) +++ wp-admin/users.php (working copy) @@ -249,7 +249,7 @@
-

+

'; break; case 'remove': - $messages[] = '

' . __('User removed from this blog.') . '

'; + $messages[] = '

' . __('User removed from this site.') . '

'; break; case 'err_admin_remove': $messages[] = '

' . __("You can't remove the current user.") . '

'; Index: wp-admin/includes/plugin.php =================================================================== --- wp-admin/includes/plugin.php (revision 14314) +++ wp-admin/includes/plugin.php (working copy) @@ -373,9 +373,9 @@ if ( is_multisite() ) { $dropins['sunrise.php' ] = array( __( 'Executed before Multisite is loaded.' ), 'SUNRISE' ); // SUNRISE - $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 + $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 } return $dropins; Index: wp-admin/includes/post.php =================================================================== --- wp-admin/includes/post.php (revision 14314) +++ wp-admin/includes/post.php (working copy) @@ -486,9 +486,9 @@ if ( !current_user_can( $ptype->edit_type_cap ) ) { if ( 'page' == $ptype->name ) - return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this blog.' ) ); + return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) ); else - return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this blog.' ) ); + return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) ); } // Check for autosave collisions Index: wp-admin/includes/upgrade.php =================================================================== --- wp-admin/includes/upgrade.php (revision 14314) +++ wp-admin/includes/upgrade.php (working copy) @@ -311,7 +311,7 @@ $user = new WP_User($user_id); $email = $user->user_email; $name = $user->user_login; - $message = sprintf(__("Your new WordPress blog has been successfully set up at: + $message = sprintf(__("Your new WordPress site has been successfully set up at: %1\$s @@ -326,7 +326,7 @@ http://wordpress.org/ "), $blog_url, $name, $password); - @wp_mail($email, __('New WordPress Blog'), $message); + @wp_mail($email, __('New WordPress Site'), $message); } endif; Index: wp-admin/includes/schema.php =================================================================== --- wp-admin/includes/schema.php (revision 14314) +++ wp-admin/includes/schema.php (working copy) @@ -197,7 +197,7 @@ $options = array( 'siteurl' => $guessurl, - 'blogname' => __('My Blog'), + 'blogname' => __('My Site'), /* translators: blog tagline */ 'blogdescription' => __('Just another WordPress site'), 'users_can_register' => 0, Index: wp-admin/includes/meta-boxes.php =================================================================== --- wp-admin/includes/meta-boxes.php (revision 14314) +++ wp-admin/includes/meta-boxes.php (working copy) @@ -366,7 +366,7 @@ ?>


()

-

pingbacks, no other action necessary.'); ?>

+

pingbacks, no other action necessary.'); ?>

-

%1$d x %2$d pixels will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?>

+

%1$d x %2$d pixels will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?>


Index: wp-admin/ms-sites.php =================================================================== --- wp-admin/ms-sites.php (revision 14314) +++ wp-admin/ms-sites.php (working copy) @@ -647,7 +647,7 @@ } } else { ?> - + ' . sprintf(__('Users cannot currently register themselves, but you can manually create users here.'), admin_url('options-general.php#users_can_register')) . '

'; } else { - echo '

' . __( 'You can add new users to your blog in two ways:' ) . '

  1. ' . __( 'Enter the username and email address of an existing user on this site.' ) . '
  2. ' . __( '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.' ) . '

'; + echo '

' . __( 'You can add new users to your site in two ways:' ) . '

  1. ' . __( 'Enter the username and email address of an existing user on this site.' ) . '
  2. ' . __( '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.' ) . '

'; echo '

' . __( '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.' ) . '

'; } ?> Index: wp-admin/import/dotclear.php =================================================================== --- wp-admin/import/dotclear.php (revision 14314) +++ wp-admin/import/dotclear.php (working copy) @@ -100,7 +100,7 @@ function greet() { - echo '

'.__('Howdy! This importer allows you to extract posts from a DotClear database into your blog. Mileage may vary.').'

'; + echo '

'.__('Howdy! This importer allows you to extract posts from a DotClear database into your WordPress site. Mileage may vary.').'

'; echo '

'.__('Your DotClear Configuration settings are as follows:').'

'; echo ''; wp_nonce_field('import-dotclear'); Index: wp-admin/import/blogger.php =================================================================== --- wp-admin/import/blogger.php (revision 14314) +++ wp-admin/import/blogger.php (working copy) @@ -48,7 +48,7 @@ $next_url = get_option('siteurl') . '/wp-admin/index.php?import=blogger&noheader=true'; $auth_url = "https://www.google.com/accounts/AuthSubRequest"; $title = __('Import Blogger'); - $welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.'); + $welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress site.'); $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).'); $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.'); $auth = esc_attr__('Authorize'); Index: wp-admin/import/rss.php =================================================================== --- wp-admin/import/rss.php (revision 14314) +++ wp-admin/import/rss.php (working copy) @@ -32,7 +32,7 @@ function greet() { echo '
'; - echo '

'.__('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.').'

'; + echo '

'.__('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.').'

'; wp_import_upload_form("admin.php?import=rss&step=1"); echo '
'; } Index: wp-admin/import/wordpress.php =================================================================== --- wp-admin/import/wordpress.php (revision 14314) +++ wp-admin/import/wordpress.php (working copy) @@ -45,7 +45,7 @@ function greet() { echo '
'; - echo '

'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we’ll import the posts, pages, comments, custom fields, categories, and tags into this blog.').'

'; + echo '

'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we’ll import the posts, pages, comments, custom fields, categories, and tags into this site.').'

'; echo '

'.__('Choose a WordPress WXR file to upload, then click Upload file and import.').'

'; wp_import_upload_form("admin.php?import=wordpress&step=1"); echo '
'; Index: wp-admin/tools.php =================================================================== --- wp-admin/tools.php (revision 14314) +++ wp-admin/tools.php (working copy) @@ -23,7 +23,7 @@

-

+

Index: wp-admin/user-edit.php =================================================================== --- wp-admin/user-edit.php (revision 14314) +++ wp-admin/user-edit.php (working copy) @@ -223,9 +223,9 @@ // print the 'no role' option. Make it selected if the user has no role yet. if ( $user_role ) - echo ''; + echo ''; else - echo ''; + echo ''; ?> Index: wp-admin/install.php =================================================================== --- wp-admin/install.php (revision 14314) +++ wp-admin/install.php (working copy) @@ -94,7 +94,7 @@ - + @@ -130,7 +130,7 @@

- +