diff --git a/AUTHORS b/AUTHORS
index 95cee72037..99422567a5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -56,7 +56,6 @@ answer newbie questions, and generally made Django that much better:
     gandalf@owca.info
     Baishampayan Ghose
     Espen Grindhaug <http://grindhaug.org/>
-    Gustavo Picon
     Brant Harris
     hipertracker@gmail.com
     Ian Holsman <http://feh.holsman.net/>
@@ -68,6 +67,7 @@ answer newbie questions, and generally made Django that much better:
     Russell Keith-Magee <freakboy@iinet.net.au>
     Garth Kidd <http://www.deadlybloodyserious.com/>
     Sune Kirkeby <http://ibofobi.dk/>
+    Bruce Kroeze <http://coderseye.com/>
     lakin.wecker@gmail.com
     Stuart Langridge <http://www.kryogenix.org/>
     Eugene Lazutkin <http://lazutkin.com/blog/>
@@ -89,6 +89,7 @@ answer newbie questions, and generally made Django that much better:
     oggie rob <oz.robharvey@gmail.com>
     pgross@thoughtworks.com
     phaedo <http://phaedo.cx/>
+    Gustavo Picon
     Luke Plant <http://lukeplant.me.uk/>
     plisk
     Daniel Poelzleithner <http://poelzi.org/>
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index b47f5ea0a5..a7b2e1a5ac 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -39,6 +39,7 @@ LANGUAGES = (
     ('cy', _('Welsh')),
     ('da', _('Danish')),
     ('de', _('German')),
+    ('el', _('Greek')),
     ('en', _('English')),
     ('es', _('Spanish')),
     ('fr', _('French')),
@@ -52,6 +53,7 @@ LANGUAGES = (
     ('ro', _('Romanian')),
     ('ru', _('Russian')),
     ('sk', _('Slovak')),
+    ('sl', _('Slovenian')),
     ('sr', _('Serbian')),
     ('sv', _('Swedish')),
     ('zh-cn', _('Simplified Chinese')),
@@ -85,6 +87,10 @@ DATABASE_PORT = ''             # Set to empty string for default. Not used with
 # Host for sending e-mail.
 EMAIL_HOST = 'localhost'
 
+# Optional SMTP authentication information for EMAIL_HOST.
+EMAIL_HOST_USER = ''
+EMAIL_HOST_PASSWORD = ''
+
 # List of strings representing installed apps.
 INSTALLED_APPS = ()
 
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index e9f84e3ec2..b8defa00da 100644
Binary files a/django/conf/locale/de/LC_MESSAGES/django.mo and b/django/conf/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po
index f1acbf8853..aaca8e8489 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-02 11:26+0100\n"
+"POT-Creation-Date: 2006-03-20 11:44+0100\n"
 "PO-Revision-Date: 2005-10-08 00:03+0200\n"
 "Last-Translator: Georg Bauer <gb@bofh.ms>\n"
 "MIME-Version: 1.0\n"
@@ -74,7 +74,7 @@ msgstr "Datum/Zeit Erstellung"
 msgid "is public"
 msgstr "ist φffentlich"
 
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:257
 msgid "IP address"
 msgstr "IP-Adresse"
 
@@ -429,7 +429,7 @@ msgstr "Logeintrag"
 msgid "log entries"
 msgstr "Logeintrδge"
 
-#: contrib/admin/templatetags/admin_list.py:241
+#: contrib/admin/templatetags/admin_list.py:240
 msgid "All dates"
 msgstr "Alle Tage"
 
@@ -573,78 +573,74 @@ msgstr "Sicher? Ganz sicher?"
 msgid "Change history: %s"
 msgstr "Δnderungsgeschichte: %s"
 
-#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
-#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:245 contrib/admin/views/doc.py:254
+#: contrib/admin/views/doc.py:256 contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:263 contrib/admin/views/doc.py:265
 msgid "Integer"
 msgstr "Ganzzahl"
 
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:246
 msgid "Boolean (Either True or False)"
 msgstr "Wahrheitswert (Wahr oder Falsch)"
 
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:247 contrib/admin/views/doc.py:264
 #, python-format
 msgid "String (up to %(maxlength)s)"
 msgstr "Zeichenkette (bis zu %(maxlength)s Zeichen)"
 
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:248
 msgid "Comma-separated integers"
 msgstr "Kommaseparierte Liste von Zahlen"
 
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:249
 msgid "Date (without time)"
 msgstr "Datum (ohne Zeit)"
 
-#: contrib/admin/views/doc.py:249
+#: contrib/admin/views/doc.py:250
 msgid "Date (with time)"
 msgstr "Datum (mit Zeit)"
 
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:251
 msgid "E-mail address"
 msgstr "E-mail-Adresse"
 
-#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
+#: contrib/admin/views/doc.py:252 contrib/admin/views/doc.py:255
 msgid "File path"
 msgstr "Dateipfad"
 
-#: contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:253
 msgid "Decimal number"
 msgstr "Dezimalzahl"
 
-#: contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259
 msgid "Boolean (Either True, False or None)"
 msgstr "Wahrheitswert (Wahr, Falsch oder Nichts)"
 
-#: contrib/admin/views/doc.py:259
+#: contrib/admin/views/doc.py:260
 msgid "Relation to parent model"
 msgstr "Beziehung zum άbermodell"
 
-#: contrib/admin/views/doc.py:260
+#: contrib/admin/views/doc.py:261
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: contrib/admin/views/doc.py:263
-msgid "String (up to 50)"
-msgstr "Zeichenkette (bis zu 50 Zeichen)"
-
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:266
 msgid "Text"
 msgstr "Text"
 
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:267
 msgid "Time"
 msgstr "Zeit"
 
-#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:268 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr "URL"
 
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:269
 msgid "U.S. state (two uppercase letters)"
 msgstr "U.S. Bundesstaat (zwei Grossbuchstaben)"
 
-#: contrib/admin/views/doc.py:269
+#: contrib/admin/views/doc.py:270
 msgid "XML text"
 msgstr "XML Text"
 
@@ -1474,75 +1470,83 @@ msgid "German"
 msgstr "Deutsch"
 
 #: conf/global_settings.py:42
+msgid "Greek"
+msgstr "Griechisch"
+
+#: conf/global_settings.py:43
 msgid "English"
 msgstr "Englisch"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "French"
 msgstr "Franzφsisch"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Galician"
 msgstr "Galicisch"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Icelandic"
 msgstr "Islδndisch"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Italian"
 msgstr "Italienisch"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Dutch"
 msgstr "Hollδndisch"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Brazilian"
 msgstr "Brasilianisch"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Romanian"
 msgstr "Rumδnisch"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Russian"
 msgstr "Russisch"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Slovak"
 msgstr "Slowakisch"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
+msgid "Slovenian"
+msgstr "Slowenisch"
+
+#: conf/global_settings.py:57
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:58
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:59
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:60
 msgid "Traditional Chinese"
 msgstr "Traditionelles Chinesisch"
 
-#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
-#: core/meta/fields.py:499
+#: core/formfields.py:59 core/meta/fields.py:283 core/meta/fields.py:486
+#: core/meta/fields.py:497
 msgid "This field is required."
 msgstr "Dieses Feld ist zwingend."
 
@@ -1579,75 +1583,77 @@ msgstr "Bitte eine ganze, positive Zahl eingeben."
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Bitte eine ganze Zahl zwischen 0 und 32.767 eingeben."
 
-#: core/validators.py:62
+#: core/validators.py:61
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Dieser Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten."
 
-#: core/validators.py:66
-msgid "This value must contain only letters, numbers, underscores and slashes."
+#: core/validators.py:65
+msgid ""
+"This value must contain only letters, numbers, underscores, dashes or "
+"slashes."
 msgstr ""
 "Dieser Wert darf nur Buchstaben, Ziffern, Unterstriche und Schrδgstriche "
 "enthalten."
 
-#: core/validators.py:74
+#: core/validators.py:73
 msgid "Uppercase letters are not allowed here."
 msgstr "Groίbuchstaben sind hier nicht erlaubt."
 
-#: core/validators.py:78
+#: core/validators.py:77
 msgid "Lowercase letters are not allowed here."
 msgstr "Kleinbuchstaben sind hier nicht erlaubt."
 
-#: core/validators.py:85
+#: core/validators.py:84
 msgid "Enter only digits separated by commas."
 msgstr "Hier sind nur durch Komma getrennte Ziffern erlaubt."
 
-#: core/validators.py:97
+#: core/validators.py:96
 msgid "Enter valid e-mail addresses separated by commas."
 msgstr "Bitte mit Komma getrennte, gόltige eMail-Adressen eingeben."
 
-#: core/validators.py:101
+#: core/validators.py:100
 msgid "Please enter a valid IP address."
 msgstr "Bitte eine gόltige IP-Adresse eingeben."
 
-#: core/validators.py:105
+#: core/validators.py:104
 msgid "Empty values are not allowed here."
 msgstr "Dieses Feld darf nicht leer sein."
 
-#: core/validators.py:109
+#: core/validators.py:108
 msgid "Non-numeric characters aren't allowed here."
 msgstr "Nichtnumerische Zeichen sind hier nicht erlaubt."
 
-#: core/validators.py:113
+#: core/validators.py:112
 msgid "This value can't be comprised solely of digits."
 msgstr "Dieser Wert darf nicht nur aus Ziffern bestehen."
 
-#: core/validators.py:118
+#: core/validators.py:117
 msgid "Enter a whole number."
 msgstr "Bitte eine ganze Zahl eingeben."
 
-#: core/validators.py:122
+#: core/validators.py:121
 msgid "Only alphabetical characters are allowed here."
 msgstr "Nur alphabetische Zeichen sind hier erlaubt."
 
-#: core/validators.py:126
+#: core/validators.py:125
 msgid "Enter a valid date in YYYY-MM-DD format."
 msgstr "Bitte ein gόltiges Datum im Format JJJJ-MM-TT eingeben."
 
-#: core/validators.py:130
+#: core/validators.py:129
 msgid "Enter a valid time in HH:MM format."
 msgstr "Bitte eine gόltige Zeit im Format SS:MM eingeben."
 
-#: core/validators.py:134
+#: core/validators.py:133
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
 msgstr ""
 "Bitte eine gόltige Datums- und Zeitangabe im Format JJJJ-MM-TT SS:MM "
 "eingeben."
 
-#: core/validators.py:138
+#: core/validators.py:137
 msgid "Enter a valid e-mail address."
 msgstr "Bitte eine gόltige eMail-Adresse eingeben"
 
-#: core/validators.py:150
+#: core/validators.py:149
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -1655,27 +1661,27 @@ msgstr ""
 "Bitte ein Bild hochladen. Die Datei, die hochgeladen wurde, ist kein Bild "
 "oder ist defekt."
 
-#: core/validators.py:157
+#: core/validators.py:156
 #, python-format
 msgid "The URL %s does not point to a valid image."
 msgstr "Die URL %s zeigt nicht auf ein gόltiges Bild."
 
-#: core/validators.py:161
+#: core/validators.py:160
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
 msgstr ""
 "Telefonnummern mόssen im Format XXX-XXX-XXXX sein. \"%s\" ist ungόltig."
 
-#: core/validators.py:169
+#: core/validators.py:168
 #, python-format
 msgid "The URL %s does not point to a valid QuickTime video."
 msgstr "Die URL %s zeigt nicht auf ein gόltiges QuickTime video."
 
-#: core/validators.py:173
+#: core/validators.py:172
 msgid "A valid URL is required."
 msgstr "Eine gόltige URL ist hier verlangt."
 
-#: core/validators.py:187
+#: core/validators.py:186
 #, python-format
 msgid ""
 "Valid HTML is required. Specific errors are:\n"
@@ -1684,71 +1690,71 @@ msgstr ""
 "Bitte gόltiges HTML eingeben. Fehler sind:\n"
 "%s"
 
-#: core/validators.py:194
+#: core/validators.py:193
 #, python-format
 msgid "Badly formed XML: %s"
 msgstr "Ungόltiges XML: %s"
 
-#: core/validators.py:204
+#: core/validators.py:203
 #, python-format
 msgid "Invalid URL: %s"
 msgstr "Ungόltige URL: %s"
 
-#: core/validators.py:208 core/validators.py:210
+#: core/validators.py:207 core/validators.py:209
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "Die URL %s funktioniert nicht."
 
-#: core/validators.py:216
+#: core/validators.py:215
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "Bitte eine gόltige Abkόrzung fόr einen US-Staat eingeben."
 
-#: core/validators.py:231
+#: core/validators.py:230
 #, 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] "Keine Schimpfworte! Das Wort %s ist hier nicht gern gesehen!"
 msgstr[1] "Keine Schimpfworte! Die Wφrter %s sind hier nicht gern gesehen!"
 
-#: core/validators.py:238
+#: core/validators.py:237
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Dieses Feld muss zum Feld '%s' passen."
 
-#: core/validators.py:257
+#: core/validators.py:256
 msgid "Please enter something for at least one field."
 msgstr "Bitte mindestens eines der Felder ausfόllen."
 
-#: core/validators.py:266 core/validators.py:277
+#: core/validators.py:265 core/validators.py:276
 msgid "Please enter both fields or leave them both empty."
 msgstr "Bitte entweder beide Felder ausfόllen, oder beide leer lassen."
 
-#: core/validators.py:284
+#: core/validators.py:283
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr ""
 "Dieses Feld muss gefόllt sein, wenn Feld %(field)s den Wert %(value)s hat."
 
-#: core/validators.py:296
+#: core/validators.py:295
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr ""
 "Dieses Feld muss gefόllt sein, wenn Feld %(field)s nicht %(value)s ist."
 
-#: core/validators.py:315
+#: core/validators.py:314
 msgid "Duplicate values are not allowed."
 msgstr "Doppelte Werte sind hier nicht erlaubt."
 
-#: core/validators.py:338
+#: core/validators.py:337
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Dieser Wert muss eine Potenz von %s sein."
 
-#: core/validators.py:349
+#: core/validators.py:348
 msgid "Please enter a valid decimal number."
 msgstr "Bitte eine gόltige Dezimalzahl eingeben."
 
-#: core/validators.py:351
+#: core/validators.py:350
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@@ -1756,7 +1762,7 @@ msgid_plural ""
 msgstr[0] "Bitte eine gόltige Dezimalzahl mit maximal %s Ziffer eingeben."
 msgstr[1] "Bitte eine gόltige Dezimalzahl mit maximal %s Ziffern eingeben."
 
-#: core/validators.py:354
+#: core/validators.py:353
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@@ -1766,39 +1772,39 @@ msgstr[0] ""
 msgstr[1] ""
 "Bitte eine gόltige Dezimalzahl mit maximal %s Dezimalstellen eingeben."
 
-#: core/validators.py:364
+#: core/validators.py:363
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr ""
 "Bitte sicherstellen, daί die hochgeladene Datei mindestens %s Bytes gross "
 "ist."
 
-#: core/validators.py:365
+#: core/validators.py:364
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr ""
 "Bitte sicherstellen, daί die hochgeladene Datei maximal %s Bytes gross ist."
 
-#: core/validators.py:378
+#: core/validators.py:377
 msgid "The format for this field is wrong."
 msgstr "Das Format fόr dieses Feld ist falsch."
 
-#: core/validators.py:393
+#: core/validators.py:392
 msgid "This field is invalid."
 msgstr "Dieses Feld ist ungόltig."
 
-#: core/validators.py:428
+#: core/validators.py:427
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Konnte nichts von %s empfangen."
 
-#: core/validators.py:431
+#: core/validators.py:430
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr "Die URL %(url)s lieferte den falschen Content-Type '%(contenttype)s'."
 
-#: core/validators.py:464
+#: core/validators.py:463
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@@ -1807,7 +1813,7 @@ msgstr ""
 "Bitte das ungeschlossene %(tag)s Tag in Zeile %(line)s schlieίen. Die Zeile "
 "beginnt mit \"%(start)s\"."
 
-#: core/validators.py:468
+#: core/validators.py:467
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@@ -1816,7 +1822,7 @@ msgstr ""
 "In Zeile %(line)s ist Text, der nicht in dem Kontext erlaubt ist. Die Zeile "
 "beginnt mit \"%(start)s\"."
 
-#: core/validators.py:473
+#: core/validators.py:472
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@@ -1825,7 +1831,7 @@ msgstr ""
 "Das Attribute %(attr)s in Zeile %(line)s ist ungόltig. Die Zeile beginnt mit "
 "\"%(start)s\"."
 
-#: core/validators.py:478
+#: core/validators.py:477
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -1834,7 +1840,7 @@ msgstr ""
 "<%(tag)s> in Zeile %(line)s ist ungόltig. Die Zeile beginnt mit \"%(start)s"
 "\"."
 
-#: core/validators.py:482
+#: core/validators.py:481
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -1843,7 +1849,7 @@ msgstr ""
 "Ein Tag in Zeile %(line)s hat eines oder mehrere Pflichtattribute nicht. Die "
 "Zeile beginnt mit \"%(start)s\"."
 
-#: core/validators.py:487
+#: core/validators.py:486
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -1880,11 +1886,11 @@ msgstr ""
 " Um mehr als eine Selektion zu treffen, \"Strg\", oder auf dem Mac \"Command"
 "\", beim Klicken gedrόckt halten."
 
-#: core/meta/fields.py:508
+#: core/meta/fields.py:506
 msgid "Enter a valid filename."
 msgstr "Bitte einen gόltigen Dateinamen eingeben"
 
-#: core/meta/fields.py:782
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
diff --git a/django/conf/locale/el/LC_MESSAGES/django.po b/django/conf/locale/el/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..0138468ae0
--- /dev/null
+++ b/django/conf/locale/el/LC_MESSAGES/django.po
@@ -0,0 +1,1804 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2006 and beyond 
+# This file is distributed under the same license as the PACKAGE package.
+# Panos Laganakos <panos.laganakos@gmail.com>, Mar 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-02-02 11:25+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: panos laganakos <panos.laganakos@gmail.com>\n"
+"Language-Team: Greek\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+msgid "object ID"
+msgstr "ID αντικειμένου"
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr "Επικεφαλίδα"
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+msgid "comment"
+msgstr "σχόλιο"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr "κατάταξη #1"
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr "βαθμολογία #2"
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr "βαθμολογία #3"
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr "βαθμολογία #4"
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr "βαθμολογία #5"
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr "βαθμολογία #6"
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr "βαθμολογία #7"
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr "βαθμολογία #8"
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr "είναι έγκυρη βαθμολογία"
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr "ημερομηνία/ώρα υποβολής"
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr "είναι δημόσιο"
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
+msgid "IP address"
+msgstr "IP διεύθυνση"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr "είναι διεγραμμένο"
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+"Σημειώστε αυτό το κουτί εάν το σχόλιο είναι ανάρμοστο. Ένα Αυτό το σχόλιο "
+"εσβήσθει\" μήνυμα θα εμφανιστεί αντί αυτού."
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr "Σχόλιο"
+
+#: contrib/comments/models/comments.py:32
+msgid "Comments"
+msgstr "Σχόλια"
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+msgid "Content object"
+msgstr ""
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+msgid "person's name"
+msgstr "όνομα ατόμου"
+
+#: contrib/comments/models/comments.py:166
+msgid "ip address"
+msgstr "ip διεύθυνση"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr "εγκεκριμένο από το προσωπικό"
+
+#: contrib/comments/models/comments.py:172
+msgid "Free comment"
+msgstr "Ελεύθερο σχόλιο"
+
+#: contrib/comments/models/comments.py:173
+msgid "Free comments"
+msgstr "Ελεύθερα σχόλια"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr "βαθμολογία"
+
+#: contrib/comments/models/comments.py:210
+msgid "score date"
+msgstr "ημερομηνία βαθμολογίας"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+msgid "flag date"
+msgstr ""
+
+#: contrib/comments/models/comments.py:251
+msgid "User flag"
+msgstr ""
+
+#: contrib/comments/models/comments.py:252
+msgid "User flags"
+msgstr ""
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"Αυτο το σχόλιο σημειώθει απο %(χρήστη)ες\n"
+"\n"
+"%(κείμενο)α"
+
+#: contrib/comments/models/comments.py:278
+msgid "deletion date"
+msgstr "ημερομηνία διαγραφής"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr "Ανώνυμοι χρήστες δέν μπορούν να ψηφήσουν"
+
+#: contrib/comments/views/karma.py:22
+msgid "Invalid comment ID"
+msgstr ""
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:25
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+"Αυτή η βαθμολογία απαιτείται επειδή τουλάχιστον ακόμα μια βαθμολογία"
+
+#: contrib/comments/views/comments.py:109
+#, python-format
+msgid ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/comments/views/comments.py:114
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
+msgid "Only POSTs are allowed"
+msgstr ""
+
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
+msgid "One or more of the required fields wasn't submitted"
+msgstr "Ένα ή περισσότερα από τα απαιτούμενα πεδία δεν υποβλίθει"
+
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr ""
+
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Κωδικός"
+
+#: contrib/comments/templates/comments/form.html:6
+msgid "Forgotten your password?"
+msgstr "Ξεχάσατε τον κωδικό σας;"
+
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:9
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+msgid "Comment:"
+msgstr "Σχόλιο:"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+msgid "Preview comment"
+msgstr ""
+
+#: contrib/comments/templates/comments/freeform.html:4
+msgid "Your name:"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:40
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:109
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:110
+msgid "Today"
+msgstr "Σήμερα"
+
+#: contrib/admin/filterspecs.py:113
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:115
+msgid "This month"
+msgstr "Αυτό το μήνα"
+
+#: contrib/admin/filterspecs.py:117
+msgid "This year"
+msgstr "Αυτό το χρόνο"
+
+#: contrib/admin/filterspecs.py:143
+msgid "Yes"
+msgstr "Ναί"
+
+#: contrib/admin/filterspecs.py:143
+msgid "No"
+msgstr "Όχι"
+
+#: contrib/admin/filterspecs.py:150
+msgid "Unknown"
+msgstr "’γνωστο"
+
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr ""
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr ""
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr ""
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr ""
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "αλλάξτε το μήνυμα"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr ""
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr ""
+
+#: contrib/admin/templatetags/admin_list.py:241
+msgid "All dates"
+msgstr "Όλες οι ημερομηνίες"
+
+#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33
+#: parts/auth/formfields.py:38
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr "Παρακαλώ εισάγετε ένα σωστό όνομα χρήστη και κωδικό. Να σημειωθεί ότι "
+"και τα δύο πεδία είναι case-sensitive."
+
+#: contrib/admin/views/decorators.py:23
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Συνδεθείτε"
+
+#: contrib/admin/views/decorators.py:61
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"Παρακαλώ ξανασυνδεθείτε, γιατί η session σας έληξε. Μην ανησυχείτε: Η "
+"submission σας έχει αποθηκευτεί."
+
+#: contrib/admin/views/decorators.py:68
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Απ'οτι φαίνεται, ο φυλλομετρητής σας δεν έχει ρυθμιστεί να δέχεται cookies. "
+"Παρακαλώ ενεργοποιείστε τα cookies, ξαναφορτώστε αυτή την σελίδα, και "
+"δοκιμάστε ξανά."
+
+#: contrib/admin/views/decorators.py:82
+msgid "Usernames cannot contain the '@' character."
+msgstr "Τα ονόματα των Χρηστών δεν μπορόυν να περιέχουν τον χαρακτήρα '@'."
+
+#: contrib/admin/views/decorators.py:84
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "Η ηλεκτρονική σας διεύθυνση δεν είναι το ονόμα χρήστη σας. Δοκιμάστε '%s' έναντι αυτού."
+
+#: contrib/admin/views/main.py:52
+msgid "Site administration"
+msgstr "Διαχείριση του Διαδυκτιακού χώρου"
+
+#: contrib/admin/views/main.py:67
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:68
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:410
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501
+#, python-format
+msgid "You may add another %s below."
+msgstr "Μπορείτε να προσθέσετε ακόμα ένα %s απο κάτω."
+
+#: contrib/admin/views/main.py:441
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:457
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
+msgid "and"
+msgstr "και"
+
+#: contrib/admin/views/main.py:459
+#, python-format
+msgid "Changed %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:461
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:464
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:489
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:498
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:536
+#, python-format
+msgid "Change %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:615
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:649
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:652
+msgid "Are you sure?"
+msgstr "Είστε σίγουρος;"
+
+#: contrib/admin/views/main.py:667
+#, python-format
+msgid "Change history: %s"
+msgstr ""
+
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
+msgid "Integer"
+msgstr "Ακέραιος"
+
+#: contrib/admin/views/doc.py:245
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (Είτε Αλήθεια ή Ψέμα)"
+
+#: contrib/admin/views/doc.py:246
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:247
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:248
+msgid "Date (without time)"
+msgstr "Ημερομηνία (χωρίς την ώρα)"
+
+#: contrib/admin/views/doc.py:249
+msgid "Date (with time)"
+msgstr "Ημερομηνία (με την ώρα)"
+
+#: contrib/admin/views/doc.py:250
+msgid "E-mail address"
+msgstr "Ηλεκτρονική διεύθυνση"
+
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:252
+msgid "Decimal number"
+msgstr "Δεκαδικός αριθμός"
+
+#: contrib/admin/views/doc.py:258
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr ""
+
+#: contrib/admin/views/doc.py:260
+msgid "Phone number"
+msgstr "Αριθμός τηλεφώνου"
+
+#: contrib/admin/views/doc.py:263
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Text"
+msgstr "Κείμενο"
+
+#: contrib/admin/views/doc.py:266
+msgid "Time"
+msgstr "Ώρα"
+
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr ""
+
+#: contrib/admin/views/doc.py:268
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:269
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:9
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:9
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "Αλλαγή κωδικού"
+
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Home"
+msgstr "Home"
+
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
+msgid "History"
+msgstr ""
+
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "Date/time"
+msgstr ""
+
+#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
+msgid "User"
+msgstr "Χρήστης"
+
+#: contrib/admin/templates/admin/object_history.html:20
+msgid "Action"
+msgstr ""
+
+#: contrib/admin/templates/admin/object_history.html:26
+msgid "DATE_WITH_TIME_FULL"
+msgstr "N j, Y, P"
+
+#: contrib/admin/templates/admin/object_history.html:36
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Διαχειριστής ιστοσελίδας Django"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr ""
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr ""
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr ""
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr ""
+
+#: contrib/admin/templates/admin/500.html:10
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr ""
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Οι πράξεις μου"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr ""
+
+#: contrib/admin/templates/admin/login.html:20
+msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
+msgstr ""
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Καλωσήρθατε,"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:6
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+
+#: contrib/admin/templates/admin/delete_confirmation.html:13
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+
+#: contrib/admin/templates/admin/delete_confirmation.html:17
+msgid "Yes, I'm sure"
+msgstr "Ναι, είμαι σίγουρος"
+
+#: contrib/admin/templates/admin/filter.html:2
+#, python-format
+msgid " By %(title)s "
+msgstr ""
+
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "Αποθήκευση"
+
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_form.html:6
+#: contrib/admin/templates/registration/password_change_form.html:10
+msgid "Password change"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
+msgid "Password change successful"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_change_done.html:12
+msgid "Your password was changed."
+msgstr "Ο κωδίκός σας άλλαξε."
+
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_form.html:12
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr ""
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Ευχαριστούμε που διαθέσατε χρόνο στο να βελτίωσετε την ιστοσελίδα "
+"σήμερα."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_done.html:12
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+
+#: contrib/admin/templates/registration/password_change_form.html:12
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+
+#: contrib/admin/templates/registration/password_change_form.html:17
+msgid "Old password:"
+msgstr "Παλιός κωδικός:"
+
+#: contrib/admin/templates/registration/password_change_form.html:19
+msgid "New password:"
+msgstr "Νέος κωδικός:"
+
+#: contrib/admin/templates/registration/password_change_form.html:21
+msgid "Confirm password:"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_change_form.html:23
+msgid "Change my password"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_email.html:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_email.html:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_email.html:5
+#, python-format
+msgid "Your new password is: %(new_password)s"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_email.html:7
+msgid "Feel free to change this password by going to this page:"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_email.html:11
+msgid "Your username, in case you've forgotten:"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_email.html:13
+msgid "Thanks for using our site!"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_email.html:15
+#, python-format
+msgid "The %(site_name)s team"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+msgid "Change:"
+msgstr ""
+
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr ""
+
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr ""
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr ""
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:12
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr ""
+
+#: utils/translation.py:350
+msgid "DATE_FORMAT"
+msgstr "N j, Y"
+
+#: utils/translation.py:351
+msgid "DATETIME_FORMAT"
+msgstr "N j, Y, P"
+
+#: utils/translation.py:352
+msgid "TIME_FORMAT"
+msgstr "P"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr ""
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr ""
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr ""
+
+#: utils/dates.py:14
+msgid "January"
+msgstr ""
+
+#: utils/dates.py:14
+msgid "February"
+msgstr ""
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "March"
+msgstr ""
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "April"
+msgstr ""
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "May"
+msgstr ""
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "June"
+msgstr ""
+
+#: utils/dates.py:15 utils/dates.py:27
+msgid "July"
+msgstr ""
+
+#: utils/dates.py:15
+msgid "August"
+msgstr ""
+
+#: utils/dates.py:15
+msgid "September"
+msgstr ""
+
+#: utils/dates.py:15
+msgid "October"
+msgstr ""
+
+#: utils/dates.py:15
+msgid "November"
+msgstr ""
+
+#: utils/dates.py:16
+msgid "December"
+msgstr ""
+
+#: utils/dates.py:27
+msgid "Jan."
+msgstr ""
+
+#: utils/dates.py:27
+msgid "Feb."
+msgstr ""
+
+#: utils/dates.py:28
+msgid "Aug."
+msgstr ""
+
+#: utils/dates.py:28
+msgid "Sept."
+msgstr ""
+
+#: utils/dates.py:28
+msgid "Oct."
+msgstr ""
+
+#: utils/dates.py:28
+msgid "Nov."
+msgstr ""
+
+#: utils/dates.py:28
+msgid "Dec."
+msgstr ""
+
+#: utils/timesince.py:12
+msgid "year"
+msgid_plural "years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:13
+msgid "month"
+msgid_plural "months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:14
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:15
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:16
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: models/core.py:7
+msgid "domain name"
+msgstr ""
+
+#: models/core.py:8
+msgid "display name"
+msgstr ""
+
+#: models/core.py:10
+msgid "site"
+msgstr ""
+
+#: models/core.py:11
+msgid "sites"
+msgstr ""
+
+#: models/core.py:28
+msgid "label"
+msgstr ""
+
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
+msgid "name"
+msgstr ""
+
+#: models/core.py:31
+msgid "package"
+msgstr ""
+
+#: models/core.py:32
+msgid "packages"
+msgstr ""
+
+#: models/core.py:42
+msgid "python module name"
+msgstr ""
+
+#: models/core.py:44
+msgid "content type"
+msgstr ""
+
+#: models/core.py:45
+msgid "content types"
+msgstr ""
+
+#: models/core.py:67
+msgid "session key"
+msgstr ""
+
+#: models/core.py:68
+msgid "session data"
+msgstr ""
+
+#: models/core.py:69
+msgid "expire date"
+msgstr ""
+
+#: models/core.py:71
+msgid "session"
+msgstr ""
+
+#: models/core.py:72
+msgid "sessions"
+msgstr ""
+
+#: models/auth.py:8
+msgid "codename"
+msgstr ""
+
+#: models/auth.py:10
+msgid "Permission"
+msgstr ""
+
+#: models/auth.py:11 models/auth.py:58
+msgid "Permissions"
+msgstr ""
+
+#: models/auth.py:22
+msgid "Group"
+msgstr ""
+
+#: models/auth.py:23 models/auth.py:60
+msgid "Groups"
+msgstr ""
+
+#: models/auth.py:33
+msgid "username"
+msgstr ""
+
+#: models/auth.py:34
+msgid "first name"
+msgstr ""
+
+#: models/auth.py:35
+msgid "last name"
+msgstr ""
+
+#: models/auth.py:36
+msgid "e-mail address"
+msgstr ""
+
+#: models/auth.py:37
+msgid "password"
+msgstr ""
+
+#: models/auth.py:37
+msgid "Use '[algo]$[salt]$[hexdigest]'"
+msgstr ""
+
+#: models/auth.py:38
+msgid "staff status"
+msgstr ""
+
+#: models/auth.py:38
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+
+#: models/auth.py:39
+msgid "active"
+msgstr ""
+
+#: models/auth.py:40
+msgid "superuser status"
+msgstr ""
+
+#: models/auth.py:41
+msgid "last login"
+msgstr ""
+
+#: models/auth.py:42
+msgid "date joined"
+msgstr ""
+
+#: models/auth.py:44
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+
+#: models/auth.py:48
+msgid "Users"
+msgstr ""
+
+#: models/auth.py:57
+msgid "Personal info"
+msgstr ""
+
+#: models/auth.py:59
+msgid "Important dates"
+msgstr ""
+
+#: models/auth.py:216
+msgid "Message"
+msgstr ""
+
+#: conf/global_settings.py:37
+msgid "Bengali"
+msgstr ""
+
+#: conf/global_settings.py:38
+msgid "Czech"
+msgstr ""
+
+#: conf/global_settings.py:39
+msgid "Welsh"
+msgstr ""
+
+#: conf/global_settings.py:40
+msgid "Danish"
+msgstr ""
+
+#: conf/global_settings.py:41
+msgid "German"
+msgstr ""
+
+#: conf/global_settings.py:42
+msgid "English"
+msgstr ""
+
+#: conf/global_settings.py:43
+msgid "Spanish"
+msgstr ""
+
+#: conf/global_settings.py:44
+msgid "French"
+msgstr ""
+
+#: conf/global_settings.py:45
+msgid "Galician"
+msgstr ""
+
+#: conf/global_settings.py:46
+msgid "Icelandic"
+msgstr ""
+
+#: conf/global_settings.py:47
+msgid "Italian"
+msgstr ""
+
+#: conf/global_settings.py:48
+msgid "Japanese"
+msgstr ""
+
+#: conf/global_settings.py:49
+msgid "Dutch"
+msgstr ""
+
+#: conf/global_settings.py:50
+msgid "Norwegian"
+msgstr ""
+
+#: conf/global_settings.py:51
+msgid "Brazilian"
+msgstr ""
+
+#: conf/global_settings.py:52
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:53
+msgid "Russian"
+msgstr ""
+
+#: conf/global_settings.py:54
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:55
+msgid "Serbian"
+msgstr ""
+
+#: conf/global_settings.py:56
+msgid "Swedish"
+msgstr ""
+
+#: conf/global_settings.py:57
+msgid "Simplified Chinese"
+msgstr ""
+
+#: conf/global_settings.py:58
+msgid "Traditional Chinese"
+msgstr ""
+
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
+msgid "This field is required."
+msgstr ""
+
+#: core/formfields.py:338
+#, python-format
+msgid "Ensure your text is less than %s character."
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/formfields.py:343
+msgid "Line breaks are not allowed here."
+msgstr ""
+
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+
+#: core/formfields.py:603
+msgid "The submitted file is empty."
+msgstr ""
+
+#: core/formfields.py:657
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr ""
+
+#: core/formfields.py:666
+msgid "Enter a positive number."
+msgstr ""
+
+#: core/formfields.py:675
+msgid "Enter a whole number between 0 and 32,767."
+msgstr ""
+
+#: core/validators.py:62
+msgid "This value must contain only letters, numbers and underscores."
+msgstr ""
+
+#: core/validators.py:66
+msgid "This value must contain only letters, numbers, underscores and slashes."
+msgstr ""
+
+#: core/validators.py:74
+msgid "Uppercase letters are not allowed here."
+msgstr ""
+
+#: core/validators.py:78
+msgid "Lowercase letters are not allowed here."
+msgstr ""
+
+#: core/validators.py:85
+msgid "Enter only digits separated by commas."
+msgstr ""
+
+#: core/validators.py:97
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr ""
+
+#: core/validators.py:101
+msgid "Please enter a valid IP address."
+msgstr ""
+
+#: core/validators.py:105
+msgid "Empty values are not allowed here."
+msgstr ""
+
+#: core/validators.py:109
+msgid "Non-numeric characters aren't allowed here."
+msgstr ""
+
+#: core/validators.py:113
+msgid "This value can't be comprised solely of digits."
+msgstr ""
+
+#: core/validators.py:118
+msgid "Enter a whole number."
+msgstr ""
+
+#: core/validators.py:122
+msgid "Only alphabetical characters are allowed here."
+msgstr ""
+
+#: core/validators.py:126
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr ""
+
+#: core/validators.py:130
+msgid "Enter a valid time in HH:MM format."
+msgstr ""
+
+#: core/validators.py:134
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr ""
+
+#: core/validators.py:138
+msgid "Enter a valid e-mail address."
+msgstr ""
+
+#: core/validators.py:150
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: core/validators.py:157
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr ""
+
+#: core/validators.py:161
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr ""
+
+#: core/validators.py:169
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr ""
+
+#: core/validators.py:173
+msgid "A valid URL is required."
+msgstr ""
+
+#: core/validators.py:187
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+
+#: core/validators.py:194
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr ""
+
+#: core/validators.py:204
+#, python-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+#: core/validators.py:208 core/validators.py:210
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr "Η διεύθυνση (URL) %s είναι χαλασμένη σύνδεση."
+
+#: core/validators.py:216
+msgid "Enter a valid U.S. state abbreviation."
+msgstr ""
+
+#: core/validators.py:231
+#, 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] ""
+msgstr[1] ""
+
+#: core/validators.py:238
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr ""
+
+#: core/validators.py:257
+msgid "Please enter something for at least one field."
+msgstr ""
+
+#: core/validators.py:266 core/validators.py:277
+msgid "Please enter both fields or leave them both empty."
+msgstr "Παρακαλώ συμπληρώστε και τα δύο πεδία ή αφήστε τα και τα δύο άδεια."
+
+#: core/validators.py:284
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr ""
+
+#: core/validators.py:296
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr ""
+
+#: core/validators.py:315
+msgid "Duplicate values are not allowed."
+msgstr ""
+
+#: core/validators.py:338
+#, python-format
+msgid "This value must be a power of %s."
+msgstr ""
+
+#: core/validators.py:349
+msgid "Please enter a valid decimal number."
+msgstr "Παρακαλώ είσάγετε έναν έγκυρο δεκαδίκο αριθμό."
+
+#: core/validators.py:351
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:354
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:364
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr "Σιγουρευτείτε ότι το αρχείου που ανεβάζετε είναι %s bytes τουλάχιστον."
+
+#: core/validators.py:365
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr ""
+
+#: core/validators.py:378
+msgid "The format for this field is wrong."
+msgstr "Η διάταξη αυτού του πεδίου έιναι λάθος"
+
+#: core/validators.py:393
+msgid "This field is invalid."
+msgstr "Αυτό το πεδίο είναι άκυρο"
+
+#: core/validators.py:428
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr ""
+
+#: core/validators.py:431
+#, python-format
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr ""
+
+#: core/validators.py:464
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:468
+#, python-format
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:473
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+
+#: core/validators.py:478
+#, python-format
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+
+#: core/validators.py:482
+#, python-format
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:487
+#, python-format
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#: core/meta/__init__.py:1944
+#, python-format
+msgid "%(object)s with this %(type)s already exists for the given %(field)s."
+msgstr ""
+
+#: core/meta/fields.py:46
+#, python-format
+msgid "Please enter a valid %s."
+msgstr ""
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr ""
+
+#: core/meta/fields.py:129
+msgid " Separate multiple IDs with commas."
+msgstr "Ξεχωρίστε πολλαπλές ΙDs με κόμματα"
+
+#: core/meta/fields.py:132
+msgid ""
+" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+
+#: core/meta/fields.py:508
+msgid "Enter a valid filename."
+msgstr "Εισάγετε ένα έγκυρο όνομα αρχείου"
+
+#: core/meta/fields.py:782
+#, 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."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/template/defaultfilters.py:379
+msgid "yes,no,maybe"
+msgstr "ναί,όχι,ίσως"
+
+#: parts/auth/formfields.py:27
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+"Ο φυλλομετρητής σας δεν φαίνεται να έχει ενεργοποιημένα τα cookies. Τα "
+"cookies απαιτούνται για να συνδεθείτε"
+
diff --git a/django/conf/locale/sl/LC_MESSAGES/django.mo b/django/conf/locale/sl/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..280b86318a
Binary files /dev/null and b/django/conf/locale/sl/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sl/LC_MESSAGES/django.po b/django/conf/locale/sl/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..6313eff814
--- /dev/null
+++ b/django/conf/locale/sl/LC_MESSAGES/django.po
@@ -0,0 +1,1779 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Igor Kolar <ike@email.si), 2006.
+# Nena Kojadin <nena@kiberpipa.org), 2006
+msgid ""
+msgstr ""
+"Project-Id-Version: Django Slovenian 0.92+svn translation\n"
+"Report-Msgid-Bugs-To: gandalf@owca.info\n"
+"POT-Creation-Date: 2006-02-02 11:25+0100\n"
+"PO-Revision-Date: 2006-03-19 17:30+0100\n"
+"Last-Translator: Jure Čuhalev <gandalf@owca.info>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+msgid "object ID"
+msgstr "ID objekta"
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr "naslov"
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+msgid "comment"
+msgstr "komentar"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr "rating #1"
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr "rating #2"
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr "rating #3"
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr "rating #4"
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr "rating #5"
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr "rating #6"
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr "rating #7"
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr "rating #8"
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr "je veljavni rating"
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr "podatek datum/čas poslan"
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr "je javno"
+
+#: contrib/comments/models/comments.py:26
+#: contrib/admin/views/doc.py:256
+msgid "IP address"
+msgstr "IP naslov"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr "je odstranjen/-a"
+
+#: contrib/comments/models/comments.py:27
+msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
+msgstr "Odkljukaj, če je komntar neprimeren. Namesto komentarja bo vidno obvestilo \"Ta komentar je bil odstranjen\"."
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr "Komentar"
+
+#: contrib/comments/models/comments.py:32
+msgid "Comments"
+msgstr "Komentarji"
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+msgid "Content object"
+msgstr "Objekt s vsebino"
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+"Poslal uporabnik %(user)s ob %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+
+#: contrib/comments/models/comments.py:163
+msgid "person's name"
+msgstr "ime osebe"
+
+#: contrib/comments/models/comments.py:166
+msgid "ip address"
+msgstr "ip naslov"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr "potrjeno s strani osebja"
+
+#: contrib/comments/models/comments.py:172
+msgid "Free comment"
+msgstr "Zastonj komentar"
+
+#: contrib/comments/models/comments.py:173
+msgid "Free comments"
+msgstr "Zastonj komentarji"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr "ocena"
+
+#: contrib/comments/models/comments.py:210
+msgid "score date"
+msgstr "datum ocene"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr "Karma"
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr "Skrivnosti karme"
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr "oceno %(score)d podelil %(user)s"
+
+#: contrib/comments/models/comments.py:248
+msgid "flag date"
+msgstr "datum označitve (zastavice)"
+
+#: contrib/comments/models/comments.py:251
+msgid "User flag"
+msgstr "UporabniΕ‘ka zastavica"
+
+#: contrib/comments/models/comments.py:252
+msgid "User flags"
+msgstr "UporabniΕ‘ke zastavice"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr "Avtor zastavice je %r"
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"Komentar je z zastavico označil %(user)s:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/models/comments.py:278
+msgid "deletion date"
+msgstr "datum izbrisa"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr "Izbris s strani moderatorja"
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr "Izbrisi s strani moderatorja"
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr "Izbris opravil moderator %r"
+
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr "Anonimni upirabniki ne morejo glasovati"
+
+#: contrib/comments/views/karma.py:22
+msgid "Invalid comment ID"
+msgstr "Neveljavni ID komentarja"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr "Ni mogoče glasovati zase"
+
+#: contrib/comments/views/comments.py:25
+msgid "This rating is required because you've entered at least one other rating."
+msgstr "MoraΕ‘ podati tole oceno, ker si podal vsaj Ε‘e eno drugo oceno."
+
+#: contrib/comments/views/comments.py:109
+#, python-format
+msgid ""
+"This comment was posted by a user who has posted fewer than %(count)s comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s comments:\n"
+"\n"
+"%(text)s"
+msgstr[0] ""
+"Ta komentar je poslal uporabnik, ki je do zdaj poslal manj kot %(count)s komentarjev Komentar:\n"
+"\n"
+"%(text)s"
+msgstr[1] ""
+"Ta komentar je poslal uporabnik, ki je do zdaj poslal manj kot %(count)s komentarjev Komentar:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/views/comments.py:114
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"Ta komentar je poslal sumljiv uporabnik:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
+msgid "Only POSTs are allowed"
+msgstr "Dovoljena je le metoda HTTP POST"
+
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
+msgid "One or more of the required fields wasn't submitted"
+msgstr "Eden ali več obveznih polj ni vpisanih"
+
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr "Nekdo se je poigraval z obrazcem za komentarje (varnostna krΕ‘itev)"
+
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
+msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
+msgstr "Obrazec s komentarji ima neveljavni parameter 'target' -- ID objekta je neveljaven."
+
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr "Obrazec s komentarji ne zahteva niti 'preview' niti 'post' akcije."
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "UporabniΕ‘ko ime:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Geslo:"
+
+#: contrib/comments/templates/comments/form.html:6
+msgid "Forgotten your password?"
+msgstr "Ste pozabili geslo?"
+
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:9
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr "Odjava"
+
+#: contrib/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr "Ocene"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr "Obvezno"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr "Neobvezno"
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr "Objavi sliko"
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+msgid "Comment:"
+msgstr "Komentar:"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+msgid "Preview comment"
+msgstr "Predogled komentarja"
+
+#: contrib/comments/templates/comments/freeform.html:4
+msgid "Your name:"
+msgstr "VaΕ‘e ime:"
+
+#: contrib/admin/filterspecs.py:40
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+"<h3>Avtor: %s</h3>\n"
+"<ul>\n"
+
+#: contrib/admin/filterspecs.py:70
+#: contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
+msgid "All"
+msgstr "Vse"
+
+#: contrib/admin/filterspecs.py:109
+msgid "Any date"
+msgstr "Kadarkoli"
+
+#: contrib/admin/filterspecs.py:110
+msgid "Today"
+msgstr "Danes"
+
+#: contrib/admin/filterspecs.py:113
+msgid "Past 7 days"
+msgstr "Zadnjih 7 dni"
+
+#: contrib/admin/filterspecs.py:115
+msgid "This month"
+msgstr "Ta mesec"
+
+#: contrib/admin/filterspecs.py:117
+msgid "This year"
+msgstr "Letos"
+
+#: contrib/admin/filterspecs.py:143
+msgid "Yes"
+msgstr "Ja"
+
+#: contrib/admin/filterspecs.py:143
+msgid "No"
+msgstr "Ne"
+
+#: contrib/admin/filterspecs.py:150
+msgid "Unknown"
+msgstr "Neznano"
+
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "čas oprave dejanja"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id objekta"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "predstavitev objekta"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "zastavica za določeno dejanje"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "spremeni sporočilo"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "vnos v dnevniku"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "vnosi v dnevniku"
+
+#: contrib/admin/templatetags/admin_list.py:241
+msgid "All dates"
+msgstr "Vsi datumi"
+
+#: contrib/admin/views/decorators.py:9
+#: parts/auth/formfields.py:33
+#: parts/auth/formfields.py:38
+msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
+msgstr "Prosimo, vnesite veljavno uporabniőko ime in geslo. Opomba: obe polji sta občutljivi na velikost črk"
+
+#: contrib/admin/views/decorators.py:23
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Prijate se"
+
+#: contrib/admin/views/decorators.py:61
+msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
+msgstr "VaΕ‘a seja je pretekla; prosimo, prijavite se znova. Opomba: Vse vaΕ‘e objave so varno shranjene."
+
+#: contrib/admin/views/decorators.py:68
+msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
+msgstr "Izgleda, da vaő brskalnik nima podpore za piőkotke. Prosimo, vključite piőkotke, znova naložite to stran in poskusite őe enkrat."
+
+#: contrib/admin/views/decorators.py:82
+msgid "Usernames cannot contain the '@' character."
+msgstr "UporabniΕ‘ka imena ne smejo vsebovati znaka '@'"
+
+#: contrib/admin/views/decorators.py:84
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "VaΕ‘ e-mail naslov ne morete uporabljati kot uporabniΕ‘ko ime. Namesto tega uporabite '%s'"
+
+#: contrib/admin/views/main.py:52
+msgid "Site administration"
+msgstr "Administracija strani"
+
+#: contrib/admin/views/main.py:67
+#, python-format
+msgid "Select %s"
+msgstr "Izberi %s"
+
+#: contrib/admin/views/main.py:68
+#, python-format
+msgid "Select %s to change"
+msgstr "Izberi %s, ki ga ΕΎelite spremeniti"
+
+#: contrib/admin/views/main.py:410
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" je bil uspeΕ‘no dodan."
+
+#: contrib/admin/views/main.py:415
+#: contrib/admin/views/main.py:492
+msgid "You may edit it again below."
+msgstr "Vsebino lahko znova uredite spodaj."
+
+#: contrib/admin/views/main.py:423
+#: contrib/admin/views/main.py:501
+#, python-format
+msgid "You may add another %s below."
+msgstr "Spodaj lahko dodate Ε‘e en %s."
+
+#: contrib/admin/views/main.py:441
+#, python-format
+msgid "Add %s"
+msgstr "Dodaj %s"
+
+#: contrib/admin/views/main.py:457
+#, python-format
+msgid "Added %s."
+msgstr "Dodal %s."
+
+#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
+msgid "and"
+msgstr "in"
+
+#: contrib/admin/views/main.py:459
+#, python-format
+msgid "Changed %s."
+msgstr "Spremenil %s"
+
+#: contrib/admin/views/main.py:461
+#, python-format
+msgid "Deleted %s."
+msgstr "Izbrisal %s."
+
+#: contrib/admin/views/main.py:464
+msgid "No fields changed."
+msgstr "Nobeno polje ni bilo spremenjeno."
+
+#: contrib/admin/views/main.py:489
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" je bilo uspeΕ‘no spremenjeno."
+
+#: contrib/admin/views/main.py:498
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "%(name)s \"%(obj)s\" je bilo uspeΕ‘no dodano. Znova ga lahko urejate spodaj."
+
+#: contrib/admin/views/main.py:536
+#, python-format
+msgid "Change %s"
+msgstr "Spremeni %s"
+
+#: contrib/admin/views/main.py:615
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Eden ali več %(fieldname)s v %(name)s: %(obj)s"
+
+#: contrib/admin/views/main.py:620
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Eden ali več %(fieldname)s v %(name)s:"
+
+#: contrib/admin/views/main.py:649
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "%(name)s \"%(obj)s\" je bilo uspeΕ‘no izbrisano."
+
+#: contrib/admin/views/main.py:652
+msgid "Are you sure?"
+msgstr "Ste prepričani?"
+
+#: contrib/admin/views/main.py:667
+#, python-format
+msgid "Change history: %s"
+msgstr "Zgodovina sprememb: %s"
+
+#: contrib/admin/views/doc.py:244
+#: contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255
+#: contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:264
+msgid "Integer"
+msgstr "Integer (Ε‘tevilo)"
+
+#: contrib/admin/views/doc.py:245
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (ali True ali False)"
+
+#: contrib/admin/views/doc.py:246
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr "Niz (vse do %(maxlength)s)"
+
+#: contrib/admin/views/doc.py:247
+msgid "Comma-separated integers"
+msgstr "Z vejico ločeni integerji"
+
+#: contrib/admin/views/doc.py:248
+msgid "Date (without time)"
+msgstr "Datum (brez časa)"
+
+#: contrib/admin/views/doc.py:249
+msgid "Date (with time)"
+msgstr "Datum (s časom)"
+
+#: contrib/admin/views/doc.py:250
+msgid "E-mail address"
+msgstr "E-naslov"
+
+#: contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:254
+msgid "File path"
+msgstr "Pot do datoteke"
+
+#: contrib/admin/views/doc.py:252
+msgid "Decimal number"
+msgstr "Decimalno Ε‘tevilo"
+
+#: contrib/admin/views/doc.py:258
+msgid "Boolean (Either True, False or None)"
+msgstr "Boolean (ali True ali False ali None)"
+
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr "Razmerje z starΕ‘evskim modelom"
+
+#: contrib/admin/views/doc.py:260
+msgid "Phone number"
+msgstr "Telefonska Ε‘tevilka"
+
+#: contrib/admin/views/doc.py:263
+msgid "String (up to 50)"
+msgstr "Niz (do 50 znakov)"
+
+#: contrib/admin/views/doc.py:265
+msgid "Text"
+msgstr "Besedilo"
+
+#: contrib/admin/views/doc.py:266
+msgid "Time"
+msgstr "Čas"
+
+#: contrib/admin/views/doc.py:267
+#: contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr "URL (spletni naslov)"
+
+#: contrib/admin/views/doc.py:268
+msgid "U.S. state (two uppercase letters)"
+msgstr "Koda ameriőke zvezne države (dve veliki črki)"
+
+#: contrib/admin/views/doc.py:269
+msgid "XML text"
+msgstr "XML besedilo"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:9
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:9
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "Spremeni geslo"
+
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Home"
+msgstr "Domov"
+
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
+msgid "History"
+msgstr "Zgodovina"
+
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "Date/time"
+msgstr "Datum/čas"
+
+#: contrib/admin/templates/admin/object_history.html:19
+#: models/auth.py:47
+msgid "User"
+msgstr "Uporabnik"
+
+#: contrib/admin/templates/admin/object_history.html:20
+msgid "Action"
+msgstr "Dejanje"
+
+#: contrib/admin/templates/admin/object_history.html:26
+msgid "DATE_WITH_TIME_FULL"
+msgstr "N j, Y, P"
+
+#: contrib/admin/templates/admin/object_history.html:36
+msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
+msgstr "Ta objekt nima zgodovine. Verjetno ni bil dodan preko te administratorske strani."
+
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django site admin"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django administracija"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Napaka streΕΎnika"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Django napaka (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Napaka streΕΎnika <em>(500)</em>"
+
+#: contrib/admin/templates/admin/500.html:10
+msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
+msgstr "Priőlo je do nepričakovane napake. Administratorji strani so že obveőčeni prekoe-poőte in naj bi jo v kratkem odpravili. Hvala za vaőe potrpljenje."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Strani ni mogoče najti"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Se opraivčujemo, a zahtevane strani ni mogoče najti."
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Dodaj"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Spremeni"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Nimate dovoljenja za urejanje česar koli."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Zadnja dejanja"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Moja dejanja"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Ni na voljo"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "Dodaj %(name)s"
+
+#: contrib/admin/templates/admin/login.html:20
+msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
+msgstr "Ste <a href=\"/password_reset/\">pozabili geslo</a>"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "DobrodoΕ‘li,"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:6
+#, python-format
+msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
+msgstr "Izbris %(object_name)s '%(object)s' bi pomenil izbris povezanih objektov, vendarvi nimate dovoljenja za izbris naslednjih tipov objektov:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:13
+#, python-format
+msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:"
+msgstr "Ste prepričani, da želite izbrisati %(object_name)s \"%(object)s\"?Vsi naslednji povezani elementi bodo izbrisani:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:17
+msgid "Yes, I'm sure"
+msgstr "Ja, sem prepričan"
+
+#: contrib/admin/templates/admin/filter.html:2
+#, python-format
+msgid " By %(title)s "
+msgstr " Po %(title)s"
+
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Go"
+msgstr "Pojdi"
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr "Poglej na strani"
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Prosimo, odpravite sledečo napako."
+msgstr[1] "Prosimo, odpravite sledeče napake."
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr "Urejanje"
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "Uredi:"
+
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr "IzbriΕ‘i"
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "Shrani kot novo"
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "Shrani in dodaj Ε‘e eno"
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "Shrani in nadaljuj z urejanjem"
+
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "Shrani"
+
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_form.html:6
+#: contrib/admin/templates/registration/password_change_form.html:10
+msgid "Password change"
+msgstr "Sprememba gesla"
+
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
+msgid "Password change successful"
+msgstr "Geslo uspeΕ‘no spremenjeno"
+
+#: contrib/admin/templates/registration/password_change_done.html:12
+msgid "Your password was changed."
+msgstr "VaΕ‘e geslo je bilo spremenjeno."
+
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr "Obnova gesla"
+
+#: contrib/admin/templates/registration/password_reset_form.html:12
+msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
+msgstr "Ste pozabili geslo? Vnesite vaΕ‘ e-naslov spodaj in mi vam bomo poslali novo geslo."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "E-naslov"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Obnova gesla"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Hvala, ker ste si vzeli nekaj časa za to spletno stran."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Ponovna prijava"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Geslo je bilo uspeΕ‘no obnovljeno"
+
+#: contrib/admin/templates/registration/password_reset_done.html:12
+msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
+msgstr "Po e-poΕ‘ti smo vam poslali novo geslo.Morali bi ga prejeti v kratkem"
+
+#: contrib/admin/templates/registration/password_change_form.html:12
+msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
+msgstr "Prosim, vnesite vaΕ‘e staro geslo (zaradi varnosti) in nato Ε‘e dvakrat novo(da preverimo, da se niste zatipkali)"
+
+#: contrib/admin/templates/registration/password_change_form.html:17
+msgid "Old password:"
+msgstr "Staro geslo:"
+
+#: contrib/admin/templates/registration/password_change_form.html:19
+msgid "New password:"
+msgstr "Novo geslo:"
+
+#: contrib/admin/templates/registration/password_change_form.html:21
+msgid "Confirm password:"
+msgstr "Potrditev gesla:"
+
+#: contrib/admin/templates/registration/password_change_form.html:23
+msgid "Change my password"
+msgstr "Sprememba gesla"
+
+#: contrib/admin/templates/registration/password_reset_email.html:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr "To poΕ‘to ste dobili, ker ste zahtevali spremembo gesla"
+
+#: contrib/admin/templates/registration/password_reset_email.html:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "za vaő uporabniőki račun pri %(site_name)s"
+
+#: contrib/admin/templates/registration/password_reset_email.html:5
+#, python-format
+msgid "Your new password is: %(new_password)s"
+msgstr "VaΕ‘e novo geslo je: %(new_password)s"
+
+#: contrib/admin/templates/registration/password_reset_email.html:7
+msgid "Feel free to change this password by going to this page:"
+msgstr "Geslo lahko spremenite z obiskom strani:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:11
+msgid "Your username, in case you've forgotten:"
+msgstr "VaΕ‘e uporabniΕ‘ko ime (za vsak primer)"
+
+#: contrib/admin/templates/registration/password_reset_email.html:13
+msgid "Thanks for using our site!"
+msgstr "Hvala, ker uporabljate naΕ‘o stran!"
+
+#: contrib/admin/templates/registration/password_reset_email.html:15
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "Ekipa strani %(site_name)s"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr "Zaznamkice"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr "Dokumentacijske zaznamkice"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+"\n"
+"<p class=\"help\">Za inőtalacijo zaznamkic povlečite povezavo v orodno vrstico\n"
+"z zaznamki, ali kliknite z desno miőkino tipko na povezavo in jo dodajte med zaznamkeZdaj lahko uporabite zaznamek s katere koli strani. Opomba: nekatere teh stranilahko gledate le z internega računalnika (preverite s sistemskim administratorjem)</p>\n"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr "Dokumentacija za to stran"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid "Jumps you from any page to the documentation for the view that generates that page."
+msgstr "Skok na stran z dokumentacijo za pogled (view), ki generira trenutno stran."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr "PokaΕΎi ID objekta"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid "Shows the content-type and unique ID for pages that represent a single object."
+msgstr "PokaΕΎe content-type in unikatni ID za strani, ki predstavljajo en objekt."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr "Uredi trenutni objekt (v trenutnem oknu)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr "Skok na administracijsko stran za vse strani, ki predstavljajo en objekt."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr "Uredi ta objekt (v novem oknu)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr "Kot zgoraj, le da odpre administracijsko stran v novem oknu."
+
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr "Datum:"
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr "Čas:"
+
+#: contrib/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr "Trenutno:"
+
+#: contrib/admin/templates/widget/file.html:3
+msgid "Change:"
+msgstr "Sprememba:"
+
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "preusmeritev iz"
+
+#: contrib/redirects/models/redirects.py:8
+msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
+msgstr "To mora biti absolutna pot, izključujoč domeno. Primer: '/events/search'-"
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "preusmeri na"
+
+#: contrib/redirects/models/redirects.py:10
+msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
+msgstr "To je ali absolutna pot (kot zgoraj) ali popoln URL naslov (začne se z 'http://')"
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "preusmeritev"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "preusmeritve"
+
+#: contrib/flatpages/models/flatpages.py:7
+msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr "Primer: '/about/contact/'. Mora vsebovati / (poőevnico) na začetku in koncu."
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "naslov"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "vsebina"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "omogoči komentarje"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "ime predloge"
+
+#: contrib/flatpages/models/flatpages.py:12
+msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'."
+msgstr "Primer: 'flatpages/contact_page'. Če to polje ni izpolnjeno, bo sistem uporabil 'flatpages/default'."
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "obvezna registracija"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr "Če je to polje odkljukano, si lahko to stran ogledajo le registrirani uporabniki."
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "ploh stran :)"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "ploh strani :)"
+
+#: utils/translation.py:350
+msgid "DATE_FORMAT"
+msgstr "N j, Y"
+
+#: utils/translation.py:351
+msgid "DATETIME_FORMAT"
+msgstr "N j, Y, P"
+
+#: utils/translation.py:352
+msgid "TIME_FORMAT"
+msgstr "P"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "ponedeljek"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "torek"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "sreda"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "četrtek"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "petek"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "sobota"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "nedelja"
+
+#: utils/dates.py:14
+msgid "January"
+msgstr "januar"
+
+#: utils/dates.py:14
+msgid "February"
+msgstr "februar"
+
+#: utils/dates.py:14
+#: utils/dates.py:27
+msgid "March"
+msgstr "marec"
+
+#: utils/dates.py:14
+#: utils/dates.py:27
+msgid "April"
+msgstr "april"
+
+#: utils/dates.py:14
+#: utils/dates.py:27
+msgid "May"
+msgstr "maj"
+
+#: utils/dates.py:14
+#: utils/dates.py:27
+msgid "June"
+msgstr "junij"
+
+#: utils/dates.py:15
+#: utils/dates.py:27
+msgid "July"
+msgstr "julij"
+
+#: utils/dates.py:15
+msgid "August"
+msgstr "avgust"
+
+#: utils/dates.py:15
+msgid "September"
+msgstr "september"
+
+#: utils/dates.py:15
+msgid "October"
+msgstr "oktober"
+
+#: utils/dates.py:15
+msgid "November"
+msgstr "november"
+
+#: utils/dates.py:16
+msgid "December"
+msgstr "december"
+
+#: utils/dates.py:27
+msgid "Jan."
+msgstr "jan."
+
+#: utils/dates.py:27
+msgid "feb."
+msgstr "feb."
+
+#: utils/dates.py:28
+msgid "Aug."
+msgstr "avg."
+
+#: utils/dates.py:28
+msgid "Sept."
+msgstr "sep."
+
+#: utils/dates.py:28
+msgid "Oct."
+msgstr "okt."
+
+#: utils/dates.py:28
+msgid "Nov."
+msgstr "nov."
+
+#: utils/dates.py:28
+msgid "Dec."
+msgstr "dec."
+
+#: utils/timesince.py:12
+msgid "year"
+msgid_plural "years"
+msgstr[0] "leto"
+msgstr[1] "let"
+
+#: utils/timesince.py:13
+msgid "month"
+msgid_plural "months"
+msgstr[0] "mesec"
+msgstr[1] "mesecev"
+
+#: utils/timesince.py:14
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dan"
+msgstr[1] "dni"
+
+#: utils/timesince.py:15
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "ura"
+msgstr[1] "ur"
+
+#: utils/timesince.py:16
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuta"
+msgstr[1] "minut"
+
+#: models/core.py:7
+msgid "domain name"
+msgstr "domena"
+
+#: models/core.py:8
+msgid "display name"
+msgstr "prikazno ime"
+
+#: models/core.py:10
+msgid "site"
+msgstr "stran"
+
+#: models/core.py:11
+msgid "sites"
+msgstr "strani"
+
+#: models/core.py:28
+msgid "label"
+msgstr "oznaka"
+
+#: models/core.py:29
+#: models/core.py:40
+#: models/auth.py:6
+#: models/auth.py:19
+msgid "name"
+msgstr "ime"
+
+#: models/core.py:31
+msgid "package"
+msgstr "paket"
+
+#: models/core.py:32
+msgid "packages"
+msgstr "paketi"
+
+#: models/core.py:42
+msgid "python module name"
+msgstr "python ime modula"
+
+#: models/core.py:44
+msgid "content type"
+msgstr "content type"
+
+#: models/core.py:45
+msgid "content types"
+msgstr "content types"
+
+#: models/core.py:67
+msgid "session key"
+msgstr "sejni ključ"
+
+#: models/core.py:68
+msgid "session data"
+msgstr "podatki v seji"
+
+#: models/core.py:69
+msgid "expire date"
+msgstr "čaz izteka"
+
+#: models/core.py:71
+msgid "session"
+msgstr "seja"
+
+#: models/core.py:72
+msgid "sessions"
+msgstr "seje"
+
+#: models/auth.py:8
+msgid "codename"
+msgstr "kodno ime"
+
+#: models/auth.py:10
+msgid "Permission"
+msgstr "Dovoljenje"
+
+#: models/auth.py:11
+#: models/auth.py:58
+msgid "Permissions"
+msgstr "Dovoljenja"
+
+#: models/auth.py:22
+msgid "Group"
+msgstr "Skupina"
+
+#: models/auth.py:23
+#: models/auth.py:60
+msgid "Groups"
+msgstr "Skupine"
+
+#: models/auth.py:33
+msgid "username"
+msgstr "uporabniΕ‘ko ime"
+
+#: models/auth.py:34
+msgid "first name"
+msgstr "ime"
+
+#: models/auth.py:35
+msgid "last name"
+msgstr "priimek"
+
+#: models/auth.py:36
+msgid "e-mail address"
+msgstr "e-naslov"
+
+#: models/auth.py:37
+msgid "password"
+msgstr "geslo"
+
+#: models/auth.py:37
+msgid "Use '[algo]$[salt]$[hexdigest]'"
+msgstr "Uporabi '[algo]$[salt]$[hexdigest]'"
+
+#: models/auth.py:38
+msgid "staff status"
+msgstr "status osebja"
+
+#: models/auth.py:38
+msgid "Designates whether the user can log into this admin site."
+msgstr "Določi, če se sme uporabnik prijaviti v to administracijsko stran."
+
+#: models/auth.py:39
+msgid "active"
+msgstr "aktiven"
+
+#: models/auth.py:40
+msgid "superuser status"
+msgstr "status superuporabnika"
+
+#: models/auth.py:41
+msgid "last login"
+msgstr "zadnja prijava"
+
+#: models/auth.py:42
+msgid "date joined"
+msgstr "član od"
+
+#: models/auth.py:44
+msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
+msgstr "Polek ročno določenih dovoljenj bo ta uporabnik dobil tudi vsa dovoljenja,ki pripadajo vsem skupinah, v katerih je."
+
+#: models/auth.py:48
+msgid "Users"
+msgstr "Uporabniki"
+
+#: models/auth.py:57
+msgid "Personal info"
+msgstr "Osebni podatki"
+
+#: models/auth.py:59
+msgid "Important dates"
+msgstr "Pomembni datumi"
+
+#: models/auth.py:216
+msgid "Message"
+msgstr "Sporočilo"
+
+#: conf/global_settings.py:37
+msgid "Bengali"
+msgstr "Bengalski"
+
+#: conf/global_settings.py:38
+msgid "Czech"
+msgstr "Čeőki"
+
+#: conf/global_settings.py:39
+msgid "Welsh"
+msgstr "ValeΕΎanski"
+
+#: conf/global_settings.py:40
+msgid "Danish"
+msgstr "Danski"
+
+#: conf/global_settings.py:41
+msgid "German"
+msgstr "NemΕ‘ki"
+
+#: conf/global_settings.py:42
+msgid "English"
+msgstr "AngleΕ‘ki"
+
+#: shamelesly added
+msgid "Slovene"
+msgstr "Slovenski"
+
+msgid "Slovenian"
+msgstr "Slovenski"
+
+#: conf/global_settings.py:43
+msgid "Spanish"
+msgstr "Ε panski"
+
+#: conf/global_settings.py:44
+msgid "French"
+msgstr "Francoski"
+
+#: conf/global_settings.py:45
+msgid "Galician"
+msgstr "Galičanski"
+
+#: conf/global_settings.py:46
+msgid "Icelandic"
+msgstr "Islandski"
+
+#: conf/global_settings.py:47
+msgid "Italian"
+msgstr "Italijanski"
+
+#: conf/global_settings.py:48
+msgid "Japanese"
+msgstr "Japonski"
+
+#: conf/global_settings.py:49
+msgid "Dutch"
+msgstr "Nizozemski"
+
+#: conf/global_settings.py:50
+msgid "Norwegian"
+msgstr "NorveΕ‘ki"
+
+#: conf/global_settings.py:51
+msgid "Brazilian"
+msgstr "Brazilski"
+
+#: conf/global_settings.py:52
+msgid "Romanian"
+msgstr "Romunski"
+
+#: conf/global_settings.py:53
+msgid "Russian"
+msgstr "Ruski"
+
+#: conf/global_settings.py:54
+msgid "Slovak"
+msgstr "SlovaΕ‘ki"
+
+#: conf/global_settings.py:55
+msgid "Serbian"
+msgstr "Srbski"
+
+#: conf/global_settings.py:56
+msgid "Swedish"
+msgstr "Ε vedski"
+
+#: conf/global_settings.py:57
+msgid "Simplified Chinese"
+msgstr "Poenostavljen kitajski"
+
+#: conf/global_settings.py:58
+msgid "Traditional Chinese"
+msgstr "Tradicionalni kitajski"
+
+#: core/formfields.py:59
+#: core/meta/fields.py:285
+#: core/meta/fields.py:488
+#: core/meta/fields.py:499
+msgid "This field is required."
+msgstr "To polje je obvezno"
+
+#: core/formfields.py:338
+#, python-format
+msgid "Ensure your text is less than %s character."
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] "Poskrbite, da bo tekst krajΕ‘i do %s znakov."
+msgstr[1] "Poskrbite, da bo tekst krajΕ‘i od %s znakov."
+
+#: core/formfields.py:343
+msgid "Line breaks are not allowed here."
+msgstr "Prelomi vrstice tu niso dovoljeni."
+
+#: core/formfields.py:438
+#: core/formfields.py:509
+#: core/formfields.py:547
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr "Izberite veljavno moΕΎnost; '%(data)s' ni v %(choices)s."
+
+#: core/formfields.py:603
+msgid "The submitted file is empty."
+msgstr "Poslano polje je prazno."
+
+#: core/formfields.py:657
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Vnesite celo Ε‘tevilo med -32,768 in 32,767."
+
+#: core/formfields.py:666
+msgid "Enter a positive number."
+msgstr "Vnesite pozitivno Ε‘tevilo."
+
+#: core/formfields.py:675
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Vnesite celo Ε‘tevilo med 0 in 32,767."
+
+#: core/validators.py:62
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "To polje lahko vsebuje le črke, őtevila in podčrtaje (_)."
+
+#: core/validators.py:66
+msgid "This value must contain only letters, numbers, underscores and slashes."
+msgstr "To polje lahko vsebuje le črke, őtevila, podčrtaje (_) in poőevnice (/)."
+
+#: core/validators.py:74
+msgid "Uppercase letters are not allowed here."
+msgstr "Velike tiskane črke tu niso dovoljene."
+
+#: core/validators.py:78
+msgid "Lowercase letters are not allowed here."
+msgstr "Majhne tiskane črke tu niso dovoljene."
+
+#: core/validators.py:85
+msgid "Enter only digits separated by commas."
+msgstr "Vnesite őtevila, ločena z vejicami."
+
+#: core/validators.py:97
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr "Vnesite veljavne e-poőne naslove, ločene z vejicami."
+
+#: core/validators.py:101
+msgid "Please enter a valid IP address."
+msgstr "Prosimo, vnesite veljavni IP naslov."
+
+#: core/validators.py:105
+msgid "Empty values are not allowed here."
+msgstr "Prazne vrednosti tu niso dovoljene."
+
+#: core/validators.py:109
+msgid "Non-numeric characters aren't allowed here."
+msgstr "Nenumerične vrednosti tukaj niso dovoljne."
+
+#: core/validators.py:113
+msgid "This value can't be comprised solely of digits."
+msgstr "To polje ne sme vsebovati le Ε‘tevk."
+
+#: core/validators.py:118
+msgid "Enter a whole number."
+msgstr "Vnesite celo Ε‘tevilo."
+
+#: core/validators.py:122
+msgid "Only alphabetical characters are allowed here."
+msgstr "Le črke iz abecede so dovoljene tukaj."
+
+#: core/validators.py:126
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr "Vnesite veljavni datum v zapisu YYYY-MM-DD (leto-mesec-dan)."
+
+#: core/validators.py:130
+msgid "Enter a valid time in HH:MM format."
+msgstr "Vnesite veljavni čas v zapisu HH:MM (ura:minuta)."
+
+#: core/validators.py:134
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr "Vnesite veljavni datum/čas v zapisu YYYY-MM-DD HH:MM (leto-mesec-dan ura:minuta)"
+
+#: core/validators.py:138
+msgid "Enter a valid e-mail address."
+msgstr "Vnesite veljavni e-naslov."
+
+#: core/validators.py:150
+msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
+msgstr "Uploadjate veljavno sliko. Trenutna datoteka ni bila niti slika niti okvarjena slika."
+
+#: core/validators.py:157
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr "URL %s ne kaΕΎe na veljavno sliko."
+
+#: core/validators.py:161
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr "Telefonska Ε‘tevilka mora biti v zapisu XXX-XXX-XXXX. \"%s\" ni vredu."
+
+#: core/validators.py:169
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr "URL %s ne kaΕΎe na veljavni QuickTime video."
+
+#: core/validators.py:173
+msgid "A valid URL is required."
+msgstr "Potreben je veljavni URL naslov."
+
+#: core/validators.py:187
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+"Potreben je veljavni HTML. Trenutni ima sledeče napake:\n"
+"%s"
+
+#: core/validators.py:194
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr "Pokvarjen XML: %s"
+
+#: core/validators.py:204
+#, python-format
+msgid "Invalid URL: %s"
+msgstr "Neveljavni URL naslov: %s"
+
+#: core/validators.py:208
+#: core/validators.py:210
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr "URL povezava %s je polomljena."
+
+#: core/validators.py:216
+msgid "Enter a valid U.S. state abbreviation."
+msgstr "Vnesi veljavno okrajΕ‘avo za ameriΕ‘ko zvezno drΕΎavo."
+
+#: core/validators.py:231
+#, 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] "Pazite na jezik! Beseda %s tu ni dovoljena."
+msgstr[1] "Pazite na jezik! Besede %s tu niso dovoljene."
+
+#: core/validators.py:238
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr "To polje mora ustrezati polju '%s'."
+
+#: core/validators.py:257
+msgid "Please enter something for at least one field."
+msgstr "Prosim, vnesite nekaj v vsaj eno od polj."
+
+#: core/validators.py:266
+#: core/validators.py:277
+msgid "Please enter both fields or leave them both empty."
+msgstr "Prosimo, izpolnite obe polji ali ju pustite obe prazni."
+
+#: core/validators.py:284
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr "To polje mora biti izpolnjeno, če je %(field)s %(value)s"
+
+#: core/validators.py:296
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr "To polje mora biti izpolnjeno, če ni %(field)s %(value)s"
+
+#: core/validators.py:315
+msgid "Duplicate values are not allowed."
+msgstr "Podvojitve niso dovoljene."
+
+#: core/validators.py:338
+#, python-format
+msgid "This value must be a power of %s."
+msgstr "Ta vrednost mora biti potenca od %s."
+
+#: core/validators.py:349
+msgid "Please enter a valid decimal number."
+msgstr "Prosim vnesite decimalno Ε‘tevilo."
+
+#: core/validators.py:351
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+msgid_plural "Please enter a valid decimal number with at most %s total digits."
+msgstr[0] "Prosimo, vnesite veljavno decimalno őtevilo z največ %s őtevkami."
+msgstr[1] "Prosimo, vnesite veljavno decimalno őtevilo z največ %s őtevkami."
+
+#: core/validators.py:354
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural "Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] "Prosimo, vnesite veljavno decimalno őtevilo z največ %s decimalnimi mesti."
+msgstr[1] "Prosimo, vnesite veljavno decimalno őtevilo z največ %s decimalnimi mesti."
+
+#: core/validators.py:364
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr "Prosimo, poskrbite, da bo prenesena datoteka velika vsaj %s bajtov."
+
+#: core/validators.py:365
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr "Poskrbite, da bo prenesena datoteka velika največ %s bajtov."
+
+#: core/validators.py:378
+msgid "The format for this field is wrong."
+msgstr "Format za to polje je napačen."
+
+#: core/validators.py:393
+msgid "This field is invalid."
+msgstr "To polje ni veljavno."
+
+#: core/validators.py:428
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr "Iz %s nisem mogel izločiti ničesar."
+
+#: core/validators.py:431
+#, python-format
+msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr "URL %(url)s je vrnil neveljavni Content-Type '%(contenttype)s'."
+
+#: core/validators.py:464
+#, python-format
+msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
+msgstr "Prosimo, zaprite nezaprto %(tag)s oznako v vrstici %(line)s. (Vrstica se začne z \"%(start)s\".)"
+
+#: core/validators.py:468
+#, python-format
+msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
+msgstr "Tekst z začetka vrstice %(line)s ni dovoljen v tem kontekstu. (Vrstica se začne z \"%(start)s\".)"
+
+#: core/validators.py:478
+#, python-format
+msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
+msgstr "\"<%(tag)s>\" v vrstici %(line)s je neveljavna oznaka. (Vrstica se začne z \"%(start)s\".)"
+
+#: core/validators.py:482
+#, python-format
+msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
+msgstr "Oznaki v vrstici %(line)s manjka eden ali več nujnih atributov (Vrstica se začne z \"%(start)s\".)"
+
+#: core/validators.py:487
+#, python-format
+msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
+msgstr "Atribut \"%(attr)s\" v vrstici %(line)s vsebuje neveljavno vrednost. (Vrstica se začne z \"%(start)s\".)"
+
+#: core/meta/__init__.py:1944
+#, python-format
+msgid "%(object)s with this %(type)s already exists for the given %(field)s."
+msgstr "%(object)s s tem %(type)s ΕΎe obstaja za veljavno (%field)s."
+
+#: core/meta/fields.py:46
+#, python-format
+msgid "Please enter a valid %s."
+msgstr "Prosimo, vnesite veljaven %s."
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr "%(optname)s s tem %(fieldname)s ΕΎe obstaja."
+
+#: core/meta/fields.py:129
+msgid " Separate multiple IDs with commas."
+msgstr "Več ID-jev ločite z vejicami."
+
+#: core/meta/fields.py:132
+msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr " Stisni \"Control\" (ali \"Command\" na Mac-u), da izbereő več kot enega."
+
+#: core/meta/fields.py:508
+msgid "Enter a valid filename."
+msgstr "Vnesite veljavno ime datoteke."
+
+#: core/meta/fields.py:782
+#, 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."
+msgstr[0] "Prosimo, vnesite veljavni %(self)s ID-je. Vrednost %(value)r ni veljavna."
+msgstr[1] "Prosimo, vnesite veljavni %(self)s ID-je. Vrednosti %(value)r niso veljavne."
+
+#: core/template/defaultfilters.py:379
+msgid "yes,no,maybe"
+msgstr "ja,ne,morda"
+
+#: parts/auth/formfields.py:27
+msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
+msgstr "Izgleda, da vaő brskalnik nima omogočenih piőkotkov. Piőkotki so potrebni za prijavo."
+
diff --git a/django/core/mail.py b/django/core/mail.py
index a25e8ed24f..d304b2e1b4 100644
--- a/django/core/mail.py
+++ b/django/core/mail.py
@@ -14,22 +14,25 @@ class SafeMIMEText(MIMEText):
             raise BadHeaderError, "Header values can't contain newlines (got %r for header %r)" % (val, name)
         MIMEText.__setitem__(self, name, val)
 
