Index: wp-admin/includes/upgrade.php =================================================================== --- wp-admin/includes/upgrade.php (revision 11518) +++ wp-admin/includes/upgrade.php (working copy) @@ -226,6 +226,7 @@ $user = new WP_User($user_id); $email = $user->user_email; $name = $user->user_login; + /* translators: do not use HTML entities ( , etc.): string is used in e-mails */ $message = sprintf(__("Your new WordPress blog has been successfully set up at: %1\$s Index: wp-includes/feed-atom-comments.php =================================================================== --- wp-includes/feed-atom-comments.php (revision 11518) +++ wp-includes/feed-atom-comments.php (working copy) @@ -16,10 +16,13 @@ > <?php if ( is_singular() ) + /* translators: Note: do not use HTML entities ( , etc.): string is used in XML feeds */ printf(ent2ncr(__('Comments on: %s')), get_the_title_rss()); elseif ( is_search() ) + /* translators: Note: do not use HTML entities ( , etc.): string is used in XML feeds */ printf(ent2ncr(__('Comments for %1$s searching on %2$s')), get_bloginfo_rss( 'name' ), esc_attr(get_search_query())); else + /* translators: Note: do not use HTML entities ( , etc.): string is used in XML feeds */ printf(ent2ncr(__('Comments for %s')), get_bloginfo_rss( 'name' ) . get_wp_title_rss()); ?> @@ -51,8 +54,10 @@ if ( !is_singular() ) { $title = get_the_title($comment_post->ID); $title = apply_filters('the_title_rss', $title); + /* translators: Note: do not use HTML entities ( , etc.): string is used in XML feeds */ printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss()); } else { + /* translators: Note: do not use HTML entities ( , etc.): 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 11518) +++ wp-includes/feed-rss2-comments.php (working copy) @@ -19,10 +19,13 @@ <?php if ( is_singular() ) + /* translators: Note: do not use HTML entities ( , etc.): string is used in XML feeds */ printf(ent2ncr(__('Comments on: %s')), get_the_title_rss()); elseif ( is_search() ) + /* translators: Note: do not use HTML entities ( , etc.): string is used in XML feeds */ printf(ent2ncr(__('Comments for %s searching on %s')), get_bloginfo_rss( 'name' ), esc_attr($wp_query->query_vars['s'])); else + /* translators: Note: do not use HTML entities ( , etc.): string is used in XML feeds */ printf(ent2ncr(__('Comments for %s')), get_bloginfo_rss( 'name' ) . get_wp_title_rss()); ?> @@ -43,8 +46,10 @@ if ( !is_singular() ) { $title = get_the_title($comment_post->ID); $title = apply_filters('the_title_rss', $title); + /* translators: Note: do not use HTML entities ( , etc.): string is used in XML feeds */ printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss()); } else { + /* translators: Note: do not use HTML entities ( , etc.): string is used in XML feeds */ printf(ent2ncr(__('By: %s')), get_comment_author_rss()); } ?> @@ -53,6 +58,7 @@ + /* translators: Note: do not use HTML entities ( , etc.): string is used in XML feeds */ ]]> Index: wp-includes/js/tinymce/langs/wp-langs.php =================================================================== --- wp-includes/js/tinymce/langs/wp-langs.php (revision 11518) +++ wp-includes/js/tinymce/langs/wp-langs.php (working copy) @@ -418,8 +418,8 @@ }); tinyMCE.addI18n("' . $language . '.wpeditimage",{ -edit_img:"' . mce_escape( __('Edit Image') ) . '", -del_img:"' . mce_escape( __('Delete Image') ) . '", +edit_img:"' /* translators: Note: do not use HTML entities ( , etc.): string is used in Visual Editor */ . mce_escape( __('Edit Image') ) . '", +del_img:"' /* translators: Note: do not use HTML entities ( , etc.): string is used in Visual Editor */ . mce_escape( __('Delete Image') ) . '", adv_settings:"' . mce_escape( __('Advanced Settings') ) . '", none:"' . mce_escape( __('None') ) . '", size:"' . mce_escape( __('Size') ) . '", Index: wp-includes/pluggable.php =================================================================== --- wp-includes/pluggable.php (revision 11518) +++ wp-includes/pluggable.php (working copy) @@ -964,40 +964,53 @@ if ( empty( $comment_type ) ) $comment_type = 'comment'; if ('comment' == $comment_type) { - /* translators: 1: post id, 2: post title */ + /* translators: 1: post id, 2: post title. Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message = sprintf( __('New comment on your post #%1$s "%2$s"'), $comment->comment_post_ID, $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. Note: do not use HTML entities ( , etc.): 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: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= sprintf( __('Whois : http://ws.arin.net/cgi-bin/whois.pl?queryinput=%s'), $comment->comment_author_IP ) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): 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. Note: do not use HTML entities ( , etc.): string is used in e-mails */ $subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title ); } elseif ('trackback' == $comment_type) { - /* translators: 1: post id, 2: post title */ + /* translators: 1: post id, 2: post title. Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message = sprintf( __('New trackback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n"; - /* translators: 1: website name, 2: author IP, 3: author domain */ + /* translators: 1: website name, 2: author IP, 3: author domain. Note: do not use HTML entities ( , etc.): 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: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= __('Excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): 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. Note: do not use HTML entities ( , etc.): string is used in e-mails */ $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title ); } elseif ('pingback' == $comment_type) { - /* translators: 1: post id, 2: post title */ + /* translators: 1: post id, 2: post title. Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message = sprintf( __('New pingback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $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. Note: do not use HTML entities ( , etc.): 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: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= __('Excerpt: ') . "\r\n" . sprintf('[...] %s [...]', $comment->comment_content ) . "\r\n\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): 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. Note: do not use HTML entities ( , etc.): string is used in e-mails */ $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title ); } $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=cdc&c=$comment_id") ) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=cdc&dt=spam&c=$comment_id") ) . "\r\n"; $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME'])); @@ -1053,38 +1066,57 @@ switch ($comment->comment_type) { case 'trackback': + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message = sprintf( __('A new trackback on the post #%1$s "%2$s" is waiting for your approval'), $post->ID, $post->post_title ) . "\r\n"; $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): 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: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; break; case 'pingback': + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message = sprintf( __('A new pingback on the post #%1$s "%2$s" is waiting for your approval'), $post->ID, $post->post_title ) . "\r\n"; $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): 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: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; break; default: //Comments + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message = sprintf( __('A new comment on the post #%1$s "%2$s" is waiting for your approval'), $post->ID, $post->post_title ) . "\r\n"; $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): 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: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= sprintf( __('Whois : http://ws.arin.net/cgi-bin/whois.pl?queryinput=%s'), $comment->comment_author_IP ) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; break; } + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= sprintf( __('Approve it: %s'), admin_url("comment.php?action=mac&c=$comment_id") ) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=cdc&c=$comment_id") ) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=cdc&dt=spam&c=$comment_id") ) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): 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: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), get_option('blogname'), $post->post_title ); $admin_email = get_option('admin_email'); $message_headers = ''; @@ -1111,7 +1143,9 @@ // 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 ( $user->user_email != get_option('admin_email') ) { + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message); } } @@ -1132,19 +1166,26 @@ $user_login = stripslashes($user->user_login); $user_email = stripslashes($user->user_email); + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $message = sprintf(__('New user registration on your blog %s:'), get_option('blogname')) . "\r\n\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), get_option('blogname')), $message); if ( empty($plaintext_pass) ) return; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $message = sprintf(__('Username: %s'), $user_login) . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n"; $message .= wp_login_url() . "\r\n"; + /* translators: Note: do not use HTML entities ( , etc.): string is used in e-mails */ wp_mail($user_email, sprintf(__('[%s] Your username and password'), get_option('blogname')), $message); } Index: wp-includes/script-loader.php =================================================================== --- wp-includes/script-loader.php (revision 11518) +++ wp-includes/script-loader.php (working copy) @@ -73,7 +73,7 @@ $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", false, '20090307' ); $scripts->localize( 'quicktags', 'quicktagsL10n', array( 'quickLinks' => __('(Quick Links)'), - 'wordLookup' => __('Enter a word to look up:'), + 'wordLookup' => /* translators: Note: do not use HTML entities ( , etc.): string is used in JavaScript alert() message */ __('Enter a word to look up:'), 'dictionaryLookup' => esc_attr(__('Dictionary lookup')), 'lookup' => esc_attr(__('lookup')), 'closeAllOpenTags' => esc_attr(__('Close all open tags')),