<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15126] trunk/wp-admin: Help text cleanup.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15126">15126</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-06-03 13:37:51 +0000 (Thu, 03 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Help text cleanup. Props zeo. fixes <a href="http://trac.wordpress.org/ticket/13467">#13467</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminindexphp">trunk/wp-admin/index.php</a></li>
<li><a href="#trunkwpadminmediauploadphp">trunk/wp-admin/media-upload.php</a></li>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
<li><a href="#trunkwpadminoptionspermalinkphp">trunk/wp-admin/options-permalink.php</a></li>
<li><a href="#trunkwpadminoptionsreadingphp">trunk/wp-admin/options-reading.php</a></li>
<li><a href="#trunkwpadminplugininstallphp">trunk/wp-admin/plugin-install.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadminthemeinstallphp">trunk/wp-admin/theme-install.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpadminwidgetsphp">trunk/wp-admin/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index.php (15125 => 15126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index.php 2010-06-03 05:23:21 UTC (rev 15125)
+++ trunk/wp-admin/index.php 2010-06-03 13:37:51 UTC (rev 15126)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> '<p>' . __('<strong>Incoming Links</strong> - Shows links to your site found by Google Blog Search.') . '</p>' .
</span><span class="cx"> '<p>' . __('<strong>QuickPress</strong> - Allows you to create a new post and either publish it or save it as a draft.') . '</p>' .
</span><span class="cx"> '<p>' . __('<strong>Recent Drafts</strong> - Displays links to the 5 most recent draft posts you&#8217;ve started.') . '</p>' .
</span><del>- '<p>' . __('<strong>Other WordPress News</strong> - Shows the feed from http://planet.wordpress.org. You can configure it to show a different feed of your choosing.') . '</p>' .
- '<p>' . __('<strong>Plugins</strong> - Features the most popular, newest, and recently updated plugins from the WordPress.org plugin repository.') . '</p>' .
</del><ins>+ '<p>' . sprintf(__('<strong>Other WordPress News</strong> - Shows the feed from <a href="%s" target="_blank">WordPress Planet</a>. You can configure it to show a different feed of your choosing.'), 'http://planet.wordpress.org') . '</p>' .
+ '<p>' . __('<strong>Plugins</strong> - Features the most popular, newest, and recently updated plugins from the WordPress.org Plugin Directory.') . '</p>' .
</ins><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><span class="cx"> '<p>' . __('<a href="http://codex.wordpress.org/Dashboard_SubPanel">Dashboard Documentation</a>') . '</p>' .
</span><span class="cx"> '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</span></span></pre></div>
<a id="trunkwpadminmediauploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/media-upload.php (15125 => 15126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/media-upload.php 2010-06-03 05:23:21 UTC (rev 15125)
+++ trunk/wp-admin/media-upload.php 2010-06-03 13:37:51 UTC (rev 15126)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> '<p>' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share.') . '</p>' .
</span><span class="cx"> '<p>' . __('There are two options for uploading files: <em>Select Files</em> will open the Flash-based uploader (multiple file upload allowed), or you can use the <em>Browser Uploader</em>. Clicking <em>Select Files</em> opens a navigation window showing you files in your operating system. Selecting <em>Open</em> after clicking on the file you want activates a progress bar on the uploader screen. Basic image editing is available after upload is complete. Make sure you click <em>Save</em> before leaving this screen.') . '</p>' .
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><del>- '<p>' . __('<a href="http://codex.wordpress.org/Media_Add_New_SubPanel">Documentaion on Uploading Media Files</a>') . '</p>' .
</del><ins>+ '<p>' . __('<a href="http://codex.wordpress.org/Media_Add_New_SubPanel">Documentation on Uploading Media Files</a>') . '</p>' .
</ins><span class="cx"> '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (15125 => 15126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-06-03 05:23:21 UTC (rev 15125)
+++ trunk/wp-admin/network.php 2010-06-03 13:37:51 UTC (rev 15126)
</span><span class="lines">@@ -90,10 +90,10 @@
</span><span class="cx"> $parent_file = 'tools.php';
</span><span class="cx">
</span><span class="cx"> add_contextual_help($current_screen,
</span><del>- '<p>' . __('This screen allows you to configure a network as having subdomains (site1.example.com) or subdirectories (example.com/site1). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.') . '</p>' .
</del><ins>+ '<p>' . __('This screen allows you to configure a network as having subdomains (<code>site1.example.com</code>) or subdirectories (<code>example.com/site1</code>). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.') . '</p>' .
</ins><span class="cx"> '<p>' . __('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '</p>' .
</span><span class="cx"> '<p>' . __('The next screen for Network will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.') . '</p>' .
</span><del>- '<p>' . __('Add a blogs.dir directory under /wp-content/ and add the designated lines of code to wp-config.php (just before /*...stop editing...*/) and .htaccess (replacing the existing WordPress rules).') . '</p>' .
</del><ins>+ '<p>' . __('Add a <code>blogs.dir</code> directory under <code>/wp-content</code> and add the designated lines of code to wp-config.php (just before <code>/*...stop editing...*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).') . '</p>' .
</ins><span class="cx"> '<p>' . __('Refreshing your browser will take you to a screen with an archive of those added lines of code. A set of six links under Super Admin will appear at the top of the main left navigation menu. The multisite network is now enabled.') . '</p>' .
</span><span class="cx"> '<p>' . __('The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with &#8220;/blog/&#8221; from the main site. This disabling will be addressed soon in a future version.') . '</p>' .
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span></span></pre></div>
<a id="trunkwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-permalink.php (15125 => 15126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-permalink.php 2010-06-03 05:23:21 UTC (rev 15125)
+++ trunk/wp-admin/options-permalink.php 2010-06-03 13:37:51 UTC (rev 15126)
</span><span class="lines">@@ -17,10 +17,10 @@
</span><span class="cx">
</span><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('This screen provides some common options for your default permalinks URL structure.') . '</p>' .
</span><del>- '<p>' . __('If you pick an option other than Default, your general URL path with structure tags, terms surrounded by %, 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 %category% or %tag%.') . '</p>' .
</del><ins>+ '<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>' . __('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>' .
</ins><span class="cx"> '<p>' . __('Note that permalinks beginning with the category, tag, author or postname structure tags require more advanced server resources. Double-check your hosting details to make sure those are in place or start your permalinks with other structure tags.') . '</p>' .
</span><del>- '<p>' . __('The Optional fields let you customize the &#8220;category&#8221; and &#8220;tag&#8221; base names that will appear in archive URLs. For example, the page listing all posts in the &#8220;Uncategorized&#8221; category could be /topics/uncategorized instead of /category/uncategorized.') . '</p>' .
</del><ins>+ '<p>' . __('The Optional fields let you customize the &#8220;category&#8221; and &#8220;tag&#8221; base names that will appear in archive URLs. For example, the page listing all posts in the &#8220;Uncategorized&#8221; category could be <code>/topics/uncategorized</code> instead of <code>/category/uncategorized</code>.') . '</p>' .
</ins><span class="cx"> '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>' .
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><span class="cx"> '<p>' . __('<a href="http://codex.wordpress.org/Settings_Permalinks_SubPanel">Permalinks Settings Documentation</a>') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminoptionsreadingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-reading.php (15125 => 15126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-reading.php 2010-06-03 05:23:21 UTC (rev 15125)
+++ trunk/wp-admin/options-reading.php 2010-06-03 13:37:51 UTC (rev 15126)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx">
</span><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('This screen contains the settings that affect the display of your content.') . '</p>' .
</span><del>- '<p>' . __('You can choose what&#8217;s displayed on the front page of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static home page, you first need to create two <a href="post-new.php?post_type=page">Pages</a>. One will become the front page, and the other will be where your posts are displayed.') . '</p>' .
</del><ins>+ '<p>' . sprintf(__('You can choose what&#8217;s displayed on the front page of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static home page, you first need to create two <a href="%s">Pages</a>. One will become the front page, and the other will be where your posts are displayed.'), 'post-new.php?post_type=page') . '</p>' .
</ins><span class="cx"> '<p>' . __('You can also control the display of your content in RSS feeds, including the maximum numbers of posts to display, whether to show full text or a summary, and the character set encoding.') . '</p>' .
</span><span class="cx"> '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>' .
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span></span></pre></div>
<a id="trunkwpadminplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-install.php (15125 => 15126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-install.php 2010-06-03 05:23:21 UTC (rev 15125)
+++ trunk/wp-admin/plugin-install.php 2010-06-03 13:37:51 UTC (rev 15126)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> do_action('install_plugins_pre_' . $tab); //Used to override the general interface, Eg, install or plugin information.
</span><span class="cx">
</span><span class="cx"> add_contextual_help($current_screen,
</span><del>- '<p>' . __('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from WordPress core by thousands of developers all over the world. All plugins in the official <a href="http://wordpress.org/extend/plugins/">WordPress.org Plugin Directory</a> are compatible with the WordPress GPL v2 license. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.') . '</p>' .
</del><ins>+ '<p>' . sprintf(__('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from WordPress core by thousands of developers all over the world. All plugins in the official <a href="%s">WordPress.org Plugin Directory</a> are compatible with the WordPress GPL v2 license. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.'), 'http://wordpress.org/extend/plugins/') . '</p>' .
</ins><span class="cx"> '<p>' . __('If you know what you&#8217;re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting a popular tags. Tags in larger type mean more plugins have been labeled with that tag.') . '</p>' .
</span><span class="cx"> '<p>' . __('If you just want to get an idea of what&#8217;s available, you can browse Featured, Popular, Newest, and Recently Updated plugins by using the links in the upper left of the screen. These sections rotate regularly.') . '</p>' .
</span><span class="cx"> '<p>' . __('If you want to install a plugin that you&#8217;ve downloaded elsewhere, click Upload in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (15125 => 15126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-06-03 05:23:21 UTC (rev 15125)
+++ trunk/wp-admin/plugins.php 2010-06-03 13:37:51 UTC (rev 15126)
</span><span class="lines">@@ -735,9 +735,9 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> if ( 'mustuse' == $status )
</span><del>- echo '<div class="clear"><p>' . __( 'Files in the <code>wp-content/mu-plugins</code> directory are executed automatically.' ) . '</p>';
</del><ins>+ echo '<div class="clear"><p>' . __( 'Files in the <code>/wp-content/mu-plugins</code> directory are executed automatically.' ) . '</p>';
</ins><span class="cx"> elseif ( 'dropins' == $status )
</span><del>- echo '<div class="clear"><p>' . __( 'Drop-ins are advanced plugins in the <code>wp-content</code> directory that replace WordPress functionality when present.' ) . '</p>';
</del><ins>+ echo '<div class="clear"><p>' . __( 'Drop-ins are advanced plugins in the <code>/wp-content</code> directory that replace WordPress functionality when present.' ) . '</p>';
</ins><span class="cx">
</span><span class="cx"> if ( !empty( $plugins ) && ( ! in_array( $status, array( 'mustuse', 'dropins' ) ) || $page_links ) ) :
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-install.php (15125 => 15126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-install.php 2010-06-03 05:23:21 UTC (rev 15125)
+++ trunk/wp-admin/theme-install.php 2010-06-03 13:37:51 UTC (rev 15126)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> do_action('install_themes_pre_' . $tab); //Used to override the general interface, Eg, install or theme information.
</span><span class="cx">
</span><del>-$help = '<p>' . __('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the WordPress.org theme repository. These themes are designed and developed by third parties, are available free of charge, and are licensed under the GNU General Public License, version 2, just like WordPress.') . '</p>';
</del><ins>+$help = '<p>' . sprintf(__('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s">WordPress.org Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are licensed under the GNU General Public License, version 2, just like WordPress.'), 'http://wordpress.org/extend/themes/') . '</p>';
</ins><span class="cx"> $help .= '<p>' . __('You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter. Alternately, you can browse the themes that are Featured, Newest, or Recently Updated. When you find a theme you like, you can preview it or install it.') . '</p>';
</span><span class="cx"> $help .= '<p>' . __('You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your <code>/wp-content/themes</code> directory.') . '</p>';
</span><span class="cx"> $help .= '<p><strong>' . __('For more information:') . '</strong></p>';
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (15125 => 15126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2010-06-03 05:23:21 UTC (rev 15125)
+++ trunk/wp-admin/themes.php 2010-06-03 13:37:51 UTC (rev 15126)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> $help = '<p>' . __('Aside from the default theme included with your WordPress installation, themes are designed and developed by third parties.') . '</p>';
</span><span class="cx"> $help .= '<p>' . __('You can see your active theme at the top of the screen. Below are the other themes you have installed that are not currently in use. You can see what your site would look like with one of these themes by clicking the Preview link. To change themes, click the Activate link.') . '</p>';
</span><span class="cx"> if ( current_user_can('install_themes') )
</span><del>- $help .= '<p>' . sprintf(__('If you would like to see more themes to choose from, click on the &#8220;Install Themes&#8221; tab and you will be able to browse or search for additional themes from the <a href="%s">WordPress.org theme repository</a>. Themes in the WordPress.org theme repository are designed and developed by third parties, and are licensed under the GNU General Public License, version 2, just like WordPress. Oh, and they&#8217;re free!'), 'http://wordpress.org/extend/themes/') . '</p>';
</del><ins>+ $help .= '<p>' . sprintf(__('If you would like to see more themes to choose from, click on the &#8220;Install Themes&#8221; tab and you will be able to browse or search for additional themes from the <a href="%s">WordPress.org Theme Directory</a>. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are licensed under the GNU General Public License, version 2, just like WordPress. Oh, and they&#8217;re free!'), 'http://wordpress.org/extend/themes/') . '</p>';
</ins><span class="cx">
</span><span class="cx"> $help .= '<p><strong>' . __('For more information:') . '</strong></p>';
</span><span class="cx"> $help .= '<p>' . __('<a href="http://codex.wordpress.org/Using_Themes">Documentation on Using Themes</a>') . '</p>';
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> printf(__('%1$s %2$s by %3$s'), $ct->title, $ct->version, $ct->author) ; ?></h4>
</span><span class="cx"> <p class="theme-description"><?php echo $ct->description; ?></p>
</span><span class="cx"> <?php if ( current_user_can('edit_themes') && $ct->parent_theme ) { ?>
</span><del>- <p><?php printf(__('The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.'), $ct->title, str_replace( WP_CONTENT_DIR, '', $ct->template_dir ), str_replace( WP_CONTENT_DIR, '', $ct->stylesheet_dir ), $ct->title, $ct->parent_theme); ?></p>
</del><ins>+ <p><?php printf(__('The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.'), $ct->title, str_replace( WP_CONTENT_DIR, '', $ct->template_dir ), str_replace( WP_CONTENT_DIR, '', $ct->stylesheet_dir ), $ct->title, $ct->parent_theme); ?></p>
</ins><span class="cx"> <?php } else { ?>
</span><span class="cx"> <p><?php printf(__('All of this theme&#8217;s files are located in <code>%2$s</code>.'), $ct->title, str_replace( WP_CONTENT_DIR, '', $ct->template_dir ), str_replace( WP_CONTENT_DIR, '', $ct->stylesheet_dir ) ); ?></p>
</span><span class="cx"> <?php } ?>
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> <span class='action-links'><?php echo $actions ?></span>
</span><span class="cx"> <?php if ( current_user_can('edit_themes') && $parent_theme ) {
</span><span class="cx"> /* translators: 1: theme title, 2: template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?>
</span><del>- <p><?php printf(__('The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.'), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ), $title, $parent_theme); ?></p>
</del><ins>+ <p><?php printf(__('The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.'), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ), $title, $parent_theme); ?></p>
</ins><span class="cx"> <?php } else { ?>
</span><span class="cx"> <p><?php printf(__('All of this theme&#8217;s files are located in <code>%2$s</code>.'), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ) ); ?></p>
</span><span class="cx"> <?php } ?>
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> <?php } else { ?>
</span><span class="cx"> <p><?php
</span><span class="cx"> if ( current_user_can('install_themes') )
</span><del>- _e('You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress.org theme repository at any time: just click on the <em><a href="theme-install.php">Install Themes</a></em> tab above.');
</del><ins>+ printf(__('You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress.org Theme Directory at any time: just click on the <em><a href="%s">Install Themes</a></em> tab above.'), 'theme-install.php');
</ins><span class="cx"> else
</span><span class="cx"> printf(__('Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.'), get_site_option('site_name'));
</span><span class="cx"> ?></p>
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <h2><?php _e('Broken Themes'); ?> <?php if ( is_multisite() ) _e( '(Site admin only)' ); ?></h2>
</span><del>-<p><?php _e('The following themes are installed but incomplete. Themes must have a stylesheet and a template.'); ?></p>
</del><ins>+<p><?php _e('The following themes are installed but incomplete. Themes must have a stylesheet and a template.'); ?></p>
</ins><span class="cx">
</span><span class="cx"> <table id="broken-themes">
</span><span class="cx"> <tr>
</span></span></pre></div>
<a id="trunkwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/widgets.php (15125 => 15126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/widgets.php 2010-06-03 05:23:21 UTC (rev 15125)
+++ trunk/wp-admin/widgets.php 2010-06-03 13:37:51 UTC (rev 15126)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> <p>' . __('If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.') . '</p>
</span><span class="cx"> <p>' . __('Widgets may be used multiple times. You can give each widget a title, to display on your site, but it&#8217;s not required.') . '</p>
</span><span class="cx"> <p>' . __('Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.') . '</p>
</span><del>- <p>' . __('Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area. ') . '</p>
</del><ins>+ <p>' . __('Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.') . '</p>
</ins><span class="cx"> ';
</span><span class="cx"> $help .= '<p><strong>' . __('For more information:') . '</strong></p>';
</span><span class="cx"> $help .= '<p>' . __('<a href="http://codex.wordpress.org/Appearance_Widgets_SubPanel">Widgets Documentation</a>') . '</p>';
</span></span></pre>
</div>
</div>
</body>
</html>