-def send_mail(subject, message, from_email, recipient_list, fail_silently=False):
+def send_mail(subject, message, from_email, recipient_list, fail_silently=False, auth_user=settings.EMAIL_HOST_USER, auth_password=settings.EMAIL_HOST_PASSWORD):
     """
     Easy wrapper for sending a single message to a recipient list. All members
     of the recipient list will see the other recipients in the 'To' field.
     """
-    return send_mass_mail([[subject, message, from_email, recipient_list]], fail_silently)
+    return send_mass_mail([[subject, message, from_email, recipient_list]], fail_silently, auth_user, auth_password)
 
-def send_mass_mail(datatuple, fail_silently=False):
+def send_mass_mail(datatuple, fail_silently=False, auth_user=settings.EMAIL_HOST_USER, auth_password=settings.EMAIL_HOST_PASSWORD):
     """
     Given a datatuple of (subject, message, from_email, recipient_list), sends
     each message to each recipient list. Returns the number of e-mails sent.
 
     If from_email is None, the DEFAULT_FROM_EMAIL setting is used.
+    If auth_user and auth_password are set, they're used to log in.
     """
     try:
         server = smtplib.SMTP(settings.EMAIL_HOST)
+        if auth_user and auth_password:
+            server.login(auth_user, auth_password)
     except:
         if fail_silently:
             return
