diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 08a366faf0..c658c6ae0d 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -1483,7 +1483,7 @@ function find_posts_div($found_action = '') { ?>
' . __( '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.' ) . '
' . - '' . __( 'You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table.' ) . '
' . + '' . __( '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.' ) . '
' ) ); get_current_screen()->add_help_tab( array( @@ -235,12 +235,24 @@ if ( ! empty( $_GET['posted'] ) ) { } if ( ! empty( $_GET['attached'] ) && $attached = absint( $_GET['attached'] ) ) { - $message = sprintf( _n( 'Reattached %d attachment.', 'Reattached %d attachments.', $attached ), $attached ); + if ( 1 == $attached ) { + $message = __( 'Media attachment reattached.' ); + } else { + /* translators: %s: number of media attachments */ + $message = _n( '%s media attachment reattached.', '%s media attachments reattached.', $attached ); + } + $message = sprintf( $message, number_format_i18n( $attached ) ); $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] ); } if ( ! empty( $_GET['detach'] ) && $detached = absint( $_GET['detach'] ) ) { - $message = sprintf( _n( 'Detached %d attachment.', 'Detached %d attachments.', $detached ), $detached ); + if ( 1 == $detached ) { + $message = __( 'Media attachment detached.' ); + } else { + /* translators: %s: number of media attachments */ + $message = _n( '%s media attachment detached.', '%s media attachments detached.', $detached ); + } + $message = sprintf( $message, number_format_i18n( $detached ) ); $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] ); } @@ -248,7 +260,8 @@ if ( ! empty( $_GET['deleted'] ) && $deleted = absint( $_GET['deleted'] ) ) { if ( 1 == $deleted ) { $message = __( 'Media attachment permanently deleted.' ); } else { - $message = _n( '%d media attachment permanently deleted.', '%d media attachments permanently deleted.', $deleted ); + /* translators: %s: number of media attachments */ + $message = _n( '%s media attachment permanently deleted.', '%s media attachments permanently deleted.', $deleted ); } $message = sprintf( $message, number_format_i18n( $deleted ) ); $_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']); @@ -258,7 +271,8 @@ if ( ! empty( $_GET['trashed'] ) && $trashed = absint( $_GET['trashed'] ) ) { if ( 1 == $trashed ) { $message = __( 'Media attachment moved to the trash.' ); } else { - $message = _n( '%d media attachment moved to the trash.', '%d media attachments moved to the trash.', $trashed ); + /* translators: %s: number of media attachments */ + $message = _n( '%s media attachment moved to the trash.', '%s media attachments moved to the trash.', $trashed ); } $message = sprintf( $message, number_format_i18n( $trashed ) ); $message .= ' ' . __('Undo') . ''; @@ -269,7 +283,8 @@ if ( ! empty( $_GET['untrashed'] ) && $untrashed = absint( $_GET['untrashed'] ) if ( 1 == $untrashed ) { $message = __( 'Media attachment restored from the trash.' ); } else { - $message = _n( '%d media attachment restored from the trash.', '%d media attachments restored from the trash.', $untrashed ); + /* translators: %s: number of media attachments */ + $message = _n( '%s media attachment restored from the trash.', '%s media attachments restored from the trash.', $untrashed ); } $message = sprintf( $message, number_format_i18n( $untrashed ) ); $_SERVER['REQUEST_URI'] = remove_query_arg(array('untrashed'), $_SERVER['REQUEST_URI']); diff --git a/wp-includes/version.php b/wp-includes/version.php index ac7b554770..c5edb40dc8 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.5-alpha-1452888852270'; +$wp_version = '4.5-alpha-1452896951889'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.