WordPress.org

Make WordPress Core

Changeset 14070


Ignore:
Timestamp:
04/11/10 10:41:54 (5 years ago)
Author:
dd32
Message:

Tweak new strings for better typography. Props demetris. Fixes #12962

Location:
trunk
Files:
24 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-activate.php

    r13884 r14070  
    6565                <?php 
    6666                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 &#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')); 
    6868                } else { 
    69                     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')); 
     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 &#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')); 
    7070                } 
    7171            } else { 
  • trunk/wp-admin/custom-background.php

    r13856 r14070  
    247247<?php if ( get_background_image() ) : ?> 
    248248<h3><?php _e('Remove Background Image'); ?></h3> 
    249 <p><?php _e('This will remove the background image. You will not be able to retrieve any customizations.') ?></p> 
     249<p><?php _e('This will remove the background image. You will not be able to restore any customizations.') ?></p> 
    250250<form method="post" action=""> 
    251251<?php wp_nonce_field('custom-background'); ?> 
  • trunk/wp-admin/edit-tag-form.php

    r13715 r14070  
    1212 
    1313if ( 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> 
    1515<?php 
    1616    return; 
  • trunk/wp-admin/import/mt.php

    r13807 r14070  
    3737?> 
    3838<div class="narrow"> 
    39 <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> 
     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 &#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> 
    4040 
    4141<?php wp_import_upload_form( add_query_arg('step', 1) ); ?> 
  • trunk/wp-admin/ms-edit.php

    r14020 r14070  
    148148 
    149149        if ( is_array( $_POST['blog'] ) == false ) 
    150             wp_die(  __( "Can't create an empty site." ) ); 
     150            wp_die(  __( 'Can&#8217;t create an empty site.' ) ); 
    151151        $blog = $_POST['blog']; 
    152152        $domain = ''; 
  • trunk/wp-admin/ms-options.php

    r14039 r14070  
    7575                    <input name="dashboard_blog" type="text" id="dashboard_blog" value="<?php echo esc_attr( $blogname ); ?>" class="regular-text" /> 
    7676                    <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 (&#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.' ); ?> 
    7878                </td> 
    7979            </tr> 
     
    8686                    </select> 
    8787                    <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. &#8220;Subscriber&#8221; or &#8220;Contributor&#8221; roles are recommended.' ); ?> 
    8989                </td> 
    9090            </tr> 
     
    114114                    <p><?php _e( 'Disable or enable registration and who or what can be registered. (Default is disabled.)' ); ?></p> 
    115115                    <?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 url you 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>'; 
    117117                    } ?> 
    118118                </td> 
     
    153153                    <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> 
    154154                    <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.' ) ?> 
    156156                </td> 
    157157            </tr> 
     
    162162                    <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> 
    163163                    <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.' ) ?> 
    165165                </td> 
    166166            </tr> 
     
    235235                <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 /> 
    236236                <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 &#8220;Write Post&#8221; page. Make sure you update the allowed upload file types below as well.' ); ?></td> 
    238238            </tr> 
    239239 
  • trunk/wp-admin/ms-sites.php

    r14039 r14070  
    129129                        else 
    130130                            $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' ), 
    135135                            ); 
    136136                        $checked_fields['mature'] = __( 'Mature' ); 
     
    275275                <h3 class="hndle"><span><?php _e( 'Add a new user' ); ?></span></h3> 
    276276                <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 &#8220;Update Options&#8221; to add the user.' ) ?></p> 
    278278                    <table class="form-table"> 
    279279                            <tr> 
     
    552552                                    if ( $current_site->blog_id != $blog['blog_id'] ) { 
    553553                                        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&amp;action2=activateblog&amp;id=' . $blog['blog_id'] . '&amp;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&amp;action2=activateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ) ) . '">' . __( 'Activate' ) . '</a></span>'; 
    555555                                        else 
    556                                             $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>'; 
     556                                            $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>'; 
    557557 
    558558                                        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&amp;action2=unarchiveblog&amp;id=' .  $blog['blog_id'] . '&amp;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&amp;action2=unarchiveblog&amp;id=' .  $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Unarchive' ) . '</a></span>'; 
    560560                                        else 
    561                                             $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>'; 
     561                                            $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>'; 
    562562 
    563563                                        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&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>'; 
     564                                            $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>'; 
    565565                                        else 
    566                                             $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>'; 
    567  
    568                                         $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>'; 
     566                                            $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>'; 
     567 
     568                                        $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>'; 
    569569                                    } 
    570570 
  • trunk/wp-admin/ms-themes.php

    r14039 r14070  
    3030        <?php screen_icon(); ?> 
    3131        <h2><?php _e( 'Network Themes' ) ?></h2> 
    32         <p><?php _e( 'Disable themes network-wide. You can enable themes on a site by site basis.' ) ?></p> 
     32        <p><?php _e( 'Disable themes network-wide. You can enable themes on a site-by-site basis.' ) ?></p> 
    3333        <table class="widefat"> 
    3434            <thead> 
  • trunk/wp-admin/ms-upgrade-network.php

    r13998 r14070  
    1111 
    1212if ( !is_multisite() ) 
    13     wp_die( __('Multisite support is not enabled.') ); 
     13    wp_die( __( 'Multisite support is not enabled.' ) ); 
    1414 
    1515require_once( ABSPATH . WPINC . '/http.php' ); 
    1616 
    17 $title = __('Update Network'); 
     17$title = __( 'Update Network' ); 
    1818$parent_file = 'ms-admin.php'; 
    1919require_once('admin-header.php'); 
    2020 
    2121if ( ! 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.' ) ); 
    2323 
    2424echo '<div class="wrap">'; 
    2525screen_icon(); 
    26 echo '<h2>'.__('Update Network').'</h2>'; 
     26echo '<h2>' . __( 'Update Network' ) . '</h2>'; 
    2727 
    2828$action = isset($_GET['action']) ? $_GET['action'] : 'show'; 
     
    5555        } 
    5656        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&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p> 
     57        ?><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> 
    5858        <script type='text/javascript'> 
    5959        <!-- 
     
    6767    case 'show': 
    6868    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> 
    7070        <p><a class="button" href="ms-upgrade-network.php?action=upgrade"><?php _e("Update Network"); ?></a></p><?php 
    7171        do_action( 'wpmu_upgrade_page' ); 
  • trunk/wp-admin/my-sites.php

    r14039 r14070  
    3232        $updated = true; 
    3333    } 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.' ) );    
    3535    } 
    3636} 
     
    5757    $settings_html = apply_filters( 'myblogs_options', '', 'global' ); 
    5858    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>'; 
    6060        echo $settings_html; 
    61         echo "</td></tr>"; 
     61        echo '</td></tr>'; 
    6262    } 
    6363    reset( $blogs ); 
  • trunk/wp-admin/network.php

    r13999 r14070  
    1818 
    1919if ( 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.' ) ); 
    2121 
    2222// We need to create references to ms global tables to enable Network. 
     
    111111        echo '<div class="error"><p><strong>' . __( 'Error:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</strong></p></div>'; 
    112112        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>'; 
    114114        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>'; 
    116116        echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>'; 
    117117        include( './admin-footer.php' ); 
     
    134134    ?> 
    135135    <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&#8217;ll be on your way to creating a network of WordPress sites. We will create configuration files in the next step.' ); ?></p> 
    137137    <?php 
    138138 
     
    145145        $subdomain_install = false; 
    146146        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>'; 
    148148        else 
    149149            echo '<div class="error inline"><p><strong>' . __( 'Warning!' ) . '</strong> ' . __( 'It looks like the Apache <code>mod_rewrite</code> module is not installed.' ) . '</p>'; 
     
    154154        <h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3> 
    155155        <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> 
    157157        <?php // @todo: Link to an MS readme? ?> 
    158158        <table class="form-table"> 
     
    174174        ?> 
    175175        <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> 
    177177        <table class="form-table"> 
    178178            <tr> 
    179179                <th scope='row'><?php esc_html_e( 'Server Address' ); ?></th> 
    180180                <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 ); ?> 
    182182                </td> 
    183183            </tr> 
     
    190190            <tr> 
    191191                <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> 
    193193            </tr> 
    194194        <?php elseif ( !allow_subdomain_install() ) : ?> 
    195195            <tr> 
    196196                <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> 
    198198            </tr> 
    199199        <?php endif; ?> 
     
    202202                <th scope='row'><?php esc_html_e( 'Server Address' ); ?></th> 
    203203                <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 ); ?> 
    205205                </td> 
    206206            </tr> 
  • trunk/wp-admin/options-discussion.php

    r13750 r14070  
    5353<input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> /> 
    5454<?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.)' ); ?> 
    5656</label> 
    5757<br /> 
     
    161161<td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display') ?></span></legend> 
    162162<?php 
    163     $yesorno = array(0 => __("Don&#8217;t show Avatars"), 1 => __('Show Avatars')); 
     163    $yesorno = array( 0 => __( 'Don&#8217;t show Avatars' ), 1 => __( 'Show Avatars' ) ); 
    164164    foreach ( $yesorno as $key => $value) { 
    165165        $selected = (get_option('show_avatars') == $key) ? 'checked="checked"' : ''; 
  • trunk/wp-admin/options.php

    r13789 r14070  
    133133        foreach ( $options as $option ) { 
    134134            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 ) ); 
    136136 
    137137            $option = trim($option); 
  • trunk/wp-admin/update-core.php

    r13972 r14070  
    132132    } else { 
    133133        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.'); 
    135135        echo '</p></div>'; 
    136136 
     
    175175        $core_update_version = $core_updates[0]->current; 
    176176    ?> 
    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 &#8220;Update Plugins&#8221;.' ); ?></p> 
    179179<form method="post" action="<?php echo $form_action; ?>" name="upgrade-plugins" class="upgrade"> 
    180180<?php wp_nonce_field('upgrade-core'); ?> 
     
    244244 
    245245?> 
    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 &#8220;Update Themes&#8221.' ); ?></p> 
    248248<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> 
    249249<form method="post" action="<?php echo $form_action; ?>" name="upgrade-themes" class="upgrade"> 
  • trunk/wp-includes/author-template.php

    r14028 r14070  
    5353        _deprecated_argument( __FUNCTION__, '2.1' ); 
    5454    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.') ); 
    5656    if ( $deprecated_echo ) 
    5757        echo get_the_author(); 
  • trunk/wp-includes/comment-template.php

    r14067 r14070  
    729729function trackback_url( $deprecated_echo = true ) { 
    730730    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.') ); 
    732732    if ( $deprecated_echo ) 
    733733        echo get_trackback_url(); 
  • trunk/wp-includes/formatting.php

    r13988 r14070  
    23612361            $value = sanitize_email($value); 
    23622362            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.')); 
    23642364            break; 
    23652365 
  • trunk/wp-includes/general-template.php

    r14047 r14070  
    396396        case 'home' : // DEPRECATED 
    397397        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' ) ); 
    399399        case 'url' : 
    400400            $output = home_url(); 
  • trunk/wp-includes/ms-functions.php

    r14055 r14070  
    323323    // Check if the domain has been used already. We should return an error message. 
    324324    if ( domain_exists($domain, $path, $site_id) ) 
    325         return __('error: Blog URL already taken.'); 
     325        return __( 'Error: Blog URL already taken.' ); 
    326326 
    327327    // Need to backup wpdb table names, and create a new wp_blogs entry for new blog. 
     
    330330 
    331331    if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) 
    332         return __('error: problem creating blog entry'); 
     332        return __( 'Error: problem creating blog entry.' ); 
    333333 
    334334    switch_to_blog($blog_id); 
     
    484484 
    485485    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 &#8220;_&#8221;!' ) ); 
    487487 
    488488    // all numeric? 
     
    569569 
    570570    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 &#8220;_&#8221;!' ) ); 
    572572 
    573573    // do not allow users to create a blog that conflicts with a page on the main blog. 
    574574    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.' ) ); 
    576576 
    577577    // all numeric? 
     
    11541154    if ( ($spaceAllowed-$size) < 0 ) { 
    11551155        if ( $echo ) 
    1156             _e( "Sorry, you have used your space allocation. Please delete some files to upload more files." ); //No space left 
     1156            _e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' ); // No space left 
    11571157        return true; 
    11581158    } else { 
  • trunk/wp-includes/ms-load.php

    r13827 r14070  
    175175        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 ) ); 
    176176    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*/ ); 
    178178} 
    179179 
     
    201201    // @todo Update WPMU codex link. 
    202202    $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&#8217;re still stuck with this message, then check that your database contains the following tables:'/*/WP_I18N_STUCK*/ . '</p><ul>'; 
    204204    foreach ( $wpdb->global_tables as $table ) { 
    205205        $msg .= '<li>' . $wpdb->prefix . $table . '</li>'; 
  • trunk/wp-includes/ms-settings.php

    r13998 r14070  
    1313// $base sanity check. 
    1414if ( '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*/ ); 
    1616 
    1717/** Include Multisite initialization functions */ 
  • trunk/wp-includes/pluggable.php

    r13878 r14070  
    10341034 
    10351035    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 &#8220;%s&#8221;' ), $post->post_title ) . "\r\n"; 
    10371037        /* translators: 1: comment author, 2: author IP, 3: author domain */ 
    10381038        $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; 
     
    10451045        $subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title ); 
    10461046    } 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 &#8221;%s&#8221;' ), $post->post_title ) . "\r\n"; 
    10481048        /* translators: 1: website name, 2: author IP, 3: author domain */ 
    10491049        $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; 
     
    10541054        $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title ); 
    10551055    } 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 &#8221;%s&#8221;' ), $post->post_title ) . "\r\n"; 
    10571057        /* translators: 1: comment author, 2: author IP, 3: author domain */ 
    10581058        $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; 
     
    11271127    { 
    11281128        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 &#8221;%s&#8221; is waiting for your approval'), $post->post_title ) . "\r\n"; 
    11301130            $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; 
    11311131            $notify_message .= sprintf( __('Website : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; 
     
    11341134            break; 
    11351135        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 &#8221;%s&#8221; is waiting for your approval'), $post->post_title ) . "\r\n"; 
    11371137            $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; 
    11381138            $notify_message .= sprintf( __('Website : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; 
     
    11411141            break; 
    11421142        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 &#8221;%s&#8221; is waiting for your approval'), $post->post_title ) . "\r\n"; 
    11441144            $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; 
    11451145            $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  
    1212 
    1313if ( ! 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.' ) ); 
    1515 
    1616/** Allow a plugin to do a complete takeover of Post by Email **/ 
  • trunk/wp-signup.php

    r13733 r14070  
    8484        else 
    8585            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>'; 
    8787    } 
    8888 
     
    131131    } 
    132132    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&nbsp;Address:') ?></label> 
     133    _e( '(Must be at least 4 characters, letters and numbers only.)' ); 
     134    ?> 
     135 
     136    <label for="user_email"><?php _e( 'Email&nbsp;Address:' ) ?></label> 
    137137    <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?> 
    138138        <p class="error"><?php echo $errmsg ?></p> 
     
    141141    <?php 
    142142    if ( $errmsg = $errors->get_error_message('generic') ) { 
    143         echo '<p class="error">'.$errmsg.'</p>'; 
     143        echo '<p class="error">' . $errmsg . '</p>'; 
    144144    } 
    145145    do_action( 'signup_extra_fields', $errors ); 
     
    163163    $errors = $filtered_results['errors']; 
    164164 
    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>'; 
    166166 
    167167    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&#8217;s content, but write responsibly!' ), $current_user->display_name ) ?></p> 
    172172 
    173173    <?php 
     
    175175    if ( !empty($blogs) ) { ?> 
    176176        <p> 
    177             <?php _e('Sites you are already a member of:') ?> 
     177            <?php _e( 'Sites you are already a member of:' ) ?> 
    178178            <ul> 
    179179                <?php foreach ( $blogs as $blog ) { 
     
    184184    <?php } ?> 
    185185 
    186     <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> 
     186    <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> 
    187187    <form id="setupform" method="post" action="wp-signup.php"> 
    188188        <input type="hidden" name="stage" value="gimmeanotherblog" /> 
    189189        <?php do_action( "signup_hidden_fields" ); ?> 
    190190        <?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> 
    192192    </form> 
    193193    <?php 
     
    209209 
    210210    $public = (int) $_POST['blog_public']; 
    211     $meta = apply_filters('signup_create_blog_meta', array ('lang_id' => 1, 'public' => $public)); // deprecated 
    212     $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 ); 
    213213 
    214214    wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid ); 
     
    219219function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $user_email = '', $meta = '') { 
    220220    ?> 
    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> 
    222222    <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 &#8220;%4$s&#8221; using your existing password.' ), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name ) ?> 
    224224    </p> 
    225225    <?php 
    226     do_action('signup_finished'); 
     226    do_action( 'signup_finished' ); 
    227227} 
    228228 
     
    248248    ?> 
    249249 
    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> 
    251251    <form id="setupform" method="post" action="wp-signup.php"> 
    252252        <input type="hidden" name="stage" value="validate-user-signup" /> 
     
    295295function confirm_user_signup($user_name, $user_email) { 
    296296    ?> 
    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' ); 
    303303} 
    304304 
     
    358358function confirm_blog_signup($domain, $path, $blog_title, $user_name = '', $user_email = '', $meta) { 
    359359    ?> 
    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> 
    366366    <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&#8217;t received your email yet, there are a number of things you can do:' ) ?> 
    368368        <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&#8217;s %s but if you have entered it incorrectly, you will not receive it.' ), $user_email ) ?></li> 
    372372        </ul> 
    373373    </p> 
    374374    <?php 
    375     do_action('signup_finished'); 
     375    do_action( 'signup_finished' ); 
    376376} 
    377377 
     
    384384 
    385385if ( 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 &#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>'; 
    387387 
    388388$newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null; 
     
    390390$current_user = wp_get_current_user(); 
    391391if ( $active_signup == "none" ) { 
    392     _e( "Registration has been disabled." ); 
     392    _e( 'Registration has been disabled.' ); 
    393393} elseif ( $active_signup == 'blog' && !is_user_logged_in() ) { 
    394394    if ( is_ssl() ) 
     
    397397        $proto = 'http://'; 
    398398    $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 ); 
    400400} else { 
    401401    $stage = isset( $_POST['stage'] ) ?  $_POST['stage'] : 'default'; 
     
    405405                validate_user_signup(); 
    406406            else 
    407                 _e( "User registration has been disabled." ); 
     407                _e( 'User registration has been disabled.' ); 
    408408        break; 
    409409        case 'validate-blog-signup': 
     
    411411                validate_blog_signup(); 
    412412            else 
    413                 _e( "Site registration has been disabled." ); 
     413                _e( 'Site registration has been disabled.' ); 
    414414            break; 
    415415        case 'gimmeanotherblog': 
     
    425425                signup_user( $newblogname, $user_email ); 
    426426            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.' ); 
    428428            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!' ); 
    430430 
    431431            if ($newblogname) { 
     
    435435                    $newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path; 
    436436                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 ); 
    438438                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 ); 
    440440            } 
    441441            break; 
Note: See TracChangeset for help on using the changeset viewer.