@@ -58,9 +61,9 @@ def send_mass_mail(datatuple, fail_silently=False):
     return num_sent
 
 def mail_admins(subject, message, fail_silently=False):
-    "Sends a message to the admins, as defined by the ADMINS constant in settings.py."
+    "Sends a message to the admins, as defined by the ADMINS setting."
     send_mail(settings.EMAIL_SUBJECT_PREFIX + subject, message, settings.SERVER_EMAIL, [a[1] for a in settings.ADMINS], fail_silently)
 
 def mail_managers(subject, message, fail_silently=False):
-    "Sends a message to the managers, as defined by the MANAGERS constant in settings.py"
+    "Sends a message to the managers, as defined by the MANAGERS setting."
     send_mail(settings.EMAIL_SUBJECT_PREFIX + subject, message, settings.SERVER_EMAIL, [a[1] for a in settings.MANAGERS], fail_silently)
diff --git a/docs/email.txt b/docs/email.txt
index c39fbbd114..8159536d1e 100644
--- a/docs/email.txt
+++ b/docs/email.txt
@@ -26,10 +26,12 @@ The send_mail function
 The simplest way to send e-mail is using the function
 ``django.core.mail.send_mail``. Here's its definition::
 
-    send_mail(subject, message, from_email, recipient_list, fail_silently=False)
+    send_mail(subject, message, from_email, recipient_list,
+        fail_silently=False, auth_user=EMAIL_HOST_USER,
+        auth_password=EMAIL_HOST_PASSWORD)
 
