Editor: Revert [48119].

This commit caused the majority of blocks in the block editor to no longer
register as they reference the old category names.

See #50278.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47899 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/includes/post.php

@@ -2179,33 +2179,33 @@ function use_block_editor_for_post_type( $post_type ) {
 function get_block_categories( $post ) {
 	$default_categories = array(
 		array(
-			'slug'  => 'text',
-			'title' => _x( 'Text', 'block category' ),
+			'slug'  => 'common',
+			'title' => __( 'Common Blocks' ),
 			'icon'  => null,
 		),
 		array(
-			'slug'  => 'media',
-			'title' => _x( 'Media', 'block category' ),
+			'slug'  => 'formatting',
+			'title' => __( 'Formatting' ),
 			'icon'  => null,
 		),
 		array(
-			'slug'  => 'design',
-			'title' => _x( 'Design', 'block category' ),
+			'slug'  => 'layout',
+			'title' => __( 'Layout Elements' ),
 			'icon'  => null,
 		),
 		array(
 			'slug'  => 'widgets',
-			'title' => _x( 'Widgets', 'block category' ),
+			'title' => __( 'Widgets' ),
 			'icon'  => null,
 		),
 		array(
 			'slug'  => 'embed',
-			'title' => _x( 'Embeds', 'block category' ),
+			'title' => __( 'Embeds' ),
 			'icon'  => null,
 		),
 		array(
 			'slug'  => 'reusable',
-			'title' => _x( 'Reusable Blocks', 'block category' ),
+			'title' => __( 'Reusable Blocks' ),
 			'icon'  => null,
 		),
 	);

wp-includes/version.php

@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-48129';
+$wp_version = '5.5-alpha-48130';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.