WordPress.org
Get WordPress

Make WordPress Core

Ticket #2666: 2666.diff

File 2666.diff, 26.9 KB (added by Nazgul, 18 years ago)

  • wp-admin/edit-comments.php

     
    4545  <input type="text" name="s" value="<?php if (isset($_GET['s'])) echo wp_specialchars($_GET['s'], 1); ?>" size="17" />
    4646  <input type="submit" name="submit" value="<?php _e('Search') ?>"  /> 
    4747  <input type="hidden" name="mode" value="<?php echo $mode; ?>" />
    48   <?php _e('(Searches within comment text, e-mail, URI, and IP address.)') ?>
     48  <?php _e('(Searches within comment text, e-mail, URL, and IP address.)') ?>
    4949  </fieldset>
    5050</form>
    5151<p><a href="?mode=view"><?php _e('View Mode') ?></a> | <a href="?mode=edit"><?php _e('Mass Edit Mode') ?></a></p>

  • wp-admin/edit-form-advanced.php

     
    191191
    192192<fieldset class="dbx-box">
    193193<h3 class="dbx-handle"><?php _e('Trackbacks') ?></h3>
    194 <div class="dbx-content"><?php _e('Send trackbacks to'); ?>: <?php echo $form_trackback; ?> (<?php _e('Separate multiple URIs with spaces'); ?>)
     194<div class="dbx-content"><?php _e('Send trackbacks to'); ?>: <?php echo $form_trackback; ?> (<?php _e('Separate multiple <abbr title="Universal Resource Locator">URL</abbr>s with spaces'); ?>)
    195195<?php
    196196if ( ! empty($pings) )
    197197        echo $pings;

  • wp-admin/edit-form-comment.php

     
    3030    </div>
    3131</fieldset>
    3232<fieldset id="uridiv">
    33         <legend><label for="URL"><?php _e('URI:') ?></label></legend>
     33        <legend><label for="URL"><?php _e('URL:') ?></label></legend>
    3434                <div>
    3535                  <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="35" value="<?php echo $comment->comment_author_url ?>" tabindex="3" id="URL" />
    3636    </div>

  • wp-admin/edit-form.php

     
    5151
    5252<input type="hidden" name="post_pingback" value="<?php echo get_option('default_pingback_flag') ?>" id="post_pingback" />
    5353
    54 <p><label for="trackback"> <?php printf(__('<a href="%s" title="Help on trackbacks"><strong>TrackBack</strong> a <abbr title="Universal Resource Identifier">URI</abbr></a>:</label> (Separate multiple <abbr title="Universal Resource Identifier">URI</abbr>s with spaces.)<br />'), 'http://wordpress.org/docs/reference/post/#trackback') ?>
     54<p><label for="trackback"> <?php printf(__('<a href="%s" title="Help on trackbacks"><strong>TrackBack</strong> a <abbr title="Universal Resource Locator">URL</abbr></a>:</label> (Separate multiple <abbr title="Universal Resource Locator">URL</abbr>s with spaces.)<br />'), 'http://wordpress.org/docs/reference/post/#trackback') ?>
    5555        <input type="text" name="trackback_url" style="width: 360px" id="trackback" tabindex="7" /></p>
    5656
    5757<p class="submit"><input name="saveasdraft" type="submit" id="saveasdraft" tabindex="9" value="<?php _e('Save as Draft') ?>" />

  • wp-admin/edit-link-form.php

     
    7979
    8080<table class="editform" width="100%" cellspacing="2" cellpadding="5">
    8181<tr>
    82 <th width="20%" scope="row" valign="top"><label for="link_url"><?php _e('URI:') ?></label></th>
     82<th width="20%" scope="row" valign="top"><label for="link_url"><?php _e('URL:') ?></label></th>
    8383<td width="80%"><input type="text" name="link_url" value="<?php echo $link->link_url; ?>" style="width: 95%" /></td>
    8484</tr>
    8585<tr>
    … …  
    216216<div class="dbx-content">
    217217<table class="editform" width="100%" cellspacing="2" cellpadding="5">
    218218        <tr>
    219                 <th width="20%" scope="row"><?php _e('Image URI:') ?></th>
     219                <th width="20%" scope="row"><?php _e('Image URL:') ?></th>
    220220                <td width="80%"><input type="text" name="link_image" size="50" value="<?php echo $link->link_image; ?>" style="width: 95%" /></td>
    221221        </tr>
    222222        <tr>
    223                 <th scope="row"><?php _e('RSS URI:') ?> </th>
     223                <th scope="row"><?php _e('RSS URL:') ?> </th>
    224224                <td><input name="link_rss" type="text" id="rss_uri" value="<?php echo $link->link_rss; ?>" size="50" style="width: 95%" /></td>
    225225        </tr>
    226226        <tr>

  • wp-admin/link-manager.php

     
    104104<select name="order_by">
    105105<option value="order_id" <?php if ($order_by == 'order_id') echo " selected='selected'";?>><?php _e('Bookmark ID') ?></option>
    106106<option value="order_name" <?php if ($order_by == 'order_name') echo " selected='selected'";?>><?php _e('Name') ?></option>
    107 <option value="order_url" <?php if ($order_by == 'order_url') echo " selected='selected'";?>><?php _e('URI') ?></option>
     107<option value="order_url" <?php if ($order_by == 'order_url') echo " selected='selected'";?>><?php _e('URL') ?></option>
    108108</select>
    109109<input type="submit" name="action" value="<?php _e('Update &raquo;') ?>" />
    110110</form>
    … …  
    119119        <thead>
    120120        <tr>
    121121                <th width="15%" style="text-align: left"><?php _e('Name') ?></th>
    122                 <th style="text-align: left"><?php _e('URI') ?></th>
     122                <th style="text-align: left"><?php _e('URL') ?></th>
    123123                <th style="text-align: left"><?php _e('Categories') ?></th>
    124124                <th><?php _e('rel') ?></th>
    125125                <th><?php _e('Visible') ?></th>

  • wp-admin/options-discussion.php

     
    7373<legend><?php _e('Comment Moderation') ?></legend>
    7474<p><?php printf(__('Hold a comment in the queue if it contains more than %s links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_settings('comment_max_links'). '" />' ) ?></p>
    7575
    76 <p><?php _e('When a comment contains any of these words in its content, name, URI, e-mail, or IP, hold it in the moderation queue: (Separate multiple words with new lines.) <a href="http://codex.wordpress.org/Spam_Words">Common spam words</a>.') ?></p>
     76<p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, hold it in the moderation queue: (Separate multiple words with new lines.) <a href="http://codex.wordpress.org/Spam_Words">Common spam words</a>.') ?></p>
    7777<p>
    7878<textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea>
    7979</p>

  • wp-admin/options-general.php

     
    2323<?php _e('In a few words, explain what this weblog is about.') ?></td>
    2424</tr>
    2525<tr valign="top">
    26 <th scope="row"><?php _e('WordPress address (URI):') ?></th>
     26<th scope="row"><?php _e('WordPress address (URL):') ?></th>
    2727<td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>" size="40" class="code" /></td>
    2828</tr>
    2929<tr valign="top">
    30 <th scope="row"><?php _e('Blog address (URI):') ?></th>
     30<th scope="row"><?php _e('Blog address (URL):') ?></th>
    3131<td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>" size="40" class="code" /><br /><?php _e('If you want your blog homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different than the directory</a> you installed WordPress in, enter that address here.'); ?></td>
    3232</tr>
    3333<tr valign="top">

  • wp-admin/options-permalink.php

     
    102102
    103103<div class="wrap">
    104104  <h2><?php _e('Customize Permalink Structure') ?></h2>
    105   <p><?php _e('By default WordPress uses web URIs which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URI structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
     105  <p><?php _e('By default WordPress uses web <abbr title="Universal Resource Locator">URL</abbr>s which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
    106106
    107107<?php
    108108$prefix = '';
    … …  
    152152
    153153<h3><?php _e('Optional'); ?></h3>
    154154<?php if ($is_apache) : ?>
    155         <p><?php _e('If you like, you may enter a custom prefix for your category URIs here. For example, <code>/taxonomy/tags</code> would make your category links like <code>http://example.org/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
     155        <p><?php _e('If you like, you may enter a custom prefix for your category <abbr title="Universal Resource Locator">URL</abbr>s here. For example, <code>/taxonomy/tags</code> would make your category links like <code>http://example.org/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
    156156<?php else : ?>
    157         <p><?php _e('If you like, you may enter a custom prefix for your category URIs here. For example, <code>/index.php/taxonomy/tags</code> would make your category links like <code>http://example.org/index.php/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
     157        <p><?php _e('If you like, you may enter a custom prefix for your category <abbr title="Universal Resource Locator">URL</abbr>s here. For example, <code>/index.php/taxonomy/tags</code> would make your category links like <code>http://example.org/index.php/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
    158158<?php endif; ?>
    159159        <p>
    160160  <?php _e('Category base'); ?>: <input name="category_base" type="text" class="code"  value="<?php echo $category_base; ?>" size="30" />

  • wp-admin/options-writing.php

     
    9696
    9797<fieldset class="options">
    9898<legend><?php _e('Update Services') ?></legend>
    99 <p><?php _e('When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="http://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service URIs with line breaks.') ?></p>
     99<p><?php _e('When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="http://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service <abbr title="Universal Resource Locator">URL</abbr>s with line breaks.') ?></p>
    100100
    101101<textarea name="ping_sites" id="ping_sites" style="width: 98%;" rows="3" cols="50"><?php form_option('ping_sites'); ?></textarea>
    102102</fieldset>

  • wp-content/themes/classic/comments-popup.php

     
    2424<p><a href="<?php echo get_settings('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><?php _e("<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on this post."); ?></a></p>
    2525
    2626<?php if ('open' == $post->ping_status) { ?>
    27 <p><?php _e("The <acronym title=\"Uniform Resource Identifier\">URI</acronym> to TrackBack this entry is:"); ?> <em><?php trackback_url() ?></em></p>
     27<p><?php _e("The <abbr title=\"Universal Resource Locator\">URL</abbr> to TrackBack this entry is:"); ?> <em><?php trackback_url() ?></em></p>
    2828<?php } ?>
    2929
    3030<?php
    … …  
    7171
    7272        <p>
    7373          <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
    74            <label for="url"><?php _e("<acronym title=\"Uniform Resource Identifier\">URI</acronym>"); ?></label>
     74           <label for="url"><?php _e("<abbr title=\"Universal Resource Locator\">URL</abbr>"); ?></label>
    7575        </p>
    7676
    7777        <p>

  • wp-content/themes/classic/comments.php

     
    2727
    2828<p><?php comments_rss_link(__('<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.')); ?>
    2929<?php if ( pings_open() ) : ?>
    30         <a href="<?php trackback_url() ?>" rel="trackback"><?php _e('TrackBack <abbr title="Uniform Resource Identifier">URI</abbr>'); ?></a>
     30        <a href="<?php trackback_url() ?>" rel="trackback"><?php _e('TrackBack <abbr title="Universal Resource Locator">URL</abbr>'); ?></a>
    3131<?php endif; ?>
    3232</p>
    3333

  • wp-content/themes/default/comments-popup.php

     
    2424<p><a href="<?php echo get_settings('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.</a></p>
    2525
    2626<?php if ('open' == $post->ping_status) { ?>
    27 <p>The <acronym title="Uniform Resource Identifier">URI</acronym> to TrackBack this entry is: <em><?php trackback_url() ?></em></p>
     27<p>The <abbr title="Universal Resource Locator">URL</abbr> to TrackBack this entry is: <em><?php trackback_url() ?></em></p>
    2828<?php } ?>
    2929
    3030<?php
    … …  
    7171
    7272        <p>
    7373          <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
    74            <label for="url"><acronym title="Uniform Resource Identifier">URI</acronym></label>
     74           <label for="url"><abbr title="Universal Resource Locator">URL</abbr></label>
    7575        </p>
    7676
    7777        <p>

  • wp-includes/comment.php

     
    580580                        $pingback_href_end = @strpos($contents, $quote, $pingback_href_start);
    581581                        $pingback_server_url_len = $pingback_href_end - $pingback_href_start;
    582582                        $pingback_server_url = substr($contents, $pingback_href_start, $pingback_server_url_len);
    583                         // We may find rel="pingback" but an incomplete pingback URI
     583                        // We may find rel="pingback" but an incomplete pingback URL
    584584                        if ($pingback_server_url_len > 0) {
    585585                                // We got it!
    586586                                return $pingback_server_url;

  • wp-includes/link-template.php

     
    398398                                $qstr = preg_replace("#/*" . $index . "/*#", '/', $qstr);
    399399                        } else {
    400400                                // If using path info style permalinks, make sure the index is in
    401                                 // the URI.
     401                                // the URL.
    402402                                if ( strpos($qstr, $index) === false )
    403403                                        $qstr = '/' . $index . $qstr;
    404404                        }

  • wp-includes/pluggable.php

     
    364364                $notify_message  = sprintf( __('New comment on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
    365365                $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    366366                $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";
    367                 $notify_message .= sprintf( __('URI    : %s'), $comment->comment_author_url ) . "\r\n";
     367                $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
    368368                $notify_message .= sprintf( __('Whois  : http://ws.arin.net/cgi-bin/whois.pl?queryinput=%s'), $comment->comment_author_IP ) . "\r\n";
    369369                $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
    370370                $notify_message .= __('You can see all comments on this post here: ') . "\r\n";
    … …  
    372372        } elseif ('trackback' == $comment_type) {
    373373                $notify_message  = sprintf( __('New trackback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
    374374                $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    375                 $notify_message .= sprintf( __('URI    : %s'), $comment->comment_author_url ) . "\r\n";
     375                $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
    376376                $notify_message .= __('Excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
    377377                $notify_message .= __('You can see all trackbacks on this post here: ') . "\r\n";
    378378                $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title );
    379379        } elseif ('pingback' == $comment_type) {
    380380                $notify_message  = sprintf( __('New pingback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
    381381                $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    382                 $notify_message .= sprintf( __('URI    : %s'), $comment->comment_author_url ) . "\r\n";
     382                $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
    383383                $notify_message .= __('Excerpt: ') . "\r\n" . sprintf('[...] %s [...]', $comment->comment_content ) . "\r\n\r\n";
    384384                $notify_message .= __('You can see all pingbacks on this post here: ') . "\r\n";
    385385                $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title );
    … …  
    439439        $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
    440440        $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    441441        $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";
    442         $notify_message .= sprintf( __('URI    : %s'), $comment->comment_author_url ) . "\r\n";
     442        $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
    443443        $notify_message .= sprintf( __('Whois  : http://ws.arin.net/cgi-bin/whois.pl?queryinput=%s'), $comment->comment_author_IP ) . "\r\n";
    444444        $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
    445445        $notify_message .= sprintf( __('To approve this comment, visit: %s'),  get_settings('siteurl').'/wp-admin/comment.php?action=mailapprovecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";

  • wp-includes/post.php

     
    799799// Trackback and ping functions
    800800//
    801801
    802 function add_ping($post_id, $uri) { // Add a URI to those already pung
     802function add_ping($post_id, $uri) { // Add a URL to those already pung
    803803        global $wpdb;
    804804        $pung = $wpdb->get_var("SELECT pinged FROM $wpdb->posts WHERE ID = $post_id");
    805805        $pung = trim($pung);
    … …  
    829829        return $pung;
    830830}
    831831
    832 function get_pung($post_id) { // Get URIs already pung for a post
     832function get_pung($post_id) { // Get URLs already pung for a post
    833833        global $wpdb;
    834834        $pung = $wpdb->get_var("SELECT pinged FROM $wpdb->posts WHERE ID = $post_id");
    835835        $pung = trim($pung);
    … …  
    838838        return $pung;
    839839}
    840840
    841 function get_to_ping($post_id) { // Get any URIs in the todo list
     841function get_to_ping($post_id) { // Get any URLs in the todo list
    842842        global $wpdb;
    843843        $to_ping = $wpdb->get_var("SELECT to_ping FROM $wpdb->posts WHERE ID = $post_id");
    844844        $to_ping = trim($to_ping);
    … …  
    10941094
    10951095                foreach ($posts as $id => $post) {
    10961096
    1097                         // URI => page name
     1097                        // URL => page name
    10981098                        $uri = get_page_uri($id);
    10991099                        $attachments = $wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = '$id'");
    11001100                        if ( $attachments ) {

  • wp-includes/query.php

     
    728728                        $distinct = 'DISTINCT';
    729729                }
    730730
    731                 // Category stuff for nice URIs
     731                // Category stuff for nice URLs
    732732
    733733                global $cache_categories;
    734734                if ('' != $q['category_name']) {
    … …  
    787787                        $whichauthor .= ')';
    788788                }
    789789
    790                 // Author stuff for nice URIs
     790                // Author stuff for nice URLs
    791791
    792792                if ('' != $q['author_name']) {
    793793                        if (stristr($q['author_name'],'/')) {

  • wp-includes/rewrite.php

     
    8484        $url_split = explode('#', $url);
    8585        $url = $url_split[0];
    8686
    87         // Get rid of URI ?query=string
     87        // Get rid of URL ?query=string
    8888        $url_split = explode('?', $url);
    8989        $url = $url_split[0];
    9090

  • wp-trackback.php

     
    8686
    8787        $dupe = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND comment_author_url = '$comment_author_url'");
    8888        if ( $dupe )
    89                 trackback_response(1, 'We already have a ping from that URI for this post.');
     89                trackback_response(1, 'We already have a ping from that URL for this post.');
    9090
    9191        $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type');
    9292

  • xmlrpc.php

     
    328328            return new IXR_Error(401, 'Sorry, this user can not edit the template.');
    329329          }
    330330
    331           /* warning: here we make the assumption that the weblog's URI is on the same server */
     331          /* warning: here we make the assumption that the weblog's URL is on the same server */
    332332          $filename = get_settings('home') . '/';
    333333          $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
    334334
    … …  
    363363            return new IXR_Error(401, 'Sorry, this user can not edit the template.');
    364364          }
    365365
    366           /* warning: here we make the assumption that the weblog's URI is on the same server */
     366          /* warning: here we make the assumption that the weblog's URL is on the same server */
    367367          $filename = get_settings('home') . '/';
    368368          $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
    369369
    … …  
    11531153                        }
    11541154                } else {
    11551155                        // TODO: Attempt to extract a post ID from the given URL
    1156                         return new IXR_Error(33, 'The specified target URI cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
     1156                        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.');
    11571157                }
    11581158                $post_ID = (int) $post_ID;
    11591159
    11601160
    1161                 logIO("O","(PB) URI='$pagelinkedto' ID='$post_ID' Found='$way'");
     1161                logIO("O","(PB) URL='$pagelinkedto' ID='$post_ID' Found='$way'");
    11621162
    11631163                $post = get_post($post_ID);
    11641164
    11651165                if ( !$post ) // Post_ID not found
    1166                         return new IXR_Error(33, 'The specified target URI cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
     1166                        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.');
    11671167
    11681168                if ( $post_ID == url_to_postid($pagelinkedfrom) )
    1169                         return new IXR_Error(0, 'The source URI and the target URI cannot both point to the same resource.');
     1169                        return new IXR_Error(0, 'The source URL and the target URL cannot both point to the same resource.');
    11701170
    11711171                // Check if pings are on
    11721172                if ( 'closed' == $post->ping_status )
    1173                         return new IXR_Error(33, 'The specified target URI cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
     1173                        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.');
    11741174
    11751175                // Let's check that the remote site didn't already pingback this entry
    11761176                $result = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post_ID' AND comment_author_url = '$pagelinkedfrom'");
    … …  
    11841184                // Let's check the remote site
    11851185                $linea = wp_remote_fopen( $pagelinkedfrom );
    11861186                if ( !$linea )
    1187                         return new IXR_Error(16, 'The source URI does not exist.');
     1187                        return new IXR_Error(16, 'The source URL does not exist.');
    11881188
    11891189                // Work around bug in strip_tags():
    11901190                $linea = str_replace('<!DOC', '<DOC', $linea);
    … …  
    12191219                }
    12201220
    12211221                if ( empty($context) ) // URL pattern not found
    1222                         return new IXR_Error(17, 'The source URI does not contain a link to the target URI, and so cannot be used as a source.');
     1222                        return new IXR_Error(17, 'The source URL does not contain a link to the target URL, and so cannot be used as a source.');
    12231223
    12241224                $pagelinkedfrom = preg_replace('#&([^amp\;])#is', '&amp;$1', $pagelinkedfrom);
    12251225
    … …  
    12571257                $post_ID = url_to_postid($url);
    12581258                if (!$post_ID) {
    12591259                        // We aren't sure that the resource is available and/or pingback enabled
    1260                         return new IXR_Error(33, 'The specified target URI cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
     1260                        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.');
    12611261                }
    12621262
    12631263                $actual_post = wp_get_single_post($post_ID, ARRAY_A);
    12641264
    12651265                if (!$actual_post) {
    12661266                        // No such post = resource not found
    1267                         return new IXR_Error(32, 'The specified target URI does not exist.');
     1267                        return new IXR_Error(32, 'The specified target URL does not exist.');
    12681268                }
    12691269
    12701270                $comments = $wpdb->get_results("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = $post_ID");