WordPress.org

Make WordPress Core

Ticket #38517: 38517.1.patch

File 38517.1.patch, 4.6 KB (added by angelagibson, 14 months ago)

patch refresh;failed hunks fixed

  • src/wp-admin/options-discussion.php

     
    4343
    4444<table class="form-table">
    4545<tr>
    46 <th scope="row"><?php _e( 'Default article settings' ); ?></th>
    47 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Default article settings' ); ?></span></legend>
     46<th scope="row"><?php _e( 'Default post settings' ); ?></th>
     47<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Default post settings' ); ?></span></legend>
    4848<label for="default_pingback_flag">
    4949<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked( '1', get_option( 'default_pingback_flag' ) ); ?> />
    50 <?php _e( 'Attempt to notify any blogs linked to from the article' ); ?></label>
     50<?php _e( 'Attempt to notify any blogs linked to from the post' ); ?></label>
    5151<br />
    5252<label for="default_ping_status">
    5353<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked( 'open', get_option( 'default_ping_status' ) ); ?> />
    54 <?php _e( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new articles' ); ?></label>
     54<?php _e( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new posts' ); ?></label>
    5555<br />
    5656<label for="default_comment_status">
    5757<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked( 'open', get_option( 'default_comment_status' ) ); ?> />
    58 <?php _e( 'Allow people to post comments on new articles' ); ?></label>
     58<?php _e( 'Allow people to submit comments on new posts' ); ?></label>
    5959<br />
    60 <p class="description"><?php echo '(' . __( 'These settings may be overridden for individual articles.' ) . ')'; ?></p>
     60<p class="description"><?php echo '(' . __( 'These settings may be overridden for individual posts.' ) . ')'; ?></p>
    6161</fieldset></td>
    6262</tr>
    6363<tr>
     
    7979<input name="close_comments_for_old_posts" type="checkbox" id="close_comments_for_old_posts" value="1" <?php checked( '1', get_option( 'close_comments_for_old_posts' ) ); ?> />
    8080<?php
    8181printf(
    82         __( 'Automatically close comments on articles older than %s days' ),
     82        __( 'Automatically close comments on posts older than %s days' ),
    8383        '</label> <label for="close_comments_days_old"><input name="close_comments_days_old" type="number" min="0" step="1" id="close_comments_days_old" value="' . esc_attr( get_option( 'close_comments_days_old' ) ) . '" class="small-text" />'
    8484);
    8585?>
  • src/wp-admin/options-reading.php

     
    137137<td><input name="posts_per_rss" type="number" step="1" min="1" id="posts_per_rss" value="<?php form_option( 'posts_per_rss' ); ?>" class="small-text" /> <?php _e( 'items' ); ?></td>
    138138</tr>
    139139<tr>
    140 <th scope="row"><?php _e( 'For each article in a feed, show' ); ?> </th>
    141 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'For each article in a feed, show' ); ?> </span></legend>
     140<th scope="row"><?php _e( 'For each post in a feed, show' ); ?> </th>
     141<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'For each post in a feed, show' ); ?> </span></legend>
    142142<p><label><input name="rss_use_excerpt" type="radio" value="0" <?php checked( 0, get_option( 'rss_use_excerpt' ) ); ?>  /> <?php _e( 'Full text' ); ?></label><br />
    143143<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked( 1, get_option( 'rss_use_excerpt' ) ); ?> /> <?php _e( 'Summary' ); ?></label></p>
    144144</fieldset></td>
  • src/wp-includes/class-wp-xmlrpc-server.php

     
    612612                                'option'   => 'large_size_h',
    613613                        ),
    614614                        'default_comment_status'  => array(
    615                                 'desc'     => __( 'Allow people to post comments on new articles' ),
     615                                'desc'     => __( 'Allow people to submit comments on new posts' ),
    616616                                'readonly' => false,
    617617                                'option'   => 'default_comment_status',
    618618                        ),
    619619                        'default_ping_status'     => array(
    620                                 'desc'     => __( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new articles' ),
     620                                'desc'     => __( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new posts' ),
    621621                                'readonly' => false,
    622622                                'option'   => 'default_ping_status',
    623623                        ),