diff --git a/src/js/media/views/attachments/browser.js b/src/js/media/views/attachments/browser.js index 92f8387ce8..d054093f27 100644 --- a/src/js/media/views/attachments/browser.js +++ b/src/js/media/views/attachments/browser.js @@ -187,7 +187,7 @@ AttachmentsBrowser = View.extend(/** @lends wp.media.view.AttachmentsBrowser.pro filters: Filters, style: 'primary', disabled: true, - text: mediaTrash ? l10n.trashSelected : l10n.deleteSelected, + text: mediaTrash ? l10n.trashSelected : l10n.deletePermanently, controller: this.controller, priority: -60, click: function() { @@ -247,7 +247,7 @@ AttachmentsBrowser = View.extend(/** @lends wp.media.view.AttachmentsBrowser.pro filters: Filters, style: 'primary', disabled: true, - text: l10n.deleteSelected, + text: l10n.deletePermanently, controller: this.controller, priority: -55, click: function() { diff --git a/src/js/media/views/button/delete-selected.js b/src/js/media/views/button/delete-selected.js index 7c58ac2b77..5023093d73 100644 --- a/src/js/media/views/button/delete-selected.js +++ b/src/js/media/views/button/delete-selected.js @@ -26,11 +26,11 @@ DeleteSelected = Button.extend(/** @lends wp.media.view.DeleteSelectedButton.pro filterChange: function( model ) { if ( 'trash' === model.get( 'status' ) ) { - this.model.set( 'text', l10n.untrashSelected ); + this.model.set( 'text', l10n.restoreSelected ); } else if ( wp.media.view.settings.mediaTrash ) { this.model.set( 'text', l10n.trashSelected ); } else { - this.model.set( 'text', l10n.deleteSelected ); + this.model.set( 'text', l10n.deletePermanently ); } }, diff --git a/src/js/media/views/button/select-mode-toggle.js b/src/js/media/views/button/select-mode-toggle.js index 3e3d6d76ca..4d7927c701 100644 --- a/src/js/media/views/button/select-mode-toggle.js +++ b/src/js/media/views/button/select-mode-toggle.js @@ -53,7 +53,7 @@ SelectModeToggle = Button.extend(/** @lends wp.media.view.SelectModeToggle.proto if ( this.controller.isModeActive( 'select' ) ) { this.model.set( { size: 'large', - text: l10n.cancelSelection + text: l10n.cancel } ); children.not( '.spinner, .media-button' ).hide(); this.$el.show(); diff --git a/src/wp-admin/includes/class-wp-media-list-table.php b/src/wp-admin/includes/class-wp-media-list-table.php index 4be710f52e..1a9970d9f4 100644 --- a/src/wp-admin/includes/class-wp-media-list-table.php +++ b/src/wp-admin/includes/class-wp-media-list-table.php @@ -151,7 +151,7 @@ class WP_Media_List_Table extends WP_List_Table { $actions['untrash'] = __( 'Restore' ); $actions['delete'] = __( 'Delete Permanently' ); } else { - $actions['trash'] = _x( 'Trash', 'verb' ); + $actions['trash'] = __( 'Move to Trash' ); } } else { $actions['delete'] = __( 'Delete Permanently' ); diff --git a/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php index 38850e9d59..f1b5307d18 100644 --- a/src/wp-admin/includes/meta-boxes.php +++ b/src/wp-admin/includes/meta-boxes.php @@ -399,7 +399,7 @@ function attachment_submit_meta_box( $post ) { ID ) ) { if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) { - echo "" . _x( 'Trash', 'verb' ) . ''; + echo "" . __( 'Move to Trash' ) . ''; } else { $delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : ''; echo "" . __( 'Delete Permanently' ) . ''; diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php index e083ae8556..4162996d53 100644 --- a/src/wp-includes/media-template.php +++ b/src/wp-includes/media-template.php @@ -480,9 +480,9 @@ function wp_print_media_templates() { <# if ( ! data.uploading && data.can.remove ) { #> | <# if ( 'trash' === data.status ) { #> - + <# } else { #> - + <# } #> @@ -591,9 +591,9 @@ function wp_print_media_templates() { <# if ( ! data.uploading && data.can.remove ) { #> <# if ( 'trash' === data.status ) { #> - + <# } else { #> - + <# } #> diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php index bb2e0b8e27..40f8870d77 100644 --- a/src/wp-includes/media.php +++ b/src/wp-includes/media.php @@ -3680,10 +3680,8 @@ function wp_enqueue_media( $args = array() ) { 'warnBulkDelete' => __( "You are about to permanently delete these items from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ), 'warnBulkTrash' => __( "You are about to trash these items.\n 'Cancel' to stop, 'OK' to delete." ), 'bulkSelect' => __( 'Bulk Select' ), - 'cancelSelection' => __( 'Cancel Selection' ), - 'trashSelected' => __( 'Trash Selected' ), - 'untrashSelected' => __( 'Untrash Selected' ), - 'deleteSelected' => __( 'Delete Selected' ), + 'trashSelected' => __( 'Move to Trash' ), + 'restoreSelected' => __( 'Restore from Trash' ), 'deletePermanently' => __( 'Delete Permanently' ), 'apply' => __( 'Apply' ), 'filterByDate' => __( 'Filter by date' ), diff --git a/tests/qunit/index.html b/tests/qunit/index.html index f59adb3c3c..530a272735 100644 --- a/tests/qunit/index.html +++ b/tests/qunit/index.html @@ -45,7 +45,7 @@