diff --git a/wp-admin/ms-admin.php b/wp-admin/ms-admin.php index 14a337c7c..8cd207818 100644 --- a/wp-admin/ms-admin.php +++ b/wp-admin/ms-admin.php @@ -22,7 +22,7 @@ $c_users = get_user_count(); $c_blogs = get_blog_count(); $user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) ); -$blog_text = sprintf( _n( '%s blog', '%s blogs', $c_blogs ), number_format_i18n( $c_blogs ) ); +$blog_text = sprintf( _n( '%s site', '%s sites', $c_blogs ), number_format_i18n( $c_blogs ) ); $sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text ); ?> diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php index 60fd4c2ea..8a5a9a159 100644 --- a/wp-admin/ms-edit.php +++ b/wp-admin/ms-edit.php @@ -141,14 +141,14 @@ switch ( $_GET['action'] ) { wp_die( __('You do not have permission to access this page.') ); if ( is_array( $_POST[ 'blog' ] ) == false ) - wp_die( "Can't create an empty blog." ); + wp_die( "Can't create an empty site." ); $blog = $_POST['blog']; $domain = sanitize_user( str_replace( '/', '', $blog[ 'domain' ] ) ); $email = sanitize_email( $blog[ 'email' ] ); $title = $blog[ 'title' ]; if ( empty($domain) || empty($email) ) - wp_die( __('Missing blog address or email address.') ); + wp_die( __('Missing site address or email address.') ); if ( !is_email( $email ) ) wp_die( __('Invalid email address') ); @@ -178,8 +178,8 @@ switch ( $_GET['action'] ) { $dashboard_blog = get_dashboard_blog(); if ( get_user_option( 'primary_blog', $user_id ) == $dashboard_blog->blog_id ) update_user_option( $user_id, 'primary_blog', $id, true ); - $content_mail = sprintf( __( "New blog created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain.$path, stripslashes( $title ) ); - wp_mail( get_site_option('admin_email'), sprintf(__('[%s] New Blog Created'), $current_site->site_name), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' ); + $content_mail = sprintf( __( "New site created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain.$path, stripslashes( $title ) ); + wp_mail( get_site_option('admin_email'), sprintf(__('[%s] New Site Created'), $current_site->site_name), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' ); wpmu_welcome_notification( $id, $user_id, $password, $title, array( "public" => 1 ) ); wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'add-blog'), $_SERVER['HTTP_REFERER'] ) ); exit(); @@ -439,7 +439,7 @@ switch ( $_GET['action'] ) { > - <?php _e("WordPress MU › Confirm your action"); ?> + <?php _e("WordPress › Confirm your action"); ?> @@ -498,7 +498,7 @@ switch ( $_GET['action'] ) { continue; $user = new WP_User( $val ); if ( in_array( $user->user_login, get_site_option( 'site_admins', array( 'admin' ) ) ) ) - wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a site admnistrator.' ), $user->user_login ) ); + wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network admnistrator.' ), $user->user_login ) ); if ( isset($_POST['alluser_spam']) ) { $userfunction = 'all_spam'; $blogs = get_blogs_of_user( $val, true ); diff --git a/wp-admin/ms-options.php b/wp-admin/ms-options.php index 0ef991096..a0aa3ac52 100644 --- a/wp-admin/ms-options.php +++ b/wp-admin/ms-options.php @@ -21,13 +21,13 @@ if (isset($_GET['updated'])) {
-

+

-

(These settings cannot be modified by blog owners)') ?>

+

(These settings cannot be modified by site owners)') ?>

- + - + @@ -71,7 +71,7 @@ if (isset($_GET['updated'])) { @@ -79,14 +79,14 @@ if (isset($_GET['updated'])) { - + @@ -109,7 +109,7 @@ if (isset($_GET['updated'])) { ?>
- + @@ -118,7 +118,7 @@ if (isset($_GET['updated'])) { @@ -129,7 +129,7 @@ if (isset($_GET['updated'])) { $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
- + @@ -138,7 +138,7 @@ if (isset($_GET['updated'])) { @@ -147,7 +147,7 @@ if (isset($_GET['updated'])) { @@ -163,7 +163,7 @@ if (isset($_GET['updated'])) { @@ -171,7 +171,7 @@ if (isset($_GET['updated'])) { @@ -179,7 +179,7 @@ if (isset($_GET['updated'])) { @@ -187,7 +187,7 @@ if (isset($_GET['updated'])) { @@ -195,7 +195,7 @@ if (isset($_GET['updated'])) { @@ -208,14 +208,14 @@ if (isset($_GET['updated'])) { - + - + @@ -231,25 +231,25 @@ if (isset($_GET['updated'])) { + echo __( "A good one to use would be the feed from your main site: " ) . 'http://' . $current_site->domain . $current_site->path . 'feed/'; ?>

@@ -36,7 +36,7 @@ if (isset($_GET['updated'])) {

@@ -52,12 +52,12 @@ if (isset($_GET['updated'])) { ?>
-
+

-
-

+
+

' . __('If registration is disabled, please set "NOBLOGREDIRECT" in wp-config.php to a url you will redirect visitors to if they visit a non existant blog.') . '

'; + echo '

' . __('If registration is disabled, please set "NOBLOGREDIRECT" in wp-config.php to a url you will redirect visitors to if they visit a non existant site.') . '

'; } ?>
/>
/>
- +
- />
- />
- Add New page.') ?> + />
+ />
+ Add New page.') ?>
" />
- New users are added to this blog as subscribers (or the user role defined below) if they don't have a blog. Leave blank for the main blog. 'Subscriber' users on old blog will be moved to the new blog if changed. New blog will be created if it does not exist." ); ?> + New users are added to this site as subscribers (or the user role defined below) if they don't have a site. Leave blank for the main site. 'Subscriber' users on old site will be moved to the new site if changed. New site will be created if it does not exist." ); ?>
" size="45" />
- +

- +

- +

- +

- +

- +

- +

- +


MB

-
+
domain . $current_site->path . 'feed/' ) - echo __( "A good one to use would be the feed from your main blog: " ) . 'http://' . $current_site->domain . $current_site->path . 'feed/'; ?>

- +

- +
-

(These settings may be overridden by blog owners)') ?>

+

(These settings may be overridden by site owners)') ?>

" />
-

+

@@ -157,7 +157,7 @@ switch ( $action ) {
-

+

-

+

@@ -237,7 +237,7 @@ switch ( $action ) { // Blog users $blogusers = get_users_of_blog( $id ); if ( is_array( $blogusers ) ) { - echo '

' . __('Blog Users') . '

'; + echo '

' . __('Site Users') . '

'; echo '
'; echo ""; reset($blogusers); @@ -305,7 +305,7 @@ switch ( $action ) {
-

+

" . __('User') . "" . __('Role') . "" . __('Password') . "" . __('Remove') . "
@@ -507,21 +507,21 @@ switch ( $action ) { $actions[] = "" . __('Backend') . ''; if ( get_blog_status( $blog['blog_id'], "deleted" ) == '1' ) - $actions[] = '' . __('Activate') . ''; + $actions[] = '' . __('Activate') . ''; else - $actions[] = '' . __('Deactivate') . ''; + $actions[] = '' . __('Deactivate') . ''; if ( get_blog_status( $blog['blog_id'], "archived" ) == '1' ) - $actions[] = '' . __('Unarchive') . ''; + $actions[] = '' . __('Unarchive') . ''; else - $actions[] = '' . __('Archive') . ''; + $actions[] = '' . __('Archive') . ''; if ( get_blog_status( $blog['blog_id'], "spam" ) == '1' ) - $actions[] = '' . __('Not Spam') . ''; + $actions[] = '' . __('Not Spam') . ''; else - $actions[] = '' . __("Spam") . ''; + $actions[] = '' . __("Spam") . ''; - $actions[] = '' . __("Delete") . ''; + $actions[] = '' . __("Delete") . ''; $actions[] = "" . __('Visit') . ''; ?> diff --git a/wp-admin/ms-users.php b/wp-admin/ms-users.php index f601baf2e..a19c5cf91 100644 --- a/wp-admin/ms-users.php +++ b/wp-admin/ms-users.php @@ -125,7 +125,7 @@ if ( isset($_GET['updated']) && $_GET['updated'] == 'true' ) { -

+

$column_display_name) { if ( $column_id == 'blogs' ) { - echo ''; + echo ''; } elseif ( $column_id == 'checkbox') { echo ''; } else { ?>
'.__('Blogs').''.__('Sites').'