Index: lang-guess-ajax.php
===================================================================
--- lang-guess-ajax.php	(revision 20187)
+++ lang-guess-ajax.php	(working copy)
@@ -9,6 +9,7 @@
 require dirname( __DIR__ ) . '/define.php';
 require WPORGPATH . 'hyperdb/bb-10-hyper-db.php';
 require WPORGPATH . 'object-cache.php';
+require WPORGPATH . 'wp-includes/formatting.php';
 wp_cache_init();
 require __DIR__ . '/class-guess-lang.php';
 require GLOTPRESS_LOCALES_PATH;
@@ -78,20 +79,10 @@
 	}
 
 	if ( is_array( $guesses ) && ! empty( $guesses ) ) {
-		$num_guesses = count( $guesses );
-
 		if ( $is_forums ) {
-			if ( 1 === $num_guesses ) {
-				$string = translate_gp( 'WordPress support forums are also available in %s.', $guesses[0]['locale'] );
-			} else {
-				$string = translate_gp( 'WordPress support forums are also available in %s (also %s).', $guesses[0]['locale'] );
-			}
+			$string = translate_gp( 'WordPress support forums are also available in %s.', $guesses[0]['locale'] );
 		} else {
-			if ( 1 === $num_guesses ) {
-				$string = translate_gp( 'WordPress is also available in %s.', $guesses[0]['locale'] );
-			} else {
-				$string = translate_gp( 'WordPress is also available in %s (also %s).', $guesses['0']['locale'] );
-			}
+			$string = translate_gp( 'WordPress is also available in %s.', $guesses[0]['locale'] );
 		}
 
 		$translated = array();
@@ -104,7 +95,8 @@
 					$path = '/downloads/';
 				}
 
-				$translated[] = "<a href='https://{$guess['subdomain']}.wordpress.org{$path}'>{$guess['name']}</a>";
+				$name = \GP_Locales::by_field( 'wp_locale', $guess['locale'] )->native_name;
+				$translated[] = "<a href='https://{$guess['subdomain']}.wordpress.org{$path}'>{$name}</a>";
 			}
 		}
 
@@ -114,14 +106,7 @@
 		}
 
 		echo '<div id="lang-guess">';
-
-		if ( 1 === $num_guesses ) {
-			printf( $string, $translated[0] );
-		} else {
-			$main_language = array_shift( $translated );
-			printf( $string, $main_language, implode( ', ', $translated ) );
-		}
-
+		printf( $string, wp_sprintf_l( '%l', $translated ) );
 		echo '</div>';
 	}
 }
@@ -130,9 +115,7 @@
 	global $wpdb;
 	$strings = array(
 		204369 => 'WordPress support forums are also available in %s.',
-		204370 => 'WordPress support forums are also available in %s (also %s).',
 		204371 => 'WordPress is also available in %s.',
-		204372 => 'WordPress is also available in %s (also %s).',
 	);
 
 	$original_id = array_search( $string, $strings, true );
@@ -199,7 +182,4 @@
 exit;
 
 __( 'WordPress support forums are also available in %s.' );
-__( 'WordPress support forums are also available in %s (also %s).' );
 __( 'WordPress is also available in %s.' );
-__( 'WordPress is also available in %s (also %s).' );
-