' . __( 'A red bar on the left means the comment is waiting for you to moderate it.' ) . '
' . - '' . __( 'In the Author column, in addition to the author’s name, email address, and blog URL, the commenter’s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '
' . + '' . __( 'In the Author column, in addition to the author’s name, email address, and site URL, the commenter’s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '
' . '' . __( 'In the Comment column, hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.' ) . '
' . '' . __( 'In the In response to column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.' ) . '
' . '' . __( 'In the Submitted on column, the date and time the comment was left on your site appears. Clicking on the date/time link will take you to that comment on your live site.' ) . '
' . diff --git a/wp-admin/includes/export.php b/wp-admin/includes/export.php index 0707b25db1..9610ac8c9f 100644 --- a/wp-admin/includes/export.php +++ b/wp-admin/includes/export.php @@ -218,7 +218,7 @@ function export_wp( $args = array() ) { // Multisite: the base URL. return network_home_url(); } else { - // WordPress (single site): the blog URL. + // WordPress (single site): the site URL. return get_bloginfo_rss( 'url' ); } } diff --git a/wp-content/themes/twentyeleven/header.php b/wp-content/themes/twentyeleven/header.php index 62d9b344dd..dc404ab0b0 100644 --- a/wp-content/themes/twentyeleven/header.php +++ b/wp-content/themes/twentyeleven/header.php @@ -31,10 +31,10 @@ wp_title( '|', true, 'right' ); - // Add the blog name. + // Add the site name. bloginfo( 'name' ); - // Add the blog description for the home/front page. + // Add the site description for the home/front page. $site_description = get_bloginfo( 'description', 'display' ); if ( $site_description && ( is_home() || is_front_page() ) ) { echo " | $site_description"; diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php index 10bd5922fc..7a4aca16f0 100644 --- a/wp-content/themes/twentyten/header.php +++ b/wp-content/themes/twentyten/header.php @@ -21,10 +21,10 @@ wp_title( '|', true, 'right' ); - // Add the blog name. + // Add the site name. bloginfo( 'name' ); - // Add the blog description for the home/front page. + // Add the site description for the home/front page. $site_description = get_bloginfo( 'description', 'display' ); if ( $site_description && ( is_home() || is_front_page() ) ) { echo " | $site_description"; diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 39c2c84c0a..698c5fcace 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -3096,11 +3096,11 @@ function feed_links( $args = array() ) { } $defaults = array( - /* translators: Separator between blog name and feed type in feed links. */ + /* translators: Separator between site name and feed type in feed links. */ 'separator' => _x( '»', 'feed link' ), - /* translators: 1: Blog title, 2: Separator (raquo). */ + /* translators: 1: Site title, 2: Separator (raquo). */ 'feedtitle' => __( '%1$s %2$s Feed' ), - /* translators: 1: Blog title, 2: Separator (raquo). */ + /* translators: 1: Site title, 2: Separator (raquo). */ 'comstitle' => __( '%1$s %2$s Comments Feed' ), ); @@ -3148,21 +3148,21 @@ function feed_links( $args = array() ) { */ function feed_links_extra( $args = array() ) { $defaults = array( - /* translators: Separator between blog name and feed type in feed links. */ + /* translators: Separator between site name and feed type in feed links. */ 'separator' => _x( '»', 'feed link' ), - /* translators: 1: Blog name, 2: Separator (raquo), 3: Post title. */ + /* translators: 1: Site name, 2: Separator (raquo), 3: Post title. */ 'singletitle' => __( '%1$s %2$s %3$s Comments Feed' ), - /* translators: 1: Blog name, 2: Separator (raquo), 3: Category name. */ + /* translators: 1: Site name, 2: Separator (raquo), 3: Category name. */ 'cattitle' => __( '%1$s %2$s %3$s Category Feed' ), - /* translators: 1: Blog name, 2: Separator (raquo), 3: Tag name. */ + /* translators: 1: Site name, 2: Separator (raquo), 3: Tag name. */ 'tagtitle' => __( '%1$s %2$s %3$s Tag Feed' ), - /* translators: 1: Blog name, 2: Separator (raquo), 3: Term name, 4: Taxonomy singular name. */ + /* translators: 1: Site name, 2: Separator (raquo), 3: Term name, 4: Taxonomy singular name. */ 'taxtitle' => __( '%1$s %2$s %3$s %4$s Feed' ), - /* translators: 1: Blog name, 2: Separator (raquo), 3: Author name. */ + /* translators: 1: Site name, 2: Separator (raquo), 3: Author name. */ 'authortitle' => __( '%1$s %2$s Posts by %3$s Feed' ), - /* translators: 1: Blog name, 2: Separator (raquo), 3: Search query. */ + /* translators: 1: Site name, 2: Separator (raquo), 3: Search query. */ 'searchtitle' => __( '%1$s %2$s Search Results for “%3$s” Feed' ), - /* translators: 1: Blog name, 2: Separator (raquo), 3: Post type name. */ + /* translators: 1: Site name, 2: Separator (raquo), 3: Post type name. */ 'posttypetitle' => __( '%1$s %2$s %3$s Feed' ), ); diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php index 94e037f754..035b93e9da 100644 --- a/wp-includes/ms-blogs.php +++ b/wp-includes/ms-blogs.php @@ -31,12 +31,12 @@ function wpmu_update_blogs_date() { } /** - * Gets a full blog URL, given a blog ID. + * Gets a full site URL, given a site ID. * * @since MU (3.0.0) * - * @param int $blog_id Blog ID. - * @return string Full URL of the blog if found. Empty string if not. + * @param int $blog_id Site ID. + * @return string Full site URL if found. Empty string if not. */ function get_blogaddress_by_id( $blog_id ) { $bloginfo = get_site( (int) $blog_id ); @@ -52,7 +52,7 @@ function get_blogaddress_by_id( $blog_id ) { } /** - * Gets a full blog URL, given a blog name. + * Gets a full site URL, given a site name. * * @since MU (3.0.0) * diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php index e526c88419..87ecfdf5c9 100644 --- a/wp-includes/ms-deprecated.php +++ b/wp-includes/ms-deprecated.php @@ -355,7 +355,7 @@ function get_user_id_from_string( $email_or_login ) { } /** - * Get a full blog URL, given a domain and a path. + * Get a full site URL, given a domain and a path. * * @since MU (3.0.0) * @deprecated 3.7.0 diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 3ecbf7691f..7bd74f2e36 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -604,12 +604,12 @@ function wpmu_validate_user_signup( $user_name, $user_email ) { * @global wpdb $wpdb WordPress database abstraction object. * @global string $domain * - * @param string $blogname The blog name provided by the user. Must be unique. - * @param string $blog_title The blog title provided by the user. + * @param string $blogname The site name provided by the user. Must be unique. + * @param string $blog_title The site title provided by the user. * @param WP_User|string $user Optional. The user object to check against the new site name. * Default empty string. * @return array { - * Array of domain, path, blog name, blog title, user and error messages. + * Array of domain, path, site name, site title, user and error messages. * * @type string $domain Domain for the site. * @type string $path Path for the site. Used in subdirectory installations. @@ -752,12 +752,12 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) { * @since MU (3.0.0) * * @param array $result { - * Array of domain, path, blog name, blog title, user and error messages. + * Array of domain, path, site name, site title, user and error messages. * * @type string $domain Domain for the site. * @type string $path Path for the site. Used in subdirectory installations. * @type string $blogname The unique site name (slug). - * @type string $blog_title Blog title. + * @type string $blog_title Site title. * @type string|WP_User $user By default, an empty string. A user object if provided. * @type WP_Error $errors WP_Error containing any errors found. * } @@ -2387,7 +2387,7 @@ function force_ssl_content( $force = '' ) { */ function filter_SSL( $url ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid if ( ! is_string( $url ) ) { - return get_bloginfo( 'url' ); // Return home blog URL with proper scheme. + return get_bloginfo( 'url' ); // Return home site URL with proper scheme. } if ( force_ssl_content() && is_ssl() ) { diff --git a/wp-includes/theme-compat/footer.php b/wp-includes/theme-compat/footer.php index 53f6d31373..2a719e18f0 100644 --- a/wp-includes/theme-compat/footer.php +++ b/wp-includes/theme-compat/footer.php @@ -22,7 +22,7 @@ _deprecated_file(WordPress' diff --git a/wp-includes/version.php b/wp-includes/version.php index 28c00ecce3..969a1de4d0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.3-alpha-55941'; +$wp_version = '6.3-alpha-55942'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-signup.php b/wp-signup.php index 8b40dec9e5..d11f16698f 100644 --- a/wp-signup.php +++ b/wp-signup.php @@ -113,7 +113,7 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) { } $current_network = get_network(); - // Blog name. + // Site name. if ( ! is_subdomain_install() ) { echo ''; } else { diff --git a/wp-trackback.php b/wp-trackback.php index 7512e33fb4..1e4ec3c993 100644 --- a/wp-trackback.php +++ b/wp-trackback.php @@ -106,7 +106,7 @@ if ( ! empty( $trackback_url ) && ! empty( $title ) ) { * @param string $charset Character set. * @param string $title Trackback title. * @param string $excerpt Trackback excerpt. - * @param string $blog_name Blog name. + * @param string $blog_name Site name. */ do_action( 'pre_trackback_post', $post_id, $trackback_url, $charset, $title, $excerpt, $blog_name );