From d4ce786b2e1b41b84507f2ce39ba74fd195d4b9b Mon Sep 17 00:00:00 2001
From: audrasjb <audrasjb@git.wordpress.org>
Date: Sun, 2 Jun 2024 21:07:13 +0000
Subject: [PATCH] I18n: Add more context to the overall use of `none` in
 translatable strings.

Because `none` doesn't convey the same meaning all the time.

Props tobifjellner, audrasjb, SergeyBiryukov, shailu25.
Fixes #50087.



Built from https://develop.svn.wordpress.org/trunk@58284


git-svn-id: http://core.svn.wordpress.org/trunk@57744 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/meta-boxes.php |  6 +++---
 wp-includes/deprecated.php       |  2 +-
 wp-includes/media-template.php   | 18 +++++++++---------
 wp-includes/version.php          |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index 707fba5e2e..43e33445d6 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -1354,7 +1354,7 @@ function link_xfn_meta_box( $link ) {
 			<input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check( 'friendship', 'friend' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'friend' ); ?>
 			</label>
 			<label for="friendship">
-			<input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check( 'friendship' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'none' ); ?>
+			<input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check( 'friendship' ); ?> />&nbsp;<?php /* translators: xfn (friendship relation): http://gmpg.org/xfn/ */ _x( 'none', 'Type of relation' ); ?>
 			</label>
 		</fieldset></td>
 	</tr>
@@ -1405,7 +1405,7 @@ function link_xfn_meta_box( $link ) {
 			<input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check( 'geographical', 'neighbor' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'neighbor' ); ?>
 			</label>
 			<label for="geographical">
-			<input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check( 'geographical' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'none' ); ?>
+			<input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check( 'geographical' ); ?> />&nbsp;<?php /* translators: xfn (geographical relation): http://gmpg.org/xfn/ */ _x( 'none', 'Type of relation' ); ?>
 			</label>
 		</fieldset></td>
 	</tr>
@@ -1434,7 +1434,7 @@ function link_xfn_meta_box( $link ) {
 			<input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check( 'family', 'spouse' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'spouse' ); ?>
 			</label>
 			<label for="family">
-			<input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check( 'family' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'none' ); ?>
+			<input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check( 'family' ); ?> />&nbsp;<?php /* translators: xfn (family relation): http://gmpg.org/xfn/ */ _x( 'none', 'Type of relation' ); ?>
 			</label>
 		</fieldset></td>
 	</tr>
diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index 6e26606fd0..863131714d 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -705,7 +705,7 @@ function dropdown_cats($optionall = 1, $all = 'All', $orderby = 'ID', $order = '
 
 	$show_option_none = '';
 	if ( $optionnone )
-		$show_option_none = __('None');
+	$show_option_none = _x( 'None', 'Categories dropdown (show_option_none parameter)' );
 
 	$vars = compact('show_option_all', 'show_option_none', 'orderby', 'order',
 					'show_last_update', 'show_count', 'hide_empty', 'selected', 'exclude');
diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php
index abe3fac0ba..e0bd68a8f4 100644
--- a/wp-includes/media-template.php
+++ b/wp-includes/media-template.php
@@ -840,7 +840,7 @@ function wp_print_media_templates() {
 						<?php esc_html_e( 'Right' ); ?>
 					</option>
 					<option value="none" selected>
-						<?php esc_html_e( 'None' ); ?>
+						<?php esc_html_x( 'None', 'Alignment' ); ?>
 					</option>
 				</select>
 			</span>
@@ -867,7 +867,7 @@ function wp_print_media_templates() {
 				<option value="file">
 			<# } else { #>
 				<option value="none" selected>
-					<?php esc_html_e( 'None' ); ?>
+					<?php esc_html_x( 'None', 'Embedded player type' ); ?>
 				</option>
 				<option value="file">
 			<# } #>
@@ -952,7 +952,7 @@ function wp_print_media_templates() {
 					<?php esc_html_e( 'Media File' ); ?>
 				</option>
 				<option value="none" <# if ( 'none' === wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
-					<?php esc_html_e( 'None' ); ?>
+					<?php esc_html_x( 'None', 'Media link target' ); ?>
 				</option>
 			</select>
 		</span>
@@ -1096,7 +1096,7 @@ function wp_print_media_templates() {
 						<?php esc_html_e( 'Right' ); ?>
 					</button>
 					<button class="button active" value="none">
-						<?php esc_html_e( 'None' ); ?>
+						<?php esc_html_x( 'None', 'Alignment' ); ?>
 					</button>
 				</span>
 			</span>
@@ -1113,7 +1113,7 @@ function wp_print_media_templates() {
 						<?php esc_html_e( 'Custom URL' ); ?>
 					</button>
 					<button class="button active" value="none">
-						<?php esc_html_e( 'None' ); ?>
+						<?php esc_html_x( 'None', 'Media URL' ); ?>
 					</button>
 				</span>
 			</span>
@@ -1160,7 +1160,7 @@ function wp_print_media_templates() {
 									<?php esc_html_e( 'Right' ); ?>
 								</button>
 								<button class="button active" value="none">
-									<?php esc_html_e( 'None' ); ?>
+									<?php esc_html_x( 'None', 'Alignment' ); ?>
 								</button>
 							</span>
 						</span>
@@ -1236,7 +1236,7 @@ function wp_print_media_templates() {
 								<?php esc_html_e( 'Custom URL' ); ?>
 							</option>
 							<option value="none">
-								<?php esc_html_e( 'None' ); ?>
+								<?php esc_html_x( 'None', 'Media URL' ); ?>
 							</option>
 						</select>
 					</span>
@@ -1356,7 +1356,7 @@ function wp_print_media_templates() {
 						<span class="button-group button-large" data-setting="preload">
 							<button class="button" value="auto"><?php _ex( 'Auto', 'auto preload' ); ?></button>
 							<button class="button" value="metadata"><?php _e( 'Metadata' ); ?></button>
-							<button class="button active" value="none"><?php _e( 'None' ); ?></button>
+							<button class="button active" value="none"><?php _x( 'None', 'Preload type' ); ?></button>
 						</span>
 					</span>
 				</fieldset>
@@ -1455,7 +1455,7 @@ function wp_print_media_templates() {
 						<span class="button-group button-large" data-setting="preload">
 							<button class="button" value="auto"><?php _ex( 'Auto', 'auto preload' ); ?></button>
 							<button class="button" value="metadata"><?php _e( 'Metadata' ); ?></button>
-							<button class="button active" value="none"><?php _e( 'None' ); ?></button>
+							<button class="button active" value="none"><?php _x( 'None', 'Preload type' ); ?></button>
 						</span>
 					</span>
 				</fieldset>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0f1e6c843a..5690839100 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.6-alpha-58283';
+$wp_version = '6.6-alpha-58284';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.