diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index 5a4a8d369f..43aef8c7ec 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -38,7 +38,7 @@ function list_core_update( $update ) {
 	static $first_pass = true;
 
 	$wp_version     = get_bloginfo( 'version' );
-	$version_string = sprintf( '%s&ndash;<strong>%s</strong>', $update->current, $update->locale );
+	$version_string = sprintf( '%s&ndash;%s', $update->current, get_locale() );
 
 	if ( 'en_US' === $update->locale && 'en_US' === get_locale() ) {
 		$version_string = $update->current;
@@ -54,8 +54,8 @@ function list_core_update( $update ) {
 	if ( ! isset( $update->response ) || 'latest' === $update->response ) {
 		$current = true;
 	}
-
-	$submit        = __( 'Update Now' );
+	preg_match( '/(alpha|beta|RC)(\d+)/', $version_string, $development );
+	$submit        = ! empty( $development ) ? __( 'Update to latest nightly' ) : __( 'Update Now' );
 	$form_action   = 'update-core.php?action=do-core-upgrade';
 	$php_version   = phpversion();
 	$mysql_version = $wpdb->db_version();
@@ -65,9 +65,9 @@ function list_core_update( $update ) {
 		$message = __( 'You are using a development version of WordPress. You can update to the latest nightly build manually:' );
 	} else {
 		if ( $current ) {
+			$message = '';
 			/* translators: %s: WordPress version. */
-			$message     = sprintf( __( 'If you need to re-install version %s, you can do so here:' ), $version_string );
-			$submit      = __( 'Re-install Now' );
+			$submit      = sprintf( __( 'Re-install version %s' ), $version_string );
 			$form_action = 'update-core.php?action=do-core-reinstall';
 		} else {
 			$php_compat = version_compare( $php_version, $update->php_version, '>=' );