diff --git a/src/js/_enqueues/admin/common.js b/src/js/_enqueues/admin/common.js index 358948d306cf6..22acbf01e9fa8 100644 --- a/src/js/_enqueues/admin/common.js +++ b/src/js/_enqueues/admin/common.js @@ -386,7 +386,7 @@ window.adminMenu = { window.columns = { /** - * Initializes the column toggles in the screen options. + * Initializes the column toggles in the display options. * * Binds an onClick event to the checkboxes to show or hide the table columns * based on their toggled state. And persists the toggled state. @@ -428,7 +428,7 @@ window.columns = { page: pagenow }, function() { - wp.a11y.speak( __( 'Screen Options updated.' ) ); + wp.a11y.speak( __( 'Display Options updated.' ) ); } ); }, @@ -473,7 +473,7 @@ window.columns = { }, /** - * Gets the checked column toggles from the screen options. + * Gets the checked column toggles from the display options. * * @since 3.0.0 * @@ -565,7 +565,7 @@ window.showNotice = { }; /** - * Represents the functions for the meta screen options panel. + * Represents the functions for the meta display options panel. * * @since 3.2.0 * diff --git a/src/js/_enqueues/admin/postbox.js b/src/js/_enqueues/admin/postbox.js index b6d1b6569dc84..07c44c8c78c11 100644 --- a/src/js/_enqueues/admin/postbox.js +++ b/src/js/_enqueues/admin/postbox.js @@ -292,7 +292,7 @@ /** * Hides the postbox element * - * Event handler for the screen options checkboxes. When a checkbox is + * Event handler for the display options checkboxes. When a checkbox is * clicked this function will hide or show the relevant postboxes. * * @since 2.7.0 @@ -471,7 +471,7 @@ page: page }, function() { - wp.a11y.speak( __( 'Screen Options updated.' ) ); + wp.a11y.speak( __( 'Display Options updated.' ) ); } ); }, @@ -559,7 +559,7 @@ */ updateEmptySortablesText: function( visibleSortables, areAllVisibleSortablesEmpty ) { var isDashboard = $( '#dashboard-widgets' ).length, - emptySortableText = areAllVisibleSortablesEmpty ? __( 'Add boxes from the Screen Options menu' ) : __( 'Drag boxes here' ); + emptySortableText = areAllVisibleSortablesEmpty ? __( 'Add boxes from the Display Options menu' ) : __( 'Drag boxes here' ); if ( ! isDashboard ) { return; diff --git a/src/js/_enqueues/wp/customize/nav-menus.js b/src/js/_enqueues/wp/customize/nav-menus.js index 392b358c519b4..c3169b9c25213 100644 --- a/src/js/_enqueues/wp/customize/nav-menus.js +++ b/src/js/_enqueues/wp/customize/nav-menus.js @@ -794,7 +794,7 @@ /** * wp.customize.Menus.MenusPanel * - * Customizer panel for menus. This is used only for screen options management. + * Customizer panel for menus. This is used only for display options management. * Note that 'menus' must match the WP_Customize_Menu_Panel::$type. * * @class wp.customize.Menus.MenusPanel @@ -1637,7 +1637,7 @@ * Shows or hides buttons based on the location of the menu item. * * @param {Object} itemToRefresh The menu item that might need its advanced accessibility buttons refreshed - * + * * @since 6.6.0 */ refreshAdvancedAccessibilityOfItem: function( itemToRefresh ) { @@ -1717,7 +1717,7 @@ } control.renderContent(); control.deferred.embedded.resolve(); // This triggers control.ready(). - + // Mark all menu items as unprocessed. $( 'button.item-edit' ).data( 'needs_accessibility_refresh', true ); }, @@ -1796,7 +1796,7 @@ control.moveRight(); control.params.depth += 1; } - + moveBtn.focus(); // Re-focus after the container was moved. // Mark all menu items as unprocessed. diff --git a/src/js/_enqueues/wp/dashboard.js b/src/js/_enqueues/wp/dashboard.js index 5216611d5dc3c..a560251425d9d 100644 --- a/src/js/_enqueues/wp/dashboard.js +++ b/src/js/_enqueues/wp/dashboard.js @@ -35,7 +35,7 @@ jQuery( function($) { welcomepanelnonce: $( '#welcomepanelnonce' ).val() }, function() { - wp.a11y.speak( wp.i18n.__( 'Screen Options updated.' ) ); + wp.a11y.speak( wp.i18n.__( 'Display Options updated.' ) ); } ); }; diff --git a/src/wp-admin/_index.php b/src/wp-admin/_index.php index de5cc21b8ff4f..6e188af4abb48 100644 --- a/src/wp-admin/_index.php +++ b/src/wp-admin/_index.php @@ -60,7 +60,7 @@ ); $help = '
' . __( '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.' ) . '
'; -$help .= '' . __( 'Screen Options — Use the Screen Options tab to choose which Dashboard boxes to show.' ) . '
'; +$help .= '' . __( 'Display Options — Use the Display Options tab to choose which Dashboard boxes to show.' ) . '
'; $help .= '' . __( 'Drag and Drop — 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.' ) . '
'; $help .= '' . __( 'Box Controls — Click the title bar of the box to expand or collapse it. Some boxes added by plugins may have configurable content, and will show a “Configure” link in the title bar if you hover over it.' ) . '
'; diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css index 45fe604247cee..00461cc595f98 100644 --- a/src/wp-admin/css/common.css +++ b/src/wp-admin/css/common.css @@ -1773,7 +1773,7 @@ p.auto-update-status { } /*------------------------------------------------------------------------------ - 6.1 - Screen Options Tabs + 6.1 - Display Options Tabs ------------------------------------------------------------------------------*/ #screen-options-wrap, @@ -1793,7 +1793,7 @@ p.auto-update-status { margin: 0 20px 0 0; } -/* screen options and help tabs revert */ +/* display options and help tabs revert */ #screen-meta { display: none; margin: 0 20px -1px 0; @@ -1865,7 +1865,7 @@ p.auto-update-status { content: "\f142"; } -/* end screen options and help tabs */ +/* end display options and help tabs */ .toggle-arrow { background-repeat: no-repeat; diff --git a/src/wp-admin/css/customize-nav-menus.css b/src/wp-admin/css/customize-nav-menus.css index 090a8c168b2f3..baa80979ae84c 100644 --- a/src/wp-admin/css/customize-nav-menus.css +++ b/src/wp-admin/css/customize-nav-menus.css @@ -237,7 +237,7 @@ color: #50575e; } -/* Screen Options */ +/* Display Options */ .customize-screen-options-toggle { background: none; border: none; diff --git a/src/wp-admin/css/list-tables.css b/src/wp-admin/css/list-tables.css index ed090c98576e1..9fd68c24d0830 100644 --- a/src/wp-admin/css/list-tables.css +++ b/src/wp-admin/css/list-tables.css @@ -1988,7 +1988,7 @@ div.action-links, display: block; } - /* Comment author hidden via Screen Options */ + /* Comment author hidden via Display Options */ .fixed .column-author.hidden ~ .column-comment .comment-author { display: none; } @@ -2239,7 +2239,7 @@ div.action-links, display: table-cell; } - /* Plugin description hidden via Screen Options */ + /* Plugin description hidden via Display Options */ #wpbody-content .wp-list-table.plugins .desc.hidden { display: none; } diff --git a/src/wp-admin/edit-form-advanced.php b/src/wp-admin/edit-form-advanced.php index 0380a48a9c735..4d165e08c0f91 100644 --- a/src/wp-admin/edit-form-advanced.php +++ b/src/wp-admin/edit-form-advanced.php @@ -272,7 +272,7 @@ ); if ( 'post' === $post_type ) { - $customize_display = '' . __( 'The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop. You can also minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.' ) . '
'; + $customize_display = '' . __( 'The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop. You can also minimize or expand them by clicking the title bar of each box. Use the Display Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.' ) . '
'; get_current_screen()->add_help_tab( array( @@ -287,7 +287,7 @@ $title_and_editor .= '' . __( 'Visual mode gives you an editor that is similar to a word processor. Click the Toolbar Toggle button to get a second row of controls.' ) . '
'; $title_and_editor .= '' . __( 'The Code mode allows you to enter HTML along with your post text. Note that <p> and <br> tags are converted to line breaks when switching to the Code editor to make it less cluttered. When you type, a single line break can be used instead of typing <br>, and two line breaks instead of paragraph tags. The line breaks are converted back to tags automatically.' ) . '
'; $title_and_editor .= '' . __( 'You can insert media files by clicking the button above the post editor and following the directions. You can align or edit images using the inline formatting toolbar available in Visual mode.' ) . '
'; - $title_and_editor .= '' . __( 'You can enable distraction-free writing mode using the icon to the right. This feature is not available for old browsers or devices with small screens, and requires that the full-height editor be enabled in Screen Options.' ) . '
'; + $title_and_editor .= '' . __( 'You can enable distraction-free writing mode using the icon to the right. This feature is not available for old browsers or devices with small screens, and requires that the full-height editor be enabled in Display Options.' ) . '
'; $title_and_editor .= '' . sprintf( /* translators: %s: Alt + F10 */ __( 'Keyboard users: When you are working in the visual editor, you can use %s to access the toolbar.' ), @@ -314,7 +314,7 @@ ); } elseif ( 'page' === $post_type ) { $about_pages = '
' . __( 'Pages are similar 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.' ) . '
' . - '' . __( 'Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Code modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box.' ) . '
'; + '' . __( 'Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Display Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Code modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box.' ) . '
'; get_current_screen()->add_help_tab( array( diff --git a/src/wp-admin/edit-link-form.php b/src/wp-admin/edit-link-form.php index a6c919a8c01a4..01cec90ba55b1 100644 --- a/src/wp-admin/edit-link-form.php +++ b/src/wp-admin/edit-link-form.php @@ -66,7 +66,7 @@ 'title' => __( 'Overview' ), 'content' => '' . __( '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.' ) . '
' . - '' . __( '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 do not use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '
' . + '' . __( '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 do not use in the Display Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '
' . '' . __( 'XFN stands for XHTML Friends Network, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking.' ) . '
', ) ); diff --git a/src/wp-admin/edit-tags.php b/src/wp-admin/edit-tags.php index 74381c0ec8d25..6ec0367cae707 100644 --- a/src/wp-admin/edit-tags.php +++ b/src/wp-admin/edit-tags.php @@ -291,7 +291,7 @@ $help .= '' . __( '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.' ) . '
'; + '' . __( 'You can change the display of this screen using the Display Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '
'; get_current_screen()->add_help_tab( array( diff --git a/src/wp-admin/edit.php b/src/wp-admin/edit.php index 15cb17d303bd3..ed511c5b6c113 100644 --- a/src/wp-admin/edit.php +++ b/src/wp-admin/edit.php @@ -261,9 +261,9 @@ 'content' => '' . __( 'You can customize the display of this screen’s contents in a number of ways:' ) . '
' . '' . __( 'If you visit our login page, we will set a temporary cookie to determine if your browser accepts cookies. This cookie contains no personal data and is discarded when you close your browser.' ) . '
'; /* translators: Default privacy policy text. */ - $strings[] = '' . __( 'When you log in, we will also set up several cookies to save your login information and your screen display choices. Login cookies last for two days, and screen options cookies last for a year. If you select "Remember Me", your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '
'; + $strings[] = '' . __( 'When you log in, we will also set up several cookies to save your login information and your screen display choices. Login cookies last for two days, and display options cookies last for a year. If you select "Remember Me", your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '
'; /* translators: Default privacy policy text. */ $strings[] = '' . __( 'If you edit or publish an article, an additional cookie will be saved in your browser. This cookie includes no personal data and simply indicates the post ID of the article you just edited. It expires after 1 day.' ) . '
'; } diff --git a/src/wp-admin/includes/class-wp-screen.php b/src/wp-admin/includes/class-wp-screen.php index 60a82476c1fd0..38dfab913dc6d 100644 --- a/src/wp-admin/includes/class-wp-screen.php +++ b/src/wp-admin/includes/class-wp-screen.php @@ -156,7 +156,7 @@ final class WP_Screen { private static $_old_compat_help = array(); /** - * The screen options associated with screen, if any. + * The display options associated with screen, if any. * * @since 3.3.0 * @var array @@ -181,7 +181,7 @@ final class WP_Screen { private $_show_screen_options; /** - * Stores the 'screen_settings' section of screen options. + * Stores the 'screen_settings' section of display options. * * @since 3.3.0 * @var string @@ -495,7 +495,7 @@ public function set_parentage( $parent_file ) { * Adds an option for the screen. * * Call this in template files after admin.php is loaded and before admin-header.php is loaded - * to add screen options. + * to add display options. * * @since 3.3.0 * @@ -702,7 +702,7 @@ public function set_help_sidebar( $content ) { * * The layout_columns option controls the max number and default number of * columns. This method returns the number of columns within that range selected - * by the user via Screen Options. If no selection has been made, the default + * by the user via Display Options. If no selection has been made, the default * provisioned in layout_columns is returned. If the screen does not support * selecting the number of layout columns, 0 is returned. * @@ -955,7 +955,7 @@ public function render_screen_meta() { } $GLOBALS['screen_layout_columns'] = $this->columns; // Set the global for back-compat. - // Add screen options. + // Add display options. if ( $this->show_screen_options() ) { $this->render_screen_options(); } @@ -969,7 +969,7 @@ public function render_screen_meta() {' . __( 'Links may be separated into Link Categories; these are different than the categories used on your posts.' ) . '
' . - '' . __( 'You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.' ) . '
', + '' . __( 'You can customize the display of this screen using the Display Options tab and/or the dropdown filters above the links table.' ) . '
', ) ); get_current_screen()->add_help_tab( diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php index 5b1a48c123ab2..b233e5f5ab2fa 100644 --- a/src/wp-admin/nav-menus.php +++ b/src/wp-admin/nav-menus.php @@ -740,7 +740,7 @@ function wp_nav_menu_max_depth( $classes ) { ); $editing_menus = '' . __( 'Each navigation menu may contain a mix of links to pages, categories, custom URLs or other content types. Menu links are added by selecting items from the expanding boxes in the left-hand column below.' ) . '
'; - $editing_menus .= '' . __( 'Clicking the arrow to the right of any menu item in the editor will reveal a standard group of settings. Additional settings such as link target, CSS classes, link relationships, and link descriptions can be enabled and disabled via the Screen Options tab.' ) . '
'; + $editing_menus .= '' . __( 'Clicking the arrow to the right of any menu item in the editor will reveal a standard group of settings. Additional settings such as link target, CSS classes, link relationships, and link descriptions can be enabled and disabled via the Display Options tab.' ) . '
'; $editing_menus .= '' . __( 'Add Site takes you to the screen for adding a new site to the network. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.' ) . '
' . + '' . __( 'Add Site takes you to the screen for adding a new site to the network. You can search for a site by Name, ID number, or IP address. Display Options allows you to choose how many sites to display on one page.' ) . '
' . '' . __( 'This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.' ) . '
' . '' . __( 'Hovering over each site reveals seven options (three for the primary site):' ) . '
' . '' . __( 'All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '
' . + '' . __( 'All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Display Options tab to customize the display of this screen.' ) . '
' . '' . __( 'You can narrow the list by file type/status or by date using the dropdown menus above the media table.' ) . '
' . '' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '
', ) diff --git a/src/wp-admin/users.php b/src/wp-admin/users.php index 6e10c2b8311f7..bfb6a5e462632 100644 --- a/src/wp-admin/users.php +++ b/src/wp-admin/users.php @@ -43,7 +43,7 @@ 'title' => __( 'Screen Content' ), 'content' => '' . __( 'You can customize the display of this screen in a number of ways:' ) . '
' . '' . __( '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.' ) . '
' . __( 'Widgets may be used multiple times. You can give each widget a title, to display on your site, but it’s not required.' ) . '
-' . __( 'Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.' ) . '
', +' . __( 'Enabling Accessibility Mode, via Display Options, allows you to use Add and Edit buttons instead of using drag and drop.' ) . '
', ) ); get_current_screen()->add_help_tab( diff --git a/src/wp-includes/customize/class-wp-customize-nav-menus-panel.php b/src/wp-includes/customize/class-wp-customize-nav-menus-panel.php index 0678fbf093c4d..ae9205b23c18c 100644 --- a/src/wp-includes/customize/class-wp-customize-nav-menus-panel.php +++ b/src/wp-includes/customize/class-wp-customize-nav-menus-panel.php @@ -10,7 +10,7 @@ /** * Customize Nav Menus Panel Class * - * Needed to add screen options. + * Needed to add display options. * * @since 4.3.0 * @@ -27,16 +27,16 @@ class WP_Customize_Nav_Menus_Panel extends WP_Customize_Panel { public $type = 'nav_menus'; /** - * Render screen options for Menus. + * Render display options for Menus. * * @since 4.3.0 */ public function render_screen_options() { - // Adds the screen options. + // Adds the display options. require_once ABSPATH . 'wp-admin/includes/nav-menu.php'; add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' ); - // Display screen options. + // Display display options. $screen = WP_Screen::get( 'nav-menus.php' ); $screen->render_screen_options( array( 'wrap' => false ) ); }