Fixing some minor spelling mistakes, Jira-495.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@641 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/.pydevproject b/.pydevproject
index eae2aa2b6b39339f2f2fcb9ec1d47fa123a19552..3d084be83e3e72c5314a1423228b7f251b3ce9e8 100644 (file)
--- a/.pydevproject
+++ b/.pydevproject
@@ -5,7 +5,7 @@
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/osqa-pydev</path>
+<path>/OSQA</path>
 </pydev_pathproperty>
 <pydev_variables_property name="org.python.pydev.PROJECT_VARIABLE_SUBSTITUTION">
 <key>DJANGO_MANAGE_LOCATION</key>

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644 (file)
index 0000000..a5dea23
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Tue Dec 28 03:23:44 EET 2010
+eclipse.preferences.version=1
+encoding/settings.py=utf-8

diff --git a/forum/settings/accept.py b/forum/settings/accept.py
index 4212366b1d7e836d6372aebdfbf2d3ea844c7e56..aa29e0998fbf88e192c0757a190124d2808cf7ca 100644 (file)
--- a/forum/settings/accept.py
+++ b/forum/settings/accept.py
@@ -6,7 +6,7 @@ ACCEPT_SET = SettingSet('accept', _('Accepting answers'), _("Settings to tweak t
 
 DISABLE_ACCEPTING_FEATURE = Setting('DISABLE_ACCEPTING_FEATURE', False, ACCEPT_SET, dict(
 label = _("Disallow answers to be accepted"),
-help_text = _("Disable accepting answers feature. If you reenable it in the future, currently accepted answers will still be marked as accepted."),
+help_text = _("Disable accepting answers feature. If you re-enable it in the future, currently accepted answers will still be marked as accepted."),
 required=False))
 
 MAXIMUM_ACCEPTED_ANSWERS = Setting('MAXIMUM_ACCEPTED_ANSWERS', 1, ACCEPT_SET, dict(
@@ -19,7 +19,7 @@ help_text = _("If more than one accpeted answer is allowed, how many can be acce
 
 USERS_CAN_ACCEPT_OWN = Setting('USERS_CAN_ACCEPT_OWN', False, ACCEPT_SET, dict(
 label = _("Users an accept own answer"),
-help_text = _("Are normal users allowed to accept theyr own answers.."),
+help_text = _("Are normal users allowed to accept their own answers.."),
 required=False))
 
 

diff --git a/forum/settings/email.py b/forum/settings/email.py
index 1a673b239bfd7731df43392b790ce2b29861bcd6..ea96940803bb41e13c9ad71377e9f396ef397402 100644 (file)
--- a/forum/settings/email.py
+++ b/forum/settings/email.py
@@ -37,7 +37,7 @@ required=False))
 \r
 EMAIL_SUBJECT_PREFIX = Setting('EMAIL_SUBJECT_PREFIX', '', EMAIL_SET, dict(\r
 label = _("Email subject prefix"),\r
-help_text = _("Every email sent through your website will have the subject prefixed by this string. It's usually a good idea to have such a prefix so your users can easilly set up a filter on theyr email clients."),\r
+help_text = _("Every email sent through your website will have the subject prefixed by this string. It's usually a good idea to have such a prefix so your users can easily set up a filter on theyr email clients."),\r
 required=False))\r
 \r
 EMAIL_FOOTER_TEXT = Setting(u'EMAIL_FOOTER_TEXT', '', EMAIL_SET, dict(\r

diff --git a/forum/skins/default/templates/401.html b/forum/skins/default/templates/401.html
index c689f53f81e2a134743abe59286882a58db4a410..7c1023fd6fb39157ada46de8f144edad4ac05bcf 100644 (file)
--- a/forum/skins/default/templates/401.html
+++ b/forum/skins/default/templates/401.html
@@ -31,7 +31,7 @@
     <div style="padding:5px 0px 10px 0;line-height:25px;">
         <h3>{% trans "You are not logged in..." %}</h3>
         <div style="margin-top:5px">
-            {% trans "...and the resource you're trying to access is pretocted." %}
+            {% trans "...and the resource you're trying to access is protected." %}
             <p>
                 {% trans "Redirecting to the login page." %}<span id="redirect_loader"></span>
             </p>

diff --git a/forum/skins/default/templates/auth/signin.html b/forum/skins/default/templates/auth/signin.html
index 22225d26a3cd60f754d704a182a29cbfd1022e5e..19dee071b37466f136979a0239005d148bd781a8 100644 (file)
--- a/forum/skins/default/templates/auth/signin.html
+++ b/forum/skins/default/templates/auth/signin.html
@@ -99,7 +99,7 @@
     <h3 class="or_label">{% trans 'Or...' %}</h3>\r
     <form name="signin_form" id="dummy_form_unused" class="signin_form" method="POST" action="">\r
         <fieldset>\r
-            {% trans 'Click' %} <a href="{% url auth_request_tempsignin %}">{% trans 'here' %}</a> {% trans "if you're having troubles signing in." %}\r
+            {% trans 'Click' %} <a href="{% url auth_request_tempsignin %}">{% trans 'here' %}</a> {% trans "if you're having trouble signing in." %}\r
         </fieldset>\r
     </form>\r
     <script type="text/html" id="simple_form_template">\r

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index d368fba30bb1f5c27a4925d9f038c1e15b2989b9..1b2e4f75162a556c18924347f6f142bfd616a8cf 100644 (file)
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -824,7 +824,7 @@ msgstr ""
 msgid ""
 "Every email sent through your website will have the subject prefixed by this "
 "string. It's usually a good idea to have such a prefix so your users can "
-"easilly set up a filter on theyr email clients."
+"easilly set up a filter on their email clients."
 msgstr ""
 
 #: forum/settings/extkeys.py:4
@@ -2595,7 +2595,7 @@ msgid "Click"
 msgstr ""
 
 #: forum/skins/default/templates/auth/signin.html:94
-msgid "if you're having troubles signing in."
+msgid "if you're having trouble signing in."
 msgstr ""
 
 #: forum/skins/default/templates/auth/signin.html:98

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index d8b598676e9015170a5f2aef453584e3b5ec2ebc..1305ee9f18c8527a2be9f267589a20fbe17402fd 100644 (file)
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -839,7 +839,7 @@ msgid "Email subject prefix"
 msgstr "Welcome to the Q&A forum"
 
 #: forum/settings/email.py:40
-msgid "Every email sent through your website will have the subject prefixed by this string. It's usually a good idea to have such a prefix so your users can easilly set up a filter on theyr email clients."
+msgid "Every email sent through your website will have the subject prefixed by this string. It's usually a good idea to have such a prefix so your users can easilly set up a filter on their email clients."
 msgstr ""
 
 #: forum/settings/extkeys.py:4

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index fb4333334a61e08e784d263e74d246809b817539..57b8ba934edd456094a7407140ce27d2d6baebd1 100644 (file)
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -825,7 +825,7 @@ msgid "Email subject prefix"
 msgstr ""
 
 #: forum/settings/email.py:40
-msgid "Every email sent through your website will have the subject prefixed by this string. It's usually a good idea to have such a prefix so your users can easilly set up a filter on theyr email clients."
+msgid "Every email sent through your website will have the subject prefixed by this string. It's usually a good idea to have such a prefix so your users can easilly set up a filter on their email clients."
 msgstr ""
 
 #: forum/settings/extkeys.py:4

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 7ae5779caaa053e1a632e49bd4b6b865917c9f65..7a76e84baffb0be9dd0ab0e1f961ea46e256efb3 100644 (file)
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -842,7 +842,7 @@ msgstr ""
 msgid ""
 "Every email sent through your website will have the subject prefixed by this "
 "string. It's usually a good idea to have such a prefix so your users can "
-"easilly set up a filter on theyr email clients."
+"easilly set up a filter on their email clients."
 msgstr ""
 
 #: forum/settings/extkeys.py:4

diff --git a/locale/l/LC_MESSAGES/django.po b/locale/l/LC_MESSAGES/django.po
index 7ae5779caaa053e1a632e49bd4b6b865917c9f65..7a76e84baffb0be9dd0ab0e1f961ea46e256efb3 100644 (file)
--- a/locale/l/LC_MESSAGES/django.po
+++ b/locale/l/LC_MESSAGES/django.po
@@ -842,7 +842,7 @@ msgstr ""
 msgid ""
 "Every email sent through your website will have the subject prefixed by this "
 "string. It's usually a good idea to have such a prefix so your users can "
-"easilly set up a filter on theyr email clients."
+"easilly set up a filter on their email clients."
 msgstr ""
 
 #: forum/settings/extkeys.py:4

diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po
index 7ae5779caaa053e1a632e49bd4b6b865917c9f65..7a76e84baffb0be9dd0ab0e1f961ea46e256efb3 100644 (file)
--- a/locale/pt/LC_MESSAGES/django.po
+++ b/locale/pt/LC_MESSAGES/django.po
@@ -842,7 +842,7 @@ msgstr ""
 msgid ""
 "Every email sent through your website will have the subject prefixed by this "
 "string. It's usually a good idea to have such a prefix so your users can "
-"easilly set up a filter on theyr email clients."
+"easilly set up a filter on their email clients."
 msgstr ""
 
 #: forum/settings/extkeys.py:4

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 56f1fb7f859362a5c9fee4db3dfd02359dfac222..fedf00e3aaf9f6a020b516f1e8e0df22b4cbcf97 100644 (file)
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -912,7 +912,7 @@ msgstr ""
 msgid ""
 "Every email sent through your website will have the subject prefixed by this "
 "string. It's usually a good idea to have such a prefix so your users can "
-"easilly set up a filter on theyr email clients."
+"easilly set up a filter on their email clients."
 msgstr ""
 
 #: forum/settings/extkeys.py:4