From 8c454d7909b9624c0ff96bef9bb92e73f0cf8c2e Mon Sep 17 00:00:00 2001 From: markjaquith Date: Mon, 30 Jul 2007 16:32:12 +0000 Subject: [PATCH] Favor the term "blog" instead of "weblog." Props foolswisdom and Nazgul. fixes #4674 git-svn-id: http://svn.automattic.com/wordpress/trunk@5825 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/schema.php | 2 +- wp-admin/includes/upgrade.php | 2 +- wp-admin/install.php | 2 +- wp-admin/options-discussion.php | 6 +++--- wp-admin/options-general.php | 6 +++--- wp-content/themes/default/sidebar.php | 10 +++++----- xmlrpc.php | 12 ++++++------ 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index 01ff50e2d5..d08fb6e0d8 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -156,7 +156,7 @@ function populate_options() { $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://'; $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); add_option('siteurl', $guessurl, __('WordPress web address')); - add_option('blogname', __('My Weblog'), __('Blog title')); + add_option('blogname', __('My Blog'), __('Blog title')); add_option('blogdescription', __('Just another WordPress weblog'), __('Short tagline')); add_option('new_users_can_blog', 0); add_option('users_can_register', 0); diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index e51b0e4288..39808accf3 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -123,7 +123,7 @@ You can log in to the administrator account with the following information: Username: %2\$s Password: %3\$s -We hope you enjoy your new weblog. Thanks! +We hope you enjoy your new blog. Thanks! --The WordPress Team http://wordpress.org/ diff --git a/wp-admin/install.php b/wp-admin/install.php index 11fdd3517b..47875593db 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -45,7 +45,7 @@ switch($step) {
- + diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php index d8c11f4008..32cadace66 100644 --- a/wp-admin/options-discussion.php +++ b/wp-admin/options-discussion.php @@ -18,12 +18,12 @@ include('admin-header.php');
  • +
  • +
    • - + + @@ -63,7 +63,7 @@ include('./admin-header.php'); - + diff --git a/wp-content/themes/default/sidebar.php b/wp-content/themes/default/sidebar.php index f692c9e391..36dea86f62 100644 --- a/wp-content/themes/default/sidebar.php +++ b/wp-content/themes/default/sidebar.php @@ -21,23 +21,23 @@

    You are currently browsing the archives for the category.

    -

    You are currently browsing the weblog archives +

    You are currently browsing the blog archives for the day .

    -

    You are currently browsing the weblog archives +

    You are currently browsing the blog archives for .

    -

    You are currently browsing the weblog archives +

    You are currently browsing the blog archives for the year .

    -

    You have searched the weblog archives +

    You have searched the blog archives for ''. If you are unable to find anything in these search results, you can try one of these links.

    -

    You are currently browsing the weblog archives.

    +

    You are currently browsing the blog archives.

    diff --git a/xmlrpc.php b/xmlrpc.php index ebcca7b76a..b2b48f00dd 100644 --- a/xmlrpc.php +++ b/xmlrpc.php @@ -707,7 +707,7 @@ class wp_xmlrpc_server extends IXR_Server { return new IXR_Error(401, __('Sorry, this user can not edit the template.')); } - /* warning: here we make the assumption that the weblog's URL is on the same server */ + /* warning: here we make the assumption that the blog's URL is on the same server */ $filename = get_option('home') . '/'; $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename); @@ -742,7 +742,7 @@ class wp_xmlrpc_server extends IXR_Server { return new IXR_Error(401, __('Sorry, this user can not edit the template.')); } - /* warning: here we make the assumption that the weblog's URL is on the same server */ + /* warning: here we make the assumption that the blog's URL is on the same server */ $filename = get_option('home') . '/'; $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename); @@ -777,7 +777,7 @@ class wp_xmlrpc_server extends IXR_Server { $cap = ($publish) ? 'publish_posts' : 'edit_posts'; $user = set_current_user(0, $user_login); if ( !current_user_can($cap) ) - return new IXR_Error(401, __('Sorry, you can not post on this weblog or category.')); + return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.')); $post_status = ($publish) ? 'publish' : 'draft'; @@ -917,7 +917,7 @@ class wp_xmlrpc_server extends IXR_Server { $cap = ($publish) ? 'publish_posts' : 'edit_posts'; $user = set_current_user(0, $user_login); if ( !current_user_can($cap) ) - return new IXR_Error(401, __('Sorry, you can not post on this weblog or category.')); + return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.')); // The post_type defaults to post, but could also be page. $post_type = "post"; @@ -1457,7 +1457,7 @@ class wp_xmlrpc_server extends IXR_Server { } - /* metaweblog.getCategories ...returns the list of categories on a given weblog */ + /* metaweblog.getCategories ...returns the list of categories on a given blog */ function mw_getCategories($args) { global $wpdb; @@ -1613,7 +1613,7 @@ class wp_xmlrpc_server extends IXR_Server { } - /* mt.getCategoryList ...returns the list of categories on a given weblog */ + /* mt.getCategoryList ...returns the list of categories on a given blog */ function mt_getCategoryList($args) { global $wpdb;

    -
    (-6 for Central Time.'); ?>)