<!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>[14989] trunk/wp-admin: Menu translatable strings cleanup.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14989">14989</a></dd>
<dt>Author</dt> <dd>nbachiyski</dd>
<dt>Date</dt> <dd>2010-05-27 11:52:15 +0000 (Thu, 27 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Menu translatable strings cleanup.
* Take out <strong> of the translatable part of For more information:
* Include support forums and Codex links inside translations, because most translators would want to change them to their local documentation sites or Codex prefixes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadmineditlinkcategoriesphp">trunk/wp-admin/edit-link-categories.php</a></li>
<li><a href="#trunkwpadmineditlinkformphp">trunk/wp-admin/edit-link-form.php</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminexportphp">trunk/wp-admin/export.php</a></li>
<li><a href="#trunkwpadminimportphp">trunk/wp-admin/import.php</a></li>
<li><a href="#trunkwpadminindexphp">trunk/wp-admin/index.php</a></li>
<li><a href="#trunkwpadminlinkmanagerphp">trunk/wp-admin/link-manager.php</a></li>
<li><a href="#trunkwpadminmediauploadphp">trunk/wp-admin/media-upload.php</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
<li><a href="#trunkwpadminplugineditorphp">trunk/wp-admin/plugin-editor.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="#trunkwpadminthemeeditorphp">trunk/wp-admin/theme-editor.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="#trunkwpadmintoolsphp">trunk/wp-admin/tools.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
<li><a href="#trunkwpadminwidgetsphp">trunk/wp-admin/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/edit-form-advanced.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -166,17 +166,18 @@
</span><span class="cx"> do_action('do_meta_boxes', $post_type, 'side', $post);
</span><span class="cx">
</span><span class="cx"> if ( 'post' == $post_type ) {
</span><del>- add_contextual_help($current_screen, '<p>' . __('The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes that allow you to add metadata to your post using drag and drop, and can minimize or expand them by clicking the title bar of the box. You can also hide any of the boxes by using the Screen Options tab, where you can also choose a 1- or 2-column layout for this screen.') . '</p>' .
</del><ins>+ add_contextual_help($current_screen,
+ '<p>' . __('The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes that allow you to add metadata to your post using drag and drop, and can minimize or expand them by clicking the title bar of the box. You can also hide any of the boxes by using the Screen Options tab, where you can also choose a 1- or 2-column layout for this screen.') . '</p>' .
</ins><span class="cx"> '<p>' . __('<strong>Title</strong> - Enter a title for your post. After you enter a title, you&#8217;ll see the permalink below, which you can edit.') . '</p>' .
</span><span class="cx"> '<p>' . __('<strong>Post editor</strong> - Enter the text for you post. There are two modes of editing: Visual and HTML. Choose the mode by clicking on the appropriate tab. Visual mode gives you a WYSIWYG editor. Click the last icon in the row to get a second row of controls. The HTML mode allows you to enter raw HTML along with your post text. You can insert media files by clicking the icons above the post editor and following the directions.') . '</p>' .
</span><span class="cx"> '<p>' . __('<strong>Publish</strong> - You can set the terms of publishing your post in the Publish box. For Status, Visibility, and Publish (immediately), click on the Edit link to reveal more options. Visibility includes options for password-protecting a post or making it stay at the top of your blog indefinitely (sticky). Publish (immediately) allows you to set a future or past date and time, so you can schedule a post to be published in the future or backdate a post.') . '</p>' .
</span><span class="cx"> '<p>' . __('<strong>Featured Image</strong> - This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the featured image as a post thumbnail on the home page, a custom header, etc.') . '</p>' .
</span><span class="cx"> '<p>' . __('<strong>Send Trackbacks</strong> - Trackbacks are a way to notify legacy blog systems that you’ve linked to them. Enter the URL(s) you want to send trackbacks. If you link other WordPress sites they&#8217;ll be notified automatically using pingbacks, and this field is unnecessary.') . '</p>' .
</span><span class="cx"> '<p>' . __('<strong>Discussion</strong> - You can turn comments and pings on or off, and if there are comments on the post, you can see them here and moderate them.') . '</p>' .
</span><del>- '<p>' . sprintf(__('You can also create posts with the <a href="%s">Press This bookmarklet</a>.'), 'tools.php') . '</p>' .
- '<p>' . __('<strong>For more information:</strong>') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Writing Posts Documentation</a>'), 'http://codex.wordpress.org/Writing_Posts') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>'
</del><ins>+ '<p>' . sprintf(__('You can also create posts with the <a href="%s">Press This bookmarklet.</a>'), 'tools.php') . '</p>' .
+ '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Writing_Posts">Writing Posts Documentation</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx"> } elseif ( 'page' == $post_type ) {
</span><span class="cx"> add_contextual_help($current_screen, '<p>' . __('Pages are similar to to Posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest Pages under other Pages by making one the "Parent" of the other, creating a group of Pages.') . '</p>' .
</span><span class="lines">@@ -185,8 +186,8 @@
</span><span class="cx"> '<p>' . __('<strong>Template</strong> - Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them in this dropdown menu.') . '</p>' .
</span><span class="cx"> '<p>' . __('<strong>Order</strong> - Pages are usually ordered alphabetically, but you can put a number above to change the order pages appear in.') . '</p>' .
</span><span class="cx"> '<p>' . __('<strong>For more information:</strong>') . '</p>' .
</span><del>- '<p>' . sprintf(__('<a href="%s">Page Creation Documentation</a>'), 'http://codex.wordpress.org/Pages_Add_New_SubPanel') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>'
</del><ins>+ '<p>' . __('<a href="http://codex.wordpress.org/Pages_Add_New_SubPanel">Page Creation Documentation</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmineditlinkcategoriesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-link-categories.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-link-categories.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/edit-link-categories.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -53,9 +53,9 @@
</span><span class="cx">
</span><span class="cx"> add_contextual_help($current_screen, '<p>' . __('You can create groups of links by using link categories. Link category names must be unique and link categories are separate from the categories you use for posts.') . '</p>' .
</span><span class="cx"> '<p>' . __('You can delete link categories, but that action does not delete the links within the category. Instead, it moves them to the default link category.') . '</p>' .
</span><del>- '<p>' . __('<strong>For more information:</strong>') . '</p>' .
- '<p>' . sprintf(__('<a href="%1$s">Link Categories Documentation</a>'), 'http://codex.wordpress.org/Links_Link_Categories_SubPanel') . '</p>' .
- '<p>' . sprintf(__('<a href="%1$s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>'
</del><ins>+ '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Links_Link_Categories_SubPanel">Link Categories Documentation</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> require_once ('admin-header.php');
</span></span></pre></div>
<a id="trunkwpadmineditlinkformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-link-form.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-link-form.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/edit-link-form.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -37,12 +37,13 @@
</span><span class="cx"> do_action('do_meta_boxes', 'link', 'advanced', $link);
</span><span class="cx"> do_action('do_meta_boxes', 'link', 'side', $link);
</span><span class="cx">
</span><del>-add_contextual_help($current_screen, '<p>' . __('You can add or edit links on this screen by entering information in each of the boxes. Only the link\'s web address and name (the text you want to display on your site as the link) are required fields.') . '</p>' .
- '<p>' . __('The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don\'t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.') . '</p>' .
- '<p>' . __( sprintf('XFN stands for <a href="%s">XHTML Friends Network</a>, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of site to which you are linking.', 'http://gmpg.org/xfn/' ) ) . '</p>' .
- '<p>' . __('<strong>For more information:</strong>') . '</p>' .
- '<p>' . sprintf(__('<a href="%1$s">Creating Links Documentation</a>'), 'http://codex.wordpress.org/Links_Add_New_SubPanel') . '</p>' .
- '<p>' . sprintf(__('<a href="%1$s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>'
</del><ins>+add_contextual_help($current_screen,
+ '<p>' . __( 'You can add or edit links on this screen by entering information in each of the boxes. Only the link&#8217;s web address and name (the text you want to display on your site as the link) are required fields.' ) . '</p>' .
+ '<p>' . __( 'The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don\'t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '</p>' .
+ '<p>' . __( 'XFN stands for <a href="http://gmpg.org/xfn/">XHTML Friends Network</a>, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of site to which you are linking.' ) . '</p>' .
+ '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+ '<p>' . __( '<a href="http://codex.wordpress.org/Links_Add_New_SubPanel">Creating Links Documentation</a>' ) . '</p>' .
+ '<p>' . __( '<a href="http://wordpress.org/support/">Support Forums</a>' ) . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> require_once ('admin-header.php');
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/edit-tags.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> $help .= '<ul>' .
</span><span class="cx"> '<li>' . __('<strong>Name</strong> - The name is how it appears on your site.') . '</li>';
</span><span class="cx"> if ( ! global_terms_enabled() )
</span><del>- $help .= '<li>' . __('<strong>Slug</strong> - The &#8220;slug &#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.') . '</li>';
</del><ins>+ $help .= '<li>' . __('<strong>Slug</strong> - The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.') . '</li>';
</ins><span class="cx">
</span><span class="cx"> if ( 'category' == $taxonomy )
</span><span class="cx"> $help .= '<li>' . __('<strong>Parent</strong> - Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.') . '</li>';
</span><span class="lines">@@ -188,14 +188,14 @@
</span><span class="cx"> $help .= '<li>' . __('<strong>Description</strong> - The description is not prominent by default; however, some themes may display it.') . '</li>' .
</span><span class="cx"> '</ul>' .
</span><span class="cx"> '<p>' . __('You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.') . '</p>' .
</span><del>- '<p>' . __('<strong>For more information:</strong>') . '</p>';
</del><ins>+ '<p><strong>' . __('For more information:') . '</strong></p>';
</ins><span class="cx">
</span><span class="cx"> if ( 'category' == $taxonomy )
</span><del>- $help .= '<p>' . sprintf(__('<a href="%s">Categories Documentation</a>'), 'http://codex.wordpress.org/Manage_Categories_SubPanel') . '</p>';
</del><ins>+ $help .= '<p>' . __('<a href="http://codex.wordpress.org/Manage_Categories_SubPanel">Categories Documentation</a>') . '</p>';
</ins><span class="cx"> else
</span><del>- $help .= '<p>' . sprintf(__('<a href="%s">Tags Documentation</a>'), 'http://codex.wordpress.org/Post_Tags_SubPanel') . '</p>';
</del><ins>+ $help .= '<p>' . __('<a href="http://codex.wordpress.org/Post_Tags_SubPanel">Tags Documentation</a>') . '</p>';
</ins><span class="cx">
</span><del>- $help .= '<p>' . sprintf(__('<a href="%s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>';
</del><ins>+ $help .= '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>';
</ins><span class="cx">
</span><span class="cx"> add_contextual_help($current_screen, $help);
</span><span class="cx"> unset($help);
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/edit.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -157,7 +157,8 @@
</span><span class="cx"> $title = $post_type_object->labels->name;
</span><span class="cx">
</span><span class="cx"> if ( 'post' == $post_type ) {
</span><del>- add_contextual_help($current_screen, '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
</del><ins>+ add_contextual_help($current_screen,
+ '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
</ins><span class="cx"> '<ul>' .
</span><span class="cx"> '<li>' . __('You can hide/display columns based on your needs and decide how many posts to list per screen using the Screen Options tab.') . '</li>' .
</span><span class="cx"> '<li>' . __('You can filter the list of posts by post status using the text links in the upper left to show All, Published, Draft, or Trashed posts. The default view is to show all posts.') . '</li>' .
</span><span class="lines">@@ -172,17 +173,18 @@
</span><span class="cx"> '<li>' . __('Preview will show you what your draft post will look like if you publish it. View will take you to your live site to view the post. Which link is available depends on your post&#8217;s status.') . '</li>' .
</span><span class="cx"> '</ul>' .
</span><span class="cx"> '<p>' . __('You can also edit multiple posts at once. Select the posts you want to edit using the checkboxes, select Edit from the Bulk Actions menu and click Apply. You will be able to change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.') . '</p>' .
</span><del>- '<p>' . __('<strong>For more information:</strong>') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Edit Posts Documentation</a>'), 'http://codex.wordpress.org/Posts_Edit_SubPanel') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>'
</del><ins>+ '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Posts_Edit_SubPanel">Edit Posts Documentation</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx"> } elseif ( 'page' == $post_type ) {
</span><del>- add_contextual_help($current_screen, '<p>' . __('Pages are similar to to Posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest Pages under other Pages by making one the "Parent" of the other, creating a group of Pages.') . '</p>' .
</del><ins>+ add_contextual_help($current_screen,
+ '<p>' . __('Pages are similar to to Posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest Pages under other Pages by making one the "Parent" of the other, creating a group of Pages.') . '</p>' .
</ins><span class="cx"> '<p>' . __('Managing Pages is very similar to managing Posts, and the screens can be customized in the same way. ') . '</p>' .
</span><span class="cx"> '<p>' . __('You can also perform the same types of actions, including narrowing the list by using the filters, acting on a Page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple Pages at once.') . '</p>' .
</span><del>- '<p>' . __('<strong>For more information:</strong>') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Page Management Documentation</a>'), 'http://codex.wordpress.org/Pages_Edit_SubPanel') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>'
</del><ins>+ '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Pages_Edit_SubPanel">Page Management Documentation</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/export.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/export.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/export.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -16,11 +16,12 @@
</span><span class="cx"> require_once('./includes/export.php');
</span><span class="cx"> $title = __('Export');
</span><span class="cx">
</span><del>-add_contextual_help($current_screen, '<p>' . __('You can export a file of your site&#8217;s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can set filters to have the WXR file only include a certain date, author, category, tag, all posts or all pages, certain publishing statuses.') . '</p>' .
</del><ins>+add_contextual_help($current_screen,
+ '<p>' . __('You can export a file of your site&#8217;s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can set filters to have the WXR file only include a certain date, author, category, tag, all posts or all pages, certain publishing statuses.') . '</p>' .
</ins><span class="cx"> '<p>' . __('Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format.') . '</p>' .
</span><del>- '<p>' . __('<strong>For more information:</strong>') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Export Documentation</a>'), 'http://codex.wordpress.org/Tools_Export_SubPanel') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>'
</del><ins>+ '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Tools_Export_SubPanel">Export Documentation</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( isset( $_GET['download'] ) ) {
</span></span></pre></div>
<a id="trunkwpadminimportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/import.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -16,11 +16,12 @@
</span><span class="cx">
</span><span class="cx"> $title = __('Import');
</span><span class="cx">
</span><del>-add_contextual_help($current_screen, '<p>' . __('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.') . '</p>' .
</del><ins>+add_contextual_help($current_screen,
+ '<p>' . __('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.') . '</p>' .
</ins><span class="cx"> '<p>' . __('In previous versions of WordPress, all the importers were built-in, but they have been turned into plugins as of version 3.0 since most people only use them once or infrequently.') . '</p>' .
</span><del>- '<p>' . __('<strong>For more information:</strong>') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Import Documentation</a>'), 'http://codex.wordpress.org/Tools_Import_SubPanel') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>'
</del><ins>+ '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Tools_Import_SubPanel">Import Documentation</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $popular_importers = array();
</span></span></pre></div>
<a id="trunkwpadminindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/index.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> $title = __('Dashboard');
</span><span class="cx"> $parent_file = 'index.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen, '<p>' . __('The left-hand navigation menu provides links to the administration screens in your WordPress application. You can expand or collapse navigation sections by clicking on the arrow that appears on the right side of each navigation item when you hover over it. You can also minimize the navigation menu to a narrow icon strip by clicking on the separator lines between navigation sections that end in double arrowheads; when minimized, the submenu items will be displayed on hover.') . '</p>' .
</del><ins>+add_contextual_help($current_screen,
+ '<p>' . __('The left-hand navigation menu provides links to the administration screens in your WordPress application. You can expand or collapse navigation sections by clicking on the arrow that appears on the right side of each navigation item when you hover over it. You can also minimize the navigation menu to a narrow icon strip by clicking on the separator lines between navigation sections that end in double arrowheads; when minimized, the submenu items will be displayed on hover.') . '</p>' .
</ins><span class="cx"> '<p>' . __('You can configure your dashboard by choosing which modules to display, how many columns to display them in, and where each module should be placed. You can hide/show modules and select the number of columns in the Screen Options tab. To rearrange the modules, drag and drop by clicking on the title bar of the selected module and releasing when you see a gray dotted-line box appear in the location you want to place the module. You can also expand or collapse each module by clicking once on the the module&#8217;s title bar. In addition, some modules are configurable, and will show a &#8220;Configure&#8221; link in the title bar when you hover over it.') . '</p>' .
</span><span class="cx"> '<p>' . __('The modules on your Dashboard screen are:') . '</p>' .
</span><span class="cx"> '<p>' . __('<strong>Right Now</strong> - Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.') . '</p>' .
</span><span class="lines">@@ -34,8 +35,9 @@
</span><span class="cx"> '<p>' . __('<strong>Recent Drafts</strong> - Displays links to the 5 most recent draft posts you&#8217;ve started.') . '</p>' .
</span><span class="cx"> '<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>' .
</span><span class="cx"> '<p>' . __('<strong>Plugins</strong> - Features the most popular, newest, and recently updated plugins from the WordPress.org plugin repository.') . '</p>' .
</span><del>- '<p>' . __('<strong>For more information:</strong>') . '</p>' .
- '<p>' . __('<a href="http://codex.wordpress.org/Dashboard_SubPanel">Codex - Dashboard</a>') . '</p>'
</del><ins>+ '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Dashboard_SubPanel">Dashboard Documentation</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> require_once('./admin-header.php');
</span></span></pre></div>
<a id="trunkwpadminlinkmanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/link-manager.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/link-manager.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/link-manager.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -44,13 +44,14 @@
</span><span class="cx"> $title = __('Links');
</span><span class="cx"> $this_file = $parent_file = 'link-manager.php';
</span><span class="cx">
</span><del>-add_contextual_help( $current_screen, '<p>' . sprintf(__('You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in WordPress community are included as examples'), 'widgets.php') . '</p>' .
- '<p>' . __('Links may be separated into categories; these are different than the categories used on your posts.') . '</p>' .
- '<p>' . __('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.') . '</p>' .
- '<p>' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet. ') . '</p>' .
- '<p>' . __('<strong>For more information:</strong>') . '</p>' .
- '<p>'. sprintf(__('<a href="%1$s">Link Management Documentation</a>'), 'http://codex.wordpress.org/Links_Edit_SubPanel') . '</p>' .
- '<p>'. sprintf(__('<a href="%1$s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>'
</del><ins>+add_contextual_help( $current_screen,
+ '<p>' . sprintf(__('You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in WordPress community are included as examples'), 'widgets.php') . '</p>' .
+ '<p>' . __('Links may be separated into categories; these are different than the categories used on your posts.') . '</p>' .
+ '<p>' . __('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.') . '</p>' .
+ '<p>' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet. ') . '</p>' .
+ '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Links_Edit_SubPanel">Link Management Documentation</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> include_once ('./admin-header.php');
</span></span></pre></div>
<a id="trunkwpadminmediauploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/media-upload.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/media-upload.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/media-upload.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -58,11 +58,10 @@
</span><span class="cx"> $parent_file = 'upload.php';
</span><span class="cx">
</span><span class="cx"> add_contextual_help( $current_screen,
</span><del>-
</del><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>' . __('The first screen for <em>Upload New</em> provides two options: to <em>Select Files</em> (multiple file upload allowed) or to switch to a <em>Browser Uploader</em> (which has two similar options). 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, which gives percentages, says &#8220;crunching,&#8221; and upon completion adds a thumbnail and five metadata boxes on this screen. Basic image editing is available after upload is complete. Make sure you click <em>Save</em> before leaving this screen.') . '</p>' .
</span><ins>+ '<p><strong>' . __('For more information:') . '</strong></p>' .
</ins><span class="cx"> '<p>' . __('<a href="http://codex.wordpress.org/Media_Add_New_SubPanel">Add New Media in Codex</a>') . '</p>' .
</span><del>- '<p>' . __('<a href="http://codex.wordpress.org/">General Codex Documentation</a>') . '</p>' .
</del><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="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/nav-menus.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -435,12 +435,12 @@
</span><span class="cx">
</span><span class="cx"> wp_initial_nav_menu_meta_boxes();
</span><span class="cx">
</span><del>-$help = '<p>' . __('This feature is new in version 3.0; to use a custom menu in place of your theme&#8217;s default menus, support for this feature must be registered in the theme&#8217;s functions.php file. If your theme does not support the custom menus feature yet (the new default theme Twenty Ten, does), you can learn about adding support yourself by following the below link.') . '</p>';
</del><ins>+$help = '<p>' . __('This feature is new in version 3.0; to use a custom menu in place of your theme&#8217;s default menus, support for this feature must be registered in the theme&#8217;s functions.php file. If your theme does not support the custom menus feature yet (the new default theme Twenty Ten, does), you can learn about adding support yourself by following the below link.') . '</p>';
</ins><span class="cx"> $help .= '<p>' . __('You can create custom menus for your site. These menus may contain links to pages, categories, custom links or other content types (use the Screen Options tab to decide which ones to show on the screen). You can specify a different navigation label for a menu item as well as other attributes. You can create multiple menus. If your theme includes more than one menu, you can choose which custom menu to associate with each. You can also use custom menus in conjunction with the Custom Menus widget.') . '</p>';
</span><span class="cx"> $help .= '<p>' . __('To create a new custom menu, click on the + tab, give the menu a name, and click Create Menu. Next, add menu items from the appropriate boxes. You&#8217;ll be able to edit the information for each menu item, and can drag and drop to put them in order. You can also drag a menu item a little to the right to make it a submenu, to create menus with hierarchy. You&#8217;ll see when the position of the drop target shifts over to create the nested placement. Don&#8217;t forget to click Save when you&#8217;re finished.') . '</p>';
</span><del>-$help .= '<p>' . __('<strong>For more information:</strong>') . '</p>';
-$help .= '<p>' . sprintf(__('<a href="%s">Menus Documentation</a>'), 'http://codex.wordpress.org/Appearance_Menus_SubPanel') . '</p>';
-$help .= '<p>' . sprintf(__('<a href="%s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>';
</del><ins>+$help .= '<p><strong>' . __('For more information:') . '</strong></p>';
+$help .= '<p>' . __('<a href="http://codex.wordpress.org/Appearance_Menus_SubPanel">Menus Documentation</a>') . '</p>';
+$help .= '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>';
</ins><span class="cx">
</span><span class="cx"> add_contextual_help($current_screen, $help);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/options-general.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> }
</span><span class="cx"> add_filter('admin_head', 'add_js');
</span><span class="cx">
</span><del>-add_contextual_help($current_screen, __('<a href="http://codex.wordpress.org/Settings_General_SubPanel" target="_blank">General Settings</a>'));
</del><ins>+add_contextual_help($current_screen, __('<a href="http://codex.wordpress.org/Settings_General_SubPanel">General Settings Documentation</a>'));
</ins><span class="cx">
</span><span class="cx"> include('./admin-header.php');
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminplugineditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-editor.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-editor.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/plugin-editor.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -107,13 +107,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- add_contextual_help($current_screen, '<p>' . __('You can use the editor to make changes to any of your plugins&#8217; individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations. ') . '</p>' .
</del><ins>+ add_contextual_help($current_screen,
+ '<p>' . __('You can use the editor to make changes to any of your plugins&#8217; individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations. ') . '</p>' .
</ins><span class="cx"> '<p>' . __('Choose a plugin to edit from the menu in the upper right and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don&#8217;t forget to save your changes (Update File) when you&#8217;re finished.') . '</p>' .
</span><span class="cx"> '<p>' . __('The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Lookup takes you to a web page about that particular function. ') . '</p>' .
</span><span class="cx"> '<p>' . __('If you want to make changes but don&#8217;t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit a plugin or start from scratch, check out the links below.') . '</p>' .
</span><del>- '<p>' . __('<strong>For more information:</strong>') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Documentation on Editing Plugins</a>'), 'http://codex.wordpress.org/Plugins_Editor_SubPanel') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>'
</del><ins>+ '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Plugins_Editor_SubPanel">Documentation on Editing Plugins</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> require_once('./admin-header.php');
</span><span class="lines">@@ -127,9 +128,9 @@
</span><span class="cx">
</span><span class="cx"> if ( !empty($functions) ) {
</span><span class="cx"> $docs_select = '<select name="docs-list" id="docs-list">';
</span><del>- $docs_select .= '<option value="">' . __( 'Function Name...' ) . '</option>';
</del><ins>+ $docs_select .= '<option value="">' . __( 'Function Name&hellip;' ) . '</option>';
</ins><span class="cx"> foreach ( $functions as $function) {
</span><del>- $docs_select .= '<option value="' . esc_attr( $function ) . '">' . htmlspecialchars( $function ) . '()</option>';
</del><ins>+ $docs_select .= '<option value="' . esc_attr( $function ) . '">' . esc_html( $function ) . '()</option>';
</ins><span class="cx"> }
</span><span class="cx"> $docs_select .= '</select>';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-install.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-install.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/plugin-install.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -52,13 +52,14 @@
</span><span class="cx">
</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><del>-add_contextual_help($current_screen, '<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>+add_contextual_help($current_screen,
+ '<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>' .
</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 in 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 teen 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><del>- '<p>' . __('<strong>For more information:</strong>') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Documentation on Installing Plugins</a>'), 'http://codex.wordpress.org/Plugins_Add_New_SubPanel') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>'
</del><ins>+ '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Plugins_Add_New_SubPanel">Documentation on Installing Plugins</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> include('./admin-header.php');
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/plugins.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -305,13 +305,14 @@
</span><span class="cx"> wp_enqueue_script('plugin-install');
</span><span class="cx"> add_thickbox();
</span><span class="cx">
</span><del>-add_contextual_help($current_screen, '<p>' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '</p>' .
</del><ins>+add_contextual_help($current_screen,
+ '<p>' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '</p>' .
</ins><span class="cx"> '<p>' . sprintf(__('You can find additional plugins for your site by using the <a href="%1$s">Plugin Browser/Installer</a> functionality or by browsing the <a href="%2$s">WordPress Plugin Directory</a> directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your <code>/wp-content/plugins</code> directory. Once a plugin has been installed, you can activate it here.'), 'plugin-install.php', 'http://wordpress.org/extend/plugins/') . '</p>' .
</span><span class="cx"> '<p>' . __('Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin&#8217;s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue.') . '</p>' .
</span><span class="cx"> '<p>' . sprintf( __('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), WP_PLUGIN_DIR) . '</p>' .
</span><del>- '<p>' . __('<strong>For more information:</strong>') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Documentation on Managing Plugins</a>'), 'http://codex.wordpress.org/Managing_Plugins#Plugin_Management') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>'
</del><ins>+ '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Managing_Plugins#Plugin_Management">Documentation on Managing Plugins</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( is_multisite() && is_super_admin() ) {
</span></span></pre></div>
<a id="trunkwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-editor.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-editor.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/theme-editor.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -20,13 +20,13 @@
</span><span class="cx"> $help .= '<p>' . __('For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Lookup takes you to a web page with reference material about that particular function.') . '</p>';
</span><span class="cx"> $help .= '<p>' . __('After typing in your edits, click Update File.') . '</p>';
</span><span class="cx"> $help .= '<p>' . __('<strong>Advice:</strong> think very carefully about your site crashing if you are live-editing the theme currently in use.') . '</p>';
</span><del>-$help .= '<p>' . sprintf(__('Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a <a href="%s">child theme</a> instead.'), 'http://codex.wordpress.org/Child_Themes') . '</p>';
-$help .= '<p>' . __('<strong>For more information:</strong>') . '</p>';
-$help .= '<p>' . sprintf(__('<a href="%s">Theme Development Documentation</a>'), 'http://codex.wordpress.org/Theme_Development') . '</p>';
-$help .= '<p>' . sprintf(__('<a href="%s">Documentation on Using Themes</a>'), 'http://codex.wordpress.org/Using_Themes') . '</p>';
-$help .= '<p>' . sprintf(__('<a href="%s">Documentation on Editing Files</a>'), 'http://codex.wordpress.org/Editing_Files') . '</p>';
-$help .= '<p>' . sprintf(__('<a href="%s">Template Tags Documentation</a>'), 'http://codex.wordpress.org/Template_Tags') . '</p>';
-$help .= '<p>' . sprintf(__('<a href="%s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>';
</del><ins>+$help .= '<p>' . __('Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a <a href="http://codex.wordpress.org/Child_Themes">child theme</a> instead.') . '</p>';
+$help .= '<p><strong>' . __('For more information:') . '</strong></p>';
+$help .= '<p>' . __('<a href="http://codex.wordpress.org/Theme_Development">Documentation on Theme Development</a>') . '</p>';
+$help .= '<p>' . __('<a href="http://codex.wordpress.org/Using_Themes">Documentation on Using Themes</a>') . '</p>';
+$help .= '<p>' . __('<a href="http://codex.wordpress.org/Editing_Files">Documentation on Editing Files</a>') . '</p>';
+$help .= '<p>' . __('<a href="http://codex.wordpress.org/Template_Tags">Documentation on Template Tags</a>') . '</p>';
+$help .= '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>';
</ins><span class="cx"> add_contextual_help($current_screen, $help);
</span><span class="cx">
</span><span class="cx"> wp_reset_vars(array('action', 'redirect', 'profile', 'error', 'warning', 'a', 'file', 'theme', 'dir'));
</span></span></pre></div>
<a id="trunkwpadminthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-install.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-install.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/theme-install.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -56,9 +56,9 @@
</span><span class="cx"> $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>';
</span><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 wp-content/themes directory.') . '</p>';
</span><del>-$help .= '<p>' . __('<strong>For more information:</strong>') . '</p>';
-$help .= '<p>' . sprintf(__('<a href="%s">Documentation on Using Themes</a>'), 'http://codex.wordpress.org/Using_Themes#Adding_New_Themes') . '</p>';
-$help .= '<p>' . sprintf(__('<a href="%s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>';
</del><ins>+$help .= '<p><strong>' . __('For more information:') . '</strong></p>';
+$help .= '<p>' . __('<a href="http://codex.wordpress.org/Using_Themes#Adding_New_Themes">Documentation on Using Themes</a>') . '</p>';
+$help .= '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>';
</ins><span class="cx"> add_contextual_help($current_screen, $help);
</span><span class="cx">
</span><span class="cx"> include('./admin-header.php');
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/themes.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -38,9 +38,9 @@
</span><span class="cx"> if ( current_user_can('install_themes') )
</span><span class="cx"> $help .= '<p>' . sprintf(__('If you would like to see more themes to choose from, click on the "Install Themes" 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>';
</span><span class="cx">
</span><del>-$help .= '<p>' . __('<strong>For more information:</strong>') . '</p>';
-$help .= '<p>' . sprintf(__('<a href="%s">Documentation on Using Themes</a>'), 'http://codex.wordpress.org/Using_Themes') . '</p>';
-$help .= '<p>' . sprintf(__('<a href="%s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>';
</del><ins>+$help .= '<p><strong>' . __('For more information:') . '</strong></p>';
+$help .= '<p>' . __('<a href="http://codex.wordpress.org/Using_Themes">Documentation on Using Themes</a>') . '</p>';
+$help .= '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>';
</ins><span class="cx"> add_contextual_help($current_screen, $help);
</span><span class="cx">
</span><span class="cx"> add_thickbox();
</span></span></pre></div>
<a id="trunkwpadmintoolsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/tools.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/tools.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/tools.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -11,11 +11,12 @@
</span><span class="cx">
</span><span class="cx"> $title = __('Tools');
</span><span class="cx">
</span><del>-add_contextual_help($current_screen, '<p>' . __('Press This is a bookmarklet that makes it easy to blog about something you come across on the web. You can use it to just grab a link, or to post an excerpt. Press This will even allow you to choose from images included on the page and use them in your post. Just drag the Press This link on this screen to your bookmarks bar in your browser, and you&#8217;ll be you&#8217;ll be on your way to easier content creation.') . '</p>' .
</del><ins>+add_contextual_help($current_screen,
+ '<p>' . __('Press This is a bookmarklet that makes it easy to blog about something you come across on the web. You can use it to just grab a link, or to post an excerpt. Press This will even allow you to choose from images included on the page and use them in your post. Just drag the Press This link on this screen to your bookmarks bar in your browser, and you&#8217;ll be you&#8217;ll be on your way to easier content creation.') . '</p>' .
</ins><span class="cx"> '<p>' . __('Note: Turbo/Gears is no longer promoted on this screen as it was in previous versions due to the fact that Google has discontinued support for it.') . '</p>' .
</span><del>- '<p>' . __('<strong>For more information:</strong>') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Tools Documentation</a>'), 'http://codex.wordpress.org/Tools_Tools_SubPanel') . '</p>' .
- '<p>' . sprintf(__('<a href="%s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>'
</del><ins>+ '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Tools_Tools_SubPanel">Tools Documentation</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> require_once('./admin-header.php');
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/update-core.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -374,7 +374,8 @@
</span><span class="cx"> $title = __('WordPress Updates');
</span><span class="cx"> $parent_file = 'tools.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen, '<p>' . __('This screen lets you update to the latest version of WordPress as well as update your themes and plugins from the WordPress.org repository. When updates are available, the number of available updates will appear in a bubble on the left hand menu as a notification. It is very important to keep your WordPress installation up to date for security reasons, so when you see a number appear, make sure you take the time to update, which is an easy process.') . '</p>' .
</del><ins>+add_contextual_help($current_screen,
+ '<p>' . __('This screen lets you update to the latest version of WordPress as well as update your themes and plugins from the WordPress.org repository. When updates are available, the number of available updates will appear in a bubble on the left hand menu as a notification. It is very important to keep your WordPress installation up to date for security reasons, so when you see a number appear, make sure you take the time to update, which is an easy process.') . '</p>' .
</ins><span class="cx"> '<p>' . __('Updating your WordPress installation is a simple one-click procedure; just click on the Update button when it says a new version is available. ') . '</p>' .
</span><span class="cx"> '<p>' . __('To upgrade themes or plugins from this screen, use the checkboxes to make your selection and click on the appropriate Update button. Check the box at the top of the Themes or Plugins section to select all and update them all at once.') . '</p>'
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/upload.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -168,9 +168,9 @@
</span><span class="cx"> '<p>' . __('You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table.') . '</p>' .
</span><span class="cx"> '<p>' . __('Hovering over a row reveals action links: <em>Edit</em>, <em>Delete Permanently</em>, and <em>View</em>. Clicking <em>Edit</em> or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking <em>Delete Permanently</em> will delete the file from the media library (as well as from any posts to which it is currently attached). <em>View</em> will take you to the display page for that file. ') . '</p>' .
</span><span class="cx"> '<p>' . __('If a media file has not been attached to any post, you will see that in the <em>Attached To</em> column, and can click on <em>Attach File</em> to launch a small popup that will allow you to search for a post and attach the file.') . '</p>' .
</span><del>- '<p>' . __('For more information:<br />
- <a href="http://codex.wordpress.org/Media_Library_SubPanel">Media Library Documentation</a> <br />
- <a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</del><ins>+ '<p><strong>' . __('For more information:') . '</strong></p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Media_Library_SubPanel">Media Library Documentation</a>') . '</p>' .
+ '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> require_once('./admin-header.php');
</span></span></pre></div>
<a id="trunkwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/widgets.php (14988 => 14989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/widgets.php 2010-05-27 11:47:53 UTC (rev 14988)
+++ trunk/wp-admin/widgets.php 2010-05-27 11:52:15 UTC (rev 14989)
</span><span class="lines">@@ -40,9 +40,9 @@
</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><span class="cx"> ';
</span><del>-$help .= '<p>' . __('<strong>For more information:</strong>') . '</p>';
-$help .= '<p>' . sprintf(__('<a href="%s">Widgets Documentation</a>'), 'http://codex.wordpress.org/Appearance_Widgets_SubPanel') . '</p>';
-$help .= '<p>' . sprintf(__('<a href="%s">Support Forums</a>'), 'http://wordpress.org/support/') . '</p>';
</del><ins>+$help .= '<p><strong>' . __('For more information:') . '</strong></p>';
+$help .= '<p>' . __('<a href="http://codex.wordpress.org/Appearance_Widgets_SubPanel">Widgets Documentation</a>') . '</p>';
+$help .= '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>';
</ins><span class="cx"> add_contextual_help($current_screen, $help);
</span><span class="cx">
</span><span class="cx"> // register the inactive_widgets area as sidebar
</span></span></pre>
</div>
</div>
</body>
</html>