WordPress 3.4.1

[autoinstalls/wordpress.git] / wp-admin / options-privacy.php

diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php
index 9fd25bc96f06848460fb3eaefcdb3c301fb2ba40..d0d4336e28c301456d944c50aaa096bc6a292dc3 100644 (file)
--- a/wp-admin/options-privacy.php
+++ b/wp-admin/options-privacy.php
@@ -15,10 +15,14 @@ if ( ! current_user_can( 'manage_options' ) )
 $title = __('Privacy Settings');
 $parent_file = 'options-general.php';
 
 $title = __('Privacy Settings');
 $parent_file = 'options-general.php';
 

-add_contextual_help($current_screen,
-       '<p>' . __('You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the second option here. Note that your privacy is not complete; your site is still visible on the web.') . '</p>' .
-       '<p>' . __('When this setting is in effect a reminder is shown in the Right Now box of the Dashboard that says, &#8220;Search Engines Blocked,&#8221; to remind you that your site is not being crawled.') . '</p>' .
-       '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>' .
+get_current_screen()->add_help_tab( array(
+       'id'      => 'overview',
+       'title'   => __('Overview'),
+       'content' => '<p>' . __('You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the radio button next to &#8220;Ask search engines not to index this site&#8221; and click the Save Changes button at the bottom of the screen. Note that your privacy is not complete; your site is still visible on the web.') . '</p>' .
+               '<p>' . __('When this setting is in effect a reminder is shown in the Right Now box of the Dashboard that says, &#8220;Search Engines Blocked,&#8221; to remind you that your site is not being crawled.') . '</p>',
+) );
+
+get_current_screen()->set_help_sidebar(

        '<p><strong>' . __('For more information:') . '</strong></p>' .
        '<p>' . __('<a href="http://codex.wordpress.org/Settings_Privacy_Screen" target="_blank">Documentation on Privacy Settings</a>') . '</p>' .
        '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
        '<p><strong>' . __('For more information:') . '</strong></p>' .
        '<p>' . __('<a href="http://codex.wordpress.org/Settings_Privacy_Screen" target="_blank">Documentation on Privacy Settings</a>') . '</p>' .
        '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'


@@ -36,12 +40,13 @@ include('./admin-header.php');
 
 <table class="form-table">
 <tr valign="top">
 
 <table class="form-table">
 <tr valign="top">

-<th scope="row"><?php _e('Site Visibility') ?> </th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Site Visibility') ?> </span></legend>
+<th scope="row"><?php _e( 'Site Visibility' ); ?> </th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Site Visibility' ); ?> </span></legend>

 <input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
 <input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />

-<label for="blog-public"><?php _e('I would like my site to be visible to everyone, including search engines (like Google, Bing, Technorati) and archivers');?></label><br/>
+<label for="blog-public"><?php _e( 'Allow search engines to index this site.' );?></label><br/>

 <input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
 <input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />

-<label for="blog-norobots"><?php _e('I would like to block search engines, but allow normal visitors'); ?></label>
+<label for="blog-norobots"><?php _e( 'Ask search engines not to index this site.' ); ?></label>
+<p class="description"><?php _e( 'Note: Neither of these options blocks access to your site &mdash; it is up to search engines to honor your request.' ); ?></p>

 <?php do_action('blog_privacy_selector'); ?>
 </fieldset></td>
 </tr>
 <?php do_action('blog_privacy_selector'); ?>
 </fieldset></td>
 </tr>