Changeset 14313

Timestamp:

04/30/2010 01:54:32 AM (15 years ago)

Author:

nacin

Message:

s/blog/site/ in more places. props PeteMall, see #11644.

Location:

trunk

Files:

• wp-admin/edit-link-category-form.php (modified) (1 diff)
• wp-admin/export.php (modified) (2 diffs)
• wp-admin/import.php (modified) (2 diffs)
• wp-admin/link-add.php (modified) (1 diff)
• wp-admin/link-manager.php (modified) (2 diffs)
• wp-admin/link.php (modified) (1 diff)
• wp-admin/ms-edit.php (modified) (2 diffs)
• wp-admin/plugin-install.php (modified) (1 diff)
• wp-admin/plugins.php (modified) (6 diffs)
• wp-admin/theme-editor.php (modified) (1 diff)
• wp-admin/theme-install.php (modified) (1 diff)
• wp-admin/update-core.php (modified) (1 diff)
• wp-admin/update.php (modified) (9 diffs)
• wp-includes/load.php (modified) (1 diff)
• wp-includes/ms-load.php (modified) (2 diffs)
• wp-includes/ms-settings.php (modified) (1 diff)

trunk/wp-admin/edit-link-category-form.php

@@ -12 +12 @@
 
 if ( !current_user_can('manage_categories') )
-    wp_die(__('You do not have sufficient permissions to edit link categories for this blog.'));
+    wp_die(__('You do not have sufficient permissions to edit link categories for this site.'));
 
 /**

trunk/wp-admin/export.php

@@ -11 +11 @@
 
 if ( !current_user_can('edit_files') )
-    wp_die(__('You do not have sufficient permissions to export the content of this blog.'));
+    wp_die(__('You do not have sufficient permissions to export the content of this site.'));
 
 /** Load WordPress export API */
@@ -60 +60 @@
 <p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
 <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p>
-<p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function on another WordPress blog to import this blog.'); ?></p>
+<p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function on another WordPress site to import this site.'); ?></p>
 <form action="" method="get">
 <h3><?php _e('Options'); ?></h3>

trunk/wp-admin/import.php

@@ -11 +11 @@
 
 if ( !current_user_can('edit_files') )
-    wp_die(__('You do not have sufficient permissions to import content in this blog.'));
+    wp_die(__('You do not have sufficient permissions to import content in this site.'));
 
 $title = __('Import');
@@ -21 +21 @@
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
-<p><?php _e('If you have posts or comments in another system, WordPress can import those into this blog. To get started, choose a system to import from below:'); ?></p>
+<p><?php _e('If you have posts or comments in another system, WordPress can import those into this site. To get started, choose a system to import from below:'); ?></p>
 
 <?php

trunk/wp-admin/link-add.php

@@ -11 +11 @@
 
 if ( ! current_user_can('manage_links') )
-    wp_die(__('You do not have sufficient permissions to add links to this blog.'));
+    wp_die(__('You do not have sufficient permissions to add links to this site.'));
 
 $title = __('Add New Link');

trunk/wp-admin/link-manager.php

@@ -16 +16 @@
 
     if ( ! current_user_can('manage_links') )
