[soc2009/i18n] merged up to trunk r11463archive/soc2009/i18n-improvementssoc2009/i18n-improvements

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/i18n-improvements@11464 bcc190cf-cafb-0310-a4f2-bffc1f526a37

7 files changed, 9 insertions, 9 deletions

diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 31a28ccf0b..3144a22a2a 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -482,7 +482,7 @@ class ModelAdmin(BaseModelAdmin):
 
     def get_action(self, action):
         """
-        Return a given action from a parameter, which can either be a calable,
+        Return a given action from a parameter, which can either be a callable,
         or the name of a method on the ModelAdmin.  Return is a tuple of
         (callable, name, description).
         """
diff --git a/django/contrib/admin/templates/admin/delete_selected_confirmation.html b/django/contrib/admin/templates/admin/delete_selected_confirmation.html
index a6258b94c0..5550b73e2e 100644
--- a/django/contrib/admin/templates/admin/delete_selected_confirmation.html
+++ b/django/contrib/admin/templates/admin/delete_selected_confirmation.html
@@ -19,7 +19,7 @@
     {% endfor %}
     </ul>
 {% else %}
-    <p>{% blocktrans %}Are you sure you want to delete the selected {{ object_name }} objects? All of the following objects and it's related items will be deleted:{% endblocktrans %}</p>
+    <p>{% blocktrans %}Are you sure you want to delete the selected {{ object_name }} objects? All of the following objects and their related items will be deleted:{% endblocktrans %}</p>
     {% for deleteable_object in deletable_objects %}
         <ul>{{ deleteable_object|unordered_list }}</ul>
     {% endfor %}
@@ -34,4 +34,4 @@
     </div>
     </form>
 {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/docs/conf.py b/docs/conf.py
index 078c83a492..bdc1280c0b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -41,11 +41,11 @@ copyright = 'Django Software Foundation and contributors'
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.0'
+version = '1.1'
 # The full version, including alpha/beta/rc tags.
 release = version
 # The next version to be released
-django_next_version = '1.1'
+django_next_version = '1.2'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
diff --git a/docs/howto/deployment/modpython.txt b/docs/howto/deployment/modpython.txt
index 8b9a4d3696..50dadf9854 100644
--- a/docs/howto/deployment/modpython.txt
+++ b/docs/howto/deployment/modpython.txt
@@ -264,7 +264,7 @@ the ``media`` subdirectory and any URL that ends with ``.jpg``, ``.gif`` or
 
 
 .. _lighttpd: http://www.lighttpd.net/
-.. _Nginx: http://wiki.codemongers.com/Main
+.. _Nginx: http://wiki.nginx.org/Main
 .. _TUX: http://en.wikipedia.org/wiki/TUX_web_server
 .. _Apache: http://httpd.apache.org/
 .. _Cherokee: http://www.cherokee-project.com/
diff --git a/docs/howto/deployment/modwsgi.txt b/docs/howto/deployment/modwsgi.txt
index 8bfbfa74f4..12de53f53d 100644
--- a/docs/howto/deployment/modwsgi.txt
+++ b/docs/howto/deployment/modwsgi.txt
@@ -98,7 +98,7 @@ file. All other URLs will be served using mod_wsgi::
     </Directory>
 
 .. _lighttpd: http://www.lighttpd.net/
-.. _Nginx: http://wiki.codemongers.com/Main
+.. _Nginx: http://wiki.nginx.org/Main
 .. _TUX: http://en.wikipedia.org/wiki/TUX_web_server
 .. _Apache: http://httpd.apache.org/
 .. _Cherokee: http://www.cherokee-project.com/
diff --git a/docs/ref/contrib/formtools/form-wizard.txt b/docs/ref/contrib/formtools/form-wizard.txt
index c81c24242a..98f0dbad42 100644
--- a/docs/ref/contrib/formtools/form-wizard.txt
+++ b/docs/ref/contrib/formtools/form-wizard.txt
@@ -95,7 +95,7 @@ Creating a ``FormWizard`` class
 The next step is to create a :class:`~django.contrib.formtools.wizard.FormWizard`
 class, which should be a subclass of ``django.contrib.formtools.wizard.FormWizard``.
 
-As your :class:`~django.forms.forms.Form` classes, this
+As with your :class:`~django.forms.forms.Form` classes, this
 :class:`~django.contrib.formtools.wizard.FormWizard` class can live anywhere
 in your codebase, but convention is to put it in :file:`forms.py`.
 
diff --git a/tests/modeltests/expressions/models.py b/tests/modeltests/expressions/models.py
index d4de5ccee9..27daabad71 100644
--- a/tests/modeltests/expressions/models.py
+++ b/tests/modeltests/expressions/models.py
@@ -117,6 +117,6 @@ FieldError: Joined field references are not permitted in this query
 >>> acme.save()
 Traceback (most recent call last):
 ...
-TypeError: int() argument must be a string or a number, not 'ExpressionNode'
+TypeError: int() argument must be a string or a number...
 
 """}