WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

I18N: Merge two similar error strings. 

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


git-svn-id: http://core.svn.wordpress.org/trunk@41405 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2017-09-22 20:55:45 +00:00
parent 58b769a057
commit bcb126292c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/class-wp-xmlrpc-server.php
View File

@ -3684,7 +3684,7 @@ class wp_xmlrpc_server extends IXR_Server {
} }
if ( ! $comment_ID ) { if ( ! $comment_ID ) {
return new IXR_Error( 403, __( 'An unknown error occurred' ) ); return new IXR_Error( 403, __( 'An unidentified error has occurred.' ) );
} }
/** /**

2
wp-includes/script-loader.php
View File

@ -816,7 +816,7 @@ function wp_default_scripts( &$scripts ) {
'activateImporter' => __( 'Run Importer' ), 'activateImporter' => __( 'Run Importer' ),
/* translators: %s: Importer name */ /* translators: %s: Importer name */
'activateImporterLabel' => __( 'Run %s' ), 'activateImporterLabel' => __( 'Run %s' ),
'unknownError' => __( 'An unknown error occurred' ), 'unknownError' => __( 'An unidentified error has occurred.' ),
'connectionError' => __( 'Connection lost or the server is busy. Please try again later.' ), 'connectionError' => __( 'Connection lost or the server is busy. Please try again later.' ),
'nonceError' => __( 'An error has occurred. Please reload the page and try again.' ), 'nonceError' => __( 'An error has occurred. Please reload the page and try again.' ),
'pluginsFound' => __( 'Number of plugins found: %d' ), 'pluginsFound' => __( 'Number of plugins found: %d' ),

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9-alpha-41571'; $wp_version = '4.9-alpha-41572';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.