Changeset 32210

Timestamp:

04/20/2015 03:35:31 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Merge two different translator comments for the same string.

props pavelevap.
fixes #31999.

File:

• trunk/src/wp-includes/pluggable.php (modified) (4 diffs)

trunk/src/wp-includes/pluggable.php

@@ -1425 +1425 @@
                 case 'trackback':
                         $notify_message  = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n";
-                        /* translators: 1: website name, 2: author IP, 3: author domain */
+                        /* translators: 1: website name, 2: website IP, 3: website hostname */
                         $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
                         $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
@@ -1435 +1435 @@
                 case 'pingback':
                         $notify_message  = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n";
-                        /* translators: 1: comment author, 2: author IP, 3: author domain */
+                        /* translators: 1: website name, 2: website IP, 3: website hostname */
                         $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
                         $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
@@ -1561 +1561 @@
                         $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 */
                         $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
                         $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
@@ -1568 +1569 @@
                         $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 */
                         $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
                         $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";