Ticket #47125: 47125-patch.3.diff

src/wp-admin/menu.php

@@ -66 +66 @@
 $menu[10]                     = array( __( 'Media' ), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'dashicons-admin-media' );
         $submenu['upload.php'][5] = array( __( 'Library' ), 'upload_files', 'upload.php' );
         /* translators: Add new file. */
-        $submenu['upload.php'][10] = array( _x( 'Add New', 'file' ), 'upload_files', 'media-new.php' );
+        $submenu['upload.php'][10] = array( __( 'Add New Media File' ), 'upload_files', 'media-new.php' );
         $i                         = 15;
 foreach ( get_taxonomies_for_attachments( 'objects' ) as $tax ) {
         if ( ! $tax->show_ui || ! $tax->show_in_menu ) {
@@ -80 +80 @@
 $menu[15]                           = array( __( 'Links' ), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'dashicons-admin-links' );
         $submenu['link-manager.php'][5] = array( _x( 'All Links', 'admin menu' ), 'manage_links', 'link-manager.php' );
         /* translators: Add new links. */
-        $submenu['link-manager.php'][10] = array( _x( 'Add New', 'link' ), 'manage_links', 'link-add.php' );
+        $submenu['link-manager.php'][10] = array( __( 'Add New Link' ), 'manage_links', 'link-add.php' );
         $submenu['link-manager.php'][15] = array( __( 'Link Categories' ), 'manage_categories', 'edit-tags.php?taxonomy=link_category' );
 
 // $menu[20] = Pages.
@@ -305 +305 @@
 
 if ( ! is_multisite() ) {
         /* translators: Add new plugin. */
-        $submenu['plugins.php'][10] = array( _x( 'Add New', 'plugin' ), 'install_plugins', 'plugin-install.php' );
+        $submenu['plugins.php'][10] = array( __( 'Add New Plugin' ), 'install_plugins', 'plugin-install.php' );
         if ( wp_is_block_theme() ) {
                 // Place the menu item below the Theme File Editor menu item.
                 add_action( 'admin_menu', '_add_plugin_file_editor_to_tools', 101 );
@@ -326 +326 @@
         $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
         $submenu['users.php'][5]             = array( __( 'All Users' ), 'list_users', 'users.php' );
         if ( current_user_can( 'create_users' ) ) {
-                $submenu['users.php'][10] = array( _x( 'Add New', 'user' ), 'create_users', 'user-new.php' );
+                $submenu['users.php'][10] = array( __( 'Add New User' ), 'create_users', 'user-new.php' );
         } elseif ( is_multisite() ) {
-                $submenu['users.php'][10] = array( _x( 'Add New', 'user' ), 'promote_users', 'user-new.php' );
+                $submenu['users.php'][10] = array( __( 'Add New User' ), 'promote_users', 'user-new.php' );
         }
 
         $submenu['users.php'][15] = array( __( 'Profile' ), 'read', 'profile.php' );

src/wp-admin/network/menu.php

@@ -50 +50 @@
 /* translators: Sites menu item. */
 $menu[5]                  = array( __( 'Sites' ), 'manage_sites', 'sites.php', '', 'menu-top menu-icon-site', 'menu-site', 'dashicons-admin-multisite' );
 $submenu['sites.php'][5]  = array( __( 'All Sites' ), 'manage_sites', 'sites.php' );
-$submenu['sites.php'][10] = array( _x( 'Add New', 'site' ), 'create_sites', 'site-new.php' );
+$submenu['sites.php'][10] = array( __( 'Add New Site' ), 'create_sites', 'site-new.php' );
 
 $menu[10]                 = array( __( 'Users' ), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
 $submenu['users.php'][5]  = array( __( 'All Users' ), 'manage_network_users', 'users.php' );
-$submenu['users.php'][10] = array( _x( 'Add New', 'user' ), 'create_users', 'user-new.php' );
+$submenu['users.php'][10] = array( __( 'Add New User' ), 'create_users', 'user-new.php' );
 
 if ( current_user_can( 'update_themes' ) && $update_data['counts']['themes'] ) {
         $menu[15] = array(
@@ -78 +78 @@
         $menu[15] = array( __( 'Themes' ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
 }
 $submenu['themes.php'][5]  = array( __( 'Installed Themes' ), 'manage_network_themes', 'themes.php' );
-$submenu['themes.php'][10] = array( _x( 'Add New', 'theme' ), 'install_themes', 'theme-install.php' );
+$submenu['themes.php'][10] = array( __( 'Add New Theme' ), 'install_themes', 'theme-install.php' );
 $submenu['themes.php'][15] = array( __( 'Theme File Editor' ), 'edit_themes', 'theme-editor.php' );
 
 if ( current_user_can( 'update_plugins' ) && $update_data['counts']['plugins'] ) {
@@ -103 +103 @@
         $menu[20] = array( __( 'Plugins' ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' );
 }
 $submenu['plugins.php'][5]  = array( __( 'Installed Plugins' ), 'manage_network_plugins', 'plugins.php' );
-$submenu['plugins.php'][10] = array( _x( 'Add New', 'plugin' ), 'install_plugins', 'plugin-install.php' );
+$submenu['plugins.php'][10] = array( __( 'Add New Plugin' ), 'install_plugins', 'plugin-install.php' );
 $submenu['plugins.php'][15] = array( __( 'Plugin File Editor' ), 'edit_plugins', 'plugin-editor.php' );
 
 $menu[25] = array( __( 'Settings' ), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );

src/wp-includes/class-wp-post-type.php

@@ -831 +831 @@
                 self::$default_labels = array(
                         'name'                     => array( _x( 'Posts', 'post type general name' ), _x( 'Pages', 'post type general name' ) ),
                         'singular_name'            => array( _x( 'Post', 'post type singular name' ), _x( 'Page', 'post type singular name' ) ),
-                        'add_new'                  => array( _x( 'Add New', 'post' ), _x( 'Add New', 'page' ) ),
+                        'add_new'                  => array( __( 'Add New Post' ), __( 'Add New Page' ) ),
                         'add_new_item'             => array( __( 'Add New Post' ), __( 'Add New Page' ) ),
                         'edit_item'                => array( __( 'Edit Post' ), __( 'Edit Page' ) ),
                         'new_item'                 => array( __( 'New Post' ), __( 'New Page' ) ),