Index: wp-admin/includes/upgrade.php =================================================================== --- wp-admin/includes/upgrade.php (revision 33318) +++ wp-admin/includes/upgrade.php (working copy) @@ -361,6 +361,7 @@ $email = $user->user_email; $name = $user->user_login; $login_url = wp_login_url(); + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $message = sprintf( __( "Your new WordPress site has been successfully set up at: %1\$s @@ -377,6 +378,7 @@ https://wordpress.org/ "), $blog_url, $name, $password, $login_url ); + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ @wp_mail($email, __('New WordPress Site'), $message); } endif; Index: wp-includes/feed-atom-comments.php =================================================================== --- wp-includes/feed-atom-comments.php (revision 33318) +++ wp-includes/feed-atom-comments.php (working copy) @@ -29,10 +29,13 @@ > <?php if ( is_singular() ) + /* translators: Do not use HTML entities ( , etc.): this string is used in XML feeds. */ printf( ent2ncr( __( 'Comments on %s' ) ), get_the_title_rss() ); elseif ( is_search() ) + /* translators: Do not use HTML entities ( , etc.): this string is used in XML feeds. */ printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() ); else + /* translators: Do not use HTML entities ( , etc.): this string is used in XML feeds. */ printf( ent2ncr( __( 'Comments for %s' ) ), get_bloginfo_rss( 'name' ) . get_wp_title_rss() ); ?> @@ -70,8 +73,10 @@ $title = get_the_title($comment_post->ID); /** This filter is documented in wp-includes/feed.php */ $title = apply_filters( 'the_title_rss', $title ); + /* translators: Do not use HTML entities ( , etc.): this string is used in XML feeds. */ printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss()); } else { + /* translators: Do not use HTML entities ( , etc.): this string is used in XML feeds. */ printf(ent2ncr(__('By: %s')), get_comment_author_rss()); } ?> Index: wp-includes/feed-rss2-comments.php =================================================================== --- wp-includes/feed-rss2-comments.php (revision 33318) +++ wp-includes/feed-rss2-comments.php (working copy) @@ -34,10 +34,13 @@ <?php if ( is_singular() ) + /* translators: Do not use HTML entities ( , etc.): this string is used in XML feeds. */ printf( ent2ncr( __( 'Comments on: %s' ) ), get_the_title_rss() ); elseif ( is_search() ) + /* translators: Do not use HTML entities ( , etc.): this string is used in XML feeds. */ printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() ); else + /* translators: Do not use HTML entities ( , etc.): this string is used in XML feeds. */ printf( ent2ncr( __( 'Comments for %s' ) ), get_bloginfo_rss( 'name' ) . get_wp_title_rss() ); ?> @@ -69,8 +72,10 @@ $title = get_the_title($comment_post->ID); /** This filter is documented in wp-includes/feed.php */ $title = apply_filters( 'the_title_rss', $title ); + /* translators: Do not use HTML entities ( , etc.): this string is used in XML feeds. */ printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss()); } else { + /* translators: Do not use HTML entities ( , etc.): this string is used in XML feeds. */ printf(ent2ncr(__('By: %s')), get_comment_author_rss()); } ?> @@ -79,7 +84,10 @@ - + + ]]> ]]> Index: wp-includes/pluggable.php =================================================================== --- wp-includes/pluggable.php (revision 33318) +++ wp-includes/pluggable.php (working copy) @@ -1439,45 +1439,64 @@ switch ( $comment->comment_type ) { case 'trackback': + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n"; - /* translators: 1: website name, 2: website IP, 3: website hostname */ + /* translators: 1: website name, 2: website IP, 3: website hostname. Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= __( 'You can see all trackbacks on this post here:' ) . "\r\n"; - /* translators: 1: blog name, 2: post title */ + /* translators: 1: blog name, 2: post title. Do not use HTML entities ( , etc.): this string is used in e-mails. */ $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title ); break; case 'pingback': + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n"; - /* translators: 1: website name, 2: website IP, 3: website hostname */ + /* translators: 1: website name, 2: website IP, 3: website hostname. Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= __( 'You can see all pingbacks on this post here:' ) . "\r\n"; - /* translators: 1: blog name, 2: post title */ + /* translators: 1: blog name, 2: post title. Do not use HTML entities ( , etc.): this string is used in e-mails. */ $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title ); break; default: // Comments + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n"; - /* translators: 1: comment author, 2: author IP, 3: author domain */ + /* translators: 1: comment author, 2: author IP, 3: author domain. Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __( 'E-mail: %s' ), $comment->comment_author_email ) . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __('Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n"; - /* translators: 1: blog name, 2: post title */ + /* translators: 1: blog name, 2: post title. Do not use HTML entities ( , etc.): this string is used in e-mails. */ $subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title ); break; } $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __('Permalink: %s'), get_comment_link( $comment_id ) ) . "\r\n"; if ( user_can( $post->post_author, 'edit_comment', $comment_id ) ) { - if ( EMPTY_TRASH_DAYS ) + if ( EMPTY_TRASH_DAYS ) { + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n"; - else + } + else { + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n"; + } + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n"; } @@ -1485,12 +1504,14 @@ if ( '' == $comment->comment_author ) { $from = "From: \"$blogname\" <$wp_email>"; - if ( '' != $comment->comment_author_email ) + if ( '' != $comment->comment_author_email ) { $reply_to = "Reply-To: $comment->comment_author_email"; + } } else { $from = "From: \"$comment->comment_author\" <$wp_email>"; - if ( '' != $comment->comment_author_email ) + if ( '' != $comment->comment_author_email ) { $reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>"; + } } $message_headers = "$from\n" @@ -1573,42 +1594,61 @@ switch ( $comment->comment_type ) { case 'trackback': + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message = sprintf( __('A new trackback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n"; $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; - /* translators: 1: website name, 2: website IP, 3: website hostname */ + /* translators: 1: website name, 2: website IP, 3: website hostname. Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; break; case 'pingback': + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message = sprintf( __('A new pingback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n"; $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; - /* translators: 1: website name, 2: website IP, 3: website hostname */ + /* translators: 1: website name, 2: website IP, 3: website hostname. Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; break; default: // Comments + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n"; $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __( 'E-mail: %s' ), $comment->comment_author_email ) . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n"; break; } + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __('Approve it: %s'), admin_url("comment.php?action=approve&c=$comment_id") ) . "\r\n"; - if ( EMPTY_TRASH_DAYS ) + if ( EMPTY_TRASH_DAYS ) { + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n"; - else + } + else { + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n"; + } + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $notify_message .= sprintf( _n('Currently %s comment is waiting for approval. Please visit the moderation panel:', 'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n"; $notify_message .= admin_url("edit-comments.php?comment_status=moderated") . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), $blogname, $post->post_title ); $message_headers = ''; @@ -1672,10 +1712,12 @@ // send a copy of password change notification to the admin // but check to see if it's the admin whose password we're changing, and skip this if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) { + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n"; // The blogname option is escaped with esc_html on the way into the database in sanitize_option // we want to reverse this for the plain text arena of emails. $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), $blogname), $message); } } @@ -1699,8 +1741,11 @@ // we want to reverse this for the plain text arena of emails. $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $message = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $message .= sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $message .= sprintf(__('E-mail: %s'), $user->user_email) . "\r\n"; @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message); @@ -1718,12 +1763,15 @@ $hashed = time() . ':' . $wp_hasher->HashPassword( $key ); $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) ); + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ $message .= __('To set your password, visit the following address:') . "\r\n\r\n"; $message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user->user_login), 'login') . ">\r\n\r\n"; $message .= wp_login_url() . "\r\n"; + /* translators: Do not use HTML entities ( , etc.): this string is used in e-mails. */ wp_mail($user->user_email, sprintf(__('[%s] Your username and password info'), $blogname), $message); }