From 8f901dba9e0ff3fe59e33f8ae7a0e45767861779 Mon Sep 17 00:00:00 2001
From: "Stephen A. Bernhardt" <sabernhardt@yahoo.com>
Date: Tue, 24 Jun 2025 20:51:20 -0500
Subject: [PATCH 1/8] settings pages

---
 src/wp-admin/options-discussion.php | 63 +++++------------------------
 src/wp-admin/options-general.php    | 21 ++--------
 src/wp-admin/options-media.php      | 21 ++--------
 src/wp-admin/options-permalink.php  |  7 +---
 src/wp-admin/options-reading.php    | 24 ++---------
 src/wp-admin/options-writing.php    |  7 +---
 6 files changed, 20 insertions(+), 123 deletions(-)

diff --git a/src/wp-admin/options-discussion.php b/src/wp-admin/options-discussion.php
index e0e12dc21f36d..c490243d80fe7 100644
--- a/src/wp-admin/options-discussion.php
+++ b/src/wp-admin/options-discussion.php
@@ -45,12 +45,7 @@
 <table class="form-table indent-children" role="presentation">
 <tr>
 <th scope="row"><?php _e( 'Default post settings' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-	<?php
-	/* translators: Hidden accessibility text. */
-	_e( 'Default post settings' );
-	?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Default post settings' ); ?></span></legend>
 <label for="default_pingback_flag">
 <input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked( '1', get_option( 'default_pingback_flag' ) ); ?> />
 <?php _e( 'Attempt to notify any blogs linked to from the post' ); ?></label>
@@ -68,12 +63,7 @@
 </tr>
 <tr>
 <th scope="row"><?php _e( 'Other comment settings' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-	<?php
-	/* translators: Hidden accessibility text. */
-	_e( 'Other comment settings' );
-	?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Other comment settings' ); ?></span></legend>
 <label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked( '1', get_option( 'require_name_email' ) ); ?> /> <?php _e( 'Comment author must fill out name and email' ); ?></label>
 <br />
 <label for="comment_registration">
@@ -131,12 +121,7 @@
 
 <tr>
 <th scope="row"><?php _e( 'Comment Pagination' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-	<?php
-	/* translators: Hidden accessibility text. */
-	_e( 'Comment Pagination' );
-	?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Comment Pagination' ); ?></span></legend>
 <input name="page_comments" type="checkbox" id="page_comments" value="1" <?php checked( '1', get_option( 'page_comments' ) ); ?> />
 <label for="page_comments"><?php _e( 'Break comments into pages' ); ?></label>
 <ul>
@@ -163,12 +148,7 @@
 </tr>
 <tr>
 <th scope="row"><?php _e( 'Email me whenever' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-	<?php
-	/* translators: Hidden accessibility text. */
-	_e( 'Email me whenever' );
-	?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Email me whenever' ); ?></span></legend>
 <label for="comments_notify">
 <input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked( '1', get_option( 'comments_notify' ) ); ?> />
 <?php _e( 'Anyone posts a comment' ); ?> </label>
@@ -180,12 +160,7 @@
 </tr>
 <tr>
 <th scope="row"><?php _e( 'Before a comment appears' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-	<?php
-	/* translators: Hidden accessibility text. */
-	_e( 'Before a comment appears' );
-	?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Before a comment appears' ); ?></span></legend>
 <label for="comment_moderation">
 <input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked( '1', get_option( 'comment_moderation' ) ); ?> />
 <?php _e( 'Comment must be manually approved' ); ?> </label>
@@ -195,12 +170,7 @@
 </tr>
 <tr>
 <th scope="row"><?php _e( 'Comment Moderation' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-	<?php
-	/* translators: Hidden accessibility text. */
-	_e( 'Comment Moderation' );
-	?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Comment Moderation' ); ?></span></legend>
 <p><label for="comment_max_links">
 <?php
 printf(
@@ -219,12 +189,7 @@
 </tr>
 <tr>
 <th scope="row"><?php _e( 'Disallowed Comment Keys' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-	<?php
-	/* translators: Hidden accessibility text. */
-	_e( 'Disallowed Comment Keys' );
-	?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Disallowed Comment Keys' ); ?></span></legend>
 <p><label for="disallowed_keys"><?php _e( 'When a comment contains any of these words in its content, author name, URL, email, IP address, or browser&#8217;s user agent string, it will be put in the Trash. One word or IP address per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.' ); ?></label></p>
 <p>
 <textarea name="disallowed_keys" rows="10" cols="50" id="disallowed_keys" class="large-text code"><?php echo esc_textarea( get_option( 'disallowed_keys' ) ); ?></textarea>
@@ -260,12 +225,7 @@
 </tr>
 <tr class="avatar-settings<?php echo $show_avatars_class; ?>">
 <th scope="row"><?php _e( 'Maximum Rating' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-	<?php
-	/* translators: Hidden accessibility text. */
-	_e( 'Maximum Rating' );
-	?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Maximum Rating' ); ?></span></legend>
 
 <?php
 $ratings = array(
@@ -288,12 +248,7 @@
 </tr>
 <tr class="avatar-settings<?php echo $show_avatars_class; ?>">
 <th scope="row"><?php _e( 'Default Avatar' ); ?></th>
-<td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span>
-	<?php
-	/* translators: Hidden accessibility text. */
-	_e( 'Default Avatar' );
-	?>
-</span></legend>
+<td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Default Avatar' ); ?></span></legend>
 
 <p>
 <?php _e( 'For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their email address.' ); ?><br />
diff --git a/src/wp-admin/options-general.php b/src/wp-admin/options-general.php
index f0becb113d767..5a9fb9cb31a13 100644
--- a/src/wp-admin/options-general.php
+++ b/src/wp-admin/options-general.php
@@ -293,12 +293,7 @@ class="<?php echo esc_attr( $classes_for_button ); ?>"
 
 <tr>
 <th scope="row"><?php _e( 'Membership' ); ?></th>
-<td> <fieldset><legend class="screen-reader-text"><span>
-	<?php
-	/* translators: Hidden accessibility text. */
-	_e( 'Membership' );
-	?>
-</span></legend><label for="users_can_register">
+<td> <fieldset><legend class="screen-reader-text"><span><?php _e( 'Membership' ); ?></span></legend><label for="users_can_register">
 <input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked( '1', get_option( 'users_can_register' ) ); ?> />
 	<?php _e( 'Anyone can register' ); ?></label>
 </fieldset></td>
@@ -464,12 +459,7 @@ class="<?php echo esc_attr( $classes_for_button ); ?>"
 <tr>
 <th scope="row"><?php _e( 'Date Format' ); ?></th>
 <td>
-	<fieldset><legend class="screen-reader-text"><span>
-		<?php
-		/* translators: Hidden accessibility text. */
-		_e( 'Date Format' );
-		?>
-	</span></legend>
+	<fieldset><legend class="screen-reader-text"><span><?php _e( 'Date Format' ); ?></span></legend>
 <?php
 	/**
 	 * Filters the default date formats.
@@ -514,12 +504,7 @@ class="<?php echo esc_attr( $classes_for_button ); ?>"
 <tr>
 <th scope="row"><?php _e( 'Time Format' ); ?></th>
 <td>
-	<fieldset><legend class="screen-reader-text"><span>
-		<?php
-		/* translators: Hidden accessibility text. */
-		_e( 'Time Format' );
-		?>
-	</span></legend>
+	<fieldset><legend class="screen-reader-text"><span><?php _e( 'Time Format' ); ?></span></legend>
 <?php
 	/**
 	 * Filters the default time formats.
diff --git a/src/wp-admin/options-media.php b/src/wp-admin/options-media.php
index b2eb47c4f402a..dd834299adf95 100644
--- a/src/wp-admin/options-media.php
+++ b/src/wp-admin/options-media.php
@@ -58,12 +58,7 @@
 <table class="form-table" role="presentation">
 <tr>
 <th scope="row"><?php _e( 'Thumbnail size' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-	<?php
-	/* translators: Hidden accessibility text. */
-	_e( 'Thumbnail size' );
-	?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Thumbnail size' ); ?></span></legend>
 <label for="thumbnail_size_w"><?php _e( 'Width' ); ?></label>
 <input name="thumbnail_size_w" type="number" step="1" min="0" id="thumbnail_size_w" value="<?php form_option( 'thumbnail_size_w' ); ?>" class="small-text" />
 <br />
@@ -77,12 +72,7 @@
 
 <tr>
 <th scope="row"><?php _e( 'Medium size' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-	<?php
-	/* translators: Hidden accessibility text. */
-	_e( 'Medium size' );
-	?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Medium size' ); ?></span></legend>
 <label for="medium_size_w"><?php _e( 'Max Width' ); ?></label>
 <input name="medium_size_w" type="number" step="1" min="0" id="medium_size_w" value="<?php form_option( 'medium_size_w' ); ?>" class="small-text" />
 <br />
@@ -93,12 +83,7 @@
 
 <tr>
 <th scope="row"><?php _e( 'Large size' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-	<?php
-	/* translators: Hidden accessibility text. */
-	_e( 'Large size' );
-	?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Large size' ); ?></span></legend>
 <label for="large_size_w"><?php _e( 'Max Width' ); ?></label>
 <input name="large_size_w" type="number" step="1" min="0" id="large_size_w" value="<?php form_option( 'large_size_w' ); ?>" class="small-text" />
 <br />
diff --git a/src/wp-admin/options-permalink.php b/src/wp-admin/options-permalink.php
index a22cdb0c92f62..7a53e6bb4915c 100644
--- a/src/wp-admin/options-permalink.php
+++ b/src/wp-admin/options-permalink.php
@@ -330,12 +330,7 @@
 	<th scope="row"><?php _e( 'Permalink structure' ); ?></th>
 	<td>
 		<fieldset class="structure-selection">
-			<legend class="screen-reader-text">
-				<?php
-				/* translators: Hidden accessibility text. */
-				_e( 'Permalink structure' );
-				?>
-			</legend>
+			<legend class="screen-reader-text"><?php _e( 'Permalink structure' ); ?></legend>
 			<?php foreach ( $default_structures as $input ) : ?>
 			<div class="row">
 				<input id="permalink-input-<?php echo esc_attr( $input['id'] ); ?>"
diff --git a/src/wp-admin/options-reading.php b/src/wp-admin/options-reading.php
index 8f3ba83a5f2c3..6c0acd0bae52c 100644
--- a/src/wp-admin/options-reading.php
+++ b/src/wp-admin/options-reading.php
@@ -86,12 +86,7 @@
 <tr>
 <th scope="row"><?php _e( 'Your homepage displays' ); ?></th>
 <td id="front-static-pages"><fieldset>
-	<legend class="screen-reader-text"><span>
-		<?php
-		/* translators: Hidden accessibility text. */
-		_e( 'Your homepage displays' );
-		?>
-	</span></legend>
+	<legend class="screen-reader-text"><span><?php _e( 'Your homepage displays' ); ?></span></legend>
 	<p><label>
 		<input name="show_on_front" type="radio" value="posts" class="tog" <?php checked( 'posts', get_option( 'show_on_front' ) ); ?> />
 		<?php _e( 'Your latest posts' ); ?>
@@ -182,12 +177,7 @@
 <tr>
 <th scope="row"><?php _e( 'For each post in a feed, include' ); ?> </th>
 <td><fieldset>
-	<legend class="screen-reader-text"><span>
-		<?php
-		/* translators: Hidden accessibility text. */
-		_e( 'For each post in a feed, include' );
-		?>
-	</span></legend>
+	<legend class="screen-reader-text"><span><?php _e( 'For each post in a feed, include' ); ?></span></legend>
 	<p>
 		<label><input name="rss_use_excerpt" type="radio" value="0" <?php checked( 0, get_option( 'rss_use_excerpt' ) ); ?>	/> <?php _e( 'Full text' ); ?></label><br />
 		<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked( 1, get_option( 'rss_use_excerpt' ) ); ?> /> <?php _e( 'Excerpt' ); ?></label>
@@ -207,15 +197,7 @@
 <tr class="option-site-visibility">
 <th scope="row"><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site visibility' ) : _e( 'Search engine visibility' ); ?> </th>
 <td><fieldset>
-	<legend class="screen-reader-text"><span>
-		<?php
-		has_action( 'blog_privacy_selector' )
-			/* translators: Hidden accessibility text. */
-			? _e( 'Site visibility' )
-			/* translators: Hidden accessibility text. */
-			: _e( 'Search engine visibility' );
-		?>
-	</span></legend>
+	<legend class="screen-reader-text"><span><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site visibility' ) : _e( 'Search engine visibility' ); ?></span></legend>
 <?php if ( has_action( 'blog_privacy_selector' ) ) : ?>
 	<input id="blog-public" type="radio" name="blog_public" value="1" <?php checked( '1', get_option( 'blog_public' ) ); ?> />
 	<label for="blog-public"><?php _e( 'Allow search engines to index this site' ); ?></label><br />
diff --git a/src/wp-admin/options-writing.php b/src/wp-admin/options-writing.php
index 21adf262f8887..5cb47b1fd37a1 100644
--- a/src/wp-admin/options-writing.php
+++ b/src/wp-admin/options-writing.php
@@ -69,12 +69,7 @@
 <?php if ( get_site_option( 'initial_db_version' ) < 32453 ) : ?>
 <tr>
 <th scope="row"><?php _e( 'Formatting' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-	<?php
-	/* translators: Hidden accessibility text. */
-	_e( 'Formatting' );
-	?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Formatting' ); ?></span></legend>
 <label for="use_smilies">
 <input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked( '1', get_option( 'use_smilies' ) ); ?> />
 	<?php _e( 'Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display' ); ?></label><br />

From 6c17891dd776269b211619e8a5a46b24db928794 Mon Sep 17 00:00:00 2001
From: "Stephen A. Bernhardt" <sabernhardt@yahoo.com>
Date: Tue, 24 Jun 2025 20:52:50 -0500
Subject: [PATCH 2/8] install page

---
 src/wp-admin/install.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/wp-admin/install.php b/src/wp-admin/install.php
index 736c5138e96ec..69b86c6891584 100644
--- a/src/wp-admin/install.php
+++ b/src/wp-admin/install.php
@@ -184,15 +184,7 @@ function display_setup_form( $error = null ) {
 			<th scope="row"><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site visibility' ) : _e( 'Search engine visibility' ); ?></th>
 			<td>
 				<fieldset>
-					<legend class="screen-reader-text"><span>
-						<?php
-						has_action( 'blog_privacy_selector' )
-							/* translators: Hidden accessibility text. */
-							? _e( 'Site visibility' )
-							/* translators: Hidden accessibility text. */
-							: _e( 'Search engine visibility' );
-						?>
-					</span></legend>
+					<legend class="screen-reader-text"><span><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site visibility' ) : _e( 'Search engine visibility' ); ?></span></legend>
 					<?php
 					if ( has_action( 'blog_privacy_selector' ) ) {
 						?>

From 5246aa9b6e652e4e3fca5ef41994afb9330a4954 Mon Sep 17 00:00:00 2001
From: "Stephen A. Bernhardt" <sabernhardt@yahoo.com>
Date: Tue, 24 Jun 2025 21:26:36 -0500
Subject: [PATCH 3/8] custom background class

---
 .../includes/class-custom-background.php      | 35 +++----------------
 1 file changed, 5 insertions(+), 30 deletions(-)

diff --git a/src/wp-admin/includes/class-custom-background.php b/src/wp-admin/includes/class-custom-background.php
index 8027c6a2ce95e..c604fcf11865a 100644
--- a/src/wp-admin/includes/class-custom-background.php
+++ b/src/wp-admin/includes/class-custom-background.php
@@ -430,12 +430,7 @@ public function admin_page() {
 			?>
 <tr>
 <th scope="row"><?php _e( 'Image Position' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-			<?php
-			/* translators: Hidden accessibility text. */
-			_e( 'Image Position' );
-			?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Image Position' ); ?></span></legend>
 <div class="background-position-control">
 			<?php foreach ( $background_position_options as $group ) : ?>
 	<div class="button-group">
@@ -454,12 +449,7 @@ public function admin_page() {
 
 <tr>
 <th scope="row"><label for="background-size"><?php _e( 'Image Size' ); ?></label></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-			<?php
-			/* translators: Hidden accessibility text. */
-			_e( 'Image Size' );
-			?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Image Size' ); ?></span></legend>
 <select id="background-size" name="background-size">
 <option value="auto"<?php selected( 'auto', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?>><?php _ex( 'Original', 'Original Size' ); ?></option>
 <option value="contain"<?php selected( 'contain', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?>><?php _e( 'Fit to Screen' ); ?></option>
@@ -470,12 +460,7 @@ public function admin_page() {
 
 <tr>
 <th scope="row"><?php _ex( 'Repeat', 'Background Repeat' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-			<?php
-			/* translators: Hidden accessibility text. */
-			_ex( 'Repeat', 'Background Repeat' );
-			?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _ex( 'Repeat', 'Background Repeat' ); ?></span></legend>
 <input name="background-repeat" type="hidden" value="no-repeat">
 <label><input type="checkbox" name="background-repeat" value="repeat"<?php checked( 'repeat', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) ); ?>> <?php _e( 'Repeat Background Image' ); ?></label>
 </fieldset></td>
@@ -483,12 +468,7 @@ public function admin_page() {
 
 <tr>
 <th scope="row"><?php _ex( 'Scroll', 'Background Scroll' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-			<?php
-			/* translators: Hidden accessibility text. */
-			_ex( 'Scroll', 'Background Scroll' );
-			?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _ex( 'Scroll', 'Background Scroll' ); ?></span></legend>
 <input name="background-attachment" type="hidden" value="fixed">
 <label><input name="background-attachment" type="checkbox" value="scroll" <?php checked( 'scroll', get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) ) ); ?>> <?php _e( 'Scroll with Page' ); ?></label>
 </fieldset></td>
@@ -496,12 +476,7 @@ public function admin_page() {
 <?php endif; // get_background_image() ?>
 <tr>
 <th scope="row"><?php _e( 'Background Color' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span>
-		<?php
-		/* translators: Hidden accessibility text. */
-		_e( 'Background Color' );
-		?>
-</span></legend>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Color' ); ?></span></legend>
 		<?php
 		$default_color = '';
 		if ( current_theme_supports( 'custom-background', 'default-color' ) ) {

From 0dba2c058b24af9cd493677d8c0ed5b197ccc740 Mon Sep 17 00:00:00 2001
From: "Stephen A. Bernhardt" <sabernhardt@yahoo.com>
Date: Tue, 24 Jun 2025 23:15:46 -0500
Subject: [PATCH 4/8] Links meta boxes

---
 src/wp-admin/includes/meta-boxes.php | 56 ++++------------------------
 1 file changed, 8 insertions(+), 48 deletions(-)

diff --git a/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php
index 0dfb1c9e8619d..39452f102c189 100644
--- a/src/wp-admin/includes/meta-boxes.php
+++ b/src/wp-admin/includes/meta-boxes.php
@@ -1228,12 +1228,7 @@ function link_categories_meta_box( $link ) {
 function link_target_meta_box( $link ) {
 
 	?>
-<fieldset><legend class="screen-reader-text"><span>
-	<?php
-	/* translators: Hidden accessibility text. */
-	_e( 'Target' );
-	?>
-</span></legend>
+<fieldset><legend class="screen-reader-text"><span><?php _e( 'Target' ); ?></span></legend>
 <p><label for="link_target_blank" class="selectit">
 <input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ( '_blank' === $link->link_target ) ? 'checked="checked"' : '' ); ?> />
 	<?php _e( '<code>_blank</code> &mdash; new window or tab.' ); ?></label></p>
@@ -1324,12 +1319,7 @@ function link_xfn_meta_box( $link ) {
 	<tr>
 		<th scope="row"><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'identity' ); ?></th>
 		<td><fieldset>
-			<legend class="screen-reader-text"><span>
-				<?php
-				/* translators: Hidden accessibility text. xfn: https://gmpg.org/xfn/ */
-				_e( 'identity' );
-				?>
-			</span></legend>
+			<legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'identity' ); ?></span></legend>
 			<label for="me">
 			<input type="checkbox" name="identity" value="me" id="me" <?php xfn_check( 'identity', 'me' ); ?> />
 			<?php _e( 'another web address of mine' ); ?></label>
@@ -1338,12 +1328,7 @@ function link_xfn_meta_box( $link ) {
 	<tr>
 		<th scope="row"><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'friendship' ); ?></th>
 		<td><fieldset>
-			<legend class="screen-reader-text"><span>
-				<?php
-				/* translators: Hidden accessibility text. xfn: https://gmpg.org/xfn/ */
-				_e( 'friendship' );
-				?>
-			</span></legend>
+			<legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'friendship' ); ?></span></legend>
 			<label for="contact">
 			<input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check( 'friendship', 'contact' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'contact' ); ?>
 			</label>
@@ -1361,12 +1346,7 @@ function link_xfn_meta_box( $link ) {
 	<tr>
 		<th scope="row"> <?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'physical' ); ?> </th>
 		<td><fieldset>
-			<legend class="screen-reader-text"><span>
-				<?php
-				/* translators: Hidden accessibility text. xfn: https://gmpg.org/xfn/ */
-				_e( 'physical' );
-				?>
-			</span></legend>
+			<legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'physical' ); ?></span></legend>
 			<label for="met">
 			<input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check( 'physical', 'met' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'met' ); ?>
 			</label>
@@ -1375,12 +1355,7 @@ function link_xfn_meta_box( $link ) {
 	<tr>
 		<th scope="row"> <?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'professional' ); ?> </th>
 		<td><fieldset>
-			<legend class="screen-reader-text"><span>
-				<?php
-				/* translators: Hidden accessibility text. xfn: https://gmpg.org/xfn/ */
-				_e( 'professional' );
-				?>
-			</span></legend>
+			<legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'professional' ); ?></span></legend>
 			<label for="co-worker">
 			<input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check( 'professional', 'co-worker' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'co-worker' ); ?>
 			</label>
@@ -1392,12 +1367,7 @@ function link_xfn_meta_box( $link ) {
 	<tr>
 		<th scope="row"><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'geographical' ); ?></th>
 		<td><fieldset>
-			<legend class="screen-reader-text"><span>
-				<?php
-				/* translators: Hidden accessibility text. xfn: https://gmpg.org/xfn/ */
-				_e( 'geographical' );
-				?>
-			</span></legend>
+			<legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'geographical' ); ?></span></legend>
 			<label for="co-resident">
 			<input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check( 'geographical', 'co-resident' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'co-resident' ); ?>
 			</label>
@@ -1412,12 +1382,7 @@ function link_xfn_meta_box( $link ) {
 	<tr>
 		<th scope="row"><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'family' ); ?></th>
 		<td><fieldset>
-			<legend class="screen-reader-text"><span>
-				<?php
-				/* translators: Hidden accessibility text. xfn: https://gmpg.org/xfn/ */
-				_e( 'family' );
-				?>
-			</span></legend>
+			<legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'family' ); ?></span></legend>
 			<label for="child">
 			<input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check( 'family', 'child' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'child' ); ?>
 			</label>
@@ -1441,12 +1406,7 @@ function link_xfn_meta_box( $link ) {
 	<tr>
 		<th scope="row"><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'romantic' ); ?></th>
 		<td><fieldset>
-			<legend class="screen-reader-text"><span>
-				<?php
-				/* translators: Hidden accessibility text. xfn: https://gmpg.org/xfn/ */
-				_e( 'romantic' );
-				?>
-			</span></legend>
+			<legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'romantic' ); ?></span></legend>
 			<label for="muse">
 			<input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check( 'romantic', 'muse' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'muse' ); ?>
 			</label>

From b794ce1c1abe78f7a1675dbf4e2591c791b87494 Mon Sep 17 00:00:00 2001
From: "Stephen A. Bernhardt" <sabernhardt@yahoo.com>
Date: Tue, 24 Jun 2025 23:31:30 -0500
Subject: [PATCH 5/8] 'Administration Color Scheme'

---
 src/wp-admin/includes/misc.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/wp-admin/includes/misc.php b/src/wp-admin/includes/misc.php
index ff073b0fd3602..7ec7e65ef064e 100644
--- a/src/wp-admin/includes/misc.php
+++ b/src/wp-admin/includes/misc.php
@@ -1022,12 +1022,7 @@ function admin_color_scheme_picker( $user_id ) {
 	}
 	?>
 	<fieldset id="color-picker" class="scheme-list">
-		<legend class="screen-reader-text"><span>
-			<?php
-			/* translators: Hidden accessibility text. */
-			_e( 'Administration Color Scheme' );
-			?>
-		</span></legend>
+		<legend class="screen-reader-text"><span><?php _e( 'Administration Color Scheme' ); ?></span></legend>
 		<?php
 		wp_nonce_field( 'save-color-scheme', 'color-nonce', false );
 		foreach ( $_wp_admin_css_colors as $color => $color_info ) :

From 81c130cb4c2349339d6d4ded8805964fc0f18c79 Mon Sep 17 00:00:00 2001
From: "Stephen A. Bernhardt" <sabernhardt@yahoo.com>
Date: Tue, 24 Jun 2025 23:33:36 -0500
Subject: [PATCH 6/8] network settings: reuse 'Enable administration menus'

---
 src/wp-admin/network/settings.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/wp-admin/network/settings.php b/src/wp-admin/network/settings.php
index e0f7909ab8a6b..ddd582c77f409 100644
--- a/src/wp-admin/network/settings.php
+++ b/src/wp-admin/network/settings.php
@@ -514,10 +514,7 @@
 					<th scope="row"><?php _e( 'Enable administration menus' ); ?></th>
 					<td>
 						<?php
-						echo '<fieldset><legend class="screen-reader-text">' .
-							/* translators: Hidden accessibility text. */
-							__( 'Enable menus' ) .
-						'</legend>';
+						echo '<fieldset><legend class="screen-reader-text">' . __( 'Enable administration menus' ) . '</legend>';
 
 						foreach ( (array) $menu_items as $key => $val ) {
 							echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . ( isset( $menu_perms[ $key ] ) ? checked( $menu_perms[ $key ], '1', false ) : '' ) . ' /> ' . esc_html( $val ) . '</label><br/>';

From 0c736fa372386ba578369cdc4adfdade02920e8e Mon Sep 17 00:00:00 2001
From: "Stephen A. Bernhardt" <sabernhardt@yahoo.com>
Date: Wed, 6 Aug 2025 06:19:13 -0500
Subject: [PATCH 7/8] Use variables for strings, where possible

---
 .../includes/class-custom-background.php      | 26 ++++++-----
 src/wp-admin/includes/meta-boxes.php          | 35 +++++++++------
 src/wp-admin/install.php                      |  5 ++-
 src/wp-admin/network/settings.php             | 15 +++----
 src/wp-admin/network/site-info.php            | 11 ++---
 src/wp-admin/options-discussion.php           | 45 +++++++++++--------
 src/wp-admin/options-general.php              | 18 +++++---
 src/wp-admin/options-media.php                | 15 ++++---
 src/wp-admin/options-permalink.php            |  5 ++-
 src/wp-admin/options-reading.php              | 16 ++++---
 src/wp-admin/options-writing.php              |  5 ++-
 11 files changed, 113 insertions(+), 83 deletions(-)

diff --git a/src/wp-admin/includes/class-custom-background.php b/src/wp-admin/includes/class-custom-background.php
index c604fcf11865a..8b4e3a4c84efd 100644
--- a/src/wp-admin/includes/class-custom-background.php
+++ b/src/wp-admin/includes/class-custom-background.php
@@ -428,9 +428,10 @@ public function admin_page() {
 				),
 			);
 			?>
+<?php $image_position_title = __( 'Image Position' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Image Position' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Image Position' ); ?></span></legend>
+<th scope="row"><?php echo $image_position_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $image_position_title; ?></span></legend>
 <div class="background-position-control">
 			<?php foreach ( $background_position_options as $group ) : ?>
 	<div class="button-group">
@@ -447,9 +448,10 @@ public function admin_page() {
 </fieldset></td>
 </tr>
 
+<?php $image_size_title = __( 'Image Size' ); ?>
 <tr>
-<th scope="row"><label for="background-size"><?php _e( 'Image Size' ); ?></label></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Image Size' ); ?></span></legend>
+<th scope="row"><label for="background-size"><?php echo $image_size_title; ?></label></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $image_size_title; ?></span></legend>
 <select id="background-size" name="background-size">
 <option value="auto"<?php selected( 'auto', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?>><?php _ex( 'Original', 'Original Size' ); ?></option>
 <option value="contain"<?php selected( 'contain', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?>><?php _e( 'Fit to Screen' ); ?></option>
@@ -458,25 +460,29 @@ public function admin_page() {
 </fieldset></td>
 </tr>
 
+<?php $background_repeat_title = _x( 'Repeat', 'Background Repeat' ); ?>
 <tr>
-<th scope="row"><?php _ex( 'Repeat', 'Background Repeat' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _ex( 'Repeat', 'Background Repeat' ); ?></span></legend>
+<th scope="row"><?php echo $background_repeat_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $background_repeat_title; ?></span></legend>
 <input name="background-repeat" type="hidden" value="no-repeat">
 <label><input type="checkbox" name="background-repeat" value="repeat"<?php checked( 'repeat', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) ); ?>> <?php _e( 'Repeat Background Image' ); ?></label>
 </fieldset></td>
 </tr>
 
+<?php $background_scroll_title = _x( 'Scroll', 'Background Scroll' ); ?>
 <tr>
-<th scope="row"><?php _ex( 'Scroll', 'Background Scroll' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _ex( 'Scroll', 'Background Scroll' ); ?></span></legend>
+<th scope="row"><?php echo $background_scroll_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $background_scroll_title; ?></span></legend>
 <input name="background-attachment" type="hidden" value="fixed">
 <label><input name="background-attachment" type="checkbox" value="scroll" <?php checked( 'scroll', get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) ) ); ?>> <?php _e( 'Scroll with Page' ); ?></label>
 </fieldset></td>
 </tr>
 <?php endif; // get_background_image() ?>
+
+<?php $background_color_title = __( 'Background Color' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Background Color' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Color' ); ?></span></legend>
+<th scope="row"><?php echo $background_color_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $background_color_title; ?></span></legend>
 		<?php
 		$default_color = '';
 		if ( current_theme_supports( 'custom-background', 'default-color' ) ) {
diff --git a/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php
index 39452f102c189..c52b4787a3044 100644
--- a/src/wp-admin/includes/meta-boxes.php
+++ b/src/wp-admin/includes/meta-boxes.php
@@ -1316,19 +1316,21 @@ function link_xfn_meta_box( $link ) {
 		<th scope="row"><label for="link_rel"><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'rel:' ); ?></label></th>
 		<td><input type="text" name="link_rel" id="link_rel" value="<?php echo ( isset( $link->link_rel ) ? esc_attr( $link->link_rel ) : '' ); ?>" /></td>
 	</tr>
+	<?php $identity_group_title = /* translators: xfn: https://gmpg.org/xfn/ */ __( 'identity' ); ?>
 	<tr>
-		<th scope="row"><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'identity' ); ?></th>
+		<th scope="row"><?php echo $identity_group_title; ?></th>
 		<td><fieldset>
-			<legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'identity' ); ?></span></legend>
+			<legend class="screen-reader-text"><span><?php echo $identity_group_title; ?></span></legend>
 			<label for="me">
 			<input type="checkbox" name="identity" value="me" id="me" <?php xfn_check( 'identity', 'me' ); ?> />
 			<?php _e( 'another web address of mine' ); ?></label>
 		</fieldset></td>
 	</tr>
+	<?php $friendship_group_title = /* translators: xfn: https://gmpg.org/xfn/ */ __( 'friendship' ); ?>
 	<tr>
-		<th scope="row"><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'friendship' ); ?></th>
+		<th scope="row"><?php echo $friendship_group_title; ?></th>
 		<td><fieldset>
-			<legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'friendship' ); ?></span></legend>
+			<legend class="screen-reader-text"><span><?php echo $friendship_group_title; ?></span></legend>
 			<label for="contact">
 			<input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check( 'friendship', 'contact' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'contact' ); ?>
 			</label>
@@ -1343,19 +1345,21 @@ function link_xfn_meta_box( $link ) {
 			</label>
 		</fieldset></td>
 	</tr>
+	<?php $physical_group_title = /* translators: xfn: https://gmpg.org/xfn/ */ __( 'physical' ); ?>
 	<tr>
-		<th scope="row"> <?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'physical' ); ?> </th>
+		<th scope="row"> <?php echo $physical_group_title; ?> </th>
 		<td><fieldset>
-			<legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'physical' ); ?></span></legend>
+			<legend class="screen-reader-text"><span><?php echo $physical_group_title; ?></span></legend>
 			<label for="met">
 			<input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check( 'physical', 'met' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'met' ); ?>
 			</label>
 		</fieldset></td>
 	</tr>
+	<?php $professional_group_title = /* translators: xfn: https://gmpg.org/xfn/ */ __( 'professional' ); ?>
 	<tr>
-		<th scope="row"> <?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'professional' ); ?> </th>
+		<th scope="row"> <?php echo $professional_group_title; ?> </th>
 		<td><fieldset>
-			<legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'professional' ); ?></span></legend>
+			<legend class="screen-reader-text"><span><?php echo $professional_group_title; ?></span></legend>
 			<label for="co-worker">
 			<input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check( 'professional', 'co-worker' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'co-worker' ); ?>
 			</label>
@@ -1364,10 +1368,11 @@ function link_xfn_meta_box( $link ) {
 			</label>
 		</fieldset></td>
 	</tr>
+	<?php $geographical_group_title = /* translators: xfn: https://gmpg.org/xfn/ */ __( 'geographical' ); ?>
 	<tr>
-		<th scope="row"><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'geographical' ); ?></th>
+		<th scope="row"><?php echo $geographical_group_title; ?></th>
 		<td><fieldset>
-			<legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'geographical' ); ?></span></legend>
+			<legend class="screen-reader-text"><span><?php echo $geographical_group_title; ?></span></legend>
 			<label for="co-resident">
 			<input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check( 'geographical', 'co-resident' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'co-resident' ); ?>
 			</label>
@@ -1379,10 +1384,11 @@ function link_xfn_meta_box( $link ) {
 			</label>
 		</fieldset></td>
 	</tr>
+	<?php $family_group_title = /* translators: xfn: https://gmpg.org/xfn/ */ __( 'family' ); ?>
 	<tr>
-		<th scope="row"><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'family' ); ?></th>
+		<th scope="row"><?php echo $family_group_title; ?></th>
 		<td><fieldset>
-			<legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'family' ); ?></span></legend>
+			<legend class="screen-reader-text"><span><?php echo $family_group_title; ?></span></legend>
 			<label for="child">
 			<input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check( 'family', 'child' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'child' ); ?>
 			</label>
@@ -1403,10 +1409,11 @@ function link_xfn_meta_box( $link ) {
 			</label>
 		</fieldset></td>
 	</tr>
+	<?php $romantic_group_title = /* translators: xfn: https://gmpg.org/xfn/ */ __( 'romantic' ); ?>
 	<tr>
-		<th scope="row"><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'romantic' ); ?></th>
+		<th scope="row"><?php echo $romantic_group_title; ?></th>
 		<td><fieldset>
-			<legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'romantic' ); ?></span></legend>
+			<legend class="screen-reader-text"><span><?php echo $romantic_group_title; ?></span></legend>
 			<label for="muse">
 			<input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check( 'romantic', 'muse' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'muse' ); ?>
 			</label>
diff --git a/src/wp-admin/install.php b/src/wp-admin/install.php
index 69b86c6891584..bcd6cefd69ff4 100644
--- a/src/wp-admin/install.php
+++ b/src/wp-admin/install.php
@@ -180,11 +180,12 @@ function display_setup_form( $error = null ) {
 			<td><input name="admin_email" type="email" id="admin_email" size="25" aria-describedby="admin-email-desc" value="<?php echo esc_attr( $admin_email ); ?>" />
 			<p id="admin-email-desc"><?php _e( 'Double-check your email address before continuing.' ); ?></p></td>
 		</tr>
+		<?php $blog_privacy_selector_title = has_action( 'blog_privacy_selector' ) ? __( 'Site visibility' ) : __( 'Search engine visibility' ); ?>
 		<tr>
-			<th scope="row"><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site visibility' ) : _e( 'Search engine visibility' ); ?></th>
+			<th scope="row"><?php echo $blog_privacy_selector_title; ?></th>
 			<td>
 				<fieldset>
-					<legend class="screen-reader-text"><span><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site visibility' ) : _e( 'Search engine visibility' ); ?></span></legend>
+					<legend class="screen-reader-text"><span><?php echo $blog_privacy_selector_title; ?></span></legend>
 					<?php
 					if ( has_action( 'blog_privacy_selector' ) ) {
 						?>
diff --git a/src/wp-admin/network/settings.php b/src/wp-admin/network/settings.php
index ddd582c77f409..f298bd0091d9e 100644
--- a/src/wp-admin/network/settings.php
+++ b/src/wp-admin/network/settings.php
@@ -199,8 +199,9 @@
 		</table>
 		<h2><?php _e( 'Registration Settings' ); ?></h2>
 		<table class="form-table" role="presentation">
+			<?php $new_registrations_settings_title = __( 'Allow new registrations' ); ?>
 			<tr>
-				<th scope="row"><?php _e( 'Allow new registrations' ); ?></th>
+				<th scope="row"><?php echo $new_registrations_settings_title; ?></th>
 				<?php
 				if ( ! get_site_option( 'registration' ) ) {
 					update_site_option( 'registration', 'none' );
@@ -209,12 +210,7 @@
 				?>
 				<td>
 					<fieldset>
-					<legend class="screen-reader-text">
-						<?php
-						/* translators: Hidden accessibility text. */
-						_e( 'New registrations settings' );
-						?>
-					</legend>
+					<legend class="screen-reader-text"><?php echo $new_registrations_settings_title; ?></legend>
 					<label><input name="registration" type="radio" id="registration1" value="none"<?php checked( $reg, 'none' ); ?> /> <?php _e( 'Registration is disabled' ); ?></label><br />
 					<label><input name="registration" type="radio" id="registration2" value="user"<?php checked( $reg, 'user' ); ?> /> <?php _e( 'User accounts may be registered' ); ?></label><br />
 					<label><input name="registration" type="radio" id="registration3" value="blog"<?php checked( $reg, 'blog' ); ?> /> <?php _e( 'Logged in users may register new sites' ); ?></label><br />
@@ -510,11 +506,12 @@
 			?>
 			<h2><?php _e( 'Menu Settings' ); ?></h2>
 			<table id="menu" class="form-table">
+				<?php $enable_administration_menus_title = __( 'Enable administration menus' ); ?>
 				<tr>
-					<th scope="row"><?php _e( 'Enable administration menus' ); ?></th>
+					<th scope="row"><?php echo $enable_administration_menus_title; ?></th>
 					<td>
 						<?php
-						echo '<fieldset><legend class="screen-reader-text">' . __( 'Enable administration menus' ) . '</legend>';
+						echo '<fieldset><legend class="screen-reader-text">' . $enable_administration_menus_title . '</legend>';
 
 						foreach ( (array) $menu_items as $key => $val ) {
 							echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . ( isset( $menu_perms[ $key ] ) ? checked( $menu_perms[ $key ], '1', false ) : '' ) . ' /> ' . esc_html( $val ) . '</label><br/>';
diff --git a/src/wp-admin/network/site-info.php b/src/wp-admin/network/site-info.php
index 46f67cced5c52..5a2a8c9367a22 100644
--- a/src/wp-admin/network/site-info.php
+++ b/src/wp-admin/network/site-info.php
@@ -196,6 +196,8 @@
 			<td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr( $details->last_updated ); ?>" /></td>
 		</tr>
 		<?php
+		$site_attributes_title = __( 'Attributes' );
+
 		$attribute_fields = array( 'public' => _x( 'Public', 'site' ) );
 		if ( ! $is_main_site ) {
 			$attribute_fields['archived'] = __( 'Archived' );
@@ -205,15 +207,10 @@
 		$attribute_fields['mature'] = __( 'Mature' );
 		?>
 		<tr>
-			<th scope="row"><?php _e( 'Attributes' ); ?></th>
+			<th scope="row"><?php echo $site_attributes_title; ?></th>
 			<td>
 			<fieldset>
-			<legend class="screen-reader-text">
-				<?php
-				/* translators: Hidden accessibility text. */
-				_e( 'Set site attributes' );
-				?>
-			</legend>
+			<legend class="screen-reader-text"><?php echo $site_attributes_title; ?></legend>
 			<?php foreach ( $attribute_fields as $field_key => $field_label ) : ?>
 				<label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked( (bool) $details->$field_key, true ); ?> <?php disabled( ! in_array( (int) $details->$field_key, array( 0, 1 ), true ) ); ?> />
 				<?php echo $field_label; ?></label><br />
diff --git a/src/wp-admin/options-discussion.php b/src/wp-admin/options-discussion.php
index c490243d80fe7..7f12d95a268c4 100644
--- a/src/wp-admin/options-discussion.php
+++ b/src/wp-admin/options-discussion.php
@@ -43,9 +43,10 @@
 <?php settings_fields( 'discussion' ); ?>
 
 <table class="form-table indent-children" role="presentation">
+<?php $default_post_settings_title = __( 'Default post settings' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Default post settings' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Default post settings' ); ?></span></legend>
+<th scope="row"><?php echo $default_post_settings_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $default_post_settings_title; ?></span></legend>
 <label for="default_pingback_flag">
 <input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked( '1', get_option( 'default_pingback_flag' ) ); ?> />
 <?php _e( 'Attempt to notify any blogs linked to from the post' ); ?></label>
@@ -61,9 +62,10 @@
 <p class="description"><?php _e( 'Individual posts may override these settings. Changes here will only be applied to new posts.' ); ?></p>
 </fieldset></td>
 </tr>
+<?php $other_comment_settings_title = __( 'Other comment settings' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Other comment settings' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Other comment settings' ); ?></span></legend>
+<th scope="row"><?php echo $other_comment_settings_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $other_comment_settings_title; ?></span></legend>
 <label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked( '1', get_option( 'require_name_email' ) ); ?> /> <?php _e( 'Comment author must fill out name and email' ); ?></label>
 <br />
 <label for="comment_registration">
@@ -119,9 +121,10 @@
 </fieldset></td>
 </tr>
 
+<?php $comment_pagination_title = __( 'Comment Pagination' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Comment Pagination' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Comment Pagination' ); ?></span></legend>
+<th scope="row"><?php echo $comment_pagination_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $comment_pagination_title; ?></span></legend>
 <input name="page_comments" type="checkbox" id="page_comments" value="1" <?php checked( '1', get_option( 'page_comments' ) ); ?> />
 <label for="page_comments"><?php _e( 'Break comments into pages' ); ?></label>
 <ul>
@@ -146,9 +149,10 @@
 </ul>
 </fieldset></td>
 </tr>
+<?php $email_me_whenever_title = __( 'Email me whenever' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Email me whenever' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Email me whenever' ); ?></span></legend>
+<th scope="row"><?php echo $email_me_whenever_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $email_me_whenever_title; ?></span></legend>
 <label for="comments_notify">
 <input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked( '1', get_option( 'comments_notify' ) ); ?> />
 <?php _e( 'Anyone posts a comment' ); ?> </label>
@@ -158,9 +162,10 @@
 <?php _e( 'A comment is held for moderation' ); ?> </label>
 </fieldset></td>
 </tr>
+<?php $before_comment_appears_title = __( 'Before a comment appears' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Before a comment appears' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Before a comment appears' ); ?></span></legend>
+<th scope="row"><?php echo $before_comment_appears_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $before_comment_appears_title; ?></span></legend>
 <label for="comment_moderation">
 <input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked( '1', get_option( 'comment_moderation' ) ); ?> />
 <?php _e( 'Comment must be manually approved' ); ?> </label>
@@ -168,9 +173,10 @@
 <label for="comment_previously_approved"><input type="checkbox" name="comment_previously_approved" id="comment_previously_approved" value="1" <?php checked( '1', get_option( 'comment_previously_approved' ) ); ?> /> <?php _e( 'Comment author must have a previously approved comment' ); ?></label>
 </fieldset></td>
 </tr>
+<?php $comment_moderation_title = __( 'Comment Moderation' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Comment Moderation' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Comment Moderation' ); ?></span></legend>
+<th scope="row"><?php echo $comment_moderation_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $comment_moderation_title; ?></span></legend>
 <p><label for="comment_max_links">
 <?php
 printf(
@@ -187,9 +193,10 @@
 </p>
 </fieldset></td>
 </tr>
+<?php $disallowed_comment_keys_title = __( 'Disallowed Comment Keys' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Disallowed Comment Keys' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Disallowed Comment Keys' ); ?></span></legend>
+<th scope="row"><?php echo $disallowed_comment_keys_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $disallowed_comment_keys_title; ?></span></legend>
 <p><label for="disallowed_keys"><?php _e( 'When a comment contains any of these words in its content, author name, URL, email, IP address, or browser&#8217;s user agent string, it will be put in the Trash. One word or IP address per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.' ); ?></label></p>
 <p>
 <textarea name="disallowed_keys" rows="10" cols="50" id="disallowed_keys" class="large-text code"><?php echo esc_textarea( get_option( 'disallowed_keys' ) ); ?></textarea>
@@ -223,9 +230,10 @@
 	</label>
 </td>
 </tr>
+<?php $maximum_rating_title = __( 'Maximum Rating' ); ?>
 <tr class="avatar-settings<?php echo $show_avatars_class; ?>">
-<th scope="row"><?php _e( 'Maximum Rating' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Maximum Rating' ); ?></span></legend>
+<th scope="row"><?php echo $maximum_rating_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $maximum_rating_title; ?></span></legend>
 
 <?php
 $ratings = array(
@@ -246,9 +254,10 @@
 
 </fieldset></td>
 </tr>
+<?php $default_avatar_title = __( 'Default Avatar' ); ?>
 <tr class="avatar-settings<?php echo $show_avatars_class; ?>">
-<th scope="row"><?php _e( 'Default Avatar' ); ?></th>
-<td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Default Avatar' ); ?></span></legend>
+<th scope="row"><?php echo $default_avatar_title; ?></th>
+<td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php echo $default_avatar_title; ?></span></legend>
 
 <p>
 <?php _e( 'For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their email address.' ); ?><br />
diff --git a/src/wp-admin/options-general.php b/src/wp-admin/options-general.php
index 5a9fb9cb31a13..c1029279f6529 100644
--- a/src/wp-admin/options-general.php
+++ b/src/wp-admin/options-general.php
@@ -291,9 +291,10 @@ class="<?php echo esc_attr( $classes_for_button ); ?>"
 
 <?php if ( ! is_multisite() ) { ?>
 
+<?php $membership_title = __( 'Membership' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Membership' ); ?></th>
-<td> <fieldset><legend class="screen-reader-text"><span><?php _e( 'Membership' ); ?></span></legend><label for="users_can_register">
+<th scope="row"><?php echo $membership_title; ?></th>
+<td> <fieldset><legend class="screen-reader-text"><span><?php echo $membership_title; ?></span></legend><label for="users_can_register">
 <input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked( '1', get_option( 'users_can_register' ) ); ?> />
 	<?php _e( 'Anyone can register' ); ?></label>
 </fieldset></td>
@@ -454,12 +455,13 @@ class="<?php echo esc_attr( $classes_for_button ); ?>"
 </p>
 <?php endif; ?>
 </td>
-
 </tr>
+
+<?php $date_format_title = __( 'Date Format' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Date Format' ); ?></th>
+<th scope="row"><?php echo $date_format_title; ?></th>
 <td>
-	<fieldset><legend class="screen-reader-text"><span><?php _e( 'Date Format' ); ?></span></legend>
+	<fieldset><legend class="screen-reader-text"><span><?php echo $date_format_title; ?></span></legend>
 <?php
 	/**
 	 * Filters the default date formats.
@@ -501,10 +503,12 @@ class="<?php echo esc_attr( $classes_for_button ); ?>"
 	</fieldset>
 </td>
 </tr>
+
+<?php $time_format_title = __( 'Time Format' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Time Format' ); ?></th>
+<th scope="row"><?php echo $time_format_title; ?></th>
 <td>
-	<fieldset><legend class="screen-reader-text"><span><?php _e( 'Time Format' ); ?></span></legend>
+	<fieldset><legend class="screen-reader-text"><span><?php echo $time_format_title; ?></span></legend>
 <?php
 	/**
 	 * Filters the default time formats.
diff --git a/src/wp-admin/options-media.php b/src/wp-admin/options-media.php
index dd834299adf95..81ebc9223f543 100644
--- a/src/wp-admin/options-media.php
+++ b/src/wp-admin/options-media.php
@@ -56,9 +56,10 @@
 <p><?php _e( 'The sizes listed below determine the maximum dimensions in pixels to use when adding an image to the Media Library.' ); ?></p>
 
 <table class="form-table" role="presentation">
+<?php $thumbnail_size_title = __( 'Thumbnail size' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Thumbnail size' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Thumbnail size' ); ?></span></legend>
+<th scope="row"><?php echo $thumbnail_size_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $thumbnail_size_title; ?></span></legend>
 <label for="thumbnail_size_w"><?php _e( 'Width' ); ?></label>
 <input name="thumbnail_size_w" type="number" step="1" min="0" id="thumbnail_size_w" value="<?php form_option( 'thumbnail_size_w' ); ?>" class="small-text" />
 <br />
@@ -70,9 +71,10 @@
 </td>
 </tr>
 
+<?php $medium_size_title = __( 'Medium size' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Medium size' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Medium size' ); ?></span></legend>
+<th scope="row"><?php echo $medium_size_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $medium_size_title; ?></span></legend>
 <label for="medium_size_w"><?php _e( 'Max Width' ); ?></label>
 <input name="medium_size_w" type="number" step="1" min="0" id="medium_size_w" value="<?php form_option( 'medium_size_w' ); ?>" class="small-text" />
 <br />
@@ -81,9 +83,10 @@
 </fieldset></td>
 </tr>
 
+<?php $large_size_title = __( 'Large size' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Large size' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Large size' ); ?></span></legend>
+<th scope="row"><?php echo $large_size_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $large_size_title; ?></span></legend>
 <label for="large_size_w"><?php _e( 'Max Width' ); ?></label>
 <input name="large_size_w" type="number" step="1" min="0" id="large_size_w" value="<?php form_option( 'large_size_w' ); ?>" class="small-text" />
 <br />
diff --git a/src/wp-admin/options-permalink.php b/src/wp-admin/options-permalink.php
index 7a53e6bb4915c..2a1b46fba2102 100644
--- a/src/wp-admin/options-permalink.php
+++ b/src/wp-admin/options-permalink.php
@@ -326,11 +326,12 @@
 </p>
 <table class="form-table permalink-structure" role="presentation">
 <tbody>
+<?php $permalink_structure_title = __( 'Permalink structure' ); ?>
 <tr>
-	<th scope="row"><?php _e( 'Permalink structure' ); ?></th>
+	<th scope="row"><?php echo $permalink_structure_title; ?></th>
 	<td>
 		<fieldset class="structure-selection">
-			<legend class="screen-reader-text"><?php _e( 'Permalink structure' ); ?></legend>
+			<legend class="screen-reader-text"><?php echo $permalink_structure_title; ?></legend>
 			<?php foreach ( $default_structures as $input ) : ?>
 			<div class="row">
 				<input id="permalink-input-<?php echo esc_attr( $input['id'] ); ?>"
diff --git a/src/wp-admin/options-reading.php b/src/wp-admin/options-reading.php
index 6c0acd0bae52c..637e1507707bd 100644
--- a/src/wp-admin/options-reading.php
+++ b/src/wp-admin/options-reading.php
@@ -83,10 +83,11 @@
 	}
 	?>
 <table class="form-table" role="presentation">
+<?php $your_homepage_displays_title = __( 'Your homepage displays' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Your homepage displays' ); ?></th>
+<th scope="row"><?php echo $your_homepage_displays_title; ?></th>
 <td id="front-static-pages"><fieldset>
-	<legend class="screen-reader-text"><span><?php _e( 'Your homepage displays' ); ?></span></legend>
+	<legend class="screen-reader-text"><span><?php echo $your_homepage_displays_title; ?></span></legend>
 	<p><label>
 		<input name="show_on_front" type="radio" value="posts" class="tog" <?php checked( 'posts', get_option( 'show_on_front' ) ); ?> />
 		<?php _e( 'Your latest posts' ); ?>
@@ -174,10 +175,12 @@
 <th scope="row"><label for="posts_per_rss"><?php _e( 'Syndication feeds show the most recent' ); ?></label></th>
 <td><input name="posts_per_rss" type="number" step="1" min="1" id="posts_per_rss" value="<?php form_option( 'posts_per_rss' ); ?>" class="small-text" /> <?php _e( 'items' ); ?></td>
 </tr>
+
+<?php $rss_use_excerpt_title = __( 'For each post in a feed, include' ); ?>
 <tr>
-<th scope="row"><?php _e( 'For each post in a feed, include' ); ?> </th>
+<th scope="row"><?php echo $rss_use_excerpt_title; ?> </th>
 <td><fieldset>
-	<legend class="screen-reader-text"><span><?php _e( 'For each post in a feed, include' ); ?></span></legend>
+	<legend class="screen-reader-text"><span><?php echo $rss_use_excerpt_title; ?></span></legend>
 	<p>
 		<label><input name="rss_use_excerpt" type="radio" value="0" <?php checked( 0, get_option( 'rss_use_excerpt' ) ); ?>	/> <?php _e( 'Full text' ); ?></label><br />
 		<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked( 1, get_option( 'rss_use_excerpt' ) ); ?> /> <?php _e( 'Excerpt' ); ?></label>
@@ -194,10 +197,11 @@
 </fieldset></td>
 </tr>
 
+<?php $blog_privacy_selector_title = has_action( 'blog_privacy_selector' ) ? __( 'Site visibility' ) : __( 'Search engine visibility' ); ?>
 <tr class="option-site-visibility">
-<th scope="row"><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site visibility' ) : _e( 'Search engine visibility' ); ?> </th>
+<th scope="row"><?php echo $blog_privacy_selector_title; ?> </th>
 <td><fieldset>
-	<legend class="screen-reader-text"><span><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site visibility' ) : _e( 'Search engine visibility' ); ?></span></legend>
+	<legend class="screen-reader-text"><span><?php echo $blog_privacy_selector_title; ?></span></legend>
 <?php if ( has_action( 'blog_privacy_selector' ) ) : ?>
 	<input id="blog-public" type="radio" name="blog_public" value="1" <?php checked( '1', get_option( 'blog_public' ) ); ?> />
 	<label for="blog-public"><?php _e( 'Allow search engines to index this site' ); ?></label><br />
diff --git a/src/wp-admin/options-writing.php b/src/wp-admin/options-writing.php
index 5cb47b1fd37a1..5ab316fc55bc3 100644
--- a/src/wp-admin/options-writing.php
+++ b/src/wp-admin/options-writing.php
@@ -67,9 +67,10 @@
 
 <table class="form-table" role="presentation">
 <?php if ( get_site_option( 'initial_db_version' ) < 32453 ) : ?>
+<?php $formatting_title = __( 'Formatting' ); ?>
 <tr>
-<th scope="row"><?php _e( 'Formatting' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Formatting' ); ?></span></legend>
+<th scope="row"><?php echo $formatting_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $formatting_title; ?></span></legend>
 <label for="use_smilies">
 <input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked( '1', get_option( 'use_smilies' ) ); ?> />
 	<?php _e( 'Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display' ); ?></label><br />

From fd2181206e22c4ac1ed1f5f5fd99646af7cb740f Mon Sep 17 00:00:00 2001
From: "Stephen A. Bernhardt" <sabernhardt@yahoo.com>
Date: Wed, 6 Aug 2025 08:15:10 -0500
Subject: [PATCH 8/8] Try fixing indentation errors

---
 src/wp-admin/includes/class-custom-background.php | 15 ++++++++-------
 src/wp-admin/options-general.php                  |  7 ++++---
 src/wp-admin/options-reading.php                  |  3 ++-
 src/wp-admin/options-writing.php                  |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/wp-admin/includes/class-custom-background.php b/src/wp-admin/includes/class-custom-background.php
index 8b4e3a4c84efd..e42a38f4eb689 100644
--- a/src/wp-admin/includes/class-custom-background.php
+++ b/src/wp-admin/includes/class-custom-background.php
@@ -377,6 +377,8 @@ public function admin_page() {
 <input name="background-preset" type="hidden" value="custom">
 
 			<?php
+			$background_position_title = __( 'Image Position' );
+
 			$background_position = sprintf(
 				'%s %s',
 				get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) ),
@@ -428,10 +430,9 @@ public function admin_page() {
 				),
 			);
 			?>
-<?php $image_position_title = __( 'Image Position' ); ?>
 <tr>
-<th scope="row"><?php echo $image_position_title; ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php echo $image_position_title; ?></span></legend>
+<th scope="row"><?php echo $background_position_title; ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php echo $background_position_title; ?></span></legend>
 <div class="background-position-control">
 			<?php foreach ( $background_position_options as $group ) : ?>
 	<div class="button-group">
@@ -448,7 +449,7 @@ public function admin_page() {
 </fieldset></td>
 </tr>
 
-<?php $image_size_title = __( 'Image Size' ); ?>
+			<?php $image_size_title = __( 'Image Size' ); ?>
 <tr>
 <th scope="row"><label for="background-size"><?php echo $image_size_title; ?></label></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php echo $image_size_title; ?></span></legend>
@@ -460,7 +461,7 @@ public function admin_page() {
 </fieldset></td>
 </tr>
 
-<?php $background_repeat_title = _x( 'Repeat', 'Background Repeat' ); ?>
+			<?php $background_repeat_title = _x( 'Repeat', 'Background Repeat' ); ?>
 <tr>
 <th scope="row"><?php echo $background_repeat_title; ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php echo $background_repeat_title; ?></span></legend>
@@ -469,7 +470,7 @@ public function admin_page() {
 </fieldset></td>
 </tr>
 
-<?php $background_scroll_title = _x( 'Scroll', 'Background Scroll' ); ?>
+			<?php $background_scroll_title = _x( 'Scroll', 'Background Scroll' ); ?>
 <tr>
 <th scope="row"><?php echo $background_scroll_title; ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php echo $background_scroll_title; ?></span></legend>
@@ -479,7 +480,7 @@ public function admin_page() {
 </tr>
 <?php endif; // get_background_image() ?>
 
-<?php $background_color_title = __( 'Background Color' ); ?>
+		<?php $background_color_title = __( 'Background Color' ); ?>
 <tr>
 <th scope="row"><?php echo $background_color_title; ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php echo $background_color_title; ?></span></legend>
diff --git a/src/wp-admin/options-general.php b/src/wp-admin/options-general.php
index c1029279f6529..745d396d9467d 100644
--- a/src/wp-admin/options-general.php
+++ b/src/wp-admin/options-general.php
@@ -289,9 +289,10 @@ class="<?php echo esc_attr( $classes_for_button ); ?>"
 </td>
 </tr>
 
-<?php if ( ! is_multisite() ) { ?>
-
-<?php $membership_title = __( 'Membership' ); ?>
+<?php
+if ( ! is_multisite() ) {
+	$membership_title = __( 'Membership' );
+	?>
 <tr>
 <th scope="row"><?php echo $membership_title; ?></th>
 <td> <fieldset><legend class="screen-reader-text"><span><?php echo $membership_title; ?></span></legend><label for="users_can_register">
diff --git a/src/wp-admin/options-reading.php b/src/wp-admin/options-reading.php
index 637e1507707bd..5a8ad87ef75bb 100644
--- a/src/wp-admin/options-reading.php
+++ b/src/wp-admin/options-reading.php
@@ -81,9 +81,10 @@
 	if ( 'page' === get_option( 'show_on_front' ) && ! get_option( 'page_on_front' ) && ! get_option( 'page_for_posts' ) ) {
 		update_option( 'show_on_front', 'posts' );
 	}
+
+	$your_homepage_displays_title = __( 'Your homepage displays' );
 	?>
 <table class="form-table" role="presentation">
-<?php $your_homepage_displays_title = __( 'Your homepage displays' ); ?>
 <tr>
 <th scope="row"><?php echo $your_homepage_displays_title; ?></th>
 <td id="front-static-pages"><fieldset>
diff --git a/src/wp-admin/options-writing.php b/src/wp-admin/options-writing.php
index 5ab316fc55bc3..6f85b54679327 100644
--- a/src/wp-admin/options-writing.php
+++ b/src/wp-admin/options-writing.php
@@ -67,7 +67,7 @@
 
 <table class="form-table" role="presentation">
 <?php if ( get_site_option( 'initial_db_version' ) < 32453 ) : ?>
-<?php $formatting_title = __( 'Formatting' ); ?>
+	<?php $formatting_title = __( 'Formatting' ); ?>
 <tr>
 <th scope="row"><?php echo $formatting_title; ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php echo $formatting_title; ?></span></legend>