Index: includes/locale.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/locale.inc,v
retrieving revision 1.110
diff -u -p -r1.110 locale.inc
--- includes/locale.inc	26 Mar 2007 01:32:22 -0000	1.110
+++ includes/locale.inc	26 Mar 2007 09:55:14 -0000
@@ -464,14 +464,14 @@ function _locale_admin_import_submit($fo
   return 'admin/build/locale';
 }
 
-function _locale_export_po_form($languages) {
+function _locale_export_po_form($names) {
   $form['export'] = array('#type' => 'fieldset',
     '#title' => t('Export translation'),
     '#collapsible' => TRUE,
   );
   $form['export']['langcode'] = array('#type' => 'select',
     '#title' => t('Language name'),
-    '#options' => array_keys($languages),
+    '#options' => $names,
     '#description' => t('Select the language you would like to export in gettext Portable Object (.po) format.'),
   );
   $form['export']['submit'] = array('#type' => 'submit', '#value' => t('Export'));
@@ -496,17 +496,14 @@ function _locale_export_pot_form() {
  * User interface for the translation export screen
  */
 function _locale_admin_export_screen() {
-  $languages = language_list();
-  $names = array();
-  foreach ($languages as $langcode => $language) {
-    $names[$langcode] = t($language->name);
-  }
-  unset($languages['en']);
+  // Omit English from the exportable languages list
+  $names = locale_language_list('name', TRUE);
+  unset($names['en']);
 
   $output = '';
   // Offer language specific export if any language is set up
-  if (count($languages)) {
-    $output = drupal_get_form('_locale_export_po_form', $languages);
+  if (count($names)) {
+    $output = drupal_get_form('_locale_export_po_form', $names);
   }
 
   $output .= drupal_get_form('_locale_export_pot_form');
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.162
diff -u -p -r1.162 locale.module
--- modules/locale/locale.module	26 Mar 2007 05:55:52 -0000	1.162
+++ modules/locale/locale.module	26 Mar 2007 09:55:15 -0000
@@ -315,11 +315,19 @@ function locale_language_name($lang) {
  * @param $field
  *   'name' => names in current language, localized
  *   'native' => native names
+ * @param $all
+ *   Boolean to return all languages or only enabled ones
  */
-function locale_language_list($field = 'name') {
-  $languages = language_list('enabled');
+function locale_language_list($field = 'name', $all = FALSE) {
+  if ($all) {
+    $languages = language_list();
+  }
+  else {
+    $languages = language_list('enabled');
+    $languages = $languages[1];
+  }
   $list = array();
-  foreach($languages[1] as $language) {
+  foreach($languages as $language) {
     $list[$language->language] = ($field == 'name') ? t($language->name) : $language->$field;
   }
   return $list;
Index: sites/default/settings.php
===================================================================
RCS file: /cvs/drupal/drupal/sites/default/settings.php,v
retrieving revision 1.53
diff -u -p -r1.53 settings.php
--- sites/default/settings.php	26 Mar 2007 06:43:12 -0000	1.53
+++ sites/default/settings.php	26 Mar 2007 09:55:15 -0000
@@ -112,7 +112,7 @@ $db_prefix = '';
  * It is not allowed to have a trailing slash; Drupal will add it
  * for you.
  */
-//$base_url = 'http://localhost';  // NO trailing slash!
+# $base_url = 'http://www.example.com';  // NO trailing slash!
 
 /**
  * PHP settings:
@@ -135,7 +135,6 @@ ini_set('session.save_handler',     'use
 ini_set('session.use_only_cookies', 1);
 ini_set('session.use_trans_sid',    0);
 ini_set('url_rewriter.tags',        '');
-ini_set('safe_mode', 1); // because my scripts actually take longer!
 
 /**
  * We try to set the correct cookie domain.