WordPress.org

Make WordPress Core

Ticket #8338: wp-r9860-typos-tweaks-apostrophes.diff

File wp-r9860-typos-tweaks-apostrophes.diff, 25.1 KB (added by demetris, 6 years ago)
  • wp-admin/import/blogger.php

     
    198198                $action   = __('The Magic Button'); 
    199199                $posts    = __('Posts'); 
    200200                $comments = __('Comments'); 
    201                 $noscript = __('This feature requires Javascript but it seems to be disabled. Please enable Javascript and then reload this page. Don\'t worry, you can turn it back off when you\'re done.'); 
     201                $noscript = __('This feature requires Javascript but it seems to be disabled. Please enable Javascript and then reload this page. Don’t worry, you can turn it back off when you’re done.'); 
    202202 
    203203                $interval = STATUS_INTERVAL * 1000; 
    204204 
  • wp-admin/import/dotclear.php

     
    713713                echo '<h3>'.__('Preserving Authors').'</h3>'; 
    714714                echo '<p>'.__('Secondly, we have attempted to preserve post authors.  If you are the only author or contributor to your blog, then you are safe.  In most cases, we are successful in this preservation endeavor.  However, if we cannot ascertain the name of the writer due to discrepancies between database tables, we assign it to you, the administrative user.').'</p>'; 
    715715                echo '<h3>'.__('Textile').'</h3>'; 
    716                 echo '<p>'.__('Also, since you\'re coming from DotClear, you probably have been using Textile to format your comments and posts.  If this is the case, we recommend downloading and installing <a href="http://www.huddledmasses.org/category/development/wordpress/textile/">Textile for WordPress</a>.  Trust me... You\'ll want it.').'</p>'; 
     716                echo '<p>'.__('Also, since you&#8217;re coming from DotClear, you probably have been using Textile to format your comments and posts.  If this is the case, we recommend downloading and installing <a href="http://www.huddledmasses.org/category/development/wordpress/textile/">Textile for WordPress</a>.  Trust us... You&#8217;ll want it.').'</p>'; 
    717717                echo '<h3>'.__('WordPress Resources').'</h3>'; 
    718718                echo '<p>'.__('Finally, there are numerous WordPress resources around the internet.  Some of them are:').'</p>'; 
    719719                echo '<ul>'; 
  • wp-admin/import/mt.php

     
    4848<input type="submit" class="button" value="<?php echo attribute_escape(__('Import mt-export.txt')); ?>" /> 
    4949</p> 
    5050</form> 
    51 <p><?php _e('The importer is smart enough not to import duplicates, so you can run this multiple times without worry if&#8212;for whatever reason&#8212;it doesn\'t finish. If you get an <strong>out of memory</strong> error try splitting up the import file into pieces.'); ?> </p> 
     51<p><?php _e('The importer is smart enough not to import duplicates, so you can run this multiple times without worry if&#8212;for whatever reason&#8212;it doesn&#8217;t finish. If you get an <strong>out of memory</strong> error try splitting up the import file into pieces.'); ?> </p> 
    5252</div> 
    5353<?php 
    5454                $this->footer(); 
     
    192192?> 
    193193<div class="wrap"> 
    194194<h2><?php _e('Assign Authors'); ?></h2> 
    195 <p><?php _e('To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as admin\'s entries.'); ?></p> 
     195<p><?php _e('To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as admin&#8217;s entries.'); ?></p> 
    196196<p><?php _e('Below, you can see the names of the authors of the MovableType posts in <em>italics</em>. For each of these names, you can either pick an author in your WordPress installation from the menu, or enter a name for the author in the textbox.'); ?></p> 
    197197<p><?php _e('If a new user is created by WordPress, a password will be randomly generated. Manually change the user\'s details if necessary.'); ?></p> 
    198198        <?php 
  • wp-admin/import/textpattern.php

     
    585585                echo '<h3>'.__('Preserving Authors').'</h3>'; 
    586586                echo '<p>'.__('Secondly, we have attempted to preserve post authors.  If you are the only author or contributor to your blog, then you are safe.  In most cases, we are successful in this preservation endeavor.  However, if we cannot ascertain the name of the writer due to discrepancies between database tables, we assign it to you, the administrative user.').'</p>'; 
    587587                echo '<h3>'.__('Textile').'</h3>'; 
    588                 echo '<p>'.__('Also, since you&#8217;re coming from Textpattern, you probably have been using Textile to format your comments and posts.  If this is the case, we recommend downloading and installing <a href="http://www.huddledmasses.org/category/development/wordpress/textile/">Textile for WordPress</a>.  Trust me... You&#8217;ll want it.').'</p>'; 
     588                echo '<p>'.__('Also, since you&#8217;re coming from Textpattern, you probably have been using Textile to format your comments and posts.  If this is the case, we recommend downloading and installing <a href="http://www.huddledmasses.org/category/development/wordpress/textile/">Textile for WordPress</a>.  Trust us... You&#8217;ll want it.').'</p>'; 
    589589                echo '<h3>'.__('WordPress Resources').'</h3>'; 
    590590                echo '<p>'.__('Finally, there are numerous WordPress resources around the internet.  Some of them are:').'</p>'; 
    591591                echo '<ul>'; 
  • wp-admin/import/wordpress.php

     
    201201<p><?php _e('To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as <code>admin</code>s entries.'); ?></p> 
    202202<?php 
    203203        if ( $this->allow_create_users() ) { 
    204                 echo '<p>'.__('If a new user is created by WordPress, a password will be randomly generated. Manually change the user\'s details if necessary.')."</p>\n"; 
     204                echo '<p>'.__('If a new user is created by WordPress, a password will be randomly generated. Manually change the user&#8217;s details if necessary.')."</p>\n"; 
    205205        } 
    206206 
    207207 
  • wp-admin/import/wp-cat2tag.php

     
    247247                        $cat_id = (int) $cat_id; 
    248248 
    249249                        if ( ! $this->_category_exists($cat_id) ) { 
    250                                 echo '<li>' . sprintf( __('Category %s doesn\'t exist!'),  $cat_id ) . "</li>\n"; 
     250                                echo '<li>' . sprintf( __('Category %s doesn&#8217;t exist!'),  $cat_id ) . "</li>\n"; 
    251251                        } else { 
    252252                                $category =& get_category($cat_id); 
    253253                                echo '<li>' . sprintf(__('Converting category <strong>%s</strong> ... '),  $category->name); 
     
    406406                                echo __('Converted successfully.') . "</li>\n"; 
    407407 
    408408                        } else { 
    409                                 printf( '<li>' . __('Tag #%s doesn\'t exist!') . "</li>\n",  $tag_id ); 
     409                                printf( '<li>' . __('Tag #%s doesn&#8217;t exist!') . "</li>\n",  $tag_id ); 
    410410                        } 
    411411                } 
    412412 
  • wp-admin/includes/dashboard.php

     
    388388 
    389389<?php 
    390390        } else { 
    391                 _e('There are no drafts at the moment'); 
     391                _e('There are no drafts at the moment.'); 
    392392        } 
    393393} 
    394394 
  • wp-admin/includes/plugin-install.php

     
    134134        </div> 
    135135         
    136136        <h4><?php _e('Install a plugin in .zip format') ?></h4> 
    137         <p><?php _e('If you have a plugin in a .zip format, You may install it by uploading it here.') ?></p> 
     137        <p><?php _e('If you have a plugin in .zip format, you may install it by uploading it here.') ?></p> 
    138138        <form method="post" enctype="multipart/form-data" action="<?php echo admin_url('plugin-install.php?tab=upload') ?>"> 
    139139                <?php wp_nonce_field( 'plugin-upload') ?> 
    140140                <input type="file" name="pluginzip" /> 
  • wp-admin/install.php

     
    5757          display_header(); 
    5858?> 
    5959<h1><?php _e('Welcome'); ?></h1> 
    60 <p><?php printf(__('Welcome to the famous five minute WordPress installation process! You may want to browse the <a href="%s">ReadMe documentation</a> at your leisure.  Otherwise, just fill in the information below and you\'ll be on your way to using the most extendable and powerful personal publishing platform in the world.'), '../readme.html'); ?></p> 
     60<p><?php printf(__('Welcome to the famous five minute WordPress installation process! You may want to browse the <a href="%s">ReadMe documentation</a> at your leisure.  Otherwise, just fill in the information below and you&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.'), '../readme.html'); ?></p> 
    6161<!--<h2 class="step"><a href="install.php?step=1"><?php _e('First Step'); ?></a></h2>--> 
    6262 
    6363<h1><?php _e('Information needed'); ?></h1> 
  • wp-admin/options-discussion.php

     
    2929<td><fieldset><legend class="hidden"><?php _e('Default article settings') ?></legend> 
    3030<label for="default_pingback_flag"> 
    3131<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> /> 
    32 <?php _e('Attempt to notify any blogs linked to from the article (slows down posting.)') ?></label> 
     32<?php _e('Attempt to notify any blogs linked to from the article (slows down posting)') ?></label> 
    3333<br /> 
    3434<label for="default_ping_status"> 
    3535<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> /> 
    36 <?php _e('Allow link notifications from other blogs (pingbacks and trackbacks.)') ?></label> 
     36<?php _e('Allow link notifications from other blogs (pingbacks and trackbacks)') ?></label> 
    3737<br /> 
    3838<label for="default_comment_status"> 
    3939<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> /> 
     
    128128<td><fieldset><legend class="hidden"><?php _e('Comment Moderation') ?></legend> 
    129129<p><label for="comment_max_links"><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" value="' . get_option('comment_max_links'). '" class="small-text" />' ) ?></label></p> 
    130130 
    131 <p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></label></p> 
     131<p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so <kbd>press</kbd> will match <kbd>WordPress</kbd>.') ?></label></p> 
    132132<p> 
    133133<textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php form_option('moderation_keys'); ?></textarea> 
    134134</p> 
     
    137137<tr valign="top"> 
    138138<th scope="row"><?php _e('Comment Blacklist') ?></th> 
    139139<td><fieldset><legend class="hidden"><?php _e('Comment Blacklist') ?></legend> 
    140 <p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></label></p> 
     140<p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so <kbd>press</kbd> will match <kbd>WordPress</kbd>.') ?></label></p> 
    141141<p> 
    142142<textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php form_option('blacklist_keys'); ?></textarea> 
    143143</p> 
  • wp-admin/options-writing.php

     
    121121 
    122122<?php else : ?> 
    123123 
    124         <p><?php printf(__('WordPress is not notifying any <a href="http://codex.wordpress.org/Update_Services">Update Services</a> because of your blog\'s <a href="%s">privacy settings</a>.'), 'options-privacy.php'); ?></p> 
     124        <p><?php printf(__('WordPress is not notifying any <a href="http://codex.wordpress.org/Update_Services">Update Services</a> because of your blog&#8217;s <a href="%s">privacy settings</a>.'), 'options-privacy.php'); ?></p> 
    125125 
    126126<?php endif; ?> 
    127127 
  • wp-admin/plugins.php

     
    350350<?php print_plugins_table($active_plugins, 'active') ?> 
    351351</form> 
    352352 
    353 <p><?php printf(__('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), WP_PLUGIN_DIR); ?></p> 
     353<p><?php printf(__('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename its file or directory in <code>%s</code> and it will be automatically deactivated.'), WP_PLUGIN_DIR); ?></p> 
    354354<?php endif; ?> 
    355355 
    356356<?php if ( ! empty($recent_plugins) ) : ?> 
    357357<h3 id="recent-plugins"><?php _e('Recently Active Plugins') ?></h3> 
    358 <p><?php _e('The following plugins were recently active. When a plugin has been inactive for more than 7 days it will be moved to the Inactive plugin list.') ?></p> 
     358<p><?php _e('The following plugins were recently active. Plugins inactive for more than 7 days are moved to Inactive Plugins.') ?></p> 
    359359<form method="post" action="<?php echo admin_url('plugins.php') ?>"> 
    360360<?php wp_nonce_field('bulk-manage-plugins') ?> 
    361361 
     
    385385<?php endif; ?> 
    386386 
    387387<h2><?php _e('Get More Plugins'); ?></h2> 
    388 <p><?php _e('You can find additional plugins for your site by using the new <a href="plugin-install.php">Plugin Browser/Installer</a> functionality, Or by browsing the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> directly and installing manually.'); ?></p> 
     388<p><?php _e('You can find additional plugins for your site by using the new <a href="plugin-install.php">Plugin Browser/Installer</a>, or by browsing the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> directly and installing manually.'); ?></p> 
    389389<p><?php printf(__('To <em>manually</em> install a plugin you generally just need to upload the plugin file into your <code>%s</code> directory.'), WP_PLUGIN_DIR); ?></p> 
    390390<p><?php _e('Once a plugin has been installed, you may activate it here.'); ?></p> 
    391391 
  • wp-admin/update-core.php

     
    9494 
    9595        if ( !isset($updates[0]->response) || 'latest' == $updates[0]->response ) { 
    9696                echo '<h3>'; 
    97                 _e('You have the latest version of WordPress. You do not need to upgrade'); 
     97                _e('You have the latest version of WordPress. You do not need to upgrade.'); 
    9898                echo '</h3>'; 
    9999        } else { 
    100100                echo '<div class="updated fade"><p>'; 
     
    102102                echo '</p></div>'; 
    103103         
    104104                echo '<h3 class="response">'; 
    105                 _e( 'There is a new version of WordPress available for upgrade' ); 
     105                _e( 'There is a new version of WordPress available for upgrade!' ); 
    106106                echo '</h3>'; 
    107107        } 
    108108 
  • wp-admin/users.php

     
    210210                        $messages[] = '<div id="message" class="updated fade"><p>' . __('Changed roles.') . '</p></div>'; 
    211211                        break; 
    212212                case 'err_admin_role': 
    213                         $messages[] = '<div id="message" class="error"><p>' . __("The current user's role must have user editing capabilities.") . '</p></div>'; 
     213                        $messages[] = '<div id="message" class="error"><p>' . __("The current user&#8217;s role must have user editing capabilities.") . '</p></div>'; 
    214214                        $messages[] = '<div id="message" class="updated fade"><p>' . __('Other user roles have been changed.') . '</p></div>'; 
    215215                        break; 
    216216                case 'err_admin_del': 
  • wp-includes/author-template.php

     
    251251 */ 
    252252function the_author_link() { 
    253253        if (get_the_author_url()) { 
    254                 echo '<a href="' . get_the_author_url() . '" title="' . sprintf(__("Visit %s's website"), get_the_author()) . '" rel="external">' . get_the_author() . '</a>'; 
     254                echo '<a href="' . get_the_author_url() . '" title="' . sprintf(__("Visit %s&#8217;s website"), get_the_author()) . '" rel="external">' . get_the_author() . '</a>'; 
    255255        } else { 
    256256                the_author(); 
    257257        } 
  • wp-includes/comment.php

     
    408408        $dupe .= ") AND comment_content = '$comment_content' LIMIT 1"; 
    409409        if ( $wpdb->get_var($dupe) ) { 
    410410                if ( defined('DOING_AJAX') ) 
    411                         die( __('Duplicate comment detected; it looks as though you\'ve already said that!') ); 
     411                        die( __('Duplicate comment detected; it looks as though you&#8217;ve already said that!') ); 
    412412 
    413                 wp_die( __('Duplicate comment detected; it looks as though you\'ve already said that!') ); 
     413                wp_die( __('Duplicate comment detected; it looks as though you&#8217;ve already said that!') ); 
    414414        } 
    415415 
    416416        do_action( 'check_comment_flood', $comment_author_IP, $comment_author_email, $comment_date_gmt ); 
  • wp-includes/script-loader.php

     
    233233                        'add' => __('Add'), 
    234234                        'edit' => __('Edit'), 
    235235                        'cancel' => __('Cancel'), 
    236                         'lameReminder' => __('Remember to click the "Save Changes" button at the bottom of the Current Widgets column after you\'re all done!'), 
    237                         'lamerReminder' => __("You're about to leave without having saved your changes!") 
     236                        'lameReminder' => __('Remember to click the "Save Changes" button at the bottom of the Current Widgets column after you&#8217;re all done!'), 
     237                        'lamerReminder' => __("You&#8217;re about to leave without having saved your changes!") 
    238238                )); 
    239239 
    240240                $scripts->add( 'word-count', '/wp-admin/js/word-count.js', array( 'jquery' ), '20080423' ); 
  • wp-includes/widgets.php

     
    19121912        if ( !is_blog_installed() ) 
    19131913                return; 
    19141914 
    1915         $widget_ops = array('classname' => 'widget_pages', 'description' => __( "Your blog's WordPress Pages") ); 
     1915        $widget_ops = array('classname' => 'widget_pages', 'description' => __( "Your blog&#8217;s WordPress Pages") ); 
    19161916        wp_register_sidebar_widget('pages', __('Pages'), 'wp_widget_pages', $widget_ops); 
    19171917        wp_register_widget_control('pages', __('Pages'), 'wp_widget_pages_control' ); 
    19181918 
    1919         $widget_ops = array('classname' => 'widget_calendar', 'description' => __( "A calendar of your blog's posts") ); 
     1919        $widget_ops = array('classname' => 'widget_calendar', 'description' => __( "A calendar of your blog&#8217;s posts") ); 
    19201920        wp_register_sidebar_widget('calendar', __('Calendar'), 'wp_widget_calendar', $widget_ops); 
    19211921        wp_register_widget_control('calendar', __('Calendar'), 'wp_widget_calendar_control' ); 
    19221922 
    1923         $widget_ops = array('classname' => 'widget_archive', 'description' => __( "A monthly archive of your blog's posts") ); 
     1923        $widget_ops = array('classname' => 'widget_archive', 'description' => __( "A monthly archive of your blog&#8217;s posts") ); 
    19241924        wp_register_sidebar_widget('archives', __('Archives'), 'wp_widget_archives', $widget_ops); 
    19251925        wp_register_widget_control('archives', __('Archives'), 'wp_widget_archives_control' ); 
    19261926 
  • wp-includes/wp-db.php

     
    319319                if (!$this->dbh) { 
    320320                        $this->bail(sprintf(/*WP_I18N_DB_CONN_ERROR*/" 
    321321<h1>Error establishing a database connection</h1> 
    322 <p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>%s</code>. This could mean your host's database server is down.</p> 
     322<p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can&#8217;t contact the database server at <code>%s</code>. This could mean your host&#8217;s database server is down.</p> 
    323323<ul> 
    324324        <li>Are you sure you have the correct username and password?</li> 
    325325        <li>Are you sure that you have typed the correct hostname?</li> 
     
    412412<li>Does the user <code>%2$s</code> have permission to use the <code>%1$s</code> database?</li> 
    413413<li>On some systems the name of your database is prefixed with your username, so it would be like username_wordpress. Could that be the problem?</li> 
    414414</ul> 
    415 <p>If you don\'t know how to setup a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="http://wordpress.org/support/">WordPress Support Forums</a>.</p>'/*/WP_I18N_DB_SELECT_DB*/, $db, DB_USER)); 
     415<p>If you don&#8217;t know how to setup a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="http://wordpress.org/support/">WordPress Support Forums</a>.</p>'/*/WP_I18N_DB_SELECT_DB*/, $db, DB_USER)); 
    416416                        return; 
    417417                } 
    418418        } 
  • xmlrpc.php

     
    32223222                        } 
    32233223                } else { 
    32243224                        // TODO: Attempt to extract a post ID from the given URL 
    3225                         return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.')); 
     3225                        return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.')); 
    32263226                } 
    32273227                $post_ID = (int) $post_ID; 
    32283228 
     
    32323232                $post = get_post($post_ID); 
    32333233 
    32343234                if ( !$post ) // Post_ID not found 
    3235                         return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.')); 
     3235                        return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.')); 
    32363236 
    32373237                if ( $post_ID == url_to_postid($pagelinkedfrom) ) 
    32383238                        return new IXR_Error(0, __('The source URL and the target URL cannot both point to the same resource.')); 
    32393239 
    32403240                // Check if pings are on 
    32413241                if ( !pings_open($post) ) 
    3242                         return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.')); 
     3242                        return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.')); 
    32433243 
    32443244                // Let's check that the remote site didn't already pingback this entry 
    32453245                $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom) ); 
     
    33473347                $post_ID = url_to_postid($url); 
    33483348                if (!$post_ID) { 
    33493349                        // We aren't sure that the resource is available and/or pingback enabled 
    3350                         return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.')); 
     3350                        return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.')); 
    33513351                } 
    33523352 
    33533353                $actual_post = wp_get_single_post($post_ID, ARRAY_A);