Index: wp-login.php =================================================================== --- wp-login.php (revision 4647) +++ wp-login.php (working copy) @@ -91,9 +91,9 @@ if ( $_POST ) { if ( empty( $_POST['user_login'] ) ) - $errors['user_login'] = __('ERROR: The username field is empty.'); + $errors['user_login'] = __('ERROR:').' '.__('The username field is empty.'); if ( empty( $_POST['user_email'] ) ) - $errors['user_email'] = __('ERROR: The e-mail field is empty.'); + $errors['user_email'] = __('ERROR:').' '.__('The e-mail field is empty.'); do_action('lostpassword_post'); @@ -104,7 +104,7 @@ $user_email = $user_data->user_email; if (!$user_email || $user_email != $_POST['user_email']) { - $errors['invalidcombo'] = __('ERROR: Invalid username / e-mail combination.'); + $errors['invalidcombo'] = __('ERROR:').' '.__('Invalid username / e-mail combination.'); } else { do_action('retreive_password', $user_login); // Misspelled and deprecated do_action('retrieve_password', $user_login); @@ -216,21 +216,21 @@ // Check the username if ( $user_login == '' ) - $errors['user_login'] = __('ERROR: Please enter a username.'); + $errors['user_login'] = __('ERROR:').' '.__('Please enter a username.'); elseif ( !validate_username( $user_login ) ) { - $errors['user_login'] = __('ERROR: This username is invalid. Please enter a valid username.'); + $errors['user_login'] = __('ERROR:').' '.__('This username is invalid. Please enter a valid username.'); $user_login = ''; } elseif ( username_exists( $user_login ) ) - $errors['user_login'] = __('ERROR: This username is already registered, please choose another one.'); + $errors['user_login'] = __('ERROR:').' '.__('This username is already registered, please choose another one.'); // Check the e-mail address if ($user_email == '') { - $errors['user_email'] = __('ERROR: Please type your e-mail address.'); + $errors['user_email'] = __('ERROR:').' '.__('Please type your e-mail address.'); } elseif ( !is_email( $user_email ) ) { - $errors['user_email'] = __('ERROR: The email address isn’t correct.'); + $errors['user_email'] = __('ERROR:').' '.__('The email address isn’t correct.'); $user_email = ''; } elseif ( email_exists( $user_email ) ) - $errors['user_email'] = __('ERROR: This email is already registered, please choose another one.'); + $errors['user_email'] = __('ERROR:').' '.__('This email is already registered, please choose another one.'); do_action('register_post'); @@ -241,7 +241,7 @@ $user_id = wp_create_user( $user_login, $user_pass, $user_email ); if ( !$user_id ) - $errors['registerfail'] = sprintf(__('ERROR: Couldn’t register you... please contact the webmaster !'), get_option('admin_email')); + $errors['registerfail'] = sprintf(__('ERROR:').' '.__('Couldn’t register you... please contact the webmaster !'), get_option('admin_email')); else { wp_new_user_notification($user_id, $user_pass); @@ -327,9 +327,9 @@ } if ( $_POST && empty( $user_login ) ) - $errors['user_login'] = __('ERROR: The username field is empty.'); + $errors['user_login'] = __('ERROR:').' '.__('The username field is empty.'); if ( $_POST && empty( $user_pass ) ) - $errors['user_pass'] = __('ERROR: The password field is empty.'); + $errors['user_pass'] = __('ERROR:').' '.__('The password field is empty.'); // Some parts of this script use the main login form to display a message if ( TRUE == $_GET['loggedout'] ) $errors['loggedout'] = __('Successfully logged you out.'); Index: wp-includes/formatting.php =================================================================== --- wp-includes/formatting.php (revision 4647) +++ wp-includes/formatting.php (working copy) @@ -738,22 +738,22 @@ $diff = (int) abs($to - $from); if ($diff <= 3600) { $mins = round($diff / 60); - if ($mins <= 1) - $since = __('1 min'); - else - $since = sprintf( __('%s mins'), $mins); + if ($mins <= 1) { + $mins = 1; + } + $since = sprintf(__n('%s min', '%s mins', $mins), $mins); } else if (($diff <= 86400) && ($diff > 3600)) { $hours = round($diff / 3600); - if ($hours <= 1) - $since = __('1 hour'); - else - $since = sprintf( __('%s hours'), $hours ); + if ($hours <= 1) { + $hour = 1; + } + $since = sprintf(__n('%s hour', '%s hours', $hours), $hours); } elseif ($diff >= 86400) { $days = round($diff / 86400); - if ($days <= 1) - $since = __('1 day'); - else - $since = sprintf( __('%s days'), $days ); + if ($days <= 1) { + $days = 1; + } + $since = sprintf(__('%s day', '%s days', $days), $days); } return $since; } Index: wp-includes/pluggable.php =================================================================== --- wp-includes/pluggable.php (revision 4647) +++ wp-includes/pluggable.php (working copy) @@ -174,7 +174,7 @@ return false; if ( '' == $password ) { - $error = __('ERROR: The password field is empty.'); + $error = __('ERROR:').' '.__('The password field is empty.'); return false; } @@ -182,7 +182,7 @@ //$login = $wpdb->get_row("SELECT ID, user_login, user_pass FROM $wpdb->users WHERE user_login = '$username'"); if (!$login) { - $error = __('ERROR: Invalid username.'); + $error = __('ERROR:').' '.__('Invalid username.'); return false; } else { // If the password is already_md5, it has been double hashed. @@ -190,7 +190,7 @@ if ( ($already_md5 && md5($login->user_pass) == $password) || ($login->user_login == $username && $login->user_pass == md5($password)) ) { return true; } else { - $error = __('ERROR: Incorrect password.'); + $error = __('ERROR:').' '.__('Incorrect password.'); $pwd = ''; return false; } Index: wp-includes/l10n.php =================================================================== --- wp-includes/l10n.php (revision 4647) +++ wp-includes/l10n.php (working copy) @@ -38,7 +38,7 @@ } // Return the plural form. -function __ngettext($single, $plural, $number, $domain = 'default') { +function __n($single, $plural, $number, $domain = 'default') { global $l10n; if (isset($l10n[$domain])) { Index: wp-admin/users.php =================================================================== --- wp-admin/users.php (revision 4647) +++ wp-admin/users.php (working copy) @@ -290,7 +290,7 @@ case 'del_many': ?> -

+

" size="17" /> - +

|

@@ -67,10 +67,11 @@ } endforeach; echo '

'; - if ( !empty( $_POST['spam_button'] ) ) - printf(__('%s comments marked as spam.'), $i); - else - printf(__('%s comments deleted.'), $i); + if ( !empty( $_POST['spam_button'] ) ) { + printf(__n('%s comment marked as spam', '%s comments marked as spam.', $i), $i); + } else { + printf(__n('%s comment deleted.', '%s comments deleted.', $i), $i); + } echo '

'; endif; @@ -157,12 +158,12 @@ comment_post_ID) ) { echo " " . __('Edit') . ''; - echo ' | comment_author)) . "', theCommentList );\">" . __('Delete') . ' '; + echo ' | comment_author)) . "', theCommentList );\">" . __('Delete') . ' '; if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) { echo ' | ' . __('Unapprove') . ' '; echo ' | ' . __('Approve') . ' '; } - echo " | comment_post_ID . "&c=" . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to mark as spam this comment by "%s".\\n"Cancel" to stop, "OK" to mark as spam."), $comment->comment_author)) . "', theCommentList );\">" . __('Spam') . " "; + echo " | comment_post_ID . "&c=" . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to mark as spam this comment by '%s'.\n'Cancel' to stop, 'OK' to mark as spam."), $comment->comment_author)) . "', theCommentList );\">" . __('Spam') . " "; } $post = get_post($comment->comment_post_ID); $post_title = wp_specialchars( $post->post_title, 'double' ); Index: wp-admin/admin-ajax.php =================================================================== --- wp-admin/admin-ajax.php (revision 4647) +++ wp-admin/admin-ajax.php (working copy) @@ -21,7 +21,7 @@ $r .= ""; $r .= "
"; $r .= ""; return $r; } Index: wp-admin/admin-functions.php =================================================================== --- wp-admin/admin-functions.php (revision 4647) +++ wp-admin/admin-functions.php (working copy) @@ -40,10 +40,10 @@ if ( $_POST['post_author'] != $_POST['user_ID'] ) { if ( 'page' == $_POST['post_type'] ) { if ( !current_user_can( 'edit_others_pages' ) ) - return new WP_Error( 'edit_others_pages', __( 'You cannot create pages as this user.' ) ); + return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) ); } else { if ( !current_user_can( 'edit_others_posts' ) ) - return new WP_Error( 'edit_others_posts', __( 'You cannot post as this user.' ) ); + return new WP_Error( 'edit_others_posts', __( 'You are not allowed to post as this user.' ) ); } } @@ -184,10 +184,10 @@ if ( $_POST['post_author'] != $_POST['user_ID'] ) { if ( 'page' == $_POST['post_type'] ) { if ( !current_user_can( 'edit_others_pages' ) ) - wp_die( __('You cannot edit pages as this user.' )); + wp_die( __('You are not allowed to edit pages as this user.' )); } else { if ( !current_user_can( 'edit_others_posts' ) ) - wp_die( __('You cannot edit posts as this user.' )); + wp_die( __('You are not allowed edit posts as this user.' )); } } @@ -467,42 +467,42 @@ /* checking that username has been typed */ if ( $user->user_login == '' ) - $errors->add( 'user_login', __( 'ERROR: Please enter a username.' )); + $errors->add( 'user_login', __( 'ERROR:' ) . ' ' . __( 'Please enter a username.' )); /* checking the password has been typed twice */ do_action_ref_array( 'check_passwords', array ( $user->user_login, & $pass1, & $pass2 )); if (!$update ) { if ( $pass1 == '' || $pass2 == '' ) - $errors->add( 'pass', __( 'ERROR: Please enter your password twice.' )); + $errors->add( 'pass', __( 'ERROR:' ) . ' ' . __( 'Please enter your password twice.' )); } else { if ((empty ( $pass1 ) && !empty ( $pass2 ) ) || (empty ( $pass2 ) && !empty ( $pass1 ) ) ) - $errors->add( 'pass', __( "ERROR: you typed your new password only once." )); + $errors->add( 'pass', __( 'ERROR:' ) . ' ' . __( 'You typed your new password only once.' )); } /* Check for "\" in password */ if( strpos( " ".$pass1, "\\" ) ) - $errors->add( 'pass', __( 'ERROR: Passwords may not contain the character "\\".' )); + $errors->add( 'pass', __( 'ERROR:' ) . ' '. __( 'Passwords may not contain the character "\\".' )); /* checking the password has been typed twice the same */ if ( $pass1 != $pass2 ) - $errors->add( 'pass', __( 'ERROR: Please type the same password in the two password fields.' )); + $errors->add( 'pass', __( 'ERROR:' ) . ' '. __( 'Please type the same password in the two password fields.' )); if (!empty ( $pass1 )) $user->user_pass = $pass1; if ( !validate_username( $user->user_login ) ) - $errors->add( 'user_login', __( 'ERROR: This username is invalid. Please enter a valid username.' )); + $errors->add( 'user_login', __( 'ERROR:' ) . ' ' . __( 'This username is invalid. Please enter a valid username.' )); if (!$update && username_exists( $user->user_login )) - $errors->add( 'user_login', __( 'ERROR: This username is already registered, please choose another one.' )); + $errors->add( 'user_login', __( 'ERROR:' ) . ' ' . __( 'This username is already registered, please choose another one.' )); /* checking e-mail address */ if ( empty ( $user->user_email ) ) { - $errors->add( 'user_email', __( "ERROR: please type an e-mail address" )); + $errors->add( 'user_email', __( 'ERROR:' ) . ' ' . __( 'Please type an e-mail address' )); } else if (!is_email( $user->user_email ) ) { - $errors->add( 'user_email', __( "ERROR: the email address isn't correct" )); + $errors->add( 'user_email', __( 'ERROR:' ) . ' ' . __( 'The email address isn&8217;t correct' )); } if ( $errors->get_error_codes() ) @@ -555,7 +555,7 @@ function edit_link( $link_id = '' ) { if (!current_user_can( 'manage_links' )) - wp_die( __("Cheatin' uh ?" )); + wp_die( __( 'Cheatin&8217; uh?' )); $_POST['link_url'] = wp_specialchars( $_POST['link_url'] ); $_POST['link_url'] = preg_match('/^(https?|ftps?|mailto|news|irc|gopher|nntp|feed|telnet):/is', $_POST['link_url']) ? $_POST['link_url'] : 'http://' . $_POST['link_url']; @@ -744,9 +744,9 @@ $default_link_cat_id = get_option( 'default_link_category' ); if ( ($category->cat_ID != $default_cat_id ) && ($category->cat_ID != $default_link_cat_id ) ) - $edit .= "cat_ID ) . "' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . sprintf( __("You are about to delete the category "%s".\\nAll of its posts will go into the default category of "%s"\\nAll of its bookmarks will go into the default category of "%s".\\n"OK" to delete, "Cancel" to stop." ), js_escape( $category->cat_name ), js_escape( get_catname( $default_cat_id )), js_escape( get_catname( $default_link_cat_id ) ) ) . "' );\" class='delete'>".__( 'Delete' ).""; + $edit .= "cat_ID ) . "' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . js_escape(sprintf( __("You are about to delete the category '%s'.\nAll of its posts will go into the default category of '%s'\nAll of its bookmarks will go into the default category of '%s'.\n'OK' to delete, 'Cancel' to stop." ), js_escape( $category->cat_name ), js_escape( get_catname( $default_cat_id )), js_escape( get_catname( $default_link_cat_id ) ) )) . "' );\" class='delete'>".__( 'Delete' ).""; else - $edit .= "".__( "Default" ); + $edit .= "".__( 'Default' ); } else $edit = ''; @@ -791,7 +791,7 @@ post_modified ) _e('Unpublished'); else echo mysql2date( 'Y-m-d g:i a', $post->post_modified ); ?> " . __( 'Edit' ) . ""; } ?> - " . __( 'Delete' ) . ""; } ?> + " . __( 'Delete' ) . ""; } ?> "; if ( $numposts > 0 ) { $r .= ""; - $r .= sprintf( __('View %1$s %2$s' ), $numposts, __ngettext( 'post', 'posts', $numposts )); + $r .= sprintf(__n( 'View %s post', 'View %s posts', $numposts ), $numposts); $r .= ''; } $r .= "\n\t\t"; @@ -1063,9 +1063,7 @@ get_month( $mm ) . "$jj, $aa @ $hh:$mn"; - echo sprintf( __(': %1$s %2$s, %3$s @ %4$s:%5$s' ), $wp_locale->get_month( $mm ), $jj, $aa, $hh, $mn ); + printf( __('Existing timestamp: %1$s %2$s, %3$s @ %4$s:%5$s' ), $wp_locale->get_month( $mm ), $jj, $aa, $hh, $mn ); } ?> Index: wp-admin/edit-page-form.php =================================================================== --- wp-admin/edit-page-form.php (revision 4647) +++ wp-admin/edit-page-form.php (working copy) @@ -84,7 +84,7 @@
-

