Changeset 14070
- Timestamp:
- 04/11/2010 10:41:54 AM (15 years ago)
- Location:
- trunk
- Files:
-
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-activate.php
r13884 r14070 65 65 <?php 66 66 if ( $signup->domain . $signup->path == '' ) { 67 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'));67 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')); 68 68 } else { 69 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 "%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'));69 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 “%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')); 70 70 } 71 71 } else { -
trunk/wp-admin/custom-background.php
r13856 r14070 247 247 <?php if ( get_background_image() ) : ?> 248 248 <h3><?php _e('Remove Background Image'); ?></h3> 249 <p><?php _e('This will remove the background image. You will not be able to re trieve any customizations.') ?></p>249 <p><?php _e('This will remove the background image. You will not be able to restore any customizations.') ?></p> 250 250 <form method="post" action=""> 251 251 <?php wp_nonce_field('custom-background'); ?> -
trunk/wp-admin/edit-tag-form.php
r13715 r14070 12 12 13 13 if ( empty($tag_ID) ) { ?> 14 <div id="message" class="updated"><p><strong><?php _e( 'An item was not selected for editing.'); ?></strong></p></div>14 <div id="message" class="updated"><p><strong><?php _e( 'You did not select an item for editing.' ); ?></strong></p></div> 15 15 <?php 16 16 return; -
trunk/wp-admin/import/mt.php
r13807 r14070 37 37 ?> 38 38 <div class="narrow"> 39 <p><?php _e( 'Howdy! We’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 “Upload file and import”, 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>39 <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 “Upload file and import”, 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> 40 40 41 41 <?php wp_import_upload_form( add_query_arg('step', 1) ); ?> -
trunk/wp-admin/ms-edit.php
r14020 r14070 148 148 149 149 if ( is_array( $_POST['blog'] ) == false ) 150 wp_die( __( "Can't create an empty site.") );150 wp_die( __( 'Can’t create an empty site.' ) ); 151 151 $blog = $_POST['blog']; 152 152 $domain = ''; -
trunk/wp-admin/ms-options.php
r14039 r14070 75 75 <input name="dashboard_blog" type="text" id="dashboard_blog" value="<?php echo esc_attr( $blogname ); ?>" class="regular-text" /> 76 76 <br /> 77 <?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."); ?>77 <?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.' ); ?> 78 78 </td> 79 79 </tr> … … 86 86 </select> 87 87 <br /> 88 <?php _e( "The default role for new users on the Dashboard site. 'Subscriber' or 'Contributor' roles are recommended."); ?>88 <?php _e( 'The default role for new users on the Dashboard site. “Subscriber” or “Contributor” roles are recommended.' ); ?> 89 89 </td> 90 90 </tr> … … 114 114 <p><?php _e( 'Disable or enable registration and who or what can be registered. (Default is disabled.)' ); ?></p> 115 115 <?php if ( is_subdomain_install() ) { 116 echo '<p>' . __( 'If registration is disabled, please set <code>NOBLOGREDIRECT</code> in <code>wp-config.php</code> to a urlyou will redirect visitors to if they visit a non-existent site.' ) . '</p>';116 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>'; 117 117 } ?> 118 118 </td> … … 153 153 <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> 154 154 <br /> 155 <?php _e( 'If you want to limit site registrations to certain domains. Enter one domain per line.' ) ?>155 <?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ) ?> 156 156 </td> 157 157 </tr> … … 162 162 <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> 163 163 <br /> 164 <?php _e( 'If you want to ban domains from site registrations. Enter one domain per line.') ?>164 <?php _e( 'If you want to ban domains from site registrations. One domain per line.' ) ?> 165 165 </td> 166 166 </tr> … … 235 235 <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 /> 236 236 <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 /> 237 <?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>237 <?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> 238 238 </tr> 239 239 -
trunk/wp-admin/ms-sites.php
r14039 r14070 129 129 else 130 130 $checked_fields = array( 131 'public' => __( 'Public'),132 'archived' => __( 'Archived'),133 'spam' => __( 'Spam'),134 'deleted' => __( 'Deleted'),131 'public' => __( 'Public' ), 132 'archived' => __( 'Archived' ), 133 'spam' => __( 'Spam' ), 134 'deleted' => __( 'Deleted' ), 135 135 ); 136 136 $checked_fields['mature'] = __( 'Mature' ); … … 275 275 <h3 class="hndle"><span><?php _e( 'Add a new user' ); ?></span></h3> 276 276 <div class="inside"> 277 <p class="description"><?php _e( 'Enter the username of an existing user and hit "Update Options"to add the user.' ) ?></p>277 <p class="description"><?php _e( 'Enter the username of an existing user and hit “Update Options” to add the user.' ) ?></p> 278 278 <table class="form-table"> 279 279 <tr> … … 552 552 if ( $current_site->blog_id != $blog['blog_id'] ) { 553 553 if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' ) 554 $actions['activate'] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&action2=activateblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to activate the site %s"), $blogname ) ) ) ) . '">' . __( 'Activate' ) . '</a></span>';554 $actions['activate'] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&action2=activateblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ) ) . '">' . __( 'Activate' ) . '</a></span>'; 555 555 else 556 $actions['deactivate'] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&action2=deactivateblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to deactivate the site %s"), $blogname ) ) ) ) . '">' . __( 'Deactivate' ) . '</a></span>';556 $actions['deactivate'] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&action2=deactivateblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ) ) . '">' . __( 'Deactivate' ) . '</a></span>'; 557 557 558 558 if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' ) 559 $actions['unarchive'] = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&action2=unarchiveblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to unarchive the site %s."), $blogname ) ) ) ) . '">' . __( 'Unarchive' ) . '</a></span>';559 $actions['unarchive'] = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&action2=unarchiveblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Unarchive' ) . '</a></span>'; 560 560 else 561 $actions['archive'] = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&action2=archiveblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to archive the site %s."), $blogname ) ) ) ) . '">' . __( 'Archive' ) . '</a></span>';561 $actions['archive'] = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&action2=archiveblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Archive' ) . '</a></span>'; 562 562 563 563 if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' ) 564 $actions['unspam'] = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&action2=unspamblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to unspam the site %s."), $blogname ) ) ) ) . '">' . __( 'Not Spam' ) . '</a></span>';564 $actions['unspam'] = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&action2=unspamblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Not Spam' ) . '</a></span>'; 565 565 else 566 $actions['spam'] = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&action2=spamblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to mark the site %s as spam."), $blogname ) ) ) ) . '">' . __( 'Spam' ) . '</a></span>';567 568 $actions['delete'] = '<span class="delete"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&action2=deleteblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to delete the site %s."), $blogname ) ) ) ) . '">' . __( 'Delete' ) . '</a></span>';566 $actions['spam'] = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&action2=spamblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ) ) . '">' . __( 'Spam' ) . '</a></span>'; 567 568 $actions['delete'] = '<span class="delete"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&action2=deleteblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( 'You are about to delete the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Delete' ) . '</a></span>'; 569 569 } 570 570 -
trunk/wp-admin/ms-themes.php
r14039 r14070 30 30 <?php screen_icon(); ?> 31 31 <h2><?php _e( 'Network Themes' ) ?></h2> 32 <p><?php _e( 'Disable themes network-wide. You can enable themes on a site bysite basis.' ) ?></p>32 <p><?php _e( 'Disable themes network-wide. You can enable themes on a site-by-site basis.' ) ?></p> 33 33 <table class="widefat"> 34 34 <thead> -
trunk/wp-admin/ms-upgrade-network.php
r13998 r14070 11 11 12 12 if ( !is_multisite() ) 13 wp_die( __( 'Multisite support is not enabled.') );13 wp_die( __( 'Multisite support is not enabled.' ) ); 14 14 15 15 require_once( ABSPATH . WPINC . '/http.php' ); 16 16 17 $title = __( 'Update Network');17 $title = __( 'Update Network' ); 18 18 $parent_file = 'ms-admin.php'; 19 19 require_once('admin-header.php'); 20 20 21 21 if ( ! current_user_can( 'manage_network' ) ) 22 wp_die( __( 'You do not have permission to access this page.') );22 wp_die( __( 'You do not have permission to access this page.' ) ); 23 23 24 24 echo '<div class="wrap">'; 25 25 screen_icon(); 26 echo '<h2>' .__('Update Network').'</h2>';26 echo '<h2>' . __( 'Update Network' ) . '</h2>'; 27 27 28 28 $action = isset($_GET['action']) ? $_GET['action'] : 'show'; … … 55 55 } 56 56 echo "</ul>"; 57 ?><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&n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>57 ?><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&n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p> 58 58 <script type='text/javascript'> 59 59 <!-- … … 67 67 case 'show': 68 68 default: 69 ?><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>69 ?><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> 70 70 <p><a class="button" href="ms-upgrade-network.php?action=upgrade"><?php _e("Update Network"); ?></a></p><?php 71 71 do_action( 'wpmu_upgrade_page' ); -
trunk/wp-admin/my-sites.php
r14039 r14070 32 32 $updated = true; 33 33 } else { 34 wp_die( __( "The primary site, which you have choosen, doesn't exists.") );34 wp_die( __( 'The primary site you chose does not exist.' ) ); 35 35 } 36 36 } … … 57 57 $settings_html = apply_filters( 'myblogs_options', '', 'global' ); 58 58 if ( $settings_html != '' ) { 59 echo "<tr><td valign='top'><h3>" . __( 'Global Settings' ) . "</h3></td><td>";59 echo '<tr><td valign="top"><h3>' . __( 'Global Settings' ) . '</h3></td><td>'; 60 60 echo $settings_html; 61 echo "</td></tr>";61 echo '</td></tr>'; 62 62 } 63 63 reset( $blogs ); -
trunk/wp-admin/network.php
r13999 r14070 18 18 19 19 if ( is_multisite() && ! defined( 'MULTISITE' ) ) 20 wp_die( __( 'The Network creation panel is not for WordPress MU networks.') );20 wp_die( __( 'The Network creation panel is not for WordPress MU networks.' ) ); 21 21 22 22 // We need to create references to ms global tables to enable Network. … … 111 111 echo '<div class="error"><p><strong>' . __( 'Error:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</strong></p></div>'; 112 112 if ( $no_ip ) 113 echo '<p>' . __( 'You cannot use an IP address such as <code>127.0.0.1</code>.' ) . '</p>';113 echo '<p>' . __( 'You cannot use an IP address such as <code>127.0.0.1</code>.' ) . '</p>'; 114 114 else 115 echo '<p>' . sprintf( __( 'You cannot use port numbers such as <code>%s</code>.' ), $has_ports ) . '</p>';115 echo '<p>' . sprintf( __( 'You cannot use port numbers such as <code>%s</code>.' ), $has_ports ) . '</p>'; 116 116 echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>'; 117 117 include( './admin-footer.php' ); … … 134 134 ?> 135 135 <p><?php _e( 'Welcome to the Network installation process!' ); ?></p> 136 <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>136 <p><?php _e( 'Fill in the information below and you’ll be on your way to creating a network of WordPress sites. We will create configuration files in the next step.' ); ?></p> 137 137 <?php 138 138 … … 145 145 $subdomain_install = false; 146 146 if ( got_mod_rewrite() ) // dangerous assumptions 147 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>';147 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>'; 148 148 else 149 149 echo '<div class="error inline"><p><strong>' . __( 'Warning!' ) . '</strong> ' . __( 'It looks like the Apache <code>mod_rewrite</code> module is not installed.' ) . '</p>'; … … 154 154 <h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3> 155 155 <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> 156 <p><?php _e( "You will need a wildcard DNS record if you're going to use the virtual host (sub-domain) functionality."); ?></p>156 <p><?php _e( 'You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality.' ); ?></p> 157 157 <?php // @todo: Link to an MS readme? ?> 158 158 <table class="form-table"> … … 174 174 ?> 175 175 <h3><?php esc_html_e( 'Server Address' ); ?></h3> 176 <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>176 <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> 177 177 <table class="form-table"> 178 178 <tr> 179 179 <th scope='row'><?php esc_html_e( 'Server Address' ); ?></th> 180 180 <td> 181 <?php printf( __( 'The Internet address of your network will be <code>%s</code>.' ), $hostname ); ?>181 <?php printf( __( 'The internet address of your network will be <code>%s</code>.' ), $hostname ); ?> 182 182 </td> 183 183 </tr> … … 190 190 <tr> 191 191 <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th> 192 <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>192 <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> 193 193 </tr> 194 194 <?php elseif ( !allow_subdomain_install() ) : ?> 195 195 <tr> 196 196 <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th> 197 <td><?php _e( 'Because your install is in a directory, the sites in your WordPress network must use sub-directories.'); ?></td>197 <td><?php _e( 'Because your install is in a directory, the sites in your WordPress network must use sub-directories.' ); ?></td> 198 198 </tr> 199 199 <?php endif; ?> … … 202 202 <th scope='row'><?php esc_html_e( 'Server Address' ); ?></th> 203 203 <td> 204 <?php printf( __( 'The Internet address of your network will be <code>%s</code>.' ), $hostname ); ?>204 <?php printf( __( 'The internet address of your network will be <code>%s</code>.' ), $hostname ); ?> 205 205 </td> 206 206 </tr> -
trunk/wp-admin/options-discussion.php
r13750 r14070 53 53 <input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> /> 54 54 <?php _e('Users must be registered and logged in to comment') ?> 55 <?php if ( !get_option( 'users_can_register' ) && is_multisite() ) _e( ' (Signup has been disabled. Only members of this site can comment )' ); ?>55 <?php if ( !get_option( 'users_can_register' ) && is_multisite() ) _e( ' (Signup has been disabled. Only members of this site can comment.)' ); ?> 56 56 </label> 57 57 <br /> … … 161 161 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display') ?></span></legend> 162 162 <?php 163 $yesorno = array( 0 => __("Don’t show Avatars"), 1 => __('Show Avatars'));163 $yesorno = array( 0 => __( 'Don’t show Avatars' ), 1 => __( 'Show Avatars' ) ); 164 164 foreach ( $yesorno as $key => $value) { 165 165 $selected = (get_option('show_avatars') == $key) ? 'checked="checked"' : ''; -
trunk/wp-admin/options.php
r13789 r14070 133 133 foreach ( $options as $option ) { 134 134 if ( $unregistered ) 135 _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 ) );135 _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 ) ); 136 136 137 137 $option = trim($option); -
trunk/wp-admin/update-core.php
r13972 r14070 132 132 } else { 133 133 echo '<div class="updated"><p>'; 134 _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>.');134 _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.'); 135 135 echo '</p></div>'; 136 136 … … 175 175 $core_update_version = $core_updates[0]->current; 176 176 ?> 177 <h3><?php _e( 'Plugins'); ?></h3>178 <p><?php _e( 'The following plugins have new versions available. Check the ones you want to update and then click "Update Plugins".'); ?></p>177 <h3><?php _e( 'Plugins' ); ?></h3> 178 <p><?php _e( 'The following plugins have new versions available. Check the ones you want to update and then click “Update Plugins”.' ); ?></p> 179 179 <form method="post" action="<?php echo $form_action; ?>" name="upgrade-plugins" class="upgrade"> 180 180 <?php wp_nonce_field('upgrade-core'); ?> … … 244 244 245 245 ?> 246 <h3><?php _e( 'Themes'); ?></h3>247 <p><?php _e( 'The following themes have new versions available. Check the ones you want to update and then click "Update Themes".'); ?></p>246 <h3><?php _e( 'Themes' ); ?></h3> 247 <p><?php _e( 'The following themes have new versions available. Check the ones you want to update and then click “Update Themes”.' ); ?></p> 248 248 <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> 249 249 <form method="post" action="<?php echo $form_action; ?>" name="upgrade-themes" class="upgrade"> -
trunk/wp-includes/author-template.php
r14028 r14070 53 53 _deprecated_argument( __FUNCTION__, '2.1' ); 54 54 if ( $deprecated_echo !== true ) 55 _deprecated_argument( __FUNCTION__, '1.5', __('Use get_the_author()instead if you do not want the value echoed.') );55 _deprecated_argument( __FUNCTION__, '1.5', __('Use <code>get_the_author()</code> instead if you do not want the value echoed.') ); 56 56 if ( $deprecated_echo ) 57 57 echo get_the_author(); -
trunk/wp-includes/comment-template.php
r14067 r14070 729 729 function trackback_url( $deprecated_echo = true ) { 730 730 if ( $deprecated_echo !== true ) 731 _deprecated_argument( __FUNCTION__, '2.5', __('Use get_trackback_url()instead if you do not want the value echoed.') );731 _deprecated_argument( __FUNCTION__, '2.5', __('Use <code>get_trackback_url()</code> instead if you do not want the value echoed.') ); 732 732 if ( $deprecated_echo ) 733 733 echo get_trackback_url(); -
trunk/wp-includes/formatting.php
r13988 r14070 2361 2361 $value = sanitize_email($value); 2362 2362 if ( !$value && function_exists('add_settings_error') ) 2363 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'));2363 add_settings_error('admin_email', 'invalid_admin_email', __('The email address submitted was not in the right format. Please enter a valid email address.')); 2364 2364 break; 2365 2365 -
trunk/wp-includes/general-template.php
r14047 r14070 396 396 case 'home' : // DEPRECATED 397 397 case 'siteurl' : // DEPRECATED 398 _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' ) );398 _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' ) ); 399 399 case 'url' : 400 400 $output = home_url(); -
trunk/wp-includes/ms-functions.php
r14055 r14070 323 323 // Check if the domain has been used already. We should return an error message. 324 324 if ( domain_exists($domain, $path, $site_id) ) 325 return __( 'error: Blog URL already taken.');325 return __( 'Error: Blog URL already taken.' ); 326 326 327 327 // Need to backup wpdb table names, and create a new wp_blogs entry for new blog. … … 330 330 331 331 if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) 332 return __( 'error: problem creating blog entry');332 return __( 'Error: problem creating blog entry.' ); 333 333 334 334 switch_to_blog($blog_id); … … 484 484 485 485 if ( strpos( " " . $user_name, "_" ) != false ) 486 $errors->add( 'user_name', __("Sorry, usernames may not contain the character '_'!"));486 $errors->add( 'user_name', __( 'Sorry, usernames may not contain the character “_”!' ) ); 487 487 488 488 // all numeric? … … 569 569 570 570 if ( strpos( " " . $blogname, "_" ) != false ) 571 $errors->add( 'blogname', __("Sorry, blog names may not contain the character '_'!"));571 $errors->add( 'blogname', __( 'Sorry, blog names may not contain the character “_”!' ) ); 572 572 573 573 // do not allow users to create a blog that conflicts with a page on the main blog. 574 574 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 ) ) ) 575 $errors->add( 'blogname', __( "Sorry, you may not use that blog name") );575 $errors->add( 'blogname', __( 'Sorry, you may not use that blog name.' ) ); 576 576 577 577 // all numeric? … … 1154 1154 if ( ($spaceAllowed-$size) < 0 ) { 1155 1155 if ( $echo ) 1156 _e( "Sorry, you have used your space allocation. Please delete some files to upload more files." ); //No space left1156 _e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' ); // No space left 1157 1157 return true; 1158 1158 } else { -
trunk/wp-includes/ms-load.php
r13827 r14070 175 175 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 ) ); 176 176 else 177 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*/ );177 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*/ ); 178 178 } 179 179 … … 201 201 // @todo Update WPMU codex link. 202 202 $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>'; 203 $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>';203 $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>'; 204 204 foreach ( $wpdb->global_tables as $table ) { 205 205 $msg .= '<li>' . $wpdb->prefix . $table . '</li>'; -
trunk/wp-includes/ms-settings.php
r13998 r14070 13 13 // $base sanity check. 14 14 if ( 'BASE' == $base ) 15 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*/ );15 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*/ ); 16 16 17 17 /** Include Multisite initialization functions */ -
trunk/wp-includes/pluggable.php
r13878 r14070 1034 1034 1035 1035 if ('comment' == $comment_type) { 1036 $notify_message = sprintf( __( 'New comment on your post "%s"'),$post->post_title ) . "\r\n";1036 $notify_message = sprintf( __( 'New comment on your post “%s”' ), $post->post_title ) . "\r\n"; 1037 1037 /* translators: 1: comment author, 2: author IP, 3: author domain */ 1038 1038 $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; … … 1045 1045 $subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title ); 1046 1046 } elseif ('trackback' == $comment_type) { 1047 $notify_message = sprintf( __( 'New trackback on your post "%s"'), $post->post_title ) . "\r\n";1047 $notify_message = sprintf( __( 'New trackback on your post ”%s”' ), $post->post_title ) . "\r\n"; 1048 1048 /* translators: 1: website name, 2: author IP, 3: author domain */ 1049 1049 $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; … … 1054 1054 $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title ); 1055 1055 } elseif ('pingback' == $comment_type) { 1056 $notify_message = sprintf( __( 'New pingback on your post "%s"'), $post->post_title ) . "\r\n";1056 $notify_message = sprintf( __( 'New pingback on your post ”%s”' ), $post->post_title ) . "\r\n"; 1057 1057 /* translators: 1: comment author, 2: author IP, 3: author domain */ 1058 1058 $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; … … 1127 1127 { 1128 1128 case 'trackback': 1129 $notify_message = sprintf( __('A new trackback on the post "%s"is waiting for your approval'), $post->post_title ) . "\r\n";1129 $notify_message = sprintf( __('A new trackback on the post ”%s” is waiting for your approval'), $post->post_title ) . "\r\n"; 1130 1130 $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; 1131 1131 $notify_message .= sprintf( __('Website : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; … … 1134 1134 break; 1135 1135 case 'pingback': 1136 $notify_message = sprintf( __('A new pingback on the post "%s"is waiting for your approval'), $post->post_title ) . "\r\n";1136 $notify_message = sprintf( __('A new pingback on the post ”%s” is waiting for your approval'), $post->post_title ) . "\r\n"; 1137 1137 $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; 1138 1138 $notify_message .= sprintf( __('Website : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; … … 1141 1141 break; 1142 1142 default: //Comments 1143 $notify_message = sprintf( __('A new comment on the post "%s"is waiting for your approval'), $post->post_title ) . "\r\n";1143 $notify_message = sprintf( __('A new comment on the post ”%s” is waiting for your approval'), $post->post_title ) . "\r\n"; 1144 1144 $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; 1145 1145 $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; -
trunk/wp-mail.php
r13418 r14070 12 12 13 13 if ( ! apply_filters( 'enable_post_by_email_configuration', true ) ) 14 wp_die( __( 'This action has been disabled by the administrator ' ) );14 wp_die( __( 'This action has been disabled by the administrator.' ) ); 15 15 16 16 /** Allow a plugin to do a complete takeover of Post by Email **/ -
trunk/wp-signup.php
r13733 r14070 84 84 else 85 85 print __( 'domain.' ) . $current_site->domain . $current_site->path; 86 echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' ) . '</p>';86 echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>'; 87 87 } 88 88 … … 131 131 } 132 132 echo '<input name="user_name" type="text" id="user_name" value="'. esc_attr($user_name) .'" maxlength="50" /><br />'; 133 _e( '(Must be at least 4 characters, letters and numbers only.)');134 ?> 135 136 <label for="user_email"><?php _e( 'Email Address:') ?></label>133 _e( '(Must be at least 4 characters, letters and numbers only.)' ); 134 ?> 135 136 <label for="user_email"><?php _e( 'Email Address:' ) ?></label> 137 137 <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?> 138 138 <p class="error"><?php echo $errmsg ?></p> … … 141 141 <?php 142 142 if ( $errmsg = $errors->get_error_message('generic') ) { 143 echo '<p class="error">' .$errmsg.'</p>';143 echo '<p class="error">' . $errmsg . '</p>'; 144 144 } 145 145 do_action( 'signup_extra_fields', $errors ); … … 163 163 $errors = $filtered_results['errors']; 164 164 165 echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds'), $current_site->site_name ) . '</h2>';165 echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), $current_site->site_name ) . '</h2>'; 166 166 167 167 if ( $errors->get_error_code() ) { 168 echo "<p>" . __('There was a problem, please correct the form below and try again.') . "</p>";169 } 170 ?> 171 <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>168 echo '<p>' . __( 'There was a problem, please correct the form below and try again.' ) . '</p>'; 169 } 170 ?> 171 <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> 172 172 173 173 <?php … … 175 175 if ( !empty($blogs) ) { ?> 176 176 <p> 177 <?php _e( 'Sites you are already a member of:') ?>177 <?php _e( 'Sites you are already a member of:' ) ?> 178 178 <ul> 179 179 <?php foreach ( $blogs as $blog ) { … … 184 184 <?php } ?> 185 185 186 <p><?php _e( "If you’re not going to use a great site domain, leave it for a new user. Now have at it!") ?></p>186 <p><?php _e( 'If you’re not going to use a great site domain, leave it for a new user. Now have at it!' ) ?></p> 187 187 <form id="setupform" method="post" action="wp-signup.php"> 188 188 <input type="hidden" name="stage" value="gimmeanotherblog" /> 189 189 <?php do_action( "signup_hidden_fields" ); ?> 190 190 <?php show_blog_form($blogname, $blog_title, $errors); ?> 191 <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Create Site') ?>" /></p>191 <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Create Site' ) ?>" /></p> 192 192 </form> 193 193 <?php … … 209 209 210 210 $public = (int) $_POST['blog_public']; 211 $meta = apply_filters( 'signup_create_blog_meta', array ('lang_id' => 1, 'public' => $public)); // deprecated212 $meta = apply_filters( "add_signup_meta", $meta );211 $meta = apply_filters( 'signup_create_blog_meta', array( 'lang_id' => 1, 'public' => $public ) ); // deprecated 212 $meta = apply_filters( 'add_signup_meta', $meta ); 213 213 214 214 wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid ); … … 219 219 function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $user_email = '', $meta = '') { 220 220 ?> 221 <h2><?php printf( __('The site %s is yours.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>221 <h2><?php printf( __( 'The site %s is yours.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2> 222 222 <p> 223 <?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) ?>223 <?php printf( __( '<a href="http://%1$s">http://%2$s</a> is your new site. <a href="%3$s">Log in</a> as “%4$s” using your existing password.' ), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name ) ?> 224 224 </p> 225 225 <?php 226 do_action( 'signup_finished');226 do_action( 'signup_finished' ); 227 227 } 228 228 … … 248 248 ?> 249 249 250 <h2><?php printf( __( 'Get your own %s account in seconds'), $current_site->site_name ) ?></h2>250 <h2><?php printf( __( 'Get your own %s account in seconds' ), $current_site->site_name ) ?></h2> 251 251 <form id="setupform" method="post" action="wp-signup.php"> 252 252 <input type="hidden" name="stage" value="validate-user-signup" /> … … 295 295 function confirm_user_signup($user_name, $user_email) { 296 296 ?> 297 <h2><?php printf( __('%s is your new username'), $user_name) ?></h2>298 <p><?php _e( 'But, before you can start using your new username, <strong>you must activate it</strong>.') ?></p>299 <p><?php printf(__( 'Check your inbox at <strong>%1$s</strong> and click the link given.'), $user_email) ?></p>300 <p><?php _e( 'If you do not activate your username within two days, you will have to sign up again.'); ?></p>301 <?php 302 do_action( 'signup_finished');297 <h2><?php printf( __( '%s is your new username' ), $user_name) ?></h2> 298 <p><?php _e( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ) ?></p> 299 <p><?php printf(__( 'Check your inbox at <strong>%1$s</strong> and click the link given.' ), $user_email) ?></p> 300 <p><?php _e( 'If you do not activate your username within two days, you will have to sign up again.' ); ?></p> 301 <?php 302 do_action( 'signup_finished' ); 303 303 } 304 304 … … 358 358 function confirm_blog_signup($domain, $path, $blog_title, $user_name = '', $user_email = '', $meta) { 359 359 ?> 360 <h2><?php printf( __('Congratulations! Your new site, %s, is almost ready.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>361 362 <p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.') ?></p>363 <p><?php printf( __('Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.'), $user_email) ?></p>364 <p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.'); ?></p>365 <h2><?php _e( 'Still waiting for your email?'); ?></h2>360 <h2><?php printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2> 361 362 <p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) ?></p> 363 <p><?php printf( __( 'Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.' ), $user_email) ?></p> 364 <p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p> 365 <h2><?php _e( 'Still waiting for your email?' ); ?></h2> 366 366 <p> 367 <?php _e( "If you haven't received your email yet, there are a number of things you can do:") ?>367 <?php _e( 'If you haven’t received your email yet, there are a number of things you can do:' ) ?> 368 368 <ul id="noemail-tips"> 369 <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>370 <li><p><?php _e( 'Check the junk email or spam folder of your email client. Sometime emails wind up there by mistake.') ?></p></li>371 <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>369 <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> 370 <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ) ?></p></li> 371 <li><?php printf( __( 'Have you entered your email correctly? We think it’s %s but if you have entered it incorrectly, you will not receive it.' ), $user_email ) ?></li> 372 372 </ul> 373 373 </p> 374 374 <?php 375 do_action( 'signup_finished');375 do_action( 'signup_finished' ); 376 376 } 377 377 … … 384 384 385 385 if ( is_super_admin() ) 386 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>';386 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>'; 387 387 388 388 $newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null; … … 390 390 $current_user = wp_get_current_user(); 391 391 if ( $active_signup == "none" ) { 392 _e( "Registration has been disabled.");392 _e( 'Registration has been disabled.' ); 393 393 } elseif ( $active_signup == 'blog' && !is_user_logged_in() ) { 394 394 if ( is_ssl() ) … … 397 397 $proto = 'http://'; 398 398 $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode($proto . $_SERVER['HTTP_HOST'] . '/wp-signup.php' )); 399 echo sprintf( __( "You must first <a href=\"%s\">login</a>, and then you can create a new site."), $login_url );399 echo sprintf( __( 'You must first <a href="%s">log in</a>, and then you can create a new site.' ), $login_url ); 400 400 } else { 401 401 $stage = isset( $_POST['stage'] ) ? $_POST['stage'] : 'default'; … … 405 405 validate_user_signup(); 406 406 else 407 _e( "User registration has been disabled.");407 _e( 'User registration has been disabled.' ); 408 408 break; 409 409 case 'validate-blog-signup': … … 411 411 validate_blog_signup(); 412 412 else 413 _e( "Site registration has been disabled.");413 _e( 'Site registration has been disabled.' ); 414 414 break; 415 415 case 'gimmeanotherblog': … … 425 425 signup_user( $newblogname, $user_email ); 426 426 elseif ( is_user_logged_in() == false && ( $active_signup == 'blog' ) ) 427 _e( "I'm sorry. We're not accepting new registrations at this time.");427 _e( 'We are sorry. We are not accepting new registrations at this time.' ); 428 428 else 429 _e( "You're logged in already. No need to register again!");429 _e( 'You are logged in already. No need to register again!' ); 430 430 431 431 if ($newblogname) { … … 435 435 $newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path; 436 436 if ( $active_signup == 'blog' || $active_signup == 'all' ) 437 printf( __("<p><em>The site you were looking for, <strong>%s</strong> doesn't exist but you can create it now!</em></p>"), $newblog );437 printf( __( '<p><em>The site you were looking for, <strong>%s</strong> does not exist, but you can create it now!</em></p>' ), $newblog ); 438 438 else 439 printf( __("<p><em>The site you were looking for, <strong>%s</strong> doesn't exist.</em></p>"), $newblog );439 printf( __( '<p><em>The site you were looking for, <strong>%s</strong>, does not exist.</em></p>' ), $newblog ); 440 440 } 441 441 break;
Note: See TracChangeset
for help on using the changeset viewer.