From 2d8633bf2259dbc1d5f0bf3653c862b0f8956510 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 9 Nov 2020 11:17:07 +0000
Subject: [PATCH] I18N: Merge duplicate "Column" strings, remove unnecessary
 context.

Props ramiy, justinahinon, garrett-eclipse, audrasjb.
Fixes #47259.
Built from https://develop.svn.wordpress.org/trunk@49541


git-svn-id: http://core.svn.wordpress.org/trunk@49279 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-editor.php | 4 ++--
 wp-includes/version.php         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php
index e0bf9de4b1..75f27d8041 100644
--- a/wp-includes/class-wp-editor.php
+++ b/wp-includes/class-wp-editor.php
@@ -1300,8 +1300,8 @@ final class _WP_Editors {
 
 				'Row'                                  => __( 'Row' ),
 				'Rows'                                 => __( 'Rows' ),
-				'Column'                               => _x( 'Column', 'table column' ),
-				'Cols'                                 => _x( 'Cols', 'table columns' ),
+				'Column'                               => __( 'Column' ),
+				'Cols'                                 => __( 'Columns' ),
 				'Cell'                                 => _x( 'Cell', 'table cell' ),
 				'Header cell'                          => __( 'Header cell' ),
 				'Header'                               => _x( 'Header', 'table header' ),
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2c8a47ebdd..03b76ce81b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6-beta3-49540';
+$wp_version = '5.6-beta3-49541';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.