Ticket #8154: more-collisions.diff
File more-collisions.diff, 8.5 KB (added by , 15 years ago) |
---|
-
wp-admin/comment.php
123 123 </tr> 124 124 <?php } ?> 125 125 <tr> 126 <th scope="row" valign="top"><?php _e('Comment'); ?></th>126 <th scope="row" valign="top"><?php echo _c('Comment|'); ?></th> 127 127 <td><?php echo $comment->comment_content; ?></td> 128 128 </tr> 129 129 </table> -
wp-admin/edit-form-comment.php
47 47 <div id="misc-publishing-actions"> 48 48 49 49 <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 /> 52 52 <label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php echo _c('Spam|verb'); ?></label> 53 53 </div> 54 54 -
wp-admin/edit-form.php
29 29 30 30 <br /> 31 31 <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> 33 33 <?php 34 34 $rows = get_option('default_post_edit_rows'); 35 35 if (($rows < 3) || ($rows > 100)) { -
wp-admin/edit-pages.php
284 284 <table class="widefat" style="margin-top: .5em"> 285 285 <thead> 286 286 <tr> 287 <th scope="col"><?php _e('Comment')?></th>287 <th scope="col"><?php echo _c('Comment|'); ?></th> 288 288 <th scope="col"><?php _e('Date') ?></th> 289 289 <th scope="col"><?php _e('Actions') ?></th> 290 290 </tr> -
wp-admin/edit.php
289 289 <table class="widefat" style="margin-top: .5em"> 290 290 <thead> 291 291 <tr> 292 <th scope="col"><?php _e('Comment')?></th>292 <th scope="col"><?php echo _c('Comment|'); ?></th> 293 293 <th scope="col"><?php _e('Author') ?></th> 294 294 <th scope="col"><?php _e('Submitted') ?></th> 295 295 </tr> … … 297 297 298 298 <tfoot> 299 299 <tr> 300 <th scope="col"><?php _e('Comment')?></th>300 <th scope="col"><?php echo _c('Comment|'); ?></th> 301 301 <th scope="col"><?php _e('Author') ?></th> 302 302 <th scope="col"><?php _e('Submitted') ?></th> 303 303 </tr> -
wp-admin/includes/template.php
678 678 function wp_manage_posts_columns() { 679 679 $posts_columns = array(); 680 680 $posts_columns['cb'] = '<input type="checkbox" />'; 681 $posts_columns['title'] = _ _('Post');681 $posts_columns['title'] = _c('Post|'); 682 682 $posts_columns['author'] = __('Author'); 683 683 $posts_columns['categories'] = __('Categories'); 684 684 $posts_columns['tags'] = __('Tags'); … … 754 754 case 'comment': 755 755 $columns = array( 756 756 'cb' => '<input type="checkbox" />', 757 'comment' => _ _('Comment'),757 'comment' => _c('Comment|'), 758 758 'author' => __('Author'), 759 759 'date' => __('Submitted'), 760 760 'response' => __('In Response To') … … 1948 1948 } 1949 1949 } 1950 1950 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>'; 1952 1952 $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>'; 1953 1953 $actions['edit'] = "<a href='comment.php?action=editcomment&c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>'; 1954 1954 $actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick Edit') . '</a>'; -
wp-admin/press-this.php
517 517 518 518 </div> 519 519 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> 521 521 522 522 <div class="editor-container"> 523 523 <textarea name="content" id="content" style="width:100%;" class="mceEditor" rows="15"> -
wp-admin/upload.php
425 425 <table class="widefat" style="margin-top: .5em"> 426 426 <thead> 427 427 <tr> 428 <th scope="col"><?php _e('Comment')?></th>428 <th scope="col"><?php echo _c('Comment|'); ?></th> 429 429 <th scope="col"><?php _e('Date') ?></th> 430 430 <th scope="col"><?php _e('Actions') ?></th> 431 431 </tr> -
wp-content/themes/classic/comments-popup.php
49 49 <?php foreach ($comments as $comment) { ?> 50 50 <li id="comment-<?php comment_ID() ?>"> 51 51 <?php comment_text() ?> 52 <p><cite><?php comment_type(_ _('Comment'), __('Trackback'), __('Pingback')); ?> <?php _e("by"); ?> <?php comment_author_link() ?> — <?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() ?> — <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p> 53 53 </li> 54 54 55 55 <?php } // end for each comment ?> -
wp-content/themes/classic/comments.php
21 21 <li <?php comment_class(); ?> id="comment-<?php comment_ID() ?>"> 22 22 <?php echo get_avatar( $comment, 32 ); ?> 23 23 <?php comment_text() ?> 24 <p><cite><?php comment_type(_ _('Comment'), __('Trackback'), __('Pingback')); ?> <?php _e('by'); ?> <?php comment_author_link() ?> — <?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() ?> — <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite> <?php edit_comment_link(__("Edit This"), ' |'); ?></p> 25 25 </li> 26 26 27 27 <?php endforeach; ?> -
wp-includes/comment.php
252 252 function get_comment_statuses( ) { 253 253 $status = array( 254 254 'hold' => __('Unapproved'), 255 'approve' => _ _('Approved'),255 'approve' => _c('Approved|'), 256 256 'spam' => _c('Spam|adjective'), 257 257 ); 258 258