+

post_title )) . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true;}return false;\""; ?> /> + post_title )) . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true;}return false;\""; ?> />

Index: wp-admin/moderation.php =================================================================== --- wp-admin/moderation.php (revision 4647) +++ wp-admin/moderation.php (working copy) @@ -72,32 +72,20 @@ $ignored = (int) $_GET['ignored']; $spam = (int) $_GET['spam']; if ($approved) { - if ('1' == $approved) { - echo __("1 comment approved") . "
\n"; - } else { - echo sprintf(__("%s comments approved
"), $approved) . "\n"; - } + printf(__n('%s comment approved', '%s comments approved', $approved), $approved); + echo "
\n"; } if ($deleted) { - if ('1' == $deleted) { - echo __("1 comment deleted") . "
\n"; - } else { - echo sprintf(__("%s comments deleted"), $deleted) . "
\n"; - } + printf(__n('%s comment deleted', '%s comments deleted', $deleted), $deleted); + echo "
\n"; } if ($spam) { - if ('1' == $spam) { - echo __("1 comment marked as spam") . "
\n"; - } else { - echo sprintf(__("%s comments marked as spam"), $spam) . "
\n"; - } + printf(__n('%s comment marked as spam', '%s comments marked as spam', $spam), $spam); + echo "
\n"; } if ($ignored) { - if ('1' == $ignored) { - echo __("1 comment unchanged") . "
\n"; - } else { - echo sprintf(__("%s comments unchanged"), $ignored) . "
\n"; - } + printf(__n('%s comment unchanged', '%s comments unchanged', $ignored), $ignored); + echo "
\n"; } echo "

\n"; } Index: wp-admin/index.php =================================================================== --- wp-admin/index.php (revision 4647) +++ wp-admin/index.php (working copy) @@ -107,7 +107,12 @@ $numcats = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->categories"); if (0 < $numcats) $numcats = number_format($numcats); ?> -

posts and %3$s comments, contained within %5$s categories.'), $numposts, 'edit.php', $numcomms, 'edit-comments.php', $numcats, 'categories.php'); ?>

+

post', '%1$s posts', $numposts), $numposts, 'edit.php'); +$comm_str = sprintf(__n('%1$s comment', '%1$s comments', $numcomms), $numcomms, 'edit-comments.php'); +$cat_str = sprintf(__n('%1$s category', '%1$s categories', $numcats), $numcats, 'categories.php'); + +printf(__('There are currently %1$s and %2$s, contained within %3$s.'), $post_str, $comm_str, $cat_str); ?>

Index: wp-admin/edit-link-form.php =================================================================== --- wp-admin/edit-link-form.php (revision 4647) +++ wp-admin/edit-link-form.php (working copy) @@ -237,7 +237,7 @@ echo 'selected="selected"'; echo('>'.$r.''); } - ?>  + ?>  Index: wp-admin/edit-form-comment.php =================================================================== --- wp-admin/edit-form-comment.php (revision 4647) +++ wp-admin/edit-form-comment.php (working copy) @@ -67,7 +67,7 @@ comment_ID ); ?>: - /> + /> Index: wp-admin/edit-form.php =================================================================== --- wp-admin/edit-form.php (revision 4647) +++ wp-admin/edit-form.php (working copy) @@ -51,7 +51,7 @@ -

