diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module
index 0167180..f8900ce 100644
--- a/core/modules/translation_entity/translation_entity.module
+++ b/core/modules/translation_entity/translation_entity.module
@@ -842,12 +842,12 @@ function translation_entity_language_configuration_element_validate($element, ar
   $values = $form_state['values'][$key];
   if (language_is_locked($values['langcode']) && !$values['language_show'] && $values['translation_entity']) {
     foreach (language_list(LANGUAGE_LOCKED) as $language) {
-      $locked_languages[] = $language->name;
+      $locked_languages[$language->langcode] = $language->name;
     }
     // @todo Set the correct form element name as soon as the element parents
     //   are correctly set. We should be using NestedArray::getValue() but for
     //   now we cannot.
-    form_set_error('', t('Translation is not supported if language is always one of: @locked_languages', array('@locked_languages' => implode(', ', $locked_languages))));
+    form_set_error('', t('"Show language selector" is not compatible with translating content that has default language: %choice. Either do not hide the language selector or pick a specific language.', array('%choice' => $locked_languages[$values['langcode']])));
   }
 }