diff --git a/AUTHORS b/AUTHORS
index ee45068cad..4966384776 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -65,6 +65,7 @@ answer newbie questions, and generally made Django that much better:
     Mikaël Barbero <mikael.barbero nospam at nospam free.fr>
     Jiri Barton
     Ned Batchelder <http://www.nedbatchelder.com/>
+    batiste@dosimple.ch
     Shannon -jj Behrens <http://jjinux.blogspot.com/>
     Esdras Beleza <linux@esdrasbeleza.com>
     Chris Bennett <chrisrbennett@yahoo.com>
@@ -231,6 +232,7 @@ answer newbie questions, and generally made Django that much better:
     Nicola Larosa <nico@teknico.net>
     Rune Rønde Laursen <runerl@skjoldhoej.dk>
     Eugene Lazutkin <http://lazutkin.com/blog/>
+    lcordier@point45.com
     Jeong-Min Lee <falsetru@gmail.com>
     Jannis Leidel <jl@websushi.org>
     Christopher Lenz <http://www.cmlenz.net/>
diff --git a/LICENSE b/LICENSE
index ba3e68a060..b0716a3908 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2005, the Lawrence Journal-World
+Copyright (c) Django Software Foundation.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 9f24f0c2df..006ab421dd 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -52,6 +52,7 @@ LANGUAGES = (
     ('el', gettext_noop('Greek')),
     ('en', gettext_noop('English')),
     ('es', gettext_noop('Spanish')),
+    ('et', gettext_noop('Estonian')), 
     ('es-ar', gettext_noop('Argentinean Spanish')),
     ('eu', gettext_noop('Basque')),
     ('fa', gettext_noop('Persian')),
@@ -70,6 +71,7 @@ LANGUAGES = (
     ('km', gettext_noop('Khmer')),
     ('kn', gettext_noop('Kannada')),
     ('lv', gettext_noop('Latvian')),
+    ('lt', gettext_noop('Lithuanian')),
     ('mk', gettext_noop('Macedonian')),
     ('nl', gettext_noop('Dutch')),
     ('no', gettext_noop('Norwegian')),
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index d62d6f1a60..a2fd2f77db 100644
Binary files a/django/conf/locale/es/LC_MESSAGES/django.mo and b/django/conf/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po
index 025dbac5f2..b665fcf9a6 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-06-13 16:14+0200\n"
-"PO-Revision-Date: 2008-06-16 10:04+0200\n"
+"PO-Revision-Date: 2008-06-18 22:45+0200\n"
 "Last-Translator: Django Spanish Translation Team <django-cat@googlegroups.com>\n"
 "Language-Team: Django Spanish Translation Team <django-cat@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -16,191 +16,191 @@ msgstr ""
 
 #: conf/global_settings.py:44
 msgid "Arabic"
-msgstr "Árabe"
+msgstr "árabe"
 
 #: conf/global_settings.py:45
 msgid "Bengali"
-msgstr "Bengalí"
+msgstr "bengalí"
 
 #: conf/global_settings.py:46
 msgid "Bulgarian"
-msgstr "Búlgaro"
+msgstr "búlgaro"
 
 #: conf/global_settings.py:47
 msgid "Catalan"
-msgstr "Catalán"
+msgstr "catalán"
 
 #: conf/global_settings.py:48
 msgid "Czech"
-msgstr "Checo"
+msgstr "checo"
 
 #: conf/global_settings.py:49
 msgid "Welsh"
-msgstr "Galés"
+msgstr "galés"
 
 #: conf/global_settings.py:50
 msgid "Danish"
-msgstr "Danés"
+msgstr "danés"
 
 #: conf/global_settings.py:51
 msgid "German"
-msgstr "Alemán"
+msgstr "alemán"
 
 #: conf/global_settings.py:52
 msgid "Greek"
-msgstr "Griego"
+msgstr "griego"
 
 #: conf/global_settings.py:53
 msgid "English"
-msgstr "Inglés"
+msgstr "inglés"
 
 #: conf/global_settings.py:54
 msgid "Spanish"
-msgstr "Español"
+msgstr "español"
 
 #: conf/global_settings.py:55
 msgid "Argentinean Spanish"
-msgstr "Español Argentino"
+msgstr "español de Argentina"
 
 #: conf/global_settings.py:56
 msgid "Basque"
-msgstr "Vasco"
+msgstr "vasco"
 
 #: conf/global_settings.py:57
 msgid "Persian"
-msgstr "Persa"
+msgstr "persa"
 
 #: conf/global_settings.py:58
 msgid "Finnish"
-msgstr "Finés"
+msgstr "finés"
 
 #: conf/global_settings.py:59
 msgid "French"
-msgstr "Francés"
+msgstr "francés"
 
 #: conf/global_settings.py:60
 msgid "Irish"
-msgstr "Irlandés"
+msgstr "irlandés"
 
 #: conf/global_settings.py:61
 msgid "Galician"
-msgstr "Gallego"
+msgstr "gallego"
 
 #: conf/global_settings.py:62
 msgid "Hungarian"
-msgstr "Húngaro"
+msgstr "húngaro"
 
 #: conf/global_settings.py:63
 msgid "Hebrew"
-msgstr "Hebreo"
+msgstr "hebreo"
 
 #: conf/global_settings.py:64
 msgid "Croatian"
-msgstr "Croata"
+msgstr "croata"
 
 #: conf/global_settings.py:65
 msgid "Icelandic"
-msgstr "Islandés"
+msgstr "islandés"
 
 #: conf/global_settings.py:66
 msgid "Italian"
-msgstr "Italiano"
+msgstr "italiano"
 
 #: conf/global_settings.py:67
 msgid "Japanese"
-msgstr "Japonés"
+msgstr "japonés"
 
 #: conf/global_settings.py:68
 msgid "Georgian"
-msgstr "Georgiano"
+msgstr "georgiano"
 
 #: conf/global_settings.py:69
 msgid "Korean"
-msgstr "Koreano"
+msgstr "koreano"
 
 #: conf/global_settings.py:70
 msgid "Khmer"
-msgstr "Khmer"
+msgstr "khmer"
 
 #: conf/global_settings.py:71
 msgid "Kannada"
-msgstr "Kannada"
+msgstr "kannada"
 
 #: conf/global_settings.py:72
 msgid "Latvian"
-msgstr "Letón"
+msgstr "letón"
 
 #: conf/global_settings.py:73
 msgid "Macedonian"
-msgstr "Macedonio"
+msgstr "macedonio"
 
 #: conf/global_settings.py:74
 msgid "Dutch"
-msgstr "Holandés"
+msgstr "holandés"
 
 #: conf/global_settings.py:75
 msgid "Norwegian"
-msgstr "Noruego"
+msgstr "noruego"
 
 #: conf/global_settings.py:76
 msgid "Polish"
-msgstr "Polaco"
+msgstr "polaco"
 
 #: conf/global_settings.py:77
 msgid "Portugese"
-msgstr "Portugués"
+msgstr "portugués"
 
 #: conf/global_settings.py:78
 msgid "Brazilian Portuguese"
-msgstr "Portugués Brasileño"
+msgstr "portugués de Brasil"
 
 #: conf/global_settings.py:79
 msgid "Romanian"
-msgstr "Rumano"
+msgstr "rumano"
 
 #: conf/global_settings.py:80
 msgid "Russian"
-msgstr "Ruso"
+msgstr "ruso"
 
 #: conf/global_settings.py:81
 msgid "Slovak"
-msgstr "Eslovaco"
+msgstr "eslovaco"
 
 #: conf/global_settings.py:82
 msgid "Slovenian"
-msgstr "Esloveno"
+msgstr "esloveno"
 
 #: conf/global_settings.py:83
 msgid "Serbian"
-msgstr "Serbio"
+msgstr "serbio"
 
 #: conf/global_settings.py:84
 msgid "Swedish"
-msgstr "Sueco"
+msgstr "sueco"
 
 #: conf/global_settings.py:85
 msgid "Tamil"
-msgstr "Tamil"
+msgstr "tamil"
 
 #: conf/global_settings.py:86
 msgid "Telugu"
-msgstr "Telugu"
+msgstr "telugu"
 
 #: conf/global_settings.py:87
 msgid "Turkish"
-msgstr "Turco"
+msgstr "turco"
 
 #: conf/global_settings.py:88
 msgid "Ukrainian"
-msgstr "Ucraniano"
+msgstr "ucraniano"
 
 #: conf/global_settings.py:89
 msgid "Simplified Chinese"
-msgstr "Chino simplificado"
+msgstr "chino simplificado"
 
 #: conf/global_settings.py:90
 msgid "Traditional Chinese"
-msgstr "Chino tradicional"
+msgstr "chino tradicional"
 
 #: contrib/admin/filterspecs.py:44
 #, python-format
@@ -4137,107 +4137,107 @@ msgstr "medio día"
 
 #: utils/dates.py:6
 msgid "Monday"
-msgstr "Lunes"
+msgstr "lunes"
 
 #: utils/dates.py:6
 msgid "Tuesday"
-msgstr "Martes"
+msgstr "martes"
 
 #: utils/dates.py:6
 msgid "Wednesday"
-msgstr "Miércoles"
+msgstr "miércoles"
 
 #: utils/dates.py:6
 msgid "Thursday"
-msgstr "Jueves"
+msgstr "jueves"
 
 #: utils/dates.py:6
 msgid "Friday"
-msgstr "Viernes"
+msgstr "viernes"
 
 #: utils/dates.py:7
 msgid "Saturday"
-msgstr "Sábado"
+msgstr "sábado"
 
 #: utils/dates.py:7
 msgid "Sunday"
-msgstr "Domingo"
+msgstr "domingo"
 
 #: utils/dates.py:10
 msgid "Mon"
-msgstr "Lun"
+msgstr "lun"
 
 #: utils/dates.py:10
 msgid "Tue"
-msgstr "Mar"
+msgstr "mar"
 
 #: utils/dates.py:10
 msgid "Wed"
-msgstr "Mié"
+msgstr "mié"
 
 #: utils/dates.py:10
 msgid "Thu"
-msgstr "Jue"
+msgstr "jue"
 
 #: utils/dates.py:10
 msgid "Fri"
-msgstr "Vie"
+msgstr "vie"
 
 #: utils/dates.py:11
 msgid "Sat"
-msgstr "Sáb"
+msgstr "sáb"
 
 #: utils/dates.py:11
 msgid "Sun"
-msgstr "Dom"
+msgstr "dom"
 
 #: utils/dates.py:18
 msgid "January"
-msgstr "Enero"
+msgstr "enero"
 
 #: utils/dates.py:18
 msgid "February"
-msgstr "Febrero"
+msgstr "febrero"
 
 #: utils/dates.py:18 utils/dates.py:31
 msgid "March"
-msgstr "Marzo"
+msgstr "marzo"
 
 #: utils/dates.py:18 utils/dates.py:31
 msgid "April"
-msgstr "Abril"
+msgstr "abril"
 
 #: utils/dates.py:18 utils/dates.py:31
 msgid "May"
-msgstr "Mayo"
+msgstr "mayo"
 
 #: utils/dates.py:18 utils/dates.py:31
 msgid "June"
-msgstr "Junio"
+msgstr "junio"
 
 #: utils/dates.py:19 utils/dates.py:31
 msgid "July"
-msgstr "Julio"
+msgstr "julio"
 
 #: utils/dates.py:19
 msgid "August"
-msgstr "Agosto"
+msgstr "agosto"
 
 #: utils/dates.py:19
 msgid "September"
-msgstr "Septiembre"
+msgstr "septiembre"
 
 #: utils/dates.py:19
 msgid "October"
-msgstr "Octubre"
+msgstr "octubre"
 
 #: utils/dates.py:19
 msgid "November"
-msgstr "Noviembre"
+msgstr "noviembre"
 
 #: utils/dates.py:20
 msgid "December"
-msgstr "Diciembre"
+msgstr "diciembre"
 
 #: utils/dates.py:23
 msgid "jan"
@@ -4289,31 +4289,31 @@ msgstr "dic"
 
 #: utils/dates.py:31
 msgid "Jan."
-msgstr "Ene."
+msgstr "ene."
 
 #: utils/dates.py:31
 msgid "Feb."
-msgstr "Feb."
+msgstr "feb."
 
 #: utils/dates.py:32
 msgid "Aug."
-msgstr "Ago."
+msgstr "ago."
 
 #: utils/dates.py:32
 msgid "Sept."
-msgstr "Sept."
+msgstr "sept."
 
 #: utils/dates.py:32
 msgid "Oct."
-msgstr "Oct."
+msgstr "oct."
 
 #: utils/dates.py:32
 msgid "Nov."
-msgstr "Nov."
+msgstr "nov."
 
 #: utils/dates.py:32
 msgid "Dec."
-msgstr "Dic."
+msgstr "dic."
 
 #: utils/text.py:127
 msgid "or"
diff --git a/django/conf/locale/et/LC_MESSAGES/django.mo b/django/conf/locale/et/LC_MESSAGES/django.mo
index 8ab647767a..f29aa1a77f 100644
Binary files a/django/conf/locale/et/LC_MESSAGES/django.mo and b/django/conf/locale/et/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/et/LC_MESSAGES/django.po b/django/conf/locale/et/LC_MESSAGES/django.po
index 2430cd0c1b..3c96818210 100644
--- a/django/conf/locale/et/LC_MESSAGES/django.po
+++ b/django/conf/locale/et/LC_MESSAGES/django.po
@@ -4,9 +4,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: removethis-eallik_at_gmail-com\n"
 "POT-Creation-Date: 2008-06-02 19:15+0300\n"
-"PO-Revision-Date: 2008-06-16 19:55+0200\n"
+"PO-Revision-Date: 2008-06-17 12:29+0300\n"
 "Last-Translator: Erik Allik <removethis-eallik_at_gmail-com>\n"
 "Language-Team: Django-i18n <django-i18n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgstr "tšehhi"
 
 #: conf/global_settings.py:48
 msgid "Welsh"
-msgstr "wales'i"
+msgstr "uelsi"
 
 #: conf/global_settings.py:49
 msgid "Danish"
@@ -59,7 +59,7 @@ msgstr "hispaania"
 
 #: conf/global_settings.py:54
 msgid "Argentinean Spanish"
-msgstr "argentiina hispaania keel"
+msgstr "argentiina hispaania"
 
 #: conf/global_settings.py:55
 msgid "Basque"
@@ -151,7 +151,7 @@ msgstr "portugali"
 
 #: conf/global_settings.py:77
 msgid "Brazilian Portuguese"
-msgstr "brasiilia portugali keel"
+msgstr "brasiilia portugali"
 
 #: conf/global_settings.py:78
 msgid "Romanian"
@@ -195,11 +195,11 @@ msgstr "ukrania"
 
 #: conf/global_settings.py:88
 msgid "Simplified Chinese"
-msgstr "lihtsustatud hiina keel"
+msgstr "lihtsustatud hiina"
 
 #: conf/global_settings.py:89
 msgid "Traditional Chinese"
-msgstr "traditsiooniline hiina keel"
+msgstr "traditsiooniline hiina"
 
 #: contrib/admin/filterspecs.py:44
 #, python-format
@@ -229,11 +229,11 @@ msgstr "Viimased 7 päeva"
 
 #: contrib/admin/filterspecs.py:119
 msgid "This month"
-msgstr "See kuu"
+msgstr "Käesolev kuu"
 
 #: contrib/admin/filterspecs.py:121
 msgid "This year"
-msgstr "See aasta"
+msgstr "Käesolev aasta"
 
 #: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
 #: oldforms/__init__.py:592
@@ -420,7 +420,7 @@ msgstr "Jah, olen kindel"
 #: contrib/admin/templates/admin/filter.html:2
 #, python-format
 msgid " By %(filter_title)s "
-msgstr " %(filter_title)s järgi "
+msgstr " %(filter_title)s "
 
 #: contrib/admin/templates/admin/filters.html:4
 msgid "Filter"
@@ -446,7 +446,7 @@ msgstr "Teil ei ole õigust midagi muuta."
 
 #: contrib/admin/templates/admin/index.html:52
 msgid "Recent Actions"
-msgstr "Hiljtuised Toimingud"
+msgstr "Hiljutised Toimingud"
 
 #: contrib/admin/templates/admin/index.html:53
 msgid "My Actions"
@@ -480,7 +480,7 @@ msgstr "Salasõna:"
 #: contrib/admin/templates/admin/login.html:25
 #: contrib/admin/views/decorators.py:31
 msgid "Log in"
-msgstr "Logi sisse"
+msgstr "Sisene"
 
 #: contrib/admin/templates/admin/object_history.html:17
 msgid "Date/time"
diff --git a/django/conf/locale/et/LC_MESSAGES/djangojs.mo b/django/conf/locale/et/LC_MESSAGES/djangojs.mo
index c3cd06ee57..2dc026ef4f 100644
Binary files a/django/conf/locale/et/LC_MESSAGES/djangojs.mo and b/django/conf/locale/et/LC_MESSAGES/djangojs.mo differ
diff --git a/django/conf/locale/et/LC_MESSAGES/djangojs.po b/django/conf/locale/et/LC_MESSAGES/djangojs.po
index 604eaa004a..05fe4bd875 100644
--- a/django/conf/locale/et/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/et/LC_MESSAGES/djangojs.po
@@ -3,10 +3,10 @@
 # This file is distributed under the same license as the django package.
 msgid ""
 msgstr ""
-"Project-Id-Version: Django"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: <removethis-eallik_at_gmail-com>\n"
 "POT-Creation-Date: 2008-06-02 19:42+0300\n"
-"PO-Revision-Date: 2008-06-16 19:55+0200\n"
+"PO-Revision-Date: 2008-06-17 12:29+0300\n"
 "Last-Translator: Erik Allik <removethis-eallik_at_gmail-com>\n"
 "Language-Team: Django-i18n <django-i18n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
diff --git a/django/conf/locale/he/LC_MESSAGES/django.mo b/django/conf/locale/he/LC_MESSAGES/django.mo
index 9aca2b263b..bd4095655e 100644
Binary files a/django/conf/locale/he/LC_MESSAGES/django.mo and b/django/conf/locale/he/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/he/LC_MESSAGES/django.po b/django/conf/locale/he/LC_MESSAGES/django.po
index 996d940338..8179773960 100644
--- a/django/conf/locale/he/LC_MESSAGES/django.po
+++ b/django/conf/locale/he/LC_MESSAGES/django.po
@@ -1,202 +1,207 @@
 # translation of Django.
-# Copyright (C) 2006 THE Django'S COPYRIGHT HOLDER
+# Copyright (C) 2008 The Django Project
 # This file is distributed under the same license as the Django package.
-# Meir Kriheli <meir@mksoft.co.il>, 2007.
-# 
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-10 02:19+0200\n"
-"PO-Revision-Date: 2007-10-07 01:31+0200\n"
+"POT-Creation-Date: 2008-06-15 23:03+0300\n"
+"PO-Revision-Date: 2008-06-17 12:53+0200\n"
 "Last-Translator: Meir Kriheli <meir@mksoft.co.il>\n"
-"Language-Team: Hebrew <he@li.org>\n"
+"Language-Team: Django-i18n <django-i18n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: conf/global_settings.py:39
-msgid "Arabic"
-msgstr "ערבית - Arabic"
-
-#: conf/global_settings.py:40
-msgid "Bengali"
-msgstr "בנגאלית - Bengali"
-
-#: conf/global_settings.py:41
-msgid "Bulgarian"
-msgstr "בולגרית - Bulgarian"
-
-#: conf/global_settings.py:42
-msgid "Catalan"
-msgstr "קאטלונית - Catalan"
-
-#: conf/global_settings.py:43
-msgid "Czech"
-msgstr "צ'כית - Czech"
-
 #: conf/global_settings.py:44
-msgid "Welsh"
-msgstr "וולשית - Welsh"
+msgid "Arabic"
+msgstr "ערבית"
 
 #: conf/global_settings.py:45
-msgid "Danish"
-msgstr "דנית - Danish"
+msgid "Bengali"
+msgstr "בנגאלית"
 
 #: conf/global_settings.py:46
-msgid "German"
-msgstr "גרמנית - German"
+msgid "Bulgarian"
+msgstr "בולגרית"
 
 #: conf/global_settings.py:47
-msgid "Greek"
-msgstr "יוונית - Greek"
+msgid "Catalan"
+msgstr "קאטלונית"
 
 #: conf/global_settings.py:48
-msgid "English"
-msgstr "אנגלית - English"
+msgid "Czech"
+msgstr "צ'כית"
 
 #: conf/global_settings.py:49
-msgid "Spanish"
-msgstr "ספרדית - Spanish"
+msgid "Welsh"
+msgstr "וולשית"
 
 #: conf/global_settings.py:50
-msgid "Argentinean Spanish"
-msgstr "ספרדית ארגנטינאית - Argentinean Spanish"
+msgid "Danish"
+msgstr "דנית"
 
 #: conf/global_settings.py:51
-msgid "Persian"
-msgstr "פרסית - Persian"
+msgid "German"
+msgstr "גרמנית"
 
 #: conf/global_settings.py:52
-msgid "Finnish"
-msgstr "פינית - Finnish"
+msgid "Greek"
+msgstr "יוונית"
 
 #: conf/global_settings.py:53
-msgid "French"
-msgstr "צרפתית - French"
+msgid "English"
+msgstr "אנגלית"
 
 #: conf/global_settings.py:54
-msgid "Gaeilge"
-msgstr "גיילית אירית - Gaeilge"
+msgid "Spanish"
+msgstr "ספרדית"
 
 #: conf/global_settings.py:55
-msgid "Galician"
-msgstr "גאליצית - Galician"
+msgid "Argentinean Spanish"
+msgstr "ספרדית ארגנטינאית"
 
 #: conf/global_settings.py:56
-msgid "Hungarian"
-msgstr "הונגרית - Hungarian"
+msgid "Basque"
+msgstr "בסקית"
 
 #: conf/global_settings.py:57
-msgid "Hebrew"
-msgstr "עברית - Hebrew"
+msgid "Persian"
+msgstr "פרסית"
 
 #: conf/global_settings.py:58
-msgid "Croatian"
-msgstr "קרואטית - Croatian"
+msgid "Finnish"
+msgstr "פינית"
 
 #: conf/global_settings.py:59
-msgid "Icelandic"
-msgstr "איסלנדית - Icelandic"
+msgid "French"
+msgstr "צרפתית"
 
 #: conf/global_settings.py:60
-msgid "Italian"
-msgstr "איטלקית - Italian"
+msgid "Irish"
+msgstr "אירית"
 
 #: conf/global_settings.py:61
-msgid "Japanese"
-msgstr "יפנית - Japanese"
+msgid "Galician"
+msgstr "גאליצית"
 
 #: conf/global_settings.py:62
-msgid "Korean"
-msgstr "קוריאנית - Korean"
+msgid "Hungarian"
+msgstr "הונגרית"
 
 #: conf/global_settings.py:63
-msgid "Khmer"
-msgstr "חמר - Khmer"
+msgid "Hebrew"
+msgstr "עברית"
 
 #: conf/global_settings.py:64
-msgid "Kannada"
-msgstr "קנדה - Kannada"
+msgid "Croatian"
+msgstr "קרואטית"
 
 #: conf/global_settings.py:65
-msgid "Latvian"
-msgstr "לטבית - Latvian"
+msgid "Icelandic"
+msgstr "איסלנדית"
 
 #: conf/global_settings.py:66
-msgid "Macedonian"
-msgstr "מקדונית - Macedonian"
+msgid "Italian"
+msgstr "איטלקית"
 
 #: conf/global_settings.py:67
-msgid "Dutch"
-msgstr "הולנדית - Dutch"
+msgid "Japanese"
+msgstr "יפנית"
 
 #: conf/global_settings.py:68
-msgid "Norwegian"
-msgstr "נורווגית - Norwegian"
+msgid "Georgian"
+msgstr "גיאורגית"
 
 #: conf/global_settings.py:69
-msgid "Polish"
-msgstr "פולנית - Polish"
+msgid "Korean"
+msgstr "קוריאנית"
 
 #: conf/global_settings.py:70
-msgid "Portugese"
-msgstr "פורטוגזית - Portugese"
+msgid "Khmer"
+msgstr "חמר"
 
 #: conf/global_settings.py:71
-msgid "Brazilian"
-msgstr "ברזילאית - Brazilian"
+msgid "Kannada"
+msgstr "קנדית"
 
 #: conf/global_settings.py:72
-msgid "Romanian"
-msgstr "רומנית - Romanian"
+msgid "Latvian"
+msgstr "לטבית"
 
 #: conf/global_settings.py:73
-msgid "Russian"
-msgstr "רוסית - Russian"
+msgid "Macedonian"
+msgstr "מקדונית"
 
 #: conf/global_settings.py:74
-msgid "Slovak"
-msgstr "סלובקית - Slovak"
+msgid "Dutch"
+msgstr "הולנדית"
 
 #: conf/global_settings.py:75
-msgid "Slovenian"
-msgstr "סלובנית - Slovenian"
+msgid "Norwegian"
+msgstr "נורווגית"
 
 #: conf/global_settings.py:76
-msgid "Serbian"
-msgstr "סרבית - Serbian"
+msgid "Polish"
+msgstr "פולנית"
 
 #: conf/global_settings.py:77
-msgid "Swedish"
-msgstr "שוודית - Swedish"
+msgid "Portugese"
+msgstr "פורטוגזית"
 
 #: conf/global_settings.py:78
+msgid "Brazilian Portuguese"
+msgstr "פורטוגזית ברזילאית"
+
+#: conf/global_settings.py:79
+msgid "Romanian"
+msgstr "רומנית"
+
+#: conf/global_settings.py:80
+msgid "Russian"
+msgstr "רוסית"
+
+#: conf/global_settings.py:81
+msgid "Slovak"
+msgstr "סלובקית"
+
+#: conf/global_settings.py:82
+msgid "Slovenian"
+msgstr "סלובנית"
+
+#: conf/global_settings.py:83
+msgid "Serbian"
+msgstr "סרבית"
+
+#: conf/global_settings.py:84
+msgid "Swedish"
+msgstr "שוודית"
+
+#: conf/global_settings.py:85
 msgid "Tamil"
 msgstr "טמילית"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:86
 msgid "Telugu"
-msgstr "טלגו - Telugu"
+msgstr "טלגו"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:87
 msgid "Turkish"
-msgstr "טורקית - Turkish"
+msgstr "טורקית"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:88
 msgid "Ukrainian"
-msgstr "אוקראינית - Ukrainian"
+msgstr "אוקראינית"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:89
 msgid "Simplified Chinese"
-msgstr "סינית פשוטה - Simplified·Chinese"
+msgstr "סינית פשוטה"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:90
 msgid "Traditional Chinese"
-msgstr "סינית מסורתית - Traditional·Chinese"
+msgstr "סינית מסורתית"
 
-#: contrib/admin/filterspecs.py:42
+#: contrib/admin/filterspecs.py:44
 #, python-format
 msgid ""
 "<h3>By %s:</h3>\n"
@@ -205,71 +210,71 @@ msgstr ""
 "<h3>ע\"י %s:</h3>\n"
 "<ul>\n"
 
-#: contrib/admin/filterspecs.py:72 contrib/admin/filterspecs.py:90
-#: contrib/admin/filterspecs.py:145 contrib/admin/filterspecs.py:171
+#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
+#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
 msgid "All"
 msgstr "הכל"
 
-#: contrib/admin/filterspecs.py:111
+#: contrib/admin/filterspecs.py:113
 msgid "Any date"
 msgstr "כל תאריך"
 
-#: contrib/admin/filterspecs.py:112
+#: contrib/admin/filterspecs.py:114
 msgid "Today"
 msgstr "היום"
 
-#: contrib/admin/filterspecs.py:115
+#: contrib/admin/filterspecs.py:117
 msgid "Past 7 days"
 msgstr "בשבוע האחרון"
 
-#: contrib/admin/filterspecs.py:117
+#: contrib/admin/filterspecs.py:119
 msgid "This month"
 msgstr "החודש"
 
-#: contrib/admin/filterspecs.py:119
+#: contrib/admin/filterspecs.py:121
 msgid "This year"
 msgstr "השנה"
 
-#: contrib/admin/filterspecs.py:145 newforms/widgets.py:221
-#: oldforms/__init__.py:591
+#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: oldforms/__init__.py:592
 msgid "Yes"
 msgstr "כן"
 
-#: contrib/admin/filterspecs.py:145 newforms/widgets.py:221
-#: oldforms/__init__.py:591
+#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: oldforms/__init__.py:592
 msgid "No"
 msgstr "לא"
 
-#: contrib/admin/filterspecs.py:152 newforms/widgets.py:221
-#: oldforms/__init__.py:591
+#: contrib/admin/filterspecs.py:154 newforms/widgets.py:231
+#: oldforms/__init__.py:592
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: contrib/admin/models.py:17
+#: contrib/admin/models.py:18
 msgid "action time"
 msgstr "זמן פעולה"
 
-#: contrib/admin/models.py:20
+#: contrib/admin/models.py:21
 msgid "object id"
 msgstr "מזהה אובייקט"
 
-#: contrib/admin/models.py:21
+#: contrib/admin/models.py:22
 msgid "object repr"
 msgstr "ייצוג אובייקט"
 
-#: contrib/admin/models.py:22
+#: contrib/admin/models.py:23
 msgid "action flag"
 msgstr "דגל פעולה"
 
-#: contrib/admin/models.py:23
+#: contrib/admin/models.py:24
 msgid "change message"
 msgstr "הערה לשינוי"
 
-#: contrib/admin/models.py:26
+#: contrib/admin/models.py:27
 msgid "log entry"
 msgstr "רישום יומן"
 
-#: contrib/admin/models.py:27
+#: contrib/admin/models.py:28
 msgid "log entries"
 msgstr "רישומי יומן"
 
@@ -468,7 +473,7 @@ msgid "Password:"
 msgstr "סיסמה:"
 
 #: contrib/admin/templates/admin/login.html:25
-#: contrib/admin/views/decorators.py:24
+#: contrib/admin/views/decorators.py:31
 msgid "Log in"
 msgstr "כניסה"
 
@@ -536,7 +541,7 @@ msgid ""
 "First, enter a username and password. Then, you'll be able to edit more user "
 "options."
 msgstr ""
-"ראשית יש להזין שם משתמש וסיסמה. לאחר מכן יהיה ביכולתך לערוך אפשרויותנוספות "
+"ראשית יש להזין שם משתמש וסיסמה. לאחר מכן יהיה ביכולתך לערוך אפשרויות נוספות "
 "עבור המשתמש"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:12
@@ -556,7 +561,7 @@ msgstr "סיסמה (שוב)"
 #: contrib/admin/templates/admin/auth/user/add_form.html:24
 #: contrib/admin/templates/admin/auth/user/change_password.html:39
 msgid "Enter the same password as above, for verification."
-msgstr "יש להזין את אותה סיסנה שוב,לאימות."
+msgstr "יש להזין את אותה סיסמה שוב,לאימות."
 
 #: contrib/admin/templates/admin/auth/user/change_password.html:27
 #, python-format
@@ -654,7 +659,7 @@ 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:16
@@ -728,7 +733,7 @@ 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
@@ -755,17 +760,17 @@ msgstr "הנוכחי."
 msgid "Change:"
 msgstr "שינוי:"
 
-#: contrib/admin/templatetags/admin_list.py:254
+#: contrib/admin/templatetags/admin_list.py:257
 msgid "All dates"
 msgstr "כל התאריכים"
 
-#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:264
+#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:267
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה."
 
-#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:268
-#: contrib/admin/views/main.py:354
+#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:271
+#: contrib/admin/views/main.py:356
 msgid "You may edit it again below."
 msgstr "ניתן לערוך שוב מתחת"
 
@@ -782,21 +787,21 @@ msgstr "הסיסמה שונתה בהצלחה."
 msgid "Change password: %s"
 msgstr "שינוי סיסמה: %s"
 
-#: contrib/admin/views/decorators.py:10 contrib/auth/forms.py:60
+#: contrib/admin/views/decorators.py:17 contrib/auth/forms.py:60
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr ""
 "נא להזין שם משתמש וסיסמה נכונים. בשני השדות גודל האותיות האנגליות משנה."
 
-#: contrib/admin/views/decorators.py:62
+#: contrib/admin/views/decorators.py:69
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
 msgstr ""
 "נא להתחבר שוב, מאחר ופג תוקף ההתחברות הנוכחית. אל דאגה: המידע ששלחת נשמר."
 
-#: contrib/admin/views/decorators.py:69
+#: contrib/admin/views/decorators.py:76
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -804,245 +809,245 @@ msgstr ""
 "נראה שהדפדפן שלך אינו מוגדר לקבל עוגיות. נא לאפשר עוגיות, לטעון מחדש את הדף "
 "ולנסות שוב."
 
-#: contrib/admin/views/decorators.py:83
-msgid "Usernames cannot contain the '@' character."
-msgstr "שם משתמש אינו יכול להכיל את התו '@'."
-
-#: contrib/admin/views/decorators.py:85
+#: contrib/admin/views/decorators.py:89
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "כתובת הדוא\"ל שלך אינה שם המשתמש שלך. נסה/י '%s' במקום."
 
-#: contrib/admin/views/doc.py:47 contrib/admin/views/doc.py:49
-#: contrib/admin/views/doc.py:51
+#: contrib/admin/views/decorators.py:93
+msgid "Usernames cannot contain the '@' character."
+msgstr "שם משתמש אינו יכול להכיל את התו '@'."
+
+#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
+#: contrib/admin/views/doc.py:52
 msgid "tag:"
 msgstr "תג:"
 
-#: contrib/admin/views/doc.py:78 contrib/admin/views/doc.py:80
-#: contrib/admin/views/doc.py:82
+#: contrib/admin/views/doc.py:79 contrib/admin/views/doc.py:81
+#: contrib/admin/views/doc.py:83
 msgid "filter:"
 msgstr "סינון:"
 
-#: contrib/admin/views/doc.py:136 contrib/admin/views/doc.py:138
-#: contrib/admin/views/doc.py:140
+#: contrib/admin/views/doc.py:137 contrib/admin/views/doc.py:139
+#: contrib/admin/views/doc.py:141
 msgid "view:"
 msgstr "צפיה (view):"
 
-#: contrib/admin/views/doc.py:165
+#: contrib/admin/views/doc.py:166
 #, python-format
 msgid "App %r not found"
 msgstr "יישום %r לא נמצא"
 
-#: contrib/admin/views/doc.py:172
+#: contrib/admin/views/doc.py:173
 #, python-format
 msgid "Model %(name)r not found in app %(label)r"
 msgstr "מודל %(name)r לא נמצא ביישום %(label)r"
 
-#: contrib/admin/views/doc.py:184
+#: contrib/admin/views/doc.py:185
 #, python-format
 msgid "the related `%(label)s.%(type)s` object"
 msgstr "האובייקט `%(label)s.%(type)s` הקשור"
 
-#: contrib/admin/views/doc.py:184 contrib/admin/views/doc.py:206
-#: contrib/admin/views/doc.py:220 contrib/admin/views/doc.py:225
+#: contrib/admin/views/doc.py:185 contrib/admin/views/doc.py:207
+#: contrib/admin/views/doc.py:221 contrib/admin/views/doc.py:226
 msgid "model:"
 msgstr "מודל:"
 
-#: contrib/admin/views/doc.py:215
+#: contrib/admin/views/doc.py:216
 #, python-format
 msgid "related `%(label)s.%(name)s` objects"
 msgstr "אובייקטי `%(label)s.%(name)s` מקושרים"
 
-#: contrib/admin/views/doc.py:220
+#: contrib/admin/views/doc.py:221
 #, python-format
 msgid "all %s"
 msgstr "כל %s"
 
-#: contrib/admin/views/doc.py:225
+#: contrib/admin/views/doc.py:226
 #, python-format
 msgid "number of %s"
 msgstr "מספר %s"
 
-#: contrib/admin/views/doc.py:230
+#: contrib/admin/views/doc.py:231
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Fields on %s objects"
 
-#: contrib/admin/views/doc.py:292 contrib/admin/views/doc.py:303
-#: contrib/admin/views/doc.py:305 contrib/admin/views/doc.py:311
-#: contrib/admin/views/doc.py:312 contrib/admin/views/doc.py:314
+#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:304
+#: contrib/admin/views/doc.py:306 contrib/admin/views/doc.py:312
+#: contrib/admin/views/doc.py:313 contrib/admin/views/doc.py:315
 msgid "Integer"
 msgstr "מספר שלם"
 
-#: contrib/admin/views/doc.py:293
+#: contrib/admin/views/doc.py:294
 msgid "Boolean (Either True or False)"
 msgstr "בוליאני (אמת או שקר)"
 
-#: contrib/admin/views/doc.py:294 contrib/admin/views/doc.py:313
+#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:314
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "מחרוזת (עד %(max_length)s תווים)"
 
-#: contrib/admin/views/doc.py:295
+#: contrib/admin/views/doc.py:296
 msgid "Comma-separated integers"
 msgstr "מספרים שלמים מופרדים בפסיקים"
 
-#: contrib/admin/views/doc.py:296
+#: contrib/admin/views/doc.py:297
 msgid "Date (without time)"
 msgstr "תאריך (ללא שעה)"
 
-#: contrib/admin/views/doc.py:297
+#: contrib/admin/views/doc.py:298
 msgid "Date (with time)"
 msgstr "תאריך (כולל שעה)"
 
-#: contrib/admin/views/doc.py:298
+#: contrib/admin/views/doc.py:299
 msgid "Decimal number"
 msgstr "מספר עשרוני"
 
-#: contrib/admin/views/doc.py:299
+#: contrib/admin/views/doc.py:300
 msgid "E-mail address"
 msgstr "כתובת דוא\"ל"
 
-#: contrib/admin/views/doc.py:300 contrib/admin/views/doc.py:301
-#: contrib/admin/views/doc.py:304
+#: contrib/admin/views/doc.py:301 contrib/admin/views/doc.py:302
+#: contrib/admin/views/doc.py:305
 msgid "File path"
 msgstr "נתיב קובץ"
 
-#: contrib/admin/views/doc.py:302
+#: contrib/admin/views/doc.py:303
 msgid "Floating point number"
 msgstr "מספר עשרוני"
 
-#: contrib/admin/views/doc.py:306 contrib/comments/models.py:85
+#: contrib/admin/views/doc.py:307 contrib/comments/models.py:89
 msgid "IP address"
 msgstr "כתובת IP"
 
-#: contrib/admin/views/doc.py:308
+#: contrib/admin/views/doc.py:309
 msgid "Boolean (Either True, False or None)"
 msgstr "בוליאני (אמת, שקר או כלום)"
 
-#: contrib/admin/views/doc.py:309
+#: contrib/admin/views/doc.py:310
 msgid "Relation to parent model"
 msgstr "יחס למודל אב"
 
-#: contrib/admin/views/doc.py:310
+#: contrib/admin/views/doc.py:311
 msgid "Phone number"
 msgstr "מספר טלפון"
 
-#: contrib/admin/views/doc.py:315
+#: contrib/admin/views/doc.py:316
 msgid "Text"
 msgstr "טקסט"
 
-#: contrib/admin/views/doc.py:316
+#: contrib/admin/views/doc.py:317
 msgid "Time"
 msgstr "זמן"
 
-#: contrib/admin/views/doc.py:317 contrib/flatpages/models.py:7
+#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:8
 msgid "URL"
 msgstr "URL"
 
-#: contrib/admin/views/doc.py:318
+#: contrib/admin/views/doc.py:319
 msgid "U.S. state (two uppercase letters)"
 msgstr "מדינה בארה\"ב (שתי אותיות גדולות)"
 
-#: contrib/admin/views/doc.py:319
+#: contrib/admin/views/doc.py:320
 msgid "XML text"
 msgstr "טקסט XML"
 
-#: contrib/admin/views/doc.py:345
+#: contrib/admin/views/doc.py:346
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "לא נראה ש-%s הוא אובייקט urlpattern"
 
-#: contrib/admin/views/main.py:230
+#: contrib/admin/views/main.py:233
 msgid "Site administration"
 msgstr "ניהול אתר"
 
-#: contrib/admin/views/main.py:278 contrib/admin/views/main.py:363
+#: contrib/admin/views/main.py:280 contrib/admin/views/main.py:365
 #, python-format
 msgid "You may add another %s below."
 msgstr "ניתן להוסיף %s נוסף מתחת."
 
-#: contrib/admin/views/main.py:296
+#: contrib/admin/views/main.py:298
 #, python-format
 msgid "Add %s"
 msgstr "הוספת %s"
 
-#: contrib/admin/views/main.py:342
+#: contrib/admin/views/main.py:344
 #, python-format
 msgid "Added %s."
 msgstr "%s התווסף."
 
-#: contrib/admin/views/main.py:342 contrib/admin/views/main.py:344
-#: contrib/admin/views/main.py:346 core/validators.py:283
+#: contrib/admin/views/main.py:344 contrib/admin/views/main.py:346
+#: contrib/admin/views/main.py:348 core/validators.py:283
 #: db/models/manipulators.py:309
 msgid "and"
 msgstr "ו"
 
-#: contrib/admin/views/main.py:344
+#: contrib/admin/views/main.py:346
 #, python-format
 msgid "Changed %s."
 msgstr "%s שונה."
 
-#: contrib/admin/views/main.py:346
+#: contrib/admin/views/main.py:348
 #, python-format
 msgid "Deleted %s."
 msgstr "%s נמחק."
 
-#: contrib/admin/views/main.py:349
+#: contrib/admin/views/main.py:351
 msgid "No fields changed."
 msgstr "אף שדה לא השתנה."
 
-#: contrib/admin/views/main.py:352
+#: contrib/admin/views/main.py:354
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "שינוי %(name)s \"%(obj)s\" בוצע בהצלחה."
 
-#: contrib/admin/views/main.py:360
+#: contrib/admin/views/main.py:362
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה. ניתן לערוך אותו שוב מתחת."
 
-#: contrib/admin/views/main.py:398
+#: contrib/admin/views/main.py:400
 #, python-format
 msgid "Change %s"
 msgstr "שינוי %s"
 
-#: contrib/admin/views/main.py:483
+#: contrib/admin/views/main.py:487
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "אחד או יותר %(fieldname)s ב%(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:492
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "אחד או יותר %(fieldname)s ב%(name)s:"
 
-#: contrib/admin/views/main.py:520
+#: contrib/admin/views/main.py:524
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "מחיקת %(name)s \"%(obj)s\" בוצעה בהצלחה."
 
-#: contrib/admin/views/main.py:523
+#: contrib/admin/views/main.py:527
 msgid "Are you sure?"
 msgstr "האם את/ה בטוח/ה ?"
 
-#: contrib/admin/views/main.py:545
+#: contrib/admin/views/main.py:549
 #, python-format
 msgid "Change history: %s"
 msgstr "היסטוריית שינוי: %s"
 
-#: contrib/admin/views/main.py:579
+#: contrib/admin/views/main.py:583
 #, python-format
 msgid "Select %s"
 msgstr "בחירת %s"
 
-#: contrib/admin/views/main.py:579
+#: contrib/admin/views/main.py:583
 #, python-format
 msgid "Select %s to change"
 msgstr "בחירת %s לשינוי"
 
-#: contrib/admin/views/main.py:780
+#: contrib/admin/views/main.py:765
 msgid "Database error"
 msgstr "שגיאת בסיס נתונים"
 
@@ -1103,38 +1108,38 @@ msgstr "הרשאות"
 msgid "group"
 msgstr "קבוצה"
 
-#: contrib/auth/models.py:98 contrib/auth/models.py:141
+#: contrib/auth/models.py:98 contrib/auth/models.py:148
 msgid "groups"
 msgstr "קבוצות"
 
-#: contrib/auth/models.py:131
+#: contrib/auth/models.py:138
 msgid "username"
 msgstr "שם משתמש"
 
-#: contrib/auth/models.py:131
+#: contrib/auth/models.py:138
 msgid ""
 "Required. 30 characters or fewer. Alphanumeric characters only (letters, "
 "digits and underscores)."
 msgstr ""
 "דורש 30 תווים או פחות. תווים אלפאנומריים בלבד (אותיות, ספרות וקווים תחתונים)."
 
-#: contrib/auth/models.py:132
+#: contrib/auth/models.py:139
 msgid "first name"
 msgstr "שם פרטי"
 
-#: contrib/auth/models.py:133
+#: contrib/auth/models.py:140
 msgid "last name"
 msgstr "שם משפחה"
 
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:141
 msgid "e-mail address"
 msgstr "כתובת דוא\"ל"
 
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:142
 msgid "password"
 msgstr "סיסמה"
 
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:142
 msgid ""
 "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
 "password form</a>."
@@ -1142,45 +1147,45 @@ msgstr ""
 "יש להזין '[algo]$[salt]$[hexdigest]' או להשתמש ב<a href=\"password/\">טופס "
 "שינוי הסיסמה</a>."
 
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:143
 msgid "staff status"
 msgstr "סטטוס איש צוות"
 
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:143
 msgid "Designates whether the user can log into this admin site."
 msgstr "מציין האם המשתמש יכול להתחבר לאתר הניהול."
 
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:144
 msgid "active"
 msgstr "פעיל"
 
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:144
 msgid ""
-"Designates whether this user can log into the Django admin. Unselect this "
+"Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
-"מציין האם המשתמש יכול להתחבר לאתר הניהול. יש לבטל בחירה זובמקום למחוק "
-"חשבונות משתמשים."
+"מציין האם יש להתייחס למשתמש כפעיל. יש לבטל בחירה זו במקום למחוק חשבונות "
+"משתמשים."
 
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:145
 msgid "superuser status"
 msgstr "סטטוס משתמש על"
 
-#: contrib/auth/models.py:138
+#: contrib/auth/models.py:145
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "מציין שלמשתמש זה יש את כל ההרשאות ללא הצורך המפורש בהענקתן."
 
-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:146
 msgid "last login"
 msgstr "כניסה אחרונה"
 
-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:147
 msgid "date joined"
 msgstr "תאריך הצטרפות"
 
-#: contrib/auth/models.py:142
+#: contrib/auth/models.py:149
 msgid ""
 "In addition to the permissions manually assigned, this user will also get "
 "all permissions granted to each group he/she is in."
@@ -1188,35 +1193,35 @@ msgstr ""
 "בנוסף לכל ההרשאות שהוקצו ידנית, יוענקו למשתמש גם כל ההרשאות של כל קבוצה "
 "המשוייכת אליו."
 
-#: contrib/auth/models.py:143
+#: contrib/auth/models.py:150
 msgid "user permissions"
 msgstr "הרשאות משתמש"
 
-#: contrib/auth/models.py:147
+#: contrib/auth/models.py:154
 msgid "user"
 msgstr "משתמש"
 
-#: contrib/auth/models.py:148
+#: contrib/auth/models.py:155
 msgid "users"
 msgstr "משתמשים"
 
-#: contrib/auth/models.py:154
+#: contrib/auth/models.py:161
 msgid "Personal info"
 msgstr "מידע אישי"
 
-#: contrib/auth/models.py:155
+#: contrib/auth/models.py:162
 msgid "Permissions"
 msgstr "הרשאות"
 
-#: contrib/auth/models.py:156
+#: contrib/auth/models.py:163
 msgid "Important dates"
 msgstr "תאריכים חשובים"
 
-#: contrib/auth/models.py:157
+#: contrib/auth/models.py:164
 msgid "Groups"
 msgstr "קבוצות"
 
-#: contrib/auth/models.py:316
+#: contrib/auth/models.py:323
 msgid "message"
 msgstr "הודעה"
 
@@ -1224,83 +1229,83 @@ msgstr "הודעה"
 msgid "Logged out"
 msgstr "יצאת מהמערכת"
 
-#: contrib/comments/models.py:67 contrib/comments/models.py:169
+#: contrib/comments/models.py:71 contrib/comments/models.py:176
 msgid "object ID"
 msgstr "מזהה אובייקט"
 
-#: contrib/comments/models.py:68
+#: contrib/comments/models.py:72
 msgid "headline"
 msgstr "כותרת"
 
-#: contrib/comments/models.py:69 contrib/comments/models.py:90
-#: contrib/comments/models.py:170
+#: contrib/comments/models.py:73 contrib/comments/models.py:95
+#: contrib/comments/models.py:177
 msgid "comment"
 msgstr "תגובה"
 
-#: contrib/comments/models.py:70
+#: contrib/comments/models.py:74
 msgid "rating #1"
 msgstr "דירוג #1"
 
-#: contrib/comments/models.py:71
+#: contrib/comments/models.py:75
 msgid "rating #2"
 msgstr "דירוג #2"
 
-#: contrib/comments/models.py:72
+#: contrib/comments/models.py:76
 msgid "rating #3"
 msgstr "דירוג #3"
 
-#: contrib/comments/models.py:73
+#: contrib/comments/models.py:77
 msgid "rating #4"
 msgstr "דירוג #4"
 
-#: contrib/comments/models.py:74
+#: contrib/comments/models.py:78
 msgid "rating #5"
 msgstr "דירוג #5"
 
-#: contrib/comments/models.py:75
+#: contrib/comments/models.py:79
 msgid "rating #6"
 msgstr "דירוג #6"
 
-#: contrib/comments/models.py:76
+#: contrib/comments/models.py:80
 msgid "rating #7"
 msgstr "דירוג #7"
 
-#: contrib/comments/models.py:77
+#: contrib/comments/models.py:81
 msgid "rating #8"
 msgstr "דירוג #8"
 
-#: contrib/comments/models.py:82
+#: contrib/comments/models.py:86
 msgid "is valid rating"
 msgstr "האם דירוג חוקי"
 
-#: contrib/comments/models.py:83 contrib/comments/models.py:172
+#: contrib/comments/models.py:87 contrib/comments/models.py:179
 msgid "date/time submitted"
 msgstr "תאריך/שעת הגשה"
 
-#: contrib/comments/models.py:84 contrib/comments/models.py:173
+#: contrib/comments/models.py:88 contrib/comments/models.py:180
 msgid "is public"
 msgstr "ציבורי"
 
-#: contrib/comments/models.py:86
+#: contrib/comments/models.py:90
 msgid "is removed"
 msgstr "האם הוסר"
 
-#: contrib/comments/models.py:86
+#: contrib/comments/models.py:90
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr ""
 "יש לסמן תיבה זו עבור תגובה לא נאותה. הודעת \"תגובה זו נמחקה\" תוצג במקום."
 
-#: contrib/comments/models.py:91
+#: contrib/comments/models.py:96
 msgid "comments"
 msgstr "תגובות"
 
-#: contrib/comments/models.py:134 contrib/comments/models.py:213
+#: contrib/comments/models.py:140 contrib/comments/models.py:222
 msgid "Content object"
 msgstr "אובייקט תוכן"
 
-#: contrib/comments/models.py:162
+#: contrib/comments/models.py:168
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -1315,48 +1320,48 @@ msgstr ""
 "\n"
 "http://%(domain)s%(url)s"
 
-#: contrib/comments/models.py:171
+#: contrib/comments/models.py:178
 msgid "person's name"
 msgstr "שם"
 
-#: contrib/comments/models.py:174
+#: contrib/comments/models.py:181
 msgid "ip address"
 msgstr "כתובת IP"
 
-#: contrib/comments/models.py:176
+#: contrib/comments/models.py:183
 msgid "approved by staff"
 msgstr "אושר ע\"י הצוות"
 
-#: contrib/comments/models.py:179
+#: contrib/comments/models.py:187
 msgid "free comment"
 msgstr "הערה אנונימית"
 
-#: contrib/comments/models.py:180
+#: contrib/comments/models.py:188
 msgid "free comments"
 msgstr "הערות אנונימיות"
 
-#: contrib/comments/models.py:239
+#: contrib/comments/models.py:250
 msgid "score"
 msgstr "ציון"
 
-#: contrib/comments/models.py:240
+#: contrib/comments/models.py:251
 msgid "score date"
 msgstr "תאריך ציון"
 
-#: contrib/comments/models.py:243
+#: contrib/comments/models.py:255
 msgid "karma score"
 msgstr "ניקוד קארמה"
 
-#: contrib/comments/models.py:244
+#: contrib/comments/models.py:256
 msgid "karma scores"
 msgstr "ניקודי קארמה"
 
-#: contrib/comments/models.py:248
+#: contrib/comments/models.py:260
 #, python-format
 msgid "%(score)d rating by %(user)s"
 msgstr "%(score)d·דירוג ע\"י·%(user)s"
 
-#: contrib/comments/models.py:264
+#: contrib/comments/models.py:277
 #, python-format
 msgid ""
 "This comment was flagged by %(user)s:\n"
@@ -1367,36 +1372,36 @@ msgstr ""
 "\n"
 "%(text)s"
 
-#: contrib/comments/models.py:271
+#: contrib/comments/models.py:285
 msgid "flag date"
 msgstr "תאריך סימון"
 
-#: contrib/comments/models.py:274
+#: contrib/comments/models.py:289
 msgid "user flag"
 msgstr "סימון ע\"י משתמש"
 
-#: contrib/comments/models.py:275
+#: contrib/comments/models.py:290
 msgid "user flags"
 msgstr "סימונים ע\"י משתמש"
 
-#: contrib/comments/models.py:279
+#: contrib/comments/models.py:294
 #, python-format
 msgid "Flag by %r"
 msgstr "סימון ע\"י %r"
 
-#: contrib/comments/models.py:284
+#: contrib/comments/models.py:300
 msgid "deletion date"
 msgstr "תאריך מחיקה"
 
-#: contrib/comments/models.py:286
+#: contrib/comments/models.py:303
 msgid "moderator deletion"
 msgstr "מחיקת מודרטור"
 
-#: contrib/comments/models.py:287
+#: contrib/comments/models.py:304
 msgid "moderator deletions"
 msgstr "מחיקות מודרטור"
 
-#: contrib/comments/models.py:291
+#: contrib/comments/models.py:308
 #, python-format
 msgid "Moderator deletion by %r"
 msgstr "מחיקת מודרציה ע\"י %r"
@@ -1455,13 +1460,11 @@ msgid_plural ""
 "\n"
 "%(text)s"
 msgstr[0] ""
-"ההודעה נשלחה ע\"י משתמש ששלח פחות מ-%(count)s "
-"תגובה:\n"
+"ההודעה נשלחה ע\"י משתמש ששלח פחות מ-%(count)s תגובה:\n"
 "\n"
 "%(text)s"
 msgstr[1] ""
-"ההודעה נשלחה ע\"י משתמש ששלח פחות מ-%(count)s "
-"תגובות:\n"
+"ההודעה נשלחה ע\"י משתמש ששלח פחות מ-%(count)s תגובות:\n"
 "\n"
 "%(text)s"
 
@@ -1515,41 +1518,41 @@ msgstr "מזהה תגובה שגוי"
 msgid "No voting for yourself"
 msgstr "לא ניתן להצביע לעצמך"
 
-#: contrib/contenttypes/models.py:37
+#: contrib/contenttypes/models.py:67
 msgid "python model class name"
 msgstr "שם ה-class של מודל פייתון"
 
-#: contrib/contenttypes/models.py:40
+#: contrib/contenttypes/models.py:71
 msgid "content type"
 msgstr "סוג תוכן"
 
-#: contrib/contenttypes/models.py:41
+#: contrib/contenttypes/models.py:72
 msgid "content types"
 msgstr "סוגי תוכן"
 
-#: contrib/flatpages/models.py:8
+#: contrib/flatpages/models.py:9
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr ""
 "לדוגמא: '/about/contact/'. יש לוודא הימצאות הקווים הנטויים בהתחלה ובסוף."
 
-#: contrib/flatpages/models.py:9
+#: contrib/flatpages/models.py:10
 msgid "title"
 msgstr "כותרת"
 
-#: contrib/flatpages/models.py:10
+#: contrib/flatpages/models.py:11
 msgid "content"
 msgstr "תוכן"
 
-#: contrib/flatpages/models.py:11
+#: contrib/flatpages/models.py:12
 msgid "enable comments"
 msgstr "אפשר תגובות"
 
-#: contrib/flatpages/models.py:12
+#: contrib/flatpages/models.py:13
 msgid "template name"
 msgstr "שם תבנית"
 
-#: contrib/flatpages/models.py:13
+#: contrib/flatpages/models.py:14
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
@@ -1557,168 +1560,173 @@ msgstr ""
 "דוגמא: 'flatpages/contact_page.html'. אם זה לא צויין, המערכת תשתמש "
 "ב-'flatpages/default.html'."
 
-#: contrib/flatpages/models.py:14
+#: contrib/flatpages/models.py:15
 msgid "registration required"
 msgstr "הרשמה נדרשת"
 
-#: contrib/flatpages/models.py:14
+#: contrib/flatpages/models.py:15
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "אם זה מסומך, רק משתמשים מחוברים יוכלו לצפות בדף."
 
-#: contrib/flatpages/models.py:18
+#: contrib/flatpages/models.py:20
 msgid "flat page"
 msgstr "דף פשוט"
 
-#: contrib/flatpages/models.py:19
+#: contrib/flatpages/models.py:21
 msgid "flat pages"
 msgstr "דפים פשוטים"
 
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/flatpages/models.py:27
+msgid "Advanced options"
+msgstr "אפשרויות מתקדמות"
+
+#: contrib/humanize/templatetags/humanize.py:19
 msgid "th"
 msgstr "רביעי"
 
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
 msgid "st"
 msgstr "ראשון"
 
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
 msgid "nd"
 msgstr "שני"
 
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
 msgid "rd"
 msgstr "שלישי"
 
-#: contrib/humanize/templatetags/humanize.py:50
+#: contrib/humanize/templatetags/humanize.py:51
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f מיליון"
 msgstr[1] "%(value).1f מיליונים"
 
-#: contrib/humanize/templatetags/humanize.py:53
+#: contrib/humanize/templatetags/humanize.py:54
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f ביליון"
 msgstr[1] "%(value).1f ביליונים"
 
-#: contrib/humanize/templatetags/humanize.py:56
+#: contrib/humanize/templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f טריליון"
 msgstr[1] "%(value).1f טריליונים"
 
-#: contrib/humanize/templatetags/humanize.py:71
+#: contrib/humanize/templatetags/humanize.py:73
 msgid "one"
 msgstr "אחד"
 
-#: contrib/humanize/templatetags/humanize.py:71
+#: contrib/humanize/templatetags/humanize.py:73
 msgid "two"
 msgstr "שניים"
 
-#: contrib/humanize/templatetags/humanize.py:71
+#: contrib/humanize/templatetags/humanize.py:73
 msgid "three"
 msgstr "שלושה"
 
-#: contrib/humanize/templatetags/humanize.py:71
+#: contrib/humanize/templatetags/humanize.py:73
 msgid "four"
 msgstr "ארבעה"
 
-#: contrib/humanize/templatetags/humanize.py:71
+#: contrib/humanize/templatetags/humanize.py:73
 msgid "five"
 msgstr "חמישה"
 
-#: contrib/humanize/templatetags/humanize.py:71
+#: contrib/humanize/templatetags/humanize.py:73
 msgid "six"
 msgstr "שישה"
 
-#: contrib/humanize/templatetags/humanize.py:71
+#: contrib/humanize/templatetags/humanize.py:73
 msgid "seven"
 msgstr "שבעה"
 
-#: contrib/humanize/templatetags/humanize.py:71
+#: contrib/humanize/templatetags/humanize.py:73
 msgid "eight"
 msgstr "שמונה"
 
-#: contrib/humanize/templatetags/humanize.py:71
+#: contrib/humanize/templatetags/humanize.py:73
 msgid "nine"
 msgstr "תשעה"
 
-#: contrib/humanize/templatetags/humanize.py:90
+#: contrib/humanize/templatetags/humanize.py:93
 msgid "today"
 msgstr "היום"
 
-#: contrib/humanize/templatetags/humanize.py:92
+#: contrib/humanize/templatetags/humanize.py:95
 msgid "tomorrow"
 msgstr "מחר"
 
-#: contrib/humanize/templatetags/humanize.py:94
+#: contrib/humanize/templatetags/humanize.py:97
 msgid "yesterday"
 msgstr "אתמול"
 
-#: contrib/localflavor/ar/forms.py:30 contrib/localflavor/ar/forms.py:38
+#: contrib/localflavor/ar/forms.py:27
 msgid "Enter a postal code in the format NNNN or ANNNNAAA."
 msgstr "יש להזין קוד דואר בתחביר NNNN או ANNNNAAA."
 
-#: contrib/localflavor/ar/forms.py:61 contrib/localflavor/br/forms.py:103
-#: contrib/localflavor/pe/forms.py:34 contrib/localflavor/pe/forms.py:57
+#: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96
+#: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23
+#: contrib/localflavor/pe/forms.py:51
 msgid "This field requires only numbers."
 msgstr "יש להזין רק ספרות בשדה זה."
 
-#: contrib/localflavor/ar/forms.py:64
+#: contrib/localflavor/ar/forms.py:50
 msgid "This field requires 7 or 8 digits."
 msgstr "שדה זה דורש 7 או 8 ספרות."
 
-#: contrib/localflavor/ar/forms.py:75
+#: contrib/localflavor/ar/forms.py:79
 msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
 msgstr "יש להזין מספר CUIT חוקי בתחביר XX-XXXXXXXX-X או XXXXXXXXXXXX."
 
-#: contrib/localflavor/ar/forms.py:88
+#: contrib/localflavor/ar/forms.py:80
 msgid "Invalid CUIT."
 msgstr "CUIT שגוי"
 
-#: contrib/localflavor/au/forms.py:18
+#: contrib/localflavor/au/forms.py:16
 msgid "Enter a 4 digit post code."
 msgstr "יש להזין קוד דואר בן 4 ספרות."
 
-#: contrib/localflavor/br/forms.py:23
+#: contrib/localflavor/br/forms.py:21
 msgid "Enter a zip code in the format XXXXX-XXX."
 msgstr "יש להזין מיקוד בתחביר XXXXX-XXX."
 
-#: contrib/localflavor/br/forms.py:35
+#: contrib/localflavor/br/forms.py:30
 msgid "Phone numbers must be in XX-XXXX-XXXX format."
 msgstr "מספרי טלפון חייבים להיות בתחביר XX-XXXX-XXXX."
 
-#: contrib/localflavor/br/forms.py:68
+#: contrib/localflavor/br/forms.py:58
 msgid ""
 "Select a valid brazilian state. That state is not one of the available "
 "states."
 msgstr "נא לבחור מדינה ברזילאית חוקית. מדינה זו אינה אחת מהמדינות האפשריות."
 
-#: contrib/localflavor/br/forms.py:105
-msgid "This field requires at most 11 digits or 14 characters."
-msgstr "שדה זה דורש 11 או 14 ספרות לכל היותר."
-
-#: contrib/localflavor/br/forms.py:115
+#: contrib/localflavor/br/forms.py:94
 msgid "Invalid CPF number."
 msgstr "מספר CPF לא חוקי"
 
-#: contrib/localflavor/br/forms.py:137
-msgid "This field requires at least 14 digits"
-msgstr "שדה זה דורש לפחות 14 ספרות."
+#: contrib/localflavor/br/forms.py:95
+msgid "This field requires at most 11 digits or 14 characters."
+msgstr "שדה זה דורש 11 או 14 ספרות לכל היותר."
 
-#: contrib/localflavor/br/forms.py:147
+#: contrib/localflavor/br/forms.py:134
 msgid "Invalid CNPJ number."
 msgstr "מספר CNPJ לא חוקי"
 
-#: contrib/localflavor/ca/forms.py:19
+#: contrib/localflavor/br/forms.py:136
+msgid "This field requires at least 14 digits"
+msgstr "שדה זה דורש לפחות 14 ספרות."
+
+#: contrib/localflavor/ca/forms.py:17
 msgid "Enter a postal code in the format XXX XXX."
 msgstr "יש להזין מיקוד בתחביר XXX XXX."
 
-#: contrib/localflavor/ca/forms.py:81
-msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXXX format."
+#: contrib/localflavor/ca/forms.py:88
+msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
 msgstr "יש להזין מספר ביטוח לאומי קנדי חוקי בתחביר XXX-XXX-XXXX."
 
 #: contrib/localflavor/ch/ch_states.py:5
@@ -1825,23 +1833,27 @@ msgstr "צוג"
 msgid "Zurich"
 msgstr "ציריך"
 
-#: contrib/localflavor/ch/forms.py:18 contrib/localflavor/no/forms.py:14
+#: contrib/localflavor/ch/forms.py:16 contrib/localflavor/no/forms.py:12
 msgid "Enter a zip code in the format XXXX."
 msgstr "יש להזין מיקוד בתחביר XXXX."
 
-#: contrib/localflavor/ch/forms.py:90
+#: contrib/localflavor/ch/forms.py:64
 msgid ""
 "Enter a valid Swiss identity or passport card number in X1234567<0 or "
 "1234567890 format."
 msgstr "יש להזין מספר זיהוי או דרכון שוויצרי בתחביר X1234567<0 או 1234567890."
 
-#: contrib/localflavor/cl/forms.py:32
-msgid "Enter valid a Chilean RUT. The format is XX.XXX.XXX-X."
+#: contrib/localflavor/cl/forms.py:29
+msgid "Enter a valid Chilean RUT."
+msgstr "יש להזין RUT צ'יליאני חוקי."
+
+#: contrib/localflavor/cl/forms.py:30
+msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
 msgstr "יש להזין RUT צ'יליאני חוקי. התחביר הוא XX.XXX.XXX-X."
 
-#: contrib/localflavor/cl/forms.py:37
-msgid "Enter valid a Chilean RUT"
-msgstr "יש להזין RUT צ'יליאני חוקי."
+#: contrib/localflavor/cl/forms.py:31
+msgid "The Chilean RUT is not valid."
+msgstr "שדה RUT צ'יליאני אינו חוקי."
 
 #: contrib/localflavor/de/de_states.py:5
 msgid "Baden-Wuerttemberg"
@@ -1907,21 +1919,20 @@ msgstr "שלזוויג-הולשטיין"
 msgid "Thuringia"
 msgstr "תורינגיה"
 
-#: contrib/localflavor/de/forms.py:16 contrib/localflavor/fi/forms.py:14
-#: contrib/localflavor/fr/forms.py:17
+#: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12
+#: contrib/localflavor/fr/forms.py:15
 msgid "Enter a zip code in the format XXXXX."
 msgstr "יש להזין מיקוד בתחביר XXXXX."
 
-#: contrib/localflavor/de/forms.py:60
+#: contrib/localflavor/de/forms.py:41
 msgid ""
 "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
 "format."
 msgstr "יש להזין מספר זיהוי גרמני חוקי בתחביר XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
 
 #: contrib/localflavor/es/es_provinces.py:5
-#, fuzzy
 msgid "Arava"
-msgstr "טרנאוה"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:6
 msgid "Albacete"
@@ -1932,28 +1943,24 @@ msgid "Alacant"
 msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:8
-#, fuzzy
 msgid "Almeria"
-msgstr "פומרניה"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:9
-#, fuzzy
 msgid "Avila"
-msgstr "אקיטה"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:10
-#, fuzzy
 msgid "Badajoz"
-msgstr "ברדיוב"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:11
 msgid "Illes Balears"
 msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:12
-#, fuzzy
 msgid "Barcelona"
-msgstr "מקדונית - Macedonian"
+msgstr "ברצלונה"
 
 #: contrib/localflavor/es/es_provinces.py:13
 msgid "Burgos"
@@ -1964,9 +1971,8 @@ msgid "Caceres"
 msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:15
-#, fuzzy
 msgid "Cadiz"
-msgstr "צ'דקה"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:16
 msgid "Castello"
@@ -1985,18 +1991,16 @@ msgid "A Coruna"
 msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:20
-#, fuzzy
 msgid "Cuenca"
-msgstr "סניצ'ה"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:21
 msgid "Girona"
 msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:22
-#, fuzzy
 msgid "Granada"
-msgstr "קנדה - Kannada"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:23
 msgid "Guadalajara"
@@ -2011,24 +2015,20 @@ msgid "Huelva"
 msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:26
-#, fuzzy
 msgid "Huesca"
-msgstr "שלישי"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:27
-#, fuzzy
 msgid "Jaen"
-msgstr "ינו'"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:28
-#, fuzzy
 msgid "Leon"
-msgstr "כניסה"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:29
-#, fuzzy
 msgid "Lleida"
-msgstr "סילסיה"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:30
 #: contrib/localflavor/es/es_regions.py:17
@@ -2041,37 +2041,32 @@ msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:32
 #: contrib/localflavor/es/es_regions.py:18
-#, fuzzy
 msgid "Madrid"
-msgstr "מרטין"
+msgstr "מדריד"
 
 #: contrib/localflavor/es/es_provinces.py:33
-#, fuzzy
 msgid "Malaga"
-msgstr "גלנטה"
+msgstr "מאלאגה"
 
 #: contrib/localflavor/es/es_provinces.py:34
-#, fuzzy
 msgid "Murcia"
-msgstr "ז'ורה"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:35
 msgid "Navarre"
 msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:36
-#, fuzzy
 msgid "Ourense"
-msgstr "דרנתה"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:37
 msgid "Asturias"
 msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:38
-#, fuzzy
 msgid "Palencia"
-msgstr "גאליצית - Galician"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:39
 msgid "Las Palmas"
@@ -2082,9 +2077,8 @@ msgid "Pontevedra"
 msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:41
-#, fuzzy
 msgid "Salamanca"
-msgstr "סאיטאמה"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:42
 msgid "Santa Cruz de Tenerife"
@@ -2092,65 +2086,56 @@ msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:43
 #: contrib/localflavor/es/es_regions.py:11
-#, fuzzy
 msgid "Cantabria"
-msgstr "קאטלונית - Catalan"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:44
-#, fuzzy
 msgid "Segovia"
-msgstr "סלובנית - Slovenian"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:45
-#, fuzzy
 msgid "Seville"
-msgstr "לביצה"
+msgstr "סביליה"
 
 #: contrib/localflavor/es/es_provinces.py:46
-#, fuzzy
 msgid "Soria"
-msgstr "סרבית - Serbian"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:47
 msgid "Tarragona"
 msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:48
-#, fuzzy
 msgid "Teruel"
-msgstr "שלישי"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:49
 msgid "Toledo"
 msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:50
-#, fuzzy
 msgid "Valencia"
-msgstr "גאליצית - Galician"
+msgstr "ולנסיה"
 
 #: contrib/localflavor/es/es_provinces.py:51
-#, fuzzy
 msgid "Valladolid"
-msgstr "ואלה"
+msgstr "ויאדוליד"
 
 #: contrib/localflavor/es/es_provinces.py:52
 msgid "Bizkaia"
 msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:53
-#, fuzzy
 msgid "Zamora"
-msgstr "נארה"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:54
 msgid "Zaragoza"
 msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:55
-#, fuzzy
 msgid "Ceuta"
-msgstr "דטבה"
+msgstr ""
 
 #: contrib/localflavor/es/es_provinces.py:56
 msgid "Melilla"
@@ -2177,9 +2162,8 @@ msgid "Basque Country"
 msgstr ""
 
 #: contrib/localflavor/es/es_regions.py:10
-#, fuzzy
 msgid "Canary Islands"
-msgstr "חבל הסאר"
+msgstr ""
 
 #: contrib/localflavor/es/es_regions.py:12
 msgid "Castile-La Mancha"
@@ -2190,18 +2174,16 @@ msgid "Castile and Leon"
 msgstr ""
 
 #: contrib/localflavor/es/es_regions.py:14
-#, fuzzy
 msgid "Catalonia"
-msgstr "קאטלונית - Catalan"
+msgstr "קאטלוניה"
 
 #: contrib/localflavor/es/es_regions.py:15
 msgid "Extremadura"
 msgstr ""
 
 #: contrib/localflavor/es/es_regions.py:16
-#, fuzzy
 msgid "Galicia"
-msgstr "גאליצית - Galician"
+msgstr "גאליציה"
 
 #: contrib/localflavor/es/es_regions.py:19
 msgid "Region of Murcia"
@@ -2215,51 +2197,50 @@ msgstr ""
 msgid "Valencian Community"
 msgstr ""
 
-#: contrib/localflavor/es/forms.py:22
-#, fuzzy
+#: contrib/localflavor/es/forms.py:19
 msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "יש להזין מיקוד בתחביר XXX XXX."
+msgstr ""
 
 #: contrib/localflavor/es/forms.py:39
-#, fuzzy
 msgid ""
 "Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
 "9XXXXXXXX."
-msgstr "נא להזין שדה מספר מס (NIP) בתחביר XXX-XXX-XX-XX או XX-XX-XXX-XXX."
+msgstr ""
 
-#: contrib/localflavor/es/forms.py:73 contrib/localflavor/es/forms.py:108
-#: db/models/fields/related.py:55
-#, python-format
-msgid "Please enter a valid %s."
-msgstr "יש להזין %s חוקי."
+#: contrib/localflavor/es/forms.py:66
+msgid "Please enter a valid NIF, NIE, or CIF."
+msgstr ""
 
-#: contrib/localflavor/es/forms.py:91
+#: contrib/localflavor/es/forms.py:67
+msgid "Please enter a valid NIF or NIE."
+msgstr ""
+
+#: contrib/localflavor/es/forms.py:68
 msgid "Invalid checksum for NIF."
 msgstr ""
 
-#: contrib/localflavor/es/forms.py:97
+#: contrib/localflavor/es/forms.py:69
 msgid "Invalid checksum for NIE."
 msgstr ""
 
-#: contrib/localflavor/es/forms.py:106
+#: contrib/localflavor/es/forms.py:70
 msgid "Invalid checksum for CIF."
 msgstr ""
 
-#: contrib/localflavor/es/forms.py:136
-#, fuzzy
+#: contrib/localflavor/es/forms.py:142
 msgid ""
 "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr "יש להזין מספר זיהוי גרמני חוקי בתחביר XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
+msgstr ""
 
-#: contrib/localflavor/es/forms.py:150
+#: contrib/localflavor/es/forms.py:143
 msgid "Invalid checksum for bank account number."
 msgstr ""
 
-#: contrib/localflavor/fi/forms.py:40 contrib/localflavor/fi/forms.py:45
+#: contrib/localflavor/fi/forms.py:28
 msgid "Enter a valid Finnish social security number."
 msgstr "יש להזין מספר ביטוח לאומי פיני חוקי."
 
-#: contrib/localflavor/in_/forms.py:16
+#: contrib/localflavor/in_/forms.py:14
 msgid "Enter a zip code in the format XXXXXXX."
 msgstr "יש להזין מיקוד בתחביר XXXXXXX."
 
@@ -2268,15 +2249,15 @@ msgid ""
 "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
 msgstr "יש להזין מספר זיהוי איסלנדי חוקי. התחביר הוא XXXXXX-XXXX."
 
-#: contrib/localflavor/is_/forms.py:31
+#: contrib/localflavor/is_/forms.py:18
 msgid "The Icelandic identification number is not valid."
 msgstr "מספר הזיהוי האיסלנדי אינו חוקי"
 
-#: contrib/localflavor/it/forms.py:16
+#: contrib/localflavor/it/forms.py:14
 msgid "Enter a valid zip code."
 msgstr "יש להזין מיקוד חוקי."
 
-#: contrib/localflavor/it/forms.py:41
+#: contrib/localflavor/it/forms.py:43
 msgid "Enter a valid Social Security number."
 msgstr "יש להזין מספר ביטוח לאומי חוקי."
 
@@ -2284,7 +2265,7 @@ msgstr "יש להזין מספר ביטוח לאומי חוקי."
 msgid "Enter a valid VAT number."
 msgstr "יש להזין מספר מעמ חוקי"
 
-#: contrib/localflavor/jp/forms.py:21
+#: contrib/localflavor/jp/forms.py:17
 msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
 msgstr "יש להזין קוד דואר בתחביר XXXXXXX או XXX-XXXX."
 
@@ -2476,15 +2457,143 @@ msgstr "קגושימה"
 msgid "Okinawa"
 msgstr "אוקינאווה"
 
-#: contrib/localflavor/nl/forms.py:25
+#: contrib/localflavor/mx/mx_states.py:12
+msgid "Aguascalientes"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:13
+msgid "Baja California"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:14
+msgid "Baja California Sur"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:15
+msgid "Campeche"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:16
+msgid "Chihuahua"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:17
+msgid "Chiapas"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:18
+msgid "Coahuila"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:19
+msgid "Colima"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:20
+msgid "Distrito Federal"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:21
+msgid "Durango"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:22
+msgid "Guerrero"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:23
+msgid "Guanajuato"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:24
+msgid "Hidalgo"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:25
+msgid "Jalisco"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:26
+msgid "Estado de México"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:27
+msgid "Michoacán"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:28
+msgid "Morelos"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:29
+msgid "Nayarit"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:30
+msgid "Nuevo León"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:31
+msgid "Oaxaca"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:32
+msgid "Puebla"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:33
+msgid "Querétaro"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:34
+msgid "Quintana Roo"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:35
+msgid "Sinaloa"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:36
+msgid "San Luis Potosí"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:37
+msgid "Sonora"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:38
+msgid "Tabasco"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:39
+msgid "Tamaulipas"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:40
+msgid "Tlaxcala"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:41
+msgid "Veracruz"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:42
+msgid "Yucatán"
+msgstr ""
+
+#: contrib/localflavor/mx/mx_states.py:43
+msgid "Zacatecas"
+msgstr ""
+
+#: contrib/localflavor/nl/forms.py:21
 msgid "Enter a valid postal code"
 msgstr "יש להזין מיקוד חוקי."
 
-#: contrib/localflavor/nl/forms.py:53
+#: contrib/localflavor/nl/forms.py:52
 msgid "Enter a valid phone number"
 msgstr "יש להזין מספר טלפון חוקי"
 
-#: contrib/localflavor/nl/forms.py:76
+#: contrib/localflavor/nl/forms.py:78
 msgid "Enter a valid SoFi number"
 msgstr "יש להזין מספר SoFi חוקי"
 
@@ -2536,23 +2645,23 @@ msgstr "זילנד"
 msgid "Zuid-Holland"
 msgstr "דרום הולנד"
 
-#: contrib/localflavor/no/forms.py:35
+#: contrib/localflavor/no/forms.py:33
 msgid "Enter a valid Norwegian social security number."
 msgstr "יש להזין מספר ביטוח לאומי נורבגי חוקי."
 
-#: contrib/localflavor/pe/forms.py:36
+#: contrib/localflavor/pe/forms.py:24
 msgid "This field requires 8 digits."
 msgstr "שדה זה דורש 8 ספרות."
 
-#: contrib/localflavor/pe/forms.py:59
+#: contrib/localflavor/pe/forms.py:52
 msgid "This field requires 11 digits."
 msgstr "שדה זה דורש 11 ספרות."
 
-#: contrib/localflavor/pl/forms.py:41
+#: contrib/localflavor/pl/forms.py:39
 msgid "National Identification Number consists of 11 digits."
 msgstr "מספר זיהוי לאומי מורכב מ-11 ספרות"
 
-#: contrib/localflavor/pl/forms.py:47
+#: contrib/localflavor/pl/forms.py:40
 msgid "Wrong checksum for the National Identification Number."
 msgstr "סכום ביקורת שגוי עבודי מספר הזיהוי הלאומי"
 
@@ -2561,24 +2670,21 @@ msgid ""
 "Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
 msgstr "נא להזין שדה מספר מס (NIP) בתחביר XXX-XXX-XX-XX או XX-XX-XXX-XXX."
 
-#: contrib/localflavor/pl/forms.py:78
-#, fuzzy
+#: contrib/localflavor/pl/forms.py:73
 msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "סכום ביקורת שגוי עבודי מספר הזיהוי הלאומי"
+msgstr ""
 
-#: contrib/localflavor/pl/forms.py:107
-#, fuzzy
+#: contrib/localflavor/pl/forms.py:112
 msgid "National Business Register Number (REGON) consists of 7 or 9 digits."
-msgstr "מספר זיהוי לאומי מורכב מ-11 ספרות"
+msgstr ""
 
 #: contrib/localflavor/pl/forms.py:113
-#, fuzzy
 msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "סכום ביקורת שגוי עבודי מספר הזיהוי הלאומי"
+msgstr ""
 
-#: contrib/localflavor/pl/forms.py:148
+#: contrib/localflavor/pl/forms.py:156
 msgid "Enter a postal code in the format XX-XXX."
-msgstr "נא להזין מיקוד בתחביר XX-XXX."
+msgstr ""
 
 #: contrib/localflavor/pl/pl_voivodeships.py:8
 msgid "Lower Silesia"
@@ -2644,7 +2750,7 @@ msgstr "פולין רבתי"
 msgid "West Pomerania"
 msgstr "מערב פומרניה"
 
-#: contrib/localflavor/sk/forms.py:32
+#: contrib/localflavor/sk/forms.py:30
 msgid "Enter a postal code in the format XXXXX or XXX XX."
 msgstr "יש להזין קוד דואר בתחביר XXXXX או XXX XX."
 
@@ -2996,18 +3102,342 @@ msgstr "מחוז טרנאוה"
 msgid "Zilina region"
 msgstr "מחוז ז'ילינה"
 
-#: contrib/localflavor/uk/forms.py:18
-msgid "Enter a postcode. A space is required between the two postcode parts."
-msgstr "יש להזין קוד דואר. נדרש רווח בין שני חלקי הקוד."
+#: contrib/localflavor/uk/forms.py:21
+msgid "Enter a valid postcode."
+msgstr "יש להזין מיקוד חוקי."
 
-#: contrib/localflavor/us/forms.py:18
+#: contrib/localflavor/uk/uk_regions.py:11
+msgid "Bedfordshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:12
+msgid "Buckinghamshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:14
+msgid "Cheshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:15
+msgid "Cornwall and Isles of Scilly"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:16
+msgid "Cumbria"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:17
+msgid "Derbyshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:18
+msgid "Devon"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:19
+msgid "Dorset"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:20
+msgid "Durham"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:21
+msgid "East Sussex"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:22
+msgid "Essex"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:23
+msgid "Gloucestershire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:24
+msgid "Greater London"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:25
+msgid "Greater Manchester"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:26
+msgid "Hampshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:27
+msgid "Hertfordshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:28
+msgid "Kent"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:29
+msgid "Lancashire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:30
+msgid "Leicestershire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:31
+msgid "Lincolnshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:32
+msgid "Merseyside"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:33
+msgid "Norfolk"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:34
+msgid "North Yorkshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:35
+msgid "Northamptonshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:36
+msgid "Northumberland"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:37
+msgid "Nottinghamshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:38
+msgid "Oxfordshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:39
+msgid "Shropshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:40
+msgid "Somerset"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:41
+msgid "South Yorkshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:42
+msgid "Staffordshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:43
+msgid "Suffolk"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:44
+msgid "Surrey"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:45
+msgid "Tyne and Wear"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:46
+msgid "Warwickshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:47
+msgid "West Midlands"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:48
+msgid "West Sussex"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:49
+msgid "West Yorkshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:50
+msgid "Wiltshire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:51
+msgid "Worcestershire"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:55
+msgid "County Antrim"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:56
+msgid "County Armagh"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:57
+msgid "County Down"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:58
+msgid "County Fermanagh"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:59
+msgid "County Londonderry"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:60
+msgid "County Tyrone"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:64
+msgid "Clwyd"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:65
+msgid "Dyfed"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:66
+msgid "Gwent"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:67
+msgid "Gwynedd"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:68
+msgid "Mid Glamorgan"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:69
+msgid "Powys"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:70
+msgid "South Glamorgan"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:71
+msgid "West Glamorgan"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:75
+msgid "Borders"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:76
+msgid "Central Scotland"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:77
+msgid "Dumfries and Galloway"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:78
+msgid "Fife"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:79
+msgid "Grampian"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:80
+msgid "Highland"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:81
+msgid "Lothian"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:82
+msgid "Orkney Islands"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:83
+msgid "Shetland Islands"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:84
+msgid "Strathclyde"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:85
+msgid "Tayside"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:86
+msgid "Western Isles"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:90
+msgid "England"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:91
+msgid "Northern Ireland"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:92
+msgid "Scotland"
+msgstr ""
+
+#: contrib/localflavor/uk/uk_regions.py:93
+msgid "Wales"
+msgstr ""
+
+#: contrib/localflavor/us/forms.py:16
 msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
 msgstr "יש להזין מיקוד חוקי בתחביר XXXXX או XXXXX-XXXX."
 
-#: contrib/localflavor/us/forms.py:51
+#: contrib/localflavor/us/forms.py:54
 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
 msgstr "יש להזין מספר ביטוח לאומי אמריקאי בתחביר XXX-XX-XXXX."
 
+#: contrib/localflavor/za/forms.py:20
+msgid "Enter a valid South African ID number"
+msgstr ""
+
+#: contrib/localflavor/za/forms.py:54
+msgid "Enter a valid South African postal code"
+msgstr ""
+
+#: contrib/localflavor/za/za_provinces.py:4
+msgid "Eastern Cape"
+msgstr ""
+
+#: contrib/localflavor/za/za_provinces.py:5
+msgid "Free State"
+msgstr ""
+
+#: contrib/localflavor/za/za_provinces.py:6
+msgid "Gauteng"
+msgstr ""
+
+#: contrib/localflavor/za/za_provinces.py:7
+msgid "KwaZulu-Natal"
+msgstr ""
+
+#: contrib/localflavor/za/za_provinces.py:8
+msgid "Limpopo"
+msgstr ""
+
+#: contrib/localflavor/za/za_provinces.py:9
+msgid "Mpumalanga"
+msgstr ""
+
+#: contrib/localflavor/za/za_provinces.py:10
+msgid "Northern Cape"
+msgstr ""
+
+#: contrib/localflavor/za/za_provinces.py:11
+msgid "North West"
+msgstr ""
+
+#: contrib/localflavor/za/za_provinces.py:12
+msgid "Western Cape"
+msgstr ""
+
 #: contrib/redirects/models.py:7
 msgid "redirect from"
 msgstr "הפניה מ"
@@ -3036,23 +3466,23 @@ msgstr "הפניה"
 msgid "redirects"
 msgstr "הפניות"
 
-#: contrib/sessions/models.py:80
+#: contrib/sessions/models.py:41
 msgid "session key"
 msgstr "מפתח התחברות (session key)"
 
-#: contrib/sessions/models.py:81
+#: contrib/sessions/models.py:42
 msgid "session data"
 msgstr "מידע התחברות (session data)"
 
-#: contrib/sessions/models.py:82
+#: contrib/sessions/models.py:43
 msgid "expire date"
 msgstr "תאריך פג תוקף"
 
-#: contrib/sessions/models.py:87
+#: contrib/sessions/models.py:48
 msgid "session"
 msgstr "התחברות"
 
-#: contrib/sessions/models.py:88
+#: contrib/sessions/models.py:49
 msgid "sessions"
 msgstr "התחברויות"
 
@@ -3118,7 +3548,7 @@ msgstr "מותר להזין ספרות בלבד."
 msgid "This value can't be comprised solely of digits."
 msgstr "ערך זה אינו יכול להכיל ספרות בלבד."
 
-#: core/validators.py:128 newforms/fields.py:157
+#: core/validators.py:128 newforms/fields.py:152
 msgid "Enter a whole number."
 msgstr "נא להזין מספר שלם."
 
@@ -3135,7 +3565,7 @@ msgstr "שנה צריכה להיות 1900 ומעלה."
 msgid "Invalid date: %s"
 msgstr "תאריך שגוי: %s"
 
-#: core/validators.py:156 db/models/fields/__init__.py:509
+#: core/validators.py:156 db/models/fields/__init__.py:548
 msgid "Enter a valid date in YYYY-MM-DD format."
 msgstr "יש להזין תאריך במבנה YYYY-MM-DD."
 
@@ -3143,20 +3573,20 @@ msgstr "יש להזין תאריך במבנה YYYY-MM-DD."
 msgid "Enter a valid time in HH:MM format."
 msgstr "יש להזין שעה במבנה HH:MM."
 
-#: core/validators.py:165 db/models/fields/__init__.py:583
+#: core/validators.py:165 db/models/fields/__init__.py:625
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
 msgstr "יש להזין תאריך ושעה במבנה YYYY-MM-DD HH:MM."
 
-#: core/validators.py:170 newforms/fields.py:408
+#: core/validators.py:170 newforms/fields.py:403
 msgid "Enter a valid e-mail address."
 msgstr "יש להזין כתובת דוא\"ל חוקית."
 
-#: core/validators.py:182 core/validators.py:474 newforms/fields.py:438
-#: oldforms/__init__.py:686
+#: core/validators.py:182 core/validators.py:474 newforms/fields.py:433
+#: oldforms/__init__.py:687
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "לא נשלח שום קובץ. נא לבדוק את סוג הקידוד של הטופס."
 
-#: core/validators.py:193 newforms/fields.py:462
+#: core/validators.py:193 newforms/fields.py:459
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -3379,131 +3809,135 @@ msgstr ""
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr "%(object)s עם %(type)s קיים כבר עבור %(field)s נתון."
 
-#: db/models/fields/__init__.py:52
+#: db/models/fields/__init__.py:54
 #, python-format
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr "%(optname)s·עם·%(fieldname)s·זה קיימת כבר."
 
-#: db/models/fields/__init__.py:161 db/models/fields/__init__.py:318
-#: db/models/fields/__init__.py:735 db/models/fields/__init__.py:746
-#: newforms/fields.py:45 newforms/models.py:211 oldforms/__init__.py:373
+#: db/models/fields/__init__.py:179 db/models/fields/__init__.py:348
+#: db/models/fields/__init__.py:780 db/models/fields/__init__.py:791
+#: newforms/fields.py:46 oldforms/__init__.py:374
 msgid "This field is required."
 msgstr "יש להזין תוכן בשדה זה."
 
-#: db/models/fields/__init__.py:418
+#: db/models/fields/__init__.py:448
 msgid "This value must be an integer."
 msgstr "ערך זה חייב להיות מספר שלם."
 
-#: db/models/fields/__init__.py:454
+#: db/models/fields/__init__.py:487
 msgid "This value must be either True or False."
 msgstr "ערך זה חייב להיות אמת או שקר."
 
-#: db/models/fields/__init__.py:475
+#: db/models/fields/__init__.py:511
 msgid "This field cannot be null."
 msgstr "שדה זה אינו יכול להכיל null."
 
-#: db/models/fields/__init__.py:644
+#: db/models/fields/__init__.py:689
 msgid "This value must be a decimal number."
 msgstr "ערך זה חייב להיות מספר עשרוני."
 
-#: db/models/fields/__init__.py:755
+#: db/models/fields/__init__.py:800
 msgid "Enter a valid filename."
 msgstr "יש להזין שם קובץ חוקי."
 
-#: db/models/fields/__init__.py:904
+#: db/models/fields/__init__.py:981
 msgid "This value must be either None, True or False."
 msgstr "ערך זה חייב להיות כלום, אמת או שקר."
 
-#: db/models/fields/related.py:658
+#: db/models/fields/related.py:94
+#, python-format
+msgid "Please enter a valid %s."
+msgstr "יש להזין %s חוקי."
+
+#: db/models/fields/related.py:746
 msgid "Separate multiple IDs with commas."
 msgstr "יש להפריד מזהים מרובים בפסיקים."
 
-#: db/models/fields/related.py:660
+#: db/models/fields/related.py:748
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr "החזק את \"Control\", או \"Command\" על מק, לחוץ כדי לבחור יותר מאחד."
 
-#: db/models/fields/related.py:707
+#: db/models/fields/related.py:795
 #, 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] "נא להזין מזהה %(self)s חוקי. הערך %(value)r אינו חוקי."
-msgstr[1] ""
-"נא להזין מזהי %(self)s חוקיים. הערכים %(value)r אינם חוקיים."
+msgstr[1] "נא להזין מזהי %(self)s חוקיים. הערכים %(value)r אינם חוקיים."
 
-#: newforms/fields.py:46
+#: newforms/fields.py:47
 msgid "Enter a valid value."
 msgstr "יש להזין ערך חוקי."
 
-#: newforms/fields.py:129
+#: newforms/fields.py:124
 #, python-format
 msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
 msgstr "נא לוודא שערך זה מכיל  %(max)d תווים לכל היותר (מכיל %(length)d)."
 
-#: newforms/fields.py:130
+#: newforms/fields.py:125
 #, python-format
 msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
 msgstr "נא לוודא שערך זה מכיל לפחות %(min)d תווים (מכיל %(length)d)."
 
-#: newforms/fields.py:158 newforms/fields.py:187 newforms/fields.py:216
+#: newforms/fields.py:153 newforms/fields.py:182 newforms/fields.py:211
 #, python-format
 msgid "Ensure this value is less than or equal to %s."
 msgstr "יש לוודא שערך זה פחות מ או שווה ל %s."
 
-#: newforms/fields.py:159 newforms/fields.py:188 newforms/fields.py:217
+#: newforms/fields.py:154 newforms/fields.py:183 newforms/fields.py:212
 #, python-format
 msgid "Ensure this value is greater than or equal to %s."
 msgstr "יש לוודא שהערך גדול מ או שווה ל %s."
 
-#: newforms/fields.py:186 newforms/fields.py:215
+#: newforms/fields.py:181 newforms/fields.py:210
 msgid "Enter a number."
 msgstr "נא להזין מספר."
 
-#: newforms/fields.py:218
+#: newforms/fields.py:213
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr "נא לוודא שאין יותר מ-%s ספרות סה\"כ"
 
-#: newforms/fields.py:219
+#: newforms/fields.py:214
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "נא לוודא שאין יותר מ-%s ספרות אחרי הנקודה"
 
-#: newforms/fields.py:220
+#: newforms/fields.py:215
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr "נא לוודא שאין יותר מ-%s ספרות לפני הנקודה העשרונית"
 
-#: newforms/fields.py:268 newforms/fields.py:724
+#: newforms/fields.py:263 newforms/fields.py:751
 msgid "Enter a valid date."
 msgstr "יש להזין תאריך חוקי."
 
-#: newforms/fields.py:301 newforms/fields.py:725
+#: newforms/fields.py:296 newforms/fields.py:752
 msgid "Enter a valid time."
 msgstr "יש להזין שעה חוקית."
 
-#: newforms/fields.py:340
+#: newforms/fields.py:335
 msgid "Enter a valid date/time."
 msgstr "יש להזין תאריך ושעה חוקיים."
 
-#: newforms/fields.py:439
+#: newforms/fields.py:434
 msgid "No file was submitted."
 msgstr "לא נשלח שום קובץ"
 
-#: newforms/fields.py:440 oldforms/__init__.py:688
+#: newforms/fields.py:435 oldforms/__init__.py:689
 msgid "The submitted file is empty."
 msgstr "הקובץ שנשלח ריק."
 
-#: newforms/fields.py:498
+#: newforms/fields.py:497
 msgid "Enter a valid URL."
 msgstr "יש להזין URL חוקי."
 
-#: newforms/fields.py:499
+#: newforms/fields.py:498
 msgid "This URL appears to be a broken link."
 msgstr "ה-URL הזה נראה כקישור שבור."
 
-#: newforms/fields.py:560 newforms/models.py:194
+#: newforms/fields.py:560 newforms/models.py:299
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "יש לבחור אפשרות חוקית; '%(data)s' אינו בין %(choices)s."
 
@@ -3512,69 +3946,69 @@ msgstr "יש לבחור אפשרות חוקית; '%(data)s' אינו בין %(ch
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr "יש לבחור אפשרות חוקית. %(value)s אינו בין האפשרויות הזמינות."
 
-#: newforms/fields.py:600 newforms/fields.py:662 newforms/models.py:215
+#: newforms/fields.py:600 newforms/fields.py:662 newforms/models.py:371
 msgid "Enter a list of values."
 msgstr "יש להזין רשימת ערכים"
 
-#: newforms/fields.py:753
+#: newforms/fields.py:780
 msgid "Enter a valid IPv4 address."
 msgstr "יש להזין כתובת IPv4 חוקית."
 
-#: newforms/models.py:221
+#: newforms/models.py:372
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "יש לבחור אפשרות חוקית. %s אינו בין האפשרויות הזמינות."
 
-#: oldforms/__init__.py:408
+#: oldforms/__init__.py:409
 #, python-format
 msgid "Ensure your text is less than %s character."
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] "נא לוודא שהטקסט שלך מכיל פחות מ %s תו."
 msgstr[1] "נא לוודא שהטקסט שלך מכיל פחות מ %s תווים."
 
-#: oldforms/__init__.py:413
+#: oldforms/__init__.py:414
 msgid "Line breaks are not allowed here."
 msgstr "מעברי שורה אסורים כאן."
 
-#: oldforms/__init__.py:511 oldforms/__init__.py:585 oldforms/__init__.py:624
+#: oldforms/__init__.py:512 oldforms/__init__.py:586 oldforms/__init__.py:625
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr "יש לבחור אפשרות חוקית; '%(data)s' אינו בין %(choices)s."
 
-#: oldforms/__init__.py:744
+#: oldforms/__init__.py:745
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "חש להזין מספר שלם בין ‎-32,768 ל- 32,767."
 
-#: oldforms/__init__.py:754
+#: oldforms/__init__.py:755
 msgid "Enter a positive number."
 msgstr "יש להזין מספר חיובי."
 
-#: oldforms/__init__.py:764
+#: oldforms/__init__.py:765
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "יש להזין מספר שלם בין 0 ל- 32,767."
 
-#: template/defaultfilters.py:555
+#: template/defaultfilters.py:698
 msgid "yes,no,maybe"
 msgstr "כן,לא,אולי"
 
-#: template/defaultfilters.py:585
+#: template/defaultfilters.py:729
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d בית"
 msgstr[1] "%(size)d בתים"
 
-#: template/defaultfilters.py:587
+#: template/defaultfilters.py:731
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: template/defaultfilters.py:589
+#: template/defaultfilters.py:733
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: template/defaultfilters.py:590
+#: template/defaultfilters.py:734
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
@@ -3837,23 +4271,23 @@ msgstr "%(number)d %(type)s"
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: utils/translation/trans_real.py:395
+#: utils/translation/trans_real.py:403
 msgid "DATE_FORMAT"
 msgstr "d.m.Y"
 
-#: utils/translation/trans_real.py:396
+#: utils/translation/trans_real.py:404
 msgid "DATETIME_FORMAT"
 msgstr "d.m.y H:i:s"
 
-#: utils/translation/trans_real.py:397
+#: utils/translation/trans_real.py:405
 msgid "TIME_FORMAT"
 msgstr "H:i:s"
 
-#: utils/translation/trans_real.py:413
+#: utils/translation/trans_real.py:421
 msgid "YEAR_MONTH_FORMAT"
 msgstr "d.m.Y"
 
-#: utils/translation/trans_real.py:414
+#: utils/translation/trans_real.py:422
 msgid "MONTH_DAY_FORMAT"
 msgstr "d.m.Y"
 
@@ -3871,4 +4305,3 @@ msgstr "ה-%(verbose_name)s עודכן בהצלחה."
 #, python-format
 msgid "The %(verbose_name)s was deleted."
 msgstr "ה-%(verbose_name)s נמחק."
-
diff --git a/django/conf/locale/hr/LC_MESSAGES/django.mo b/django/conf/locale/hr/LC_MESSAGES/django.mo
index 0290455bc2..0326a71909 100644
Binary files a/django/conf/locale/hr/LC_MESSAGES/django.mo and b/django/conf/locale/hr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/hr/LC_MESSAGES/django.po b/django/conf/locale/hr/LC_MESSAGES/django.po
index ca2d1d05bf..cfdcf6f916 100644
--- a/django/conf/locale/hr/LC_MESSAGES/django.po
+++ b/django/conf/locale/hr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-01-06 16:24+0100\n"
-"PO-Revision-Date: 2008-04-17 17:30+0200\n"
+"PO-Revision-Date: 2008-06-17 23:25+0100\n"
 "Last-Translator: Aljosa Mohorovic <aljosa.mohorovic@gmail.com>\n"
 "Language-Team: Hrvatski jezik\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 
 #: conf/global_settings.py:39
 msgid "Arabic"
-msgstr ""
+msgstr "Arapski"
 
 #: conf/global_settings.py:40
 msgid "Bengali"
-msgstr ""
+msgstr "Bengalski"
 
 #: conf/global_settings.py:41
 msgid "Bulgarian"
@@ -30,7 +30,7 @@ msgstr "Bugarski"
 
 #: conf/global_settings.py:42
 msgid "Catalan"
-msgstr ""
+msgstr "Katalanski"
 
 #: conf/global_settings.py:43
 msgid "Czech"
@@ -38,7 +38,7 @@ msgstr "Češki"
 
 #: conf/global_settings.py:44
 msgid "Welsh"
-msgstr ""
+msgstr "Velški"
 
 #: conf/global_settings.py:45
 msgid "Danish"
@@ -62,7 +62,7 @@ msgstr "Španjolski"
 
 #: conf/global_settings.py:50
 msgid "Argentinean Spanish"
-msgstr ""
+msgstr "Argentinski španjolski"
 
 #: conf/global_settings.py:51
 msgid "Persian"
@@ -78,11 +78,11 @@ msgstr "Francuski"
 
 #: conf/global_settings.py:54
 msgid "Gaeilge"
-msgstr ""
+msgstr "Gaeilge"
 
 #: conf/global_settings.py:55
 msgid "Galician"
-msgstr ""
+msgstr "Galski"
 
 #: conf/global_settings.py:56
 msgid "Hungarian"
@@ -90,7 +90,7 @@ msgstr "Mađarski"
 
 #: conf/global_settings.py:57
 msgid "Hebrew"
-msgstr ""
+msgstr "Hebrejski"
 
 #: conf/global_settings.py:58
 msgid "Croatian"
@@ -98,7 +98,7 @@ msgstr "Hrvatski"
 
 #: conf/global_settings.py:59
 msgid "Icelandic"
-msgstr ""
+msgstr "Islandski"
 
 #: conf/global_settings.py:60
 msgid "Italian"
@@ -114,15 +114,15 @@ msgstr "Koreanski"
 
 #: conf/global_settings.py:63
 msgid "Khmer"
-msgstr ""
+msgstr "Kambođanski"
 
 #: conf/global_settings.py:64
 msgid "Kannada"
-msgstr ""
+msgstr "Kannada"
 
 #: conf/global_settings.py:65
 msgid "Latvian"
-msgstr ""
+msgstr "Letonski"
 
 #: conf/global_settings.py:66
 msgid "Macedonian"
@@ -174,11 +174,11 @@ msgstr "Švedski"
 
 #: conf/global_settings.py:78
 msgid "Tamil"
-msgstr ""
+msgstr "Tamilski"
 
 #: conf/global_settings.py:79
 msgid "Telugu"
-msgstr ""
+msgstr "Telugu"
 
 #: conf/global_settings.py:80
 msgid "Turkish"
@@ -186,11 +186,11 @@ msgstr "Turski"
 
 #: conf/global_settings.py:81
 msgid "Ukrainian"
-msgstr ""
+msgstr "Ukrajinski"
 
 #: conf/global_settings.py:82
 msgid "Simplified Chinese"
-msgstr ""
+msgstr "Pojednostavljeni kineski"
 
 #: conf/global_settings.py:83
 msgid "Traditional Chinese"
@@ -202,6 +202,8 @@ msgid ""
 "<h3>By %s:</h3>\n"
 "<ul>\n"
 msgstr ""
+"<h3>Po %s:</h3>\n"
+"<ul>\n"
 
 #: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
 #: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
@@ -241,7 +243,7 @@ msgstr "Ne"
 #: contrib/admin/filterspecs.py:154 newforms/widgets.py:231
 #: oldforms/__init__.py:592
 msgid "Unknown"
-msgstr "Nepoznat pojam."
+msgstr "Nepoznat pojam"
 
 #: contrib/admin/models.py:18
 msgid "action time"
@@ -253,11 +255,11 @@ msgstr "id objekta"
 
 #: contrib/admin/models.py:22
 msgid "object repr"
-msgstr ""
+msgstr "object repr"
 
 #: contrib/admin/models.py:23
 msgid "action flag"
-msgstr ""
+msgstr "action flag"
 
 #: contrib/admin/models.py:24
 msgid "change message"
@@ -265,11 +267,11 @@ msgstr "promijeni poruku"
 
 #: contrib/admin/models.py:27
 msgid "log entry"
-msgstr ""
+msgstr "log entry"
 
 #: contrib/admin/models.py:28
 msgid "log entries"
-msgstr ""
+msgstr "log entries"
 
 #: contrib/admin/templates/admin/404.html:4
 #: contrib/admin/templates/admin/404.html:8
@@ -310,11 +312,10 @@ msgid "Server Error <em>(500)</em>"
 msgstr "Serverska pogreška <em>(500)</em>"
 
 #: contrib/admin/templates/admin/500.html:10
-#, fuzzy
 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 "i."
+msgstr "Dogodila se pogreška. Administratori su obaviješteni putem e-maila te bi pogreška uskoro trebala biti ispravljena. Hvala na strpljenju."
 
 #: contrib/admin/templates/admin/base.html:26
 msgid "Welcome,"
@@ -371,12 +372,12 @@ msgstr "Redoslijed"
 
 #: contrib/admin/templates/admin/change_form.html:52
 msgid "Order:"
-msgstr "Redoslijed"
+msgstr "Redoslijed:"
 
 #: contrib/admin/templates/admin/change_list.html:11
 #, python-format
 msgid "Add %(name)s"
-msgstr "Add %(name)s"
+msgstr "Dodaj %(name)s"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:8
 #: contrib/admin/templates/admin/submit_line.html:3
@@ -399,6 +400,8 @@ msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
 "All of the following related items will be deleted:"
 msgstr ""
+"Jeste li sigurni da želite izbrisati %(object_name)s \"%(escaped_object)s\"? "
+"Svi navedeni objekti biti će izbrisani:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:25
 msgid "Yes, I'm sure"
@@ -482,7 +485,7 @@ msgstr "Akcija"
 
 #: contrib/admin/templates/admin/object_history.html:25
 msgid "DATE_WITH_TIME_FULL"
-msgstr ""
+msgstr "DATE_WITH_TIME_FULL"
 
 #: contrib/admin/templates/admin/object_history.html:35
 msgid ""
@@ -562,11 +565,11 @@ msgstr "Unesi novu lozinku za korisnika <strong>%(username)s</strong>."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Bookmarklets"
-msgstr ""
+msgstr "Bookmarklets"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:4
 msgid "Documentation bookmarklets"
-msgstr ""
+msgstr "Dokumentacija bookmarklets-a"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:8
 msgid ""
@@ -579,12 +582,12 @@ msgid ""
 "your computer is \"internal\").</p>\n"
 msgstr ""
 "\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"
+"<p class=\"help\">Da bi instalirali bookmarklet, povucite link na svoj bookmarks\n"
+"toolbar, ili desnim klikom na link dodajte u svoje bookmarke. Sada možete\n"
+"selektirati bookmarklet sa bilo koje stranice. Zapamtite da neki bookmarkleti\n"
+"zahtjevaju da gledate stranice sa računala označenog\n"
+"kao \"internal\" (razgovarajte sa svojim sistem administratorom ako niste sigurni\n"
+"je li vaše računalo \"internal\").</p>\n"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:18
 msgid "Documentation for this page"
@@ -607,22 +610,20 @@ msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
-"Prikazuje tip sadržaja i jedinstveni ID za stranice koje predstavljaju "
+"Prikazuje tip sadržaja (content-type) i jedinstveni ID za stranice koje predstavljaju "
 "pojedinačan objekt."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:24
 msgid "Edit this object (current window)"
-msgstr "Uredi objekt (u trenutno prozoru)"
+msgstr "Uredi objekt (u trenutnom prozoru)"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:25
 msgid "Jumps to the admin page for pages that represent a single object."
-msgstr ""
-"Preusmjeri na admin stranicu za stranice koje predstavljaju pojedinačan "
-"objekt."
+msgstr "Preusmjeri na admin stranicu za stranice koje predstavljaju pojedinačan objekt."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:27
 msgid "Edit this object (new window)"
-msgstr "Uredi objekt (novi prozor)"
+msgstr "Uredi objekt (u novom prozoru)"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:28
 msgid "As above, but opens the admin page in a new window."
@@ -674,7 +675,7 @@ msgstr "Potvrdi lozinku:"
 
 #: contrib/admin/templates/registration/password_change_form.html:22
 msgid "Change my password"
-msgstr "Promijeni lozinku"
+msgstr "Promijeni moju lozinku"
 
 #: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:4
@@ -741,7 +742,7 @@ msgstr "E-mail adresa:"
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
 msgid "Reset my password"
-msgstr "Resetiraj lozinku"
+msgstr "Resetiraj moju lozinku"
 
 #: contrib/admin/templates/widget/date_time.html:3
 msgid "Date:"
@@ -882,7 +883,7 @@ msgstr "Cijeli broj"
 
 #: contrib/admin/views/doc.py:294
 msgid "Boolean (Either True or False)"
-msgstr "Boolean (True or False)"
+msgstr "Boolean (True ili False)"
 
 #: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:314
 #, python-format
@@ -916,7 +917,7 @@ msgstr "Put do datoteke"
 
 #: contrib/admin/views/doc.py:303
 msgid "Floating point number"
-msgstr "Floating point number"
+msgstr "Broj s pomičnim zarezom (floating point number)"
 
 #: contrib/admin/views/doc.py:307 contrib/comments/models.py:85
 msgid "IP address"
@@ -924,11 +925,11 @@ msgstr "IP adresa"
 
 #: contrib/admin/views/doc.py:309
 msgid "Boolean (Either True, False or None)"
-msgstr "Boolean (Either True, False or None)"
+msgstr "Boolean (True, False ili None)"
 
 #: contrib/admin/views/doc.py:310
 msgid "Relation to parent model"
-msgstr "Relation to parent model"
+msgstr "Relacija na roditeljski model (parent model)"
 
 #: contrib/admin/views/doc.py:311
 msgid "Phone number"
@@ -948,7 +949,7 @@ msgstr "URL"
 
 #: contrib/admin/views/doc.py:319
 msgid "U.S. state (two uppercase letters)"
-msgstr "U.S. state (two uppercase letters)"
+msgstr "Država S.A.D.-a (dva velika slova)"
 
 #: contrib/admin/views/doc.py:320
 msgid "XML text"
@@ -992,7 +993,7 @@ msgstr "Promijenjeno %s."
 #: contrib/admin/views/main.py:348
 #, python-format
 msgid "Deleted %s."
-msgstr ""
+msgstr "Izbrisano %s."
 
 #: contrib/admin/views/main.py:351
 msgid "No fields changed."
@@ -1016,12 +1017,12 @@ msgstr "Promijeni %s"
 #: contrib/admin/views/main.py:487
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Jedan ili više %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Jedan ili više %(fieldname)s u %(name)s: %(obj)s"
 
 #: contrib/admin/views/main.py:492
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Jedan ili više %(fieldname)s in %(name)s"
+msgstr "Jedan ili više %(fieldname)s u %(name)s"
 
 #: contrib/admin/views/main.py:524
 #, python-format
@@ -1240,7 +1241,7 @@ msgstr "ID objekta"
 
 #: contrib/comments/models.py:68
 msgid "headline"
-msgstr "headline / naslov?"
+msgstr "naslov"
 
 #: contrib/comments/models.py:69 contrib/comments/models.py:90
 #: contrib/comments/models.py:170
@@ -1249,43 +1250,43 @@ msgstr "komentar"
 
 #: contrib/comments/models.py:70
 msgid "rating #1"
-msgstr "rating #1"
+msgstr "ocjena #1"
 
 #: contrib/comments/models.py:71
 msgid "rating #2"
-msgstr "rating #2"
+msgstr "ocjena #2"
 
 #: contrib/comments/models.py:72
 msgid "rating #3"
-msgstr "rating #3"
+msgstr "ocjena #3"
 
 #: contrib/comments/models.py:73
 msgid "rating #4"
-msgstr "rating #4"
+msgstr "ocjena #4"
 
 #: contrib/comments/models.py:74
 msgid "rating #5"
-msgstr "rating #5"
+msgstr "ocjena #5"
 
 #: contrib/comments/models.py:75
 msgid "rating #6"
-msgstr "rating #6"
+msgstr "ocjena #6"
 
 #: contrib/comments/models.py:76
 msgid "rating #7"
-msgstr "rating #7"
+msgstr "ocjena #7"
 
 #: contrib/comments/models.py:77
 msgid "rating #8"
-msgstr "rating #8"
+msgstr "ocjena #8"
 
 #: contrib/comments/models.py:82
 msgid "is valid rating"
-msgstr "rating je ispravan"
+msgstr "ocjena je ispravana"
 
 #: contrib/comments/models.py:83 contrib/comments/models.py:172
 msgid "date/time submitted"
-msgstr "datum/vrijeme submitted"
+msgstr "datum/vrijeme unosa"
 
 #: contrib/comments/models.py:84 contrib/comments/models.py:173
 msgid "is public"
@@ -1320,6 +1321,11 @@ msgid ""
 "\n"
 "http://%(domain)s%(url)s"
 msgstr ""
+"Napisao %(user)s dana %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
 
 #: contrib/comments/models.py:171
 msgid "person's name"
@@ -1360,7 +1366,7 @@ msgstr "karma rezultati"
 #: contrib/comments/models.py:248
 #, python-format
 msgid "%(score)d rating by %(user)s"
-msgstr "%(score)d rating po %(user)s"
+msgstr "%(score)d ocjena po %(user)s"
 
 #: contrib/comments/models.py:264
 #, python-format
@@ -1369,23 +1375,26 @@ msgid ""
 "\n"
 "%(text)s"
 msgstr ""
+"Ovaj komentar je označio %(user)s:\n"
+"\n"
+"%(text)s"
 
 #: contrib/comments/models.py:271
 msgid "flag date"
-msgstr "datum flag-a"
+msgstr "označeno datuma"
 
 #: contrib/comments/models.py:274
 msgid "user flag"
-msgstr "korisnički flag"
+msgstr "korisnička oznaka"
 
 #: contrib/comments/models.py:275
 msgid "user flags"
-msgstr "korisnički flag-ovi"
+msgstr "korisničke oznake"
 
 #: contrib/comments/models.py:279
 #, python-format
 msgid "Flag by %r"
-msgstr "Flag po %r"
+msgstr "Oznaka po %r"
 
 #: contrib/comments/models.py:284
 msgid "deletion date"
@@ -1410,7 +1419,7 @@ msgstr "Zaboravili ste lozinku?"
 
 #: contrib/comments/templates/comments/form.html:12
 msgid "Ratings"
-msgstr "Ratings"
+msgstr "Ocjene"
 
 #: contrib/comments/templates/comments/form.html:12
 #: contrib/comments/templates/comments/form.html:23
@@ -1434,7 +1443,7 @@ msgstr "Komentar:"
 #: contrib/comments/templates/comments/form.html:35
 #: contrib/comments/templates/comments/freeform.html:10
 msgid "Preview comment"
-msgstr "Preview komentara"
+msgstr "Pregled komentara"
 
 #: contrib/comments/templates/comments/freeform.html:4
 msgid "Your name:"
@@ -1442,7 +1451,7 @@ msgstr "Vaše ime:"
 
 #: contrib/comments/views/comments.py:28
 msgid "This rating is required because you've entered at least one other rating."
-msgstr ""
+msgstr "Ova ocjena je obavezna jer ste bar jednom već ocjenjivali"
 
 #: contrib/comments/views/comments.py:112
 #, python-format
@@ -1457,7 +1466,15 @@ msgid_plural ""
 "\n"
 "%(text)s"
 msgstr[0] ""
+"Ovaj komentar je napisao korisnik koji je napisao manje od %(count)s "
+"komentara:\n"
+"\n"
+"%(text)s"
 msgstr[1] ""
+"Ovaj komentar je napisao korisnik koji je napisao manje od %(count)s "
+"komentara:\n"
+"\n"
+"%(text)s"
 
 #: contrib/comments/views/comments.py:117
 #, python-format
@@ -1466,6 +1483,9 @@ msgid ""
 "\n"
 "%(text)s"
 msgstr ""
+"Ovaj komentar je napisao nedorečen korisnik:\n"
+"\n"
+"%(text)s"
 
 #: contrib/comments/views/comments.py:190
 #: contrib/comments/views/comments.py:283
@@ -1480,7 +1500,7 @@ msgstr "Jedno ili više obaveznih polja nisu poslana"
 #: contrib/comments/views/comments.py:198
 #: contrib/comments/views/comments.py:289
 msgid "Somebody tampered with the comment form (security violation)"
-msgstr ""
+msgstr "Netko je mijenjao formu komentara (sigurnosni propust)"
 
 #: contrib/comments/views/comments.py:208
 #: contrib/comments/views/comments.py:295
@@ -1488,24 +1508,25 @@ msgid ""
 "The comment form had an invalid 'target' parameter -- the object ID was "
 "invalid"
 msgstr ""
+"Forma komentara ima nepravilni 'target' parametar -- ID objekta je bio "
+"nepravilan"
 
 #: contrib/comments/views/comments.py:259
 #: contrib/comments/views/comments.py:324
 msgid "The comment form didn't provide either 'preview' or 'post'"
-msgstr ""
+msgstr "Forma komentara nije imala ni 'preview' ni 'post'"
 
 #: contrib/comments/views/karma.py:21
 msgid "Anonymous users cannot vote"
-msgstr ""
+msgstr "Anonimni korisnici ne mogu glasati"
 
 #: contrib/comments/views/karma.py:25
 msgid "Invalid comment ID"
-msgstr ""
+msgstr "Neispravan ID komentara"
 
 #: contrib/comments/views/karma.py:27
-#, fuzzy
 msgid "No voting for yourself"
-msgstr "Ne"
+msgstr "Ne možete glasati za sebe"
 
 #: contrib/contenttypes/models.py:37
 msgid "python model class name"
@@ -1567,40 +1588,40 @@ msgstr "statične stranice"
 
 #: contrib/humanize/templatetags/humanize.py:20
 msgid "th"
-msgstr ""
+msgstr "th"
 
 #: contrib/humanize/templatetags/humanize.py:20
 msgid "st"
-msgstr ""
+msgstr "st"
 
 #: contrib/humanize/templatetags/humanize.py:20
 msgid "nd"
-msgstr ""
+msgstr "nd"
 
 #: contrib/humanize/templatetags/humanize.py:20
 msgid "rd"
-msgstr ""
+msgstr "rd"
 
 #: contrib/humanize/templatetags/humanize.py:52
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value).1f milijun"
+msgstr[1] "%(value).1f milijuna"
 
 #: contrib/humanize/templatetags/humanize.py:55
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value).1f milijarda"
+msgstr[1] "%(value).1f milijarde"
 
 #: contrib/humanize/templatetags/humanize.py:58
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value).1f bilijun"
+msgstr[1] "%(value).1f bilijuna"
 
 #: contrib/humanize/templatetags/humanize.py:74
 msgid "one"
@@ -1688,7 +1709,8 @@ msgstr "Telefonski brojevi moraju biti formata XX-XXXX-XXXX."
 msgid ""
 "Select a valid brazilian state. That state is not one of the available "
 "states."
-msgstr ""
+msgstr "Izaberite ispravnu brazilsku državu. Država nije jedna od dostupnih "
+"država."
 
 #: contrib/localflavor/br/forms.py:94
 msgid "Invalid CPF number."
@@ -1696,7 +1718,7 @@ msgstr "Neispravan CPF broj."
 
 #: contrib/localflavor/br/forms.py:95
 msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Ovo polje zahtjeva najviše 11 ili 14 numeričkih znakova."
+msgstr "Ovo polje zahtjeva najviše 11 numeričkih znakova ili 14 slova."
 
 #: contrib/localflavor/br/forms.py:134
 msgid "Invalid CNPJ number."
@@ -1704,7 +1726,7 @@ msgstr "Neispravan CNPJ broj."
 
 #: contrib/localflavor/br/forms.py:136
 msgid "This field requires at least 14 digits"
-msgstr "Ovo polje zahtjeva najviše 14 numeričkih znakova"
+msgstr "Ovo polje zahtjeva bar 14 numeričkih znakova"
 
 #: contrib/localflavor/ca/forms.py:17
 msgid "Enter a postal code in the format XXX XXX."
@@ -1712,121 +1734,122 @@ msgstr "Unesi poštanski broj formata XXX XXX."
 
 #: contrib/localflavor/ca/forms.py:88
 msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
-msgstr ""
+msgstr "Unesite valjani kanadski broj socijalnog osiguranja formata XXX-XXX-XXX."
 
 #: contrib/localflavor/ch/ch_states.py:5
 msgid "Aargau"
-msgstr ""
+msgstr "Aargau"
 
 #: contrib/localflavor/ch/ch_states.py:6
 msgid "Appenzell Innerrhoden"
-msgstr ""
+msgstr "Appenzell Innerrhoden"
 
 #: contrib/localflavor/ch/ch_states.py:7
 msgid "Appenzell Ausserrhoden"
-msgstr ""
+msgstr "Appenzell Ausserrhoden"
 
 #: contrib/localflavor/ch/ch_states.py:8
 msgid "Basel-Stadt"
-msgstr ""
+msgstr "Basel-Stadt"
 
 #: contrib/localflavor/ch/ch_states.py:9
 msgid "Basel-Land"
-msgstr ""
+msgstr "Basel-Land"
 
 #: contrib/localflavor/ch/ch_states.py:10
 msgid "Berne"
-msgstr ""
+msgstr "Berne"
 
 #: contrib/localflavor/ch/ch_states.py:11
 msgid "Fribourg"
-msgstr ""
+msgstr "Fribourg"
 
 #: contrib/localflavor/ch/ch_states.py:12
 msgid "Geneva"
-msgstr ""
+msgstr "Geneva"
 
 #: contrib/localflavor/ch/ch_states.py:13
 msgid "Glarus"
-msgstr ""
+msgstr "Glarus"
 
 #: contrib/localflavor/ch/ch_states.py:14
 msgid "Graubuenden"
-msgstr ""
+msgstr "Graubuenden"
 
 #: contrib/localflavor/ch/ch_states.py:15
 msgid "Jura"
-msgstr ""
+msgstr "Jura"
 
 #: contrib/localflavor/ch/ch_states.py:16
 msgid "Lucerne"
-msgstr ""
+msgstr "Lucerne"
 
 #: contrib/localflavor/ch/ch_states.py:17
 msgid "Neuchatel"
-msgstr ""
+msgstr "Neuchatel"
 
 #: contrib/localflavor/ch/ch_states.py:18
 msgid "Nidwalden"
-msgstr ""
+msgstr "Nidwalden"
 
 #: contrib/localflavor/ch/ch_states.py:19
 msgid "Obwalden"
-msgstr ""
+msgstr "Obwalden"
 
 #: contrib/localflavor/ch/ch_states.py:20
 msgid "Schaffhausen"
-msgstr ""
+msgstr "Schaffhausen"
 
 #: contrib/localflavor/ch/ch_states.py:21
 msgid "Schwyz"
-msgstr ""
+msgstr "Schwyz"
 
 #: contrib/localflavor/ch/ch_states.py:22
 msgid "Solothurn"
-msgstr ""
+msgstr "Solothurn"
 
 #: contrib/localflavor/ch/ch_states.py:23
 msgid "St. Gallen"
-msgstr ""
+msgstr "St. Gallen"
 
 #: contrib/localflavor/ch/ch_states.py:24
 msgid "Thurgau"
-msgstr ""
+msgstr "Thurgau"
 
 #: contrib/localflavor/ch/ch_states.py:25
 msgid "Ticino"
-msgstr ""
+msgstr "Ticino"
 
 #: contrib/localflavor/ch/ch_states.py:26
 msgid "Uri"
-msgstr ""
+msgstr "Uri"
 
 #: contrib/localflavor/ch/ch_states.py:27
 msgid "Valais"
-msgstr ""
+msgstr "Valais"
 
 #: contrib/localflavor/ch/ch_states.py:28
 msgid "Vaud"
-msgstr ""
+msgstr "Vaud"
 
 #: contrib/localflavor/ch/ch_states.py:29
 msgid "Zug"
-msgstr ""
+msgstr "Zug"
 
 #: contrib/localflavor/ch/ch_states.py:30
 msgid "Zurich"
-msgstr ""
+msgstr "Zurich"
 
 #: contrib/localflavor/ch/forms.py:16 contrib/localflavor/no/forms.py:12
 msgid "Enter a zip code in the format XXXX."
-msgstr ""
+msgstr "Unesite zip kod formata XXXX."
 
 #: contrib/localflavor/ch/forms.py:64
 msgid ""
 "Enter a valid Swiss identity or passport card number in X1234567<0 or "
 "1234567890 format."
-msgstr ""
+msgstr "Unesite ispravan švicarski identifikacijski broj ili broj putovnice formata X1234567<0 ili "
+"1234567890"
 
 #: contrib/localflavor/cl/forms.py:29
 msgid "Enter a valid Chilean RUT."
@@ -1838,55 +1861,55 @@ msgstr "Unesi ispravan čileanski RUT formata XX.XXX.XXX-X."
 
 #: contrib/localflavor/cl/forms.py:31
 msgid "The Chilean RUT is not valid."
-msgstr ""
+msgstr "Čileanski RUT nije ispravan."
 
 #: contrib/localflavor/de/de_states.py:5
 msgid "Baden-Wuerttemberg"
-msgstr ""
+msgstr "Baden-Wuerttemberg"
 
 #: contrib/localflavor/de/de_states.py:6
 msgid "Bavaria"
-msgstr ""
+msgstr "Bavaria"
 
 #: contrib/localflavor/de/de_states.py:7
 msgid "Berlin"
-msgstr ""
+msgstr "Berlin"
 
 #: contrib/localflavor/de/de_states.py:8
 msgid "Brandenburg"
-msgstr ""
+msgstr "Brandenburg"
 
 #: contrib/localflavor/de/de_states.py:9
 msgid "Bremen"
-msgstr ""
+msgstr "Bremen"
 
 #: contrib/localflavor/de/de_states.py:10
 msgid "Hamburg"
-msgstr ""
+msgstr "Hamburg"
 
 #: contrib/localflavor/de/de_states.py:11
 msgid "Hessen"
-msgstr ""
+msgstr "Hessen"
 
 #: contrib/localflavor/de/de_states.py:12
 msgid "Mecklenburg-Western Pomerania"
-msgstr ""
+msgstr "Mecklenburg-Western Pomerania"
 
 #: contrib/localflavor/de/de_states.py:13
 msgid "Lower Saxony"
-msgstr ""
+msgstr "Lower Saxony"
 
 #: contrib/localflavor/de/de_states.py:14
 msgid "North Rhine-Westphalia"
-msgstr ""
+msgstr "North Rhine-Westphalia"
 
 #: contrib/localflavor/de/de_states.py:15
 msgid "Rhineland-Palatinate"
-msgstr ""
+msgstr "Rhineland-Palatinate"
 
 #: contrib/localflavor/de/de_states.py:16
 msgid "Saarland"
-msgstr ""
+msgstr "Saarland"
 
 #: contrib/localflavor/de/de_states.py:17
 msgid "Saxony"
@@ -1894,861 +1917,846 @@ msgstr "Saxony"
 
 #: contrib/localflavor/de/de_states.py:18
 msgid "Saxony-Anhalt"
-msgstr ""
+msgstr "Saxony-Anhalt"
 
 #: contrib/localflavor/de/de_states.py:19
 msgid "Schleswig-Holstein"
-msgstr ""
+msgstr "Schleswig-Holstein"
 
 #: contrib/localflavor/de/de_states.py:20
 msgid "Thuringia"
-msgstr ""
+msgstr "Thuringia"
 
 #: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12
 #: contrib/localflavor/fr/forms.py:15
 msgid "Enter a zip code in the format XXXXX."
-msgstr ""
+msgstr "Unesite zip kod formata XXXXX."
 
 #: contrib/localflavor/de/forms.py:41
 msgid ""
 "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
 "format."
-msgstr ""
+msgstr "Unesite broj njemačke identifikacijske kartice formata XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
+""
 
 #: contrib/localflavor/es/es_provinces.py:5
 msgid "Arava"
-msgstr ""
+msgstr "Arava"
 
 #: contrib/localflavor/es/es_provinces.py:6
 msgid "Albacete"
-msgstr ""
+msgstr "Albacete"
 
 #: contrib/localflavor/es/es_provinces.py:7
 msgid "Alacant"
-msgstr ""
+msgstr "Alacant"
 
 #: contrib/localflavor/es/es_provinces.py:8
 msgid "Almeria"
-msgstr ""
+msgstr "Almeria"
 
 #: contrib/localflavor/es/es_provinces.py:9
 msgid "Avila"
-msgstr "Travanj"
+msgstr "Avila"
 
 #: contrib/localflavor/es/es_provinces.py:10
 msgid "Badajoz"
-msgstr ""
+msgstr "Badajoz"
 
 #: contrib/localflavor/es/es_provinces.py:11
 msgid "Illes Balears"
-msgstr ""
+msgstr "Illes Balears"
 
 #: contrib/localflavor/es/es_provinces.py:12
 msgid "Barcelona"
-msgstr ""
+msgstr "Barcelona"
 
 #: contrib/localflavor/es/es_provinces.py:13
 msgid "Burgos"
-msgstr ""
+msgstr "Burgos"
 
 #: contrib/localflavor/es/es_provinces.py:14
 msgid "Caceres"
-msgstr ""
+msgstr "Caceres"
 
 #: contrib/localflavor/es/es_provinces.py:15
 msgid "Cadiz"
-msgstr ""
+msgstr "Cadiz"
 
 #: contrib/localflavor/es/es_provinces.py:16
 msgid "Castello"
-msgstr ""
+msgstr "Castello"
 
 #: contrib/localflavor/es/es_provinces.py:17
 msgid "Ciudad Real"
-msgstr ""
+msgstr "Ciudad Real"
 
 #: contrib/localflavor/es/es_provinces.py:18
 msgid "Cordoba"
-msgstr ""
+msgstr "Cordoba"
 
 #: contrib/localflavor/es/es_provinces.py:19
 msgid "A Coruna"
-msgstr ""
+msgstr "A Coruna"
 
 #: contrib/localflavor/es/es_provinces.py:20
 msgid "Cuenca"
-msgstr ""
+msgstr "Cuenca"
 
 #: contrib/localflavor/es/es_provinces.py:21
 msgid "Girona"
-msgstr ""
+msgstr "Girona"
 
 #: contrib/localflavor/es/es_provinces.py:22
-#, fuzzy
 msgid "Granada"
-msgstr "i"
+msgstr "Granada"
 
 #: contrib/localflavor/es/es_provinces.py:23
 msgid "Guadalajara"
-msgstr ""
+msgstr "Guadalajara"
 
 #: contrib/localflavor/es/es_provinces.py:24
 msgid "Guipuzkoa"
-msgstr ""
+msgstr "Guipuzkoa"
 
 #: contrib/localflavor/es/es_provinces.py:25
 msgid "Huelva"
-msgstr ""
+msgstr "Huelva"
 
 #: contrib/localflavor/es/es_provinces.py:26
-#, fuzzy
 msgid "Huesca"
-msgstr "Utorak"
+msgstr "Huesca"
 
 #: contrib/localflavor/es/es_provinces.py:27
-#, fuzzy
 msgid "Jaen"
-msgstr "Sij."
+msgstr "Jaen"
 
 #: contrib/localflavor/es/es_provinces.py:28
 msgid "Leon"
-msgstr ""
+msgstr "Leon"
 
 #: contrib/localflavor/es/es_provinces.py:29
 msgid "Lleida"
-msgstr ""
+msgstr "Lleida"
 
 #: contrib/localflavor/es/es_provinces.py:30
 #: contrib/localflavor/es/es_regions.py:17
 msgid "La Rioja"
-msgstr ""
+msgstr "La Rioja"
 
 #: contrib/localflavor/es/es_provinces.py:31
 msgid "Lugo"
-msgstr ""
+msgstr "Lugo"
 
 #: contrib/localflavor/es/es_provinces.py:32
 #: contrib/localflavor/es/es_regions.py:18
 msgid "Madrid"
-msgstr ""
+msgstr "Madrid"
 
 #: contrib/localflavor/es/es_provinces.py:33
 msgid "Malaga"
-msgstr ""
+msgstr "Malaga"
 
 #: contrib/localflavor/es/es_provinces.py:34
 msgid "Murcia"
-msgstr ""
+msgstr "Murcia"
 
 #: contrib/localflavor/es/es_provinces.py:35
 msgid "Navarre"
-msgstr ""
+msgstr "Navarre"
 
 #: contrib/localflavor/es/es_provinces.py:36
 msgid "Ourense"
-msgstr ""
+msgstr "Ourense"
 
 #: contrib/localflavor/es/es_provinces.py:37
 msgid "Asturias"
-msgstr ""
+msgstr "Asturias"
 
 #: contrib/localflavor/es/es_provinces.py:38
 msgid "Palencia"
-msgstr ""
+msgstr "Palencia"
 
 #: contrib/localflavor/es/es_provinces.py:39
 msgid "Las Palmas"
-msgstr ""
+msgstr "Las Palmas"
 
 #: contrib/localflavor/es/es_provinces.py:40
 msgid "Pontevedra"
-msgstr ""
+msgstr "Pontevedra"
 
 #: contrib/localflavor/es/es_provinces.py:41
 msgid "Salamanca"
-msgstr ""
+msgstr "Salamanca"
 
 #: contrib/localflavor/es/es_provinces.py:42
 msgid "Santa Cruz de Tenerife"
-msgstr ""
+msgstr "Santa Cruz de Tenerife"
 
 #: contrib/localflavor/es/es_provinces.py:43
 #: contrib/localflavor/es/es_regions.py:11
 msgid "Cantabria"
-msgstr ""
+msgstr "Cantabria"
 
 #: contrib/localflavor/es/es_provinces.py:44
 msgid "Segovia"
-msgstr ""
+msgstr "Segovia"
 
 #: contrib/localflavor/es/es_provinces.py:45
 msgid "Seville"
-msgstr ""
+msgstr "Seville"
 
 #: contrib/localflavor/es/es_provinces.py:46
 msgid "Soria"
-msgstr ""
+msgstr "Soria"
 
 #: contrib/localflavor/es/es_provinces.py:47
 msgid "Tarragona"
-msgstr ""
+msgstr "Tarragona"
 
 #: contrib/localflavor/es/es_provinces.py:48
-#, fuzzy
 msgid "Teruel"
-msgstr "Uto"
+msgstr "Teruel"
 
 #: contrib/localflavor/es/es_provinces.py:49
 msgid "Toledo"
-msgstr ""
+msgstr "Toledo"
 
 #: contrib/localflavor/es/es_provinces.py:50
 msgid "Valencia"
-msgstr ""
+msgstr "Valencia"
 
 #: contrib/localflavor/es/es_provinces.py:51
 msgid "Valladolid"
-msgstr ""
+msgstr "Valladolid"
 
 #: contrib/localflavor/es/es_provinces.py:52
 msgid "Bizkaia"
-msgstr ""
+msgstr "Bizkaia"
 
 #: contrib/localflavor/es/es_provinces.py:53
 msgid "Zamora"
-msgstr ""
+msgstr "Zamora"
 
 #: contrib/localflavor/es/es_provinces.py:54
 msgid "Zaragoza"
-msgstr ""
+msgstr "Zaragoza"
 
 #: contrib/localflavor/es/es_provinces.py:55
 msgid "Ceuta"
-msgstr ""
+msgstr "Ceuta"
 
 #: contrib/localflavor/es/es_provinces.py:56
 msgid "Melilla"
-msgstr ""
+msgstr "Melilla"
 
 #: contrib/localflavor/es/es_regions.py:5
 msgid "Andalusia"
-msgstr ""
+msgstr "Andalusia"
 
 #: contrib/localflavor/es/es_regions.py:6
 msgid "Aragon"
-msgstr ""
+msgstr "Aragon"
 
 #: contrib/localflavor/es/es_regions.py:7
 msgid "Principality of Asturias"
-msgstr ""
+msgstr "Principality of Asturias"
 
 #: contrib/localflavor/es/es_regions.py:8
 msgid "Balearic Islands"
-msgstr ""
+msgstr "Balearic Islands"
 
 #: contrib/localflavor/es/es_regions.py:9
 msgid "Basque Country"
-msgstr ""
+msgstr "Basque Country"
 
 #: contrib/localflavor/es/es_regions.py:10
 msgid "Canary Islands"
-msgstr ""
+msgstr "Canary Islands"
 
 #: contrib/localflavor/es/es_regions.py:12
 msgid "Castile-La Mancha"
-msgstr ""
+msgstr "Castile-La Mancha"
 
 #: contrib/localflavor/es/es_regions.py:13
 msgid "Castile and Leon"
-msgstr ""
+msgstr "Castile and Leon"
 
 #: contrib/localflavor/es/es_regions.py:14
 msgid "Catalonia"
-msgstr ""
+msgstr "Catalonia"
 
 #: contrib/localflavor/es/es_regions.py:15
 msgid "Extremadura"
-msgstr ""
+msgstr "Extremadura"
 
 #: contrib/localflavor/es/es_regions.py:16
 msgid "Galicia"
-msgstr ""
+msgstr "Galicia"
 
 #: contrib/localflavor/es/es_regions.py:19
 msgid "Region of Murcia"
-msgstr ""
+msgstr "Region of Murcia"
 
 #: contrib/localflavor/es/es_regions.py:20
 msgid "Foral Community of Navarre"
-msgstr ""
+msgstr "Foral Community of Navarre"
 
 #: contrib/localflavor/es/es_regions.py:21
 msgid "Valencian Community"
-msgstr ""
+msgstr "Valencian Community"
 
 #: contrib/localflavor/es/forms.py:19
-#, fuzzy
 msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Unesi ispravan poštanski broj formata XXXXX or XXX XX."
+msgstr "Unesi ispravan poštanski broj u rasponu i formatu od 01XXX - 52XXX."
 
 #: contrib/localflavor/es/forms.py:39
-#, fuzzy
 msgid ""
 "Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
 "9XXXXXXXX."
-msgstr "Unesi ispravan poštanski broj formata XXXXX or XXX XX."
+msgstr ""
+"Unesite ispravan broj telefona u jednom od formata 6XXXXXXXX, 8XXXXXXXX ili "
+"9XXXXXXXX."
 
 #: contrib/localflavor/es/forms.py:66
-#, fuzzy
 msgid "Please enter a valid NIF, NIE, or CIF."
-msgstr "Unesite ispravnu IP adresu."
+msgstr "Unesite ispravan NIF, NIE ili CIF."
 
 #: contrib/localflavor/es/forms.py:67
-#, fuzzy
 msgid "Please enter a valid NIF or NIE."
-msgstr "Molim unesite validan %s."
+msgstr "Molim unesite ispravan NIF ili NIE."
 
 #: contrib/localflavor/es/forms.py:68
 msgid "Invalid checksum for NIF."
-msgstr ""
+msgstr "Neispravan checksum za NIF"
 
 #: contrib/localflavor/es/forms.py:69
 msgid "Invalid checksum for NIE."
-msgstr ""
+msgstr "Neispravan checksum za NIF"
 
 #: contrib/localflavor/es/forms.py:70
 msgid "Invalid checksum for CIF."
-msgstr ""
+msgstr "Neispravan checksum za CIF."
 
 #: contrib/localflavor/es/forms.py:142
 msgid "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
-msgstr ""
+msgstr "Molim unesite ispravan broj bankovnog računa formata XXXX-XXXX-XX-XXXXXXXXXX."
 
 #: contrib/localflavor/es/forms.py:143
 msgid "Invalid checksum for bank account number."
-msgstr ""
+msgstr "Neispravan checksum za broj bankovnog računa."
 
 #: contrib/localflavor/fi/forms.py:28
 msgid "Enter a valid Finnish social security number."
-msgstr "Unesi ispravan finski broj socijalnog osiguranja."
+msgstr "Unesi ispravan broj finskog socijalnog osiguranja."
 
 #: contrib/localflavor/in_/forms.py:14
-#, fuzzy
 msgid "Enter a zip code in the format XXXXXXX."
-msgstr "Unesi ispravan poštanski broj formata XXXXX or XXX XX."
+msgstr "Unesi ispravan zip kod formata XXXXXXX."
 
 #: contrib/localflavor/is_/forms.py:17
 msgid "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr ""
+msgstr "Unesite ispravan islandski identifikacijski broj formata XXXXXX-XXXX."
 
 #: contrib/localflavor/is_/forms.py:18
 msgid "The Icelandic identification number is not valid."
-msgstr ""
+msgstr "Islandski identifikacijski broj nije ispravan."
 
 #: contrib/localflavor/it/forms.py:14
 msgid "Enter a valid zip code."
-msgstr ""
+msgstr "Unesite ispravan zip kod."
 
 #: contrib/localflavor/it/forms.py:43
 msgid "Enter a valid Social Security number."
-msgstr ""
+msgstr "Unesite ispravan broj socijalnog osiguranja."
 
 #: contrib/localflavor/it/forms.py:68
 msgid "Enter a valid VAT number."
-msgstr ""
+msgstr "Unesite ispravan VAT broj."
 
 #: contrib/localflavor/jp/forms.py:19
 msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
-msgstr ""
+msgstr "Unesite poštanski broj formata XXXXXXX or XXX-XXXX."
 
 #: contrib/localflavor/jp/jp_prefectures.py:4
 msgid "Hokkaido"
-msgstr ""
+msgstr "Hokkaido"
 
 #: contrib/localflavor/jp/jp_prefectures.py:5
 msgid "Aomori"
-msgstr ""
+msgstr "Aomori"
 
 #: contrib/localflavor/jp/jp_prefectures.py:6
 msgid "Iwate"
-msgstr ""
+msgstr "Iwate"
 
 #: contrib/localflavor/jp/jp_prefectures.py:7
 msgid "Miyagi"
-msgstr ""
+msgstr "Miyagi"
 
 #: contrib/localflavor/jp/jp_prefectures.py:8
 msgid "Akita"
-msgstr ""
+msgstr "Akita"
 
 #: contrib/localflavor/jp/jp_prefectures.py:9
 msgid "Yamagata"
-msgstr ""
+msgstr "Yamagata"
 
 #: contrib/localflavor/jp/jp_prefectures.py:10
 msgid "Fukushima"
-msgstr ""
+msgstr "Fukushima"
 
 #: contrib/localflavor/jp/jp_prefectures.py:11
 msgid "Ibaraki"
-msgstr ""
+msgstr "Ibaraki"
 
 #: contrib/localflavor/jp/jp_prefectures.py:12
 msgid "Tochigi"
-msgstr ""
+msgstr "Tochigi"
 
 #: contrib/localflavor/jp/jp_prefectures.py:13
 msgid "Gunma"
-msgstr ""
+msgstr "Gunma"
 
 #: contrib/localflavor/jp/jp_prefectures.py:14
 msgid "Saitama"
-msgstr ""
+msgstr "Saitama"
 
 #: contrib/localflavor/jp/jp_prefectures.py:15
 msgid "Chiba"
-msgstr ""
+msgstr "Chiba"
 
 #: contrib/localflavor/jp/jp_prefectures.py:16
 msgid "Tokyo"
-msgstr ""
+msgstr "Tokyo"
 
 #: contrib/localflavor/jp/jp_prefectures.py:17
 msgid "Kanagawa"
-msgstr ""
+msgstr "Kanagawa"
 
 #: contrib/localflavor/jp/jp_prefectures.py:18
 msgid "Yamanashi"
-msgstr ""
+msgstr "Yamanashi"
 
 #: contrib/localflavor/jp/jp_prefectures.py:19
 msgid "Nagano"
-msgstr ""
+msgstr "Nagano"
 
 #: contrib/localflavor/jp/jp_prefectures.py:20
 msgid "Niigata"
-msgstr ""
+msgstr "Niigata"
 
 #: contrib/localflavor/jp/jp_prefectures.py:21
 msgid "Toyama"
-msgstr ""
+msgstr "Toyama"
 
 #: contrib/localflavor/jp/jp_prefectures.py:22
 msgid "Ishikawa"
-msgstr ""
+msgstr "Ishikawa"
 
 #: contrib/localflavor/jp/jp_prefectures.py:23
 msgid "Fukui"
-msgstr ""
+msgstr "Fukui"
 
 #: contrib/localflavor/jp/jp_prefectures.py:24
 msgid "Gifu"
-msgstr ""
+msgstr "Gifu"
 
 #: contrib/localflavor/jp/jp_prefectures.py:25
 msgid "Shizuoka"
-msgstr ""
+msgstr "Shizuoka"
 
 #: contrib/localflavor/jp/jp_prefectures.py:26
 msgid "Aichi"
-msgstr ""
+msgstr "Aichi"
 
 #: contrib/localflavor/jp/jp_prefectures.py:27
 msgid "Mie"
-msgstr ""
+msgstr "Mie"
 
 #: contrib/localflavor/jp/jp_prefectures.py:28
 msgid "Shiga"
-msgstr ""
+msgstr "Shiga"
 
 #: contrib/localflavor/jp/jp_prefectures.py:29
 msgid "Kyoto"
-msgstr ""
+msgstr "Kyoto"
 
 #: contrib/localflavor/jp/jp_prefectures.py:30
 msgid "Osaka"
-msgstr ""
+msgstr "Osaka"
 
 #: contrib/localflavor/jp/jp_prefectures.py:31
 msgid "Hyogo"
-msgstr ""
+msgstr "Hyogo"
 
 #: contrib/localflavor/jp/jp_prefectures.py:32
 msgid "Nara"
-msgstr ""
+msgstr "Nara"
 
 #: contrib/localflavor/jp/jp_prefectures.py:33
 msgid "Wakayama"
-msgstr ""
+msgstr "Wakayama"
 
 #: contrib/localflavor/jp/jp_prefectures.py:34
 msgid "Tottori"
-msgstr ""
+msgstr "Tottori"
 
 #: contrib/localflavor/jp/jp_prefectures.py:35
 msgid "Shimane"
-msgstr ""
+msgstr "Shimane"
 
 #: contrib/localflavor/jp/jp_prefectures.py:36
 msgid "Okayama"
-msgstr ""
+msgstr "Okayama"
 
 #: contrib/localflavor/jp/jp_prefectures.py:37
 msgid "Hiroshima"
-msgstr ""
+msgstr "Hiroshima"
 
 #: contrib/localflavor/jp/jp_prefectures.py:38
 msgid "Yamaguchi"
-msgstr ""
+msgstr "Yamaguchi"
 
 #: contrib/localflavor/jp/jp_prefectures.py:39
 msgid "Tokushima"
-msgstr ""
+msgstr "Tokushima"
 
 #: contrib/localflavor/jp/jp_prefectures.py:40
 msgid "Kagawa"
-msgstr ""
+msgstr "Kagawa"
 
 #: contrib/localflavor/jp/jp_prefectures.py:41
 msgid "Ehime"
-msgstr ""
+msgstr "Ehime"
 
 #: contrib/localflavor/jp/jp_prefectures.py:42
 msgid "Kochi"
-msgstr ""
+msgstr "Kochi"
 
 #: contrib/localflavor/jp/jp_prefectures.py:43
 msgid "Fukuoka"
-msgstr ""
+msgstr "Fukuoka"
 
 #: contrib/localflavor/jp/jp_prefectures.py:44
 msgid "Saga"
-msgstr ""
+msgstr "Saga"
 
 #: contrib/localflavor/jp/jp_prefectures.py:45
 msgid "Nagasaki"
-msgstr ""
+msgstr "Nagasaki"
 
 #: contrib/localflavor/jp/jp_prefectures.py:46
 msgid "Kumamoto"
-msgstr ""
+msgstr "Kumamoto"
 
 #: contrib/localflavor/jp/jp_prefectures.py:47
 msgid "Oita"
-msgstr ""
+msgstr "Oita"
 
 #: contrib/localflavor/jp/jp_prefectures.py:48
 msgid "Miyazaki"
-msgstr ""
+msgstr "Miyazaki"
 
 #: contrib/localflavor/jp/jp_prefectures.py:49
 msgid "Kagoshima"
-msgstr ""
+msgstr "Kagoshima"
 
 #: contrib/localflavor/jp/jp_prefectures.py:50
 msgid "Okinawa"
-msgstr ""
+msgstr "Okinawa"
 
 #: contrib/localflavor/mx/mx_states.py:12
 msgid "Aguascalientes"
-msgstr ""
+msgstr "Aguascalientes"
 
 #: contrib/localflavor/mx/mx_states.py:13
 msgid "Baja California"
-msgstr ""
+msgstr "Baja California"
 
 #: contrib/localflavor/mx/mx_states.py:14
 msgid "Baja California Sur"
-msgstr ""
+msgstr "Baja California Sur"
 
 #: contrib/localflavor/mx/mx_states.py:15
 msgid "Campeche"
-msgstr ""
+msgstr "Campeche"
 
 #: contrib/localflavor/mx/mx_states.py:16
 msgid "Chihuahua"
-msgstr ""
+msgstr "Chihuahua"
 
 #: contrib/localflavor/mx/mx_states.py:17
 msgid "Chiapas"
-msgstr ""
+msgstr "Chiapas"
 
 #: contrib/localflavor/mx/mx_states.py:18
 msgid "Coahuila"
-msgstr ""
+msgstr "Coahuila"
 
 #: contrib/localflavor/mx/mx_states.py:19
 msgid "Colima"
-msgstr ""
+msgstr "Colima"
 
 #: contrib/localflavor/mx/mx_states.py:20
 msgid "Distrito Federal"
-msgstr ""
+msgstr "Distrito Federal"
 
 #: contrib/localflavor/mx/mx_states.py:21
 msgid "Durango"
-msgstr ""
+msgstr "Durango"
 
 #: contrib/localflavor/mx/mx_states.py:22
 msgid "Guerrero"
-msgstr ""
+msgstr "Guerrero"
 
 #: contrib/localflavor/mx/mx_states.py:23
 msgid "Guanajuato"
-msgstr ""
+msgstr "Guanajuato"
 
 #: contrib/localflavor/mx/mx_states.py:24
 msgid "Hidalgo"
-msgstr ""
+msgstr "Hidalgo"
 
 #: contrib/localflavor/mx/mx_states.py:25
 msgid "Jalisco"
-msgstr ""
+msgstr "Jalisco"
 
 #: contrib/localflavor/mx/mx_states.py:26
 msgid "Estado de México"
-msgstr ""
+msgstr "Estado de México"
 
 #: contrib/localflavor/mx/mx_states.py:27
 msgid "Michoacán"
-msgstr ""
+msgstr "Michoacán"
 
 #: contrib/localflavor/mx/mx_states.py:28
 msgid "Morelos"
-msgstr ""
+msgstr "Morelos"
 
 #: contrib/localflavor/mx/mx_states.py:29
 msgid "Nayarit"
-msgstr ""
+msgstr "Nayarit"
 
 #: contrib/localflavor/mx/mx_states.py:30
 msgid "Nuevo León"
-msgstr ""
+msgstr "Nuevo León"
 
 #: contrib/localflavor/mx/mx_states.py:31
 msgid "Oaxaca"
-msgstr ""
+msgstr "Oaxaca"
 
 #: contrib/localflavor/mx/mx_states.py:32
 msgid "Puebla"
-msgstr ""
+msgstr "Puebla"
 
 #: contrib/localflavor/mx/mx_states.py:33
 msgid "Querétaro"
-msgstr ""
+msgstr "Querétaro"
 
 #: contrib/localflavor/mx/mx_states.py:34
 msgid "Quintana Roo"
-msgstr ""
+msgstr "Quintana Roo"
 
 #: contrib/localflavor/mx/mx_states.py:35
 msgid "Sinaloa"
-msgstr ""
+msgstr "Sinaloa"
 
 #: contrib/localflavor/mx/mx_states.py:36
 msgid "San Luis Potosí"
-msgstr ""
+msgstr "San Luis Potosí"
 
 #: contrib/localflavor/mx/mx_states.py:37
 msgid "Sonora"
-msgstr ""
+msgstr "Sonora"
 
 #: contrib/localflavor/mx/mx_states.py:38
 msgid "Tabasco"
-msgstr ""
+msgstr "Tabasco"
 
 #: contrib/localflavor/mx/mx_states.py:39
 msgid "Tamaulipas"
-msgstr ""
+msgstr "Tamaulipas"
 
 #: contrib/localflavor/mx/mx_states.py:40
 msgid "Tlaxcala"
-msgstr ""
+msgstr "Tlaxcala"
 
 #: contrib/localflavor/mx/mx_states.py:41
 msgid "Veracruz"
-msgstr ""
+msgstr "Veracruz"
 
 #: contrib/localflavor/mx/mx_states.py:42
 msgid "Yucatán"
-msgstr ""
+msgstr "Yucatán"
 
 #: contrib/localflavor/mx/mx_states.py:43
 msgid "Zacatecas"
-msgstr ""
+msgstr "Zacatecas"
 
 #: contrib/localflavor/nl/forms.py:21
-#, fuzzy
 msgid "Enter a valid postal code"
-msgstr "Unesite ispravan datum."
+msgstr "Unesite ispravan poštanski broj"
 
 #: contrib/localflavor/nl/forms.py:52
-#, fuzzy
 msgid "Enter a valid phone number"
-msgstr "Unesite cijeli broj."
+msgstr "Unesite ispravan telefonski broj"
 
 #: contrib/localflavor/nl/forms.py:78
-#, fuzzy
 msgid "Enter a valid SoFi number"
-msgstr "Unesite ime datoteke koja postoji."
+msgstr "Unesite ispravan SoFi broj"
 
 #: contrib/localflavor/nl/nl_provinces.py:4
 msgid "Drente"
-msgstr ""
+msgstr "Drente"
 
 #: contrib/localflavor/nl/nl_provinces.py:5
 msgid "Flevoland"
-msgstr ""
+msgstr "Flevoland"
 
 #: contrib/localflavor/nl/nl_provinces.py:6
 msgid "Friesland"
-msgstr ""
+msgstr "Friesland"
 
 #: contrib/localflavor/nl/nl_provinces.py:7
 msgid "Gelderland"
-msgstr ""
+msgstr "Gelderland"
 
 #: contrib/localflavor/nl/nl_provinces.py:8
 msgid "Groningen"
-msgstr ""
+msgstr "Groningen"
 
 #: contrib/localflavor/nl/nl_provinces.py:9
 msgid "Limburg"
-msgstr ""
+msgstr "Limburg"
 
 #: contrib/localflavor/nl/nl_provinces.py:10
 msgid "Noord-Brabant"
-msgstr ""
+msgstr "Noord-Brabant"
 
 #: contrib/localflavor/nl/nl_provinces.py:11
 msgid "Noord-Holland"
-msgstr ""
+msgstr "Noord-Holland"
 
 #: contrib/localflavor/nl/nl_provinces.py:12
 msgid "Overijssel"
-msgstr ""
+msgstr "Overijssel"
 
 #: contrib/localflavor/nl/nl_provinces.py:13
 msgid "Utrecht"
-msgstr ""
+msgstr "Utrecht"
 
 #: contrib/localflavor/nl/nl_provinces.py:14
-#, fuzzy
 msgid "Zeeland"
-msgstr "i"
+msgstr "Zeeland"
 
 #: contrib/localflavor/nl/nl_provinces.py:15
 msgid "Zuid-Holland"
-msgstr ""
+msgstr "Zuid-Holland"
 
 #: contrib/localflavor/no/forms.py:33
 msgid "Enter a valid Norwegian social security number."
-msgstr ""
+msgstr "Unesite ispravan broj norveškog socijalnog osiguranja."
 
 #: contrib/localflavor/pe/forms.py:24
-#, fuzzy
 msgid "This field requires 8 digits."
-msgstr "Unos za ovo polje je obavezno."
+msgstr "Ovo polje zahtjeva 8 numeričkih znakova."
 
 #: contrib/localflavor/pe/forms.py:52
-#, fuzzy
 msgid "This field requires 11 digits."
-msgstr "Unos za ovo polje je obavezno."
+msgstr "Ovo polje zahtjeva 11 numeričkih znakova."
 
 #: contrib/localflavor/pl/forms.py:39
 msgid "National Identification Number consists of 11 digits."
-msgstr ""
+msgstr "Nacionalni identifikacijski broj sadrži 11 numeričkih znakova."
 
 #: contrib/localflavor/pl/forms.py:40
 msgid "Wrong checksum for the National Identification Number."
-msgstr ""
+msgstr "Neispravan checksum za Nacionalni identifikacijski broj."
 
 #: contrib/localflavor/pl/forms.py:72
-#, fuzzy
 msgid "Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
-msgstr "Unesi ispravan poštanski broj formata XXXXX or XXX XX."
+msgstr "Unesite ispravan porezni broj (NIP) formata XXX-XXX-XX-XX or XX-XX-XXX-XXX."
 
 #: contrib/localflavor/pl/forms.py:73
 msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr ""
+msgstr "Neispravan checksum za porezni broj (NIP)."
 
 #: contrib/localflavor/pl/forms.py:112
 msgid "National Business Register Number (REGON) consists of 7 or 9 digits."
-msgstr ""
+msgstr "National Business Register Number (REGON) sastoji se od 7 ili 9 numeričkih znakova."
 
 #: contrib/localflavor/pl/forms.py:113
 msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr ""
+msgstr "Neispravan checked za National Business Register Number (REGON)."
 
 #: contrib/localflavor/pl/forms.py:156
-#, fuzzy
 msgid "Enter a postal code in the format XX-XXX."
-msgstr "Unesi ispravan poštanski broj formata XXXXX or XXX XX."
+msgstr "Unesi poštanski broj formata XX-XXX."
 
 #: contrib/localflavor/pl/pl_voivodeships.py:8
 msgid "Lower Silesia"
-msgstr ""
+msgstr "Lower Silesia"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:9
 msgid "Kuyavia-Pomerania"
-msgstr ""
+msgstr "Kuyavia-Pomerania"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:10
 msgid "Lublin"
-msgstr ""
+msgstr "Lublin"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:11
 msgid "Lubusz"
-msgstr ""
+msgstr "Lubusz"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:12
 msgid "Lodz"
-msgstr ""
+msgstr "Lodz"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:13
 msgid "Lesser Poland"
-msgstr ""
+msgstr "Lesser Poland"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:14
 msgid "Masovia"
-msgstr ""
+msgstr "Masovia"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:15
 msgid "Opole"
-msgstr ""
+msgstr "Opole"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:16
 msgid "Subcarpatia"
-msgstr ""
+msgstr "Subcarpatia"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:17
 msgid "Podlasie"
-msgstr ""
+msgstr "Podlasie"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:18
 msgid "Pomerania"
-msgstr ""
+msgstr "Pomerania"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:19
-#, fuzzy
 msgid "Silesia"
-msgstr "Zilina"
+msgstr "Silesia"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:20
 msgid "Swietokrzyskie"
-msgstr ""
+msgstr "Swietokrzyskie"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:21
 msgid "Warmia-Masuria"
-msgstr ""
+msgstr "Warmia-Masuria"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:22
 msgid "Greater Poland"
-msgstr ""
+msgstr "Greater Poland"
 
 #: contrib/localflavor/pl/pl_voivodeships.py:23
 msgid "West Pomerania"
-msgstr ""
+msgstr "West Pomerania"
 
 #: contrib/localflavor/sk/forms.py:30
 msgid "Enter a postal code in the format XXXXX or XXX XX."
@@ -2756,311 +2764,311 @@ msgstr "Unesi ispravan poštanski broj formata XXXXX or XXX XX."
 
 #: contrib/localflavor/sk/sk_districts.py:8
 msgid "Banska Bystrica"
-msgstr ""
+msgstr "Banska Bystrica"
 
 #: contrib/localflavor/sk/sk_districts.py:9
 msgid "Banska Stiavnica"
-msgstr ""
+msgstr "Banska Stiavnica"
 
 #: contrib/localflavor/sk/sk_districts.py:10
 msgid "Bardejov"
-msgstr ""
+msgstr "Bardejov"
 
 #: contrib/localflavor/sk/sk_districts.py:11
 msgid "Banovce nad Bebravou"
-msgstr ""
+msgstr "Banovce nad Bebravou"
 
 #: contrib/localflavor/sk/sk_districts.py:12
 msgid "Brezno"
-msgstr ""
+msgstr "Brezno"
 
 #: contrib/localflavor/sk/sk_districts.py:13
 msgid "Bratislava I"
-msgstr ""
+msgstr "Bratislava I"
 
 #: contrib/localflavor/sk/sk_districts.py:14
 msgid "Bratislava II"
-msgstr ""
+msgstr "Bratislava II"
 
 #: contrib/localflavor/sk/sk_districts.py:15
 msgid "Bratislava III"
-msgstr ""
+msgstr "Bratislava III"
 
 #: contrib/localflavor/sk/sk_districts.py:16
 msgid "Bratislava IV"
-msgstr ""
+msgstr "Bratislava IV"
 
 #: contrib/localflavor/sk/sk_districts.py:17
 msgid "Bratislava V"
-msgstr ""
+msgstr "Bratislava V"
 
 #: contrib/localflavor/sk/sk_districts.py:18
 msgid "Bytca"
-msgstr ""
+msgstr "Bytca"
 
 #: contrib/localflavor/sk/sk_districts.py:19
 msgid "Cadca"
-msgstr ""
+msgstr "Cadca"
 
 #: contrib/localflavor/sk/sk_districts.py:20
 msgid "Detva"
-msgstr ""
+msgstr "Detva"
 
 #: contrib/localflavor/sk/sk_districts.py:21
 msgid "Dolny Kubin"
-msgstr ""
+msgstr "Dolny Kubin"
 
 #: contrib/localflavor/sk/sk_districts.py:22
 msgid "Dunajska Streda"
-msgstr ""
+msgstr "Dunajska Streda"
 
 #: contrib/localflavor/sk/sk_districts.py:23
 msgid "Galanta"
-msgstr ""
+msgstr "Galanta"
 
 #: contrib/localflavor/sk/sk_districts.py:24
 msgid "Gelnica"
-msgstr ""
+msgstr "Gelnica"
 
 #: contrib/localflavor/sk/sk_districts.py:25
 msgid "Hlohovec"
-msgstr ""
+msgstr "Hlohovec"
 
 #: contrib/localflavor/sk/sk_districts.py:26
 msgid "Humenne"
-msgstr ""
+msgstr "Humenne"
 
 #: contrib/localflavor/sk/sk_districts.py:27
 msgid "Ilava"
-msgstr ""
+msgstr "Ilava"
 
 #: contrib/localflavor/sk/sk_districts.py:28
 msgid "Kezmarok"
-msgstr ""
+msgstr "Kezmarok"
 
 #: contrib/localflavor/sk/sk_districts.py:29
 msgid "Komarno"
-msgstr ""
+msgstr "Komarno"
 
 #: contrib/localflavor/sk/sk_districts.py:30
 msgid "Kosice I"
-msgstr ""
+msgstr "Kosice I"
 
 #: contrib/localflavor/sk/sk_districts.py:31
 msgid "Kosice II"
-msgstr ""
+msgstr "Kosice II"
 
 #: contrib/localflavor/sk/sk_districts.py:32
 msgid "Kosice III"
-msgstr ""
+msgstr "Kosice III"
 
 #: contrib/localflavor/sk/sk_districts.py:33
 msgid "Kosice IV"
-msgstr ""
+msgstr "Kosice IV"
 
 #: contrib/localflavor/sk/sk_districts.py:34
 msgid "Kosice - okolie"
-msgstr ""
+msgstr "Kosice - okolie"
 
 #: contrib/localflavor/sk/sk_districts.py:35
 msgid "Krupina"
-msgstr ""
+msgstr "Krupina"
 
 #: contrib/localflavor/sk/sk_districts.py:36
 msgid "Kysucke Nove Mesto"
-msgstr ""
+msgstr "Kysucke Nove Mesto"
 
 #: contrib/localflavor/sk/sk_districts.py:37
 msgid "Levice"
-msgstr ""
+msgstr "Levice"
 
 #: contrib/localflavor/sk/sk_districts.py:38
 msgid "Levoca"
-msgstr ""
+msgstr "Levoca"
 
 #: contrib/localflavor/sk/sk_districts.py:39
 msgid "Liptovsky Mikulas"
-msgstr ""
+msgstr "Liptovsky Mikulas"
 
 #: contrib/localflavor/sk/sk_districts.py:40
 msgid "Lucenec"
-msgstr ""
+msgstr "Lucenec"
 
 #: contrib/localflavor/sk/sk_districts.py:41
 msgid "Malacky"
-msgstr ""
+msgstr "Malacky"
 
 #: contrib/localflavor/sk/sk_districts.py:42
 msgid "Martin"
-msgstr ""
+msgstr "Martin"
 
 #: contrib/localflavor/sk/sk_districts.py:43
 msgid "Medzilaborce"
-msgstr ""
+msgstr "Medzilaborce"
 
 #: contrib/localflavor/sk/sk_districts.py:44
 msgid "Michalovce"
-msgstr ""
+msgstr "Michalovce"
 
 #: contrib/localflavor/sk/sk_districts.py:45
 msgid "Myjava"
-msgstr ""
+msgstr "Myjava"
 
 #: contrib/localflavor/sk/sk_districts.py:46
 msgid "Namestovo"
-msgstr ""
+msgstr "Namestovo"
 
 #: contrib/localflavor/sk/sk_districts.py:47
 msgid "Nitra"
-msgstr ""
+msgstr "Nitra"
 
 #: contrib/localflavor/sk/sk_districts.py:48
 msgid "Nove Mesto nad Vahom"
-msgstr ""
+msgstr "Nove Mesto nad Vahom"
 
 #: contrib/localflavor/sk/sk_districts.py:49
 msgid "Nove Zamky"
-msgstr ""
+msgstr "Nove Zamky"
 
 #: contrib/localflavor/sk/sk_districts.py:50
 msgid "Partizanske"
-msgstr ""
+msgstr "Partizanske"
 
 #: contrib/localflavor/sk/sk_districts.py:51
 msgid "Pezinok"
-msgstr ""
+msgstr "Pezinok"
 
 #: contrib/localflavor/sk/sk_districts.py:52
 msgid "Piestany"
-msgstr ""
+msgstr "Piestany"
 
 #: contrib/localflavor/sk/sk_districts.py:53
 msgid "Poltar"
-msgstr ""
+msgstr "Poltar"
 
 #: contrib/localflavor/sk/sk_districts.py:54
 msgid "Poprad"
-msgstr ""
+msgstr "Poprad"
 
 #: contrib/localflavor/sk/sk_districts.py:55
 msgid "Povazska Bystrica"
-msgstr ""
+msgstr "Povazska Bystrica"
 
 #: contrib/localflavor/sk/sk_districts.py:56
 msgid "Presov"
-msgstr ""
+msgstr "Presov"
 
 #: contrib/localflavor/sk/sk_districts.py:57
 msgid "Prievidza"
-msgstr ""
+msgstr "Prievidza"
 
 #: contrib/localflavor/sk/sk_districts.py:58
 msgid "Puchov"
-msgstr ""
+msgstr "Puchov"
 
 #: contrib/localflavor/sk/sk_districts.py:59
 msgid "Revuca"
-msgstr ""
+msgstr "Revuca"
 
 #: contrib/localflavor/sk/sk_districts.py:60
 msgid "Rimavska Sobota"
-msgstr ""
+msgstr "Rimavska Sobota"
 
 #: contrib/localflavor/sk/sk_districts.py:61
 msgid "Roznava"
-msgstr ""
+msgstr "Roznava"
 
 #: contrib/localflavor/sk/sk_districts.py:62
 msgid "Ruzomberok"
-msgstr ""
+msgstr "Ruzomberok"
 
 #: contrib/localflavor/sk/sk_districts.py:63
 msgid "Sabinov"
-msgstr ""
+msgstr "Sabinov"
 
 #: contrib/localflavor/sk/sk_districts.py:64
 msgid "Senec"
-msgstr ""
+msgstr "Senec"
 
 #: contrib/localflavor/sk/sk_districts.py:65
 msgid "Senica"
-msgstr ""
+msgstr "Senica"
 
 #: contrib/localflavor/sk/sk_districts.py:66
 msgid "Skalica"
-msgstr ""
+msgstr "Skalica"
 
 #: contrib/localflavor/sk/sk_districts.py:67
 msgid "Snina"
-msgstr ""
+msgstr "Snina"
 
 #: contrib/localflavor/sk/sk_districts.py:68
 msgid "Sobrance"
-msgstr ""
+msgstr "Sobrance"
 
 #: contrib/localflavor/sk/sk_districts.py:69
 msgid "Spisska Nova Ves"
-msgstr ""
+msgstr "Spisska Nova Ves"
 
 #: contrib/localflavor/sk/sk_districts.py:70
 msgid "Stara Lubovna"
-msgstr ""
+msgstr "Stara Lubovna"
 
 #: contrib/localflavor/sk/sk_districts.py:71
 msgid "Stropkov"
-msgstr ""
+msgstr "Stropkov"
 
 #: contrib/localflavor/sk/sk_districts.py:72
 msgid "Svidnik"
-msgstr ""
+msgstr "Svidnik"
 
 #: contrib/localflavor/sk/sk_districts.py:73
 msgid "Sala"
-msgstr ""
+msgstr "Sala"
 
 #: contrib/localflavor/sk/sk_districts.py:74
 msgid "Topolcany"
-msgstr ""
+msgstr "Topolcany"
 
 #: contrib/localflavor/sk/sk_districts.py:75
 msgid "Trebisov"
-msgstr ""
+msgstr "Trebisov"
 
 #: contrib/localflavor/sk/sk_districts.py:76
 msgid "Trencin"
-msgstr ""
+msgstr "Trencin"
 
 #: contrib/localflavor/sk/sk_districts.py:77
 msgid "Trnava"
-msgstr ""
+msgstr "Trnava"
 
 #: contrib/localflavor/sk/sk_districts.py:78
 msgid "Turcianske Teplice"
-msgstr ""
+msgstr "Turcianske Teplice"
 
 #: contrib/localflavor/sk/sk_districts.py:79
 msgid "Tvrdosin"
-msgstr ""
+msgstr "Tvrdosin"
 
 #: contrib/localflavor/sk/sk_districts.py:80
 msgid "Velky Krtis"
-msgstr ""
+msgstr "Velky Krtis"
 
 #: contrib/localflavor/sk/sk_districts.py:81
 msgid "Vranov nad Toplou"
-msgstr ""
+msgstr "Vranov nad Toplou"
 
 #: contrib/localflavor/sk/sk_districts.py:82
 msgid "Zlate Moravce"
-msgstr ""
+msgstr "Zlate Moravce"
 
 #: contrib/localflavor/sk/sk_districts.py:83
 msgid "Zvolen"
-msgstr ""
+msgstr "Zvolen"
 
 #: contrib/localflavor/sk/sk_districts.py:84
 msgid "Zarnovica"
-msgstr ""
+msgstr "Zarnovica"
 
 #: contrib/localflavor/sk/sk_districts.py:85
 msgid "Ziar nad Hronom"
@@ -3072,378 +3080,372 @@ msgstr "Zilina"
 
 #: contrib/localflavor/sk/sk_regions.py:8
 msgid "Banska Bystrica region"
-msgstr ""
+msgstr "Banska Bystrica regija"
 
 #: contrib/localflavor/sk/sk_regions.py:9
 msgid "Bratislava region"
-msgstr ""
+msgstr "Bratislava regija"
 
 #: contrib/localflavor/sk/sk_regions.py:10
 msgid "Kosice region"
-msgstr ""
+msgstr "Kosice regija"
 
 #: contrib/localflavor/sk/sk_regions.py:11
 msgid "Nitra region"
-msgstr ""
+msgstr "Nitra regija"
 
 #: contrib/localflavor/sk/sk_regions.py:12
 msgid "Presov region"
-msgstr ""
+msgstr "Presov regija"
 
 #: contrib/localflavor/sk/sk_regions.py:13
 msgid "Trencin region"
-msgstr ""
+msgstr "Trencin regija"
 
 #: contrib/localflavor/sk/sk_regions.py:14
 msgid "Trnava region"
-msgstr ""
+msgstr "Trnava regija"
 
 #: contrib/localflavor/sk/sk_regions.py:15
 msgid "Zilina region"
-msgstr ""
+msgstr "Zilina regija"
 
 #: contrib/localflavor/uk/forms.py:21
-#, fuzzy
 msgid "Enter a valid postcode."
-msgstr "Unesite ispravan datum."
+msgstr "Unesite ispravan poštanski broj."
 
 #: contrib/localflavor/uk/uk_regions.py:11
 msgid "Bedfordshire"
-msgstr ""
+msgstr "Bedfordshire"
 
 #: contrib/localflavor/uk/uk_regions.py:12
 msgid "Buckinghamshire"
-msgstr ""
+msgstr "Buckinghamshire"
 
 #: contrib/localflavor/uk/uk_regions.py:14
 msgid "Cheshire"
-msgstr ""
+msgstr "Cheshire"
 
 #: contrib/localflavor/uk/uk_regions.py:15
 msgid "Cornwall and Isles of Scilly"
-msgstr ""
+msgstr "Cornwall and Isles of Scilly"
 
 #: contrib/localflavor/uk/uk_regions.py:16
 msgid "Cumbria"
-msgstr ""
+msgstr "Cumbria"
 
 #: contrib/localflavor/uk/uk_regions.py:17
 msgid "Derbyshire"
-msgstr ""
+msgstr "Derbyshire"
 
 #: contrib/localflavor/uk/uk_regions.py:18
 msgid "Devon"
-msgstr ""
+msgstr "Devon"
 
 #: contrib/localflavor/uk/uk_regions.py:19
 msgid "Dorset"
-msgstr ""
+msgstr "Dorset"
 
 #: contrib/localflavor/uk/uk_regions.py:20
 msgid "Durham"
-msgstr ""
+msgstr "Durham"
 
 #: contrib/localflavor/uk/uk_regions.py:21
 msgid "East Sussex"
-msgstr ""
+msgstr "East Sussex"
 
 #: contrib/localflavor/uk/uk_regions.py:22
 msgid "Essex"
-msgstr ""
+msgstr "Essex"
 
 #: contrib/localflavor/uk/uk_regions.py:23
 msgid "Gloucestershire"
-msgstr ""
+msgstr "Gloucestershire"
 
 #: contrib/localflavor/uk/uk_regions.py:24
 msgid "Greater London"
-msgstr ""
+msgstr "Greater London"
 
 #: contrib/localflavor/uk/uk_regions.py:25
 msgid "Greater Manchester"
-msgstr ""
+msgstr "Greater Manchester"
 
 #: contrib/localflavor/uk/uk_regions.py:26
 msgid "Hampshire"
-msgstr ""
+msgstr "Hampshire"
 
 #: contrib/localflavor/uk/uk_regions.py:27
 msgid "Hertfordshire"
-msgstr ""
+msgstr "Hertfordshire"
 
 #: contrib/localflavor/uk/uk_regions.py:28
 msgid "Kent"
-msgstr ""
+msgstr "Kent"
 
 #: contrib/localflavor/uk/uk_regions.py:29
 msgid "Lancashire"
-msgstr ""
+msgstr "Lancashire"
 
 #: contrib/localflavor/uk/uk_regions.py:30
 msgid "Leicestershire"
-msgstr ""
+msgstr "Leicestershire"
 
 #: contrib/localflavor/uk/uk_regions.py:31
 msgid "Lincolnshire"
-msgstr ""
+msgstr "Lincolnshire"
 
 #: contrib/localflavor/uk/uk_regions.py:32
 msgid "Merseyside"
-msgstr ""
+msgstr "Merseyside"
 
 #: contrib/localflavor/uk/uk_regions.py:33
 msgid "Norfolk"
-msgstr ""
+msgstr "Norfolk"
 
 #: contrib/localflavor/uk/uk_regions.py:34
 msgid "North Yorkshire"
-msgstr ""
+msgstr "North Yorkshire"
 
 #: contrib/localflavor/uk/uk_regions.py:35
 msgid "Northamptonshire"
-msgstr ""
+msgstr "Northamptonshire"
 
 #: contrib/localflavor/uk/uk_regions.py:36
 msgid "Northumberland"
-msgstr ""
+msgstr "Northumberland"
 
 #: contrib/localflavor/uk/uk_regions.py:37
 msgid "Nottinghamshire"
-msgstr ""
+msgstr "Nottinghamshire"
 
 #: contrib/localflavor/uk/uk_regions.py:38
 msgid "Oxfordshire"
-msgstr ""
+msgstr "Oxfordshire"
 
 #: contrib/localflavor/uk/uk_regions.py:39
 msgid "Shropshire"
-msgstr ""
+msgstr "Shropshire"
 
 #: contrib/localflavor/uk/uk_regions.py:40
 msgid "Somerset"
-msgstr ""
+msgstr "Somerset"
 
 #: contrib/localflavor/uk/uk_regions.py:41
 msgid "South Yorkshire"
-msgstr ""
+msgstr "South Yorkshire"
 
 #: contrib/localflavor/uk/uk_regions.py:42
 msgid "Staffordshire"
-msgstr ""
+msgstr "Staffordshire"
 
 #: contrib/localflavor/uk/uk_regions.py:43
 msgid "Suffolk"
-msgstr ""
+msgstr "Suffolk"
 
 #: contrib/localflavor/uk/uk_regions.py:44
 msgid "Surrey"
-msgstr ""
+msgstr "Surrey"
 
 #: contrib/localflavor/uk/uk_regions.py:45
 msgid "Tyne and Wear"
-msgstr ""
+msgstr "Tyne and Wear"
 
 #: contrib/localflavor/uk/uk_regions.py:46
 msgid "Warwickshire"
-msgstr ""
+msgstr "Warwickshire"
 
 #: contrib/localflavor/uk/uk_regions.py:47
 msgid "West Midlands"
-msgstr ""
+msgstr "West Midlands"
 
 #: contrib/localflavor/uk/uk_regions.py:48
 msgid "West Sussex"
-msgstr ""
+msgstr "West Sussex"
 
 #: contrib/localflavor/uk/uk_regions.py:49
 msgid "West Yorkshire"
-msgstr ""
+msgstr "West Yorkshire"
 
 #: contrib/localflavor/uk/uk_regions.py:50
 msgid "Wiltshire"
-msgstr ""
+msgstr "Wiltshire"
 
 #: contrib/localflavor/uk/uk_regions.py:51
 msgid "Worcestershire"
-msgstr ""
+msgstr "Worcestershire"
 
 #: contrib/localflavor/uk/uk_regions.py:55
 msgid "County Antrim"
-msgstr ""
+msgstr "County Antrim"
 
 #: contrib/localflavor/uk/uk_regions.py:56
 msgid "County Armagh"
-msgstr ""
+msgstr "County Armagh"
 
 #: contrib/localflavor/uk/uk_regions.py:57
 #: contrib/localflavor/uk/uk_regions.py:58
 msgid "County Down"
-msgstr ""
+msgstr "County Down"
 
 #: contrib/localflavor/uk/uk_regions.py:59
 msgid "County Londonderry"
-msgstr ""
+msgstr "County Londonderry"
 
 #: contrib/localflavor/uk/uk_regions.py:60
 msgid "County Tyrone"
-msgstr ""
+msgstr "Country Tyrone"
 
 #: contrib/localflavor/uk/uk_regions.py:64
 msgid "Clwyd"
-msgstr ""
+msgstr "Clwyd"
 
 #: contrib/localflavor/uk/uk_regions.py:65
 msgid "Dyfed"
-msgstr ""
+msgstr "Dyfed"
 
 #: contrib/localflavor/uk/uk_regions.py:66
 msgid "Gwent"
-msgstr ""
+msgstr "Gwent"
 
 #: contrib/localflavor/uk/uk_regions.py:67
 msgid "Gwynedd"
-msgstr ""
+msgstr "Gwynedd"
 
 #: contrib/localflavor/uk/uk_regions.py:68
 msgid "Mid Glamorgan"
-msgstr ""
+msgstr "Mid Glamorgan"
 
 #: contrib/localflavor/uk/uk_regions.py:69
 msgid "Powys"
-msgstr ""
+msgstr "Powys"
 
 #: contrib/localflavor/uk/uk_regions.py:70
 msgid "South Glamorgan"
-msgstr ""
+msgstr "South Glamorgan"
 
 #: contrib/localflavor/uk/uk_regions.py:71
 msgid "West Glamorgan"
-msgstr ""
+msgstr "West Glamorgan"
 
 #: contrib/localflavor/uk/uk_regions.py:75
 msgid "Borders"
-msgstr ""
+msgstr "Borders"
 
 #: contrib/localflavor/uk/uk_regions.py:76
 msgid "Central Scotland"
-msgstr ""
+msgstr "Central Scotland"
 
 #: contrib/localflavor/uk/uk_regions.py:77
 msgid "Dumfries and Galloway"
-msgstr ""
+msgstr "Dumfries and Galloway"
 
 #: contrib/localflavor/uk/uk_regions.py:78
 msgid "Fife"
-msgstr ""
+msgstr "Fife"
 
 #: contrib/localflavor/uk/uk_regions.py:79
 msgid "Grampian"
-msgstr ""
+msgstr "Grampian"
 
 #: contrib/localflavor/uk/uk_regions.py:80
 msgid "Highland"
-msgstr ""
+msgstr "Highland"
 
 #: contrib/localflavor/uk/uk_regions.py:81
 msgid "Lothian"
-msgstr ""
+msgstr "Lothian"
 
 #: contrib/localflavor/uk/uk_regions.py:82
 msgid "Orkney Islands"
-msgstr ""
+msgstr "Orkney Islands"
 
 #: contrib/localflavor/uk/uk_regions.py:83
 msgid "Shetland Islands"
-msgstr ""
+msgstr "Shetland Islands"
 
 #: contrib/localflavor/uk/uk_regions.py:84
 msgid "Strathclyde"
-msgstr ""
+msgstr "Strathclyde"
 
 #: contrib/localflavor/uk/uk_regions.py:85
 msgid "Tayside"
-msgstr ""
+msgstr "Tayside"
 
 #: contrib/localflavor/uk/uk_regions.py:86
 msgid "Western Isles"
-msgstr ""
+msgstr "Western Isles"
 
 #: contrib/localflavor/uk/uk_regions.py:90
-#, fuzzy
 msgid "England"
-msgstr "i"
+msgstr "Engleska"
 
 #: contrib/localflavor/uk/uk_regions.py:91
 msgid "Northern Ireland"
-msgstr ""
+msgstr "Sjeverna irska"
 
 #: contrib/localflavor/uk/uk_regions.py:92
 msgid "Scotland"
-msgstr ""
+msgstr "Škotska"
 
 #: contrib/localflavor/uk/uk_regions.py:93
 msgid "Wales"
-msgstr ""
+msgstr "Wales"
 
 #: contrib/localflavor/us/forms.py:16
 msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr ""
+msgstr "Unesite zip kod formata XXXXX or XXXXX-XXXX."
 
 #: contrib/localflavor/us/forms.py:54
 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
-msgstr ""
+msgstr "Unesi ispravan broj socijalnog osiguranja S.A.D.-a formata XXX-XX-XXXX."
 
 #: contrib/localflavor/za/forms.py:20
-#, fuzzy
 msgid "Enter a valid South African ID number"
-msgstr "Unesi ispravan finski broj socijalnog osiguranja."
+msgstr "Unesi ispravan južnoafrički ID broj."
 
 #: contrib/localflavor/za/forms.py:54
-#, fuzzy
 msgid "Enter a valid South African postal code"
-msgstr "Unesite ime datoteke koja postoji."
+msgstr "Unesite ispravan južnoafrički poštanski broj."
 
 #: contrib/localflavor/za/za_provinces.py:4
-#, fuzzy
 msgid "Eastern Cape"
-msgstr "korisničko ime"
+msgstr "Eastern Cape"
 
 #: contrib/localflavor/za/za_provinces.py:5
 msgid "Free State"
-msgstr ""
+msgstr "Free State"
 
 #: contrib/localflavor/za/za_provinces.py:6
-#, fuzzy
 msgid "Gauteng"
-msgstr "kol."
+msgstr "Gauteng"
 
 #: contrib/localflavor/za/za_provinces.py:7
 msgid "KwaZulu-Natal"
-msgstr ""
+msgstr "KwaZulu-Natal"
 
 #: contrib/localflavor/za/za_provinces.py:8
 msgid "Limpopo"
-msgstr ""
+msgstr "Limpopo"
 
 #: contrib/localflavor/za/za_provinces.py:9
 msgid "Mpumalanga"
-msgstr ""
+msgstr "Mpumalanga"
 
 #: contrib/localflavor/za/za_provinces.py:10
 msgid "Northern Cape"
-msgstr ""
+msgstr "Northern Cape"
 
 #: contrib/localflavor/za/za_provinces.py:11
 msgid "North West"
-msgstr ""
+msgstr "North West"
 
 #: contrib/localflavor/za/za_provinces.py:12
 msgid "Western Cape"
-msgstr ""
+msgstr "Western Cape"
 
 #: contrib/redirects/models.py:7
 msgid "redirect from"
-msgstr "forma za preusmjeravanje"
+msgstr "preusmjeri od"
 
 #: contrib/redirects/models.py:8
 msgid ""
@@ -3471,7 +3473,7 @@ msgstr "preusmjeri"
 
 #: contrib/redirects/models.py:14
 msgid "redirects"
-msgstr "redirects"
+msgstr "preusmjeravanja"
 
 #: contrib/sessions/models.py:46
 msgid "session key"
@@ -3547,7 +3549,7 @@ msgstr "Unesite ispravnu IP adresu."
 
 #: core/validators.py:115
 msgid "Empty values are not allowed here."
-msgstr "Prazne vrijednosti nisu ispravne ovdje."
+msgstr "Prazne vrijednosti nisu dopuštene ovdje."
 
 #: core/validators.py:119
 msgid "Non-numeric characters aren't allowed here."
@@ -3567,7 +3569,7 @@ msgstr "Dozvoljena su samo slova abecede."
 
 #: core/validators.py:147
 msgid "Year must be 1900 or later."
-msgstr "Godina mora biti poslije 1900."
+msgstr "Godina mora biti 1900 ili poslije."
 
 #: core/validators.py:151
 #, python-format
@@ -3576,7 +3578,7 @@ msgstr "Neispravan datum: %s"
 
 #: core/validators.py:156 db/models/fields/__init__.py:509
 msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Unesite validan datum u formatu YYYY-MM-DD."
+msgstr "Unesite ispravan datum u formatu YYYY-MM-DD."
 
 #: core/validators.py:161
 msgid "Enter a valid time in HH:MM format."
@@ -3584,7 +3586,7 @@ msgstr "Unesite ispravno vrijeme u HH:MM formatu."
 
 #: core/validators.py:165 db/models/fields/__init__.py:583
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr "Unesite validan datum/vrijeme u formatu YYYY-MM-DD HH:MM."
+msgstr "Unesite ispravan datum/vrijeme u formatu YYYY-MM-DD HH:MM."
 
 #: core/validators.py:170 newforms/fields.py:402
 msgid "Enter a valid e-mail address."
@@ -3606,7 +3608,7 @@ msgstr ""
 #: core/validators.py:200
 #, python-format
 msgid "The URL %s does not point to a valid image."
-msgstr "URL %s ne prikazuje ispravnu sliku."
+msgstr "URL %s ne vodi na ispravnu sliku."
 
 #: core/validators.py:204
 #, python-format
@@ -3648,7 +3650,7 @@ msgstr "URL %s je neispravan (broken) link."
 
 #: core/validators.py:267
 msgid "Enter a valid U.S. state abbreviation."
-msgstr "Enter a valid U.S. state abbreviation."
+msgstr "Unesite ispravanu kraticu za državu S.A.D.-a."
 
 #: core/validators.py:281
 #, python-format
@@ -3673,7 +3675,7 @@ msgstr "Molim unesite vrijednosti za oba polja ili ostavite oba polja prazna."
 #: core/validators.py:335
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
-msgstr "Ovo polja mora biti ispunjeno ako je %(field)s %(value)s"
+msgstr "Ovo polje mora biti ispunjeno ako je %(field)s %(value)s"
 
 #: core/validators.py:348
 #, python-format
@@ -3702,7 +3704,7 @@ msgstr "Vrijednost ne može biti veća od %s."
 #: core/validators.py:427
 #, python-format
 msgid "This value must be a power of %s."
-msgstr "Ova vrijednost na kvadrat mora biti %s."
+msgstr "Ova vrijednost mora biti %s na kvadrat."
 
 #: core/validators.py:437
 msgid "Please enter a valid decimal number."
@@ -3712,54 +3714,54 @@ msgstr "Molim unesite ispravan decimalni broj."
 #, 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] ""
+msgstr[0] "Molim unesite ispravan decimalni broj sa najviše %s numerička znaka."
+msgstr[1] "Molim unesite ispravan decimalni broj sa najviše %s numeričkih znakova."
 
 #: core/validators.py:447
 #, python-format
 msgid "Please enter a valid decimal number with a whole part of at most %s digit."
 msgid_plural "Please enter a valid decimal number with a whole part of at most %s digits."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Molim unesite ispravan decimalni broj sa najviše %s numerička znaka u cijelom dijelu."
+msgstr[1] "Molim unesite ispravan decimalni broj sa najviše %s numeričkih znakova u cijelom dijelu."
 
 #: core/validators.py:450
 #, 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] ""
+msgstr[0] "Molim unesite ispravan decimalni broj sa najviše %s decimalna mjesta."
+msgstr[1] "Molim unesite ispravan decimalni broj sa najviše %s decimalnih mjesta."
 
 #: core/validators.py:458
 msgid "Please enter a valid floating point number."
-msgstr ""
+msgstr "Molim unesite ispravan broj sa pomičnim zarezom (floating point number)."
 
 #: core/validators.py:467
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
-msgstr ""
+msgstr "Provjerite je li Vaša upload-ana datoteka bar %s byte-ova velika."
 
 #: core/validators.py:468
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
-msgstr ""
+msgstr "Provjerite je li Vaša upload-ana datoteka najviše %s byte-ova velika."
 
 #: core/validators.py:485
 msgid "The format for this field is wrong."
-msgstr ""
+msgstr "Format za ovo polje je pogrešno."
 
 #: core/validators.py:500
 msgid "This field is invalid."
-msgstr ""
+msgstr "Ovo polje je neispravno."
 
 #: core/validators.py:536
 #, python-format
 msgid "Could not retrieve anything from %s."
-msgstr ""
+msgstr "Ništa nije izvučeno iz %s."
 
 #: core/validators.py:539
 #, python-format
 msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
-msgstr ""
+msgstr "URL %(url)s je vratio neispravan Content-Type header '%(contenttype)s'."
 
 #: core/validators.py:572
 #, python-format
@@ -3767,6 +3769,8 @@ msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
 "\"%(start)s\".)"
 msgstr ""
+"Molim zatvorite %(tag)s na liniji %(line)s. (Linija počinje sa "
+"\"%(start)s\".)"
 
 #: core/validators.py:576
 #, python-format
@@ -3774,6 +3778,8 @@ msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
 "starts with \"%(start)s\".)"
 msgstr ""
+"Neki tekst koji počinje na liniji %(line)s nije dopušten u tom kontekstu. (Linija "
+"počinje sa \"%(start)s\".)"
 
 #: core/validators.py:581
 #, python-format
@@ -3781,6 +3787,8 @@ msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
 "(start)s\".)"
 msgstr ""
+"\"%(attr)s\" na liniji %(line)s je neispravan atribut. (Linija počinje sa \"%"
+"(start)s\".)"
 
 #: core/validators.py:586
 #, python-format
@@ -3788,6 +3796,8 @@ msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
 "(start)s\".)"
 msgstr ""
+"\"<%(tag)s>\" na liniji %(line)s je neispravan tag. (Linija počinje sa \"%"
+"(start)s\".)"
 
 #: core/validators.py:590
 #, python-format
@@ -3795,6 +3805,8 @@ msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
 "starts with \"%(start)s\".)"
 msgstr ""
+"Tagu na liniji %(line)s nedostaje jedan ili više obaveznih atributa. (Linija "
+"počinje sa \"%(start)s\".)"
 
 #: core/validators.py:595
 #, python-format
@@ -3802,6 +3814,8 @@ msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
 "starts with \"%(start)s\".)"
 msgstr ""
+"\"%(attr)s\" atribut na liniji %(line)s ima neispravnu vrijednost. (Linija "
+"počinje sa \"%(start)s\".)"
 
 #: db/models/manipulators.py:308
 #, python-format
@@ -3821,7 +3835,7 @@ msgstr "Unos za ovo polje je obavezno."
 
 #: db/models/fields/__init__.py:418
 msgid "This value must be an integer."
-msgstr "Vrijednost mora biti interger."
+msgstr "Vrijednost mora biti cijeli broj."
 
 #: db/models/fields/__init__.py:454
 msgid "This value must be either True or False."
@@ -3846,7 +3860,7 @@ msgstr "Vrijednost mora biti None, True ili False."
 #: db/models/fields/related.py:55
 #, python-format
 msgid "Please enter a valid %s."
-msgstr "Molim unesite validan %s."
+msgstr "Molim unesite ispravan %s."
 
 #: db/models/fields/related.py:658
 msgid "Separate multiple IDs with commas."
@@ -3855,58 +3869,58 @@ msgstr "Odvojite više ID-a zarezom."
 #: db/models/fields/related.py:660
 msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
-"Držite \"Control\", ili \"Command\" na Mac-u, da bi odabravili više od "
+"Držite \"Control\", ili \"Command\" na Mac-u, da bi odabrali više od "
 "jednog objekta."
 
 #: db/models/fields/related.py:707
 #, 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] "Molim unesite ispravan %(self)s ID. Vrijednost %(value)r je neispravna."
-msgstr[1] ""
+msgstr[0] "Molim unesite ispravan %(self)s ID-eve. Vrijednost %(value)r je neispravna."
+msgstr[1] "Molim unesite ispravan %(self)s ID-eve. Vrijednosti %(value)r su neispravne."
 
 #: newforms/fields.py:46
 msgid "Enter a valid value."
-msgstr ""
+msgstr "Unesite ispravnu vrijednost."
 
 #: newforms/fields.py:123
 #, python-format
 msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
-msgstr ""
+msgstr "Osigurajte da ova vrijednost ima najviše %(max)d znakova (ima %(length)d)."
 
 #: newforms/fields.py:124
 #, python-format
 msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
-msgstr ""
+msgstr "Osigurajte da ova vrijednost ima najmanje %(min)d znakova (ima %(length)d)."
 
 #: newforms/fields.py:152 newforms/fields.py:181 newforms/fields.py:210
 #, python-format
 msgid "Ensure this value is less than or equal to %s."
-msgstr ""
+msgstr "Osigurajte da je ova vrijednost manja ili jednaka %s."
 
 #: newforms/fields.py:153 newforms/fields.py:182 newforms/fields.py:211
 #, python-format
 msgid "Ensure this value is greater than or equal to %s."
-msgstr ""
+msgstr "Osigurajte da je ova vrijednost veća ili jednaka %s."
 
 #: newforms/fields.py:180 newforms/fields.py:209
 msgid "Enter a number."
-msgstr ""
+msgstr "Unesite broj."
 
 #: newforms/fields.py:212
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
-msgstr ""
+msgstr "Osigurajte da ukupno nema više od %s numeričkih znakova."
 
 #: newforms/fields.py:213
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
-msgstr ""
+msgstr "Osigurajte da ukupno nema više od %s decimalnih mjesta."
 
 #: newforms/fields.py:214
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr ""
+msgstr "Osigurajte da ukupno nema više od %s numeričkih znakova prije decimalne točke."
 
 #: newforms/fields.py:262 newforms/fields.py:719
 msgid "Enter a valid date."
@@ -3914,16 +3928,15 @@ msgstr "Unesite ispravan datum."
 
 #: newforms/fields.py:295 newforms/fields.py:720
 msgid "Enter a valid time."
-msgstr ""
+msgstr "Unesite ispravno vrijeme."
 
 #: newforms/fields.py:334
 msgid "Enter a valid date/time."
-msgstr ""
+msgstr "Unesite ispravan datum/vrijeme."
 
 #: newforms/fields.py:433
-#, fuzzy
 msgid "No file was submitted."
-msgstr "Ne."
+msgstr "Datoteka nije poslana."
 
 #: newforms/fields.py:434 oldforms/__init__.py:689
 msgid "The submitted file is empty."
@@ -3931,45 +3944,43 @@ msgstr "Poslana datoteka je prazna."
 
 #: newforms/fields.py:492
 msgid "Enter a valid URL."
-msgstr ""
+msgstr "Unesite ispravan URL."
 
 #: newforms/fields.py:493
 msgid "This URL appears to be a broken link."
-msgstr ""
+msgstr "Izgleda da je URL neispravan."
 
 #: newforms/fields.py:555 newforms/models.py:317
 msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
+msgstr "Izaberite ispravnu opciju. Ta opcija nije jedna od dostupnih opcija."
 
 #: newforms/fields.py:594
-#, fuzzy, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "Odaberite iz ponuđenog; '%(data)s' nije u %(choices)s."
+msgstr "Odaberite iz ponuđenog. %(value)s nije ponuđen kao opcija."
 
 #: newforms/fields.py:595 newforms/fields.py:657 newforms/models.py:377
 msgid "Enter a list of values."
 msgstr ""
 
 #: newforms/fields.py:748
-#, fuzzy
 msgid "Enter a valid IPv4 address."
-msgstr "Unesite ispravnu e-mail adresu."
+msgstr "Unesite ispravnu IPv4 adresu."
 
 #: newforms/models.py:378
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
-msgstr ""
+msgstr "Odaberite iz ponuđenog. %s nije ponuđen kao opcija."
 
 #: oldforms/__init__.py:409
 #, 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] "Uneseni tekst mora sadržavati manje od %s znakova."
+msgstr[0] "Osigurajte da tekst sadrži manje od %s znaka."
+msgstr[1] "Osigurajte da tekst sadrži manje od %s znakova."
 
 #: oldforms/__init__.py:414
 msgid "Line breaks are not allowed here."
-msgstr "Unos u novi red ovdje nije dozvoljen."
+msgstr "Novi redovi ovdje nisu dozvoljeni."
 
 #: oldforms/__init__.py:512 oldforms/__init__.py:586 oldforms/__init__.py:625
 #, python-format
@@ -3996,39 +4007,39 @@ msgstr "da,ne,možda"
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(size)d bajt"
+msgstr[1] "%(size)d bajta"
 
 #: template/defaultfilters.py:716
 #, python-format
 msgid "%.1f KB"
-msgstr ""
+msgstr "%.1f KB"
 
 #: template/defaultfilters.py:718
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: template/defaultfilters.py:719
 #, python-format
 msgid "%.1f GB"
-msgstr ""
+msgstr "%.1f GB"
 
 #: utils/dateformat.py:41
 msgid "p.m."
-msgstr ""
+msgstr "popodne"
 
 #: utils/dateformat.py:42
 msgid "a.m."
-msgstr ""
+msgstr "ujutro"
 
 #: utils/dateformat.py:47
 msgid "PM"
-msgstr ""
+msgstr "popodne"
 
 #: utils/dateformat.py:48
 msgid "AM"
-msgstr ""
+msgstr "ujutro"
 
 #: utils/dateformat.py:97
 msgid "midnight"
@@ -4036,7 +4047,7 @@ msgstr "ponoć"
 
 #: utils/dateformat.py:99
 msgid "noon"
-msgstr ""
+msgstr "podne"
 
 #: utils/dates.py:6
 msgid "Monday"
@@ -4219,85 +4230,83 @@ msgid "Dec."
 msgstr "Pro."
 
 #: utils/text.py:127
-#, fuzzy
 msgid "or"
-msgstr "sati"
+msgstr "ili"
 
 #: utils/timesince.py:21
 msgid "year"
 msgid_plural "years"
 msgstr[0] "godina"
-msgstr[1] "godina"
+msgstr[1] "godine"
 
 #: utils/timesince.py:22
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mjesec"
-msgstr[1] "mjesec"
+msgstr[1] "mjeseci"
 
 #: utils/timesince.py:23
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "tjedan"
-msgstr[1] "tjedan"
+msgstr[1] "tjedani"
 
 #: utils/timesince.py:24
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dan"
-msgstr[1] "dan"
+msgstr[1] "dani"
 
 #: utils/timesince.py:25
 msgid "hour"
 msgid_plural "hours"
-msgstr[0] "sati"
+msgstr[0] "sat"
 msgstr[1] "sati"
 
 #: utils/timesince.py:26
 msgid "minute"
 msgid_plural "minutes"
-msgstr[0] "minute"
-msgstr[1] "minuta"
+msgstr[0] "minuta"
+msgstr[1] "minute"
 
 #: utils/timesince.py:46
-#, fuzzy
 msgid "minutes"
-msgstr "minute"
+msgstr "minuta"
 
 #: utils/timesince.py:51
 #, python-format
 msgid "%(number)d %(type)s"
-msgstr ""
+msgstr "%(number)d %(type)s"
 
 #: utils/timesince.py:57
 #, python-format
 msgid ", %(number)d %(type)s"
-msgstr ""
+msgstr ", %(number)d %(type)s"
 
 #: utils/translation/trans_real.py:399
 msgid "DATE_FORMAT"
-msgstr ""
+msgstr "DATE_FORMAT"
 
 #: utils/translation/trans_real.py:400
 msgid "DATETIME_FORMAT"
-msgstr ""
+msgstr "DATETIME_FORMAT"
 
 #: utils/translation/trans_real.py:401
 msgid "TIME_FORMAT"
-msgstr ""
+msgstr "TIME_FORMAT"
 
 #: utils/translation/trans_real.py:417
 msgid "YEAR_MONTH_FORMAT"
-msgstr ""
+msgstr "YEAR_MONTH_FORMAT"
 
 #: utils/translation/trans_real.py:418
 msgid "MONTH_DAY_FORMAT"
-msgstr ""
+msgstr "MONTH_DAY_FORMAT"
 
 #: views/generic/create_update.py:43
 #, python-format
 msgid "The %(verbose_name)s was created successfully."
-msgstr ""
+msgstr "%(verbose_name)s je uspješno kreirano."
 
 #: views/generic/create_update.py:117
 #, python-format
@@ -4307,5 +4316,5 @@ msgstr "%(verbose_name)s je uspješno promijenjeno."
 #: views/generic/create_update.py:184
 #, python-format
 msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s je izbrisano"
+msgstr "%(verbose_name)s je izbrisano."
 
diff --git a/django/conf/locale/hr/LC_MESSAGES/djangojs.mo b/django/conf/locale/hr/LC_MESSAGES/djangojs.mo
index c4b71f0fa2..30f7c1960c 100644
Binary files a/django/conf/locale/hr/LC_MESSAGES/djangojs.mo and b/django/conf/locale/hr/LC_MESSAGES/djangojs.mo differ
diff --git a/django/conf/locale/hr/LC_MESSAGES/djangojs.po b/django/conf/locale/hr/LC_MESSAGES/djangojs.po
index 7aa988c43d..5ad8993af3 100644
--- a/django/conf/locale/hr/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/hr/LC_MESSAGES/djangojs.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-08-13 11:13+1000\n"
-"PO-Revision-Date: 2008-01-05 01:45+0100\n"
+"PO-Revision-Date: 2008-06-17 23:45+0100\n"
 "Last-Translator: Aljosa Mohorovic <aljosa.mohorovic@gmail.com>\n"
 "Language-Team: Hrvatski jezik\n"
 "MIME-Version: 1.0\n"
diff --git a/django/conf/locale/lt/LC_MESSAGES/django.mo b/django/conf/locale/lt/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..3d428274b1
Binary files /dev/null and b/django/conf/locale/lt/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/lt/LC_MESSAGES/django.po b/django/conf/locale/lt/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..d855d87ddb
--- /dev/null
+++ b/django/conf/locale/lt/LC_MESSAGES/django.po
@@ -0,0 +1,2868 @@
+# Lithuanian translation of Django.
+# Copyright (C) 2008 The Django Software Foundation
+# This file is distributed under the same license as the Django package.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-06-15 23:03+0300\n"
+"PO-Revision-Date: 2008-06-18 22:37+0200\n"
+"Last-Translator: Rapolas Kaselis <rapolas@gmail.com>\n"
+"Language-Team: Django-i18n <django-i18n@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: oldforms/__init__.py:357
+#: db/models/fields/__init__.py:117
+#: db/models/fields/__init__.py:274
+#: db/models/fields/__init__.py:612
+#: db/models/fields/__init__.py:623
+#: newforms/models.py:178
+#: newforms/fields.py:80
+#: newforms/fields.py:376
+#: newforms/fields.py:452
+#: newforms/fields.py:463
+msgid "This field is required."
+msgstr "Šis laukas yra privalomas."
+
+#: oldforms/__init__.py:392
+#, python-format
+msgid "Ensure your text is less than %s character."
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] "Įsitikink, kad tavo tekstas turi mažiau nei %s simbolį."
+msgstr[1] "Įsitikink, kad tavo tekstas turi mažiau nei %s simbolių."
+
+#: oldforms/__init__.py:397
+msgid "Line breaks are not allowed here."
+msgstr "Nauja eilutė nėra leidžiama."
+
+#: oldforms/__init__.py:498
+#: oldforms/__init__.py:571
+#: oldforms/__init__.py:610
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr "Pasirink gerą variantą; '%(data)s' nėra tarp %(choices)s."
+
+#: oldforms/__init__.py:577
+#: newforms/widgets.py:180
+#: contrib/admin/filterspecs.py:150
+msgid "Unknown"
+msgstr "Nežinomas"
+
+#: oldforms/__init__.py:577
+#: newforms/widgets.py:180
+#: contrib/admin/filterspecs.py:143
+msgid "Yes"
+msgstr "Taip"
+
+#: oldforms/__init__.py:577
+#: newforms/widgets.py:180
+#: contrib/admin/filterspecs.py:143
+msgid "No"
+msgstr "Ne"
+
+#: oldforms/__init__.py:672
+#: core/validators.py:174
+#: core/validators.py:445
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr "Failas nebuvo nurodytas. Patikrink formos koduotę."
+
+#: oldforms/__init__.py:674
+msgid "The submitted file is empty."
+msgstr "Nurodytas failas yra tuščias"
+
+#: oldforms/__init__.py:730
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Įvesk sveiką skaičių nuo -32,768 iki 32,767."
+
+#: oldforms/__init__.py:740
+msgid "Enter a positive number."
+msgstr "Įvesk teigiamą skaičių."
+
+#: oldforms/__init__.py:750
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Įvesk sveiką skaičių nuo 0 iki 32,767."
+
+#: db/models/manipulators.py:307
+#, python-format
+msgid "%(object)s with this %(type)s already exists for the given %(field)s."
+msgstr "%(object)s su šiuo %(type)s jau egzistuoja duotuose %(field)s."
+
+#: db/models/manipulators.py:308
+#: contrib/admin/views/main.py:335
+#: contrib/admin/views/main.py:337
+#: contrib/admin/views/main.py:339
+msgid "and"
+msgstr "ir"
+
+#: db/models/fields/__init__.py:42
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr "%(optname)s su šiuo %(fieldname)s jau egzistuoja."
+
+#: db/models/fields/__init__.py:369
+msgid "This value must be an integer."
+msgstr "Ši reikšme turi būti sveikas skaičius."
+
+#: db/models/fields/__init__.py:404
+msgid "This value must be either True or False."
+msgstr "Ši reikšmė turi būti True arba False."
+
+#: db/models/fields/__init__.py:425
+msgid "This field cannot be null."
+msgstr "Šis laukas negali būti null"
+
+#: db/models/fields/__init__.py:459
+#: core/validators.py:148
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr "Įvesk tinkamą datą YYYY-MM-DD formatu."
+
+#: db/models/fields/__init__.py:528
+#: core/validators.py:157
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr "Įvesk tinkamą datą/laiką YYYY-MM-DD HH:MM formatu."
+
+#: db/models/fields/__init__.py:632
+msgid "Enter a valid filename."
+msgstr "Įvesk tinkamą failo vardą."
+
+#: db/models/fields/__init__.py:753
+msgid "This value must be either None, True or False."
+msgstr "Ši reikšmė turi būti viena iš None, True arba False."
+
+#: db/models/fields/related.py:53
+#, python-format
+msgid "Please enter a valid %s."
+msgstr "Įveskite tinkamą %s"
+
+#: db/models/fields/related.py:642
+msgid "Separate multiple IDs with commas."
+msgstr "Atskirkite skirtingus ID su kableliu."
+
+#: db/models/fields/related.py:644
+msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr "Paspausk ir laikyk \"Control\", arba \"Command\" Mac'uose, kad pasirinkti daugiau nei vieną."
+
+#: db/models/fields/related.py:691
+#, 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] "Įveskite tinkamą %(self)s ID. Reikšmė %(value)r yra netinkama."
+msgstr[1] "Įveskite tinkamą %(self)s ID. Reikšmės %(value)r yra netinkamos."
+
+#: conf/global_settings.py:39
+msgid "Arabic"
+msgstr "Arabų"
+
+#: conf/global_settings.py:40
+msgid "Bengali"
+msgstr "Bengalų"
+
+#: conf/global_settings.py:41
+msgid "Catalan"
+msgstr "Katalonų"
+
+#: conf/global_settings.py:42
+msgid "Czech"
+msgstr "Čekų"
+
+#: conf/global_settings.py:43
+msgid "Welsh"
+msgstr "Velso"
+
+#: conf/global_settings.py:44
+msgid "Danish"
+msgstr "Danų"
+
+#: conf/global_settings.py:45
+msgid "German"
+msgstr "Vokiečių"
+
+#: conf/global_settings.py:46
+msgid "Greek"
+msgstr "Graikų"
+
+#: conf/global_settings.py:47
+msgid "English"
+msgstr "Anglų"
+
+#: conf/global_settings.py:48
+msgid "Spanish"
+msgstr "Ispanų"
+
+#: conf/global_settings.py:49
+msgid "Argentinean Spanish"
+msgstr "Argentinos Ispanų"
+
+#: conf/global_settings.py:50
+msgid "Finnish"
+msgstr "Suomių"
+
+#: conf/global_settings.py:51
+msgid "French"
+msgstr "Prancūzų"
+
+#: conf/global_settings.py:52
+msgid "Galician"
+msgstr "Galų"
+
+#: conf/global_settings.py:53
+msgid "Hungarian"
+msgstr "Vengrų"
+
+#: conf/global_settings.py:54
+msgid "Hebrew"
+msgstr "Hebrajų"
+
+#: conf/global_settings.py:55
+msgid "Icelandic"
+msgstr "Islandų"
+
+#: conf/global_settings.py:56
+msgid "Italian"
+msgstr "Italų"
+
+#: conf/global_settings.py:57
+msgid "Japanese"
+msgstr "Japonų"
+
+#: conf/global_settings.py:58
+msgid "Korean"
+msgstr "Korėjiečių"
+
+#: conf/global_settings.py:59
+msgid "Kannada"
+msgstr "Dravidų"
+
+#: conf/global_settings.py:60
+msgid "Latvian"
+msgstr "Latvių"
+
+#: conf/global_settings.py:61
+msgid "Macedonian"
+msgstr "Makedonų"
+
+#: conf/global_settings.py:62
+msgid "Dutch"
+msgstr "Olandų"
+
+#: conf/global_settings.py:63
+msgid "Norwegian"
+msgstr "Norvegų"
+
+#: conf/global_settings.py:64
+msgid "Polish"
+msgstr "Lenkų"
+
+#: conf/global_settings.py:65
+msgid "Portugese"
+msgstr "Portugalų"
+
+#: conf/global_settings.py:66
+msgid "Brazilian"
+msgstr "Brazilų"
+
+#: conf/global_settings.py:67
+msgid "Romanian"
+msgstr "Rumunų"
+
+#: conf/global_settings.py:68
+msgid "Russian"
+msgstr "Rusų"
+
+#: conf/global_settings.py:69
+msgid "Slovak"
+msgstr "Slovakų"
+
+#: conf/global_settings.py:70
+msgid "Slovenian"
+msgstr "Slovėnų"
+
+#: conf/global_settings.py:71
+msgid "Serbian"
+msgstr "Serbų"
+
+#: conf/global_settings.py:72
+msgid "Swedish"
+msgstr "Švedų"
+
+#: conf/global_settings.py:73
+msgid "Tamil"
+msgstr "Tamilų"
+
+#: conf/global_settings.py:74
+msgid "Telugu"
+msgstr "Telugų"
+
+#: conf/global_settings.py:75
+msgid "Turkish"
+msgstr "Turkų"
+
+#: conf/global_settings.py:76
+msgid "Ukrainian"
+msgstr "Ukrainiečių"
+
+#: conf/global_settings.py:77
+msgid "Simplified Chinese"
+msgstr "Supaprastinta kinų"
+
+#: conf/global_settings.py:78
+msgid "Traditional Chinese"
+msgstr "Tradicinė kinų"
+
+#: core/validators.py:64
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "Ši reikšmė gali būti sudaryta tik iš raidžių, skaičių ir pabraukimų."
+
+#: core/validators.py:68
+msgid "This value must contain only letters, numbers, underscores, dashes or slashes."
+msgstr "Ši reikšmė gali būti sudaryta tik iš raidžių, skaičių, pabraukimų, brūkšnių ir/arba pasvirų brūkšnių."
+
+#: core/validators.py:72
+msgid "This value must contain only letters, numbers, underscores or hyphens."
+msgstr "Ši reikšmė gali būti sudaryta tik iš raidžių, skaičių, pabraukimų arba brūkšnelių."
+
+#: core/validators.py:76
+msgid "Uppercase letters are not allowed here."
+msgstr "Didžiosios raidės nėra leidžiamos."
+
+#: core/validators.py:80
+msgid "Lowercase letters are not allowed here."
+msgstr "Mažosios raidės nėra leidžiamos."
+
+#: core/validators.py:87
+msgid "Enter only digits separated by commas."
+msgstr "Įvesk skaitmenis atskirtus kableliais."
+
+#: core/validators.py:99
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr "Įvesk tinkamus e-mailus atskirtus kableliais."
+
+#: core/validators.py:103
+msgid "Please enter a valid IP address."
+msgstr "Įveskt tinkamą IP adresą."
+
+#: core/validators.py:107
+msgid "Empty values are not allowed here."
+msgstr "Tuščios reikšmės neleidžiamos."
+
+#: core/validators.py:111
+msgid "Non-numeric characters aren't allowed here."
+msgstr "Ne skaičius neleidžiamas čia."
+
+#: core/validators.py:115
+msgid "This value can't be comprised solely of digits."
+msgstr "Ši reikšmė negali būti sudaryta vientik iš skaičių."
+
+#: core/validators.py:120
+#: newforms/fields.py:128
+msgid "Enter a whole number."
+msgstr "Įvesk sveiką skaičių."
+
+#: core/validators.py:124
+msgid "Only alphabetical characters are allowed here."
+msgstr "Tik alfabetiniai simboliai leidžiami."
+
+#: core/validators.py:139
+msgid "Year must be 1900 or later."
+msgstr "Metai turi būti 1900 arba vėlesni."
+
+#: core/validators.py:143
+#, python-format
+msgid "Invalid date: %s"
+msgstr "Netinkama data: %s"
+
+#: core/validators.py:153
+msgid "Enter a valid time in HH:MM format."
+msgstr "Įvesk tinkamą laiką HH:MM formatu"
+
+#: core/validators.py:162
+#: newforms/fields.py:271
+msgid "Enter a valid e-mail address."
+msgstr "Įvesk tinkamą e-mailą."
+
+#: core/validators.py:178
+msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
+msgstr "Atsiųsk tinkamą paveiksliuką. Failas, kurį siuntei buvo arba ne paveiksliukas, arba sugadintas paveiksliukas"
+
+#: core/validators.py:185
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr "URL %s nenurodo tinkamo paveiksliuko."
+
+#: core/validators.py:189
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr "Telefono numeris turi būti XXX-XXX-XXXX formatu. \"%s\" yra netinkamas."
+
+#: core/validators.py:197
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr "URL %s nenurodo tinkamo QuickTime video."
+
+#: core/validators.py:201
+msgid "A valid URL is required."
+msgstr "Tinkamas URL privalomas."
+
+#: core/validators.py:215
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+"Tinkamas HTML privalomas. Klaidos:\n"
+"%s"
+
+#: core/validators.py:222
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr "Blogai suformuotas XML: %s"
+
+#: core/validators.py:239
+#, python-format
+msgid "Invalid URL: %s"
+msgstr "Netinkamas URL: %s"
+
+#: core/validators.py:244
+#: core/validators.py:246
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr "URL %s yra neveikiantis."
+
+#: core/validators.py:252
+msgid "Enter a valid U.S. state abbreviation."
+msgstr "Įvesk tinkamą JAV valstijos sutrumpinimą."
+
+#: core/validators.py:266
+#, 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] "Kontroliuok liežuvį! %s neleidžiamas."
+msgstr[1] "Kontroliuok liežuvį! %s neleidžiami."
+
+#: core/validators.py:273
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr "Šis laukas turi atitikti %s lauką."
+
+#: core/validators.py:292
+msgid "Please enter something for at least one field."
+msgstr "Nors vienam lauke kažką reikia įvesti."
+
+#: core/validators.py:301
+#: core/validators.py:312
+msgid "Please enter both fields or leave them both empty."
+msgstr "Įveskite abu laukus arba abu palikite tuščius."
+
+#: core/validators.py:320
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr "Šis laukas turi būti užpildytas, jei %(field)s yra %(value)s"
+
+#: core/validators.py:333
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr "Šis laukas turi būti užpildytas, jei %(field)s nėra %(value)s"
+
+#: core/validators.py:352
+msgid "Duplicate values are not allowed."
+msgstr "Vienodos reikšmės neleidžiamos."
+
+#: core/validators.py:367
+#, python-format
+msgid "This value must be between %(lower)s and %(upper)s."
+msgstr "Ši reikšmė turi būti tarp %(lower)s ir %(upper)s."
+
+#: core/validators.py:369
+#, python-format
+msgid "This value must be at least %s."
+msgstr "Ši reikšme mažiausiai turi būti %s."
+
+#: core/validators.py:371
+#, python-format
+msgid "This value must be no more than %s."
+msgstr "Ši reikšmė negali būti daugiau nei %s."
+
+#: core/validators.py:407
+#, python-format
+msgid "This value must be a power of %s."
+msgstr "Ši reikšmė turi būti %s laipsnis."
+
+#: core/validators.py:418
+msgid "Please enter a valid decimal number."
+msgstr "Įveskite tinkamą dešimtainį skaičių."
+
+#: core/validators.py:422
+#, 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] "Įveskite tinkamą dešimtainį skaičių su daugiausiai %s skaitmeniu."
+msgstr[1] "Įveskite tinkamą dešimtainį skaičių su daugiausiai %s skaitmenimis."
+
+#: core/validators.py:425
+#, python-format
+msgid "Please enter a valid decimal number with a whole part of at most %s digit."
+msgid_plural "Please enter a valid decimal number with a whole part of at most %s digits."
+msgstr[0] "Įveskite tinkamą dešimtainį skaičių, kurio sveikoji dalis ne didenė nei %s skaitmens."
+msgstr[1] "Įveskite tinkamą dešimtainį skaičių, kurio sveikoji dalis ne didenė nei %s skaitmenų."
+
+#: core/validators.py:428
+#, 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] "Įveskite tinkamą dešimtainį skaičių, kur po kablelio max %s skaitmuo."
+msgstr[1] "Įveskite tinkamą dešimtainį skaičių, kur po kablelio max %s skaitmenų."
+
+#: core/validators.py:438
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr "Įsitikink, kad įkeltas failas yra mažiausiai %s baitų dydžio."
+
+#: core/validators.py:439
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr "Įsitikink, kad įkeltas failas yra daugiausiai %s baitų dydžio."
+
+#: core/validators.py:456
+msgid "The format for this field is wrong."
+msgstr "Šis formatas yra netinkamas šiam laukui."
+
+#: core/validators.py:471
+msgid "This field is invalid."
+msgstr "Šis laukas yra netinkamas."
+
+#: core/validators.py:507
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr "Nieko negaliu gauti iš %s"
+
+#: core/validators.py:510
+#, python-format
+msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr "URL %(url)s gražino blogą Content-Type headerį '%(contenttype)s'."
+
+#: core/validators.py:543
+#, python-format
+msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
+msgstr "Uždaryk neuždarytus %(tag)s tagus nuo %(line)s eilutės. (Pradedant \"%(start)s\" eilute.)"
+
+#: core/validators.py:547
+#, python-format
+msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
+msgstr "Kažkiek teksto pradedant %(line)s eilute nėra leidžiamas šiame kontekste. (Pradedant \"%(start)s\" eilute."
+
+#: core/validators.py:552
+#, python-format
+msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
+msgstr "\"%(attr)s\" eilutėje %(line)s yra netinkamas atributas. (Pradedant \"%(start)s\" eilute.)"
+
+#: core/validators.py:557
+#, python-format
+msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
+msgstr "\"<%(tag)s>\" eilutėje %(line)s yra netinkami tagai. (Pradedant \"%(start)s\" eilute.)"
+
+#: core/validators.py:561
+#, python-format
+msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
+msgstr "Eilutėje %(line)s tagui trūksta vieno ar daugiau privalomų atributų. (Pradedant \"%(start)s\" eilute.)"
+
+#: core/validators.py:566
+#, python-format
+msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
+msgstr "\"%(attr)s\" atributas eilutėje %(line)s turi netinkamą reikšmę. (Pradedant \"%(start)s\" eilute.)"
+
+#: views/generic/create_update.py:43
+#, python-format
+msgid "The %(verbose_name)s was created successfully."
+msgstr "%(verbose_name)s sėkmingai sukurtas."
+
+#: views/generic/create_update.py:117
+#, python-format
+msgid "The %(verbose_name)s was updated successfully."
+msgstr "%(verbose_name)s sėkmingai atnaujintas."
+
+#: views/generic/create_update.py:184
+#, python-format
+msgid "The %(verbose_name)s was deleted."
+msgstr "%(verbose_name)s buvo ištrintas."
+
+#: newforms/models.py:165
+#: newforms/fields.py:364
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "Pasirink tinkamą. Tas pasirinkimas nėra iš galimų."
+
+#: newforms/models.py:182
+#: newforms/fields.py:380
+#: newforms/fields.py:456
+msgid "Enter a list of values."
+msgstr "Įvesk reikšmių sarašą."
+
+#: newforms/models.py:188
+#: newforms/fields.py:389
+#, python-format
+msgid "Select a valid choice. %s is not one of the available choices."
+msgstr "Pasirink tinkamą. %s nėra vienas iš galimų."
+
+#: newforms/fields.py:103
+#: newforms/fields.py:256
+#, python-format
+msgid "Ensure this value has at most %d characters."
+msgstr "Įsitikink, kad reikšmė daugiausiai turi %d simbolių."
+
+#: newforms/fields.py:105
+#: newforms/fields.py:258
+#, python-format
+msgid "Ensure this value has at least %d characters."
+msgstr "Įsitikink, kad reikšmė mažiausiai turi %d simbolių."
+
+#: newforms/fields.py:130
+#, python-format
+msgid "Ensure this value is less than or equal to %s."
+msgstr "Įsitikink, kad ši reikšmė yra mažiau arba lygu %s."
+
+#: newforms/fields.py:132
+#, python-format
+msgid "Ensure this value is greater than or equal to %s."
+msgstr "Įsitikink, kad ši reikšmė yra daugiau arba lygu %s."
+
+#: newforms/fields.py:165
+msgid "Enter a valid date."
+msgstr "Įvesk tinkamą datą."
+
+#: newforms/fields.py:192
+msgid "Enter a valid time."
+msgstr "Įvesk tinkamą laiką."
+
+#: newforms/fields.py:228
+msgid "Enter a valid date/time."
+msgstr "Įvesk tinkamą datą/laiką."
+
+#: newforms/fields.py:242
+msgid "Enter a valid value."
+msgstr "Įvesk tinkamą reikšmę."
+
+#: newforms/fields.py:289
+#: newforms/fields.py:311
+msgid "Enter a valid URL."
+msgstr "Įvesk tinkamą URL."
+
+#: newforms/fields.py:313
+msgid "This URL appears to be a broken link."
+msgstr "Atrodo URL blogas."
+
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "th"
+msgstr "th"
+
+#: contrib/humanize/templatetags/humanize.py:17
+#, fuzzy
+msgid "st"
+msgstr "st"
+
+#: contrib/humanize/templatetags/humanize.py:17
+#, fuzzy
+msgid "nd"
+msgstr "nd"
+
+#: contrib/humanize/templatetags/humanize.py:17
+msgid "rd"
+msgstr "rd"
+
+#: contrib/humanize/templatetags/humanize.py:47
+#, python-format
+msgid "%(value).1f million"
+msgid_plural "%(value).1f million"
+msgstr[0] "%(value).1f milijonas"
+msgstr[1] "%(value).1f milijonas"
+
+#: contrib/humanize/templatetags/humanize.py:50
+#, python-format
+msgid "%(value).1f billion"
+msgid_plural "%(value).1f billion"
+msgstr[0] "%(value).1f milijardas"
+msgstr[1] "%(value).1f milijardas"
+
+#: contrib/humanize/templatetags/humanize.py:53
+#, python-format
+msgid "%(value).1f trillion"
+msgid_plural "%(value).1f trillion"
+msgstr[0] "%(value).1f trilijonas"
+msgstr[1] "%(value).1f trilijonas"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "one"
+msgstr "vienas"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "two"
+msgstr "du"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "three"
+msgstr "trys"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "four"
+msgstr "keturi"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "five"
+msgstr "penki"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "six"
+msgstr "šeši"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "seven"
+msgstr "septyni"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "eight"
+msgstr "aštuoni"
+
+#: contrib/humanize/templatetags/humanize.py:68
+msgid "nine"
+msgstr "devyni"
+
+#: contrib/redirects/models.py:7
+msgid "redirect from"
+msgstr "nukreiptas (redirect) iš"
+
+#: contrib/redirects/models.py:8
+msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
+msgstr "Turi būti absoliutus adresas neįtraukiant domaino. Pavyzdžiui: '/events/search/'."
+
+#: contrib/redirects/models.py:9
+msgid "redirect to"
+msgstr "nukreipti(redirect) į"
+
+#: contrib/redirects/models.py:10
+msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
+msgstr "Gali būti absoliutus adresas (kaip viršuj) arba pilnas URL pradedant 'http://'."
+
+#: contrib/redirects/models.py:13
+msgid "redirect"
+msgstr "nukreipti"
+
+#: contrib/redirects/models.py:14
+msgid "redirects"
+msgstr "nukreipia"
+
+#: contrib/comments/models.py:67
+#: contrib/comments/models.py:166
+msgid "object ID"
+msgstr "objekto ID"
+
+#: contrib/comments/models.py:68
+msgid "headline"
+msgstr "antraštė"
+
+#: contrib/comments/models.py:69
+#: contrib/comments/models.py:90
+#: contrib/comments/models.py:167
+msgid "comment"
+msgstr "komentaras"
+
+#: contrib/comments/models.py:70
+msgid "rating #1"
+msgstr "reitingas #1"
+
+#: contrib/comments/models.py:71
+msgid "rating #2"
+msgstr "reitingas #2"
+
+#: contrib/comments/models.py:72
+msgid "rating #3"
+msgstr "reitingas #3"
+
+#: contrib/comments/models.py:73
+msgid "rating #4"
+msgstr "reitingas #4"
+
+#: contrib/comments/models.py:74
+msgid "rating #5"
+msgstr "reitingas #5"
+
+#: contrib/comments/models.py:75
+msgid "rating #6"
+msgstr "reitingas #6"
+
+#: contrib/comments/models.py:76
+msgid "rating #7"
+msgstr "reitingas #7"
+
+#: contrib/comments/models.py:77
+msgid "rating #8"
+msgstr "reitingas #8"
+
+#: contrib/comments/models.py:82
+msgid "is valid rating"
+msgstr "tinkamas reitingas"
+
+#: contrib/comments/models.py:83
+#: contrib/comments/models.py:169
+msgid "date/time submitted"
+msgstr "įvesta data/laikas"
+
+#: contrib/comments/models.py:84
+#: contrib/comments/models.py:170
+msgid "is public"
+msgstr "viešas"
+
+#: contrib/comments/models.py:85
+#: contrib/admin/views/doc.py:304
+msgid "IP address"
+msgstr "IP adresas"
+
+#: contrib/comments/models.py:86
+msgid "is removed"
+msgstr "pašalintas"
+
+#: contrib/comments/models.py:86
+msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
+msgstr "Pažymėk šį laukelį, jei komentaras netinkamas. \"Šis komentaras ištrintas\" bus rodoma."
+
+#: contrib/comments/models.py:91
+msgid "comments"
+msgstr "komentarai"
+
+#: contrib/comments/models.py:131
+#: contrib/comments/models.py:207
+msgid "Content object"
+msgstr "Turinio objektas"
+
+#: contrib/comments/models.py:159
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+"Paskelbta  %(user)s, %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+
+#: contrib/comments/models.py:168
+msgid "person's name"
+msgstr "asmens vardas"
+
+#: contrib/comments/models.py:171
+msgid "ip address"
+msgstr "ip adresas"
+
+#: contrib/comments/models.py:173
+msgid "approved by staff"
+msgstr "patvirtinta personalo"
+
+#: contrib/comments/models.py:176
+msgid "free comment"
+msgstr "laisvas komentaras"
+
+#: contrib/comments/models.py:177
+msgid "free comments"
+msgstr "laisvi komentarai"
+
+#: contrib/comments/models.py:233
+msgid "score"
+msgstr "rezultatas"
+
+#: contrib/comments/models.py:234
+msgid "score date"
+msgstr "rezultato data"
+
+#: contrib/comments/models.py:237
+msgid "karma score"
+msgstr "karma rezultatas"
+
+#: contrib/comments/models.py:238
+msgid "karma scores"
+msgstr "karma rezultatai"
+
+#: contrib/comments/models.py:242
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr "%(score)d reitingas nuo %(user)s"
+
+#: contrib/comments/models.py:258
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"Šis komentaras pažymėtas %(user)s:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/models.py:265
+msgid "flag date"
+msgstr "pažymėjimo data"
+
+#: contrib/comments/models.py:268
+msgid "user flag"
+msgstr "vartotojo žymė"
+
+#: contrib/comments/models.py:269
+msgid "user flags"
+msgstr "vartotojo žymės"
+
+#: contrib/comments/models.py:273
+#, python-format
+msgid "Flag by %r"
+msgstr "Pažymėtas %r"
+
+#: contrib/comments/models.py:278
+msgid "deletion date"
+msgstr "ištrinimo data"
+
+#: contrib/comments/models.py:280
+msgid "moderator deletion"
+msgstr "moderatoriaus ištrynimas"
+
+#: contrib/comments/models.py:281
+msgid "moderator deletions"
+msgstr "moderatoriaus ištrynimai"
+
+#: contrib/comments/models.py:285
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr "Moderatoriaus ištrynimas, pagal %r"
+
+#: contrib/comments/views/karma.py:19
+msgid "Anonymous users cannot vote"
+msgstr "Neprisijungę vartotojai negali balsuoti"
+
+#: contrib/comments/views/karma.py:23
+msgid "Invalid comment ID"
+msgstr "Blogas komentaro ID"
+
+#: contrib/comments/views/karma.py:25
+msgid "No voting for yourself"
+msgstr "Negali balsuoti už save"
+
+#: contrib/comments/views/comments.py:27
+msgid "This rating is required because you've entered at least one other rating."
+msgstr "Šis reitingas privalomas nes įvedei mažiausiai vieną kitą reitingą."
+
+#: contrib/comments/views/comments.py:111
+#, 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] ""
+"Šis komentaras buvo paskelbtas vartotojo, kuris paskelbė mažiau nei %(count)s komentarą:\n"
+"\n"
+"%(text)s"
+msgstr[1] ""
+"Šis komentaras buvo paskelbtas vartotojo, kuris paskelbė mažiau nei %(count)s komentarų:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/views/comments.py:116
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"Šis komentaras buvo paskelbtas nerimto vartotojo:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:280
+msgid "Only POSTs are allowed"
+msgstr "Tik POSTai yra leidžiami"
+
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:284
+msgid "One or more of the required fields wasn't submitted"
+msgstr "Vienas ar daugiau privalomų laukų nebuvo įrašytas"
+
+#: contrib/comments/views/comments.py:196
+#: contrib/comments/views/comments.py:286
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr "Kažkas padirbo komentaro formą (saugumo pažeidimai)"
+
+#: contrib/comments/views/comments.py:206
+#: contrib/comments/views/comments.py:292
+msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
+msgstr "Komentaro forma turi blogą 'target' parametrą -- objekto ID blogas"
+
+#: contrib/comments/views/comments.py:257
+#: contrib/comments/views/comments.py:321
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr "Komentaro forma nepateikė 'preview' arba 'post'"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:17
+msgid "Username:"
+msgstr "Vartotojo vardas:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:9
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_tag_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
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+msgid "Log out"
+msgstr "Atsijungti"
+
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:20
+msgid "Password:"
+msgstr "Slaptažodis:"
+
+#: contrib/comments/templates/comments/form.html:8
+msgid "Forgotten your password?"
+msgstr "Pamiršai slaptažodį?"
+
+#: contrib/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr "Reitingas"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr "Privalomas"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr "Neprivalomas"
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr "Įkelk nuotrauką"
+
+#: contrib/comments/templates/comments/form.html:28
+#: contrib/comments/templates/comments/freeform.html:5
+msgid "Comment:"
+msgstr "Komentaras:"
+
+#: contrib/comments/templates/comments/form.html:35
+#: contrib/comments/templates/comments/freeform.html:10
+msgid "Preview comment"
+msgstr "Peržiūrėti komentarą"
+
+#: contrib/comments/templates/comments/freeform.html:4
+msgid "Your name:"
+msgstr "Jūsų vardas:"
+
+#: contrib/sites/models.py:10
+msgid "domain name"
+msgstr "domeno vardas"
+
+#: contrib/sites/models.py:11
+msgid "display name"
+msgstr "rodomas vardas"
+
+#: contrib/sites/models.py:15
+msgid "site"
+msgstr "saitas"
+
+#: contrib/sites/models.py:16
+msgid "sites"
+msgstr "saitai"
+
+#: 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
+#: contrib/admin/filterspecs.py:169
+msgid "All"
+msgstr "Visi"
+
+#: contrib/admin/filterspecs.py:109
+msgid "Any date"
+msgstr "Betkokia data"
+
+#: contrib/admin/filterspecs.py:110
+msgid "Today"
+msgstr "Šiandien"
+
+#: contrib/admin/filterspecs.py:113
+msgid "Past 7 days"
+msgstr "Paskutinės 7 dienos"
+
+#: contrib/admin/filterspecs.py:115
+msgid "This month"
+msgstr "Šį mėnesį"
+
+#: contrib/admin/filterspecs.py:117
+msgid "This year"
+msgstr "Šiais metais"
+
+#: contrib/admin/models.py:16
+msgid "action time"
+msgstr "veiksmo laikas"
+
+#: contrib/admin/models.py:19
+msgid "object id"
+msgstr "objekto id"
+
+#: contrib/admin/models.py:20
+msgid "object repr"
+msgstr "objekto repr"
+
+#: contrib/admin/models.py:21
+msgid "action flag"
+msgstr "veiksmo žymė"
+
+#: contrib/admin/models.py:22
+msgid "change message"
+msgstr "pakeisti žinutę"
+
+#: contrib/admin/models.py:25
+msgid "log entry"
+msgstr "log įrašas"
+
+#: contrib/admin/models.py:26
+msgid "log entries"
+msgstr "log įrašai"
+
+#: contrib/admin/templatetags/admin_list.py:247
+msgid "All dates"
+msgstr "Visos datos"
+
+#: contrib/admin/views/auth.py:19
+#: contrib/admin/views/main.py:257
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)s \"%(obj)s\" pridėtas sėkmingai."
+
+#: contrib/admin/views/auth.py:24
+#: contrib/admin/views/main.py:261
+#: contrib/admin/views/main.py:347
+msgid "You may edit it again below."
+msgstr "Gali taisyti dar kartą žemiau."
+
+#: contrib/admin/views/auth.py:30
+msgid "Add user"
+msgstr "Pridėti vartotoją"
+
+#: contrib/admin/views/auth.py:57
+msgid "Password changed successfully."
+msgstr "Slaptažodis pakeistas sėkmingai."
+
+#: contrib/admin/views/auth.py:64
+#, python-format
+msgid "Change password: %s"
+msgstr "Pakeisti slaptažodį: %s"
+
+#: contrib/admin/views/main.py:223
+msgid "Site administration"
+msgstr "Saito administracija"
+
+#: contrib/admin/views/main.py:271
+#: contrib/admin/views/main.py:356
+#, python-format
+msgid "You may add another %s below."
+msgstr "Gali pridėti dar vieną %s žemiau."
+
+#: contrib/admin/views/main.py:289
+#, python-format
+msgid "Add %s"
+msgstr "Pridėti %s"
+
+#: contrib/admin/views/main.py:335
+#, python-format
+msgid "Added %s."
+msgstr "Pridėtas %s."
+
+#: contrib/admin/views/main.py:337
+#, python-format
+msgid "Changed %s."
+msgstr "Pakeistas %s."
+
+#: contrib/admin/views/main.py:339
+#, python-format
+msgid "Deleted %s."
+msgstr "Ištrintas %s"
+
+#: contrib/admin/views/main.py:342
+msgid "No fields changed."
+msgstr "Nei vienas laukas nepakeistas"
+
+#: contrib/admin/views/main.py:345
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)s \"%(obj)s\" buvo sėkmingai pakeistas."
+
+#: contrib/admin/views/main.py:353
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "%(name)s \"%(obj)s\" pridėtas sėkmingai. Gali taisytį jį dar kartą žemiau."
+
+#: contrib/admin/views/main.py:391
+#, python-format
+msgid "Change %s"
+msgstr "Pakeisti %s"
+
+#: contrib/admin/views/main.py:476
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Vienas arba daugiau %(fieldname)s %(name)s: %(obj)s"
+
+#: contrib/admin/views/main.py:481
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Vienas arba daugiau %(fieldname)s %(name)s:"
+
+#: contrib/admin/views/main.py:514
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "%(name)s \"%(obj)s\" sėkmingai ištrintas."
+
+#: contrib/admin/views/main.py:517
+msgid "Are you sure?"
+msgstr "Ar tu tikras?"
+
+#: contrib/admin/views/main.py:539
+#, python-format
+msgid "Change history: %s"
+msgstr "Pakeisti istoriją: %s"
+
+#: contrib/admin/views/main.py:573
+#, python-format
+msgid "Select %s"
+msgstr "Pasirinkti %s"
+
+#: contrib/admin/views/main.py:573
+#, python-format
+msgid "Select %s to change"
+msgstr "Pasirinkti %s pakeitimui"
+
+#: contrib/admin/views/main.py:768
+msgid "Database error"
+msgstr "Duomenų bazės klaida"
+
+#: contrib/admin/views/decorators.py:10
+#: contrib/auth/forms.py:60
+msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
+msgstr "Įveskite teisingą vartotojo vardą ir slaptažodį. Abiejuose laukuose didžiosios mažosios raidės skiriasi"
+
+#: contrib/admin/views/decorators.py:24
+#: contrib/admin/templates/admin/login.html:25
+msgid "Log in"
+msgstr "Prisijungti"
+
+#: contrib/admin/views/decorators.py:62
+msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
+msgstr "Prisijunkite dar kartą, nes sesijos laikas baigėsi. Nesirūpinkite, įrašai buvo išsaugoti."
+
+#: contrib/admin/views/decorators.py:69
+msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
+msgstr "Atrodo, kad Jūsų naršyklė nepriima sausainėlių (cookies). Įjunkite sausainėlių palaikymą, perkraukite puslapį ir bandykite dar kartą."
+
+#: contrib/admin/views/decorators.py:83
+msgid "Usernames cannot contain the '@' character."
+msgstr "Vartotojo vardas negali turėti '@'."
+
+#: contrib/admin/views/decorators.py:85
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "E-mailas nėra vartotojo vardas. Pabandyk '%s' vietoj to."
+
+#: contrib/admin/views/doc.py:46
+#: contrib/admin/views/doc.py:48
+#: contrib/admin/views/doc.py:50
+msgid "tag:"
+msgstr "tagas"
+
+#: contrib/admin/views/doc.py:77
+#: contrib/admin/views/doc.py:79
+#: contrib/admin/views/doc.py:81
+msgid "filter:"
+msgstr "filtras:"
+
+#: contrib/admin/views/doc.py:135
+#: contrib/admin/views/doc.py:137
+#: contrib/admin/views/doc.py:139
+msgid "view:"
+msgstr "vaizdas:"
+
+#: contrib/admin/views/doc.py:164
+#, python-format
+msgid "App %r not found"
+msgstr "Programa %r nerasta"
+
+#: contrib/admin/views/doc.py:171
+#, python-format
+msgid "Model %(name)r not found in app %(label)r"
+msgstr "Modelis %(name)r programoje %(label)r nerastas"
+
+#: contrib/admin/views/doc.py:183
+#, python-format
+msgid "the related `%(label)s.%(type)s` object"
+msgstr "susijęs `%(label)s.%(type)s` objektas"
+
+#: contrib/admin/views/doc.py:183
+#: contrib/admin/views/doc.py:205
+#: contrib/admin/views/doc.py:219
+#: contrib/admin/views/doc.py:224
+msgid "model:"
+msgstr "modelis:"
+
+#: contrib/admin/views/doc.py:214
+#, python-format
+msgid "related `%(label)s.%(name)s` objects"
+msgstr "susiję `%(label)s.%(name)s` objektai"
+
+#: contrib/admin/views/doc.py:219
+#, python-format
+msgid "all %s"
+msgstr "visi %s"
+
+#: contrib/admin/views/doc.py:224
+#, python-format
+msgid "number of %s"
+msgstr "%s skaičius"
+
+#: contrib/admin/views/doc.py:229
+#, python-format
+msgid "Fields on %s objects"
+msgstr "Objekto %s laukai"
+
+#: contrib/admin/views/doc.py:291
+#: contrib/admin/views/doc.py:301
+#: contrib/admin/views/doc.py:303
+#: contrib/admin/views/doc.py:309
+#: contrib/admin/views/doc.py:310
+#: contrib/admin/views/doc.py:312
+msgid "Integer"
+msgstr "Sveikas skaičius"
+
+#: contrib/admin/views/doc.py:292
+msgid "Boolean (Either True or False)"
+msgstr "Boolean (True arba False)"
+
+#: contrib/admin/views/doc.py:293
+#: contrib/admin/views/doc.py:311
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr "Eilutė (iki %(maxlength)s)"
+
+#: contrib/admin/views/doc.py:294
+msgid "Comma-separated integers"
+msgstr "Kableliais atskirti sveikieji skaičiai"
+
+#: contrib/admin/views/doc.py:295
+msgid "Date (without time)"
+msgstr "Data (be laiko)"
+
+#: contrib/admin/views/doc.py:296
+msgid "Date (with time)"
+msgstr "Data (su laiku)"
+
+#: contrib/admin/views/doc.py:297
+msgid "E-mail address"
+msgstr "E-mailo adresas"
+
+#: contrib/admin/views/doc.py:298
+#: contrib/admin/views/doc.py:299
+#: contrib/admin/views/doc.py:302
+msgid "File path"
+msgstr "Kelias iki failo"
+
+#: contrib/admin/views/doc.py:300
+msgid "Decimal number"
+msgstr "Dešimtainis skaičius"
+
+#: contrib/admin/views/doc.py:306
+msgid "Boolean (Either True, False or None)"
+msgstr "Boolean (True arba False arba None)"
+
+#: contrib/admin/views/doc.py:307
+msgid "Relation to parent model"
+msgstr "Sąsaja su tėviniu modeliu"
+
+#: contrib/admin/views/doc.py:308
+msgid "Phone number"
+msgstr "Telefono numeris"
+
+#: contrib/admin/views/doc.py:313
+msgid "Text"
+msgstr "Tekstas"
+
+#: contrib/admin/views/doc.py:314
+msgid "Time"
+msgstr "Laikas"
+
+#: contrib/admin/views/doc.py:315
+#: contrib/flatpages/models.py:7
+msgid "URL"
+msgstr "URL"
+
+#: contrib/admin/views/doc.py:316
+msgid "U.S. state (two uppercase letters)"
+msgstr "JAV valstija (dvi didžiosios raidės)"
+
+#: contrib/admin/views/doc.py:317
+msgid "XML text"
+msgstr "XML tekstas"
+
+#: contrib/admin/views/doc.py:343
+#, python-format
+msgid "%s does not appear to be a urlpattern object"
+msgstr "%s neatrodo kaip urlpattern objektas"
+
+#: contrib/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr "Dabartinis:"
+
+#: contrib/admin/templates/widget/file.html:3
+msgid "Change:"
+msgstr "Pakeisti:"
+
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr "Data:"
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr "Laikas:"
+
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:9
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: 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/change_list.html:5
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:9
+#: contrib/admin/templates/admin/auth/user/change_password.html:15
+#: contrib/admin/templates/admin/auth/user/change_password.html:46
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_tag_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
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+msgid "Change password"
+msgstr "Pakeisti slaptažodį"
+
+#: contrib/admin/templates/admin/change_list.html:6
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/invalid_setup.html:4
+#: contrib/admin/templates/admin/change_form.html:13
+#: contrib/admin/templates/admin/delete_confirmation.html:6
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/auth/user/change_password.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 "Pradinis"
+
+#: contrib/admin/templates/admin/change_list.html:12
+#, python-format
+msgid "Add %(name)s"
+msgstr "Pridėti %(name)s"
+
+#: contrib/admin/templates/admin/filter.html:2
+#, python-format
+msgid " By %(filter_title)s "
+msgstr " Pagal %(filter_title)s "
+
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:21
+msgid "History"
+msgstr "Istorija"
+
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "Date/time"
+msgstr "Data/laikas"
+
+#: contrib/admin/templates/admin/object_history.html:19
+msgid "User"
+msgstr "Vartotojas"
+
+#: contrib/admin/templates/admin/object_history.html:20
+msgid "Action"
+msgstr "Veiksmas"
+
+#: contrib/admin/templates/admin/object_history.html:26
+msgid "DATE_WITH_TIME_FULL"
+msgstr "j. N Y, H:i"
+
+#: 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 "Šis objektas neturi pakeitimų istorijos. Tikriausiai jis buvo pridėtas ne per admin puslapį."
+
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Go"
+msgstr "Eiti!"
+
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "1 result"
+msgid_plural "%(counter)s results"
+msgstr[0] "1 rezultatas"
+msgstr[1] "%(counter)s rezultatai"
+
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr "%(full_result_count)s iš viso"
+
+#: contrib/admin/templates/admin/pagination.html:10
+msgid "Show all"
+msgstr "Rodyti visus"
+
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django saito administravimas"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django administravimas"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Serverio klaida"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Serverio klaida (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Serverio klaida <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 "Įvyko klaida. Apie ją buvo pranešta administratoriams ir turėtų būti greitai ištaisyta. Dėkojame už kantrybę."
+
+#: contrib/admin/templates/admin/invalid_setup.html:8
+msgid "Something's wrong with your database installation. Make sure the appropriate database tables have been created, and make sure the database is readable by the appropriate user."
+msgstr "Kažkas yra negerai su jūsų duomenų bazės instaliacija. Įsitikink, kad visos reikalingos lentelės sukurtos ir vartotojas turi teises skaityti duomenų bazę."
+
+#: contrib/admin/templates/admin/index.html:17
+#, python-format
+msgid "Models available in the %(name)s application."
+msgstr "Modelis prieinamas %(name)s programoje."
+
+#: contrib/admin/templates/admin/index.html:18
+#, python-format
+msgid "%(name)s"
+msgstr "%(name)s"
+
+#: contrib/admin/templates/admin/index.html:28
+#: contrib/admin/templates/admin/change_form.html:15
+msgid "Add"
+msgstr "Pridėti"
+
+#: contrib/admin/templates/admin/index.html:34
+msgid "Change"
+msgstr "Pakeisti"
+
+#: contrib/admin/templates/admin/index.html:44
+msgid "You don't have permission to edit anything."
+msgstr "Neturi teisių ką nors keistis."
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "Recent Actions"
+msgstr "Neseni veiksmai"
+
+#: contrib/admin/templates/admin/index.html:53
+msgid "My Actions"
+msgstr "Mano Veiksmai"
+
+#: contrib/admin/templates/admin/index.html:57
+msgid "None available"
+msgstr "Nėra prieinamų"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Puslapis nerastas"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Atsiprašome, bet prašytas puslapis nerastas."
+
+#: contrib/admin/templates/admin/filters.html:4
+msgid "Filter"
+msgstr "Filtras"
+
+#: contrib/admin/templates/admin/change_form.html:22
+msgid "View on site"
+msgstr "Matyti saite"
+
+#: contrib/admin/templates/admin/change_form.html:32
+#: contrib/admin/templates/admin/auth/user/change_password.html:24
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Ištaisykite klaidą žemiau"
+msgstr[1] "Ištaisykite klaidas žemiau"
+
+#: contrib/admin/templates/admin/change_form.html:50
+msgid "Ordering"
+msgstr "Rūšiavimas"
+
+#: contrib/admin/templates/admin/change_form.html:53
+msgid "Order:"
+msgstr "Rūšiuoti:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:9
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr "Ištrinti"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, python-format
+msgid "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
+msgstr "Trinant %(object_name)s '%(escaped_object)s' turi būti ištrinti ir susiję objektai, bet tavo vartotojas neturi teisių ištrinti šių objektų:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:21
+#, python-format
+msgid "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:"
+msgstr "Ar tu esi tikras, kad nori ištrinti %(object_name)s \"%(escaped_object)s\"? Visi susiję objektai bus ištrinti:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:26
+msgid "Yes, I'm sure"
+msgstr "Taip, aš esu tikras"
+
+#: contrib/admin/templates/admin/base.html:25
+msgid "Welcome,"
+msgstr "Sveiki,"
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "Išsaugoti kaip naują"
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "Išsaugoti ir pridėti naują"
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "Išsaugoti ir tęsti redagavimą"
+
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "Išsaugoti"
+
+#: contrib/admin/templates/admin/auth/user/change_password.html:28
+#, python-format
+msgid "Enter a new password for the user <strong>%(username)s</strong>."
+msgstr "Įvesk naują slaptažodį vartotojui <strong>%(username)s</strong>."
+
+#: contrib/admin/templates/admin/auth/user/change_password.html:34
+#: contrib/admin/templates/admin/auth/user/add_form.html:18
+msgid "Password"
+msgstr "Slaptažodis"
+
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: contrib/admin/templates/admin/auth/user/add_form.html:23
+msgid "Password (again)"
+msgstr "Slaptažodis (dar kartą)"
+
+#: contrib/admin/templates/admin/auth/user/change_password.html:40
+#: contrib/admin/templates/admin/auth/user/add_form.html:24
+msgid "Enter the same password as above, for verification."
+msgstr "Patikrinimui įvesk tokį patį slaptažodį, kaip viršuje."
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:6
+msgid "First, enter a username and password. Then, you'll be able to edit more user options."
+msgstr "Pirmiausi įvesk vartotojo vardą ir slaptažodį. Tada turėsi galimybę redaguoti daugiau nustatymų."
+
+#: contrib/admin/templates/admin/auth/user/add_form.html:12
+msgid "Username"
+msgstr "Vartotojo vardas"
+
+#: 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 "Slaptažodžio keitimas"
+
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
+msgid "Password change successful"
+msgstr "Slaptažodis sėkmingai pakeistas"
+
+#: contrib/admin/templates/registration/password_change_done.html:12
+msgid "Your password was changed."
+msgstr "Jūsų slaptažodis buvo pakeistas."
+
+#: 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 "Slaptažodžiu atstatymas(reset)"
+
+#: 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 "Pamiršai slaptažodį? Įvesk savo emailą žemiau ir mes atsiųsime naują slaptažodį emailu."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "E-mailo adresas:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Atstatyti slaptažodį"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Dėkui už praleistą laiką šiandien."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Prisijungti dar kartą"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Slaptažodis sėkmingai atsatytas"
+
+#: 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 "Išsiuntėm naują slaptažodį e-mailu. Turėtumėte greitai gauti."
+
+#: 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 "Saugumo sumetimais įvesk seną slaptažodį ir tada du kartus naują, kad įsitikinti, jog nesuklydai rašydamas"
+
+#: contrib/admin/templates/registration/password_change_form.html:17
+msgid "Old password:"
+msgstr "Senas slaptažodis:"
+
+#: contrib/admin/templates/registration/password_change_form.html:19
+msgid "New password:"
+msgstr "Naujas slaptažodis:"
+
+#: contrib/admin/templates/registration/password_change_form.html:21
+msgid "Confirm password:"
+msgstr "Slaptažodžio patvirtinimas:"
+
+#: contrib/admin/templates/registration/password_change_form.html:23
+msgid "Change my password"
+msgstr "Pakeisti slaptažodį"
+
+#: contrib/admin/templates/registration/password_reset_email.html:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr "Gavote šį laišką, nes paprašėte atstatyti slaptažodį"
+
+#: contrib/admin/templates/registration/password_reset_email.html:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "Jūsų vartotojui %(site_name)s saite"
+
+#: contrib/admin/templates/registration/password_reset_email.html:5
+#, python-format
+msgid "Your new password is: %(new_password)s"
+msgstr "Jūsų naujas slaptažodis yra: %(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 "Nebijokite pasikeisti šį slaptažodį puslapyje:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:11
+msgid "Your username, in case you've forgotten:"
+msgstr "Jūsų vartotojo vardas, jei netyčia užmiršote:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:13
+msgid "Thanks for using our site!"
+msgstr "Dėkui, kad naudojatės mūsų saitu!"
+
+#: contrib/admin/templates/registration/password_reset_email.html:15
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "%(site_name)s komanda"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr "Greitosios žymės"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr "Doumentacijos greitosios žymės"
+
+#: 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\">Greitųjų žymių įdiegimui, nutempkite nuorodą į greitųjų žymių\n"
+"juostą, arba spauskite dešinį pelės klavišą ir pridėkite prie greitųjų žymių. Dabar galite\n"
+"pasirinkti greitąją žymę iš bet kurio saito puslapio. Pastebėjimas, kad keletas iš šių\n"
+"greitųjų žymių reikalauja, kad saitas būtų žiūrimas iš vidinio kompiuterio \n"
+"(pasitarkite su administratorium, jei nežinai ar tavo kompiuteris yra vidinis).</p>\n"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr "Šio puslapio dokumentacija"
+
+#: 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 "Pereina iš bet kurio puslapio į jo view funkcijos dokumentaciją, kuri sukūria tą puslapį"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr "Parodyti objekto ID"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid "Shows the content-type and unique ID for pages that represent a single object."
+msgstr "Parodyti content-type ir unikalų puslapių ID, kuris parodo vieną objektą."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr "Redaguoti šį objektą (einamajame lange)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr "Pereina į administravimo puslapį, kuris parodo vieną objektą."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr "Redaguoti šį objektą (naujame lange)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr "Kaip ir viršuje, bet administravimo puslapį atidaro naujame lange."
+
+#: contrib/contenttypes/models.py:36
+msgid "python model class name"
+msgstr "python modelio klasės vardas"
+
+#: contrib/contenttypes/models.py:39
+msgid "content type"
+msgstr "turinio tipas"
+
+#: contrib/contenttypes/models.py:40
+msgid "content types"
+msgstr "turinio tipai"
+
+#: contrib/auth/views.py:40
+msgid "Logged out"
+msgstr "Atsijungęs"
+
+#: contrib/auth/models.py:44
+#: contrib/auth/models.py:64
+msgid "name"
+msgstr "vardas"
+
+#: contrib/auth/models.py:46
+msgid "codename"
+msgstr "kodinis vardas"
+
+#: contrib/auth/models.py:49
+msgid "permission"
+msgstr "leidimas"
+
+#: contrib/auth/models.py:50
+#: contrib/auth/models.py:65
+msgid "permissions"
+msgstr "leidimai"
+
+#: contrib/auth/models.py:68
+msgid "group"
+msgstr "grupė"
+
+#: contrib/auth/models.py:69
+#: contrib/auth/models.py:109
+msgid "groups"
+msgstr "grupės"
+
+#: contrib/auth/models.py:99
+msgid "username"
+msgstr "vartotojo vardas"
+
+#: contrib/auth/models.py:99
+msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."
+msgstr "Privalomas. 30 simbolių arba mažiau. Alfanumeriniai simboliai tik (raidės, skaitmenys ir pabraukimai)"
+
+#: contrib/auth/models.py:100
+msgid "first name"
+msgstr "vardas"
+
+#: contrib/auth/models.py:101
+msgid "last name"
+msgstr "pavardė"
+
+#: contrib/auth/models.py:102
+msgid "e-mail address"
+msgstr "e-mailo adresas"
+
+#: contrib/auth/models.py:103
+msgid "password"
+msgstr "slaptažodis"
+
+#: contrib/auth/models.py:103
+msgid "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change password form</a>."
+msgstr "Naudok '[algo]$[salt]$[hexdigest]' arba naudok <a href=\"password/\">slaptažodžio keitimo formą</a>."
+
+#: contrib/auth/models.py:104
+msgid "staff status"
+msgstr "personalo statusas"
+
+#: contrib/auth/models.py:104
+msgid "Designates whether the user can log into this admin site."
+msgstr "Pažymi ar vartotojas gali prisijungti prie administravimo puslapio."
+
+#: contrib/auth/models.py:105
+msgid "active"
+msgstr "aktyvus"
+
+#: contrib/auth/models.py:105
+msgid "Designates whether this user can log into the Django admin. Unselect this instead of deleting accounts."
+msgstr "Pažymi ar šis vartotojas gali prisijungti prie Django administravimo. Nepažymėk šios lauko, vietoj vartotojo trynimo."
+
+#: contrib/auth/models.py:106
+msgid "superuser status"
+msgstr "supervartotojo statusas"
+
+#: contrib/auth/models.py:106
+msgid "Designates that this user has all permissions without explicitly assigning them."
+msgstr "Pažymi, kad šis vartotojas turi visas teises be specialių nustatymų."
+
+#: contrib/auth/models.py:107
+msgid "last login"
+msgstr "paskutinį kartą prisijungęs"
+
+#: contrib/auth/models.py:108
+msgid "date joined"
+msgstr "data, kada prisijungė"
+
+#: contrib/auth/models.py:110
+msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
+msgstr "Prie rankiniu būdų priskirtų teisių, šis vartotojas taip pat gaus visas teises, kurias turi grupės, kurioms jis priklauso."
+
+#: contrib/auth/models.py:111
+msgid "user permissions"
+msgstr "vartotojo leidimai"
+
+#: contrib/auth/models.py:115
+msgid "user"
+msgstr "vartotojas"
+
+#: contrib/auth/models.py:116
+msgid "users"
+msgstr "vartotojai"
+
+#: contrib/auth/models.py:122
+msgid "Personal info"
+msgstr "Asmeninė informacija"
+
+#: contrib/auth/models.py:123
+msgid "Permissions"
+msgstr "Leidimai"
+
+#: contrib/auth/models.py:124
+msgid "Important dates"
+msgstr "Svarbios datos"
+
+#: contrib/auth/models.py:125
+msgid "Groups"
+msgstr "Grupės"
+
+#: contrib/auth/models.py:269
+msgid "message"
+msgstr "žinutė"
+
+#: contrib/auth/models.py:282
+msgid "AnonymousUser"
+msgstr "Anoniminis vartotojas"
+
+#: contrib/auth/forms.py:17
+#: contrib/auth/forms.py:138
+msgid "The two password fields didn't match."
+msgstr "Slaptažodžio laukai nesutapo"
+
+#: contrib/auth/forms.py:25
+msgid "A user with that username already exists."
+msgstr "Jau egzistuoja vartotojas su tokiu vardu."
+
+#: contrib/auth/forms.py:53
+msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
+msgstr "Atrodo, jūsų naršyklė nepriima sausainėlių(cookies). Sausainėliai yra reikalingi norint prisijungti."
+
+#: contrib/auth/forms.py:62
+msgid "This account is inactive."
+msgstr "Ši paskyra yra neaktyvi."
+
+#: contrib/auth/forms.py:85
+msgid "That e-mail address doesn't have an associated user account. Are you sure you've registered?"
+msgstr "Šis emailas nėra registruotas sistemoje. Ar esi tikras, kad tu užsiregistravęs?"
+
+#: contrib/auth/forms.py:117
+msgid "The two 'new password' fields didn't match."
+msgstr "Naujo slaptažodžio laukai nesutapo"
+
+#: contrib/auth/forms.py:124
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr "Blogai įvestas senas slaptažodis. Bandykite dar kartą."
+
+#: contrib/localflavor/uk/forms.py:18
+msgid "Enter a postcode. A space is required between the two postcode parts."
+msgstr "Įveskite pašto kodą. Tarpas reikalingas tarp dviejų pašto kodo dalių."
+
+#: contrib/localflavor/br/forms.py:18
+msgid "Enter a zip code in the format XXXXX-XXX."
+msgstr "Įveskite pašto kodą XXXXX-XXX formatu."
+
+#: contrib/localflavor/br/forms.py:30
+msgid "Phone numbers must be in XX-XXXX-XXXX format."
+msgstr "Telefonas turi būti XXX-XXXX-XXXX formatu."
+
+#: contrib/localflavor/br/forms.py:72
+msgid "This field requires only numbers."
+msgstr "Šis laukas priima tik skaičius."
+
+#: contrib/localflavor/br/forms.py:74
+msgid "This field requires at most 11 digits or 14 characters."
+msgstr "Šis laukas talpina daugiausiai 11 skaitmenų arba 14 simbolių."
+
+#: contrib/localflavor/br/forms.py:84
+msgid "Invalid CPF number."
+msgstr "Netinkamas CPF numeris"
+
+#: contrib/localflavor/br/forms.py:106
+msgid "This field requires at least 14 digits"
+msgstr "Šis laukas reikalauja mažiausiai 14 skaitmenų."
+
+#: contrib/localflavor/br/forms.py:116
+msgid "Invalid CNPJ number."
+msgstr "Netinkamas CNPJ numeris"
+
+#: contrib/localflavor/au/forms.py:18
+msgid "Enter a 4 digit post code."
+msgstr "Įveskite 4 skaitmenų pašto kodą."
+
+#: contrib/localflavor/fr/forms.py:17
+#: contrib/localflavor/de/forms.py:16
+#: contrib/localflavor/fi/forms.py:14
+msgid "Enter a zip code in the format XXXXX."
+msgstr "Įveskite pašto kodą XXXXX formatu."
+
+#: contrib/localflavor/us/forms.py:18
+msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
+msgstr "Įveskite pašto kodą XXXXX arba XXXXX-XXXX formatu."
+
+#: contrib/localflavor/us/forms.py:51
+msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
+msgstr "Įveskite tinkamą JAV socialinio draudimo numerį."
+
+#: contrib/localflavor/de/de_states.py:5
+msgid "Baden-Wuerttemberg"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:6
+msgid "Bavaria"
+msgstr "Bavarija"
+
+#: contrib/localflavor/de/de_states.py:7
+msgid "Berlin"
+msgstr "Berlynas"
+
+#: contrib/localflavor/de/de_states.py:8
+msgid "Brandenburg"
+msgstr "Brandenburgas"
+
+#: contrib/localflavor/de/de_states.py:9
+msgid "Bremen"
+msgstr "Bremenas"
+
+#: contrib/localflavor/de/de_states.py:10
+msgid "Hamburg"
+msgstr "Hamburgas"
+
+#: contrib/localflavor/de/de_states.py:11
+#, fuzzy
+msgid "Hessen"
+msgstr "Hesenas"
+
+#: contrib/localflavor/de/de_states.py:12
+msgid "Mecklenburg-Western Pomerania"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:13
+msgid "Lower Saxony"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:14
+msgid "North Rhine-Westphalia"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:15
+msgid "Rhineland-Palatinate"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:16
+msgid "Saarland"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:17
+msgid "Saxony"
+msgstr "Saksonija"
+
+#: contrib/localflavor/de/de_states.py:18
+msgid "Saxony-Anhalt"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:19
+msgid "Schleswig-Holstein"
+msgstr ""
+
+#: contrib/localflavor/de/de_states.py:20
+msgid "Thuringia"
+msgstr ""
+
+#: contrib/localflavor/de/forms.py:60
+msgid "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format."
+msgstr "Įveskite tinkamą Vokiško asmens id numerį XXXXXXXXXXX-XXXXXXX-XXXXXXX-X formatu."
+
+#: contrib/localflavor/jp/jp_prefectures.py:4
+msgid "Hokkaido"
+msgstr "Hokaidas"
+
+#: contrib/localflavor/jp/jp_prefectures.py:5
+msgid "Aomori"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:6
+#, fuzzy
+msgid "Iwate"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:7
+msgid "Miyagi"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:8
+msgid "Akita"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:9
+msgid "Yamagata"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:10
+msgid "Fukushima"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:11
+msgid "Ibaraki"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:12
+msgid "Tochigi"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:13
+msgid "Gunma"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:14
+msgid "Saitama"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:15
+msgid "Chiba"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:16
+msgid "Tokyo"
+msgstr "Tokijas"
+
+#: contrib/localflavor/jp/jp_prefectures.py:17
+msgid "Kanagawa"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:18
+msgid "Yamanashi"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:19
+msgid "Nagano"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:20
+msgid "Niigata"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:21
+msgid "Toyama"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:22
+msgid "Ishikawa"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:23
+msgid "Fukui"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:24
+msgid "Gifu"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:25
+msgid "Shizuoka"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:26
+msgid "Aichi"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:27
+msgid "Mie"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:28
+msgid "Shiga"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:29
+msgid "Kyoto"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:30
+msgid "Osaka"
+msgstr "Osaka"
+
+#: contrib/localflavor/jp/jp_prefectures.py:31
+msgid "Hyogo"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:32
+msgid "Nara"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:33
+msgid "Wakayama"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:34
+msgid "Tottori"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:35
+#, fuzzy
+msgid "Shimane"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:36
+msgid "Okayama"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:37
+msgid "Hiroshima"
+msgstr "Hirošima"
+
+#: contrib/localflavor/jp/jp_prefectures.py:38
+msgid "Yamaguchi"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:39
+msgid "Tokushima"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:40
+msgid "Kagawa"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:41
+#, fuzzy
+msgid "Ehime"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:42
+msgid "Kochi"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:43
+msgid "Fukuoka"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:44
+msgid "Saga"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:45
+msgid "Nagasaki"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:46
+msgid "Kumamoto"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:47
+msgid "Oita"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:48
+msgid "Miyazaki"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:49
+msgid "Kagoshima"
+msgstr ""
+
+#: contrib/localflavor/jp/jp_prefectures.py:50
+msgid "Okinawa"
+msgstr "Okinava"
+
+#: contrib/localflavor/jp/forms.py:21
+msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
+msgstr "Įveskite pašto kodą XXXXXXX arba XXX-XXXX formatu."
+
+#: contrib/localflavor/ch/ch_states.py:5
+msgid "Aargau"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:6
+msgid "Appenzell Innerrhoden"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:7
+msgid "Appenzell Ausserrhoden"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:8
+msgid "Basel-Stadt"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:9
+msgid "Basel-Land"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:10
+#, fuzzy
+msgid "Berne"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:11
+msgid "Fribourg"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:12
+msgid "Geneva"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:13
+#, fuzzy
+msgid "Glarus"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:14
+msgid "Graubuenden"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:15
+msgid "Jura"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:16
+#, fuzzy
+msgid "Lucerne"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:17
+msgid "Neuchatel"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:18
+msgid "Nidwalden"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:19
+msgid "Obwalden"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:20
+msgid "Schaffhausen"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:21
+msgid "Schwyz"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:22
+msgid "Solothurn"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:23
+msgid "St. Gallen"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:24
+#, fuzzy
+msgid "Thurgau"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:25
+msgid "Ticino"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:26
+msgid "Uri"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:27
+msgid "Valais"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:28
+msgid "Vaud"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:29
+#, fuzzy
+msgid "Zug"
+msgstr ""
+
+#: contrib/localflavor/ch/ch_states.py:30
+msgid "Zurich"
+msgstr ""
+
+#: contrib/localflavor/ch/forms.py:18
+#: contrib/localflavor/no/forms.py:15
+msgid "Enter a zip code in the format XXXX."
+msgstr "Įveskite pašto kodą XXXX formatu."
+
+#: contrib/localflavor/ch/forms.py:90
+msgid "Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format."
+msgstr "Įveskite tinkamą šveicarų asmens id ar paso numerį X1234567<0 arba 1234567890 formatu."
+
+#: contrib/localflavor/is_/forms.py:16
+msgid "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
+msgstr "Įveskite tinkamą islandų asmens id numerį XXXXXX-XXXX formatu."
+
+#: contrib/localflavor/is_/forms.py:30
+msgid "The Icelandic identification number is not valid."
+msgstr "Islandiškas asmend id yra netinkamas."
+
+#: contrib/localflavor/it/forms.py:16
+msgid "Enter a valid zip code."
+msgstr "Įveskite tinkamą pašto kodą."
+
+#: contrib/localflavor/it/forms.py:41
+msgid "Enter a valid Social Security number."
+msgstr "Įveskite tinkamą socialinio draudimo numerį."
+
+#: contrib/localflavor/it/forms.py:68
+msgid "Enter a valid VAT number."
+msgstr "Įveskite tinkamą PVM numerį"
+
+#: contrib/localflavor/no/forms.py:36
+msgid "Enter a valid Norwegian social security number."
+msgstr "Įveskite tinkamą norvegiška socialinio draudimo numerį."
+
+#: contrib/localflavor/cl/forms.py:21
+msgid "Enter valid a Chilean RUT. The format is XX.XXX.XXX-X."
+msgstr "Įveskite tinkamą Čilės RUT XX.XXX.XXX-X formatu."
+
+#: contrib/localflavor/cl/forms.py:26
+msgid "Enter valid a Chilean RUT"
+msgstr "Įveskite tinkamą Čilės RUT"
+
+#: contrib/localflavor/fi/forms.py:40
+#: contrib/localflavor/fi/forms.py:45
+msgid "Enter a valid Finnish social security number."
+msgstr "Įveskite tinkamą suomišką socialinio draudimo numerį."
+
+#: contrib/sessions/models.py:68
+msgid "session key"
+msgstr "sesijos raktas"
+
+#: contrib/sessions/models.py:69
+msgid "session data"
+msgstr "sesijos data"
+
+#: contrib/sessions/models.py:70
+msgid "expire date"
+msgstr "galiojima data"
+
+#: contrib/sessions/models.py:74
+msgid "session"
+msgstr "sesija"
+
+#: contrib/sessions/models.py:75
+msgid "sessions"
+msgstr "sesijos"
+
+#: contrib/flatpages/models.py:8
+msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr "Pavyzdžiui: '/about/contact/'. Įsitikink, kad yra pasvirieji brūkšniai pradžioj ir gale."
+
+#: contrib/flatpages/models.py:9
+msgid "title"
+msgstr "pavadinimas"
+
+#: contrib/flatpages/models.py:10
+msgid "content"
+msgstr "turinys"
+
+#: contrib/flatpages/models.py:11
+msgid "enable comments"
+msgstr "įjungti komentavimą"
+
+#: contrib/flatpages/models.py:12
+msgid "template name"
+msgstr "šablono vardas"
+
+#: contrib/flatpages/models.py:13
+msgid "Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'."
+msgstr "Pavyzdžiui: 'flatpages/contact_page.html'. Jeigu bus nenurodytas, sistema naudos 'flatpages/default.html'."
+
+#: contrib/flatpages/models.py:14
+msgid "registration required"
+msgstr "registracija privaloma"
+
+#: contrib/flatpages/models.py:14
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr "Jeigu pažymėta, tik prisijungę vartotojai galės matyti šį puslapį."
+
+#: contrib/flatpages/models.py:18
+msgid "flat page"
+msgstr "paprastas puslapis"
+
+#: contrib/flatpages/models.py:19
+msgid "flat pages"
+msgstr "paprasti puslapiai"
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Pirmadienis"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Antradienis"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Trečiadienis"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "Ketvirtadienis"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Penktadienis"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Šeštadienis"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Sekmadienis"
+
+#: utils/dates.py:14
+msgid "January"
+msgstr "Sausis"
+
+#: utils/dates.py:14
+msgid "February"
+msgstr "Vasaris"
+
+#: utils/dates.py:14
+#: utils/dates.py:27
+msgid "March"
+msgstr "Kovas"
+
+#: utils/dates.py:14
+#: utils/dates.py:27
+msgid "April"
+msgstr "Balandis"
+
+#: utils/dates.py:14
+#: utils/dates.py:27
+msgid "May"
+msgstr "Gegužė"
+
+#: utils/dates.py:14
+#: utils/dates.py:27
+msgid "June"
+msgstr "Birželis"
+
+#: utils/dates.py:15
+#: utils/dates.py:27
+msgid "July"
+msgstr "Liepa"
+
+#: utils/dates.py:15
+msgid "August"
+msgstr "Rugpjūtis"
+
+#: utils/dates.py:15
+msgid "September"
+msgstr "Rugsėjis"
+
+#: utils/dates.py:15
+msgid "October"
+msgstr "Spalis"
+
+#: utils/dates.py:15
+msgid "November"
+msgstr "Lapkritis"
+
+#: utils/dates.py:16
+msgid "December"
+msgstr "Gruodis"
+
+#: utils/dates.py:19
+msgid "jan"
+msgstr "sau"
+
+#: utils/dates.py:19
+msgid "feb"
+msgstr "vas"
+
+#: utils/dates.py:19
+msgid "mar"
+msgstr "kov"
+
+#: utils/dates.py:19
+msgid "apr"
+msgstr "bal"
+
+#: utils/dates.py:19
+msgid "may"
+msgstr "geg"
+
+#: utils/dates.py:19
+msgid "jun"
+msgstr "bir"
+
+#: utils/dates.py:20
+msgid "jul"
+msgstr "lie"
+
+#: utils/dates.py:20
+msgid "aug"
+msgstr "rugp"
+
+#: utils/dates.py:20
+msgid "sep"
+msgstr "rugs"
+
+#: utils/dates.py:20
+msgid "oct"
+msgstr "spa"
+
+#: utils/dates.py:20
+msgid "nov"
+msgstr "lap"
+
+#: utils/dates.py:20
+msgid "dec"
+msgstr "grd"
+
+#: utils/dates.py:27
+msgid "Jan."
+msgstr "Sau."
+
+#: utils/dates.py:27
+msgid "Feb."
+msgstr "Vas."
+
+#: utils/dates.py:28
+msgid "Aug."
+msgstr "Rugp."
+
+#: utils/dates.py:28
+msgid "Sept."
+msgstr "Rugs."
+
+#: utils/dates.py:28
+msgid "Oct."
+msgstr "Spa."
+
+#: utils/dates.py:28
+msgid "Nov."
+msgstr "Lap."
+
+#: utils/dates.py:28
+msgid "Dec."
+msgstr "Grd."
+
+#: utils/timesince.py:12
+msgid "year"
+msgid_plural "years"
+msgstr[0] "metai"
+msgstr[1] "metai"
+
+#: utils/timesince.py:13
+msgid "month"
+msgid_plural "months"
+msgstr[0] "mėnesis"
+msgstr[1] "mėnesiai"
+
+#: utils/timesince.py:14
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "savaitė"
+msgstr[1] "savaitės"
+
+#: utils/timesince.py:15
+msgid "day"
+msgid_plural "days"
+msgstr[0] "diena"
+msgstr[1] "dienos"
+
+#: utils/timesince.py:16
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "valanda"
+msgstr[1] "valandos"
+
+#: utils/timesince.py:17
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minutė"
+msgstr[1] "minutės"
+
+#: utils/timesince.py:40
+#, python-format
+msgid "%d milliseconds"
+msgstr "%d milisekundės"
+
+#: utils/timesince.py:41
+#, python-format
+msgid "%(number)d %(type)s"
+msgstr "%(number)d %(type)s"
+
+#: utils/timesince.py:47
+#, python-format
+msgid ", %(number)d %(type)s"
+msgstr ", %(number)d %(type)s"
+
+#: utils/dateformat.py:40
+#, fuzzy
+msgid "p.m."
+msgstr "p.m."
+
+#: utils/dateformat.py:41
+#, fuzzy
+msgid "a.m."
+msgstr "a.m."
+
+#: utils/dateformat.py:46
+#, fuzzy
+msgid "PM"
+msgstr "PM"
+
+#: utils/dateformat.py:47
+#, fuzzy
+msgid "AM"
+msgstr "AM"
+
+#: utils/dateformat.py:95
+msgid "midnight"
+msgstr "vidurnaktis"
+
+#: utils/dateformat.py:97
+msgid "noon"
+msgstr "vidurdienis"
+
+#: utils/translation/trans_real.py:358
+msgid "DATE_FORMAT"
+msgstr "DATE_FORMAT"
+
+#: utils/translation/trans_real.py:359
+msgid "DATETIME_FORMAT"
+msgstr "DATETIME_FORMAT"
+
+#: utils/translation/trans_real.py:360
+msgid "TIME_FORMAT"
+msgstr "TIME_FORMAT"
+
+#: utils/translation/trans_real.py:376
+msgid "YEAR_MONTH_FORMAT"
+msgstr "YEAR_MONTH_FORMAT"
+
+#: utils/translation/trans_real.py:377
+msgid "MONTH_DAY_FORMAT"
+msgstr "MONTH_DAY_FORMAT"
+
+#: template/defaultfilters.py:491
+msgid "yes,no,maybe"
+msgstr "taip,ne,galbūt"
+
+#: template/defaultfilters.py:520
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d baitas"
+msgstr[1] "%(size)d baitai"
+
+#: template/defaultfilters.py:522
+#, python-format
+msgid "%.1f KB"
+msgstr "%.1f KB"
+
+#: template/defaultfilters.py:524
+#, python-format
+msgid "%.1f MB"
+msgstr "%.1f MB"
+
+#: template/defaultfilters.py:525
+#, python-format
+msgid "%.1f GB"
+msgstr "%.1f GB"
+
diff --git a/django/conf/locale/lt/LC_MESSAGES/djangojs.mo b/django/conf/locale/lt/LC_MESSAGES/djangojs.mo
new file mode 100644
index 0000000000..d703bfbe60
Binary files /dev/null and b/django/conf/locale/lt/LC_MESSAGES/djangojs.mo differ
diff --git a/django/conf/locale/lt/LC_MESSAGES/djangojs.po b/django/conf/locale/lt/LC_MESSAGES/djangojs.po
new file mode 100644
index 0000000000..81d69882c4
--- /dev/null
+++ b/django/conf/locale/lt/LC_MESSAGES/djangojs.po
@@ -0,0 +1,116 @@
+# Lithuanian translation of Django.
+# Copyright (C) 2008 The Django Software Foundation
+# This file is distributed under the same license as the Django package.
+msgid ""
+msgstr ""
+"Project-Id-Version: Django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-06-15 23:03+0300\n"
+"PO-Revision-Date: 2008-06-18 22:37+0200\n"
+"Last-Translator: Rapolas Kaselis <rapolas@gmail.com>\n"
+"Language-Team: Django-i18n <django-i18n@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: contrib/admin/media/js/SelectFilter2.js:33
+#, perl-format
+msgid "Available %s"
+msgstr "Galimas %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:41
+msgid "Choose all"
+msgstr "Pasirinkti visus"
+
+#: contrib/admin/media/js/SelectFilter2.js:46
+msgid "Add"
+msgstr "Pridėti"
+
+#: contrib/admin/media/js/SelectFilter2.js:48
+msgid "Remove"
+msgstr "Pašalinti"
+
+#: contrib/admin/media/js/SelectFilter2.js:53
+#, perl-format
+msgid "Chosen %s"
+msgstr "Pasirinktas %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:54
+msgid "Select your choice(s) and click "
+msgstr "Pasirink ir paspausk"
+
+#: contrib/admin/media/js/SelectFilter2.js:59
+msgid "Clear all"
+msgstr "Išvalyti visus"
+
+#: contrib/admin/media/js/dateparse.js:32
+#: contrib/admin/media/js/calendar.js:24
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr "Sausis Vasaris Kovas Balandis Gegužė Birželis Liepa Rugpjūtis Rugsėjis "
+"Spalis Lapkritis Gruodis"
+
+#: contrib/admin/media/js/dateparse.js:33
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "Sekmadienis Pirmadienis Antradienis Trečiadienis Ketvirtadienis Penktadienis Šeštadienis"
+
+#: contrib/admin/media/js/calendar.js:25
+msgid "S M T W T F S"
+msgstr "S P A T K P Š"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+msgid "Now"
+msgstr "Dabar"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
+msgid "Clock"
+msgstr "Laikrodis"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
+msgid "Choose a time"
+msgstr "Pasirink laiką"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+msgid "Midnight"
+msgstr "Vidurnaktis"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+msgid "6 a.m."
+msgstr "6 a.m."
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
+msgid "Noon"
+msgstr "Vidurdienis"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
+msgid "Cancel"
+msgstr "Atšaukti"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
+msgid "Today"
+msgstr "Šiandien"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
+msgid "Calendar"
+msgstr "Kalendorius"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
+msgid "Yesterday"
+msgstr "Vakar"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
+msgid "Tomorrow"
+msgstr "Rytoj"
+
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
+msgid "Show"
+msgstr "Parodyti"
+
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
+msgid "Hide"
+msgstr "Slėpti"
diff --git a/django/contrib/auth/views.py b/django/contrib/auth/views.py
index d796e62004..c04b900932 100644
--- a/django/contrib/auth/views.py
+++ b/django/contrib/auth/views.py
@@ -16,7 +16,7 @@ def login(request, template_name='registration/login.html', redirect_field_name=
     "Displays the login form and handles the login action."
     redirect_to = request.REQUEST.get(redirect_field_name, '')
     if request.method == "POST":
-        form = AuthenticationForm(request, request.POST)
+        form = AuthenticationForm(data=request.POST)
         if form.is_valid():
             # Light security check -- make sure redirect_to isn't garbage.
             if not redirect_to or '//' in redirect_to or ' ' in redirect_to:
@@ -24,7 +24,8 @@ def login(request, template_name='registration/login.html', redirect_field_name=
                 redirect_to = settings.LOGIN_REDIRECT_URL
             from django.contrib.auth import login
             login(request, form.get_user())
-            request.session.delete_test_cookie()
+            if request.session.test_cookie_worked():
+                request.session.delete_test_cookie()
             return HttpResponseRedirect(redirect_to)
     else:
         form = AuthenticationForm(request)
diff --git a/django/contrib/formtools/tests.py b/django/contrib/formtools/tests.py
index feda6e041e..143857ad58 100644
--- a/django/contrib/formtools/tests.py
+++ b/django/contrib/formtools/tests.py
@@ -23,12 +23,16 @@ class TestForm(forms.Form):
 class PreviewTests(TestCase):
 
     def setUp(self):
+        self._old_root_urlconf = settings.ROOT_URLCONF
         settings.ROOT_URLCONF = 'django.contrib.formtools.test_urls'
         # Create a FormPreview instance to share between tests
         self.preview = preview.FormPreview(TestForm)
         input_template = '<input type="hidden" name="%s" value="%s" />'
         self.input = input_template % (self.preview.unused_name('stage'), "%d")
 
+    def tearDown(self):
+        settings.ROOT_URLCONF = self._old_root_urlconf
+        
     def test_unused_name(self):
         """
         Verifies name mangling to get uniue field name.
diff --git a/django/contrib/localflavor/ar/forms.py b/django/contrib/localflavor/ar/forms.py
index b23923b47a..464399188f 100644
--- a/django/contrib/localflavor/ar/forms.py
+++ b/django/contrib/localflavor/ar/forms.py
@@ -6,7 +6,7 @@ AR-specific Form helpers.
 from django.newforms import ValidationError
 from django.newforms.fields import RegexField, CharField, Select, EMPTY_VALUES
 from django.utils.encoding import smart_unicode
-from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 
 class ARProvinceSelect(Select):
     """
@@ -24,7 +24,7 @@ class ARPostalCodeField(RegexField):
     See http://www.correoargentino.com.ar/consulta_cpa/home.php
     """
     default_error_messages = {
-        'invalid': ugettext("Enter a postal code in the format NNNN or ANNNNAAA."),
+        'invalid': _("Enter a postal code in the format NNNN or ANNNNAAA."),
     }
 
     def __init__(self, *args, **kwargs):
@@ -46,8 +46,8 @@ class ARDNIField(CharField):
     A field that validates 'Documento Nacional de Identidad' (DNI) numbers.
     """
     default_error_messages = {
-        'invalid': ugettext("This field requires only numbers."),
-        'max_digits': ugettext("This field requires 7 or 8 digits."),
+        'invalid': _("This field requires only numbers."),
+        'max_digits': _("This field requires 7 or 8 digits."),
     }
 
     def __init__(self, *args, **kwargs):
@@ -76,8 +76,8 @@ class ARCUITField(RegexField):
     CUIT is of the form XX-XXXXXXXX-V. The last digit is a check digit.
     """
     default_error_messages = {
-        'invalid': ugettext('Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format.'),
-        'checksum': ugettext("Invalid CUIT."),
+        'invalid': _('Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format.'),
+        'checksum': _("Invalid CUIT."),
     }
 
     def __init__(self, *args, **kwargs):
diff --git a/django/contrib/localflavor/au/forms.py b/django/contrib/localflavor/au/forms.py
index ada27b69b9..41d4e04fec 100644
--- a/django/contrib/localflavor/au/forms.py
+++ b/django/contrib/localflavor/au/forms.py
@@ -5,7 +5,7 @@ Australian-specific Form helpers
 from django.newforms import ValidationError
 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
 from django.newforms.util import smart_unicode
-from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 import re
 
 PHONE_DIGITS_RE = re.compile(r'^(\d{10})$')
@@ -13,7 +13,7 @@ PHONE_DIGITS_RE = re.compile(r'^(\d{10})$')
 class AUPostCodeField(RegexField):
     """Australian post code field."""
     default_error_messages = {
-        'invalid': ugettext('Enter a 4 digit post code.'),
+        'invalid': _('Enter a 4 digit post code.'),
     }
 
     def __init__(self, *args, **kwargs):
diff --git a/django/contrib/localflavor/br/forms.py b/django/contrib/localflavor/br/forms.py
index aa7e3b23fd..81dcb8228b 100644
--- a/django/contrib/localflavor/br/forms.py
+++ b/django/contrib/localflavor/br/forms.py
@@ -6,7 +6,7 @@ BR-specific Form helpers
 from django.newforms import ValidationError
 from django.newforms.fields import Field, RegexField, CharField, Select, EMPTY_VALUES
 from django.utils.encoding import smart_unicode
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
 import re
 
 try:
diff --git a/django/contrib/localflavor/ca/forms.py b/django/contrib/localflavor/ca/forms.py
index b40dba8335..548f85b7f6 100644
--- a/django/contrib/localflavor/ca/forms.py
+++ b/django/contrib/localflavor/ca/forms.py
@@ -5,7 +5,7 @@ Canada-specific Form helpers
 from django.newforms import ValidationError
 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
 from django.newforms.util import smart_unicode
-from django.utils.translation import gettext, ugettext
+from django.utils.translation import ugettext_lazy as _
 import re
 
 phone_digits_re = re.compile(r'^(?:1-?)?(\d{3})[-\.]?(\d{3})[-\.]?(\d{4})$')
@@ -14,7 +14,7 @@ sin_re = re.compile(r"^(\d{3})-(\d{3})-(\d{3})$")
 class CAPostalCodeField(RegexField):
     """Canadian postal code field."""
     default_error_messages = {
-        'invalid': gettext(u'Enter a postal code in the format XXX XXX.'),
+        'invalid': _(u'Enter a postal code in the format XXX XXX.'),
     }
 
     def __init__(self, *args, **kwargs):
@@ -85,7 +85,7 @@ class CASocialInsuranceNumberField(Field):
              See: http://en.wikipedia.org/wiki/Social_Insurance_Number
     """
     default_error_messages = {
-        'invalid': ugettext('Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format.'),
+        'invalid': _('Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format.'),
     }
 
     def clean(self, value):
diff --git a/django/contrib/localflavor/ch/forms.py b/django/contrib/localflavor/ch/forms.py
index 2158fba697..e2d3aea944 100644
--- a/django/contrib/localflavor/ch/forms.py
+++ b/django/contrib/localflavor/ch/forms.py
@@ -5,7 +5,7 @@ Swiss-specific Form helpers
 from django.newforms import ValidationError
 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
 from django.utils.encoding import smart_unicode
-from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 import re
 
 id_re = re.compile(r"^(?P<idnumber>\w{8})(?P<pos9>(\d{1}|<))(?P<checksum>\d{1})$")
@@ -13,7 +13,7 @@ phone_digits_re = re.compile(r'^0([1-9]{1})\d{8}$')
 
 class CHZipCodeField(RegexField):
     default_error_messages = {
-        'invalid': ugettext('Enter a zip code in the format XXXX.'),
+        'invalid': _('Enter a zip code in the format XXXX.'),
     }
 
     def __init__(self, *args, **kwargs):
@@ -61,7 +61,7 @@ class CHIdentityCardNumberField(Field):
     Algorithm is documented at http://adi.kousz.ch/artikel/IDCHE.htm
     """
     default_error_messages = {
-        'invalid': ugettext('Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format.'),
+        'invalid': _('Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format.'),
     }
 
     def has_valid_checksum(self, number):
diff --git a/django/contrib/localflavor/cl/forms.py b/django/contrib/localflavor/cl/forms.py
index 2f5ac29b39..69473607a6 100644
--- a/django/contrib/localflavor/cl/forms.py
+++ b/django/contrib/localflavor/cl/forms.py
@@ -4,7 +4,7 @@ Chile specific form helpers.
 
 from django.newforms import ValidationError
 from django.newforms.fields import RegexField, Select, EMPTY_VALUES
-from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import smart_unicode
 
 
@@ -26,9 +26,9 @@ class CLRutField(RegexField):
     https://palena.sii.cl/cvc/dte/ee_empresas_emisoras.html
     """
     default_error_messages = {
-        'invalid': ugettext('Enter a valid Chilean RUT.'),
-        'strict': ugettext('Enter a valid Chilean RUT. The format is XX.XXX.XXX-X.'),
-        'checksum': ugettext('The Chilean RUT is not valid.'),
+        'invalid': _('Enter a valid Chilean RUT.'),
+        'strict': _('Enter a valid Chilean RUT. The format is XX.XXX.XXX-X.'),
+        'checksum': _('The Chilean RUT is not valid.'),
     }
 
     def __init__(self, *args, **kwargs):
diff --git a/django/contrib/localflavor/de/forms.py b/django/contrib/localflavor/de/forms.py
index 76ce215dca..c5402fa260 100644
--- a/django/contrib/localflavor/de/forms.py
+++ b/django/contrib/localflavor/de/forms.py
@@ -4,14 +4,14 @@ DE-specific Form helpers
 
 from django.newforms import ValidationError
 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
-from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 import re
 
 id_re = re.compile(r"^(?P<residence>\d{10})(?P<origin>\w{1,3})[-\ ]?(?P<birthday>\d{7})[-\ ]?(?P<validity>\d{7})[-\ ]?(?P<checksum>\d{1})$")
 
 class DEZipCodeField(RegexField):
     default_error_messages = {
-        'invalid': ugettext('Enter a zip code in the format XXXXX.'),
+        'invalid': _('Enter a zip code in the format XXXXX.'),
     }
     def __init__(self, *args, **kwargs):
         super(DEZipCodeField, self).__init__(r'^\d{5}$',
@@ -38,7 +38,7 @@ class DEIdentityCardNumberField(Field):
     Algorithm is documented at http://de.wikipedia.org/wiki/Personalausweis
     """
     default_error_messages = {
-        'invalid': ugettext('Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format.'),
+        'invalid': _('Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format.'),
     }
 
     def has_valid_checksum(self, number):
diff --git a/django/contrib/localflavor/es/forms.py b/django/contrib/localflavor/es/forms.py
index 81186f8b3d..57e730b2cf 100644
--- a/django/contrib/localflavor/es/forms.py
+++ b/django/contrib/localflavor/es/forms.py
@@ -5,7 +5,7 @@ Spanish-specific Form helpers
 
 from django.newforms import ValidationError
 from django.newforms.fields import RegexField, Select, EMPTY_VALUES
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
 import re
 
 class ESPostalCodeField(RegexField):
diff --git a/django/contrib/localflavor/fi/forms.py b/django/contrib/localflavor/fi/forms.py
index a0274da44c..e9e0fc1e93 100644
--- a/django/contrib/localflavor/fi/forms.py
+++ b/django/contrib/localflavor/fi/forms.py
@@ -5,11 +5,11 @@ FI-specific Form helpers
 import re
 from django.newforms import ValidationError
 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
-from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 
 class FIZipCodeField(RegexField):
     default_error_messages = {
-        'invalid': ugettext('Enter a zip code in the format XXXXX.'),
+        'invalid': _('Enter a zip code in the format XXXXX.'),
     }
     def __init__(self, *args, **kwargs):
         super(FIZipCodeField, self).__init__(r'^\d{5}$',
@@ -25,7 +25,7 @@ class FIMunicipalitySelect(Select):
 
 class FISocialSecurityNumber(Field):
     default_error_messages = {
-        'invalid': ugettext('Enter a valid Finnish social security number.'),
+        'invalid': _('Enter a valid Finnish social security number.'),
     }
 
     def clean(self, value):
diff --git a/django/contrib/localflavor/fr/forms.py b/django/contrib/localflavor/fr/forms.py
index 635b62edd5..960e8b221c 100644
--- a/django/contrib/localflavor/fr/forms.py
+++ b/django/contrib/localflavor/fr/forms.py
@@ -5,14 +5,14 @@ FR-specific Form helpers
 from django.newforms import ValidationError
 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
 from django.utils.encoding import smart_unicode
-from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 import re
 
 phone_digits_re = re.compile(r'^0\d(\s|\.)?(\d{2}(\s|\.)?){3}\d{2}$')
 
 class FRZipCodeField(RegexField):
     default_error_messages = {
-        'invalid': ugettext('Enter a zip code in the format XXXXX.'),
+        'invalid': _('Enter a zip code in the format XXXXX.'),
     }
 
     def __init__(self, *args, **kwargs):
diff --git a/django/contrib/localflavor/is_/forms.py b/django/contrib/localflavor/is_/forms.py
index ea7a1e00c3..9f7b6f0211 100644
--- a/django/contrib/localflavor/is_/forms.py
+++ b/django/contrib/localflavor/is_/forms.py
@@ -5,7 +5,7 @@ Iceland specific form helpers.
 from django.newforms import ValidationError
 from django.newforms.fields import RegexField, EMPTY_VALUES
 from django.newforms.widgets import Select
-from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import smart_unicode
 
 class ISIdNumberField(RegexField):
@@ -14,8 +14,8 @@ class ISIdNumberField(RegexField):
     of Iceland has.
     """
     default_error_messages = {
-        'invalid': ugettext('Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.'),
-        'checksum': ugettext(u'The Icelandic identification number is not valid.'),
+        'invalid': _('Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.'),
+        'checksum': _(u'The Icelandic identification number is not valid.'),
     }
 
     def __init__(self, *args, **kwargs):
diff --git a/django/contrib/localflavor/it/forms.py b/django/contrib/localflavor/it/forms.py
index 901c86fafa..7d4a82dd63 100644
--- a/django/contrib/localflavor/it/forms.py
+++ b/django/contrib/localflavor/it/forms.py
@@ -4,14 +4,14 @@ IT-specific Form helpers
 
 from django.newforms import ValidationError
 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
-from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import smart_unicode
 from django.contrib.localflavor.it.util import ssn_check_digit, vat_number_check_digit
 import re
 
 class ITZipCodeField(RegexField):
     default_error_messages = {
-        'invalid': ugettext('Enter a valid zip code.'),
+        'invalid': _('Enter a valid zip code.'),
     }
     def __init__(self, *args, **kwargs):
         super(ITZipCodeField, self).__init__(r'^\d{5}$',
@@ -40,7 +40,7 @@ class ITSocialSecurityNumberField(RegexField):
     'Informazioni sulla codificazione delle persone fisiche'.
     """
     default_error_messages = {
-        'invalid': ugettext(u'Enter a valid Social Security number.'),
+        'invalid': _(u'Enter a valid Social Security number.'),
     }
 
     def __init__(self, *args, **kwargs):
@@ -65,7 +65,7 @@ class ITVatNumberField(Field):
     A form field that validates Italian VAT numbers (partita IVA).
     """
     default_error_messages = {
-        'invalid': ugettext(u'Enter a valid VAT number.'),
+        'invalid': _(u'Enter a valid VAT number.'),
     }
 
     def clean(self, value):
diff --git a/django/contrib/localflavor/jp/forms.py b/django/contrib/localflavor/jp/forms.py
index d726f822d7..70def85351 100644
--- a/django/contrib/localflavor/jp/forms.py
+++ b/django/contrib/localflavor/jp/forms.py
@@ -4,7 +4,7 @@ JP-specific Form helpers
 
 from django.core import validators
 from django.newforms import ValidationError
-from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 from django.newforms.fields import RegexField, Select
 
 class JPPostalCodeField(RegexField):
@@ -14,7 +14,7 @@ class JPPostalCodeField(RegexField):
     Accepts 7 digits, with or without a hyphen.
     """
     default_error_messages = {
-        'invalid': ugettext('Enter a postal code in the format XXXXXXX or XXX-XXXX.'),
+        'invalid': _('Enter a postal code in the format XXXXXXX or XXX-XXXX.'),
     }
 
     def __init__(self, *args, **kwargs):
diff --git a/django/contrib/localflavor/nl/forms.py b/django/contrib/localflavor/nl/forms.py
index 748484926e..6f9e887339 100644
--- a/django/contrib/localflavor/nl/forms.py
+++ b/django/contrib/localflavor/nl/forms.py
@@ -6,7 +6,7 @@ import re
 
 from django.newforms import ValidationError
 from django.newforms.fields import Field, Select, EMPTY_VALUES
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import smart_unicode
 
 pc_re = re.compile('^\d{4}[A-Z]{2}$')
diff --git a/django/contrib/localflavor/no/forms.py b/django/contrib/localflavor/no/forms.py
index 8dc001955d..39c80ec0b2 100644
--- a/django/contrib/localflavor/no/forms.py
+++ b/django/contrib/localflavor/no/forms.py
@@ -5,11 +5,11 @@ Norwegian-specific Form helpers
 import re, datetime
 from django.newforms import ValidationError
 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
-from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 
 class NOZipCodeField(RegexField):
     default_error_messages = {
-        'invalid': ugettext('Enter a zip code in the format XXXX.'),
+        'invalid': _('Enter a zip code in the format XXXX.'),
     }
 
     def __init__(self, *args, **kwargs):
@@ -30,7 +30,7 @@ class NOSocialSecurityNumber(Field):
     Algorithm is documented at http://no.wikipedia.org/wiki/Personnummer
     """
     default_error_messages = {
-        'invalid': ugettext(u'Enter a valid Norwegian social security number.'),
+        'invalid': _(u'Enter a valid Norwegian social security number.'),
     }
 
     def clean(self, value):
diff --git a/django/contrib/localflavor/pe/forms.py b/django/contrib/localflavor/pe/forms.py
index 57c9d441f7..328b2e36e1 100644
--- a/django/contrib/localflavor/pe/forms.py
+++ b/django/contrib/localflavor/pe/forms.py
@@ -5,7 +5,7 @@ PE-specific Form helpers.
 
 from django.newforms import ValidationError
 from django.newforms.fields import RegexField, CharField, Select, EMPTY_VALUES
-from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 
 class PEDepartmentSelect(Select):
     """
@@ -20,8 +20,8 @@ class PEDNIField(CharField):
     A field that validates `Documento Nacional de IdentidadŽ (DNI) numbers.
     """
     default_error_messages = {
-        'invalid': ugettext("This field requires only numbers."),
-        'max_digits': ugettext("This field requires 8 digits."),
+        'invalid': _("This field requires only numbers."),
+        'max_digits': _("This field requires 8 digits."),
     }
 
     def __init__(self, *args, **kwargs):
@@ -48,8 +48,8 @@ class PERUCField(RegexField):
     the form XXXXXXXXXXX.
     """
     default_error_messages = {
-        'invalid': ugettext("This field requires only numbers."),
-        'max_digits': ugettext("This field requires 11 digits."),
+        'invalid': _("This field requires only numbers."),
+        'max_digits': _("This field requires 11 digits."),
     }
 
     def __init__(self, *args, **kwargs):
diff --git a/django/contrib/localflavor/pl/forms.py b/django/contrib/localflavor/pl/forms.py
index b02dad7025..32d00cc3a8 100644
--- a/django/contrib/localflavor/pl/forms.py
+++ b/django/contrib/localflavor/pl/forms.py
@@ -6,7 +6,7 @@ import re
 
 from django.newforms import ValidationError
 from django.newforms.fields import Select, RegexField
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
 
 class PLVoivodeshipSelect(Select):
     """
diff --git a/django/contrib/localflavor/sk/forms.py b/django/contrib/localflavor/sk/forms.py
index 711d70fc2b..d12927ecab 100644
--- a/django/contrib/localflavor/sk/forms.py
+++ b/django/contrib/localflavor/sk/forms.py
@@ -3,7 +3,7 @@ Slovak-specific form helpers
 """
 
 from django.newforms.fields import Select, RegexField
-from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 
 class SKRegionSelect(Select):
     """
@@ -27,7 +27,7 @@ class SKPostalCodeField(RegexField):
     Valid form is XXXXX or XXX XX, where X represents integer.
     """
     default_error_messages = {
-        'invalid': ugettext(u'Enter a postal code in the format XXXXX or XXX XX.'),
+        'invalid': _(u'Enter a postal code in the format XXXXX or XXX XX.'),
     }
 
     def __init__(self, *args, **kwargs):
diff --git a/django/contrib/localflavor/uk/forms.py b/django/contrib/localflavor/uk/forms.py
index 52cd7ad232..b3883f6477 100644
--- a/django/contrib/localflavor/uk/forms.py
+++ b/django/contrib/localflavor/uk/forms.py
@@ -6,7 +6,7 @@ import re
 
 from django.newforms.fields import CharField, Select
 from django.newforms import ValidationError
-from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 
 class UKPostcodeField(CharField):
     """
@@ -18,7 +18,7 @@ class UKPostcodeField(CharField):
     The value is uppercased and a space added in the correct place, if required.
     """
     default_error_messages = {
-        'invalid': ugettext(u'Enter a valid postcode.'),
+        'invalid': _(u'Enter a valid postcode.'),
     }
     outcode_pattern = '[A-PR-UWYZ]([0-9]{1,2}|([A-HIK-Y][0-9](|[0-9]|[ABEHMNPRVWXY]))|[0-9][A-HJKSTUW])'
     incode_pattern = '[0-9][ABD-HJLNP-UW-Z]{2}'
diff --git a/django/contrib/localflavor/uk/uk_regions.py b/django/contrib/localflavor/uk/uk_regions.py
index 61d0812488..dd92f5e758 100644
--- a/django/contrib/localflavor/uk/uk_regions.py
+++ b/django/contrib/localflavor/uk/uk_regions.py
@@ -5,7 +5,7 @@ Sources:
     Welsh regions: http://en.wikipedia.org/wiki/Preserved_counties_of_Wales
     Scottish regions: http://en.wikipedia.org/wiki/Regions_and_districts_of_Scotland
 """
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
 
 ENGLAND_REGION_CHOICES = (
     ("Bedfordshire", _("Bedfordshire")),
diff --git a/django/contrib/localflavor/us/forms.py b/django/contrib/localflavor/us/forms.py
index d6aa684cba..a17062d61f 100644
--- a/django/contrib/localflavor/us/forms.py
+++ b/django/contrib/localflavor/us/forms.py
@@ -5,7 +5,7 @@ USA-specific Form helpers
 from django.newforms import ValidationError
 from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
 from django.utils.encoding import smart_unicode
-from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 import re
 
 phone_digits_re = re.compile(r'^(?:1-?)?(\d{3})[-\.]?(\d{3})[-\.]?(\d{4})$')
@@ -13,7 +13,7 @@ ssn_re = re.compile(r"^(?P<area>\d{3})[-\ ]?(?P<group>\d{2})[-\ ]?(?P<serial>\d{
 
 class USZipCodeField(RegexField):
     default_error_messages = {
-        'invalid': ugettext('Enter a zip code in the format XXXXX or XXXXX-XXXX.'),
+        'invalid': _('Enter a zip code in the format XXXXX or XXXXX-XXXX.'),
     }
 
     def __init__(self, *args, **kwargs):
@@ -51,7 +51,7 @@ class USSocialSecurityNumberField(Field):
           1962 promotional number).
     """
     default_error_messages = {
-        'invalid': ugettext('Enter a valid U.S. Social Security number in XXX-XX-XXXX format.'),
+        'invalid': _('Enter a valid U.S. Social Security number in XXX-XX-XXXX format.'),
     }
 
     def clean(self, value):
diff --git a/django/contrib/sessions/backends/base.py b/django/contrib/sessions/backends/base.py
index 1063760915..1f9c20871b 100644
--- a/django/contrib/sessions/backends/base.py
+++ b/django/contrib/sessions/backends/base.py
@@ -87,6 +87,25 @@ class SessionBase(object):
         except:
             return {}
 
+    def update(self, dict_):
+        self._session.update(dict_)
+        self.modified = True
+
+    def has_key(self, key):
+        return self._session.has_key(key)
+
+    def values(self):
+        return self._session.values()
+
+    def iterkeys(self):
+        return self._session.iterkeys()
+
+    def itervalues(self):
+        return self._session.itervalues()
+
+    def iteritems(self):
+        return self._session.iteritems()
+
     def _get_new_session_key(self):
         "Returns session key that isn't being used."
         # The random module is seeded when this Apache child is created.
diff --git a/django/contrib/sessions/tests.py b/django/contrib/sessions/tests.py
index 0f162b211f..a1bc6799fa 100644
--- a/django/contrib/sessions/tests.py
+++ b/django/contrib/sessions/tests.py
@@ -89,6 +89,66 @@ False
 >>> s.pop('some key', 'does not exist')
 'does not exist'
 
+
+>>> s.get('update key', None)
+
+# test .update()
+>>> s.modified = s.accessed = False   # Reset to pretend this wasn't accessed previously
+>>> s.update({'update key':1})
+>>> s.accessed, s.modified
+(True, True)
+>>> s.get('update key', None)
+1
+
+# test .has_key()
+>>> s.modified = s.accessed = False   # Reset to pretend this wasn't accessed previously
+>>> s.has_key('update key')
+True
+>>> s.accessed, s.modified
+(True, False)
+
+# test .values()
+>>> s = SessionBase()
+>>> s.values()
+[]
+>>> s.accessed
+True
+>>> s['x'] = 1
+>>> s.values()
+[1]
+
+# test .iterkeys()
+>>> s.accessed = False
+>>> i = s.iterkeys()
+>>> hasattr(i,'__iter__')
+True
+>>> s.accessed
+True
+>>> list(i)
+['x']
+
+# test .itervalues()
+>>> s.accessed = False
+>>> i = s.itervalues()
+>>> hasattr(i,'__iter__')
+True
+>>> s.accessed
+True
+>>> list(i)
+[1]
+
+# test .iteritems()
+>>> s.accessed = False
+>>> i = s.iteritems()
+>>> hasattr(i,'__iter__')
+True
+>>> s.accessed
+True
+>>> list(i)
+[('x', 1)]
+
+ 
+
 #########################
 # Custom session expiry #
 #########################
diff --git a/django/core/management/commands/sql.py b/django/core/management/commands/sql.py
index 4a0107ac02..bc68a1e43a 100644
--- a/django/core/management/commands/sql.py
+++ b/django/core/management/commands/sql.py
@@ -7,4 +7,4 @@ class Command(AppCommand):
 
     def handle_app(self, app, **options):
         from django.core.management.sql import sql_create
-        return '\n'.join(sql_create(app, self.style))
+        return u'\n'.join(sql_create(app, self.style)).encode('utf-8')
diff --git a/django/core/management/commands/sqlall.py b/django/core/management/commands/sqlall.py
index bf3c734bb6..5d510f179a 100644
--- a/django/core/management/commands/sqlall.py
+++ b/django/core/management/commands/sqlall.py
@@ -7,4 +7,4 @@ class Command(AppCommand):
 
     def handle_app(self, app, **options):
         from django.core.management.sql import sql_all
-        return '\n'.join(sql_all(app, self.style))
+        return u'\n'.join(sql_all(app, self.style)).encode('utf-8')
diff --git a/django/core/management/commands/sqlclear.py b/django/core/management/commands/sqlclear.py
index d76d6f4de2..8550e88e28 100644
--- a/django/core/management/commands/sqlclear.py
+++ b/django/core/management/commands/sqlclear.py
@@ -7,4 +7,4 @@ class Command(AppCommand):
 
     def handle_app(self, app, **options):
         from django.core.management.sql import sql_delete
-        return '\n'.join(sql_delete(app, self.style))
+        return u'\n'.join(sql_delete(app, self.style)).encode('utf-8')
diff --git a/django/core/management/commands/sqlcustom.py b/django/core/management/commands/sqlcustom.py
index 2148a9f307..90b90b6d49 100644
--- a/django/core/management/commands/sqlcustom.py
+++ b/django/core/management/commands/sqlcustom.py
@@ -7,4 +7,4 @@ class Command(AppCommand):
 
     def handle_app(self, app, **options):
         from django.core.management.sql import sql_custom
-        return '\n'.join(sql_custom(app))
+        return u'\n'.join(sql_custom(app)).encode('utf-8')
diff --git a/django/core/management/commands/sqlflush.py b/django/core/management/commands/sqlflush.py
index 261aa0d423..d0f71d3875 100644
--- a/django/core/management/commands/sqlflush.py
+++ b/django/core/management/commands/sqlflush.py
@@ -7,4 +7,4 @@ class Command(NoArgsCommand):
 
     def handle_noargs(self, **options):
         from django.core.management.sql import sql_flush
-        return '\n'.join(sql_flush(self.style, only_django=True))
+        return u'\n'.join(sql_flush(self.style, only_django=True)).encode('utf-8')
diff --git a/django/core/management/commands/sqlindexes.py b/django/core/management/commands/sqlindexes.py
index b5e86f26d6..9693588a89 100644
--- a/django/core/management/commands/sqlindexes.py
+++ b/django/core/management/commands/sqlindexes.py
@@ -7,4 +7,4 @@ class Command(AppCommand):
 
     def handle_app(self, app, **options):
         from django.core.management.sql import sql_indexes
-        return '\n'.join(sql_indexes(app, self.style))
+        return u'\n'.join(sql_indexes(app, self.style)).encode('utf-8')
diff --git a/django/core/management/commands/sqlreset.py b/django/core/management/commands/sqlreset.py
index a2abb855cf..ec40848c42 100644
--- a/django/core/management/commands/sqlreset.py
+++ b/django/core/management/commands/sqlreset.py
@@ -7,4 +7,4 @@ class Command(AppCommand):
 
     def handle_app(self, app, **options):
         from django.core.management.sql import sql_reset
-        return '\n'.join(sql_reset(app, self.style))
+        return u'\n'.join(sql_reset(app, self.style)).encode('utf-8')
diff --git a/django/core/management/commands/sqlsequencereset.py b/django/core/management/commands/sqlsequencereset.py
index 6b12d83843..e8dad0bef6 100644
--- a/django/core/management/commands/sqlsequencereset.py
+++ b/django/core/management/commands/sqlsequencereset.py
@@ -6,4 +6,4 @@ class Command(AppCommand):
 
     def handle_app(self, app, **options):
         from django.db import connection, models
-        return '\n'.join(connection.ops.sequence_reset_sql(self.style, models.get_models(app)))
+        return u'\n'.join(connection.ops.sequence_reset_sql(self.style, models.get_models(app))).encode('utf-8')
diff --git a/django/core/management/commands/syncdb.py b/django/core/management/commands/syncdb.py
index d87644d049..91e78c96e8 100644
--- a/django/core/management/commands/syncdb.py
+++ b/django/core/management/commands/syncdb.py
@@ -25,6 +25,7 @@ class Command(NoArgsCommand):
 
         verbosity = int(options.get('verbosity', 1))
         interactive = options.get('interactive')
+        show_traceback = options.get('traceback', False)
 
         self.style = no_style()
 
@@ -119,12 +120,17 @@ class Command(NoArgsCommand):
                             for sql in custom_sql:
                                 cursor.execute(sql)
                         except Exception, e:
-                            sys.stderr.write("Failed to install custom SQL for %s.%s model: %s" % \
+                            sys.stderr.write("Failed to install custom SQL for %s.%s model: %s\n" % \
                                                 (app_name, model._meta.object_name, e))
+                            if show_traceback:
+                                import traceback
+                                traceback.print_exc()
                             transaction.rollback_unless_managed()
                         else:
                             transaction.commit_unless_managed()
-
+                    else:
+                        if verbosity >= 2:
+                            print "No custom SQL for %s.%s model" % (app_name, model._meta.object_name)
         # Install SQL indicies for all newly created models
         for app in models.get_apps():
             app_name = app.__name__.split('.')[-2]
diff --git a/django/db/models/loading.py b/django/db/models/loading.py
index e7d134e6da..e62188adf7 100644
--- a/django/db/models/loading.py
+++ b/django/db/models/loading.py
@@ -157,7 +157,7 @@ class AppCache(object):
         """
         for model in models:
             # Store as 'name: model' pair in a dictionary
-            # in the _app_models dictionary
+            # in the app_models dictionary
             model_name = model._meta.object_name.lower()
             model_dict = self.app_models.setdefault(app_label, {})
             if model_name in model_dict:
diff --git a/django/newforms/widgets.py b/django/newforms/widgets.py
index 38d7aed97e..bce428ddbe 100644
--- a/django/newforms/widgets.py
+++ b/django/newforms/widgets.py
@@ -428,8 +428,12 @@ class RadioInput(StrAndUnicode):
         self.index = index
 
     def __unicode__(self):
-        return mark_safe(u'<label>%s %s</label>' % (self.tag(),
-                conditional_escape(force_unicode(self.choice_label))))
+        if 'id' in self.attrs:
+            label_for = ' for="%s_%s"' % (self.attrs['id'], self.index)
+        else:
+            label_for = ''
+        choice_label = conditional_escape(force_unicode(self.choice_label))
+        return mark_safe(u'<label%s>%s %s</label>' % (label_for, self.tag(), choice_label))
 
     def is_checked(self):
         return self.value == self.choice_value
@@ -511,11 +515,15 @@ class CheckboxSelectMultiple(SelectMultiple):
             # so that the checkboxes don't all have the same ID attribute.
             if has_id:
                 final_attrs = dict(final_attrs, id='%s_%s' % (attrs['id'], i))
+                label_for = u' for="%s"' % final_attrs['id']
+            else:
+                label_for = ''
+                
             cb = CheckboxInput(final_attrs, check_test=lambda value: value in str_values)
             option_value = force_unicode(option_value)
             rendered_cb = cb.render(name, option_value)
-            output.append(u'<li><label>%s %s</label></li>' % (rendered_cb,
-                    conditional_escape(force_unicode(option_label))))
+            option_label = conditional_escape(force_unicode(option_label))
+            output.append(u'<li><label%s>%s %s</label></li>' % (label_for, rendered_cb, option_label))
         output.append(u'</ul>')
         return mark_safe(u'\n'.join(output))
 
diff --git a/django/template/loader_tags.py b/django/template/loader_tags.py
index 00ae99bbf9..38b2fff9fd 100644
--- a/django/template/loader_tags.py
+++ b/django/template/loader_tags.py
@@ -69,10 +69,6 @@ class ExtendsNode(Node):
 
     def render(self, context):
         compiled_parent = self.get_parent(context)
-        pos = 0
-        while isinstance(compiled_parent.nodelist[pos], TextNode):
-            pos += 1
-        parent_is_child = isinstance(compiled_parent.nodelist[pos], ExtendsNode)
         parent_blocks = dict([(n.name, n) for n in compiled_parent.nodelist.get_nodes_by_type(BlockNode)])
         for block_node in self.nodelist.get_nodes_by_type(BlockNode):
             # Check for a BlockNode with this node's name, and replace it if found.
@@ -83,8 +79,16 @@ class ExtendsNode(Node):
                 # parent block might be defined in the parent's *parent*, so we
                 # add this BlockNode to the parent's ExtendsNode nodelist, so
                 # it'll be checked when the parent node's render() is called.
-                if parent_is_child:
-                    compiled_parent.nodelist[pos].nodelist.append(block_node)
+
+                # Find out if the parent template has a parent itself
+                for node in compiled_parent.nodelist:
+                    if not isinstance(node, TextNode):
+                        # If the first non-text node is an extends, handle it.
+                        if isinstance(node, ExtendsNode):
+                            node.nodelist.append(block_node)
+                        # Extends must be the first non-text node, so once you find
+                        # the first non-text node you can stop looking. 
+                        break
             else:
                 # Keep any existing parents and add a new one. Used by BlockNode.
                 parent_block.parent = block_node.parent
diff --git a/django/utils/html.py b/django/utils/html.py
index 17ff78a2b5..07e4f0d3f4 100644
--- a/django/utils/html.py
+++ b/django/utils/html.py
@@ -99,7 +99,7 @@ def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False):
             lead, middle, trail = match.groups()
             if safe_input:
                 middle = mark_safe(middle)
-            if middle.startswith('www.') or ('@' not in middle and not middle.startswith('http://') and \
+            if middle.startswith('www.') or ('@' not in middle and not (middle.startswith('http://') or middle.startswith('https://')) and \
                     len(middle) > 0 and middle[0] in string.ascii_letters + string.digits and \
                     (middle.endswith('.org') or middle.endswith('.net') or middle.endswith('.com'))):
                 middle = 'http://%s' % middle
diff --git a/docs/django-admin.txt b/docs/django-admin.txt
index 8797d2e988..309166fe94 100644
--- a/docs/django-admin.txt
+++ b/docs/django-admin.txt
@@ -756,6 +756,17 @@ variable.
 Note that this option is unnecessary in ``manage.py``, because it uses
 ``settings.py`` from the current project by default.
 
+--traceback
+-----------
+
+Example usage::
+
+    django-admin.py syncdb --traceback
+
+By default, ``django-admin.py`` will show a simple error message whenever an
+error occurs. If you specify ``--traceback``, ``django-admin.py``  will
+output a full stack trace whenever an exception is raised.
+
 Extra niceties
 ==============
 
diff --git a/docs/form_preview.txt b/docs/form_preview.txt
index e6f9b05f25..e03de36187 100644
--- a/docs/form_preview.txt
+++ b/docs/form_preview.txt
@@ -69,12 +69,10 @@ How to use ``FormPreview``
 
        ...and add the following line to the appropriate model in your URLconf::
 
-           (r'^post/$', SomeModelFormPreview(forms.models.form_for_model(SomeModel))),
-
-       Or, if you already have a Form class defined for the model::
-
            (r'^post/$', SomeModelFormPreview(SomeModelForm)),
 
+       where ``SomeModelForm`` is a Form or ModelForm class for the model.
+
     4. Run the Django server and visit ``/post/`` in your browser.
 
 .. _template loader docs: ../templates_python/#loader-types
diff --git a/docs/model-api.txt b/docs/model-api.txt
index d459b8638b..314c8ea4b5 100644
--- a/docs/model-api.txt
+++ b/docs/model-api.txt
@@ -1527,6 +1527,36 @@ In this way, you're tying the model's absolute URL to the view that is used
 to display it, without repeating the URL information anywhere. You can still
 use the ``get_absolute_url`` method in templates, as before.
 
+In some cases, such as the use of generic views or the re-use of
+custom views for multiple models, specifying the view function may
+confuse the reverse URL matcher (because multiple patterns point to
+the same view).
+
+For that problem, Django has **named URL patterns**. Using a named
+URL pattern, it's possible to give a name to a pattern, and then
+reference the name rather than the view function. A named URL
+pattern is defined by replacing the pattern tuple by a call to
+the ``url`` function)::
+
+    from django.conf.urls.defaults import *
+
+    url(r'^people/(\d+)/$',
+        'django.views.generic.list_detail.object_detail',
+        name='people_view'),
+
+and then using that name to perform the reverse URL resolution instead
+of the view name::
+
+    from django.db.models import permalink
+
+    def get_absolute_url(self):
+        return ('people_view', [str(self.id)])
+    get_absolute_url = permalink(get_absolute_url)
+
+More details on named URL patterns can be found in `URL dispatch documentation`_.
+
+.. _URL dispatch documentation: ../url_dispatch/#naming-url-patterns
+
 Executing custom SQL
 --------------------
 
diff --git a/docs/newforms.txt b/docs/newforms.txt
index f81fcfc8dc..8386c0507c 100644
--- a/docs/newforms.txt
+++ b/docs/newforms.txt
@@ -1385,6 +1385,20 @@ extra arguments:
                                 as choices.
     ==============  ==========  ===============================================
 
+``FloatField`` 
+~~~~~~~~~~~~~~ 
+
+    * Default widget: ``TextInput`` 
+    * Empty value: ``None`` 
+    * Normalizes to: A Python float. 
+    * Validates that the given value is an float. Leading and trailing 
+      whitespace is allowed, as in Python's ``float()`` function. 
+    * Error message keys: ``required``, ``invalid``, ``max_value``, 
+      ``min_value`` 
+	 
+Takes two optional arguments for validation, ``max_value`` and ``min_value``. 
+These control the range of values permitted in the field.
+
 ``ImageField``
 ~~~~~~~~~~~~~~
 
diff --git a/docs/settings.txt b/docs/settings.txt
index 02e458fcda..3fe999d0d2 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -388,8 +388,13 @@ be able to give backtraces without seeing sensitive (or offensive) settings.
 
 Still, note that there are always going to be sections of your debug output that
 are inappropriate for public consumption. File paths, configuration options, and
-the like all give attackers extra information about your server. Never deploy a
-site with ``DEBUG`` turned on.
+the like all give attackers extra information about your server. 
+
+It is also important to remember that when running with ``DEBUG`` turned on, Django
+will remember every SQL query it executes. This is useful when you are debugging,
+but on a production server, it will rapidly consume memory.
+
+Never deploy a site into production with ``DEBUG`` turned on.
 
 DEBUG_PROPAGATE_EXCEPTIONS
 --------------------------
@@ -958,7 +963,10 @@ See the `template documentation`_.
 TEMPLATE_LOADERS
 ----------------
 
-Default: ``('django.template.loaders.filesystem.load_template_source',)``
+Default::
+
+     ('django.template.loaders.filesystem.load_template_source',
+      'django.template.loaders.app_directories.load_template_source')
 
 A tuple of callables (as strings) that know how to import templates from
 various sources. See the `template documentation`_.
diff --git a/docs/templates.txt b/docs/templates.txt
index 3b2c03766b..3a557c1476 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -346,7 +346,7 @@ To avoid this problem, you have two options:
 
     * One, you can make sure to run each untrusted variable through the
       ``escape`` filter (documented below), which converts potentially harmful
-      HTML characters to unharmful ones. This was default the default solution
+      HTML characters to unharmful ones. This was the default solution
       in Django for its first few years, but the problem is that it puts the
       onus on *you*, the developer / template author, to ensure you're escaping
       everything. It's easy to forget to escape data.
diff --git a/extras/django_bash_completion b/extras/django_bash_completion
old mode 100644
new mode 100755
index 7b2b1947d8..686f090b95
--- a/extras/django_bash_completion
+++ b/extras/django_bash_completion
@@ -53,9 +53,10 @@ _django_completion()
     action_shell_opts="--plain"
     action_runfcgi_opts="host port socket method maxspare minspare maxchildren daemonize pidfile workdir"
 
-    if [[ # django-admin.py, ./manage, manage.py
+    if [[ # django-admin.py, django-admin, ./manage, manage.py
           ( ${COMP_CWORD} -eq 1 &&
             ( ${COMP_WORDS[0]} == django-admin.py ||
+              ${COMP_WORDS[0]} == django-admin ||
               ${COMP_WORDS[0]} == ./manage.py ||
               ${COMP_WORDS[0]} == manage.py ) )
           ||
@@ -68,6 +69,11 @@ _django_completion()
           ( ${COMP_CWORD} -eq 2 &&
             ( $( basename -- ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
             ( $( basename -- ${COMP_WORDS[1]} ) == django-admin.py) &&
+            ( -r ${COMP_WORDS[1]} ) ) 
+          ||
+          ( ${COMP_CWORD} -eq 2 &&
+            ( $( basename -- ${COMP_WORDS[0]} ) == python?([1-9]\.[0-9]) ) &&
+            ( $( basename -- ${COMP_WORDS[1]} ) == django-admin) &&
             ( -r ${COMP_WORDS[1]} ) ) ]] ; then
 
         case ${cur} in
@@ -142,7 +148,7 @@ _django_completion()
     fi
 }
 
-complete -F _django_completion django-admin.py manage.py
+complete -F _django_completion django-admin.py manage.py django-admin
 
 # Support for multiple interpreters.
 unset pythons
diff --git a/setup.py b/setup.py
index 3cbfc55460..081cdb4c4b 100644
--- a/setup.py
+++ b/setup.py
@@ -51,8 +51,8 @@ setup(
     name = "Django",
     version = version,
     url = 'http://www.djangoproject.com/',
-    author = 'Lawrence Journal-World',
-    author_email = 'holovaty@gmail.com',
+    author = 'Django Software Foundation',
+    author_email = 'foundation@djangoproject.com',
     description = 'A high-level Python Web framework that encourages rapid development and clean, pragmatic design.',
     packages = packages,
     data_files = data_files,
diff --git a/tests/regressiontests/defaultfilters/tests.py b/tests/regressiontests/defaultfilters/tests.py
index 4a8b68a897..62403935d4 100644
--- a/tests/regressiontests/defaultfilters/tests.py
+++ b/tests/regressiontests/defaultfilters/tests.py
@@ -166,6 +166,27 @@ u'<a href="http://31characteruri.com/test/" rel="nofollow">http://31characteruri
 >>> urlizetrunc(uri, 2)
 u'<a href="http://31characteruri.com/test/" rel="nofollow">...</a>'
 
+# Check normal urlize
+>>> urlize('http://google.com') 
+u'<a href="http://google.com" rel="nofollow">http://google.com</a>'
+
+>>> urlize('http://google.com/') 
+u'<a href="http://google.com/" rel="nofollow">http://google.com/</a>'
+
+>>> urlize('www.google.com') 
+u'<a href="http://www.google.com" rel="nofollow">http://www.google.com</a>'
+
+>>> urlize('djangoproject.org') 
+u'<a href="http://djangoproject.org" rel="nofollow">http://djangoproject.org</a>'
+
+>>> urlize('info@djangoproject.org') 
+u'<a href="mailto:info@djangoproject.org">info@djangoproject.org</a>'
+
+# Check urlize with https addresses
+>>> urlize('https://google.com') 
+u'<a href="https://google.com" rel="nofollow">https://google.com</a>'
+
+
 >>> wordcount('')
 0
 
diff --git a/tests/regressiontests/forms/forms.py b/tests/regressiontests/forms/forms.py
index a865e9126c..0088a4b995 100644
--- a/tests/regressiontests/forms/forms.py
+++ b/tests/regressiontests/forms/forms.py
@@ -443,8 +443,8 @@ zero-based index.
 >>> f = FrameworkForm(auto_id='id_%s')
 >>> print f['language']
 <ul>
-<li><label><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
-<li><label><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
+<li><label for="id_language_0"><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
+<li><label for="id_language_1"><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
 </ul>
 
 When RadioSelect is used with auto_id, and the whole form is printed using
@@ -453,20 +453,20 @@ ID of the *first* radio button.
 >>> print f
 <tr><th><label for="id_name">Name:</label></th><td><input type="text" name="name" id="id_name" /></td></tr>
 <tr><th><label for="id_language_0">Language:</label></th><td><ul>
-<li><label><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
-<li><label><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
+<li><label for="id_language_0"><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
+<li><label for="id_language_1"><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
 </ul></td></tr>
 >>> print f.as_ul()
 <li><label for="id_name">Name:</label> <input type="text" name="name" id="id_name" /></li>
 <li><label for="id_language_0">Language:</label> <ul>
-<li><label><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
-<li><label><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
+<li><label for="id_language_0"><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
+<li><label for="id_language_1"><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
 </ul></li>
 >>> print f.as_p()
 <p><label for="id_name">Name:</label> <input type="text" name="name" id="id_name" /></p>
 <p><label for="id_language_0">Language:</label> <ul>
-<li><label><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
-<li><label><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
+<li><label for="id_language_0"><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
+<li><label for="id_language_1"><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
 </ul></p>
 
 MultipleChoiceField is a special case, as its data is required to be a list:
@@ -535,8 +535,8 @@ zero-based index.
 >>> f = SongForm(auto_id='%s_id')
 >>> print f['composers']
 <ul>
-<li><label><input type="checkbox" name="composers" value="J" id="composers_id_0" /> John Lennon</label></li>
-<li><label><input type="checkbox" name="composers" value="P" id="composers_id_1" /> Paul McCartney</label></li>
+<li><label for="composers_id_0"><input type="checkbox" name="composers" value="J" id="composers_id_0" /> John Lennon</label></li>
+<li><label for="composers_id_1"><input type="checkbox" name="composers" value="P" id="composers_id_1" /> Paul McCartney</label></li>
 </ul>
 
 Data for a MultipleChoiceField should be a list. QueryDict and MultiValueDict
diff --git a/tests/regressiontests/forms/regressions.py b/tests/regressiontests/forms/regressions.py
index 1bb6f6e7e5..cbc8095e60 100644
--- a/tests/regressiontests/forms/regressions.py
+++ b/tests/regressiontests/forms/regressions.py
@@ -40,7 +40,7 @@ Unicode decoding problems...
 ...     somechoice = ChoiceField(choices=GENDERS, widget=RadioSelect(), label=u'\xc5\xf8\xdf')
 >>> f = SomeForm()
 >>> f.as_p()
-u'<p><label for="id_somechoice_0">\xc5\xf8\xdf:</label> <ul>\n<li><label><input type="radio" id="id_somechoice_0" value="\xc5" name="somechoice" /> En tied\xe4</label></li>\n<li><label><input type="radio" id="id_somechoice_1" value="\xf8" name="somechoice" /> Mies</label></li>\n<li><label><input type="radio" id="id_somechoice_2" value="\xdf" name="somechoice" /> Nainen</label></li>\n</ul></p>'
+u'<p><label for="id_somechoice_0">\xc5\xf8\xdf:</label> <ul>\n<li><label for="id_somechoice_0"><input type="radio" id="id_somechoice_0" value="\xc5" name="somechoice" /> En tied\xe4</label></li>\n<li><label for="id_somechoice_1"><input type="radio" id="id_somechoice_1" value="\xf8" name="somechoice" /> Mies</label></li>\n<li><label for="id_somechoice_2"><input type="radio" id="id_somechoice_2" value="\xdf" name="somechoice" /> Nainen</label></li>\n</ul></p>'
 
 Testing choice validation with UTF-8 bytestrings as input (these are the
 Russian abbreviations "мес." and "шт.".
@@ -56,7 +56,7 @@ Translated error messages used to be buggy.
 >>> activate('ru')
 >>> f = SomeForm({})
 >>> f.as_p()
-u'<ul class="errorlist"><li>\u041e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u043f\u043e\u043b\u0435.</li></ul>\n<p><label for="id_somechoice_0">\xc5\xf8\xdf:</label> <ul>\n<li><label><input type="radio" id="id_somechoice_0" value="\xc5" name="somechoice" /> En tied\xe4</label></li>\n<li><label><input type="radio" id="id_somechoice_1" value="\xf8" name="somechoice" /> Mies</label></li>\n<li><label><input type="radio" id="id_somechoice_2" value="\xdf" name="somechoice" /> Nainen</label></li>\n</ul></p>'
+u'<ul class="errorlist"><li>\u041e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u043f\u043e\u043b\u0435.</li></ul>\n<p><label for="id_somechoice_0">\xc5\xf8\xdf:</label> <ul>\n<li><label for="id_somechoice_0"><input type="radio" id="id_somechoice_0" value="\xc5" name="somechoice" /> En tied\xe4</label></li>\n<li><label for="id_somechoice_1"><input type="radio" id="id_somechoice_1" value="\xf8" name="somechoice" /> Mies</label></li>\n<li><label for="id_somechoice_2"><input type="radio" id="id_somechoice_2" value="\xdf" name="somechoice" /> Nainen</label></li>\n</ul></p>'
 >>> deactivate()
 
 Deep copying translated text shouldn't raise an error
diff --git a/tests/regressiontests/forms/widgets.py b/tests/regressiontests/forms/widgets.py
index 379e05f028..e0837ab5b3 100644
--- a/tests/regressiontests/forms/widgets.py
+++ b/tests/regressiontests/forms/widgets.py
@@ -794,20 +794,20 @@ u'<ul>\n<li><label><input checked="checked" type="radio" name="email" value="\u0
 >>> w = RadioSelect(attrs={'id':'foo'})
 >>> print w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')))
 <ul>
-<li><label><input checked="checked" type="radio" id="foo_0" value="J" name="beatle" /> John</label></li>
-<li><label><input type="radio" id="foo_1" value="P" name="beatle" /> Paul</label></li>
-<li><label><input type="radio" id="foo_2" value="G" name="beatle" /> George</label></li>
-<li><label><input type="radio" id="foo_3" value="R" name="beatle" /> Ringo</label></li>
+<li><label for="foo_0"><input checked="checked" type="radio" id="foo_0" value="J" name="beatle" /> John</label></li>
+<li><label for="foo_1"><input type="radio" id="foo_1" value="P" name="beatle" /> Paul</label></li>
+<li><label for="foo_2"><input type="radio" id="foo_2" value="G" name="beatle" /> George</label></li>
+<li><label for="foo_3"><input type="radio" id="foo_3" value="R" name="beatle" /> Ringo</label></li>
 </ul>
 
 # Attributes provided at render-time are passed to the constituent inputs
 >>> w = RadioSelect()
 >>> print w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')), attrs={'id':'bar'})
 <ul>
-<li><label><input checked="checked" type="radio" id="bar_0" value="J" name="beatle" /> John</label></li>
-<li><label><input type="radio" id="bar_1" value="P" name="beatle" /> Paul</label></li>
-<li><label><input type="radio" id="bar_2" value="G" name="beatle" /> George</label></li>
-<li><label><input type="radio" id="bar_3" value="R" name="beatle" /> Ringo</label></li>
+<li><label for="bar_0"><input checked="checked" type="radio" id="bar_0" value="J" name="beatle" /> John</label></li>
+<li><label for="bar_1"><input type="radio" id="bar_1" value="P" name="beatle" /> Paul</label></li>
+<li><label for="bar_2"><input type="radio" id="bar_2" value="G" name="beatle" /> George</label></li>
+<li><label for="bar_3"><input type="radio" id="bar_3" value="R" name="beatle" /> Ringo</label></li>
 </ul>
 
 # CheckboxSelectMultiple Widget ###############################################
diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py
index 4effea55de..089a6d312d 100644
--- a/tests/regressiontests/templates/tests.py
+++ b/tests/regressiontests/templates/tests.py
@@ -704,6 +704,12 @@ class Templates(unittest.TestCase):
             # Inheritance from local context with variable parent template
             'inheritance25': ("{% extends context_template.1 %}{% block first %}2{% endblock %}{% block second %}4{% endblock %}", {'context_template': [template.Template("Wrong"), template.Template("1{% block first %}_{% endblock %}3{% block second %}_{% endblock %}")]}, '1234'),
 
+            # Set up a base template to extend
+         	'inheritance26': ("no tags", {}, 'no tags'),
+
+         	# Inheritance from a template that doesn't have any blocks
+         	'inheritance27': ("{% extends 'inheritance26' %}", {}, 'no tags'),
+         	
             ### I18N ##################################################################
 
             # {% spaceless %} tag