diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-includes/customize/class-wp-customize-themes-section.php
--- a/wp/wp-includes/customize/class-wp-customize-themes-section.php	Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-includes/customize/class-wp-customize-themes-section.php	Tue Dec 15 13:49:49 2020 +0100
@@ -72,7 +72,7 @@
 		?>
 		<li id="accordion-section-{{ data.id }}" class="theme-section">
 			<button type="button" class="customize-themes-section-title themes-section-{{ data.id }}">{{ data.title }}</button>
-			<?php if ( current_user_can( 'install_themes' ) || is_multisite() ) : // @todo: upload support ?>
+			<?php if ( current_user_can( 'install_themes' ) || is_multisite() ) : // @todo Upload support. ?>
 			<?php endif; ?>
 			<div class="customize-themes-section themes-section-{{ data.id }} control-section-content themes-php">
 				<div class="theme-overlay" tabindex="0" role="dialog" aria-label="<?php esc_attr_e( 'Theme Details' ); ?>"></div>
@@ -81,14 +81,24 @@
 						<?php $this->filter_bar_content_template(); ?>
 					</div>
 					<?php $this->filter_drawer_content_template(); ?>
-					<div class="error unexpected-error" style="display: none; "><p><?php _e( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ); ?></p></div>
+					<div class="error unexpected-error" style="display: none; ">
+						<p>
+							<?php
+							printf(
+								/* translators: %s: Support forums URL. */
+								__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
+								__( 'https://wordpress.org/support/forums/' )
+							);
+							?>
+						</p>
+					</div>
 					<ul class="themes">
 					</ul>
 					<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
 					<p class="no-themes-local">
 						<?php
 						printf(
-							/* translators: %s: "Search WordPress.org themes" button text */
+							/* translators: %s: "Search WordPress.org themes" button text. */
 							__( 'No themes found. Try a different search, or %s.' ),
 							sprintf( '<button type="button" class="button-link search-dotorg-themes">%s</button>', __( 'Search WordPress.org themes' ) )
 						);
@@ -122,7 +132,7 @@
 			<button type="button" class="button feature-filter-toggle">
 				<span class="filter-count-0"><?php _e( 'Filter themes' ); ?></span><span class="filter-count-filters">
 				<?php
-				/* translators: %s: number of filters selected. */
+				/* translators: %s: Number of filters selected. */
 				printf( __( 'Filter themes (%s)' ), '<span class="theme-filter-count">0</span>' );
 				?>
 				</span>
@@ -138,8 +148,8 @@
 		<div class="filter-themes-count">
 			<span class="themes-displayed">
 				<?php
-				/* translators: %s: number of themes displayed. */
-				echo sprintf( __( '%s themes' ), '<span class="theme-count">0</span>' );
+				/* translators: %s: Number of themes displayed. */
+				printf( __( '%s themes' ), '<span class="theme-count">0</span>' );
 				?>
 			</span>
 		</div>
@@ -154,7 +164,9 @@
 	 * @since 4.9.0
 	 */
 	protected function filter_drawer_content_template() {
-		$feature_list = get_theme_feature_list( false ); // @todo: Use the .org API instead of the local core feature list. The .org API is currently outdated and will be reconciled when the .org themes directory is next redesigned.
+		// @todo Use the .org API instead of the local core feature list.
+		// The .org API is currently outdated and will be reconciled when the .org themes directory is next redesigned.
+		$feature_list = get_theme_feature_list( false );
 		?>
 		<# if ( 'wporg' === data.action ) { #>
 			<div class="filter-drawer filter-details">