WordPress.org

Make WordPress Core

Ticket #13433: 13433.2.diff

File 13433.2.diff, 10.0 KB (added by markmcwilliams, 4 years ago)

refreshed patch

  • wp-admin/includes/misc.php

     
    594594 */ 
    595595function admin_color_scheme_picker() { 
    596596        global $_wp_admin_css_colors, $user_id; ?> 
    597 <fieldset><legend class="screen-reader-text"><span><?php _e('Admin Color Scheme')?></span></legend> 
     597<fieldset><legend class="screen-reader-text"><span><?php _e('Dashboard Color Scheme')?></span></legend> 
    598598<?php 
    599599$current_color = get_user_option('admin_color', $user_id); 
    600600if ( empty($current_color) ) 
  • wp-admin/options-general.php

     
    103103<tr valign="top"> 
    104104<th scope="row"><label for="admin_email"><?php _e('E-mail address') ?> </label></th> 
    105105<td><input name="admin_email" type="text" id="admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text" /> 
    106 <span class="description"><?php _e('This address is used for admin purposes, like new user notification.') ?></span></td> 
     106<span class="description"><?php _e('This address is used for administrative purposes, like new user notification.') ?></span></td> 
    107107</tr> 
    108108<tr valign="top"> 
    109109<th scope="row"><?php _e('Membership') ?></th> 
     
    122122<tr valign="top"> 
    123123<th scope="row"><label for="new_admin_email"><?php _e('E-mail address') ?> </label></th> 
    124124<td><input name="new_admin_email" type="text" id="new_admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text code" /> 
    125 <span class="description"><?php _e('This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></span> 
     125<span class="description"><?php _e('This address is used for administrative purposes. If you change this we will send you an e-mail at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></span> 
    126126<?php 
    127127$new_admin_email = get_option( 'new_admin_email' ); 
    128128if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?> 
    129129<div class="updated inline"> 
    130 <p><?php printf( __('There is a pending change of the admin e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), $new_admin_email, esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></p> 
     130<p><?php printf( __('There is a pending change of the administrator e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), $new_admin_email, esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></p> 
    131131</div> 
    132132<?php endif; ?> 
    133133</td> 
  • wp-admin/themes.php

     
    188188if ( current_user_can('edit_themes') && count( $broken_themes ) ) { 
    189189?> 
    190190 
    191 <h2><?php _e('Broken Themes'); ?> <?php if ( is_multisite() ) _e( '(Site admin only)' ); ?></h2> 
     191<h2><?php _e('Broken Themes'); ?> <?php if ( is_multisite() ) _e( '(Super administrator only)' ); ?></h2> 
    192192<p><?php _e('The following themes are installed but incomplete. Themes must have a stylesheet and a template.'); ?></p> 
    193193 
    194194<table id="broken-themes"> 
  • wp-admin/user-edit.php

     
    3636else 
    3737        $parent_file = 'profile.php'; 
    3838 
    39 // contextual help - choose Help on the top right of admin panel to preview this. 
     39// contextual help - choose Help on the top right of administration panel to preview this. 
    4040add_contextual_help($current_screen, 
    4141    '<p>' . __('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.') . '</p>' . 
    4242    '<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things.') . '</p>' . 
     
    6767?> 
    6868        <tr> 
    6969                <th scope="row"><?php _e('Use https')?></th> 
    70                 <td><label for="use_ssl"><input name="use_ssl" type="checkbox" id="use_ssl" value="1" <?php checked('1', $user->use_ssl); ?> /> <?php _e('Always use https when visiting the admin'); ?></label></td> 
     70                <td><label for="use_ssl"><input name="use_ssl" type="checkbox" id="use_ssl" value="1" <?php checked('1', $user->use_ssl); ?> /> <?php _e('Always use https when visiting the administration area.'); ?></label></td> 
    7171        </tr> 
    7272<?php 
    7373} 
    7474 
    7575 
    76 // Only allow super admins on multisite to edit every user. 
     76// Only allow super administrators on multisite to edit every user. 
    7777if ( is_multisite() && ! current_user_can( 'manage_network_users' ) && $user_id != $current_user->ID && ! apply_filters( 'enable_edit_any_user_configuration', true ) ) 
    7878        wp_die( __( 'You do not have permission to edit this user.' ) ); 
    7979 
     
    162162?> 
    163163 
    164164<?php if ( !IS_PROFILE_PAGE && is_super_admin( $profileuser->ID ) && current_user_can( 'manage_network_options' ) ) { ?> 
    165         <div class="updated"><p><strong><?php _e('Important:'); ?></strong> <?php _e('This user has super admin privileges.'); ?></p></div> 
     165        <div class="updated"><p><strong><?php _e('Important:'); ?></strong> <?php _e('This user has super administrator privileges.'); ?></p></div> 
    166166<?php } ?> 
    167167<?php if ( isset($_GET['updated']) ) : ?> 
    168168<div id="message" class="updated"> 
     
    201201<?php endif; ?> 
    202202<?php if ( count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker') ) : ?> 
    203203<tr> 
    204 <th scope="row"><?php _e('Admin Color Scheme')?></th> 
     204<th scope="row"><?php _e('Dashboard Color Scheme')?></th> 
    205205<td><?php do_action( 'admin_color_scheme_picker' ); ?></td> 
    206206</tr> 
    207207<?php 
     
    249249?> 
    250250</select> 
    251251<?php if ( is_multisite() && is_network_admin() && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?> 
    252 <p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.'); ?></label></p> 
     252<p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super administrator privileges for the Network.'); ?></label></p> 
    253253<?php } ?> 
    254254</td></tr> 
    255255<?php endif; //!IS_PROFILE_PAGE ?> 
  • wp-app.php

     
    1111 * @var bool 
    1212 */ 
    1313define('APP_REQUEST', true); 
    14 define('WP_SHOW_ADMIN_BAR' , false); 
     14define('WP_SHOW_ADMIN_BAR', false); 
    1515 
    1616/** Set up WordPress environment */ 
    1717require_once('./wp-load.php'); 
     
    1919/** Atom Publishing Protocol Class */ 
    2020require_once(ABSPATH . WPINC . '/atomlib.php'); 
    2121 
    22 /** Admin Image API for metadata updating */ 
     22/** Administration Image API for metadata updating */ 
    2323require_once(ABSPATH . '/wp-admin/includes/image.php'); 
    2424 
    2525$_SERVER['PATH_INFO'] = preg_replace( '/.*\/wp-app\.php/', '', $_SERVER['REQUEST_URI'] ); 
     
    285285 
    286286                // check to see if AtomPub is enabled 
    287287                if ( !get_option( 'enable_app' ) ) 
    288                         $this->forbidden( sprintf( __( 'AtomPub services are disabled on this site.  An admin user can enable them at %s' ), admin_url('options-writing.php') ) ); 
     288                        $this->forbidden( sprintf( __( 'AtomPub services are disabled on this site.  An administrator user can enable them at %s' ), admin_url('options-writing.php') ) ); 
    289289 
    290290                // dispatch 
    291291                foreach ( $this->selectors as $regex => $funcs ) { 
  • wp-includes/js/tinymce/wp-mce-help.php

     
    184184        <p><?php _e('<em>Rich editing</em>, also called WYSIWYG for What You See Is What You Get, means your text is formatted as you type. The rich editor creates HTML code behind the scenes while you concentrate on writing. Font styles, links and images all appear approximately as they will on the internet.') ?></p> 
    185185        <p><?php _e('WordPress includes a rich HTML editor that works well in all major web browsers used today. However editing HTML is not the same as typing text. Each web page has two major components: the structure, which is the actual HTML code and is produced by the editor as you type, and the display, that is applied to it by the currently selected WordPress theme and is defined in style.css. WordPress is producing valid XHTML 1.0 which means that inserting multiple line breaks (BR tags) after a paragraph would not produce white space on the web page. The BR tags will be removed as invalid by the internal HTML correcting functions.') ?></p> 
    186186        <p><?php _e('While using the editor, most basic keyboard shortcuts work like in any other text editor. For example: Shift+Enter inserts line break, Ctrl+C = copy, Ctrl+X = cut, Ctrl+Z = undo, Ctrl+Y = redo, Ctrl+A = select all, etc. (on Mac use the Command key instead of Ctrl). See the Hotkeys tab for all available keyboard shortcuts.') ?></p> 
    187     <p><?php _e('If you do not like the way the rich editor works, you may turn it off from Your Profile submenu, under Users in the admin menu.') ?></p> 
     187    <p><?php _e('If you do not like the way the rich editor works, you may turn it off from Your Profile submenu, under Users in the administration menu.') ?></p> 
    188188</div> 
    189189 
    190190<div id="content2" class="hidden"> 
  • xmlrpc.php

     
    1111 * @var bool 
    1212 */ 
    1313define('XMLRPC_REQUEST', true); 
    14 define('WP_SHOW_ADMIN_BAR' , false); 
     14define('WP_SHOW_ADMIN_BAR', false); 
    1515 
    1616// Some browser-embedded clients send cookies. We don't want them. 
    1717$_COOKIE = array();