diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 9e2c875..18ef8e3 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -206,6 +206,13 @@ const LANGUAGE_NOT_APPLICABLE = 'zxx';
 const LANGUAGE_MULTIPLE = 'mul';
 
 /**
+ * The language code used when referring to all languages.
+ *
+ * @todo W3C uses this for 'Allar', need to find a better code.
+ */
+const LANGUAGE_ALL = 'all';
+
+/**
  * The type of language used to define the content language.
  */
 const LANGUAGE_TYPE_CONTENT = 'language_content';
@@ -231,6 +238,16 @@ const LANGUAGE_LTR = 0;
 const LANGUAGE_RTL = 1;
 
 /**
+ * Language list filtering to remove disabled.
+ */
+const LANGUAGE_FILTER_DISABLED = 1;
+
+/**
+ * Language list filtering to remove locked.
+ */
+const LANGUAGE_FILTER_LOCKED = 2;
+
+/**
  * Time of the current request in seconds elapsed since the Unix Epoch.
  *
  * This differs from $_SERVER['REQUEST_TIME'], which is stored as a float
@@ -2509,36 +2526,43 @@ function language_multilingual() {
  *   An associative array of languages, keyed by the language code, ordered by
  *   weight ascending and name ascending.
  */
-function language_list($only_enabled = FALSE) {
+function language_list($filter = NULL) {
   $languages = &drupal_static(__FUNCTION__);
   // Initialize master language list.
   if (!isset($languages)) {
-    // Initialize local language list caches.
-    $languages = array('all' => array(), 'enabled' => array());
+    // Initialize local language list cache.
+    $languages = array();
 
     // Fill in master language list based on current configuration.
     $default = language_default();
     if (language_multilingual() || module_exists('language')) {
       // Use language module configuration if available.
-      $languages['all'] = db_query('SELECT * FROM {language} ORDER BY weight ASC, name ASC')->fetchAllAssoc('langcode');
+      $languages = db_query('SELECT *, 0 as `default` FROM {language} ORDER BY weight ASC, name ASC')->fetchAllAssoc('langcode');
+      $languages[$default->langcode]->default = 1;
     }
     else {
       // No language module, so use the default language only.
-      $languages['all'][$default->langcode] = $default;
+      $languages[$default->langcode] = $default;
     }
+  }
 
-    // Initialize default property so callers have an easy reference and can
-    // save the same object without data loss. Also fill in the filtered list
-    // of enabled languages only.
-    foreach ($languages['all'] as $langcode => $language) {
-      $languages['all'][$langcode]->default = ($langcode == $default->langcode);
-      if ($language->enabled) {
-        $languages['enabled'][$langcode] = $languages['all'][$langcode];
+  if (empty($filter)) {
+    return $languages;
+  }
+  else {
+    // If filtering was needed, filter the list for items that match the
+    // provided criteria. $filter can be a combination of two bit values
+    // to indicate what to filter for.
+    $filtered_languages = array();
+    foreach ($languages as $langcode => $language) {
+      if ((($filter & LANGUAGE_FILTER_DISABLED) && !$language->enabled) ||
+          (($filter & LANGUAGE_FILTER_LOCKED) && $language->locked)) {
+        continue;
       }
+      $filtered_languages[$langcode] = $language;
     }
+    return $filtered_languages;
   }
-
-  return $only_enabled ? $languages['enabled'] : $languages['all'];
 }
 
 /**
@@ -2591,6 +2615,7 @@ function language_default() {
     'direction' => 0,
     'enabled' => 1,
     'weight' => 0,
+    'locked' => 0,
   ));
   $default->default = TRUE;
   return $default;
diff --git a/core/includes/language.inc b/core/includes/language.inc
index 76c4318..a5d622e 100644
--- a/core/includes/language.inc
+++ b/core/includes/language.inc
@@ -339,7 +339,7 @@ function language_negotiation_method_invoke($method_id, $method = NULL) {
     global $user;
 
     // Get the enabled languages only.
-    $languages = language_list(TRUE);
+    $languages = language_list(LANGUAGE_FILTER_DISABLED);
 
     if (!isset($method)) {
       $negotiation_info = language_negotiation_info();
diff --git a/core/includes/locale.inc b/core/includes/locale.inc
index 1f9567b..bdf3994 100644
--- a/core/includes/locale.inc
+++ b/core/includes/locale.inc
@@ -355,7 +355,7 @@ function locale_language_url_fallback($language = NULL, $language_type = LANGUAG
  */
 function locale_language_switcher_url($type, $path) {
   // Get the enabled languages only.
-  $languages = language_list(TRUE);
+  $languages = language_list(LANGUAGE_FILTER_DISABLED | LANGUAGE_FILTER_LOCKED);
   $links = array();
 
   foreach ($languages as $language) {
@@ -380,7 +380,7 @@ function locale_language_switcher_session($type, $path) {
   $language_query = isset($_SESSION[$param]) ? $_SESSION[$param] : $GLOBALS[$type]->langcode;
 
   // Get the enabled languages only.
-  $languages = language_list(TRUE);
+  $languages = language_list(LANGUAGE_FILTER_DISABLED);
   $links = array();
 
   $query = $_GET;
@@ -417,17 +417,16 @@ function locale_language_url_rewrite_url(&$path, &$options) {
 
   if (!isset($languages)) {
     // Get the enabled languages only.
-    $languages = language_list(TRUE);
+    $languages = language_list(LANGUAGE_FILTER_DISABLED | LANGUAGE_FILTER_LOCKED);
     $languages = array_flip(array_keys($languages));
   }
-
   // Language can be passed as an option, or we go for current URL language.
   if (!isset($options['language'])) {
     global $language_url;
     $options['language'] = $language_url;
   }
   // We allow only enabled languages here.
-  elseif (!isset($languages[$options['language']->langcode])) {
+  elseif (is_object($options['language']) && !isset($languages[$options['language']->langcode])) {
     unset($options['language']);
     return;
   }
@@ -455,7 +454,7 @@ function locale_language_url_rewrite_url(&$path, &$options) {
 
       case LANGUAGE_NEGOTIATION_URL_PREFIX:
         $prefixes = locale_language_negotiation_url_prefixes();
-        if (!empty($prefixes[$options['language']->langcode])) {
+        if (is_object($options['language']) && !empty($prefixes[$options['language']->langcode])) {
           $options['prefix'] = $prefixes[$options['language']->langcode] . '/';
         }
         break;
@@ -503,7 +502,7 @@ function locale_language_url_rewrite_session(&$path, &$options) {
     global $user;
     if (!$user->uid) {
       // Get the enabled languages only.
-      $languages = language_list(TRUE);
+      $languages = language_list(LANGUAGE_FILTER_DISABLED);
       $query_param = check_plain(variable_get('locale_language_negotiation_session_param', 'language'));
       $query_value = isset($_GET[$query_param]) ? check_plain($_GET[$query_param]) : NULL;
       $query_rewrite = isset($languages[$query_value]) && language_negotiation_method_enabled(LANGUAGE_NEGOTIATION_SESSION);
diff --git a/core/includes/update.inc b/core/includes/update.inc
index 1660d7d..be27d81 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -193,9 +193,10 @@ function update_prepare_d8_language() {
     update_module_add_to_system($modules);
     update_module_enable($modules);
 
-    // Rename 'language' column to 'langcode'.
+    // Rename 'language' column to 'langcode', add locked column.
     require_once DRUPAL_ROOT . '/core/modules/language/language.install';
     language_update_8000();
+    language_update_8001();
   }
 }
 
@@ -851,7 +852,7 @@ function update_retrieve_dependencies() {
 
 /**
  * Updates config with values set on Drupal 7.x
- * 
+ *
  * Provide a generalised method to migrate variables from Drupal 7 to Drupal 8's
  * configuration management system.
  *
@@ -863,8 +864,8 @@ function update_retrieve_dependencies() {
  *   An array to map new to old configuration naming conventions. Example:
  *   @code
  *     array('new_config' => 'old_config')
- *   @endcode 
- *   This would update the value for new_config to the value old_config has in 
+ *   @endcode
+ *   This would update the value for new_config to the value old_config has in
  *   the variable table.
  */
 function update_variables_to_config($config_name, $variable_map = array()) {
diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc
index 33bc147..4e4e306 100644
--- a/core/modules/language/language.admin.inc
+++ b/core/modules/language/language.admin.inc
@@ -61,17 +61,22 @@ function language_admin_overview_form($form, &$form_state) {
       '#theme_wrappers' => array('language_admin_operations'),
       '#weight' => 100,
     );
-    $form['languages'][$langcode]['operations']['edit'] = array(
-      '#type' => 'link',
-      '#title' => t('edit'),
-      '#href' => 'admin/config/regional/language/edit/' . $langcode,
-    );
-    $form['languages'][$langcode]['operations']['delete'] = array(
-      '#type' => 'link',
-      '#title' => t('delete'),
-      '#href' => 'admin/config/regional/language/delete/' . $langcode,
-      '#access' => $langcode != $default->langcode,
-    );
+    if (empty($language->locked)) {
+      $form['languages'][$langcode]['operations']['edit'] = array(
+        '#type' => 'link',
+        '#title' => t('edit'),
+        '#href' => 'admin/config/regional/language/edit/' . $langcode,
+      );
+      $form['languages'][$langcode]['operations']['delete'] = array(
+        '#type' => 'link',
+        '#title' => t('delete'),
+        '#href' => 'admin/config/regional/language/delete/' . $langcode,
+        '#access' => $langcode != $default->langcode,
+      );
+    }
+    else{
+      $form['languages'][$langcode]['default']['#disabled'] = TRUE;
+    }
   }
 
   $form['actions'] = array('#type' => 'actions');
diff --git a/core/modules/language/language.install b/core/modules/language/language.install
index ecf637d..19ccbd5 100644
--- a/core/modules/language/language.install
+++ b/core/modules/language/language.install
@@ -9,8 +9,58 @@
  * Implements hook_install().
  */
 function language_install() {
-  // Add the default language to the database too.
+
+  // Add the default language at first so that language_list() returns this in
+  // language_special_languages().
   language_save(language_default());
+  $languages = language_special_languages();
+  foreach ($languages as $language) {
+    language_save($language);
+  }
+}
+
+/**
+ * List of special languages to install on a site.
+ */
+function language_special_languages() {
+  $locked_language = array(
+    'default' => FALSE,
+    'locked' => TRUE,
+    'enabled' => TRUE,
+  );
+  $languages = language_list();
+
+  // Language list is ordered by weight, get the biggest one.
+  $keys = array_keys($languages);
+  $max_weight = $languages[array_pop($keys)]->weight;
+  $languages = array();
+
+  $languages[LANGUAGE_SYSTEM] = (object) (array(
+    'langcode' => LANGUAGE_SYSTEM,
+    'name' => t('System (English)'),
+    'weight' => ++$max_weight,
+  ) + $locked_language);
+  $languages[LANGUAGE_NOT_SPECIFIED] = (object) (array(
+    'langcode' => LANGUAGE_NOT_SPECIFIED,
+    'name' => t('Not specified'),
+    'weight' => ++$max_weight,
+  ) + $locked_language);
+  $languages[LANGUAGE_NOT_APPLICABLE] = (object) (array(
+    'langcode' => LANGUAGE_NOT_APPLICABLE,
+    'name' => t('Not applicable'),
+    'weight' => ++$max_weight,
+  ) + $locked_language);
+  $languages[LANGUAGE_MULTIPLE] = (object) (array(
+    'langcode' => LANGUAGE_MULTIPLE,
+    'name' => t('Multiple'),
+    'weight' => ++$max_weight,
+  ) + $locked_language);
+  $languages[LANGUAGE_ALL] = (object) (array(
+    'langcode' => LANGUAGE_ALL,
+    'name' => t('All languages'),
+    'weight' => ++$max_weight,
+  ) + $locked_language);
+  return $languages;
 }
 
 /**
@@ -65,6 +115,13 @@ function language_schema() {
         'default' => 0,
         'description' => 'Weight, used in lists of languages.',
       ),
+      'locked' => array(
+        'type' => 'int',
+        'size' => 'tiny',
+        'not null' => TRUE,
+        'default' => 0,
+        'description' => 'A boolean indicating whether the administrator can edit or delete the language.',
+      ),
     ),
     'primary key' => array('langcode'),
     'indexes' => array(
@@ -101,3 +158,59 @@ function language_update_8000() {
     variable_set('language_default', $language_default);
   }
 }
+
+/**
+ * Adds the locked column and saves the special languages.
+ */
+function language_update_8001() {
+  if (!db_field_exists('language', 'locked')) {
+    $locked_spec = array(
+      'type' => 'int',
+      'size' => 'tiny',
+      'not null' => TRUE,
+      'default' => 0,
+      'description' => 'A boolean indicating whether the administrator can edit or delete the language.',
+    );
+    db_add_field('language', 'locked', $locked_spec);
+
+    $max_weight = db_query('SELECT MAX(weight) FROM {language}')->fetchField();
+    $languages = array();
+    $languages[LANGUAGE_SYSTEM] = array(
+      'langcode' => LANGUAGE_SYSTEM,
+      'name' => 'System (English)',
+      'weight' => ++$max_weight,
+    );
+    $languages[LANGUAGE_NOT_SPECIFIED] = array(
+      'langcode' => LANGUAGE_NOT_SPECIFIED,
+      'name' => 'Not specified',
+      'weight' => ++$max_weight,
+    );
+    $languages[LANGUAGE_NOT_APPLICABLE] = array(
+      'langcode' => LANGUAGE_NOT_APPLICABLE,
+      'name' => 'Not applicable',
+      'weight' => ++$max_weight,
+    );
+    $languages[LANGUAGE_MULTIPLE] = array(
+      'langcode' => LANGUAGE_MULTIPLE,
+      'name' => 'Multiple',
+      'weight' => ++$max_weight,
+    );
+    $languages[LANGUAGE_ALL] = array(
+      'langcode' => LANGUAGE_ALL,
+      'name' => 'All languages',
+      'weight' => ++$max_weight,
+    );
+    foreach ($languages as $language) {
+      db_insert('language')
+        ->fields(array(
+          'langcode' => $language['langcode'],
+          'name' => $language['name'],
+          'weight' => $language['weight'],
+          // These languages are locked, default to enabled.
+          'locked' => 1,
+          'enabled' => 1,
+        ))
+        ->execute();
+    }
+  }
+}
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 20f7c62..bf20b21 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -144,11 +144,10 @@ function language_save($language) {
   }
 
   // Update language count based on enabled language count.
-  variable_set('language_count', db_query('SELECT COUNT(langcode) FROM {language} WHERE enabled = 1')->fetchField());
+  variable_set('language_count', db_query('SELECT COUNT(langcode) FROM {language} WHERE enabled = 1 AND locked = 0')->fetchField());
 
   // Kill the static cache in language_list().
   drupal_static_reset('language_list');
-
   return $language;
 }
 
diff --git a/core/modules/language/language.test b/core/modules/language/language.test
index 0a59937..4d064c0 100644
--- a/core/modules/language/language.test
+++ b/core/modules/language/language.test
@@ -122,7 +122,7 @@ class LanguageListTest extends DrupalWebTestCase {
     $this->assertResponse(404, t('Language no longer found.'));
     // Make sure the "language_count" variable has been updated correctly.
     drupal_static_reset('language_list');
-    $enabled_languages = language_list(TRUE);
+    $enabled_languages = language_list(LANGUAGE_FILTER_DISABLED | LANGUAGE_FILTER_LOCKED);
     $this->assertEqual(variable_get('language_count', 1), count($enabled_languages), t('Language count is correct.'));
     // Delete a disabled language.
     // Disable an enabled language.
@@ -133,7 +133,7 @@ class LanguageListTest extends DrupalWebTestCase {
     $this->assertNoFieldChecked('edit-languages-fr-enabled', t('French language disabled.'));
     // Get the count of enabled languages.
     drupal_static_reset('language_list');
-    $enabled_languages = language_list(TRUE);
+    $enabled_languages = language_list(LANGUAGE_FILTER_DISABLED | LANGUAGE_FILTER_LOCKED);
     // Delete the disabled language.
     $this->drupalPost('admin/config/regional/language/delete/fr', array(), t('Delete'));
     // We need raw here because %language and %langcode will add HTML.
diff --git a/core/modules/locale/locale.admin.inc b/core/modules/locale/locale.admin.inc
index 321b8ce..7cc569b 100644
--- a/core/modules/locale/locale.admin.inc
+++ b/core/modules/locale/locale.admin.inc
@@ -255,7 +255,7 @@ function language_negotiation_configure_url_form($form, &$form_state) {
   );
 
   // Get the enabled languages only.
-  $languages = language_list(TRUE);
+  $languages = language_list(LANGUAGE_FILTER_DISABLED | LANGUAGE_FILTER_LOCKED);
   $prefixes = locale_language_negotiation_url_prefixes();
   $domains = locale_language_negotiation_url_domains();
   foreach ($languages as $langcode => $language) {
@@ -292,7 +292,7 @@ function language_negotiation_configure_url_form($form, &$form_state) {
  */
 function language_negotiation_configure_url_form_validate($form, &$form_state) {
   // Get the enabled languages only.
-  $languages = language_list(TRUE);
+  $languages = language_list(LANGUAGE_FILTER_DISABLED | LANGUAGE_FILTER_LOCKED);
   $default = language_default();
 
   // Count repeated values for uniqueness check.
@@ -330,14 +330,14 @@ function language_negotiation_configure_url_form_validate($form, &$form_state) {
   }
 
   // Domain names should not contain protocol and/or ports.
-  foreach ($languages as $langcode => $name) {
+  foreach ($languages as $langcode => $language) {
     $value = $form_state['values']['domain'][$langcode];
     if (!empty($value)) {
       // Ensure we have a protocol but only one protocol in the setting for
       // parse_url() checking against the hostname.
       $host = 'http://' . str_replace(array('http://', 'https://'), '', $value);
       if (parse_url($host, PHP_URL_HOST) != $value) {
-        form_error($form['domain'][$langcode], t('The domain for %language may only contain the domain name, not a protocol and/or port.', array( '%language' => $name)));
+        form_error($form['domain'][$langcode], t('The domain for %language may only contain the domain name, not a protocol and/or port.', array( '%language' => $language->name)));
       }
     }
   }
@@ -419,7 +419,7 @@ function locale_date_format_language_overview_page() {
   );
 
   // Get the enabled languages only.
-  $languages = language_list(TRUE);
+  $languages = language_list(LANGUAGE_FILTER_DISABLED);
 
   foreach ($languages as $langcode => $language) {
     $row = array();
diff --git a/core/modules/locale/locale.bulk.inc b/core/modules/locale/locale.bulk.inc
index a4982e1..cadfc5b 100644
--- a/core/modules/locale/locale.bulk.inc
+++ b/core/modules/locale/locale.bulk.inc
@@ -12,7 +12,7 @@ include_once DRUPAL_ROOT . '/core/includes/gettext.inc';
  */
 function locale_translate_import_form($form, &$form_state) {
   drupal_static_reset('language_list');
-  $languages = language_list(TRUE);
+  $languages = language_list(LANGUAGE_FILTER_DISABLED | LANGUAGE_FILTER_LOCKED);
 
   // Initialize a language list to the ones available, including English if we
   // are to translate Drupal to English as well.
@@ -111,10 +111,10 @@ function locale_translate_import_form_submit($form, &$form_state) {
 function locale_translate_export_screen() {
   // Get all enabled languages, except English, if we should not translate that.
   drupal_static_reset('language_list');
-  $languages = language_list(TRUE);
+  $languages = language_list(LANGUAGE_FILTER_DISABLED);
   $language_options = array();
   foreach ($languages as $langcode => $language) {
-    if ($langcode != 'en' || locale_translate_english()) {
+    if (empty($language->locked) && ($langcode != 'en' || locale_translate_english())) {
       $language_options[$langcode] = $language->name;
     }
   }
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index 6d3ded0..a443836 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -221,14 +221,14 @@ function locale_permission() {
 function locale_language_selector_form($user) {
   global $language_interface;
   // Get list of enabled languages only.
-  $languages = language_list(TRUE);
+  $languages = language_list(LANGUAGE_FILTER_DISABLED | LANGUAGE_FILTER_LOCKED);
 
   // If the user is being created, we set the user language to the page language.
   $user_preferred_language = $user->uid ? user_preferred_language($user) : $language_interface;
 
   $names = array();
-  foreach ($languages as $langcode => $item) {
-    $names[$langcode] = $item->name;
+  foreach ($languages as $langcode => $language) {
+    $names[$langcode] = $language->name;
   }
   // Get language negotiation settings.
   $mode = language_negotiation_method_get_first(LANGUAGE_TYPE_INTERFACE) != LANGUAGE_NEGOTIATION_DEFAULT;
@@ -530,6 +530,9 @@ function locale_modules_disabled($modules) {
  * Implements hook_language_insert().
  */
 function locale_language_insert($language) {
+  if (!empty($language->locked)) {
+    return;
+  }
   // Add new language to the list of language prefixes.
   $prefixes = locale_language_negotiation_url_prefixes();
   $prefixes[$language->langcode] = (empty($language->default) ? $language->langcode : '');
@@ -924,7 +927,6 @@ function locale_block_view($type) {
   if (language_multilingual()) {
     $path = drupal_is_front_page() ? '<front>' : $_GET['q'];
     $links = language_negotiation_get_switch_links($type, $path);
-
     if (isset($links->links)) {
       drupal_add_css(drupal_get_path('module', 'locale') . '/locale.css');
       $class = "language-switcher-{$links->method_id}";
@@ -951,6 +953,7 @@ function locale_preprocess_block(&$variables) {
  * Rewrite outbound URLs with language based prefixes.
  */
 function locale_url_outbound_alter(&$path, &$options, $original_path) {
+
   // Only modify internal URLs.
   if (!$options['external'] && language_multilingual()) {
     static $drupal_static_fast;
@@ -981,13 +984,13 @@ function locale_url_outbound_alter(&$path, &$options, $original_path) {
       $callbacks = array_keys($callbacks);
     }
 
-    foreach ($callbacks as $callback) {
-      $callback($path, $options);
-    }
-
     // No language dependent path allowed in this mode.
     if (empty($callbacks)) {
       unset($options['language']);
+      return;
+    }
+    foreach ($callbacks as $callback) {
+      $callback($path, $options);
     }
   }
 }
@@ -1019,7 +1022,7 @@ function locale_form_language_admin_overview_form_alter(&$form, &$form_state) {
       'translated' => 0,
       'ratio' => 0,
     );
-    if ($langcode != 'en' || locale_translate_english()) {
+    if (empty($language->locked) && ($langcode != 'en' || locale_translate_english())) {
       $form['languages'][$langcode]['locale_statistics'] = array(
         '#type' => 'link',
         '#title' => t('@translated/@total (@ratio%)', array(
@@ -1030,9 +1033,14 @@ function locale_form_language_admin_overview_form_alter(&$form, &$form_state) {
         '#href' => 'admin/config/regional/translate/translate',
       );
     }
+    elseif ($langcode == LANGUAGE_SYSTEM) {
+      $form['languages'][$langcode]['locale_statistics'] = array(
+        '#markup' => t('Built-in'),
+      );
+    }
     else {
       $form['languages'][$langcode]['locale_statistics'] = array(
-        '#markup' => t('not applicable'),
+        '#markup' => t('Not applicable'),
       );
     }
   }
diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc
index 3df2832..d315bbf 100644
--- a/core/modules/locale/locale.pages.inc
+++ b/core/modules/locale/locale.pages.inc
@@ -28,7 +28,7 @@ function _locale_translate_seek() {
   if (!($query = _locale_translate_seek_query())) {
     $query = array(
       'translation' => 'all',
-      'language' => 'all',
+      'language' => LANGUAGE_ALL,
       'string' => '',
     );
   }
@@ -64,7 +64,7 @@ function _locale_translate_seek() {
   }
 
   $limit_language = NULL;
-  if ($query['language'] != LANGUAGE_SYSTEM && $query['language'] != 'all') {
+  if ($query['language'] != LANGUAGE_SYSTEM && $query['language'] != LANGUAGE_ALL) {
     $sql_query->condition('language', $query['language']);
     $limit_language = $query['language'];
   }
@@ -113,7 +113,7 @@ function _locale_translate_language_list($translation, $limit_language) {
   // Add CSS.
   drupal_add_css(drupal_get_path('module', 'locale') . '/locale.css');
 
-  $languages = language_list();
+  $languages = language_list(LANGUAGE_FILTER_LOCKED);
   if (!locale_translate_english()) {
     unset($languages['en']);
   }
@@ -152,7 +152,7 @@ function locale_translation_filters() {
 
   // Get all languages, except English
   drupal_static_reset('language_list');
-  $languages = language_list(TRUE);
+  $languages = language_list(LANGUAGE_FILTER_DISABLED | LANGUAGE_FILTER_LOCKED);
   $language_options = array();
   foreach ($languages as $langcode => $language) {
     if ($langcode != 'en' || locale_translate_english()) {
@@ -167,7 +167,7 @@ function locale_translation_filters() {
 
   $filters['language'] = array(
     'title' => t('Language'),
-    'options' => array_merge(array('all' => t('All languages'), LANGUAGE_SYSTEM => t('System (English)')), $language_options),
+    'options' => array_merge(array(LANGUAGE_ALL => t('All languages'), LANGUAGE_SYSTEM => t('System (English)')), $language_options),
   );
 
   $filters['translation'] = array(
@@ -327,10 +327,11 @@ function locale_translate_edit_form($form, &$form_state, $lid) {
 
   // Include default form controls with empty values for all languages.
   // This ensures that the languages are always in the same order in forms.
-  $languages = language_list();
+  $languages = language_list(LANGUAGE_FILTER_LOCKED);
   if (!locale_translate_english()) {
     unset($languages['en']);
   }
+
   // Store languages to iterate for validation and submission of the form.
   $form_state['langcodes'] = array_keys($languages);
   $plural_formulas = variable_get('locale_translation_plurals', array());
diff --git a/core/modules/locale/locale.test b/core/modules/locale/locale.test
index f2395ad..46e1922 100644
--- a/core/modules/locale/locale.test
+++ b/core/modules/locale/locale.test
@@ -2350,7 +2350,7 @@ class LocaleUILanguageNegotiationTest extends DrupalWebTestCase {
     // is for some reason not found when doing translate search. This might
     // be some bug.
     drupal_static_reset('language_list');
-    $languages = language_list(TRUE);
+    $languages = language_list(LANGUAGE_FILTER_DISABLED);
     variable_set('language_default', $languages['vi']);
     // First visit this page to make sure our target string is searchable.
     $this->drupalGet('admin/config');
diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc
index ac18da7..8ca428b 100644
--- a/core/modules/node/node.admin.inc
+++ b/core/modules/node/node.admin.inc
@@ -106,7 +106,7 @@ function node_filters() {
 
   // Language filter if language support is present.
   if (language_multilingual()) {
-    $languages = language_list(TRUE);
+    $languages = language_list(LANGUAGE_FILTER_DISABLED);
     $language_options = array(LANGUAGE_NOT_SPECIFIED => t('- None -'));
     foreach ($languages as $langcode => $language) {
       $language_options[$langcode] = $language->name;
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index b5ed7e8..7aa8a90 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -2857,7 +2857,7 @@ function node_form_search_form_alter(&$form, $form_state) {
 
     // Languages:
     $language_options = array();
-    foreach (language_list(TRUE) as $langcode => $language) {
+    foreach (language_list(LANGUAGE_FILTER_DISABLED | LANGUAGE_FILTER_LOCKED) as $langcode => $language) {
       $language_options[$langcode] = $language->name;
     }
     if (count($language_options) > 1) {
diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc
index 4e94b26..01bcde8 100644
--- a/core/modules/node/node.pages.inc
+++ b/core/modules/node/node.pages.inc
@@ -176,7 +176,7 @@ function node_form($form, &$form_state, $node) {
   $form['#node'] = $node;
 
   if (variable_get('node_type_language_' . $node->type, 0) && module_exists('language')) {
-    $languages = language_list(TRUE);
+    $languages = language_list(LANGUAGE_FILTER_DISABLED);
     $language_options = array();
     foreach ($languages as $langcode => $language) {
       $language_options[$langcode] = $language->name;
@@ -184,9 +184,8 @@ function node_form($form, &$form_state, $node) {
     $form['langcode'] = array(
       '#type' => 'select',
       '#title' => t('Language'),
-      '#default_value' => (isset($node->langcode) ? $node->langcode : ''),
+      '#default_value' => (isset($node->langcode) ? $node->langcode : LANGUAGE_NOT_SPECIFIED),
       '#options' => $language_options,
-      '#empty_value' => LANGUAGE_NOT_SPECIFIED,
     );
   }
   else {
diff --git a/core/modules/openid/openid.module b/core/modules/openid/openid.module
index a3df38f..3cf847a 100644
--- a/core/modules/openid/openid.module
+++ b/core/modules/openid/openid.module
@@ -263,7 +263,7 @@ function openid_form_user_register_form_alter(&$form, &$form_state) {
         $candidate_languages[] = $parts[0] . '-' . $parts[2];
         $candidate_languages[] = $parts[0] . '-' . $parts[1] . '-' . $parts[2];
       }
-      $enabled_languages = language_list(TRUE);
+      $enabled_languages = language_list(LANGUAGE_FILTER_DISABLED);
       // Iterate over the generated permutations starting with the longest (most
       // specific) strings.
       foreach (array_reverse($candidate_languages) as $candidate_language) {
diff --git a/core/modules/translation/translation.module b/core/modules/translation/translation.module
index fa73df5..cb810c1 100644
--- a/core/modules/translation/translation.module
+++ b/core/modules/translation/translation.module
@@ -223,7 +223,7 @@ function translation_node_view($node, $view_mode) {
   // If the site has no translations or is not multilingual we have no content
   // translation links to display.
   if (isset($node->tnid) && language_multilingual() && $translations = translation_node_get_translations($node->tnid)) {
-    $languages = language_list(TRUE);
+    $languages = language_list(LANGUAGE_FILTER_DISABLED);
 
     // There might be a language provider enabled defining custom language
     // switch links which need to be taken into account while generating the