Ticket #22451: 22451.2.diff

File 22451.2.diff, 20.8 KB (added by DrewAPicture, 6 months ago)

Dashboard + Appearance + Settings

Line 
1Index: wp-admin/theme-editor.php
2===================================================================
3--- wp-admin/theme-editor.php   (revision 22685)
4+++ wp-admin/theme-editor.php   (working copy)
5@@ -22,16 +22,16 @@
6 
7 get_current_screen()->add_help_tab( array(
8 'id'           => 'overview',
9-'title'                => __('Overview'),
10+'title'                => __( 'Overview' ),
11 'content'      =>
12-       '<p>' . __('You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme.') . '</p>
13-       <p>' . __('Begin by choosing a theme to edit from the dropdown menu and clicking Select. A list then appears of all the template files. Clicking once on any file name causes the file to appear in the large Editor box.') . '</p>
14-       <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>
15-       <p id="newcontent-description">' . __('In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key.') . '</p>
16-       <p>' . __('After typing in your edits, click Update File.') . '</p>
17-       <p>' . __('<strong>Advice:</strong> think very carefully about your site crashing if you are live-editing the theme currently in use.') . '</p>
18-       <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" target="_blank">child theme</a> instead.') . '</p>' .
19-       ( is_network_admin() ? '<p>' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '</p>' : '' )
20+       '<p>' . __( 'You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme.') . '</p>' .
21+       '<p>' . __( 'Begin by choosing a theme to edit from the dropdown menu and clicking Select. A list then appears of all the template files. Clicking once on any file name causes the file to appear in the large Editor box.' ) . '</p>' .
22+       '<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>' .
23+       '<p id="newcontent-description">' . __( 'In the editing area, the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key.' ) . '</p>' .
24+       '<p>' . __( 'After typing in your edits, click Update File.' ) . '</p>' .
25+       '<p>' . __( '<strong>Advice:</strong> think very carefully about your site crashing if you are live-editing the theme currently in use.' ) . '</p>' .
26+       '<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" target="_blank">child theme</a> instead.' ) . '</p>' .
27+       ( is_network_admin() ? '<p>' . __( 'Any edits to files from this screen will be reflected on all sites in the network.' ) . '</p>' : '' )
28 ) );
29 
30 get_current_screen()->set_help_sidebar(
31Index: wp-admin/custom-header.php
32===================================================================
33--- wp-admin/custom-header.php  (revision 22685)
34+++ wp-admin/custom-header.php  (working copy)
35@@ -127,11 +127,11 @@
36 
37                get_current_screen()->add_help_tab( array(
38                        'id'      => 'set-header-text',
39-                       'title'   => __('Header Text'),
40+                       'title'   => __( 'Header Text' ),
41                        'content' =>
42                                '<p>' . sprintf( __( 'For most themes, the header text is your Site Title and Tagline, as defined in the <a href="%1$s">General Settings</a> section.' ), admin_url( 'options-general.php' ) ) . '<p>' .
43                                '<p>' . __( 'In the Header Text section of this page, you can choose whether to display this text or hide it. You can also choose a color for the text by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.' ) . '</p>' .
44-                               '<p>' . __( 'Don&#8217;t forget to Save Changes when you&#8217;re done!') . '</p>'
45+                               '<p>' . __( 'Don&#8217;t forget to click &#8220;Save Changes&#8221; when you&#8217;re done!') . '</p>'
46                ) );
47 
48                get_current_screen()->set_help_sidebar(
49Index: wp-admin/options-general.php
50===================================================================
51--- wp-admin/options-general.php        (revision 22685)
52+++ wp-admin/options-general.php        (working copy)
53@@ -58,7 +58,7 @@
54 add_action('admin_head', 'options_general_add_js');
55 
56 $options_help = '<p>' . __('The fields on this screen determine some of the basics of your site setup.') . '</p>' .
57-       '<p>' . __('Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes.') . '</p>';
58+       '<p>' . __('Most themes display the Site Title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The Tagline is also displayed by many themes.') . '</p>';
59 
60 if ( ! is_multisite() ) {
61        $options_help .= '<p>' . __('The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory.') . '</p>' .
62Index: wp-admin/index.php
63===================================================================
64--- wp-admin/index.php  (revision 22685)
65+++ wp-admin/index.php  (working copy)
66@@ -50,7 +50,7 @@
67 // Help tabs
68 
69 $help  = '<p>' . __('The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.') . '</p>';
70-$help .= '<p>' . __('Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.') . '</p>';
71+$help .= '<p>' . __('Links in the Toolbar at the top of the screen connect your Dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.') . '</p>';
72 
73 $screen->add_help_tab( array(
74        'id'      => 'help-navigation',
75@@ -61,7 +61,7 @@
76 $help  = '<p>' . __('You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.') . '</p>';
77 $help .= '<p>' . __('<strong>Screen Options</strong> - Use the Screen Options tab to choose which Dashboard boxes to show, and how many columns to display.') . '</p>';
78 $help .= '<p>' . __('<strong>Drag and Drop</strong> - To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.') . '</p>';
79-$help .= '<p>' . __('<strong>Box Controls</strong> - Click the title bar of the box to expand or collapse it. In addition, some box have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.') . '</p>';
80+$help .= '<p>' . __('<strong>Box Controls</strong> - Click the title bar of the box to expand or collapse it. In addition, some boxes have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.') . '</p>';
81 
82 $screen->add_help_tab( array(
83        'id'      => 'help-layout',
84Index: wp-admin/options-media.php
85===================================================================
86--- wp-admin/options-media.php  (revision 22685)
87+++ wp-admin/options-media.php  (working copy)
88@@ -15,7 +15,7 @@
89 $title = __('Media Settings');
90 $parent_file = 'options-general.php';
91 
92-$media_options_help = '<p>' . __('You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.') . '</p>';
93+$media_options_help = '<p>' . __('On this screen, you can set maximum height and width dimensions for images that will be inserted into your written content; you will still have the option to insert full-sized images.') . '</p>';
94 
95 if ( ! is_multisite() ) {
96        $media_options_help .= '<p>' . __('Uploading Files allows you to choose the folder and path for storing your uploaded files.') . '</p>';
97Index: wp-admin/nav-menus.php
98===================================================================
99--- wp-admin/nav-menus.php      (revision 22685)
100+++ wp-admin/nav-menus.php      (working copy)
101@@ -436,17 +436,17 @@
102 
103 get_current_screen()->add_help_tab( array(
104 'id'           => 'overview',
105-'title'                => __('Overview'),
106+'title'                => __( 'Overview' ),
107 'content'      =>
108-       '<p>' . __('This feature allows you to use a custom menu in place of your theme&#8217;s default menus.') . '</p>' .
109-       '<p>' . __('Custom 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>' .
110-       '<p>' . __('If your theme does not support the custom menus feature yet (the default themes, Twenty Eleven and Twenty Ten, do), you can learn about adding this support by following the Documentation link to the side.') . '</p>'
111+       '<p>' . __( 'This feature allows you to use a custom menu in place of your theme&#8217;s default menus.' ) . '</p>' .
112+       '<p>' . __( 'Custom 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 location, you can choose which custom menu to associate with each. You can also use custom menus in conjunction with the Custom Menus widget.' ) . '</p>' .
113+       '<p>' . __( 'If your theme does not support the custom menus feature yet (the default themes, Twenty Twelve and Twenty Eleven, do), you can learn about adding this support by following the Documentation link to the side.' ) . '</p>'
114 ) );
115 get_current_screen()->add_help_tab( array(
116 'id'           => 'create-menus',
117-'title'                => __('Create Menus'),
118+'title'                => __( 'Create Menus' ),
119 'content'      =>
120-       '<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. Drop the item into its new nested placement when the dotted rectangle target shifts over, also a little to the right. Don&#8217;t forget to click Save when you&#8217;re finished.') . '</p>'
121+       '<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. Drop the item into its new nested placement when the dotted rectangle target shifts over, also a little to the right. Don&#8217;t forget to click Save Menu when you&#8217;re finished.' ) . '</p>'
122 ) );
123 
124 get_current_screen()->set_help_sidebar(
125Index: wp-admin/widgets.php
126===================================================================
127--- wp-admin/widgets.php        (revision 22685)
128+++ wp-admin/widgets.php        (working copy)
129@@ -56,10 +56,10 @@
130 ) );
131 get_current_screen()->add_help_tab( array(
132 'id'           => 'missing-widgets',
133-'title'                => __('Missing Widgets'),
134+'title'                => __( 'Missing Widgets' ),
135 'content'      =>
136-       '<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>' .
137-               '<p>' . __('When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive area, where all your widgets and their settings will have been saved.') . '</p>'
138+       '<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>' .
139+               '<p>' . __( 'When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved.' ) . '</p>'
140 ) );
141 
142 get_current_screen()->set_help_sidebar(
143Index: wp-admin/options-permalink.php
144===================================================================
145--- wp-admin/options-permalink.php      (revision 22685)
146+++ wp-admin/options-permalink.php      (working copy)
147@@ -18,7 +18,7 @@
148 get_current_screen()->add_help_tab( array(
149        'id'      => 'overview',
150        'title'   => __('Overview'),
151-       'content' => '<p>' . __('Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change &#8212; hence the name permalink.') . '</p>' .
152+       'content' => '<p>' . __('Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the Web address used to link to your content. The URL to each post should be permanent, and never change &#8212; hence the name permalink.') . '</p>' .
153                '<p>' . __('This screen allows you to choose your default permalink structure. You can choose from common settings or create custom URL structures.') . '</p>' .
154                '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
155 ) );
156Index: wp-admin/options-writing.php
157===================================================================
158--- wp-admin/options-writing.php        (revision 22685)
159+++ wp-admin/options-writing.php        (working copy)
160@@ -18,7 +18,7 @@
161 get_current_screen()->add_help_tab( array(
162        'id'      => 'overview',
163        'title'   => __('Overview'),
164-       'content' => '<p>' . __('You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within the dashboard, while the rest control external publishing methods. For more information on any of these methods, use the documentation links.') . '</p>' .
165+       'content' => '<p>' . __('You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within the Dashboard, while the rest control external publishing methods. For more information on any of these methods, use the documentation links.') . '</p>' .
166                '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
167 ) );
168 
169Index: wp-admin/themes.php
170===================================================================
171--- wp-admin/themes.php (revision 22685)
172+++ wp-admin/themes.php (working copy)
173@@ -41,12 +41,12 @@
174 
175 if ( current_user_can( 'switch_themes' ) ) :
176 
177-$help_manage = '<p>' . __('Aside from the default theme included with your WordPress installation, themes are designed and developed by third parties.') . '</p>' .
178-       '<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 Live Preview link (see "Previewing and Customizing" help tab). To change themes, click the Activate link.') . '</p>';
179+$help_manage = '<p>' . __( 'Aside from the default theme included with your WordPress installation, themes are designed and developed by third parties.' ) . '</p>' .
180+       '<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 Live Preview link (see &#8220;Previewing and Customizing&#822; help tab). To change themes, click the Activate link.' ) . '</p>';
181 
182 get_current_screen()->add_help_tab( array(
183        'id'      => 'overview',
184-       'title'   => __('Overview'),
185+       'title'   => __( 'Overview' ),
186        'content' => $help_manage
187 ) );
188 
189@@ -70,14 +70,14 @@
190 
191 if ( current_user_can( 'edit_theme_options' ) ) {
192        $help_customize =
193-               '<p>' . __('Click on the "Live Preview" link under any theme to preview that theme and change theme options in a separate, full-screen view. Any installed theme can be previewed and customized in this way.') . '</p>'.
194-               '<p>' . __('The theme being previewed is fully interactive &mdash; navigate to different pages to see how the theme handles posts, archives, and other page templates.') . '</p>' .
195-               '<p>' . __('In the left-hand pane you can edit the theme settings. The settings will differ, depending on what theme features the theme being previewed supports. To accept the new settings and activate the theme all in one step, click the "Save &amp; Activate" button at the top of the left-hand pane.') . '</p>' .
196-               '<p>' . __('When previewing on smaller monitors, you can use the "Collapse" icon at the bottom of the left-hand pane. This will hide the pane, giving you more room to preview your site in the new theme. To bring the pane back, click on the Collapse icon again.') . '</p>';
197+               '<p>' . __( 'Click on the Live Preview link under any theme to preview that theme and change theme options in a separate, full-screen view. Any installed theme can be previewed and customized in this way.' ) . '</p>'.
198+               '<p>' . __( 'The theme being previewed is fully interactive &mdash; navigate to different pages to see how the theme handles posts, archives, and other page templates.' ) . '</p>' .
199+               '<p>' . __( 'In the left-hand pane you can edit the theme settings. The settings will differ, depending on what theme features the theme being previewed supports. To accept the new settings and activate the theme all in one step, click the Save &amp; Activate button at the top of the left-hand pane.' ) . '</p>' .
200+               '<p>' . __( 'When previewing on smaller monitors, you can use the &#8220;Collapse menu&#8221; icon at the bottom of the left-hand pane. This will hide the pane, giving you more room to preview your site in the new theme. To bring the pane back, click on the Collapse icon again.' ) . '</p>';
201 
202        get_current_screen()->add_help_tab( array(
203                'id'            => 'customize-preview-themes',
204-               'title'         => __('Previewing and Customizing'),
205+               'title'         => __( 'Previewing and Customizing' ),
206                'content'       => $help_customize
207        ) );
208 }
209Index: wp-admin/custom-background.php
210===================================================================
211--- wp-admin/custom-background.php      (revision 22685)
212+++ wp-admin/custom-background.php      (working copy)
213@@ -94,7 +94,7 @@
214                        'title'   => __('Overview'),
215                        'content' =>
216                                '<p>' . __( 'You can customize the look of your site without touching any of your theme&#8217;s code by using a custom background. Your background can be an image or a color.' ) . '</p>' .
217-                               '<p>' . __( 'To use a background image, simply upload it, then choose your display options below. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '</p>' .
218+                               '<p>' . __( 'To use a background image, simply upload it or choose an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '</p>' .
219                                '<p>' . __( 'You can also choose a background color by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.' ) . '</p>' .
220                                '<p>' . __( 'Don&#8217;t forget to click on the Save Changes button when you are finished.' ) . '</p>'
221                ) );