-All parameters are required except for ``fail_silently``, which is ``False`` by
-default.
+The ``subject``, ``message``, ``from_email`` and ``recipient_list`` parameters
+are required.
 
     * ``subject``: A string.
     * ``message``: A string.
@@ -40,6 +42,13 @@ default.
     * ``fail_silently``: A boolean. If it's ``False``, ``send_mail`` will raise
       an ``smtplib.SMTPException``. See the `smtplib docs`_ for a list of
       possible exceptions, all of which are subclasses of ``SMTPException``.
+    * ``auth_user``: **New in Django development version.** The optional
+      username to use to authenticate to the SMTP server. If this isn't
+      provided, Django will use the value of the ``EMAIL_HOST_USER`` setting.
+    * ``auth_password``: **New in Django development version.** The optional
+      password to use to authenticate to the SMTP server. If this isn't
+      provided, Django will use the value of the ``EMAIL_HOST_PASSWORD``
+      setting.
 
 .. _smtplib docs: http://www.python.org/doc/current/lib/module-smtplib.html
 
@@ -49,13 +58,16 @@ The send_mass_mail function
 ``django.core.mail.send_mass_mail`` is intended to handle mass e-mailing.
 Here's the definition::
 
-    send_mass_mail(datatuple, fail_silently=False):
+    send_mass_mail(datatuple, fail_silently=False,
+        auth_user=EMAIL_HOST_USER, auth_password=EMAIL_HOST_PASSWORD):
 
 ``datatuple`` is a tuple in which each element is in this format::
 
     (subject, message, from_email, recipient_list)
 
