From b0a177f4d25cec5fc5fd2d10a949a93b5d97c1ad Mon Sep 17 00:00:00 2001
From: Timo Stollenwerk <timo@rudolf.(none)>
Date: Sun, 30 Oct 2011 08:11:06 +0100
Subject: [PATCH] Fix various text typos.

---
 CHANGES.txt                                             | 6 +++++-
 plone/app/discussion/interfaces.py                      | 2 +-
 plone/app/discussion/locales/plone.app.discussion.pot   | 2 +-
 plone/app/discussion/tests/functional_test_comments.txt | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index fa66f52..4d7cf28 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,10 @@ Changelog
 2.1.1 (unreleased)
 ------------------
 
-- Fix control panel help text typos
+- Fix various text typos.
+  [timo]
+
+- Fix control panel help text typos.
   [jonstahl]
 
 - Documentation about overriding the comments viewlet js added.
@@ -13,6 +16,7 @@ Changelog
 - Corrected location of Japanese po file.
   [tyam]
 
+
 2.1.0 (2011-08-22)
 ------------------
 
diff --git a/plone/app/discussion/interfaces.py b/plone/app/discussion/interfaces.py
index e73cdec..1ed57f2 100644
--- a/plone/app/discussion/interfaces.py
+++ b/plone/app/discussion/interfaces.py
@@ -37,7 +37,7 @@ class IDiscussionSettings(Interface):
                 default="Enable anonymous comments"),
         description=_(u"help_anonymous_comments",
                 default=u"If selected, anonymous users are able to post "
-                         "comments without logging in. It is highly "
+                         "comments without loggin in. It is highly "
                          "recommended to use a captcha solution to prevent "
                          "spam if this setting is enabled."),
         required=False,
diff --git a/plone/app/discussion/locales/plone.app.discussion.pot b/plone/app/discussion/locales/plone.app.discussion.pot
index eb85fd6..50014ec 100644
--- a/plone/app/discussion/locales/plone.app.discussion.pot
+++ b/plone/app/discussion/locales/plone.app.discussion.pot
@@ -211,7 +211,7 @@ msgstr ""
 msgid "heading_moderate_comments"
 msgstr ""
 
-#. Default: "If selected, anonymous users are able to post comments without logging in. It is highly recommended to use a captcha solution to prevent spam if this setting is enabled."
+#. Default: "If selected, anonymous users are able to post comments without loggin in. It is highly recommended to use a captcha solution to prevent spam if this setting is enabled."
 #: ../interfaces.py:38
 msgid "help_anonymous_comments"
 msgstr ""
diff --git a/plone/app/discussion/tests/functional_test_comments.txt b/plone/app/discussion/tests/functional_test_comments.txt
index 33f675e..275f2d9 100644
--- a/plone/app/discussion/tests/functional_test_comments.txt
+++ b/plone/app/discussion/tests/functional_test_comments.txt
@@ -8,8 +8,8 @@ We use zope.testbrowser to simulate browser interaction in order to show how
 the plone.app.discussion commenting works.
 
 
-Setting up and logging in
--------------------------
+Setting up and loggin in
+------------------------
 
 First we have to set up some things and login.