Make WordPress Core

Ticket #8154: more-collisions.diff

File more-collisions.diff, 8.5 KB (added by tenpura, 15 years ago)
  • wp-admin/comment.php

     
    123123</tr>
    124124<?php } ?>
    125125<tr>
    126 <th scope="row" valign="top"><?php _e('Comment'); ?></th>
     126<th scope="row" valign="top"><?php echo _c('Comment|'); ?></th>
    127127<td><?php echo $comment->comment_content; ?></td>
    128128</tr>
    129129</table>
  • wp-admin/edit-form-comment.php

     
    4747<div id="misc-publishing-actions">
    4848
    4949<div class="misc-pub-section" id="comment-status-radio">
    50 <label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php _e('Approved') ?></label><br />
    51 <label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php _e('Awaiting Moderation') ?></label><br />
     50<label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php echo _c('Approved|'); ?></label><br />
     51<label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php echo _c('Awaiting Moderation|'); ?></label><br />
    5252<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php echo _c('Spam|verb'); ?></label>
    5353</div>
    5454
  • wp-admin/edit-form.php

     
    2929
    3030<br />
    3131<fieldset id="postdiv">
    32     <legend><a href="http://wordpress.org/docs/reference/post/#post" title="<?php _e('Help with post field') ?>"><?php _e('Post') ?></a></legend>
     32    <legend><a href="http://wordpress.org/docs/reference/post/#post" title="<?php _e('Help with post field') ?>"><?php echo _c('Post|'); ?></a></legend>
    3333<?php
    3434 $rows = get_option('default_post_edit_rows');
    3535 if (($rows < 3) || ($rows > 100)) {
  • wp-admin/edit-pages.php

     
    284284<table class="widefat" style="margin-top: .5em">
    285285<thead>
    286286  <tr>
    287     <th scope="col"><?php _e('Comment') ?></th>
     287    <th scope="col"><?php echo _c('Comment|'); ?></th>
    288288    <th scope="col"><?php _e('Date') ?></th>
    289289    <th scope="col"><?php _e('Actions') ?></th>
    290290  </tr>
  • wp-admin/edit.php

     
    289289<table class="widefat" style="margin-top: .5em">
    290290<thead>
    291291  <tr>
    292     <th scope="col"><?php _e('Comment') ?></th>
     292    <th scope="col"><?php echo _c('Comment|'); ?></th>
    293293    <th scope="col"><?php _e('Author') ?></th>
    294294    <th scope="col"><?php _e('Submitted') ?></th>
    295295  </tr>
     
    297297
    298298<tfoot>
    299299  <tr>
    300     <th scope="col"><?php _e('Comment') ?></th>
     300    <th scope="col"><?php echo _c('Comment|'); ?></th>
    301301    <th scope="col"><?php _e('Author') ?></th>
    302302    <th scope="col"><?php _e('Submitted') ?></th>
    303303  </tr>
  • wp-admin/includes/template.php

     
    678678function wp_manage_posts_columns() {
    679679        $posts_columns = array();
    680680        $posts_columns['cb'] = '<input type="checkbox" />';
    681         $posts_columns['title'] = __('Post');
     681        $posts_columns['title'] = _c('Post|');
    682682        $posts_columns['author'] = __('Author');
    683683        $posts_columns['categories'] = __('Categories');
    684684        $posts_columns['tags'] = __('Tags');
     
    754754                case 'comment':
    755755                        $columns = array(
    756756                                'cb' => '<input type="checkbox" />',
    757                                 'comment' => __('Comment'),
     757                                'comment' => _c('Comment|'),
    758758                                'author' => __('Author'),
    759759                                'date' => __('Submitted'),
    760760                                'response' => __('In Response To')
     
    19481948                                                }
    19491949                                        }
    19501950                                        if ( 'spam' != $the_comment_status )
    1951                                                 $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . __( 'Spam' ) . '</a>';
     1951                                                $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . _c( 'Spam|verb' ) . '</a>';
    19521952                                        $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>';
    19531953                                        $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>';
    19541954                                        $actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick&nbsp;Edit') . '</a>';
  • wp-admin/press-this.php

     
    517517       
    518518        </div>
    519519       
    520                                 <h2 id="content_type"><label for="content"><?php _e('Post') ?></label></h2>
     520                                <h2 id="content_type"><label for="content"><?php echo _c('Post|'); ?></label></h2>
    521521                       
    522522                                <div class="editor-container">
    523523                                        <textarea name="content" id="content" style="width:100%;" class="mceEditor" rows="15">
  • wp-admin/upload.php

     
    425425<table class="widefat" style="margin-top: .5em">
    426426<thead>
    427427        <tr>
    428                 <th scope="col"><?php _e('Comment') ?></th>
     428                <th scope="col"><?php echo _c('Comment|'); ?></th>
    429429                <th scope="col"><?php _e('Date') ?></th>
    430430                <th scope="col"><?php _e('Actions') ?></th>
    431431        </tr>
  • wp-content/themes/classic/comments-popup.php

     
    4949<?php foreach ($comments as $comment) { ?>
    5050        <li id="comment-<?php comment_ID() ?>">
    5151        <?php comment_text() ?>
    52         <p><cite><?php comment_type(__('Comment'), __('Trackback'), __('Pingback')); ?> <?php _e("by"); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
     52        <p><cite><?php comment_type(_c('Comment|'), __('Trackback'), __('Pingback')); ?> <?php _e("by"); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
    5353        </li>
    5454
    5555<?php } // end for each comment ?>
  • wp-content/themes/classic/comments.php

     
    2121        <li <?php comment_class(); ?> id="comment-<?php comment_ID() ?>">
    2222        <?php echo get_avatar( $comment, 32 ); ?>
    2323        <?php comment_text() ?>
    24         <p><cite><?php comment_type(__('Comment'), __('Trackback'), __('Pingback')); ?> <?php _e('by'); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite> <?php edit_comment_link(__("Edit This"), ' |'); ?></p>
     24        <p><cite><?php comment_type(_c('Comment|'), __('Trackback'), __('Pingback')); ?> <?php _e('by'); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite> <?php edit_comment_link(__("Edit This"), ' |'); ?></p>
    2525        </li>
    2626
    2727<?php endforeach; ?>
  • wp-includes/comment.php

     
    252252function get_comment_statuses( ) {
    253253        $status = array(
    254254                'hold'          => __('Unapproved'),
    255                 'approve'       => __('Approved'),
     255                'approve'       => _c('Approved|'),
    256256                'spam'          => _c('Spam|adjective'),
    257257        );
    258258