Index: wp-admin/custom-background.php
===================================================================
--- wp-admin/custom-background.php	(revision 25008)
+++ wp-admin/custom-background.php	(working copy)
@@ -268,7 +268,7 @@
 </tbody>
 </table>
 
-<h3><?php _e('Display Options') ?></h3>
+<h3><?php _e('Display Settings') ?></h3>
 <form method="post" action="">
 <table class="form-table">
 <tbody>
Index: wp-admin/network.php
===================================================================
--- wp-admin/network.php	(revision 25008)
+++ wp-admin/network.php	(working copy)
@@ -16,7 +16,7 @@
 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() ) {
Index: wp-admin/network/settings.php
===================================================================
--- wp-admin/network/settings.php	(revision 25008)
+++ wp-admin/network/settings.php	(working copy)
@@ -23,13 +23,13 @@
 		'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>' . __('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>' . __('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(
@@ -74,7 +74,7 @@
 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
 }
 ?>
 
Index: wp-admin/options-discussion.php
===================================================================
--- wp-admin/options-discussion.php	(revision 25008)
+++ wp-admin/options-discussion.php	(working copy)
@@ -10,7 +10,7 @@
 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 = __('Discussion Settings');
 $parent_file = 'options-general.php';
@@ -18,7 +18,7 @@
 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>',
 ) );
 
Index: wp-admin/options-general.php
===================================================================
--- wp-admin/options-general.php	(revision 25008)
+++ wp-admin/options-general.php	(working copy)
@@ -10,7 +10,7 @@
 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';
Index: wp-admin/options-media.php
===================================================================
--- wp-admin/options-media.php	(revision 25008)
+++ wp-admin/options-media.php	(working copy)
@@ -10,7 +10,7 @@
 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';
Index: wp-admin/options-permalink.php
===================================================================
--- wp-admin/options-permalink.php	(revision 25008)
+++ wp-admin/options-permalink.php	(working copy)
@@ -10,7 +10,7 @@
 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';
@@ -19,7 +19,7 @@
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' => '<p>' . __('Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change &#8212; hence the name permalink.') . '</p>' .
-		'<p>' . __('This screen allows you to choose your default permalink structure. You can choose from common settings or create custom URL structures.') . '</p>' .
+		'<p>' . __('This screen allows you to choose your default permalink structure. You can choose from common settings, or create custom URL structures.') . '</p>' .
 		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
 ) );
 
@@ -26,8 +26,8 @@
 get_current_screen()->add_help_tab( array(
 	'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>' .
+	'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 you can craft your own if you select Custom Structure.') . '</p>' .
+		'<p>' . __('If you pick a format 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>',
 ) );
@@ -232,7 +232,7 @@
 ?>
 <p><?php
 /* translators: %s is a placeholder that must come at the start of the URL path. */
-printf( __('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>topics</code> as your category base would make your category links like <code>http://example.org/%stopics/uncategorized/</code>. If you leave these blank the defaults will be used.'), $suffix ); ?></p>
+printf( __('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>topics</code> as your category base would make your category links like <code>http://example.org/%stopics/uncategorized/</code>. If you leave these blank, the defaults will be used.'), $suffix ); ?></p>
 
 <table class="form-table">
 	<tr>
Index: wp-admin/options-reading.php
===================================================================
--- wp-admin/options-reading.php	(revision 25008)
+++ wp-admin/options-reading.php	(working copy)
@@ -10,7 +10,7 @@
 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';
Index: wp-admin/options-writing.php
===================================================================
--- wp-admin/options-writing.php	(revision 25008)
+++ wp-admin/options-writing.php	(working copy)
@@ -10,7 +10,7 @@
 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';
Index: wp-admin/options.php
===================================================================
--- wp-admin/options.php	(revision 25008)
+++ wp-admin/options.php	(working copy)
@@ -1,13 +1,13 @@
 <?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.
  *
Index: wp-signup.php
===================================================================
--- wp-signup.php	(revision 25008)
+++ wp-signup.php	(working copy)
@@ -524,7 +524,7 @@
 $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;