diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 6e7d891..9c300ab 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -970,6 +970,7 @@ function comment_links(Comment $comment, Node $node) {
     $links['comment-translations'] = array(
       'title' => t('translations'),
       'href' => 'comment/' . $comment->id() . '/translations',
+      'html' => TRUE,
     );
   }
 
diff --git a/core/modules/translation_entity/translation_entity.install b/core/modules/translation_entity/translation_entity.install
index 83b50b9..b791071 100644
--- a/core/modules/translation_entity/translation_entity.install
+++ b/core/modules/translation_entity/translation_entity.install
@@ -70,11 +70,11 @@ function translation_entity_enable() {
   // Translation works when at least two languages are enabled.
   if (count(language_list()) < 2) {
     $t_args = array('!language_url' => url('admin/config/regional/language'));
-    $message = t('Be sure to <a href="!language_url">enable at least two languages</a>.', $t_args);
+    $message = t('Be sure to <a href="!language_url">enable at least two languages</a> to translate content.', $t_args);
+    drupal_set_message($message, 'warning');
   }
-
-  // Workflow for language settings can configure content translation settings.
+  // Point the user to the content translation settings.
   $t_args = array('!settings_url' => url('admin/config/regional/content-language'));
-  $message .= t('<a href="!settings_url">Enable translation</a> for <em>content types</em>, <em>taxonomy vocabularies</em>, <em>accounts</em>, or any other element you wish to translate.', $t_args);
+  $message = t('<a href="!settings_url">Enable translation</a> for <em>content types</em>, <em>taxonomy vocabularies</em>, <em>accounts</em>, or any other element you wish to translate.', $t_args);
   drupal_set_message($message, 'warning');
 }
diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module
index 3380b8e..fca7c4a 100644
--- a/core/modules/translation_entity/translation_entity.module
+++ b/core/modules/translation_entity/translation_entity.module
@@ -49,9 +49,9 @@ function translation_entity_help($path, $arg) {
  */
 function translation_entity_module_implements_alter(&$implementations, $hook) {
   switch ($hook) {
+    // Move some of our hook implementations to the end of the list.
     case 'menu_alter':
     case 'entity_info_alter':
-      // Move some of our hook implementations to the end of the list.
       $group = $implementations['translation_entity'];
       unset($implementations['translation_entity']);
       $implementations['translation_entity'] = $group;
@@ -201,7 +201,7 @@ function translation_entity_menu_alter(array &$items) {
       // If the base path is not defined we cannot provide the translation UI
       // for this entity type. In some cases the actual base path might not have
       // a menu loader associated, hence we need to check also for the plain "%"
-      // variant.
+      // variant. See for instance comment_menu().
       if (!isset($items[$path]) && !isset($items[_translation_entity_menu_strip_loaders($path)])) {
         unset(
           $items["$path/translations"],