-``fail_silently`` has the same function as in ``send_mail()``.
+``fail_silently``, ``auth_user`` and ``auth_password`` have the same functions
+as in ``send_mail()``. Note that ``auth_user`` and ``auth_password`` are only
+available in the Django development version.
 
 Each separate element of ``datatuple`` results in a separate e-mail message.
 As in ``send_mail()``, recipients in the same ``recipient_list`` will all see
diff --git a/docs/generic_views.txt b/docs/generic_views.txt
index 68c32bf92b..b6a51e0618 100644
--- a/docs/generic_views.txt
+++ b/docs/generic_views.txt
@@ -257,7 +257,7 @@ The date-based generic functions are:
     your URLconf, and you'll need to pass a ``slug_field`` key in your info
     dictionary to indicate the name of the slug field.
 
-    If your using the object_id-style URLs, you'll just need to give the URL
+    If you're using the object_id-style URLs, you'll just need to give the URL
     pattern an ``object_id`` field.
 
     You can also pass the ``template_name_field`` argument to indicate that the
@@ -290,23 +290,24 @@ Individual views are:
 
     Takes the following optional arguments:
 
-        =======================  =================================================
-        Argument                 Description
-        =======================  =================================================
-        ``paginate_by``          If set to an integer, the view will paginate
-                                 objects with ``paginate_by`` objects per page.
-                                 The view will expect a ``page`` GET param with
-                                 the (zero-indexed) page number.
+        ========================  =================================================
+        Argument                  Description
+        ========================  =================================================
+        ``paginate_by``           If set to an integer, the view will paginate
+                                  objects with ``paginate_by`` objects per page.
+                                  The view will expect a ``page`` GET param with
+                                  the (zero-indexed) page number.
 
