Commit ae3a6d1c authored by Jake Spurlock's avatar Jake Spurlock
Browse files

i18n: Merge similar translation strings to "Update failed". 

Fixes #50714.
Props ramiy, ocean90.

Built from https://develop.svn.wordpress.org/trunk@48569


git-svn-id: https://core.svn.wordpress.org/trunk@48331 1a063a9b-81f0-0310-95a4-ce76da25c4cd
parent 50308c0e

wp-admin/includes/ajax-actions.php

+1 −1
Original line number Diff line number Diff line
@@ -4210,7 +4210,7 @@ function wp_ajax_update_theme() { 
	}



	// An unhandled error occurred.

	$status['errorMessage'] = __( 'Update failed.' );

	$status['errorMessage'] = __( 'Update failed' );

	wp_send_json_error( $status );

}

wp-admin/js/updates.js

+2 −2
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ 
				} ) );



			$card.find( '.update-now' )

				.text(  __( 'Update Failed!' ) )

				.text(  __( 'Update failed' ) )

				.removeClass( 'updating-message' );



			if ( response.pluginName ) {
@@ -1838,7 +1838,7 @@ 
			.removeClass( 'updating-message' )

			.removeAttr( 'aria-label' )

			.prop( 'disabled', true )

			.text( __( 'Update Failed!' ) );

			.text( __( 'Update failed' ) );



		$( '.updating-message:not(.button):not(.thickbox)' )

			.removeClass( 'updating-message notice-warning' )

wp-admin/js/updates.min.js

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

wp-includes/version.php

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 *

 * @global string $wp_version

 */

$wp_version = '5.5-beta3-48568';

$wp_version = '5.5-beta3-48569';



/**

 * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.