Index: wp-admin/includes/theme.php
===================================================================
--- wp-admin/includes/theme.php (revision 18156)
+++ wp-admin/includes/theme.php (working copy)
@@ -309,7 +309,7 @@
'front-page-post-form' => __( 'Front Page Posting' ),
'microformats' => __( 'Microformats' ),
'sticky-post' => __( 'Sticky Post' ),
- 'theme-options' => __( 'Theme Options' ),
+ 'theme-options' => __( 'Theme Settings' ),
'threaded-comments' => __( 'Threaded Comments' ),
'translation-ready' => __( 'Translation Ready' ),
'rtl-language-support' => __( 'RTL Language Support' )
Index: wp-admin/network.php
===================================================================
--- wp-admin/network.php (revision 18156)
+++ 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 18156)
+++ wp-admin/network/settings.php (working copy)
@@ -20,15 +20,15 @@
$parent_file = 'settings.php';
add_contextual_help($current_screen,
- '' . __('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’s options.') . '
' .
+ '' . __('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’s settings.') . '
' .
'' . __('Operational settings has fields for the network’s name and admin email.') . '
' .
- '' . __('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.') . '
' .
+ '' . __('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.') . '
' .
'' . __('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.') . '
' .
'' . __('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᾿s put in the first post, page, comment, comment author, and comment URL.') . '
' .
'' . __('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).') . '
' .
'' . __('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.') . '
' .
'' . __('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.') . '
' .
- '' . __('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.') . '
' .
+ '' . __('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.') . '
' .
'' . __('For more information:') . '
' .
'' . __('Documentation on Network Settings') . '
' .
'' . __('Support Forums') . '
'
@@ -38,7 +38,7 @@
if (isset($_GET['updated'])) {
?>
-
+
Index: wp-admin/options-discussion.php
===================================================================
--- wp-admin/options-discussion.php (revision 18156)
+++ wp-admin/options-discussion.php (working copy)
@@ -16,7 +16,7 @@
$parent_file = 'options-general.php';
add_contextual_help($current_screen,
- '' . __('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’t all fit here! :) Use the documentation link below to get information on what each discussion setting does.') . '
' .
+ '' . __('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’t all fit here! :) Use the documentation link below to get information on what each discussion setting does.') . '
' .
'' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '
' .
'' . __('For more information:') . '
' .
'' . __('Documentation on Discussion Settings') . '
' .
Index: wp-admin/options-general.php
===================================================================
--- wp-admin/options-general.php (revision 18156)
+++ 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 18156)
+++ 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';
@@ -18,7 +18,7 @@
add_contextual_help($current_screen,
'' . __('You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.') . '
' .
'' . __('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.') . '
' .
- ( is_multisite() ? '' : '' . __('Uploading Options gives you folder and path choices for storing your files in your installation’s directory.') . '
' ) .
+ ( is_multisite() ? '' : '' . __('Uploading Settings gives you folder and path choices for storing your files in your installation’s directory.') . '
' ) .
'' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '
' .
'' . __('For more information:') . '
' .
'' . __('Documentation on Media Settings') . '
' .
Index: wp-admin/options-permalink.php
===================================================================
--- wp-admin/options-permalink.php (revision 18156)
+++ 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';
Index: wp-admin/options-privacy.php
===================================================================
--- wp-admin/options-privacy.php (revision 18156)
+++ wp-admin/options-privacy.php (working copy)
@@ -1,6 +1,6 @@
' . __('Your profile contains information about you (your “account”) as well as some personal options related to using WordPress.') . '' .
+ '' . __('Your profile contains information about you (your “account”) as well as some personal settings related to using WordPress.') . '
' .
'' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things.') . '
' .
'' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '
' .
'' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '
' .
Index: wp-signup.php
===================================================================
--- wp-signup.php (revision 18156)
+++ wp-signup.php (working copy)
@@ -391,7 +391,7 @@
$i18n_signup['user'] = _x('user', 'Multisite active signup type');
if ( is_super_admin() )
- echo '' . sprintf( __( 'Greetings Site Administrator! You are currently allowing “%s” registrations. To change or disable registration go to your
Options page.' ), $i18n_signup[$active_signup], esc_url( network_admin_url( 'settings.php' ) ) ) . '
';
+ echo '' . sprintf( __( 'Greetings Site Administrator! You are currently allowing “%s” registrations. To change or disable registration go to your
Settings page.' ), $i18n_signup[$active_signup], esc_url( network_admin_url( 'settings.php' ) ) ) . '
';
$newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;