WordPress.org

Make WordPress Core

Changeset 37914


Ignore:
Timestamp:
06/29/2016 03:15:40 PM (4 years ago)
Author:
ocean90
Message:

Text Changes: Unify permission error messages.

The new format looks like "Sorry, you are not allowed to <action>.". This provides a consistent experience for all error messages related to missing permissions. It also reduces the number of similar strings and allows translators to provide a consistent style in their language.

Props ramiy, Presskopp.
Fixes #34521.

Location:
trunk
Files:
73 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/admin.php

    r37537 r37914  
    273273
    274274    if ( ! current_user_can('import') )
    275         wp_die(__('You are not allowed to import.'));
     275        wp_die(__('Sorry, you are not allowed to import.'));
    276276
    277277    if ( validate_file($importer) ) {
  • trunk/src/wp-admin/async-upload.php

    r37488 r37914  
    4646
    4747if ( ! current_user_can( 'upload_files' ) ) {
    48     wp_die( __( 'You do not have permission to upload files.' ) );
     48    wp_die( __( 'Sorry, you are not allowed to upload files.' ) );
    4949}
    5050
     
    5555        wp_die( __( 'Unknown post type.' ) );
    5656    if ( ! current_user_can( 'edit_post', $id ) )
    57         wp_die( __( 'You are not allowed to edit this item.' ) );
     57        wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
    5858
    5959    switch ( $_REQUEST['fetch'] ) {
  • trunk/src/wp-admin/comment.php

    r37674 r37914  
    6262
    6363    if ( !current_user_can( 'edit_comment', $comment_id ) )
    64         comment_footer_die( __('You are not allowed to edit this comment.') );
     64        comment_footer_die( __('Sorry, you are not allowed to edit this comment.') );
    6565
    6666    if ( 'trash' == $comment->comment_approved )
     
    255255        comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
    256256    if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
    257         comment_footer_die( __('You are not allowed to edit comments on this post.') );
     257        comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') );
    258258
    259259    if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') )
  • trunk/src/wp-admin/custom-header.php

    r37488 r37914  
    967967    public function admin_page() {
    968968        if ( ! current_user_can('edit_theme_options') )
    969             wp_die(__('You do not have permission to customize headers.'));
     969            wp_die(__('Sorry, you are not allowed to customize headers.'));
    970970        $step = $this->step();
    971971        if ( 2 == $step )
  • trunk/src/wp-admin/customize.php

    r37560 r37914  
    1616    wp_die(
    1717        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    18         '<p>' . __( 'You are not allowed to customize this site.' ) . '</p>',
     18        '<p>' . __( 'Sorry, you are not allowed to customize this site.' ) . '</p>',
    1919        403
    2020    );
  • trunk/src/wp-admin/edit-comments.php

    r36302 r37914  
    1212    wp_die(
    1313        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    14         '<p>' . __( 'You are not allowed to edit comments.' ) . '</p>',
     14        '<p>' . __( 'Sorry, you are not allowed to edit comments.' ) . '</p>',
    1515        403
    1616    );
     
    211211            break;
    212212        case 2 :
    213             $error_msg = __( 'You are not allowed to edit comments on this post.' );
     213            $error_msg = __( 'Sorry, you are not allowed to edit comments on this post.' );
    214214            break;
    215215    }
  • trunk/src/wp-admin/edit-tags.php

    r37696 r37914  
    1919
    2020if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) {
    21    wp_die( __( 'You are not allowed to manage these items.' ) );
     21   wp_die( __( 'Sorry, you are not allowed to manage these items.' ) );
    2222}
    2323
     
    2525    wp_die(
    2626        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    27         '<p>' . __( 'You are not allowed to manage these items.' ) . '</p>',
     27        '<p>' . __( 'Sorry, you are not allowed to manage these items.' ) . '</p>',
    2828        403
    2929    );
     
    7272        wp_die(
    7373            '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    74             '<p>' . __( 'You are not allowed to add this item.' ) . '</p>',
     74            '<p>' . __( 'Sorry, you are not allowed to add this item.' ) . '</p>',
    7575            403
    7676        );
     
    112112        wp_die(
    113113            '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    114             '<p>' . __( 'You are not allowed to delete this item.' ) . '</p>',
     114            '<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
    115115            403
    116116        );
     
    129129        wp_die(
    130130            '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    131             '<p>' . __( 'You are not allowed to delete these items.' ) . '</p>',
     131            '<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
    132132            403
    133133        );
     
    172172        wp_die(
    173173            '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    174             '<p>' . __( 'You are not allowed to edit this item.' ) . '</p>',
     174            '<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
    175175            403
    176176        );
     
    298298    wp_die(
    299299        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    300         '<p>' . __( 'You are not allowed to edit this item.' ) . '</p>',
     300        '<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
    301301        403
    302302    );
  • trunk/src/wp-admin/edit.php

    r37890 r37914  
    1414
    1515if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
    16     wp_die( __( 'You are not allowed to edit posts in this post type.' ) );
     16    wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
    1717}
    1818
     
    3838    wp_die(
    3939        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    40         '<p>' . __( 'You are not allowed to edit posts in this post type.' ) . '</p>',
     40        '<p>' . __( 'Sorry, you are not allowed to edit posts in this post type.' ) . '</p>',
    4141        403
    4242    );
     
    104104            foreach ( (array) $post_ids as $post_id ) {
    105105                if ( !current_user_can( 'delete_post', $post_id) )
    106                     wp_die( __('You are not allowed to move this item to the Trash.') );
     106                    wp_die( __('Sorry, you are not allowed to move this item to the Trash.') );
    107107
    108108                if ( wp_check_post_lock( $post_id ) ) {
     
    123123            foreach ( (array) $post_ids as $post_id ) {
    124124                if ( !current_user_can( 'delete_post', $post_id) )
    125                     wp_die( __('You are not allowed to restore this item from the Trash.') );
     125                    wp_die( __('Sorry, you are not allowed to restore this item from the Trash.') );
    126126
    127127                if ( !wp_untrash_post($post_id) )
     
    138138
    139139                if ( !current_user_can( 'delete_post', $post_id ) )
    140                     wp_die( __('You are not allowed to delete this item.') );
     140                    wp_die( __('Sorry, you are not allowed to delete this item.') );
    141141
    142142                if ( $post_del->post_type == 'attachment' ) {
  • trunk/src/wp-admin/export.php

    r37488 r37914  
    1111
    1212if ( !current_user_can('export') )
    13     wp_die(__('You do not have sufficient permissions to export the content of this site.'));
     13    wp_die(__('Sorry, you are not allowed to export the content of this site.'));
    1414
    1515/** Load WordPress export API */
  • trunk/src/wp-admin/import.php

    r37714 r37914  
    1313
    1414if ( !current_user_can('import') )
    15     wp_die(__('You do not have sufficient permissions to import content in this site.'));
     15    wp_die(__('Sorry, you are not allowed to import content in this site.'));
    1616
    1717$title = __('Import');
  • trunk/src/wp-admin/includes/ajax-actions.php

    r37913 r37914  
    16231623    if ( 'page' == $_POST['post_type'] ) {
    16241624        if ( ! current_user_can( 'edit_page', $post_ID ) )
    1625             wp_die( __( 'You are not allowed to edit this page.' ) );
     1625            wp_die( __( 'Sorry, you are not allowed to edit this page.' ) );
    16261626    } else {
    16271627        if ( ! current_user_can( 'edit_post', $post_ID ) )
    1628             wp_die( __( 'You are not allowed to edit this post.' ) );
     1628            wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
    16291629    }
    16301630
     
    20212021            'success' => false,
    20222022            'data'    => array(
    2023                 'message'  => __( 'You do not have permission to upload files.' ),
     2023                'message'  => __( 'Sorry, you are not allowed to upload files.' ),
    20242024                'filename' => $_FILES['async-upload']['name'],
    20252025            )
     
    33033303
    33043304    if ( ! current_user_can( 'install_themes' ) ) {
    3305         $status['errorMessage'] = __( 'You do not have sufficient permissions to install themes on this site.' );
     3305        $status['errorMessage'] = __( 'Sorry, you are not allowed to install themes on this site.' );
    33063306        wp_send_json_error( $status );
    33073307    }
     
    33993399
    34003400    if ( ! current_user_can( 'update_themes' ) ) {
    3401         $status['errorMessage'] = __( 'You do not have sufficient permissions to update themes on this site.' );
     3401        $status['errorMessage'] = __( 'Sorry, you are not allowed to update themes on this site.' );
    34023402        wp_send_json_error( $status );
    34033403    }
     
    34773477
    34783478    if ( ! current_user_can( 'delete_themes' ) ) {
    3479         $status['errorMessage'] = __( 'You do not have sufficient permissions to delete themes on this site.' );
     3479        $status['errorMessage'] = __( 'Sorry, you are not allowed to delete themes on this site.' );
    34803480        wp_send_json_error( $status );
    34813481    }
     
    35413541
    35423542    if ( ! current_user_can( 'install_plugins' ) ) {
    3543         $status['errorMessage'] = __( 'You do not have sufficient permissions to install plugins on this site.' );
     3543        $status['errorMessage'] = __( 'Sorry, you are not allowed to install plugins on this site.' );
    35443544        wp_send_json_error( $status );
    35453545    }
     
    36393639
    36403640    if ( ! current_user_can( 'update_plugins' ) ) {
    3641         $status['errorMessage'] = __( 'You do not have sufficient permissions to update plugins for this site.' );
     3641        $status['errorMessage'] = __( 'Sorry, you are not allowed to update plugins for this site.' );
    36423642        wp_send_json_error( $status );
    36433643    }
     
    37283728
    37293729    if ( ! current_user_can( 'delete_plugins' ) ) {
    3730         $status['errorMessage'] = __( 'You do not have sufficient permissions to delete plugins for this site.' );
     3730        $status['errorMessage'] = __( 'Sorry, you are not allowed to delete plugins for this site.' );
    37313731        wp_send_json_error( $status );
    37323732    }
     
    37883788
    37893789    if ( ! $wp_list_table->ajax_user_can() ) {
    3790         $status['errorMessage'] = __( 'You do not have sufficient permissions to manage plugins on this site.' );
     3790        $status['errorMessage'] = __( 'Sorry, you are not allowed to manage plugins for this site.' );
    37913791        wp_send_json_error( $status );
    37923792    }
     
    38283828
    38293829    if ( ! $wp_list_table->ajax_user_can() ) {
    3830         $status['errorMessage'] = __( 'You do not have sufficient permissions to manage plugins on this site.' );
     3830        $status['errorMessage'] = __( 'Sorry, you are not allowed to manage plugins on this site.' );
    38313831        wp_send_json_error( $status );
    38323832    }
  • trunk/src/wp-admin/includes/bookmark.php

    r37353 r37914  
    3030        wp_die(
    3131            '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    32             '<p>' . __( 'You do not have sufficient permissions to edit the links for this site.' ) . '</p>',
     32            '<p>' . __( 'Sorry, you are not allowed to edit the links for this site.' ) . '</p>',
    3333            403
    3434        );
     
    313313    }
    314314
    315     wp_die( __( 'You do not have sufficient permissions to edit the links for this site.' ) );
    316 }
     315    wp_die( __( 'Sorry, you are not allowed to edit the links for this site.' ) );
     316}
  • trunk/src/wp-admin/includes/comment.php

    r37488 r37914  
    4747function edit_comment() {
    4848    if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
    49         wp_die ( __( 'You are not allowed to edit comments on this post.' ) );
     49        wp_die ( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
    5050
    5151    if ( isset( $_POST['newcomment_author'] ) )
  • trunk/src/wp-admin/includes/media.php

    r37880 r37914  
    31223122
    31233123    if ( ! current_user_can( 'edit_post', $parent_id ) ) {
    3124         wp_die( __( 'You are not allowed to edit this post.' ) );
     3124        wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
    31253125    }
    31263126    $ids = array();
  • trunk/src/wp-admin/includes/menu.php

    r37488 r37914  
    340340    do_action( 'admin_page_access_denied' );
    341341
    342     wp_die( __( 'You do not have sufficient permissions to access this page.' ), 403 );
     342    wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
    343343}
    344344
  • trunk/src/wp-admin/includes/post.php

    r37801 r37914  
    3131    if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
    3232        if ( 'page' == $post_data['post_type'] )
    33             return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
     33            return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
    3434        else
    35             return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
     35            return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
    3636    } elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
    3737        if ( 'page' == $post_data['post_type'] )
    38             return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
     38            return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
    3939        else
    40             return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
     40            return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
    4141    }
    4242
     
    6969        if ( $update ) {
    7070            if ( 'page' == $post_data['post_type'] )
    71                 return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
     71                return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
    7272            else
    73                 return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
     73                return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
    7474        } else {
    7575            if ( 'page' == $post_data['post_type'] )
    76                 return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
     76                return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
    7777            else
    78                 return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
     78                return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
    7979        }
    8080    }
     
    211211    if ( !current_user_can( 'edit_post', $post_ID ) ) {
    212212        if ( 'page' == $post_data['post_type'] )
    213             wp_die( __('You are not allowed to edit this page.' ));
     213            wp_die( __('Sorry, you are not allowed to edit this page.' ));
    214214        else
    215             wp_die( __('You are not allowed to edit this post.' ));
     215            wp_die( __('Sorry, you are not allowed to edit this post.' ));
    216216    }
    217217
     
    429429    if ( !current_user_can( $ptype->cap->edit_posts ) ) {
    430430        if ( 'page' == $ptype->name )
    431             wp_die( __('You are not allowed to edit pages.'));
     431            wp_die( __('Sorry, you are not allowed to edit pages.'));
    432432        else
    433             wp_die( __('You are not allowed to edit posts.'));
     433            wp_die( __('Sorry, you are not allowed to edit posts.'));
    434434    }
    435435
     
    722722    if ( !current_user_can( $ptype->cap->edit_posts ) ) {
    723723        if ( 'page' == $ptype->name )
    724             return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) );
     724            return new WP_Error( 'edit_pages', __( 'Sorry, you are not allowed to create pages on this site.' ) );
    725725        else
    726             return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) );
     726            return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to create posts or drafts on this site.' ) );
    727727    }
    728728
     
    17251725
    17261726    if ( ! $post = get_post( $post_ID ) ) {
    1727         wp_die( __( 'You are not allowed to edit this post.' ) );
     1727        wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
    17281728    }
    17291729
    17301730    if ( ! current_user_can( 'edit_post', $post->ID ) ) {
    1731         wp_die( __( 'You are not allowed to edit this post.' ) );
     1731        wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
    17321732    }
    17331733
     
    17871787
    17881788    if ( ! current_user_can( 'edit_post', $post->ID ) ) {
    1789         return new WP_Error( 'edit_posts', __( 'You are not allowed to edit this item.' ) );
     1789        return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to edit this item.' ) );
    17901790    }
    17911791
  • trunk/src/wp-admin/link-add.php

    r25616 r37914  
    1111
    1212if ( ! current_user_can('manage_links') )
    13     wp_die(__('You do not have sufficient permissions to add links to this site.'));
     13    wp_die(__('Sorry, you are not allowed to add links to this site.'));
    1414
    1515$title = __('Add New Link');
  • trunk/src/wp-admin/link-manager.php

    r36302 r37914  
    1010require_once( dirname( __FILE__ ) . '/admin.php' );
    1111if ( ! current_user_can( 'manage_links' ) )
    12     wp_die( __( 'You do not have sufficient permissions to edit the links for this site.' ) );
     12    wp_die( __( 'Sorry, you are not allowed to edit the links for this site.' ) );
    1313
    1414$wp_list_table = _get_list_table('WP_Links_List_Table');
     
    6969
    7070if ( ! current_user_can('manage_links') )
    71     wp_die(__("You do not have sufficient permissions to edit the links for this site."));
     71    wp_die(__('Sorry, you are not allowed to edit the links for this site.'));
    7272
    7373?>
  • trunk/src/wp-admin/media-new.php

    r34002 r37914  
    1414
    1515if (!current_user_can('upload_files'))
    16     wp_die(__('You do not have permission to upload files.'));
     16    wp_die(__('Sorry, you are not allowed to upload files.'));
    1717
    1818wp_enqueue_script('plupload-handlers');
  • trunk/src/wp-admin/media-upload.php

    r37488 r37914  
    1717
    1818if ( ! current_user_can( 'upload_files' ) ) {
    19     wp_die( __( 'You do not have permission to upload files.' ), 403 );
     19    wp_die( __( 'Sorry, you are not allowed to upload files.' ), 403 );
    2020}
    2121
     
    4444    wp_die(
    4545        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    46         '<p>' . __( 'You are not allowed to edit this item.' ) . '</p>',
     46        '<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
    4747        403
    4848    );
  • trunk/src/wp-admin/media.php

    r36887 r37914  
    2121
    2222    if ( !current_user_can('edit_post', $attachment_id) )
    23         wp_die ( __('You are not allowed to edit this attachment.') );
     23        wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
    2424
    2525    $errors = media_upload_form_handler();
     
    5555
    5656    if ( !current_user_can('edit_post', $att_id) )
    57         wp_die ( __('You are not allowed to edit this attachment.') );
     57        wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
    5858
    5959    $att = get_post($att_id);
  • trunk/src/wp-admin/ms-delete-site.php

    r37488 r37914  
    1414
    1515if ( ! current_user_can( 'delete_site' ) )
    16     wp_die(__( 'You do not have sufficient permissions to delete this site.'));
     16    wp_die(__( 'Sorry, you are not allowed to delete this site.'));
    1717
    1818if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' ) != false ) {
  • trunk/src/wp-admin/my-sites.php

    r37488 r37914  
    1414
    1515if ( ! current_user_can('read') )
    16     wp_die( __( 'You do not have sufficient permissions to access this page.' ) );
     16    wp_die( __( 'Sorry, you are not allowed to access this page.' ) );
    1717
    1818$action = isset( $_POST['action'] ) ? $_POST['action'] : 'splash';
  • trunk/src/wp-admin/nav-menus.php

    r37904 r37914  
    2323    wp_die(
    2424        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    25         '<p>' . __( 'You are not allowed to edit theme options on this site.' ) . '</p>',
     25        '<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
    2626        403
    2727    );
  • trunk/src/wp-admin/network.php

    r34292 r37914  
    1717
    1818if ( ! is_super_admin() ) {
    19     wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
     19    wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
    2020}
    2121
  • trunk/src/wp-admin/network/index.php

    r32974 r37914  
    1818
    1919if ( ! current_user_can( 'manage_network' ) )
    20     wp_die( __( 'You do not have permission to access this page.' ), 403 );
     20    wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
    2121
    2222$title = __( 'Dashboard' );
  • trunk/src/wp-admin/network/settings.php

    r37888 r37914  
    1818
    1919if ( ! current_user_can( 'manage_network_options' ) )
    20     wp_die( __( 'You do not have permission to access this page.' ), 403 );
     20    wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
    2121
    2222$title = __( 'Network Settings' );
  • trunk/src/wp-admin/network/site-info.php

    r37466 r37914  
    1616
    1717if ( ! current_user_can( 'manage_sites' ) ) {
    18     wp_die( __( 'You do not have sufficient permissions to edit this site.' ) );
     18    wp_die( __( 'Sorry, you are not allowed to edit this site.' ) );
    1919}
    2020
     
    4848
    4949if ( ! can_edit_network( $details->site_id ) ) {
    50     wp_die( __( 'You do not have permission to access this page.' ), 403 );
     50    wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
    5151}
    5252
  • trunk/src/wp-admin/network/site-new.php

    r36826 r37914  
    1818
    1919if ( ! current_user_can( 'manage_sites' ) )
    20     wp_die( __( 'You do not have sufficient permissions to add sites to this network.' ) );
     20    wp_die( __( 'Sorry, you are not allowed to add sites to this network.' ) );
    2121
    2222get_current_screen()->add_help_tab( array(
  • trunk/src/wp-admin/network/site-settings.php

    r37466 r37914  
    1515
    1616if ( ! current_user_can( 'manage_sites' ) )
    17     wp_die( __( 'You do not have sufficient permissions to edit this site.' ) );
     17    wp_die( __( 'Sorry, you are not allowed to edit this site.' ) );
    1818
    1919get_current_screen()->add_help_tab( array(
     
    4545
    4646if ( !can_edit_network( $details->site_id ) )
    47     wp_die( __( 'You do not have permission to access this page.' ), 403 );
     47    wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
    4848
    4949$is_main_site = is_main_site( $id );
  • trunk/src/wp-admin/network/site-themes.php

    r37466 r37914  
    1515
    1616if ( ! current_user_can( 'manage_sites' ) )
    17     wp_die( __( 'You do not have sufficient permissions to manage themes for this site.' ) );
     17    wp_die( __( 'Sorry, you are not allowed to manage themes for this site.' ) );
    1818
    1919get_current_screen()->add_help_tab( array(
     
    6868
    6969if ( !can_edit_network( $details->site_id ) )
    70     wp_die( __( 'You do not have permission to access this page.' ), 403 );
     70    wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
    7171
    7272$is_main_site = is_main_site( $id );
  • trunk/src/wp-admin/network/site-users.php

    r37488 r37914  
    1515
    1616if ( ! current_user_can('manage_sites') )
    17     wp_die(__('You do not have sufficient permissions to edit this site.'));
     17    wp_die(__('Sorry, you are not allowed to edit this site.'));
    1818
    1919$wp_list_table = _get_list_table('WP_Users_List_Table');
     
    6161
    6262if ( ! can_edit_network( $details->site_id ) )
    63     wp_die( __( 'You do not have permission to access this page.' ), 403 );
     63    wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
    6464
    6565$is_main_site = is_main_site( $id );
  • trunk/src/wp-admin/network/sites.php

    r37488 r37914  
    1515
    1616if ( ! current_user_can( 'manage_sites' ) )
    17     wp_die( __( 'You do not have permission to access this page.' ), 403 );
     17    wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
    1818
    1919$wp_list_table = _get_list_table( 'WP_MS_Sites_List_Table' );
     
    9292
    9393        if ( $current_site->blog_id == $id ) {
    94             wp_die( __( 'You are not allowed to change the current site.' ) );
     94            wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );
    9595        }
    9696
     
    127127        case 'deleteblog':
    128128            if ( ! current_user_can( 'delete_sites' ) )
    129                 wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
     129                wp_die( __( 'Sorry, you are not allowed to access this page.' ), '', array( 'response' => 403 ) );
    130130
    131131            $updated_action = 'not_deleted';
     
    145145                            case 'delete':
    146146                                if ( ! current_user_can( 'delete_site', $val ) )
    147                                     wp_die( __( 'You are not allowed to delete the site.' ) );
     147                                    wp_die( __( 'Sorry, you are not allowed to delete the site.' ) );
    148148
    149149                                $updated_action = 'all_delete';
     
    158158                        }
    159159                    } else {
    160                         wp_die( __( 'You are not allowed to change the current site.' ) );
     160                        wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );
    161161                    }
    162162                }
     
    238238        break;
    239239        case 'not_deleted':
    240             $msg = __( 'You do not have permission to delete that site.' );
     240            $msg = __( 'Sorry, you are not allowed to delete that site.' );
    241241        break;
    242242        case 'archiveblog':
  • trunk/src/wp-admin/network/themes.php

    r37714 r37914  
    1515
    1616if ( !current_user_can('manage_network_themes') )
    17     wp_die( __( 'You do not have sufficient permissions to manage network themes.' ) );
     17    wp_die( __( 'Sorry, you are not allowed to manage network themes.' ) );
    1818
    1919$wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
     
    9191        case 'delete-selected':
    9292            if ( ! current_user_can( 'delete_themes' ) ) {
    93                 wp_die( __('You do not have sufficient permissions to delete themes for this site.') );
     93                wp_die( __('Sorry, you are not allowed to delete themes for this site.') );
    9494            }
    9595
  • trunk/src/wp-admin/network/upgrade.php

    r37695 r37914  
    3737
    3838if ( ! current_user_can( 'manage_network' ) )
    39     wp_die( __( 'You do not have permission to access this page.' ), 403 );
     39    wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
    4040
    4141echo '<div class="wrap">';
  • trunk/src/wp-admin/network/user-new.php

    r36697 r37914  
    1515
    1616if ( ! current_user_can('create_users') )
    17     wp_die(__('You do not have sufficient permissions to add users to this network.'));
     17    wp_die(__('Sorry, you are not allowed to add users to this network.'));
    1818
    1919get_current_screen()->add_help_tab( array(
     
    3535
    3636    if ( ! current_user_can( 'manage_network_users' ) )
    37         wp_die( __( 'You do not have permission to access this page.' ), 403 );
     37        wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
    3838
    3939    if ( ! is_array( $_POST['user'] ) )
  • trunk/src/wp-admin/network/users.php

    r37680 r37914  
    1515
    1616if ( ! current_user_can( 'manage_network_users' ) )
    17     wp_die( __( 'You do not have permission to access this page.' ), 403 );
     17    wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
    1818
    1919if ( isset( $_GET['action'] ) ) {
     
    2424        case 'deleteuser':
    2525            if ( ! current_user_can( 'manage_network_users' ) )
    26                 wp_die( __( 'You do not have permission to access this page.' ), 403 );
     26                wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
    2727
    2828            check_admin_referer( 'deleteuser' );
     
    4545        case 'allusers':
    4646            if ( !current_user_can( 'manage_network_users' ) )
    47                 wp_die( __( 'You do not have permission to access this page.' ), 403 );
     47                wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
    4848
    4949            if ( ( isset( $_POST['action']) || isset($_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) {
     
    5858                            case 'delete':
    5959                                if ( ! current_user_can( 'delete_users' ) )
    60                                     wp_die( __( 'You do not have permission to access this page.' ), 403 );
     60                                    wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
    6161                                $title = __( 'Users' );
    6262                                $parent_file = 'users.php';
     
    107107            check_admin_referer( 'ms-users-delete' );
    108108            if ( ! ( current_user_can( 'manage_network_users' ) && current_user_can( 'delete_users' ) ) )
    109                 wp_die( __( 'You do not have permission to access this page.' ), 403 );
     109                wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
    110110
    111111            if ( ! empty( $_POST['blog'] ) && is_array( $_POST['blog'] ) ) {
  • trunk/src/wp-admin/options-discussion.php

    r37674 r37914  
    1010
    1111if ( ! current_user_can( 'manage_options' ) )
    12     wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
     12    wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
    1313
    1414$title = __('Discussion Settings');
  • trunk/src/wp-admin/options-general.php

    r37674 r37914  
    1414
    1515if ( ! current_user_can( 'manage_options' ) )
    16     wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
     16    wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
    1717
    1818$title = __('General Settings');
  • trunk/src/wp-admin/options-media.php

    r35550 r37914  
    1111
    1212if ( ! current_user_can( 'manage_options' ) )
    13     wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
     13    wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
    1414
    1515$title = __('Media Settings');
  • trunk/src/wp-admin/options-permalink.php

    r37747 r37914  
    1111
    1212if ( ! current_user_can( 'manage_options' ) )
    13     wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
     13    wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
    1414
    1515$title = __('Permalink Settings');
  • trunk/src/wp-admin/options-reading.php

    r34022 r37914  
    1111
    1212if ( ! current_user_can( 'manage_options' ) )
    13     wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
     13    wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
    1414
    1515$title = __( 'Reading Settings' );
  • trunk/src/wp-admin/options-writing.php

    r37488 r37914  
    1111
    1212if ( ! current_user_can( 'manage_options' ) )
    13     wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
     13    wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
    1414
    1515$title = __('Writing Settings');
  • trunk/src/wp-admin/options.php

    r37488 r37914  
    4848    wp_die(
    4949        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    50         '<p>' . __( 'You are not allowed to manage these items.' ) . '</p>',
     50        '<p>' . __( 'Sorry, you are not allowed to manage these items.' ) . '</p>',
    5151        403
    5252    );
     
    7777    wp_die(
    7878        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    79         '<p>' . __( 'You are not allowed to delete these items.' ) . '</p>',
     79        '<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
    8080        403
    8181    );
     
    161161    if ( 'options' == $option_page ) {
    162162        if ( is_multisite() && ! is_super_admin() )
    163             wp_die( __( 'You do not have sufficient permissions to modify unregistered settings for this site.' ) );
     163            wp_die( __( 'Sorry, you are not allowed to modify unregistered settings for this site.' ) );
    164164        $options = explode( ',', wp_unslash( $_POST[ 'page_options' ] ) );
    165165    } else {
  • trunk/src/wp-admin/plugin-editor.php

    r37680 r37914  
    1616
    1717if ( !current_user_can('edit_plugins') )
    18     wp_die( __('You do not have sufficient permissions to edit plugins for this site.') );
     18    wp_die( __('Sorry, you are not allowed to edit plugins for this site.') );
    1919
    2020$title = __("Edit Plugins");
  • trunk/src/wp-admin/plugin-install.php

    r37714 r37914  
    1616
    1717if ( ! current_user_can('install_plugins') )
    18     wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
     18    wp_die(__('Sorry, you are not allowed to install plugins on this site.'));
    1919
    2020if ( is_multisite() && ! is_network_admin() ) {
  • trunk/src/wp-admin/plugins.php

    r37714 r37914  
    1111
    1212if ( ! current_user_can('activate_plugins') )
    13     wp_die( __( 'You do not have sufficient permissions to manage plugins for this site.' ) );
     13    wp_die( __( 'Sorry, you are not allowed to manage plugins for this site.' ) );
    1414
    1515$wp_list_table = _get_list_table('WP_Plugins_List_Table');
     
    3131        case 'activate':
    3232            if ( ! current_user_can('activate_plugins') )
    33                 wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));
     33                wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
    3434
    3535            if ( is_multisite() && ! is_network_admin() && is_network_only_plugin( $plugin ) ) {
     
    7070        case 'activate-selected':
    7171            if ( ! current_user_can('activate_plugins') )
    72                 wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));
     72                wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
    7373
    7474            check_admin_referer('bulk-plugins');
     
    148148        case 'error_scrape':
    149149            if ( ! current_user_can('activate_plugins') )
    150                 wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));
     150                wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
    151151
    152152            check_admin_referer('plugin-activation-error_' . $plugin);
     
    169169        case 'deactivate':
    170170            if ( ! current_user_can('activate_plugins') )
    171                 wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.'));
     171                wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
    172172
    173173            check_admin_referer('deactivate-plugin_' . $plugin);
     
    194194        case 'deactivate-selected':
    195195            if ( ! current_user_can('activate_plugins') )
    196                 wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.'));
     196                wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
    197197
    198198            check_admin_referer('bulk-plugins');
     
    229229        case 'delete-selected':
    230230            if ( ! current_user_can('delete_plugins') ) {
    231                 wp_die(__('You do not have sufficient permissions to delete plugins for this site.'));
     231                wp_die(__('Sorry, you are not allowed to delete plugins for this site.'));
    232232            }
    233233
  • trunk/src/wp-admin/post-new.php

    r33864 r37914  
    5858    wp_die(
    5959        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    60         '<p>' . __( 'You are not allowed to create posts as this user.' ) . '</p>',
     60        '<p>' . __( 'Sorry, you are not allowed to create posts as this user.' ) . '</p>',
    6161        403
    6262    );
  • trunk/src/wp-admin/post.php

    r37424 r37914  
    111111
    112112    if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
    113         wp_die( __( 'You are not allowed to edit posts in this post type.' ) );
     113        wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
    114114    }
    115115
    116116    if ( ! current_user_can( 'edit_post', $post_id ) )
    117         wp_die( __( 'You are not allowed to edit this item.' ) );
     117        wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
    118118
    119119    if ( 'trash' == $post->post_status )
     
    212212
    213213    if ( ! current_user_can( 'delete_post', $post_id ) )
    214         wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
     214        wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
    215215
    216216    if ( $user_id = wp_check_post_lock( $post_id ) ) {
     
    235235
    236236    if ( ! current_user_can( 'delete_post', $post_id ) )
    237         wp_die( __( 'You are not allowed to restore this item from the Trash.' ) );
     237        wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
    238238
    239239    if ( ! wp_untrash_post( $post_id ) )
     
    253253
    254254    if ( ! current_user_can( 'delete_post', $post_id ) )
    255         wp_die( __( 'You are not allowed to delete this item.' ) );
     255        wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
    256256
    257257    if ( $post->post_type == 'attachment' ) {
  • trunk/src/wp-admin/press-this.php

    r33865 r37914  
    1515    wp_die(
    1616        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    17         '<p>' . __( 'You are not allowed to create posts as this user.' ) . '</p>',
     17        '<p>' . __( 'Sorry, you are not allowed to create posts as this user.' ) . '</p>',
    1818        403
    1919    );
  • trunk/src/wp-admin/term.php

    r36969 r37914  
    3636    wp_die(
    3737        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    38         '<p>' . __( 'You are not allowed to manage this item.' ) . '</p>',
     38        '<p>' . __( 'Sorry, you are not allowed to manage this item.' ) . '</p>',
    3939        403
    4040    );
  • trunk/src/wp-admin/theme-editor.php

    r37680 r37914  
    1616
    1717if ( !current_user_can('edit_themes') )
    18     wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this site.').'</p>');
     18    wp_die('<p>'.__('Sorry, you are not allowed to edit templates for this site.').'</p>');
    1919
    2020$title = __("Edit Themes");
  • trunk/src/wp-admin/theme-install.php

    r37742 r37914  
    1414
    1515if ( ! current_user_can('install_themes') )
    16     wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
     16    wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
    1717
    1818if ( is_multisite() && ! is_network_admin() ) {
  • trunk/src/wp-admin/themes.php

    r37714 r37914  
    1313    wp_die(
    1414        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    15         '<p>' . __( 'You are not allowed to edit theme options on this site.' ) . '</p>',
     15        '<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
    1616        403
    1717    );
     
    4141            wp_die(
    4242                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    43                 '<p>' . __( 'You are not allowed to delete this item.' ) . '</p>',
     43                '<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
    4444                403
    4545            );
  • trunk/src/wp-admin/update-core.php

    r37162 r37914  
    2121
    2222if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) )
    23     wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
     23    wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
    2424
    2525/**
     
    624624
    625625    if ( ! current_user_can( 'update_core' ) )
    626         wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
     626        wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
    627627
    628628    check_admin_referer('upgrade-core');
     
    648648
    649649    if ( ! current_user_can( 'update_plugins' ) )
    650         wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
     650        wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
    651651
    652652    check_admin_referer('upgrade-core');
     
    676676
    677677    if ( ! current_user_can( 'update_themes' ) )
    678         wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
     678        wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
    679679
    680680    check_admin_referer('upgrade-core');
     
    706706
    707707    if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_themes' ) )
    708         wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
     708        wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
    709709
    710710    check_admin_referer( 'upgrade-translations' );
  • trunk/src/wp-admin/update.php

    r34598 r37914  
    2222    if ( 'update-selected' == $action ) {
    2323        if ( ! current_user_can( 'update_plugins' ) )
    24             wp_die( __( 'You do not have sufficient permissions to update plugins for this site.' ) );
     24            wp_die( __( 'Sorry, you are not allowed to update plugins for this site.' ) );
    2525
    2626        check_admin_referer( 'bulk-update-plugins' );
     
    4848    } elseif ( 'upgrade-plugin' == $action ) {
    4949        if ( ! current_user_can('update_plugins') )
    50             wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
     50            wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
    5151
    5252        check_admin_referer('upgrade-plugin_' . $plugin);
     
    6969    } elseif ('activate-plugin' == $action ) {
    7070        if ( ! current_user_can('update_plugins') )
    71             wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
     71            wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
    7272
    7373        check_admin_referer('activate-plugin_' . $plugin);
     
    9494
    9595        if ( ! current_user_can('install_plugins') )
    96             wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
     96            wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
    9797
    9898        include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
     
    142142
    143143        if ( ! current_user_can( 'upload_plugins' ) ) {
    144             wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
     144            wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
    145145        }
    146146
     
    170170
    171171        if ( ! current_user_can('update_themes') )
    172             wp_die(__('You do not have sufficient permissions to update themes for this site.'));
     172            wp_die(__('Sorry, you are not allowed to update themes for this site.'));
    173173
    174174        check_admin_referer('upgrade-theme_' . $theme);
     
    191191    } elseif ( 'update-selected-themes' == $action ) {
    192192        if ( ! current_user_can( 'update_themes' ) )
    193             wp_die( __( 'You do not have sufficient permissions to update themes for this site.' ) );
     193            wp_die( __( 'Sorry, you are not allowed to update themes for this site.' ) );
    194194
    195195        check_admin_referer( 'bulk-update-themes' );
     
    217217
    218218        if ( ! current_user_can('install_themes') )
    219             wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
     219            wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
    220220
    221221        include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api..
     
    247247
    248248        if ( ! current_user_can( 'upload_themes' ) ) {
    249             wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
     249            wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
    250250        }
    251251
  • trunk/src/wp-admin/upload.php

    r36987 r37914  
    1111
    1212if ( !current_user_can('upload_files') )
    13     wp_die( __( 'You do not have permission to upload files.' ) );
     13    wp_die( __( 'Sorry, you are not allowed to upload files.' ) );
    1414
    1515$mode = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
     
    133133            foreach ( (array) $post_ids as $post_id ) {
    134134                if ( !current_user_can( 'delete_post', $post_id ) )
    135                     wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
     135                    wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
    136136
    137137                if ( !wp_trash_post( $post_id ) )
     
    145145            foreach ( (array) $post_ids as $post_id ) {
    146146                if ( !current_user_can( 'delete_post', $post_id ) )
    147                     wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
     147                    wp_die( __( 'Sorry, you are not allowed to move this item out of the Trash.' ) );
    148148
    149149                if ( !wp_untrash_post( $post_id ) )
     
    157157            foreach ( (array) $post_ids as $post_id_del ) {
    158158                if ( !current_user_can( 'delete_post', $post_id_del ) )
    159                     wp_die( __( 'You are not allowed to delete this item.' ) );
     159                    wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
    160160
    161161                if ( !wp_delete_attachment( $post_id_del ) )
  • trunk/src/wp-admin/user-edit.php

    r37488 r37914  
    7878    && ! apply_filters( 'enable_edit_any_user_configuration', true )
    7979) {
    80     wp_die( __( 'You do not have permission to edit this user.' ) );
     80    wp_die( __( 'Sorry, you are not allowed to edit this user.' ) );
    8181}
    8282
     
    111111
    112112if ( !current_user_can('edit_user', $user_id) )
    113     wp_die(__('You do not have permission to edit this user.'));
     113    wp_die(__('Sorry, you are not allowed to edit this user.'));
    114114
    115115if ( IS_PROFILE_PAGE ) {
     
    164164
    165165if ( !current_user_can('edit_user', $user_id) )
    166     wp_die(__('You do not have permission to edit this user.'));
     166    wp_die(__('Sorry, you are not allowed to edit this user.'));
    167167
    168168$sessions = WP_Session_Tokens::get_instance( $profileuser->ID );
  • trunk/src/wp-admin/user-new.php

    r37488 r37914  
    1414        wp_die(
    1515            '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    16             '<p>' . __( 'You do not have sufficient permissions to add users to this network.' ) . '</p>',
     16            '<p>' . __( 'Sorry, you are not allowed to add users to this network.' ) . '</p>',
    1717            403
    1818        );
     
    2121    wp_die(
    2222        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    23         '<p>' . __( 'You are not allowed to create users.' ) . '</p>',
     23        '<p>' . __( 'Sorry, you are not allowed to create users.' ) . '</p>',
    2424        403
    2525    );
     
    5454        wp_die(
    5555            '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    56             '<p>' . __( 'You do not have sufficient permissions to add users to this network.' ) . '</p>',
     56            '<p>' . __( 'Sorry, you are not allowed to add users to this network.' ) . '</p>',
    5757            403
    5858        );
     
    108108        wp_die(
    109109            '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    110             '<p>' . __( 'You are not allowed to create users.' ) . '</p>',
     110            '<p>' . __( 'Sorry, you are not allowed to create users.' ) . '</p>',
    111111            403
    112112        );
  • trunk/src/wp-admin/users.php

    r37680 r37914  
    1414    wp_die(
    1515        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    16         '<p>' . __( 'You are not allowed to browse users.' ) . '</p>',
     16        '<p>' . __( 'Sorry, you are not allowed to browse users.' ) . '</p>',
    1717        403
    1818    );
  • trunk/src/wp-admin/widgets.php

    r37904 r37914  
    1616    wp_die(
    1717        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
    18         '<p>' . __( 'You are not allowed to edit theme options on this site.' ) . '</p>',
     18        '<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
    1919        403
    2020    );
  • trunk/src/wp-includes/class-wp-customize-manager.php

    r37700 r37914  
    388388
    389389        if ( ! current_user_can( 'customize' ) ) {
    390             $this->wp_die( -1, __( 'You are not allowed to customize this site.' ) );
     390            $this->wp_die( -1, __( 'Sorry, you are not allowed to customize this site.' ) );
    391391        }
    392392
     
    402402            // switch_themes cap, bail.
    403403            if ( ! current_user_can( 'switch_themes' ) ) {
    404                 $this->wp_die( -1, __( 'You are not allowed to edit theme options on this site.' ) );
     404                $this->wp_die( -1, __( 'Sorry, you are not allowed to edit theme options on this site.' ) );
    405405            }
    406406
  • trunk/src/wp-includes/class-wp-xmlrpc-server.php

    r37890 r37914  
    13411341        if ( ! empty( $post_data['post_author'] ) && $post_data['post_author'] != $user->ID ) {
    13421342            if ( ! current_user_can( $post_type->cap->edit_others_posts ) )
    1343                 return new IXR_Error( 401, __( 'You are not allowed to create posts as this user.' ) );
     1343                return new IXR_Error( 401, __( 'Sorry, you are not allowed to create posts as this user.' ) );
    13441344
    13451345            $author = get_userdata( $post_data['post_author'] );
     
    16351635
    16361636        if ( ! current_user_can( 'delete_post', $post_id ) ) {
    1637             return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete this post.' ) );
     1637            return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this post.' ) );
    16381638        }
    16391639
     
    17931793
    17941794        if ( ! current_user_can( $post_type->cap->edit_posts ) )
    1795             return new IXR_Error( 401, __( 'You are not allowed to edit posts in this post type.' ));
     1795            return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts in this post type.' ));
    17961796
    17971797        $query['post_type'] = $post_type->name;
     
    18761876
    18771877        if ( ! current_user_can( $taxonomy->cap->manage_terms ) )
    1878             return new IXR_Error( 401, __( 'You are not allowed to create terms in this taxonomy.' ) );
     1878            return new IXR_Error( 401, __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) );
    18791879
    18801880        $taxonomy = (array) $taxonomy;
     
    19631963
    19641964        if ( ! current_user_can( $taxonomy->cap->edit_terms ) )
    1965             return new IXR_Error( 401, __( 'You are not allowed to edit terms in this taxonomy.' ) );
     1965            return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ) );
    19661966
    19671967        $taxonomy = (array) $taxonomy;
     
    20592059
    20602060        if ( ! current_user_can( $taxonomy->cap->delete_terms ) )
    2061             return new IXR_Error( 401, __( 'You are not allowed to delete terms in this taxonomy.' ) );
     2061            return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete terms in this taxonomy.' ) );
    20622062
    20632063        $term = get_term( $term_id, $taxonomy->name );
     
    21302130
    21312131        if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
    2132             return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
     2132            return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ) );
    21332133
    21342134        $term = get_term( $term_id , $taxonomy->name, ARRAY_A );
     
    21882188
    21892189        if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
    2190             return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
     2190            return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ) );
    21912191
    21922192        $query = array();
     
    22832283
    22842284        if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
    2285             return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
     2285            return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ) );
    22862286
    22872287        return $this->_prepare_taxonomy( $taxonomy, $fields );
     
    24712471
    24722472        if ( ! current_user_can( 'list_users' ) )
    2473             return new IXR_Error( 401, __( 'You are not allowed to browse users.' ) );
     2473            return new IXR_Error( 401, __( 'Sorry, you are not allowed to browse users.' ) );
    24742474
    24752475        $query = array( 'fields' => 'all_with_meta' );
     
    27952795        // Make sure the user can delete pages.
    27962796        if ( !current_user_can('delete_page', $page_id) )
    2797             return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete this page.' ) );
     2797            return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this page.' ) );
    27982798
    27992799        // Attempt to delete the page.
     
    28572857        // Make sure the user is allowed to edit pages.
    28582858        if ( !current_user_can('edit_page', $page_id) )
    2859             return new IXR_Error( 401, __( 'Sorry, you do not have the right to edit this page.' ) );
     2859            return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this page.' ) );
    28602860
    28612861        // Mark this as content for a page.
     
    30543054        // Make sure the user is allowed to add a category.
    30553055        if ( !current_user_can('manage_categories') )
    3056             return new IXR_Error(401, __('Sorry, you do not have the right to add a category.'));
     3056            return new IXR_Error(401, __('Sorry, you are not allowed to add a category.'));
    30573057
    30583058        // If no slug was provided make it empty so that
     
    31293129
    31303130        if ( !current_user_can('manage_categories') )
    3131             return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete a category.' ) );
     3131            return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete a category.' ) );
    31323132
    31333133        $status = wp_delete_term( $category_id, 'category' );
     
    32273227
    32283228        if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
    3229             return new IXR_Error( 403, __( 'You are not allowed to moderate or edit this comment.' ) );
     3229            return new IXR_Error( 403, __( 'Sorry, you are not allowed to moderate or edit this comment.' ) );
    32303230        }
    32313231
     
    33593359
    33603360        if ( !current_user_can( 'edit_comment', $comment_ID ) ) {
    3361             return new IXR_Error( 403, __( 'You are not allowed to moderate or edit this comment.' ) );
     3361            return new IXR_Error( 403, __( 'Sorry, you are not allowed to moderate or edit this comment.' ) );
    33623362        }
    33633363
     
    34263426
    34273427        if ( ! current_user_can( 'edit_comment', $comment_ID ) ) {
    3428             return new IXR_Error( 403, __( 'You are not allowed to moderate or edit this comment.' ) );
     3428            return new IXR_Error( 403, __( 'Sorry, you are not allowed to moderate or edit this comment.' ) );
    34293429        }
    34303430
     
    36303630
    36313631        if ( ! current_user_can( 'publish_posts' ) ) {
    3632             return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
     3632            return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details about this site.' ) );
    36333633        }
    36343634
     
    36713671
    36723672        if ( ! current_user_can( 'edit_post', $post_id ) ) {
    3673             return new IXR_Error( 403, __( 'You are not allowed access to details of this post.' ) );
     3673            return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details of this post.' ) );
    36743674        }
    36753675
     
    37113711
    37123712        if ( !current_user_can( 'edit_posts' ) )
    3713             return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
     3713            return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details about this site.' ) );
    37143714
    37153715        /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
     
    37433743
    37443744        if ( !current_user_can( 'edit_pages' ) )
    3745             return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
     3745            return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details about this site.' ) );
    37463746
    37473747        /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
     
    37753775
    37763776        if ( !current_user_can( 'edit_pages' ) )
    3777             return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
     3777            return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details about this site.' ) );
    37783778
    37793779        $templates = get_page_templates();
     
    38693869
    38703870        if ( !current_user_can( 'manage_options' ) )
    3871             return new IXR_Error( 403, __( 'You are not allowed to update options.' ) );
     3871            return new IXR_Error( 403, __( 'Sorry, you are not allowed to update options.' ) );
    38723872
    38733873        $option_names = array();
     
    39213921
    39223922        if ( !current_user_can( 'upload_files' ) )
    3923             return new IXR_Error( 403, __( 'You do not have permission to upload files.' ) );
     3923            return new IXR_Error( 403, __( 'Sorry, you are not allowed to upload files.' ) );
    39243924
    39253925        /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
     
    39693969
    39703970        if ( !current_user_can( 'upload_files' ) )
    3971             return new IXR_Error( 401, __( 'You do not have permission to upload files.' ) );
     3971            return new IXR_Error( 401, __( 'Sorry, you are not allowed to upload files.' ) );
    39723972
    39733973        /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
     
    40134013
    40144014        if ( !current_user_can( 'edit_posts' ) )
    4015             return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
     4015            return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details about this site.' ) );
    40164016
    40174017        /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
     
    46834683
    46844684        if ( ! current_user_can( 'edit_post', $post_ID ) ) {
    4685             return new IXR_Error(401, __('Sorry, you do not have the right to edit this post.'));
     4685            return new IXR_Error(401, __('Sorry, you are not allowed to edit this post.'));
    46864686        }
    46874687        if ( 'publish' == $actual_post['post_status'] && ! current_user_can( 'publish_posts' ) ) {
    4688             return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this post.' ) );
     4688            return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish this post.' ) );
    46894689        }
    46904690
     
    47534753
    47544754        if ( ! current_user_can( 'delete_post', $post_ID ) ) {
    4755             return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete this post.' ) );
     4755            return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this post.' ) );
    47564756        }
    47574757
     
    49064906                case "post":
    49074907                    if ( !current_user_can( 'edit_others_posts' ) )
    4908                         return new IXR_Error( 401, __( 'You are not allowed to create posts as this user.' ) );
     4908                        return new IXR_Error( 401, __( 'Sorry, you are not allowed to create posts as this user.' ) );
    49094909                    break;
    49104910                case "page":
    49114911                    if ( !current_user_can( 'edit_others_pages' ) )
    4912                         return new IXR_Error( 401, __( 'You are not allowed to create pages as this user.' ) );
     4912                        return new IXR_Error( 401, __( 'Sorry, you are not allowed to create pages as this user.' ) );
    49134913                    break;
    49144914                default:
     
    51875187
    51885188        if ( ! current_user_can( 'edit_post', $post_ID ) )
    5189             return new IXR_Error( 401, __( 'Sorry, you do not have the right to edit this post.' ) );
     5189            return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
    51905190
    51915191        // Use wp.editPost to edit post types other than post and page.
     
    52465246                    case 'post':
    52475247                        if ( ! current_user_can( 'edit_others_posts' ) ) {
    5248                             return new IXR_Error( 401, __( 'You are not allowed to change the post author as this user.' ) );
     5248                            return new IXR_Error( 401, __( 'Sorry, you are not allowed to change the post author as this user.' ) );
    52495249                        }
    52505250                        break;
    52515251                    case 'page':
    52525252                        if ( ! current_user_can( 'edit_others_pages' ) ) {
    5253                             return new IXR_Error( 401, __( 'You are not allowed to change the page author as this user.' ) );
     5253                            return new IXR_Error( 401, __( 'Sorry, you are not allowed to change the page author as this user.' ) );
    52545254                        }
    52555255                        break;
     
    53585358        if ( 'publish' == $post_status || 'private' == $post_status ) {
    53595359            if ( 'page' == $post_type && ! current_user_can( 'publish_pages' ) ) {
    5360                 return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this page.' ) );
     5360                return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish this page.' ) );
    53615361            } elseif ( ! current_user_can( 'publish_posts' ) ) {
    5362                 return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this post.' ) );
     5362                return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish this post.' ) );
    53635363            }
    53645364        }
     
    57915791
    57925792        if ( !current_user_can('upload_files') ) {
    5793             $this->error = new IXR_Error( 401, __( 'You do not have permission to upload files.' ) );
     5793            $this->error = new IXR_Error( 401, __( 'Sorry, you are not allowed to upload files.' ) );
    57945794            return $this->error;
    57955795        }
  • trunk/src/wp-includes/revision.php

    r37854 r37914  
    546546
    547547        if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) )
    548             wp_die( __('You do not have permission to preview drafts.') );
     548            wp_die( __('Sorry, you are not allowed to preview drafts.') );
    549549
    550550        add_filter('the_preview', '_set_preview');
  • trunk/src/wp-includes/script-loader.php

    r37908 r37914  
    125125    $scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), false, 1 );
    126126    did_action( 'init' ) && $scripts->localize( 'wp-ajax-response', 'wpAjax', array(
    127         'noPerm' => __('You do not have permission to do that.'),
     127        'noPerm' => __('Sorry, you are not allowed to do that.'),
    128128        'broken' => __('An unidentified error has occurred.')
    129129    ) );
     
    446446        'close'              => __( 'Close' ),
    447447        'cheatin'            => __( 'Cheatin&#8217; uh?' ),
    448         'notAllowed'         => __( 'You are not allowed to customize this site.' ),
     448        'notAllowed'         => __( 'Sorry, you are not allowed to customize this site.' ),
    449449        'previewIframeTitle' => __( 'Site Preview' ),
    450450        'loginIframeTitle'   => __( 'Session expired' ),
     
    486486        $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array( 'jquery', 'wp-ajax-response' ), false, 1 );
    487487        did_action( 'init' ) && $scripts->localize( 'admin-tags', 'tagsl10n', array(
    488             'noPerm' => __('You do not have permission to do that.'),
     488            'noPerm' => __('Sorry, you are not allowed to do that.'),
    489489            'broken' => __('An unidentified error has occurred.')
    490490        ));
  • trunk/tests/phpunit/tests/admin/includesPost.php

    r36853 r37914  
    6565        $this->assertInstanceOf( 'WP_Error', $_results );
    6666        $this->assertEquals( 'edit_others_posts', $_results->get_error_code() );
    67         $this->assertEquals( 'You are not allowed to create posts as this user.', $_results->get_error_message() );
     67        $this->assertEquals( 'Sorry, you are not allowed to create posts as this user.', $_results->get_error_message() );
    6868
    6969        // Edit Draft Post for another user
     
    7878        $this->assertInstanceOf( 'WP_Error', $_results );
    7979        $this->assertEquals( 'edit_others_posts', $_results->get_error_code() );
    80         $this->assertEquals( 'You are not allowed to edit posts as this user.', $_results->get_error_message() );
     80        $this->assertEquals( 'Sorry, you are not allowed to edit posts as this user.', $_results->get_error_message() );
    8181    }
    8282
  • trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php

    r25002 r37914  
    4444        $this->assertInstanceOf( 'IXR_Error', $result );
    4545        $this->assertEquals( 401, $result->code );
    46         $this->assertEquals( __( 'You are not allowed to delete terms in this taxonomy.' ), $result->message );
     46        $this->assertEquals( __( 'Sorry, you are not allowed to delete terms in this taxonomy.' ), $result->message );
    4747    }
    4848
  • trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php

    r36163 r37914  
    4545        $this->assertInstanceOf( 'IXR_Error', $result );
    4646        $this->assertEquals( 403, $result->code );
    47         $this->assertEquals( __( 'You are not allowed to moderate or edit this comment.' ), $result->message );
     47        $this->assertEquals( __( 'Sorry, you are not allowed to moderate or edit this comment.' ), $result->message );
    4848    }
    4949
  • trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php

    r34580 r37914  
    5050        $this->assertInstanceOf( 'IXR_Error', $result );
    5151        $this->assertEquals( 401, $result->code );
    52         $this->assertEquals( __( 'You are not allowed to edit terms in this taxonomy.' ), $result->message );
     52        $this->assertEquals( __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ), $result->message );
    5353    }
    5454
  • trunk/tests/phpunit/tests/xmlrpc/wp/getTaxonomy.php

    r25002 r37914  
    3636        $this->assertInstanceOf( 'IXR_Error', $result );
    3737        $this->assertEquals( 401, $result->code );
    38         $this->assertEquals( __( 'You are not allowed to assign terms in this taxonomy.' ), $result->message );
     38        $this->assertEquals( __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ), $result->message );
    3939    }
    4040
  • trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php

    r25002 r37914  
    4444        $this->assertInstanceOf( 'IXR_Error', $result );
    4545        $this->assertEquals( 401, $result->code );
    46         $this->assertEquals( __( 'You are not allowed to assign terms in this taxonomy.' ), $result->message );
     46        $this->assertEquals( __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ), $result->message );
    4747    }
    4848
  • trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php

    r35242 r37914  
    3636        $this->assertInstanceOf( 'IXR_Error', $result );
    3737        $this->assertEquals( 401, $result->code );
    38         $this->assertEquals( __( 'You are not allowed to assign terms in this taxonomy.' ), $result->message );
     38        $this->assertEquals( __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ), $result->message );
    3939    }
    4040
  • trunk/tests/phpunit/tests/xmlrpc/wp/newTerm.php

    r25002 r37914  
    4545        $this->assertInstanceOf( 'IXR_Error', $result );
    4646        $this->assertEquals( 401, $result->code );
    47         $this->assertEquals( __( 'You are not allowed to create terms in this taxonomy.' ), $result->message );
     47        $this->assertEquals( __( 'Sorry, you are not allowed to create terms in this taxonomy.' ), $result->message );
    4848    }
    4949
Note: See TracChangeset for help on using the changeset viewer.