(Separate multiple URLs with spaces.)
'), 'http://wordpress.org/docs/reference/post/#trackback') ?> +

(Separate multiple URLs with spaces.)'), 'http://wordpress.org/docs/reference/post/#trackback'); echo '
'; ?>

Index: wp-admin/edit-form-advanced.php =================================================================== --- wp-admin/edit-form-advanced.php (revision 4647) +++ wp-admin/edit-form-advanced.php (working copy) @@ -206,7 +206,7 @@

-
: () +
()

-(These settings may be overridden for individual articles.)') ?> +('.__('These settings may be overridden for individual articles.').')'; ?>
  • +
- \ No newline at end of file + Index: wp-admin/plugins.php =================================================================== --- wp-admin/plugins.php (revision 4647) +++ wp-admin/plugins.php (working copy) @@ -79,7 +79,7 @@ if (empty($plugins)) { echo '

'; - _e("Couldn't open plugins directory or there are no plugins available."); // TODO: make more helpful + _e("Couldn&8217;t open plugins directory or there are no plugins available."); // TODO: make more helpful echo '

'; } else { ?> Index: wp-admin/link-add.php =================================================================== --- wp-admin/link-add.php (revision 4647) +++ wp-admin/link-add.php (working copy) @@ -28,7 +28,7 @@ Index: wp-admin/edit.php =================================================================== --- wp-admin/edit.php (revision 4647) +++ wp-admin/edit.php (working copy) @@ -221,7 +221,7 @@ case 'control_delete': ?> - ID) ) { echo "ID) . "' class='delete' onclick=\"return deleteSomething( 'post', " . $id . ", '" . sprintf(__("You are about to delete this post "%s".\\n"OK" to delete, "Cancel" to stop."), js_escape(get_the_title()) ) . "' );\">" . __('Delete') . ""; } ?> + ID) ) { echo "ID) . "' class='delete' onclick=\"return deleteSomething( 'post', " . $id . ", '" . js_escape(sprintf(__("You are about to delete this post '%s'.\n'OK' to delete, 'Cancel' to stop."), get_the_title())) . "' );\">" . __('Delete') . ""; } ?> comment_post_ID) ) { echo " " . __('Edit') . ''; - echo ' | comment_author)) . "', theCommentList );\">" . __('Delete') . ' '; + echo ' | comment_author)) . "', theCommentList );\">" . __('Delete') . ' '; if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) { echo ' | ' . __('Unapprove') . ' '; echo ' | ' . __('Approve') . ' '; } - echo " | comment_post_ID."&c=".$comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . sprintf(__("You are about to mark as spam this comment by "%s".\\n"Cancel" to stop, "OK" to mark as spam."), js_escape( $comment->comment_author)) . "', theCommentList );\">" . __('Spam') . " ]"; + echo " | comment_post_ID."&c=".$comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . sprintf(__("You are about to mark as spam this comment by '%s'.\n'Cancel' to stop, 'OK' to mark as spam."), js_escape( $comment->comment_author)) . "', theCommentList );\">" . __('Spam') . " ]"; } // end if any comments to show ?>

