Index: bp-activity/bp-activity-admin.php
===================================================================
--- bp-activity/bp-activity-admin.php (revision 12655)
+++ bp-activity/bp-activity-admin.php (working copy)
@@ -85,12 +85,12 @@
// Check that a reply has been entered.
if ( empty( $_REQUEST['content'] ) )
- die( __( 'ERROR: Please type a reply.', 'buddypress' ) );
+ die( __( 'Error: Please type a reply.', 'buddypress' ) );
// Check parent activity exists.
$parent_activity = new BP_Activity_Activity( $parent_id );
if ( empty( $parent_activity->component ) )
- die( __( 'ERROR: The item you are trying to reply to cannot be found, or it has been deleted.', 'buddypress' ) );
+ die( __( 'Error: The item you are trying to reply to cannot be found, or it has been deleted.', 'buddypress' ) );
// @todo: Check if user is allowed to create new activity items
// if ( ! current_user_can( 'bp_new_activity' ) )
Index: bp-members/bp-members-functions.php
===================================================================
--- bp-members/bp-members-functions.php (revision 12655)
+++ bp-members/bp-members-functions.php (working copy)
@@ -1364,7 +1364,7 @@
// The user exists; now do a check to see if the user is a spammer
// if the user is a spammer, stop them in their tracks!
if ( is_a( $user, 'WP_User' ) && ( ( is_multisite() && (int) $user->spam ) || 1 == $user->user_status ) ) {
- return new WP_Error( 'invalid_username', __( 'ERROR: Your account has been marked as a spammer.', 'buddypress' ) );
+ return new WP_Error( 'invalid_username', __( 'Error: Your account has been marked as a spammer.', 'buddypress' ) );
}
// User is good to go!
@@ -2337,7 +2337,7 @@
/* translators: %s: the activation url */
$resend_string .= sprintf( __( 'If you have not received an email yet, click here to resend it.', 'buddypress' ), esc_url( $resend_url ) );
- return new WP_Error( 'bp_account_not_activated', __( 'ERROR: Your account has not been activated. Check your email for the activation link.', 'buddypress' ) . $resend_string );
+ return new WP_Error( 'bp_account_not_activated', __( 'Error: Your account has not been activated. Check your email for the activation link.', 'buddypress' ) . $resend_string );
}
add_filter( 'authenticate', 'bp_core_signup_disable_inactive', 30, 3 );
@@ -2368,7 +2368,7 @@
// Add feedback message.
if ( ! empty( $resend['errors'] ) ) {
- $error = __( 'ERROR: Your account has already been activated.', 'buddypress' );
+ $error = __( 'Error: Your account has already been activated.', 'buddypress' );
} else {
$error = __( 'Activation email resent! Please check your inbox or spam folder.', 'buddypress' );
}
@@ -2513,7 +2513,7 @@
function bp_live_spammer_login_error() {
global $error;
- $error = __( 'ERROR: Your account has been marked as a spammer.', 'buddypress' );
+ $error = __( 'Error: Your account has been marked as a spammer.', 'buddypress' );
// Shake shake shake!
add_action( 'login_head', 'wp_shake_js', 12 );