Ticket #17360: 17360.3.patch

wp-signup.php

@@ -387 +387 @@
 $i18n_signup['user'] = _x('user', 'Multisite active signup type');
 
 if ( is_super_admin() )
-        echo '<div class="mu_alert">' . sprintf( __( 'Greetings Site Administrator! You are currently allowing &#8220;%s&#8221; registrations. To change or disable registration go to your <a href="%s">Options page</a>.' ), $i18n_signup[$active_signup], esc_url( network_admin_url( 'settings.php' ) ) ) . '</div>';
+        echo '<div class="mu_alert">' . sprintf( __( 'Greetings Site Administrator! You are currently allowing &#8220;%s&#8221; registrations. To change or disable registration go to your <a href="%s">Settings page</a>.' ), $i18n_signup[$active_signup], esc_url( network_admin_url( 'settings.php' ) ) ) . '</div>';
 
 $newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;
 

wp-admin/network.php

@@ -16 +16 @@
 require_once( './admin.php' );
 
 if ( ! is_super_admin() )
-        wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+        wp_die( __( 'You do not have sufficient permissions to manage settings for this site.' ) );
 
 if ( is_multisite() ) {
         if ( ! is_network_admin() ) {

wp-admin/options-privacy.php

@@ -1 +1 @@
 <?php
 /**
- * Privacy Options Settings Administration Screen.
+ * Privacy Settings Administration Screen.
  *
  * @package WordPress
  * @subpackage Administration
@@ -10 +10 @@
 require_once('./admin.php');
 
 if ( ! current_user_can( 'manage_options' ) )
-        wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+        wp_die( __( 'You do not have sufficient permissions to manage settings for this site.' ) );
 
 $title = __('Privacy Settings');
 $parent_file = 'options-general.php';

wp-admin/options-general.php

@@ -10 +10 @@
 require_once('./admin.php');
 
 if ( ! current_user_can( 'manage_options' ) )
-        wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+        wp_die( __( 'You do not have sufficient permissions to manage settings for this site.' ) );
 
 $title = __('General Settings');
 $parent_file = 'options-general.php';

wp-admin/options-media.php

@@ -10 +10 @@
 require_once('./admin.php');
 
 if ( ! current_user_can( 'manage_options' ) )
-        wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+        wp_die( __( 'You do not have sufficient permissions to manage settings for this site.' ) );
 
 $title = __('Media Settings');
 $parent_file = 'options-general.php';
 
 $media_options_help = '<p>' . __('You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.') . '</p>' .
-        '<p>' . __('The Embed option allows you embed a video, image, or other media content into your content automatically by typing the URL (of the web page where the file lives) on its own line when you create your content.');
+        '<p>' . __('The Embed setting allows you embed a video, image, or other media content into your content automatically by typing the URL (of the web page where the file lives) on its own line when you create your content.');
 
 if ( ! empty( $content_width ) )
         $media_options_help .= ' ' . __( 'If you do not set the maximum embed size, it will be automatically sized to fit into your content area.' );

wp-admin/network/settings.php

@@ -23 +23 @@
                 'id'      => 'overview',
                 'title'   => __('Overview'),
                 'content' =>
-                        '<p>' . __('This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site&#8217;s options.') . '</p>' .
+                        '<p>' . __('This screen sets and changes settings for the network as a whole. The first site is the main site in the network and network settings are pulled from that original site&#8217;s settings.') . '</p>' .
                         '<p>' . __('Operational settings has fields for the network&#8217;s name and admin email.') . '</p>' .
-                        '<p>' . __('Dashboard Site is an option to give a site to users who do not have a site on the system. Their default role is Subscriber, but that default can be changed. The Admin Notice Feed can provide a notice on all dashboards of the latest post via RSS or Atom, or provide no such notice if left blank.') . '</p>' .
+                        '<p>' . __('Dashboard Site is a setting to give a site to users who do not have a site on the system. Their default role is Subscriber, but that default can be changed. The Admin Notice Feed can provide a notice on all dashboards of the latest post via RSS or Atom, or provide no such notice if left blank.') . '</p>' .
                         '<p>' . __('Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.') . '</p>' .
                         '<p>' . __('New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.') . '</p>' .
                         '<p>' . __('Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).') . '</p>' .
                         '<p>' . __('Checkboxes for media upload buttons set which are shown in the visual editor. If unchecked, a generic upload button is still visible; other media types can still be uploaded if on the allowed file types list.') . '</p>' .
                         '<p>' . __('Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.') . '</p>' .
-                        '<p>' . __('Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.') . '</p>'
+                        '<p>' . __('Super admins can no longer be added on the Settings screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.') . '</p>'
 ) );
 
 get_current_screen()->set_help_sidebar(
@@ -109 +109 @@
 include( '../admin-header.php' );
 
 if ( isset( $_GET['updated'] ) ) {
-        ?><div id="message" class="updated"><p><?php _e( 'Options saved.' ) ?></p></div><?php
+        ?><div id="message" class="updated"><p><?php _e( 'Settings saved.' ) ?></p></div><?php
 }
 ?>
 

wp-admin/options-discussion.php

@@ -18 +18 @@
 get_current_screen()->add_help_tab( array(
         'id'      => 'overview',
         'title'   => __('Overview'),
-        'content' => '<p>' . __('This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won&#8217;t all fit here! :) Use the documentation links to get information on what each discussion setting does.') . '</p>' .
+        'content' => '<p>' . __('This screen provides many settings for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won&#8217;t all fit here! :) Use the documentation links to get information on what each discussion setting does.') . '</p>' .
                 '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
 ) );
 

wp-admin/options.php

@@ -1 +1 @@
 <?php
 /**
- * Options Management Administration Screen.
+ * Settings Management Administration Screen.
  *
- * If accessed directly in a browser this page shows a list of all saved options
+ * If accessed directly in a browser this page shows a list of all saved settings
  * along with editable fields for their values. Serialized data is not supported
- * and there is no way to remove options via this page. It is not linked to from
+ * and there is no way to remove settings via this page. It is not linked to from
  * anywhere else in the admin.
  *
- * This file is also the target of the forms in core and custom options pages
+ * This file is also the target of the forms in core and custom settings pages
  * that use the Settings API. In this case it saves the new option values
  * and returns the user to their page of origin.
  *

wp-admin/options-reading.php

@@ -10 +10 @@
 require_once( './admin.php' );
 
 if ( ! current_user_can( 'manage_options' ) )
-        wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+        wp_die( __( 'You do not have sufficient permissions to manage settings for this site.' ) );
 
 $title = __( 'Reading Settings' );
 $parent_file = 'options-general.php';

wp-admin/options-permalink.php

@@ -10 +10 @@
 require_once('./admin.php');
 
 if ( ! current_user_can( 'manage_options' ) )
-        wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+        wp_die( __( 'You do not have sufficient permissions to manage settings for this site.' ) );
 
 $title = __('Permalink Settings');
 $parent_file = 'options-general.php';
@@ -27 +27 @@
         'id'      => 'common-settings',
         'title'   => __('Common Settings'),
         'content' => '<p>' . __('Many people choose to use &#8220;pretty permalinks,&#8221; URLs that contain useful information such as the post title rather than generic post ID numbers. You can choose from any of the permalink formats under Common Settings, or can craft your own if you select Custom Structure.') . '</p>' .
-                '<p>' . __('If you pick an option other than Default, your general URL path with structure tags, terms surrounded by <code>%</code>, will also appear in the custom structure field and your path can be further modified there.') . '</p>' .
+                '<p>' . __('If you pick an setting other than Default, your general URL path with structure tags, terms surrounded by <code>%</code>, will also appear in the custom structure field and your path can be further modified there.') . '</p>' .
                 '<p>' . __('When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes <code>%category%</code> or <code>%tag%</code>.') . '</p>' .
                 '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
 ) );

wp-admin/options-writing.php

@@ -10 +10 @@
 require_once('./admin.php');
 
 if ( ! current_user_can( 'manage_options' ) )
-        wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+        wp_die( __( 'You do not have sufficient permissions to manage settings for this site.' ) );
 
 $title = __('Writing Settings');
 $parent_file = 'options-general.php';

wp-admin/custom-background.php

@@ -85 +85 @@
                         'title'   => __('Overview'),
                         'content' =>
                                 '<p>' . __( 'You can customize the look of your site without touching any of your theme&#8217;s code by using a custom background. Your background can be an image or a color.' ) . '</p>' .
-                                '<p>' . __( 'To use a background image, simply upload it, then choose your display options below. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '</p>' .
+                                '<p>' . __( 'To use a background image, simply upload it, then choose your display settings below. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '</p>' .
                                 '<p>' . __( 'You can also choose a background color. If you know the hexadecimal code for the color you want, enter it in the Background Color field. If not, click on the Select a Color link, and a color picker will allow you to choose the exact shade you want.' ) . '</p>' .
                                 '<p>' . __( 'Don&#8217;t forget to click on the Save Changes button when you are finished.' ) . '</p>'
                 ) );
@@ -252 +252 @@
 </tbody>
 </table>
 
-<h3><?php _e('Display Options') ?></h3>
+<h3><?php _e('Display Settings') ?></h3>
 <form method="post" action="">
 <table class="form-table">
 <tbody>