|
- The new address will not become active until confirmed.' ); ?>
+The new address will not become active until confirmed.' ); ?>
-
-
+
+
-
+
diff --git a/src/wp-admin/setup-config.php b/src/wp-admin/setup-config.php
index 979f6e546e..bd3ec1d0b0 100644
--- a/src/wp-admin/setup-config.php
+++ b/src/wp-admin/setup-config.php
@@ -158,7 +158,7 @@ switch ( $step ) {
}
?>
-
+
@@ -170,7 +170,7 @@ switch ( $step ) {
wp-config.php'
);
?>
@@ -187,7 +187,7 @@ switch ( $step ) {
We got it.' ),
+ __( 'Need more help? Read the support article on wp-config.php.' ),
__( 'https://wordpress.org/support/article/editing-wp-config-php/' )
);
?>
diff --git a/src/wp-admin/upgrade.php b/src/wp-admin/upgrade.php
index 32eefd73d0..716b8cdc33 100644
--- a/src/wp-admin/upgrade.php
+++ b/src/wp-admin/upgrade.php
@@ -137,7 +137,7 @@ else :
}
?>
-
+
user_email ); ?>" class="regular-text ltr" />
ID === $current_user->ID ) : ?>
- The new address will not become active until confirmed.' ); ?>
+ The new address will not become active until confirmed.' ); ?>
diff --git a/src/wp-includes/class-wp-xmlrpc-server.php b/src/wp-includes/class-wp-xmlrpc-server.php
index e33f6554ce..c920adb3a0 100644
--- a/src/wp-includes/class-wp-xmlrpc-server.php
+++ b/src/wp-includes/class-wp-xmlrpc-server.php
@@ -6963,7 +6963,7 @@ class wp_xmlrpc_server extends IXR_Server {
preg_match( '|([^<]*?)|is', $remote_source, $matchtitle );
$title = isset( $matchtitle[1] ) ? $matchtitle[1] : '';
if ( empty( $title ) ) {
- return $this->pingback_error( 32, __( 'We cannot find a title on that page.' ) );
+ return $this->pingback_error( 32, __( 'A title on that page can not be found.' ) );
}
// Remove all script and style tags including their content.
diff --git a/src/wp-includes/ms-functions.php b/src/wp-includes/ms-functions.php
index 9e99f7f1a6..184c56fd7f 100644
--- a/src/wp-includes/ms-functions.php
+++ b/src/wp-includes/ms-functions.php
@@ -490,7 +490,7 @@ function wpmu_validate_user_signup( $user_name, $user_email ) {
if ( ! is_email( $user_email ) ) {
$errors->add( 'user_email', __( 'Please enter a valid email address.' ) );
} elseif ( is_email_address_unsafe( $user_email ) ) {
- $errors->add( 'user_email', __( 'You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.' ) );
+ $errors->add( 'user_email', __( 'You cannot use that email address to signup. There are problems with them blocking some emails from WordPress. Please use another email provider.' ) );
}
if ( strlen( $user_name ) < 4 ) {
diff --git a/src/wp-includes/theme.json b/src/wp-includes/theme.json
index 9a23d1268a..5c1404ccdd 100644
--- a/src/wp-includes/theme.json
+++ b/src/wp-includes/theme.json
@@ -13,47 +13,46 @@
"custom": true,
"customDuotone": true,
"customGradient": true,
- "defaultDuotone": true,
"defaultGradients": true,
"defaultPalette": true,
"duotone": [
{
- "name": "Dark grayscale",
+ "name": "Dark grayscale" ,
"colors": [ "#000000", "#7f7f7f" ],
"slug": "dark-grayscale"
},
{
- "name": "Grayscale",
+ "name": "Grayscale" ,
"colors": [ "#000000", "#ffffff" ],
"slug": "grayscale"
},
{
- "name": "Purple and yellow",
+ "name": "Purple and yellow" ,
"colors": [ "#8c00b7", "#fcff41" ],
"slug": "purple-yellow"
},
{
- "name": "Blue and red",
+ "name": "Blue and red" ,
"colors": [ "#000097", "#ff4747" ],
"slug": "blue-red"
},
{
- "name": "Midnight",
+ "name": "Midnight" ,
"colors": [ "#000000", "#00a5ff" ],
"slug": "midnight"
},
{
- "name": "Magenta and yellow",
+ "name": "Magenta and yellow" ,
"colors": [ "#c7005a", "#fff278" ],
"slug": "magenta-yellow"
},
{
- "name": "Purple and green",
+ "name": "Purple and green" ,
"colors": [ "#a60072", "#67ff66" ],
"slug": "purple-green"
},
{
- "name": "Blue and orange",
+ "name": "Blue and orange" ,
"colors": [ "#1900d8", "#ffa96b" ],
"slug": "blue-orange"
}
diff --git a/src/wp-includes/widgets/class-wp-widget-media-audio.php b/src/wp-includes/widgets/class-wp-widget-media-audio.php
index 719959ea7c..6500ef9d7c 100644
--- a/src/wp-includes/widgets/class-wp-widget-media-audio.php
+++ b/src/wp-includes/widgets/class-wp-widget-media-audio.php
@@ -41,7 +41,7 @@ class WP_Widget_Media_Audio extends WP_Widget_Media {
'edit_media' => _x( 'Edit Audio', 'label for button in the audio widget; should preferably not be longer than ~13 characters long' ),
'missing_attachment' => sprintf(
/* translators: %s: URL to media library. */
- __( 'We cannot find that audio file. Check your media library and make sure it was not deleted.' ),
+ __( 'That audio file can not be found. Check your media library and make sure it was not deleted.' ),
esc_url( admin_url( 'upload.php' ) )
),
/* translators: %d: Widget count. */
diff --git a/src/wp-includes/widgets/class-wp-widget-media-image.php b/src/wp-includes/widgets/class-wp-widget-media-image.php
index 9fe3f1962d..e05f9d73d4 100644
--- a/src/wp-includes/widgets/class-wp-widget-media-image.php
+++ b/src/wp-includes/widgets/class-wp-widget-media-image.php
@@ -41,7 +41,7 @@ class WP_Widget_Media_Image extends WP_Widget_Media {
'edit_media' => _x( 'Edit Image', 'label for button in the image widget; should preferably not be longer than ~13 characters long' ),
'missing_attachment' => sprintf(
/* translators: %s: URL to media library. */
- __( 'We cannot find that image. Check your media library and make sure it was not deleted.' ),
+ __( 'That image can not be found. Check your media library and make sure it was not deleted.' ),
esc_url( admin_url( 'upload.php' ) )
),
/* translators: %d: Widget count. */
diff --git a/src/wp-includes/widgets/class-wp-widget-media-video.php b/src/wp-includes/widgets/class-wp-widget-media-video.php
index ef2386eac2..2800a25a69 100644
--- a/src/wp-includes/widgets/class-wp-widget-media-video.php
+++ b/src/wp-includes/widgets/class-wp-widget-media-video.php
@@ -41,14 +41,14 @@ class WP_Widget_Media_Video extends WP_Widget_Media {
'edit_media' => _x( 'Edit Video', 'label for button in the video widget; should preferably not be longer than ~13 characters long' ),
'missing_attachment' => sprintf(
/* translators: %s: URL to media library. */
- __( 'We cannot find that video. Check your media library and make sure it was not deleted.' ),
+ __( 'That video can not be found. Check your media library and make sure it was not deleted.' ),
esc_url( admin_url( 'upload.php' ) )
),
/* translators: %d: Widget count. */
'media_library_state_multi' => _n_noop( 'Video Widget (%d)', 'Video Widget (%d)' ),
'media_library_state_single' => __( 'Video Widget' ),
/* translators: %s: A list of valid video file extensions. */
- 'unsupported_file_type' => sprintf( __( 'Sorry, we cannot load the video at the supplied URL. Please check that the URL is for a supported video file (%s) or stream (e.g. YouTube and Vimeo).' ), '.' . implode( ', .', wp_get_video_extensions() ) . '' ),
+ 'unsupported_file_type' => sprintf( __( 'Sorry, the video at the supplied URL can not be loaded. Please check that the URL is for a supported video file (%s) or stream (e.g. YouTube and Vimeo).' ), '.' . implode( ', .', wp_get_video_extensions() ) . '' ),
)
);
}
diff --git a/src/wp-includes/widgets/class-wp-widget-media.php b/src/wp-includes/widgets/class-wp-widget-media.php
index e370afdd64..2fa3cf986f 100644
--- a/src/wp-includes/widgets/class-wp-widget-media.php
+++ b/src/wp-includes/widgets/class-wp-widget-media.php
@@ -74,7 +74,7 @@ abstract class WP_Widget_Media extends WP_Widget {
'add_to_widget' => __( 'Add to Widget' ),
'missing_attachment' => sprintf(
/* translators: %s: URL to media library. */
- __( 'We cannot find that file. Check your media library and make sure it was not deleted.' ),
+ __( 'That file can not be found. Check your media library and make sure it was not deleted.' ),
esc_url( admin_url( 'upload.php' ) )
),
/* translators: %d: Widget count. */
diff --git a/src/wp-includes/wp-db.php b/src/wp-includes/wp-db.php
index 30f9086545..28575f2872 100644
--- a/src/wp-includes/wp-db.php
+++ b/src/wp-includes/wp-db.php
@@ -1186,7 +1186,7 @@ class wpdb {
$message .= '' . sprintf(
/* translators: %s: Database name. */
- __( 'We were able to connect to the database server (which means your username and password is okay) but not able to select the %s database.' ),
+ __( 'The database server could be connected to (which means your username and password is okay) but the %s database could not be selected.' ),
'' . htmlspecialchars( $db, ENT_QUOTES ) . ''
) . " \n";
@@ -1802,7 +1802,7 @@ class wpdb {
$message .= '' . sprintf(
/* translators: 1: wp-config.php, 2: Database host. */
- __( 'This either means that the username and password information in your %1$s file is incorrect or we cannot contact the database server at %2$s. This could mean your host’s database server is down.' ),
+ __( 'This either means that the username and password information in your %1$s file is incorrect or that contact with the database server at %2$s could not be established. This could mean your host’s database server is down.' ),
'wp-config.php',
'' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . ''
) . " \n";
@@ -1961,7 +1961,7 @@ class wpdb {
$message .= '' . sprintf(
/* translators: %s: Database host. */
- __( 'This means that we lost contact with the database server at %s. This could mean your host’s database server is down.' ),
+ __( 'This means that the contact with the database server at %s was lost. This could mean your host’s database server is down.' ),
'' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . ''
) . " \n";
diff --git a/src/wp-load.php b/src/wp-load.php
index 2c20055f15..b583f40240 100644
--- a/src/wp-load.php
+++ b/src/wp-load.php
@@ -92,7 +92,7 @@ if ( file_exists( ABSPATH . 'wp-config.php' ) ) {
) . '';
$die .= '' . sprintf(
/* translators: %s: Documentation URL. */
- __( "Need more help? We got it." ),
+ __( "Need more help? Read the support article on wp-config.php." ),
__( 'https://wordpress.org/support/article/editing-wp-config-php/' )
) . ' ';
$die .= '' . sprintf(
diff --git a/src/wp-signup.php b/src/wp-signup.php
index 99b128d827..5524a43e51 100644
--- a/src/wp-signup.php
+++ b/src/wp-signup.php
@@ -271,7 +271,7 @@ function show_user_form( $user_name = '', $user_email = '', $errors = '' ) {
?>
-
+
get_error_message( 'generic' );
if ( $errmsg ) {
diff --git a/src/wp-trackback.php b/src/wp-trackback.php
index 3d4f6056f5..7da8cdd16f 100644
--- a/src/wp-trackback.php
+++ b/src/wp-trackback.php
@@ -127,7 +127,7 @@ if ( ! empty( $tb_url ) && ! empty( $title ) ) {
$dupe = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url ) );
if ( $dupe ) {
- trackback_response( 1, __( 'We already have a ping from that URL for this post.' ) );
+ trackback_response( 1, __( 'There is already a ping from that URL for this post.' ) );
}
$commentdata = compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type' );
diff --git a/tests/qunit/index.html b/tests/qunit/index.html
index 0e08292798..717d26e661 100644
--- a/tests/qunit/index.html
+++ b/tests/qunit/index.html
@@ -121,21 +121,21 @@
wp.mediaWidgets.modelConstructors[ "media_image" ].prototype.schema = {"attachment_id":{"type":"integer","default":0,"minimum":0,"media_prop":"id"},"url":{"type":"string","default":"","format":"uri"},"title":{"type":"string","default":"","should_preview_update":false},"size":{"type":"string","default":"medium","enum":["thumbnail","medium","medium_large","large","twentyseventeen-featured-image","twentyseventeen-thumbnail-avatar","full","custom"]},"width":{"type":"integer","default":0,"minimum":0},"height":{"type":"integer","default":0,"minimum":0},"caption":{"type":"string","default":"","should_preview_update":false},"alt":{"type":"string","default":""},"link_type":{"type":"string","default":"none","enum":["none","file","post","custom"],"media_prop":"link","should_preview_update":false},"link_url":{"type":"string","default":"","format":"uri","media_prop":"linkUrl","should_preview_update":false},"image_classes":{"type":"string","default":"","media_prop":"extraClasses","should_preview_update":false},"link_classes":{"type":"string","default":"","media_prop":"linkClassName","should_preview_update":false},"link_rel":{"type":"string","default":"","media_prop":"linkRel","should_preview_update":false},"link_target_blank":{"type":"boolean","default":false,"media_prop":"linkTargetBlank","should_preview_update":false},"image_title":{"type":"string","default":"","media_prop":"title","should_preview_update":false}};
wp.mediaWidgets.controlConstructors[ "media_image" ].prototype.mime_type = "image";
- _.extend( wp.mediaWidgets.controlConstructors[ "media_image" ].prototype.l10n, {"no_media_selected":"No image selected","select_media":"Select Image","change_media":"Change Image","edit_media":"Edit Image","add_to_widget":"Add to Widget","missing_attachment":"We cannot find that image. Check your media library<\/a> and make sure it was not deleted.","media_library_state_multi":{"0":"Image Widget (%d)","1":"Image Widget (%d)","singular":"Image Widget (%d)","plural":"Image Widget (%d)","context":null,"domain":null},"media_library_state_single":"Image Widget"} );
+ _.extend( wp.mediaWidgets.controlConstructors[ "media_image" ].prototype.l10n, {"no_media_selected":"No image selected","select_media":"Select Image","change_media":"Change Image","edit_media":"Edit Image","add_to_widget":"Add to Widget","missing_attachment":"That image can not be found. Check your media library<\/a> and make sure it was not deleted.","media_library_state_multi":{"0":"Image Widget (%d)","1":"Image Widget (%d)","singular":"Image Widget (%d)","plural":"Image Widget (%d)","context":null,"domain":null},"media_library_state_single":"Image Widget"} );
|