<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14070] trunk: Tweak new strings for better typography.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14070">14070</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-11 10:41:54 +0000 (Sun, 11 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tweak new strings for better typography. Props demetris. Fixes <a href="http://trac.wordpress.org/ticket/12962">#12962</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpactivatephp">trunk/wp-activate.php</a></li>
<li><a href="#trunkwpadmincustombackgroundphp">trunk/wp-admin/custom-background.php</a></li>
<li><a href="#trunkwpadminedittagformphp">trunk/wp-admin/edit-tag-form.php</a></li>
<li><a href="#trunkwpadminimportmtphp">trunk/wp-admin/import/mt.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadminmsthemesphp">trunk/wp-admin/ms-themes.php</a></li>
<li><a href="#trunkwpadminmsupgradenetworkphp">trunk/wp-admin/ms-upgrade-network.php</a></li>
<li><a href="#trunkwpadminmysitesphp">trunk/wp-admin/my-sites.php</a></li>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
<li><a href="#trunkwpadminoptionsdiscussionphp">trunk/wp-admin/options-discussion.php</a></li>
<li><a href="#trunkwpadminoptionsphp">trunk/wp-admin/options.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpincludesauthortemplatephp">trunk/wp-includes/author-template.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludesmsloadphp">trunk/wp-includes/ms-load.php</a></li>
<li><a href="#trunkwpincludesmssettingsphp">trunk/wp-includes/ms-settings.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkwpmailphp">trunk/wp-mail.php</a></li>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpactivatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-activate.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-activate.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-activate.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -64,9 +64,9 @@
</span><span class="cx"> <h2><?php _e('Your account is now active!'); ?></h2>
</span><span class="cx"> <?php
</span><span class="cx"> if ( $signup->domain . $signup->path == '' ) {
</span><del>- printf(__('<p class="lead-in">Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of "%2$s". Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.</p>'), network_site_url('wp-login.php', 'login'), $signup->user_login, $signup->user_email, network_site_url('wp-login.php?action=lostpassword', 'login'));
</del><ins>+ printf(__('<p class="lead-in">Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.</p>'), network_site_url('wp-login.php', 'login'), $signup->user_login, $signup->user_email, network_site_url('wp-login.php?action=lostpassword', 'login'));
</ins><span class="cx"> } else {
</span><del>- printf(__('<p class="lead-in">Your site at <a href="%1$s">%2$s</a> is active. You may now login to your site using your chosen username of "%3$s". Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.</p>'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url('wp-login.php?action=lostpassword'));
</del><ins>+ printf(__('<p class="lead-in">Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.</p>'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url('wp-login.php?action=lostpassword'));
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-background.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-admin/custom-background.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( get_background_image() ) : ?>
</span><span class="cx"> <h3><?php _e('Remove Background Image'); ?></h3>
</span><del>-<p><?php _e('This will remove the background image. You will not be able to retrieve any customizations.') ?></p>
</del><ins>+<p><?php _e('This will remove the background image. You will not be able to restore any customizations.') ?></p>
</ins><span class="cx"> <form method="post" action="">
</span><span class="cx"> <?php wp_nonce_field('custom-background'); ?>
</span><span class="cx"> <input type="submit" class="button" name="remove-background" value="<?php esc_attr_e('Remove Background'); ?>" />
</span></span></pre></div>
<a id="trunkwpadminedittagformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tag-form.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tag-form.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-admin/edit-tag-form.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> die('-1');
</span><span class="cx">
</span><span class="cx"> if ( empty($tag_ID) ) { ?>
</span><del>- <div id="message" class="updated"><p><strong><?php _e('An item was not selected for editing.'); ?></strong></p></div>
</del><ins>+ <div id="message" class="updated"><p><strong><?php _e( 'You did not select an item for editing.' ); ?></strong></p></div>
</ins><span class="cx"> <?php
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminimportmtphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/mt.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/mt.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-admin/import/mt.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> $this->header();
</span><span class="cx"> ?>
</span><span class="cx"> <div class="narrow">
</span><del>-<p><?php _e('Howdy! We&#8217;re about to begin importing all of your Movable Type or TypePad entries into WordPress. To begin, either choose a file to upload and click &#8220;Upload file and import&#8221;, or use FTP to upload your MT export file as <code>mt-export.txt</code> in your <code>/wp-content/</code> directory and then click "Import mt-export.txt"'); ?></p>
</del><ins>+<p><?php _e( 'Howdy! We are about to begin importing all of your Movable Type or TypePad entries into WordPress. To begin, either choose a file to upload and click &#8220;Upload file and import&#8221;, or use FTP to upload your MT export file as <code>mt-export.txt</code> in your <code>/wp-content/</code> directory and then click &#8220;Import mt-export.txt&#8221;.' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <?php wp_import_upload_form( add_query_arg('step', 1) ); ?>
</span><span class="cx"> <form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)); ?>" class="import-upload-form">
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-admin/ms-edit.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><span class="cx"> if ( is_array( $_POST['blog'] ) == false )
</span><del>- wp_die( __( "Can't create an empty site." ) );
</del><ins>+ wp_die( __( 'Can&#8217;t create an empty site.' ) );
</ins><span class="cx"> $blog = $_POST['blog'];
</span><span class="cx"> $domain = '';
</span><span class="cx"> if ( ! preg_match( '/(--)/', $blog['domain'] ) && preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-admin/ms-options.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> <input name="dashboard_blog_orig" type="hidden" id="dashboard_blog_orig" value="<?php echo esc_attr( $blogname ); ?>" />
</span><span class="cx"> <input name="dashboard_blog" type="text" id="dashboard_blog" value="<?php echo esc_attr( $blogname ); ?>" class="regular-text" />
</span><span class="cx"> <br />
</span><del>- <?php _e( "Site path ('dashboard', 'control', 'manager', etc) or blog id.<br />New users are added to this site as the user role defined below if they don't have a site. Leave blank for the main site. Users with the subscriber role on old site will be moved to the new site if changed. The new site will be created if it does not exist." ); ?>
</del><ins>+ <?php _e( 'Site path (&#8220;dashboard&#8221;, &#8220;control&#8221;, &#8220;manager&#8221;, etc.) or blog ID.<br />New users are added to this site as the user role defined below if they don&#8217;t have a site. Leave blank for the main site. Users with the subscriber role on old site will be moved to the new site if changed. The new site will be created if it does not exist.' ); ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> </select>
</span><span class="cx"> <br />
</span><del>- <?php _e( "The default role for new users on the Dashboard site. 'Subscriber' or 'Contributor' roles are recommended." ); ?>
</del><ins>+ <?php _e( 'The default role for new users on the Dashboard site. &#8220;Subscriber&#8221; or &#8220;Contributor&#8221; roles are recommended.' ); ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> <label><input name="registration" type="radio" id="registration4" value="all"<?php checked( $reg, 'all') ?> /> <?php _e( 'Both sites and user accounts can be registered.' ); ?></label><br />
</span><span class="cx"> <p><?php _e( 'Disable or enable registration and who or what can be registered. (Default is disabled.)' ); ?></p>
</span><span class="cx"> <?php if ( is_subdomain_install() ) {
</span><del>- echo '<p>' . __( 'If registration is disabled, please set <code>NOBLOGREDIRECT</code> in <code>wp-config.php</code> to a url you will redirect visitors to if they visit a non-existent site.' ) . '</p>';
</del><ins>+ echo '<p>' . __( 'If registration is disabled, please set <code>NOBLOGREDIRECT</code> in <code>wp-config.php</code> to a URL you will redirect visitors to if they visit a non-existent site.' ) . '</p>';
</ins><span class="cx"> } ?>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
</span><span class="cx"> <textarea name="limited_email_domains" id="limited_email_domains" cols="45" rows="5"><?php echo wp_htmledit_pre( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
</span><span class="cx"> <br />
</span><del>- <?php _e( 'If you want to limit site registrations to certain domains. Enter one domain per line.' ) ?>
</del><ins>+ <?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ) ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <textarea name="banned_email_domains" id="banned_email_domains" cols="45" rows="5"><?php echo wp_htmledit_pre( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea>
</span><span class="cx"> <br />
</span><del>- <?php _e('If you want to ban domains from site registrations. Enter one domain per line.') ?>
</del><ins>+ <?php _e( 'If you want to ban domains from site registrations. One domain per line.' ) ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> <td><label><input type="checkbox" id="mu_media_buttons_image" name="mu_media_buttons[image]" value="1"<?php checked( ! empty( $mu_media_buttons['image'] ) ) ?>/> <?php _e( 'Images' ); ?></label><br />
</span><span class="cx"> <label><input type="checkbox" id="mu_media_buttons_video" name="mu_media_buttons[video]" value="1"<?php checked( ! empty( $mu_media_buttons['video'] ) ) ?>/> <?php _e( 'Videos' ); ?></label><br />
</span><span class="cx"> <label><input type="checkbox" id="mu_media_buttons_audio" name="mu_media_buttons[audio]" value="1"<?php checked( ! empty( $mu_media_buttons['audio'] ) ) ?>/> <?php _e( 'Music' ); ?></label><br />
</span><del>- <?php _e( 'The media upload buttons to display on the "Write Post" page. Make sure you update the allowed upload file types below as well.' ); ?></td>
</del><ins>+ <?php _e( 'The media upload buttons to display on the &#8220;Write Post&#8221; page. Make sure you update the allowed upload file types below as well.' ); ?></td>
</ins><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <tr valign="top">
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-admin/ms-sites.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -128,10 +128,10 @@
</span><span class="cx"> $checked_fields = array( 'public' => __( 'Public' ) );
</span><span class="cx"> else
</span><span class="cx"> $checked_fields = array(
</span><del>- 'public' => __('Public'),
- 'archived' => __('Archived'),
- 'spam' => __('Spam'),
- 'deleted' => __('Deleted'),
</del><ins>+ 'public' => __( 'Public' ),
+ 'archived' => __( 'Archived' ),
+ 'spam' => __( 'Spam' ),
+ 'deleted' => __( 'Deleted' ),
</ins><span class="cx"> );
</span><span class="cx"> $checked_fields['mature'] = __( 'Mature' );
</span><span class="cx"> foreach ( $checked_fields as $field_key => $field_label ) {
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> <div id="blogedit_blogadduser" class="postbox">
</span><span class="cx"> <h3 class="hndle"><span><?php _e( 'Add a new user' ); ?></span></h3>
</span><span class="cx"> <div class="inside">
</span><del>- <p class="description"><?php _e( 'Enter the username of an existing user and hit "Update Options" to add the user.' ) ?></p>
</del><ins>+ <p class="description"><?php _e( 'Enter the username of an existing user and hit &#8220;Update Options&#8221; to add the user.' ) ?></p>
</ins><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope="row"><?php _e( 'User&nbsp;Login:' ) ?></th>
</span><span class="lines">@@ -551,21 +551,21 @@
</span><span class="cx"> $actions['backend'] = "<span class='backend'><a href='" . esc_url( get_admin_url($blog['blog_id']) ) . "' class='edit'>" . __( 'Backend' ) . '</a></span>';
</span><span class="cx"> if ( $current_site->blog_id != $blog['blog_id'] ) {
</span><span class="cx"> if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' )
</span><del>- $actions['activate'] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to activate the site %s" ), $blogname ) ) ) ) . '">' . __( 'Activate' ) . '</a></span>';
</del><ins>+ $actions['activate'] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ) ) . '">' . __( 'Activate' ) . '</a></span>';
</ins><span class="cx"> else
</span><del>- $actions['deactivate'] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to deactivate the site %s" ), $blogname ) ) ) ) . '">' . __( 'Deactivate' ) . '</a></span>';
</del><ins>+ $actions['deactivate'] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ) ) . '">' . __( 'Deactivate' ) . '</a></span>';
</ins><span class="cx">
</span><span class="cx"> if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
</span><del>- $actions['unarchive'] = '<span class="archive"><a href="' . esc_url( admin_url( '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></span>';
</del><ins>+ $actions['unarchive'] = '<span class="archive"><a href="' . esc_url( admin_url( '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></span>';
</ins><span class="cx"> else
</span><del>- $actions['archive'] = '<span class="archive"><a href="' . esc_url( admin_url( '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></span>';
</del><ins>+ $actions['archive'] = '<span class="archive"><a href="' . esc_url( admin_url( '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></span>';
</ins><span class="cx">
</span><span class="cx"> if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' )
</span><del>- $actions['unspam'] = '<span class="spam"><a href="' . esc_url( admin_url( '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></span>';
</del><ins>+ $actions['unspam'] = '<span class="spam"><a href="' . esc_url( admin_url( '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></span>';
</ins><span class="cx"> else
</span><del>- $actions['spam'] = '<span class="spam"><a href="' . esc_url( admin_url( '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></span>';
</del><ins>+ $actions['spam'] = '<span class="spam"><a href="' . esc_url( admin_url( '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></span>';
</ins><span class="cx">
</span><del>- $actions['delete'] = '<span class="delete"><a href="' . esc_url( admin_url( '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></span>';
</del><ins>+ $actions['delete'] = '<span class="delete"><a href="' . esc_url( admin_url( '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></span>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $actions['visit'] = "<span class='view'><a href='" . esc_url( get_home_url( $blog['blog_id'] ) ) . "' rel='permalink'>" . __( 'Visit' ) . '</a>';
</span></span></pre></div>
<a id="trunkwpadminmsthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-themes.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-themes.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-admin/ms-themes.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> <form action="<?php echo esc_url( admin_url( 'ms-edit.php?action=updatethemes' ) ); ?>" method="post">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php _e( 'Network Themes' ) ?></h2>
</span><del>- <p><?php _e( 'Disable themes network-wide. You can enable themes on a site by site basis.' ) ?></p>
</del><ins>+ <p><?php _e( 'Disable themes network-wide. You can enable themes on a site-by-site basis.' ) ?></p>
</ins><span class="cx"> <table class="widefat">
</span><span class="cx"> <thead>
</span><span class="cx"> <tr>
</span></span></pre></div>
<a id="trunkwpadminmsupgradenetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-upgrade-network.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-upgrade-network.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-admin/ms-upgrade-network.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -10,20 +10,20 @@
</span><span class="cx"> require_once('admin.php');
</span><span class="cx">
</span><span class="cx"> if ( !is_multisite() )
</span><del>- wp_die( __('Multisite support is not enabled.') );
</del><ins>+ wp_die( __( 'Multisite support is not enabled.' ) );
</ins><span class="cx">
</span><span class="cx"> require_once( ABSPATH . WPINC . '/http.php' );
</span><span class="cx">
</span><del>-$title = __('Update Network');
</del><ins>+$title = __( 'Update Network' );
</ins><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="cx"> require_once('admin-header.php');
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can( 'manage_network' ) )
</span><del>- wp_die( __('You do not have permission to access this page.') );
</del><ins>+ wp_die( __( 'You do not have permission to access this page.' ) );
</ins><span class="cx">
</span><span class="cx"> echo '<div class="wrap">';
</span><span class="cx"> screen_icon();
</span><del>-echo '<h2>'.__('Update Network').'</h2>';
</del><ins>+echo '<h2>' . __( 'Update Network' ) . '</h2>';
</ins><span class="cx">
</span><span class="cx"> $action = isset($_GET['action']) ? $_GET['action'] : 'show';
</span><span class="cx">
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> echo "</ul>";
</span><del>- ?><p><?php _e("If your browser doesn't start loading the next page automatically click this link:"); ?> <a class="button" href="ms-upgrade-network.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
</del><ins>+ ?><p><?php _e( 'If your browser doesn&#8217;t start loading the next page automatically, click this link:' ); ?> <a class="button" href="ms-upgrade-network.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
</ins><span class="cx"> <script type='text/javascript'>
</span><span class="cx"> <!--
</span><span class="cx"> function nextpage() {
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case 'show':
</span><span class="cx"> default:
</span><del>- ?><p><?php _e("You can update all the sites on your network through this page. It works by calling the update script of each site automatically. Hit the link below to update."); ?></p>
</del><ins>+ ?><p><?php _e( 'You can update all the sites on your network through this page. It works by calling the update script of each site automatically. Hit the link below to update.' ); ?></p>
</ins><span class="cx"> <p><a class="button" href="ms-upgrade-network.php?action=upgrade"><?php _e("Update Network"); ?></a></p><?php
</span><span class="cx"> do_action( 'wpmu_upgrade_page' );
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkwpadminmysitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/my-sites.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/my-sites.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-admin/my-sites.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> update_user_option( $current_user->id, 'primary_blog', (int) $_POST['primary_blog'], true );
</span><span class="cx"> $updated = true;
</span><span class="cx"> } else {
</span><del>- wp_die( __( "The primary site, which you have choosen, doesn't exists." ) );
</del><ins>+ wp_die( __( 'The primary site you chose does not exist.' ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -56,9 +56,9 @@
</span><span class="cx"> <?php
</span><span class="cx"> $settings_html = apply_filters( 'myblogs_options', '', 'global' );
</span><span class="cx"> if ( $settings_html != '' ) {
</span><del>- echo "<tr><td valign='top'><h3>" . __( 'Global Settings' ) . "</h3></td><td>";
</del><ins>+ echo '<tr><td valign="top"><h3>' . __( 'Global Settings' ) . '</h3></td><td>';
</ins><span class="cx"> echo $settings_html;
</span><del>- echo "</td></tr>";
</del><ins>+ echo '</td></tr>';
</ins><span class="cx"> }
</span><span class="cx"> reset( $blogs );
</span><span class="cx"> $num = count( $blogs );
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-admin/network.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</span><span class="cx">
</span><span class="cx"> if ( is_multisite() && ! defined( 'MULTISITE' ) )
</span><del>- wp_die( __('The Network creation panel is not for WordPress MU networks.') );
</del><ins>+ wp_die( __( 'The Network creation panel is not for WordPress MU networks.' ) );
</ins><span class="cx">
</span><span class="cx"> // We need to create references to ms global tables to enable Network.
</span><span class="cx"> foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table )
</span><span class="lines">@@ -110,9 +110,9 @@
</span><span class="cx"> || ( $no_ip = preg_match( '|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|', $hostname ) ) ) {
</span><span class="cx"> echo '<div class="error"><p><strong>' . __( 'Error:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</strong></p></div>';
</span><span class="cx"> if ( $no_ip )
</span><del>- echo '<p>' . __('You cannot use an IP address such as <code>127.0.0.1</code>.' ) . '</p>';
</del><ins>+ echo '<p>' . __( 'You cannot use an IP address such as <code>127.0.0.1</code>.' ) . '</p>';
</ins><span class="cx"> else
</span><del>- echo '<p>' . sprintf( __('You cannot use port numbers such as <code>%s</code>.' ), $has_ports ) . '</p>';
</del><ins>+ echo '<p>' . sprintf( __( 'You cannot use port numbers such as <code>%s</code>.' ), $has_ports ) . '</p>';
</ins><span class="cx"> echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>';
</span><span class="cx"> include( './admin-footer.php' );
</span><span class="cx"> die();
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> $admin_email = ( ! empty( $_POST['email'] ) && ! in_array( 'invalid_email', $error_codes ) ) ? $_POST['email'] : get_option( 'admin_email' );
</span><span class="cx"> ?>
</span><span class="cx"> <p><?php _e( 'Welcome to the Network installation process!' ); ?></p>
</span><del>- <p><?php _e( "Fill in the information below and you'll be on your way to creating a network of WordPress sites. We'll create configuration files in the next step." ); ?></p>
</del><ins>+ <p><?php _e( 'Fill in the information below and you&#8217;ll be on your way to creating a network of WordPress sites. We will create configuration files in the next step.' ); ?></p>
</ins><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> // @todo IIS and ! $is_apache
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> $subdomain_install = false;
</span><span class="cx"> if ( got_mod_rewrite() ) // dangerous assumptions
</span><del>- echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ' . __( 'Please make sure the Apache <code>mod_rewrite</code> module is installed as it will be used at the end of this install.' ) . '</p>';
</del><ins>+ echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ' . __( 'Please make sure the Apache <code>mod_rewrite</code> module is installed as it will be used at the end of this installation.' ) . '</p>';
</ins><span class="cx"> else
</span><span class="cx"> echo '<div class="error inline"><p><strong>' . __( 'Warning!' ) . '</strong> ' . __( 'It looks like the Apache <code>mod_rewrite</code> module is not installed.' ) . '</p>';
</span><span class="cx"> echo '<p>' . __( 'If <code>mod_rewrite</code> is disabled, ask your administrator to enable that module, or look at the <a href="http://httpd.apache.org/docs/mod/mod_rewrite.html">Apache documentation</a> or <a href="http://www.google.com/search?q=apache+mod_rewrite">elsewhere</a> for help setting it up.' ) . '</p></div>';
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> if ( allow_subdomain_install() ) : ?>
</span><span class="cx"> <h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3>
</span><span class="cx"> <p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories. <strong>You cannot change this later.</strong>' ); ?></p>
</span><del>- <p><?php _e( "You will need a wildcard DNS record if you're going to use the virtual host (sub-domain) functionality." ); ?></p>
</del><ins>+ <p><?php _e( 'You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality.' ); ?></p>
</ins><span class="cx"> <?php // @todo: Link to an MS readme? ?>
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr>
</span><span class="lines">@@ -173,12 +173,12 @@
</span><span class="cx"> if ( $is_www ) :
</span><span class="cx"> ?>
</span><span class="cx"> <h3><?php esc_html_e( 'Server Address' ); ?></h3>
</span><del>- <p><?php printf( __( 'We recommend you change your siteurl to <code>%1$s</code> before enabling the network feature. It will still be possible to visit your site using the "www" prefix with an address like <code>%2$s</code> but any links will not have the "www" prefix.' ), substr( $hostname, 4 ), $hostname ); ?></h3>
</del><ins>+ <p><?php printf( __( 'We recommend you change your siteurl to <code>%1$s</code> before enabling the network feature. It will still be possible to visit your site using the <code>www</code> prefix with an address like <code>%2$s</code> but any links will not have the <code>www</code> prefix.' ), substr( $hostname, 4 ), $hostname ); ?></h3>
</ins><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
</span><span class="cx"> <td>
</span><del>- <?php printf( __( 'The Internet address of your network will be <code>%s</code>.' ), $hostname ); ?>
</del><ins>+ <?php printf( __( 'The internet address of your network will be <code>%s</code>.' ), $hostname ); ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="lines">@@ -189,19 +189,19 @@
</span><span class="cx"> <?php if ( 'localhost' == $hostname ) : ?>
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
</span><del>- <td><?php _e('Because you are using <code>localhost</code>, the sites in your WordPress network must use sub-directories. Consider using <code>localhost.localdomain</code> if you wish to use sub-domains.'); ?></td>
</del><ins>+ <td><?php _e( 'Because you are using <code>localhost</code>, the sites in your WordPress network must use sub-directories. Consider using <code>localhost.localdomain</code> if you wish to use sub-domains.' ); ?></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <?php elseif ( !allow_subdomain_install() ) : ?>
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
</span><del>- <td><?php _e('Because your install is in a directory, the sites in your WordPress network must use sub-directories.'); ?></td>
</del><ins>+ <td><?php _e( 'Because your install is in a directory, the sites in your WordPress network must use sub-directories.' ); ?></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php if ( ! $is_www ) : ?>
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
</span><span class="cx"> <td>
</span><del>- <?php printf( __( 'The Internet address of your network will be <code>%s</code>.' ), $hostname ); ?>
</del><ins>+ <?php printf( __( 'The internet address of your network will be <code>%s</code>.' ), $hostname ); ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php endif; ?>
</span></span></pre></div>
<a id="trunkwpadminoptionsdiscussionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-discussion.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-discussion.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-admin/options-discussion.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> <label for="comment_registration">
</span><span class="cx"> <input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
</span><span class="cx"> <?php _e('Users must be registered and logged in to comment') ?>
</span><del>-<?php if ( !get_option( 'users_can_register' ) && is_multisite() ) _e( ' (Signup has been disabled. Only members of this site can comment)' ); ?>
</del><ins>+<?php if ( !get_option( 'users_can_register' ) && is_multisite() ) _e( ' (Signup has been disabled. Only members of this site can comment.)' ); ?>
</ins><span class="cx"> </label>
</span><span class="cx"> <br />
</span><span class="cx">
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> <th scope="row"><?php _e('Avatar Display') ?></th>
</span><span class="cx"> <td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display') ?></span></legend>
</span><span class="cx"> <?php
</span><del>- $yesorno = array(0 => __("Don&#8217;t show Avatars"), 1 => __('Show Avatars'));
</del><ins>+ $yesorno = array( 0 => __( 'Don&#8217;t show Avatars' ), 1 => __( 'Show Avatars' ) );
</ins><span class="cx"> foreach ( $yesorno as $key => $value) {
</span><span class="cx"> $selected = (get_option('show_avatars') == $key) ? 'checked="checked"' : '';
</span><span class="cx"> echo "\n\t<label><input type='radio' name='show_avatars' value='" . esc_attr($key) . "' $selected/> $value</label><br />";
</span></span></pre></div>
<a id="trunkwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-admin/options.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> if ( $options ) {
</span><span class="cx"> foreach ( $options as $option ) {
</span><span class="cx"> if ( $unregistered )
</span><del>- _deprecated_argument( 'options.php', '2.7', sprintf( __( 'The "%1$s" setting is unregistered. Unregistered settings are deprecated. See http://codex.wordpress.org/Settings_API' ), $option, $option_page ) );
</del><ins>+ _deprecated_argument( 'options.php', '2.7', sprintf( __( 'The <code>%1$s</code> setting is unregistered. Unregistered settings are deprecated. See http://codex.wordpress.org/Settings_API' ), $option, $option_page ) );
</ins><span class="cx">
</span><span class="cx"> $option = trim($option);
</span><span class="cx"> $value = null;
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-admin/update-core.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> echo '</h3>';
</span><span class="cx"> } else {
</span><span class="cx"> echo '<div class="updated"><p>';
</span><del>- _e('<strong>Important:</strong> before updating, please <a href="http://codex.wordpress.org/WordPress_Backups">backup your database and files</a>. For help with updates, visit the <a href="http://codex.wordpress.org/Updating_WordPress">Updating WordPress Codex page</a>.');
</del><ins>+ _e('<strong>Important:</strong> before updating, please <a href="http://codex.wordpress.org/WordPress_Backups">backup your database and files</a>. For help with updates, visit the <a href="http://codex.wordpress.org/Updating_WordPress">Updating WordPress</a> Codex page.');
</ins><span class="cx"> echo '</p></div>';
</span><span class="cx">
</span><span class="cx"> echo '<h3 class="response">';
</span><span class="lines">@@ -174,8 +174,8 @@
</span><span class="cx"> else
</span><span class="cx"> $core_update_version = $core_updates[0]->current;
</span><span class="cx"> ?>
</span><del>-<h3><?php _e('Plugins'); ?></h3>
-<p><?php _e('The following plugins have new versions available. Check the ones you want to update and then click "Update Plugins".'); ?></p>
</del><ins>+<h3><?php _e( 'Plugins' ); ?></h3>
+<p><?php _e( 'The following plugins have new versions available. Check the ones you want to update and then click &#8220;Update Plugins&#8221;.' ); ?></p>
</ins><span class="cx"> <form method="post" action="<?php echo $form_action; ?>" name="upgrade-plugins" class="upgrade">
</span><span class="cx"> <?php wp_nonce_field('upgrade-core'); ?>
</span><span class="cx"> <p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p>
</span><span class="lines">@@ -243,8 +243,8 @@
</span><span class="cx"> $form_action = 'update-core.php?action=do-theme-upgrade';
</span><span class="cx">
</span><span class="cx"> ?>
</span><del>-<h3><?php _e('Themes'); ?></h3>
-<p><?php _e('The following themes have new versions available. Check the ones you want to update and then click "Update Themes".'); ?></p>
</del><ins>+<h3><?php _e( 'Themes' ); ?></h3>
+<p><?php _e( 'The following themes have new versions available. Check the ones you want to update and then click &#8220;Update Themes&#8221.' ); ?></p>
</ins><span class="cx"> <p><?php printf( __('<strong>Please Note:</strong> Any customizations you have made to the Themes files will be lost. Please consider using <a href="%s">child themes</a> for modifications.'), _x('http://codex.wordpress.org/Child_Themes', 'Link used in suggestion to use child themes in GUU') ); ?></p>
</span><span class="cx"> <form method="post" action="<?php echo $form_action; ?>" name="upgrade-themes" class="upgrade">
</span><span class="cx"> <?php wp_nonce_field('upgrade-core'); ?>
</span></span></pre></div>
<a id="trunkwpincludesauthortemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/author-template.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/author-template.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-includes/author-template.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> if ( !empty( $deprecated ) )
</span><span class="cx"> _deprecated_argument( __FUNCTION__, '2.1' );
</span><span class="cx"> if ( $deprecated_echo !== true )
</span><del>- _deprecated_argument( __FUNCTION__, '1.5', __('Use get_the_author() instead if you do not want the value echoed.') );
</del><ins>+ _deprecated_argument( __FUNCTION__, '1.5', __('Use <code>get_the_author()</code> instead if you do not want the value echoed.') );
</ins><span class="cx"> if ( $deprecated_echo )
</span><span class="cx"> echo get_the_author();
</span><span class="cx"> return get_the_author();
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-includes/comment-template.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -728,7 +728,7 @@
</span><span class="cx"> */
</span><span class="cx"> function trackback_url( $deprecated_echo = true ) {
</span><span class="cx"> if ( $deprecated_echo !== true )
</span><del>- _deprecated_argument( __FUNCTION__, '2.5', __('Use get_trackback_url() instead if you do not want the value echoed.') );
</del><ins>+ _deprecated_argument( __FUNCTION__, '2.5', __('Use <code>get_trackback_url()</code> instead if you do not want the value echoed.') );
</ins><span class="cx"> if ( $deprecated_echo )
</span><span class="cx"> echo get_trackback_url();
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-includes/formatting.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -2360,7 +2360,7 @@
</span><span class="cx"> case 'admin_email':
</span><span class="cx"> $value = sanitize_email($value);
</span><span class="cx"> if ( !$value && function_exists('add_settings_error') )
</span><del>- add_settings_error('admin_email', 'invalid_admin_email', __('The E-Mail Address submitted was not in the right format. Please enter a valid Email Address'));
</del><ins>+ add_settings_error('admin_email', 'invalid_admin_email', __('The email address submitted was not in the right format. Please enter a valid email address.'));
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'thumbnail_size_w':
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-includes/general-template.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> switch( $show ) {
</span><span class="cx"> case 'home' : // DEPRECATED
</span><span class="cx"> case 'siteurl' : // DEPRECATED
</span><del>- _deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The \'%1$s\' option is deprecated for the family of bloginfo() functions. Use the \'%2$s\' option instead.'), $show, 'url' ) );
</del><ins>+ _deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The <code>%1$s</code> option is deprecated for the family of <code>bloginfo()</code> functions. Use the <code>%2$s</code> option instead.'), $show, 'url' ) );
</ins><span class="cx"> case 'url' :
</span><span class="cx"> $output = home_url();
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-includes/ms-functions.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -322,14 +322,14 @@
</span><span class="cx">
</span><span class="cx"> // Check if the domain has been used already. We should return an error message.
</span><span class="cx"> if ( domain_exists($domain, $path, $site_id) )
</span><del>- return __('error: Blog URL already taken.');
</del><ins>+ return __( 'Error: Blog URL already taken.' );
</ins><span class="cx">
</span><span class="cx"> // Need to backup wpdb table names, and create a new wp_blogs entry for new blog.
</span><span class="cx"> // Need to get blog_id from wp_blogs, and create new table names.
</span><span class="cx"> // Must restore table names at the end of function.
</span><span class="cx">
</span><span class="cx"> if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
</span><del>- return __('error: problem creating blog entry');
</del><ins>+ return __( 'Error: problem creating blog entry.' );
</ins><span class="cx">
</span><span class="cx"> switch_to_blog($blog_id);
</span><span class="cx"> install_blog($blog_id);
</span><span class="lines">@@ -483,7 +483,7 @@
</span><span class="cx"> $errors->add('user_name', __("Username must be at least 4 characters"));
</span><span class="cx">
</span><span class="cx"> if ( strpos( " " . $user_name, "_" ) != false )
</span><del>- $errors->add('user_name', __("Sorry, usernames may not contain the character '_'!"));
</del><ins>+ $errors->add( 'user_name', __( 'Sorry, usernames may not contain the character &#8220;_&#8221;!' ) );
</ins><span class="cx">
</span><span class="cx"> // all numeric?
</span><span class="cx"> $match = array();
</span><span class="lines">@@ -568,11 +568,11 @@
</span><span class="cx"> $errors->add('blogname', __("Blog name must be at least 4 characters"));
</span><span class="cx">
</span><span class="cx"> if ( strpos( " " . $blogname, "_" ) != false )
</span><del>- $errors->add('blogname', __("Sorry, blog names may not contain the character '_'!"));
</del><ins>+ $errors->add( 'blogname', __( 'Sorry, blog names may not contain the character &#8220;_&#8221;!' ) );
</ins><span class="cx">
</span><span class="cx"> // do not allow users to create a blog that conflicts with a page on the main blog.
</span><span class="cx"> 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 ) ) )
</span><del>- $errors->add( 'blogname', __( "Sorry, you may not use that blog name" ) );
</del><ins>+ $errors->add( 'blogname', __( 'Sorry, you may not use that blog name.' ) );
</ins><span class="cx">
</span><span class="cx"> // all numeric?
</span><span class="cx"> $match = array();
</span><span class="lines">@@ -1153,7 +1153,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ($spaceAllowed-$size) < 0 ) {
</span><span class="cx"> if ( $echo )
</span><del>- _e( "Sorry, you have used your space allocation. Please delete some files to upload more files." ); //No space left
</del><ins>+ _e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' ); // No space left
</ins><span class="cx"> return true;
</span><span class="cx"> } else {
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkwpincludesmsloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-load.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-load.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-includes/ms-load.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> if ( 1 == count( $sites ) )
</span><span class="cx"> wp_die( sprintf( /*WP_I18N_BLOG_DOESNT_EXIST*/'That blog does not exist. Please try <a href="%s">%s</a>.'/*/WP_I18N_BLOG_DOESNT_EXIST*/, $sites[0]->domain . $sites[0]->path ) );
</span><span class="cx"> else
</span><del>- wp_die( /*WP_I18N_NO_SITE_DEFINED*/'No site defined on this host. If you are the owner of this site, please check <a href="http://codex.wordpress.org/Debugging_WPMU">Debugging WPMU</a> for further assistance.'/*/WP_I18N_NO_SITE_DEFINED*/ );
</del><ins>+ wp_die( /*WP_I18N_NO_SITE_DEFINED*/'No site defined on this host. If you are the owner of this site, please check <a href="http://codex.wordpress.org/Debugging_WPMU">Debugging WPMU</a> for help.'/*/WP_I18N_NO_SITE_DEFINED*/ );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> $msg .= '<h1>' . /*WP_I18N_WHAT_DO_I_DO*/'What do I do now?'/*WP_I18N_WHAT_DO_I_DO*/ . '</h1>';
</span><span class="cx"> // @todo Update WPMU codex link.
</span><span class="cx"> $msg .= '<p>' . /*WP_I18N_RTFM*/'Read the <a target="_blank" href="http://codex.wordpress.org/Debugging_WPMU">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.'/*/WP_I18N_RTFM*/ . '</p>';
</span><del>- $msg .= '<p>' . /*WP_I18N_STUCK*/"If you're still stuck with this message, then check that your database contains the following tables:"/*/WP_I18N_STUCK*/ . '</p><ul>';
</del><ins>+ $msg .= '<p>' . /*WP_I18N_STUCK*/'If you&#8217;re still stuck with this message, then check that your database contains the following tables:'/*/WP_I18N_STUCK*/ . '</p><ul>';
</ins><span class="cx"> foreach ( $wpdb->global_tables as $table ) {
</span><span class="cx"> $msg .= '<li>' . $wpdb->prefix . $table . '</li>';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesmssettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-settings.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-settings.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-includes/ms-settings.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">
</span><span class="cx"> // $base sanity check.
</span><span class="cx"> if ( 'BASE' == $base )
</span><del>- die( /*WP_I18N_BASE_ERROR*/'Configuration error in <code>wp-config.php</code>. <code>$base</code> is set to "BASE" when it should be the path like "/" or "/blogs/".'/*/WP_I18N_BASE_ERROR*/ );
</del><ins>+ die( /*WP_I18N_BASE_ERROR*/'Configuration error in <code>wp-config.php</code>. <code>$base</code> is set to <code>BASE</code> when it should be like <code>/</code> or <code>/blogs/</code>.'/*/WP_I18N_BASE_ERROR*/ );
</ins><span class="cx">
</span><span class="cx"> /** Include Multisite initialization functions */
</span><span class="cx"> require( ABSPATH . WPINC . '/ms-load.php' );
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-includes/pluggable.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -1033,7 +1033,7 @@
</span><span class="cx"> if ( empty( $comment_type ) ) $comment_type = 'comment';
</span><span class="cx">
</span><span class="cx"> if ('comment' == $comment_type) {
</span><del>- $notify_message = sprintf( __('New comment on your post "%s"'),$post->post_title ) . "\r\n";
</del><ins>+ $notify_message = sprintf( __( 'New comment on your post &#8220;%s&#8221;' ), $post->post_title ) . "\r\n";
</ins><span class="cx"> /* translators: 1: comment author, 2: author IP, 3: author domain */
</span><span class="cx"> $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";
</span><span class="lines">@@ -1044,7 +1044,7 @@
</span><span class="cx"> /* translators: 1: blog name, 2: post title */
</span><span class="cx"> $subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title );
</span><span class="cx"> } elseif ('trackback' == $comment_type) {
</span><del>- $notify_message = sprintf( __('New trackback on your post "%s"'), $post->post_title ) . "\r\n";
</del><ins>+ $notify_message = sprintf( __( 'New trackback on your post &#8221;%s&#8221;' ), $post->post_title ) . "\r\n";
</ins><span class="cx"> /* translators: 1: website name, 2: author IP, 3: author domain */
</span><span class="cx"> $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n";
</span><span class="lines">@@ -1053,7 +1053,7 @@
</span><span class="cx"> /* translators: 1: blog name, 2: post title */
</span><span class="cx"> $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title );
</span><span class="cx"> } elseif ('pingback' == $comment_type) {
</span><del>- $notify_message = sprintf( __('New pingback on your post "%s"'), $post->post_title ) . "\r\n";
</del><ins>+ $notify_message = sprintf( __( 'New pingback on your post &#8221;%s&#8221;' ), $post->post_title ) . "\r\n";
</ins><span class="cx"> /* translators: 1: comment author, 2: author IP, 3: author domain */
</span><span class="cx"> $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n";
</span><span class="lines">@@ -1126,21 +1126,21 @@
</span><span class="cx"> switch ($comment->comment_type)
</span><span class="cx"> {
</span><span class="cx"> case 'trackback':
</span><del>- $notify_message = sprintf( __('A new trackback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
</del><ins>+ $notify_message = sprintf( __('A new trackback on the post &#8221;%s&#8221; is waiting for your approval'), $post->post_title ) . "\r\n";
</ins><span class="cx"> $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('Website : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n";
</span><span class="cx"> $notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
</span><span class="cx"> break;
</span><span class="cx"> case 'pingback':
</span><del>- $notify_message = sprintf( __('A new pingback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
</del><ins>+ $notify_message = sprintf( __('A new pingback on the post &#8221;%s&#8221; is waiting for your approval'), $post->post_title ) . "\r\n";
</ins><span class="cx"> $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('Website : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n";
</span><span class="cx"> $notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
</span><span class="cx"> break;
</span><span class="cx"> default: //Comments
</span><del>- $notify_message = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
</del><ins>+ $notify_message = sprintf( __('A new comment on the post &#8221;%s&#8221; is waiting for your approval'), $post->post_title ) . "\r\n";
</ins><span class="cx"> $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";
</span></span></pre></div>
<a id="trunkwpmailphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-mail.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-mail.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-mail.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> require(dirname(__FILE__) . '/wp-load.php');
</span><span class="cx">
</span><span class="cx"> if ( ! apply_filters( 'enable_post_by_email_configuration', true ) )
</span><del>- wp_die( __( 'This action has been disabled by the administrator' ) );
</del><ins>+ wp_die( __( 'This action has been disabled by the administrator.' ) );
</ins><span class="cx">
</span><span class="cx"> /** Allow a plugin to do a complete takeover of Post by Email **/
</span><span class="cx"> do_action('wp-mail.php');
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (14069 => 14070)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2010-04-11 09:11:39 UTC (rev 14069)
+++ trunk/wp-signup.php 2010-04-11 10:41:54 UTC (rev 14070)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> print $current_site->domain . $current_site->path . __( 'sitename' );
</span><span class="cx"> else
</span><span class="cx"> print __( 'domain.' ) . $current_site->domain . $current_site->path;
</span><del>- echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' ) . '</p>';
</del><ins>+ echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Blog Title
</span><span class="lines">@@ -130,17 +130,17 @@
</span><span class="cx"> echo '<p class="error">'.$errmsg.'</p>';
</span><span class="cx"> }
</span><span class="cx"> echo '<input name="user_name" type="text" id="user_name" value="'. esc_attr($user_name) .'" maxlength="50" /><br />';
</span><del>- _e('(Must be at least 4 characters, letters and numbers only.)');
</del><ins>+ _e( '(Must be at least 4 characters, letters and numbers only.)' );
</ins><span class="cx"> ?>
</span><span class="cx">
</span><del>- <label for="user_email"><?php _e('Email&nbsp;Address:') ?></label>
</del><ins>+ <label for="user_email"><?php _e( 'Email&nbsp;Address:' ) ?></label>
</ins><span class="cx"> <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?>
</span><span class="cx"> <p class="error"><?php echo $errmsg ?></p>
</span><span class="cx"> <?php } ?>
</span><span class="cx"> <input name="user_email" type="text" id="user_email" value="<?php echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('(We&#8217;ll send your password to this address, so <strong>triple-check it</strong>.)') ?>
</span><span class="cx"> <?php
</span><span class="cx"> if ( $errmsg = $errors->get_error_message('generic') ) {
</span><del>- echo '<p class="error">'.$errmsg.'</p>';
</del><ins>+ echo '<p class="error">' . $errmsg . '</p>';
</ins><span class="cx"> }
</span><span class="cx"> do_action( 'signup_extra_fields', $errors );
</span><span class="cx"> }
</span><span class="lines">@@ -162,19 +162,19 @@
</span><span class="cx"> $blog_title = $filtered_results['blog_title'];
</span><span class="cx"> $errors = $filtered_results['errors'];
</span><span class="cx">
</span><del>- echo '<h2>' . sprintf( __('Get <em>another</em> %s site in seconds'), $current_site->site_name ) . '</h2>';
</del><ins>+ echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), $current_site->site_name ) . '</h2>';
</ins><span class="cx">
</span><span class="cx"> if ( $errors->get_error_code() ) {
</span><del>- echo "<p>" . __('There was a problem, please correct the form below and try again.') . "</p>";
</del><ins>+ echo '<p>' . __( 'There was a problem, please correct the form below and try again.' ) . '</p>';
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><del>- <p><?php printf(__("Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart's content, but write responsibly."), $current_user->display_name) ?></p>
</del><ins>+ <p><?php printf( __( 'Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart&#8217;s content, but write responsibly!' ), $current_user->display_name ) ?></p>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> $blogs = get_blogs_of_user($current_user->ID);
</span><span class="cx"> if ( !empty($blogs) ) { ?>
</span><span class="cx"> <p>
</span><del>- <?php _e('Sites you are already a member of:') ?>
</del><ins>+ <?php _e( 'Sites you are already a member of:' ) ?>
</ins><span class="cx"> <ul>
</span><span class="cx"> <?php foreach ( $blogs as $blog ) {
</span><span class="cx"> echo "<li><a href='http://" . $blog->domain . $blog->path . "'>" . $blog->domain . $blog->path . "</a></li>";
</span><span class="lines">@@ -183,12 +183,12 @@
</span><span class="cx"> </p>
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><del>- <p><?php _e("If you&#8217;re not going to use a great site domain, leave it for a new user. Now have at it!") ?></p>
</del><ins>+ <p><?php _e( 'If you&#8217;re not going to use a great site domain, leave it for a new user. Now have at it!' ) ?></p>
</ins><span class="cx"> <form id="setupform" method="post" action="wp-signup.php">
</span><span class="cx"> <input type="hidden" name="stage" value="gimmeanotherblog" />
</span><span class="cx"> <?php do_action( "signup_hidden_fields" ); ?>
</span><span class="cx"> <?php show_blog_form($blogname, $blog_title, $errors); ?>
</span><del>- <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Create Site') ?>" /></p>
</del><ins>+ <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Create Site' ) ?>" /></p>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -208,8 +208,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $public = (int) $_POST['blog_public'];
</span><del>- $meta = apply_filters('signup_create_blog_meta', array ('lang_id' => 1, 'public' => $public)); // deprecated
- $meta = apply_filters( "add_signup_meta", $meta );
</del><ins>+ $meta = apply_filters( 'signup_create_blog_meta', array( 'lang_id' => 1, 'public' => $public ) ); // deprecated
+ $meta = apply_filters( 'add_signup_meta', $meta );
</ins><span class="cx">
</span><span class="cx"> wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid );
</span><span class="cx"> confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta);
</span><span class="lines">@@ -218,12 +218,12 @@
</span><span class="cx">
</span><span class="cx"> function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $user_email = '', $meta = '') {
</span><span class="cx"> ?>
</span><del>- <h2><?php printf(__('The site %s is yours.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
</del><ins>+ <h2><?php printf( __( 'The site %s is yours.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
</ins><span class="cx"> <p>
</span><del>- <?php printf(__('<a href="http://%1$s">http://%2$s</a> is your new site. <a href="%3$s">Login</a> as "%4$s" using your existing password.'), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name) ?>
</del><ins>+ <?php printf( __( '<a href="http://%1$s">http://%2$s</a> is your new site. <a href="%3$s">Log in</a> as &#8220;%4$s&#8221; using your existing password.' ), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name ) ?>
</ins><span class="cx"> </p>
</span><span class="cx"> <?php
</span><del>- do_action('signup_finished');
</del><ins>+ do_action( 'signup_finished' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function signup_user($user_name = '', $user_email = '', $errors = '') {
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>- <h2><?php printf( __('Get your own %s account in seconds'), $current_site->site_name ) ?></h2>
</del><ins>+ <h2><?php printf( __( 'Get your own %s account in seconds' ), $current_site->site_name ) ?></h2>
</ins><span class="cx"> <form id="setupform" method="post" action="wp-signup.php">
</span><span class="cx"> <input type="hidden" name="stage" value="validate-user-signup" />
</span><span class="cx"> <?php do_action( "signup_hidden_fields" ); ?>
</span><span class="lines">@@ -294,12 +294,12 @@
</span><span class="cx">
</span><span class="cx"> function confirm_user_signup($user_name, $user_email) {
</span><span class="cx"> ?>
</span><del>- <h2><?php printf(__('%s is your new username'), $user_name) ?></h2>
- <p><?php _e('But, before you can start using your new username, <strong>you must activate it</strong>.') ?></p>
- <p><?php printf(__('Check your inbox at <strong>%1$s</strong> and click the link given.'), $user_email) ?></p>
- <p><?php _e('If you do not activate your username within two days, you will have to sign up again.'); ?></p>
</del><ins>+ <h2><?php printf( __( '%s is your new username' ), $user_name) ?></h2>
+ <p><?php _e( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ) ?></p>
+ <p><?php printf(__( 'Check your inbox at <strong>%1$s</strong> and click the link given.' ), $user_email) ?></p>
+ <p><?php _e( 'If you do not activate your username within two days, you will have to sign up again.' ); ?></p>
</ins><span class="cx"> <?php
</span><del>- do_action('signup_finished');
</del><ins>+ do_action( 'signup_finished' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_title = '', $errors = '') {
</span><span class="lines">@@ -357,22 +357,22 @@
</span><span class="cx">
</span><span class="cx"> function confirm_blog_signup($domain, $path, $blog_title, $user_name = '', $user_email = '', $meta) {
</span><span class="cx"> ?>
</span><del>- <h2><?php printf(__('Congratulations! Your new site, %s, is almost ready.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
</del><ins>+ <h2><?php printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
</ins><span class="cx">
</span><del>- <p><?php _e('But, before you can start using your site, <strong>you must activate it</strong>.') ?></p>
- <p><?php printf(__('Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.'), $user_email) ?></p>
- <p><?php _e('If you do not activate your site within two days, you will have to sign up again.'); ?></p>
- <h2><?php _e('Still waiting for your email?'); ?></h2>
</del><ins>+ <p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) ?></p>
+ <p><?php printf( __( 'Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.' ), $user_email) ?></p>
+ <p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p>
+ <h2><?php _e( 'Still waiting for your email?' ); ?></h2>
</ins><span class="cx"> <p>
</span><del>- <?php _e("If you haven't received your email yet, there are a number of things you can do:") ?>
</del><ins>+ <?php _e( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' ) ?>
</ins><span class="cx"> <ul id="noemail-tips">
</span><del>- <li><p><strong><?php _e('Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.') ?></strong></p></li>
- <li><p><?php _e('Check the junk email or spam folder of your email client. Sometime emails wind up there by mistake.') ?></p></li>
- <li><?php printf(__("Have you entered your email correctly? We think it's %s but if you've entered it incorrectly, you won't receive it."), $user_email) ?></li>
</del><ins>+ <li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ) ?></strong></p></li>
+ <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ) ?></p></li>
+ <li><?php printf( __( 'Have you entered your email correctly? We think it&#8217;s %s but if you have entered it incorrectly, you will not receive it.' ), $user_email ) ?></li>
</ins><span class="cx"> </ul>
</span><span class="cx"> </p>
</span><span class="cx"> <?php
</span><del>- do_action('signup_finished');
</del><ins>+ do_action( 'signup_finished' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Main
</span><span class="lines">@@ -383,20 +383,20 @@
</span><span class="cx"> $active_signup = apply_filters( 'wpmu_active_signup', $active_signup ); // return "all", "none", "blog" or "user"
</span><span class="cx">
</span><span class="cx"> if ( is_super_admin() )
</span><del>- echo '<div class="mu_alert">' . sprintf( __( "Greetings Site Administrator! You are currently allowing '%s' registrations. To change or disable registration go to your <a href='wp-admin/ms-options.php'>Options page</a>." ), $active_signup ) . '</div>';
</del><ins>+ echo '<div class="mu_alert">' . sprintf( __( 'Greetings Site Administrator! You are currently allowing &#8220;%s&#8221; registrations. To change or disable registration go to your <a href="wp-admin/ms-options.php">Options page</a>.' ), $active_signup ) . '</div>';
</ins><span class="cx">
</span><span class="cx"> $newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;
</span><span class="cx">
</span><span class="cx"> $current_user = wp_get_current_user();
</span><span class="cx"> if ( $active_signup == "none" ) {
</span><del>- _e( "Registration has been disabled." );
</del><ins>+ _e( 'Registration has been disabled.' );
</ins><span class="cx"> } elseif ( $active_signup == 'blog' && !is_user_logged_in() ) {
</span><span class="cx"> if ( is_ssl() )
</span><span class="cx"> $proto = 'https://';
</span><span class="cx"> else
</span><span class="cx"> $proto = 'http://';
</span><span class="cx"> $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode($proto . $_SERVER['HTTP_HOST'] . '/wp-signup.php' ));
</span><del>- echo sprintf( __( "You must first <a href=\"%s\">login</a>, and then you can create a new site."), $login_url );
</del><ins>+ echo sprintf( __( 'You must first <a href="%s">log in</a>, and then you can create a new site.' ), $login_url );
</ins><span class="cx"> } else {
</span><span class="cx"> $stage = isset( $_POST['stage'] ) ? $_POST['stage'] : 'default';
</span><span class="cx"> switch ( $stage ) {
</span><span class="lines">@@ -404,13 +404,13 @@
</span><span class="cx"> if ( $active_signup == 'all' || $_POST[ 'signup_for' ] == 'blog' && $active_signup == 'blog' || $_POST[ 'signup_for' ] == 'user' && $active_signup == 'user' )
</span><span class="cx"> validate_user_signup();
</span><span class="cx"> else
</span><del>- _e( "User registration has been disabled." );
</del><ins>+ _e( 'User registration has been disabled.' );
</ins><span class="cx"> break;
</span><span class="cx"> case 'validate-blog-signup':
</span><span class="cx"> if ( $active_signup == 'all' || $active_signup == 'blog' )
</span><span class="cx"> validate_blog_signup();
</span><span class="cx"> else
</span><del>- _e( "Site registration has been disabled." );
</del><ins>+ _e( 'Site registration has been disabled.' );
</ins><span class="cx"> break;
</span><span class="cx"> case 'gimmeanotherblog':
</span><span class="cx"> validate_another_blog_signup();
</span><span class="lines">@@ -424,9 +424,9 @@
</span><span class="cx"> elseif ( is_user_logged_in() == false && ( $active_signup == 'all' || $active_signup == 'user' ) )
</span><span class="cx"> signup_user( $newblogname, $user_email );
</span><span class="cx"> elseif ( is_user_logged_in() == false && ( $active_signup == 'blog' ) )
</span><del>- _e( "I'm sorry. We're not accepting new registrations at this time." );
</del><ins>+ _e( 'We are sorry. We are not accepting new registrations at this time.' );
</ins><span class="cx"> else
</span><del>- _e( "You're logged in already. No need to register again!" );
</del><ins>+ _e( 'You are logged in already. No need to register again!' );
</ins><span class="cx">
</span><span class="cx"> if ($newblogname) {
</span><span class="cx"> if ( !is_subdomain_install() )
</span><span class="lines">@@ -434,9 +434,9 @@
</span><span class="cx"> else
</span><span class="cx"> $newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path;
</span><span class="cx"> if ( $active_signup == 'blog' || $active_signup == 'all' )
</span><del>- printf(__("<p><em>The site you were looking for, <strong>%s</strong> doesn't exist but you can create it now!</em></p>"), $newblog );
</del><ins>+ printf( __( '<p><em>The site you were looking for, <strong>%s</strong> does not exist, but you can create it now!</em></p>' ), $newblog );
</ins><span class="cx"> else
</span><del>- printf(__("<p><em>The site you were looking for, <strong>%s</strong> doesn't exist.</em></p>"), $newblog );
</del><ins>+ printf( __( '<p><em>The site you were looking for, <strong>%s</strong>, does not exist.</em></p>' ), $newblog );
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>