From c37bdc3c9ee48faca9e1a99d4ef77670dffa43cc Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Sat, 9 May 2015 18:27:26 +0000
Subject: [PATCH] Merge similar error strings.

props pavelevap.
fixes #32327.
Built from https://develop.svn.wordpress.org/trunk@32471


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

diff --git a/wp-admin/includes/class-wp-press-this.php b/wp-admin/includes/class-wp-press-this.php
index 257c76dc9c..dc4f3a3b00 100644
--- a/wp-admin/includes/class-wp-press-this.php
+++ b/wp-admin/includes/class-wp-press-this.php
@@ -280,9 +280,9 @@ class WP_Press_This {
 			unlink( $source_tmp_file );
 
 		} else if ( is_wp_error( $source_tmp_file ) ) {
-			$source_content = new WP_Error( 'upload-error',  sprintf( __( 'Error: %s' ), sprintf( __( 'Could not download the source URL (native error: %s).' ), $source_tmp_file->get_error_message() ) ) );
+			$source_content = new WP_Error( 'upload-error',  sprintf( __( 'ERROR: %s' ), sprintf( __( 'Could not download the source URL (native error: %s).' ), $source_tmp_file->get_error_message() ) ) );
 		} else if ( ! file_exists( $source_tmp_file ) ) {
-			$source_content = new WP_Error( 'no-local-file',  sprintf( __( 'Error: %s' ), __( 'Could not save or locate the temporary download file for the source URL.' ) ) );
+			$source_content = new WP_Error( 'no-local-file',  sprintf( __( 'ERROR: %s' ), __( 'Could not save or locate the temporary download file for the source URL.' ) ) );
 		}
 
 		return $source_content;
diff --git a/wp-includes/atomlib.php b/wp-includes/atomlib.php
index 9d34276a7e..3d2e1904e5 100644
--- a/wp-includes/atomlib.php
+++ b/wp-includes/atomlib.php
@@ -130,7 +130,8 @@ class AtomParser {
             if($this->debug) $this->content .= $data;
 
             if(!xml_parse($parser, $data, feof($fp))) {
-                trigger_error(sprintf(__('XML error: %s at line %d')."\n",
+                /* translators: 1: error message, 2: line number */
+                trigger_error(sprintf(__('XML Error: %1$s at line %2$s')."\n",
                     xml_error_string(xml_get_error_code($parser)),
                     xml_get_current_line_number($parser)));
                 $ret = false;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e216ce7d33..c03a3918ab 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-32469';
+$wp_version = '4.3-alpha-32471';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.