diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 5684731..5de725f 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1836,12 +1836,13 @@ function comment_form($form, &$form_state, Comment $comment) {
   }
   $form['node_type'] = array('#type' => 'value', '#value' => 'comment_node_' . $node->type);
 
-  // If a content type has multilingual support we set the comment to inherit the
-  // content language. Otherwise mark the comment as language neutral.
+  // Make the comment inherit the node language unless specifically set.
   $comment_langcode = $comment->langcode;
-  if (($comment_langcode == LANGUAGE_NOT_SPECIFIED) && variable_get('node_type_language_' . $node->type, 0)) {
+  if ($comment_langcode == LANGUAGE_NOT_SPECIFIED) {
     $comment_langcode = $language_content->langcode;
   }
+
+  // Uses the language of the content as comment language.
   $form['langcode'] = array(
     '#type' => 'value',
     '#value' => $comment_langcode,
diff --git a/core/modules/field/modules/text/text.test b/core/modules/field/modules/text/text.test
index 49366e5..7e99bdd 100644
--- a/core/modules/field/modules/text/text.test
+++ b/core/modules/field/modules/text/text.test
@@ -443,7 +443,7 @@ class TextTranslationTestCase extends WebTestBase {
     $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Set "Article" content type to use multilingual support with translation.
-    $edit = array('node_type_language' => TRANSLATION_ENABLED);
+    $edit = array('node_type_language_locked' => FALSE, 'node_type_language_translation_enabled' => TRANSLATION_ENABLED);
     $this->drupalPost('admin/structure/types/manage/article', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Article')), t('Article content type has been updated.'));
   }
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleCommentLanguageTest.php b/core/modules/locale/lib/Drupal/locale/Tests/LocaleCommentLanguageTest.php
index 16fc83f..0d37b1d 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleCommentLanguageTest.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleCommentLanguageTest.php
@@ -38,7 +38,7 @@ class LocaleCommentLanguageTest extends WebTestBase {
     $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Set "Article" content type to use multilingual support.
-    $edit = array('node_type_language' => 1);
+    $edit = array('node_type_language_locked' => FALSE);
     $this->drupalPost('admin/structure/types/manage/article', $edit, t('Save content type'));
 
     // Enable content language negotiation UI.
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php b/core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php
index 0c5cea3..4a3c37a 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php
@@ -82,9 +82,9 @@ class LocaleContentTest extends WebTestBase {
 
     // Set "Basic page" content type to use multilingual support.
     $this->drupalGet('admin/structure/types/manage/page');
-    $this->assertText(t('Multilingual support'), t('Multilingual support fieldset present on content type configuration form.'));
+    $this->assertText(t('Language settings'), t('Multilingual support fieldset present on content type configuration form.'));
     $edit = array(
-      'node_type_language' => 1,
+      'node_type_language_locked' => FALSE,
     );
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), t('Basic page content type has been updated.'));
@@ -152,7 +152,7 @@ class LocaleContentTest extends WebTestBase {
     // Set "Article" content type to use multilingual support.
     $this->drupalGet('admin/structure/types/manage/article');
     $edit = array(
-      'node_type_language' => 1,
+      'node_type_language_locked' => FALSE,
     );
     $this->drupalPost('admin/structure/types/manage/article', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Article')), t('Article content type has been updated.'));
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleMultilingualFieldsTest.php b/core/modules/locale/lib/Drupal/locale/Tests/LocaleMultilingualFieldsTest.php
index 2a8299a..f002d8c 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleMultilingualFieldsTest.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleMultilingualFieldsTest.php
@@ -44,7 +44,7 @@ class LocaleMultilingualFieldsTest extends WebTestBase {
 
     // Set "Basic page" content type to use multilingual support.
     $edit = array(
-      'node_type_language' => 1,
+      'node_type_language_locked' => FALSE,
     );
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), t('Basic page content type has been updated.'));
@@ -60,7 +60,7 @@ class LocaleMultilingualFieldsTest extends WebTestBase {
    */
   function testMultilingualNodeForm() {
     // Create "Basic page" content.
-    $langcode = LANGUAGE_NOT_SPECIFIED;
+    $langcode = node_type_get_default_langcode('page');
     $title_key = "title";
     $title_value = $this->randomName(8);
     $body_key = "body[$langcode][0][value]";
@@ -70,7 +70,6 @@ class LocaleMultilingualFieldsTest extends WebTestBase {
     $edit = array();
     $edit[$title_key] = $title_value;
     $edit[$body_key] = $body_value;
-    $edit['langcode'] = 'en';
     $this->drupalPost('node/add/page', $edit, t('Save'));
 
     // Check that the node exists in the database.
@@ -109,7 +108,7 @@ class LocaleMultilingualFieldsTest extends WebTestBase {
    */
   function testMultilingualDisplaySettings() {
     // Create "Basic page" content.
-    $langcode = LANGUAGE_NOT_SPECIFIED;
+    $langcode = node_type_get_default_langcode('page');
     $title_key = "title";
     $title_value = $this->randomName(8);
     $body_key = "body[$langcode][0][value]";
@@ -119,7 +118,6 @@ class LocaleMultilingualFieldsTest extends WebTestBase {
     $edit = array();
     $edit[$title_key] = $title_value;
     $edit[$body_key] = $body_value;
-    $edit['langcode'] = 'en';
     $this->drupalPost('node/add/page', $edit, t('Save'));
 
     // Check that the node exists in the database.
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUninstallTest.php b/core/modules/locale/lib/Drupal/locale/Tests/LocaleUninstallTest.php
index 72868e9..62342d8 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUninstallTest.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocaleUninstallTest.php
@@ -52,11 +52,9 @@ class LocaleUninstallTest extends WebTestBase {
     $this->assertEqual(drupal_container()->get(LANGUAGE_TYPE_INTERFACE)->langcode, $this->langcode, t('Current language: %lang', array('%lang' => drupal_container()->get(LANGUAGE_TYPE_INTERFACE)->langcode)));
 
     // Enable multilingual workflow option for articles.
-    variable_set('node_type_language_article', 1);
-
+    variable_set('node_type_language_locked_article',FALSE);
     // Change JavaScript translations directory.
     variable_set('locale_js_directory', 'js_translations');
-
     // Build the JavaScript translation file for French.
     $user = $this->drupalCreateUser(array('translate interface', 'access administration pages'));
     $this->drupalLogin($user);
diff --git a/core/modules/node/content_types.inc b/core/modules/node/content_types.inc
index 6bb7969..d740a2d 100644
--- a/core/modules/node/content_types.inc
+++ b/core/modules/node/content_types.inc
@@ -185,11 +185,37 @@ function node_type_form($form, &$form_state, $type = NULL) {
     '#description' => t('Users with the <em>Administer content</em> permission will be able to override these options.'),
   );
   if (module_exists('language')) {
-    $form['workflow']['node_type_language'] = array(
+    $languages = language_list();
+    $lang_options = array(
+      LANGUAGE_NOT_SPECIFIED => t('- None -'),
+      LANGUAGE_NOT_APPLICABLE => t('- N/A -'),
+      LANGUAGE_MULTIPLE => t('Multiple Languages'),
+      'site_default' => t("Site's default"),
+      'current' => t('Current content language'),
+      'user_default' => t("User's preferred language"),
+    );
+    foreach ($languages as $langcode => $language) {
+      $lang_options[$langcode] = $language->name;
+    }
+
+    $form['language'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Language settings'),
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
+      '#group' => 'additional_settings',
+    );
+    $form['language']['node_type_language_default'] = array(
+      '#type' => 'select',
+      '#title' => t('Default language'),
+      '#options' => $lang_options,
+      '#default_value' => variable_get('node_type_language_default_' . $type->type, 'site_default'),
+    );
+    $form['language']['node_type_language_locked'] = array(
       '#type' => 'checkbox',
-      '#title' => t('Multilingual support'),
-      '#default_value' => variable_get('node_type_language_' . $type->type, 0),
-      '#description' => t('Add a language selection field to the editing form, allowing you to select from one of the <a href="!languages">enabled languages</a>. If disabled, new posts are saved with the default language. Existing content will not be affected by changing this option.', array('!languages' => url('admin/config/regional/language'))),
+      '#title' => t('Hide language options'),
+      '#default_value' => variable_get('node_type_language_locked_' . $type->type, TRUE),
+      '#description' => t('Users will not be able to change the default language on content of this type.'),
     );
   }
   $form['display'] = array(
diff --git a/core/modules/node/content_types.js b/core/modules/node/content_types.js
index 5c1c44e..582ed5e 100644
--- a/core/modules/node/content_types.js
+++ b/core/modules/node/content_types.js
@@ -21,6 +21,17 @@ Drupal.behaviors.contentTypes = {
       }
       return vals.join(', ');
     });
+    $('fieldset#edit-language', context).drupalSetSummary(function(context) {
+      var vals = [];
+
+      vals.push($(".form-item-node-type-language-default select option:selected", context).text());
+
+      $('input:checked', context).next('label').each(function() {
+        vals.push(Drupal.checkPlain($(this).text()));
+      });
+
+      return vals.join(', ');
+    });
     $context.find('fieldset#edit-display').drupalSetSummary(function(context) {
       var vals = [];
       var $context = $(context);
@@ -32,6 +43,15 @@ Drupal.behaviors.contentTypes = {
       }
       return vals.join(', ');
     });
+    $('#edit-node-type-language-default, #edit-node-type-language-locked', context).change(function(context) {
+      if ($('#edit-node-type-language-default').val() == 'und' && $('#edit-node-type-language-locked').attr('checked')) {
+        $('#edit-node-type-language-translation-enabled').attr('disabled', true);
+        $('#edit-node-type-language-translation-enabled').removeAttr('checked');
+      } else {
+        $('#edit-node-type-language-translation-enabled').removeAttr('disabled');
+      }
+    });
+    $('#edit-node-type-language-default', context).trigger('change');
   }
 };
 
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTypeInitialLanguageTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeTypeInitialLanguageTest.php
new file mode 100644
index 0000000..38d96aa
--- /dev/null
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeTypeInitialLanguageTest.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\node\Tests\NodeTypeTest.
+ */
+
+namespace Drupal\node\Tests;
+
+/**
+ * Tests related to node type initial language.
+ */
+class NodeTypeInitalLanguageTestCase extends NodeTestBase {
+  public static function getInfo() {
+    return array(
+        'name' => 'Node type initial language',
+        'description' => 'Tests node type initial language settings.',
+        'group' => 'Node',
+        );
+  }
+
+  function setUp() {
+    parent::setUp(array('language'));
+    $web_user = $this->drupalCreateUser(array('bypass node access', 'administer content types', 'administer languages'));
+    $this->drupalLogin($web_user);
+  }
+
+  /**
+   * Tests the node type initial language defaults, and modify them.
+   *
+   * The default initial language must be the site's default, and the language
+   * locked option must be on.
+   */
+  function testNodeTypeInitialLanguageDefaults() {
+    $this->drupalGet('admin/structure/types/manage/article');
+    $this->assertOptionSelected('edit-node-type-language-default', 'site_default', 'The default inital language is the site default.');
+    $this->assertFieldChecked('edit-node-type-language-locked', 'Language is locked by default.');
+
+    $this->drupalGet('node/add/article');
+    $this->assertRaw('select disabled="disabled" id="edit-langcode"', 'Language is not selectable on node add/edit page when language is locked.');
+    $this->assertOptionSelected('edit-langcode', language_default()->langcode, 'The inital language is the site default on the node add page.');
+
+    // Adds a new language and set it as default.
+    $edit = array(
+        'predefined_langcode' => 'hu',
+        );
+    $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language'));
+    $edit = array(
+        'site_default' => 'hu',
+        );
+    $this->drupalPost('admin/config/regional/language', $edit, t('Save configuration'));
+
+    // Tests the initial language after changing the site default language.
+    $this->drupalGet('node/add/article');
+    $this->assertOptionSelected('edit-langcode', 'hu', 'The inital language is the site default on the node add page after the site default language is changed.');
+
+    // Changes the inital language settings.
+    $edit = array(
+        'node_type_language_default' => 'en',
+        'node_type_language_locked' => FALSE,
+        );
+    $this->drupalPost('admin/structure/types/manage/article', $edit, t('Save content type'));
+    $this->drupalGet('node/add/article');
+    $this->assertNoRaw('select disabled="disabled" id="edit-langcode"', "Language is selectable on node add/edit page when language isn't locked.");
+    $this->assertOptionSelected('edit-langcode', 'en', 'The inital language is the previously selected language on the node add page.');
+  }
+}
diff --git a/core/modules/node/node.install b/core/modules/node/node.install
index 6f806e9..f551cad 100644
--- a/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -458,9 +458,12 @@ function node_uninstall() {
         ->condition('name', 'node_options_' . $type)
         ->condition('name', 'node_submitted_' . $type)
         ->condition('name', 'node_permissions_' . $type)
-        ->condition('name', 'node_type_language_' . $type)
+        ->condition('name', 'node_type_language_default_' . $type)
+        ->condition('name', 'node_type_language_locked_' . $type)
       )
       ->execute();
+     // TODO: node_type_language_translation_enabled_ in the translation module
+     // ->condition('name', 'node_type_language_translation_enabled_' . $type)
   }
 
   // Delete node search ranking variables.
@@ -520,9 +523,9 @@ function _update_7000_node_get_types() {
 function node_update_8001() {
   $types = db_query('SELECT type FROM {node_type}')->fetchCol();
   foreach ($types as $type) {
-    $language = variable_get('language_content_type_' . $type);
-    if (isset($language)) {
-      variable_set('node_type_language_' . $type, $language);
+    $node_type_language = variable_get('language_content_type_' . $type);
+    if (isset($node_type_language)) {
+      variable_set('node_type_language_' . $type, $node_type_language);
     }
     variable_del('language_content_type_' . $type);
   }
@@ -543,6 +546,24 @@ function node_update_8002() {
 }
 
 /**
- * @} End of "addtogroup updates-7.x-to-8.x".
+ * Rename node type language variable names.
+ */
+function node_update_8003() {
+  $types = db_query('SELECT type FROM {node_type}')->fetchCol();
+  foreach ($types as $type) {
+    variable_set('node_type_language_default_' . $type, LANGUAGE_NOT_SPECIFIED);
+    $node_type_language = variable_get('node_type_language_' . $type, 0);
+    if ($node_type_language == 0) {
+      variable_set('node_type_language_locked_' . $type, TRUE);
+    }
+    if ($node_type_language == 2) {
+      variable_set('node_type_language_translation_enabled_' . $type, 2);
+    }
+    variable_del('node_type_language_' . $type);
+  }
+}
+
+/**
+ * @} End of "addtogroup updates-7.x-to-8.x"
  * The next series of updates should start at 9000.
  */
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 31b94d3..bde18d2 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -629,6 +629,47 @@ function node_field_extra_fields() {
 }
 
 /**
+ * Get the default language for a node type.
+ *
+ * @param string $node_type
+ *   The type of node.
+ *
+ * @return (string)
+ *   The language code of the node type's default langcode.
+ */
+function node_type_get_default_langcode($node_type) {
+  $default_value = variable_get('node_type_language_default_' . $node_type, 'site_default');
+
+  if ($default_value == LANGUAGE_NOT_SPECIFIED) {
+    return LANGUAGE_NOT_SPECIFIED;
+  }
+
+  drupal_container()->get(LANGUAGE_TYPE_CONTENT);
+
+  switch ($default_value) {
+    case 'site_default':
+      $default_value = language_default()->langcode;
+      break;
+
+    case 'current':
+      $default_value = $language_interface->langcode;
+      break;
+
+    case 'user_default':
+      global $user;
+      if (!empty($user->preferred_langcode)) {
+        $default_value = $user->preferred_langcode;
+      }
+      else {
+        $default_value = $language_interface->langcode;
+      }
+      break;
+  }
+
+  return $default_value;
+}
+
+/**
  * Deletes a node type from the database.
  *
  * @param $name
diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc
index a43ff62..8cb1d22 100644
--- a/core/modules/node/node.pages.inc
+++ b/core/modules/node/node.pages.inc
@@ -91,7 +91,7 @@ function node_add($type) {
     'uid' => $user->uid,
     'name' => (isset($user->name) ? $user->name : ''),
     'type' => $type,
-    'langcode' => LANGUAGE_NOT_SPECIFIED,
+    'langcode' => node_type_get_default_langcode($type)
   ));
   drupal_set_title(t('Create @name', array('@name' => $types[$type]->name)), PASS_THROUGH);
   $output = drupal_get_form($type . '_node_form', $node);
@@ -186,7 +186,7 @@ function node_form($form, &$form_state, Node $node) {
   // @todo D8: Remove. Modules should access the node using $form_state['node'].
   $form['#node'] = $node;
 
-  if (variable_get('node_type_language_' . $node->type, 0) && module_exists('language')) {
+  if (module_exists('language')) {
     $languages = language_list();
     $language_options = array();
     foreach ($languages as $langcode => $language) {
@@ -203,9 +203,8 @@ function node_form($form, &$form_state, Node $node) {
   else {
     $form['langcode'] = array(
       '#type' => 'value',
-      // New nodes without multilingual support get the default language, old
-      // nodes keep their language if language.module is not available.
-      '#value' => !isset($form['#node']->nid) ? language_default()->langcode : $node->langcode,
+      // Use default language when language module is inactive.
+      '#value' => $node->langcode,
     );
   }
 
diff --git a/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php b/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
index 096729f..7e37f4c 100644
--- a/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
+++ b/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
@@ -42,7 +42,8 @@ class PathLanguageTest extends PathTestBase {
    */
   function testAliasTranslation() {
     // Set 'page' content type to enable translation.
-    variable_set('node_type_language_page', TRANSLATION_ENABLED);
+    variable_set('node_type_language_locked_page', FALSE);
+    variable_set('node_type_language_translation_enabled_page', TRANSLATION_ENABLED);
 
     $english_node = $this->drupalCreateNode(array('type' => 'page'));
     $english_alias = $this->randomName();
diff --git a/core/modules/poll/lib/Drupal/poll/Tests/PollTranslateTest.php b/core/modules/poll/lib/Drupal/poll/Tests/PollTranslateTest.php
index 6b89cad..f2cf74c 100644
--- a/core/modules/poll/lib/Drupal/poll/Tests/PollTranslateTest.php
+++ b/core/modules/poll/lib/Drupal/poll/Tests/PollTranslateTest.php
@@ -50,8 +50,7 @@ class PollTranslateTest extends PollTestBase {
 
     // Set "Poll" content type to use multilingual support with translation.
     $this->drupalGet('admin/structure/types/manage/poll');
-    $edit = array();
-    $edit['node_type_language'] = TRANSLATION_ENABLED;
+    $edit = array('node_type_language_locked' => FALSE, 'node_type_language_translation_enabled' => TRANSLATION_ENABLED);
     $this->drupalPost('admin/structure/types/manage/poll', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Poll')), t('Poll content type has been updated.'));
 
diff --git a/core/modules/system/tests/upgrade/upgrade.language.test b/core/modules/system/tests/upgrade/upgrade.language.test
index 91e1fec..c92380c 100644
--- a/core/modules/system/tests/upgrade/upgrade.language.test
+++ b/core/modules/system/tests/upgrade/upgrade.language.test
@@ -77,7 +77,7 @@ class LanguageUpgradePathTestCase extends UpgradePathTestCase {
     $this->drupalGet('node/add/article');
     $this->assertFieldByName('langcode');
     $this->drupalGet('node/add/page');
-    $this->assertNoFieldByName('langcode');
+    $this->assertFieldByName('langcode');
 
     // Check that the user language value was retained in both langcode and
     // preferred_langcode.
diff --git a/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php b/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php
index e09c8b0..d9e8f9e 100644
--- a/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php
+++ b/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php
@@ -42,8 +42,7 @@ class TranslationTest extends WebTestBase {
     // Set "Basic page" content type to use multilingual support with
     // translation.
     $this->drupalGet('admin/structure/types/manage/page');
-    $edit = array();
-    $edit['node_type_language'] = TRANSLATION_ENABLED;
+    $edit = array('node_type_language_locked' => FALSE, 'node_type_language_translation_enabled' => TRANSLATION_ENABLED);
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
     $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), t('Basic page content type has been updated.'));
 
@@ -222,7 +221,7 @@ class TranslationTest extends WebTestBase {
     // Disable translation support to check that the language switcher is left
     // untouched only for new nodes.
     $this->drupalLogin($this->admin_user);
-    $edit = array('node_type_language' => 0);
+    $edit = array('node_type_language_locked' => TRUE, 'node_type_language_translation_enabled' => FALSE);
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
     $this->drupalLogin($this->translator);
 
diff --git a/core/modules/translation/translation.module b/core/modules/translation/translation.module
index b2c0635..8148cf0 100644
--- a/core/modules/translation/translation.module
+++ b/core/modules/translation/translation.module
@@ -120,10 +120,28 @@ function translation_permission() {
  */
 function translation_form_node_type_form_alter(&$form, &$form_state) {
   // Add translation option to content type form.
-  $form['workflow']['node_type_language']['#type'] = 'radios';
-  $form['workflow']['node_type_language']['#options'] = array(t('Disabled'), t('Enabled'), TRANSLATION_ENABLED => t('Enabled, with translation'));
-  // Description based on text from node.module.
-  $form['workflow']['node_type_language']['#description'] = t('Add a language selection field to the editing form, allowing you to select from one of the <a href="@languages">enabled languages</a>. You can also turn on translation for this content type, which lets you have content translated to any of the installed languages. If disabled, new posts are saved with the default language. Existing content will not be affected by changing this option.', array('@languages' => url('admin/config/regional/language')));
+  $form['language']['node_type_language_translation_enabled'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Enable translation'),
+    '#return_value' => TRANSLATION_ENABLED,
+    '#default_value' => variable_get('node_type_language_translation_enabled_' . $form['#node_type']->type, FALSE),
+    '#element_validate' => array('translation_node_type_language_translation_enabled_validate'),
+    '#states' => array(
+      'invisible' => array(
+        ':input[name="node_type_language_default"]' => array('value' => 'und'),
+      ),
+    ),
+  );
+}
+
+/**
+ * Checks if default language=none && default language=locked
+ */
+function translation_node_type_language_translation_enabled_validate($element, &$form_state, $form){
+  $language_default = (($form_state['values']['node_type_language_default'] == 'und' || $form_state['values']['node_type_language_default'] == 'zxx' || $form_state['values']['node_type_language_default'] == 'mul') ? TRUE : FALSE);
+  if ($language_default && $form_state['values']['node_type_language_locked'] && $form_state['values']['node_type_language_translation_enabled'] == TRANSLATION_ENABLED) {
+    form_set_error('node_type_language_translation_enabled', t('Translation cannot be enabled if no default language is set and locked.'));
+  }
 }
 
 /**
@@ -461,7 +479,7 @@ function translation_node_get_translations($tnid) {
  *   TRUE if translation is supported, and FALSE if not.
  */
 function translation_supported_type($type) {
-  return variable_get('node_type_language_' . $type, 0) == TRANSLATION_ENABLED;
+  return variable_get('node_type_language_translation_enabled_' . $type, 0) == TRANSLATION_ENABLED;
 }
 
 /**