diff --git a/client/coral-embed-stream/src/components/EditableCommentContent.js b/client/coral-embed-stream/src/components/EditableCommentContent.js
index ec6718217..1af4a9fa7 100644
--- a/client/coral-embed-stream/src/components/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/components/EditableCommentContent.js
@@ -85,7 +85,7 @@ export class EditableCommentContent extends React.Component {
       } else if (error.networkError) {
         addNotification('error', t('error.networkError'));
       } else {
-        addNotification('error', t('editComment.unexpectedError'));
+        addNotification('error', t('edit_comment.unexpectedError'));
         throw error;
       }
     }
@@ -114,9 +114,9 @@ export class EditableCommentContent extends React.Component {
             return (comment.body !== originalBody) && !editWindowExpired;
           }}
           saveComment={this.editComment}
-          bodyLabel={t('editComment.bodyInputLabel')}
+          bodyLabel={t('edit_comment.bodyInputLabel')}
           bodyPlaceholder=""
-          submitText={<span>{t('editComment.saveButton')}</span>}
+          submitText={<span>{t('edit_comment.save_button')}</span>}
           saveButtonCStyle="green"
           cancelButtonClicked={this.props.stopEditing}
           buttonClass={styles.button}
@@ -126,15 +126,15 @@ export class EditableCommentContent extends React.Component {
                 {
                   editWindowExpired
                   ? <span>
-                      {t('editComment.editWindowExpired')}
+                      {t('edit_comment.editWindowExpired')}
                       {
                         typeof this.props.stopEditing === 'function'
-                        ? <span>&nbsp;<a className={styles.link} onClick={this.props.stopEditing}>{t('editComment.editWindowExpiredClose')}</a></span>
+                        ? <span>&nbsp;<a className={styles.link} onClick={this.props.stopEditing}>{t('edit_comment.editWindowExpiredClose')}</a></span>
                         : null
                       }
                     </span>
                   : <span>
-                      <Icon name="timer"/> {t('editComment.editWindowTimerPrefix')}
+                      <Icon name="timer"/> {t('edit_comment.editWindowTimerPrefix')}
                       <CountdownSeconds
                         until={editableUntil}
                         classNameForMsRemaining={(remainingMs) => (remainingMs <= 10 * 1000) ? styles.editWindowAlmostOver : '' }
diff --git a/client/coral-embed-stream/src/components/Embed.js b/client/coral-embed-stream/src/components/Embed.js
index c429f3a4b..7030caf74 100644
--- a/client/coral-embed-stream/src/components/Embed.js
+++ b/client/coral-embed-stream/src/components/Embed.js
@@ -46,7 +46,7 @@ export default class Embed extends React.Component {
           <TabBar onChange={this.changeTab} activeTab={activeTab}>
             <Tab><Count count={totalCommentCount}/></Tab>
             <Tab>{t('framework.my_profile')}</Tab>
-            <Tab restricted={!can(user, 'UPDATE_CONFIG')}>Configure Stream</Tab>
+            <Tab restricted={!can(user, 'UPDATE_CONFIG')}>{t('framework.configure_stream')}</Tab>
           </TabBar>
           {
             commentId &&
diff --git a/client/coral-plugin-history/Comment.js b/client/coral-plugin-history/Comment.js
index b98ed88c3..cb188e53e 100644
--- a/client/coral-plugin-history/Comment.js
+++ b/client/coral-plugin-history/Comment.js
@@ -4,6 +4,8 @@ import styles from './Comment.css';
 import PubDate from '../coral-plugin-pubdate/PubDate';
 import Content from '../coral-plugin-commentcontent/CommentContent';
 
+import t from 'coral-framework/services/i18n';
+
 const Comment = (props) => {
   return (
     <div className={styles.myComment}>
@@ -25,7 +27,7 @@ const Comment = (props) => {
         <ul>
           <li>
             <a onClick={props.link(`${props.asset.url}#${props.comment.id}`)}>
-              <Icon name="open_in_new" />View Conversation
+              <Icon name="open_in_new" />{t('view_conversation')}
             </a>
           </li>
           <li>
diff --git a/locales/en.yml b/locales/en.yml
index fe3d43ead..1f9066786 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -144,6 +144,15 @@ en:
     no_flags: "There have been no flags in the last 5 minutes! Hooray!"
     no_likes: "There have been no likes in the last 5 minutes. All quiet."
   done: Done
+  editComment:
+    bodyInputLabel: "Edit this comment"
+    save_button: "Save changes"
+    editWindowExpired: "You can no longer edit this comment. The time window to do so has expired. Why not post another one?"
+    editWindowExpiredClose: "Close"
+    editWindowTimerPrefix: "Edit Window: "
+    second: "second"
+    secondsPlural: "seconds"
+    unexpectedError: "Unexpected error while saving changes. Sorry!"
   embedlink:
     copy: "Copy to Clipboard"
   error:
@@ -177,6 +186,7 @@ en:
     comment: comment
     comment_is_ignored: "This comment is hidden because you ignored this user."
     comments: comments
+    configure_stream: "Configure Stream"
     content_not_available: "This content is not available"
     edit_name:
       button: Submit
@@ -337,6 +347,7 @@ en:
   user_impersonating: "This user is impersonating"
   user_no_comment: "You've never left a comment. Join the conversation!"
   username_offensive: "This username is offensive"
+  view_conversation: "View Conversation"
   install:
     INITIAL:
       DESCRIPTION: "Let's set up your Talk community in just a few short steps."
diff --git a/locales/es.yml b/locales/es.yml
index 4b668d104..701494f2c 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -144,6 +144,15 @@ es:
     no_flags: "No ha habido ningún reporte en los últimos 5 minutos! Bravo!"
     no_likes: "No ha habido ningún 'me gusta' en los últimos 5 minutos. Todo tranquilo."
   done: hecho
+  edit_comment:
+    bodyInputLabel: "Editar este comentario"
+    saveButton: "Guardar cambios"
+    editWindowExpired: "Ya no puedes editar este comentario. La ventana de tiempo para hacerlo ha caducado. ¿Por qué no publicar otro?"
+    editWindowExpiredClose: "Cerca"
+    editWindowTimerPrefix: "Ventana de edición: "
+    second: "segundo"
+    secondsPlural: "segundos"
+    unexpectedError: "Unexpected error while saving changes. Sorry!"
   embedlink:
     copy: "Copiar al portapapeles"
   error:
@@ -177,6 +186,7 @@ es:
     comment: commentario
     comment_is_ignored: "Este comentario está escondido porque has ignorado al usuario."
     comments: commentarios
+    configure_stream: "Configurar Hilo de Comentarios"
     content_not_available: "El contenido no se encuentra disponible"
     edit_name:
       button: Enviar
@@ -337,6 +347,7 @@ es:
   user_impersonating: "Este usuario suplanta a alguien"
   user_no_comment: "No has dejado aún ningún comentario. ¡Únete a la conversación!"
   username_offensive: "Este nombre de usuario es ofensivo"
+  view_conversation: "Ver Conversación"
   install:
     INITIAL:
       DESCRIPTION: "Creemos tu comunidad Talk en unos pocos pasos."