diff --git a/CHANGES.txt b/CHANGES.txt
index 78290c3..8c4b176 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,14 @@ Changelog
 * Added French translation.
   [vincentfretin]
 
+* Renamed legend_add_comment to label_add_comment to have the translation from
+  plone domain.
+  [vincentfretin]
+
+* label_comment_by and label_commented_at are not in Plone 4 translation anymore, so
+  these two messages moved to plone.app.discussions i18n domain.
+  [vincentfretin]
+
 * Translate "Warning" shown in @@moderate-comments in the plone domain.
   [vincentfretin]
 
diff --git a/plone/app/discussion/browser/comments.pt b/plone/app/discussion/browser/comments.pt
index 85591f9..800fda7 100644
--- a/plone/app/discussion/browser/comments.pt
+++ b/plone/app/discussion/browser/comments.pt
@@ -62,7 +62,7 @@
                 <h3 class="commentTitle"
                     tal:content="reply/Title" />
 
-                <div class="documentByLine">
+                <div class="documentByLine" i18n:domain="plone.app.discussion">
                         <tal:posted i18n:translate="label_comment_by">Posted by</tal:posted>
                         <tal:name>
                             <a href=""
@@ -144,7 +144,7 @@
 
         <fieldset>
 
-            <legend i18n:translate="legend_add_comment">Add comment</legend>
+            <legend i18n:translate="label_add_comment">Add comment</legend>
             <p i18n:translate="description_add_comment">
                 You can add a comment by filling out the form below. Plain text
                 formatting.
@@ -156,4 +156,4 @@
     </div>
 
 </tal:block>
-</tal:block>
\ No newline at end of file
+</tal:block>
diff --git a/plone/app/discussion/locales/de/LC_MESSAGES/plone.app.discussion.po b/plone/app/discussion/locales/de/LC_MESSAGES/plone.app.discussion.po
index 5d75d6b..3c1d8b0 100644
--- a/plone/app/discussion/locales/de/LC_MESSAGES/plone.app.discussion.po
+++ b/plone/app/discussion/locales/de/LC_MESSAGES/plone.app.discussion.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: plone.app.discussion\n"
-"POT-Creation-Date: 2010-08-06 10:01+0000\n"
+"POT-Creation-Date: 2010-08-06 15:31+0000\n"
 "PO-Revision-Date: 2010-03-18 11:10+0100\n"
 "Last-Translator: Timo Stollenwerk <timo@zmag.de>\n"
 "Language-Team: Deutsch <plone-i18n@lists.sourceforge.net>\n"
@@ -214,6 +214,16 @@ msgstr ""
 msgid "label_comment"
 msgstr "Kommentar"
 
+#. Default: "Posted by"
+#: ./browser/comments.pt:66
+msgid "label_comment_by"
+msgstr ""
+
+#. Default: "at"
+#: ./browser/comments.pt:79
+msgid "label_commented_at"
+msgstr ""
+
 #. Default: "Delete"
 #: ./browser/moderation.pt:136
 msgid "label_delete"
diff --git a/plone/app/discussion/locales/es/LC_MESSAGES/plone.app.discussion.po b/plone/app/discussion/locales/es/LC_MESSAGES/plone.app.discussion.po
index 626dc8c..9755079 100644
--- a/plone/app/discussion/locales/es/LC_MESSAGES/plone.app.discussion.po
+++ b/plone/app/discussion/locales/es/LC_MESSAGES/plone.app.discussion.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: plone.app.discussion\n"
-"POT-Creation-Date: 2010-08-06 10:01+0000\n"
+"POT-Creation-Date: 2010-08-06 15:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: Judith Sanleandro <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -211,6 +211,16 @@ msgstr "Captcha"
 msgid "label_comment"
 msgstr "Comentario"
 
+#. Default: "Posted by"
+#: ./browser/comments.pt:66
+msgid "label_comment_by"
+msgstr ""
+
+#. Default: "at"
+#: ./browser/comments.pt:79
+msgid "label_commented_at"
+msgstr ""
+
 #. Default: "Delete"
 #: ./browser/moderation.pt:136
 msgid "label_delete"
diff --git a/plone/app/discussion/locales/fr/LC_MESSAGES/plone.app.discussion.po b/plone/app/discussion/locales/fr/LC_MESSAGES/plone.app.discussion.po
index 8fda808..606c948 100644
--- a/plone/app/discussion/locales/fr/LC_MESSAGES/plone.app.discussion.po
+++ b/plone/app/discussion/locales/fr/LC_MESSAGES/plone.app.discussion.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: plone.app.discussion\n"
-"POT-Creation-Date: 2010-08-06 10:01+0000\n"
-"PO-Revision-Date: 2010-08-06 17:19+0100\n"
+"POT-Creation-Date: 2010-08-06 15:31+0000\n"
+"PO-Revision-Date: 2010-08-06 17:32+0100\n"
 "Last-Translator: Vincent Fretin <vincent.fretin@gmail.com>\n"
 "Language-Team: Vincent Fretin <vincent.fretin@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -212,6 +212,16 @@ msgstr "Captcha"
 msgid "label_comment"
 msgstr "Commentaire"
 
+#. Default: "Posted by"
+#: ./browser/comments.pt:66
+msgid "label_comment_by"
+msgstr "Posté par"
+
+#. Default: "at"
+#: ./browser/comments.pt:79
+msgid "label_commented_at"
+msgstr "le"
+
 #. Default: "Delete"
 #: ./browser/moderation.pt:136
 msgid "label_delete"
