WordPress.org

Make WordPress Core

Changeset 22430


Ignore:
Timestamp:
11/07/12 19:37:54 (17 months ago)
Author:
nacin
Message:

Merge some strings. props pavelevap. fixes #22306.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/update.php

    r20476 r22430  
    9191 
    9292        if ( ! current_user_can('install_plugins') ) 
    93             wp_die(__('You do not have sufficient permissions to install plugins for this site.')); 
     93            wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) ); 
    9494 
    9595        include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api.. 
     
    122122 
    123123        if ( ! current_user_can('install_plugins') ) 
    124             wp_die(__('You do not have sufficient permissions to install plugins for this site.')); 
     124            wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) ); 
    125125 
    126126        check_admin_referer('plugin-upload'); 
     
    195195 
    196196        if ( ! current_user_can('install_themes') ) 
    197             wp_die(__('You do not have sufficient permissions to install themes for this site.')); 
     197            wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) ); 
    198198 
    199199        include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api.. 
     
    225225 
    226226        if ( ! current_user_can('install_themes') ) 
    227             wp_die(__('You do not have sufficient permissions to install themes for this site.')); 
     227            wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) ); 
    228228 
    229229        check_admin_referer('theme-upload'); 
  • trunk/wp-includes/default-widgets.php

    r22278 r22430  
    845845 
    846846    if ( !$rss->get_item_quantity() ) { 
    847         echo '<ul><li>' . __( 'An error has occurred; the feed is probably down. Try again later.' ) . '</li></ul>'; 
     847        echo '<ul><li>' . __( 'An error has occurred, which probably means the feed is down. Try again later.' ) . '</li></ul>'; 
    848848        $rss->__destruct(); 
    849849        unset($rss); 
  • trunk/wp-includes/ms-functions.php

    r22428 r22430  
    16771677        wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) ); 
    16781678 
    1679     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') ); 
     1679    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' ) ); 
    16801680} 
    16811681 
Note: See TracChangeset for help on using the changeset viewer.