From b8edb91f436bc3f04a4d8c532b4568601a04a4a7 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 22 Sep 2017 22:08:46 +0000
Subject: [PATCH] I18N: Merge two similar "Cannot set parent term" error
 strings.

Props ramiy.
Fixes #41637.
Built from https://develop.svn.wordpress.org/trunk@41574


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

diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php
index 1c9ec17f33..ee04cc0c1d 100644
--- a/wp-includes/class-wp-xmlrpc-server.php
+++ b/wp-includes/class-wp-xmlrpc-server.php
@@ -2065,7 +2065,7 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		if ( ! empty( $content_struct['parent'] ) ) {
 			if ( ! $taxonomy['hierarchical'] )
-				return new IXR_Error( 403, __( "This taxonomy is not hierarchical so you can't set a parent." ) );
+				return new IXR_Error( 403, __( 'Cannot set parent term, taxonomy is not hierarchical.' ) );
 
 			$parent_term_id = (int) $content_struct['parent'];
 			$parent_term = get_term( $parent_term_id , $taxonomy['name'] );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1ac18a27cd..a41984e3c8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-41573';
+$wp_version = '4.9-alpha-41574';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.