Index: /trunk/src/wp-admin/custom-header.php =================================================================== --- /trunk/src/wp-admin/custom-header.php (revision 42718) +++ /trunk/src/wp-admin/custom-header.php (revision 42719) @@ -759,5 +759,5 @@ if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) { wp_die( - '
' . __( 'The current theme does not support uploading a custom header image.' ) . '
', 403 @@ -923,5 +923,5 @@ if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) { wp_die( - '' . __( 'The current theme does not support uploading a custom header image.' ) . '
', 403 @@ -931,5 +931,5 @@ if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) { wp_die( - '' . __( 'The current theme does not support a flexible sized header image.' ) . '
', 403 Index: /trunk/src/wp-admin/customize.php =================================================================== --- /trunk/src/wp-admin/customize.php (revision 42718) +++ /trunk/src/wp-admin/customize.php (revision 42719) @@ -15,5 +15,5 @@ if ( ! current_user_can( 'customize' ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to customize this site.' ) . '
', 403 @@ -32,5 +32,5 @@ if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $changeset_post->ID ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to edit this changeset.' ) . '
', 403 @@ -77,5 +77,5 @@ if ( in_array( get_post_status( $changeset_post->ID ), array( 'publish', 'trash' ), true ) ) { wp_die( - '' . __( 'This changeset cannot be further modified.' ) . '
' . '' . __( 'Customize New Changes' ) . '
', Index: /trunk/src/wp-admin/edit-comments.php =================================================================== --- /trunk/src/wp-admin/edit-comments.php (revision 42718) +++ /trunk/src/wp-admin/edit-comments.php (revision 42719) @@ -11,5 +11,5 @@ if ( ! current_user_can( 'edit_posts' ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to edit comments.' ) . '
', 403 Index: /trunk/src/wp-admin/edit-tags.php =================================================================== --- /trunk/src/wp-admin/edit-tags.php (revision 42718) +++ /trunk/src/wp-admin/edit-tags.php (revision 42719) @@ -26,5 +26,5 @@ if ( ! current_user_can( $tax->cap->manage_terms ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to manage terms in this taxonomy.' ) . '
', 403 @@ -82,5 +82,5 @@ if ( ! current_user_can( $tax->cap->edit_terms ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) . '
', 403 @@ -112,5 +112,5 @@ if ( ! current_user_can( 'delete_term', $tag_ID ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to delete this item.' ) . '
', 403 @@ -132,5 +132,5 @@ if ( ! current_user_can( $tax->cap->delete_terms ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to delete these items.' ) . '
', 403 @@ -168,5 +168,5 @@ if ( ! current_user_can( 'edit_term', $tag_ID ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to edit this item.' ) . '
', 403 Index: /trunk/src/wp-admin/edit.php =================================================================== --- /trunk/src/wp-admin/edit.php (revision 42718) +++ /trunk/src/wp-admin/edit.php (revision 42719) @@ -39,5 +39,5 @@ if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to edit posts in this post type.' ) . '
', 403 Index: /trunk/src/wp-admin/includes/bookmark.php =================================================================== --- /trunk/src/wp-admin/includes/bookmark.php (revision 42718) +++ /trunk/src/wp-admin/includes/bookmark.php (revision 42719) @@ -29,5 +29,5 @@ if ( ! current_user_can( 'manage_links' ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to edit the links for this site.' ) . '
', 403 Index: /trunk/src/wp-admin/includes/file.php =================================================================== --- /trunk/src/wp-admin/includes/file.php (revision 42718) +++ /trunk/src/wp-admin/includes/file.php (revision 42719) @@ -592,5 +592,5 @@ if ( ! isset( $result['message'] ) ) { - $message = __( 'An error has occurred.' ); + $message = __( 'Something went wrong.' ); } else { $message = $result['message']; Index: /trunk/src/wp-admin/media-upload.php =================================================================== --- /trunk/src/wp-admin/media-upload.php (revision 42718) +++ /trunk/src/wp-admin/media-upload.php (revision 42719) @@ -36,5 +36,5 @@ if ( isset( $action ) && $action == 'edit' && ! $ID ) { wp_die( - '' . __( 'Invalid item ID.' ) . '
', 403 @@ -44,5 +44,5 @@ if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post', $_REQUEST['post_id'] ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to edit this item.' ) . '
', 403 Index: /trunk/src/wp-admin/nav-menus.php =================================================================== --- /trunk/src/wp-admin/nav-menus.php (revision 42718) +++ /trunk/src/wp-admin/nav-menus.php (revision 42719) @@ -23,5 +23,5 @@ if ( ! current_user_can( 'edit_theme_options' ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '
', 403 Index: /trunk/src/wp-admin/network/site-users.php =================================================================== --- /trunk/src/wp-admin/network/site-users.php (revision 42718) +++ /trunk/src/wp-admin/network/site-users.php (revision 42719) @@ -160,5 +160,5 @@ if ( ! is_user_member_of_blog( $user_id ) ) { wp_die( - '' . __( 'One of the selected users is not a member of this site.' ) . '
', 403 Index: /trunk/src/wp-admin/options.php =================================================================== --- /trunk/src/wp-admin/options.php (revision 42718) +++ /trunk/src/wp-admin/options.php (revision 42719) @@ -47,5 +47,5 @@ if ( ! current_user_can( $capability ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to manage these options.' ) . '
', 403 @@ -75,5 +75,5 @@ if ( is_multisite() && ! current_user_can( 'manage_network_options' ) && 'update' != $action ) { wp_die( - '' . __( 'Sorry, you are not allowed to delete these items.' ) . '
', 403 Index: /trunk/src/wp-admin/post-new.php =================================================================== --- /trunk/src/wp-admin/post-new.php (revision 42718) +++ /trunk/src/wp-admin/post-new.php (revision 42719) @@ -58,5 +58,5 @@ if ( ! current_user_can( $post_type_object->cap->edit_posts ) || ! current_user_can( $post_type_object->cap->create_posts ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to create posts as this user.' ) . '
', 403 Index: /trunk/src/wp-admin/press-this.php =================================================================== --- /trunk/src/wp-admin/press-this.php (revision 42718) +++ /trunk/src/wp-admin/press-this.php (revision 42719) @@ -19,5 +19,5 @@ wp_die( __( 'Sorry, you are not allowed to create posts as this user.' ), - __( 'You don’t have permission to do this.' ), + __( 'You need a higher level of permission.' ), 403 ); Index: /trunk/src/wp-admin/term.php =================================================================== --- /trunk/src/wp-admin/term.php (revision 42718) +++ /trunk/src/wp-admin/term.php (revision 42719) @@ -35,5 +35,5 @@ wp_die( - '' . __( 'Sorry, you are not allowed to edit this item.' ) . '
', 403 Index: /trunk/src/wp-admin/themes.php =================================================================== --- /trunk/src/wp-admin/themes.php (revision 42718) +++ /trunk/src/wp-admin/themes.php (revision 42719) @@ -12,5 +12,5 @@ if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '
', 403 @@ -25,5 +25,5 @@ if ( ! $theme->exists() || ! $theme->is_allowed() ) { wp_die( - '' . __( 'The requested theme does not exist.' ) . '
', 403 @@ -40,5 +40,5 @@ if ( ! current_user_can( 'delete_themes' ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to delete this item.' ) . '
', 403 @@ -48,5 +48,5 @@ if ( ! $theme->exists() ) { wp_die( - '' . __( 'The requested theme does not exist.' ) . '
', 403 Index: /trunk/src/wp-admin/user-new.php =================================================================== --- /trunk/src/wp-admin/user-new.php (revision 42718) +++ /trunk/src/wp-admin/user-new.php (revision 42719) @@ -13,5 +13,5 @@ if ( ! current_user_can( 'create_users' ) && ! current_user_can( 'promote_users' ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to add users to this network.' ) . '
', 403 @@ -20,5 +20,5 @@ } elseif ( ! current_user_can( 'create_users' ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to create users.' ) . '
', 403 @@ -53,5 +53,5 @@ if ( ! current_user_can( 'promote_user', $user_details->ID ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to add users to this network.' ) . '
', 403 @@ -137,5 +137,5 @@ if ( ! current_user_can( 'create_users' ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to create users.' ) . '
', 403 Index: /trunk/src/wp-admin/users.php =================================================================== --- /trunk/src/wp-admin/users.php (revision 42718) +++ /trunk/src/wp-admin/users.php (revision 42719) @@ -13,5 +13,5 @@ if ( ! current_user_can( 'list_users' ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to list users.' ) . '
', 403 @@ -142,5 +142,5 @@ if ( is_multisite() && ! is_user_member_of_blog( $id ) ) { wp_die( - '' . __( 'One of the selected users is not a member of this site.' ) . '
', 403 Index: /trunk/src/wp-admin/widgets.php =================================================================== --- /trunk/src/wp-admin/widgets.php (revision 42718) +++ /trunk/src/wp-admin/widgets.php (revision 42719) @@ -15,5 +15,5 @@ if ( ! current_user_can( 'edit_theme_options' ) ) { wp_die( - '' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '
', 403 Index: /trunk/src/wp-includes/class-wp-customize-manager.php =================================================================== --- /trunk/src/wp-includes/class-wp-customize-manager.php (revision 42718) +++ /trunk/src/wp-includes/class-wp-customize-manager.php (revision 42719) @@ -448,5 +448,5 @@ if ( ! $message ) { - $message = __( 'An error has occurred.' ); + $message = __( 'Something went wrong.' ); } @@ -513,5 +513,5 @@ } else { wp_die( - '' . __( 'Sorry, you are not allowed to customize this site.' ) . '
', 403 Index: /trunk/src/wp-includes/class-wp-xmlrpc-server.php =================================================================== --- /trunk/src/wp-includes/class-wp-xmlrpc-server.php (revision 42718) +++ /trunk/src/wp-includes/class-wp-xmlrpc-server.php (revision 42719) @@ -3880,5 +3880,5 @@ if ( ! $comment_ID ) { - return new IXR_Error( 403, __( 'An error has occurred.' ) ); + return new IXR_Error( 403, __( 'Something went wrong.' ) ); } Index: /trunk/src/wp-includes/functions.php =================================================================== --- /trunk/src/wp-includes/functions.php (revision 42718) +++ /trunk/src/wp-includes/functions.php (revision 42719) @@ -674,9 +674,9 @@ * Determines whether the publish date of the current post in the loop is different * from the publish date of the previous post in the loop. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. - * + * * @since 0.71 * @@ -1394,7 +1394,7 @@ * * Checks for the 'siteurl' option for whether WordPress is installed. - * + * * For more information on this and similar theme functions, check out - * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ + * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ * Conditional Tags} article in the Theme Developer Handbook. * @@ -2728,5 +2728,5 @@ ); } else { - $html = __( 'The link you followed no longer exists.' ); + $html = __( 'The link you followed has expired.' ); if ( wp_get_referer() ) { $html .= ''; @@ -2739,5 +2739,5 @@ } - wp_die( $html, __( 'An error has occurred.' ), 403 ); + wp_die( $html, __( 'Something went wrong.' ), 403 ); } Index: /trunk/src/wp-includes/js/wp-ajax-response.js =================================================================== --- /trunk/src/wp-includes/js/wp-ajax-response.js (revision 42718) +++ /trunk/src/wp-includes/js/wp-ajax-response.js (revision 42719) @@ -57,5 +57,5 @@ return !wpAjax.invalidateForm( selector.find('.form-required').filter( function() { return jQuery('input:visible', this).val() === ''; } ) ).length; } -}, wpAjax || { noPerm: 'Sorry, you are not allowed to do that.', broken: 'An error has occurred.' } ); +}, wpAjax || { noPerm: 'Sorry, you are not allowed to do that.', broken: 'Something went wrong.' } ); // Basic form validation Index: /trunk/src/wp-includes/script-loader.php =================================================================== --- /trunk/src/wp-includes/script-loader.php (revision 42718) +++ /trunk/src/wp-includes/script-loader.php (revision 42719) @@ -138,5 +138,5 @@ 'wp-ajax-response', 'wpAjax', array( 'noPerm' => __( 'Sorry, you are not allowed to do that.' ), - 'broken' => __( 'An error has occurred.' ), + 'broken' => __( 'Something went wrong.' ), ) ); @@ -606,6 +606,6 @@ 'action' => __( 'Action' ), 'discardChanges' => __( 'Discard changes' ), - 'cheatin' => __( 'An error has occurred.' ), - 'notAllowedHeading' => __( 'You don’t have permission to do this.' ), + 'cheatin' => __( 'Something went wrong.' ), + 'notAllowedHeading' => __( 'You need a higher level of permission.' ), 'notAllowed' => __( 'Sorry, you are not allowed to customize this site.' ), 'previewIframeTitle' => __( 'Site Preview' ), @@ -690,5 +690,5 @@ 'admin-tags', 'tagsl10n', array( 'noPerm' => __( 'Sorry, you are not allowed to do that.' ), - 'broken' => __( 'An error has occurred.' ), + 'broken' => __( 'Something went wrong.' ), ) ); @@ -919,5 +919,5 @@ /* translators: %s: Importer name */ 'activateImporterLabel' => __( 'Run %s' ), - 'unknownError' => __( 'An error has occurred.' ), + 'unknownError' => __( 'Something went wrong.' ), 'connectionError' => __( 'Connection lost or the server is busy. Please try again later.' ), 'nonceError' => __( 'An error has occurred. Please reload the page and try again.' ),