Index: wp-admin/link-manager.php =================================================================== --- wp-admin/link-manager.php (revision 4647) +++ wp-admin/link-manager.php (working copy) @@ -65,7 +65,7 @@ if ( isset($_GET['deleted']) ) { echo '

'; $deleted = (int) $_GET['deleted']; - printf(__('%s links deleted.'), $deleted); + printf(__n('%s link deleted.', '%s links deleted', $deleted), $deleted); echo '

'; } ?> @@ -175,7 +175,7 @@ break; case 'action': echo ''.__('Edit').''; - echo 'link_id , '".js_escape(sprintf(__("You are about to delete the "%s" link to %s.\n"Cancel" to stop, "OK" to delete."), $link->link_name, $link->link_url )).'\' );" class="delete">'.__('Delete').''; + echo 'link_id , '".js_escape(sprintf(__("You are about to delete the '%s' link to %s.\n'Cancel' to stop, 'OK' to delete."), $link->link_name, $link->link_url )).'\' );" class="delete">'.__('Delete').''; break; default: ?> Index: wp-admin/install.php =================================================================== --- wp-admin/install.php (revision 4647) +++ wp-admin/install.php (working copy) @@ -70,9 +70,9 @@ $public = (int) $_POST['blog_public']; // check e-mail address if (empty($admin_email)) { - die(__("ERROR: please type your e-mail address")); + die(__('ERROR:').' '.__('Please type your e-mail address')); } else if (!is_email($admin_email)) { - die(__("ERROR: the e-mail address isn't correct")); + die(__('ERROR:').' '.__('The e-mail address isn&8217;t correct')); } ?> @@ -107,4 +107,4 @@ - \ No newline at end of file + Index: wp-admin/export.php =================================================================== --- wp-admin/export.php (revision 4647) +++ wp-admin/export.php (working copy) @@ -14,7 +14,7 @@

-

+

Index: wp-admin/categories.php =================================================================== --- wp-admin/categories.php (revision 4647) +++ wp-admin/categories.php (working copy) @@ -34,10 +34,10 @@ // Don't delete the default cats. if ( $cat_ID == get_option('default_category') ) - wp_die(sprintf(__("Can't delete the %s category: this is the default one"), $cat_name)); + wp_die(sprintf(__("Can&8217;t delete the %s category: this is the default one"), $cat_name)); if ( $cat_ID == get_option('default_link_category') ) - wp_die(sprintf(__("Can't delete the %s category: this is the default one for links"), $cat_name)); + wp_die(sprintf(__("Can&8217;t delete the %s category: this is the default one for links"), $cat_name)); wp_delete_category($cat_ID);