[1.0.X] Reverted r12000. 1.0.X branch is in security fix only mode.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@12003 bcc190cf-cafb-0310-a4f2-bffc1f526a37
[1.0.X] Italian translation updated
2009-12-27 04:10:19 +00:00 · 2009-12-26 16:36:22 +00:00 · 2009-12-22 08:27:45 +00:00 · 2009-12-16 19:22:52 +00:00 · 2009-10-09 22:18:16 +00:00 · 2009-10-09 21:29:17 +00:00
553 changed files with 37689 additions and 11626 deletions
--- a/40
+++ b/40
@ -14,6 +14,8 @@ The PRIMARY AUTHORS are (and/or have been):
    * Robert Wittams
    * Gary Wilson
    * Brian Rosner
+    * Justin Bronn
+    * Karen Tracey

 More information on the main contributors to Django can be found in
 docs/internals/committers.txt.
@ -31,6 +33,7 @@ answer newbie questions, and generally made Django that much better:
    Dagur Páll Ammendrup <dagurp@gmail.com>
    Collin Anderson <cmawebsite@gmail.com>
    Jeff Anderson <jefferya@programmerq.net>
+    Marian Andre <django@andre.sk>
    Andreas
    andy@jadedplanet.net
    Fabrice Aneche <akh@nobugware.com>
@ -57,11 +60,13 @@ answer newbie questions, and generally made Django that much better:
    James Bennett
    Julian Bez
    Arvis Bickovskis <viestards.lists@gmail.com>
+    Natalia Bidart
    Paul Bissex <http://e-scribe.com/>
    Simon Blanchard
    David Blewett <david@dawninglight.net>
    Matt Boersma <matt@sprout.org>
    boobsd@gmail.com
+    Matías Bordese
    Andrew Brehaut <http://brehaut.net/blog>
    brut.alll@gmail.com
    btoll@bestweb.net
@ -79,6 +84,7 @@ answer newbie questions, and generally made Django that much better:
    Chris Chamberlin <dja@cdc.msbx.net>
    Amit Chakradeo <http://amit.chakradeo.net/>
    ChaosKCW
+    Kowito Charoenratchatabhan <kowito@felspar.com>
    Sengtha Chay <sengtha@e-khmer.com>
    ivan.chelubeev@gmail.com
    Bryan Chow <bryan at verdjn dot com>
@ -90,6 +96,7 @@ answer newbie questions, and generally made Django that much better:
    colin@owlfish.com
    crankycoder@gmail.com
    Paul Collier <paul@paul-collier.com>
+    Robert Coup
    Pete Crosier <pete.crosier@gmail.com>
    Matt Croydon <http://www.postneo.com/>
    Leah Culver <leah@pownce.com>
@ -106,6 +113,7 @@ answer newbie questions, and generally made Django that much better:
    Jason Davies (Esaj) <http://www.jasondavies.com/>
    Richard Davies <richard.davies@elastichosts.com>
    Alex Dedul
+    Matt Dennenbaum
    deric@monowerks.com
    Max Derkachev <mderk@yandex.ru>
    Rajesh Dhawan <rajesh.dhawan@gmail.com>
@ -118,9 +126,11 @@ answer newbie questions, and generally made Django that much better:
    Andrew Durdin <adurdin@gmail.com>
    dusk@woofle.net
    Andy Dustman <farcepest@gmail.com>
+    J. Clifford Dyer <jcd@unc.edu>
    Clint Ecker
    Nick Efford <nick@efford.org>
    eibaan@gmail.com
+    Julia Elman
    enlight
    Enrico <rico.bl@gmail.com>
    A. Murat Eren <meren@pardus.org.tr>
@ -129,6 +139,7 @@ answer newbie questions, and generally made Django that much better:
    Dirk Eschler <dirk.eschler@gmx.net>
    Marc Fargas <telenieko@telenieko.com>
    Szilveszter Farkas <szilveszter.farkas@gmail.com>
+    Grigory Fateyev <greg@dial.com.ru>
    favo@exoweb.net
    fdr <drfarina@gmail.com>
    Dmitri Fedortchenko <zeraien@gmail.com>
@ -149,6 +160,7 @@ answer newbie questions, and generally made Django that much better:
    Marc Garcia <marc.garcia@accopensys.com>
    Alex Gaynor <alex.gaynor@gmail.com>
    Andy Gayton <andy-django@thecablelounge.com>
+    Idan Gazit
    Baishampayan Ghose
    Dimitris Glezos <dimitris@glezos.com>
    glin@seznam.cz
@ -165,6 +177,7 @@ answer newbie questions, and generally made Django that much better:
    Espen Grindhaug <http://grindhaug.org/>
    Thomas Güttler <hv@tbz-pariv.de>
    Horst Gutmann <zerok@zerokspot.com>
+    Scot Hacker <shacker@birdhouse.org>
    dAniel hAhler
    hambaloney
    Brian Harring <ferringb@gmail.com>
@ -197,9 +210,7 @@ answer newbie questions, and generally made Django that much better:
    Nis Jørgensen <nis@superlativ.dk>
    Michael Josephson <http://www.sdjournal.com/>
    jpellerin@gmail.com
-    Julia Elman
    junzhang.jn@gmail.com
-    Grigory Fateyev <greg@dial.com.ru>
    Antti Kaihola <http://akaihola.blogspot.com/>
    Bahadır Kandemir <bahadir@pardus.org.tr>
    Karderio <karderio@gmail.com>
@ -208,6 +219,7 @@ answer newbie questions, and generally made Django that much better:
    Ben Dean Kawamura <ben.dean.kawamura@gmail.com>
    Ian G. Kelly <ian.g.kelly@gmail.com>
    Thomas Kerpe <thomas@kerpe.net>
+    Wiley Kestner <wiley.kestner@gmail.com>
    Ossama M. Khayat <okhayat@yahoo.com>
    Ben Khoo <khoobks@westnet.com.au>
    Garth Kidd <http://www.deadlybloodyserious.com/>
@ -226,12 +238,15 @@ answer newbie questions, and generally made Django that much better:
    konrad@gwu.edu
    knox <christobzr@gmail.com>
    David Krauth
+    Kevin Kubasik <kevin@kubasik.net>
    kurtiss@meetro.com
+    Denis Kuzmichyov <kuzmichyov@gmail.com>
    Panos Laganakos <panos.laganakos@gmail.com>
    lakin.wecker@gmail.com
    Nick Lane <nick.lane.au@gmail.com>
    Stuart Langridge <http://www.kryogenix.org/>
    Paul Lanier <planier@google.com>
+    David Larlet <http://david.larlet.fr>
    Nicola Larosa <nico@teknico.net>
    Finn Gruwier Larsen <finn@gruwier.dk>
    Lau Bech Lauritzen
@ -243,6 +258,7 @@ answer newbie questions, and generally made Django that much better:
    Christopher Lenz <http://www.cmlenz.net/>
    lerouxb@gmail.com
    Piotr Lewandowski <piotr.lewandowski@gmail.com>
+    Justin Lilly <justinlilly@gmail.com>
    Waylan Limberg <waylan@gmail.com>
    limodou
    Philip Lindborg <philip.lindborg@gmail.com>
@ -294,6 +310,7 @@ answer newbie questions, and generally made Django that much better:
    oggie rob <oz.robharvey@gmail.com>
    oggy <ognjen.maric@gmail.com>
    Jay Parlar <parlar@gmail.com>
+    Claude Paroz <claude@2xlibre.net>
    Carlos Eduardo de Paula <carlosedp@gmail.com>
    pavithran s <pavithran.s@gmail.com>
    Barry Pederson <bp@barryp.org>
@ -318,6 +335,7 @@ answer newbie questions, and generally made Django that much better:
    Jan Rademaker
    Michael Radziej <mir@noris.de>
    Laurent Rahuel <laurent.rahuel@gmail.com>
+    Stéphane Raimbault <stephane.raimbault@gmail.com>
    Luciano Ramalho
    Amit Ramon <amit.ramon@gmail.com>
    Philippe Raoult <philippe.raoult@n2nsoft.com>
@ -329,9 +347,10 @@ answer newbie questions, and generally made Django that much better:
    ricardojbarrios@gmail.com
    Mike Richardson
    Matt Riggott
+    Alex Robbins <alexander.j.robbins@gmail.com>
    Henrique Romano <onaiort@gmail.com>
    Armin Ronacher
-    Daniel Roseman <http://roseman.org.uk/>    
+    Daniel Roseman <http://roseman.org.uk/>
    Brian Rosner <brosner@gmail.com>
    Rozza <ross.lawley@gmail.com>
    Oliver Rutherfurd <http://rutherfurd.net/>
@ -339,7 +358,10 @@ answer newbie questions, and generally made Django that much better:
    Manuel Saelices <msaelices@yaco.es>
    Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
    Vinay Sajip <vinay_sajip@yahoo.co.uk>
+    Kadesarin Sanjek
+    Massimo Scamarcia <massimo.scamarcia@gmail.com>
    David Schein
+    Bernd Schlapsi
    scott@staplefish.com
    Ilya Semenov <semenov@inetss.com>
    serbaut@gmail.com
@ -352,7 +374,7 @@ answer newbie questions, and generally made Django that much better:
    Ben Slavin <benjamin.slavin@gmail.com>
    sloonz <simon.lipp@insa-lyon.fr>
    SmileyChris <smileychris@gmail.com>
-    Warren Smith <warren@wandrsmith.net> 
+    Warren Smith <warren@wandrsmith.net>
    smurf@smurf.noris.de
    Vsevolod Solovyov
    sopel
@ -367,7 +389,7 @@ answer newbie questions, and generally made Django that much better:
    Johan C. Stöver <johan@nilling.nl>
    nowell strite
    Thomas Stromberg <tstromberg@google.com>
-    Sundance
+    Pascal Varet
    SuperJared
    Radek Švarz <http://www.svarz.cz/translate/>
    Swaroop C H <http://www.swaroopch.info>
@ -378,7 +400,9 @@ answer newbie questions, and generally made Django that much better:
    Tyler Tarabula <tyler.tarabula@gmail.com>
    Tyson Tate <tyson@fallingbullets.com>
    Frank Tegtmeyer <fte@fte.to>
+    Marcel Telka <marcel@telka.sk>
    Terry Huang <terryh.tp@gmail.com>
+    Travis Terry <tdterry7@gmail.com>
    thebjorn <bp@datakortet.no>
    Zach Thompson <zthompson47@gmail.com>
    Michael Thornhill
@ -388,7 +412,6 @@ answer newbie questions, and generally made Django that much better:
    Tom Tobin
    Joe Topjian <http://joe.terrarum.net/geek/code/python/django/>
    torne-django@wolfpuppy.org.uk
-    Karen Tracey <graybark@bellsouth.net>
    Jeff Triplett <jeff.triplett@gmail.com>
    tstromberg@google.com
    Makoto Tsuyuki <mtsuyuki@gmail.com>
@ -396,12 +419,14 @@ answer newbie questions, and generally made Django that much better:
    David Tulig <david.tulig@gmail.com>
    Amit Upadhyay <http://www.amitu.com/blog/>
    Geert Vanderkelen
+    Vasil Vangelovski
    I.S. van Oostveen <v.oostveen@idca.nl>
    viestards.lists@gmail.com
    George Vilches <gav@thataddress.com>
    Vlado <vlado@labath.org>
    Milton Waddams
    Chris Wagner <cw264701@ohio.edu>
+    Rick Wagner <rwagner@physics.ucsd.edu>
    wam-djangobug@wamber.net
    Wang Chun <wangchun@exoweb.net>
    Filip Wasilewski <filip.wasilewski@gmail.com>
@ -410,6 +435,7 @@ answer newbie questions, and generally made Django that much better:
    Chris Wesseling <Chris.Wesseling@cwi.nl>
    James Wheare <django@sparemint.com>
    Mike Wiacek <mjwiacek@google.com>
+    Frank Wierzbicki
    charly.wilhelm@gmail.com
    Rachel Willmer <http://www.willmer.com/kb/>
    Gary Wilson <gary.wilson@gmail.com>
@ -420,6 +446,8 @@ answer newbie questions, and generally made Django that much better:
    Jason Yan <tailofthesun@gmail.com>
    ye7cakf02@sneakemail.com
    ymasuda@ethercube.com
+    Mykola Zamkovoi <nickzam@gmail.com>
+    Gasper Zejn <zejn@kiberpipa.org>
    Jarek Zgoda <jarek.zgoda@gmail.com>
    Cheng Zhang

--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -3,14 +3,27 @@ include AUTHORS
 include INSTALL
 include LICENSE
 include MANIFEST.in
+include django/utils/simplejson/LICENSE.txt
+include django/contrib/gis/gdal/LICENSE
+include django/contrib/gis/geos/LICENSE
 recursive-include docs *
 recursive-include scripts *
 recursive-include examples *
 recursive-include extras *
+recursive-include tests *
 recursive-include django/conf/locale *
 recursive-include django/contrib/admin/templates *
 recursive-include django/contrib/admin/media *
 recursive-include django/contrib/admindocs/templates *
+recursive-include django/contrib/auth/fixtures *
+recursive-include django/contrib/auth/tests/templates *
 recursive-include django/contrib/comments/templates *
 recursive-include django/contrib/databrowse/templates *
+recursive-include django/contrib/formtools/templates *
+recursive-include django/contrib/gis/templates *
+recursive-include django/contrib/gis/tests/data *
+recursive-include django/contrib/gis/tests/geoapp/sql *
+recursive-include django/contrib/gis/tests/layermap/cities *
+recursive-include django/contrib/gis/tests/layermap/counties *
+recursive-include django/contrib/gis/tests/layermap/interstates *
 recursive-include django/contrib/sitemaps/templates *
--- a/django/init.py
+++ b/django/init.py
@ -1,9 +1,16 @@
-VERSION = (1, 0, 'post-release-SVN')
+VERSION = (1, 0, 5, 'alpha', 0)

 def get_version():
-    "Returns the version as a human-format string."
-    v = '.'.join([str(i) for i in VERSION[:-1]])
-    if VERSION[-1]:
-        from django.utils.version import get_svn_revision
-        v = '%s-%s-%s' % (v, VERSION[-1], get_svn_revision())
-    return v
+    version = '%s.%s' % (VERSION[0], VERSION[1])
+    if VERSION[2]:
+        version = '%s.%s' % (version, VERSION[2])
+    if VERSION[3:] == ('alpha', 0):
+        version = '%s pre-alpha' % version
+    else:
+        if VERSION[3] != 'final':
+            version = '%s %s %s' % (version, VERSION[3], VERSION[4])
+    from django.utils.version import get_svn_revision
+    svn_rev = get_svn_revision()
+    if svn_rev != u'SVN-unknown':
+        version = "%s %s" % (version, svn_rev)
+    return version
--- a/django/bin/daily_cleanup.py
+++ b/django/bin/daily_cleanup.py
--- a/django/conf/init.py
+++ b/django/conf/init.py
@ -7,41 +7,21 @@ a list of all possible variables.
 """

 import os
+import re
 import time     # Needed for Windows
+
 from django.conf import global_settings
+from django.utils.functional import LazyObject

 ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"

-class LazySettings(object):
+class LazySettings(LazyObject):
    """
    A lazy proxy for either global Django settings or a custom settings object.
    The user can manually configure settings prior to using them. Otherwise,
    Django uses the settings module pointed to by DJANGO_SETTINGS_MODULE.
    """
-    def __init__(self):
-        # _target must be either None or something that supports attribute
-        # access (getattr, hasattr, etc).
-        self._target = None
-
-    def __getattr__(self, name):
-        if self._target is None:
-            self._import_settings()
-        if name == '__members__':
-            # Used to implement dir(obj), for example.
-            return self._target.get_all_members()
-        return getattr(self._target, name)
-
-    def __setattr__(self, name, value):
-        if name == '_target':
-            # Assign directly to self.__dict__, because otherwise we'd call
-            # __setattr__(), which would be an infinite loop.
-            self.__dict__['_target'] = value
-        else:
-            if self._target is None:
-                self._import_settings()
-            setattr(self._target, name, value)
-
-    def _import_settings(self):
+    def _setup(self):
        """
        Load the settings module pointed to by the environment variable. This
        is used the first time we need any settings at all, if the user has not
@ -56,7 +36,7 @@ class LazySettings(object):
            # problems with Python's interactive help.
            raise ImportError("Settings cannot be imported, because environment variable %s is undefined." % ENVIRONMENT_VARIABLE)

-        self._target = Settings(settings_module)
+        self._wrapped = Settings(settings_module)

    def configure(self, default_settings=global_settings, **options):
        """
@ -64,18 +44,18 @@ class LazySettings(object):
        parameter sets where to retrieve any unspecified values from (its
        argument must support attribute access (__getattr__)).
        """
-        if self._target != None:
+        if self._wrapped != None:
            raise RuntimeError, 'Settings already configured.'
        holder = UserSettingsHolder(default_settings)
        for name, value in options.items():
            setattr(holder, name, value)
-        self._target = holder
+        self._wrapped = holder

    def configured(self):
        """
        Returns True if the settings have already been configured.
        """
-        return bool(self._target)
+        return bool(self._wrapped)
    configured = property(configured)

 class Settings(object):
@ -112,8 +92,9 @@ class Settings(object):
                appdir = os.path.dirname(__import__(app[:-2], {}, {}, ['']).__file__)
                app_subdirs = os.listdir(appdir)
                app_subdirs.sort()
+                name_pattern = re.compile(r'[a-zA-Z]\w*')
                for d in app_subdirs:
