Favor the term "blog" instead of "weblog." Props foolswisdom and Nazg…

…ul. fixes #4674

git-svn-id: http://svn.automattic.com/wordpress/trunk@5825 1a063a9b-81f0-0310-95a4-ce76da25c4cd

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);

wp-admin/includes/upgrade.php

@@ -123,7 +123,7 @@ function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) {
 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/

wp-admin/install.php

@@ -45,7 +45,7 @@
 <form id="setup" method="post" action="install.php?step=2">
 	<table width="100%">
 		<tr>
-			<th width="33%"><?php _e('Weblog title:'); ?></th>
+			<th width="33%"><?php _e('Blog title:'); ?></th>
 			<td><input name="weblog_title" type="text" id="weblog_title" size="25" /></td>
 		</tr>
 		<tr>

wp-admin/options-discussion.php

@@ -18,12 +18,12 @@
 <li> 
 <label for="default_pingback_flag"> 
 <input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> /> 
-<?php _e('Attempt to notify any Weblogs linked to from the article (slows down posting.)') ?></label> 
+<?php _e('Attempt to notify any blogs linked to from the article (slows down posting.)') ?></label> 
 </li> 
 <li> 
 <label for="default_ping_status"> 
 <input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> /> 
-<?php _e('Allow link notifications from other Weblogs (pingbacks and trackbacks.)') ?></label> 
+<?php _e('Allow link notifications from other blogs (pingbacks and trackbacks.)') ?></label> 
 </li> 
 <li> 
 <label for="default_comment_status"> 
@@ -83,4 +83,4 @@
 </form>
 </div>
 
-<?php include('./admin-footer.php'); ?>
+<?php include('./admin-footer.php'); ?>

wp-admin/options-general.php

@@ -14,14 +14,14 @@
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
 <table class="optiontable"> 
 <tr valign="top"> 
-<th scope="row"><?php _e('Weblog title:') ?></th> 
+<th scope="row"><?php _e('Blog title:') ?></th> 
 <td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" size="40" /></td> 
 </tr> 
 <tr valign="top"> 
 <th scope="row"><?php _e('Tagline:') ?></th> 
 <td><input name="blogdescription" type="text" id="blogdescription" style="width: 95%" value="<?php form_option('blogdescription'); ?>" size="45" />
 <br />
-<?php _e('In a few words, explain what this weblog is about.') ?></td> 
+<?php _e('In a few words, explain what this blog is about.') ?></td> 
 </tr> 
 <tr valign="top"> 
 <th scope="row"><?php _e('WordPress address (URL):') ?></th> 
@@ -63,7 +63,7 @@
 <td><code><?php echo gmdate(__('Y-m-d g:i:s a')); ?></code></td> 
 </tr>
 <tr>
-<th scope="row"><?php _e('Times in the weblog should differ by:') ?> </th>
+<th scope="row"><?php _e('Times in the blog should differ by:') ?> </th>
 <td><input name="gmt_offset" type="text" id="gmt_offset" size="2" value="<?php form_option('gmt_offset'); ?>" /> 
 <?php _e('hours') ?> (<?php _e('Your timezone offset, for example <code>-6</code> for Central Time.'); ?>)</td>
 </tr>

wp-content/themes/default/sidebar.php

@@ -21,23 +21,23 @@
 			<p>You are currently browsing the archives for the <?php single_cat_title(''); ?> category.</p>
 
 			<?php /* If this is a yearly archive */ } elseif (is_day()) { ?>
-			<p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+			<p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
 			for the day <?php the_time('l, F jS, Y'); ?>.</p>
 
 			<?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
-			<p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+			<p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
 			for <?php the_time('F, Y'); ?>.</p>
 
 			<?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
-			<p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+			<p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
 			for the year <?php the_time('Y'); ?>.</p>
 
 			<?php /* If this is a monthly archive */ } elseif (is_search()) { ?>
-			<p>You have searched the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+			<p>You have searched the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
 			for <strong>'<?php the_search_query(); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
 
 			<?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
-			<p>You are currently browsing the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
+			<p>You are currently browsing the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives.</p>
 
 			<?php } ?>
 

xmlrpc.php

@@ -707,7 +707,7 @@ function blogger_getTemplate($args) {
 	    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 @@ function blogger_setTemplate($args) {
 	    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 @@ function blogger_newPost($args) {
 	  $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 @@ function mw_newPost($args) {
       $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 @@ function mw_getRecentPosts($args) {
 	}
 
 
-	/* 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 @@ function mt_getRecentPostTitles($args) {
 	}
 
 
-	/* 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;