Fix missing translations for comment formatting. This fixes #11671; Update translations.

svn path=/plone.app.discussion/branches/1.x/; revision=49302

CHANGES.txt

@@ -1,9 +1,16 @@
 Changelog
 =========
 
-1.1 (Unreleased)
+1.1 (2011-05-03)
 ----------------
 
+- Fix missing translations for comment formatting. This fixes 
+  http://dev.plone.org/plone/ticket/11671.
+  [timo]
+
+- Translations updated.
+  [timo]
+    
 - Add a moderator_email setting to control where moderator notifications are
   sent.
   [davisagli]
@@ -15,6 +22,7 @@ Changelog
   defaultUser.gif to defaultUser.png in Products.PlonePAS 4.0.5.
   [maurits]
 
+
 1.0 (2011-02-07)
 ----------------
 

plone/app/discussion/browser/comments.py

@@ -50,14 +50,11 @@ except ImportError: # pragma: no cover
 
 COMMENT_DESCRIPTION_PLAIN_TEXT = _(
     u"comment_description_plain_text",
-    default=u"You can add a comment by filling out the form below. " +
+    default=u"You can add a comment by filling out the form below. Plain text formatting.")
-             "Plain text formatting.")
 
 COMMENT_DESCRIPTION_INTELLIGENT_TEXT = _(
     u"comment_description_intelligent_text",
-    default=u"You can add a comment by filling out the form below. " +
+    default=u"You can add a comment by filling out the form below. Plain text formatting. Web and email addresses are transformed into clickable links.")
-             "Plain text formatting. Web and email addresses are transformed " +
-             "into clickable links.")
 
 COMMENT_DESCRIPTION_MODERATION_ENABLED = _(
     u"comment_description_moderation_enabled",
@@ -316,9 +313,11 @@ class CommentsViewlet(ViewletBase):
 
         # text transform setting
         if settings.text_transform == "text/x-web-intelligent":
-            message = translate(Message(COMMENT_DESCRIPTION_INTELLIGENT_TEXT))
+            message = translate(Message(COMMENT_DESCRIPTION_INTELLIGENT_TEXT),
+                                context=self.request)
         else:
-            message = translate(Message(COMMENT_DESCRIPTION_PLAIN_TEXT))
+            message = translate(Message(COMMENT_DESCRIPTION_PLAIN_TEXT),
+                                context=self.request)
 
         # comment workflow
         wftool = getToolByName(context, "portal_workflow", None)

plone/app/discussion/locales/af/LC_MESSAGES/plone.app.discussion.po

@@ -11,11 +11,11 @@
 # Sommige mense verkies die hoflikheidsvorm "u" bo "jy/jou", en anders om.
 # Ons probeer dus maar om sover moontlik in die passiewe vorm te skryf.
 # Bv.
-#  - "Attach your file" -> "Heg die lêer aan"
+# - "Attach your file" -> "Heg die lêer aan"
-#  - "Afterwards you can attach your files" -> "Agterna kan lêers aangeheg
+# - "Afterwards you can attach your files" -> "Agterna kan lêers aangeheg
 # 
 # An updateable list of Afrikaans computer terms can be found here:
-#   https://wiki.ubuntu.com/AfrikaansTranslators/VertalerWoordeboek
+# https://wiki.ubuntu.com/AfrikaansTranslators/VertalerWoordeboek
 # 
 msgid ""
 msgstr ""
@@ -23,65 +23,69 @@ msgstr ""
 "POT-Creation-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "PO-Revision-Date: 2010-06-07 16:30+0100\n"
 "Last-Translator: JC Brand <brand at syslab.com>\n"
-"Language-Code: af\n"
 "Language-Team: Afrikaans <plone-i18n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Preferred-Encodings: utf-8 latin1\n"
+"Language-Code: af\n"
 "Language-Name: Afrikaans\n"
 "Preferred-Encodings: utf-8 latin1\n"
 "Domain: plone.app.discussion\n"
 
-#: ./comment.py:217
+#: ./comment.py:234
 msgid "A comment has been posted."
 msgstr "'n Opmerking is geplaas."
 
-#: ./interfaces.py:248
+#: ./interfaces.py:283
 msgid "A comment id unique to this conversation"
 msgstr "'n ID uniek tot hierdie gesprek"
 
-#: ./browser/comments.py:53
+#: ./browser/comments.py:71
 msgid "Add a comment"
 msgstr "Voeg 'n opmerking by"
 
-#: ./browser/controlpanel.py:41
+#: ./browser/controlpanel.py:63
 msgid "Anonymous Comments"
 msgstr "Anonieme kommentaar"
 
-#: ./interfaces.py:273
+#: ./interfaces.py:308
 msgid "Author name (for display)"
 msgstr "Outeur naam (om te vertoon)"
 
-#: ./browser/comments.py:219
+#: ./browser/comments.py:252
+#: ./browser/controlpanel.py:83
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ./browser/moderation.py:148
+#: ./browser/controlpanel.py:79
+msgid "Changes saved"
+msgstr ""
+
+#: ./browser/moderation.py:165
 msgid "Comment approved."
 msgstr "Opmerking goedgekeur"
 
-#: ./browser/moderation.py:109
+#: ./browser/moderation.py:126
 msgid "Comment deleted."
 msgstr "Opmerking verwyder"
 
-#: ./browser/controlpanel.py:42
+#: ./browser/controlpanel.py:64
 msgid "Commenter Image"
 msgstr "Kommentator se Profielfoto"
 
 msgid "Commenting infrastructure for Plone"
 msgstr "Kommentaarinfrastruktuur vir Plone"
 
-#: ./interfaces.py:243
+#: ./interfaces.py:278
 msgid "Conversation"
 msgstr "Gesprek"
 
-#: ./interfaces.py:274
+#: ./interfaces.py:309
 msgid "Creation date"
 msgstr "Skeppingsdatum"
 
-#: ./interfaces.py:128
+#: ./interfaces.py:163
 msgid "Date of the most recent comment"
 msgstr "Datum van die laaste opmerking"
 
@@ -89,39 +93,43 @@ msgstr "Datum van die laaste opmerking"
 msgid "Disabled"
 msgstr "Uitgeskakel"
 
-#: ./browser/controlpanel.py:13
+#: ./browser/controlpanel.py:32
 msgid "Discussion settings"
 msgstr "Kommentaar instellings"
 
-#: ./interfaces.py:260
+#: ./browser/controlpanel.py:85
+msgid "Edit cancelled"
+msgstr ""
+
+#: ./interfaces.py:295
 msgid "Email"
 msgstr "E-pos"
 
-#: ./browser/controlpanel.py:40
+#: ./browser/controlpanel.py:62
 msgid "Enable Comments"
 msgstr "Laat kommentare toe"
 
-#: ./interfaces.py:251
+#: ./interfaces.py:286
 msgid "Id of comment this comment is in reply to"
 msgstr "Id van dié opmerking waarop hierdie een antwoord"
 
-#: ./interfaces.py:265
+#: ./interfaces.py:300
 msgid "MIME type"
 msgstr "MIME-tipe"
 
-#: ./browser/controlpanel.py:44
+#: ./browser/controlpanel.py:66
 msgid "Moderator Email Notification"
 msgstr "E-pos in kennis stelling vir die redaksie"
 
-#: ./interfaces.py:275
+#: ./interfaces.py:310
 msgid "Modification date"
 msgstr "Wysigingsdatum"
 
-#: ./interfaces.py:245
+#: ./interfaces.py:280
 msgid "Name"
 msgstr "Naam"
 
-#: ./interfaces.py:269
+#: ./interfaces.py:304
 msgid "Notify me of new comments via email."
 msgstr "Stel my in kennis van nuwe opmerkings m.b.v e-pos"
 
@@ -129,28 +137,32 @@ msgstr "Stel my in kennis van nuwe opmerkings m.b.v e-pos"
 msgid "Plone Discussions"
 msgstr "Plone Kommentare"
 
-#: ./interfaces.py:238
+#: ./interfaces.py:273
 msgid "Portal type"
 msgstr "Portaaltipe"
 
-#: ./interfaces.py:133
+#: ./browser/controlpanel.py:72
+msgid "Save"
+msgstr ""
+
+#: ./interfaces.py:168
 msgid "The set of unique commentators (usernames)"
 msgstr "Lys van kommentators (gebruikersname)"
 
-#: ./interfaces.py:122
+#: ./interfaces.py:157
 msgid "Total number of comments on this item"
 msgstr "Totale aantal opmerkings op hierdie item"
 
-#: ./browser/controlpanel.py:46
+#: ./browser/controlpanel.py:68
 msgid "User Email Notification"
 msgstr "Gebruik e-pos in kennis stelling"
 
-#: ./browser/comments.py:212
+#: ./browser/comments.py:245
 msgid "Your comment awaits moderator approval."
 msgstr "Die opmerking sal geplaas word sodra dit goedgekeur is."
 
 #. Default: "Comment"
-#: ./browser/comments.py:102
+#: ./browser/comments.py:127
 msgid "add_comment_button"
 msgstr "Lewer kommentaar"
 
@@ -164,8 +176,23 @@ msgstr "Skrap"
 msgid "bulkactions_publish"
 msgstr "Keur goed"
 
+#. Default: "You can add a comment by filling out the form below. Plain text formatting. Web and email addresses are transformed into clickable links."
+#: ./browser/comments.py:56
+msgid "comment_description_intelligent_text"
+msgstr ""
+
+#. Default: "Comments are moderated."
+#: ./browser/comments.py:62
+msgid "comment_description_moderation_enabled"
+msgstr ""
+
+#. Default: "You can add a comment by filling out the form below. Plain text formatting."
+#: ./browser/comments.py:51
+msgid "comment_description_plain_text"
+msgstr ""
+
 #. Default: "${creator} on ${content}"
-#: ./comment.py:48
+#: ./comment.py:55
 msgid "comment_title"
 msgstr "${creator} op ${content}"
 
@@ -205,37 +232,49 @@ msgid "help_anonymous_comments"
 msgstr "Indien geselekteer, sal anonieme besoekers opmerkings kan laat sonder om aan te meld. Die captcha-oplossing word aanbeveel indien hierdie opsie aangeskakel word, om gemorspos te voorkom."
 
 #. Default: "Use this setting to enable or disable Captcha validation for comments. Install plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet, or collective.z3cform.norobots if there are no options available."
-#: ./interfaces.py:58
+#: ./interfaces.py:83
 msgid "help_captcha"
 msgstr "Gebruik hierdie instelling om Captcha validasie vir kommentaar aan of af te skakel. Installeer plone.formwidget of plone.formwidget.captcha indien daar geen opsies beskikbaar is nie."
 
 #. Default: "Some discussion related settings are not located in the Discussion Control Panel.\nTo enable comments for a specific content type, go to the Types Control Panel of this type and choose \"Allow comments\".\nTo enable the moderation workflow for comments, go to the Types Control Panel, choose \"Comment\" and set workflow to \"Comment Review Workflow\"."
-#: ./browser/controlpanel.py:14
+#: ./browser/controlpanel.py:33
 msgid "help_discussion_settings_editform"
-msgstr "Sommige besprekingsinstellings kom nie op hierdie bladsy voor nie.\nOm kommentaar vir 'n spesifieke inhoudstipe aan te skakel, gaan na die Tipes Konfigurasie, kies 'Comment' en stel die werksvloei na \"Comment Review Workflow\"."
+msgstr ""
+"Sommige besprekingsinstellings kom nie op hierdie bladsy voor nie.\n"
+"Om kommentaar vir 'n spesifieke inhoudstipe aan te skakel, gaan na die Tipes Konfigurasie, kies 'Comment' en stel die werksvloei na \"Comment Review Workflow\"."
 
 #. Default: "If selected, users are able to post comments on the site. Though, you have to enable comments for specific content types, folders or content objects before users will be able to post comments."
 #: ./interfaces.py:26
 msgid "help_globally_enabled"
 msgstr "Indien geselekteer, sal gebruikers op die werf kommentare kan plaas. Kommentare moet moontlik ook nog vir sekere inhoudstipe, vouers en objekte aangeskakel word, voordat kommentaar daar gelewer kan word."
 
+#. Default: "Address to which moderator notifications will be sent. If not specified, the Site 'From' Address from the mail control panel will be used."
+#: ./interfaces.py:117
+msgid "help_moderator_email"
+msgstr ""
+
 #. Default: "If selected, the moderator is notified if a comment needs attention."
-#: ./interfaces.py:83
+#: ./interfaces.py:108
 msgid "help_moderator_notification_enabled"
 msgstr "Indien geselekteer, sal die moderator in kennis gestel word wanneer 'n opmerking aandag verg."
 
 #. Default: "If selected, an image of the user is shown next to the comment."
-#: ./interfaces.py:73
+#: ./interfaces.py:98
 msgid "help_show_commenter_image"
 msgstr "Indien geselekteer, sal die profielfoto van 'n gebruiker langs sy opmerking vertoon."
 
+#. Default: "Use this setting to choose if the comment text should be transformed in any way. You can choose between 'Plain text' and 'Intelligent text'. 'Intelligent text' converts plain text into HTML where line breaks and indentation is preserved, and web and email addresses are made into clickable links."
+#: ./interfaces.py:67
+msgid "help_text_transform"
+msgstr ""
+
 #. Default: "If selected, users can choose to be notified of new comments by email."
-#: ./interfaces.py:93
+#: ./interfaces.py:128
 msgid "help_user_notification_enabled"
 msgstr "Indien geselekteer, sal gebruikers kan kies om per e-pos van nuwe kommentaar in kennis gestel te word."
 
 #. Default: "Anonymous"
-#: ./comment.py:121
+#: ./comment.py:130
 msgid "label_anonymous"
 msgstr "Anoniem"
 
@@ -250,12 +289,12 @@ msgid "label_apply"
 msgstr "Pas toe"
 
 #. Default: "Captcha"
-#: ./interfaces.py:56
+#: ./interfaces.py:81
 msgid "label_captcha"
 msgstr "Captcha"
 
 #. Default: "Comment"
-#: ./interfaces.py:266
+#: ./interfaces.py:301
 msgid "label_comment"
 msgstr "Opmerking"
 
@@ -269,8 +308,13 @@ msgstr "Skrap"
 msgid "label_globally_enabled"
 msgstr "Laat kommentare globaal toe"
 
+#. Default: "Moderator Email Address"
+#: ./interfaces.py:116
+msgid "label_moderator_email"
+msgstr ""
+
 #. Default: "Enable moderator email notification"
-#: ./interfaces.py:81
+#: ./interfaces.py:106
 msgid "label_moderator_notification_enabled"
 msgstr "Skakel moderator e-pos in kennis stelling aan"
 
@@ -285,7 +329,7 @@ msgid "label_says"
 msgstr "sê:"
 
 #. Default: "Show commenter image"
-#: ./interfaces.py:71
+#: ./interfaces.py:96
 msgid "label_show_commenter_image"
 msgstr "Vertoon kommentaarleweraar se foto"
 
@@ -295,22 +339,22 @@ msgid "label_show_full_comment_text"
 msgstr "Toon die volledige opmerking"
 
 #. Default: "Subject"
-#: ./interfaces.py:262
+#: ./interfaces.py:297
 msgid "label_subject"
 msgstr "Onderwerp"
 
 #. Default: "Comment text transform"
-#: ./interfaces.py:48
+#: ./interfaces.py:65
 msgid "label_text_transform"
 msgstr "Kommentaar tekstransformasie"
 
 #. Default: "Enable user email notification"
-#: ./interfaces.py:91
+#: ./interfaces.py:126
 msgid "label_user_notification_enabled"
 msgstr "Skakel e-pos in kennis stelling aan vir gebruikers"
 
 #. Default: "A comment on '${title}' has been posted here: ${link}"
-#: ./comment.py:51
+#: ./comment.py:58
 msgid "mail_notification_message"
 msgstr "'n Opmerking is op '${title}' gelewer: ${link}"
 

plone/app/discussion/locales/ca/LC_MESSAGES/plone.app.discussion.po

@@ -4,6 +4,7 @@ msgstr ""
 "POT-Creation-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "PO-Revision-Date: 2010-11-17 16:52+0100\n"
 "Last-Translator: Victor Fernandez de Alba <sneridagh@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -13,54 +14,59 @@ msgstr ""
 "Preferred-Encodings: utf-8 latin1\n"
 "Domain: plone.app.discussion\n"
 
-#: ./comment.py:217
+#: ./comment.py:234
 msgid "A comment has been posted."
 msgstr "Comentari afegit."
 
-#: ./interfaces.py:248
+#: ./interfaces.py:283
 msgid "A comment id unique to this conversation"
 msgstr "Un identificador exclusiu assignat al comentari per aquesta conversa"
 
-#: ./browser/comments.py:53
+#: ./browser/comments.py:71
 msgid "Add a comment"
 msgstr "Afegir un comentari"
 
-#: ./browser/controlpanel.py:41
+#: ./browser/controlpanel.py:63
 msgid "Anonymous Comments"
 msgstr "Comentaris anònims"
 
-#: ./interfaces.py:273
+#: ./interfaces.py:308
 msgid "Author name (for display)"
 msgstr "Nom de l'autor (per mostrar)"
 
-#: ./browser/comments.py:219
+#: ./browser/comments.py:252
+#: ./browser/controlpanel.py:83
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ./browser/moderation.py:148
+#: ./browser/controlpanel.py:79
+msgid "Changes saved"
+msgstr ""
+
+#: ./browser/moderation.py:165
 msgid "Comment approved."
 msgstr "Comentari aprovat."
 
-#: ./browser/moderation.py:109
+#: ./browser/moderation.py:126
 msgid "Comment deleted."
 msgstr "Comentari esborrat."
 
-#: ./browser/controlpanel.py:42
+#: ./browser/controlpanel.py:64
 msgid "Commenter Image"
 msgstr "Imatge de l'autor"
 
 msgid "Commenting infrastructure for Plone"
 msgstr "Infraestructura de comentaris per Plone"
 
-#: ./interfaces.py:243
+#: ./interfaces.py:278
 msgid "Conversation"
 msgstr "Conversa"
 
-#: ./interfaces.py:274
+#: ./interfaces.py:309
 msgid "Creation date"
 msgstr "Data de creació"
 
-#: ./interfaces.py:128
+#: ./interfaces.py:163
 msgid "Date of the most recent comment"
 msgstr "Data del comentari més recent"
 
@@ -68,39 +74,43 @@ msgstr "Data del comentari més recent"
 msgid "Disabled"
 msgstr "Desactivat"
 
-#: ./browser/controlpanel.py:13
+#: ./browser/controlpanel.py:32
 msgid "Discussion settings"
 msgstr "Configuració dels comentaris"
 
-#: ./interfaces.py:260
+#: ./browser/controlpanel.py:85
+msgid "Edit cancelled"
+msgstr ""
+
+#: ./interfaces.py:295
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: ./browser/controlpanel.py:40
+#: ./browser/controlpanel.py:62
 msgid "Enable Comments"
 msgstr "Permetre comentaris"
 
-#: ./interfaces.py:251
+#: ./interfaces.py:286
 msgid "Id of comment this comment is in reply to"
 msgstr "Identificador únic del comentari en relació al comentari del qual és resposta"
 
-#: ./interfaces.py:265
+#: ./interfaces.py:300
 msgid "MIME type"
 msgstr "Tipus MIME"
 
-#: ./browser/controlpanel.py:44
+#: ./browser/controlpanel.py:66
 msgid "Moderator Email Notification"
 msgstr "Notificació al moderador per correu electrònic"
 
-#: ./interfaces.py:275
+#: ./interfaces.py:310
 msgid "Modification date"
 msgstr "Data de modificació"
 
-#: ./interfaces.py:245
+#: ./interfaces.py:280
 msgid "Name"
 msgstr "Nom"
 
-#: ./interfaces.py:269
+#: ./interfaces.py:304
 msgid "Notify me of new comments via email."
 msgstr "Notifica'm de la creació de nous comentaris via correu electrònic."
 
@@ -108,28 +118,32 @@ msgstr "Notifica'm de la creació de nous comentaris via correu electrònic."
 msgid "Plone Discussions"
 msgstr "Plone Discussions"
 
-#: ./interfaces.py:238
+#: ./interfaces.py:273
 msgid "Portal type"
 msgstr "Tipus d'objecte"
 
-#: ./interfaces.py:133
+#: ./browser/controlpanel.py:72
+msgid "Save"
+msgstr ""
+
+#: ./interfaces.py:168
 msgid "The set of unique commentators (usernames)"
 msgstr "Llistat d'usuaris que han comentat (noms d'usuari)"
 
-#: ./interfaces.py:122
+#: ./interfaces.py:157
 msgid "Total number of comments on this item"
 msgstr "Número total de comentaris en aquest contingut"
 
-#: ./browser/controlpanel.py:46
+#: ./browser/controlpanel.py:68
 msgid "User Email Notification"
 msgstr "Notificació a l'usuari via mail"
 
-#: ./browser/comments.py:212
+#: ./browser/comments.py:245
 msgid "Your comment awaits moderator approval."
 msgstr "El vostre comentari està pendent d'aprovació per part del moderador de l'espai"
 
 #. Default: "Comment"
-#: ./browser/comments.py:102
+#: ./browser/comments.py:127
 msgid "add_comment_button"
 msgstr "Comenta"
 
@@ -143,8 +157,23 @@ msgstr "Esborra"
 msgid "bulkactions_publish"
 msgstr "Publica"
 
+#. Default: "You can add a comment by filling out the form below. Plain text formatting. Web and email addresses are transformed into clickable links."
+#: ./browser/comments.py:56
+msgid "comment_description_intelligent_text"
+msgstr ""
+
+#. Default: "Comments are moderated."
+#: ./browser/comments.py:62
+msgid "comment_description_moderation_enabled"
+msgstr ""
+
+#. Default: "You can add a comment by filling out the form below. Plain text formatting."
+#: ./browser/comments.py:51
+msgid "comment_description_plain_text"
+msgstr ""
+
 #. Default: "${creator} on ${content}"
-#: ./comment.py:48
+#: ./comment.py:55
 msgid "comment_title"
 msgstr "${creator} sobre ${content}"
 
@@ -184,12 +213,12 @@ msgid "help_anonymous_comments"
 msgstr "Si està seleccionada, els usuaris anònims podran afegir comentaris sense identificar-se. Es recomana la utilització de una eina de captcha per evitar comentaris spam si aquesta opció està activada."
 
 #. Default: "Use this setting to enable or disable Captcha validation for comments. Install plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet, or collective.z3cform.norobots if there are no options available."
-#: ./interfaces.py:58
+#: ./interfaces.py:83
 msgid "help_captcha"
 msgstr "Utilitzeu aquesta opció per activar o desactivar una eina de captcha pels comentaris. Instal·leu plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet o collective.z3cform.norobots si no teniu cap opció disponible."
 
 #. Default: "Some discussion related settings are not located in the Discussion Control Panel.\nTo enable comments for a specific content type, go to the Types Control Panel of this type and choose \"Allow comments\".\nTo enable the moderation workflow for comments, go to the Types Control Panel, choose \"Comment\" and set workflow to \"Comment Review Workflow\"."
-#: ./browser/controlpanel.py:14
+#: ./browser/controlpanel.py:33
 msgid "help_discussion_settings_editform"
 msgstr "Algunes de les configuracions dels comentaris no estan en la element de configuració 'Comentaris' del panell de control de l'espai. Per activar els comentaris per un tipus de contingut específic, dirigiu-vos al element de configuració 'Tipus' i activeu la opció 'Permetre comentaris'. Per activar el circuit de treball (workflow) de moderació de comentaris, dirigiu-vos al element de configuració de 'Tipus', seleccioneu 'Comentari' i escolliu el 'Workflow de moderació de comentaris'."
 
@@ -198,23 +227,33 @@ msgstr "Algunes de les configuracions dels comentaris no estan en la element de
 msgid "help_globally_enabled"
 msgstr "Si està seleccionada, es permet que els usuaris puguin afegir comentaris a l'espai. De tota manera, teniu que activar els comentaris per a cada tipus de contingut específicament abans de que pogueu afegir comentaris."
 
+#. Default: "Address to which moderator notifications will be sent. If not specified, the Site 'From' Address from the mail control panel will be used."
+#: ./interfaces.py:117
+msgid "help_moderator_email"
+msgstr ""
+
 #. Default: "If selected, the moderator is notified if a comment needs attention."
-#: ./interfaces.py:83
+#: ./interfaces.py:108
 msgid "help_moderator_notification_enabled"
 msgstr "Si està seleccionada, es notificarà per correu electrònic al moderador els nous comentaris."
 
 #. Default: "If selected, an image of the user is shown next to the comment."
-#: ./interfaces.py:73
+#: ./interfaces.py:98
 msgid "help_show_commenter_image"
 msgstr "Si està seleccionada, es mostrarà el retrat (o imatge) que hagi configurat l'usuari en el seu perfil juntament amb el comentari."
 
+#. Default: "Use this setting to choose if the comment text should be transformed in any way. You can choose between 'Plain text' and 'Intelligent text'. 'Intelligent text' converts plain text into HTML where line breaks and indentation is preserved, and web and email addresses are made into clickable links."
+#: ./interfaces.py:67
+msgid "help_text_transform"
+msgstr ""
+
 #. Default: "If selected, users can choose to be notified of new comments by email."
-#: ./interfaces.py:93
+#: ./interfaces.py:128
 msgid "help_user_notification_enabled"
 msgstr "Si està seleccionada, els usuaris poden escollir si volen ser notificats cada cop que s'afegeixi un nou comentari al contingut."
 
 #. Default: "Anonymous"
-#: ./comment.py:121
+#: ./comment.py:130
 msgid "label_anonymous"
 msgstr "Anònim"
 
@@ -229,12 +268,12 @@ msgid "label_apply"
 msgstr "Aplica"
 
 #. Default: "Captcha"
-#: ./interfaces.py:56
+#: ./interfaces.py:81
 msgid "label_captcha"
 msgstr "Captcha"
 
 #. Default: "Comment"
-#: ./interfaces.py:266
+#: ./interfaces.py:301
 msgid "label_comment"
 msgstr "Comentari"
 
@@ -248,8 +287,13 @@ msgstr "Esborra"
 msgid "label_globally_enabled"
 msgstr "Activa els comentaris de forma global"
 
+#. Default: "Moderator Email Address"
+#: ./interfaces.py:116
+msgid "label_moderator_email"
+msgstr ""
+
 #. Default: "Enable moderator email notification"
-#: ./interfaces.py:81
+#: ./interfaces.py:106
 msgid "label_moderator_notification_enabled"
 msgstr "Activa la notificació al moderador"
 
@@ -264,7 +308,7 @@ msgid "label_says"
 msgstr "diu:"
 
 #. Default: "Show commenter image"
-#: ./interfaces.py:71
+#: ./interfaces.py:96
 msgid "label_show_commenter_image"
 msgstr "Mostra el retrat (o imatge) de l'autor"
 
@@ -274,22 +318,22 @@ msgid "label_show_full_comment_text"
 msgstr "Mostra text complet"
 
 #. Default: "Subject"
-#: ./interfaces.py:262
+#: ./interfaces.py:297
 msgid "label_subject"
 msgstr "Tema"
 
 #. Default: "Comment text transform"
-#: ./interfaces.py:48
+#: ./interfaces.py:65
 msgid "label_text_transform"
 msgstr "Transformacions aplicades al text del comentari"
 
 #. Default: "Enable user email notification"
-#: ./interfaces.py:91
+#: ./interfaces.py:126
 msgid "label_user_notification_enabled"
 msgstr "Activa les notificacions als usuaris"
 
 #. Default: "A comment on '${title}' has been posted here: ${link}"
-#: ./comment.py:51
+#: ./comment.py:58
 #, fuzzy
 msgid "mail_notification_message"
 msgstr "S'ha publicat un comentari sobre el contingut ${title} en aquesta adreça: ${link}"

plone/app/discussion/locales/cs/LC_MESSAGES/plone.app.discussion.po

@@ -14,54 +14,59 @@ msgstr ""
 "Preferred-Encodings: utf-8 latin1\n"
 "Domain: DOMAIN\n"
 
-#: ./comment.py:217
+#: ./comment.py:234
 msgid "A comment has been posted."
 msgstr "Komentář byl přidán."
 
-#: ./interfaces.py:248
+#: ./interfaces.py:283
 msgid "A comment id unique to this conversation"
 msgstr "Identifikátor komentáře v této konverzaci."
 
-#: ./browser/comments.py:53
+#: ./browser/comments.py:71
 msgid "Add a comment"
 msgstr "Přidat komentář"
 
-#: ./browser/controlpanel.py:41
+#: ./browser/controlpanel.py:63
 msgid "Anonymous Comments"
 msgstr "Anonymní komentáře"
 
-#: ./interfaces.py:273
+#: ./interfaces.py:308
 msgid "Author name (for display)"
 msgstr "Jméno autora (pro zobrazení)"
 
-#: ./browser/comments.py:219
+#: ./browser/comments.py:252
+#: ./browser/controlpanel.py:83
 msgid "Cancel"
 msgstr "Storno"
 
-#: ./browser/moderation.py:148
+#: ./browser/controlpanel.py:79
+msgid "Changes saved"
+msgstr ""
+
+#: ./browser/moderation.py:165
 msgid "Comment approved."
 msgstr "Komentář byl schválen."
 
-#: ./browser/moderation.py:109
+#: ./browser/moderation.py:126
 msgid "Comment deleted."
 msgstr "Komentář byl odebrán."
 
-#: ./browser/controlpanel.py:42
+#: ./browser/controlpanel.py:64
 msgid "Commenter Image"
 msgstr "Portét komentujícího"
 
 msgid "Commenting infrastructure for Plone"
 msgstr "Komentářový systém pro Plone"
 
-#: ./interfaces.py:243
+#: ./interfaces.py:278
 msgid "Conversation"
 msgstr "Konverzace"
 
-#: ./interfaces.py:274
+#: ./interfaces.py:309
 msgid "Creation date"
 msgstr "Datum vytvoření"
 
-#: ./interfaces.py:128
+#: ./interfaces.py:163
 msgid "Date of the most recent comment"
 msgstr "Datum nejnovějšícho komentáře"
 
@@ -69,39 +74,43 @@ msgstr "Datum nejnovějšícho komentáře"
 msgid "Disabled"
 msgstr "Zakázáno"
 
-#: ./browser/controlpanel.py:13
+#: ./browser/controlpanel.py:32
 msgid "Discussion settings"
 msgstr "Nastavení komentářů"
 
-#: ./interfaces.py:260
+#: ./browser/controlpanel.py:85
+msgid "Edit cancelled"
+msgstr ""
+
+#: ./interfaces.py:295
 msgid "Email"
 msgstr "Email"
 
-#: ./browser/controlpanel.py:40
+#: ./browser/controlpanel.py:62
 msgid "Enable Comments"
 msgstr "Povolit komentáře"
 
-#: ./interfaces.py:251
+#: ./interfaces.py:286
 msgid "Id of comment this comment is in reply to"
 msgstr "Id předchozího komentáře, na který je tento odpovědí"
 
-#: ./interfaces.py:265
+#: ./interfaces.py:300
 msgid "MIME type"
 msgstr "MIME typ"
 
-#: ./browser/controlpanel.py:44
+#: ./browser/controlpanel.py:66
 msgid "Moderator Email Notification"
 msgstr "Notifikace moderátorů emailem"
 
-#: ./interfaces.py:275
+#: ./interfaces.py:310
 msgid "Modification date"
 msgstr "Datum změny"
 
-#: ./interfaces.py:245
+#: ./interfaces.py:280
 msgid "Name"
 msgstr "Jméno"
 
-#: ./interfaces.py:269
+#: ./interfaces.py:304
 msgid "Notify me of new comments via email."
 msgstr "Chci zasílat notifikace o nových komentářích emailem."
 
@@ -109,28 +118,32 @@ msgstr "Chci zasílat notifikace o nových komentářích emailem."
 msgid "Plone Discussions"
 msgstr "Komentáře"
 
-#: ./interfaces.py:238
+#: ./interfaces.py:273
 msgid "Portal type"
 msgstr "Typ položky"
 
-#: ./interfaces.py:133
+#: ./browser/controlpanel.py:72
+msgid "Save"
+msgstr ""
+
+#: ./interfaces.py:168
 msgid "The set of unique commentators (usernames)"
 msgstr "Seznam komentujících"
 
-#: ./interfaces.py:122
+#: ./interfaces.py:157
 msgid "Total number of comments on this item"
 msgstr "Celkový počet komentářů k této položce"
 
-#: ./browser/controlpanel.py:46
+#: ./browser/controlpanel.py:68
 msgid "User Email Notification"
 msgstr "Notifikace emailem"
 
-#: ./browser/comments.py:212
+#: ./browser/comments.py:245
 msgid "Your comment awaits moderator approval."
 msgstr "Váš komentář čeká na schválení."
 
 #. Default: "Comment"
-#: ./browser/comments.py:102
+#: ./browser/comments.py:127
 msgid "add_comment_button"
 msgstr "Přidat komentář"
 
@@ -144,8 +157,23 @@ msgstr "Odebrat"
 msgid "bulkactions_publish"
 msgstr "Schválit"
 
+#. Default: "You can add a comment by filling out the form below. Plain text formatting. Web and email addresses are transformed into clickable links."
+#: ./browser/comments.py:56
+msgid "comment_description_intelligent_text"
+msgstr ""
+
+#. Default: "Comments are moderated."
+#: ./browser/comments.py:62
+msgid "comment_description_moderation_enabled"
+msgstr ""
+
+#. Default: "You can add a comment by filling out the form below. Plain text formatting."
+#: ./browser/comments.py:51
+msgid "comment_description_plain_text"
+msgstr ""
+
 #. Default: "${creator} on ${content}"
-#: ./comment.py:48
+#: ./comment.py:55
 msgid "comment_title"
 msgstr "${creator} k ${content}"
 
@@ -185,12 +213,12 @@ msgid "help_anonymous_comments"
 msgstr "Je-li zaškrtnuto, nepřihlášení uživatelé mohou posílat komentáře. Doporučujeme použití Captcha, pokud povolíte tuto volbu."
 
 #. Default: "Use this setting to enable or disable Captcha validation for comments. Install plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet, or collective.z3cform.norobots if there are no options available."
-#: ./interfaces.py:58
+#: ./interfaces.py:83
 msgid "help_captcha"
 msgstr "Zde můžete povolit nebo zakázat Captcha pro komentáře. Pokud zde není žádná možnost k výběru, nainstalujte prosím balíček plone.formwidget.captcha nebo plone.formwidget.recaptcha, collective.akismet nebo collective.z3cform.norobots."
 
 #. Default: "Some discussion related settings are not located in the Discussion Control Panel.\nTo enable comments for a specific content type, go to the Types Control Panel of this type and choose \"Allow comments\".\nTo enable the moderation workflow for comments, go to the Types Control Panel, choose \"Comment\" and set workflow to \"Comment Review Workflow\"."
-#: ./browser/controlpanel.py:14
+#: ./browser/controlpanel.py:33
 msgid "help_discussion_settings_editform"
 msgstr ""
 "Nekterá nastavení pro diskuse nejsou k dispozici v ovládacím panelu komentářů.\n"
@@ -202,23 +230,33 @@ msgstr ""
 msgid "help_globally_enabled"
 msgstr "Je-li zaškrtnuto, uživatelé mohou přidávat komentáře. Navíc však musíte ověřit, že je povoleno přidávání komentářů k příslušným typům položek."
 
+#. Default: "Address to which moderator notifications will be sent. If not specified, the Site 'From' Address from the mail control panel will be used."
+#: ./interfaces.py:117
+msgid "help_moderator_email"
+msgstr ""
+
 #. Default: "If selected, the moderator is notified if a comment needs attention."
-#: ./interfaces.py:83
+#: ./interfaces.py:108
 msgid "help_moderator_notification_enabled"
 msgstr "Je-li zaškrtnuto, moderátor je upozorněn na komentáře, které vyžadují jeho zásah."
 
 #. Default: "If selected, an image of the user is shown next to the comment."
-#: ./interfaces.py:73
+#: ./interfaces.py:98
 msgid "help_show_commenter_image"
 msgstr "Je-li zaškrtnuto, je vedle komentáře zobrazen portrét autora komentáře."
 
+#. Default: "Use this setting to choose if the comment text should be transformed in any way. You can choose between 'Plain text' and 'Intelligent text'. 'Intelligent text' converts plain text into HTML where line breaks and indentation is preserved, and web and email addresses are made into clickable links."
+#: ./interfaces.py:67
+msgid "help_text_transform"
+msgstr ""
+
 #. Default: "If selected, users can choose to be notified of new comments by email."
-#: ./interfaces.py:93
+#: ./interfaces.py:128
 msgid "help_user_notification_enabled"
 msgstr "Je-li zaškrtnuto, uživatelé se mohou rozhodnout zda si přejí být upozorněni na nové komentáře emailem."
 
 #. Default: "Anonymous"
-#: ./comment.py:121
+#: ./comment.py:130
 msgid "label_anonymous"
 msgstr "Anonym"
 
@@ -233,12 +271,12 @@ msgid "label_apply"
 msgstr "Provést"
 
 #. Default: "Captcha"
-#: ./interfaces.py:56
+#: ./interfaces.py:81
 msgid "label_captcha"
 msgstr "Captcha"
 
 #. Default: "Comment"
-#: ./interfaces.py:266
+#: ./interfaces.py:301
 msgid "label_comment"
 msgstr "Komentář"
 
@@ -252,8 +290,13 @@ msgstr "Odebrat"
 msgid "label_globally_enabled"
 msgstr "Globální povolení komentářů"
 
+#. Default: "Moderator Email Address"
+#: ./interfaces.py:116
+msgid "label_moderator_email"
+msgstr ""
+
 #. Default: "Enable moderator email notification"
-#: ./interfaces.py:81
+#: ./interfaces.py:106
 msgid "label_moderator_notification_enabled"
 msgstr "Povolit emailovou notifikaci moderátorů"
 
@@ -268,7 +311,7 @@ msgid "label_says"
 msgstr "píše:"
 
 #. Default: "Show commenter image"
-#: ./interfaces.py:71
+#: ./interfaces.py:96
 msgid "label_show_commenter_image"
 msgstr "Zobrazit portrét komentujícího"
 
@@ -278,22 +321,22 @@ msgid "label_show_full_comment_text"
 msgstr "zobrazit celý text příspěvku"
 
 #. Default: "Subject"
-#: ./interfaces.py:262
+#: ./interfaces.py:297
 msgid "label_subject"
 msgstr "Předmět"
 
 #. Default: "Comment text transform"
-#: ./interfaces.py:48
+#: ./interfaces.py:65
 msgid "label_text_transform"
 msgstr "Transformace textu"
 
 #. Default: "Enable user email notification"
-#: ./interfaces.py:91
+#: ./interfaces.py:126
 msgid "label_user_notification_enabled"
 msgstr "Povolit notifikaci uživatelů emailem"
 
 #. Default: "A comment on '${title}' has been posted here: ${link}"
-#: ./comment.py:51
+#: ./comment.py:58
 msgid "mail_notification_message"
 msgstr "Na adrese ${link}\" byl přidán komentář k položce '${title}'."
 

plone/app/discussion/locales/da/LC_MESSAGES/plone.app.discussion.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: plone.app.discussion\n"
-"POT-Creation-Date: 2010-11-03 13:43+0000\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "PO-Revision-Date: 2010-01-28 15:00+0000\n"
 "Last-Translator: Anton Stonor <anton@headnet.dk>\n"
 "Language-Team: Anton Stonor <anton@headnet.dk>\n"
@@ -14,54 +14,59 @@ msgstr ""
 "Preferred-Encodings: utf-8\n"
 "Domain: plone.app.discussion\n"
 
-#: ./comment.py:217
+#: ./comment.py:234
 msgid "A comment has been posted."
 msgstr "En kommentar er gem."
 
-#: ./interfaces.py:248
+#: ./interfaces.py:283
 msgid "A comment id unique to this conversation"
 msgstr "En kommentar-id som er unik for denne dialog"
 
-#: ./browser/comments.py:53
+#: ./browser/comments.py:71
 msgid "Add a comment"
 msgstr "Tilføj en kommentar"
 
-#: ./browser/controlpanel.py:41
+#: ./browser/controlpanel.py:63
 msgid "Anonymous Comments"
 msgstr "Anonyme kommentarer"
 
-#: ./interfaces.py:273
+#: ./interfaces.py:308
 msgid "Author name (for display)"
 msgstr "Forfatter"
 
-#: ./browser/comments.py:219
+#: ./browser/comments.py:252
+#: ./browser/controlpanel.py:83
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: ./browser/moderation.py:148
+#: ./browser/controlpanel.py:79
+msgid "Changes saved"
+msgstr ""
+
+#: ./browser/moderation.py:165
 msgid "Comment approved."
 msgstr "Kommentar godkendt."
 
-#: ./browser/moderation.py:109
+#: ./browser/moderation.py:126
 msgid "Comment deleted."
 msgstr "Kommentar slettet."
 
-#: ./browser/controlpanel.py:42
+#: ./browser/controlpanel.py:64
 msgid "Commenter Image"
 msgstr "Kommentar-billede"
 
 msgid "Commenting infrastructure for Plone"
 msgstr "Kommentar-funktionalitet til Plone"
 
-#: ./interfaces.py:243
+#: ./interfaces.py:278
 msgid "Conversation"
 msgstr "Dialog"
 
-#: ./interfaces.py:274
+#: ./interfaces.py:309
 msgid "Creation date"
 msgstr "Oprettelses-dato"
 
-#: ./interfaces.py:128
+#: ./interfaces.py:163
 msgid "Date of the most recent comment"
 msgstr "Dato for den seneste kommentar"
 
@@ -69,39 +74,43 @@ msgstr "Dato for den seneste kommentar"
 msgid "Disabled"
 msgstr "Slået fra"
 
-#: ./browser/controlpanel.py:13
+#: ./browser/controlpanel.py:32
 msgid "Discussion settings"
 msgstr "Indstilling for kommentarer"
 
-#: ./interfaces.py:260
+#: ./browser/controlpanel.py:85
+msgid "Edit cancelled"
+msgstr ""
+
+#: ./interfaces.py:295
 msgid "Email"
 msgstr "Email"
 
-#: ./browser/controlpanel.py:40
+#: ./browser/controlpanel.py:62
 msgid "Enable Comments"
 msgstr "Slå kommentarer til"
 
-#: ./interfaces.py:251
+#: ./interfaces.py:286
 msgid "Id of comment this comment is in reply to"
 msgstr "Id'en på den kommentar, denne kommentar er et svar til"
 
-#: ./interfaces.py:265
+#: ./interfaces.py:300
 msgid "MIME type"
 msgstr "MIME-type"
 
-#: ./browser/controlpanel.py:44
+#: ./browser/controlpanel.py:66
 msgid "Moderator Email Notification"
 msgstr "Notificering af moderator"
 
-#: ./interfaces.py:275
+#: ./interfaces.py:310
 msgid "Modification date"
 msgstr "Ændringsdato"
 
-#: ./interfaces.py:245
+#: ./interfaces.py:280
 msgid "Name"
 msgstr "Navn"
 
-#: ./interfaces.py:269
+#: ./interfaces.py:304
 msgid "Notify me of new comments via email."
 msgstr "Send besked om nye kommentarer pr. email."
 
@@ -109,28 +118,32 @@ msgstr "Send besked om nye kommentarer pr. email."
 msgid "Plone Discussions"
 msgstr "Plone diskussioner"
 
-#: ./interfaces.py:238
+#: ./interfaces.py:273
 msgid "Portal type"
 msgstr "Portal type"
 
-#: ./interfaces.py:133
+#: ./browser/controlpanel.py:72
+msgid "Save"
+msgstr ""
+
+#: ./interfaces.py:168
 msgid "The set of unique commentators (usernames)"
 msgstr "Liste over kommentatorer (brugernavne)"
 
-#: ./interfaces.py:122
+#: ./interfaces.py:157
 msgid "Total number of comments on this item"
 msgstr "Kommentarer i alt på denne side"
 
-#: ./browser/controlpanel.py:46
+#: ./browser/controlpanel.py:68
 msgid "User Email Notification"
 msgstr "Email-notificering af brugere"
 
-#: ./browser/comments.py:212
+#: ./browser/comments.py:245
 msgid "Your comment awaits moderator approval."
 msgstr "Din kommentar venter  på godkendelse."
 
 #. Default: "Comment"
-#: ./browser/comments.py:102
+#: ./browser/comments.py:127
 msgid "add_comment_button"
 msgstr "Gem"
 
@@ -144,8 +157,23 @@ msgstr "Slet"
 msgid "bulkactions_publish"
 msgstr "Godkend"
 
+#. Default: "You can add a comment by filling out the form below. Plain text formatting. Web and email addresses are transformed into clickable links."
+#: ./browser/comments.py:56
+msgid "comment_description_intelligent_text"
+msgstr ""
+
+#. Default: "Comments are moderated."
+#: ./browser/comments.py:62
+msgid "comment_description_moderation_enabled"
+msgstr ""
+
+#. Default: "You can add a comment by filling out the form below. Plain text formatting."
+#: ./browser/comments.py:51
+msgid "comment_description_plain_text"
+msgstr ""
+
 #. Default: "${creator} on ${content}"
-#: ./comment.py:48
+#: ./comment.py:55
 msgid "comment_title"
 msgstr "${creator} på ${content}"
 
@@ -185,12 +213,12 @@ msgid "help_anonymous_comments"
 msgstr "Hvis du krydser af, kan anonyme brugere skrive kommentarer uden at være logget ind. I så fald er det en god ide at bruge CAPTCHA for at forhindre spam."
 
 #. Default: "Use this setting to enable or disable Captcha validation for comments. Install plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet, or collective.z3cform.norobots if there are no options available."
-#: ./interfaces.py:58
+#: ./interfaces.py:83
 msgid "help_captcha"
 msgstr "Her kan du slå CAPTCHA til og fra for kommentarer. Installer plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet eller collective.z3cform.norobots, hvis der ikke er nogen valgmuligheder nedenfor."
 
 #. Default: "Some discussion related settings are not located in the Discussion Control Panel.\nTo enable comments for a specific content type, go to the Types Control Panel of this type and choose \"Allow comments\".\nTo enable the moderation workflow for comments, go to the Types Control Panel, choose \"Comment\" and set workflow to \"Comment Review Workflow\"."
-#: ./browser/controlpanel.py:14
+#: ./browser/controlpanel.py:33
 msgid "help_discussion_settings_editform"
 msgstr ""
 
@@ -199,23 +227,33 @@ msgstr ""
 msgid "help_globally_enabled"
 msgstr "Hvis du krydser af, kan brugere skrive kommentarer på sitet. Du skal dog først slå kommentering til for bestemte indholdstyper, mapper eller indholdsobjekter, før det virker."
 
+#. Default: "Address to which moderator notifications will be sent. If not specified, the Site 'From' Address from the mail control panel will be used."
+#: ./interfaces.py:117
+msgid "help_moderator_email"
+msgstr ""
+
 #. Default: "If selected, the moderator is notified if a comment needs attention."
-#: ./interfaces.py:83
+#: ./interfaces.py:108
 msgid "help_moderator_notification_enabled"
 msgstr "Hvis du krydser af, får en moderator besked, hvis en kommentarer skal vurderes."
 
 #. Default: "If selected, an image of the user is shown next to the comment."
-#: ./interfaces.py:73
+#: ./interfaces.py:98
 msgid "help_show_commenter_image"
 msgstr "Hvis du krydser af, bliver der vist et billede af brugeren ved siden af kommentaren."
 
+#. Default: "Use this setting to choose if the comment text should be transformed in any way. You can choose between 'Plain text' and 'Intelligent text'. 'Intelligent text' converts plain text into HTML where line breaks and indentation is preserved, and web and email addresses are made into clickable links."
+#: ./interfaces.py:67
+msgid "help_text_transform"
+msgstr ""
+
 #. Default: "If selected, users can choose to be notified of new comments by email."
-#: ./interfaces.py:93
+#: ./interfaces.py:128
 msgid "help_user_notification_enabled"
 msgstr "Hvis den er slået til, kan brugere få besked om nye kommentarer over email."
 
 #. Default: "Anonymous"
-#: ./comment.py:121
+#: ./comment.py:130
 msgid "label_anonymous"
 msgstr "Anonym"
 
@@ -230,12 +268,12 @@ msgid "label_apply"
 msgstr "Udfør"
 
 #. Default: "Captcha"
-#: ./interfaces.py:56
+#: ./interfaces.py:81
 msgid "label_captcha"
 msgstr "CAPTCHA"
 
 #. Default: "Comment"
-#: ./interfaces.py:266
+#: ./interfaces.py:301
 msgid "label_comment"
 msgstr "Kommentar"
 
@@ -249,8 +287,13 @@ msgstr "Slet"
 msgid "label_globally_enabled"
 msgstr "Slå kommentarer til over alt"
 
+#. Default: "Moderator Email Address"
+#: ./interfaces.py:116
+msgid "label_moderator_email"
+msgstr ""
+
 #. Default: "Enable moderator email notification"
-#: ./interfaces.py:81
+#: ./interfaces.py:106
 msgid "label_moderator_notification_enabled"
 msgstr "Slå moderatorer-notificering til"
 
@@ -265,7 +308,7 @@ msgid "label_says"
 msgstr "siger:"
 
 #. Default: "Show commenter image"
-#: ./interfaces.py:71
+#: ./interfaces.py:96
 msgid "label_show_commenter_image"
 msgstr "Vis kommentator-billede"
 
@@ -275,22 +318,22 @@ msgid "label_show_full_comment_text"
 msgstr "Hvis fuld kommentar"
 
 #. Default: "Subject"
-#: ./interfaces.py:262
+#: ./interfaces.py:297
 msgid "label_subject"
 msgstr "Emne"
 
 #. Default: "Comment text transform"
-#: ./interfaces.py:48
+#: ./interfaces.py:65
 msgid "label_text_transform"
 msgstr "Formattering af kommentar-tekst"
 
 #. Default: "Enable user email notification"
-#: ./interfaces.py:91
+#: ./interfaces.py:126
 msgid "label_user_notification_enabled"
 msgstr "Slå bruger-notificering til"
 
 #. Default: "A comment on '${title}' has been posted here: ${link}"
-#: ./comment.py:51
+#: ./comment.py:58
 msgid "mail_notification_message"
 msgstr "En kommentarer om '${title}' er blevet gemt her: ${link}"
 

plone/app/discussion/locales/de/LC_MESSAGES/plone.app.discussion.po

@@ -14,54 +14,59 @@ msgstr ""
 "Preferred-Encodings: utf-8 latin1\n"
 "Domain: plone.app.discussion\n"
 
-#: ./comment.py:217
+#: ./comment.py:234
 msgid "A comment has been posted."
 msgstr "Ein Kommentar wurde abgegeben."
 
-#: ./interfaces.py:248
+#: ./interfaces.py:283
 msgid "A comment id unique to this conversation"
 msgstr "Eine eindeutige ID des Kommentars"
 
-#: ./browser/comments.py:53
+#: ./browser/comments.py:71
 msgid "Add a comment"
 msgstr "Kommentar hinzufügen"
 
-#: ./browser/controlpanel.py:41
+#: ./browser/controlpanel.py:63
 msgid "Anonymous Comments"
 msgstr "Anonyme Kommentare"
 
-#: ./interfaces.py:273
+#: ./interfaces.py:308
 msgid "Author name (for display)"
 msgstr "Name des Autors (wird angezeigt)"
 
-#: ./browser/comments.py:219
+#: ./browser/comments.py:252
+#: ./browser/controlpanel.py:83
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ./browser/moderation.py:148
+#: ./browser/controlpanel.py:79
+msgid "Changes saved"
+msgstr "Änderungen gespeichert."
+
+#: ./browser/moderation.py:165
 msgid "Comment approved."
 msgstr "Kommentar zur Veröffentlichung freigegeben."
 
-#: ./browser/moderation.py:109
+#: ./browser/moderation.py:126
 msgid "Comment deleted."
 msgstr "Kommentar gelöscht"
 
-#: ./browser/controlpanel.py:42
+#: ./browser/controlpanel.py:64
 msgid "Commenter Image"
 msgstr "Porträt des Benutzers"
 
 msgid "Commenting infrastructure for Plone"
 msgstr ""
 
-#: ./interfaces.py:243
+#: ./interfaces.py:278
 msgid "Conversation"
 msgstr "Diskussion"
 
-#: ./interfaces.py:274
+#: ./interfaces.py:309
 msgid "Creation date"
 msgstr "Erstellungsdatum"
 
-#: ./interfaces.py:128
+#: ./interfaces.py:163
 msgid "Date of the most recent comment"
 msgstr "Datum des letzten Kommentars"
 
@@ -69,68 +74,76 @@ msgstr "Datum des letzten Kommentars"
 msgid "Disabled"
 msgstr "Ausgeschaltet"
 
-#: ./browser/controlpanel.py:13
+#: ./browser/controlpanel.py:32
 msgid "Discussion settings"
 msgstr "Kommentierungseinstellungen"
 
-#: ./interfaces.py:260
+#: ./browser/controlpanel.py:85
+msgid "Edit cancelled"
+msgstr "Änderungen abgebrochen."
+
+#: ./interfaces.py:295
 msgid "Email"
 msgstr "E-Mail"
 
-#: ./browser/controlpanel.py:40
+#: ./browser/controlpanel.py:62
 msgid "Enable Comments"
 msgstr "Kommentare einschalten"
 
-#: ./interfaces.py:251
+#: ./interfaces.py:286
 msgid "Id of comment this comment is in reply to"
 msgstr "ID des Kommentars, auf den geantwortet wird."
 
-#: ./interfaces.py:265
+#: ./interfaces.py:300
 msgid "MIME type"
 msgstr "MIME-Typ"
 
-#: ./browser/controlpanel.py:44
+#: ./browser/controlpanel.py:66
 msgid "Moderator Email Notification"
-msgstr ""
+msgstr "Moderator E-Mail Benachrichtigung"
 
-#: ./interfaces.py:275
+#: ./interfaces.py:310
 msgid "Modification date"
 msgstr "Änderungsdatum"
 
-#: ./interfaces.py:245
+#: ./interfaces.py:280
 msgid "Name"
 msgstr "Name"
 
-#: ./interfaces.py:269
+#: ./interfaces.py:304
 msgid "Notify me of new comments via email."
-msgstr ""
+msgstr "Informiere mich über neue Beiträge per E-Mail."
 
 #: ./plone.app.discussion/plone/app/discussion/configure.zcml
 msgid "Plone Discussions"
 msgstr "Plone Diskussionen"
 
-#: ./interfaces.py:238
+#: ./interfaces.py:273
 msgid "Portal type"
 msgstr "Artikeltyp"
 
-#: ./interfaces.py:133
+#: ./browser/controlpanel.py:72
+msgid "Save"
+msgstr "Speichern"
+
+#: ./interfaces.py:168
 msgid "The set of unique commentators (usernames)"
 msgstr "Liste von Benutzern, die Kommentare abgegeben haben"
 
-#: ./interfaces.py:122
+#: ./interfaces.py:157
 msgid "Total number of comments on this item"
 msgstr "Anzahl der Kommentare zu diesem Artikel"
 
-#: ./browser/controlpanel.py:46
+#: ./browser/controlpanel.py:68
 msgid "User Email Notification"
-msgstr ""
+msgstr "Benutzer E-Mail Benachrichtigung"
 
-#: ./browser/comments.py:212
+#: ./browser/comments.py:245
 msgid "Your comment awaits moderator approval."
 msgstr "Ihr Kommentar muss noch vom Moderator freigegeben werden."
 
 #. Default: "Comment"
-#: ./browser/comments.py:102
+#: ./browser/comments.py:127
 msgid "add_comment_button"
 msgstr "Kommentieren"
 
@@ -144,8 +157,23 @@ msgstr "Löschen"
 msgid "bulkactions_publish"
 msgstr "Veröffentlichen"
 
+#. Default: "You can add a comment by filling out the form below. Plain text formatting. Web and email addresses are transformed into clickable links."
+#: ./browser/comments.py:56
+msgid "comment_description_intelligent_text"
+msgstr "Sie können einen Kommentar abgeben, indem sie das untenstehende Formular ausfüllen. Nur Text. Web- und E-Mailadressen werden in anklickbare Links umgewandelt."
+
+#. Default: "Comments are moderated."
+#: ./browser/comments.py:62
+msgid "comment_description_moderation_enabled"
+msgstr ""
+
+#. Default: "You can add a comment by filling out the form below. Plain text formatting."
+#: ./browser/comments.py:51
+msgid "comment_description_plain_text"
+msgstr "Sie können einen Kommentar abgeben, indem sie das untenstehende Formular ausfüllen. Nur Text."
+
 #. Default: "${creator} on ${content}"
-#: ./comment.py:48
+#: ./comment.py:55
 msgid "comment_title"
 msgstr ""
 
@@ -185,13 +213,13 @@ msgid "help_anonymous_comments"
 msgstr "Wenn Sie diese Einstellung aktivieren, können anonyme Benutzer Kommentare abgeben. Es ist empfehlenswert, dann auch Captchas zu aktivieren."
 
 #. Default: "Use this setting to enable or disable Captcha validation for comments. Install plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet, or collective.z3cform.norobots if there are no options available."
-#: ./interfaces.py:58
+#: ./interfaces.py:83
 #, fuzzy
 msgid "help_captcha"
 msgstr "Wenn Sie diese Einstellung aktivieren, wird mit Hilfe der Captcha-Validierung überprüft, ob die Kommentare von einem echten Benutzer oder von einem automatisierten Skript stammen. Falls Sie die Option nicht einschalten können, fehlt evtl. ein benötigtes Programmmodul. Stellen Sie sicher, dass entweder plone.formwidget.captcha oder plone.formwidget.recaptcha installiert ist."
 
 #. Default: "Some discussion related settings are not located in the Discussion Control Panel.\nTo enable comments for a specific content type, go to the Types Control Panel of this type and choose \"Allow comments\".\nTo enable the moderation workflow for comments, go to the Types Control Panel, choose \"Comment\" and set workflow to \"Comment Review Workflow\"."
-#: ./browser/controlpanel.py:14
+#: ./browser/controlpanel.py:33
 #, fuzzy
 msgid "help_discussion_settings_editform"
 msgstr ""
@@ -205,23 +233,33 @@ msgstr ""
 msgid "help_globally_enabled"
 msgstr "Wenn Sie diese Einstellung aktivieren, können Artikel generell kommentiert werden."
 
+#. Default: "Address to which moderator notifications will be sent. If not specified, the Site 'From' Address from the mail control panel will be used."
+#: ./interfaces.py:117
+msgid "help_moderator_email"
+msgstr ""
+
 #. Default: "If selected, the moderator is notified if a comment needs attention."
-#: ./interfaces.py:83
+#: ./interfaces.py:108
 msgid "help_moderator_notification_enabled"
 msgstr ""
 
 #. Default: "If selected, an image of the user is shown next to the comment."
-#: ./interfaces.py:73
+#: ./interfaces.py:98
 msgid "help_show_commenter_image"
 msgstr "Wenn Sie diese Einstellung aktivieren, wird das Porträt des kommentierenden Benutzers neben dem Kommentar angezeigt."
 
+#. Default: "Use this setting to choose if the comment text should be transformed in any way. You can choose between 'Plain text' and 'Intelligent text'. 'Intelligent text' converts plain text into HTML where line breaks and indentation is preserved, and web and email addresses are made into clickable links."
+#: ./interfaces.py:67
+msgid "help_text_transform"
+msgstr ""
+
 #. Default: "If selected, users can choose to be notified of new comments by email."
-#: ./interfaces.py:93
+#: ./interfaces.py:128
 msgid "help_user_notification_enabled"
 msgstr ""
 
 #. Default: "Anonymous"
-#: ./comment.py:121
+#: ./comment.py:130
 msgid "label_anonymous"
 msgstr "Anonymer Benutzer"
 
@@ -236,12 +274,12 @@ msgid "label_apply"
 msgstr "Anwenden"
 
 #. Default: "Captcha"
-#: ./interfaces.py:56
+#: ./interfaces.py:81
 msgid "label_captcha"
 msgstr "Captcha"
 
 #. Default: "Comment"
-#: ./interfaces.py:266
+#: ./interfaces.py:301
 msgid "label_comment"
 msgstr "Kommentar"
 
@@ -255,8 +293,13 @@ msgstr "Löschen"
 msgid "label_globally_enabled"
 msgstr "Kommentierungsfunktion generell einschalten"
 
+#. Default: "Moderator Email Address"
+#: ./interfaces.py:116
+msgid "label_moderator_email"
+msgstr ""
+
 #. Default: "Enable moderator email notification"
-#: ./interfaces.py:81
+#: ./interfaces.py:106
 msgid "label_moderator_notification_enabled"
 msgstr ""
 
@@ -271,7 +314,7 @@ msgid "label_says"
 msgstr "sagt"
 
 #. Default: "Show commenter image"
-#: ./interfaces.py:71
+#: ./interfaces.py:96
 msgid "label_show_commenter_image"
 msgstr ""
 
@@ -281,22 +324,22 @@ msgid "label_show_full_comment_text"
 msgstr "Den vollständigen Kommentar anzeigen"
 
 #. Default: "Subject"
-#: ./interfaces.py:262
+#: ./interfaces.py:297
 msgid "label_subject"
 msgstr "Betreff"
 
 #. Default: "Comment text transform"
-#: ./interfaces.py:48
+#: ./interfaces.py:65
 msgid "label_text_transform"
 msgstr "Text transformationen"
 
 #. Default: "Enable user email notification"
-#: ./interfaces.py:91
+#: ./interfaces.py:126
 msgid "label_user_notification_enabled"
 msgstr ""
 
 #. Default: "A comment on '${title}' has been posted here: ${link}"
-#: ./comment.py:51
+#: ./comment.py:58
 msgid "mail_notification_message"
 msgstr ""
 

plone/app/discussion/locales/es/LC_MESSAGES/plone.app.discussion.po

@@ -15,54 +15,59 @@ msgstr ""
 "Domain: plone.app.discussion\n"
 "X-Poedit-Language: Spanish\n"
 
-#: ./comment.py:217
+#: ./comment.py:234
 msgid "A comment has been posted."
 msgstr "Comentario añadido"
 
-#: ./interfaces.py:248
+#: ./interfaces.py:283
 msgid "A comment id unique to this conversation"
 msgstr "Un comentario de ID exclusivo para esta conversación"
 
-#: ./browser/comments.py:53
+#: ./browser/comments.py:71
 msgid "Add a comment"
 msgstr "Añadir un comentario"
 
-#: ./browser/controlpanel.py:41
+#: ./browser/controlpanel.py:63
 msgid "Anonymous Comments"
 msgstr "Comentarios anónimos"
 
-#: ./interfaces.py:273
+#: ./interfaces.py:308
 msgid "Author name (for display)"
 msgstr "Nombre del autor (para mostrar)"
 
-#: ./browser/comments.py:219
+#: ./browser/comments.py:252
+#: ./browser/controlpanel.py:83
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ./browser/moderation.py:148
+#: ./browser/controlpanel.py:79
+msgid "Changes saved"
+msgstr ""
+
+#: ./browser/moderation.py:165
 msgid "Comment approved."
 msgstr "Comentario aprobado"
 
-#: ./browser/moderation.py:109
+#: ./browser/moderation.py:126
 msgid "Comment deleted."
 msgstr "Comentario eliminado"
 
-#: ./browser/controlpanel.py:42
+#: ./browser/controlpanel.py:64
 msgid "Commenter Image"
 msgstr "Imagen del autor"
 
 msgid "Commenting infrastructure for Plone"
 msgstr "Infraestructura de comentarios para Plone"
 
-#: ./interfaces.py:243
+#: ./interfaces.py:278
 msgid "Conversation"
 msgstr "Conversación"
 
-#: ./interfaces.py:274
+#: ./interfaces.py:309
 msgid "Creation date"
 msgstr "Fecha de creación"
 
-#: ./interfaces.py:128
+#: ./interfaces.py:163
 msgid "Date of the most recent comment"
 msgstr "Fecha del comentario más reciente"
 
@@ -70,39 +75,43 @@ msgstr "Fecha del comentario más reciente"
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: ./browser/controlpanel.py:13
+#: ./browser/controlpanel.py:32
 msgid "Discussion settings"
 msgstr "Ajustes de discusión"
 
-#: ./interfaces.py:260
+#: ./browser/controlpanel.py:85
+msgid "Edit cancelled"
+msgstr ""
+
+#: ./interfaces.py:295
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: ./browser/controlpanel.py:40
+#: ./browser/controlpanel.py:62
 msgid "Enable Comments"
 msgstr "Permitir comentarios"
 
-#: ./interfaces.py:251
+#: ./interfaces.py:286
 msgid "Id of comment this comment is in reply to"
 msgstr "ID del comentario este comentario es en respuesta a"
 
-#: ./interfaces.py:265
+#: ./interfaces.py:300
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: ./browser/controlpanel.py:44
+#: ./browser/controlpanel.py:66
 msgid "Moderator Email Notification"
 msgstr "Notificación al moderador por e-maill"
 
-#: ./interfaces.py:275
+#: ./interfaces.py:310
 msgid "Modification date"
 msgstr "Fecha de modificación"
 
-#: ./interfaces.py:245
+#: ./interfaces.py:280
 msgid "Name"
 msgstr "Nombre"
 
-#: ./interfaces.py:269
+#: ./interfaces.py:304
 msgid "Notify me of new comments via email."
 msgstr "Recibir avisos por correo cuando haya nuevos comentarios"
 
@@ -110,28 +119,32 @@ msgstr "Recibir avisos por correo cuando haya nuevos comentarios"
 msgid "Plone Discussions"
 msgstr "Plone Discussions"
 
-#: ./interfaces.py:238
+#: ./interfaces.py:273
 msgid "Portal type"
 msgstr "Tipo de objeto"
 
-#: ./interfaces.py:133
+#: ./browser/controlpanel.py:72
+msgid "Save"
+msgstr ""
+
+#: ./interfaces.py:168
 msgid "The set of unique commentators (usernames)"
 msgstr "Listado de usuarios que han comentado (nombres de usuario)"
 
-#: ./interfaces.py:122
+#: ./interfaces.py:157
 msgid "Total number of comments on this item"
 msgstr "Número total de comentarios en este elemento"
 
-#: ./browser/controlpanel.py:46
+#: ./browser/controlpanel.py:68
 msgid "User Email Notification"
 msgstr "Notificaciones de correo para usuarios"
 
-#: ./browser/comments.py:212
+#: ./browser/comments.py:245
 msgid "Your comment awaits moderator approval."
 msgstr "Su comentario está pendiente de aprobación por el moderador"
 
 #. Default: "Comment"
-#: ./browser/comments.py:102
+#: ./browser/comments.py:127
 msgid "add_comment_button"
 msgstr "Comentar"
 
@@ -145,8 +158,23 @@ msgstr "Borrar"
 msgid "bulkactions_publish"
 msgstr "Publicar"
 
+#. Default: "You can add a comment by filling out the form below. Plain text formatting. Web and email addresses are transformed into clickable links."
+#: ./browser/comments.py:56
+msgid "comment_description_intelligent_text"
+msgstr ""
+
+#. Default: "Comments are moderated."
+#: ./browser/comments.py:62
+msgid "comment_description_moderation_enabled"
+msgstr ""
+
+#. Default: "You can add a comment by filling out the form below. Plain text formatting."
+#: ./browser/comments.py:51
+msgid "comment_description_plain_text"
+msgstr ""
+
 #. Default: "${creator} on ${content}"
-#: ./comment.py:48
+#: ./comment.py:55
 msgid "comment_title"
 msgstr "${creator} sobre ${content}"
 
@@ -186,12 +214,12 @@ msgid "help_anonymous_comments"
 msgstr "Si está seleccionado, los usuarios anónimos podrán añadir comentarios sin tener que hacer login. Recomendamos encarecidamente que utilice una solución Captcha para evitar el spam si esta opción está activada."
 
 #. Default: "Use this setting to enable or disable Captcha validation for comments. Install plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet, or collective.z3cform.norobots if there are no options available."
-#: ./interfaces.py:58
+#: ./interfaces.py:83
 msgid "help_captcha"
 msgstr "Utilice esta opción para activar o desactivar Captcha para los comentarios. Instale plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet o collective.z3cform.norobots si no tiene ninguna opción disponible."
 
 #. Default: "Some discussion related settings are not located in the Discussion Control Panel.\nTo enable comments for a specific content type, go to the Types Control Panel of this type and choose \"Allow comments\".\nTo enable the moderation workflow for comments, go to the Types Control Panel, choose \"Comment\" and set workflow to \"Comment Review Workflow\"."
-#: ./browser/controlpanel.py:14
+#: ./browser/controlpanel.py:33
 msgid "help_discussion_settings_editform"
 msgstr ""
 "Algunos de los ajustes sobre los comentarios no están en el Panel de Control de Discusiones.\n"
@@ -203,23 +231,33 @@ msgstr ""
 msgid "help_globally_enabled"
 msgstr "Si está seleccionado, se permite que los visitantes hagan comentarios en la web. Sin embargo, tiene que activar los comentarios para cada tipo de objeto específicamente antes de que se puedan añadir los comentarios."
 
+#. Default: "Address to which moderator notifications will be sent. If not specified, the Site 'From' Address from the mail control panel will be used."
+#: ./interfaces.py:117
+msgid "help_moderator_email"
+msgstr ""
+
 #. Default: "If selected, the moderator is notified if a comment needs attention."
-#: ./interfaces.py:83
+#: ./interfaces.py:108
 msgid "help_moderator_notification_enabled"
 msgstr "Si está seleccionado, se notifican por e-mail al moderador los nuevos comentarios."
 
 #. Default: "If selected, an image of the user is shown next to the comment."
-#: ./interfaces.py:73
+#: ./interfaces.py:98
 msgid "help_show_commenter_image"
 msgstr "Si está seleccionado, se mostrará una imagen del autor junto al comentario."
 
+#. Default: "Use this setting to choose if the comment text should be transformed in any way. You can choose between 'Plain text' and 'Intelligent text'. 'Intelligent text' converts plain text into HTML where line breaks and indentation is preserved, and web and email addresses are made into clickable links."
+#: ./interfaces.py:67
+msgid "help_text_transform"
+msgstr ""
+
 #. Default: "If selected, users can choose to be notified of new comments by email."
-#: ./interfaces.py:93
+#: ./interfaces.py:128
 msgid "help_user_notification_enabled"
 msgstr "Si está seleccionado, los usuarios pueden solicitar recibir avisos por correo cuando haya nuevos comentarios."
 
 #. Default: "Anonymous"
-#: ./comment.py:121
+#: ./comment.py:130
 msgid "label_anonymous"
 msgstr "Anónimo"
 
@@ -234,12 +272,12 @@ msgid "label_apply"
 msgstr "Aplicar"
 
 #. Default: "Captcha"
-#: ./interfaces.py:56
+#: ./interfaces.py:81
 msgid "label_captcha"
 msgstr "Captcha"
 
 #. Default: "Comment"
-#: ./interfaces.py:266
+#: ./interfaces.py:301
 msgid "label_comment"
 msgstr "Comentario"
 
@@ -253,8 +291,13 @@ msgstr "Borrar"
 msgid "label_globally_enabled"
 msgstr "Activar comentarios de forma global"
 
+#. Default: "Moderator Email Address"
+#: ./interfaces.py:116
+msgid "label_moderator_email"
+msgstr ""
+
 #. Default: "Enable moderator email notification"
-#: ./interfaces.py:81
+#: ./interfaces.py:106
 msgid "label_moderator_notification_enabled"
 msgstr "Activar notificación al moderador"
 
@@ -269,7 +312,7 @@ msgid "label_says"
 msgstr "dice:"
 
 #. Default: "Show commenter image"
-#: ./interfaces.py:71
+#: ./interfaces.py:96
 msgid "label_show_commenter_image"
 msgstr "Mostrar imagen del autor"
 
@@ -279,22 +322,22 @@ msgid "label_show_full_comment_text"
 msgstr "Mostrar texto completo"
 
 #. Default: "Subject"
-#: ./interfaces.py:262
+#: ./interfaces.py:297
 msgid "label_subject"
 msgstr "Tema"
 
 #. Default: "Comment text transform"
-#: ./interfaces.py:48
+#: ./interfaces.py:65
 msgid "label_text_transform"
 msgstr "Transformaciones aplicadas al texto del comentario"
 
 #. Default: "Enable user email notification"
-#: ./interfaces.py:91
+#: ./interfaces.py:126
 msgid "label_user_notification_enabled"
 msgstr "Activar notificación de correo a los usuarios"
 
 #. Default: "A comment on '${title}' has been posted here: ${link}"
-#: ./comment.py:51
+#: ./comment.py:58
 #, fuzzy
 msgid "mail_notification_message"
 msgstr "Se ha publicado un comentario de título ${title} en la siguiente dirección: ${link}"

plone/app/discussion/locales/eu/LC_MESSAGES/plone.app.discussion.po

@@ -15,54 +15,59 @@ msgstr ""
 "Domain: DOMAIN\n"
 "X-Poedit-Language: Basque\n"
 
-#: ./comment.py:217
+#: ./comment.py:234
 msgid "A comment has been posted."
 msgstr "Erantzun bat argitaratu da."
 
-#: ./interfaces.py:248
+#: ./interfaces.py:283
 msgid "A comment id unique to this conversation"
 msgstr "Eztabaida honetarako bakarra den erantzunaren id-a."
 
-#: ./browser/comments.py:53
+#: ./browser/comments.py:71
 msgid "Add a comment"
 msgstr "Erantzuna gehitu"
 
-#: ./browser/controlpanel.py:41
+#: ./browser/controlpanel.py:63
 msgid "Anonymous Comments"
 msgstr "Erantzun anonimoak"
 
-#: ./interfaces.py:273
+#: ./interfaces.py:308
 msgid "Author name (for display)"
 msgstr "Egilearen izena (argitaratuko dena)"
 
-#: ./browser/comments.py:219
+#: ./browser/comments.py:252
+#: ./browser/controlpanel.py:83
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ./browser/moderation.py:148
+#: ./browser/controlpanel.py:79
+msgid "Changes saved"
+msgstr ""
+
+#: ./browser/moderation.py:165
 msgid "Comment approved."
 msgstr "Erantzuna onartuta."
 
-#: ./browser/moderation.py:109
+#: ./browser/moderation.py:126
 msgid "Comment deleted."
 msgstr "Erantzuna ezabatuta."
 
-#: ./browser/controlpanel.py:42
+#: ./browser/controlpanel.py:64
 msgid "Commenter Image"
 msgstr "Erantzuna eman duenaren irudia."
 
 msgid "Commenting infrastructure for Plone"
 msgstr "Ploneren Erantzunen Azpiegitura"
 
-#: ./interfaces.py:243
+#: ./interfaces.py:278
 msgid "Conversation"
 msgstr "Eztabaida"
 
-#: ./interfaces.py:274
+#: ./interfaces.py:309
 msgid "Creation date"
 msgstr "Sorrera data"
 
-#: ./interfaces.py:128
+#: ./interfaces.py:163
 msgid "Date of the most recent comment"
 msgstr "Azken erantzunaren data"
 
@@ -70,39 +75,43 @@ msgstr "Azken erantzunaren data"
 msgid "Disabled"
 msgstr "Desaktibatuta"
 
-#: ./browser/controlpanel.py:13
+#: ./browser/controlpanel.py:32
 msgid "Discussion settings"
 msgstr "Eztabaidaren ezarpenak"
 
-#: ./interfaces.py:260
+#: ./browser/controlpanel.py:85
+msgid "Edit cancelled"
+msgstr ""
+
+#: ./interfaces.py:295
 msgid "Email"
 msgstr "E-posta"
 
-#: ./browser/controlpanel.py:40
+#: ./browser/controlpanel.py:62
 msgid "Enable Comments"
 msgstr "Erantzunak aktibatu"
 
-#: ./interfaces.py:251
+#: ./interfaces.py:286
 msgid "Id of comment this comment is in reply to"
 msgstr "Erantzun honek erreferentzia egiten dion erantzunaren id-a"
 
-#: ./interfaces.py:265
+#: ./interfaces.py:300
 msgid "MIME type"
 msgstr "MIME mota"
 
-#: ./browser/controlpanel.py:44
+#: ./browser/controlpanel.py:66
 msgid "Moderator Email Notification"
 msgstr "Moderatzailea e-postaz abisatu"
 
-#: ./interfaces.py:275
+#: ./interfaces.py:310
 msgid "Modification date"
 msgstr "Aldaketa data"
 
-#: ./interfaces.py:245
+#: ./interfaces.py:280
 msgid "Name"
 msgstr "Izena"
 
-#: ./interfaces.py:269
+#: ./interfaces.py:304
 msgid "Notify me of new comments via email."
 msgstr ""
 
@@ -110,28 +119,32 @@ msgstr ""
 msgid "Plone Discussions"
 msgstr "Plone Eztabaidak"
 
-#: ./interfaces.py:238
+#: ./interfaces.py:273
 msgid "Portal type"
 msgstr "Elementu mota"
 
-#: ./interfaces.py:133
+#: ./browser/controlpanel.py:72
+msgid "Save"
+msgstr ""
+
+#: ./interfaces.py:168
 msgid "The set of unique commentators (usernames)"
 msgstr "Erantzunak eman dituzten erabiltzaileak (erabiltzaile-izenak)"
 
-#: ./interfaces.py:122
+#: ./interfaces.py:157
 msgid "Total number of comments on this item"
 msgstr "Elementu honen erantzun kopurua"
 
-#: ./browser/controlpanel.py:46
+#: ./browser/controlpanel.py:68
 msgid "User Email Notification"
 msgstr ""
 
-#: ./browser/comments.py:212
+#: ./browser/comments.py:245
 msgid "Your comment awaits moderator approval."
 msgstr "Zure erantzuna moderazio kolan dago."
 
 #. Default: "Comment"
-#: ./browser/comments.py:102
+#: ./browser/comments.py:127
 msgid "add_comment_button"
 msgstr "Eman erantzuna"
 
@@ -145,8 +158,23 @@ msgstr "Ezabatu"
 msgid "bulkactions_publish"
 msgstr "Onartu"
 
+#. Default: "You can add a comment by filling out the form below. Plain text formatting. Web and email addresses are transformed into clickable links."
+#: ./browser/comments.py:56
+msgid "comment_description_intelligent_text"
+msgstr ""
+
+#. Default: "Comments are moderated."
+#: ./browser/comments.py:62
+msgid "comment_description_moderation_enabled"
+msgstr ""
+
+#. Default: "You can add a comment by filling out the form below. Plain text formatting."
+#: ./browser/comments.py:51
+msgid "comment_description_plain_text"
+msgstr ""
+
 #. Default: "${creator} on ${content}"
-#: ./comment.py:48
+#: ./comment.py:55
 msgid "comment_title"
 msgstr "${creator} ${content} buruz\""
 
@@ -186,12 +214,12 @@ msgid "help_anonymous_comments"
 msgstr "Aukeratuta badago, erabiltzaile anonimoek erantzunak gehitu ditzakete login egin gabe. Berariaz gomendatzen dizugu Captcha kontrolen bat aktibatzea anonimoen erantzunak baimentzen badituzu."
 
 #. Default: "Use this setting to enable or disable Captcha validation for comments. Install plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet, or collective.z3cform.norobots if there are no options available."
-#: ./interfaces.py:58
+#: ./interfaces.py:83
 msgid "help_captcha"
 msgstr "Erabili aukera hau Captcha aktibatu edo desaktibatzeko. Instalatu plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet edo collective.z3cform.norobots aukerarik ez baldin badago."
 
 #. Default: "Some discussion related settings are not located in the Discussion Control Panel.\nTo enable comments for a specific content type, go to the Types Control Panel of this type and choose \"Allow comments\".\nTo enable the moderation workflow for comments, go to the Types Control Panel, choose \"Comment\" and set workflow to \"Comment Review Workflow\"."
-#: ./browser/controlpanel.py:14
+#: ./browser/controlpanel.py:33
 msgid "help_discussion_settings_editform"
 msgstr ""
 "Erantzunei dagozkien ezarpen batzuk ez daude Eztabaiden Kontrol Panelean.\n"
@@ -203,23 +231,33 @@ msgstr ""
 msgid "help_globally_enabled"
 msgstr "Aukeratuta badago, atarian erantzunak gehitu daitezke. Edonola ere, elementu-mota bakoitzarentzat erantzunak baimendu beharko dituzu erabiltzaileak erantzunak ematen hasi aurretik."
 
+#. Default: "Address to which moderator notifications will be sent. If not specified, the Site 'From' Address from the mail control panel will be used."
+#: ./interfaces.py:117
+msgid "help_moderator_email"
+msgstr ""
+
 #. Default: "If selected, the moderator is notified if a comment needs attention."
-#: ./interfaces.py:83
+#: ./interfaces.py:108
 msgid "help_moderator_notification_enabled"
 msgstr "Aukeratuta badago, moderatzaileari e-posta abisua helduko zaio erantzun bat gehitzean."
 
 #. Default: "If selected, an image of the user is shown next to the comment."
-#: ./interfaces.py:73
+#: ./interfaces.py:98
 msgid "help_show_commenter_image"
 msgstr "Aukeratuta badago, erantzuna eman duenaren irudi bat agertuko da testuaren ondoan."
 
+#. Default: "Use this setting to choose if the comment text should be transformed in any way. You can choose between 'Plain text' and 'Intelligent text'. 'Intelligent text' converts plain text into HTML where line breaks and indentation is preserved, and web and email addresses are made into clickable links."
+#: ./interfaces.py:67
+msgid "help_text_transform"
+msgstr ""
+
 #. Default: "If selected, users can choose to be notified of new comments by email."
-#: ./interfaces.py:93
+#: ./interfaces.py:128
 msgid "help_user_notification_enabled"
 msgstr ""
 
 #. Default: "Anonymous"
-#: ./comment.py:121
+#: ./comment.py:130
 msgid "label_anonymous"
 msgstr "Anonimoak"
 
@@ -234,12 +272,12 @@ msgid "label_apply"
 msgstr "Aplikatu"
 
 #. Default: "Captcha"
-#: ./interfaces.py:56
+#: ./interfaces.py:81
 msgid "label_captcha"
 msgstr "Captcha"
 
 #. Default: "Comment"
-#: ./interfaces.py:266
+#: ./interfaces.py:301
 msgid "label_comment"
 msgstr "Erantzuna"
 
@@ -253,8 +291,13 @@ msgstr "Ezabatu"
 msgid "label_globally_enabled"
 msgstr "Erantzunak globalki aktibatu"
 
+#. Default: "Moderator Email Address"
+#: ./interfaces.py:116
+msgid "label_moderator_email"
+msgstr ""
+
 #. Default: "Enable moderator email notification"
-#: ./interfaces.py:81
+#: ./interfaces.py:106
 msgid "label_moderator_notification_enabled"
 msgstr "Aktibatu moderatzaileari e-postaz abisatzea"
 
@@ -269,7 +312,7 @@ msgid "label_says"
 msgstr "dio:"
 
 #. Default: "Show commenter image"
-#: ./interfaces.py:71
+#: ./interfaces.py:96
 msgid "label_show_commenter_image"
 msgstr "Erantzuna eman duenaren irudia erakutsi"
 
@@ -279,22 +322,22 @@ msgid "label_show_full_comment_text"
 msgstr "Erakutsi testu osoa"
 
 #. Default: "Subject"
-#: ./interfaces.py:262
+#: ./interfaces.py:297
 msgid "label_subject"
 msgstr "Gaia"
 
 #. Default: "Comment text transform"
-#: ./interfaces.py:48
+#: ./interfaces.py:65
 msgid "label_text_transform"
 msgstr "Erantzunari aplikatu beharreko transformazioa"
 
 #. Default: "Enable user email notification"
-#: ./interfaces.py:91
+#: ./interfaces.py:126
 msgid "label_user_notification_enabled"
 msgstr ""
 
 #. Default: "A comment on '${title}' has been posted here: ${link}"
-#: ./comment.py:51
+#: ./comment.py:58
 #, fuzzy
 msgid "mail_notification_message"
 msgstr "'${title} izenburua duen erantzun bat gehitu da helbide honetan: ${link}"

plone/app/discussion/locales/fi/LC_MESSAGES/plone.app.discussion.po

@@ -16,54 +16,59 @@ msgstr ""
 "X-Poedit-Language: Finnish\n"
 "X-Poedit-Country: FINLAND\n"
 
-#: ./comment.py:217
+#: ./comment.py:234
 msgid "A comment has been posted."
 msgstr ""
 
-#: ./interfaces.py:248
+#: ./interfaces.py:283
 msgid "A comment id unique to this conversation"
 msgstr "Tämän keskustelun sisällä uniikki tunniste"
 
-#: ./browser/comments.py:53
+#: ./browser/comments.py:71
 msgid "Add a comment"
 msgstr "Lisää viesti"
 
-#: ./browser/controlpanel.py:41
+#: ./browser/controlpanel.py:63
 msgid "Anonymous Comments"
 msgstr "Viestit tunnistamattomilta käyttäjiltä"
 
-#: ./interfaces.py:273
+#: ./interfaces.py:308
 msgid "Author name (for display)"
 msgstr "Kirjoittajan nimi"
 
-#: ./browser/comments.py:219
+#: ./browser/comments.py:252
+#: ./browser/controlpanel.py:83
 msgid "Cancel"
 msgstr "Peru"
 
-#: ./browser/moderation.py:148
+#: ./browser/controlpanel.py:79
+msgid "Changes saved"
+msgstr ""
+
+#: ./browser/moderation.py:165
 msgid "Comment approved."
 msgstr "Viesti hyväksytty."
 
-#: ./browser/moderation.py:109
+#: ./browser/moderation.py:126
 msgid "Comment deleted."
 msgstr "Viesti poistettu."
 
-#: ./browser/controlpanel.py:42
+#: ./browser/controlpanel.py:64
 msgid "Commenter Image"
 msgstr "Kirjoittajan kuva"
 
 msgid "Commenting infrastructure for Plone"
 msgstr "Plone:n kommentointi- ja keskustelutoiminnot"
 
-#: ./interfaces.py:243
+#: ./interfaces.py:278
 msgid "Conversation"
 msgstr "Keskustelu"
 
-#: ./interfaces.py:274
+#: ./interfaces.py:309
 msgid "Creation date"
 msgstr "Luotu"
 
-#: ./interfaces.py:128
+#: ./interfaces.py:163
 msgid "Date of the most recent comment"
 msgstr "Viimeisimmän viestin ajankohta"
 
@@ -71,39 +76,43 @@ msgstr "Viimeisimmän viestin ajankohta"
 msgid "Disabled"
 msgstr "Ei käytössä"
 
-#: ./browser/controlpanel.py:13
+#: ./browser/controlpanel.py:32
 msgid "Discussion settings"
 msgstr "Kommentointi- ja keskustelutoimintojen asetukset"
 
-#: ./interfaces.py:260
+#: ./browser/controlpanel.py:85
+msgid "Edit cancelled"
+msgstr ""
+
+#: ./interfaces.py:295
 msgid "Email"
 msgstr "Sähköposti"
 
-#: ./browser/controlpanel.py:40
+#: ./browser/controlpanel.py:62
 msgid "Enable Comments"
 msgstr "Salli Kommentointi & Keskustelut"
 
-#: ./interfaces.py:251
+#: ./interfaces.py:286
 msgid "Id of comment this comment is in reply to"
 msgstr "Sen viestin tunniste johon tämä viesti vastaa"
 
-#: ./interfaces.py:265
+#: ./interfaces.py:300
 msgid "MIME type"
 msgstr "MIME-tyyppi"
 
-#: ./browser/controlpanel.py:44
+#: ./browser/controlpanel.py:66
 msgid "Moderator Email Notification"
 msgstr "Ilmoitukset sähköpostitse tarkistajille"
 
-#: ./interfaces.py:275
+#: ./interfaces.py:310
 msgid "Modification date"
 msgstr "Muutettu"
 
-#: ./interfaces.py:245
+#: ./interfaces.py:280
 msgid "Name"
 msgstr "Nimi"
 
-#: ./interfaces.py:269
+#: ./interfaces.py:304
 msgid "Notify me of new comments via email."
 msgstr ""
 
@@ -111,28 +120,32 @@ msgstr ""
 msgid "Plone Discussions"
 msgstr "Kommentointi & Keskustelut (Plone Discussions)"
 
-#: ./interfaces.py:238
+#: ./interfaces.py:273
 msgid "Portal type"
 msgstr "Sisältötyyppi"
 
-#: ./interfaces.py:133
+#: ./browser/controlpanel.py:72
+msgid "Save"
+msgstr ""
+
+#: ./interfaces.py:168
 msgid "The set of unique commentators (usernames)"
 msgstr "Kirjoittajat (käyttäjätunnukset)"
 
-#: ./interfaces.py:122
+#: ./interfaces.py:157
 msgid "Total number of comments on this item"
 msgstr "Viestien kokonaismäärä"
 
-#: ./browser/controlpanel.py:46
+#: ./browser/controlpanel.py:68
 msgid "User Email Notification"
 msgstr ""
 
-#: ./browser/comments.py:212
+#: ./browser/comments.py:245
 msgid "Your comment awaits moderator approval."
 msgstr "Viestisi on vastaanotettu. Se tulee näkyviin heti kun ylläpito on hyväksynyt sen julkaistavaksi."
 
 #. Default: "Comment"
-#: ./browser/comments.py:102
+#: ./browser/comments.py:127
 msgid "add_comment_button"
 msgstr "Lisää"
 
@@ -146,8 +159,23 @@ msgstr "Poista valitut"
 msgid "bulkactions_publish"
 msgstr "Hyväksy valitut"
 
+#. Default: "You can add a comment by filling out the form below. Plain text formatting. Web and email addresses are transformed into clickable links."
+#: ./browser/comments.py:56
+msgid "comment_description_intelligent_text"
+msgstr ""
+
+#. Default: "Comments are moderated."
+#: ./browser/comments.py:62
+msgid "comment_description_moderation_enabled"
+msgstr ""
+
+#. Default: "You can add a comment by filling out the form below. Plain text formatting."
+#: ./browser/comments.py:51
+msgid "comment_description_plain_text"
+msgstr ""
+
 #. Default: "${creator} on ${content}"
-#: ./comment.py:48
+#: ./comment.py:55
 msgid "comment_title"
 msgstr ""
 
@@ -187,13 +215,13 @@ msgid "help_anonymous_comments"
 msgstr "Jos viestit tunnistamattomilta käyttäjiltä sallitaan, on erittäin suositeltavaa käyttää automaattisten roskapostittimien estintä (engl. captcha)."
 
 #. Default: "Use this setting to enable or disable Captcha validation for comments. Install plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet, or collective.z3cform.norobots if there are no options available."
-#: ./interfaces.py:58
+#: ./interfaces.py:83
 #, fuzzy
 msgid "help_captcha"
 msgstr "Roskaviestiautomaattien estimen (engl. captcha) käyttö. Jos mitään estintä ei ole valittavissa, järjestelmään ei ole asennettu mitään estintä. Soveltuvia estimiä ovat plone.formwidget.captcha ('Captcha') ja plone.formwidget.recaptcha ('ReCapthca')."
 
 #. Default: "Some discussion related settings are not located in the Discussion Control Panel.\nTo enable comments for a specific content type, go to the Types Control Panel of this type and choose \"Allow comments\".\nTo enable the moderation workflow for comments, go to the Types Control Panel, choose \"Comment\" and set workflow to \"Comment Review Workflow\"."
-#: ./browser/controlpanel.py:14
+#: ./browser/controlpanel.py:33
 msgid "help_discussion_settings_editform"
 msgstr "Tarkista myös keskusteluun / kommentointiin liittyvät asetukset sisältötyyppien hallintapaneelissa ('Sisältötyypit')."
 
@@ -203,23 +231,33 @@ msgstr "Tarkista myös keskusteluun / kommentointiin liittyvät asetukset sisäl
 msgid "help_globally_enabled"
 msgstr "Huomaa, että keskustelu/kommentointi pitää myös lisäksi erikseen asettaa päälle halutuille sisältötyypeille ja/tai yksittäisille sisällöille."
 
+#. Default: "Address to which moderator notifications will be sent. If not specified, the Site 'From' Address from the mail control panel will be used."
+#: ./interfaces.py:117
+msgid "help_moderator_email"
+msgstr ""
+
 #. Default: "If selected, the moderator is notified if a comment needs attention."
-#: ./interfaces.py:83
+#: ./interfaces.py:108
 msgid "help_moderator_notification_enabled"
 msgstr "Tarkistajana toimivalle ylläpitäjälle ilmoitetaan toimenpiteitä edellyttävistä viesteistä."
 
 #. Default: "If selected, an image of the user is shown next to the comment."
-#: ./interfaces.py:73
+#: ./interfaces.py:98
 msgid "help_show_commenter_image"
 msgstr "Näytetäänkö kirjoittajan kuva viestin yhteydessä."
 
+#. Default: "Use this setting to choose if the comment text should be transformed in any way. You can choose between 'Plain text' and 'Intelligent text'. 'Intelligent text' converts plain text into HTML where line breaks and indentation is preserved, and web and email addresses are made into clickable links."
+#: ./interfaces.py:67
+msgid "help_text_transform"
+msgstr ""
+
 #. Default: "If selected, users can choose to be notified of new comments by email."
-#: ./interfaces.py:93
+#: ./interfaces.py:128
 msgid "help_user_notification_enabled"
 msgstr ""
 
 #. Default: "Anonymous"
-#: ./comment.py:121
+#: ./comment.py:130
 msgid "label_anonymous"
 msgstr ""
 
@@ -234,12 +272,12 @@ msgid "label_apply"
 msgstr "toteuta"
 
 #. Default: "Captcha"
-#: ./interfaces.py:56
+#: ./interfaces.py:81
 msgid "label_captcha"
 msgstr "Roskaviestien estin"
 
 #. Default: "Comment"
-#: ./interfaces.py:266
+#: ./interfaces.py:301
 msgid "label_comment"
 msgstr "Viesti"
 
@@ -253,8 +291,13 @@ msgstr "Poista"
 msgid "label_globally_enabled"
 msgstr "Keskustelu/kommentointitoiminnot käytössä"
 
+#. Default: "Moderator Email Address"
+#: ./interfaces.py:116
+msgid "label_moderator_email"
+msgstr ""
+
 #. Default: "Enable moderator email notification"
-#: ./interfaces.py:81
+#: ./interfaces.py:106
 msgid "label_moderator_notification_enabled"
 msgstr "Ilmoita viesteistä sähköpostitse ylläpitäjälle"
 
@@ -269,7 +312,7 @@ msgid "label_says"
 msgstr ""
 
 #. Default: "Show commenter image"
-#: ./interfaces.py:71
+#: ./interfaces.py:96
 msgid "label_show_commenter_image"
 msgstr "Näytä kirjoittajan kuva"
 
@@ -279,22 +322,22 @@ msgid "label_show_full_comment_text"
 msgstr "Näytä kokonaan"
 
 #. Default: "Subject"
-#: ./interfaces.py:262
+#: ./interfaces.py:297
 msgid "label_subject"
 msgstr "Aihe"
 
 #. Default: "Comment text transform"
-#: ./interfaces.py:48
+#: ./interfaces.py:65
 msgid "label_text_transform"
 msgstr ""
 
 #. Default: "Enable user email notification"
-#: ./interfaces.py:91
+#: ./interfaces.py:126
 msgid "label_user_notification_enabled"
 msgstr ""
 
 #. Default: "A comment on '${title}' has been posted here: ${link}"
-#: ./comment.py:51
+#: ./comment.py:58
 msgid "mail_notification_message"
 msgstr ""
 

plone/app/discussion/locales/fr/LC_MESSAGES/plone.app.discussion.po

@@ -14,54 +14,59 @@ msgstr ""
 "Preferred-Encodings: utf-8 latin1\n"
 "Domain: plone.app.discussion\n"
 
-#: ./comment.py:217
+#: ./comment.py:234
 msgid "A comment has been posted."
 msgstr "Un commentaire a été posté."
 
-#: ./interfaces.py:248
+#: ./interfaces.py:283
 msgid "A comment id unique to this conversation"
 msgstr "Un id de commentaire unique pour cette conversation"
 
-#: ./browser/comments.py:53
+#: ./browser/comments.py:71
 msgid "Add a comment"
 msgstr "Ajouter un commentaire"
 
-#: ./browser/controlpanel.py:41
+#: ./browser/controlpanel.py:63
 msgid "Anonymous Comments"
 msgstr "Commentaires anonymes"
 
-#: ./interfaces.py:273
+#: ./interfaces.py:308
 msgid "Author name (for display)"
 msgstr "Nom de l'auteur (pour l'affichage)"
 
-#: ./browser/comments.py:219
+#: ./browser/comments.py:252
+#: ./browser/controlpanel.py:83
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ./browser/moderation.py:148
+#: ./browser/controlpanel.py:79
+msgid "Changes saved"
+msgstr ""
+
+#: ./browser/moderation.py:165
 msgid "Comment approved."
 msgstr "Commentaire approuvé."
 
-#: ./browser/moderation.py:109
+#: ./browser/moderation.py:126
 msgid "Comment deleted."
 msgstr "Commentaire supprimé."
 
-#: ./browser/controlpanel.py:42
+#: ./browser/controlpanel.py:64
 msgid "Commenter Image"
 msgstr "Portrait de l'utilisateur"
 
 msgid "Commenting infrastructure for Plone"
 msgstr "Infrastructure pour déposer des commentaires."
 
-#: ./interfaces.py:243
+#: ./interfaces.py:278
 msgid "Conversation"
 msgstr "Conversation"
 
-#: ./interfaces.py:274
+#: ./interfaces.py:309
 msgid "Creation date"
 msgstr "Date de création"
 
-#: ./interfaces.py:128
+#: ./interfaces.py:163
 msgid "Date of the most recent comment"
 msgstr "Date du commentaire le plus récent"
 
@@ -69,39 +74,43 @@ msgstr "Date du commentaire le plus récent"
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: ./browser/controlpanel.py:13
+#: ./browser/controlpanel.py:32
 msgid "Discussion settings"
 msgstr "Paramètres des discussions"
 
-#: ./interfaces.py:260
+#: ./browser/controlpanel.py:85
+msgid "Edit cancelled"
+msgstr ""
+
+#: ./interfaces.py:295
 msgid "Email"
 msgstr "Adresse courriel"
 
-#: ./browser/controlpanel.py:40
+#: ./browser/controlpanel.py:62
 msgid "Enable Comments"
 msgstr "Activation des commentaires"
 
-#: ./interfaces.py:251
+#: ./interfaces.py:286
 msgid "Id of comment this comment is in reply to"
 msgstr "Id du commentaire dont ce commentaire répond"
 
-#: ./interfaces.py:265
+#: ./interfaces.py:300
 msgid "MIME type"
 msgstr "Type MIME"
 
-#: ./browser/controlpanel.py:44
+#: ./browser/controlpanel.py:66
 msgid "Moderator Email Notification"
 msgstr "Notification du modérateur par courriel"
 
-#: ./interfaces.py:275
+#: ./interfaces.py:310
 msgid "Modification date"
 msgstr "Date de modification"
 
-#: ./interfaces.py:245
+#: ./interfaces.py:280
 msgid "Name"
 msgstr "Nom"
 
-#: ./interfaces.py:269
+#: ./interfaces.py:304
 msgid "Notify me of new comments via email."
 msgstr ""
 
@@ -109,28 +118,32 @@ msgstr ""
 msgid "Plone Discussions"
 msgstr "Plone Discussions"
 
-#: ./interfaces.py:238
+#: ./interfaces.py:273
 msgid "Portal type"
 msgstr "Portal type"
 
-#: ./interfaces.py:133
+#: ./browser/controlpanel.py:72
+msgid "Save"
+msgstr ""
+
+#: ./interfaces.py:168
 msgid "The set of unique commentators (usernames)"
 msgstr "L'ensemble des commentateurs uniques (identifiants)"
 
-#: ./interfaces.py:122
+#: ./interfaces.py:157
 msgid "Total number of comments on this item"
 msgstr "Nombre total de commentaires pour cet élément"
 
-#: ./browser/controlpanel.py:46
+#: ./browser/controlpanel.py:68
 msgid "User Email Notification"
 msgstr ""
 
-#: ./browser/comments.py:212
+#: ./browser/comments.py:245
 msgid "Your comment awaits moderator approval."
 msgstr "Votre commentaire attend d'être modéré."
 
 #. Default: "Comment"
-#: ./browser/comments.py:102
+#: ./browser/comments.py:127
 msgid "add_comment_button"
 msgstr "Commenter"
 
@@ -144,8 +157,23 @@ msgstr "Supprimer"
 msgid "bulkactions_publish"
 msgstr "Approuver"
 
+#. Default: "You can add a comment by filling out the form below. Plain text formatting. Web and email addresses are transformed into clickable links."
+#: ./browser/comments.py:56
+msgid "comment_description_intelligent_text"
+msgstr ""
+
+#. Default: "Comments are moderated."
+#: ./browser/comments.py:62
+msgid "comment_description_moderation_enabled"
+msgstr ""
+
+#. Default: "You can add a comment by filling out the form below. Plain text formatting."
+#: ./browser/comments.py:51
+msgid "comment_description_plain_text"
+msgstr ""
+
 #. Default: "${creator} on ${content}"
-#: ./comment.py:48
+#: ./comment.py:55
 msgid "comment_title"
 msgstr ""
 
@@ -185,13 +213,13 @@ msgid "help_anonymous_comments"
 msgstr "Si activé, les utilisateurs anonymes peuvent poster des commentaires sans se connecter. Il est fortement recommandé d'utiliser un captcha pour prévenir du spam si cette option est activé."
 
 #. Default: "Use this setting to enable or disable Captcha validation for comments. Install plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet, or collective.z3cform.norobots if there are no options available."
-#: ./interfaces.py:58
+#: ./interfaces.py:83
 #, fuzzy
 msgid "help_captcha"
 msgstr "Utilisez cette option pour activer la validation par captcha pour les commentaires. Installez plone.formwidget.captcha ou plone.formwidget.recaptcha s'il n'y a aucune option de disponible."
 
 #. Default: "Some discussion related settings are not located in the Discussion Control Panel.\nTo enable comments for a specific content type, go to the Types Control Panel of this type and choose \"Allow comments\".\nTo enable the moderation workflow for comments, go to the Types Control Panel, choose \"Comment\" and set workflow to \"Comment Review Workflow\"."
-#: ./browser/controlpanel.py:14
+#: ./browser/controlpanel.py:33
 msgid "help_discussion_settings_editform"
 msgstr ""
 "Certaines options liées aux discussions ne sont pas dans \"Paramètres des discussions\".\n"
@@ -203,23 +231,33 @@ msgstr ""
 msgid "help_globally_enabled"
 msgstr "Si activé, les utilisateurs peuvent poster des commentaires sur ce site. Vous devez néanmoins activer les commentaires pour des types de contenu spécifiques, dossiers, ou éléments avant que les utilisateurs puissent poster des commentaires."
 
+#. Default: "Address to which moderator notifications will be sent. If not specified, the Site 'From' Address from the mail control panel will be used."
+#: ./interfaces.py:117
+msgid "help_moderator_email"
+msgstr ""
+
 #. Default: "If selected, the moderator is notified if a comment needs attention."
-#: ./interfaces.py:83
+#: ./interfaces.py:108
 msgid "help_moderator_notification_enabled"
 msgstr "Si activé, le modérateur est notifié si un commentaire requiert une attention particulière."
 
 #. Default: "If selected, an image of the user is shown next to the comment."
-#: ./interfaces.py:73
+#: ./interfaces.py:98
 msgid "help_show_commenter_image"
 msgstr "Si activé, le portrait de l'utilisateur apparait à côté du commentaire."
 
+#. Default: "Use this setting to choose if the comment text should be transformed in any way. You can choose between 'Plain text' and 'Intelligent text'. 'Intelligent text' converts plain text into HTML where line breaks and indentation is preserved, and web and email addresses are made into clickable links."
+#: ./interfaces.py:67
+msgid "help_text_transform"
+msgstr ""
+
 #. Default: "If selected, users can choose to be notified of new comments by email."
-#: ./interfaces.py:93
+#: ./interfaces.py:128
 msgid "help_user_notification_enabled"
 msgstr ""
 
 #. Default: "Anonymous"
-#: ./comment.py:121
+#: ./comment.py:130
 msgid "label_anonymous"
 msgstr ""
 
@@ -234,12 +272,12 @@ msgid "label_apply"
 msgstr "Appliquer"
 
 #. Default: "Captcha"
-#: ./interfaces.py:56
+#: ./interfaces.py:81
 msgid "label_captcha"
 msgstr "Captcha"
 
 #. Default: "Comment"
-#: ./interfaces.py:266
+#: ./interfaces.py:301
 msgid "label_comment"
 msgstr "Commentaire"
 
@@ -253,8 +291,13 @@ msgstr "Supprimer"
 msgid "label_globally_enabled"
 msgstr "Activer globalement les commentaires"
 
+#. Default: "Moderator Email Address"
+#: ./interfaces.py:116
+msgid "label_moderator_email"
+msgstr ""
+
 #. Default: "Enable moderator email notification"
-#: ./interfaces.py:81
+#: ./interfaces.py:106
 msgid "label_moderator_notification_enabled"
 msgstr "Activer la notification du modérateur par courriel"
 
@@ -269,7 +312,7 @@ msgid "label_says"
 msgstr ""
 
 #. Default: "Show commenter image"
-#: ./interfaces.py:71
+#: ./interfaces.py:96
 msgid "label_show_commenter_image"
 msgstr "Afficher le portrait de l'utilisateur"
 
@@ -279,22 +322,22 @@ msgid "label_show_full_comment_text"
 msgstr "afficher le texte complet du commentaire"
 
 #. Default: "Subject"
-#: ./interfaces.py:262
+#: ./interfaces.py:297
 msgid "label_subject"
 msgstr "Sujet"
 
 #. Default: "Comment text transform"
-#: ./interfaces.py:48
+#: ./interfaces.py:65
 msgid "label_text_transform"
 msgstr "Transformation du texte du commentaire"
 
 #. Default: "Enable user email notification"
-#: ./interfaces.py:91
+#: ./interfaces.py:126
 msgid "label_user_notification_enabled"
 msgstr ""
 
 #. Default: "A comment on '${title}' has been posted here: ${link}"
-#: ./comment.py:51
+#: ./comment.py:58
 #, fuzzy
 msgid "mail_notification_message"
 msgstr "Un commentaire avec le titre '${title}' a été posté ici : ${link}"

plone/app/discussion/locales/it/LC_MESSAGES/plone.app.discussion.po

@@ -15,54 +15,59 @@ msgstr ""
 "Domain: plone.app.discussion\n"
 "X-Is-Fallback-For: it-it it-ch it-sm it-hr it-si\n"
 
-#: ./comment.py:217
+#: ./comment.py:234
 msgid "A comment has been posted."
 msgstr "Un commento è stato inserito."
 
-#: ./interfaces.py:248
+#: ./interfaces.py:283
 msgid "A comment id unique to this conversation"
 msgstr "Un id del commento unico per questa conversazione"
 
-#: ./browser/comments.py:53
+#: ./browser/comments.py:71
 msgid "Add a comment"
 msgstr "Aggiungi un commento"
 
-#: ./browser/controlpanel.py:41
+#: ./browser/controlpanel.py:63
 msgid "Anonymous Comments"
 msgstr "Commenti Anonimi"
 
-#: ./interfaces.py:273
+#: ./interfaces.py:308
 msgid "Author name (for display)"
 msgstr "Nome autore (per visualizzazione)"
 
-#: ./browser/comments.py:219
+#: ./browser/comments.py:252
+#: ./browser/controlpanel.py:83
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ./browser/moderation.py:148
+#: ./browser/controlpanel.py:79
+msgid "Changes saved"
+msgstr ""
+
+#: ./browser/moderation.py:165
 msgid "Comment approved."
 msgstr "Commento approvato."
 
-#: ./browser/moderation.py:109
+#: ./browser/moderation.py:126
 msgid "Comment deleted."
 msgstr "Commento eliminato."
 
-#: ./browser/controlpanel.py:42
+#: ./browser/controlpanel.py:64
 msgid "Commenter Image"
 msgstr "Immagine Commentatore"
 
 msgid "Commenting infrastructure for Plone"
 msgstr "Infrastruttura di commenti per Plone"
 
-#: ./interfaces.py:243
+#: ./interfaces.py:278
 msgid "Conversation"
 msgstr "Conversazione"
 
-#: ./interfaces.py:274
+#: ./interfaces.py:309
 msgid "Creation date"
 msgstr "Data di creazione"
 
-#: ./interfaces.py:128
+#: ./interfaces.py:163
 msgid "Date of the most recent comment"
 msgstr "Data del commento più recente"
 
@@ -70,39 +75,43 @@ msgstr "Data del commento più recente"
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: ./browser/controlpanel.py:13
+#: ./browser/controlpanel.py:32
 msgid "Discussion settings"
 msgstr "Impostazioni dei commenti"
 
-#: ./interfaces.py:260
+#: ./browser/controlpanel.py:85
+msgid "Edit cancelled"
+msgstr ""
+
+#: ./interfaces.py:295
 msgid "Email"
 msgstr "E-mail"
 
-#: ./browser/controlpanel.py:40
+#: ./browser/controlpanel.py:62
 msgid "Enable Comments"
 msgstr "Abilita commenti"
 
-#: ./interfaces.py:251
+#: ./interfaces.py:286
 msgid "Id of comment this comment is in reply to"
 msgstr "Id del commento a cui si risponde"
 
-#: ./interfaces.py:265
+#: ./interfaces.py:300
 msgid "MIME type"
 msgstr ""
 
-#: ./browser/controlpanel.py:44
+#: ./browser/controlpanel.py:66
 msgid "Moderator Email Notification"
 msgstr "Notifiche e-mail"
 
-#: ./interfaces.py:275
+#: ./interfaces.py:310
 msgid "Modification date"
 msgstr "Data di modifica"
 
-#: ./interfaces.py:245
+#: ./interfaces.py:280
 msgid "Name"
 msgstr "Nome"
 
-#: ./interfaces.py:269
+#: ./interfaces.py:304
 msgid "Notify me of new comments via email."
 msgstr "Notificami nuovi commenti via e-mail"
 
@@ -110,28 +119,32 @@ msgstr "Notificami nuovi commenti via e-mail"
 msgid "Plone Discussions"
 msgstr "Supporto ai commenti Plone"
 
-#: ./interfaces.py:238
+#: ./interfaces.py:273
 msgid "Portal type"
 msgstr "Tipo di contenuto"
 
-#: ./interfaces.py:133
+#: ./browser/controlpanel.py:72
+msgid "Save"
+msgstr ""
+
+#: ./interfaces.py:168
 msgid "The set of unique commentators (usernames)"
 msgstr "L'insieme unico dei commentatori (username)"
 
-#: ./interfaces.py:122
+#: ./interfaces.py:157
 msgid "Total number of comments on this item"
 msgstr "Totale dei commenti per questo contenuto"
 
-#: ./browser/controlpanel.py:46
+#: ./browser/controlpanel.py:68
 msgid "User Email Notification"
 msgstr "Notifiche utenti via e-mail"
 
-#: ./browser/comments.py:212
+#: ./browser/comments.py:245
 msgid "Your comment awaits moderator approval."
 msgstr "Il tuo commento è in attesa di approvazione"
 
 #. Default: "Comment"
-#: ./browser/comments.py:102
+#: ./browser/comments.py:127
 msgid "add_comment_button"
 msgstr "Commenta"
 
@@ -145,8 +158,23 @@ msgstr "Elimina"
 msgid "bulkactions_publish"
 msgstr "Approva"
 
+#. Default: "You can add a comment by filling out the form below. Plain text formatting. Web and email addresses are transformed into clickable links."
+#: ./browser/comments.py:56
+msgid "comment_description_intelligent_text"
+msgstr ""
+
+#. Default: "Comments are moderated."
+#: ./browser/comments.py:62
+msgid "comment_description_moderation_enabled"
+msgstr ""
+
+#. Default: "You can add a comment by filling out the form below. Plain text formatting."
+#: ./browser/comments.py:51
+msgid "comment_description_plain_text"
+msgstr ""
+
 #. Default: "${creator} on ${content}"
-#: ./comment.py:48
+#: ./comment.py:55
 msgid "comment_title"
 msgstr ""
 
@@ -186,12 +214,12 @@ msgid "help_anonymous_comments"
 msgstr "Se selezionato, gli utenti anonimi saranno in grado di inserire commenti senza autenticazione. E' altamente consigliato l'uso di captcha to prevenire spam se questa impostazione viene abilitata."
 
 #. Default: "Use this setting to enable or disable Captcha validation for comments. Install plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet, or collective.z3cform.norobots if there are no options available."
-#: ./interfaces.py:58
+#: ./interfaces.py:83
 msgid "help_captcha"
 msgstr "Usa questa impostazione per abilitare o disabilitare la validazione tramite captcha. Se nessuna opzione di captcha è disponibile, installa plone.formwidget.captcha o plone.formwidget.recaptcha."
 
 #. Default: "Some discussion related settings are not located in the Discussion Control Panel.\nTo enable comments for a specific content type, go to the Types Control Panel of this type and choose \"Allow comments\".\nTo enable the moderation workflow for comments, go to the Types Control Panel, choose \"Comment\" and set workflow to \"Comment Review Workflow\"."
-#: ./browser/controlpanel.py:14
+#: ./browser/controlpanel.py:33
 msgid "help_discussion_settings_editform"
 msgstr ""
 "Alcune impostazioni legate ai commenti non sono nel Pannello di controllo commenti.\n"
@@ -203,23 +231,33 @@ msgstr ""
 msgid "help_globally_enabled"
 msgstr "Se selezionato, gli utenti saranno in grado di inserire commenti nel sito. Comunque, dovrai abilitare i commenti per specifici tipi di contenuto, cartelle o oggetti prima che gli utenti siano in grado di commentare."
 
+#. Default: "Address to which moderator notifications will be sent. If not specified, the Site 'From' Address from the mail control panel will be used."
+#: ./interfaces.py:117
+msgid "help_moderator_email"
+msgstr ""
+
 #. Default: "If selected, the moderator is notified if a comment needs attention."
-#: ./interfaces.py:83
+#: ./interfaces.py:108
 msgid "help_moderator_notification_enabled"
 msgstr "Se selezionato il moderatore riceverà una notifica se il commento dovrà necessita della sua attenzione."
 
 #. Default: "If selected, an image of the user is shown next to the comment."
-#: ./interfaces.py:73
+#: ./interfaces.py:98
 msgid "help_show_commenter_image"
 msgstr "Se selezionato, un'immagine dell'utente verrà mostrata a fianco dei commenti."
 
+#. Default: "Use this setting to choose if the comment text should be transformed in any way. You can choose between 'Plain text' and 'Intelligent text'. 'Intelligent text' converts plain text into HTML where line breaks and indentation is preserved, and web and email addresses are made into clickable links."
+#: ./interfaces.py:67
+msgid "help_text_transform"
+msgstr ""
+
 #. Default: "If selected, users can choose to be notified of new comments by email."
-#: ./interfaces.py:93
+#: ./interfaces.py:128
 msgid "help_user_notification_enabled"
 msgstr "Se selezionato, gli utenti possono scegliere di essere notificati ad ogni nuovo commenti via e-mail."
 
 #. Default: "Anonymous"
-#: ./comment.py:121
+#: ./comment.py:130
 msgid "label_anonymous"
 msgstr "Anonimo"
 
@@ -234,12 +272,12 @@ msgid "label_apply"
 msgstr "Applica"
 
 #. Default: "Captcha"
-#: ./interfaces.py:56
+#: ./interfaces.py:81
 msgid "label_captcha"
 msgstr ""
 
 #. Default: "Comment"
-#: ./interfaces.py:266
+#: ./interfaces.py:301
 msgid "label_comment"
 msgstr "Commento"
 
@@ -253,8 +291,13 @@ msgstr "Elimina"
 msgid "label_globally_enabled"
 msgstr "Abilita globalmente i commenti"
 
+#. Default: "Moderator Email Address"
+#: ./interfaces.py:116
+msgid "label_moderator_email"
+msgstr ""
+
 #. Default: "Enable moderator email notification"
-#: ./interfaces.py:81
+#: ./interfaces.py:106
 msgid "label_moderator_notification_enabled"
 msgstr "Abilita le notifiche ai moderatori"
 
@@ -269,7 +312,7 @@ msgid "label_says"
 msgstr "dice:"
 
 #. Default: "Show commenter image"
-#: ./interfaces.py:71
+#: ./interfaces.py:96
 msgid "label_show_commenter_image"
 msgstr "Visualizza le immagini dei commentatori"
 
@@ -279,22 +322,22 @@ msgid "label_show_full_comment_text"
 msgstr "mostra testo completo del commento"
 
 #. Default: "Subject"
-#: ./interfaces.py:262
+#: ./interfaces.py:297
 msgid "label_subject"
 msgstr "Oggetto"
 
 #. Default: "Comment text transform"
-#: ./interfaces.py:48
+#: ./interfaces.py:65
 msgid "label_text_transform"
 msgstr "Transformazioni testo del commento"
 
 #. Default: "Enable user email notification"
-#: ./interfaces.py:91
+#: ./interfaces.py:126
 msgid "label_user_notification_enabled"
 msgstr "Abilita notifica via e-mail"
 
 #. Default: "A comment on '${title}' has been posted here: ${link}"
-#: ./comment.py:51
+#: ./comment.py:58
 msgid "mail_notification_message"
 msgstr "Un commento a '${title}' è stato inserito qui: ${link}"
 

plone/app/discussion/locales/nl/LC_MESSAGES/plone.app.discussion.po

@@ -14,54 +14,59 @@ msgstr ""
 "Preferred-Encodings: utf-8 latin1\n"
 "Domain: plone.app.discussion\n"
 
-#: ./comment.py:217
+#: ./comment.py:234
 msgid "A comment has been posted."
 msgstr ""
 
-#: ./interfaces.py:248
+#: ./interfaces.py:283
 msgid "A comment id unique to this conversation"
 msgstr "Een unieke ID voor dit commentaar"
 
-#: ./browser/comments.py:53
+#: ./browser/comments.py:71
 msgid "Add a comment"
 msgstr "Voeg opmerking toe"
 
-#: ./browser/controlpanel.py:41
+#: ./browser/controlpanel.py:63
 msgid "Anonymous Comments"
 msgstr "Anoniem commentaar"
 
-#: ./interfaces.py:273
+#: ./interfaces.py:308
 msgid "Author name (for display)"
 msgstr "Auteur"
 
-#: ./browser/comments.py:219
+#: ./browser/comments.py:252
+#: ./browser/controlpanel.py:83
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ./browser/moderation.py:148
+#: ./browser/controlpanel.py:79
+msgid "Changes saved"
+msgstr ""
+
+#: ./browser/moderation.py:165
 msgid "Comment approved."
 msgstr "Commentaar goedgekeurd"
 
-#: ./browser/moderation.py:109
+#: ./browser/moderation.py:126
 msgid "Comment deleted."
 msgstr "Commentaar verwijderd"
 
-#: ./browser/controlpanel.py:42
+#: ./browser/controlpanel.py:64
 msgid "Commenter Image"
 msgstr "Profielfoto commentator"
 
 msgid "Commenting infrastructure for Plone"
 msgstr ""
 
-#: ./interfaces.py:243
+#: ./interfaces.py:278
 msgid "Conversation"
 msgstr "Conversatie"
 
-#: ./interfaces.py:274
+#: ./interfaces.py:309
 msgid "Creation date"
 msgstr "Aanmaakdatum"
 
-#: ./interfaces.py:128
+#: ./interfaces.py:163
 msgid "Date of the most recent comment"
 msgstr "Datum van het laatste commentaar"
 
@@ -69,39 +74,43 @@ msgstr "Datum van het laatste commentaar"
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
-#: ./browser/controlpanel.py:13
+#: ./browser/controlpanel.py:32
 msgid "Discussion settings"
 msgstr "Discussie instellingen"
 
-#: ./interfaces.py:260
+#: ./browser/controlpanel.py:85
+msgid "Edit cancelled"
+msgstr ""
+
+#: ./interfaces.py:295
 msgid "Email"
 msgstr "E-mail"
 
-#: ./browser/controlpanel.py:40
+#: ./browser/controlpanel.py:62
 msgid "Enable Comments"
 msgstr "Commentaar toestaan"
 
-#: ./interfaces.py:251
+#: ./interfaces.py:286
 msgid "Id of comment this comment is in reply to"
 msgstr ""
 
-#: ./interfaces.py:265
+#: ./interfaces.py:300
 msgid "MIME type"
 msgstr "MIME-type"
 
-#: ./browser/controlpanel.py:44
+#: ./browser/controlpanel.py:66
 msgid "Moderator Email Notification"
 msgstr "E-mail notificatie voor de redactie"
 
-#: ./interfaces.py:275
+#: ./interfaces.py:310
 msgid "Modification date"
 msgstr "Wijzigingsdatum"
 
-#: ./interfaces.py:245
+#: ./interfaces.py:280
 msgid "Name"
 msgstr "Naam"
 
-#: ./interfaces.py:269
+#: ./interfaces.py:304
 msgid "Notify me of new comments via email."
 msgstr ""
 
@@ -109,28 +118,32 @@ msgstr ""
 msgid "Plone Discussions"
 msgstr ""
 
-#: ./interfaces.py:238
+#: ./interfaces.py:273
 msgid "Portal type"
 msgstr "type"
 
-#: ./interfaces.py:133
+#: ./browser/controlpanel.py:72
+msgid "Save"
+msgstr ""
+
+#: ./interfaces.py:168
 msgid "The set of unique commentators (usernames)"
 msgstr "Lijst van commentatoren (gebruikernamen)"
 
-#: ./interfaces.py:122
+#: ./interfaces.py:157
 msgid "Total number of comments on this item"
 msgstr "Totaal aantal reacties op dit item"
 
-#: ./browser/controlpanel.py:46
+#: ./browser/controlpanel.py:68
 msgid "User Email Notification"
 msgstr ""
 
-#: ./browser/comments.py:212
+#: ./browser/comments.py:245
 msgid "Your comment awaits moderator approval."
 msgstr "Je commentaar zal geplaatst worden na goedkeuring."
 
 #. Default: "Comment"
-#: ./browser/comments.py:102
+#: ./browser/comments.py:127
 msgid "add_comment_button"
 msgstr "Commentaar toevoegen"
 
@@ -144,8 +157,23 @@ msgstr "Verwijderen"
 msgid "bulkactions_publish"
 msgstr "Publiceren"
 
+#. Default: "You can add a comment by filling out the form below. Plain text formatting. Web and email addresses are transformed into clickable links."
+#: ./browser/comments.py:56
+msgid "comment_description_intelligent_text"
+msgstr ""
+
+#. Default: "Comments are moderated."
+#: ./browser/comments.py:62
+msgid "comment_description_moderation_enabled"
+msgstr ""
+
+#. Default: "You can add a comment by filling out the form below. Plain text formatting."
+#: ./browser/comments.py:51
+msgid "comment_description_plain_text"
+msgstr ""
+
 #. Default: "${creator} on ${content}"
-#: ./comment.py:48
+#: ./comment.py:55
 msgid "comment_title"
 msgstr ""
 
@@ -185,13 +213,13 @@ msgid "help_anonymous_comments"
 msgstr "Indien geselecteerd, anonieme bezoekers kunnen een reactie achterlaten zonder in te loggen. Het is aanbevolen om de captcha-oplossing te gebruiken om spam te voorkomen als deze optie is ingeschakeld."
 
 #. Default: "Use this setting to enable or disable Captcha validation for comments. Install plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet, or collective.z3cform.norobots if there are no options available."
-#: ./interfaces.py:58
+#: ./interfaces.py:83
 #, fuzzy
 msgid "help_captcha"
 msgstr "Indien geselecteerd, Captcha validatie wordt gebruikt voor het commentaar. Installeer plone.formwidget of plone.formwidget.recaptcha als er geen opties beschikbaar zijn."
 
 #. Default: "Some discussion related settings are not located in the Discussion Control Panel.\nTo enable comments for a specific content type, go to the Types Control Panel of this type and choose \"Allow comments\".\nTo enable the moderation workflow for comments, go to the Types Control Panel, choose \"Comment\" and set workflow to \"Comment Review Workflow\"."
-#: ./browser/controlpanel.py:14
+#: ./browser/controlpanel.py:33
 #, fuzzy
 msgid "help_discussion_settings_editform"
 msgstr "Sommige discussie instellingen staan niet op deze pagina. Om commentaar in te schakelen voor een specifiek content-type, ga naar het Typen instellingenscherm van het betreffende type en kies 'commentaar toestaan'. Om de moderatie-workflow in te schakelen, ga naar het Typen instellingenscherm en kies het type 'Comment' stel de 'Comment Review Workflow' in."
@@ -202,23 +230,33 @@ msgstr "Sommige discussie instellingen staan niet op deze pagina. Om commentaar
 msgid "help_globally_enabled"
 msgstr "Indien geselecteerd, gebruikers kunnen commentaar plaatsen op de site. Het kan zijn dat commentaar voor een specifiek content-type ingeschakeld moet worden voordat commentaar mogelijk is."
 
+#. Default: "Address to which moderator notifications will be sent. If not specified, the Site 'From' Address from the mail control panel will be used."
+#: ./interfaces.py:117
+msgid "help_moderator_email"
+msgstr ""
+
 #. Default: "If selected, the moderator is notified if a comment needs attention."
-#: ./interfaces.py:83
+#: ./interfaces.py:108
 msgid "help_moderator_notification_enabled"
 msgstr "Indien geselecteerd, de moderator zal ingelicht worden als een commentaar aandacht nodig heeft."
 
 #. Default: "If selected, an image of the user is shown next to the comment."
-#: ./interfaces.py:73
+#: ./interfaces.py:98
 msgid "help_show_commenter_image"
 msgstr "Indien geselecteerd, de profielfoto van een gebruiker wordt naast het commentaar getoond."
 
+#. Default: "Use this setting to choose if the comment text should be transformed in any way. You can choose between 'Plain text' and 'Intelligent text'. 'Intelligent text' converts plain text into HTML where line breaks and indentation is preserved, and web and email addresses are made into clickable links."
+#: ./interfaces.py:67
+msgid "help_text_transform"
+msgstr ""
+
 #. Default: "If selected, users can choose to be notified of new comments by email."
-#: ./interfaces.py:93
+#: ./interfaces.py:128
 msgid "help_user_notification_enabled"
 msgstr ""
 
 #. Default: "Anonymous"
-#: ./comment.py:121
+#: ./comment.py:130
 msgid "label_anonymous"
 msgstr ""
 
@@ -233,12 +271,12 @@ msgid "label_apply"
 msgstr "Toepassen"
 
 #. Default: "Captcha"
-#: ./interfaces.py:56
+#: ./interfaces.py:81
 msgid "label_captcha"
 msgstr ""
 
 #. Default: "Comment"
-#: ./interfaces.py:266
+#: ./interfaces.py:301
 msgid "label_comment"
 msgstr ""
 
@@ -252,8 +290,13 @@ msgstr "Verwijderen"
 msgid "label_globally_enabled"
 msgstr "Commentaar globaal toestaan"
 
+#. Default: "Moderator Email Address"
+#: ./interfaces.py:116
+msgid "label_moderator_email"
+msgstr ""
+
 #. Default: "Enable moderator email notification"
-#: ./interfaces.py:81
+#: ./interfaces.py:106
 msgid "label_moderator_notification_enabled"
 msgstr "Notificatie voor moderator  inschakelen"
 
@@ -268,7 +311,7 @@ msgid "label_says"
 msgstr ""
 
 #. Default: "Show commenter image"
-#: ./interfaces.py:71
+#: ./interfaces.py:96
 msgid "label_show_commenter_image"
 msgstr ""
 
@@ -278,22 +321,22 @@ msgid "label_show_full_comment_text"
 msgstr "Toon het volledige commentaar"
 
 #. Default: "Subject"
-#: ./interfaces.py:262
+#: ./interfaces.py:297
 msgid "label_subject"
 msgstr ""
 
 #. Default: "Comment text transform"
-#: ./interfaces.py:48
+#: ./interfaces.py:65
 msgid "label_text_transform"
 msgstr ""
 
 #. Default: "Enable user email notification"
-#: ./interfaces.py:91
+#: ./interfaces.py:126
 msgid "label_user_notification_enabled"
 msgstr ""
 
 #. Default: "A comment on '${title}' has been posted here: ${link}"
-#: ./comment.py:51
+#: ./comment.py:58
 msgid "mail_notification_message"
 msgstr ""
 

plone/app/discussion/locales/no/LC_MESSAGES/plone.app.discussion.po

@@ -14,54 +14,59 @@ msgstr ""
 "Preferred-Encodings: utf-8 latin1\n"
 "Domain: plone.app.discussion\n"
 
-#: ./comment.py:217
+#: ./comment.py:234
 msgid "A comment has been posted."
 msgstr ""
 
-#: ./interfaces.py:248
+#: ./interfaces.py:283
 msgid "A comment id unique to this conversation"
 msgstr "En kommentar-id unik for denne kommentaren"
 
-#: ./browser/comments.py:53
+#: ./browser/comments.py:71
 msgid "Add a comment"
 msgstr "Legg til en kommentar"
 
-#: ./browser/controlpanel.py:41
+#: ./browser/controlpanel.py:63
 msgid "Anonymous Comments"
 msgstr "Anonym kommentar"
 
-#: ./interfaces.py:273
+#: ./interfaces.py:308
 msgid "Author name (for display)"
 msgstr "Forfatternavn (synlig)"
 
-#: ./browser/comments.py:219
+#: ./browser/comments.py:252
+#: ./browser/controlpanel.py:83
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ./browser/moderation.py:148
+#: ./browser/controlpanel.py:79
+msgid "Changes saved"
+msgstr ""
+
+#: ./browser/moderation.py:165
 msgid "Comment approved."
 msgstr "Kommentaren er godkjent"
 
-#: ./browser/moderation.py:109
+#: ./browser/moderation.py:126
 msgid "Comment deleted."
 msgstr "Kommentaren er slettet"
 
-#: ./browser/controlpanel.py:42
+#: ./browser/controlpanel.py:64
 msgid "Commenter Image"
 msgstr "Forfatterbilde"
 
 msgid "Commenting infrastructure for Plone"
 msgstr ""
 
-#: ./interfaces.py:243
+#: ./interfaces.py:278
 msgid "Conversation"
 msgstr "Diskusjon"
 
-#: ./interfaces.py:274
+#: ./interfaces.py:309
 msgid "Creation date"
 msgstr "Dato opprettet"
 
-#: ./interfaces.py:128
+#: ./interfaces.py:163
 msgid "Date of the most recent comment"
 msgstr "Dato for den nyeste kommentaren"
 
@@ -69,39 +74,43 @@ msgstr "Dato for den nyeste kommentaren"
 msgid "Disabled"
 msgstr "Slått av"
 
-#: ./browser/controlpanel.py:13
+#: ./browser/controlpanel.py:32
 msgid "Discussion settings"
 msgstr "Innstillinger for kommentarer"
 
-#: ./interfaces.py:260
+#: ./browser/controlpanel.py:85
+msgid "Edit cancelled"
+msgstr ""
+
+#: ./interfaces.py:295
 msgid "Email"
 msgstr "E-post"
 
-#: ./browser/controlpanel.py:40
+#: ./browser/controlpanel.py:62
 msgid "Enable Comments"
 msgstr "Slå på kommentarer"
 
-#: ./interfaces.py:251
+#: ./interfaces.py:286
 msgid "Id of comment this comment is in reply to"
 msgstr "Id til kommentar som denne kommentaren er en kommentar til"
 
-#: ./interfaces.py:265
+#: ./interfaces.py:300
 msgid "MIME type"
 msgstr "MIME-type"
 
-#: ./browser/controlpanel.py:44
+#: ./browser/controlpanel.py:66
 msgid "Moderator Email Notification"
 msgstr "Varsling av moderator på epost"
 
-#: ./interfaces.py:275
+#: ./interfaces.py:310
 msgid "Modification date"
 msgstr "Endringsdato"
 
-#: ./interfaces.py:245
+#: ./interfaces.py:280
 msgid "Name"
 msgstr "Navn"
 
-#: ./interfaces.py:269
+#: ./interfaces.py:304
 msgid "Notify me of new comments via email."
 msgstr ""
 
@@ -109,28 +118,32 @@ msgstr ""
 msgid "Plone Discussions"
 msgstr ""
 
-#: ./interfaces.py:238
+#: ./interfaces.py:273
 msgid "Portal type"
 msgstr "Portaltype"
 
-#: ./interfaces.py:133
+#: ./browser/controlpanel.py:72
+msgid "Save"
+msgstr ""
+
+#: ./interfaces.py:168
 msgid "The set of unique commentators (usernames)"
 msgstr "Listen over forfattere (brukernavn)"
 
-#: ./interfaces.py:122
+#: ./interfaces.py:157
 msgid "Total number of comments on this item"
 msgstr "Antall kommentarer på denne artikkelen"
 
-#: ./browser/controlpanel.py:46
+#: ./browser/controlpanel.py:68
 msgid "User Email Notification"
 msgstr ""
 
-#: ./browser/comments.py:212
+#: ./browser/comments.py:245
 msgid "Your comment awaits moderator approval."
 msgstr "Kommentaren venter på godkjenning av moderator."
 
 #. Default: "Comment"
-#: ./browser/comments.py:102
+#: ./browser/comments.py:127
 msgid "add_comment_button"
 msgstr "Kommentér"
 
@@ -144,8 +157,23 @@ msgstr "Slett"
 msgid "bulkactions_publish"
 msgstr "Godkjenn"
 
+#. Default: "You can add a comment by filling out the form below. Plain text formatting. Web and email addresses are transformed into clickable links."
+#: ./browser/comments.py:56
+msgid "comment_description_intelligent_text"
+msgstr ""
+
+#. Default: "Comments are moderated."
+#: ./browser/comments.py:62
+msgid "comment_description_moderation_enabled"
+msgstr ""
+
+#. Default: "You can add a comment by filling out the form below. Plain text formatting."
+#: ./browser/comments.py:51
+msgid "comment_description_plain_text"
+msgstr ""
+
 #. Default: "${creator} on ${content}"
-#: ./comment.py:48
+#: ./comment.py:55
 msgid "comment_title"
 msgstr ""
 
@@ -185,13 +213,13 @@ msgid "help_anonymous_comments"
 msgstr "Dersom innstillingen er valgt kan anonyme brukere kommentere uten å logge inn. Det er anbefalt å bruke en captcha-løsning for å forhindre nettsøppel dersom denne innstillingen er valgt"
 
 #. Default: "Use this setting to enable or disable Captcha validation for comments. Install plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet, or collective.z3cform.norobots if there are no options available."
-#: ./interfaces.py:58
+#: ./interfaces.py:83
 #, fuzzy
 msgid "help_captcha"
 msgstr "Bruk denne innstillingen for å aktivere eller deaktivere captcha-validering av kommentarer. Installér plone.formwidget.captcha eller plone.formwidget.recaptcha dersom det mangler valg her."
 
 #. Default: "Some discussion related settings are not located in the Discussion Control Panel.\nTo enable comments for a specific content type, go to the Types Control Panel of this type and choose \"Allow comments\".\nTo enable the moderation workflow for comments, go to the Types Control Panel, choose \"Comment\" and set workflow to \"Comment Review Workflow\"."
-#: ./browser/controlpanel.py:14
+#: ./browser/controlpanel.py:33
 #, fuzzy
 msgid "help_discussion_settings_editform"
 msgstr ""
@@ -204,23 +232,33 @@ msgstr ""
 msgid "help_globally_enabled"
 msgstr "Dersom denne instillingen er valgt kan brukerene legge til kommentarer på nettstedet. Men du må likevel aktivere kommentarer for spesifikke innholdstyper, mapper eller innholdsobjekter før brukerene får lov til å legge til kommentarer."
 
+#. Default: "Address to which moderator notifications will be sent. If not specified, the Site 'From' Address from the mail control panel will be used."
+#: ./interfaces.py:117
+msgid "help_moderator_email"
+msgstr ""
+
 #. Default: "If selected, the moderator is notified if a comment needs attention."
-#: ./interfaces.py:83
+#: ./interfaces.py:108
 msgid "help_moderator_notification_enabled"
 msgstr "Dersom innstillingen er valgt vil moderatoren bli varslet når en kommentar er lagt til."
 
 #. Default: "If selected, an image of the user is shown next to the comment."
-#: ./interfaces.py:73
+#: ./interfaces.py:98
 msgid "help_show_commenter_image"
 msgstr "Dersom denne er valgt vil bildet av brukeren vise ved siden av kommentaren."
 
+#. Default: "Use this setting to choose if the comment text should be transformed in any way. You can choose between 'Plain text' and 'Intelligent text'. 'Intelligent text' converts plain text into HTML where line breaks and indentation is preserved, and web and email addresses are made into clickable links."
+#: ./interfaces.py:67
+msgid "help_text_transform"
+msgstr ""
+
 #. Default: "If selected, users can choose to be notified of new comments by email."
-#: ./interfaces.py:93
+#: ./interfaces.py:128
 msgid "help_user_notification_enabled"
 msgstr ""
 
 #. Default: "Anonymous"
-#: ./comment.py:121
+#: ./comment.py:130
 msgid "label_anonymous"
 msgstr ""
 
@@ -235,12 +273,12 @@ msgid "label_apply"
 msgstr "Bruk"
 
 #. Default: "Captcha"
-#: ./interfaces.py:56
+#: ./interfaces.py:81
 msgid "label_captcha"
 msgstr ""
 
 #. Default: "Comment"
-#: ./interfaces.py:266
+#: ./interfaces.py:301
 msgid "label_comment"
 msgstr ""
 
@@ -254,8 +292,13 @@ msgstr "Slett"
 msgid "label_globally_enabled"
 msgstr "Aktiver kommentarer globalt"
 
+#. Default: "Moderator Email Address"
+#: ./interfaces.py:116
+msgid "label_moderator_email"
+msgstr ""
+
 #. Default: "Enable moderator email notification"
-#: ./interfaces.py:81
+#: ./interfaces.py:106
 msgid "label_moderator_notification_enabled"
 msgstr "Slå på e-postvarsling av moderator"
 
@@ -270,7 +313,7 @@ msgid "label_says"
 msgstr ""
 
 #. Default: "Show commenter image"
-#: ./interfaces.py:71
+#: ./interfaces.py:96
 msgid "label_show_commenter_image"
 msgstr ""
 
@@ -280,22 +323,22 @@ msgid "label_show_full_comment_text"
 msgstr "Vis hele kommentaren"
 
 #. Default: "Subject"
-#: ./interfaces.py:262
+#: ./interfaces.py:297
 msgid "label_subject"
 msgstr ""
 
 #. Default: "Comment text transform"
-#: ./interfaces.py:48
+#: ./interfaces.py:65
 msgid "label_text_transform"
 msgstr ""
 
 #. Default: "Enable user email notification"
-#: ./interfaces.py:91
+#: ./interfaces.py:126
 msgid "label_user_notification_enabled"
 msgstr ""
 
 #. Default: "A comment on '${title}' has been posted here: ${link}"
-#: ./comment.py:51
+#: ./comment.py:58
 msgid "mail_notification_message"
 msgstr ""
 

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-11-03 13:43+0000\n"
+"POT-Creation-Date: 2011-05-03 13:55+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"
@@ -14,58 +14,63 @@ msgstr ""
 "Preferred-Encodings: utf-8 latin1\n"
 "Domain: DOMAIN\n"
 
-#: ./browser/comments.py:76
+#: ./browser/comments.py:94
 msgid ""
 msgstr ""
 
-#: ./comment.py:217
+#: ./comment.py:234
 msgid "A comment has been posted."
 msgstr ""
 
-#: ./interfaces.py:248
+#: ./interfaces.py:283
 msgid "A comment id unique to this conversation"
 msgstr ""
 
-#: ./browser/comments.py:53
+#: ./browser/comments.py:71
 msgid "Add a comment"
 msgstr ""
 
-#: ./browser/controlpanel.py:41
+#: ./browser/controlpanel.py:63
 msgid "Anonymous Comments"
 msgstr ""
 
-#: ./interfaces.py:273
+#: ./interfaces.py:308
 msgid "Author name (for display)"
 msgstr ""
 
-#: ./browser/comments.py:219
+#: ./browser/comments.py:252
+#: ./browser/controlpanel.py:83
 msgid "Cancel"
 msgstr ""
 
-#: ./browser/moderation.py:148
+#: ./browser/controlpanel.py:79
+msgid "Changes saved"
+msgstr ""
+
+#: ./browser/moderation.py:165
 msgid "Comment approved."
 msgstr ""
 
-#: ./browser/moderation.py:109
+#: ./browser/moderation.py:126
 msgid "Comment deleted."
 msgstr ""
 
-#: ./browser/controlpanel.py:42
+#: ./browser/controlpanel.py:64
 msgid "Commenter Image"
 msgstr ""
 
 msgid "Commenting infrastructure for Plone"
 msgstr ""
 
-#: ./interfaces.py:243
+#: ./interfaces.py:278
 msgid "Conversation"
 msgstr ""
 
-#: ./interfaces.py:274
+#: ./interfaces.py:309
 msgid "Creation date"
 msgstr ""
 
-#: ./interfaces.py:128
+#: ./interfaces.py:163
 msgid "Date of the most recent comment"
 msgstr ""
 
@@ -73,39 +78,43 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: ./browser/controlpanel.py:13
+#: ./browser/controlpanel.py:32
 msgid "Discussion settings"
 msgstr ""
 
-#: ./interfaces.py:260
+#: ./browser/controlpanel.py:85
+msgid "Edit cancelled"
+msgstr ""
+
+#: ./interfaces.py:295
 msgid "Email"
 msgstr ""
 
-#: ./browser/controlpanel.py:40
+#: ./browser/controlpanel.py:62
 msgid "Enable Comments"
 msgstr ""
 
-#: ./interfaces.py:251
+#: ./interfaces.py:286
 msgid "Id of comment this comment is in reply to"
 msgstr ""
 
-#: ./interfaces.py:265
+#: ./interfaces.py:300
 msgid "MIME type"
 msgstr ""
 
-#: ./browser/controlpanel.py:44
+#: ./browser/controlpanel.py:66
 msgid "Moderator Email Notification"
 msgstr ""
 
-#: ./interfaces.py:275
+#: ./interfaces.py:310
 msgid "Modification date"
 msgstr ""
 
-#: ./interfaces.py:245
+#: ./interfaces.py:280
 msgid "Name"
 msgstr ""
 
-#: ./interfaces.py:269
+#: ./interfaces.py:304
 msgid "Notify me of new comments via email."
 msgstr ""
 
@@ -113,28 +122,32 @@ msgstr ""
 msgid "Plone Discussions"
 msgstr ""
 
-#: ./interfaces.py:238
+#: ./interfaces.py:273
 msgid "Portal type"
 msgstr ""
 
-#: ./interfaces.py:133
+#: ./browser/controlpanel.py:72
+msgid "Save"
+msgstr ""
+
+#: ./interfaces.py:168
 msgid "The set of unique commentators (usernames)"
 msgstr ""
 
-#: ./interfaces.py:122
+#: ./interfaces.py:157
 msgid "Total number of comments on this item"
 msgstr ""
 
-#: ./browser/controlpanel.py:46
+#: ./browser/controlpanel.py:68
 msgid "User Email Notification"
 msgstr ""
 
-#: ./browser/comments.py:212
+#: ./browser/comments.py:245
 msgid "Your comment awaits moderator approval."
 msgstr ""
 
 #. Default: "Comment"
-#: ./browser/comments.py:102
+#: ./browser/comments.py:127
 msgid "add_comment_button"
 msgstr ""
 
@@ -148,8 +161,23 @@ msgstr ""
 msgid "bulkactions_publish"
 msgstr ""
 
+#. Default: "You can add a comment by filling out the form below. Plain text formatting. Web and email addresses are transformed into clickable links."
+#: ./browser/comments.py:56
+msgid "comment_description_intelligent_text"
+msgstr ""
+
+#. Default: "Comments are moderated."
+#: ./browser/comments.py:62
+msgid "comment_description_moderation_enabled"
+msgstr ""
+
+#. Default: "You can add a comment by filling out the form below. Plain text formatting."
+#: ./browser/comments.py:51
+msgid "comment_description_plain_text"
+msgstr ""
+
 #. Default: "${creator} on ${content}"
-#: ./comment.py:48
+#: ./comment.py:55
 msgid "comment_title"
 msgstr ""
 
@@ -189,12 +217,12 @@ msgid "help_anonymous_comments"
 msgstr ""
 
 #. Default: "Use this setting to enable or disable Captcha validation for comments. Install plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet, or collective.z3cform.norobots if there are no options available."
-#: ./interfaces.py:58
+#: ./interfaces.py:83
 msgid "help_captcha"
 msgstr ""
 
 #. Default: "Some discussion related settings are not located in the Discussion Control Panel.\nTo enable comments for a specific content type, go to the Types Control Panel of this type and choose \"Allow comments\".\nTo enable the moderation workflow for comments, go to the Types Control Panel, choose \"Comment\" and set workflow to \"Comment Review Workflow\"."
-#: ./browser/controlpanel.py:14
+#: ./browser/controlpanel.py:33
 msgid "help_discussion_settings_editform"
 msgstr ""
 
@@ -203,23 +231,33 @@ msgstr ""
 msgid "help_globally_enabled"
 msgstr ""
 
+#. Default: "Address to which moderator notifications will be sent. If not specified, the Site 'From' Address from the mail control panel will be used."
+#: ./interfaces.py:117
+msgid "help_moderator_email"
+msgstr ""
+
 #. Default: "If selected, the moderator is notified if a comment needs attention."
-#: ./interfaces.py:83
+#: ./interfaces.py:108
 msgid "help_moderator_notification_enabled"
 msgstr ""
 
 #. Default: "If selected, an image of the user is shown next to the comment."
-#: ./interfaces.py:73
+#: ./interfaces.py:98
 msgid "help_show_commenter_image"
 msgstr ""
 
+#. Default: "Use this setting to choose if the comment text should be transformed in any way. You can choose between 'Plain text' and 'Intelligent text'. 'Intelligent text' converts plain text into HTML where line breaks and indentation is preserved, and web and email addresses are made into clickable links."
+#: ./interfaces.py:67
+msgid "help_text_transform"
+msgstr ""
+
 #. Default: "If selected, users can choose to be notified of new comments by email."
-#: ./interfaces.py:93
+#: ./interfaces.py:128
 msgid "help_user_notification_enabled"
 msgstr ""
 
 #. Default: "Anonymous"
-#: ./comment.py:121
+#: ./comment.py:130
 msgid "label_anonymous"
 msgstr ""
 
@@ -234,12 +272,12 @@ msgid "label_apply"
 msgstr ""
 
 #. Default: "Captcha"
-#: ./interfaces.py:56
+#: ./interfaces.py:81
 msgid "label_captcha"
 msgstr ""
 
 #. Default: "Comment"
-#: ./interfaces.py:266
+#: ./interfaces.py:301
 msgid "label_comment"
 msgstr ""
 
@@ -253,8 +291,13 @@ msgstr ""
 msgid "label_globally_enabled"
 msgstr ""
 
+#. Default: "Moderator Email Address"
+#: ./interfaces.py:116
+msgid "label_moderator_email"
+msgstr ""
+
 #. Default: "Enable moderator email notification"
-#: ./interfaces.py:81
+#: ./interfaces.py:106
 msgid "label_moderator_notification_enabled"
 msgstr ""
 
@@ -269,7 +312,7 @@ msgid "label_says"
 msgstr ""
 
 #. Default: "Show commenter image"
-#: ./interfaces.py:71
+#: ./interfaces.py:96
 msgid "label_show_commenter_image"
 msgstr ""
 
@@ -279,22 +322,22 @@ msgid "label_show_full_comment_text"
 msgstr ""
 
 #. Default: "Subject"
-#: ./interfaces.py:262
+#: ./interfaces.py:297
 msgid "label_subject"
 msgstr ""
 
 #. Default: "Comment text transform"
-#: ./interfaces.py:48
+#: ./interfaces.py:65
 msgid "label_text_transform"
 msgstr ""
 
 #. Default: "Enable user email notification"
-#: ./interfaces.py:91
+#: ./interfaces.py:126
 msgid "label_user_notification_enabled"
 msgstr ""
 
 #. Default: "A comment on '${title}' has been posted here: ${link}"
-#: ./comment.py:51
+#: ./comment.py:58
 msgid "mail_notification_message"
 msgstr ""
 

plone/app/discussion/locales/zh_TW/LC_MESSAGES/plone.app.discussion.po

@@ -14,54 +14,59 @@ msgstr ""
 "Preferred-Encodings: utf-8 latin1\n"
 "Domain: plone.app.discussion\n"
 
-#: ./comment.py:217
+#: ./comment.py:234
 msgid "A comment has been posted."
 msgstr ""
 
-#: ./interfaces.py:248
+#: ./interfaces.py:283
 msgid "A comment id unique to this conversation"
 msgstr "留言的識別碼"
 
-#: ./browser/comments.py:53
+#: ./browser/comments.py:71
 msgid "Add a comment"
 msgstr "新增留言"
 
-#: ./browser/controlpanel.py:41
+#: ./browser/controlpanel.py:63
 msgid "Anonymous Comments"
 msgstr "匿名留言"
 
-#: ./interfaces.py:273
+#: ./interfaces.py:308
 msgid "Author name (for display)"
 msgstr "作者 (顯示在網頁上)"
 
-#: ./browser/comments.py:219
+#: ./browser/comments.py:252
+#: ./browser/controlpanel.py:83
 msgid "Cancel"
 msgstr "取消"
 
-#: ./browser/moderation.py:148
+#: ./browser/controlpanel.py:79
+msgid "Changes saved"
+msgstr ""
+
+#: ./browser/moderation.py:165
 msgid "Comment approved."
 msgstr "留言已審核"
 
-#: ./browser/moderation.py:109
+#: ./browser/moderation.py:126
 msgid "Comment deleted."
 msgstr "留言已刪除"
 
-#: ./browser/controlpanel.py:42
+#: ./browser/controlpanel.py:64
 msgid "Commenter Image"
 msgstr "留言者圖檔"
 
 msgid "Commenting infrastructure for Plone"
 msgstr "Plone 的留言功能"
 
-#: ./interfaces.py:243
+#: ./interfaces.py:278
 msgid "Conversation"
 msgstr "討論"
 
-#: ./interfaces.py:274
+#: ./interfaces.py:309
 msgid "Creation date"
 msgstr "建立日期"
 
-#: ./interfaces.py:128
+#: ./interfaces.py:163
 msgid "Date of the most recent comment"
 msgstr "最近留言的日期"
 
@@ -69,39 +74,43 @@ msgstr "最近留言的日期"
 msgid "Disabled"
 msgstr "已停用"
 
-#: ./browser/controlpanel.py:13
+#: ./browser/controlpanel.py:32
 msgid "Discussion settings"
 msgstr "討論區設定"
 
-#: ./interfaces.py:260
+#: ./browser/controlpanel.py:85
+msgid "Edit cancelled"
+msgstr ""
+
+#: ./interfaces.py:295
 msgid "Email"
 msgstr "E-Mail"
 
-#: ./browser/controlpanel.py:40
+#: ./browser/controlpanel.py:62
 msgid "Enable Comments"
 msgstr "允許留言"
 
-#: ./interfaces.py:251
+#: ./interfaces.py:286
 msgid "Id of comment this comment is in reply to"
 msgstr "留言的識別碼"
 
-#: ./interfaces.py:265
+#: ./interfaces.py:300
 msgid "MIME type"
 msgstr "MIME-Type"
 
-#: ./browser/controlpanel.py:44
+#: ./browser/controlpanel.py:66
 msgid "Moderator Email Notification"
 msgstr "審核者的電子郵件通知"
 
-#: ./interfaces.py:275
+#: ./interfaces.py:310
 msgid "Modification date"
 msgstr "修改日期"
 
-#: ./interfaces.py:245
+#: ./interfaces.py:280
 msgid "Name"
 msgstr "名稱"
 
-#: ./interfaces.py:269
+#: ./interfaces.py:304
 msgid "Notify me of new comments via email."
 msgstr ""
 
@@ -109,28 +118,32 @@ msgstr ""
 msgid "Plone Discussions"
 msgstr "Plone 討論區"
 
-#: ./interfaces.py:238
+#: ./interfaces.py:273
 msgid "Portal type"
 msgstr "網站型別"
 
-#: ./interfaces.py:133
+#: ./browser/controlpanel.py:72
+msgid "Save"
+msgstr ""
+
+#: ./interfaces.py:168
 msgid "The set of unique commentators (usernames)"
 msgstr "留言者 (使用者名稱) 的集合"
 
-#: ./interfaces.py:122
+#: ./interfaces.py:157
 msgid "Total number of comments on this item"
 msgstr "本項目的留言數目"
 
-#: ./browser/controlpanel.py:46
+#: ./browser/controlpanel.py:68
 msgid "User Email Notification"
 msgstr ""
 
-#: ./browser/comments.py:212
+#: ./browser/comments.py:245
 msgid "Your comment awaits moderator approval."
 msgstr "你的留言等待審核中。"
 
 #. Default: "Comment"
-#: ./browser/comments.py:102
+#: ./browser/comments.py:127
 msgid "add_comment_button"
 msgstr "留言"
 
@@ -144,8 +157,23 @@ msgstr "刪除"
 msgid "bulkactions_publish"
 msgstr "審核"
 
+#. Default: "You can add a comment by filling out the form below. Plain text formatting. Web and email addresses are transformed into clickable links."
+#: ./browser/comments.py:56
+msgid "comment_description_intelligent_text"
+msgstr ""
+
+#. Default: "Comments are moderated."
+#: ./browser/comments.py:62
+msgid "comment_description_moderation_enabled"
+msgstr ""
+
+#. Default: "You can add a comment by filling out the form below. Plain text formatting."
+#: ./browser/comments.py:51
+msgid "comment_description_plain_text"
+msgstr ""
+
 #. Default: "${creator} on ${content}"
-#: ./comment.py:48
+#: ./comment.py:55
 msgid "comment_title"
 msgstr ""
 
@@ -185,13 +213,13 @@ msgid "help_anonymous_comments"
 msgstr "勾選的話，匿名使用者不必登入系統就能留言。建議使用 captcha 來避免垃圾留言。"
 
 #. Default: "Use this setting to enable or disable Captcha validation for comments. Install plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet, or collective.z3cform.norobots if there are no options available."
-#: ./interfaces.py:58
+#: ./interfaces.py:83
 #, fuzzy
 msgid "help_captcha"
 msgstr "設定留言是否啟用或停用 captcha 功能，如果還沒有這類模組選項的話，可安裝 plone.formwidget.captcha 或 plone.formwidget.recaptcha。"
 
 #. Default: "Some discussion related settings are not located in the Discussion Control Panel.\nTo enable comments for a specific content type, go to the Types Control Panel of this type and choose \"Allow comments\".\nTo enable the moderation workflow for comments, go to the Types Control Panel, choose \"Comment\" and set workflow to \"Comment Review Workflow\"."
-#: ./browser/controlpanel.py:14
+#: ./browser/controlpanel.py:33
 msgid "help_discussion_settings_editform"
 msgstr ""
 "某些討論區設定值並未在討論區控制面板找得到。\n"
@@ -204,23 +232,33 @@ msgstr ""
 msgid "help_globally_enabled"
 msgstr "勾選的話，就啟用使用者的留言功能，不過，仍然要決定哪些內容型別、目錄、項目，能讓使用者留言。"
 
+#. Default: "Address to which moderator notifications will be sent. If not specified, the Site 'From' Address from the mail control panel will be used."
+#: ./interfaces.py:117
+msgid "help_moderator_email"
+msgstr ""
+
 #. Default: "If selected, the moderator is notified if a comment needs attention."
-#: ./interfaces.py:83
+#: ./interfaces.py:108
 msgid "help_moderator_notification_enabled"
 msgstr "勾選的話，有人留言時就會通知審核者。"
 
 #. Default: "If selected, an image of the user is shown next to the comment."
-#: ./interfaces.py:73
+#: ./interfaces.py:98
 msgid "help_show_commenter_image"
 msgstr "勾選的話，使用者的圖檔會顯示在留言旁邊。"
 
+#. Default: "Use this setting to choose if the comment text should be transformed in any way. You can choose between 'Plain text' and 'Intelligent text'. 'Intelligent text' converts plain text into HTML where line breaks and indentation is preserved, and web and email addresses are made into clickable links."
+#: ./interfaces.py:67
+msgid "help_text_transform"
+msgstr ""
+
 #. Default: "If selected, users can choose to be notified of new comments by email."
-#: ./interfaces.py:93
+#: ./interfaces.py:128
 msgid "help_user_notification_enabled"
 msgstr ""
 
 #. Default: "Anonymous"
-#: ./comment.py:121
+#: ./comment.py:130
 msgid "label_anonymous"
 msgstr ""
 
@@ -235,12 +273,12 @@ msgid "label_apply"
 msgstr "更新"
 
 #. Default: "Captcha"
-#: ./interfaces.py:56
+#: ./interfaces.py:81
 msgid "label_captcha"
 msgstr "captcha"
 
 #. Default: "Comment"
-#: ./interfaces.py:266
+#: ./interfaces.py:301
 msgid "label_comment"
 msgstr "留言"
 
@@ -254,8 +292,13 @@ msgstr "刪除"
 msgid "label_globally_enabled"
 msgstr "全域啟用留言功能"
 
+#. Default: "Moderator Email Address"
+#: ./interfaces.py:116
+msgid "label_moderator_email"
+msgstr ""
+
 #. Default: "Enable moderator email notification"
-#: ./interfaces.py:81
+#: ./interfaces.py:106
 msgid "label_moderator_notification_enabled"
 msgstr "啟用通知審核者的功能"
 
@@ -270,7 +313,7 @@ msgid "label_says"
 msgstr ""
 
 #. Default: "Show commenter image"
-#: ./interfaces.py:71
+#: ./interfaces.py:96
 msgid "label_show_commenter_image"
 msgstr "顯示留言者圖檔"
 
@@ -280,22 +323,22 @@ msgid "label_show_full_comment_text"
 msgstr "顯示完整的留言內容"
 
 #. Default: "Subject"
-#: ./interfaces.py:262
+#: ./interfaces.py:297
 msgid "label_subject"
 msgstr "標題"
 
 #. Default: "Comment text transform"
-#: ./interfaces.py:48
+#: ./interfaces.py:65
 msgid "label_text_transform"
 msgstr ""
 
 #. Default: "Enable user email notification"
-#: ./interfaces.py:91
+#: ./interfaces.py:126
 msgid "label_user_notification_enabled"
 msgstr ""
 
 #. Default: "A comment on '${title}' has been posted here: ${link}"
-#: ./comment.py:51
+#: ./comment.py:58
 msgid "mail_notification_message"
 msgstr ""