WordPress.org

Make WordPress Core

Changeset 13379


Ignore:
Timestamp:
02/24/10 19:56:10 (4 years ago)
Author:
wpmuguru
Message:

more multisite UX rebranding, See #11644

Location:
trunk/wp-admin
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/ms-admin.php

    r13301 r13379  
    2323 
    2424$user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) ); 
    25 $blog_text = sprintf( _n( '%s blog', '%s blogs', $c_blogs ), number_format_i18n( $c_blogs ) ); 
     25$blog_text = sprintf( _n( '%s site', '%s sites', $c_blogs ), number_format_i18n( $c_blogs ) ); 
    2626 
    2727$sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text ); 
  • trunk/wp-admin/ms-edit.php

    r13311 r13379  
    142142 
    143143        if ( is_array( $_POST[ 'blog' ] ) == false ) 
    144             wp_die( "Can't create an empty blog." ); 
     144            wp_die( "Can't create an empty site." ); 
    145145        $blog = $_POST['blog']; 
    146146        $domain = sanitize_user( str_replace( '/', '', $blog[ 'domain' ] ) ); 
     
    149149 
    150150        if ( empty($domain) || empty($email) ) 
    151             wp_die( __('Missing blog address or email address.') ); 
     151            wp_die( __('Missing site address or email address.') ); 
    152152        if ( !is_email( $email ) ) 
    153153            wp_die( __('Invalid email address') ); 
     
    179179            if ( get_user_option( 'primary_blog', $user_id ) == $dashboard_blog->blog_id ) 
    180180                update_user_option( $user_id, 'primary_blog', $id, true ); 
    181             $content_mail = sprintf( __( "New blog created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain.$path, stripslashes( $title ) ); 
    182             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' ) . '>' ); 
     181            $content_mail = sprintf( __( "New site created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain.$path, stripslashes( $title ) ); 
     182            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' ) . '>' ); 
    183183            wpmu_welcome_notification( $id, $user_id, $password, $title, array( "public" => 1 ) ); 
    184184            wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'add-blog'), $_SERVER['HTTP_REFERER'] ) ); 
     
    440440        <html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists('language_attributes') ) language_attributes(); ?>> 
    441441            <head> 
    442                 <title><?php _e("WordPress MU &rsaquo; Confirm your action"); ?></title> 
     442                <title><?php _e("WordPress &rsaquo; Confirm your action"); ?></title> 
    443443 
    444444                <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
     
    499499                $user = new WP_User( $val ); 
    500500                if ( in_array( $user->user_login, get_site_option( 'site_admins', array( 'admin' ) ) ) ) 
    501                     wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a site admnistrator.' ), $user->user_login ) ); 
     501                    wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network admnistrator.' ), $user->user_login ) ); 
    502502                if ( isset($_POST['alluser_spam']) ) { 
    503503                    $userfunction = 'all_spam'; 
  • trunk/wp-admin/ms-options.php

    r13301 r13379  
    2222<div class="wrap"> 
    2323    <?php screen_icon(); ?> 
    24     <h2><?php _e('Site Options') ?></h2> 
     24    <h2><?php _e('Network Options') ?></h2> 
    2525    <form method="post" action="ms-edit.php?action=siteoptions"> 
    2626        <?php wp_nonce_field( "siteoptions" ); ?> 
    27         <h3><?php _e('Operational Settings <em>(These settings cannot be modified by blog owners)</em>') ?></h3> 
    28         <table class="form-table"> 
    29             <tr valign="top"> 
    30                 <th scope="row"><?php _e('Site Name') ?></th> 
     27        <h3><?php _e('Operational Settings <em>(These settings cannot be modified by site owners)</em>') ?></h3> 
     28        <table class="form-table"> 
     29            <tr valign="top"> 
     30                <th scope="row"><?php _e('Network Name') ?></th> 
    3131                <td> 
    3232                    <input name="site_name" type="text" id="site_name" style="width: 95%" value="<?php echo esc_attr($current_site->site_name) ?>" size="45" /> 
     
    3737 
    3838            <tr valign="top"> 
    39                 <th scope="row"><?php _e('Site Admin Email') ?></th> 
     39                <th scope="row"><?php _e('Network Admin Email') ?></th> 
    4040                <td> 
    4141                    <input name="admin_email" type="text" id="admin_email" style="width: 95%" value="<?php echo esc_attr( get_site_option('admin_email') ) ?>" size="45" /> 
     
    5353                <td> 
    5454                    <label><input name="registration" type="radio" id="registration1" value='none' <?php checked( get_site_option('registration'), 'none') ?> /> <?php _e('Disabled'); ?></label><br /> 
    55                     <label><input name="registration" type="radio" id="registration2" value='all' <?php  checked( get_site_option('registration'), 'all') ?> /> <?php _e('Enabled. Blogs and user accounts can be created.'); ?></label><br /> 
     55                    <label><input name="registration" type="radio" id="registration2" value='all' <?php  checked( get_site_option('registration'), 'all') ?> /> <?php _e('Enabled. Sites and user accounts can be created.'); ?></label><br /> 
    5656                    <label><input name="registration" type="radio" id="registration3" value='user' <?php checked( get_site_option('registration'), 'user') ?> /> <?php _e('Only user account can be created.'); ?></label><br /> 
    57                     <label><input name="registration" type="radio" id="registration4" value='blog' <?php checked( get_site_option('registration'), 'blog') ?> /> <?php _e('Only logged in users can create new blogs.'); ?></label><br /> 
    58                     <p><?php _e('Disable or enable registration and who or what can be registered. (Default=all)'); ?></p> 
     57                    <label><input name="registration" type="radio" id="registration4" value='blog' <?php checked( get_site_option('registration'), 'blog') ?> /> <?php _e('Only logged in users can create new sites.'); ?></label><br /> 
     58                    <p><?php _e('Disable or enable registration and who or what can be registered. (Default=Disabled)'); ?></p> 
    5959                    <?php if ( is_subdomain_install() ) { 
    60                         echo '<p>' . __('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.') . '</p>'; 
     60                        echo '<p>' . __('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.') . '</p>'; 
    6161                    } ?> 
    6262                </td> 
     
    7272                    <input name="registrationnotification" type="radio" id="registrationnotification1" value='yes' <?php checked( get_site_option('registrationnotification'), 'yes') ?> /> <?php _e('Yes'); ?><br /> 
    7373                    <input name="registrationnotification" type="radio" id="registrationnotification2" value='no' <?php checked( get_site_option('registrationnotification'), 'no') ?> /> <?php _e('No'); ?><br /> 
    74                     <?php _e('Send the site admin an email notification every time someone registers a blog or user account.') ?> 
     74                    <?php _e('Send the network admin an email notification every time someone registers a site or user account.') ?> 
    7575                </td> 
    7676            </tr> 
     
    8080                <td> 
    8181                    <a name='addnewusers'></a> 
    82                     <input name="add_new_users" type="radio" id="add_new_users1" value='1' <?php checked( get_site_option('add_new_users') ) ?> /> <?php _e('Yes'); ?><br /> 
    83                     <input name="add_new_users" type="radio" id="add_new_users2" value='0' <?php checked( get_site_option('add_new_users'), 0) ?> /> <?php _e('No'); ?><br /> 
    84                     <?php _e('Allow blog administrators to add new users to their blog via the Users->Add New page.') ?> 
    85                 </td> 
    86             </tr> 
    87  
    88             <tr valign="top"> 
    89                 <th scope="row"><?php _e('Dashboard Blog') ?></th> 
     82                    <input name="add_new_users" type="radio" id="add_new_users1" value='1' <?php checked( get_site_option('add_new_users'), 1 ) ?> /> <?php _e('Yes'); ?><br /> 
     83                    <input name="add_new_users" type="radio" id="add_new_users2" value='0' <?php checked( get_site_option('add_new_users'), 0 ) ?> /> <?php _e('No'); ?><br /> 
     84                    <?php _e('Allow site administrators to add new users to their site via the Users->Add New page.') ?> 
     85                </td> 
     86            </tr> 
     87 
     88            <tr valign="top"> 
     89                <th scope="row"><?php _e('Dashboard Site') ?></th> 
    9090                <td> 
    9191                    <?php 
     
    9999                    <input name="dashboard_blog" type="text" id="dashboard_blog" value="<?php echo esc_attr($blogname); ?>" size="30" /> 
    100100                    <br /> 
    101                     <?php _e( "Blogname ('dashboard', 'control', 'manager', etc) or blog id.<br />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." ); ?> 
     101                    <?php _e( "Blogname ('dashboard', 'control', 'manager', etc) or blog id.<br />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." ); ?> 
    102102                </td> 
    103103            </tr> 
     
    110110                    </select> 
    111111                    <br /> 
    112                     <?php _e( "The default role for new users on the Dashboard blog. This should probably be 'Subscriber' or maybe 'Contributor'." ); ?> 
     112                    <?php _e( "The default role for new users on the Dashboard site. This should probably be 'Subscriber' or maybe 'Contributor'." ); ?> 
    113113                </td> 
    114114            </tr> 
     
    119119                    <input name="illegal_names" type="text" id="illegal_names" style="width: 95%" value="<?php echo esc_attr( implode( " ", get_site_option('illegal_names') ) ); ?>" size="45" /> 
    120120                    <br /> 
    121                     <?php _e('Users are not allowed to register these blogs. Separate names by spaces.') ?> 
     121                    <?php _e('Users are not allowed to register these sites. Separate names by spaces.') ?> 
    122122                </td> 
    123123            </tr> 
     
    130130                    <textarea name="limited_email_domains" id="limited_email_domains" cols='40' rows='5'><?php echo $limited_email_domains == '' ? '' : @implode( "\n", $limited_email_domains ); ?></textarea> 
    131131                    <br /> 
    132                     <?php _e('If you want to limit blog registrations to certain domains. One domain per line.') ?> 
     132                    <?php _e('If you want to limit site registrations to certain domains. One domain per line.') ?> 
    133133                </td> 
    134134            </tr> 
     
    139139                    <textarea name="banned_email_domains" id="banned_email_domains" cols='40' rows='5'><?php echo get_site_option('banned_email_domains') == '' ? '' : @implode( "\n", get_site_option('banned_email_domains') ); ?></textarea> 
    140140                    <br /> 
    141                     <?php _e('If you want to ban certain email domains from blog registrations. One domain per line.') ?> 
     141                    <?php _e('If you want to ban certain email domains from site registrations. One domain per line.') ?> 
    142142                </td> 
    143143            </tr> 
     
    148148                    <textarea name="welcome_email" id="welcome_email" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('welcome_email') ) ?></textarea> 
    149149                    <br /> 
    150                     <?php _e('The welcome email sent to new blog owners.') ?> 
     150                    <?php _e('The welcome email sent to new site owners.') ?> 
    151151                </td> 
    152152            </tr> 
     
    164164                    <textarea name="first_post" id="first_post" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_post') ) ?></textarea> 
    165165                    <br /> 
    166                     <?php _e('First post on a new blog.') ?> 
     166                    <?php _e('First post on a new site.') ?> 
    167167                </td> 
    168168            </tr> 
     
    172172                    <textarea name="first_page" id="first_page" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_page') ) ?></textarea> 
    173173                    <br /> 
    174                     <?php _e('First page on a new blog.') ?> 
     174                    <?php _e('First page on a new site.') ?> 
    175175                </td> 
    176176            </tr> 
     
    180180                    <textarea name="first_comment" id="first_comment" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_comment') ) ?></textarea> 
    181181                    <br /> 
    182                     <?php _e('First comment on a new blog.') ?> 
     182                    <?php _e('First comment on a new site.') ?> 
    183183                </td> 
    184184            </tr> 
     
    188188                    <input type="text" size='40' name="first_comment_author" id="first_comment_author" value="<?php echo get_site_option('first_comment_author') ?>" /> 
    189189                    <br /> 
    190                     <?php _e('Author of first comment on a new blog.') ?> 
     190                    <?php _e('Author of first comment on a new site.') ?> 
    191191                </td> 
    192192            </tr> 
     
    196196                    <input type="text" size='40' name="first_comment_url" id="first_comment_url" value="<?php echo esc_attr(get_site_option('first_comment_url')) ?>" /> 
    197197                    <br /> 
    198                     <?php _e('URL on first comment on a new blog.') ?> 
     198                    <?php _e('URL on first comment on a new site.') ?> 
    199199                </td> 
    200200            </tr> 
     
    209209            </tr> 
    210210            <tr valign="top"> 
    211                 <th scope="row"><?php _e('Blog upload space check') ?></th> 
     211                <th scope="row"><?php _e('Site upload space check') ?></th> 
    212212                <td> 
    213213                <label><input type='radio' id="upload_space_check_disabled" name="upload_space_check_disabled" value='0' <?php checked( get_site_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php _e( 'Enabled' ); ?></label><br /> 
     
    216216            </tr> 
    217217            <tr valign="top"> 
    218                 <th scope="row"><?php _e('Blog upload space') ?></th> 
     218                <th scope="row"><?php _e('Site upload space') ?></th> 
    219219                <td><input name="blog_upload_space" type="text" id="blog_upload_space" value="<?php echo esc_attr( get_site_option('blog_upload_space', 10) ) ?>" size="3" /> MB</td> 
    220220            </tr> 
     
    232232                <th scope="row"><?php _e('Admin Notice Feed') ?></th> 
    233233                <td><input name="admin_notice_feed" style="width: 95%" type="text" id="admin_notice_feed" value="<?php echo esc_attr( get_site_option( 'admin_notice_feed' ) ) ?>" size="80" /><br /> 
    234                 <?php _e( 'Display the latest post from this RSS or Atom feed on all blog dashboards. Leave blank to disable.' ); ?><br /> 
     234                <?php _e( 'Display the latest post from this RSS or Atom feed on all site dashboards. Leave blank to disable.' ); ?><br /> 
    235235                <?php if ( get_site_option( 'admin_notice_feed' ) != 'http://' . $current_site->domain . $current_site->path . 'feed/' ) 
    236                     echo __( "A good one to use would be the feed from your main blog: " ) . 'http://' . $current_site->domain . $current_site->path . 'feed/'; ?></td> 
     236                    echo __( "A good one to use would be the feed from your main site: " ) . 'http://' . $current_site->domain . $current_site->path . 'feed/'; ?></td> 
    237237            </tr> 
    238238        </table> 
     
    241241        <table class="form-table"> 
    242242            <tr valign="top"> 
    243                 <th scope="row"><?php _e('Site Admins') ?></th> 
     243                <th scope="row"><?php _e('Network Admins') ?></th> 
    244244                <td> 
    245245                    <input name="site_admins" type="text" id="site_admins" style="width: 95%" value="<?php echo esc_attr( implode(' ', get_site_option( 'site_admins', array( 'admin' ) ) ) ) ?>" size="45" /> 
    246246                    <br /> 
    247                     <?php _e('These users may login to the main blog and administer the site. Space separated list of usernames.') ?> 
    248                 </td> 
    249             </tr> 
    250         </table> 
    251  
    252         <h3><?php _e('Site Wide Settings <em>(These settings may be overridden by blog owners)</em>') ?></h3> 
     247                    <?php _e('These users may login to the main site and administer the network. Space separated list of usernames.') ?> 
     248                </td> 
     249            </tr> 
     250        </table> 
     251 
     252        <h3><?php _e('Network Wide Settings <em>(These settings may be overridden by site owners)</em>') ?></h3> 
    253253        <table class="form-table"> 
    254254            <?php 
  • trunk/wp-admin/ms-sites.php

    r13301 r13379  
    2424        switch ($_GET['action']) { 
    2525            case 'all_notspam': 
    26                 _e('Blogs mark as not spam !'); 
     26                _e('Sites mark as not spam !'); 
    2727            break; 
    2828            case 'all_spam': 
    29                 _e('Blogs mark as spam !'); 
     29                _e('Sites mark as spam !'); 
    3030            break; 
    3131            case 'all_delete': 
    32                 _e('Blogs deleted !'); 
     32                _e('Sites deleted !'); 
    3333            break; 
    3434            case 'delete': 
    35                 _e('Blog deleted !'); 
     35                _e('Site deleted !'); 
    3636            break; 
    3737            case 'add-blog': 
    38                 _e('Blog added !'); 
     38                _e('Site added !'); 
    3939            break; 
    4040            case 'archive': 
    41                 _e('Blog archived !'); 
     41                _e('Site archived !'); 
    4242            break; 
    4343            case 'unarchive': 
    44                 _e('Blog unarchived !'); 
     44                _e('Site unarchived !'); 
    4545            break; 
    4646            case 'activate': 
    47                 _e('Blog activated !'); 
     47                _e('Site activated !'); 
    4848            break; 
    4949            case 'deactivate': 
    50                 _e('Blog deactivated !'); 
     50                _e('Site deactivated !'); 
    5151            break; 
    5252            case 'unspam': 
    53                 _e('Blog mark as not spam !'); 
     53                _e('Site mark as not spam !'); 
    5454            break; 
    5555            case 'spam': 
    56                 _e('Blog mark as spam !'); 
     56                _e('Site mark as spam !'); 
    5757            break; 
    5858            case 'umature': 
    59                 _e('Blog mark as not mature !'); 
     59                _e('Site mark as not mature !'); 
    6060            break; 
    6161            case 'mature': 
    62                 _e('Blog mark as mature !'); 
     62                _e('Site mark as mature !'); 
    6363            break; 
    6464            default: 
     
    9090            <div class='metabox-holder' style='width:49%;float:left;'> 
    9191            <div id="blogedit_bloginfo" class="postbox " > 
    92             <h3 class='hndle'><span><?php _e('Blog info (wp_blogs)'); ?></span></h3> 
     92            <h3 class='hndle'><span><?php _e('Site info (wp_blogs)'); ?></span></h3> 
    9393            <div class="inside"> 
    9494                <table class="form-table"> 
     
    158158 
    159159            <div id="blogedit_blogoptions" class="postbox " > 
    160             <h3 class='hndle'><span><?php printf( __('Blog options (%soptions)'), $blog_prefix ); ?></span></h3> 
     160            <h3 class='hndle'><span><?php printf( __('Site options (%soptions)'), $blog_prefix ); ?></span></h3> 
    161161            <div class="inside"> 
    162162                <table class="form-table"> 
     
    224224            ?> 
    225225            <div id="blogedit_blogthemes" class="postbox"> 
    226             <h3 class='hndle'><span><?php esc_html_e('Blog Themes'); ?></span></h3> 
     226            <h3 class='hndle'><span><?php esc_html_e('Site Themes'); ?></span></h3> 
    227227            <div class="inside"> 
    228228                <table class="form-table"> 
     
    238238                    $blogusers = get_users_of_blog( $id ); 
    239239                    if ( is_array( $blogusers ) ) { 
    240                         echo '<div id="blogedit_blogusers" class="postbox"><h3 class="hndle"><span>' . __('Blog Users') . '</span></h3><div class="inside">'; 
     240                        echo '<div id="blogedit_blogusers" class="postbox"><h3 class="hndle"><span>' . __('Site Users') . '</span></h3><div class="inside">'; 
    241241                        echo '<table class="form-table">'; 
    242242                        echo "<tr><th>" . __('User') . "</th><th>" . __('Role') . "</th><th>" . __('Password') . "</th><th>" . __('Remove') . "</th></tr>"; 
     
    306306 
    307307            <div id="blogedit_miscoptions" class="postbox"> 
    308             <h3 class='hndle'><span><?php _e('Misc Blog Actions') ?></span></h3> 
     308            <h3 class='hndle'><span><?php _e('Misc Site Actions') ?></span></h3> 
    309309            <div class="inside"> 
    310310                <table class="form-table"> 
     
    508508 
    509509                                    if ( get_blog_status( $blog['blog_id'], "deleted" ) == '1' ) 
    510                                         $actions[]  = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=activateblog&amp;ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to activate the blog %s" ), $blogname ) ) . '">' . __('Activate') . '</a>'; 
     510                                        $actions[]  = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=activateblog&amp;ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to activate the site %s" ), $blogname ) ) . '">' . __('Activate') . '</a>'; 
    511511                                    else 
    512                                         $actions[]  = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=deactivateblog&amp;ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to deactivate the blog %s" ), $blogname ) ) . '">' . __('Deactivate') . '</a>'; 
     512                                        $actions[]  = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=deactivateblog&amp;ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to deactivate the site %s" ), $blogname ) ) . '">' . __('Deactivate') . '</a>'; 
    513513 
    514514                                    if ( get_blog_status( $blog['blog_id'], "archived" ) == '1' ) 
    515                                         $actions[]  = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' .  $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unarchive the blog %s" ), $blogname ) ) . '">' . __('Unarchive') . '</a>'; 
     515                                        $actions[]  = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' .  $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unarchive the site %s" ), $blogname ) ) . '">' . __('Unarchive') . '</a>'; 
    516516                                    else 
    517                                         $actions[]  = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to archive the blog %s" ), $blogname ) ) . '">' . __('Archive') . '</a>'; 
     517                                        $actions[]  = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to archive the site %s" ), $blogname ) ) . '">' . __('Archive') . '</a>'; 
    518518 
    519519                                    if ( get_blog_status( $blog['blog_id'], "spam" ) == '1' ) 
    520                                         $actions[]  = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unspam the blog %s" ), $blogname ) ) . '">' . __('Not Spam') . '</a>'; 
     520                                        $actions[]  = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unspam the site %s" ), $blogname ) ) . '">' . __('Not Spam') . '</a>'; 
    521521                                    else 
    522                                         $actions[]  = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to mark the blog %s as spam" ), $blogname ) ) . '">' . __("Spam") . '</a>'; 
    523  
    524                                     $actions[]  = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to delete the blog %s" ), $blogname ) ) . '">' . __("Delete") . '</a>'; 
     522                                        $actions[]  = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to mark the site %s as spam" ), $blogname ) ) . '">' . __("Spam") . '</a>'; 
     523 
     524                                    $actions[]  = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to delete the site %s" ), $blogname ) ) . '">' . __("Delete") . '</a>'; 
    525525 
    526526                                    $actions[]  = "<a href='" . get_home_url($blog['blog_id']) . "' rel='permalink'>" . __('Visit') . '</a>'; 
  • trunk/wp-admin/ms-users.php

    r13301 r13379  
    126126 
    127127        <?php if ( isset($_GET['s']) && $_GET['s'] != '' ) : ?> 
    128             <p><a href="ms-sites.php?action=blogs&amp;s=<?php echo urlencode( stripslashes( $s ) ); ?>&blog_name=Search+blogs+by+name"><?php _e('Search Blogs for') ?> <strong><?php echo stripslashes( $s ) ?></strong></a></p> 
     128            <p><a href="ms-sites.php?action=blogs&amp;s=<?php echo urlencode( stripslashes( $s ) ); ?>&blog_name=Search+blogs+by+name"><?php _e('Search Sites for') ?> <strong><?php echo stripslashes( $s ) ?></strong></a></p> 
    129129        <?php endif; ?> 
    130130 
     
    146146                <?php foreach( (array) $posts_columns as $column_id => $column_display_name) { 
    147147                    if ( $column_id == 'blogs' ) { 
    148                         echo '<th scope="col">'.__('Blogs').'</th>'; 
     148                        echo '<th scope="col">'.__('Sites').'</th>'; 
    149149                    } elseif ( $column_id == 'checkbox') { 
    150150                        echo '<th scope="col" class="check-column"><input type="checkbox" /></th>'; 
Note: See TracChangeset for help on using the changeset viewer.