diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index 070b61ba04..28eae8324d 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -640,7 +640,7 @@ case 'replyto-comment' : if ( empty($status) ) die('1'); elseif ( in_array($status, array('draft', 'pending', 'trash') ) ) - die( __('Error: you are replying to a comment on a draft post.') ); + die( __('ERROR: you are replying to a comment on a draft post.') ); $user = wp_get_current_user(); if ( $user->ID ) { @@ -659,7 +659,7 @@ case 'replyto-comment' : } if ( '' == $comment_content ) - die( __('Error: please type a comment.') ); + die( __('ERROR: please type a comment.') ); $comment_parent = absint($_POST['comment_ID']); $comment_auto_approved = false; @@ -721,7 +721,7 @@ case 'edit-comment' : die('-1'); if ( '' == $_POST['content'] ) - die( __('Error: please type a comment.') ); + die( __('ERROR: please type a comment.') ); $_POST['comment_status'] = $_POST['status']; edit_comment(); diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index c254dadf36..23df9d1125 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -965,7 +965,7 @@ function request_filesystem_credentials($form_post, $type = '', $error = false, if ( !empty($credentials) ) extract($credentials, EXTR_OVERWRITE); if ( $error ) { - $error_string = __('Error: There was an error connecting to the server, Please verify the settings are correct.'); + $error_string = __('ERROR: There was an error connecting to the server, Please verify the settings are correct.'); if ( is_wp_error($error) ) $error_string = esc_html( $error->get_error_message() ); echo '

' . $error_string . '

'; diff --git a/wp-admin/includes/theme-install.php b/wp-admin/includes/theme-install.php index b1ad8a6eae..da04a451b6 100644 --- a/wp-admin/includes/theme-install.php +++ b/wp-admin/includes/theme-install.php @@ -237,7 +237,7 @@ function install_theme_information() { iframe_header( __('Theme Install') ); if ( empty($api->download_link) ) { - echo '

' . __('Error: This theme is currently not available. Please try again later.') . '

'; + echo '

' . __('ERROR: This theme is currently not available. Please try again later.') . '

'; iframe_footer(); exit; } diff --git a/wp-admin/network.php b/wp-admin/network.php index d5448c2ce7..c854924583 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -135,14 +135,14 @@ function network_step1( $errors = false ) { global $is_apache; if ( get_option( 'siteurl' ) != get_option( 'home' ) ) { - echo '

' . __('Error:') . ' ' . sprintf( __( 'Your WordPress address must match your Site address before creating a Network. See General Settings.' ), esc_url( admin_url( 'options-general.php' ) ) ) . '

'; + echo '

' . __('ERROR:') . ' ' . sprintf( __( 'Your WordPress address must match your Site address before creating a Network. See General Settings.' ), esc_url( admin_url( 'options-general.php' ) ) ) . '

'; echo ''; include ( ABSPATH . 'wp-admin/admin-footer.php' ); die(); } if ( defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) { - echo '

' . __('Error:') . ' ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '

'; + echo '

' . __('ERROR:') . ' ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '

'; echo ''; include ( ABSPATH . 'wp-admin/admin-footer.php' ); die(); @@ -159,7 +159,7 @@ function network_step1( $errors = false ) { $hostname = get_clean_basedomain(); $has_ports = strstr( $hostname, ':' ); if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) { - echo '

' . __( 'Error:') . ' ' . __( 'You cannot install a network of sites with your server address.' ) . '

'; + echo '

' . __( 'ERROR:') . ' ' . __( 'You cannot install a network of sites with your server address.' ) . '

'; echo '

' . sprintf( __( 'You cannot use port numbers such as %s.' ), $has_ports ) . '

'; echo '' . __( 'Return to Dashboard' ) . ''; echo ''; diff --git a/wp-admin/options.php b/wp-admin/options.php index 069dcb90f4..8eb283a84b 100644 --- a/wp-admin/options.php +++ b/wp-admin/options.php @@ -110,7 +110,7 @@ if ( 'update' == $action ) { } if ( !isset( $whitelist_options[ $option_page ] ) ) - wp_die( __( 'Error: options page not found.' ) ); + wp_die( __( 'ERROR: options page not found.' ) ); if ( 'options' == $option_page ) { if ( is_multisite() && ! is_super_admin() ) diff --git a/wp-comments-post.php b/wp-comments-post.php index 9c17a355b2..648388f4d1 100644 --- a/wp-comments-post.php +++ b/wp-comments-post.php @@ -75,13 +75,13 @@ $comment_type = ''; if ( get_option('require_name_email') && !$user->ID ) { if ( 6 > strlen($comment_author_email) || '' == $comment_author ) - wp_die( __('Error: please fill the required fields (name, email).') ); + wp_die( __('ERROR: please fill the required fields (name, email).') ); elseif ( !is_email($comment_author_email)) - wp_die( __('Error: please enter a valid email address.') ); + wp_die( __('ERROR: please enter a valid email address.') ); } if ( '' == $comment_content ) - wp_die( __('Error: please type a comment.') ); + wp_die( __('ERROR: please type a comment.') ); $comment_parent = isset($_POST['comment_parent']) ? absint($_POST['comment_parent']) : 0; diff --git a/wp-includes/js/tinymce/langs/wp-langs.php b/wp-includes/js/tinymce/langs/wp-langs.php index 8552590c09..bb1c0c8ddb 100644 --- a/wp-includes/js/tinymce/langs/wp-langs.php +++ b/wp-includes/js/tinymce/langs/wp-langs.php @@ -24,7 +24,7 @@ not_set:"' . mce_escape( __('-- Not set --') ) . '", clipboard_msg:"' . mce_escape( __('Copy/Cut/Paste is not available in Mozilla and Firefox.') ) . '", clipboard_no_support:"' . mce_escape( __('Currently not supported by your browser, use keyboard shortcuts instead.') ) . '", popup_blocked:"' . mce_escape( __('Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.') ) . '", -invalid_data:"' . mce_escape( __('Error: Invalid values entered, these are marked in red.') ) . '", +invalid_data:"' . mce_escape( __('ERROR: Invalid values entered, these are marked in red.') ) . '", invalid_data_number:"' . mce_escape( __('{#field} must be a number') ) . '", invalid_data_min:"' . mce_escape( __('{#field} must be a number greater than {#min}') ) . '", invalid_data_size:"' . mce_escape( __('{#field} must be a number or percentage') ) . '", diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index b15bb1a651..eda032f5c3 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -318,14 +318,14 @@ function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) { // Check if the domain has been used already. We should return an error message. if ( domain_exists($domain, $path, $site_id) ) - return __( 'Error: Site URL already taken.' ); + return __( 'ERROR: Site URL already taken.' ); // Need to back up wpdb table names, and create a new wp_blogs entry for new blog. // Need to get blog_id from wp_blogs, and create new table names. // Must restore table names at the end of function. if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) - return __( 'Error: problem creating site entry.' ); + return __( 'ERROR: problem creating site entry.' ); switch_to_blog($blog_id); install_blog($blog_id);