diff --git a/wp-admin/includes/class-wp-media-list-table.php b/wp-admin/includes/class-wp-media-list-table.php index 3e0f41cfd1..502bd06a63 100644 --- a/wp-admin/includes/class-wp-media-list-table.php +++ b/wp-admin/includes/class-wp-media-list-table.php @@ -127,7 +127,7 @@ class WP_Media_List_Table extends WP_List_Table { $type_links['trash'] = sprintf( '', selected( 'trash' === $filter, true, false ), - __( 'Trash' ) + _x( 'Trash', 'attachment filter' ) ); } return $type_links; @@ -144,7 +144,7 @@ class WP_Media_List_Table extends WP_List_Table { $actions['untrash'] = __( 'Restore' ); $actions['delete'] = __( 'Delete Permanently' ); } else { - $actions['trash'] = __( 'Trash' ); + $actions['trash'] = _x( 'Trash', 'verb' ); } } else { $actions['delete'] = __( 'Delete Permanently' ); @@ -636,7 +636,7 @@ class WP_Media_List_Table extends WP_List_Table { $actions['edit'] = '' . __( 'Edit' ) . ''; if ( current_user_can( 'delete_post', $post->ID ) ) if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) { - $actions['trash'] = "ID ) . "'>" . __( 'Trash' ) . ""; + $actions['trash'] = "ID ) . "'>" . _x( 'Trash', 'verb' ) . ""; } else { $delete_ays = !MEDIA_TRASH ? " onclick='return showNotice.warn();'" : ''; $actions['delete'] = "ID ) . "'>" . __( 'Delete Permanently' ) . ""; @@ -652,7 +652,7 @@ class WP_Media_List_Table extends WP_List_Table { if ( $this->is_trash ) $actions['untrash'] = "ID ) . "'>" . __( 'Restore' ) . ""; elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) - $actions['trash'] = "ID ) . "'>" . __( 'Trash' ) . ""; + $actions['trash'] = "ID ) . "'>" . _x( 'Trash', 'verb' ) . ""; if ( $this->is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) { $delete_ays = ( !$this->is_trash && !MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : ''; $actions['delete'] = "ID ) . "'>" . __( 'Delete Permanently' ) . ""; diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php index 8a1cd65d18..8b13fef1f0 100644 --- a/wp-admin/includes/class-wp-posts-list-table.php +++ b/wp-admin/includes/class-wp-posts-list-table.php @@ -1179,7 +1179,7 @@ class WP_Posts_List_Table extends WP_List_Table { if ( 'trash' === $post->post_status ) $actions['untrash'] = "ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . ""; elseif ( EMPTY_TRASH_DAYS ) - $actions['trash'] = "" . __( 'Trash' ) . ""; + $actions['trash'] = "" . _x( 'Trash', 'verb' ) . ""; if ( 'trash' === $post->post_status || !EMPTY_TRASH_DAYS ) $actions['delete'] = "" . __( 'Delete Permanently' ) . ""; } diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php index f52af1470e..ad05a2ad8c 100644 --- a/wp-admin/includes/meta-boxes.php +++ b/wp-admin/includes/meta-boxes.php @@ -334,7 +334,7 @@ function attachment_submit_meta_box( $post ) { ID ) ) if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) { - echo "" . __( 'Trash' ) . ""; + echo "" . _x( 'Trash', 'verb' ) . ""; } else { $delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : ''; echo "" . __( 'Delete Permanently' ) . ""; diff --git a/wp-includes/version.php b/wp-includes/version.php index 16e789c5f4..3b0eac72b0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.5-alpha-35900'; +$wp_version = '4.5-alpha-35901'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.