Index: options-general.php
===================================================================
--- options-general.php	(revision 30104)
+++ options-general.php	(working copy)
@@ -327,15 +327,15 @@
 		<th width="33%" scope="row"><label for="WPLANG"><?php _e( 'Site Language' ); ?></label></th>
 		<td>
 			<?php
-			$locale = get_locale();
-			if ( ! in_array( $locale, $languages ) ) {
-				$locale = '';
+			$lang = get_option( 'WPLANG' );
+			if ( ! in_array( $lang, $languages ) ) {
+				$lang = '';
 			}
 
 			wp_dropdown_languages( array(
 				'name'      => 'WPLANG',
 				'id'        => 'WPLANG',
-				'selected'  => $locale,
+				'selected'  => $lang,
 				'languages' => $languages,
 			) );