From 04a1ea0b3973b2a4ef41e271ce5d916e0641f166 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Thu, 25 Oct 2012 22:21:15 +0000 Subject: [PATCH] Consolidate some transalted strings. Remove unnecessary trailing newlines. Props pavelevap. fixes #22274 git-svn-id: http://core.svn.wordpress.org/trunk@22308 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/ms-functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index b7c018d5ab..d183b622e8 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -781,7 +781,7 @@ function wpmu_signup_user_notification($user, $user_email, $key, $meta = '') { $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; $message = sprintf( apply_filters( 'wpmu_signup_user_notification_email', - __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\n" ), + __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login." ), $user, $user_email, $key, $meta ), site_url( "wp-activate.php?key=$key" ) @@ -1130,7 +1130,7 @@ function install_blog($blog_id, $blog_title = '') { $wpdb->suppress_errors(); if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) ) - die( __( '

Already Installed

You appear to have already installed WordPress. To reinstall please clear your old database tables first.

' ) . '' ); + die( '

' . __( 'Already Installed' ) . '

' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '

' ); $wpdb->suppress_errors( false ); $url = get_blogaddress_by_id( $blog_id );