-        ``allow_empty``          If ``False`` and there are no objects to display,
-                                 the view will raise a 404 instead of displaying
-                                 an empty index page. ``False`` is default.
-        ``template_object_name`` **New in Django development version.** Designates
-                                 the name of the object template variable. Default
-                                 is ``'object'``.
-        =======================  =================================================
+        ``allow_empty``           If ``False`` and there are no objects to display,
+                                  the view will raise a 404 instead of displaying
+                                  an empty index page. ``False`` is default.
 
-    Uses the template ``<app_label>/<model_name>_list`` by default.
+        ``template_object_name``  **New in Django development version.** Designates
+                                  the name of the object template variable. Default
+                                  is ``'object'``.
+        ========================  =================================================
+
+    Uses the template ``<app_label>/<module_name_list>`` by default.
 
     Has the following template context:
 
diff --git a/docs/settings.txt b/docs/settings.txt
index 56304ba3b4..a7a03d86e1 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -334,6 +334,30 @@ Default: ``'localhost'``
 
 The host to use for sending e-mail.
 
+EMAIL_HOST_PASSWORD
+-------------------
+
+Default: ``''`` (Empty string)
+
+**New in Django development version.**
+
+Username to use for the SMTP server defined in ``EMAIL_HOST``. If empty,
+Django won't attempt authentication.
+
+See also ``EMAIL_HOST_USER``.
+
+EMAIL_HOST_USER
+---------------
+
+Default: ``''`` (Empty string)
+
+**New in Django development version.**
+
+Username to use for the SMTP server defined in ``EMAIL_HOST``. If empty,
+Django won't attempt authentication.
+
+See also ``EMAIL_HOST_PASSWORD``.
+
 EMAIL_SUBJECT_PREFIX
 --------------------