-        wp_die( __('You do not have sufficient permissions to edit the links for this blog.') );
+        wp_die( __('You do not have sufficient permissions to edit the links for this site.') );
 
     if ( 'delete' == $doaction ) {
@@ -47 +47 @@
 
 if ( ! current_user_can('manage_links') )
-    wp_die(__("You do not have sufficient permissions to edit the links for this blog."));
+    wp_die(__("You do not have sufficient permissions to edit the links for this site."));
 
 switch ($order_by) {

trunk/wp-admin/link.php

@@ -16 +16 @@
 
 if ( ! current_user_can('manage_links') )
-    wp_die( __('You do not have sufficient permissions to edit the links for this blog.') );
+    wp_die( __('You do not have sufficient permissions to edit the links for this site.') );
 
 if ( !empty($_POST['deletebookmarks']) )

trunk/wp-admin/ms-edit.php

@@ -83 +83 @@
             if ( false === $blog_details ) {
                 if ( is_numeric( $dashboard_blog ) )
-                    wp_die( __( 'Dashboard blog_id must be a blog that already exists' ) );
+                    wp_die( __( 'A dashboard site referenced by ID must already exist' ) );
                 if ( is_subdomain_install() ) {
                     $domain = $dashboard_blog . '.' . $current_site->domain;
@@ -99 +99 @@
         }
         if ( is_wp_error( $dashboard_blog_id ) )
-            wp_die( __( 'Problem creating dashboard blog: ' ) . $dashboard_blog_id->get_error_message() );
+            wp_die( __( 'Problem creating dashboard site: ' ) . $dashboard_blog_id->get_error_message() );
         if ( $_POST['dashboard_blog_orig'] != $_POST['dashboard_blog'] ) {
             $users = get_users_of_blog( get_site_option( 'dashboard_blog' ) );

trunk/wp-admin/plugin-install.php

@@ -11 +11 @@
 
 if ( ! current_user_can('install_plugins') )
-    wp_die(__('You do not have sufficient permissions to install plugins on this blog.'));
+    wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
 
 include(ABSPATH . 'wp-admin/includes/plugin-install.php');

trunk/wp-admin/plugins.php

@@ -46 +46 @@
         case 'activate':
             if ( ! current_user_can('activate_plugins') )
-                wp_die(__('You do not have sufficient permissions to activate plugins for this blog.'));
+                wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));
 
             check_admin_referer('activate-plugin_' . $plugin);
@@ -73 +73 @@
         case 'network-activate-selected':
             if ( ! current_user_can('activate_plugins') )
-                wp_die(__('You do not have sufficient permissions to activate plugins for this blog.'));
+                wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));
 
             check_admin_referer('bulk-manage-plugins');
@@ -127 +127 @@
         case 'error_scrape':
             if ( ! current_user_can('activate_plugins') )
-                wp_die(__('You do not have sufficient permissions to activate plugins for this blog.'));
+                wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));
 
             check_admin_referer('plugin-activation-error_' . $plugin);
@@ -153 +153 @@
         case 'deactivate':
             if ( ! current_user_can('activate_plugins') )
-                wp_die(__('You do not have sufficient permissions to deactivate plugins for this blog.'));
+                wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.'));
 
             check_admin_referer('deactivate-plugin_' . $plugin);
@@ -166 +166 @@
         case 'deactivate-selected':
             if ( ! current_user_can('activate_plugins') )
-                wp_die(__('You do not have sufficient permissions to deactivate plugins for this blog.'));
+                wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.'));
 
             check_admin_referer('bulk-manage-plugins');
@@ -189 +189 @@
         case 'delete-selected':
             if ( ! current_user_can('delete_plugins') )
-                wp_die(__('You do not have sufficient permissions to delete plugins for this blog.'));
+                wp_die(__('You do not have sufficient permissions to delete plugins for this site.'));
 
             check_admin_referer('bulk-manage-plugins');

trunk/wp-admin/theme-editor.php

@@ -11 +11 @@
 
 if ( !current_user_can('edit_themes') )
-    wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
+    wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this site.').'</p>');
 
 $title = __("Edit Themes");

trunk/wp-admin/theme-install.php

@@ -11 +11 @@
 
 if ( ! current_user_can('install_themes') )
-    wp_die(__('You do not have sufficient permissions to install themes on this blog.'));
+    wp_die(__('You do not have sufficient permissions to install themes on this site.'));
 
 include(ABSPATH . 'wp-admin/includes/theme-install.php');

trunk/wp-admin/update-core.php

@@ -11 +11 @@
 
 if ( ! current_user_can('update_plugins') )
