Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge some strings. props pavelevap. fixes #22306. 

git-svn-id: http://core.svn.wordpress.org/trunk@22430 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2012-11-07 19:37:54 +00:00
parent e588812a49
commit dc40f18228
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/update.php
View File

@ -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');

2
wp-includes/default-widgets.php
View File

@ -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;

2
wp-includes/ms-functions.php
View File

@ -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' ) );
}
/**