Index: wp-admin/upload.php =================================================================== --- wp-admin/upload.php (revision 12905) +++ wp-admin/upload.php (working copy) @@ -388,10 +388,10 @@ $actions['edit'] = '' . __('Edit') . ''; if ( current_user_can('delete_post', $post->ID) ) if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) { - $actions['trash'] = "ID) . "'>" . __('Trash') . ""; + $actions['trash'] = "ID) . "'>" . __('Trash') . ""; } else { $delete_ays = !MEDIA_TRASH ? " onclick='return showNotice.warn();'" : ''; - $actions['delete'] = "ID) . "'>" . __('Delete Permanently') . ""; + $actions['delete'] = "ID) . "'>" . __('Delete Permanently') . ""; } $actions['view'] = '' . __('View') . ''; if ( current_user_can('edit_post', $post->ID) ) Index: wp-admin/includes/media.php =================================================================== --- wp-admin/includes/media.php (revision 12905) +++ wp-admin/includes/media.php (working copy) @@ -1245,16 +1245,16 @@ $send = ""; if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) { if ( !EMPTY_TRASH_DAYS ) { - $delete = "" . __( 'Delete Permanently' ) . ''; + $delete = "" . __( 'Delete Permanently' ) . ''; } elseif ( !MEDIA_TRASH ) { $delete = "" . __( 'Delete' ) . "
"; } else { - $delete = "" . __( 'Move to Trash' ) . " - " . __( 'Undo' ) . ""; + $delete = "" . __( 'Move to Trash' ) . " + " . __( 'Undo' ) . ""; } } else { $delete = ''; Index: wp-admin/edit-attachment-rows.php =================================================================== --- wp-admin/edit-attachment-rows.php (revision 12905) +++ wp-admin/edit-attachment-rows.php (working copy) @@ -93,12 +93,12 @@ $actions['edit'] = '' . __('Edit') . ''; if ( current_user_can('delete_post', $post->ID) ) { if ( $is_trash ) - $actions['untrash'] = "ID) . "'>" . __('Restore') . ""; + $actions['untrash'] = "ID) . "'>" . __('Restore') . ""; elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) - $actions['trash'] = "ID) . "'>" . __('Trash') . ""; + $actions['trash'] = "ID) . "'>" . __('Trash') . ""; if ( $is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) { $delete_ays = (!$is_trash && !MEDIA_TRASH) ? " onclick='return showNotice.warn();'" : ''; - $actions['delete'] = "ID) . "'>" . __('Delete Permanently') . ""; + $actions['delete'] = "ID) . "'>" . __('Delete Permanently') . ""; } } if ( !$is_trash ) {