diff --git a/plone/app/discussion/locales/it/LC_MESSAGES/plone.app.discussion.po b/plone/app/discussion/locales/it/LC_MESSAGES/plone.app.discussion.po
index 9efb443..226d61d 100644
--- a/plone/app/discussion/locales/it/LC_MESSAGES/plone.app.discussion.po
+++ b/plone/app/discussion/locales/it/LC_MESSAGES/plone.app.discussion.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: plone.app.discussion\n"
-"POT-Creation-Date: 2010-08-06 10:01+0000\n"
+"POT-Creation-Date: 2010-08-06 15:31+0000\n"
 "PO-Revision-Date: 2010-02-26 09:15+0000\n"
 "Last-Translator: Luca Fabbri <luca.fabbri@redturtle.net>\n"
 "Language-Team: RedTurtle Technology <sviluppoplone@redturtle.net>\n"
@@ -219,6 +219,16 @@ msgstr ""
 msgid "label_comment"
 msgstr "Commento"
 
+#. Default: "Posted by"
+#: ./browser/comments.pt:66
+msgid "label_comment_by"
+msgstr ""
+
+#. Default: "at"
+#: ./browser/comments.pt:79
+msgid "label_commented_at"
+msgstr ""
+
 #. Default: "Delete"
 #: ./browser/moderation.pt:136
 msgid "label_delete"
diff --git a/plone/app/discussion/locales/nl/LC_MESSAGES/plone.app.discussion.po b/plone/app/discussion/locales/nl/LC_MESSAGES/plone.app.discussion.po
index 28abc1a..37c6d46 100644
--- a/plone/app/discussion/locales/nl/LC_MESSAGES/plone.app.discussion.po
+++ b/plone/app/discussion/locales/nl/LC_MESSAGES/plone.app.discussion.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: plone.app.discussion\n"
-"POT-Creation-Date: 2010-08-06 10:01+0000\n"
+"POT-Creation-Date: 2010-08-06 15:31+0000\n"
 "PO-Revision-Date: 2010-06-07 16:30+0100\n"
 "Last-Translator: Kim Chee Leong <leong@gw20e.com>\n"
 "Language-Team: Nederlands <plone-i18n@lists.sourceforge.net>\n"
@@ -211,6 +211,16 @@ msgstr ""
 msgid "label_comment"
 msgstr ""
 
+#. Default: "Posted by"
+#: ./browser/comments.pt:66
+msgid "label_comment_by"
+msgstr ""
+
+#. Default: "at"
+#: ./browser/comments.pt:79
+msgid "label_commented_at"
+msgstr ""
+
 #. Default: "Delete"
 #: ./browser/moderation.pt:136
 msgid "label_delete"
diff --git a/plone/app/discussion/locales/no/LC_MESSAGES/plone.app.discussion.po b/plone/app/discussion/locales/no/LC_MESSAGES/plone.app.discussion.po
index 96aaf44..6179d2e 100644
--- a/plone/app/discussion/locales/no/LC_MESSAGES/plone.app.discussion.po
+++ b/plone/app/discussion/locales/no/LC_MESSAGES/plone.app.discussion.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: plone.app.discussion\n"
-"POT-Creation-Date: 2010-08-06 10:01+0000\n"
+"POT-Creation-Date: 2010-08-06 15:31+0000\n"
 "PO-Revision-Date: 2010-01-28 15:00+0000\n"
 "Last-Translator: Sverre Helge Bolstad <sverrehelge@gmail.com>\n"
 "Language-Team: Norwegian <plone-i18n@lists.sourceforge.net>\n"
@@ -213,6 +213,16 @@ msgstr ""
 msgid "label_comment"
 msgstr ""
 
+#. Default: "Posted by"
+#: ./browser/comments.pt:66
+msgid "label_comment_by"
+msgstr ""
+
+#. Default: "at"
+#: ./browser/comments.pt:79
+msgid "label_commented_at"
+msgstr ""
+
 #. Default: "Delete"
 #: ./browser/moderation.pt:136
 msgid "label_delete"
diff --git a/plone/app/discussion/locales/plone.app.discussion.pot b/plone/app/discussion/locales/plone.app.discussion.pot
index 2d0c3be..fb0a7b8 100644
--- a/plone/app/discussion/locales/plone.app.discussion.pot
+++ b/plone/app/discussion/locales/plone.app.discussion.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: plone.app.discussion\n"
-"POT-Creation-Date: 2010-08-06 10:01+0000\n"
+"POT-Creation-Date: 2010-08-06 15:31+0000\n"
 "PO-Revision-Date: 2010-01-28 15:00+0000\n"
 "Last-Translator: Hanno Schlichting <hannosch@plone.org>\n"
 "Language-Team: Hanno Schlichting <hannosch@plone.org>\n"
@@ -210,6 +210,16 @@ msgstr ""
 msgid "label_comment"
 msgstr ""
 
+#. Default: "Posted by"
+#: ./browser/comments.pt:66
+msgid "label_comment_by"
+msgstr ""
+
+#. Default: "at"
+#: ./browser/comments.pt:79
+msgid "label_commented_at"
+msgstr ""
+
 #. Default: "Delete"
 #: ./browser/moderation.pt:136
 msgid "label_delete"