From dc40f18228d4c3f6d5051c069106daafd0286721 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Wed, 7 Nov 2012 19:37:54 +0000
Subject: [PATCH] Merge some strings. props pavelevap. fixes #22306.

git-svn-id: http://core.svn.wordpress.org/trunk@22430 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/update.php             | 8 ++++----
 wp-includes/default-widgets.php | 2 +-
 wp-includes/ms-functions.php    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wp-admin/update.php b/wp-admin/update.php
index 4fdf2064c7..687142e218 100644
--- a/wp-admin/update.php
+++ b/wp-admin/update.php
@@ -90,7 +90,7 @@ if ( isset($_GET['action']) ) {
 	} elseif ( 'install-plugin' == $action ) {
 
 		if ( ! current_user_can('install_plugins') )
-			wp_die(__('You do not have sufficient permissions to install plugins for this site.'));
+			wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
 
 		include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api..
 
@@ -121,7 +121,7 @@ if ( isset($_GET['action']) ) {
 	} elseif ( 'upload-plugin' == $action ) {
 
 		if ( ! current_user_can('install_plugins') )
-			wp_die(__('You do not have sufficient permissions to install plugins for this site.'));
+			wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
 
 		check_admin_referer('plugin-upload');
 
@@ -194,7 +194,7 @@ if ( isset($_GET['action']) ) {
 	} elseif ( 'install-theme' == $action ) {
 
 		if ( ! current_user_can('install_themes') )
-			wp_die(__('You do not have sufficient permissions to install themes for this site.'));
+			wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
 
 		include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api..
 
@@ -224,7 +224,7 @@ if ( isset($_GET['action']) ) {
 	} elseif ( 'upload-theme' == $action ) {
 
 		if ( ! current_user_can('install_themes') )
-			wp_die(__('You do not have sufficient permissions to install themes for this site.'));
+			wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
 
 		check_admin_referer('theme-upload');
 
diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php
index ddd9d8ac63..5942f5bfd4 100644
--- a/wp-includes/default-widgets.php
+++ b/wp-includes/default-widgets.php
@@ -844,7 +844,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
 	$show_date     = (int) $show_date;
 
 	if ( !$rss->get_item_quantity() ) {
-		echo '<ul><li>' . __( 'An error has occurred; the feed is probably down. Try again later.' ) . '</li></ul>';
+		echo '<ul><li>' . __( 'An error has occurred, which probably means the feed is down. Try again later.' ) . '</li></ul>';
 		$rss->__destruct();
 		unset($rss);
 		return;
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 8d645f89ee..8f5aeec66f 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -1676,7 +1676,7 @@ function maybe_add_existing_user_to_blog() {
 	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
 		wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
 
-	wp_die( sprintf(__('You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.'), home_url(), admin_url() ), __('Success') );
+	wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ) );
 }
 
 /**