-    wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
+    wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
 
 function list_core_update( $update ) {

trunk/wp-admin/update.php

@@ -19 +19 @@
     if ( 'update-selected' == $action ) {
         if ( ! current_user_can( 'update_plugins' ) )
-            wp_die( __( 'You do not have sufficient permissions to update plugins for this blog.' ) );
+            wp_die( __( 'You do not have sufficient permissions to update plugins for this site.' ) );
 
         check_admin_referer( 'bulk-update-plugins' );
@@ -46 +46 @@
     } elseif ( 'upgrade-plugin' == $action ) {
         if ( ! current_user_can('update_plugins') )
-            wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
+            wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
 
         check_admin_referer('upgrade-plugin_' . $plugin);
@@ -65 +65 @@
     } elseif ('activate-plugin' == $action ) {
         if ( ! current_user_can('update_plugins') )
-            wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
+            wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
 
         check_admin_referer('activate-plugin_' . $plugin);
@@ -93 +93 @@
 
         if ( ! current_user_can('install_plugins') )
-            wp_die(__('You do not have sufficient permissions to install plugins for this blog.'));
+            wp_die(__('You do not have sufficient permissions to install plugins for this site.'));
 
         include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api..
@@ -121 +121 @@
 
         if ( ! current_user_can('install_plugins') )
-            wp_die(__('You do not have sufficient permissions to install plugins for this blog.'));
+            wp_die(__('You do not have sufficient permissions to install plugins for this site.'));
 
         check_admin_referer('plugin-upload');
@@ -145 +145 @@
 
         if ( ! current_user_can('update_themes') )
-            wp_die(__('You do not have sufficient permissions to update themes for this blog.'));
+            wp_die(__('You do not have sufficient permissions to update themes for this site.'));
 
         check_admin_referer('upgrade-theme_' . $theme);
@@ -165 +165 @@
     } elseif ( 'update-selected-themes' == $action ) {
         if ( ! current_user_can( 'update_themes' ) )
-            wp_die( __( 'You do not have sufficient permissions to update themes for this blog.' ) );
+            wp_die( __( 'You do not have sufficient permissions to update themes for this site.' ) );
 
         check_admin_referer( 'bulk-update-themes' );
@@ -192 +192 @@
 
         if ( ! current_user_can('install_themes') )
-            wp_die(__('You do not have sufficient permissions to install themes for this blog.'));
+            wp_die(__('You do not have sufficient permissions to install themes for this site.'));
 
         include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api..
@@ -222 +222 @@
 
         if ( ! current_user_can('install_themes') )
-            wp_die(__('You do not have sufficient permissions to install themes for this blog.'));
+            wp_die(__('You do not have sufficient permissions to install themes for this site.'));
 
         check_admin_referer('theme-upload');

trunk/wp-includes/load.php

@@ -393 +393 @@
     if ( is_multisite() ) {
         if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) )
-            wp_die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) );
+            wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
     } elseif ( ! is_blog_installed() && false === strpos( $_SERVER['PHP_SELF'], 'install.php' ) && !defined( 'WP_INSTALLING' ) ) {
         if ( defined( 'WP_SITEURL' ) )

trunk/wp-includes/ms-load.php

@@ -69 +69 @@
         } else {
             header( 'HTTP/1.1 410 Gone' );
-            wp_die( /*WP_I18N_ARCHIVED*/'This blog has been archived or suspended.'/*/WP_I18N_ARCHIVED*/ );
+            wp_die( /*WP_I18N_ARCHIVED*/'This site has been archived or suspended.'/*/WP_I18N_ARCHIVED*/ );
         }
     }
@@ -182 +182 @@
     // @todo Update or remove WPMU codex link.
     if ( 1 == count( $sites ) )
-        wp_die( sprintf( /*WP_I18N_BLOG_DOESNT_EXIST*/'That blog does not exist. Please try <a href="%s">%s</a>.'/*/WP_I18N_BLOG_DOESNT_EXIST*/, $sites[0]->domain . $sites[0]->path ) );
+        wp_die( sprintf( /*WP_I18N_BLOG_DOESNT_EXIST*/'That site does not exist. Please try <a href="%s">%s</a>.'/*/WP_I18N_BLOG_DOESNT_EXIST*/, $sites[0]->domain . $sites[0]->path ) );
     else
         wp_die( /*WP_I18N_NO_SITE_DEFINED*/'No site defined on this host. If you are the owner of this site, please check <a href="http://codex.wordpress.org/Debugging_WPMU">Debugging WPMU</a> for help.'/*/WP_I18N_NO_SITE_DEFINED*/ );

trunk/wp-includes/ms-settings.php

@@ -116 +116 @@
         } else {
             $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . /*WP_I18N_TABLES_MISSING*/'Database tables are missing.'/*/WP_I18N_TABLES_MISSING*/ : '';
-            wp_die( /*WP_I18N_NO_BLOG*/'No blog by that name on this system.'/*/WP_I18N_NO_BLOG*/ . $msg );
+            wp_die( /*WP_I18N_NO_BLOG*/'No site by that name on this system.'/*/WP_I18N_NO_BLOG*/ . $msg );
         }
     }