WordPress.org

Make WordPress Core

Changeset 14315


Ignore:
Timestamp:
04/30/10 03:17:49 (4 years ago)
Author:
nacin
Message:

s/blog/site/ in even more places. props PeteMall, see #11644.

Location:
trunk
Files:
22 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/custom-header.php

    r13895 r14315  
    415415?> 
    416416<div class="wrap"> 
    417 <h3><?php _e('Upload New Header Image'); ?></h3><p><?php _e('Here you can upload a custom header image to be shown at the top of your blog instead of the default one. On the next screen you will be able to crop the image.'); ?> <?php printf(__('Images of exactly <strong>%1$d x %2$d pixels</strong> will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?></p> 
     417<h3><?php _e('Upload New Header Image'); ?></h3><p><?php _e('Here you can upload a custom header image to be shown at the top of your site instead of the default one. On the next screen you will be able to crop the image.'); ?> <?php printf(__('Images of exactly <strong>%1$d x %2$d pixels</strong> will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?></p> 
    418418 
    419419<form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo esc_attr(add_query_arg('step', 2)) ?>"> 
  • trunk/wp-admin/import/blogger.php

    r13684 r14315  
    4949        $auth_url = "https://www.google.com/accounts/AuthSubRequest"; 
    5050        $title = __('Import Blogger'); 
    51         $welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.'); 
     51        $welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress site.'); 
    5252        $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).'); 
    5353        $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.'); 
  • trunk/wp-admin/import/dotclear.php

    r14165 r14315  
    101101    function greet() 
    102102    { 
    103         echo '<div class="narrow"><p>'.__('Howdy! This importer allows you to extract posts from a DotClear database into your blog.  Mileage may vary.').'</p>'; 
     103        echo '<div class="narrow"><p>'.__('Howdy! This importer allows you to extract posts from a DotClear database into your WordPress site.  Mileage may vary.').'</p>'; 
    104104        echo '<p>'.__('Your DotClear Configuration settings are as follows:').'</p>'; 
    105105        echo '<form action="admin.php?import=dotclear&amp;step=1" method="post">'; 
  • trunk/wp-admin/import/rss.php

    r12985 r14315  
    3333    function greet() { 
    3434        echo '<div class="narrow">'; 
    35         echo '<p>'.__('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.').'</p>'; 
     35        echo '<p>'.__('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.').'</p>'; 
    3636        wp_import_upload_form("admin.php?import=rss&amp;step=1"); 
    3737        echo '</div>'; 
  • trunk/wp-admin/import/wordpress.php

    r13907 r14315  
    4646    function greet() { 
    4747        echo '<div class="narrow">'; 
    48         echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts, pages, comments, custom fields, categories, and tags into this blog.').'</p>'; 
     48        echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts, pages, comments, custom fields, categories, and tags into this site.').'</p>'; 
    4949        echo '<p>'.__('Choose a WordPress WXR file to upload, then click Upload file and import.').'</p>'; 
    5050        wp_import_upload_form("admin.php?import=wordpress&amp;step=1"); 
  • trunk/wp-admin/includes/meta-boxes.php

    r14232 r14315  
    367367?> 
    368368<p><label for="trackback_url"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p> 
    369 <p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress blogs they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p> 
     369<p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress sites they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p> 
    370370<?php 
    371371if ( ! empty($pings) ) 
  • trunk/wp-admin/includes/plugin.php

    r14127 r14315  
    374374    if ( is_multisite() ) { 
    375375        $dropins['sunrise.php'       ] = array( __( 'Executed before Multisite is loaded.' ), 'SUNRISE' ); // SUNRISE 
    376         $dropins['blog-deleted.php'  ] = array( __( 'Custom blog deleted message.'   ), true ); // auto on deleted blog 
    377         $dropins['blog-inactive.php' ] = array( __( 'Custom blog inactive message.'  ), true ); // auto on inactive blog 
    378         $dropins['blog-suspended.php'] = array( __( 'Custom blog suspended message.' ), true ); // auto on archived or spammed blog 
     376        $dropins['blog-deleted.php'  ] = array( __( 'Custom site deleted message.'   ), true ); // auto on deleted blog 
     377        $dropins['blog-inactive.php' ] = array( __( 'Custom site inactive message.'  ), true ); // auto on inactive blog 
     378        $dropins['blog-suspended.php'] = array( __( 'Custom site suspended message.' ), true ); // auto on archived or spammed blog 
    379379    } 
    380380 
  • trunk/wp-admin/includes/post.php

    r14216 r14315  
    487487    if ( !current_user_can( $ptype->edit_type_cap ) ) { 
    488488        if ( 'page' == $ptype->name ) 
    489             return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this blog.' ) ); 
     489            return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) ); 
    490490        else 
    491             return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this blog.' ) ); 
     491            return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) ); 
    492492    } 
    493493 
  • trunk/wp-admin/includes/schema.php

    r14275 r14315  
    198198    $options = array( 
    199199    'siteurl' => $guessurl, 
    200     'blogname' => __('My Blog'), 
     200    'blogname' => __('My Site'), 
    201201    /* translators: blog tagline */ 
    202202    'blogdescription' => __('Just another WordPress site'), 
  • trunk/wp-admin/includes/upgrade.php

    r14218 r14315  
    312312    $email = $user->user_email; 
    313313    $name = $user->user_login; 
    314     $message = sprintf(__("Your new WordPress blog has been successfully set up at: 
     314    $message = sprintf(__("Your new WordPress site has been successfully set up at: 
    315315 
    316316%1\$s 
     
    327327"), $blog_url, $name, $password); 
    328328 
    329     @wp_mail($email, __('New WordPress Blog'), $message); 
     329    @wp_mail($email, __('New WordPress Site'), $message); 
    330330} 
    331331endif; 
  • trunk/wp-admin/install.php

    r14265 r14315  
    9595    <table class="form-table"> 
    9696        <tr> 
    97             <th scope="row"><label for="weblog_title"><?php _e( 'Blog Title' ); ?></label></th> 
     97            <th scope="row"><label for="weblog_title"><?php _e( 'Site Title' ); ?></label></th> 
    9898            <td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></td> 
    9999        </tr> 
     
    131131        </tr> 
    132132        <tr> 
    133             <td colspan="2"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow my blog to appear in search engines like Google and Technorati.' ); ?></label></td> 
     133            <td colspan="2"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow my site to appear in search engines like Google and Technorati.' ); ?></label></td> 
    134134        </tr> 
    135135    </table> 
  • trunk/wp-admin/ms-sites.php

    r14277 r14315  
    648648            } else { ?> 
    649649                <tr> 
    650                     <td colspan="<?php echo (int) count( $sites_columns ); ?>"><?php _e( 'No blogs found.' ) ?></td> 
     650                    <td colspan="<?php echo (int) count( $sites_columns ); ?>"><?php _e( 'No sites found.' ) ?></td> 
    651651                </tr> 
    652652            <?php 
  • trunk/wp-admin/tools.php

    r14139 r14315  
    2424    <p><?php _e('Press This is a bookmarklet: a little app that runs in your browser and lets you grab bits of the web.');?></p> 
    2525 
    26     <p><?php _e('Use Press This to clip text, images and videos from any web page. Then edit and add more straight from Press This before you save or publish it in a post on your blog.'); ?></p> 
     26    <p><?php _e('Use Press This to clip text, images and videos from any web page. Then edit and add more straight from Press This before you save or publish it in a post on your site.'); ?></p> 
    2727    <p><?php _e('Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut.') ?></p> 
    2828    <p class="pressthis"><a href="<?php echo htmlspecialchars( get_shortcut_link() ); ?>" title="<?php echo esc_attr(__('Press This')) ?>"><?php _e('Press This') ?></a></p> 
  • trunk/wp-admin/user-edit.php

    r14261 r14315  
    224224// print the 'no role' option. Make it selected if the user has no role yet. 
    225225if ( $user_role ) 
    226     echo '<option value="">' . __('&mdash; No role for this blog &mdash;') . '</option>'; 
     226    echo '<option value="">' . __('&mdash; No role for this site &mdash;') . '</option>'; 
    227227else 
    228     echo '<option value="" selected="selected">' . __('&mdash; No role for this blog &mdash;') . '</option>'; 
     228    echo '<option value="" selected="selected">' . __('&mdash; No role for this site &mdash;') . '</option>'; 
    229229?> 
    230230</select> 
  • trunk/wp-admin/user-new.php

    r14139 r14315  
    3333 
    3434    function admin_created_user_subject( $text ) { 
    35         return "[" . get_bloginfo('name') . "] Your blog invite"; 
     35        return "[" . get_bloginfo('name') . "] Your site invite"; 
    3636    } 
    3737} 
     
    175175        echo '<p>' . sprintf(__('Users cannot currently <a href="%1$s">register themselves</a>, but you can manually create users here.'), admin_url('options-general.php#users_can_register')) . '</p>'; 
    176176} else { 
    177     echo '<p>' . __( 'You can add new users to your blog in two ways:' ) . '<ol><li> ' . __( 'Enter the username and email address of an existing user on this site.' ) . '</li><li> ' . __( '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.' ) . '</li></ol></p>'; 
     177    echo '<p>' . __( 'You can add new users to your site in two ways:' ) . '<ol><li> ' . __( 'Enter the username and email address of an existing user on this site.' ) . '</li><li> ' . __( '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.' ) . '</li></ol></p>'; 
    178178    echo '<p>' . __( '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.' ) . '</p>'; 
    179179} 
  • trunk/wp-admin/users.php

    r14189 r14315  
    250250<div class="wrap"> 
    251251<?php screen_icon(); ?> 
    252 <h2><?php _e('Remove Users from Blog'); ?></h2> 
     252<h2><?php _e('Remove Users from Site'); ?></h2> 
    253253<p><?php _e('You have specified these users for removal:'); ?></p> 
    254254<ul> 
     
    325325            break; 
    326326        case 'remove': 
    327             $messages[] = '<div id="message" class="updated fade"><p>' . __('User removed from this blog.') . '</p></div>'; 
     327            $messages[] = '<div id="message" class="updated fade"><p>' . __('User removed from this site.') . '</p></div>'; 
    328328            break; 
    329329        case 'err_admin_remove': 
  • trunk/wp-app.php

    r14136 r14315  
    285285        // check to see if AtomPub is enabled 
    286286        if ( !get_option( 'enable_app' ) ) 
    287             $this->forbidden( sprintf( __( 'AtomPub services are disabled on this blog.  An admin user can enable them at %s' ), admin_url('options-writing.php') ) ); 
     287            $this->forbidden( sprintf( __( 'AtomPub services are disabled on this site.  An admin user can enable them at %s' ), admin_url('options-writing.php') ) ); 
    288288 
    289289        // dispatch 
     
    322322 
    323323        if ( !current_user_can( 'edit_posts' ) ) 
    324             $this->auth_required( __( 'Sorry, you do not have the right to access this blog.' ) ); 
     324            $this->auth_required( __( 'Sorry, you do not have the right to access this site.' ) ); 
    325325 
    326326        $entries_url = esc_attr($this->get_entries_url()); 
     
    363363 
    364364        if ( !current_user_can( 'edit_posts' ) ) 
    365             $this->auth_required( __( 'Sorry, you do not have the right to access this blog.' ) ); 
     365            $this->auth_required( __( 'Sorry, you do not have the right to access this site.' ) ); 
    366366 
    367367        $home = esc_attr(get_bloginfo_rss('url')); 
  • trunk/wp-includes/default-widgets.php

    r13733 r14315  
    173173 
    174174    function WP_Widget_Search() { 
    175         $widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your blog") ); 
     175        $widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your site") ); 
    176176        $this->WP_Widget('search', __('Search'), $widget_ops); 
    177177    } 
     
    216216 
    217217    function WP_Widget_Archives() { 
    218         $widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your blog&#8217;s posts') ); 
     218        $widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your site&#8217;s posts') ); 
    219219        $this->WP_Widget('archives', __('Archives'), $widget_ops); 
    220220    } 
     
    329329 
    330330    function WP_Widget_Calendar() { 
    331         $widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your blog&#8217;s posts') ); 
     331        $widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your site&#8217;s posts') ); 
    332332        $this->WP_Widget('calendar', __('Calendar'), $widget_ops); 
    333333    } 
     
    512512 
    513513    function WP_Widget_Recent_Posts() { 
    514         $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your blog") ); 
     514        $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your site") ); 
    515515        $this->WP_Widget('recent-posts', __('Recent Posts'), $widget_ops); 
    516516        $this->alt_option_name = 'widget_recent_entries'; 
  • trunk/wp-includes/ms-functions.php

    r14298 r14315  
    323323    // Check if the domain has been used already. We should return an error message. 
    324324    if ( domain_exists($domain, $path, $site_id) ) 
    325         return __( 'Error: Blog URL already taken.' ); 
     325        return __( 'Error: Site URL already taken.' ); 
    326326 
    327327    // Need to backup wpdb table names, and create a new wp_blogs entry for new blog. 
     
    330330 
    331331    if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) 
    332         return __( 'Error: problem creating blog entry.' ); 
     332        return __( 'Error: problem creating site entry.' ); 
    333333 
    334334    switch_to_blog($blog_id); 
     
    558558 
    559559    if ( empty( $blogname ) ) 
    560         $errors->add('blogname', __('Please enter a blog name')); 
     560        $errors->add('blogname', __('Please enter a site name')); 
    561561 
    562562    $maybe = array(); 
     
    569569 
    570570    if ( strlen( $blogname ) < 4 && !is_super_admin() ) 
    571         $errors->add('blogname',  __('Blog name must be at least 4 characters')); 
     571        $errors->add('blogname',  __('Site name must be at least 4 characters')); 
    572572 
    573573    if ( strpos( ' ' . $blogname, '_' ) != false ) 
    574         $errors->add( 'blogname', __( 'Sorry, blog names may not contain the character &#8220;_&#8221;!' ) ); 
     574        $errors->add( 'blogname', __( 'Sorry, site names may not contain the character &#8220;_&#8221;!' ) ); 
    575575 
    576576    // do not allow users to create a blog that conflicts with a page on the main blog. 
    577577    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 ) ) ) 
    578         $errors->add( 'blogname', __( 'Sorry, you may not use that blog name.' ) ); 
     578        $errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) ); 
    579579 
    580580    // all numeric? 
     
    582582    preg_match( '/[0-9]*/', $blogname, $match ); 
    583583    if ( $match[0] == $blogname ) 
    584         $errors->add('blogname', __('Sorry, blog names must have letters too!')); 
     584        $errors->add('blogname', __('Sorry, site names must have letters too!')); 
    585585 
    586586    $blogname = apply_filters( 'newblogname', $blogname ); 
     
    589589 
    590590    if ( empty( $blog_title ) ) 
    591         $errors->add('blog_title', __('Please enter a blog title')); 
     591        $errors->add('blog_title', __('Please enter a site title')); 
    592592 
    593593    // Check if the domain/path has been used already. 
     
    600600    } 
    601601    if ( domain_exists($mydomain, $path) ) 
    602         $errors->add('blogname', __('Sorry, that blog already exists!')); 
     602        $errors->add('blogname', __('Sorry, that site already exists!')); 
    603603 
    604604    if ( username_exists( $blogname ) ) { 
    605605        if ( is_object( $user ) == false || ( is_object($user) && ( $user->user_login != $blogname ) ) ) 
    606             $errors->add( 'blogname', __( 'Sorry, that blog is reserved!' ) ); 
     606            $errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) ); 
    607607    } 
    608608 
     
    615615            $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) ); 
    616616        else 
    617             $errors->add('blogname', __('That blog is currently reserved but may be available in a couple days.')); 
     617            $errors->add('blogname', __('That site is currently reserved but may be available in a couple days.')); 
    618618    } 
    619619 
     
    689689    $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) ); 
    690690    $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; 
    691     $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 ); 
     691    $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 ); 
    692692    // TODO: Don't hard code activation link. 
    693693    $subject = sprintf( apply_filters( 'wpmu_signup_blog_notification_subject', __( '[%1s] Activate %2s' ) ), $from_name, esc_url( 'http://' . $domain . $path ) ); 
     
    722722 
    723723    if ( $signup->active ) 
    724         return new WP_Error('already_active', __('The blog is already active.'), $signup); 
     724        return new WP_Error('already_active', __('The site is already active.'), $signup); 
    725725 
    726726    $meta = unserialize($signup->meta); 
     
    812812    // Check if the domain has been used already. We should return an error message. 
    813813    if ( domain_exists($domain, $path, $site_id) ) 
    814         return new WP_Error('blog_taken', __('Blog already exists.')); 
     814        return new WP_Error('blog_taken', __('Site already exists.')); 
    815815 
    816816    if ( !defined('WP_INSTALLING') ) 
     
    818818 
    819819    if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) 
    820         return new WP_Error('insert_blog', __('Could not create blog.')); 
     820        return new WP_Error('insert_blog', __('Could not create site.')); 
    821821 
    822822    switch_to_blog($blog_id); 
     
    860860    restore_current_blog(); 
    861861 
    862     $msg = sprintf( __( 'New Blog: %1s 
     862    $msg = sprintf( __( 'New Site: %1s 
    863863URL: %2s 
    864864Remote IP: %3s 
     
    867867    $msg = apply_filters( 'newblog_notify_siteadmin', $msg ); 
    868868 
    869     wp_mail( $email, sprintf( __( 'New Blog Registration: %s' ), $siteurl ), $msg ); 
     869    wp_mail( $email, sprintf( __( 'New Site Registration: %s' ), $siteurl ), $msg ); 
    870870    return true; 
    871871} 
     
    10101010        $current_site->site_name = 'WordPress MU'; 
    10111011 
    1012     $subject = apply_filters( 'update_welcome_subject', sprintf(__('New %1$s Blog: %2$s'), $current_site->site_name, stripslashes( $title ) ) ); 
     1012    $subject = apply_filters( 'update_welcome_subject', sprintf(__('New %1$s Site: %2$s'), $current_site->site_name, stripslashes( $title ) ) ); 
    10131013    wp_mail($user->user_email, $subject, $message, $message_headers); 
    10141014    return true; 
  • trunk/wp-includes/pluggable.php

    r14090 r14315  
    11981198    $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); 
    11991199 
    1200     $message  = sprintf(__('New user registration on your blog %s:'), $blogname) . "\r\n\r\n"; 
     1200    $message  = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n"; 
    12011201    $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; 
    12021202    $message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n"; 
  • trunk/wp-includes/user.php

    r14311 r14315  
    9898            $details = get_blog_details( $userdata->primary_blog ); 
    9999            if ( is_object( $details ) && $details->spam == 1 ) 
    100                 return new WP_Error('blog_suspended', __('Blog Suspended.')); 
     100                return new WP_Error('blog_suspended', __('Site Suspended.')); 
    101101        } 
    102102    } 
  • trunk/xmlrpc.php

    r14090 r14315  
    247247    function login_pass_ok($user_login, $user_pass) { 
    248248        if ( !get_option( 'enable_xmlrpc' ) ) { 
    249             $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') ) ); 
     249            $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') ) ); 
    250250            return false; 
    251251        } 
     
    269269    function login($username, $password) { 
    270270        if ( !get_option( 'enable_xmlrpc' ) ) { 
    271             $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') ) ); 
     271            $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') ) ); 
    272272            return false; 
    273273        } 
     
    392392            ), 
    393393            'blog_url'          => array( 
    394                 'desc'          => __( 'Blog URL' ), 
     394                'desc'          => __( 'Site URL' ), 
    395395                'readonly'      => true, 
    396396                'option'        => 'siteurl' 
     
    404404            ), 
    405405            'blog_title'        => array( 
    406                 'desc'          => __( 'Blog Title' ), 
     406                'desc'          => __( 'Site Title' ), 
    407407                'readonly'      => false, 
    408408                'option'            => 'blogname' 
    409409            ), 
    410410            'blog_tagline'      => array( 
    411                 'desc'          => __( 'Blog Tagline' ), 
     411                'desc'          => __( 'Site Tagline' ), 
    412412                'readonly'      => false, 
    413413                'option'        => 'blogdescription' 
     
    831831 
    832832        if ( !current_user_can("edit_posts") ) 
    833             return(new IXR_Error(401, __("Sorry, you cannot edit posts on this blog."))); 
     833            return(new IXR_Error(401, __("Sorry, you cannot edit posts on this site."))); 
    834834 
    835835        do_action('xmlrpc_call', 'wp.getAuthors'); 
     
    866866 
    867867        if ( !current_user_can( 'edit_posts' ) ) 
    868             return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this blog in order to view tags.' ) ); 
     868            return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view tags.' ) ); 
    869869 
    870870        do_action( 'xmlrpc_call', 'wp.getKeywords' ); 
     
    989989 
    990990        if ( !current_user_can( 'edit_posts' ) ) 
    991             return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts to this blog in order to view categories.' ) ); 
     991            return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts to this site in order to view categories.' ) ); 
    992992 
    993993        do_action('xmlrpc_call', 'wp.suggestCategories'); 
     
    10251025 
    10261026        if ( !current_user_can( 'moderate_comments' ) ) 
    1027             return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this blog.' ) ); 
     1027            return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) ); 
    10281028 
    10291029        do_action('xmlrpc_call', 'wp.getComment'); 
     
    11471147 
    11481148        if ( !current_user_can( 'moderate_comments' ) ) 
    1149             return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this blog.' ) ); 
     1149            return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) ); 
    11501150 
    11511151        do_action('xmlrpc_call', 'wp.deleteComment'); 
     
    11781178 
    11791179        if ( !current_user_can( 'moderate_comments' ) ) 
    1180             return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this blog.' ) ); 
     1180            return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) ); 
    11811181 
    11821182        do_action('xmlrpc_call', 'wp.editComment'); 
     
    13281328 
    13291329        if ( !current_user_can( 'moderate_comments' ) ) 
    1330             return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) ); 
     1330            return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) ); 
    13311331 
    13321332        do_action('xmlrpc_call', 'wp.getCommentStatusList'); 
     
    13871387 
    13881388        if ( !current_user_can( 'edit_posts' ) ) 
    1389             return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) ); 
     1389            return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) ); 
    13901390 
    13911391        do_action('xmlrpc_call', 'wp.getPostStatusList'); 
     
    14131413 
    14141414        if ( !current_user_can( 'edit_posts' ) ) 
    1415             return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) ); 
     1415            return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) ); 
    14161416 
    14171417        do_action('xmlrpc_call', 'wp.getPageStatusList'); 
     
    14391439 
    14401440        if ( !current_user_can( 'edit_pages' ) ) 
    1441             return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) ); 
     1441            return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) ); 
    14421442 
    14431443        $templates = get_page_templates( ); 
     
    16251625 
    16261626        if ( !current_user_can( 'edit_posts' ) ) 
    1627             return new IXR_Error( 401, __( 'Sorry, you do not have access to user data on this blog.' ) ); 
     1627            return new IXR_Error( 401, __( 'Sorry, you do not have access to user data on this site.' ) ); 
    16281628 
    16291629        do_action('xmlrpc_call', 'blogger.getUserInfo'); 
     
    18431843        $cap = ($publish) ? 'publish_posts' : 'edit_posts'; 
    18441844        if ( !current_user_can($cap) ) 
    1845             return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.')); 
     1845            return new IXR_Error(401, __('Sorry, you are not allowed to post on this site.')); 
    18461846 
    18471847        $post_status = ($publish) ? 'publish' : 'draft'; 
     
    19901990 
    19911991        $cap = ( $publish ) ? 'publish_posts' : 'edit_posts'; 
    1992         $error_message = __( 'Sorry, you are not allowed to publish posts on this blog.' ); 
     1992        $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' ); 
    19931993        $post_type = 'post'; 
    19941994        $page_template = ''; 
     
    19961996            if ( $content_struct['post_type'] == 'page' ) { 
    19971997                $cap = ( $publish ) ? 'publish_pages' : 'edit_pages'; 
    1998                 $error_message = __( 'Sorry, you are not allowed to publish pages on this blog.' ); 
     1998                $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' ); 
    19991999                $post_type = 'page'; 
    20002000                if ( !empty( $content_struct['wp_page_template'] ) ) 
     
    22652265 
    22662266        $cap = ( $publish ) ? 'publish_posts' : 'edit_posts'; 
    2267         $error_message = __( 'Sorry, you are not allowed to publish posts on this blog.' ); 
     2267        $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' ); 
    22682268        $post_type = 'post'; 
    22692269        $page_template = ''; 
     
    22712271            if ( $content_struct['post_type'] == 'page' ) { 
    22722272                $cap = ( $publish ) ? 'publish_pages' : 'edit_pages'; 
    2273                 $error_message = __( 'Sorry, you are not allowed to publish pages on this blog.' ); 
     2273                $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' ); 
    22742274                $post_type = 'page'; 
    22752275                if ( !empty( $content_struct['wp_page_template'] ) ) 
     
    27212721 
    27222722        if ( !current_user_can( 'edit_posts' ) ) 
    2723             return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this blog in order to view categories.' ) ); 
     2723            return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) ); 
    27242724 
    27252725        do_action('xmlrpc_call', 'metaWeblog.getCategories'); 
     
    29092909 
    29102910        if ( !current_user_can( 'edit_posts' ) ) 
    2911             return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this blog in order to view categories.' ) ); 
     2911            return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) ); 
    29122912 
    29132913        do_action('xmlrpc_call', 'mt.getCategoryList'); 
Note: See TracChangeset for help on using the changeset viewer.