-                    if d.isalpha() and os.path.isdir(os.path.join(appdir, d)):
+                    if name_pattern.match(d) and os.path.isdir(os.path.join(appdir, d)):
                        new_installed_apps.append('%s.%s' % (app[:-2], d))
            else:
                new_installed_apps.append(app)
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@ -52,7 +52,7 @@ LANGUAGES = (
    ('el', gettext_noop('Greek')),
    ('en', gettext_noop('English')),
    ('es', gettext_noop('Spanish')),
-    ('et', gettext_noop('Estonian')), 
+    ('et', gettext_noop('Estonian')),
    ('es-ar', gettext_noop('Argentinean Spanish')),
    ('eu', gettext_noop('Basque')),
    ('fa', gettext_noop('Persian')),
@ -62,6 +62,7 @@ LANGUAGES = (
    ('gl', gettext_noop('Galician')),
    ('hu', gettext_noop('Hungarian')),
    ('he', gettext_noop('Hebrew')),
+    ('hi', gettext_noop('Hindi')),
    ('hr', gettext_noop('Croatian')),
    ('is', gettext_noop('Icelandic')),
    ('it', gettext_noop('Italian')),
@ -76,7 +77,7 @@ LANGUAGES = (
    ('nl', gettext_noop('Dutch')),
    ('no', gettext_noop('Norwegian')),
    ('pl', gettext_noop('Polish')),
-    ('pt', gettext_noop('Portugese')),
+    ('pt', gettext_noop('Portuguese')),
    ('pt-br', gettext_noop('Brazilian Portuguese')),
    ('ro', gettext_noop('Romanian')),
    ('ru', gettext_noop('Russian')),
@ -86,6 +87,7 @@ LANGUAGES = (
    ('sv', gettext_noop('Swedish')),
    ('ta', gettext_noop('Tamil')),
    ('te', gettext_noop('Telugu')),
+    ('th', gettext_noop('Thai')),
    ('tr', gettext_noop('Turkish')),
    ('uk', gettext_noop('Ukrainian')),
    ('zh-cn', gettext_noop('Simplified Chinese')),
--- a/django/conf/locale/ar/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ar/LC_MESSAGES/django.mo
--- a/django/conf/locale/ar/LC_MESSAGES/django.po
+++ b/django/conf/locale/ar/LC_MESSAGES/django.po
--- a/django/conf/locale/ca/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ca/LC_MESSAGES/django.mo
--- a/django/conf/locale/ca/LC_MESSAGES/django.po
+++ b/django/conf/locale/ca/LC_MESSAGES/django.po
--- a/django/conf/locale/da/LC_MESSAGES/django.mo
+++ b/django/conf/locale/da/LC_MESSAGES/django.mo
--- a/django/conf/locale/da/LC_MESSAGES/django.po
+++ b/django/conf/locale/da/LC_MESSAGES/django.po
@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-09 20:19+0200\n"
-"PO-Revision-Date: 2008-08-11 20:41+0200\n"
+"POT-Creation-Date: 2008-11-16 20:27+0100\n"
+"PO-Revision-Date: 2008-11-07 20:41+0200\n"
 "Last-Translator: Finn Gruwier Larsen<finn@gruwier.dk>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@ -99,114 +99,122 @@ msgid "Hebrew"
 msgstr "Hebræisk"

 #: conf/global_settings.py:65
+msgid "Hindi"
+msgstr "Hindi"
+
+#: conf/global_settings.py:66
 msgid "Croatian"
 msgstr "Kroatisk"

-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
 msgid "Icelandic"
 msgstr "Islandsk"

-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
 msgid "Italian"
 msgstr "Italiensk"

-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
 msgid "Japanese"
 msgstr "Japansk"

-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
 msgid "Georgian"
 msgstr "Georgisk"

-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
 msgid "Korean"
 msgstr "Koreansk"

-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
 msgid "Khmer"
 msgstr "Khmer"

-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
 msgid "Kannada"
 msgstr "Kannada"

-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
 msgid "Latvian"
 msgstr "Lettisk"

-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
 msgid "Lithuanian"
 msgstr "Litauisk"

-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
 msgid "Macedonian"
 msgstr "Makedonsk"

-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
 msgid "Dutch"
 msgstr "Hollandsk"

-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
 msgid "Norwegian"
 msgstr "Norsk"

-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
 msgid "Polish"
 msgstr "Polsk"

-#: conf/global_settings.py:79
-msgid "Portugese"
+#: conf/global_settings.py:80
+msgid "Portuguese"
 msgstr "Portugisisk"

-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk portugisisk"

-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
 msgid "Romanian"
 msgstr "Rumænsk"

-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
 msgid "Russian"
 msgstr "Russisk"

-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
 msgid "Slovak"
 msgstr "Slovakisk"

-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
 msgid "Slovenian"
 msgstr "Slovensk"

-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
 msgid "Serbian"
 msgstr "Serbisk"

-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
 msgid "Swedish"
 msgstr "Svensk"

-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
 msgid "Tamil"
 msgstr "Tamil"

-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
 msgid "Telugu"
 msgstr "Telugu"

-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
+msgid "Thai"
+msgstr "Thai"
+
+#: conf/global_settings.py:91
 msgid "Turkish"
 msgstr "Tyrkisk"

-#: conf/global_settings.py:90
+#: conf/global_settings.py:92
 msgid "Ukrainian"
 msgstr "Ukrainsk"

-#: conf/global_settings.py:91
+#: conf/global_settings.py:93
 msgid "Simplified Chinese"
 msgstr "Forenklet kinesisk"

-#: conf/global_settings.py:92
+#: conf/global_settings.py:94
 msgid "Traditional Chinese"
 msgstr "Traditionelt kinesisk"

@ -219,40 +227,40 @@ msgstr ""
 "<h3>Efter %s:</h3>\n"
 "<ul>\n"

-#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
+#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:91
+#: contrib/admin/filterspecs.py:146 contrib/admin/filterspecs.py:172
 msgid "All"
 msgstr "Alle"

-#: contrib/admin/filterspecs.py:113
+#: contrib/admin/filterspecs.py:112
 msgid "Any date"
 msgstr "Når som helst"

-#: contrib/admin/filterspecs.py:114
+#: contrib/admin/filterspecs.py:113
 msgid "Today"
 msgstr "I dag"

-#: contrib/admin/filterspecs.py:117
+#: contrib/admin/filterspecs.py:116
 msgid "Past 7 days"
 msgstr "De sidste 7 dage"

-#: contrib/admin/filterspecs.py:119
+#: contrib/admin/filterspecs.py:118
 msgid "This month"
 msgstr "Denne måned"

-#: contrib/admin/filterspecs.py:121
+#: contrib/admin/filterspecs.py:120
 msgid "This year"
 msgstr "Dette år"

-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:390
 msgid "Yes"
 msgstr "Ja"

-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:390
 msgid "No"
 msgstr "Nej"

-#: contrib/admin/filterspecs.py:154 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:153 forms/widgets.py:390
 msgid "Unknown"
 msgstr "Ukendt"

@ -294,7 +302,7 @@ msgid "Changed %s."
 msgstr "Ændrede %s."

 #: contrib/admin/options.py:338 contrib/admin/options.py:348
-#: forms/models.py:275
+#: contrib/comments/templates/comments/preview.html:15 forms/models.py:288
 msgid "and"
 msgstr "og"

@ -348,25 +356,30 @@ msgstr "%(name)s \"%(obj)s\" blev tilføjet. Du kan redigere det igen herunder."
 msgid "Add %s"
 msgstr "Tilføj %s"

-#: contrib/admin/options.py:605
+#: contrib/admin/options.py:559 contrib/admin/options.py:673
+#, python-format
+msgid "%(name)s object with primary key %(key)r does not exist."
+msgstr "Der findes ikke et %(name)s-objekt med primærnøgle %(key)r."
+
+#: contrib/admin/options.py:606
 #, python-format
 msgid "Change %s"
 msgstr "Ret %s"

-#: contrib/admin/options.py:637
+#: contrib/admin/options.py:638
 msgid "Database error"
 msgstr "databasefejl"

-#: contrib/admin/options.py:687
+#: contrib/admin/options.py:688
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" blev slettet."

-#: contrib/admin/options.py:694
+#: contrib/admin/options.py:695
 msgid "Are you sure?"
 msgstr "Er du sikker?"

-#: contrib/admin/options.py:723
+#: contrib/admin/options.py:724
 #, python-format
 msgid "Change history: %s"
 msgstr "Ændringshistorik: %s"
@ -382,8 +395,7 @@ msgstr ""

 #: contrib/admin/sites.py:226 contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
-msgstr ""
-"Log venligst ind igen, da din session er udløbet."
+msgstr "Log venligst ind igen, da din session er udløbet."

 #: contrib/admin/sites.py:233 contrib/admin/views/decorators.py:47
 msgid ""
@ -463,7 +475,7 @@ msgstr "Vi beklager, men den ønskede side kunne ikke findes"

 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/app_index.html:8
-#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/base.html:33
 #: contrib/admin/templates/admin/change_form.html:17
 #: contrib/admin/templates/admin/change_list.html:8
 #: contrib/admin/templates/admin/delete_confirmation.html:6
@ -507,18 +519,18 @@ msgstr ""
 msgid "%(name)s"
 msgstr "%(name)s"

-#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/base.html:28
 msgid "Welcome,"
 msgstr "Velkommen,"

-#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/base.html:28
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Dokumentation"

-#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/base.html:28
 #: contrib/admin/templates/admin/auth/user/change_password.html:13
 #: contrib/admin/templates/admin/auth/user/change_password.html:46
 #: contrib/admin/templates/registration/password_change_done.html:3
@ -526,7 +538,7 @@ msgstr "Dokumentation"
 msgid "Change password"
 msgstr "Skift adgangskode"

-#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/base.html:28
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 msgid "Log out"
@ -552,7 +564,7 @@ msgstr "Historik"

 #: contrib/admin/templates/admin/change_form.html:28
 #: contrib/admin/templates/admin/edit_inline/stacked.html:13
-#: contrib/admin/templates/admin/edit_inline/tabular.html:25
+#: contrib/admin/templates/admin/edit_inline/tabular.html:27
 msgid "View on site"
 msgstr "Se på website"

@ -638,8 +650,8 @@ msgid ""
 "the appropriate user."
 msgstr ""
 "Der er noget galt med databaseinstallationen. Kontroller om "
-"databasetabellerne er blevet oprettet og at databasen er læsbar for "
-"den pågældende bruger."
+"databasetabellerne er blevet oprettet og at databasen er læsbar for den "
+"pågældende bruger."

 #: contrib/admin/templates/admin/login.html:19
 msgid "Username:"
@ -658,13 +670,14 @@ msgid "User"
 msgstr "Bruger"

 #: contrib/admin/templates/admin/object_history.html:24
+#: contrib/comments/templates/comments/moderation_queue.html:33
 msgid "Action"
 msgstr "Funktion"

 #: contrib/admin/templates/admin/object_history.html:30
 #: utils/translation/trans_real.py:404
 msgid "DATETIME_FORMAT"
-msgstr "DATETIME_FORMAT"
+msgstr "j. F Y H:i"

 #: contrib/admin/templates/admin/object_history.html:38
 msgid ""
@ -904,7 +917,7 @@ msgstr "E-mail-adresse:"
 msgid "Reset my password"
 msgstr "Nulstil min adgangskode"

-#: contrib/admin/templatetags/admin_list.py:288
+#: contrib/admin/templatetags/admin_list.py:284
 msgid "All dates"
 msgstr "Alle datoer"

@ -1049,7 +1062,8 @@ msgstr "Tekst"
 msgid "Time"
 msgstr "Tid"

-#: contrib/admindocs/views.py:339 contrib/comments/forms.py:22
+#: contrib/admindocs/views.py:339 contrib/comments/forms.py:21
+#: contrib/comments/templates/comments/moderation_queue.html:37
 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
 msgid "URL"
 msgstr "URL"
@ -1168,7 +1182,7 @@ msgid "Change password: %s"
 msgstr "Skift adgangskode: %s"

 #: contrib/auth/forms.py:15 contrib/auth/forms.py:48
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:127
 msgid ""
 "Required. 30 characters or fewer. Alphanumeric characters only (letters, "
 "digits and underscores)."
@ -1239,51 +1253,51 @@ msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Din gamle adgangskode blev ikke indtastet korrekt. Indtast den venligst igen."

-#: contrib/auth/models.py:72 contrib/auth/models.py:95
+#: contrib/auth/models.py:63 contrib/auth/models.py:86
 msgid "name"
 msgstr "navn"

-#: contrib/auth/models.py:74
+#: contrib/auth/models.py:65
 msgid "codename"
 msgstr "kodenavn"

-#: contrib/auth/models.py:77
+#: contrib/auth/models.py:68
 msgid "permission"
 msgstr "rettighed"

-#: contrib/auth/models.py:78 contrib/auth/models.py:96
+#: contrib/auth/models.py:69 contrib/auth/models.py:87
 msgid "permissions"
 msgstr "rettigheder"

-#: contrib/auth/models.py:99
+#: contrib/auth/models.py:90
 msgid "group"
 msgstr "gruppe"

-#: contrib/auth/models.py:100 contrib/auth/models.py:146
+#: contrib/auth/models.py:91 contrib/auth/models.py:137
 msgid "groups"
 msgstr "grupper"

-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:127
 msgid "username"
 msgstr "brugernavn"

-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:128
 msgid "first name"
 msgstr "fornavn"

-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:129
 msgid "last name"
 msgstr "efternavn"

-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:130
 msgid "e-mail address"
 msgstr "e-mail-adresse"

-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:131
 msgid "password"
 msgstr "adgangskode"

-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:131
 msgid ""
 "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
 "password form</a>."
@ -1291,19 +1305,19 @@ msgstr ""
 "Brug '[algo]$[salt]$[hexdigest]' eller brug <a href=\"password/\">formularen "
 "til skift af adgangskode</a>."

-#: contrib/auth/models.py:141
+#: contrib/auth/models.py:132
 msgid "staff status"
 msgstr "admin-status"

-#: contrib/auth/models.py:141
+#: contrib/auth/models.py:132
 msgid "Designates whether the user can log into this admin site."
 msgstr "Bestemmer om brugeren kan logge ind på dette administrationswebsite."

-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:133
 msgid "active"
 msgstr "aktiv"

-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:133
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@ -1311,26 +1325,26 @@ msgstr ""
 "Bestemmer om brugeren skal behandles som aktiv. Fravælg dette frem for at "
 "slette en konto."

-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:134
 msgid "superuser status"
 msgstr "superbrugerstatus"

-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:134
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 "Bestemmer at denne bruger har alle rettigheder uden at tildele dem eksplicit."

-#: contrib/auth/models.py:144
+#: contrib/auth/models.py:135
 msgid "last login"
 msgstr "sidst logget ind"

-#: contrib/auth/models.py:145
+#: contrib/auth/models.py:136
 msgid "date joined"
 msgstr "dato for registrering"

-#: contrib/auth/models.py:147
+#: contrib/auth/models.py:138
 msgid ""
 "In addition to the permissions manually assigned, this user will also get "
 "all permissions granted to each group he/she is in."
@ -1338,19 +1352,19 @@ msgstr ""
 "Udover de rettigheder, der manuelt er tildelt brugeren, vil denne også få "
 "alle rettigheder, der er tildelt hver gruppe, brugeren er medlem af."

-#: contrib/auth/models.py:148
+#: contrib/auth/models.py:139
 msgid "user permissions"
 msgstr "Rettigheder"

-#: contrib/auth/models.py:152
+#: contrib/auth/models.py:143
 msgid "user"
 msgstr "bruger"

-#: contrib/auth/models.py:153
+#: contrib/auth/models.py:144
 msgid "users"
 msgstr "brugere"

-#: contrib/auth/models.py:308
+#: contrib/auth/models.py:300
 msgid "message"
 msgstr "meddelelse"

@ -1370,25 +1384,28 @@ msgstr "Indhold"
 msgid "Metadata"
 msgstr "Metadata"

-#: contrib/comments/forms.py:20
+#: contrib/comments/forms.py:19
+#: contrib/comments/templates/comments/moderation_queue.html:34
 msgid "Name"
 msgstr "Navn"

-#: contrib/comments/forms.py:21
+#: contrib/comments/forms.py:20
 msgid "Email address"
 msgstr "E-mail-adresse"

-#: contrib/comments/forms.py:23
+#: contrib/comments/forms.py:22
+#: contrib/comments/templates/comments/moderation_queue.html:35
 msgid "Comment"
 msgstr "Kommentar"

-#: contrib/comments/forms.py:26
+#: contrib/comments/forms.py:25
 msgid ""
 "If you enter anything in this field your comment will be treated as spam"
-msgstr "Hvis du indtaster noget i dette felt, vil din kommentar blive "
-"betragtet som spam."
+msgstr ""
+"Hvis du indtaster noget i dette felt, vil din kommentar blive betragtet som "
+"spam."

-#: contrib/comments/forms.py:126
+#: contrib/comments/forms.py:125
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
@ -1454,8 +1471,8 @@ msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
 msgstr ""
-"Denne kommentar blev indsendt af en autenticeret bruger; derfor er "
-"e-mail-adressen skrivebeskyttet."
+"Denne kommentar blev indsendt af en autenticeret bruger; derfor er e-mail-"
+"adressen skrivebeskyttet."

 #: contrib/comments/models.py:149
 #, python-format
@ -1472,6 +1489,135 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"

+#: contrib/comments/templates/comments/approve.html:4
+msgid "Approve a comment"
+msgstr "Godkend en kommentar"
+
+#: contrib/comments/templates/comments/approve.html:7
+msgid "Really make this comment public?"
+msgstr "Vil du godkende denne kommentar?"
+
+#: contrib/comments/templates/comments/approve.html:12
+#: contrib/comments/templates/comments/moderation_queue.html:49
+msgid "Approve"
+msgstr "Godkend"
+
+#: contrib/comments/templates/comments/approved.html:4
+msgid "Thanks for approving"
+msgstr "Tak for godkendelsen"
+
+#: contrib/comments/templates/comments/approved.html:7
+#: contrib/comments/templates/comments/deleted.html:7
+#: contrib/comments/templates/comments/flagged.html:7
+msgid ""
+"Thanks for taking the time to improve the quality of discussion on our site"
+msgstr ""
+"Tak fordi du tog dig tid til at højne kvaliteten af diskussionen på vores "
+"website"
+
+#: contrib/comments/templates/comments/delete.html:4
+msgid "Remove a comment"
+msgstr "Fjern en kommentar"
+
+#: contrib/comments/templates/comments/delete.html:7
+msgid "Really remove this comment?"
+msgstr "Skal kommentaren fjernes?"
+
+#: contrib/comments/templates/comments/delete.html:12
+#: contrib/comments/templates/comments/moderation_queue.html:53
+msgid "Remove"
+msgstr "Fjern"
+
+#: contrib/comments/templates/comments/deleted.html:4
+msgid "Thanks for removing"
+msgstr "Tak for fjernelsen"
+
+#: contrib/comments/templates/comments/flag.html:4
+msgid "Flag this comment"
+msgstr "Flag denne kommentar"
+
+#: contrib/comments/templates/comments/flag.html:7
+msgid "Really flag this comment?"
+msgstr "Skal kommentaren flages?"
+
+#: contrib/comments/templates/comments/flag.html:12
+msgid "Flag"
+msgstr "Flag"
+
+#: contrib/comments/templates/comments/flagged.html:4
+msgid "Thanks for flagging"
+msgstr "Tak for flagningen"
+
+#: contrib/comments/templates/comments/form.html:16
+#: contrib/comments/templates/comments/preview.html:31
+msgid "Post"
+msgstr "Indsend"
+
+#: contrib/comments/templates/comments/form.html:17
+#: contrib/comments/templates/comments/preview.html:32
+msgid "Preview"
+msgstr "Forhåndsvis"
+
+#: contrib/comments/templates/comments/moderation_queue.html:4
+#: contrib/comments/templates/comments/moderation_queue.html:19
+msgid "Comment moderation queue"
+msgstr "Moderationskø"
+
+#: contrib/comments/templates/comments/moderation_queue.html:26
+msgid "No comments to moderate"
+msgstr "Ingen kommentarer at moderere"
+
+#: contrib/comments/templates/comments/moderation_queue.html:36
+msgid "Email"
+msgstr "E-mail"
+
+#: contrib/comments/templates/comments/moderation_queue.html:38
+msgid "Authenticated?"
+msgstr "Autenticeret?"
+
+#: contrib/comments/templates/comments/moderation_queue.html:39
+msgid "IP Address"
+msgstr "IP-adresse"
+
+#: contrib/comments/templates/comments/moderation_queue.html:40
+msgid "Date posted"
+msgstr "Indsendt d."
+
+#: contrib/comments/templates/comments/moderation_queue.html:63
+msgid "yes"
+msgstr "ja"
+
+#: contrib/comments/templates/comments/moderation_queue.html:63
+msgid "no"
+msgstr "nej"
+
+#: contrib/comments/templates/comments/posted.html:4
+msgid "Thanks for commenting"
+msgstr "Tak for kommenteringen"
+
+#: contrib/comments/templates/comments/posted.html:7
+msgid "Thank you for your comment"
+msgstr "Tak for kommentaren"
+
+#: contrib/comments/templates/comments/preview.html:4
+#: contrib/comments/templates/comments/preview.html:12
+msgid "Preview your comment"
+msgstr "Forhåndsvis kommentar"
+
+#: contrib/comments/templates/comments/preview.html:10
+msgid "Please correct the error below"
+msgid_plural "Please correct the errors below"
+msgstr[0] "Ret venligst fejlen herunder."
+msgstr[1] "Ret venligst fejlene herunder."
+
+#: contrib/comments/templates/comments/preview.html:15
+msgid "Post your comment"
+msgstr "Indsend din kommentar"
+
+#: contrib/comments/templates/comments/preview.html:15
+msgid "or make changes"
+msgstr "eller gennemfør ændringer"
+
 #: contrib/contenttypes/models.py:67
 msgid "python model class name"
 msgstr "klassenavn i Python-model"
@ -1549,8 +1695,9 @@ msgstr "flade sider"
 msgid ""
 "We apologize, but your form has expired. Please continue filling out the "
 "form from this page."
-msgstr "Tiden er udløbet - vi beklager. Vær venlig at fortsætte med at "
-"udfylde formularen på denne side."
+msgstr ""
+"Tiden er udløbet - vi beklager. Vær venlig at fortsætte med at udfylde "
+"formularen på denne side."

 #: contrib/gis/forms/fields.py:14
 msgid "No geometry value provided."
@ -1866,8 +2013,9 @@ msgstr "Zurich"
 msgid ""
 "Enter a valid Swiss identity or passport card number in X1234567<0 or "
 "1234567890 format."
-msgstr "Indtast et svejtsisk identitets- eller pasnr. i format "
-"X1234567<0 eller 1234567890."
+msgstr ""
+"Indtast et svejtsisk identitets- eller pasnr. i format X1234567<0 eller "
+"1234567890."

 #: contrib/localflavor/cl/forms.py:29
 msgid "Enter a valid Chilean RUT."
@ -1954,8 +2102,8 @@ msgstr ""
 msgid ""
 "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
 "format."
-msgstr "Indtast et tysk identiteskortsnr. i formatet "
-"XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
+msgstr ""
+"Indtast et tysk identiteskortsnr. i formatet XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."

 #: contrib/localflavor/es/es_provinces.py:5
 msgid "Arava"
@ -2232,8 +2380,9 @@ msgstr "Indtast et gyldigt postnr. i området 01XXX - 52XXX."
 msgid ""
 "Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
 "9XXXXXXXX."
-msgstr "Indtast et gyldigt telefonr. i et af disse formater: "
-"6XXXXXXXX, 8XXXXXXXX, 9XXXXXXXX."
+msgstr ""
+"Indtast et gyldigt telefonr. i et af disse formater: 6XXXXXXXX, 8XXXXXXXX, "
+"9XXXXXXXX."

 #: contrib/localflavor/es/forms.py:66
 msgid "Please enter a valid NIF, NIE, or CIF."
@ -2258,8 +2407,8 @@ msgstr "Ugyldig kontrolsum for CIF."
 #: contrib/localflavor/es/forms.py:142
 msgid ""
 "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "Indtast venligst et gyldigt bankkontonr. i formatet "
-"XXX-XXXX-XX-XXXXXXXXXX."
+msgstr ""
+"Indtast venligst et gyldigt bankkontonr. i formatet XXX-XXXX-XX-XXXXXXXXXX."

 #: contrib/localflavor/es/forms.py:143
 msgid "Invalid checksum for bank account number."
@ -2276,8 +2425,8 @@ msgstr "Indtast et postnr. i formatet XXXXXXX."
 #: contrib/localflavor/is_/forms.py:17
 msgid ""
 "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Indtast et gyldigt islandsk identifikationsnr. Formatet er "
-"XXXXXX-XXXX."
+msgstr ""
+"Indtast et gyldigt islandsk identifikationsnr. Formatet er XXXXXX-XXXX."

 #: contrib/localflavor/is_/forms.py:18
 msgid "The Icelandic identification number is not valid."
@ -3661,11 +3810,11 @@ msgstr "Der må højst være %s decimalpladser."
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Der må maksimalt være %s cifre før decimaltegnet."

-#: forms/fields.py:287 forms/fields.py:848
+#: forms/fields.py:287 forms/fields.py:849
 msgid "Enter a valid date."
 msgstr "Indtast en gyldig dato."

-#: forms/fields.py:321 forms/fields.py:849
+#: forms/fields.py:321 forms/fields.py:850
 msgid "Enter a valid time."
 msgstr "Indtast en gyldig tid."

@ -3708,15 +3857,15 @@ msgstr ""
 "Marker en gyldigt valgmulighed; '%(value)s' er ikke en af de tilgængelige "
 "valgmuligheder."

-#: forms/fields.py:697 forms/fields.py:758 forms/models.py:660
+#: forms/fields.py:697 forms/fields.py:758 forms/models.py:714
 msgid "Enter a list of values."
 msgstr "Indtast en liste af værdier."

-#: forms/fields.py:877
+#: forms/fields.py:878
 msgid "Enter a valid IPv4 address."
 msgstr "Indtast en gyldig IPv4-adresse."

-#: forms/fields.py:887
+#: forms/fields.py:888
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -3726,45 +3875,49 @@ msgstr ""
 msgid "Order"
 msgstr "Rækkefølge"

-#: forms/models.py:268 forms/models.py:277
+#: forms/models.py:281 forms/models.py:290
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr "%(model_name)s med dette %(field_label)s eksisterer allerede."

-#: forms/models.py:590
+#: forms/models.py:581
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr "Den indlejrede fremmednøgle passede ikke med forælderinstansens primærnøgle."
+
+#: forms/models.py:644
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Marker en gyldig valgmulighed. Det valg, du har foretaget, er ikke blandt de "
 "tilgængelige valgmuligheder."

-#: forms/models.py:661
+#: forms/models.py:715
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 "Marker et gyldigt valg. %s er ikke en af de tilgængelige valgmuligheder."

-#: template/defaultfilters.py:706
+#: template/defaultfilters.py:743
 msgid "yes,no,maybe"
 msgstr "ja,nej,måske"

-#: template/defaultfilters.py:737
+#: template/defaultfilters.py:774
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"

-#: template/defaultfilters.py:739
+#: template/defaultfilters.py:776
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"

-#: template/defaultfilters.py:741
+#: template/defaultfilters.py:778
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"

-#: template/defaultfilters.py:742
+#: template/defaultfilters.py:779
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
@ -3851,51 +4004,51 @@ msgstr "Søn"

 #: utils/dates.py:18
 msgid "January"
-msgstr "Januar"
+msgstr "januar"

 #: utils/dates.py:18
 msgid "February"
-msgstr "Februar"
+msgstr "februar"

 #: utils/dates.py:18 utils/dates.py:31
 msgid "March"
-msgstr "Marts"
+msgstr "marts"

 #: utils/dates.py:18 utils/dates.py:31
 msgid "April"
-msgstr "April"
+msgstr "april"

 #: utils/dates.py:18 utils/dates.py:31
 msgid "May"
-msgstr "Maj"
+msgstr "maj"

 #: utils/dates.py:18 utils/dates.py:31
 msgid "June"
-msgstr "Juni"
+msgstr "juni"

 #: utils/dates.py:19 utils/dates.py:31
 msgid "July"
-msgstr "Juli"
+msgstr "juli"

 #: utils/dates.py:19
 msgid "August"
-msgstr "August"
+msgstr "august"

 #: utils/dates.py:19
 msgid "September"
-msgstr "September"
+msgstr "september"

 #: utils/dates.py:19
 msgid "October"
-msgstr "Oktober"
+msgstr "oktober"

 #: utils/dates.py:19
 msgid "November"
-msgstr "November"
+msgstr "november"

 #: utils/dates.py:20
 msgid "December"
-msgstr "December"
+msgstr "december"

 #: utils/dates.py:23
 msgid "jan"
@ -4029,19 +4182,19 @@ msgstr ", %(number)d %(type)s"

 #: utils/translation/trans_real.py:403
 msgid "DATE_FORMAT"
-msgstr "DATE_FORMAT"
+msgstr "j. F Y"

 #: utils/translation/trans_real.py:405
 msgid "TIME_FORMAT"
-msgstr "TIME_FORMAT"
+msgstr "H:i"

 #: utils/translation/trans_real.py:421
 msgid "YEAR_MONTH_FORMAT"
-msgstr "YEAR_MONTH_FORMAT"
+msgstr "F Y"

 #: utils/translation/trans_real.py:422
 msgid "MONTH_DAY_FORMAT"
-msgstr "MONTH_DAY_FORMAT"
+msgstr "j. F"

 #: views/generic/create_update.py:114
 #, python-format
@ -4103,9 +4256,6 @@ msgstr "%(verbose_name)s blev slettet."
 #~ msgid "approved by staff"
 #~ msgstr "godkendt af personale"

-#~ msgid "free comment"
-#~ msgstr "fri kommentar"
-
 #~ msgid "free comments"
 #~ msgstr "frie kommentarer"

@ -4172,9 +4322,6 @@ msgstr "%(verbose_name)s blev slettet."
 #~ msgid "Post a photo"
 #~ msgstr "Indsend et foto"

-#~ msgid "Preview comment"
-#~ msgstr "Forhåndsvis kommentar"
-
 #~ msgid "Your name:"
 #~ msgstr "Dit navn:"

@ -4345,8 +4492,9 @@ msgstr "%(verbose_name)s blev slettet."
 #~ "Please enter a valid decimal number with at most %s decimal place. Please "
 #~ "enter a valid decimal number with at most %s decimal places."
 #~ msgstr ""
-#~ "Indtast venligst et gyldigt decimaltal med %s cifre efter kommaet. Indtast "
-#~ "venligst et gyldigt decimaltal med maksimalt %s cifre efter kommaet."
+#~ "Indtast venligst et gyldigt decimaltal med %s cifre efter kommaet. "
+#~ "Indtast venligst et gyldigt decimaltal med maksimalt %s cifre efter "
+#~ "kommaet."

 #~ msgid "Please enter a valid floating point number."
 #~ msgstr "Indtast venligst et gyldigt flydende-komma-tal."
--- a/django/conf/locale/de/LC_MESSAGES/django.mo
+++ b/django/conf/locale/de/LC_MESSAGES/django.mo
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
--- a/django/conf/locale/es/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es/LC_MESSAGES/django.mo
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
--- a/django/conf/locale/es_AR/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es_AR/LC_MESSAGES/django.mo
--- a/django/conf/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_AR/LC_MESSAGES/django.po
--- a/django/conf/locale/et/LC_MESSAGES/django.mo
+++ b/django/conf/locale/et/LC_MESSAGES/django.mo
--- a/django/conf/locale/et/LC_MESSAGES/django.po
+++ b/django/conf/locale/et/LC_MESSAGES/django.po
--- a/django/conf/locale/fr/LC_MESSAGES/django.mo
+++ b/django/conf/locale/fr/LC_MESSAGES/django.mo
--- a/django/conf/locale/fr/LC_MESSAGES/django.po
+++ b/django/conf/locale/fr/LC_MESSAGES/django.po
--- a/django/conf/locale/fr/LC_MESSAGES/djangojs.mo
+++ b/django/conf/locale/fr/LC_MESSAGES/djangojs.mo
--- a/django/conf/locale/fr/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/fr/LC_MESSAGES/djangojs.po
@ -1,15 +1,15 @@
-# French translation for js. 
-# Copyright (C) 2005 Mikaël Barbero 
-# This file is distributed under the same license as the PACKAGE package. 
-# 
+# French translation for Django Javascript. 
+# Copyright (C) 2005 Mikaël Barbero
+# This file is distributed under the same license as the Django package. 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-02 01:08+0200\n"
-"PO-Revision-Date: 2005-12-24 16:39+0100\n"
-"Last-Translator: David Larlet <http://david.larlet.fr>\n"
-"Language-Team: français <http://django-fr.org>\n"
+"POT-Creation-Date: 2008-11-04 11:14+0100\n"
+"PO-Revision-Date: 2009-03-01 12:43+0100\n"
+"Last-Translator: Stéphane Raimbault <stephane.raimbault@gmail.com>\n"
+"Language-Team: French <http://django-fr.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -64,7 +64,7 @@ msgstr "Dimanche Lundi Mardi Mercredi Jeudi Vendredi Samedi"
 #: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
 #: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
 msgid "Show"
-msgstr "Montrer"
+msgstr "Afficher"

 #: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
 msgid "Hide"
--- a/django/conf/locale/he/LC_MESSAGES/django.mo
+++ b/django/conf/locale/he/LC_MESSAGES/django.mo
--- a/django/conf/locale/he/LC_MESSAGES/django.po
+++ b/django/conf/locale/he/LC_MESSAGES/django.po
@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-02 22:48-0400\n"
-"PO-Revision-Date: 2008-09-02 23:02-0500\n"
+"POT-Creation-Date: 2008-11-14 02:20-0500\n"
+"PO-Revision-Date: 2008-11-14 02:21-0500\n"
 "Last-Translator: Alex <alex.gaynor@gmail.com>\n"
 "Language-Team: Django-i18n <django-i18n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@ -100,114 +100,122 @@ msgid "Hebrew"
 msgstr "עברית"

 #: conf/global_settings.py:65
+msgid "Hindi"
+msgstr "הינדי"
+
+#: conf/global_settings.py:66
 msgid "Croatian"
 msgstr "קרואטית"

-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
 msgid "Icelandic"
 msgstr "איסלנדית"

-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
 msgid "Italian"
 msgstr "איטלקית"

-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
 msgid "Japanese"
 msgstr "יפנית"

-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
 msgid "Georgian"
 msgstr "גיאורגית"

-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
 msgid "Korean"
 msgstr "קוריאנית"

-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
 msgid "Khmer"
 msgstr "חמר"

-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
 msgid "Kannada"
 msgstr "קנדית"

-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
 msgid "Latvian"
 msgstr "לטבית"

-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
 msgid "Lithuanian"
 msgstr "ליטאית"

-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
 msgid "Macedonian"
 msgstr "מקדונית"

-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
 msgid "Dutch"
 msgstr "הולנדית"

-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
 msgid "Norwegian"
 msgstr "נורווגית"

-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
 msgid "Polish"
 msgstr "פולנית"

-#: conf/global_settings.py:79
-msgid "Portugese"
+#: conf/global_settings.py:80
+msgid "Portuguese"
 msgstr "פורטוגזית"

-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
 msgid "Brazilian Portuguese"
 msgstr "פורטוגזית ברזילאית"

-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
 msgid "Romanian"
 msgstr "רומנית"

-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
 msgid "Russian"
 msgstr "רוסית"

-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
 msgid "Slovak"
 msgstr "סלובקית"

-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
 msgid "Slovenian"
 msgstr "סלובנית"

-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
 msgid "Serbian"
 msgstr "סרבית"

-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
 msgid "Swedish"
 msgstr "שוודית"

-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
 msgid "Tamil"
 msgstr "טמילית"

-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
 msgid "Telugu"
 msgstr "טלגו"

-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
+msgid "Thai"
+msgstr "תאילנדית"
+
+#: conf/global_settings.py:91
 msgid "Turkish"
 msgstr "טורקית"

-#: conf/global_settings.py:90
+#: conf/global_settings.py:92
 msgid "Ukrainian"
 msgstr "אוקראינית"

-#: conf/global_settings.py:91
+#: conf/global_settings.py:93
 msgid "Simplified Chinese"
 msgstr "סינית פשוטה"

-#: conf/global_settings.py:92
+#: conf/global_settings.py:94
 msgid "Traditional Chinese"
 msgstr "סינית מסורתית"

@ -221,44 +229,44 @@ msgstr ""
 "<ul>\n"

 #: contrib/admin/filterspecs.py:74
-#: contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147
-#: contrib/admin/filterspecs.py:173
+#: contrib/admin/filterspecs.py:91
+#: contrib/admin/filterspecs.py:146
+#: contrib/admin/filterspecs.py:172
 msgid "All"
 msgstr "הכל"

-#: contrib/admin/filterspecs.py:113
+#: contrib/admin/filterspecs.py:112
 msgid "Any date"
 msgstr "כל תאריך"

-#: contrib/admin/filterspecs.py:114
+#: contrib/admin/filterspecs.py:113
 msgid "Today"
 msgstr "היום"

-#: contrib/admin/filterspecs.py:117
+#: contrib/admin/filterspecs.py:116
 msgid "Past 7 days"
 msgstr "בשבוע האחרון"

-#: contrib/admin/filterspecs.py:119
+#: contrib/admin/filterspecs.py:118
 msgid "This month"
 msgstr "החודש"

-#: contrib/admin/filterspecs.py:121
+#: contrib/admin/filterspecs.py:120
 msgid "This year"
 msgstr "השנה"

-#: contrib/admin/filterspecs.py:147
-#: forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146
+#: forms/widgets.py:390
 msgid "Yes"
 msgstr "כן"

-#: contrib/admin/filterspecs.py:147
-#: forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146
+#: forms/widgets.py:390
 msgid "No"
 msgstr "לא"

-#: contrib/admin/filterspecs.py:154
-#: forms/widgets.py:391
+#: contrib/admin/filterspecs.py:153
+#: forms/widgets.py:390
 msgid "Unknown"
 msgstr "לא ידוע"

@ -302,7 +310,8 @@ msgstr "%s שונה."

 #: contrib/admin/options.py:338
 #: contrib/admin/options.py:348
-#: forms/models.py:275
+#: contrib/comments/templates/comments/preview.html:15
+#: forms/models.py:288
 msgid "and"
 msgstr "ו"

@ -353,30 +362,36 @@ msgstr "שינוי %(name)s \"%(obj)s\" בוצע בהצלחה."
 msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה. ניתן לערוך אותו שוב מתחת."

-#: contrib/admin/options.py:536
+#: contrib/admin/options.py:528
 #, python-format
 msgid "Add %s"
 msgstr "הוספת %s"

-#: contrib/admin/options.py:614
+#: contrib/admin/options.py:559
+#: contrib/admin/options.py:673
+#, python-format
+msgid "%(name)s object with primary key %(key)r does not exist."
+msgstr ""
+
+#: contrib/admin/options.py:606
 #, python-format
 msgid "Change %s"
 msgstr "שינוי %s"

-#: contrib/admin/options.py:646
+#: contrib/admin/options.py:638
 msgid "Database error"
 msgstr "שגיאת בסיס נתונים"

-#: contrib/admin/options.py:696
+#: contrib/admin/options.py:688
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "מחיקת %(name)s \"%(obj)s\" בוצעה בהצלחה."

-#: contrib/admin/options.py:703
+#: contrib/admin/options.py:695
 msgid "Are you sure?"
 msgstr "האם את/ה בטוח/ה ?"

-#: contrib/admin/options.py:732
+#: contrib/admin/options.py:724
 #, python-format
 msgid "Change history: %s"
 msgstr "היסטוריית שינוי: %s"
@ -387,40 +402,40 @@ msgstr "היסטוריית שינוי: %s"
 msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
 msgstr "נא להזין שם משתמש וסיסמה נכונים. בשני השדות גודל האותיות האנגליות משנה."

-#: contrib/admin/sites.py:227
+#: contrib/admin/sites.py:226
 #: contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
 msgstr "עליך להתחבר שנית כי פג הזמן המוקצב לך."

-#: contrib/admin/sites.py:234
+#: contrib/admin/sites.py:233
 #: contrib/admin/views/decorators.py:47
 msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
 msgstr "נראה שהדפדפן שלך אינו מוגדר לקבל עוגיות. נא לאפשר עוגיות, לטעון מחדש את הדף ולנסות שוב."

-#: contrib/admin/sites.py:250
-#: contrib/admin/sites.py:256
+#: contrib/admin/sites.py:249
+#: contrib/admin/sites.py:255
 #: contrib/admin/views/decorators.py:66
 msgid "Usernames cannot contain the '@' character."
 msgstr "שם משתמש אינו יכול להכיל את התו '@'."

-#: contrib/admin/sites.py:253
+#: contrib/admin/sites.py:252
 #: contrib/admin/views/decorators.py:62
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "כתובת הדוא\"ל שלך אינה שם המשתמש שלך. נסה/י '%s' במקום."

-#: contrib/admin/sites.py:313
+#: contrib/admin/sites.py:312
 msgid "Site administration"
 msgstr "ניהול אתר"

-#: contrib/admin/sites.py:326
+#: contrib/admin/sites.py:325
 #: contrib/admin/templates/admin/login.html:26
 #: contrib/admin/templates/registration/password_reset_complete.html:14
 #: contrib/admin/views/decorators.py:20
 msgid "Log in"
 msgstr "כניסה"

-#: contrib/admin/sites.py:373
+#: contrib/admin/sites.py:372
 #, python-format
 msgid "%s administration"
 msgstr "ניהול %s"
@ -451,11 +466,11 @@ msgstr "הנוכחי:"
 msgid "Change:"
 msgstr "שינוי:"

-#: contrib/admin/widgets.py:121
+#: contrib/admin/widgets.py:123
 msgid "Lookup"
 msgstr "חפש"

-#: contrib/admin/widgets.py:228
+#: contrib/admin/widgets.py:230
 msgid "Add Another"
 msgstr "הוסף עוד אחת"

@ -470,7 +485,7 @@ msgstr "אנו מצטערים, לא ניתן למצוא את הדף המבוקש

 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/app_index.html:8
-#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/base.html:31
 #: contrib/admin/templates/admin/change_form.html:17
 #: contrib/admin/templates/admin/change_list.html:8
 #: contrib/admin/templates/admin/delete_confirmation.html:6
@ -510,18 +525,18 @@ msgstr "התרחשה שגיאה. היא דווחה למנהלי האתר בדו
 msgid "%(name)s"
 msgstr "%(name)s"

-#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/base.html:26
 msgid "Welcome,"
 msgstr "שלום,"

-#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/base.html:26
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "תיעוד"

-#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/base.html:26
 #: contrib/admin/templates/admin/auth/user/change_password.html:13
 #: contrib/admin/templates/admin/auth/user/change_password.html:46
 #: contrib/admin/templates/registration/password_change_done.html:3
@ -529,7 +544,7 @@ msgstr "תיעוד"
 msgid "Change password"
 msgstr "שינוי סיסמה"

-#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/base.html:26
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 msgid "Log out"
@ -555,7 +570,7 @@ msgstr "היסטוריה"

 #: contrib/admin/templates/admin/change_form.html:28
 #: contrib/admin/templates/admin/edit_inline/stacked.html:13
-#: contrib/admin/templates/admin/edit_inline/tabular.html:25
+#: contrib/admin/templates/admin/edit_inline/tabular.html:27
 msgid "View on site"
 msgstr "צפיה באתר"

@ -646,6 +661,7 @@ msgid "User"
 msgstr "משתמש"

 #: contrib/admin/templates/admin/object_history.html:24
+#: contrib/comments/templates/comments/moderation_queue.html:33
 msgid "Action"
 msgstr "פעולה"

@ -865,7 +881,7 @@ msgstr "כתובת דוא\"ל:"
 msgid "Reset my password"
 msgstr "אפס את סיסמתי"

-#: contrib/admin/templatetags/admin_list.py:288
+#: contrib/admin/templatetags/admin_list.py:284
 msgid "All dates"
 msgstr "כל התאריכים"

@ -1023,7 +1039,8 @@ msgid "Time"
 msgstr "זמן"

 #: contrib/admindocs/views.py:339
-#: contrib/comments/forms.py:22
+#: contrib/comments/forms.py:21
+#: contrib/comments/templates/comments/moderation_queue.html:37
 #: contrib/flatpages/admin.py:8
 #: contrib/flatpages/models.py:7
 msgid "URL"
@ -1131,7 +1148,7 @@ msgstr "שינוי סיסמה: %s"

 #: contrib/auth/forms.py:15
 #: contrib/auth/forms.py:48
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:127
 msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."
 msgstr "דורש 30 תווים או פחות. תווים אלפאנומריים בלבד (אותיות, ספרות וקווים תחתונים)."

@ -1191,106 +1208,106 @@ msgstr "סיסמה ישנה"
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "סיסמתך הישנה הוזנה בצורה שגויה. נא להזינה שוב."

-#: contrib/auth/models.py:72
-#: contrib/auth/models.py:95
+#: contrib/auth/models.py:63
+#: contrib/auth/models.py:86
 msgid "name"
 msgstr "שם"

-#: contrib/auth/models.py:74
+#: contrib/auth/models.py:65
 msgid "codename"
 msgstr "שם קוד"

-#: contrib/auth/models.py:77
+#: contrib/auth/models.py:68
 msgid "permission"
 msgstr "הרשאה"

-#: contrib/auth/models.py:78
-#: contrib/auth/models.py:96
+#: contrib/auth/models.py:69
+#: contrib/auth/models.py:87
 msgid "permissions"
 msgstr "הרשאות"

-#: contrib/auth/models.py:99
+#: contrib/auth/models.py:90
 msgid "group"
 msgstr "קבוצה"

-#: contrib/auth/models.py:100
-#: contrib/auth/models.py:146
+#: contrib/auth/models.py:91
+#: contrib/auth/models.py:137
 msgid "groups"
 msgstr "קבוצות"

-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:127
 msgid "username"
 msgstr "שם משתמש"

-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:128
 msgid "first name"
 msgstr "שם פרטי"

-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:129
 msgid "last name"
 msgstr "שם משפחה"

-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:130
 msgid "e-mail address"
 msgstr "כתובת דוא\"ל"

-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:131
 msgid "password"
 msgstr "סיסמה"

-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:131
 msgid "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change password form</a>."
 msgstr "יש להזין '[algo]$[salt]$[hexdigest]' או להשתמש ב<a href=\"password/\">טופס שינוי הסיסמה</a>."

-#: contrib/auth/models.py:141
+#: contrib/auth/models.py:132
 msgid "staff status"
 msgstr "סטטוס איש צוות"

-#: contrib/auth/models.py:141
+#: contrib/auth/models.py:132
 msgid "Designates whether the user can log into this admin site."
 msgstr "מציין האם המשתמש יכול להתחבר לאתר הניהול."

-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:133
 msgid "active"
 msgstr "פעיל"

-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:133
 msgid "Designates whether this user should be treated as active. Unselect this instead of deleting accounts."
 msgstr "מציין האם יש להתייחס למשתמש כפעיל. יש לבטל בחירה זו במקום למחוק חשבונות משתמשים."

-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:134
 msgid "superuser status"
 msgstr "סטטוס משתמש על"

-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:134
 msgid "Designates that this user has all permissions without explicitly assigning them."
 msgstr "מציין שלמשתמש זה יש את כל ההרשאות ללא הצורך המפורש בהענקתן."

-#: contrib/auth/models.py:144
+#: contrib/auth/models.py:135
 msgid "last login"
 msgstr "כניסה אחרונה"

-#: contrib/auth/models.py:145
+#: contrib/auth/models.py:136
 msgid "date joined"
 msgstr "תאריך הצטרפות"

-#: contrib/auth/models.py:147
+#: contrib/auth/models.py:138
 msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
 msgstr "בנוסף לכל ההרשאות שהוקצו ידנית, יוענקו למשתמש גם כל ההרשאות של כל קבוצה המשוייכת אליו."

-#: contrib/auth/models.py:148
+#: contrib/auth/models.py:139
 msgid "user permissions"
 msgstr "הרשאות משתמש"

-#: contrib/auth/models.py:152
+#: contrib/auth/models.py:143
 msgid "user"
 msgstr "משתמש"

-#: contrib/auth/models.py:153
+#: contrib/auth/models.py:144
 msgid "users"
 msgstr "משתמשים"

-#: contrib/auth/models.py:308
+#: contrib/auth/models.py:300
 msgid "message"
 msgstr "הודעה"

@ -1311,23 +1328,25 @@ msgstr "תוכן"
 msgid "Metadata"
 msgstr "מטא-נתונים"

-#: contrib/comments/forms.py:20
+#: contrib/comments/forms.py:19
+#: contrib/comments/templates/comments/moderation_queue.html:34
 msgid "Name"
 msgstr "שם"

-#: contrib/comments/forms.py:21
+#: contrib/comments/forms.py:20
 msgid "Email address"
 msgstr "כתובת דוא\"ל"

-#: contrib/comments/forms.py:23
+#: contrib/comments/forms.py:22
+#: contrib/comments/templates/comments/moderation_queue.html:35
 msgid "Comment"
 msgstr "תגובה"

-#: contrib/comments/forms.py:26
+#: contrib/comments/forms.py:25
 msgid "If you enter anything in this field your comment will be treated as spam"
 msgstr "אם יוזן משהו בשדה היחס לתגובתך יהיה כמו לספאם"

-#: contrib/comments/forms.py:126
+#: contrib/comments/forms.py:125
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
@ -1397,6 +1416,132 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"

+#: contrib/comments/templates/comments/approve.html:4
+msgid "Approve a comment"
+msgstr "אשר הערה"
+
+#: contrib/comments/templates/comments/approve.html:7
+msgid "Really make this comment public?"
+msgstr "באמת הופכים את התגובה הציבורית?"
+
+#: contrib/comments/templates/comments/approve.html:12
+#: contrib/comments/templates/comments/moderation_queue.html:49
+msgid "Approve"
+msgstr "אשר"
+
+#: contrib/comments/templates/comments/approved.html:4
+msgid "Thanks for approving"
+msgstr "תודה על השימוש באתר שלנו!"
+
+#: contrib/comments/templates/comments/approved.html:7
+#: contrib/comments/templates/comments/deleted.html:7
+#: contrib/comments/templates/comments/flagged.html:7
+msgid "Thanks for taking the time to improve the quality of discussion on our site"
+msgstr "תודה שהקדשת מזמנך כדי לשפר את האתר שלנו"
+
+#: contrib/comments/templates/comments/delete.html:4
+msgid "Remove a comment"
+msgstr "הסר הערה"
+
+#: contrib/comments/templates/comments/delete.html:7
+msgid "Really remove this comment?"
+msgstr "באמת להסיר את הערה זו?"
+
+#: contrib/comments/templates/comments/delete.html:12
+#: contrib/comments/templates/comments/moderation_queue.html:53
+msgid "Remove"
+msgstr "להסיר"
+
+#: contrib/comments/templates/comments/deleted.html:4
+msgid "Thanks for removing"
+msgstr "תודה על הסרת"
+
+#: contrib/comments/templates/comments/flag.html:4
+msgid "Flag this comment"
+msgstr "סמן את הערה זו"
+
+#: contrib/comments/templates/comments/flag.html:7
+msgid "Really flag this comment?"
+msgstr "באמת, סמן את הערה זו?"
+
+#: contrib/comments/templates/comments/flag.html:12
+msgid "Flag"
+msgstr "סימן"
+
+#: contrib/comments/templates/comments/flagged.html:4
+msgid "Thanks for flagging"
+msgstr "תודה לציון"
+
+#: contrib/comments/templates/comments/form.html:16
+#: contrib/comments/templates/comments/preview.html:31
+msgid "Post"
+msgstr "פוסט"
+
+#: contrib/comments/templates/comments/form.html:17
+#: contrib/comments/templates/comments/preview.html:32
+msgid "Preview"
+msgstr "תצוגה מקדימה"
+
+#: contrib/comments/templates/comments/moderation_queue.html:4
+#: contrib/comments/templates/comments/moderation_queue.html:19
+msgid "Comment moderation queue"
+msgstr "תור תגובה עבור מתון של תגובות"
+
+#: contrib/comments/templates/comments/moderation_queue.html:26
+msgid "No comments to moderate"
+msgstr "אין תגובות עד בינוני"
+
+#: contrib/comments/templates/comments/moderation_queue.html:36
+msgid "Email"
+msgstr "כתובת דוא\"ל"
+
+#: contrib/comments/templates/comments/moderation_queue.html:38
+msgid "Authenticated?"
+msgstr "מאומתים?"
+
+#: contrib/comments/templates/comments/moderation_queue.html:39
+msgid "IP Address"
+msgstr "כתובת IP"
+
+#: contrib/comments/templates/comments/moderation_queue.html:40
+msgid "Date posted"
+msgstr "תאריך הצטרפות"
+
+#: contrib/comments/templates/comments/moderation_queue.html:63
+msgid "yes"
+msgstr "כן"
+
+#: contrib/comments/templates/comments/moderation_queue.html:63
+msgid "no"
+msgstr "לא"
+
+#: contrib/comments/templates/comments/posted.html:4
+msgid "Thanks for commenting"
+msgstr "תודה על התגובה"
+
+#: contrib/comments/templates/comments/posted.html:7
+msgid "Thank you for your comment"
+msgstr "תודה על התגובה"
+
+#: contrib/comments/templates/comments/preview.html:4
+#: contrib/comments/templates/comments/preview.html:12
+msgid "Preview your comment"
+msgstr "תצוגה מקדימה של התגובה"
+
+#: contrib/comments/templates/comments/preview.html:10
+msgid "Please correct the error below"
+msgid_plural "Please correct the errors below"
+msgstr[0] "בבקשה לתקן את השגיאה למטה"
+msgstr[1] "אנא תקן את שגיאות למטה"
+
+#: contrib/comments/templates/comments/preview.html:15
+msgid "Post your comment"
+msgstr "פרסם את התגובה"
+
+#: contrib/comments/templates/comments/preview.html:15
+msgid "or make changes"
+msgstr "או לבצע שינויים"
+
 #: contrib/contenttypes/models.py:67
 msgid "python model class name"
 msgstr "שם ה-class של מודל פייתון"
@ -3553,12 +3698,12 @@ msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "נא לוודא שאין יותר מ-%s ספרות לפני הנקודה העשרונית"

 #: forms/fields.py:287
-#: forms/fields.py:848
+#: forms/fields.py:849
 msgid "Enter a valid date."
 msgstr "יש להזין תאריך חוקי."

 #: forms/fields.py:321
-#: forms/fields.py:849
+#: forms/fields.py:850
 msgid "Enter a valid time."
 msgstr "יש להזין שעה חוקית."

@ -3598,15 +3743,15 @@ msgstr "יש לבחור אפשרות חוקית. %(value)s אינו בין הא

 #: forms/fields.py:697
 #: forms/fields.py:758
-#: forms/models.py:654
+#: forms/models.py:720
 msgid "Enter a list of values."
 msgstr "יש להזין רשימת ערכים"

-#: forms/fields.py:877
+#: forms/fields.py:878
 msgid "Enter a valid IPv4 address."
 msgstr "יש להזין כתובת IPv4 חוקית."

-#: forms/fields.py:887
+#: forms/fields.py:888
 msgid "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "יש להזין ערך המכיל אותיות, ספרות, קווים תחתונים ומקפים בלבד."

@ -3615,43 +3760,47 @@ msgstr "יש להזין ערך המכיל אותיות, ספרות, קווים
 msgid "Order"
 msgstr "מיון"

-#: forms/models.py:268
-#: forms/models.py:277
+#: forms/models.py:281
+#: forms/models.py:290
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr "%(model_name)s·עם·%(field_label)s·זה קיימת כבר."

-#: forms/models.py:584
+#: forms/models.py:587
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr "הרצופות מפתח זר לא תאם את האב מופע המפתח העיקרי."
+
+#: forms/models.py:650
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "יש לבחור אפשרות חוקית; '%(data)s' אינו בין %(choices)s."

-#: forms/models.py:655
+#: forms/models.py:721
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "יש לבחור אפשרות חוקית. %s אינו בין האפשרויות הזמינות."

-#: template/defaultfilters.py:706
+#: template/defaultfilters.py:741
 msgid "yes,no,maybe"
 msgstr "כן,לא,אולי"

-#: template/defaultfilters.py:737
+#: template/defaultfilters.py:772
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d בית"
 msgstr[1] "%(size)d בתים"

-#: template/defaultfilters.py:739
+#: template/defaultfilters.py:774
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"

-#: template/defaultfilters.py:741
+#: template/defaultfilters.py:776
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"

-#: template/defaultfilters.py:742
+#: template/defaultfilters.py:777
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
@ -3982,8 +4131,6 @@ msgstr "ה-%(verbose_name)s נמחק."
 #~ msgstr "כתובת IP"
 #~ msgid "approved by staff"
 #~ msgstr "אושר ע\"י הצוות"
-#~ msgid "free comment"
-#~ msgstr "הערה אנונימית"
 #~ msgid "free comments"
 #~ msgstr "הערות אנונימיות"
 #~ msgid "score"
@ -4030,8 +4177,6 @@ msgstr "ה-%(verbose_name)s נמחק."
 #~ msgstr "אופציונלי"
 #~ msgid "Post a photo"
 #~ msgstr "שליחת תמונה"
-#~ msgid "Preview comment"
-#~ msgstr "תצוגה מקדימה של התגובה"
 #~ msgid "Your name:"
 #~ msgstr "שמך:"
 #~ msgid ""
--- a/django/conf/locale/hi/LC_MESSAGES/django.mo
+++ b/django/conf/locale/hi/LC_MESSAGES/django.mo
--- a/django/conf/locale/hi/LC_MESSAGES/django.po
+++ b/django/conf/locale/hi/LC_MESSAGES/django.po
--- a/django/conf/locale/hi/LC_MESSAGES/djangojs.mo
+++ b/django/conf/locale/hi/LC_MESSAGES/djangojs.mo
--- a/django/conf/locale/hi/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/hi/LC_MESSAGES/djangojs.po
@ -0,0 +1,116 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-09-27 11:30+0530\n"
+"PO-Revision-Date: 2008-09-27 12:36+0530\n"
+"Last-Translator: Thejaswi Puthraya <thejaswi.puthraya@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"
+
+#: contrib/admin/media/js/SelectFilter2.js:33
+#, perl-format
+msgid "Available %s"
+msgstr "उपलब्ध %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:41
+msgid "Choose all"
+msgstr "सारे चुनें"
+
+#: contrib/admin/media/js/SelectFilter2.js:46
+msgid "Add"
+msgstr "जोड़ना"
+
+#: contrib/admin/media/js/SelectFilter2.js:48
+msgid "Remove"
+msgstr "हटाना"
+
+#: contrib/admin/media/js/SelectFilter2.js:53
+#, perl-format
+msgid "Chosen %s"
+msgstr "%s चुना गया हैं"
+
+#: contrib/admin/media/js/SelectFilter2.js:54
+msgid "Select your choice(s) and click "
+msgstr "आपके पसंद चुनिये और क्लिक करें"
+
+#: contrib/admin/media/js/SelectFilter2.js:59
+msgid "Clear all"
+msgstr "सारे हटाओ"
+
+#: contrib/admin/media/js/calendar.js:24
+#: contrib/admin/media/js/dateparse.js:32
+msgid "January February March April May June July August September October November December"
+msgstr "जनवरी फ़रवरी मार्च अप्रैल मई जून जुलाई अगस्त सेप्टम्बर अक्टूबर नवंबर दिसम्‍बर"
+
+#: contrib/admin/media/js/calendar.js:25
+msgid "S M T W T F S"
+msgstr "आ सो म बु गु शु श"
+
+#: contrib/admin/media/js/dateparse.js:33
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "रविवार सोमवार मंगलवार बुधवार गुरूवार शुक्रवार शनिवार"
+
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
+msgid "Show"
+msgstr "दिखाना"
+
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
+msgid "Hide"
+msgstr "छिपाना"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+msgid "Now"
+msgstr "अब"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
+msgid "Clock"
+msgstr "घड़ी"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
+msgid "Choose a time"
+msgstr "एक समय चुनें"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+msgid "Midnight"
+msgstr "मध्यरात्री"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+msgid "6 a.m."
+msgstr "6 बजे"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
+msgid "Noon"
+msgstr "दोपहर"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
+msgid "Cancel"
+msgstr "रद्द करें"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
+msgid "Today"
+msgstr "आज"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
+msgid "Calendar"
+msgstr "तिथि-पत्र "
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
+msgid "Yesterday"
+msgstr "कल (बीता)"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
+msgid "Tomorrow"
+msgstr "कल"
+
--- a/django/conf/locale/it/LC_MESSAGES/django.mo
+++ b/django/conf/locale/it/LC_MESSAGES/django.mo
--- a/django/conf/locale/it/LC_MESSAGES/django.po
+++ b/django/conf/locale/it/LC_MESSAGES/django.po
--- a/django/conf/locale/it/LC_MESSAGES/djangojs.mo
+++ b/django/conf/locale/it/LC_MESSAGES/djangojs.mo
--- a/django/conf/locale/it/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/it/LC_MESSAGES/djangojs.po
@ -4,17 +4,17 @@
 # This file is distributed under the same license as the Django package.
 msgid ""
 msgstr ""
-"Project-Id-Version: Django\n"
+"Project-Id-Version: Django 1.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-01 07:16+0200\n"
-"PO-Revision-Date: 2008-08-14 18:36+0200\n"
+"POT-Creation-Date: 2009-04-10 08:20+0200\n"
+"PO-Revision-Date: 2009-07-26 19:01+0200\n"
 "Last-Translator: Nicola Larosa <nico@tekNico.net>\n"
-"Language-Team: Italiano\n"
+"Language-Team: Italian <django-it@googlegroups.com>\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"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.3\n"

 #: contrib/admin/media/js/SelectFilter2.js:33
 #, perl-format
@ -40,7 +40,7 @@ msgstr "%s scelti"

 #: contrib/admin/media/js/SelectFilter2.js:54
 msgid "Select your choice(s) and click "
-msgstr "Fai le tue scelte e clicca "
+msgstr "Seleziona le tue scelte e clicca "

 #: contrib/admin/media/js/SelectFilter2.js:59
 msgid "Clear all"
@ -118,3 +118,4 @@ msgstr "Ieri"
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
 msgid "Tomorrow"
 msgstr "Domani"
+
--- a/django/conf/locale/ja/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ja/LC_MESSAGES/django.mo
--- a/django/conf/locale/ja/LC_MESSAGES/django.po
+++ b/django/conf/locale/ja/LC_MESSAGES/django.po
@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-03 10:01+0900\n"
-"PO-Revision-Date: 2008-09-03 10:03+0900\n"
+"POT-Creation-Date: 2008-12-19 13:45+0900\n"
+"PO-Revision-Date: 2008-12-19 13:57+0900\n"
 "Last-Translator: Takashi Matsuo <matsuo.takashi@gmail.com>\n"
 "Language-Team: Japanese <django-ja@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@ -97,114 +97,122 @@ msgid "Hebrew"
 msgstr "ヘブライ語"

 #: conf/global_settings.py:65
+msgid "Hindi"
+msgstr "ヒンディー語"
+
+#: conf/global_settings.py:66
 msgid "Croatian"
 msgstr "クロアチア語"

-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
 msgid "Icelandic"
 msgstr "アイスランド語"

-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
 msgid "Italian"
 msgstr "イタリア語"

-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
 msgid "Japanese"
 msgstr "日本語"

-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
 msgid "Georgian"
 msgstr "グルジア語"

-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
 msgid "Korean"
 msgstr "韓国語"

-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
 msgid "Khmer"
 msgstr "クメール語"

-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
 msgid "Kannada"
 msgstr "カンナダ語"

-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
 msgid "Latvian"
 msgstr "ラトビア語"

-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
 msgid "Lithuanian"
 msgstr "リトアニア語"

-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
 msgid "Macedonian"
 msgstr "マケドニア語"

-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
 msgid "Dutch"
 msgstr "オランダ語"

-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
 msgid "Norwegian"
 msgstr "ノルウェー語"

-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
 msgid "Polish"
 msgstr "ポーランド語"

-#: conf/global_settings.py:79
-msgid "Portugese"
+#: conf/global_settings.py:80
+msgid "Portuguese"
 msgstr "ポルトガル語"

-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
 msgid "Brazilian Portuguese"
 msgstr "ブラジルポルトガル語"

-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
 msgid "Romanian"
 msgstr "ルーマニア語"

-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
 msgid "Russian"
 msgstr "ロシア語"

-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
 msgid "Slovak"
 msgstr "スロバキア語"

-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
 msgid "Slovenian"
 msgstr "スロヴェニア語"

-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
 msgid "Serbian"
 msgstr "セルビア語"

-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
 msgid "Swedish"
 msgstr "スウェーデン語"

-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
 msgid "Tamil"
 msgstr "タミル語"

-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
 msgid "Telugu"
 msgstr "テルグ語"

-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
+msgid "Thai"
+msgstr "タイ語"
+
+#: conf/global_settings.py:91
 msgid "Turkish"
 msgstr "トルコ語"

-#: conf/global_settings.py:90
+#: conf/global_settings.py:92
 msgid "Ukrainian"
 msgstr "ウクライナ語"

-#: conf/global_settings.py:91
+#: conf/global_settings.py:93
 msgid "Simplified Chinese"
 msgstr "簡体字中国語"

-#: conf/global_settings.py:92
+#: conf/global_settings.py:94
 msgid "Traditional Chinese"
 msgstr "繁体字中国語"

@ -217,40 +225,40 @@ msgstr ""
 "<h3>%s で絞り込む</h3>\n"
 "<ul>\n"

-#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
+#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:91
+#: contrib/admin/filterspecs.py:146 contrib/admin/filterspecs.py:172
 msgid "All"
 msgstr "全て"

-#: contrib/admin/filterspecs.py:113
+#: contrib/admin/filterspecs.py:112
 msgid "Any date"
 msgstr "いつでも"

-#: contrib/admin/filterspecs.py:114
+#: contrib/admin/filterspecs.py:113
 msgid "Today"
 msgstr "今日"

-#: contrib/admin/filterspecs.py:117
+#: contrib/admin/filterspecs.py:116
 msgid "Past 7 days"
 msgstr "過去 7 日間"

-#: contrib/admin/filterspecs.py:119
+#: contrib/admin/filterspecs.py:118
 msgid "This month"
 msgstr "今月"

-#: contrib/admin/filterspecs.py:121
+#: contrib/admin/filterspecs.py:120
 msgid "This year"
 msgstr "今年"

-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:391
 msgid "Yes"
 msgstr "はい"

-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:391
 msgid "No"
 msgstr "いいえ"

-#: contrib/admin/filterspecs.py:154 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:153 forms/widgets.py:391
 msgid "Unknown"
 msgstr "不明"

@ -292,7 +300,7 @@ msgid "Changed %s."
 msgstr "%s を変更しました。"

 #: contrib/admin/options.py:338 contrib/admin/options.py:348
-#: forms/models.py:275
+#: contrib/comments/templates/comments/preview.html:15 forms/models.py:288
 msgid "and"
 msgstr "と"

@ -341,30 +349,35 @@ msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" を追加しました。続けて編集できます。"

-#: contrib/admin/options.py:536
+#: contrib/admin/options.py:528
 #, python-format
 msgid "Add %s"
 msgstr "%s を追加"

-#: contrib/admin/options.py:614
+#: contrib/admin/options.py:559 contrib/admin/options.py:673
+#, python-format
+msgid "%(name)s object with primary key %(key)r does not exist."
+msgstr "主キーが %(key)r である %(name)s オブジェクトは存在しません。"
+
+#: contrib/admin/options.py:606
 #, python-format
 msgid "Change %s"
 msgstr "%s を変更"

-#: contrib/admin/options.py:646
+#: contrib/admin/options.py:638
 msgid "Database error"
 msgstr "データベースエラー"

-#: contrib/admin/options.py:696
+#: contrib/admin/options.py:688
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" を削除しました。"

-#: contrib/admin/options.py:703
+#: contrib/admin/options.py:695
 msgid "Are you sure?"
 msgstr "よろしいですか？"

-#: contrib/admin/options.py:732
+#: contrib/admin/options.py:724
 #, python-format
 msgid "Change history: %s"
 msgstr "変更履歴: %s"
@ -377,11 +390,12 @@ msgid ""
 msgstr ""
 "正しいユーザ名とパスワードを入力してください (大文字小文字は区別します) 。"

-#: contrib/admin/sites.py:227 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:226 contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
-msgstr "再ログインしてください。ログインセッションが有効期間切れしてしまいました。"
+msgstr ""
+"再ログインしてください。ログインセッションが有効期間切れしてしまいました。"

-#: contrib/admin/sites.py:234 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:233 contrib/admin/views/decorators.py:47
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@ -389,37 +403,37 @@ msgstr ""
 "ブラウザがクッキーの使用を許可していないようです。クッキーの使用を許可して、"
 "もう一度このページを表示してください。"

-#: contrib/admin/sites.py:250 contrib/admin/sites.py:256
+#: contrib/admin/sites.py:249 contrib/admin/sites.py:255
 #: contrib/admin/views/decorators.py:66
 msgid "Usernames cannot contain the '@' character."
 msgstr "ユーザ名には '@' を含められません。"

-#: contrib/admin/sites.py:253 contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:252 contrib/admin/views/decorators.py:62
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "メールアドレスはユーザ名ではありません。 '%s' を試してみてください。"

-#: contrib/admin/sites.py:313
+#: contrib/admin/sites.py:312
 msgid "Site administration"
 msgstr "サイト管理"

-#: contrib/admin/sites.py:326 contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:325 contrib/admin/templates/admin/login.html:26
 #: contrib/admin/templates/registration/password_reset_complete.html:14
 #: contrib/admin/views/decorators.py:20
 msgid "Log in"
 msgstr "ログイン"

-#: contrib/admin/sites.py:373
+#: contrib/admin/sites.py:372
 #, python-format
 msgid "%s administration"
 msgstr "%s サイト管理"

-#: contrib/admin/util.py:138
+#: contrib/admin/util.py:145
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "%(name)s に %(fieldname)s が一つ以上あります: %(obj)s"

-#: contrib/admin/util.py:143
+#: contrib/admin/util.py:150
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "%(name)s に %(fieldname)s が一つ以上あります:"
@ -440,11 +454,11 @@ msgstr "現在:"
 msgid "Change:"
 msgstr "変更:"

-#: contrib/admin/widgets.py:121
+#: contrib/admin/widgets.py:123
 msgid "Lookup"
 msgstr "検索"

-#: contrib/admin/widgets.py:228
+#: contrib/admin/widgets.py:230
 msgid "Add Another"
 msgstr "追加"

@ -548,7 +562,7 @@ msgstr "履歴"

 #: contrib/admin/templates/admin/change_form.html:28
 #: contrib/admin/templates/admin/edit_inline/stacked.html:13
-#: contrib/admin/templates/admin/edit_inline/tabular.html:25
+#: contrib/admin/templates/admin/edit_inline/tabular.html:27
 msgid "View on site"
 msgstr "サイト上で表示"

@ -652,6 +666,7 @@ msgid "User"
 msgstr "ユーザ"

 #: contrib/admin/templates/admin/object_history.html:24
+#: contrib/comments/templates/comments/moderation_queue.html:33
 msgid "Action"
 msgstr "操作"

@ -895,7 +910,7 @@ msgstr "メールアドレス"
 msgid "Reset my password"
 msgstr "パスワードをリセット"

-#: contrib/admin/templatetags/admin_list.py:288
+#: contrib/admin/templatetags/admin_list.py:285
 msgid "All dates"
 msgstr "いつでも"

@ -1041,7 +1056,8 @@ msgstr "テキスト"
 msgid "Time"
 msgstr "時刻"

-#: contrib/admindocs/views.py:339 contrib/comments/forms.py:22
+#: contrib/admindocs/views.py:339 contrib/comments/forms.py:21
+#: contrib/comments/templates/comments/moderation_queue.html:37
 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
 msgid "URL"
 msgstr "URL"
@ -1352,24 +1368,26 @@ msgstr "内容"
 msgid "Metadata"
 msgstr "メタデータ"

-#: contrib/comments/forms.py:20
+#: contrib/comments/forms.py:19
+#: contrib/comments/templates/comments/moderation_queue.html:34
 msgid "Name"
 msgstr "名前"

-#: contrib/comments/forms.py:21
+#: contrib/comments/forms.py:20
 msgid "Email address"
 msgstr "メールアドレス"

-#: contrib/comments/forms.py:23
+#: contrib/comments/forms.py:22
+#: contrib/comments/templates/comments/moderation_queue.html:35
 msgid "Comment"
 msgstr "コメント"

-#: contrib/comments/forms.py:26
+#: contrib/comments/forms.py:25
 msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "このフィールドに入力するとコメントはスパム扱いされます"

-#: contrib/comments/forms.py:126
+#: contrib/comments/forms.py:125
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
@ -1452,6 +1470,132 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"

+#: contrib/comments/templates/comments/approve.html:4
+msgid "Approve a comment"
+msgstr "コメントを承認する"
+
+#: contrib/comments/templates/comments/approve.html:7
+msgid "Really make this comment public?"
+msgstr "本当にこのコメントを承認しますか？"
+
+#: contrib/comments/templates/comments/approve.html:12
+#: contrib/comments/templates/comments/moderation_queue.html:49
+msgid "Approve"
+msgstr "承認"
+
+#: contrib/comments/templates/comments/approved.html:4
+msgid "Thanks for approving"
+msgstr "ご利用ありがとうございました！"
+
+#: contrib/comments/templates/comments/approved.html:7
+#: contrib/comments/templates/comments/deleted.html:7
+#: contrib/comments/templates/comments/flagged.html:7
+msgid ""
+"Thanks for taking the time to improve the quality of discussion on our site"
+msgstr "当サイトの品質向上にご協力いただきありがとうございました"
+
+#: contrib/comments/templates/comments/delete.html:4
+msgid "Remove a comment"
+msgstr "コメントを削除する"
+
+#: contrib/comments/templates/comments/delete.html:7
+msgid "Really remove this comment?"
+msgstr "本当にこのコメントを削除しますか？"
+
+#: contrib/comments/templates/comments/delete.html:12
+#: contrib/comments/templates/comments/moderation_queue.html:53
+msgid "Remove"
+msgstr "削除"
+
+#: contrib/comments/templates/comments/deleted.html:4
+msgid "Thanks for removing"
+msgstr "ご利用ありがとうございました！"
+
+#: contrib/comments/templates/comments/flag.html:4
+msgid "Flag this comment"
+msgstr "このコメントにフラグを付ける"
+
+#: contrib/comments/templates/comments/flag.html:7
+msgid "Really flag this comment?"
+msgstr "本当にこのコメントにフラグを付けますか？"
+
+#: contrib/comments/templates/comments/flag.html:12
+msgid "Flag"
+msgstr "フラグを付ける"
+
+#: contrib/comments/templates/comments/flagged.html:4
+msgid "Thanks for flagging"
+msgstr "ご利用ありがとうございました！"
+
+#: contrib/comments/templates/comments/form.html:16
+#: contrib/comments/templates/comments/preview.html:31
+msgid "Post"
+msgstr "投稿"
+
+#: contrib/comments/templates/comments/form.html:17
+#: contrib/comments/templates/comments/preview.html:32
+msgid "Preview"
+msgstr "プレビュー"
+
+#: contrib/comments/templates/comments/moderation_queue.html:4
+#: contrib/comments/templates/comments/moderation_queue.html:19
+msgid "Comment moderation queue"
+msgstr "コメントのモデレーションキュー"
+
+#: contrib/comments/templates/comments/moderation_queue.html:26
+msgid "No comments to moderate"
+msgstr "モデレートするコメントはありません"
+
+#: contrib/comments/templates/comments/moderation_queue.html:36
+msgid "Email"
+msgstr "メールアドレス"
+
+#: contrib/comments/templates/comments/moderation_queue.html:38
+msgid "Authenticated?"
+msgstr "認証済みか？"
+
+#: contrib/comments/templates/comments/moderation_queue.html:39
+msgid "IP Address"
+msgstr "IP アドレス"
+
+#: contrib/comments/templates/comments/moderation_queue.html:40
+msgid "Date posted"
+msgstr "登録日"
+
+#: contrib/comments/templates/comments/moderation_queue.html:63
+msgid "yes"
+msgstr "はい"
+
+#: contrib/comments/templates/comments/moderation_queue.html:63
+msgid "no"
+msgstr "いいえ"
+
+#: contrib/comments/templates/comments/posted.html:4
+msgid "Thanks for commenting"
+msgstr "コメントしてくれてありがとうございました"
+
+#: contrib/comments/templates/comments/posted.html:7
+msgid "Thank you for your comment"
+msgstr "コメントありがとうございました"
+
+#: contrib/comments/templates/comments/preview.html:4
+#: contrib/comments/templates/comments/preview.html:12
+msgid "Preview your comment"
+msgstr "コメントのプレビュー"
+
+#: contrib/comments/templates/comments/preview.html:10
+msgid "Please correct the error below"
+msgid_plural "Please correct the errors below"
+msgstr[0] "下記のエラーを修正してください。"
+
+#: contrib/comments/templates/comments/preview.html:15
+msgid "Post your comment"
+msgstr "コメントを投稿"
+
+#: contrib/comments/templates/comments/preview.html:15
+msgid "or make changes"
+msgstr "さらに編集"
+
 #: contrib/contenttypes/models.py:67
 msgid "python model class name"
 msgstr "Python モデルクラス名"
@ -3567,14 +3711,14 @@ msgstr "値は、空: None、真: True または偽: False でなければなり
 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
 msgstr "HH:MM[:ss[.uuuuuu]]形式で時刻を入力してください。"

-#: db/models/fields/related.py:761
+#: db/models/fields/related.py:762
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "複数選択するときには Control キーを押したまま選択してください。Mac は "
 "Command キーを使ってください"

-#: db/models/fields/related.py:838
+#: db/models/fields/related.py:840
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
@ -3632,11 +3776,11 @@ msgstr "少数部は %s 桁までで入力して下さい。"
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "整数部は %s 桁までで入力して下さい。"

-#: forms/fields.py:287 forms/fields.py:848
+#: forms/fields.py:287 forms/fields.py:849
 msgid "Enter a valid date."
 msgstr "日付を正しく入力してください。"

-#: forms/fields.py:321 forms/fields.py:849
+#: forms/fields.py:321 forms/fields.py:850
 msgid "Enter a valid time."
 msgstr "時間を正しく入力してください。"

@ -3678,15 +3822,15 @@ msgstr "このURLはリンクが壊れています。"
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr "正しく選択してください。 %(value)s は候補にありません。"

-#: forms/fields.py:697 forms/fields.py:758 forms/models.py:654
+#: forms/fields.py:697 forms/fields.py:758 forms/models.py:708
 msgid "Enter a list of values."
 msgstr "リストを入力してください。"

-#: forms/fields.py:877
+#: forms/fields.py:878
 msgid "Enter a valid IPv4 address."
 msgstr "有効なIPアドレス (IPv4) を入力してください。"

-#: forms/fields.py:887
+#: forms/fields.py:888
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "slug には半角の英数字、アンダースコア、ハイフン以外は使用できません。"
@ -3695,41 +3839,45 @@ msgstr "slug には半角の英数字、アンダースコア、ハイフン以
 msgid "Order"
 msgstr "並び変え"

-#: forms/models.py:268 forms/models.py:277
+#: forms/models.py:281 forms/models.py:290
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr "この %(field_label)s を持った %(model_name)s が既に存在します。"

-#: forms/models.py:584
+#: forms/models.py:581
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr "インライン外部キーが親インスタンスの主キーと一致しません。"
+
+#: forms/models.py:638
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "正しく選択してください。選択したものは候補にありません。"

-#: forms/models.py:655
+#: forms/models.py:709
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "正しく選択してください。 %s は候補にありません。"

-#: template/defaultfilters.py:706
+#: template/defaultfilters.py:743
 msgid "yes,no,maybe"
 msgstr "はい,いいえ,たぶん"

-#: template/defaultfilters.py:737
+#: template/defaultfilters.py:774
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d バイト"

-#: template/defaultfilters.py:739
+#: template/defaultfilters.py:776
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"

-#: template/defaultfilters.py:741
+#: template/defaultfilters.py:778
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"

-#: template/defaultfilters.py:742
+#: template/defaultfilters.py:779
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
--- a/django/conf/locale/ja/LC_MESSAGES/djangojs.mo
+++ b/django/conf/locale/ja/LC_MESSAGES/djangojs.mo
--- a/django/conf/locale/ja/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/ja/LC_MESSAGES/djangojs.po
@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-03 10:01+0900\n"
+"POT-Creation-Date: 2008-12-19 13:45+0900\n"
 "PO-Revision-Date: 2006-05-08 13:39+0900\n"
 "Last-Translator: makoto tsuyuki <mtsuyuki@gmail.com>\n"
 "Language-Team: Japanese <django-ja@googlegroups.com>\n"
--- a/django/conf/locale/mk/LC_MESSAGES/django.mo
+++ b/django/conf/locale/mk/LC_MESSAGES/django.mo
--- a/django/conf/locale/mk/LC_MESSAGES/django.po
+++ b/django/conf/locale/mk/LC_MESSAGES/django.po
@ -1,12 +1,12 @@
 # translation of django.po to Macedonian
-# (c) 2008, The Django Software Foundation
+
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-03 11:19+0200\n"
+"POT-Creation-Date: 2008-12-01 04:27+0100\n"
 "PO-Revision-Date: 2008-09-03 11:20+0200\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"Last-Translator: Vasil Vangelovski <vvangelovski@gmail.com>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -99,114 +99,122 @@ msgid "Hebrew"
 msgstr "Еврејски"

 #: conf/global_settings.py:65
+msgid "Hindi"
+msgstr "Хинди"
+
+#: conf/global_settings.py:66
 msgid "Croatian"
 msgstr "Хрватски"

-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
 msgid "Icelandic"
 msgstr "Исландски"

-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
 msgid "Italian"
 msgstr "Италијански"

-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
 msgid "Japanese"
 msgstr "Јапонски"

-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
 msgid "Georgian"
 msgstr "Грузиски"

-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
 msgid "Korean"
 msgstr "Корејски"

-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
 msgid "Khmer"
 msgstr "Кмер"

-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
 msgid "Kannada"
 msgstr "Канада"

-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
 msgid "Latvian"
 msgstr "Латвиски"

-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
 msgid "Lithuanian"
 msgstr "Литвански"

-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
 msgid "Macedonian"
 msgstr "Македонски"

-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
 msgid "Dutch"
 msgstr "Холандски"

-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
 msgid "Norwegian"
 msgstr "Норвешки"

-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
 msgid "Polish"
 msgstr "Полски"

-#: conf/global_settings.py:79
-msgid "Portugese"
+#: conf/global_settings.py:80
+msgid "Portuguese"
 msgstr "Португалкски"

-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
 msgid "Brazilian Portuguese"
 msgstr "Бразилско португалски"

-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
 msgid "Romanian"
 msgstr "Романски"

-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
 msgid "Russian"
 msgstr "Руски"

-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
 msgid "Slovak"
 msgstr "Словачки"

-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
 msgid "Slovenian"
 msgstr "Словенечки"

-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
 msgid "Serbian"
 msgstr "Српски"

-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
 msgid "Swedish"
 msgstr "Шведски"

-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
 msgid "Tamil"
 msgstr "Тамил"

-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
 msgid "Telugu"
 msgstr "Телугу"

-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
+msgid "Thai"
+msgstr "Тајландски"
+
+#: conf/global_settings.py:91
 msgid "Turkish"
 msgstr "Турски"

-#: conf/global_settings.py:90
+#: conf/global_settings.py:92
 msgid "Ukrainian"
 msgstr "Украински"

-#: conf/global_settings.py:91
+#: conf/global_settings.py:93
 msgid "Simplified Chinese"
 msgstr "Упростен кинески"

-#: conf/global_settings.py:92
+#: conf/global_settings.py:94
 msgid "Traditional Chinese"
 msgstr "Традиционален кинески"

@ -219,40 +227,40 @@ msgstr ""
 "<h3>Од %s:</h3>\n"
 "<ul>\n"

-#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
+#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:91
+#: contrib/admin/filterspecs.py:146 contrib/admin/filterspecs.py:172
 msgid "All"
 msgstr "Сите"

-#: contrib/admin/filterspecs.py:113
+#: contrib/admin/filterspecs.py:112
 msgid "Any date"
 msgstr "Било кој датум"

-#: contrib/admin/filterspecs.py:114
+#: contrib/admin/filterspecs.py:113
 msgid "Today"
 msgstr "Денеска"

-#: contrib/admin/filterspecs.py:117
+#: contrib/admin/filterspecs.py:116
 msgid "Past 7 days"
 msgstr "Последните 7 дена"

-#: contrib/admin/filterspecs.py:119
+#: contrib/admin/filterspecs.py:118
 msgid "This month"
 msgstr "Овој месец"

-#: contrib/admin/filterspecs.py:121
+#: contrib/admin/filterspecs.py:120
 msgid "This year"
 msgstr "Оваа година"

-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:390
 msgid "Yes"
 msgstr "Да"

-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:390
 msgid "No"
 msgstr "Не"

-#: contrib/admin/filterspecs.py:154 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:153 forms/widgets.py:390
 msgid "Unknown"
 msgstr "Непознато"

@ -294,7 +302,7 @@ msgid "Changed %s."
 msgstr "Изменета %s."

 #: contrib/admin/options.py:338 contrib/admin/options.py:348
-#: forms/models.py:275
+#: contrib/comments/templates/comments/preview.html:15 forms/models.py:288
 msgid "and"
 msgstr "и"

@ -339,35 +347,41 @@ msgstr "%(name)s \"%(obj)s\" беше успешно изменета."

 #: contrib/admin/options.py:460
 #, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "%(name)s \"%(obj)s\" беше успешно додадена.Подолу можете повторно да ја "
 "уредите."

-#: contrib/admin/options.py:536
+#: contrib/admin/options.py:528
 #, python-format
 msgid "Add %s"
 msgstr "Додади %s"

-#: contrib/admin/options.py:614
+#: contrib/admin/options.py:559 contrib/admin/options.py:673
+#, python-format
+msgid "%(name)s object with primary key %(key)r does not exist."
+msgstr ""
+
+#: contrib/admin/options.py:606
 #, python-format
 msgid "Change %s"
 msgstr "Измени %s"

-#: contrib/admin/options.py:646
+#: contrib/admin/options.py:638
 msgid "Database error"
 msgstr "Грешка во базата со податоци"

-#: contrib/admin/options.py:696
+#: contrib/admin/options.py:688
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" беше избришана успешно."

-#: contrib/admin/options.py:703
+#: contrib/admin/options.py:695
 msgid "Are you sure?"
 msgstr "Сигурни сте?"

-#: contrib/admin/options.py:732
+#: contrib/admin/options.py:724
 #, python-format
 msgid "Change history: %s"
 msgstr "Историја на измени: %s"
@ -381,11 +395,11 @@ msgstr ""
 "Ве молам внесете точно корисничко име и лозинка. Имајте на ум дека и во "
 "двете полиња се битни големите и малите букви."

-#: contrib/admin/sites.py:227 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:226 contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
 msgstr "Ве молам најавете се повторно бидејќи вашата сесија е истечена."

-#: contrib/admin/sites.py:234 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:233 contrib/admin/views/decorators.py:47
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@ -393,27 +407,27 @@ msgstr ""
 "Изгледа дека вашиот прелистувач не е конфигуриран да прифаќа колачиња. Ве "
 "молам овозможете ги колачињата, превчитајте ја страта и пробајте повторно."

-#: contrib/admin/sites.py:250 contrib/admin/sites.py:256
+#: contrib/admin/sites.py:249 contrib/admin/sites.py:255
 #: contrib/admin/views/decorators.py:66
 msgid "Usernames cannot contain the '@' character."
 msgstr "Корисничките имиња неможе да го содржат „@“ знакот."

-#: contrib/admin/sites.py:253 contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:252 contrib/admin/views/decorators.py:62
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "Вашата е-пошта не е вашето корисничко име. Пробајте со „%s“."

-#: contrib/admin/sites.py:313
+#: contrib/admin/sites.py:312
 msgid "Site administration"
 msgstr "Администрација на сајт"

-#: contrib/admin/sites.py:326 contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:325 contrib/admin/templates/admin/login.html:26
 #: contrib/admin/templates/registration/password_reset_complete.html:14
 #: contrib/admin/views/decorators.py:20
 msgid "Log in"
 msgstr "Најава"

-#: contrib/admin/sites.py:373
+#: contrib/admin/sites.py:372
 #, python-format
 msgid "%s administration"
 msgstr "%s администрација"
@ -444,11 +458,11 @@ msgstr "Моментално:"
 msgid "Change:"
 msgstr "Измена:"

-#: contrib/admin/widgets.py:121
+#: contrib/admin/widgets.py:123
 msgid "Lookup"
 msgstr "Побарај"

-#: contrib/admin/widgets.py:228
+#: contrib/admin/widgets.py:230
 msgid "Add Another"
 msgstr "Додади друго"

@ -463,7 +477,7 @@ msgstr "Се извинуваме, но неможе да ја најдеме с

 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/app_index.html:8
-#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/base.html:33
 #: contrib/admin/templates/admin/change_form.html:17
 #: contrib/admin/templates/admin/change_list.html:8
 #: contrib/admin/templates/admin/delete_confirmation.html:6
@ -507,18 +521,18 @@ msgstr ""
 msgid "%(name)s"
 msgstr "%(name)s"

-#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/base.html:28
 msgid "Welcome,"
 msgstr "Добредојдовте,"

-#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/base.html:28
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Документација"

-#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/base.html:28
 #: contrib/admin/templates/admin/auth/user/change_password.html:13
 #: contrib/admin/templates/admin/auth/user/change_password.html:46
 #: contrib/admin/templates/registration/password_change_done.html:3
@ -526,7 +540,7 @@ msgstr "Документација"
 msgid "Change password"
 msgstr "Промени лозинка"

-#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/base.html:28
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 msgid "Log out"
@ -552,7 +566,7 @@ msgstr "Историја"

 #: contrib/admin/templates/admin/change_form.html:28
 #: contrib/admin/templates/admin/edit_inline/stacked.html:13
-#: contrib/admin/templates/admin/edit_inline/tabular.html:25
+#: contrib/admin/templates/admin/edit_inline/tabular.html:27
 msgid "View on site"
 msgstr "Погледни на сајтот"

@ -658,6 +672,7 @@ msgid "User"
 msgstr "Корисник"

 #: contrib/admin/templates/admin/object_history.html:24
+#: contrib/comments/templates/comments/moderation_queue.html:33
 msgid "Action"
 msgstr "Акција"

@ -751,7 +766,8 @@ msgstr "Избриши?"

 #: contrib/admin/templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Ви благодариме што денеска поминавте квалитетно време со интернет страницава."
+msgstr ""
+"Ви благодариме што денеска поминавте квалитетно време со интернет страницава."

 #: contrib/admin/templates/registration/logged_out.html:10
 msgid "Log in again"
@ -861,7 +877,8 @@ msgstr ""

 #: contrib/admin/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
-msgstr "Ја добивата оваа порака бидејќи побаравте да се ресетира вашата лозинка"
+msgstr ""
+"Ја добивата оваа порака бидејќи побаравте да се ресетира вашата лозинка"

 #: contrib/admin/templates/registration/password_reset_email.html:3
 #, python-format
@ -901,7 +918,7 @@ msgstr "Е-пошта:"
 msgid "Reset my password"
 msgstr "Ресетирај ја мојата лозинка"

-#: contrib/admin/templatetags/admin_list.py:288
+#: contrib/admin/templatetags/admin_list.py:284
 msgid "All dates"
 msgstr "Сите датуми"

@ -1046,7 +1063,8 @@ msgstr "Текст"
 msgid "Time"
 msgstr "Час"

-#: contrib/admindocs/views.py:339 contrib/comments/forms.py:22
+#: contrib/admindocs/views.py:339 contrib/comments/forms.py:21
+#: contrib/comments/templates/comments/moderation_queue.html:37
 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
 msgid "URL"
 msgstr "URL"
@ -1123,7 +1141,8 @@ msgstr "Уреди го овој објект (во овој прозорец)"

 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:25
 msgid "Jumps to the admin page for pages that represent a single object."
-msgstr "Скокнува до админ страницата за страници кои претставуваат единечен објект."
+msgstr ""
+"Скокнува до админ страницата за страници кои претставуваат единечен објект."

 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:27
 msgid "Edit this object (new window)"
@ -1163,7 +1182,7 @@ msgid "Change password: %s"
 msgstr "Промени лозинка: %s"

 #: contrib/auth/forms.py:15 contrib/auth/forms.py:48
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:127
 msgid ""
 "Required. 30 characters or fewer. Alphanumeric characters only (letters, "
 "digits and underscores)."
@ -1231,53 +1250,54 @@ msgstr "Стара лозинка"

 #: contrib/auth/forms.py:176
 msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr "Не ја внесовте точно вашата стара лозинка. Ве молам внесете ја повторно."
+msgstr ""
+"Не ја внесовте точно вашата стара лозинка. Ве молам внесете ја повторно."

-#: contrib/auth/models.py:72 contrib/auth/models.py:95
+#: contrib/auth/models.py:63 contrib/auth/models.py:86
 msgid "name"
 msgstr "име"

-#: contrib/auth/models.py:74
+#: contrib/auth/models.py:65
 msgid "codename"
 msgstr "кодно име"

-#: contrib/auth/models.py:77
+#: contrib/auth/models.py:68
 msgid "permission"
 msgstr "привилегија"

-#: contrib/auth/models.py:78 contrib/auth/models.py:96
+#: contrib/auth/models.py:69 contrib/auth/models.py:87
 msgid "permissions"
 msgstr "привилегии"

-#: contrib/auth/models.py:99
+#: contrib/auth/models.py:90
 msgid "group"
 msgstr "група"

-#: contrib/auth/models.py:100 contrib/auth/models.py:146
+#: contrib/auth/models.py:91 contrib/auth/models.py:137
 msgid "groups"
 msgstr "групи"

-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:127
 msgid "username"
 msgstr "корисничко име"

-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:128
 msgid "first name"
 msgstr "име"

-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:129
 msgid "last name"
 msgstr "презиме"

-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:130
 msgid "e-mail address"
 msgstr "е-пошта"

-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:131
 msgid "password"
 msgstr "лозинка"

-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:131
 msgid ""
 "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
 "password form</a>."
@ -1285,19 +1305,20 @@ msgstr ""
 "Користете '[algo]$[salt]$[hexdigest]' или користете ја <a href=\"password/"
 "\">формата за промена на лозинката</a>."

-#: contrib/auth/models.py:141
+#: contrib/auth/models.py:132
 msgid "staff status"
 msgstr "статус на администраторите"

-#: contrib/auth/models.py:141
+#: contrib/auth/models.py:132
 msgid "Designates whether the user can log into this admin site."
-msgstr "Означува дали корисникот може да се логира во сајтот за администрација."
+msgstr ""
+"Означува дали корисникот може да се логира во сајтот за администрација."

-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:133
 msgid "active"
 msgstr "активен"

-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:133
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@ -1305,11 +1326,11 @@ msgstr ""
 "Означува дали корисникот треба да биде активен. Одштиклирајте го ова наместо "
 "да бришете корисници."

-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:134
 msgid "superuser status"
 msgstr "статус на суперкорисник"

-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:134
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@ -1317,15 +1338,15 @@ msgstr ""
 "Означува дека овој корисник ги има сите привилегии без експлицитно да се "
 "доделуваат сите."

-#: contrib/auth/models.py:144
+#: contrib/auth/models.py:135
 msgid "last login"
 msgstr "последна најава"

-#: contrib/auth/models.py:145
+#: contrib/auth/models.py:136
 msgid "date joined"
 msgstr "датум на зачленување"

-#: contrib/auth/models.py:147
+#: contrib/auth/models.py:138
 msgid ""
 "In addition to the permissions manually assigned, this user will also get "
 "all permissions granted to each group he/she is in."
@ -1333,19 +1354,19 @@ msgstr ""
 "Како дополнување на рачно доделени привилегии, овој корисник ќе ги добие "
 "автоматски и сите привилегии за секоја група во која тој/таа членува."

-#: contrib/auth/models.py:148
+#: contrib/auth/models.py:139
 msgid "user permissions"
 msgstr "кориснички привилегии"

-#: contrib/auth/models.py:152
+#: contrib/auth/models.py:143
 msgid "user"
 msgstr "корисник"

-#: contrib/auth/models.py:153
+#: contrib/auth/models.py:144
 msgid "users"
 msgstr "корисници"

-#: contrib/auth/models.py:308
+#: contrib/auth/models.py:300
 msgid "message"
 msgstr "порака"

@ -1365,23 +1386,27 @@ msgstr "Содржина"
 msgid "Metadata"
 msgstr "Метаподатоци"

-#: contrib/comments/forms.py:20
+#: contrib/comments/forms.py:19
+#: contrib/comments/templates/comments/moderation_queue.html:34
 msgid "Name"
 msgstr "Име"

-#: contrib/comments/forms.py:21
+#: contrib/comments/forms.py:20
 msgid "Email address"
 msgstr "Е-пошта"

-#: contrib/comments/forms.py:23
+#: contrib/comments/forms.py:22
+#: contrib/comments/templates/comments/moderation_queue.html:35
 msgid "Comment"
 msgstr "Коментар"

-#: contrib/comments/forms.py:26
-msgid "If you enter anything in this field your comment will be treated as spam"
-msgstr "Ако внесете нешто во ова поле вашиот коментар ќе биде означен како спам"
+#: contrib/comments/forms.py:25
+msgid ""
+"If you enter anything in this field your comment will be treated as spam"
+msgstr ""
+"Ако внесете нешто во ова поле вашиот коментар ќе биде означен како спам"

-#: contrib/comments/forms.py:126
+#: contrib/comments/forms.py:125
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
@ -1417,8 +1442,10 @@ msgid "is public"
 msgstr "е јавен"

 #: contrib/comments/models.py:60
-msgid "Uncheck this box to make the comment effectively disappear from the site."
-msgstr "Одштиклирајте го ова за да направите коментаров да исчезне од овој сајт."
+msgid ""
+"Uncheck this box to make the comment effectively disappear from the site."
+msgstr ""
+"Одштиклирајте го ова за да направите коментаров да исчезне од овој сајт."

 #: contrib/comments/models.py:62
 msgid "is removed"
@ -1463,29 +1490,158 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"

+#: contrib/comments/templates/comments/approve.html:4
+msgid "Approve a comment"
+msgstr "Одобри коментар"
+
+#: contrib/comments/templates/comments/approve.html:7
+msgid "Really make this comment public?"
+msgstr "Навистина ли сакате овој коментар да биде објавен?"
+
+#: contrib/comments/templates/comments/approve.html:12
+#: contrib/comments/templates/comments/moderation_queue.html:49
+msgid "Approve"
+msgstr "Одобри"
+
+#: contrib/comments/templates/comments/approved.html:4
+msgid "Thanks for approving"
+msgstr "Ви благодариме што одобривте"
+
+#: contrib/comments/templates/comments/approved.html:7
+#: contrib/comments/templates/comments/deleted.html:7
+#: contrib/comments/templates/comments/flagged.html:7
+msgid ""
+"Thanks for taking the time to improve the quality of discussion on our site"
+msgstr "Ви благодариме што допринесовте да се подобри квалитетот на дискусиите на нашиот сајт"
+
+#: contrib/comments/templates/comments/delete.html:4
+msgid "Remove a comment"
+msgstr "Избриши коментар"
+
+#: contrib/comments/templates/comments/delete.html:7
+msgid "Really remove this comment?"
+msgstr "Навистина ли сакате да го отстраните овој коментар?"
+
+#: contrib/comments/templates/comments/delete.html:12
+#: contrib/comments/templates/comments/moderation_queue.html:53
+msgid "Remove"
+msgstr "Отстрани"
+
+#: contrib/comments/templates/comments/deleted.html:4
+msgid "Thanks for removing"
+msgstr "Ви благодариме што отстранивте"
+
+#: contrib/comments/templates/comments/flag.html:4
+msgid "Flag this comment"
+msgstr "Обележи го овој коментар"
+
+#: contrib/comments/templates/comments/flag.html:7
+msgid "Really flag this comment?"
+msgstr "Навистина ли сакате да го обележите овој коментар?"
+
+#: contrib/comments/templates/comments/flag.html:12
+msgid "Flag"
+msgstr "Обележи"
+
+#: contrib/comments/templates/comments/flagged.html:4
+msgid "Thanks for flagging"
+msgstr "Ви благодариме што обележавте"
+
+#: contrib/comments/templates/comments/form.html:16
+#: contrib/comments/templates/comments/preview.html:31
+msgid "Post"
+msgstr "Објави"
+
+#: contrib/comments/templates/comments/form.html:17
+#: contrib/comments/templates/comments/preview.html:32
+msgid "Preview"
+msgstr "Преглед"
+
+#: contrib/comments/templates/comments/moderation_queue.html:4
+#: contrib/comments/templates/comments/moderation_queue.html:19
+msgid "Comment moderation queue"
+msgstr "Редица за модерирање коментари"
+
+#: contrib/comments/templates/comments/moderation_queue.html:26
+msgid "No comments to moderate"
+msgstr "Нема коменатари за модерирање"
+
+#: contrib/comments/templates/comments/moderation_queue.html:36
+msgid "Email"
+msgstr "Е-пошта"
+
+#: contrib/comments/templates/comments/moderation_queue.html:38
+msgid "Authenticated?"
+msgstr "Автентициран?"
+
+#: contrib/comments/templates/comments/moderation_queue.html:39
+msgid "IP Address"
+msgstr "ИП адреса"
+
+#: contrib/comments/templates/comments/moderation_queue.html:40
+msgid "Date posted"
+msgstr "Датум на објава"
+
+#: contrib/comments/templates/comments/moderation_queue.html:63
+msgid "yes"
+msgstr "да"
+
+#: contrib/comments/templates/comments/moderation_queue.html:63
+msgid "no"
+msgstr "не"
+
+#: contrib/comments/templates/comments/posted.html:4
+msgid "Thanks for commenting"
+msgstr "Ви благодариме за коментарот"
+
+#: contrib/comments/templates/comments/posted.html:7
+msgid "Thank you for your comment"
+msgstr "Ви благодариме за коментарот"
+
+#: contrib/comments/templates/comments/preview.html:4
+#: contrib/comments/templates/comments/preview.html:12
+msgid "Preview your comment"
+msgstr "Прегледајте го вашиот коментар"
+
+#: contrib/comments/templates/comments/preview.html:10
+msgid "Please correct the error below"
+msgid_plural "Please correct the errors below"
+msgstr[0] "Ве молам поправете ја грешката подолу."
+msgstr[1] "Ве молам поправете ги грешките подолу."
+
+#: contrib/comments/templates/comments/preview.html:15
+msgid "Post your comment"
+msgstr "Објавете го вашиот коментар"
+
+#: contrib/comments/templates/comments/preview.html:15
+msgid "or make changes"
+msgstr "или направете измени"
+
 #: contrib/contenttypes/models.py:67
 msgid "python model class name"
-msgstr "има на класата на питон моделите"
+msgstr "име на класата за python моделoт"

 #: contrib/contenttypes/models.py:71
 msgid "content type"
-msgstr "content type"
+msgstr "тип на содржина"

 #: contrib/contenttypes/models.py:72
 msgid "content types"
-msgstr "content types"
+msgstr "типови содржини"

 #: contrib/flatpages/admin.py:9
-msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr ""
-"На пр. „/za/kontakt/“. Осигурајте се да имате коса црта и на крајот и на "
+"На пр. „/за_сајтот/контакт/“. Осигурајте се да имате коса црта и на крајот и на "
 "почетокот."

 #: contrib/flatpages/admin.py:11
 msgid ""
 "This value must contain only letters, numbers, underscores, dashes or "
 "slashes."
-msgstr "Оваа вредност смее да има само букви, бројки, долни црти, црти или коси црти."
+msgstr ""
+"Оваа вредност смее да има само букви, бројки, долни црти, црти или коси црти."

 #: contrib/flatpages/admin.py:22
 msgid "Advanced options"
@ -1723,7 +1879,8 @@ msgstr "Телефонските броеви мора да бидат во XX-X
 msgid ""
 "Select a valid brazilian state. That state is not one of the available "
 "states."
-msgstr "Изберете правилна бразилска држава. Оваа држава не е од достапните држави."
+msgstr ""
+"Изберете правилна бразилска држава. Оваа држава не е од достапните држави."

 #: contrib/localflavor/br/forms.py:94
 msgid "Invalid CPF number."
@ -2250,7 +2407,8 @@ msgid "Invalid checksum for CIF."
 msgstr "Неправилна контролна сум за CIF."

 #: contrib/localflavor/es/forms.py:142
-msgid "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
+msgid ""
+"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
 msgstr "Внесете правилна банкарска сметка во формат XXXX-XXXX-XX-XXXXXXXXXX."

 #: contrib/localflavor/es/forms.py:143
@ -2266,8 +2424,10 @@ msgid "Enter a zip code in the format XXXXXXX."
 msgstr "Внесете правилен поштенски број во форматот  XXXXXXXX."

 #: contrib/localflavor/is_/forms.py:17
-msgid "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Внесете валиден идентификационен број од Исланд. Форматот е XXXXXX-XXXX."
+msgid ""
+"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
+msgstr ""
+"Внесете валиден идентификационен број од Исланд. Форматот е XXXXXX-XXXX."

 #: contrib/localflavor/is_/forms.py:18
 msgid "The Icelandic identification number is not valid."
@ -2686,8 +2846,10 @@ msgid "Wrong checksum for the National Identification Number."
 msgstr "Погрешна проверка за Националниот идентификационен број."

 #: contrib/localflavor/pl/forms.py:71
-msgid "Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
-msgstr "Внесете даночен број (NIP) во форматот XXX-XXX-XX-XX или XX-XX-XXX-XXX."
+msgid ""
+"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
+msgstr ""
+"Внесете даночен број (NIP) во форматот XXX-XXX-XX-XX или XX-XX-XXX-XXX."

 #: contrib/localflavor/pl/forms.py:72
 msgid "Wrong checksum for the Tax Number (NIP)."
@ -2695,11 +2857,13 @@ msgstr "Даночниот број (NIP) е погрешен."

 #: contrib/localflavor/pl/forms.py:111
 msgid "National Business Register Number (REGON) consists of 7 or 9 digits."
-msgstr "Националниот бизнис регистрациски број (REGON) се состои од 7 или 9 цифри."
+msgstr ""
+"Националниот бизнис регистрациски број (REGON) се состои од 7 или 9 цифри."

 #: contrib/localflavor/pl/forms.py:112
 msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Неправилна контролна сум за Националниот бизнис регистрационен број (REGON)."
+msgstr ""
+"Неправилна контролна сум за Националниот бизнис регистрационен број (REGON)."

 #: contrib/localflavor/pl/forms.py:155
 msgid "Enter a postal code in the format XX-XXX."
@ -3583,7 +3747,8 @@ msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
 msgstr "Внесете правилно време во HH:MM[:ss[.uuuuuu]] формат."

 #: db/models/fields/related.py:761
-msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Држете го „Control“, или „Command“ на Мекинтош, за да изберете повеќе од "
 "едно."
@ -3591,7 +3756,8 @@ msgstr ""
 #: db/models/fields/related.py:838
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 "Ве молам внесете правилен %(self)s идентификацион број. Оваа вредност %"
 "(value)r е неправилна."
@ -3610,12 +3776,14 @@ msgstr "Внесете правилна вредност."
 #: forms/fields.py:138
 #, python-format
 msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
-msgstr "Осигурајте се дека оваа вредност има најмногу %(max)d знаци (има %(length)d)."
+msgstr ""
+"Осигурајте се дека оваа вредност има најмногу %(max)d знаци (има %(length)d)."

 #: forms/fields.py:139
 #, python-format
 msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
-msgstr "Осигурајте се дека оваа вредност има најмалку %(min)d знаци (има %(length)d)."
+msgstr ""
+"Осигурајте се дека оваа вредност има најмалку %(min)d знаци (има %(length)d)."

 #: forms/fields.py:166
 msgid "Enter a whole number."
@ -3650,11 +3818,11 @@ msgstr "Осигурајте се дека нема повеќе од %s дец
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Осигурајте се дека нема повеќе од %s цифри пред децималната запирка."

-#: forms/fields.py:287 forms/fields.py:848
+#: forms/fields.py:287 forms/fields.py:849
 msgid "Enter a valid date."
 msgstr "Внесете правилен датум."

-#: forms/fields.py:321 forms/fields.py:849
+#: forms/fields.py:321 forms/fields.py:850
 msgid "Enter a valid time."
 msgstr "Внесете правилно време."

@ -3695,16 +3863,17 @@ msgstr "Оваа адреса изгледа дека не е достапна."
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr "Внесете валиден избор. %(value)s не е еден од можните избори."

-#: forms/fields.py:697 forms/fields.py:758 forms/models.py:654
+#: forms/fields.py:697 forms/fields.py:758 forms/models.py:714
 msgid "Enter a list of values."
 msgstr "Внесете листа на вредности."

-#: forms/fields.py:877
+#: forms/fields.py:878
 msgid "Enter a valid IPv4 address."
 msgstr "Внесeте правилна IPv4 адреса."

-#: forms/fields.py:887
-msgid "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+#: forms/fields.py:888
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Внесете правилно кратко име (slug) кое се соддржи од букви, цифри, долна "
 "црта или тире."
@ -3713,42 +3882,46 @@ msgstr ""
 msgid "Order"
 msgstr "Редослед"

-#: forms/models.py:268 forms/models.py:277
+#: forms/models.py:281 forms/models.py:290
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr "%(model_name)s со %(field_label)s веќе постои."

-#: forms/models.py:584
+#: forms/models.py:581
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr ""
+
+#: forms/models.py:644
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Изберете правилно. Тоа не е едно од можните избори."

-#: forms/models.py:655
+#: forms/models.py:715
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Внесете правилно. %s не е еден од достапните вредности."

-#: template/defaultfilters.py:706
+#: template/defaultfilters.py:743
 msgid "yes,no,maybe"
 msgstr "да, не, можеби"

-#: template/defaultfilters.py:737
+#: template/defaultfilters.py:774
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d бајт"
 msgstr[1] "%(size)d бајти"

-#: template/defaultfilters.py:739
+#: template/defaultfilters.py:776
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f КБ"

-#: template/defaultfilters.py:741
+#: template/defaultfilters.py:778
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f МБ"

-#: template/defaultfilters.py:742
+#: template/defaultfilters.py:779
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f ГБ"
@ -4041,4 +4214,3 @@ msgstr "%(verbose_name)s беше успешно ажуриран."
 #, python-format
 msgid "The %(verbose_name)s was deleted."
 msgstr "%(verbose_name)s беше избришан."
-
--- a/django/conf/locale/pl/LC_MESSAGES/django.mo
+++ b/django/conf/locale/pl/LC_MESSAGES/django.mo
--- a/django/conf/locale/pl/LC_MESSAGES/django.po
+++ b/django/conf/locale/pl/LC_MESSAGES/django.po
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
+++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
--- a/django/conf/locale/ru/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ru/LC_MESSAGES/django.mo
--- a/django/conf/locale/ru/LC_MESSAGES/django.po
+++ b/django/conf/locale/ru/LC_MESSAGES/django.po
--- a/django/conf/locale/sk/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sk/LC_MESSAGES/django.mo
--- a/django/conf/locale/sk/LC_MESSAGES/django.po
+++ b/django/conf/locale/sk/LC_MESSAGES/django.po
--- a/django/conf/locale/sk/LC_MESSAGES/djangojs.mo
+++ b/django/conf/locale/sk/LC_MESSAGES/djangojs.mo
--- a/django/conf/locale/sk/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/sk/LC_MESSAGES/djangojs.po
@ -1,15 +1,18 @@
-# 
+# Slovak translation of Django
+# This file is distributed under the same license as the Django package.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-01 19:21+0200\n"
-"PO-Revision-Date: 2008-08-09 21:19+0100\n"
-"Last-Translator: Frantisek Malina <vizualbod@vizualbod.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-03-20 20:16+0100\n"
+"PO-Revision-Date: 2009-03-15 17:23+0100\n"
+"Last-Translator: Marian Andre <django@andre.sk>\n"
+"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"

 #: contrib/admin/media/js/SelectFilter2.js:33
 #, perl-format
@ -35,38 +38,42 @@ msgstr "Vybrané %s"

 #: contrib/admin/media/js/SelectFilter2.js:54
 msgid "Select your choice(s) and click "
-msgstr "Vyberte svoje voľby a kliknite"
+msgstr "Zvoľte si a kliknite "

 #: contrib/admin/media/js/SelectFilter2.js:59
 msgid "Clear all"
-msgstr "Odstrániť vybrané"
+msgstr "Všetko zrušiť"

-#: contrib/admin/media/js/dateparse.js:32
 #: contrib/admin/media/js/calendar.js:24
-msgid "January February March April May June July August September October November December"
-msgstr "Január Február Marec Apríl Máj Jún Júl August September Október November December"
-
-#: contrib/admin/media/js/dateparse.js:33
-msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr "Nedeľa Pondelok Utorok Streda Štvrtok Piatok Sobota"
+#: contrib/admin/media/js/dateparse.js:32
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+"január február marec apríl máj jún júl august september október november "
+"december"

 #: contrib/admin/media/js/calendar.js:25
 msgid "S M T W T F S"
 msgstr "N P U S Š P S"

+#: contrib/admin/media/js/dateparse.js:33
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "nedeľa pondelok utorok streda štvrtok piatok sobota"
+
 #: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
 #: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
 msgid "Show"
-msgstr "Ukáž!"
+msgstr "Zobraziť"

 #: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
 msgid "Hide"
-msgstr "Skry!"
+msgstr "Skryť"

 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
 msgid "Now"
-msgstr "Práve teraz"
+msgstr "Teraz"

 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
 msgid "Clock"
@ -82,7 +89,7 @@ msgstr "Polnoc"

 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
 msgid "6 a.m."
-msgstr "6 ráno"
+msgstr "6:00"

 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
 msgid "Noon"
@ -91,7 +98,7 @@ msgstr "Poludnie"
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
 msgid "Cancel"
-msgstr "Zruš"
+msgstr "Zrušiť"

 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
@ -109,4 +116,3 @@ msgstr "Včera"
 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
 msgid "Tomorrow"
 msgstr "Zajtra"
-
--- a/django/conf/locale/sl/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sl/LC_MESSAGES/django.mo
--- a/django/conf/locale/sl/LC_MESSAGES/django.po
+++ b/django/conf/locale/sl/LC_MESSAGES/django.po
--- a/django/conf/locale/sv/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sv/LC_MESSAGES/django.mo
--- a/django/conf/locale/sv/LC_MESSAGES/django.po
+++ b/django/conf/locale/sv/LC_MESSAGES/django.po
@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-03 04:36+0200\n"
+"POT-Creation-Date: 2008-11-19 17:19+0100\n"
 "PO-Revision-Date: 2008-05-26 11:15+0200\n"
 "Last-Translator: Ludvig Ericson <ludvig.ericson@gmail.com>\n"
 "Language-Team: Django I18N <Django-I18N@googlegroups.com>\n"
@ -102,114 +102,122 @@ msgid "Hebrew"
 msgstr "Hebreiska"

 #: conf/global_settings.py:65
+msgid "Hindi"
+msgstr "Hindi"
+
+#: conf/global_settings.py:66
 msgid "Croatian"
 msgstr "Kroatiska"

-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
 msgid "Icelandic"
 msgstr "Isländska"

-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
 msgid "Italian"
 msgstr "Italienska"

-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
 msgid "Japanese"
 msgstr "Japanska"

-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
 msgid "Georgian"
 msgstr "Georgiska"

-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
 msgid "Korean"
 msgstr "Koreanska"

-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
 msgid "Khmer"
 msgstr "Khmer"

-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
 msgid "Kannada"
 msgstr "Kannada"

-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
 msgid "Latvian"
 msgstr "Lettiska"

-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
 msgid "Lithuanian"
 msgstr "Lettiska"

-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
 msgid "Macedonian"
 msgstr "Makedonska"

-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
 msgid "Dutch"
 msgstr "Holländska"

-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
 msgid "Norwegian"
 msgstr "Norska"

-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
 msgid "Polish"
 msgstr "Polska"

-#: conf/global_settings.py:79
-msgid "Portugese"
+#: conf/global_settings.py:80
+msgid "Portuguese"
 msgstr "Portugisiska"

-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
 msgid "Brazilian Portuguese"
 msgstr "Brasiliensk portugisiska"

-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
 msgid "Romanian"
 msgstr "Rumänska"

-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
 msgid "Russian"
 msgstr "Ryska"

-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
 msgid "Slovak"
 msgstr "Slovakiska"

-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
 msgid "Slovenian"
 msgstr "Slovenska"

-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
 msgid "Serbian"
 msgstr "Serbiska"

-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
 msgid "Swedish"
 msgstr "Svenska"

-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
 msgid "Tamil"
 msgstr "Tamilska"

-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
 msgid "Telugu"
 msgstr "Telugu"

-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
+msgid "Thai"
+msgstr "Thailändska"
+
+#: conf/global_settings.py:91
 msgid "Turkish"
 msgstr "Turkiska"

-#: conf/global_settings.py:90
+#: conf/global_settings.py:92
 msgid "Ukrainian"
 msgstr "Ukrainska"

-#: conf/global_settings.py:91
+#: conf/global_settings.py:93
 msgid "Simplified Chinese"
 msgstr "Förenklad Kinesiska"

-#: conf/global_settings.py:92
+#: conf/global_settings.py:94
 msgid "Traditional Chinese"
 msgstr "Traditionell Kinesiska"

@ -222,40 +230,40 @@ msgstr ""
 "<h3>Av %s:</h3>\n"
 "<ul>\n"

-#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
+#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:91
+#: contrib/admin/filterspecs.py:146 contrib/admin/filterspecs.py:172
 msgid "All"
 msgstr "Alla"

-#: contrib/admin/filterspecs.py:113
+#: contrib/admin/filterspecs.py:112
 msgid "Any date"
 msgstr "Alla datum"

-#: contrib/admin/filterspecs.py:114
+#: contrib/admin/filterspecs.py:113
 msgid "Today"
 msgstr "Idag"

-#: contrib/admin/filterspecs.py:117
+#: contrib/admin/filterspecs.py:116
 msgid "Past 7 days"
 msgstr "Senaste 7 dagarna"

-#: contrib/admin/filterspecs.py:119
+#: contrib/admin/filterspecs.py:118
 msgid "This month"
 msgstr "Denna månad"

-#: contrib/admin/filterspecs.py:121
+#: contrib/admin/filterspecs.py:120
 msgid "This year"
 msgstr "Detta år"

-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:391
 msgid "Yes"
 msgstr "Ja"

-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:391
 msgid "No"
 msgstr "Nej"

-#: contrib/admin/filterspecs.py:154 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:153 forms/widgets.py:391
 msgid "Unknown"
 msgstr "Okänt"

@ -297,7 +305,7 @@ msgid "Changed %s."
 msgstr "Ändrade %s."

 #: contrib/admin/options.py:338 contrib/admin/options.py:348
-#: forms/models.py:275
+#: contrib/comments/templates/comments/preview.html:15 forms/models.py:288
 msgid "and"
 msgstr "och"

@ -347,30 +355,35 @@ msgid ""
 msgstr ""
 "%(name)s \"%(obj)s\" lades till. Du kan redigera objektet igen nedanför."

-#: contrib/admin/options.py:536
+#: contrib/admin/options.py:528
 #, python-format
 msgid "Add %s"
 msgstr "Lägg till %s"

-#: contrib/admin/options.py:614
+#: contrib/admin/options.py:559 contrib/admin/options.py:673
+#, python-format
+msgid "%(name)s object with primary key %(key)r does not exist."
+msgstr "%(name)s-objektet med primärnyckeln %(key)r finns inte."
+
+#: contrib/admin/options.py:606
 #, python-format
 msgid "Change %s"
 msgstr "Ändra %s"

-#: contrib/admin/options.py:646
+#: contrib/admin/options.py:638
 msgid "Database error"
 msgstr "Databasfel"

-#: contrib/admin/options.py:696
+#: contrib/admin/options.py:688
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" togs bort."

-#: contrib/admin/options.py:703
+#: contrib/admin/options.py:695
 msgid "Are you sure?"
 msgstr "Är du säker?"

-#: contrib/admin/options.py:732
+#: contrib/admin/options.py:724
 #, python-format
 msgid "Change history: %s"
 msgstr "Ändringshistorik: %s"
@ -384,11 +397,11 @@ msgstr ""
 "Var god ange ett korrekt användarnamn och lösenord. Tänk på att skilja "
 "mellan gemener och versaler."

-#: contrib/admin/sites.py:227 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:226 contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
 msgstr "Var god logga in igen, eftersom din session har förfallit."

-#: contrib/admin/sites.py:234 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:233 contrib/admin/views/decorators.py:47
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@ -396,27 +409,27 @@ msgstr ""
 "Det verkar som att din webläsare inte är konfigurerad att acceptera cookies. "
 "Aktivera cookies, ladda om denna sida och försök igen."

-#: contrib/admin/sites.py:250 contrib/admin/sites.py:256
+#: contrib/admin/sites.py:249 contrib/admin/sites.py:255
 #: contrib/admin/views/decorators.py:66
 msgid "Usernames cannot contain the '@' character."
 msgstr "Användarnamn får inte innehålla '@'-tecknet."

-#: contrib/admin/sites.py:253 contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:252 contrib/admin/views/decorators.py:62
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "Din e-postadress är inte ditt användarnamn. Försök med '%s' istället."

-#: contrib/admin/sites.py:313
+#: contrib/admin/sites.py:312
 msgid "Site administration"
 msgstr "Webbplatsadministration"

-#: contrib/admin/sites.py:326 contrib/admin/templates/admin/login.html:26
+#: contrib/admin/sites.py:325 contrib/admin/templates/admin/login.html:26
 #: contrib/admin/templates/registration/password_reset_complete.html:14
 #: contrib/admin/views/decorators.py:20
 msgid "Log in"
 msgstr "Logga in"

-#: contrib/admin/sites.py:373
+#: contrib/admin/sites.py:372
 #, python-format
 msgid "%s administration"
 msgstr "Administration av %s"
@ -447,11 +460,11 @@ msgstr "Aktuell:"
 msgid "Change:"
 msgstr "Ändra:"

-#: contrib/admin/widgets.py:121
+#: contrib/admin/widgets.py:123
 msgid "Lookup"
 msgstr "Uppslag"

-#: contrib/admin/widgets.py:228
+#: contrib/admin/widgets.py:230
 msgid "Add Another"
 msgstr "Lägg till ytterligare"

@ -555,7 +568,7 @@ msgstr "Historik"

 #: contrib/admin/templates/admin/change_form.html:28
 #: contrib/admin/templates/admin/edit_inline/stacked.html:13
-#: contrib/admin/templates/admin/edit_inline/tabular.html:25
+#: contrib/admin/templates/admin/edit_inline/tabular.html:27
 msgid "View on site"
 msgstr "Visa på webbplats"

@ -660,6 +673,7 @@ msgid "User"
 msgstr "Användare"

 #: contrib/admin/templates/admin/object_history.html:24
+#: contrib/comments/templates/comments/moderation_queue.html:33
 msgid "Action"
 msgstr "Händelse"

@ -904,7 +918,7 @@ msgstr "E-postadress:"
 msgid "Reset my password"
 msgstr "Nollställ mitt lösenord"

-#: contrib/admin/templatetags/admin_list.py:288
+#: contrib/admin/templatetags/admin_list.py:284
 msgid "All dates"
 msgstr "Alla datum"

@ -1049,7 +1063,8 @@ msgstr "Text"
 msgid "Time"
 msgstr "Tid"

-#: contrib/admindocs/views.py:339 contrib/comments/forms.py:22
+#: contrib/admindocs/views.py:339 contrib/comments/forms.py:21
+#: contrib/comments/templates/comments/moderation_queue.html:37
 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
 msgid "URL"
 msgstr "URL"
@ -1368,29 +1383,31 @@ msgstr "Innehåll"
 msgid "Metadata"
 msgstr "Metadata"

-#: contrib/comments/forms.py:20
+#: contrib/comments/forms.py:19
+#: contrib/comments/templates/comments/moderation_queue.html:34
 msgid "Name"
 msgstr "Namn"

-#: contrib/comments/forms.py:21
+#: contrib/comments/forms.py:20
 msgid "Email address"
 msgstr "E-postadress"

-#: contrib/comments/forms.py:23
+#: contrib/comments/forms.py:22
+#: contrib/comments/templates/comments/moderation_queue.html:35
 msgid "Comment"
 msgstr "Kommentar"

-#: contrib/comments/forms.py:26
+#: contrib/comments/forms.py:25
 msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr "Om du fyller i detta fält kommer din kommentar att betraktas som spam"

-#: contrib/comments/forms.py:126
+#: contrib/comments/forms.py:125
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
-msgstr[0] "Akta din tunga! Ordet %s är inte tillåtet här."
-msgstr[1] "Akta din tunga! Orden %s är inte tillåtna här."
+msgstr[0] "Håll tungan rätt i mun! Ordet %s är inte tillåtet här."
+msgstr[1] "Håll tungan rätt i mun! Orden %s är inte tillåtna här."

 #: contrib/comments/models.py:23
 msgid "object ID"
@ -1423,7 +1440,7 @@ msgstr "är offentlig"
 #: contrib/comments/models.py:60
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
-msgstr "Avmarkeras detta kommer kommentaren inte synas på webbplatsen."
+msgstr "Bocka av detta så syns kommentaren inte på webbplatsen."

 #: contrib/comments/models.py:62
 msgid "is removed"
@ -1468,17 +1485,145 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"

+#: contrib/comments/templates/comments/approve.html:4
+msgid "Approve a comment"
+msgstr "Godkänna kommentarer"
+
+#: contrib/comments/templates/comments/approve.html:7
+msgid "Really make this comment public?"
+msgstr "Är du säker på att du vill publicera denna kommentar?"
+
+#: contrib/comments/templates/comments/approve.html:12
+#: contrib/comments/templates/comments/moderation_queue.html:49
+msgid "Approve"
+msgstr "Godkänn"
+
+#: contrib/comments/templates/comments/approved.html:4
+msgid "Thanks for approving"
+msgstr "Tack för ditt godkännande"
+
+#: contrib/comments/templates/comments/approved.html:7
+#: contrib/comments/templates/comments/deleted.html:7
+#: contrib/comments/templates/comments/flagged.html:7
+msgid ""
+"Thanks for taking the time to improve the quality of discussion on our site"
+msgstr ""
+"Tack för att du tog dig tid att förbättra diskussionskvaliteten på vår sida"
+
+#: contrib/comments/templates/comments/delete.html:4
+msgid "Remove a comment"
+msgstr "Ta bort kommentar"
+
+#: contrib/comments/templates/comments/delete.html:7
+msgid "Really remove this comment?"
+msgstr "Är du säker på att du vill ta bort denna kommentar?"
+
+#: contrib/comments/templates/comments/delete.html:12
+#: contrib/comments/templates/comments/moderation_queue.html:53
+msgid "Remove"
+msgstr "Ta bort"
+
+#: contrib/comments/templates/comments/deleted.html:4
+msgid "Thanks for removing"
+msgstr "Tack borttagning"
+
+#: contrib/comments/templates/comments/flag.html:4
+msgid "Flag this comment"
+msgstr "Flagga denna kommentar"
+
+#: contrib/comments/templates/comments/flag.html:7
+msgid "Really flag this comment?"
+msgstr "Är du säker på att du vill flagga denna kommentar?"
+
+#: contrib/comments/templates/comments/flag.html:12
+msgid "Flag"
+msgstr "Flagga"
+
+#: contrib/comments/templates/comments/flagged.html:4
+msgid "Thanks for flagging"
+msgstr "Tack för flaggningen"
+
+#: contrib/comments/templates/comments/form.html:16
+#: contrib/comments/templates/comments/preview.html:31
+msgid "Post"
+msgstr "Skicka"
+
+#: contrib/comments/templates/comments/form.html:17
+#: contrib/comments/templates/comments/preview.html:32
+msgid "Preview"
+msgstr "Förhandsgranska"
+
+#: contrib/comments/templates/comments/moderation_queue.html:4
+#: contrib/comments/templates/comments/moderation_queue.html:19
+msgid "Comment moderation queue"
+msgstr "Moderera kommentarer"
+
+#: contrib/comments/templates/comments/moderation_queue.html:26
+msgid "No comments to moderate"
+msgstr "Inga kommentarer att moderera"
+
+#: contrib/comments/templates/comments/moderation_queue.html:36
+msgid "Email"
+msgstr "E-postadress"
+
+#: contrib/comments/templates/comments/moderation_queue.html:38
+msgid "Authenticated?"
+msgstr "Autentiserad?"
+
+#: contrib/comments/templates/comments/moderation_queue.html:39
+msgid "IP Address"
+msgstr "IP-adress"
+
+#: contrib/comments/templates/comments/moderation_queue.html:40
+msgid "Date posted"
+msgstr "Inskickat den"
+
+#: contrib/comments/templates/comments/moderation_queue.html:63
+msgid "yes"
+msgstr "ja"
+
+#: contrib/comments/templates/comments/moderation_queue.html:63
+msgid "no"
+msgstr "nej"
+
+#: contrib/comments/templates/comments/posted.html:4
+msgid "Thanks for commenting"
+msgstr "Tack för din kommentar"
+
+#: contrib/comments/templates/comments/posted.html:7
+msgid "Thank you for your comment"
+msgstr "Tack för din kommentar"
+
+#: contrib/comments/templates/comments/preview.html:4
+#: contrib/comments/templates/comments/preview.html:12
+msgid "Preview your comment"
+msgstr "Förhandsgranska din kommentar"
+
+#: contrib/comments/templates/comments/preview.html:10
+msgid "Please correct the error below"
+msgid_plural "Please correct the errors below"
+msgstr[0] "Rätta till felet nedan."
+msgstr[1] "Rätta till felen nedan."
+
+#: contrib/comments/templates/comments/preview.html:15
+msgid "Post your comment"
+msgstr "Skicka kommentar"
+
+#: contrib/comments/templates/comments/preview.html:15
+msgid "or make changes"
+msgstr "eller ändra den"
+
 #: contrib/contenttypes/models.py:67
 msgid "python model class name"
-msgstr "python klassnamn för modell"
+msgstr "python-klassnamn för modell"

 #: contrib/contenttypes/models.py:71
 msgid "content type"
-msgstr "innehålls typ"
+msgstr "innehållstyp"

 #: contrib/contenttypes/models.py:72
 msgid "content types"
-msgstr "innehålls typer"
+msgstr "innehållstyper"

 #: contrib/flatpages/admin.py:9
 msgid ""
@ -1637,11 +1782,11 @@ msgstr "idag"

 #: contrib/humanize/templatetags/humanize.py:95
 msgid "tomorrow"
-msgstr "imorgon"
+msgstr "i morgon"

 #: contrib/humanize/templatetags/humanize.py:97
 msgid "yesterday"
-msgstr "igår"
+msgstr "i går"

 #: contrib/localflavor/ar/forms.py:27
 msgid "Enter a postal code in the format NNNN or ANNNNAAA."
@ -3664,11 +3809,11 @@ msgstr "Kontrollera att det inte finns mer än %s decimaler."
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "Kontrollera att det inte finns mer än %s siffror före decimaltecknet."

-#: forms/fields.py:287 forms/fields.py:848
+#: forms/fields.py:287 forms/fields.py:849
 msgid "Enter a valid date."
 msgstr "Fyll i ett giltigt datum."

-#: forms/fields.py:321 forms/fields.py:849
+#: forms/fields.py:321 forms/fields.py:850
 msgid "Enter a valid time."
 msgstr "Fyll i en giltig tid."

@ -3711,15 +3856,15 @@ msgstr ""
 "Välj ett giltigt alternativ. %(value)s finns inte bland tillgängliga "
 "alternativ."

-#: forms/fields.py:697 forms/fields.py:758 forms/models.py:654
+#: forms/fields.py:697 forms/fields.py:758 forms/models.py:714
 msgid "Enter a list of values."
 msgstr "Fyll i en lista med värden."

-#: forms/fields.py:877
+#: forms/fields.py:878
 msgid "Enter a valid IPv4 address."
 msgstr "Fyll i en giltig IPv4 adress."

-#: forms/fields.py:887
+#: forms/fields.py:888
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -3730,45 +3875,49 @@ msgstr ""
 msgid "Order"
 msgstr "Sortering"

-#: forms/models.py:268 forms/models.py:277
+#: forms/models.py:281 forms/models.py:290
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr "%(model_name)s med detta %(field_label)s finns redan."

-#: forms/models.py:584
+#: forms/models.py:581
+msgid "The inline foreign key did not match the parent instance primary key."
+msgstr "Inline foreign-key:n matchade inte den ägande instansens primärnyckel."
+
+#: forms/models.py:644
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Välj ett giltigt alternativ. Det valet finns inte bland tillgängliga "
 "alternativ."

-#: forms/models.py:655
+#: forms/models.py:715
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 "Välj ett giltigt alternativ. %s finns inte bland tillgängliga alternativ."

-#: template/defaultfilters.py:706
+#: template/defaultfilters.py:743
 msgid "yes,no,maybe"
 msgstr "ja,nej,kanske"

-#: template/defaultfilters.py:737
+#: template/defaultfilters.py:774
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d byte"

-#: template/defaultfilters.py:739
+#: template/defaultfilters.py:776
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"

-#: template/defaultfilters.py:741
+#: template/defaultfilters.py:778
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"

-#: template/defaultfilters.py:742
+#: template/defaultfilters.py:779
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
@ -4110,9 +4259,6 @@ msgstr "%(verbose_name)s togs bort."
 #~ msgid "approved by staff"
 #~ msgstr "godkänd av personal"

-#~ msgid "free comment"
-#~ msgstr "fri kommentar"
-
 #~ msgid "free comments"
 #~ msgstr "fria kommentarer"

@ -4179,9 +4325,6 @@ msgstr "%(verbose_name)s togs bort."
 #~ msgid "Post a photo"
 #~ msgstr "Lägg till foto"

-#~ msgid "Preview comment"
-#~ msgstr "Förhandsgranska kommentar"
-
 #~ msgid "Your name:"
 #~ msgstr "Ditt namn:"

--- a/django/conf/locale/sv/LC_MESSAGES/djangojs.mo
+++ b/django/conf/locale/sv/LC_MESSAGES/djangojs.mo
--- a/django/conf/locale/sv/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/sv/LC_MESSAGES/djangojs.po
@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-03 04:36+0200\n"
+"POT-Creation-Date: 2008-11-19 17:20+0100\n"
 "PO-Revision-Date: 2008-02-01 15:32+0100\n"
 "Last-Translator: Ludvig Ericson <ludvig.ericson@gmail.com>\n"
 "Language-Team: Django I18N <Django-I18N@googlegroups.com>\n"
--- a/django/conf/locale/th/LC_MESSAGES/django.mo
+++ b/django/conf/locale/th/LC_MESSAGES/django.mo
--- a/django/conf/locale/th/LC_MESSAGES/django.po
+++ b/django/conf/locale/th/LC_MESSAGES/django.po
--- a/django/conf/locale/th/LC_MESSAGES/djangojs.mo
+++ b/django/conf/locale/th/LC_MESSAGES/djangojs.mo
--- a/django/conf/locale/th/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/th/LC_MESSAGES/djangojs.po
@ -0,0 +1,119 @@
+# This file is distributed under the same license as the Django package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-11-10 21:13+1100\n"
+"PO-Revision-Date: 2008-11-07 19:34+0700\n"
+"Last-Translator: Kowit Charoenratchatabhan <kowito@felspar.com>\n"
+"Language-Team: Kowit Charoenratchatabhan,Kadsarin Sanjek, Felspar <kowito@felspar.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Thai\n"
+"X-Poedit-Country: Thailand\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: contrib/admin/media/js/SelectFilter2.js:33
+#, perl-format
+msgid "Available %s"
+msgstr "มีอยู่ %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:41
+msgid "Choose all"
+msgstr "เลือกทั้งหมด"
+
+#: contrib/admin/media/js/SelectFilter2.js:46
+msgid "Add"
+msgstr "เพิ่ม"
+
+#: contrib/admin/media/js/SelectFilter2.js:48
+msgid "Remove"
+msgstr "ลบออก"
+
+#: contrib/admin/media/js/SelectFilter2.js:53
+#, perl-format
+msgid "Chosen %s"
+msgstr "ถูกเลือก %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:54
+msgid "Select your choice(s) and click "
+msgstr "เลือกและคลิก"
+
+#: contrib/admin/media/js/SelectFilter2.js:59
+msgid "Clear all"
+msgstr "ลบทั้งหมด"
+
+#: contrib/admin/media/js/calendar.js:24
+#: contrib/admin/media/js/dateparse.js:32
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+"มกราคม กุมภาพันธ์ มีนาคม เมษายน พฤษภาคม มิถุนายน กรกฎาคม สิงหาคม กันยายน ตุลาคม "
+"พฤศจิกายน ธันวาคม"
+
+#: contrib/admin/media/js/calendar.js:25
+msgid "S M T W T F S"
+msgstr "อา. จ. อ. พ. พฤ. ศ. ส."
+
+#: contrib/admin/media/js/dateparse.js:33
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "อาทิตย์ จันทร์ อังคาร พุธ พฤหัสบดี ศุกร์ เสาร์"
+
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
+msgid "Show"
+msgstr "แสดง"
+
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
+msgid "Hide"
+msgstr "ซ่อน"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+msgid "Now"
+msgstr "ขณะนี้"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
+msgid "Clock"
+msgstr "นาฬิกา"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
+msgid "Choose a time"
+msgstr "เลือกเวลา"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+msgid "Midnight"
+msgstr "เที่ยงคืน"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+msgid "6 a.m."
+msgstr "หกโมงเช้า"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
+msgid "Noon"
+msgstr "เที่ยงวัน"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
+msgid "Today"
+msgstr "วันนี้"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
+msgid "Calendar"
+msgstr "ปฏิทิน"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
+msgid "Yesterday"
+msgstr "เมื่อวาน"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
+msgid "Tomorrow"
+msgstr "พรุ่งนี้"
--- a/django/conf/locale/uk/LC_MESSAGES/django.mo
+++ b/django/conf/locale/uk/LC_MESSAGES/django.mo
--- a/django/conf/locale/uk/LC_MESSAGES/django.po
+++ b/django/conf/locale/uk/LC_MESSAGES/django.po
--- a/django/conf/locale/uk/LC_MESSAGES/djangojs.mo
+++ b/django/conf/locale/uk/LC_MESSAGES/djangojs.mo
--- a/django/conf/locale/uk/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/uk/LC_MESSAGES/djangojs.po
@ -1,118 +1,118 @@
-# SOME DESCRIPTIVE TITLE.
+# Django, ukrainian translation.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-28 17:36+1000\n"
+"POT-Creation-Date: 2008-11-16 04:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Mykola Zamkovoy <nickzam@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"

-#: contrib/admin/media/js/SelectFilter2.js:33
+#: .\contrib\admin\media\js\SelectFilter2.js.py:33
 #, perl-format
 msgid "Available %s"
-msgstr ""
+msgstr "В наявності %s"

-#: contrib/admin/media/js/SelectFilter2.js:41
+#: .\contrib\admin\media\js\SelectFilter2.js.py:41
 msgid "Choose all"
-msgstr ""
+msgstr "Обрати всі"

-#: contrib/admin/media/js/SelectFilter2.js:46
+#: .\contrib\admin\media\js\SelectFilter2.js.py:46
 msgid "Add"
-msgstr ""
+msgstr "Додати"

-#: contrib/admin/media/js/SelectFilter2.js:48
+#: .\contrib\admin\media\js\SelectFilter2.js.py:48
 msgid "Remove"
-msgstr ""
+msgstr "Видалити"

-#: contrib/admin/media/js/SelectFilter2.js:53
+#: .\contrib\admin\media\js\SelectFilter2.js.py:53
 #, perl-format
 msgid "Chosen %s"
-msgstr ""
+msgstr "Обрано %s"

-#: contrib/admin/media/js/SelectFilter2.js:54
+#: .\contrib\admin\media\js\SelectFilter2.js.py:54
 msgid "Select your choice(s) and click "
-msgstr ""
+msgstr "Зробіть ваш вибір та клікніть "

-#: contrib/admin/media/js/SelectFilter2.js:59
+#: .\contrib\admin\media\js\SelectFilter2.js.py:59
 msgid "Clear all"
-msgstr ""
+msgstr "Очистити все"

-#: contrib/admin/media/js/dateparse.js:32
-#: contrib/admin/media/js/calendar.js:24
+#: .\contrib\admin\media\js\calendar.js.py:24
+#: .\contrib\admin\media\js\dateparse.js.py:32
 msgid ""
 "January February March April May June July August September October November "
 "December"
 msgstr ""
+"Січень Лютий Березень Квітень Травень Червень Липень Серпень Вересень Жовтень Листопад "
+"Грудень"

-#: contrib/admin/media/js/dateparse.js:33
-msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr ""
-
-#: contrib/admin/media/js/calendar.js:25
+#: .\contrib\admin\media\js\calendar.js.py:25
 msgid "S M T W T F S"
-msgstr ""
+msgstr "Нд Пн Вт Ср Чт Пт Сб"

-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
-msgid "Now"
-msgstr ""
+#: .\contrib\admin\media\js\dateparse.js.py:33
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "Неділя Понеділок Вівторок Середа Четвер П'ятниця Субота"

-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
-msgid "Clock"
-msgstr ""
-
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
-msgid "Choose a time"
-msgstr ""
-
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
-msgid "Midnight"
-msgstr ""
-
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
-msgid "6 a.m."
-msgstr ""
-
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
-msgid "Noon"
-msgstr ""
-
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
-msgid "Cancel"
-msgstr ""
-
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
-msgid "Today"
-msgstr ""
-
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
-msgid "Calendar"
-msgstr ""
-
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
-msgid "Yesterday"
-msgstr ""
-
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
-msgid "Tomorrow"
-msgstr ""
-
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
+#: .\contrib\admin\media\js\admin\CollapsedFieldsets.js.py:34
+#: .\contrib\admin\media\js\admin\CollapsedFieldsets.js.py:72
 msgid "Show"
-msgstr ""
+msgstr "Показати"

-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
+#: .\contrib\admin\media\js\admin\CollapsedFieldsets.js.py:63
 msgid "Hide"
-msgstr ""
+msgstr "Сховати"
+
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:47
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:81
+msgid "Now"
+msgstr "Зараз"
+
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:51
+msgid "Clock"
+msgstr "Годинник"
+
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:78
+msgid "Choose a time"
+msgstr "Оберіть час"
+
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:82
+msgid "Midnight"
+msgstr "північ"
+
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:83
+msgid "6 a.m."
+msgstr "6"
+
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:84
+msgid "Noon"
+msgstr "полудень"
+
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:88
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:183
+msgid "Cancel"
+msgstr "Відмінити"
+
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:128
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:177
+msgid "Today"
+msgstr "Сьогодні"
+
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:132
+msgid "Calendar"
+msgstr "Календар"
+
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:175
+msgid "Yesterday"
+msgstr "Вчора"
+
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:179
+msgid "Tomorrow"
+msgstr "Завтра"
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
--- a/django/contrib/admin/init.py
+++ b/django/contrib/admin/init.py
@ -2,12 +2,26 @@ from django.contrib.admin.options import ModelAdmin, HORIZONTAL, VERTICAL
 from django.contrib.admin.options import StackedInline, TabularInline
 from django.contrib.admin.sites import AdminSite, site

+# A flag to tell us if autodiscover is running.  autodiscover will set this to
+# True while running, and False when it finishes.
+LOADING = False
+
 def autodiscover():
    """
-    Auto-discover INSTALLED_APPS admin.py modules and fail silently when 
+    Auto-discover INSTALLED_APPS admin.py modules and fail silently when
    not present. This forces an import on them to register any admin bits they
    may want.
    """
+    # Bail out if autodiscover didn't finish loading from a previous call so
+    # that we avoid running autodiscover again when the URLconf is loaded by
+    # the exception handler to resolve the handler500 view.  This prevents an
+    # admin.py module with errors from re-registering models and raising a
+    # spurious AlreadyRegistered exception (see #8245).
+    global LOADING
+    if LOADING:
+        return
+    LOADING = True
+
    import imp
    from django.conf import settings

@ -38,3 +52,5 @@ def autodiscover():
        # Step 3: import the app's admin file. If this has errors we want them
        # to bubble up.
        __import__("%s.admin" % app)
+    # autodiscover was successful, reset loading flag.
+    LOADING = False
--- a/django/contrib/admin/filterspecs.py
+++ b/django/contrib/admin/filterspecs.py
@ -58,9 +58,10 @@ class RelatedFilterSpec(FilterSpec):
            self.lookup_title = f.rel.to._meta.verbose_name
        else:
            self.lookup_title = f.verbose_name
-        self.lookup_kwarg = '%s__%s__exact' % (f.name, f.rel.to._meta.pk.name)
+        rel_name = f.rel.get_related_field().name
+        self.lookup_kwarg = '%s__%s__exact' % (f.name, rel_name)
        self.lookup_val = request.GET.get(self.lookup_kwarg, None)
-        self.lookup_choices = f.rel.to._default_manager.all()
+        self.lookup_choices = f.get_choices(include_blank=False)

    def has_output(self):
        return len(self.lookup_choices) > 1
@ -72,8 +73,7 @@ class RelatedFilterSpec(FilterSpec):
        yield {'selected': self.lookup_val is None,
               'query_string': cl.get_query_string({}, [self.lookup_kwarg]),
               'display': _('All')}
-        for val in self.lookup_choices:
-            pk_val = getattr(val, self.field.rel.to._meta.pk.attname)
+        for pk_val, val in self.lookup_choices:
            yield {'selected': self.lookup_val == smart_unicode(pk_val),
                   'query_string': cl.get_query_string({self.lookup_kwarg: pk_val}),
                   'display': val}
@ -90,7 +90,7 @@ class ChoicesFilterSpec(FilterSpec):
        yield {'selected': self.lookup_val is None,
               'query_string': cl.get_query_string({}, [self.lookup_kwarg]),
               'display': _('All')}
-        for k, v in self.field.choices:
+        for k, v in self.field.flatchoices:
            yield {'selected': smart_unicode(k) == self.lookup_val,
                    'query_string': cl.get_query_string({self.lookup_kwarg: k}),
                    'display': v}
--- a/django/contrib/admin/helpers.py
+++ b/django/contrib/admin/helpers.py
@ -108,7 +108,10 @@ class InlineAdminFormSet(object):
            yield InlineAdminForm(self.formset, form, self.fieldsets, self.opts.prepopulated_fields, None)

    def fields(self):
+        fk = getattr(self.formset, "fk", None)
        for field_name in flatten_fieldsets(self.fieldsets):
+            if fk and fk.name == field_name:
+                continue
            yield self.formset.form.base_fields[field_name]

    def _media(self):
@ -126,13 +129,45 @@ class InlineAdminForm(AdminForm):
        self.formset = formset
        self.original = original
        if original is not None:
-            self.original.content_type_id = ContentType.objects.get_for_model(original).pk
+            self.original_content_type_id = ContentType.objects.get_for_model(original).pk
        self.show_url = original and hasattr(original, 'get_absolute_url')
        super(InlineAdminForm, self).__init__(form, fieldsets, prepopulated_fields)

+    def __iter__(self):
+        for name, options in self.fieldsets:
+            yield InlineFieldset(self.formset, self.form, name, **options)
+
+    def has_auto_field(self):
+        if self.form._meta.model._meta.has_auto_field:
+            return True
+        # Also search any parents for an auto field.
+        for parent in self.form._meta.model._meta.get_parent_list():
+            if parent._meta.has_auto_field:
+                return True
+        return False
+
+    def field_count(self):
+        # tabular.html uses this function for colspan value.
+        num_of_fields = 0
+        if self.has_auto_field():
+            num_of_fields += 1
+        num_of_fields += len(self.fieldsets[0][1]["fields"])
+        if self.formset.can_order:
+            num_of_fields += 1
+        if self.formset.can_delete:
+            num_of_fields += 1
+        return num_of_fields
+
    def pk_field(self):
        return AdminField(self.form, self.formset._pk_field.name, False)

+    def fk_field(self):
+        fk = getattr(self.formset, "fk", None)
+        if fk:
+            return AdminField(self.form, fk.name, False)
+        else:
+            return ""
+
    def deletion_field(self):
        from django.forms.formsets import DELETION_FIELD_NAME
        return AdminField(self.form, DELETION_FIELD_NAME, False)
@ -141,6 +176,18 @@ class InlineAdminForm(AdminForm):
        from django.forms.formsets import ORDERING_FIELD_NAME
        return AdminField(self.form, ORDERING_FIELD_NAME, False)

+class InlineFieldset(Fieldset):
+    def __init__(self, formset, *args, **kwargs):
+        self.formset = formset
+        super(InlineFieldset, self).__init__(*args, **kwargs)
+
+    def __iter__(self):
+        fk = getattr(self.formset, "fk", None)
+        for field in self.fields:
+            if fk and fk.name == field:
+                continue
+            yield Fieldline(self.form, field)
+
 class AdminErrorList(forms.util.ErrorList):
    """
    Stores all errors for the form/formsets in an add/change stage view.
--- a/django/contrib/admin/media/css/rtl.css
+++ b/django/contrib/admin/media/css/rtl.css
@ -54,3 +54,15 @@ fieldset .field-box { float:right; margin-left: 20px; }

 /* x unsorted */
 .inline-related h2 { text-align:right }
+
+.inline-related h3 span.delete {
+    padding-right: 20px;
+    padding-left: inherit;
+    left: 10px;
+    right: inherit;
+}
+
+.inline-related h3 span.delete label {
+    margin-left: inherit;
+    margin-right: 2px;
+}
--- a/django/contrib/admin/media/js/admin/DateTimeShortcuts.js
+++ b/django/contrib/admin/media/js/admin/DateTimeShortcuts.js
@ -109,11 +109,11 @@ var DateTimeShortcuts = {
    
        // Show the clock box
        clock_box.style.display = 'block';
-        addEvent(window, 'click', function() { DateTimeShortcuts.dismissClock(num); return true; });
+        addEvent(window.document, 'click', function() { DateTimeShortcuts.dismissClock(num); return true; });
    },
    dismissClock: function(num) {
       document.getElementById(DateTimeShortcuts.clockDivName + num).style.display = 'none';
-       window.onclick = null;
+       window.document.onclick = null;
    },
    handleClockQuicklink: function(num, val) {
       DateTimeShortcuts.clockInputs[num].value = val;
@ -224,10 +224,11 @@ var DateTimeShortcuts = {
        cal_box.style.top = findPosY(cal_link) - 75 + 'px';
    
        cal_box.style.display = 'block';
-        addEvent(window, 'click', function() { DateTimeShortcuts.dismissCalendar(num); return true; });
+        addEvent(window.document, 'click', function() { DateTimeShortcuts.dismissCalendar(num); return true; });
    },
    dismissCalendar: function(num) {
        document.getElementById(DateTimeShortcuts.calendarDivName1+num).style.display = 'none';
+        window.document.onclick = null;
    },
    drawPrev: function(num) {
        DateTimeShortcuts.calendars[num].drawPreviousMonth();
--- a/django/contrib/admin/media/js/admin/RelatedObjectLookups.js
+++ b/django/contrib/admin/media/js/admin/RelatedObjectLookups.js
@ -11,10 +11,25 @@ function html_unescape(text) {
    return text;
 }

+// IE doesn't accept periods or dashes in the window name, but the element IDs
+// we use to generate popup window names may contain them, therefore we map them
+// to allowed characters in a reversible way so that we can locate the correct 
+// element when the popup window is dismissed.
+function id_to_windowname(text) {
+    text = text.replace(/\./g, '__dot__');
+    text = text.replace(/\-/g, '__dash__');
+    return text;
+}
+
+function windowname_to_id(text) {
+    text = text.replace(/__dot__/g, '.');
+    text = text.replace(/__dash__/g, '-');
+    return text;
+}
+
 function showRelatedObjectLookupPopup(triggeringLink) {
    var name = triggeringLink.id.replace(/^lookup_/, '');
-    // IE doesn't like periods in the window name, so convert temporarily.
-    name = name.replace(/\./g, '___');
+    name = id_to_windowname(name);
    var href;
    if (triggeringLink.href.search(/\?/) >= 0) {
        href = triggeringLink.href + '&pop=1';
@ -27,7 +42,7 @@ function showRelatedObjectLookupPopup(triggeringLink) {
 }

 function dismissRelatedLookupPopup(win, chosenId) {
-    var name = win.name.replace(/___/g, '.');
+    var name = windowname_to_id(win.name);
    var elem = document.getElementById(name);
    if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1 && elem.value) {
        elem.value += ',' + chosenId;
@ -39,7 +54,7 @@ function dismissRelatedLookupPopup(win, chosenId) {

 function showAddAnotherPopup(triggeringLink) {
    var name = triggeringLink.id.replace(/^add_/, '');
-    name = name.replace(/\./g, '___');
+    name = id_to_windowname(name);
    href = triggeringLink.href
    if (href.indexOf('?') == -1) {
        href += '?_popup=1';
@ -56,7 +71,7 @@ function dismissAddAnotherPopup(win, newId, newRepr) {
    // django.utils.html.escape.
    newId = html_unescape(newId);
    newRepr = html_unescape(newRepr);
-    var name = win.name.replace(/___/g, '.');
+    var name = windowname_to_id(win.name);
    var elem = document.getElementById(name);
    if (elem) {
        if (elem.nodeName == 'SELECT') {
@ -64,7 +79,11 @@ function dismissAddAnotherPopup(win, newId, newRepr) {
            elem.options[elem.options.length] = o;
            o.selected = true;
        } else if (elem.nodeName == 'INPUT') {
-            elem.value = newId;
+            if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1 && elem.value) {
+                elem.value += ',' + newId;
+            } else {
+                elem.value = newId;
+            }
        }
    } else {
        var toId = name + "_to";
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@ -46,7 +46,7 @@ class BaseModelAdmin(object):

        If kwargs are given, they're passed to the form Field's constructor.
        """
-        
+
        # If the field specifies choices, we don't need to look for special
        # admin widgets - we just need to use a select widget of some kind.
        if db_field.choices:
@ -79,17 +79,17 @@ class BaseModelAdmin(object):
        if isinstance(db_field, models.TimeField):
            kwargs['widget'] = widgets.AdminTimeWidget
            return db_field.formfield(**kwargs)
-        
+
        # For TextFields, add a custom CSS class.
        if isinstance(db_field, models.TextField):
            kwargs['widget'] = widgets.AdminTextareaWidget
            return db_field.formfield(**kwargs)
-        
+
        # For URLFields, add a custom CSS class.
        if isinstance(db_field, models.URLField):
            kwargs['widget'] = widgets.AdminURLFieldWidget
            return db_field.formfield(**kwargs)
-        
+
        # For IntegerFields, add a custom CSS class.
        if isinstance(db_field, models.IntegerField):
            kwargs['widget'] = widgets.AdminIntegerFieldWidget
@ -104,7 +104,7 @@ class BaseModelAdmin(object):
        if isinstance(db_field, models.CharField):
            kwargs['widget'] = widgets.AdminTextInputWidget
            return db_field.formfield(**kwargs)
-    
+
        # For FileFields and ImageFields add a link to the current file.
        if isinstance(db_field, models.ImageField) or isinstance(db_field, models.FileField):
            kwargs['widget'] = widgets.AdminFileWidget
@ -267,10 +267,12 @@ class ModelAdmin(BaseModelAdmin):
            exclude = []
        else:
            exclude = list(self.exclude)
+        # if exclude is an empty list we pass None to be consistant with the
+        # default on modelform_factory
        defaults = {
            "form": self.form,
            "fields": fields,
-            "exclude": exclude + kwargs.get("exclude", []),
+            "exclude": (exclude + kwargs.get("exclude", [])) or None,
            "formfield_callback": self.formfield_for_dbfield,
        }
        defaults.update(kwargs)
@ -279,56 +281,56 @@ class ModelAdmin(BaseModelAdmin):
    def get_formsets(self, request, obj=None):
        for inline in self.inline_instances:
            yield inline.get_formset(request, obj)
-            
+
    def log_addition(self, request, object):
        """
-        Log that an object has been successfully added. 
-        
+        Log that an object has been successfully added.
+
        The default implementation creates an admin LogEntry object.
        """
        from django.contrib.admin.models import LogEntry, ADDITION
        LogEntry.objects.log_action(
-            user_id         = request.user.pk, 
+            user_id         = request.user.pk,
            content_type_id = ContentType.objects.get_for_model(object).pk,
            object_id       = object.pk,
-            object_repr     = force_unicode(object), 
+            object_repr     = force_unicode(object),
            action_flag     = ADDITION
        )
-        
+
    def log_change(self, request, object, message):
        """
-        Log that an object has been successfully changed. 
-        
+        Log that an object has been successfully changed.
+
        The default implementation creates an admin LogEntry object.
        """
        from django.contrib.admin.models import LogEntry, CHANGE
        LogEntry.objects.log_action(
-            user_id         = request.user.pk, 
-            content_type_id = ContentType.objects.get_for_model(object).pk, 
-            object_id       = object.pk, 
-            object_repr     = force_unicode(object), 
-            action_flag     = CHANGE, 
+            user_id         = request.user.pk,
+            content_type_id = ContentType.objects.get_for_model(object).pk,
+            object_id       = object.pk,
+            object_repr     = force_unicode(object),
+            action_flag     = CHANGE,
            change_message  = message
        )
-        
+
    def log_deletion(self, request, object, object_repr):
        """
        Log that an object has been successfully deleted. Note that since the
        object is deleted, it might no longer be safe to call *any* methods
        on the object, hence this method getting object_repr.
-        
+
        The default implementation creates an admin LogEntry object.
        """
        from django.contrib.admin.models import LogEntry, DELETION
        LogEntry.objects.log_action(
-            user_id         = request.user.id, 
-            content_type_id = ContentType.objects.get_for_model(self.model).pk, 
-            object_id       = object.pk, 
+            user_id         = request.user.id,
+            content_type_id = ContentType.objects.get_for_model(self.model).pk,
+            object_id       = object.pk,
            object_repr     = object_repr,
            action_flag     = DELETION
        )
-        
-    
+
+
    def construct_change_message(self, request, form, formsets):
        """
        Construct a change message from a changed object.
@ -342,22 +344,22 @@ class ModelAdmin(BaseModelAdmin):
                for added_object in formset.new_objects:
                    change_message.append(_('Added %(name)s "%(object)s".')
                                          % {'name': added_object._meta.verbose_name,
-                                             'object': added_object})
+                                             'object': force_unicode(added_object)})
                for changed_object, changed_fields in formset.changed_objects:
                    change_message.append(_('Changed %(list)s for %(name)s "%(object)s".')
                                          % {'list': get_text_list(changed_fields, _('and')),
                                             'name': changed_object._meta.verbose_name,
-                                             'object': changed_object})
+                                             'object': force_unicode(changed_object)})
                for deleted_object in formset.deleted_objects:
                    change_message.append(_('Deleted %(name)s "%(object)s".')
                                          % {'name': deleted_object._meta.verbose_name,
-                                             'object': deleted_object})
+                                             'object': force_unicode(deleted_object)})
        change_message = ' '.join(change_message)
        return change_message or _('No fields changed.')
-    
+
    def message_user(self, request, message):
        """
-        Send a message to the user. The default implementation 
+        Send a message to the user. The default implementation
        posts a message using the auth Message object.
        """
        request.user.message_set.create(message=message)
@ -368,7 +370,7 @@ class ModelAdmin(BaseModelAdmin):
        the object is being changed, and False if it's being added.
        """
        return form.save(commit=False)
-    
+
    def save_model(self, request, obj, form, change):
        """
        Given a model instance save it to the database.
@ -406,14 +408,14 @@ class ModelAdmin(BaseModelAdmin):
            "admin/%s/change_form.html" % app_label,
            "admin/change_form.html"
        ], context, context_instance=template.RequestContext(request))
-    
+
    def response_add(self, request, obj, post_url_continue='../%s/'):
        """
        Determines the HttpResponse for the add_view stage.
        """
        opts = obj._meta
        pk_value = obj._get_pk_val()
-        
+
        msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': force_unicode(obj)}
        # Here, we distinguish between different save types by checking for
        # the presence of keys in request.POST.
@ -422,7 +424,7 @@ class ModelAdmin(BaseModelAdmin):
            if request.POST.has_key("_popup"):
                post_url_continue += "?_popup=1"
            return HttpResponseRedirect(post_url_continue % pk_value)
-        
+
        if request.POST.has_key("_popup"):
            return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script>' % \
                # escape() calls force_unicode.
@ -441,14 +443,14 @@ class ModelAdmin(BaseModelAdmin):
            else:
                post_url = '../../../'
            return HttpResponseRedirect(post_url)
-    
+
    def response_change(self, request, obj):
        """
        Determines the HttpResponse for the change_view stage.
        """
        opts = obj._meta
        pk_value = obj._get_pk_val()
-        
+
        msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': force_unicode(obj)}
        if request.POST.has_key("_continue"):
            self.message_user(request, msg + ' ' + _("You may edit it again below."))
@ -485,17 +487,23 @@ class ModelAdmin(BaseModelAdmin):
            else:
                form_validated = False
                new_object = self.model()
+            prefixes = {}
            for FormSet in self.get_formsets(request):
+                prefix = FormSet.get_default_prefix()
+                prefixes[prefix] = prefixes.get(prefix, 0) + 1
+                if prefixes[prefix] != 1:
+                    prefix = "%s-%s" % (prefix, prefixes[prefix])
                formset = FormSet(data=request.POST, files=request.FILES,
                                  instance=new_object,
-                                  save_as_new=request.POST.has_key("_saveasnew"))
+                                  save_as_new=request.POST.has_key("_saveasnew"),
+                                  prefix=prefix)
                formsets.append(formset)
            if all_valid(formsets) and form_validated:
                self.save_model(request, new_object, form, change=False)
                form.save_m2m()
                for formset in formsets:
                    self.save_formset(request, form, formset, change=False)
-                
+
                self.log_addition(request, new_object)
                return self.response_add(request, new_object)
        else:
@ -510,8 +518,13 @@ class ModelAdmin(BaseModelAdmin):
                if isinstance(f, models.ManyToManyField):
                    initial[k] = initial[k].split(",")
            form = ModelForm(initial=initial)
+            prefixes = {}
            for FormSet in self.get_formsets(request):
-                formset = FormSet(instance=self.model())
+                prefix = FormSet.get_default_prefix()
+                prefixes[prefix] = prefixes.get(prefix, 0) + 1
+                if prefixes[prefix] != 1:
+                    prefix = "%s-%s" % (prefix, prefixes[prefix])
+                formset = FormSet(instance=self.model(), prefix=prefix)
                formsets.append(formset)

        adminForm = helpers.AdminForm(form, list(self.get_fieldsets(request)), self.prepopulated_fields)
@ -536,7 +549,7 @@ class ModelAdmin(BaseModelAdmin):
            'app_label': opts.app_label,
        }
        context.update(extra_context or {})
-        return self.render_change_form(request, context, add=True)
+        return self.render_change_form(request, context, form_url=form_url, add=True)
    add_view = transaction.commit_on_success(add_view)

    def change_view(self, request, object_id, extra_context=None):
@ -545,7 +558,7 @@ class ModelAdmin(BaseModelAdmin):
        opts = model._meta

        try:
-            obj = model._default_manager.get(pk=object_id)
+            obj = self.queryset(request).get(pk=object_id)
        except model.DoesNotExist:
            # Don't raise Http404 just yet, because we haven't checked
            # permissions yet. We don't want an unauthenticated user to be able
@ -556,10 +569,10 @@ class ModelAdmin(BaseModelAdmin):
            raise PermissionDenied

        if obj is None:
-            raise Http404('%s object with primary key %r does not exist.' % (force_unicode(opts.verbose_name), escape(object_id)))
+            raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {'name': force_unicode(opts.verbose_name), 'key': escape(object_id)})

        if request.method == 'POST' and request.POST.has_key("_saveasnew"):
-            return self.add_view(request, form_url='../../add/')
+            return self.add_view(request, form_url='../add/')

        ModelForm = self.get_form(request, obj)
        formsets = []
@ -571,9 +584,14 @@ class ModelAdmin(BaseModelAdmin):
            else:
                form_validated = False
                new_object = obj
+            prefixes = {}
            for FormSet in self.get_formsets(request, new_object):
+                prefix = FormSet.get_default_prefix()
+                prefixes[prefix] = prefixes.get(prefix, 0) + 1
+                if prefixes[prefix] != 1:
+                    prefix = "%s-%s" % (prefix, prefixes[prefix])
                formset = FormSet(request.POST, request.FILES,
-                                  instance=new_object)
+                                  instance=new_object, prefix=prefix)
                formsets.append(formset)

            if all_valid(formsets) and form_validated:
@ -581,14 +599,20 @@ class ModelAdmin(BaseModelAdmin):
                form.save_m2m()
                for formset in formsets:
                    self.save_formset(request, form, formset, change=True)
-                
+
                change_message = self.construct_change_message(request, form, formsets)
                self.log_change(request, new_object, change_message)
                return self.response_change(request, new_object)
+
        else:
            form = ModelForm(instance=obj)
+            prefixes = {}
            for FormSet in self.get_formsets(request, obj):
-                formset = FormSet(instance=obj)
+                prefix = FormSet.get_default_prefix()
+                prefixes[prefix] = prefixes.get(prefix, 0) + 1
+                if prefixes[prefix] != 1:
+                    prefix = "%s-%s" % (prefix, prefixes[prefix])
+                formset = FormSet(instance=obj, prefix=prefix)
                formsets.append(formset)

        adminForm = helpers.AdminForm(form, self.get_fieldsets(request, obj), self.prepopulated_fields)
@ -658,7 +682,7 @@ class ModelAdmin(BaseModelAdmin):
        app_label = opts.app_label

        try:
-            obj = self.model._default_manager.get(pk=object_id)
+            obj = self.queryset(request).get(pk=object_id)
        except self.model.DoesNotExist:
            # Don't raise Http404 just yet, because we haven't checked
            # permissions yet. We don't want an unauthenticated user to be able
@ -669,7 +693,7 @@ class ModelAdmin(BaseModelAdmin):
            raise PermissionDenied

        if obj is None:
-            raise Http404('%s object with primary key %r does not exist.' % (force_unicode(opts.verbose_name), escape(object_id)))
+            raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {'name': force_unicode(opts.verbose_name), 'key': escape(object_id)})

        # Populate deleted_objects, a data structure of all related objects that
        # will also be deleted.
@ -681,11 +705,11 @@ class ModelAdmin(BaseModelAdmin):
            if perms_needed:
                raise PermissionDenied
            obj_display = force_unicode(obj)
-            obj.delete()
-            
            self.log_deletion(request, obj, obj_display)
+            obj.delete()
+
            self.message_user(request, _('The %(name)s "%(obj)s" was deleted successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': force_unicode(obj_display)})
-            
+
            if not self.has_change_permission(request, None):
                return HttpResponseRedirect("../../../../")
            return HttpResponseRedirect("../../")
@ -760,7 +784,7 @@ class InlineModelAdmin(BaseModelAdmin):
            self.verbose_name = self.model._meta.verbose_name
        if self.verbose_name_plural is None:
            self.verbose_name_plural = self.model._meta.verbose_name_plural
-    
+
    def _media(self):
        from django.conf import settings
        js = []
@ -781,12 +805,14 @@ class InlineModelAdmin(BaseModelAdmin):
            exclude = []
        else:
            exclude = list(self.exclude)
+        # if exclude is an empty list we use None, since that's the actual
+        # default
        defaults = {
            "form": self.form,
            "formset": self.formset,
            "fk_name": self.fk_name,
            "fields": fields,
-            "exclude": exclude + kwargs.get("exclude", []),
+            "exclude": (exclude + kwargs.get("exclude", [])) or None,
            "formfield_callback": self.formfield_for_dbfield,
            "extra": self.extra,
            "max_num": self.max_num,
--- a/django/contrib/admin/sites.py
+++ b/django/contrib/admin/sites.py
@ -25,7 +25,7 @@ class NotRegistered(Exception):
 class AdminSite(object):
    """
    An AdminSite object encapsulates an instance of the Django admin application, ready
-    to be hooked in to your URLConf. Models are registered with the AdminSite using the
+    to be hooked in to your URLconf. Models are registered with the AdminSite using the
    register() method, and the root() method can then be used as a Django view function
    that presents a full admin interface for the collection of registered models.
    """
@ -49,14 +49,15 @@ class AdminSite(object):

        If a model is already registered, this will raise AlreadyRegistered.
        """
+        if not admin_class:
+            admin_class = ModelAdmin
+
        # Don't import the humongous validation code unless required
        if admin_class and settings.DEBUG:
            from django.contrib.admin.validation import validate
        else:
            validate = lambda model, adminclass: None

-        if not admin_class:
-            admin_class = ModelAdmin
        if isinstance(model_or_iterable, ModelBase):
            model_or_iterable = [model_or_iterable]
        for model in model_or_iterable:
--- a/django/contrib/admin/templates/admin/auth/user/change_password.html
+++ b/django/contrib/admin/templates/admin/auth/user/change_password.html
@ -8,6 +8,7 @@
 {% block breadcrumbs %}{% if not is_popup %}
 <div class="breadcrumbs">
     <a href="../../../../">{% trans "Home" %}</a> &rsaquo;
+     <a href="../../../">{{ opts.app_label|capfirst|escape }}</a> &rsaquo;
     <a href="../../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
     <a href="../">{{ original|truncatewords:"18" }}</a> &rsaquo;
     {% trans 'Change password' %}
--- a/django/contrib/admin/templates/admin/change_form.html
+++ b/django/contrib/admin/templates/admin/change_form.html
@ -16,7 +16,7 @@
 <div class="breadcrumbs">
     <a href="../../../">{% trans "Home" %}</a> &rsaquo;
     <a href="../../">{{ app_label|capfirst|escape }}</a> &rsaquo; 
-     <a href="../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
+     {% if has_change_permission %}<a href="../">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} &rsaquo; 
     {% if add %}{% trans "Add" %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %}
 </div>
 {% endif %}{% endblock %}
@ -35,7 +35,7 @@
 {% if save_on_top %}{% submit_row %}{% endif %}
 {% if errors %}
    <p class="errornote">
-    {% blocktrans count errors.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
+    {% blocktrans count errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
    </p>
    <ul class="errorlist">{% for error in adminform.form.non_field_errors %}<li>{{ error }}</li>{% endfor %}</ul>
 {% endif %}
@ -54,7 +54,7 @@

 {% submit_row %}

-{% if add %}
+{% if adminform and add %}
   <script type="text/javascript">document.getElementById("{{ adminform.first_field.auto_id }}").focus();</script>
 {% endif %}

--- a/django/contrib/admin/templates/admin/edit_inline/stacked.html
+++ b/django/contrib/admin/templates/admin/edit_inline/stacked.html
@ -5,18 +5,20 @@
 {{ inline_admin_formset.formset.non_form_errors }}

 {% for inline_admin_form in inline_admin_formset %}
-<div class="inline-related {% if forloop.last %}last-related{% endif %}">
+<div class="inline-related{% if forloop.last %} last-related{% endif %}">
  <h3><b>{{ inline_admin_formset.opts.verbose_name|title }}:</b>&nbsp;{% if inline_admin_form.original %}{{ inline_admin_form.original }}{% else %} #{{ forloop.counter }}{% endif %}
    {% if inline_admin_formset.formset.can_delete and inline_admin_form.original %}<span class="delete">{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}</span>{% endif %}
  </h3>
  {% if inline_admin_form.show_url %}
-  <p><a href="../../../r/{{ inline_admin_form.original.content_type_id }}/{{ inline_admin_form.original.id }}/">{% trans "View on site" %}</a></p>
+  <p><a href="../../../r/{{ inline_admin_form.original_content_type_id }}/{{ inline_admin_form.original.id }}/">{% trans "View on site" %}</a></p>
  {% endif %}
+  {% if inline_admin_form.form.non_field_errors %}{{ inline_admin_form.form.non_field_errors }}{% endif %}

  {% for fieldset in inline_admin_form %}
    {% include "admin/includes/fieldset.html" %}
  {% endfor %}
-  {{ inline_admin_form.pk_field.field }}
+  {% if inline_admin_form.has_auto_field %}{{ inline_admin_form.pk_field.field }}{% endif %}
+  {{ inline_admin_form.fk_field.field }}
 </div>
 {% endfor %}

--- a/django/contrib/admin/templates/admin/edit_inline/tabular.html
+++ b/django/contrib/admin/templates/admin/edit_inline/tabular.html
@ -14,17 +14,20 @@
     {% endfor %}
     {% if inline_admin_formset.formset.can_delete %}<th>{% trans "Delete?" %}</th>{% endif %}
     </tr></thead>
-   
+
     {% for inline_admin_form in inline_admin_formset %}
-                   
+        {% if inline_admin_form.form.non_field_errors %}
+        <tr><td colspan="{{ inline_admin_form.field_count }}">{{ inline_admin_form.form.non_field_errors }}</td></tr>
+        {% endif %}
        <tr class="{% cycle row1,row2 %} {% if inline_admin_form.original or inline_admin_form.show_url %}has_original{% endif %}">

        <td class="original">
          {% if inline_admin_form.original or inline_admin_form.show_url %}<p>
          {% if inline_admin_form.original %} {{ inline_admin_form.original }}{% endif %}
-          {% if inline_admin_form.show_url %}<a href="../../../r/{{ inline_admin_form.original.content_type_id }}/{{ inline_admin_form.original.id }}/">{% trans "View on site" %}</a>{% endif %}
+          {% if inline_admin_form.show_url %}<a href="../../../r/{{ inline_admin_form.original_content_type_id }}/{{ inline_admin_form.original.id }}/">{% trans "View on site" %}</a>{% endif %}
            </p>{% endif %}
-          {{ inline_admin_form.pk_field.field }}
+          {% if inline_admin_form.has_auto_field %}{{ inline_admin_form.pk_field.field }}{% endif %}
+          {{ inline_admin_form.fk_field.field }}
          {% spaceless %}
          {% for fieldset in inline_admin_form %}
            {% for line in fieldset %}
@ -46,22 +49,22 @@
            {% endfor %}
          {% endfor %}
        {% endfor %}
-                
+
        {% if inline_admin_formset.formset.can_delete %}
          <td class="delete">{% if inline_admin_form.original %}{{ inline_admin_form.deletion_field.field }}{% endif %}</td>
        {% endif %}
-        
+
        </tr>

     {% endfor %}
-   
+
   </table>
-   
+
 </fieldset>
  </div>
-  
+
  {# <ul class="tools"> #}
  {#   <li><a class="add" href="">Add another {{ inline_admin_formset.opts.verbose_name|title }}</a></li> #}
  {# </ul> #}
-  
+
 </div>
--- a/django/contrib/admin/templates/admin/index.html
+++ b/django/contrib/admin/templates/admin/index.html
@ -59,7 +59,19 @@
            {% else %}
            <ul class="actionlist">
            {% for entry in admin_log %}
-            <li class="{% if entry.is_addition %}addlink{% endif %}{% if entry.is_change %}changelink{% endif %}{% if entry.is_deletion %}deletelink{% endif %}">{% if not entry.is_deletion %}<a href="{{ entry.get_admin_url }}">{% endif %}{{ entry.object_repr }}{% if not entry.is_deletion %}</a>{% endif %}<br /><span class="mini quiet">{% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %}</span></li>
+            <li class="{% if entry.is_addition %}addlink{% endif %}{% if entry.is_change %}changelink{% endif %}{% if entry.is_deletion %}deletelink{% endif %}">
+                {% if entry.is_deletion %}
+                    {{ entry.object_repr }}
+                {% else %}
+                    <a href="{{ entry.get_admin_url }}">{{ entry.object_repr }}</a>
+                {% endif %}
+                <br/>
+                {% if entry.content_type %}
+                    <span class="mini quiet">{% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %}</span>
+                {% else %}
+                    <span class="mini quiet">{% trans 'Unknown content' %}</span>
+                {% endif %}
+            </li>
            {% endfor %}
            </ul>
            {% endif %}
--- a/django/contrib/admin/templates/registration/password_reset_confirm.html
+++ b/django/contrib/admin/templates/registration/password_reset_confirm.html
@ -25,7 +25,7 @@

 <h1>{% trans 'Password reset unsuccessful' %}</h1>

-<p>{% trans "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}
+<p>{% trans "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}</p>

 {% endif %}

--- a/django/contrib/admin/templatetags/admin_list.py
+++ b/django/contrib/admin/templatetags/admin_list.py
@ -205,8 +205,8 @@ def items_for_result(cl, result):
                    result_repr = EMPTY_CHANGELIST_VALUE
            # Fields with choices are special: Use the representation
            # of the choice.
-            elif f.choices:
-                result_repr = dict(f.choices).get(field_val, EMPTY_CHANGELIST_VALUE)
+            elif f.flatchoices:
+                result_repr = dict(f.flatchoices).get(field_val, EMPTY_CHANGELIST_VALUE)
            else:
                result_repr = escape(field_val)
        if force_unicode(result_repr) == '':
@ -222,7 +222,8 @@ def items_for_result(cl, result):
                attr = str(cl.to_field)
            else:
                attr = pk
-            result_id = repr(force_unicode(getattr(result, attr)))[1:]
+            value = result.serializable_value(attr)
+            result_id = repr(force_unicode(value))[1:]
            yield mark_safe(u'<%s%s><a href="%s"%s>%s</a></%s>' % \
                (table_tag, row_class, url, (cl.is_popup and ' onclick="opener.dismissRelatedLookupPopup(window, %s); return false;"' % result_id or ''), conditional_escape(result_repr), table_tag))
        else:
--- a/django/contrib/admin/templatetags/log.py
+++ b/django/contrib/admin/templatetags/log.py
@ -14,9 +14,10 @@ class AdminLogNode(template.Node):
        if self.user is None:
            context[self.varname] = LogEntry.objects.all().select_related('content_type', 'user')[:self.limit]
        else:
-            if not self.user.isdigit():
-                self.user = context[self.user].id
-            context[self.varname] = LogEntry.objects.filter(user__id__exact=self.user).select_related('content_type', 'user')[:self.limit]
+            user_id = self.user
+            if not user_id.isdigit():
+                user_id = context[self.user].id
+            context[self.varname] = LogEntry.objects.filter(user__id__exact=user_id).select_related('content_type', 'user')[:self.limit]
        return ''

 class DoGetAdminLog:
--- a/django/contrib/admin/util.py
+++ b/django/contrib/admin/util.py
@ -88,14 +88,16 @@ def get_deleted_objects(deleted_objects, perms_needed, user, obj, opts, current_
                if not has_admin:
                    # Don't display link to edit, because it either has no
                    # admin or is edited inline.
-                    nh(deleted_objects, current_depth, [u'%s: %s' % (force_unicode(capfirst(related.opts.verbose_name)), sub_obj), []])
+                    nh(deleted_objects, current_depth,
+                        [u'%s: %s' % (capfirst(related.opts.verbose_name), force_unicode(sub_obj)), []])
                else:
                    # Display a link to the admin page.
                    nh(deleted_objects, current_depth, [mark_safe(u'%s: <a href="../../../../%s/%s/%s/">%s</a>' %
-                        (escape(force_unicode(capfirst(related.opts.verbose_name))),
-                            related.opts.app_label,
-                            related.opts.object_name.lower(),
-                            sub_obj._get_pk_val(), sub_obj)), []])
+                        (escape(capfirst(related.opts.verbose_name)),
+                        related.opts.app_label,
+                        related.opts.object_name.lower(),
+                        sub_obj._get_pk_val(),
+                        escape(sub_obj))), []])
                get_deleted_objects(deleted_objects, perms_needed, user, sub_obj, related.opts, current_depth+2, admin_site)
        else:
            has_related_objs = False
@ -104,11 +106,16 @@ def get_deleted_objects(deleted_objects, perms_needed, user, obj, opts, current_
                if not has_admin:
                    # Don't display link to edit, because it either has no
                    # admin or is edited inline.
-                    nh(deleted_objects, current_depth, [u'%s: %s' % (force_unicode(capfirst(related.opts.verbose_name)), sub_obj), []])
+                    nh(deleted_objects, current_depth,
+                        [u'%s: %s' % (capfirst(related.opts.verbose_name), force_unicode(sub_obj)), []])
                else:
                    # Display a link to the admin page.
-                    nh(deleted_objects, current_depth, [mark_safe(u'%s: <a href="../../../../%s/%s/%s/">%s</a>' % \
-                        (escape(force_unicode(capfirst(related.opts.verbose_name))), related.opts.app_label, related.opts.object_name.lower(), sub_obj._get_pk_val(), escape(sub_obj))), []])
+                    nh(deleted_objects, current_depth, [mark_safe(u'%s: <a href="../../../../%s/%s/%s/">%s</a>' % 
+                        (escape(capfirst(related.opts.verbose_name)),
+                        related.opts.app_label,
+                        related.opts.object_name.lower(),
+                        sub_obj._get_pk_val(),
+                        escape(sub_obj))), []])
                get_deleted_objects(deleted_objects, perms_needed, user, sub_obj, related.opts, current_depth+2, admin_site)
            # If there were related objects, and the user doesn't have
            # permission to delete them, add the missing perm to perms_needed.
--- a/django/contrib/admin/validation.py
+++ b/django/contrib/admin/validation.py
@ -5,7 +5,7 @@ except NameError:

 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
-from django.forms.models import BaseModelForm, BaseModelFormSet, fields_for_model
+from django.forms.models import BaseModelForm, BaseModelFormSet, fields_for_model, _get_foreign_key
 from django.contrib.admin.options import flatten_fieldsets, BaseModelAdmin
 from django.contrib.admin.options import HORIZONTAL, VERTICAL

@ -36,6 +36,8 @@ def validate(cls, model):
                        except models.FieldDoesNotExist:
                            raise ImproperlyConfigured("%s.list_display[%d], %r is not a callable or an attribute of %r or found in the model %r."
                                % (cls.__name__, idx, field, cls.__name__, model._meta.object_name))
+                    else:
+                        # getattr(model, field) could be an X_RelatedObjectsDescriptor
                        f = fetch_attr(cls, model, opts, "list_display[%d]" % idx, field)
                        if isinstance(f, models.ManyToManyField):
                            raise ImproperlyConfigured("'%s.list_display[%d]', '%s' is a ManyToManyField which is not supported."
@ -115,9 +117,9 @@ def validate(cls, model):
                raise ImproperlyConfigured("'%s.inlines[%d].model' does not "
                        "inherit from models.Model." % (cls.__name__, idx))
            validate_base(inline, inline.model)
-            validate_inline(inline)
+            validate_inline(inline, cls, model)

-def validate_inline(cls):
+def validate_inline(cls, parent, parent_model):
    # model is already verified to exist and be a Model
    if cls.fk_name: # default value is None
        f = get_field(cls, cls.model, cls.model._meta, 'fk_name', cls.fk_name)
@ -136,6 +138,14 @@ def validate_inline(cls):
        raise ImproperlyConfigured("'%s.formset' does not inherit from "
                "BaseModelFormSet." % cls.__name__)

+    # exclude
+    if hasattr(cls, 'exclude') and cls.exclude:
+        fk = _get_foreign_key(parent_model, cls.model, can_fail=True)
+        if fk and fk.name in cls.exclude:
+            raise ImproperlyConfigured("%s cannot exclude the field "
+                    "'%s' - this is the foreign key to the parent model "
+                    "%s." % (cls.__name__, fk.name, parent_model.__name__))
+
 def validate_base(cls, model):
    opts = model._meta

--- a/django/contrib/admin/views/main.py
+++ b/django/contrib/admin/views/main.py
@ -99,14 +99,7 @@ class ChangeList(object):
    def get_results(self, request):
        paginator = Paginator(self.query_set, self.list_per_page)
        # Get the number of objects, with admin filters applied.
-        try:
-            result_count = paginator.count
-        # Naked except! Because we don't have any other way of validating
-        # "params". They might be invalid if the keyword arguments are
-        # incorrect, or if the values are not in the correct type (which would
-        # result in a database error).
-        except:
-            raise IncorrectLookupParameters
+        result_count = paginator.count

        # Get the total number of objects, with no admin filters applied.
        # Perform a slight optimization: Check to see whether any filters were
@ -122,7 +115,7 @@ class ChangeList(object):

        # Get the list of objects to display on this page.
        if (self.show_all and can_show_all) or not multi_page:
-            result_list = list(self.query_set)
+            result_list = self.query_set._clone()
        else:
            try:
                result_list = paginator.page(self.page_num+1).object_list
@ -157,7 +150,12 @@ class ChangeList(object):
                    # See whether field_name is a name of a non-field
                    # that allows sorting.
                    try:
-                        attr = getattr(self.model, field_name)
+                        if callable(field_name):
+                            attr = field_name
+                        elif hasattr(self.model_admin, field_name):
+                            attr = getattr(self.model_admin, field_name)
+                        else:
+                            attr = getattr(self.model, field_name)
                        order_field = attr.admin_order_field
                    except AttributeError:
                        pass
@ -187,22 +185,32 @@ class ChangeList(object):
                lookup_params[key] = value.split(',')

        # Apply lookup parameters from the query string.
-        qs = qs.filter(**lookup_params)
+        try:
+            qs = qs.filter(**lookup_params)
+        # Naked except! Because we don't have any other way of validating "params".
+        # They might be invalid if the keyword arguments are incorrect, or if the
+        # values are not in the correct type, so we might get FieldError, ValueError,
+        # ValicationError, or ? from a custom field that raises yet something else
+        # when handed impossible data.
+        except:
+            raise IncorrectLookupParameters

        # Use select_related() if one of the list_display options is a field
-        # with a relationship.
-        if self.list_select_related:
-            qs = qs.select_related()
-        else:
-            for field_name in self.list_display:
-                try:
-                    f = self.lookup_opts.get_field(field_name)
-                except models.FieldDoesNotExist:
-                    pass
-                else:
-                    if isinstance(f.rel, models.ManyToOneRel):
-                        qs = qs.select_related()
-                        break
+        # with a relationship and the provided queryset doesn't already have
+        # select_related defined.
+        if not qs.query.select_related:
+            if self.list_select_related:
+                qs = qs.select_related()
+            else:
+                for field_name in self.list_display:
+                    try:
+                        f = self.lookup_opts.get_field(field_name)
+                    except models.FieldDoesNotExist:
+                        pass
+                    else:
+                        if isinstance(f.rel, models.ManyToOneRel):
+                            qs = qs.select_related()
+                            break

        # Set ordering.
        if self.order_field:
@ -221,19 +229,13 @@ class ChangeList(object):

        if self.search_fields and self.query:
            for bit in self.query.split():
-                or_queries = [models.Q(**{construct_search(field_name): bit}) for field_name in self.search_fields]
-                other_qs = QuerySet(self.model)
-                other_qs.dup_select_related(qs)
-                other_qs = other_qs.filter(reduce(operator.or_, or_queries))
-                qs = qs & other_qs
+                or_queries = [models.Q(**{construct_search(str(field_name)): bit}) for field_name in self.search_fields]
+                qs = qs.filter(reduce(operator.or_, or_queries))
            for field_name in self.search_fields:
                if '__' in field_name:
                    qs = qs.distinct()
                    break

-        if self.opts.one_to_one_field:
-            qs = qs.complex_filter(self.opts.one_to_one_field.rel.limit_choices_to)
-
        return qs

    def url_for_result(self, result):
--- a/django/contrib/admin/widgets.py
+++ b/django/contrib/admin/widgets.py
@ -131,10 +131,10 @@ class ForeignKeyRawIdWidget(forms.TextInput):
            items = []
            for k, v in self.rel.limit_choices_to.items():
                if isinstance(v, list):
-                    v = [str(x) for x in v]
+                    v = ','.join([str(x) for x in v])
                else:
                    v = str(v)
-                items.append((k, ','.join(v)))
+                items.append((k, v))
            params.update(dict(items))
        return params    
    
@ -146,7 +146,7 @@ class ForeignKeyRawIdWidget(forms.TextInput):
            
    def label_for_value(self, value):
        key = self.rel.get_related_field().name
-        obj = self.rel.to.objects.get(**{key: value})
+        obj = self.rel.to._default_manager.get(**{key: value})
        return '&nbsp;<strong>%s</strong>' % truncate_words(obj, 14)

 class ManyToManyRawIdWidget(ForeignKeyRawIdWidget):
--- a/django/contrib/admindocs/templates/admin_doc/model_index.html
+++ b/django/contrib/admindocs/templates/admin_doc/model_index.html
@ -14,7 +14,7 @@
 <div id="content-main">
 {% for group in grouped_models %}
 <div class="module">
-<h2 id="{{ group.grouper }}">{{ group.grouper|capfirst }}</h2>
+<h2 id="app-{{ group.grouper }}">{{ group.grouper|capfirst }}</h2>

 <table class="xfull">
 {% for model in group.list %}
@ -36,7 +36,7 @@
 <ul>
 {% regroup models by app_label as grouped_models %}
 {% for group in grouped_models %}
-    <li><a href="#{{ group.grouper }}">{{ group.grouper|capfirst }}</a></li>
+    <li><a href="#app-{{ group.grouper }}">{{ group.grouper|capfirst }}</a></li>
 {% endfor %}
 </ul>
 </div>
--- a/django/contrib/admindocs/utils.py
+++ b/django/contrib/admindocs/utils.py
@ -4,6 +4,7 @@ import re
 from email.Parser import HeaderParser
 from email.Errors import HeaderParseError
 from django.utils.safestring import mark_safe
+from django.core.urlresolvers import reverse
 try:
    import docutils.core
    import docutils.nodes
@ -52,7 +53,7 @@ def parse_docstring(docstring):
                body = "\n\n".join(parts[1:])
    return title, body, metadata

-def parse_rst(text, default_reference_context, thing_being_parsed=None, link_base='../..'):
+def parse_rst(text, default_reference_context, thing_being_parsed=None):
    """
    Convert the string from reST to an XHTML fragment.
    """
@ -60,7 +61,7 @@ def parse_rst(text, default_reference_context, thing_being_parsed=None, link_bas
        'doctitle_xform' : True,
        'inital_header_level' : 3,
        "default_reference_context" : default_reference_context,
-        "link_base" : link_base,
+        "link_base" : reverse('django-admindocs-docroot').rstrip('/')
    }
    if thing_being_parsed:
        thing_being_parsed = "<%s>" % thing_being_parsed
--- a/django/contrib/admindocs/views.py
+++ b/django/contrib/admindocs/views.py
@ -128,7 +128,7 @@ def view_index(request):
            site_obj = GenericSite()
        for (func, regex) in view_functions:
            views.append({
-                'name': func.__name__,
+                'name': getattr(func, '__name__', func.__class__.__name__),
                'module': func.__module__,
                'site_id': settings_mod.SITE_ID,
                'site': site_obj,
@ -213,6 +213,22 @@ def model_detail(request, app_label, model_name):
            'help_text': field.help_text,
        })

+    # Gather many-to-many fields.
+    for field in opts.many_to_many:
+        data_type = related_object_name = field.rel.to.__name__
+        app_label = field.rel.to._meta.app_label
+        verbose = _("related `%(app_label)s.%(object_name)s` objects") % {'app_label': app_label, 'object_name': data_type}
+        fields.append({
+            'name': "%s.all" % field.name,
+            "data_type": 'List',
+            'verbose': utils.parse_rst(_("all %s") % verbose , 'model', _('model:') + opts.module_name),
+        })
+        fields.append({
+            'name'      : "%s.count" % field.name,
+            'data_type' : 'Integer',
+            'verbose'   : utils.parse_rst(_("number of %s") % verbose , 'model', _('model:') + opts.module_name),
+        })
+
    # Gather model methods.
    for func_name, func in model.__dict__.items():
        if (inspect.isfunction(func) and len(inspect.getargspec(func)[0]) == 1):
@ -232,7 +248,7 @@ def model_detail(request, app_label, model_name):
            })

    # Gather related objects
-    for rel in opts.get_all_related_objects():
+    for rel in opts.get_all_related_objects() + opts.get_all_related_many_to_many_objects():
        verbose = _("related `%(app_label)s.%(object_name)s` objects") % {'app_label': rel.opts.app_label, 'object_name': rel.opts.object_name}
        accessor = rel.get_accessor_name()
        fields.append({
--- a/django/contrib/auth/admin.py
+++ b/django/contrib/auth/admin.py
@ -1,14 +1,14 @@
-
+from django import template
+from django.conf import settings
+from django.contrib import admin
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm, AdminPasswordChangeForm
 from django.contrib.auth.models import User, Group
 from django.core.exceptions import PermissionDenied
-from django import template
+from django.http import HttpResponseRedirect, Http404
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.utils.html import escape
-from django.http import HttpResponseRedirect
 from django.utils.translation import ugettext, ugettext_lazy as _
-from django.contrib.auth.forms import UserCreationForm, UserChangeForm, AdminPasswordChangeForm
-from django.contrib import admin

 class GroupAdmin(admin.ModelAdmin):
    search_fields = ('name',)
@ -42,7 +42,17 @@ class UserAdmin(admin.ModelAdmin):
        return super(UserAdmin, self).__call__(request, url)

    def add_view(self, request):
+        # It's an error for a user to have add permission but NOT change
+        # permission for users. If we allowed such users to add users, they
+        # could create superusers, which would mean they would essentially have
+        # the permission to change users. To avoid the problem entirely, we
+        # disallow users from adding users if they don't have change
+        # permission.
        if not self.has_change_permission(request):
+            if self.has_add_permission(request) and settings.DEBUG:
+                # Raise Http404 in debug mode so that the user gets a helpful
+                # error message.
+                raise Http404('Your user does not have the "Change user" permission. In order to add users, Django requires that your user account have both the "Add user" and "Change user" permissions set.')
            raise PermissionDenied
        if request.method == 'POST':
            form = self.add_form(request.POST)
@ -80,7 +90,7 @@ class UserAdmin(admin.ModelAdmin):
        }, context_instance=template.RequestContext(request))

    def user_change_password(self, request, id):
-        if not request.user.has_perm('auth.change_user'):
+        if not self.has_change_permission(request):
            raise PermissionDenied
        user = get_object_or_404(self.model, pk=id)
        if request.method == 'POST':
--- a/django/contrib/auth/decorators.py
+++ b/django/contrib/auth/decorators.py
@ -56,8 +56,19 @@ class _CheckLogin(object):
        self.test_func = test_func
        self.login_url = login_url
        self.redirect_field_name = redirect_field_name
-        update_wrapper(self, view_func)
        
+        # We can't blindly apply update_wrapper because it udpates __dict__ and 
+        # if the view function is already a _CheckLogin object then 
+        # self.test_func and friends will get stomped. However, we also can't 
+        # *not* update the wrapper's dict because then view function attributes
+        # don't get updated into the wrapper. So we need to split the
+        # difference: don't let update_wrapper update __dict__, but then update
+        # the (parts of) __dict__ that we care about ourselves.
+        update_wrapper(self, view_func, updated=())
+        for k in view_func.__dict__:
+            if k not in self.__dict__:
+                self.__dict__[k] = view_func.__dict__[k]
+
    def __get__(self, obj, cls=None):
        view_func = self.view_func.__get__(obj, cls)
        return _CheckLogin(view_func, self.test_func, self.login_url, self.redirect_field_name)
--- a/django/contrib/auth/forms.py
+++ b/django/contrib/auth/forms.py
@ -107,6 +107,7 @@ class PasswordResetForm(forms.Form):
        self.users_cache = User.objects.filter(email__iexact=email)
        if len(self.users_cache) == 0:
            raise forms.ValidationError(_("That e-mail address doesn't have an associated user account. Are you sure you've registered?"))
+        return email

    def save(self, domain_override=None, email_template_name='registration/password_reset_email.html',
             use_https=False, token_generator=default_token_generator):
--- a/django/contrib/auth/management/commands/createsuperuser.py
+++ b/django/contrib/auth/management/commands/createsuperuser.py
@ -57,10 +57,12 @@ class Command(BaseCommand):
        # Try to determine the current system user's username to use as a default.
        try:
            import pwd
-        except ImportError:
-            default_username = ''
-        else:
            default_username = pwd.getpwuid(os.getuid())[0].replace(' ', '').lower()
+        except (ImportError, KeyError):
+            # KeyError will be raised by getpwuid() if there is no
+            # corresponding entry in the /etc/passwd file (a very restricted
+            # chroot environment, for example).
+            default_username = ''

        # Determine whether the default username is taken, so we don't display
        # it as an option.
--- a/django/contrib/auth/models.py
+++ b/django/contrib/auth/models.py
@ -120,6 +120,7 @@ class UserManager(models.Manager):
        u.is_active = True
        u.is_superuser = True
        u.save()
+        return u

    def make_random_password(self, length=10, allowed_chars='abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'):
        "Generates a random password with the given length and given allowed_chars"
--- a/django/contrib/auth/tests/basic.py
+++ b/django/contrib/auth/tests/basic.py
@ -24,6 +24,8 @@ True
 False
 >>> u.is_active
 True
+>>> u.is_superuser
+False

 >>> a = AnonymousUser()
 >>> a.is_authenticated()
@ -32,11 +34,22 @@ False
 False
 >>> a.is_active
 False
+>>> a.is_superuser
+False
 >>> a.groups.all()
 []
 >>> a.user_permissions.all()
 []

+# superuser tests.
+>>> super = User.objects.create_superuser('super', 'super@example.com', 'super')
+>>> super.is_superuser
+True
+>>> super.is_active
+True
+>>> super.is_staff
+True
+
 #
 # Tests for createsuperuser management command.
 # It's nearly impossible to test the interactive mode -- a command test helper
@ -45,7 +58,7 @@ False
 #
 >>> from django.core.management import call_command

->>> call_command("createsuperuser", noinput=True, username="joe", email="joe@somewhere.org")
+>>> call_command("createsuperuser", interactive=False, username="joe", email="joe@somewhere.org")
 Superuser created successfully.

 >>> u = User.objects.get(username="joe")
--- a/django/contrib/auth/tests/forms.py
+++ b/django/contrib/auth/tests/forms.py
@ -190,4 +190,33 @@ True
 False
 >>> form['username'].errors
 [u'This value must contain only letters, numbers and underscores.']
+
+
+### PasswordResetForm
+
+>>> from django.contrib.auth.forms import PasswordResetForm
+>>> data = {'email':'not valid'}
+>>> form = PasswordResetForm(data)
+>>> form.is_valid()
+False
+>>> form['email'].errors
+[u'Enter a valid e-mail address.']
+
+# Test nonexistant email address
+>>> data = {'email':'foo@bar.com'}
+>>> form = PasswordResetForm(data)
+>>> form.is_valid()
+False
+>>> form.errors
+{'email': [u"That e-mail address doesn't have an associated user account. Are you sure you've registered?"]}
+
+# Test cleaned_data bug fix
+>>> user = User.objects.create_user("jsmith3", "jsmith3@example.com", "test123")
+>>> data = {'email':'jsmith3@example.com'}
+>>> form = PasswordResetForm(data)
+>>> form.is_valid()
+True
+>>> form.cleaned_data['email']
+u'jsmith3@example.com'
+
 """
--- a/django/contrib/auth/tests/tokens.py
+++ b/django/contrib/auth/tests/tokens.py
@ -8,6 +8,14 @@ TOKEN_GENERATOR_TESTS = """
 >>> p0.check_token(u, tk1)
 True

+>>> u = User.objects.create_user('comebackkid', 'test3@example.com', 'testpw')
+>>> p0 = PasswordResetTokenGenerator()
+>>> tk1 = p0.make_token(u)
+>>> reload = User.objects.get(username='comebackkid')
+>>> tk2 = p0.make_token(reload)
+>>> tk1 == tk2
+True
+
 Tests to ensure we can use the token after n days, but no greater.
 Use a mocked version of PasswordResetTokenGenerator so we can change
 the value of 'today'
--- a/django/contrib/auth/tests/views.py
+++ b/django/contrib/auth/tests/views.py
@ -7,16 +7,49 @@ from django.contrib.auth.models import User
 from django.test import TestCase
 from django.core import mail

-class PasswordResetTest(TestCase):
+class AuthViewsTestCase(TestCase):
+    """
+    Helper base class for all the follow test cases.
+    """
    fixtures = ['authtestdata.json']
    urls = 'django.contrib.auth.urls'

+    def setUp(self):
+        self.old_LANGUAGES = settings.LANGUAGES
+        self.old_LANGUAGE_CODE = settings.LANGUAGE_CODE
+        settings.LANGUAGES = (('en', 'English'),)
+        settings.LANGUAGE_CODE = 'en'
+        self.old_TEMPLATE_DIRS = settings.TEMPLATE_DIRS
+        settings.TEMPLATE_DIRS = (
+            os.path.join(
+                os.path.dirname(__file__),
+                'templates'
+            )
+        ,)
+
+    def tearDown(self):
+        settings.LANGUAGES = self.old_LANGUAGES
+        settings.LANGUAGE_CODE = self.old_LANGUAGE_CODE
+        settings.TEMPLATE_DIRS = self.old_TEMPLATE_DIRS
+
+class PasswordResetTest(AuthViewsTestCase):
+
+    def setUp(self):
+        self.old_LANGUAGES = settings.LANGUAGES
+        self.old_LANGUAGE_CODE = settings.LANGUAGE_CODE
+        settings.LANGUAGES = (('en', 'English'),)
+        settings.LANGUAGE_CODE = 'en'
+
+    def tearDown(self):
+        settings.LANGUAGES = self.old_LANGUAGES
+        settings.LANGUAGE_CODE = self.old_LANGUAGE_CODE
+
    def test_email_not_found(self):
        "Error is raised if the provided email address isn't currently registered"
        response = self.client.get('/password_reset/')
        self.assertEquals(response.status_code, 200)
        response = self.client.post('/password_reset/', {'email': 'not_a_real_email@email.com'})
-        self.assertContains(response, "That e-mail address doesn't have an associated user account")
+        self.assertContains(response, "That e-mail address doesn&#39;t have an associated user account")
        self.assertEquals(len(mail.outbox), 0)

    def test_email_found(self):
@ -47,8 +80,8 @@ class PasswordResetTest(TestCase):

    def test_confirm_invalid(self):
        url, path = self._test_confirm_start()
-        # Lets munge the token in the path, but keep the same length,
-        # in case the URL conf will reject a different length
+        # Let's munge the token in the path, but keep the same length,
+        # in case the URLconf will reject a different length.
        path = path[:-5] + ("0"*4) + path[-1]

        response = self.client.get(path)
@ -87,24 +120,9 @@ class PasswordResetTest(TestCase):
        response = self.client.post(path, {'new_password1': 'anewpassword',
                                           'new_password2':' x'})
        self.assertEquals(response.status_code, 200)
-        self.assert_("The two password fields didn't match" in response.content)
+        self.assert_("The two password fields didn&#39;t match" in response.content)

-
-class ChangePasswordTest(TestCase):
-    fixtures = ['authtestdata.json']
-    urls = 'django.contrib.auth.urls'
-
-    def setUp(self):
-        self.old_TEMPLATE_DIRS = settings.TEMPLATE_DIRS
-        settings.TEMPLATE_DIRS = (
-            os.path.join(
-                os.path.dirname(__file__),
-                'templates'
-            )
-        ,)
-
-    def tearDown(self):
-        settings.TEMPLATE_DIRS = self.old_TEMPLATE_DIRS
+class ChangePasswordTest(AuthViewsTestCase):

    def login(self, password='password'):
        response = self.client.post('/login/', {
@ -147,7 +165,7 @@ class ChangePasswordTest(TestCase):
            }
        )
        self.assertEquals(response.status_code, 200)
-        self.assert_("The two password fields didn't match." in response.content)
+        self.assert_("The two password fields didn&#39;t match." in response.content)

    def test_password_change_succeeds(self):
        self.login()
@ -162,3 +180,61 @@ class ChangePasswordTest(TestCase):
        self.fail_login()
        self.login(password='password1')

+class LoginTest(AuthViewsTestCase):
+
+    def test_current_site_in_context_after_login(self):
+        response = self.client.get(reverse('django.contrib.auth.views.login'))
+        self.assertEquals(response.status_code, 200)
+        site = Site.objects.get_current()
+        self.assertEquals(response.context['site'], site)
+        self.assertEquals(response.context['site_name'], site.name)
+        self.assert_(isinstance(response.context['form'], AuthenticationForm), 
+                     'Login form is not an AuthenticationForm')
+        
+class LogoutTest(AuthViewsTestCase):
+    urls = 'django.contrib.auth.tests.urls'
+
+    def login(self, password='password'):
+        response = self.client.post('/login/', {
+            'username': 'testclient',
+            'password': password
+            }
+        )
+        self.assertEquals(response.status_code, 302)
+        self.assert_(response['Location'].endswith(settings.LOGIN_REDIRECT_URL))
+        self.assert_(SESSION_KEY in self.client.session)
+
+    def confirm_logged_out(self):
+        self.assert_(SESSION_KEY not in self.client.session)
+
+    def test_logout_default(self):
+        "Logout without next_page option renders the default template"
+        self.login()
+        response = self.client.get('/logout/')
+        self.assertEquals(200, response.status_code)
+        self.assert_('Logged out' in response.content)
+        self.confirm_logged_out()
+
+    def test_logout_with_next_page_specified(self): 
+        "Logout with next_page option given redirects to specified resource"
+        self.login()
+        response = self.client.get('/logout/next_page/')
+        self.assertEqual(response.status_code, 302)
+        self.assert_(response['Location'].endswith('/somewhere/'))
+        self.confirm_logged_out()
+
+    def test_logout_with_redirect_argument(self):
+        "Logout with query string redirects to specified resource"
+        self.login()
+        response = self.client.get('/logout/?next=/login/')
+        self.assertEqual(response.status_code, 302)
+        self.assert_(response['Location'].endswith('/login/'))
+        self.confirm_logged_out()
+
+    def test_logout_with_custom_redirect_argument(self):
+        "Logout with custom query string redirects to specified resource"
+        self.login()
+        response = self.client.get('/logout/custom_query/?follow=/somewhere/')
+        self.assertEqual(response.status_code, 302)
+        self.assert_(response['Location'].endswith('/somewhere/'))
+        self.confirm_logged_out()
--- a/django/contrib/auth/tokens.py
+++ b/django/contrib/auth/tokens.py
@ -4,7 +4,7 @@ from django.utils.http import int_to_base36, base36_to_int

 class PasswordResetTokenGenerator(object):
    """
-    Stratgy object used to generate and check tokens for the password
+    Strategy object used to generate and check tokens for the password
    reset mechanism.
    """
    def make_token(self, user):
@ -18,7 +18,7 @@ class PasswordResetTokenGenerator(object):
        """
        Check that a password reset token is correct for a given user.
        """
-        # Parse the tokem
+        # Parse the token
        try:
            ts_b36, hash = token.split("-")
        except ValueError:
@ -52,7 +52,7 @@ class PasswordResetTokenGenerator(object):
        # We limit the hash to 20 chars to keep URL short
        from django.utils.hashcompat import sha_constructor
        hash = sha_constructor(settings.SECRET_KEY + unicode(user.id) +
-                               user.password + unicode(user.last_login) +
+                               user.password + user.last_login.strftime('%Y-%m-%d %H:%M:%S') +
                               unicode(timestamp)).hexdigest()[::2]
        return "%s-%s" % (ts_b36, hash)

--- a/django/contrib/comments/admin.py
+++ b/django/contrib/comments/admin.py
@ -1,5 +1,4 @@
 from django.contrib import admin
-from django.conf import settings
 from django.contrib.comments.models import Comment
 from django.utils.translation import ugettext_lazy as _

--- a/Show More
+++ b/Show More