From 67dd5b7d96b3471a2ad82a41d256727e1562d719 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Wed, 14 Mar 2012 08:56:23 +0000
Subject: [PATCH] Pulled the auth translations updates from Transifex. Refs
 #17822.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 .../auth/locale/ar/LC_MESSAGES/django.mo      | Bin 6124 -> 5410 bytes
 .../auth/locale/ar/LC_MESSAGES/django.po      | 231 +++++++-------
 .../auth/locale/az/LC_MESSAGES/django.mo      | Bin 406 -> 4778 bytes
 .../auth/locale/az/LC_MESSAGES/django.po      | 283 ++++++++++--------
 .../auth/locale/bg/LC_MESSAGES/django.mo      | Bin 6208 -> 5882 bytes
 .../auth/locale/bg/LC_MESSAGES/django.po      | 267 +++++++++--------
 .../auth/locale/bn/LC_MESSAGES/django.mo      | Bin 6176 -> 5351 bytes
 .../auth/locale/bn/LC_MESSAGES/django.po      | 231 +++++++-------
 .../auth/locale/bs/LC_MESSAGES/django.mo      | Bin 5015 -> 4482 bytes
 .../auth/locale/bs/LC_MESSAGES/django.po      | 209 +++++++------
 .../auth/locale/ca/LC_MESSAGES/django.mo      | Bin 5096 -> 5676 bytes
 .../auth/locale/ca/LC_MESSAGES/django.po      | 239 ++++++++-------
 .../auth/locale/cs/LC_MESSAGES/django.mo      | Bin 5068 -> 5535 bytes
 .../auth/locale/cs/LC_MESSAGES/django.po      | 210 +++++++------
 .../auth/locale/cy/LC_MESSAGES/django.mo      | Bin 1705 -> 1400 bytes
 .../auth/locale/cy/LC_MESSAGES/django.po      | 222 ++++++++------
 .../auth/locale/da/LC_MESSAGES/django.mo      | Bin 4978 -> 5450 bytes
 .../auth/locale/da/LC_MESSAGES/django.po      | 216 +++++++------
 .../auth/locale/de/LC_MESSAGES/django.mo      | Bin 5126 -> 5705 bytes
 .../auth/locale/de/LC_MESSAGES/django.po      | 214 +++++++------
 .../auth/locale/el/LC_MESSAGES/django.mo      | Bin 7117 -> 6390 bytes
 .../auth/locale/el/LC_MESSAGES/django.po      | 209 +++++++------
 .../auth/locale/en/LC_MESSAGES/django.mo      | Bin 356 -> 356 bytes
 .../auth/locale/en/LC_MESSAGES/django.po      |   4 +-
 .../auth/locale/en_GB/LC_MESSAGES/django.mo   | Bin 4866 -> 5343 bytes
 .../auth/locale/en_GB/LC_MESSAGES/django.po   | 254 +++++++++-------
 .../auth/locale/es/LC_MESSAGES/django.mo      | Bin 5155 -> 5755 bytes
 .../auth/locale/es/LC_MESSAGES/django.po      | 215 +++++++------
 .../auth/locale/es_AR/LC_MESSAGES/django.mo   | Bin 5295 -> 4714 bytes
 .../auth/locale/es_AR/LC_MESSAGES/django.po   | 205 +++++++------
 .../auth/locale/es_MX/LC_MESSAGES/django.mo   | Bin 5286 -> 5869 bytes
 .../auth/locale/es_MX/LC_MESSAGES/django.po   | 212 +++++++------
 .../auth/locale/et/LC_MESSAGES/django.mo      | Bin 4994 -> 4401 bytes
 .../auth/locale/et/LC_MESSAGES/django.po      | 204 +++++++------
 .../auth/locale/eu/LC_MESSAGES/django.mo      | Bin 4916 -> 5388 bytes
 .../auth/locale/eu/LC_MESSAGES/django.po      | 212 +++++++------
 .../auth/locale/fa/LC_MESSAGES/django.mo      | Bin 5224 -> 5354 bytes
 .../auth/locale/fa/LC_MESSAGES/django.po      | 232 +++++++-------
 .../auth/locale/fi/LC_MESSAGES/django.mo      | Bin 5013 -> 4761 bytes
 .../auth/locale/fi/LC_MESSAGES/django.po      | 208 +++++++------
 .../auth/locale/fr/LC_MESSAGES/django.mo      | Bin 5447 -> 5958 bytes
 .../auth/locale/fr/LC_MESSAGES/django.po      | 216 +++++++------
 .../auth/locale/fy_NL/LC_MESSAGES/django.mo   | Bin 401 -> 401 bytes
 .../auth/locale/fy_NL/LC_MESSAGES/django.po   | 214 +++++++------
 .../auth/locale/ga/LC_MESSAGES/django.mo      | Bin 5142 -> 4574 bytes
 .../auth/locale/ga/LC_MESSAGES/django.po      | 205 +++++++------
 .../auth/locale/gl/LC_MESSAGES/django.mo      | Bin 5114 -> 4628 bytes
 .../auth/locale/gl/LC_MESSAGES/django.po      | 208 +++++++------
 .../auth/locale/he/LC_MESSAGES/django.mo      | Bin 5422 -> 5478 bytes
 .../auth/locale/he/LC_MESSAGES/django.po      | 235 ++++++++-------
 .../auth/locale/hi/LC_MESSAGES/django.mo      | Bin 6051 -> 6924 bytes
 .../auth/locale/hi/LC_MESSAGES/django.po      | 237 ++++++++-------
 .../auth/locale/hr/LC_MESSAGES/django.mo      | Bin 5075 -> 4534 bytes
 .../auth/locale/hr/LC_MESSAGES/django.po      | 209 +++++++------
 .../auth/locale/hu/LC_MESSAGES/django.mo      | Bin 5101 -> 4544 bytes
 .../auth/locale/hu/LC_MESSAGES/django.po      | 206 +++++++------
 .../auth/locale/id/LC_MESSAGES/django.mo      | Bin 4876 -> 5373 bytes
 .../auth/locale/id/LC_MESSAGES/django.po      | 213 +++++++------
 .../auth/locale/is/LC_MESSAGES/django.mo      | Bin 5128 -> 4582 bytes
 .../auth/locale/is/LC_MESSAGES/django.po      | 207 +++++++------
 .../auth/locale/it/LC_MESSAGES/django.mo      | Bin 4984 -> 5515 bytes
 .../auth/locale/it/LC_MESSAGES/django.po      | 240 ++++++++-------
 .../auth/locale/ja/LC_MESSAGES/django.mo      | Bin 5433 -> 6085 bytes
 .../auth/locale/ja/LC_MESSAGES/django.po      | 213 +++++++------
 .../auth/locale/ka/LC_MESSAGES/django.mo      | Bin 7763 -> 6854 bytes
 .../auth/locale/ka/LC_MESSAGES/django.po      | 205 +++++++------
 .../auth/locale/km/LC_MESSAGES/django.mo      | Bin 4606 -> 4030 bytes
 .../auth/locale/km/LC_MESSAGES/django.po      | 224 +++++++-------
 .../auth/locale/kn/LC_MESSAGES/django.mo      | Bin 4509 -> 5290 bytes
 .../auth/locale/kn/LC_MESSAGES/django.po      | 212 +++++++------
 .../auth/locale/ko/LC_MESSAGES/django.mo      | Bin 5031 -> 4522 bytes
 .../auth/locale/ko/LC_MESSAGES/django.po      | 204 +++++++------
 .../auth/locale/lt/LC_MESSAGES/django.mo      | Bin 5106 -> 5605 bytes
 .../auth/locale/lt/LC_MESSAGES/django.po      | 217 ++++++++------
 .../auth/locale/lv/LC_MESSAGES/django.mo      | Bin 5010 -> 4426 bytes
 .../auth/locale/lv/LC_MESSAGES/django.po      | 231 +++++++-------
 .../auth/locale/mk/LC_MESSAGES/django.mo      | Bin 6434 -> 7170 bytes
 .../auth/locale/mk/LC_MESSAGES/django.po      | 213 +++++++------
 .../auth/locale/ml/LC_MESSAGES/django.mo      | Bin 8433 -> 7528 bytes
 .../auth/locale/ml/LC_MESSAGES/django.po      | 204 +++++++------
 .../auth/locale/mn/LC_MESSAGES/django.mo      | Bin 6316 -> 7001 bytes
 .../auth/locale/mn/LC_MESSAGES/django.po      | 212 +++++++------
 .../auth/locale/nb/LC_MESSAGES/django.mo      | Bin 4841 -> 5368 bytes
 .../auth/locale/nb/LC_MESSAGES/django.po      | 246 ++++++++-------
 .../auth/locale/nl/LC_MESSAGES/django.mo      | Bin 5031 -> 5512 bytes
 .../auth/locale/nl/LC_MESSAGES/django.po      | 214 +++++++------
 .../auth/locale/nn/LC_MESSAGES/django.mo      | Bin 4806 -> 4269 bytes
 .../auth/locale/nn/LC_MESSAGES/django.po      | 231 +++++++-------
 .../auth/locale/pa/LC_MESSAGES/django.mo      | Bin 5007 -> 4609 bytes
 .../auth/locale/pa/LC_MESSAGES/django.po      | 229 +++++++-------
 .../auth/locale/pl/LC_MESSAGES/django.mo      | Bin 4893 -> 4648 bytes
 .../auth/locale/pl/LC_MESSAGES/django.po      | 237 ++++++++-------
 .../auth/locale/pt/LC_MESSAGES/django.mo      | Bin 5152 -> 4550 bytes
 .../auth/locale/pt/LC_MESSAGES/django.po      | 206 +++++++------
 .../auth/locale/pt_BR/LC_MESSAGES/django.mo   | Bin 5066 -> 4767 bytes
 .../auth/locale/pt_BR/LC_MESSAGES/django.po   | 209 +++++++------
 .../auth/locale/ro/LC_MESSAGES/django.mo      | Bin 5081 -> 4512 bytes
 .../auth/locale/ro/LC_MESSAGES/django.po      | 207 +++++++------
 .../auth/locale/ru/LC_MESSAGES/django.mo      | Bin 6489 -> 7226 bytes
 .../auth/locale/ru/LC_MESSAGES/django.po      | 218 ++++++++------
 .../auth/locale/sk/LC_MESSAGES/django.mo      | Bin 5028 -> 4753 bytes
 .../auth/locale/sk/LC_MESSAGES/django.po      | 233 +++++++-------
 .../auth/locale/sl/LC_MESSAGES/django.mo      | Bin 4996 -> 5520 bytes
 .../auth/locale/sl/LC_MESSAGES/django.po      | 211 +++++++------
 .../auth/locale/sq/LC_MESSAGES/django.mo      | Bin 5178 -> 4581 bytes
 .../auth/locale/sq/LC_MESSAGES/django.po      | 205 +++++++------
 .../auth/locale/sr/LC_MESSAGES/django.mo      | Bin 6265 -> 6869 bytes
 .../auth/locale/sr/LC_MESSAGES/django.po      | 214 +++++++------
 .../auth/locale/sr_Latn/LC_MESSAGES/django.mo | Bin 5010 -> 4423 bytes
 .../auth/locale/sr_Latn/LC_MESSAGES/django.po | 199 ++++++------
 .../auth/locale/sv/LC_MESSAGES/django.mo      | Bin 4990 -> 5482 bytes
 .../auth/locale/sv/LC_MESSAGES/django.po      | 212 +++++++------
 .../auth/locale/ta/LC_MESSAGES/django.mo      | Bin 4338 -> 3952 bytes
 .../auth/locale/ta/LC_MESSAGES/django.po      | 227 +++++++-------
 .../auth/locale/te/LC_MESSAGES/django.mo      | Bin 3753 -> 3688 bytes
 .../auth/locale/te/LC_MESSAGES/django.po      | 229 +++++++-------
 .../auth/locale/th/LC_MESSAGES/django.mo      | Bin 6266 -> 7883 bytes
 .../auth/locale/th/LC_MESSAGES/django.po      | 237 ++++++++-------
 .../auth/locale/tr/LC_MESSAGES/django.mo      | Bin 4988 -> 5494 bytes
 .../auth/locale/tr/LC_MESSAGES/django.po      | 213 +++++++------
 .../auth/locale/uk/LC_MESSAGES/django.mo      | Bin 6294 -> 7006 bytes
 .../auth/locale/uk/LC_MESSAGES/django.po      | 217 ++++++++------
 .../auth/locale/ur/LC_MESSAGES/django.mo      | Bin 390 -> 1254 bytes
 .../auth/locale/ur/LC_MESSAGES/django.po      | 224 ++++++++------
 .../auth/locale/vi/LC_MESSAGES/django.mo      | Bin 4762 -> 4100 bytes
 .../auth/locale/vi/LC_MESSAGES/django.po      | 232 +++++++-------
 .../auth/locale/zh_CN/LC_MESSAGES/django.mo   | Bin 4621 -> 4357 bytes
 .../auth/locale/zh_CN/LC_MESSAGES/django.po   | 233 +++++++-------
 .../auth/locale/zh_TW/LC_MESSAGES/django.mo   | Bin 4666 -> 4149 bytes
 .../auth/locale/zh_TW/LC_MESSAGES/django.po   | 229 +++++++-------
 130 files changed, 7936 insertions(+), 6178 deletions(-)

diff --git a/django/contrib/auth/locale/ar/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ar/LC_MESSAGES/django.mo
index 2e8df6f73a5e2e7cda3f71358b842c74d2333820..0a2e18da3a6fadca7b43b53c9d737ffd02b776f8 100644
GIT binary patch
delta 1304
zcmYk*Ur19?9Ki82|EANNYr4#`S!QaR_f8FU4?$^~WN1DV(H~iQ)A?r`+iKQ}K12o*
z3@$}ckVa7yg|Oa4uzK;;hn|XjD*E>jg!m9h-``r`;hy`sf6hIBe&=_8YLDtBKiRWx
zD~gx8lls`AR2#Z8IZ;}&l&Zy6+=c_#i*anlWi&7&Td5oz#$6b~M!bbZ_y+TF1q<*a
zmMJx<zNH^z^7R&8*wBV$Sb=p|f?a6Eek{aMJdIcJD6Zgfbml5`4hL`_E+GS{FW7-H
zh>X+8={)1BUM>#v;1$w``h^^7os$fx@|4;N1t=>hN9L@mQQEuH&l{0L9pXe#)G?HP
zPM~~u3Z*|kN(9Ey#`x+Q7xKZ3Jir9XhjS<cJ;xtx%RC<8{sF!0!BxDD8T2-e(>RN3
zScP{8Q!_4L5B^4pWE-m~#xpo64M(}qFoANvgwpVH`u-0}ez@337xtkYqgaVI@IF4n
z5Vo@l@ipGXDn^rBSwxxmI?9B1*onWBi<|T|g|m18E6Fqo?G(!UX)MQw=*9(<34TQu
zt2R(3WOe*YwhEN*>QO@9fztjYN`!|{+D|x$zr2{?K{d{ybhwPW@jXgMYsjGrY0OTf
z%HFg!X{DVcoFtp9vX)B3Qxn%vBD=ZBU$R~HUnU@{{a^N{FJ$IKK9vjdhy+#{R7oOP
zg@-Cdep>>d>ZlSODYCly)D>Y)E65_VHr=<nxH&*&>rzP}2`9gu{Ql%yDhfKvK9^D@
zI+6>H<h`tfrKoE>9E!yJ!I*2%A2XunVooA?G55R0e3G|ezQ~_H*x=C{J>DjluKT=A
z9=%!D^Lu+dea4kQG!P1U+WE@oYS6u@c6y7;+u+li&4jfgr`re&8e`^5tGlCSI2H^0
zG%X&F*T*9MU^H;an5YjLF)bVkjTi&5s20`+NBqH|kT%BovVX|X{1L4-zdL>BbNM6Y
ps`YHLv!FWDoGL0!4%^BtX1mj#d|RBIX})thlKmx5EoQOv!(TrNnE?O*

delta 1967
zcmaKsYfM~46o6;Tf<U1U9!1(xM=T<x3%li^5=3o;hP1Jj*w_T2-gIwwSNB2oF0J*E
zm9!KjrfJ+X(U>T<AuCj%xX}a?ZEE$0j~I-Jz54?-(I5V(kEAj2kBQ&8ER80O!=C${
zIWu$4nKLt--*LS;`F)xDoT9ZOTam9^O7+4Q^7zmu-AXmUw_!Q_5*~m*!26*$Unvtl
z4GZ8Btbx~H3;Z)@Z(wjeeJ^|wJ_L)EN~(`hN-%s5tKoOK{vWWA{@-u|EVxanZLkVf
z!gg2z_rbN$fTb`3pMcN9Zul+S3#)PVBs5_i`~+4LU;Tp8gJDgPQiotK#H7x{0eBHU
z42wvYT-07D<9$#9_rrBC0Qsq7eAu)afiizAXFmgRrCx{Rq%J@=@zq5Xad-*xQ;U4W
z@uyHKvjn9A%aE$8-*WvMP}aGbECEa50>@Vlchmoj#kH`IvYdjAFaj^ZNw|%yliN`)
zqudLBhWp`G4yp`>p_Doazk%oAMi?L)S$6_9!#8vNuc6Gpk?R*R*+;(#YWNh~2}hv#
zpW8_N??kzR;SKl`jKL(M!r$R*@Gv(|F56#FcC?Fwmz^AhC*f6C1@{pBC3qMP!XKd=
z!GoJt#(Urv`h!psd2SQ+myFXGq|_fl$?OZrX4Ntj$G<|Vt@7yzH$Yjp1+rP?gR*XS
z&VCTyP5&7veqV)mz_%bjb(xP`-fKw|j?6KNqt(`qA_3&d$+K)gq}8v$DeIb?-U#Jo
zNZX81MCXFZoscGp$&<Vbk>q9P5}Z9bM++z^B4=8Mco2<9lX6Rwx4hb<gt9Bykz7D&
zO-QSwtvo}y>GCgR2O>uxP3{VJ^Je3@*E&x}N+nJ1LK|{Bau4D~+!>$ytSh-E9vdFA
zRBvP`7Ec(_g!UT=lYUeiet#$tibZuIrV~L^51H{u$g;3lI$}hJjd1vcHZTODrhg|>
zLY5x3%(y-t3Wv23wqiP9CQ!ovSsI8F#q^6;(>PKY)B(vr2hC=SAovJHn^H^pXUlPY
zJQnxsxM|^rJnF2>V8M0Q<GQ}z2nS*V+xsmeoB%=dS$`;CT8V*r9g9m6PQsmr4#v%+
z57Z9jTs7Br9SIuI0DD<=el!-3bT%7ZneM_oS3$(IEF+NWDSEHX=kd09d~Mp-(&20M
zcw4>R;sg6Vede){RKW8HRqD{Yygp~1w^jS@>uB|*JjL5meZ`FhosY(%W>@NJaev7^
z0uCDiW*hNL&D#3BWIB5)J8Hk19nFs0i+0+cQT7aK+Fr;`*mD~D7~|8*e#d62J!O9Y
zN9<{BPqFf4?O5MuByG>K0tb$XHM90Sf76<25+Y;I*mL%Lc2qNMK0EGAekEVyY$`Qb
zQZ+bh<3`&T7$AnW7ajlEldJJ=8Duqa@{#mrvJ<$^o<<o(b#k1@j@jv^%%OEPu2Lrp
z*`_3xdaR<dkoZjGG~??x=b1Ni{J&Er#c{&@Ye%;_+?5GzoKi};X6z5iY{Fh};<}x4
TK3#UjRkVO3$$dK2U9tQRE~&~=

diff --git a/django/contrib/auth/locale/ar/LC_MESSAGES/django.po b/django/contrib/auth/locale/ar/LC_MESSAGES/django.po
index f8de21a68d1..79538bd7ce4 100644
--- a/django/contrib/auth/locale/ar/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ar/LC_MESSAGES/django.po
@@ -1,78 +1,84 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Arabic <None>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Arabic (http://www.transifex.net/projects/p/django/language/"
+"ar/)\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "المعلومات الشخصية"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "الصلاحيات"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "تواريخ مهمة"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "المجموعات"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "تم تغيير كلمة المرور بنجاح."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "غيّر كلمة المرور: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "اسم المستخدم"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "مطلوب. 30 حرف أو أقل. يتكوّن من حروف، وأرقام، والرموز @/./+/-/_ فقط."
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "هذه القيمة يجب أن تحتوي الأحرف، والأرقام، والرموز @/./+/-/_ فقط."
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "كلمة المرور"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "تأكيد كلمة المرور"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "أدخل كلمة المرور ذاتها التي أعلاه لتأكيدها."
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "هناك مستخدم موجود مسبقاً بهذا الاسم."
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "حقلا كلمتي المرور غير متطابقين."
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "اسم المستخدم"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "مطلوب. 30 حرف أو أقل. يتكوّن من حروف، وأرقام، والرموز @/./+/-/_ فقط."
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "هذه القيمة يجب أن تحتوي الأحرف، والأرقام، والرموز @/./+/-/_ فقط."
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "كلمة المرور"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "تأكيد كلمة المرور"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "أدخل كلمة المرور ذاتها التي أعلاه لتأكيدها."
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -80,21 +86,17 @@ msgstr ""
 "رجاءً أدخل اسم مستخدم وكلمة مرور صحيحين، وانتبه إلى أن كلا الحقلين حساس لحالة "
 "الأحرف."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "هذا الحساب غير نشط."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "يبدو بأن الكوكيز غير مفعله في متصفحك، الكوكيز مطلوبة للتمكن من الدخول."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "عنوان بريد إلكتروني"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "هذا الحساب غير نشط."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -102,101 +104,123 @@ msgstr ""
 "عنوان البريد الإلكتروني هذا ليس مرتبط بأي حساب مستخدم. أأنت متأكد أنك قمت "
 "بالتسجيل؟"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "استعادة كلمة المرور في %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "عنوان بريد إلكتروني"
+
+#: forms.py:249
 msgid "New password"
 msgstr "كلمة المرور الجديدة"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "تأكيد كلمة المرور الجديدة"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "كلمة المرور القديمة"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "كلمة مرورك القديمة غير صحيحة. رجاءً أدخلها مرة أخرى."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "كلمة المرور القديمة"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "كلمة المرور (مجدداً)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "الاسم"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "الاسم الرمزي"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "الصلاحية"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "الصلاحيات"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "مجموعة"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "المجموعات"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "اسم المستخدم"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "مطلوب. 30 حرف أو أقل. يتكوّن من حروف، وأرقام، والرموز @/./+/-/_ فقط."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "الاسم الأول"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "الاسم الأخير"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "عنوان البريد الإلكتروني"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "كلمة المرور"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"استخدم '[algo]$[salt]$[hexdigest]' أو استخدم <a href=\"password/\">استمارة "
-"تغيير كلمة المرور</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "حالة الطاقم"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "يحدد ما إذا كان المستخدم يستطيع الدخول إلى موقع الإدارة هذا."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "نشط"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -204,53 +228,52 @@ msgstr ""
 "يحدد ما إذا كان المستخدم سيُعامل على أنّه نشط. أزل تحديد ها الخيار بدلاً من حذف "
 "الحسابات."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "حالة المستخدم الخارق"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 "حدد بأن هذا المستخدم يمتلك كافة الصلاحيات دون الحاجة لتحديدها له تصريحا."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "آخر دخول"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "تاريخ الانضمام"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"بالإضافة إلى الصلاحيات المحددة للمستخدم يدويا، فإن المستخدم يحصل أيضا على "
-"كافة صلاحيات المجموعة التي ينتمي إليها."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "صلاحيات المستخدم"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "مستخدم"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "المستخدمين"
 
-#: models.py:406
-msgid "message"
-msgstr "رسالة"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "تم الخروج"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "أدخل عنوان بريد إلكتروني صحيح."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/az/LC_MESSAGES/django.mo b/django/contrib/auth/locale/az/LC_MESSAGES/django.mo
index 39864cff302a207b929ec92b6bca5e759d50114c..3713372c939c9ff3af6800d91a6cb00f95132c10 100644
GIT binary patch
literal 4778
zcmcJSON<;x8OO^I9@#h$!ZRVpUx3BCc)MrT&ckdH;<deo#jnMzZ5e_>&2-I7d3w5L
zx~gY(_6A7gz#&K|f)x^*6UzY!te{+CB&1m*jl=;73B-YLL68dwE(jzJ{J-j+mlK4L
zpf%OMuI}ou>U&nttM}jag1~Vc?IE-u9}wbG;Q2S>grjkn5R0G&-wl2f+yM8$Pk?_1
z6?p6|LcA6HHh2i!1zF}#z;}Xw1?Rv67<3Rk2tEKlQ1p+3Z%6+mcptb9ehB<L_+GFN
z9tNKW?*V@Z-V440UIT~V8u;+rgg6J*!Dqmiz<KaK2)_hA2J*aL1J8mlg7}F);`BxE
zFW@S8@$OuoZ-D&#TOiN-BKQvQ2O#V73JBH2&p<3e{JgmTOAtTtDo!wwcnxGZe**cv
zzkw|806J`sdqLLwL6FBEE&64U-&+NFp3i_Uz(*V4W9a_@Lhc6-LC8_C46cLEfL-u=
zAWR?*!B`96JoqGd5oEu79mEjv9S|bL_d&MzOCWw?h!fBIYmnFXTae@A&qe<p7~^B;
zKLoNqr$HWf3H&PfB`^hl4}KZEhDpBw{stuQQ4HPyuYw-{_rP=DPeIn};JbvVfQP{g
z;8#Fi&o4l>%dZOl4#X?sHSkT~KR~wQKS9?20EDq#cZ2-?VUWko7ySj0{TG64hetuE
zC{BVLFBd_!Qv-xZkrjLn<au{MxWyku>iBE6Ib1D1>U%<bydVQ65ld)nzawbNXlz?P
zcr7I~mi-`FfX4piV=;%<pMA*d{UF-=(bxxku<lrrKf;0|a9*)4tRLqp+vOM<>%}?7
z_F@~cKlmu45gO++A0NpfJ`6sL_CB<EwD+K~t+-C`!S)>=tCU%lQct@ExrTJUo5+?T
z8K+7{eNtQ6Iva}94VlyxwWYN^lSV5vZ^ap9bv=<z+5BbK&^8y?kQNeRYOA!Rt<@&6
zeiD;8NNmTts$JYC2!jBf)bYM*h0_9i4TXCtKgdN^WkRv3lTMt$UCbn-mQKiOr~b{G
zqt)1k$>NAAiX4=3D#FAht4?=SNLLc8VpVmyOr2N<y~)%l!fnTElhvxp5;nqG(2_b9
zYl*|kBz0x1BU1h*RuiSl@*w||*KOI5Ba8VtE2gWKsAf{?s#Mo>RXW%v6zi?FNu5j_
zMQl!S-qh<@Cd?%+s@_<}Ooyr_sp+)kMTkpKa5R<JD7-Yjpaof%I$50DsCs`!WV31&
z%dTZ{+z+Q7Ps<*OBPggGnS|yS*zC`8q%2yoG4V2ATa(BbeySO<5i4mGsls4YlcsEH
z4!S(blF6z=x@a6+#9>%52*{dNaRf)DimH$jSe0N_cAB`XI+;#Y6w>iBL6sEV#KZ){
z)>KcWA)Qx_?<`TI>)JsIW;$64OGisV=~<}2+Wr?(lB`wX31-DiW)_>g?AcJD$S9i}
zanz7qBviuTZmQY`pijFZutHjeihYy88TrK#j89b^nWv!S(-023^vu}7Bhy4WV)+Px
zY9sWcrsYo0S7bOc;*K>UtrFu3&vMX?f{5jDlI6iqxYS9JGx-xlf2J^Zp99e$y1Z2h
zNs}A?Kbb5PSBfwY*G-nvHC3TXYI<CdMwXN9wvs3UCbwbLn5IUxQHiX??ETZl4UUnt
zhzXxws1$Y1U5(`O(#=$UP!IX<V-h*0lOie+5i}F8+L6ziP~>`xs);ajO9@U=x?yyp
zA~9=EfsC|{{HS_rvbOMND`JV;Sd~ulOFzP&Mg|v?VmWnbg>|x4Bb;4^PKHt5$;A!6
z7XHTMb?a|<;rs*%nwlHPyI?&EuA+~UvqEQXprD(%%Ze*caKYAf6r9THHrO;PG`DeS
zGdRt~5@UliP<Mrnm6wkN<>SHfBUCQ0EI$&IA1{|NFu1I`nq}TGu6%-)kFAs+KU&5y
zcOLo&o2g7}ES*VLXf@WfZV^5@HeGrWrSzmmmwO@Cj!)v1q@KyT3O1E&;e~CLR;0$V
zH7zupYp;|_y<RVLEL7LjR+uPPYUirjQo9s+4NGw$rX;sZi({cHB)8`-tY280SY$aY
z&z(jnBQk=`ej6$~wFQYWV*3eSWl;T|y0UpTI58Q=lh;%ltRajdMBECUsAxC05of84
zgR>@W*%eCKzH6UaeuDDLr|=1RDnnK|U6avpXRxQSgY4hLuIct~CXu9yyuI6zvm?4P
z<r<xuI3v8&*SB~5M!f%{DLMV&4pj!X+~8J1*kHDYJMnNQ)qcmp>oa4q_ZHh|TP7;j
z3Eqw5mW~NiRF-gtgJf0i?_yC{o#ROpQjvZ`NljE|>Ow|eQb+Yu9Y}wR#n{(Npie7{
zM3yNeTOGHCJ53ty;QejCkV*zSK!=fTJT20BEohs;o)gjF)^?qhRQV0Ubys4QywF^U
z{Dte;7Eck$CLXj4>v<*lIW;vliQ!I1cVZ3Yu=?Q+e^{7Uc0zGgR&|A(O!XF<Q4F5j
zzqtiRVUlfeT_F~|#Hq_HVKdoCceFS+c)7t6^D*9Yx&LUPqEY5#L-L*shf=n`o29WF
z`4tw{aij}xPl=q_dY1})@ENp!v$lT|0upa(xOwb)ar?W&oh_>g297gq7UImvbYt6&
z<Bz@PSBnT6+X!1ToC5XnP{vT+8?AvGq?;PwIk<%R2Yc*}%HZYx;8rteY6xu-kE*fh
zU}LI*9eg(-dc0vdj(7{Vy46L6<~?%T2OTDXk@4`ljM>z=m?gprI&hB<vdMOyzwQI+
z&X93Fs^H5vo)US6B}qPw0{8#90;K$%(Mk<9*dvaH24@2&{{Al1$M+{nV@RJ>{Ydxw
z(y?`#7>k}xG`x|=spU>fKb=Pk^n@c&YWajANRr#TFhQh4t~alnT*EV*s<TtHP+0Qi
zjACINUdZf<Pt|QN(64zq*L`L9Upj53Uilg+KBrM2@U0*-YzZ7z&8*3aq_mKKAuLi}
zcM21pDJoh^cE(YPFF=@TQl7ZNAuy5bUW1v$#fRB&r_miHghSQP+aaAQGMK7(ivIx|
zYTh-Pwq%1%$aPXTL$S(LP&5txcp$1p$K2k{P+#%w;7i%KatRrUPKu8PK4E<VpVC|q
zkT%8ST$XXSkAe8*WhF22Vp8kz$p16)pA1?4%`lVc`L{zRrf&-97-QLe>>rMesb?PN
LE1!OW$B2Ic61Uld

delta 177
zcmZ3bI*r-lo)F7a1|VPrVi_P-0b*t#)&XJ=umIv1prj>`2C0F8$^KlPriQu(#=3^4
z3Wmm3h9<fOCI$vv0sgu{sb!hPnfZCTE{P?nRtiQ2hG2CDCJKfYRwjm%&vJ>2dL`!N
yWfm*gWPxdioYc&e)SSuxxs=#!{POcs?Ix#lNAvh3=B1Y=rUT7LteSj~TNMBa=_e2X

diff --git a/django/contrib/auth/locale/az/LC_MESSAGES/django.po b/django/contrib/auth/locale/az/LC_MESSAGES/django.po
index b09785bbdba..9da4f124803 100644
--- a/django/contrib/auth/locale/az/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/az/LC_MESSAGES/django.po
@@ -1,244 +1,285 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Ali Ismayilov <ali@ismailov.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Azerbaijani <None>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
+"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"language/az/)\n"
+"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: az\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
-msgstr ""
+msgstr "Şəxsi məlumat"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
-msgstr ""
+msgstr "İcazələr"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
-msgstr ""
+msgstr "Vacib tarixlər"
 
-#: admin.py:31
-msgid "Groups"
-msgstr ""
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
-msgstr ""
+msgstr "Parol uğurla dəyişdirildi"
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
-msgstr ""
+msgstr "Parolu dəyiş: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Bu istifadəçi adı altında başqa istifadəçi var."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Parollar üst-üstə düşmədi."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
-msgstr ""
+msgstr "İstifadəçi adı"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
+"Vacibdir. 30 simvoldan az olmalıdır. Yalnız hərf, rəqəm və @/./+/-/_ "
+"simvollarından istifadə etmək olar."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr ""
+msgstr "Yalnız hərf, rəqəm və @/./+/-/_ simvollarından istifadə etmək olar."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
-msgstr ""
+msgstr "Parol"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
-msgstr ""
+msgstr "Parolun təsdiqi"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
+msgstr "Yuxarıdakı parolu daxil edin ki, dəqiqliyinə əmin olaq."
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
 msgstr ""
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr ""
-
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr ""
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr ""
+"Düzgün istifadəçi adı və parolu daxil edin. Nəzərə alın ki, hər iki sahə "
+"üçün böyük-kiçik hərflərdə fərq var."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr ""
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
+"Sizin brauzerdə kukilər (cookie) aktiv deyil. Daxil olmaq üçün onlar aktiv "
+"olmağı vacibdir."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr ""
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Bu hesab qeyri-aktivdir."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
+"Bu e-poçt ünvanı heç bir hesaba bağlı deyil. Qeydiyyatdan keçdiyinizə "
+"əminsinizmi?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
 msgstr ""
+"Bu e-poçt ünvanı ilə qeydiyyatdan keçmiş hesab parolu sıfırlaya bilməz."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-poçt"
+
+#: forms.py:249
 msgid "New password"
-msgstr ""
+msgstr "Yeni parol"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
-msgstr ""
+msgstr "Yeni parolun təsdiqi"
 
-#: forms.py:177
-msgid "Old password"
-msgstr ""
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
+"Köhnə parolu səhv daxil etdiniz. Bir daha cəhd etməyinizi xahiş edirik."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Köhnə parol"
+
+#: forms.py:308
 msgid "Password (again)"
+msgstr "Parol (bir daha)"
+
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
 msgstr ""
 
-#: models.py:76 models.py:104
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
-msgstr ""
+msgstr "ad"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
-msgstr ""
+msgstr "kod adı"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
-msgstr ""
+msgstr "icazə"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
-msgstr ""
+msgstr "icazələr"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
-msgstr ""
+msgstr "qrup"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
-msgstr ""
+msgstr "qruplar"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
-msgstr ""
+msgstr "istifadəçi adı"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
+"Vacibdir. 30 simvola bərabər və ya az olmalıdır. Yalnız hərf, rəqəm və @/./"
+"+/-/_ simvollarından istifadə etmək olar."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
-msgstr ""
+msgstr "ad"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
-msgstr ""
+msgstr "soyad"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
-msgstr ""
+msgstr "e-poçt ünvanı"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
-msgstr ""
+msgstr "parol"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
-msgstr ""
+msgstr "admin statusu"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
-msgstr ""
+msgstr "İstifadəçinin admin panelinə daxil olub, olmayacağını təyin edir."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
-msgstr ""
+msgstr "Aktiv"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
+"İstifadəçinin aktiv və ya qeyri-aktiv olmasını təyin edir. Hesabları silmək "
+"əvəzinə bundan istifadə edin."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
-msgstr ""
+msgstr "superistifadəçi statusu"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
-msgstr ""
+msgstr "İstifadəçiyə bütün icazələri verir."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
-msgstr ""
+msgstr "son dəfə daxil olub"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
-msgstr ""
+msgstr "qoşulub"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
-msgstr ""
+msgstr "səlahiyyətləri"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
-msgstr ""
+msgstr "istifadəçi"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
-msgstr ""
+msgstr "istifadəçilər"
 
-#: models.py:406
-msgid "message"
-msgstr ""
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
-msgstr ""
+msgstr "Çıxdınız"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
-msgstr ""
+msgstr "düzgün e-poçt ünvanını daxil edin."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "%(site_name)s, parolun sıfırlanması"
diff --git a/django/contrib/auth/locale/bg/LC_MESSAGES/django.mo b/django/contrib/auth/locale/bg/LC_MESSAGES/django.mo
index a4758024f21c5aac696549bb43bf4b800210c852..b05e35a56376e63c15eb56e2a082f53f1e907549 100644
GIT binary patch
delta 2141
zcmaKrTWnNC7=UMia_PNW+69DqsG_ZOFTE(*7^Fo|v<e{_6V%{od)h9vyUp$?1s*Id
z#vsJBFbY0^1yqPp)0I-#2upo18lo}h=z~x2q7h$Ed@)8N`u%5@SbT7DX1<v@^WSGa
zjr<WDy6T_vrlK{{m(tJrlzI%d&1RtW%u%WqMqxSBa1%TYAA-L_3pV5_H5a}Gm%(u;
zIy0~Y{tEM<k3)s95H40~NG;B7G{X7(SOZJp23Q5RzzVnv-U&xx0i1wE@B(}eUWV)7
z@_9-<3A^D7a1yS7r6}JBAAlHEufp}%SI3#~scQ@`!W*y!KD{6t(HNBfN1zx!4vXQ3
zP$Iej2~K?u@j-o++y55wsjCbmN&N&x&vhtrzrh0RD<3OKNfDIDmp~C%nOjGo2(~~m
z^aMOcnKr==)<5HwWM(r;j=}`o1xrZJckneRdQH5Rk|dyH>=Yc5n%-n0HS<#_Np%FS
zg6m-bz6`~|!|)FH4qOeVVF=!Y4KRomd{Qq#acDctzyr{N8_F;aC*Ubq?I-{1nOycO
z^*SuYn>zS5wBeU<AzZ_78a@k6_!q=ywH0qA<uP~<9DvwTN1@dCBPb4ik>fXTIqNHs
zPyJm%{zXAWWj4a4Py}joY=YISAA$9-9g0J5z`No5x%JnOPkqloWxSSqK;FEDk#c)7
zvT>gb(xm<pi9{_C+)Ecj@)V_sb78tfwS*p|ucS+>&BD7IRKRmw$|EI{iz-d-5y|zM
zlxk*^*EJ+{<$ieemy}2yDUVk_UXFL+7C~tdx<PNGOS>xzFGG@6$$&gH$&jR<>UnKe
zjviW!fuxl%2BUV5VfRc<%-QWL+0fS?PuOP6Habn)O6ttqlLa-&sBLYHnSEC6<kooy
zd~H@%(Cp}l4{*{<CgUAZj(6VD6-^peu+NP48fIr_!b&EM4l@>u+Xi#X#+YUFBQ+RL
zbm|}Hcj@;Q+|(cBr|xeEMjC_lO-3ZrT;CLotcpbPH*E}Vwsu65(ReKQC^njnhDg14
zF7lvJ-_RUcrN;^aL#^=yM%VUOi5*sKdwhrSaJ;K4+F`9pS}{A?84tC0ug-5XW8DL0
zw-tQGGW(j1)`8w`GZ8goMoo`x_cw>bgM))1J7LC>(JpIeC}!E={zQD6)nO;Y{o&4S
zh{wadIVIut?r`lbm3jEp-mQNqcwV;^j^&NJdz?%9N}(=v($0D3V_CYRdS{W=2a6hY
zYw@Cj5%#9s5hv~L(b3}Cyo{{$k>ZB>vrfuz<#*aUFl9K?p8P9pTyRn$wa&||lXA{_
zI)?S1#nrm1q}P9ly>m{+NgEDIM7iEpdZOSGvy5}eIfGB7Wq~?(pL0v8bJ3aNpLC4w
zb%&j4jP8@;A;VD4xIR(3O!t)e!{Wkir#YGOHu1^u<X6nND0;kXWU|`7*5^B>_m(%+
z&IrM9hlvku=W*2fPb?w*S^1c6T;B*R8gfV7k=uf=L)1Cr?#JwTLe2cIraEzoI4@%9
zoJ=II*;HoZa7S7G8v`zpTjylXF=x6;qI12h8zL`hN;#i!E=?+@^qz&g^=L)aEO)=2
zs5mh149e2(KHXCJxZxaf_sbb<N{y!su{E;{?^d?zYn4yckY|H~B1vQtlQX5TnZiY>
yw)a2nT-4D((C-e5k6aDvl+Cz49N1Edn<<gaZaLF>tYV@5B~Y%f2P$SeY4s1v-&3Ig

delta 2377
zcmaKsYiv|S6vwBu6zCJSFL{VVrDC<)ZcB@?DGee%2#AOzq7{=%_p)8xN8R1>@R6lJ
z0)>Rv1*0ECfe(<N$x10*C~XZfF-A;gV<Is|@e9UJh#`hZ(D*xdx4vSW?A+hnGiT=f
z=bX8F+xxLE`JJcWh@vf`&!Jz=Q))SUBcBKD{Q{-x;W1bNKZmQ~RroOUO;*Z=FT+A;
z;N9>FTnK;3+3T4s=iLY2giBzNQb{$&pajEba3=gJ_kIIT<^4A}9TrYeYA&pSRd5lk
zgeze&v|uR=!{^}Z@G<x$TmfgY*^AJIb?_3LNqqGqgU2yUnx@n`xEx|q$KiT-8a@K2
zAr~!b1(f+UPy%<sG8lmT)FvJrTJ=Nm-<7lPgKVYVfoM`EU;**fX$G=k3i4CudC10}
zK*@}Ol7Vj_Sy$I{?>C{WE5KO-mcnkzS0UtmGmB@#Z{XYT7TgLCkfv*}2-Qgmbb~=F
zyaOe5%@m5g)c};5ABLCUDJZpl1vOHF0r(Jn57xjdPz3*!o4*6)UU_CH)d-iv`{5QS
z`yZP@{_kP%0fsSn8QO5KN2wV68J>iGR7i<RD7X(k3lnfBJPdz@{M0^FiT?>GwO&!3
zEzKz?r5J|y!7)fEb*-BG%cZ-8K@`p47{WPFQnvugNgsu1QO`r!C<NuCaVY-Va@-3!
zw0a9R!;?^ieGTj2_1t^qT}lyB)h8KHGB<s)aH1_@Ab}<Q@>$l?r7g(9-F#AR{2-Js
zL)t95oJ=m5+zDwST*`JYUBoufMU)6gQc}0I@SIN<m0r50ORLSo{g!h>H#2g2DV<zE
zX;R--ca;4M<)+JD$OClAn6xIk+_#BF=4;(gM`|K%9=(lDQrwFowJsR63J&BYpNK{K
zdgE$&xHlS0SdoPGTM3)@h_?LxU?Lce=tNW}dTiZm$HKvQ97|k>tw^603T@REhCsyj
zH{cSC>%O=h)0=~#khVhcs1Dc(2BCi}4aA6I`(;<#>aOb10a2iP?4~$D*drKeJXCmm
z@WaBrdCu;s8`kOtT~;U%T|d7oZiNz{$KK)(2JCoZ{Q@10NlaH?hoyUB_Qu7vy@=Wz
zjrp5uJG*<VNC4?Mi{2QGg*%$8&cSO_^YaSBc06tcoFAs0X>0cS7J8f8bo0XY=2ow-
z)#oc({j_(Dy(uUM_AVnS?YhO+ob~f*Ut4=?i}OWM&EiC;Z-X6)ZqgkSqa}f`6$~|Y
zN5h>(D~aD{1#ItH+X}bqrG24*6$@Gs-LWbfu{)if;;xbjpLV?=;9M#`n0L%sSK>^~
z>@XKh$_zWVN}S@OX4s6HRA!e+IR{IZm2Z<7GiXN4kU3}0I^UPpPd<Zf)F~@#X-S*m
z%=XMSlQyo+3~5=c%{aEP%uehhCe^6S5w97?Fu<m-meuBY9j7d`#>s3W^teeYbBG<!
zu{5pCS%PmD+tExvyAGLAjo%&wjhZn%p;Z)^G>$}+U?~yM;2bU0k$#*9#C5=(G-GBY
zvxDXA{ii1jQRzxOlj+awmjq}tm=lz0(B?vBkGTj?y&vzf?BcYnL1H!==|-)c8Rf?&
zk7K;xjF#8TMIf@r%}{1{R&T$#C}(hc%DG+MR>%2BjwHraf%}l=;ksq^XI0fXFHPS*
zcy;=+JZiM6Vpcw8XTGPklsK&0VMa6C8@1E#InZ#Ny@us*f1A>B^0UOmMi8k^T9V{^
zTJc))5GRwoGSA%5|K57Hfb313rGSVYmPDKL?#loA5GeW>p)Tf5hkwdF9XWQ>JzC-3
zkH3;2Uy0LMId75~a;(a|Q$`3g$Z2m@J~>;Pe~Xm_WwYH?wUm4GZq-v|az#)k%czg@
rdsWSJYPtu*M{);<n|3_aUgw$W7aUXVaaMau3f=pnoMd%<K6mX8d|12u

diff --git a/django/contrib/auth/locale/bg/LC_MESSAGES/django.po b/django/contrib/auth/locale/bg/LC_MESSAGES/django.po
index 2d553b00807..833d1ecdb14 100644
--- a/django/contrib/auth/locale/bg/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/bg/LC_MESSAGES/django.po
@@ -1,258 +1,285 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Boris Chervenkov <office@sentido.bg>, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Todor Lubenov <tlubenov@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-10 05:42+0000\n"
-"Last-Translator: tlubenov <tlubenov@gmail.com>\n"
-"Language-Team: Bulgarian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Boris Chervenkov <office@sentido.bg>\n"
+"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"language/bg/)\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Лична информация"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Права"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Важни дати"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Групи"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
-msgstr "Паролата бе успешно сменена.  "
+msgstr "Паролата беше променена успешно.  "
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
-msgstr "Смени парола: %s"
+msgstr "Промени парола: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "Потребител"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "Задължително. 30 знака или по-малко. Букви, цифри и @/./+/-/_ ."
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "Тази стойност може да съдържа само букви, цифри и  @/./+/-/_ символи."
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "Парола"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "Потвърждение на паролата"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "Въведете същата парола още веднъж за проверка.  "
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "Потребител с това потребителско име вече съществува.  "
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "Двете полета за паролата не съвпадат.  "
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "Потребител"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "Задължително. 30 знака или по-малко. Букви, цифри и @/./+/-/_ ."
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "Тази стойност може да съдържа само букви, цифри и  @/./+/-/_ символи."
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "Парола"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "Потвърждение на паролата"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "Въведете същата парола още веднъж за проверка.  "
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr ""
-"Въведете правилно потребителско име и парола.  И двете полета правят разлика "
+"Въведете правилно потребителско име и парола. И двете полета правят разлика "
 "между малки и големи букви!"
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Този акаунт е деактивиран."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
-"Браузерът, който използвате не поддържа cookies, а те са необходими за да "
-"можете да се логнете.  "
+"Браузърът, който използвате не поддържа cookies, а те са необходими за да "
+"можете да се впишете.  "
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Е-поща"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Този профил е неактивен."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
-"С този email адрес няма обвързан потребителски акаунт.  Сигурни ли сте, че "
+"Няма обвързан потребителски профил с този email адрес. Сигурни ли сте, че "
 "сте се регистрирали?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Паролата се сменя на %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"Потребителският профил, свързан с този email адрес, не може да променя "
+"паролата."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Email адрес"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Нова парола"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "потвърждение на нова паролата"
 
-#: forms.py:177
+#: forms.py:280
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr "Въвели сте погрешна стара парола. Въведете я отново.  "
+
+#: forms.py:283
 msgid "Old password"
 msgstr "Стара парола"
 
-#: forms.py:185
-msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr "Въвели сте погрешна стара парола.  Въведете я пак.  "
-
-#: forms.py:194
+#: forms.py:308
 msgid "Password (again)"
-msgstr "Парола (пак)"
+msgstr "Парола (отново)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "име"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "код"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "право"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "права"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "група"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "групи"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "потребител"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Задължително. 30 знака или по-малко. Букви, цифри и символи @/./+/-/_"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "собствено име"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "фамилно име"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
-msgstr "e-mail адрес"
+msgstr "email адрес"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "парола"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Въведете '[algo]$[salt]$[hexdigest]' или използвайте <a href=\"password/"
-"\">формата за смяна на парола</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
-msgstr "персонал"
+msgstr "статус на персонал"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Указва дали този потребител има достъп до административния панел."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "активен"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
-"Означава дали този потребител трябва да се разглежда като активен. "
-"Премахване на избора на това, вместо изтриване на профила."
+"Указва дали този потребител трябва да се третира като активен. Премахнете на "
+"избора на това, вместо да триете профила."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "статут на супер-потребител"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
-"Указва, че този потребител има всички права (без да има нужда да се указват "
-"изрично)."
+"Указва, че този потребител има всички права (без да има нужда да се "
+"изброяват изрично)."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
-msgstr "последен логин"
+msgstr "последно вписване"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "дата на регистриране"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Освен ръчно указаните права, този потребител също ще получи правата на всяка "
-"група, към която принадлежи.  "
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
-msgstr "потребителски права"
+msgstr "права на потребител"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "потребител"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "потребители"
 
-#: models.py:406
-msgid "message"
-msgstr "съобщение"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Извън системата"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
-msgstr "Въведете валиден e-mail адрес.  "
+msgstr "Въведете валиден email адрес.  "
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Променена парола на %(site_name)s"
diff --git a/django/contrib/auth/locale/bn/LC_MESSAGES/django.mo b/django/contrib/auth/locale/bn/LC_MESSAGES/django.mo
index 49814cbbf40d3be302afeffa5662d6362391320b..af838b3ca66ee1204ff688161799a7f9674c0758 100644
GIT binary patch
delta 1247
zcmXxjOGs2v7{Ku}z8y^)GtEr9rD<c%+&hk9P4v(nQV3d`h>9BXrXw~pIHM*BqYD>8
znQ(2<gD9|75y32aL7O&#i;^H(CAhGlMFlM+di}pU)8T&ich7yC$9K-XYkYDiK9*!%
zR}?R?iMZlWY7hR(;6(YBsgxVP<2tO&QmPwu+=UZp;&aSFEnBH7tVcf{!eSglCr)D_
z&S8a833V@h;|1pN;5DwrMXbhUT#pV~FTiqKgEe>peRvwDaT~564XeW3RC{%JhPsYz
zcolg?y|JGslzPvFG`xgG_yuL8KasvwHlvac3Q+EsU_MqMlUDV}p&B{K^A?o$_M^<S
z6J<gtQQjX&*CUum|7wB@>1Y~nkp64fMcqwnJ{-dye1IcZMC%JUg_7E1^dd_U#2LJW
z&DcPiWLeMRcAUWue3HKZ7Za7-@G@-!k77Gs#=ZCwH{frS2FmDd7Wd&he2bFOd8Q}d
zt)RT`b}97`+wn7gMakHQlGIWz;|}VpC9MBeE^66XvSuA9sSYBC>gOaKkEiSRQ5t%N
zGVoU@9WJF^McD(c(o_aoQ8F}$yKx-l{ii5<YO$33lW~<nNRge(;8YF4r0w;R0ZQ3S
zY$2G8;(Jv~$e{T#>>^7@M(w>Ilc*!=iT{PM*@KZiB9oHM&HPhEMkOPcQOOLYu)Oxh
zX|!vp->{r(522;+2@UCM`F*8GYT3K?=99XVGQvwp);1EVO&gAxLs~MLHR&imaxoei
ziU-4Stv47qW7bs8Y_cKO<*?@R{#ZBjAGb7l48O<MtQkhY*X%J`4a3>p<vDJSgkqsc
z*mIDt0$P*dv)?mzYQCm`(P|}})j6GJsMj2{ZaY1PxA({6(SWXxj*fccL&0z?biusj
z4V!U2Iusc&&&OkWRPP-KhWjG=Am`y=pQ-nRb+@xKT?=SEVQay8D(NrqW?KD4Ey+j4
ccN~_#ydpX8a%ETt3SG%_rIQ)SA7zb>f0b#L+yDRo

delta 1948
zcmaKrTWB0r7=X{_)?Ax=Ol^$EG%==TySuqSj4=?a1VbQ2M1?e!X?L=_u-RR9HmMg%
z$b(INur>~@+Cbx_nFI-K=vs+_&66NRMDS5;2VeBH`jUrQ{r=gFB8Wfx&o}>>bN=hu
zU%EaF&fl&px~Py|v<3alr_?AMFXVwli<IhuF<1|6cnq$=C*UqLVNbDACGdUt5L|)c
z^Q-*&U09913(vq(HkT_kug>yP$-)vm0I%fjEm(^EHLQW(!B%(&Hp2U`0XFPYsseVw
zD%cNSf=A(TxC}esE)@T*IDHuoz*6F?C0?djxC}>RBgD5FEXyS@0wus0+z(%bWUfp|
zF)9UR|6G3k4CJTI@gSyp7t$nk8RA;4Ksmn-D~PYMyhsPOp;Y=UlmkEI?Vq6>{2fZb
zdvKC572st8`vlpA;5B#>x^NC2#pw?G5=!gO(jFPvC3qfw59cNGS179wPQw};FT*3)
z8=QI!{s>255!uQ5I6Mg7fI;{kd>VcOhhar+j$^PH`z<JbK86?I4*UTgucQCc@*p=$
z9Hij~@FtXl6AX9*M&Ylpk-<~Ex)0?Jlr|~#IBbP&a16?fXP^|e2yvy(Lob26y#wo5
zztcqj#o=!(NJaOc1a5vH#}JguGX|wYDJZR6g-^npQ1;)2l2ADY4fI6*K++wNPE_I?
z5(AOoatGx8c{A^Z66jGhgi10ZQbhn|gz7=mk4nWNQjth0N=Lm*Dz*rt^+fIw&GY`+
zGCGmNIe5=`M(tH37DcEYR9Yr~HMzZV;pG1;(uF>Z_KJZ>%S9eRH7cEGM`@xr2H;6S
zp3)&TqGv5Ltxv}?QJslq|15mnH$R$A&ZaE&+)OH&&KQY|4jUO0JE4tmIF^Ye6FQS*
zx2aQRdM0LBtXO)+NX#1X_-oo=A(Ak|-E4_jd;a5bZN#mlj+hx<;{Q4tNfX5ki&xV)
z)fm+g$v{WVfJG2|#1cpBbHx|xaeX?O4(qgO;f6dqtZY+Bz3&CxIcdZr$*J~9%ZO({
z)O<A@i<nkss#7P^l7yG=kfEb#bNZ>aRNhsfZTM8wNJOY*&-rvRJu?(AhO_Pa3VkIr
zrezrsyQB0*f5;!~^@sX(sCO{b=MVM;gXPC2{Lh<nG3kK+8M-v6dx9ZvU$9Sy1_t{=
zc4b+s9V+WC7#g-eDVwYuC)lhJVdu$2_K&haVUgoHH|(yef#P>uXHnbxE1DY|cWu#K
zTXCIR+I6;E=b~&`YB(@2>&_;NpYqLhKKGt~zi;#5P1jj>*WPxW>)yBg`#)}YlYlu#
z-B{PX*Gqf57g_QW@dC4TE9Z^nP4`)Hk_?u;=eiuv#anQlYp!$Eb+%o{W;OS=j*XGa
zZzFfcUA>w;QT36}wyRt8rgwk{_*`M<7gF?I0ETPdu5ZaUSJxIC{Ga*Shbs@Y<uX}y
zoec`n|21ZNsk*h9uTnj`Y3ZiBM&9c(YkQ%hF*{hhP*5Z1y-&1|DsE-B>I1&N0PR}P
ABLDyZ

diff --git a/django/contrib/auth/locale/bn/LC_MESSAGES/django.po b/django/contrib/auth/locale/bn/LC_MESSAGES/django.po
index a88077b3273..db3661adc0f 100644
--- a/django/contrib/auth/locale/bn/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/bn/LC_MESSAGES/django.po
@@ -1,250 +1,273 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Bengali <>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"bn/)\n"
+"Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "ব্যক্তিগত তথ্য"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "অনুমোদন"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "গুরুত্বপূর্ণ তারিখ"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "দল"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "পাসওয়ার্ড বদল সফল হয়েছে।"
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "পাসওয়ার্ড বদলানঃ %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "সদস্যনাম"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr ""
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr ""
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "পাসওয়ার্ড"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "পাসওয়ার্ড নিশ্চিত করুন"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "উপরের পাসওয়ার্ডটি পুনরায় প্রবেশ করান, যাচাইয়ের জন্য।"
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "এই সদস্যনামে একজন সদস্য আছেন।"
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "পাসওয়ার্ড দুটো মেলেনি।"
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "সদস্যনাম"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "পাসওয়ার্ড"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "পাসওয়ার্ড নিশ্চিত করুন"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "উপরের পাসওয়ার্ডটি পুনরায় প্রবেশ করান, যাচাইয়ের জন্য।"
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr "অনুগ্রহপূর্বক সঠিক সদস্যনাম ও পাসওয়ার্ড প্রবেশ করান।"
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "এই একাউন্টটি কার্যকর নয়।"
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "আপনার ব্রাউজার কুকি গ্রহণে সক্ষম নয়। লগইন করার জন্য কুকি আবশ্যক।"
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "ইমেইল"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "এই একাউন্টটি কার্যকর নয়।"
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 "এই ইমেইল ঠিকানা কোন সদস্য একাউন্টের সাথে সম্পর্কিত নয়। আপনি কি নিবন্ধন করেছেন?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "পাসওয়ার্ড রিসেট হয়েছে %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "ইমেইল"
+
+#: forms.py:249
 msgid "New password"
 msgstr "নতুন পাসওয়ার্ড"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "নতুন পাসওয়ার্ড নিশ্চিতকরণ"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "পুরনো পাসওয়ার্ড"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "আপনার পুরনো পাসওয়ার্ড ঠিকভাবে প্রবেশ করানো হয়নি। অনুগ্রহপূর্বক সঠিক পাসওয়ার্ড দিন।"
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "পুরনো পাসওয়ার্ড"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "পাসওয়ার্ড (পুনরায়)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "নাম"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "কোডনাম"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "অনুমোদন"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "অনুমোদন"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "দল"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "দল সমূহ"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "সদস্যনাম"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "প্রথম নাম"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "শেষ নাম"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "ইমেইল ঠিকানা"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "পাসওয়ার্ড"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"'[algo]$[salt]$[hexdigest]' ব্যবহার করুন অথবা <a href=\"password/\">পাসওয়ার্ড "
-"বদল করুন</a>।"
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "স্টাফ মর্যাদা"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "সদস্যকে প্রশাসন সাইটে প্রবেশাধিকার প্রদান।"
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "সচল"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr "সদস্যকে সচল হিসেবে নির্ধারণ করুন। একাউন্ট মুছে ফেলার বদলে এটি ব্যবহার করুন।"
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "সুপারইউজার মর্যাদা"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "সদস্যকে সকল ধরণের অনুমতি প্রদান করে।"
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "সর্বশেষ প্রবেশ"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "যোগদানের তারিখ"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"এই সদস্যকে দেয়া সকল অনুমোদনের পাশাপাশি অন্যান্য সকল দলের, যেখানে এই সদস্য "
-"রয়েছেন, অনুমতিও তিনি পাবেন।"
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "সদস্যের অনুমোদন সমূহ"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "সদস্য"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "সদস্যগণ"
 
-#: models.py:406
-msgid "message"
-msgstr "বার্তা"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "প্রস্থান সম্পন্ন"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "বৈধ ইমেইল ঠিকানা দিন।"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/bs/LC_MESSAGES/django.mo b/django/contrib/auth/locale/bs/LC_MESSAGES/django.mo
index 55d0d774d0ea333bc307e2875e246f73db28b4ab..f37e627591843b8f60e9f92182be313d3d86d3a5 100644
GIT binary patch
delta 1305
zcmYk*OGs2v7{Kx4Xqq$HjE_>YY|4D*c<=Z?9Vm#(G!5-#ixM04s^ep3aIUFA2-PMc
zkfxFr5kW303TfIFwdk=-Xc18&6j82%Bv(ED-*klz_dCDqnR{N}InI=vE1X)$OuD8h
zUSbn*Cqbz_SdmCYsZUa>3>z>Dd$1kHu>oJBfwnbDCF1~Y#t>HHWpv_mwBtOc;Rno9
zYD#^x8WQQfmLFW`!aOX%a$Jwi=)f*a$00n9leiD(u?2Hdlsbt$ScK1ziPRTtM43e9
z*-zEU{HmRo-84Kz#!%mpN3BrFgeq03b&!U#gM4Josu<<_3ah;udDJc{lA@YW#yN=6
zuLET~KS~Bh(8c`f3@_5*k~H8nO2^wM6Wzm49LpTaF<oU8If|Ef2;XBXRxoN0PNGck
zkxDYSgp#3D(k7W}qhcu4iBs}nKQGy6B9FRAMYhxoX5uZBGkt_|mT#=z7m-JOrRu|<
z*n*v;>j2)xQ@D&Jc#O`ucovV~btn0koi5QZgg<a6c98~Iz)h6Y&!Q~kG0K8pq1?~6
zC>eTZxq$NBXO#XcDBu0D{!YyJ*Y2>)${_!8Ir3?cOIC}rpca%AA4S%r22fHqft*CV
z6k3*A=3o&a<833#2+2-9p%L4O|BGZaSI%E1mW#AnBvn%6(#Y;*K~iK#HiF}h-xCi?
zk$+oRY&lUuNRcd5#^03MXeksEa@ST%gPXS<gzS>d#nUO5M$#rb-a_caR$>Do>Gu-Z
zu^UO#3C`w`aA?%@2Tgac-!vl8C&|;X?v$m3=xplm=zaTKZIwr__IPXDy6*GVc=S45
zx3{->4jZQfkw7Tu*-I~<yGr-Qztij8-YTD77oBz#B)1xYUSl}=z~N~u9Wc$XPt(T7
z$1BZIe=rj0GbSp7hN*=|LxV<-8PUR8@1Q@}AJT@Y$Nc?<)*aEx?5);cK6iH{y689&
mYf95?=^g$TPlEwj^4Lfqy1ec}?26NAi~Y)QB}B8c&i@6SFqtI)

delta 1832
zcmaLWPfQ$D9Ki7hEZags5Lzkz!B<+OD9i5hrz)XD6I+E6i)htkMf+qQyR*#BY-V;T
zqIFYa(u*}sH^yi@XibcUi;<HDduZ@r^gv?NlQ!{SdT7*Wnt1Wg_qQxY6XVPL=JV$5
zoA>AUW?$O>dVl%5j>v0@a)`K<_@Yj!DSV-U8|CeYQUmx7cH-wai&yYoOf)KGF^5sy
z#M|&29Kq|g_5pru<2iw+@jh%;s;n+iX`$gW?8dKa&p+c%o`1)7jP6jX2fJ_&9>U!?
zgS*gRE9UVDd>)VBmv{`j8SE*v*oT*~oB7pMDo1IkZ&K<>oI;w^MV!YqydRrbE^AT8
zP=237nK*?vU<SF=GB-A@&Y<)^TWfz68A`o@tVz9#5$0EGRAj&pkxPBdO$OdT$;>87
z2EIkIu70dN|BCWngw8TyD}KQ7bz+j|Pk335>?eE#8%WO#p1=jXh-H}|%JL<(ohT_A
zMj3DgC8aN77GFWx!F81P{zN%~77kYW?L*mF96RuCly6}gxm1>$9PtWDzYA^TUtWBZ
zhDCfIk6|0zoyHWN#P_ftcigDdUX0_T_z<S>EtE|BhD%t-?1wRrGSM2cR<({?>M}Rk
zz*imQUq1BjX^<WNQ1cpcsb9Fs0FC5P&axGy|8A7_y)|{sgD5*ppnRm$C<{A@T*~3b
z9@S}-Or9%K;mA}MA!oc@<nJg0$V>9K93Z4f7NjJJ`f5$7yHJi#%FP5x*jltSP-G)=
z4EqT_88t}AvE4+JWi?WUi33C*5hFAqrFV<!f4Npww@{Jv-A>5vqzn<G)!Np#AiI-H
z-APF1q{Ion&A$to>aCv39kr%?I7Y}BA0!e)WIY)<UsrxG@JoeIP2~%IP&8gqr%loF
z>}iuuJ4MI$bkWzvtkne@<ef02CDeK2m5l2?rwt7m&!z|I;)J>s+CZOjTvr=6^mWD-
zskr}oH4`w4P0Og(EbPhZjI2OsZ9HTW#&Eo$%4XyFPKG|^2WcJHkYQLyU%38s^jh6x
zx<6&yj6Z)M6&kk)S-X;UGBzyE_iI0pMN}6&VRSaIi-&s)wV~p@lM7knW!TI1;ER5c
zpNN~u^&>kQ>Y{lYh9*-v+Vs&_GL{&LCC7AfWIQ<<ON=HG&9ld2b9UL048$HFOXGSt
zk*xMhjOye)<D<z+thuK$*E|@Vc-Z&sWM!i{)iT3`C6l4|v*CKru4FwaFBPnM+<bb;
zb0poRyrX9QfSd%SjdPx_(|+2?SvO}rC(Fa?vhSKf?Jt|0Uh)Gc^qeKVah7D|P0`Ve
zQSD;?@t)P0Qcy5?!wWgO=|bQXOxg^o<LSyXt!KLDB&m$(<*au7RmWSh+B1^kE3NJI
vCyGwd{%@Kc*U|r#U&&|5HGy6=y5#xc_TbeVUv2BEi}Ib7mQ3Z3_Lu(xQ?NG8

diff --git a/django/contrib/auth/locale/bs/LC_MESSAGES/django.po b/django/contrib/auth/locale/bs/LC_MESSAGES/django.po
index fea09f70c1f..2078ecb1903 100644
--- a/django/contrib/auth/locale/bs/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/bs/LC_MESSAGES/django.po
@@ -1,81 +1,87 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Bosnian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"bs/)\n"
+"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bs\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Lični podaci"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Dozvole"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Važni datumi"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupe"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Lozinka uspješno izmjenjena."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Izmjeni lozinku: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Korisnik sa tim korisničkim imenom već postoji."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Dva polja za lozinku se nisu poklopila."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Korisnik"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Neophodno. Najviše 30 slovnih mesta. Samo slova, brojke i  @/./+/-/_ only."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Ova vrijednost može sadržati samo slova, brojke i  digits and @/./+/-/_ "
 "znamenke."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Lozinka"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Potvrda lozinke"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Radi provjere tačnosti ponovo unesite lozinku koju ste unijeli gore."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Korisnik sa tim korisničkim imenom već postoji."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Dva polja za lozinku se nisu poklopila."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -83,11 +89,7 @@ msgstr ""
 "Unesite tačno korisničko ime i lozinku. Pazite na razliku izmjeđu malih i "
 "velikih slova u oba polja"
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Ovaj nalog je neaktivan."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -95,11 +97,11 @@ msgstr ""
 "Izgleda da su kolačići isključeni u vašem browser-u. Oni moraju biti "
 "uključeni da bi ste se prijavili."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Email adresa"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Ovaj nalog je neaktivan."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -107,103 +109,125 @@ msgstr ""
 "Ta email adresa nije u vezi ni sa jednim nalogom. Da li ste sigurni da ste "
 "se već registrovali?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Resetovanje lozinke na %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Email adresa"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Potvrda nove lozinke"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Stara lozinka"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Vaša stara lozinka nije pravilno unesena. Unesite je ponovo."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Stara lozinka"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Lozinka (ponovite)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "ime"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "šifra dozvole"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "dozvola"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "dozvole"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grupa"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupe"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "korisničko ime"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Neophodno. Najviše 30 slovnih mesta. Slova, brojke i  @/./+/-/_ karakteri"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "ime"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "prezime"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "email adresa"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "lozinka"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Koristite '[algo]$[salt]$[hexdigest]' ili <a href=\"password/\">formular za "
-"unos lozinke</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "status člana uredništva"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "Označava da li korisnik može da se prijavi na ovaj sajt za administraciju."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktivan"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -211,11 +235,11 @@ msgstr ""
 "Označava da li se korisnik smatra aktivnim. Uklnote izbor sa ovog polja "
 "umjesto da brišete nalog."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "status administratora"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -223,42 +247,41 @@ msgstr ""
 "Označava da li korisnik ima sve dozvole bez dodjeljivanja pojedinačnih "
 "dozvola."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "posljednja prijava"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "datum registracije"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Pored ručno dodijeljenih dozvola, ovaj korisnik će imati i dozvole "
-"dodijeljene gurpama kojima pripada."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "korisničke dozvole"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "korisnik"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "korisnici"
 
-#: models.py:406
-msgid "message"
-msgstr "poruka"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Odjavljen"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Unesite važeću email adresu."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/ca/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ca/LC_MESSAGES/django.mo
index c68580aae750d6edbdd0eaa3522ffa2a33f03b2f..9c588108c932618120316a6984b1fca9280f3fa4 100644
GIT binary patch
delta 2491
zcmaKsTZ~;(7{^yl^)geP_Kd2!w5wA!Gc{+<nO?L;T}q2aYmm5>)S7+PoU?Ubj=lDo
zF+3b1eGw9}Lx_}+h^Whhc|j0O6AvPBeUTtS2ofQJh$p{qpFOR5uyVfrTWjsLzV)r|
z`|tC^z{|t!uS)YDQ?v`Qv#{UiDK!p1=;A?Jbh1)Ia53zIo8YzZN_YW$0$TV9TmZN6
zI2&F9H^JLsFMJes!)M_V_%d9jR9n4KOneF#@#1T^4E_jL!@uDQxN4zNYhVTTz;SpA
z+y`%hK71S=fxF<%IJ+7?4R3=#!3lWfVx`u@!*HDQ)kk!QL}|ji0**lm<bHTNd=Tz{
zKR{wp8#tXUY81-43k&Xq{M23^OW`e$Evf-Yj&e};&%pWcK6%gi>Y#MsBTyVaRV;WO
z$^nOq_p^|ndWVNNcppkCKZKI8FN*n}i}7zz_II&J0$2i>QYCnZGOvbhNyS^_aV7i)
zUJw6<Ti{-<5x@sv3H}O)U>60IOqHP=oI=sY!D9R*Jd^QZDEr=na`5NyRQMgtOWRBS
zW#KBkl;IXA5qnS;2Jm5cKYSDRE~kF*{emUD?`M1~oPuvc@iR&^Qo8+6{J#yQgr7q$
zt<J>x3>-X_{EyRljtNQ8Z%|6`7v!f-LU|JTN+{!XP}IE*%DNk&l;RF3`)x5k0Hvf&
zD4D$%qDz%Q`LLdX;`f<$@!};YH=ivQyafqXy$j{w&!C9s$71{|l$)G<TE}q-k`#3Y
zq_p{-bD@0FOyy11pNDP4Bna`}CbQ}sYy&1Yk@^l}(&Rw-Us#8U^SQRR=v3etn510V
zR!nZY1slcW|KSvD43m0~V3M`DMrqn=^W3Ol6%JyOzHOMKTSWTrCYh4-4Pca9osLP{
zgrO~Uz6@v@TO%D>e+PLPq>GmM>{)$M@j~jiV)oGdhvxO}4x4e3nkdyZlUkR(z2Lc?
zLFcD-e`G>Cl<i;GYMW`@G|o-ONzG}KSRKWwc4?g0+OT%9P8*g<-!ZSJ&5TZC?W|>*
zsg|?JfIGH-SWmQ4JrlRIXCm!2OjMVJ_Sgb8_)%SNH@cD7$&30qctw74rT^mG;bfeI
z+bibc?Bj)h4Azsl)pW;C(i1j_qdGJ3h~AMOuBZJV$PO-8zdWAQL{uSIo$njTjw~A5
zV>_#i=fy3uz&&HnClxg|rj3qkTMmsMXj7{t);S4XGC<#^Cj_5;zi2Xhe(@_M6V&5`
z?V<7-);r)@VRl{jMe7>IH59o`OzOvxQ-N`*4&u5Wb-JWHd$D`4%LHlmVfW4+GJZf$
z8jn<GrJmheHkPZK%A=cgwK_Jsxm?{^t#)5KUcTN=`3`^OorFE6H&#dUb=7TpbmLfc
zYxYRb%Jr9<B(P3jW|AbHIQpW~+r50|(usV=x)Co9vm-sLt{7~jX>+VnnVy~=NfQ$}
zf70GP64|uUOyWDOm%2)`QoEDF#g%|(%hYYfGnJw4J;i8@1Z7|M?3=x6$+z>CNl;Gv
zb24+;>q}=h_>oVN13$gTBswtKizCi*HkvWo==J{=-~+v{wy!}@12zmz-K6)}&_-G=
zb9@s6=Dffp!@5a%b3G%*hOZk&hbAK9x@Ps1Z6VbEoL3t#ceN~qXt|b2{M^IQ*JM>Q
zu2~W4STyAm=cGj+$a%_7PSEF^JPS7>&=#Tixk@X`{%qG15vd8BzN;lqLL|Z&eZsl9
zUZWxij?sZHH}q`HrwRx<<&vGvq3>cR_wh{4IIk7a=Z&*1hq5_qMD1c+W07aVW>#L_
zf7`AAZ(%dFx;D_c=rO62@lGTVfggP#&y^P^3AZPU&0OpMQ?hLD@;kD=(wD0{vUj0X
zD8BF#BAY4W`A287UrIMDJ^l%JNH)8yuRja>)^<4)WDoc4D|N&!cS{pHVS+&Y1NtBm
AEC2ui

delta 1904
zcmaLWPiz!b9Ki7hmeM~IXqOf0AAD3wp>*3_T8M0#1`x#x2q74a1<5P>*bdGgn3*kB
zBpai|ixQFv2e^Q6Fa#wk2ZM=3#DhjnNJ#V~c;G-h7!u>fNaFW5oyK_aW#4?>ym|Zn
z{C+bZ_1){K-|lEQr6}vDk5PY^rPL_C`4AV%xdx?H;Rl$*?{O#I!Sz_2qm;#i*oZgr
zar_wv@z1P(6%QA1U&Ld$0b7)+t7|mo(eWL2;!oNAeQe_X0WQSGxk@d?#hAx+xCpml
zD;jJ=4`0Hg_zd2{t=P$Ad(dJxevO^1ukO)!mX6uYO1+GuNS8W~d+`!(#Ade3Ues2U
z=etlA9>e)qMSg0M3x`&3p^Sew>py`^rA{MzQWvm+_0=UBGT|r4PhI6A6MusenVTpP
z_yvi&`aQe<1Lc1W43-7ka3AT*p`0+{&x`Ri?!r%TEjAD)7t2`hpz$G%Rrm!;B<`Y2
zxSC_h!X=!<O(^fc)vW(Ve3bj!DD(V<vhg+&Eve~5Nm)P2xb2w^%Epf`ApSD&1Rd|=
z1>AxqRu!jkA6~}-E^D8jXa`D4UPFr?BZpHtb}@w-ci<V6gZzfFvHK|N{f+XHw&#ey
z<Ya(jNod!j{9yzobemCfwFhO#6_gLdLz(b!_WW4({5bMcC%DK$=TY8)&$Ih$C>y<n
zGViZ-8l)^;OhP?V<a3m_oX6>BDd~~YGmR?Y?5w>SCCpMDp%RRAayf_;4x66#N#vDL
zeN@@p!_+zvPs<vv%c<Q|3ALt5>6#|}ma}G>OF6|8REdg|e(F%#n*IzWsuHPQszgA_
z09B$kQ~2Chq@T`;tY;a@8@hzLl3JunTGW*}bKaY^XG<8=4n=CzI~0Vm@nc;vvE|;^
zrc!ZYC-8L~=y<~FLpJoBD559Qp7CqOb*HqUqw3pAA48l-*CHG0BaZ88<3>ReHFxK#
zvVfkj0}*pD#PR!+bB*Vd?Q?6%*{0s)?WS*&%gxJ^u9op0-7{v~YOr_tSY+H7ChY4K
zr)r~kZ;uW_nO?S%oNdo9**{_YD!XC_M}n}T4+Nn%JYYtWddp|Y=GNilWNW_Bvr%NK
z$%WRH$<5YH$<lex)k}rqV4<{Dmj=tFp+a$}SZvw3qp-_PI&!qaW{zLhYl@|GTyaR3
zo+=NORu?HP+e{P}c8A7~ToVUjSwC-lpCb()Ox@sGr()fH$3GB^FxaowOw|^4TjQ1W
z(<U~q@pa?y3xRJ(l67rk^Ja#W^?q~ZWZT_Y^(~<!L-s(RW>ONVjoQ0$G15#PWoZba
zEc7Ox$%beBxKEqIHNr)tY9@4a?D&=N#yK4uZ~VqZ{h$A*vsGom>52K{d`&iMj`plK
z9@_roods8xM6nrnolx%&{5Uj`^{0%szV1%U!pliV$6)fH{d%%C*PDEqd$sq)*m0fs
z4O{#FOtKNlVYlS0=E_DZmKgYx(~W;uN)y_-=uWaYzdJda*G=*Unz(9{Gx@IMtNbhf
E0ECcJ>Hq)$

diff --git a/django/contrib/auth/locale/ca/LC_MESSAGES/django.po b/django/contrib/auth/locale/ca/LC_MESSAGES/django.po
index 4ab026de48a..1b604f7c732 100644
--- a/django/contrib/auth/locale/ca/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ca/LC_MESSAGES/django.po
@@ -1,77 +1,87 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Carles Barrobés <carles@barrobes.com>, 2011, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Catalan <None>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Carles Barrobés <carles@barrobes.com>\n"
+"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Informació personal"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Permisos"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Dates importants"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grups"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Contrasenya canviada amb èxit"
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Canviar contrasenya: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "Nom d'usuari"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "Obligatori. 30 o menys caràcters. Només lletres, dígits i @/./+/-/_."
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "Aquest valor ha de contenir només lletres, números i @/./+/-/_."
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "Contrasenya"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "Confirmació de contrasenya"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "Introduïu la mateixa contrasenya de dalt, per fer-ne la verificació."
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "Ja existeix un usuari amb aquest nom."
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "Els dos camps de contrasenya no coincideixen."
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "Nom d'usuari"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "Obligatori. 30 o menys caràcters. Només lletres, dígits i @/./+/-/_."
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "Aquest valor ha de contenir només lletres, números i @/./+/-/_."
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "Contrasenya"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "Confirmació de contrasenya"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "Introduïu la mateixa contrasenya de dalt, per fer-ne la verificació."
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"No s'emmagatzemen les contrasenyes en clar, per tant no hi ha manera de "
+"veure la contrasenya d'aquest usuari, però la podeu canviar fent servir <a "
+"href=\"password/\">aquest formulari</a>."
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -79,11 +89,7 @@ msgstr ""
 "Si us plau, introduïu un nom d'usuari i contrasenya vàlids. Tingueu en "
 "compte que tots dos camps son sensibles a majúscules i minúscules."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Aquest compte està inactiu"
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -91,11 +97,11 @@ msgstr ""
 "El vostre navegador no sembla tenir les galetes ('cookies') activades. "
 "Aquestes són necessàries per iniciar la sessió."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Correu electrònic"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Aquest compte està inactiu"
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -103,102 +109,126 @@ msgstr ""
 "Aquesta adreça de correu no té associat cap compte d'usuari. Esteu segurs "
 "que s'ha registrat?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Restablir contrasenya en %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"El compte d'usuari associat a aquesta adreça de correu no pot reinicialitzar "
+"la contrasenya."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Correu electrònic"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Contrasenya nova"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Contrasenya nova confirmada"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Contrasenya antiga"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "La vostra antiga contrasenya no és correcta. Si us plau, introduïu-la de nou."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Contrasenya antiga"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Contrasenya (de nou)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algorisme"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "iteracions"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "sal"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "hash"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "factor de treball"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "suma de comprovació"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "nom"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "nom en clau"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "permís"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "permisos"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grup"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grups"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "nom d'usuari"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Obligatori. 30 o menys caràcters. Només lletres, números i @/./+/-/_"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "nom propi"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "cognoms"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "adreça de correu electrònic"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "contrasenya"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Utilitzeu '[algo]$[salt]$[hexdigest]' o el <a href=\"password/\">formulari "
-"de canvi de contrasenya</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "membre del personal"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Designa si l'usuari pot entrar al lloc administratiu."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "actiu"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -206,11 +236,11 @@ msgstr ""
 "Designa si aquest usuari ha de ser tractat com a actiu. Deseleccioneu-ho "
 "enlloc d'esborrar comptes d'usuari."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "estat de superusuari"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -218,42 +248,43 @@ msgstr ""
 "Designa que aquest usuari té tots els permisos sense assignar-los "
 "explícitament."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "últim inici de sessió"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "data d'incorporació"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"A més dels permisos assignats manualment, aquest usuari tindrà també els "
-"permisos dels grups dels que sigui membre."
+"Els grups als quals pertany aquest usuari. A un usuari se li concediran tots "
+"els permisos de cadascun dels seus grups."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "permisos de l'usuari"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "usuari"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "usuaris"
 
-#: models.py:406
-msgid "message"
-msgstr "missatge"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Sessió finalitzada"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Introduïu una adreça de correu vàlida."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Reinicialitzar la contrasenya a %(site_name)s"
diff --git a/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo b/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo
index 693e49e3c48991c97fdd16b4c853a631047cadee..5b8cae94cfe5f4bd93fdfd4e7a30ed751f58242b 100644
GIT binary patch
delta 2375
zcmY+EYitx%6vr=8p|rJ6Ye59B<<S<}-E9jLOQAr@8!RYQ6bQMUx$R7McJ4BFrmw`T
zCK7{@ggU{9jgOk}0Rs8~Vj__y&9)y@2%_JNL8FO56HPP{6HSQ!vmFZD?3v%(_c{M_
zX0O(KurhPAJns}kTL*gr_V+BtI>D>6@j%Oen6Wx=9#{c3gL}bk;M3qcpaj1G=YVVR
zSOm6%&ER3M1RMbiz%j50JP$5lEW<vF2EGOJG4Uf<3jPW%2LA;s!3A>}dlHO;g<vQ6
z2zU^D0kpxl!3l5+cmRj(0^bJ@fxm&>;I?^;Ed$Siow%QUjTd;rINaL`wu0oytKebq
z4R8~93xqFh1#ZU{)(FzNbrCy2{Ma5mioq8_Y+)7%ahL{a{}7l5zC!c3pB<wY@FYkF
zk46j5fONsRX#OII9~;Mm4)_uzDX)X1*!R)+?@|9RkoM2UB66Sz#1Jb7KSr7tgPA%E
zT!W4r{0BS$&WHOQ;88FMehQN3)ktJDSO=~IcY}2CAV>!vk9Z24kN#LRe;FhPz5*#_
zH$Y154<*o_4!DB>%1H@2aEh%4Ny5#b1?~f1122R7!1l6fj(~mW{|xqn&y+LvC^!Xf
z1iu3pf(uc(Tfi2O=3fRWu(v9p|7N`0!2n6M3A2=nogntIE)c#k3&h=Q5X4>Vc+?*S
zQE%*g#7iKh=JTjO0g@75fTYk*ASw9=NQ&If;DsXoFJeAQo%)p^6=gL@O0<Dg8@s^A
z!7dP6SQ?~*kAWoZ2#D0?=9Yu>Nk0aoM(3`CHNoiXM$9ZjQ7wh7fRX1^5A`r=<SG3x
zEP+wfciU6ZOB^I;8lrv+SOr@RYlPAN13A?SqkP9;6vW+z)MVJIyS<1BuogyXSPP>+
z6RM5-8>Nb(u7OdSNMdTuFiO`N>Y#BL{bx|4!lg#(qDHDNpw$oMy3_fny!c+;o3l!G
zq|(ash3j)u_)>>g=6qCGt8HH%aYahjg-7NF88N`qLhAwLnVJhva##6W`^uAMJ=co+
zmc*c~G0q3X5cd_=QeqfGftFs4p4nf|y91vOsel{8<%T8PURo$;7GQ(z_VPBtEl>8W
zug1ldxtrtF8*&HsC@<9(7aPJGb8px7dMZfkdpGfJ=_t1sBPzx><u2y~w&R4y<}52y
zJscjz;VjSXi-i;Ub-U&CDq$EZfC`9H88)OavC+4tkCqK7VLM!yrYE%~*GU1qOaB4q
z!(Z}y!ZY(OlnbX<dDxy}h9!-p4pQO1g7r%*p)Ce&J>lER)yxsv=Z@;N-RW0I9-b|z
zoh=+cyk5{z2*s1UM;MSgEHB)#x~U=2+|am+ClalVs~Qq5iA2HP&W2}YzpZgzLkHY$
z<xPpk+`7bC-q_TdXbDdiRxNto5vJgKgdvl>Ek)R<g===J!I&`|P83#ct+jkV-5QS%
z3=G74Pq^Cdk%KW;`th`<`lR9Ocsg$OAz>=+;2DTs88>viu3&f6YvqOxZx$ZBxV7ld
zS*0CQpEz=A-1f6$R9YguQT*Wpm36e_^~`pu9f4xut_+e+cFYug*$X^9bvk<?rMTd}
zNb)|Kb%rG$R^6T$w*462DY<YYPpPSKH+z;=45ubXUEAkrl~M+dxW9g8%12oWrAY-8
z;I66DGA~z1+e`O{J4>&$KbH*BwmVeMO~sQ)Qud00{7V;m0tC_zbsf~HPu|6N*UXTq
zG(I31jucmA0&{ZIkuG9Rim7oE&JDvo3m-)8@EE%<Vr?liK)f-QeRuMNA8?(9&<H5S
zsel9AJ6(9HAK#0h+5@MxP~EQTN4ypUR57+c=VkVCxU}r0@K)KiMNt8!0?m@j^*!ad
zPzC!ZPe?z!RNhr|uNDm%=2t8a*HqLL!6Q^QGC~!2s3Kk5Ba$dSp7ye1hGhQ(LFD&^

delta 1910
zcmZ|PUu+ab9Ki7@l$QPz=pSnlaXcw)X|KJb1+giJScC#<MU2GKhlShTZM(O7?w|6<
zKb4q(4<P8q2Z9L{9<gd98hxNKUN4bIBGCk%#Q4^jXpF{0A4vTEuE(2B`rFU!?C#9`
zX6AaK^G4g$o%-_k6=fr_invjx)DXV5m<#1%xl$cCjScuM4&zVwI3|`TW#Twi;7xo8
zZ(}e1Rci0x;WF+M_&RRIYNe*sER|Xsu44<{D&7B%OS!*`%dw(TsnytwO}G&oaSzs@
zfpwV0m+)2Gjz8dTY@xFQXksgVjV+9?=BYeQ!=fss_Tv!Jq%PqoUco1^is>>JwHxL6
zUX+1H@IFi<e`=BoNvq>1@1HESzk_t8&LMMBm$97j)fFnz;U~zS`jU%uJcqI}H&IsL
zM`YF2Z>9S`QNAnZWf`yzkFb3W*uniNKGyg-N@BNh5ECrZ1co>zGyIuK4Ck>EYe+|C
z_!!E-PvCJJM*3FYm%M`yaQ_R+dyCm%nMfnjm0F3iW$h@>ci>9gkCK?bjP>VR^(GA&
zJcG~U-z9hP)j0PbpzL+!3Z)*zRk$5Dp@natJfBC&>@IFYtA1gHK18}ypP@{ofV`q^
z)wBN6Fi(SI{7=a;j=E%4g_3a$<#{*Cifu&6bTdjOPn8@-ImDwVi5*7S^AjkUpGBGI
z6_kFznxev%sb)eZa<9nGQBFCJi$6=*PbqB+s3a~b)jLs^S&9rInaN~jf>Ow-_>+7T
zIWnq?kV)K6Ov$oHSx>AXT8TKJ2`O?er1UOOyvi0x)(;bM0Ht&jeZ|_s-b>c<FJv7d
zD<-9fkgV?&R%&f=nbwwC9>EQSEPXqXAmqfWt4o%gDm$>lbHkjkhO#-=3k)aFDI+ks
zceIg8S%Kv`I&gK6F?G)LvX<}D;_Iy8gobS&)dme|$4qtciskFjH$8pWvTbeHz8m>f
ztqo}zKxfPzpFViSa=N376_=uCD#Pf)(sj{WOTURes#+7pst@kdZ6k)Ac1PEY_=X)o
z#ypa;(xxAbwrSUs?u%0yFm%Q<$2P}ujDOhmQa!OPhcbqfW|pNEJ?47ZfgWQ^G*$g+
zG*~kbovmrA$eO-yq@&9<?a|GeZPDu5ony&(qBox0pp(7*$-a1^FOjGoelEV(oU|m>
z_#n&Cuh%D%#rG0@I=QL8FWH%(RPQnTAimEt9N#tq*X!52496kGf$^eSZPQAbcDLn>
zxzTsE%@qUBx{kRe>Z%*5-NR%<BTd(b{HrJG{wRC-g^4g{IY-rC;bYq@%vwQyTK2+F
zyFE8McfPpf`Dxpsnk$^MQgi2R)5%{ul+kX^%TG`8z{$_(gJH_lA>U6jaa(8eGeLB^
zzPTgkxq8AV%%<E>`^BNcE<J9J=V!8oSt@$&H2s;`?&$4h7o*<gC!=>)>?N)>>@-PF
zv+|DVXWUfCCs9j7YGT-xVa5ZKG3U<cVAAk(?0@$!#^(oJ{a-sLI~Cgb>B2cJvphz&
rPRNO2SlPgC^<wl&Q)BdA!xvGeabI-3v9<D8F=ZqAwXr>lHM#!+Fx+D-

diff --git a/django/contrib/auth/locale/cs/LC_MESSAGES/django.po b/django/contrib/auth/locale/cs/LC_MESSAGES/django.po
index 34e5d579ab9..e6a89fb85e7 100644
--- a/django/contrib/auth/locale/cs/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/cs/LC_MESSAGES/django.po
@@ -1,78 +1,87 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Vlada Macek <macek@sandbox.cz>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Czech <None>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Vlada Macek <macek@sandbox.cz>\n"
+"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Osobní údaje"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Oprávnění"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Důležitá data"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Skupiny"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Změna hesla byla úspěšná."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Heslo pro uživatele %s: změnit"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Uživatel s tímto jménem již existuje."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Hesla se neshodují."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Požadováno. 30 znaků nebo méně. Pouze písmena, číslice a znaky @/./+/-/_."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Hodnota může obsahovat pouze písmena, číslice a znaky @/./+/-/_."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Heslo"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Potvrzení hesla"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Pro ověření vložte stejné heslo znovu."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Uživatel s tímto jménem již existuje."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Hesla se neukládají přímo a tak je nelze zobrazit. Je ale možné je změnit "
+"pomocí <a href=\"password/\">tohoto formuláře</a>."
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Hesla se neshodují."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -80,11 +89,7 @@ msgstr ""
 "Vložte správné uživatelské jméno a heslo (u obou položek se rozlišují malá a "
 "velká písmena)."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Tento účet je neaktivní."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -92,11 +97,11 @@ msgstr ""
 "Váš prohlížeč zřejmě nemá povoleno přijímat cookies, které jsou ale potřeba "
 "pro přihlášení."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Tento účet je neaktivní."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -104,102 +109,124 @@ msgstr ""
 "K této e-mailové adrese není přiřazen žádný uživatelský účet. Určitě jste "
 "zde registrováni?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Obnovení hesla na webu %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr "Účtu spojeném s touto e-mailovou adresou nelze obnovit heslo."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-mail"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Nové heslo"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Potvrzení nového hesla"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Současné heslo"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Vaše současné heslo nebylo vloženo správně. Zkuste to znovu."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Současné heslo"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Heslo (znovu)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algoritmus"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "iterace"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "hodnota salt"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "hash"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "faktor práce"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "kontrolní součet"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "název"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "kódový název"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "oprávnění"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "oprávnění"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "skupina"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "skupiny"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "uživatelské jméno"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Požadováno. 30 znaků nebo méně. Pouze písmena, číslice a znaky @/./+/-/_."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "křestní jméno"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "příjmení"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-mailová adresa"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "heslo"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Použijte buď tvar \"[algo]$[salt]$[hexdigest]\" nebo <a href=\"password/"
-"\">formulář pro změnu hesla</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "administrační přístup"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Určuje, zda se uživatel může přihlásit do správy tohoto webu."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktivní"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -207,53 +234,54 @@ msgstr ""
 "Určuje, zda bude uživatel považován za aktivního. Použijte tuto možnost "
 "místo odstranění účtů."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "superuživatel"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 "Určuje, že uživatel má veškerá oprávnění bez jejich explicitního přiřazení."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "poslední přihlášení"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "datum registrace"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Kromě manuálně přidělených oprávnění bude uživatel mít všechna oprávnění pro "
-"každou skupinu, jejímž je členem."
+"Skupiny, do kterých tento uživatel patří. Uživatel dostane všechna oprávnění "
+"udělená každé z jeho skupin."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "uživatelská oprávnění"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "uživatel"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "uživatelé"
 
-#: models.py:406
-msgid "message"
-msgstr "zpráva"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Odhlášeno"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Vložte platnou e-mailovou adresu."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Obnovení hesla na webu %(site_name)s"
diff --git a/django/contrib/auth/locale/cy/LC_MESSAGES/django.mo b/django/contrib/auth/locale/cy/LC_MESSAGES/django.mo
index 2bf05342449c9ce52228081ab81fc7ee452f5e55..0e9cf99f3b37b1fdfe88e5830bab978b33f16f6c 100644
GIT binary patch
delta 578
zcmZwDze~eF6u|N84}aBGYaLWj%;KU1(jQn2Zi=83L~v7t!;})JsWd6l#SX4c20{M>
z#X%8AadFgtK?Fyg#6dT|FLd<5%O|<Z-Mx30nV(eWHJ3b7M2?&!ugNKLDaM1i!9~19
z8UMgx9EdA5h!dE>8SKR(_M_dMU&bN6H!y{}U0obds-ps4l1v<-EIh_Eo?sR)y5m=P
z&f#~s%6NrE(-@-scZYrWgroS3Qs5iPexKd>UzGo2JyKAI&UulJrceqnF@f_)g~~?R
zU<Jo;6Qv^;sVC|hqL6*$P^SKk5k_ULoFg}`EK&}UE0jYeq&n$@Mx&5xqv)sz6~4rF
zhS&BF8qGj^f#K+&>W2^U_iVwmie|oKSeBhHnN~TxNsQ;CL2JRt7i_CMXA!B2_5*XP
zsXf20gGSRf*0txkzEP>VPPHC>B^J{a?bTYkR<(`2b~u~d4o{Ph*_F2AxZ2Sz<KVFE
KyS4DU=l&0V-AKv+

delta 879
zcmY+BJ!lkB5XWD#=hs~lO;l7cI-uYOS+kp5AYLJYK@r46K}aMB?{44iJ$?JZez<HQ
z2bOlS*rc?xuuLZ+1RE>uthBHZTNP{s|FfKe19QLkW@p}iX6{$>#pLkQOyik=9fBW+
zzk<)gH^=Y;dk<a&KY$!>jSI0GJO}Ov9q<u&8Ek>C!AbBP$ax>Zz2N83_pjg-?mxh$
z5JO>E^+8O5`|#ly*Z@y~TzD3o0A26^cxe=01)rj+b?_?U-%xat^L7cb2fPJx{s#C2
zyg!Qn1P|i=8*D*eOruQ}m<74;JjjI$AUYIRK%Vp_$PL{Cp(%Wj8-4(CeGVQ0AA>yM
z7RXEF8a7<TG@Q4?I<>9+J&eemu{aC!U&6*~<px-kZ3fQ5*kElej$vxiM)h)Rb9gO@
z@;DXOgE&eu8D`|kOyM4q^gNyED5NZ+Y@jGsNubjdk(2@%=F*swBm#b@yg8)kl=4(1
zRA^&JnlvI`WjL7sO8o>X%Hvm+>>VDE&mGV}&8HB-8#=sD9UcF&<l4@n?JkkK*m2vo
z({`NZ+Nyn9J=ENTy@EbFwBWdPp3^3Gxzlzl$2w8nv6ibX>+Zx28Tz^Ok=84#@75a(
zTf|!CVx`1v(vvyGMTr5#Mo5ugrkOOf^ZZOg16dd(QkF!iZwjQt$-|9|Eas?-h}1~*
zR6pd$iiFBQVv0WU%8+_e87iq)bj`oV<Z0fi>hn{Y;;4(!-)_fPrlM$mpeaxVX5VRS
F{{iSctfv3~

diff --git a/django/contrib/auth/locale/cy/LC_MESSAGES/django.po b/django/contrib/auth/locale/cy/LC_MESSAGES/django.po
index 97dc26dadb6..5015990d6ab 100644
--- a/django/contrib/auth/locale/cy/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/cy/LC_MESSAGES/django.po
@@ -1,247 +1,271 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
+"Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
 "11) ? 2 : 3\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Gwybodaeth personol"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Hawliau"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Dyddiadau pwysig"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grwpiau"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr ""
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr ""
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr ""
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr ""
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr ""
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr ""
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr ""
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr ""
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr ""
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr ""
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr ""
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr ""
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr ""
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr ""
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 
-#: forms.py:108
-msgid "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
 msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr ""
+
+#: forms.py:249
 msgid "New password"
 msgstr ""
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr ""
 
-#: forms.py:177
-msgid "Old password"
-msgstr ""
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr ""
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr ""
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "enw"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "enw arwyddol"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr ""
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr ""
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr ""
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr ""
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "enw defnyddiwr"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "enw cyntaf"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "enw olaf"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "cyfeiriad e-bost"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "cyfrinair"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "statws staff"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Dylunio ai'r defnyddiwr yn gally mewngofnodi i'r safle weinyddiad yma."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "gweithredol"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "statws defnyddiwr swper"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "mewngofnod olaf"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "Dyddiad"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Yn ogystal â'r hawliau trosglwyddwyd dros law, byddai'r defnyddiwr yma hefyd "
-"yn cael y cwbl hawliau a addefwyd i pob grŵp mae o/hi mewn."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr ""
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr ""
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr ""
 
-#: models.py:406
-msgid "message"
-msgstr ""
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr ""
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Rhowch cyfeiriad e-bost ddilys."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/da/LC_MESSAGES/django.mo b/django/contrib/auth/locale/da/LC_MESSAGES/django.mo
index 603b00ced5cc31a63343424f249e52971e1efe4c..7e9d7539314cef7e7efa6259749d9ff62609a2db 100644
GIT binary patch
delta 2458
zcmY+EYitx%6vr=ur4KB$m6wllr4(A|?)JsQQc$#jyetqS8bC7Lz1^Me?#yOpwzcuY
z>IaN5#()!uk7xo3B%mfnB+(BVNfTp;2EmUgA<-Bl@q+|R<ct2!?i9++p83svo^#Ln
z&)!&ietGFi<BTJUwibH?yE#p%LHNUT9<=KFm1>7IunG3Sop3XJ9KH(;yacP@8Xk|r
zCtwfU4`;)}uofPJv*0Iip;9IFRW$H3tY+dWoCE)a&G0sy3m48*Y7tDpIyeX)fP3K{
zXv3rM9NY+B;IM7*Be)M<heL34jZ&@fG#tdg`iU1JQJU~J!9FN~yaxBfH{k|&4HAo5
zj(4`GE-35PMjU|r)D9l?@I}ZLm4PHj`B3(c!x`{Zna966C@=63l!HHr7My_M;B+*9
z2J%zi@Q?$}LrLWYC>i@D8viTm-+;1zI*TNLS&$*s2#-+aW>`uv@CA946#ou)z}rw#
z_zc(B3*Uwk`E~dh{2Pj1nkX!<Y7k1`FGc+fl+umCMtBs8<5N-pEPROm_p{0W!@T^)
zfYju_XkjbYk$}2j5^jda;m7bP_-q3P4?_v?D$K)vye);N;VyU)&W9~1cPm^ACDX6N
z6g=ES{^iF1Fd!)!c(8Jltq>il=b)r;AC!O$lpDVi&A$mHGw($G_n?&K7?c~Igv6{q
zhmxU*X#U4&{!%HLxDpLqix%93lt=vwxtyxPyEs|^<={n7Zn6SOpsS+s^^npkwv{s>
zpY%LTnw+-+>&E2k=FX}l(JjH2V-k5g)`3YAhf?PjOoEtfq5)|MOzIeu4sA6i>0XI-
zVe<cglvE!kdWd6^g~>+gOR9IW7qJtzVRE}QnEaWDHl{WyiDY3JMv2t|Oj-|ygw!hO
z&@?9h8PXP4P|lXTN*Nc*>iePzssG$FAI^Ad+Uza)g6jpA6X=u`7(e{F>Udq7ZwKap
zW93bIcwlC+WR2;9<@;l<m-4mc8SS`%_5;^5sSfSCI>;CXZJ%*HW{vB>)xI$dGgS1A
zx6Hq@ze5id13m5*b<%QlGGjSuS!nJoV1w<Xb-$%Eo*7=Z7{_zVo)e4Lmk%6vy?lSd
zS|47Vd8;k$xy6Ei*OMMHIoC-u;>PucvU5FV=W^k}s@4W~SQAl#V0C$4JUmz3zTH$-
zS;?eZBn#ZrP1>X)#l|30IoibXmYvg9D&-m9m(V2xyqn;j;KM(vhr<&!pEg>#wCk}w
zuaX&)%=*QAxT|(uOUCjuirjiuV7rd5a+V+HoSU|t$}1@kPt~?fw{k&vp?08-jA!+*
zl_b?+W8IdO-LcM|SXZy^?Ck66jdiZ>?5y267~5?|ZJ+aE1BBhDyF0ro>$-J!S6|nv
z@KD|S=8c}6)qC8u;~Pi!d%bzz_)n(gR`H~p56{&t*wmH@f<j*+F*Y_94?N59?P2qB
z+%Z9-;JG6v8Tg4pA~izA+(eFN(Mp>{%1X4?ZjX9>Xehi~xA)A`v%Z^F|Gb?JY^sZ{
zT;qkG)gNE7Gg6Uuia9@^F66H;aYDCFRh%>XjnZxg?@BIh@_FNHJDWA=jj0s-sG<z$
zd@+Y3ZJ|hf8OJet$SbCeH&t|bZk;OXESj4*=}^Txr*qOMwa$!8oXi!pHC$F+%cS%s
zl~*}eq*u&Yp2#mAu9?#pCgz+iZT5<Vg7NU{yZL(}(3y!ZJ>ul1alO%r;?lztCp>L&
zc@z|oqKrw2B<)dA6Ee$;(j^i;4pFO<;_m5+leik-b8%5(nw<MtH)X<GbLQ>b<~k(V
z>A<}wnc<kMGadw-SP8wN;FwhwFj<sLl+$;o5>wA~!kPv<yxj0@LnP$9QNf5Q>-hb~
oP4)NcIQ+G-Ijm}0Hp3U)b~G(pG38#WQVho$b)r|JrpQ|T5BHb{vH$=8

delta 1969
zcmaKsTWl0n7=TY}DQ&m4^n!pW9$I<<y6r9$BDE4EAh)8V;w6^G49wZxf!Ud6X0~X=
zY>W@^U<`V~gE3JAd=L_&pbu)|gPJIaNsWp4;w8oheKB65iBS{3e^`7X{@H)NbDRG<
zXD_Y#wZHmxXTu4FtVeG_FV`ux10K172XeAOsg>|$*abg<d*C;41I*1+%D{uL5zfI|
z;T5<R{$5*O$!0tA9DD+9f-Oo_)q4zDS-1$7z%Od^pJ5a8f8YYxIA5t{a1mSx*TZf&
z0W;8nZLka<gpb3m@N>8eF2UG7XkZ_FA1=Ya`hmgSEYvqE^$^?vSyHFqG&~3Ig3W|W
zENT~&{YfZ}r{ImS2>Gd59we=vgmV69ZT%UDDfK)gCUqJ%;9s3%AO>HD{M6e##PEku
zDl-SA0$)L@u70Y`e}nQ~1Bb<78+@4db-@wl0WV9XUWB{hn@}oJPno9Rc371N&oEdH
z&%rz3r%)nnCN0UVgU4~Gp=9tzZT(#+Ex80c;g3)P|GPGCqTx3)UkaDP^-#WzNhs%L
z+Nr-pc!Y%m@Hw~{{sHfS8%SFsJqG*X_iz!+bSSkG_QDbjAjMEupbNi)yWuvXlFFQb
zQmGf9_&WoMQN7bi{Uy_jEJ!6jgEIdT;!AxCCF5V9IQR=n3mUl!l0gQ_{-WA^Ih2-V
zAu*^iD0U}m`}aYy^9U3_2dfNdS(=qNye4uTB~rH2Yq_$vF;HV3*4M_Xp|n9n$}Nt?
zxMVIu%xT$sp*SBx<>uUkR;hF<Yk00e`_L?^QIVdjNbhoOnD$b#ybYDIiVUNp>FDY;
zl&Z*I$SPDSATokV)vgKGy+7@P^j1VZ!gc6kbP&y<Qf_r&-n^&l_HB#8%1o?wlxM;y
zae_p<PGXn`+HqYk@xnkSp-xIh&zPv}#W5?fE;~WR@%_iN!$L7I?hr@3SXW{b>BFAy
zYsZg68#niL6~%!rnUNS99Pxr-d$RGA-95izUus%qpKAKpzSg|L_O$HZs|ThWzZg!h
zn2H@g0VVUO>lIC$Ob_TV67y*&<Bl#xrf_G^4E_&?kvr0}@j%H5ibPpk(S<N7kB>MT
zZMEgR-I5u%$1@8X%O;MUqCK4%v~!uwc3JE8LOz>Yo6WD&`L$#D(QIxsmuuN`Z+6nm
zdXj2(3*{KoYjXMYTy9k7Zyy`Yug)PY6Hc6D_eM?-`%V%@V|u3(1f)2AFy$uSc&_n>
zy`T`<xz@$?;~VX8+f?fWfmWO%W?kpPv9^!us@tN<4CPf1c*TTtr3WF?``vJsdb&nO
zCSjvwToVm3kJ1JhKhX>m&&Nxm_eYhYiA*r0XFZ=oL11)Pj6Zlq7f`x&9Wz&7A57mb
ziLYWB$<Tks#6j7(zA0;`Fl?vWPuW-7GaWjp_%V)sljs?&_u1YB$LzBm8|=}Jx9r)@
z0o&VEtp0C14KGKjAAP-cO8Y9lLq3wAjt_Z-gb?^Di<B=u6uL&bJFGURX$Q`1ptg7c
q2E)Vh5u)~F*IB!-d#gR)y|jfS$kO<+v6s6C?VsKKb(2;vT=p-mBxtSx

diff --git a/django/contrib/auth/locale/da/LC_MESSAGES/django.po b/django/contrib/auth/locale/da/LC_MESSAGES/django.po
index d585f1f4b69..c1d29f21d33 100644
--- a/django/contrib/auth/locale/da/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/da/LC_MESSAGES/django.po
@@ -1,78 +1,89 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Christian Joergensen <christian@gmta.info>, 2012.
+# Erik Wognsen <r4mses@gmail.com>, 2011, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Danish <>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-12 21:16+0000\n"
+"Last-Translator: Erik Wognsen <r4mses@gmail.com>\n"
+"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"da/)\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Personlig information"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Rettigheder"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Vigtige datoer"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupper"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Adgangskoden blev ændret."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Skift adgangskode: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "En bruger med dette brugernavn findes allerede."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "De to adgangskoder var ikke identiske."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Brugernavn"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr "Påkrævet. Højst 30 tegn. Kun  bogstaver og cifre samt @/./+/-/_"
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Dette felt må kun indeholde bogstaver og cifre samt disse tegn: @/./+/-/_"
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Adgangskode"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Bekræftelse af adgangskode"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Indtast den samme adgangskode som ovenfor for verifikation."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "En bruger med dette brugernavn findes allerede."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Rå passwords gemmes ikke, så det er ikke muligt at se denne brugers "
+"password, men du kan ændre passwordet ved hjælp af <a href=\"password/"
+"\">denne formular</a>."
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "De to adgangskoder var ikke identiske."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -80,11 +91,7 @@ msgstr ""
 "Indtast venligst et korrekt brugernavn og adgangskode. Bemærk, at begge "
 "felter er versalfølsomme."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Denne konto er inaktiv."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -92,11 +99,11 @@ msgstr ""
 "Din browser ser ud til ikke at have cookies aktiveret. Cookies er påkrævet "
 "for at kunne logge ind."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Denne konto er inaktiv."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -104,103 +111,127 @@ msgstr ""
 "Den e-mail-adresse er ikke tilknyttet en konto. Er du sikker på at du har "
 "registreret dig?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Adgangskode nulstillet på %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"Kontoen, der er tilknyttet denne e-mail-adresse, kan ikke nulstille "
+"adgangskoden."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-mail"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Ny adgangskode"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Bekræftelse af ny adgangskode"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Gammel adgangskode"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Din gamle adgangskode blev ikke indtastet korrekt. Indtast den venligst igen."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Gammel adgangskode"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Adgangskode (igen)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algoritme"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "iterationer"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "salt"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "hash"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "work factor"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "tjeksum"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "navn"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "kodenavn"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "rettighed"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "rettigheder"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "gruppe"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupper"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "brugernavn"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Påkrævet. Højst 30 tegn. Kun  bogstaver og cifre samt disse tegn: @/./+/-/_"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "fornavn"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "efternavn"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-mail-adresse"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "adgangskode"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Brug '[algo]$[salt]$[hexdigest]' eller brug <a href=\"password/\">formularen "
-"til skift af adgangskode</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "admin-status"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Bestemmer om brugeren kan logge ind på dette administrationswebsite."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktiv"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -208,53 +239,54 @@ msgstr ""
 "Bestemmer om brugeren skal behandles som aktiv. Fravælg dette frem for at "
 "slette en konto."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "superbrugerstatus"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 "Bestemmer at denne bruger har alle rettigheder uden at tildele dem eksplicit."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "sidst logget ind"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "dato for registrering"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Udover de rettigheder, der manuelt er tildelt brugeren, vil denne også få "
-"alle rettigheder, der er tildelt hver gruppe, brugeren er medlem af."
+"Grupperne som denne bruger hører til. En bruger får alle rettigheder givet "
+"til hver af hans/hendes grupper."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
-msgstr "Rettigheder"
+msgstr "rettigheder"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "bruger"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "brugere"
 
-#: models.py:406
-msgid "message"
-msgstr "meddelelse"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Logget ud"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Indtast en gyldig e-mail-adresse."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Password nulstillet på %(site_name)s"
diff --git a/django/contrib/auth/locale/de/LC_MESSAGES/django.mo b/django/contrib/auth/locale/de/LC_MESSAGES/django.mo
index 5bbba93542f2e84d9e087fa4a44863bafcb4336b..30729528778e9daa29a6655108200f0b12c4ed19 100644
GIT binary patch
delta 2449
zcmZXUTWl0n7=TX&3$)Ne3n(ghELK|Vc6$MV7BNK%A~e)n5Ru??_jGsY?#wzD7W!Z{
z5#tR5jv5jo#tVs}L=6!&0tsm((P&Ufe9?G&05!n}qsI86-@iL85Ks1>@0>ILIsbL`
zv8GR2M!u_?_`G6tBiA5*R4BCpel~#zWAf!nHNz>e9(KZhxCSnR`=Ehe!AiK4$6R;|
z?1WojE!+#M;LC6-d<)J|YD9e)Z=8XXdGQ0B4u663;6HE{oHI$OYhe;r!wqm6+zdBD
z8@>Qf!d`eUm#u>b;QjDdH~`m7QK}Ihf*Y`}zF>kUO5@&Y*agLrN8lFtB<z7dLwr#S
zvCa|I4n?m!<|@cf_3@~In;=J27Lpw0Lpi?_PJ|E3d+e)SGJ$)bT)aP4I0(hSq4@m~
z$WNW%As2iKC6%Y4WbE5`|9rgu9m@F$D2W48AzP{r?xW1};7BtY?~})w@JA>S{{?S{
zcN4}|_!5+e{^ijEYbfXn*bQZW7)k(7#OvqaRjgl)*C(Jj@;RIhzlKuE^R?t(3{S)T
zCfESw!ga6?-UoNUJp3M>g#kP@qs(rU@~q#1E}Tb)ii6KU8-4_(sT(mOC0q#!T0IIy
zfA384-_E3h4wDphLP^mwC=vBS@w^|B6txM8gBeJlsqIi|`cS;y1*J5*q1^K<#AkH?
z$~|w#?>~sw$48imN2j1%d?r@-3Ch895NFljP%fB8{zPv!lyi+x_B)_B*bOOd>C6pK
zqGzi#ME^#l1Cg(r<fsubay_yT5znO`S`Zl$nfx!zN67g2xGtV0q0~7Mub03pkj02(
zRsJ8usV+o5<yJ%*d~94T-~XbqRm?Wngh=|ABJyV<-|NLgB9`<nK%`HuL}YX#^p?6w
z77UF@qseF}qf|DTN*3pc_GR%4ssF4aFHU^AqIPY*;Cg}O1UhX6#*dCyzEa)f+kx5Y
zSb5VNZJiX3SVdj1e81>=X<u8O(T*EvKX5&hZqdH0gREiG_Sx4(Yo`ue?Hj{3TcK~f
z1^)Q?7CjIKdZ!!el;!AD)^akUXvP&dU^^MT+|pUk4Bp&;;aMfi$%YlB3kO{<zdUKJ
zh`yZkXH&*=!-9Xok{&QQ*U7Nsw(6deab2`?xoB5q;|zCD<53c4b?IDdbaHa@dQ;Z2
zQYkki3&iQBY*LZtV2~|eZ4!CQ&S@*1_Kfd~>yiQHCb-1;=<MXd=-`yYbyhCpdK}NI
zRMw=1{4gKgQFZhDtmS7Fx%I5Tb{${kEI-gWH)A{HDJhTMsA`&E<$~yR)v9VTKBNb&
z6seBts@E>=NVIh(+861zwyyR?iMAzeZB_jn5_g*Iw$FWuRk+=yJKEaE^%i%vFN^k6
z&#PQ-?6k>6hpSswH)VsM(3MOUi^bN!vmD<ZG&@=y6C?|syUnBmKUqkow^124nd2E+
z8Iw$#WOLQ}c-5uTCi<p&^O0Mp{#H@5(N1Lpn=*=dC;GVN^-CHkU;F0BD%<FO>7dc0
z9?|Qf@zTc8j-1q1&e!X57B6-LI%E8TVcU3tv{v3`%N_`{@%50g9i#h3k7jZxu#%Sb
z%lFd4I&D)AU#~Py7z`VaPIZPupB4+Z8m9#_IjquK+(i8@Jv(}A0Jkn~y0M;%Z(U8-
zg*Yjlhm)hPIcZ#s1BsrRUW|56KR2|-3kwA?Ms&o7%D6jtlQCI|zg73z&V~H}Gvwy;
zl7^gN*E6MThG;u{MTG3>;V@$YW9LY(j!m>i?u^!KpX9*gQ7A|6>E1*ioto$=HLAf=
zF==r2g2f@%;RF4D4$9RS4!zN1sUhlMg5mK1_s_7R2kYLO-80tLp|AQ;9Hg`JCTgr-
oQFEL0_S&)DjvlC=8$DjXaN=Fk%kS3TQ`6%OP%?ke8ls!kf8Z4eJpcdz

delta 1877
zcmaKsTWnNC7=Wj>lwK{iUAZWAtZnI)?m{6_N~5H5EwLd)45cB5?y!5z?%DNRD57;^
zOq4_*hKWXF6r?<uG#UemMjwo^Y9#tlW1_xzd%`Cq8lRNJ@82GLGEVkC-^@S%{PSPV
z*{l7}b(el@u6ju^HY0Z<UsWiz8$NX#55|QmrF!6-umyezC*V(T3rsFk%D~59HC%*i
z;dgK&{4>_~u-U{q31{I0uuiFx`iMybimPxn{5D?SfHkad!WFQ3xl(O#B}~B0uoaHO
zdg#DLn1=`9lkg$<4crS?<LodruoHd)S98DmmB|him9<Je3U@<P>LQ$i^YB4fOSr_M
z_Cnd;59Q)XcstBMe(E?6l2*?^v41|+pM|(muR>x{bFhm0)jSh%_%7t9KHwpaKZR16
zMJN^c0aA5!JzoC-<y;lUa$zGpMEhD`4{MLZQlVF%B=R=g1M4Z%5%>r!N#yS_>4%@e
zQTRKQ2vcmz{uUn6vt5uo)#tJPYq*B>&++;%C;`>c=sRHxya)C|31kmk3y(ld)oc^>
zZ)S2D#R+&GhHw?>3eUhith{3>z#^2F^mQmL`4EcT-;m_g<2Wn8r(p_Shf*2Mn=65J
zL2^@rPy*Q2Lj5JvaTL<415nnJP)a@x<zNUU^I0e@I2G&9K)Lv3C=TbKoVyGq;{_<^
zzmNBSfnt9n*552Kp=D|%A_s2``5fgfXS<xS^i#&VC6u$PjOTq&z6=@C4vJAuLNb>j
z6_&E!he#6AY6(tSRHEYLv4Lj?(uoWp8j;bygz~o>Pt{#aBn#=SWG7=iGE|-|l~~?%
z`3vbqq_Q#w5#G&z2cLUaxolmr>Rz}BS%q{XNkq!6t}I)2y5jIozYrAzwL4!d_@U#4
zI_-ppwWpnQ+6~=;r^A8{vql$<pLc@*O`!9R7dg4y6WT$M@l3iO6F1ONV0=B}=5pG}
z1qB<_cD7{X0-ZI30X{Hsz4i7&^+mgHd1TMm^x9`@zOe7qcG&j1qX+c5Nhg;nOm$2K
zPA&vlb0Y0#Ob|}3(*<ALmqQtGbk;Y=wzU_zf2QE42ir%dvyPV`%2=b175x0jpfhSq
zb(if}{fK?BK2e=FLEvQUTz$7)tlw_i8g^|;4J0=Xq&Df)#^Kb^KyoOVtebdvV81!;
zN~!~6lw(+LNT$km$swJ(e|RWmUu$TyA2;+>j*Qw=<7C4)cSlYJ%e1-jLgQ~0rJa6M
zEE-Q8bf>c+DQI!zsY6k)a49^QL#t0lSbODK8mSoJ=S&7Gz29&M8b7;mDMwFSBZb{=
zyeK@$#ECdg{Y`AyFBUp5u4nL?F*9z010EjYFm%>AYAF1vrnl_Y74vp$bA(*8=URGf
zXX}yD7{_-|u>WnqapTVzkC6LyAx#u%C(!@ZiHW5agnHo;*1lKv9OWEe+M$U<lJM56
kTj_X?J=;2OClcH28;Lb_``j=zZZ7gN_WeYky_Pue55HAQ@&Et;

diff --git a/django/contrib/auth/locale/de/LC_MESSAGES/django.po b/django/contrib/auth/locale/de/LC_MESSAGES/django.po
index ce0b3202966..efd40281665 100644
--- a/django/contrib/auth/locale/de/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/de/LC_MESSAGES/django.po
@@ -1,79 +1,90 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# André Hagenbruch <ahagenbruch@googlemail.com>, 2011.
+#   <florian@apolloner.eu>, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: German <>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-14 05:19+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Persönliche Infos"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Wichtige Daten"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Gruppen"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Passwort erfolgreich geändert."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Passwort ändern: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Dieser Benutzername ist bereits vergeben."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Die beiden Passwörter sind nicht identisch."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Benutzername"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Erforderlich. 30 Zeichen oder weniger. Nur alphanumerische Zeichen "
 "(Buchstaben, Ziffern und @/./+/-/_) sind erlaubt."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Dieser Wert darf nur Buchstaben, Ziffern und @/./+/-/_ enthalten."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Passwort"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Passwort bestätigen"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Bitte das gleiche Passwort zur Überprüfung nochmal eingeben."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Dieser Benutzername ist bereits vergeben."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Die Passwörter werden nicht als Klartext gespeichert, somit gibt es keine "
+"Möglichkeit das Passwort dieses Benutzers anzuschauen, allerdings kann das "
+"Passwort über <a href=\"password/\">dieses Formular</a> geändert werden."
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Die beiden Passwörter sind nicht identisch."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -81,11 +92,7 @@ msgstr ""
 "Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder "
 "berücksichtigen die Groß-/Kleinschreibung."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Dieser Benutzer ist inaktiv."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -93,11 +100,11 @@ msgstr ""
 "Der Webbrowser scheint keine Cookies aktiviert zu haben. Cookies sind für "
 "die Anmeldung zwingend erforderlich."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-Mail-Adresse"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Dieser Benutzer ist inaktiv."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -105,104 +112,128 @@ msgstr ""
 "Zu dieser E-Mail-Adresse existiert kein Benutzer. Sicher, dass Sie sich mit "
 "dieser Adresse registriert haben?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Passwort auf %s zurücksetzen"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"Mit dem zu dieser E-Mail-Adresse gehörenden Benutzerkonto kann das Passwort "
+"nicht zurückgesetzt werden."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-Mail-Adresse"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Neues Passwort bestätigen"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Altes Passwort"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Das alte Passwort war falsch. Bitte neu eingeben."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Altes Passwort"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Passwort (wiederholen)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "Algorithmus"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "Iterationen"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "Salt"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "Hash"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "Arbeitsfaktor"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "Prüfsumme"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "Name"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "Codename"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "Berechtigung"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "Berechtigungen"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "Gruppe"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "Gruppen"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "Benutzername"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Erforderlich. 30 Zeichen oder weniger. Nur alphanumerische Zeichen "
 "(Buchstaben, Ziffern und @/./+/-/_) sind erlaubt."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "Vorname"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "Nachname"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "E-Mail-Adresse"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "Passwort"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Die Form '[algo]$[salt]$[hexdigest]' verwenden, oder das <a href=\"password/"
-"\">Passwort ändern Formular</a> benutzen."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "Redakteur-Status"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "Legt fest, ob sich der Benutzer an der Administrationsseite anmelden kann."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "Aktiv"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -210,11 +241,11 @@ msgstr ""
 "Legt fest, ob dieser Benutzer aktiv ist. Kann deaktiviert werden, anstatt "
 "Benutzer zu löschen."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "Administrator-Status"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -222,42 +253,43 @@ msgstr ""
 "Legt fest, dass der Benutzer alle Berechtigungen hat, ohne diese einzeln "
 "zuweisen zu müssen."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "Letzte Anmeldung"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "Mitglied seit"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Zusätzlich zu den manuell angelegten Rechten erhält dieser Benutzer auch "
-"alle Rechte, die seine zugewiesenen Gruppen haben."
+"Die Gruppen, denen der Benutzer angehört. Ein Benutzer bekommt alle "
+"Berechtigungen seiner zugeteilten Gruppen."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "Berechtigungen"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "Benutzer"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "Benutzer"
 
-#: models.py:406
-msgid "message"
-msgstr "Mitteilung"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Abgemeldet"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Bitte eine gültige E-Mail-Adresse eingeben."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Passwort auf %(site_name)s zurücksetzen"
diff --git a/django/contrib/auth/locale/el/LC_MESSAGES/django.mo b/django/contrib/auth/locale/el/LC_MESSAGES/django.mo
index 3540e437b6e639d4fd81b7236ddb484acc95d0d9..92e74a64df07ec9cd86db5c616978ea4258a0a50 100644
GIT binary patch
delta 1381
zcmYk+OGp%P9KiAa=9cDKmi931F_o{))|oX!+dT9zQxtm~im0$9CtJ~3ai)}@3<^71
z3?3rtP;}@a7<(xy^wfiBCAx@#)TJ&35meM6`u@f-`s05-Gynh0|MmN=uWNop2d49a
z!-`TxT}izkP--XEWpJT129*k96Xv6hd+`!(!AUeRZ?01Fupd|90B*wTn2T>P8$VzU
ze#RBNrhfSi`Fx#4hlYzVjH@w*OYsn{!6b%o2p8ZrJcxI27X~twYR27o1YIn_ugHXI
z8Iv@ifmzJ2`nWkt!+G3})5us#n?JLlGL#7oT!?ijJ84GNt`4BQf5dM;j{GT$3x}in
zks;Mtl<x*n#=C+!%&)F<BRjr}^1);Oc^u`#Hz*TL;Z?%(9$R=m!zdEA=a|OdXyHrF
zw~Y5{IUZTqF;*=n)PWap3@dOaaT)NAlpBfJ5Z2-duEmd7gjuXko{O;+8&D=5#(nq#
zmtf)InSpf-uz<suiAVF;E&V15^bmjI9vof5`Af1%fL*A^<v5A2@GG9fC(CA%W-Fc2
z-^fK`dJMxjh;p=}zK>Co>>0|!-y)k<-~Ikz0eQf4ZUN`d;#H~NP=jSWxB8w&`S1qH
zKqJT)YQk^-gly0&#a!8#w;*YtOO;X!sq3j5sFJYqD>JCF0m;9AMY7$?P?WgMmU90_
zb|{OHoRC67t2tD{?rowHrAR0x91`OQRSFSMx_37dQvX&p$!;a-W{d1{BbCrA!sjKP
z<cRz`An%k$jZ)W9<s{^oB^Q>at_Cj$a+|t)lD$sca<uliW7_W1c{fAlcET~+ta!H>
zPPJuz3AnfC|8ehSk8ZAt7@H!|YRxcW(dvj%V;I?c_eA!arxSJ}X+`Q8A*NLsQSUvY
zR*P1}j2icHX!)A@M0djJP1xG*F7r&%*6KPuw<WCh#0j(CeHtoiC_m{qJuzMH>+7p@
zdgGQYJ(ZT}=sms3PV=~9>pgmVXWZ&Y>Rnt<#XC&h?9#*8E&fwXGrQcW(BagMobMTK
w{i2Pj;l-T+x4)pcNK2>EkJ1mciHqqmt>nKQ+FEK|{&+BTtDs_z`>ycYUt3JL-T(jq

delta 2118
zcmaKsTWnNC7=WjATWAXuT54NV980l6+3ju%6`R_CsHEZ6Ac>dShZFX&UD->sXA9Qb
zaw|vz1hewsgHbWj2cWntO=)c@F}@h}9HNOP8gDPg7Ys(_jl}Oi=hVc+ICS=#`RBjQ
zKmXx&<co)LKhy-yDn=*s9_HsIO7+5*OZj2E6Hsb3d>7Wj&tM<?5k3sVWlEXwc~}l_
zz<c30umk?(%U5$)%{~lYfg53^QaN>v#X<z1!bbSDzrO_+u)hPB!1DP@t$_8g4tBz2
za2u?G23!P_@G1Bbd>noSx57r8JqJy=3VsY5iLZWT@dSc-6-qq~dm$oq4i3Qca1*Q`
zU2;)dp`7o661X2OhB3&W+RqP{R)?VIANS>_A+FS$ket+eFhG2Do`pF45b~!c`4PvT
zK&i|PC>8h~Qg!v4zyAY@T>xbXxClPO^VPy_?2{O`!zpOPn=l2ZDN_r2tz?~(44>p-
zq-4*+Bk(drS9KD#6>f&j7^LBS?B7`Gz3~;ef&G{8eppqb)ZH)$W#0>Tz<sbCPQmr?
zCX}aJSxfyTzy><2gaA=EAMWM!b>t}?`YKd+DYX+!!p*RvUa36X4zI(XA%E&z0}TqN
z;H&T$4J8*TTkf6LKzaK$a5d~(PW`E(dJ%ze6pFzaC^vWuQYAI(%WWun-$8Owzd(7K
zJN|w#*Kc9J%I9_{_QO#89fgwU`@Z~Ijs+KXh2m&#$mb|sPC?wyQnHmH&SgZH^W2s9
zMDk_GAP>cBxD6&fA%kkWpX5p?$**Nf`Q-vRp4uJqKFv%iPmrmZGMYTN-?G1S-&m?7
zy&w%JBg9<iuDs7sI$iz?S;LeblhMYcH~$&DPLo@n2Yiu~NE(FaQx7u3%s_Ed;7mzw
zOC~)$WU1cdP&$(}Qdu1}vL^eKHlopZHl9xDY+7drO+930l5xvIV(Fxj8a5J%5p5ud
zrOfDBRN|H%w#<w^5Kknuk+9M_W@cF={$(1=5XFp&SJT*2H>hKhfgUv5EP~)8o(koE
zDmzy^RerN%w{Gb-60!6^bH8OIvS84BAsUaFR(7C8r!x}JO|IL}gBf%0BTYkObReCH
zwl($a88lKc^7bWqZ#t9gZZmp{!wX7F%9EyL8L|BSip%RG!Ei^gJ*?X!UEy`D;Yc`K
z*|#&e%iJHA+Xf$_B3-&Y9GTOLM7la6`GLy%jv*tKFfH9Z67p6XV@V^P2<=HHdn&gP
zeb|VZ!QG~j?9y8@rnygd_vHVq>|Z!{)}_rvaYxnd(yF)ZY5RhG#U6JK=O3*O<<2?>
z?MdgLbI6``j@Vc2i_TH!gmYL6>=}*bq&;O9&^aNNz8IrfXH<g%mKUAl_N+bQ92Gsy
zW*l`KVtC1(u_xp}J4XOooO3qjZYOjNAq(2|fRUC^`QC*qa^s$j7sd<VjEb=rv4E2k
zxS7Cw+`i;FpOAcK{reG6;!H>!=d@T#d{0HPCo|#}NN<dw#13g?zh)P??u<QN9H}-+
z^0%t%7IV*2+7%b{Dy!JI^m-uof#(?2X^zF&q<^7t>gENJlS9rid+dKZi(_KXkjF>-
zE7((*OT915`T4JYt9On$CrM%2yMbp}w8!$_E@_@GjTcgO{zgN6@mAfkc@3zI@iwEP
UuAGwulM)qF{`cyJd`pA#H?9#U;{X5v

diff --git a/django/contrib/auth/locale/el/LC_MESSAGES/django.po b/django/contrib/auth/locale/el/LC_MESSAGES/django.po
index 0606cb55d76..61f3ba2642e 100644
--- a/django/contrib/auth/locale/el/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/el/LC_MESSAGES/django.po
@@ -1,82 +1,91 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Dimitris Glezos <glezos@indifex.com>, 2011, 2012.
+# glogiotatidis <seadog@sealabs.net>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Yorgos Pagles <y.pagles@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 21:04+0100\n"
-"PO-Revision-Date: 2011-03-20 11:31+0000\n"
-"Last-Translator: pagles <y.pagles@gmail.com>\n"
-"Language-Team: Greek <>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Dimitris Glezos <glezos@indifex.com>\n"
+"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"el/)\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Προσωπικές πληροφορίες"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Δικαιώματα"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Σημαντικές ημερομηνίες"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Ομάδες"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Ο κωδικός πρόσβασης αλλάχτηκε με επιτυχία."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Αλλαγή κωδικού πρόσβασης: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Αυτό το όνομα χρήστη χρησιμοποιείται ήδη."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Τα δύο πεδία κωδικού χρήστη δεν ταιριάζουν."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Απαραίτητο. Πρέπει να αποτελείται από 30 ή λιγότερους χαρακτήρες. Μπορείτε "
 "να χρησιμοποιήσετε μόνο γράμματα, αριθμούς και τους χαρακτήρες @/./+/-/_."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Αυτή η τιμή μπορεί να περιέχει μόνο γράμματα, αριθμούς και τους χαρακτήρες "
 "@/./+/-/_."
 
-#: forms.py:17 forms.py:67 forms.py:196
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Κωδικός χρήστη"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Επιβεβαίωση κωδικού χρήστη"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr ""
 "Εισάγετε τον ίδιο κωδικό χρήστη όπως παραπάνω, για λόγους επιβεβαίωσης."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Αυτό το όνομα χρήστη χρησιμοποιείται ήδη."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:166 forms.py:208
-msgid "The two password fields didn't match."
-msgstr "Τα δύο πεδία κωδικού χρήστη δεν ταιριάζουν."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -84,11 +93,7 @@ msgstr ""
 "Παρακαλούμε εισάγετε ένα σωστό όνομα χρήστη και κωδικό χρήστη. Να σημειωθεί "
 "ότι και τα δύο πεδία κάνουν διάκριση μεταξύ πεζών και κεφαλαίων."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Αυτός ο λογαριασμός είναι ανενεργός."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -96,11 +101,11 @@ msgstr ""
 "Ο πλοηγητής σας δεν φαίνεται να έχει ενεργοποιημένα τα αρχεία cookie. Τα "
 "αρχεία cookie απαιτούνται για να συνδεθείτε."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Αυτός ο λογαριασμός είναι ανενεργός."
 
-#: forms.py:120
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -108,103 +113,125 @@ msgstr ""
 "Αυτή η διεύθυνση e-mail δεν αντιστοιχεί σε κάποιον λογαριασμό χρήστη. Είστε "
 "σίγουρος ότι έχετε γραφτεί;"
 
-#: forms.py:146
-#, python-format
-msgid "Password reset on %s"
-msgstr "Επαναφορά συνθηματικού για %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:154
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-mail"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Νέο συνθηματικό"
 
-#: forms.py:155
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Επιβεβαίωση νέου συνθηματικού"
 
-#: forms.py:180
-msgid "Old password"
-msgstr "Παλιό συνθηματικό"
-
-#: forms.py:188
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Το παλιό συνθηματικό σας δόθηκε λανθασμένα. Παρακαλώ δοκιμάστε ξανά."
 
-#: forms.py:197
+#: forms.py:283
+msgid "Old password"
+msgstr "Παλιό συνθηματικό"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Συνθηματικό (ξανά)"
 
-#: models.py:77 models.py:105
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "όνομα"
 
-#: models.py:79
+#: models.py:68
 msgid "codename"
 msgstr "κωδικό όνομα"
 
-#: models.py:83
+#: models.py:72
 msgid "permission"
 msgstr "δικαίωμα"
 
-#: models.py:84 models.py:106
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "διακαιώματα"
 
-#: models.py:109
+#: models.py:120
 msgid "group"
 msgstr "ομάδα"
 
-#: models.py:110 models.py:217
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "ομάδες"
 
-#: models.py:207
+#: models.py:232
 msgid "username"
 msgstr "όνομα χρήστη"
 
-#: models.py:207
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Απαραίτητα. 30 ή λιγότεροι χαρακτήρες. Γράμματα, αριθμοί και οι χαρακτήρες "
 "@/./+/-/_."
 
-#: models.py:208
+#: models.py:235
 msgid "first name"
 msgstr "όνομα"
 
-#: models.py:209
+#: models.py:236
 msgid "last name"
 msgstr "επώνυμο"
 
-#: models.py:210
+#: models.py:237
 msgid "e-mail address"
 msgstr "ηλεκτρονική διεύθυνση"
 
-#: models.py:211
+#: models.py:238
 msgid "password"
 msgstr "συνθηματικό"
 
-#: models.py:211
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Χρησιμοποιήστε την μορφή '[algo]$[salt]$[hexdigest]' ή εναλλακτικά την <a "
-"href=\"password/\">φόρμα αλλαγής κωδικού πρόσβασης</a>."
-
-#: models.py:212
+#: models.py:239
 msgid "staff status"
 msgstr "Κατάσταση προσωπικού"
 
-#: models.py:212
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Ορίζει αν ο χρήστης μπορεί να συνδεθεί στο χώρο διαχείρισης."
 
-#: models.py:213
+#: models.py:242
 msgid "active"
 msgstr "ενεργό"
 
-#: models.py:213
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -213,11 +240,11 @@ msgstr ""
 "την επεπιλογή αυτής της επιλογής αντί του να πραγματοποιήσετε διαγραφή του "
 "χρήστη."
 
-#: models.py:214
+#: models.py:245
 msgid "superuser status"
 msgstr "κατάσταση υπερχρήστη"
 
-#: models.py:214
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -225,43 +252,41 @@ msgstr ""
 "Υποδηλώνει ότι ο συγκεκριμένος χρήστης έχει όλα τα δικαιώματα χωρίς να "
 "χρειάζεται να τα παραχωρήσετε ξεχωριστά."
 
-#: models.py:215
+#: models.py:248
 msgid "last login"
 msgstr "τελευταία σύνδεση"
 
-#: models.py:216
+#: models.py:249
 msgid "date joined"
 msgstr "ημερομηνία σύνδεσης"
 
-#: models.py:218
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Επιπροσθέτως των δικαιωμάτων που παρέχονται χειροκίνητα στον χρήστη θα έχει "
-"και όλα τα δικαιώμετα που έχουν παραχωρηθεί στην ομάδα χρηστών στην οποία "
-"ανήκει. "
 
-#: models.py:219
+#: models.py:255
 msgid "user permissions"
 msgstr "δικαιώματα χρήστη"
 
-#: models.py:223
+#: models.py:260
 msgid "user"
 msgstr "χρήστης"
 
-#: models.py:224
+#: models.py:261
 msgid "users"
 msgstr "χρήστες"
 
-#: models.py:407
-msgid "message"
-msgstr "μήνυμα"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Έγινε αποσύνδεση"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Εισάγετε μια έγκυρη διεύθυνση ηλ. ταχυδρομείου."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Επαναφοράς κωδικού πρόσβασης για το %(site_name)s "
diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.mo b/django/contrib/auth/locale/en/LC_MESSAGES/django.mo
index 365af68d0d1cf2212605bec9b8f7b87ca491b504..8d0aa545f109e9661f478c1e44a5e9cf228bb76a 100644
GIT binary patch
delta 21
ccmaFD^n__b8@Hi}f`NgRp^2`6`NWBr0ZiBi`v3p{

delta 21
ccmaFD^n__b8@GX}f`O5hk*T(U;lzoT0Zi5g_W%F@

diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.po b/django/contrib/auth/locale/en/LC_MESSAGES/django.po
index 58bbbc6f042..ff44ac02b76 100644
--- a/django/contrib/auth/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/en/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-05 02:25+0100\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -257,7 +257,7 @@ msgstr ""
 msgid "Logged out"
 msgstr ""
 
-#: management/commands/createsuperuser.py:24
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr ""
 
diff --git a/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.mo
index 03106ccd110d9b606d6ceaac0016a23ac91e4b6b..104979a6539565e431e2467e0d0dd495edfa0182 100644
GIT binary patch
literal 5343
zcmeH~O^h5z6@UwpfU|@U%&$W*6@&4vy*)F#>ku>cI`PlivTSFU)tX?D$m*G{=_zkd
z*U(k7<K@DS#04&i2nY#*lmiDG#3d($goMN?0)fa4Ap|#mgoL78_&M;s?w*}pO9*jh
zOI!VQ{k?ki-mBNMzdLyUHx%VG^)c$3Z&7L${`@{3lmibaH3uJr?}1Bj4PJ(ygx`V&
z{u;gwp5pOg_!L}%&%<}Y7vT(i89oGm01v?*)$P~e0ouQZkH9~{!|)&QeelrRmHG&5
z!gs(`_)hp)_$;*WoA9S_1%3u$SK)WzbMViw11~?Q)KPdB$~k`pMGuW~mtY%;9$$jb
z!>__~@Q)Bx)NwXviCTa%?{v+JkUw>u$HVX@WQpoSOrt!M_1o}%_{DnsD>Yw$BKO<%
z`1hd5zgv&L3i(q%;UVi^gJQ>DLb2Cx>;Avi?KhyTzmG|>|3i>2br8OSj}OB++OJ_m
z@#~vV{CWW8#jiJ^fnSHB_urxTRh%h)Jq*RK>pbL~9f(LZfMU<j*X@^}=<zZXJ?}#C
z>yM%M^*2!b`Zp;0J;EgM>tj&-dK`*hzYJI4p?6n)y#>XuuR!tZfrFJ_H{mMn7oq6!
z2Pl61Clo!-b6D}~RVaS_K9uwQ1&aOOfHLo2H6M6yrPsp{6R1a_oOce2T~9(;--hCs
zbM^S8nxBFq_qlq!2Sxs7JszN(`wR8>*Pz((1;~-rck2Eh*6mlJtp6F5{eJ;v{p%37
zDxf}2mAm|YsuYoTg1ShRYt7M0*&l<)siL>U!aP-qoJaD(N2!>1r#xQ2HQ}SwsBS+A
zKR|tgx<Hlq5g)dx;_C)gY%nPw;^pL|QL_bSsbbqxREf2t)ZInSEoVJO#hvPdR4GeT
z!bg2V8Wc^Hn38g&f+8)HMSLi6@z$zY+EC(9ozo+43O%-=uR}i$WiyWlM#ouU;$&N!
zJJtu^P#5}fo*F%jy&t<GY3rk2T{PaNc^r(d7Kgs|mB4=Nk&x-3DF)Vi>vCUi;zj|9
z!_0PV$hI}Y5Mc9^^=8o6EpXg7^c6BtiR{L?&RnW(9vr>w6ek0lYj1=34=X3y_`Vxu
ziS8I3I8-nR8|%0m?3QWh8@V@`>4r+C&3)k9+VylocM#p;Zr6=+F~UkTh;61;@_=Ts
z-ikAuXj68gO;Q*ylgd%i+lwJ57AyDcxGgiUd#=!1rm#KRjRUr6s4Ih^D?*$HorpQr
zHJ7HSiMiA>X1pU~PeXTI-m}G^6rol*;AAVcR(omZMbE}*Z1cHkN4NB6qW!4bMeW`w
z%eEW4hIh-Jh|?U<1nqKtbXLrMOCn{?tF@_@<=wkH&hS&uskO|+-e^-Btm}$GOf5lI
zMOi-8x}l$O0T)Rab{qlOvnES$RAF=%DUmlhyNc7)dOS5sH6wRH```+b%xf<JVpv81
z<W7&{ZB5L0Bf{&LIOcb(HLp8F<+dBKORg)s$oicLs4HP`Cf5DJ^p=lI%-lS3wv>lE
z2WOh`S=2J08(CCn=%toODhM*{q49Umj7`zd*G!O}d7aqQ22{rYPd6LQ6V0f33(JZV
z{s$@fXwZ=j_KKPAtTx1&dm~gQ&iMRT(EWIed!EZJbX{BCi!vM3@!rtqFrnDRkE)kr
z%r8tzLcqAmQwTRYE!=1*_kVKPIwo^@N{>T8b#=#<RFD!m_ojrjAmoX2ykp{SUv3?8
znsV<;xs7s*Fm_X4)IpKhM2<l4cl*_>-Ky_CQk~mS?;bPYZ3&txrg!^W<T1TAg9MSy
z>ugbtaPLQky|?8G2JThqI8C~!eEZ+L(oi?*3!rYgQK6qT9o;G1SW@xCIq`64V$z?h
z+|+e$(~@UR9(OVcunTpE+>W9SyE3tmBU1@iOIj(VyIq-qyC5=3|1qP!j|83Gb5kv@
zl6=un)wxxirLN#3F;LyU>2CTFFD^lufl-pN^lfKzlc>EWR-`8%bUCZ^r>dew@p<Sg
z5=c?zF0ZnfX((><>a|=^J|=ffO}`|&UcK^h7L*ThugC3=!-$>{Q_EneJLFxJ9a9;;
z>?n7T5wG~BZR#GUb%k0h+-<T{bR~&C%@_%~tuNl@^XF#PjpXU*x=(Eqogbw>+Hh?>
zv$nbsU64-;bEAvcqpcTP3yV=}DOxzGTdnrO$*A>YtHs1<-E3KrdGEYMy|~bRV(~<a
zGII@sL>t@=pT(%u*6YrDy~bxOkbTb-w4Rp7u;GgIEYtIJ6sIQIF!7+RSMoHozOQF*
z<QO^8SBZzj4d(Q0KZIes*&L6@jUdu(&)jL`CNziDnSFEEOv<A+vsz};<hL%LZ_e#(
z(k6iDnYn)D`pVQm3ys#y1#Sbu6>V$}u|P0)ked-kr^{T(r(^lX#--@gbe^ctGexvQ
zBqk`?)~7l)%&cXjBF>^q<W=9+`LJyI<;BywdR?B)_2bKWVQyys2h9EtnEf9x`#)gz
Sf57bjfZ6@8#{c&Zn12Ib^!!Bt

literal 4866
zcmeH}O>7-U9l(bYLTf067HG>?rlG+x$-a-ot-?zjk|s`N@=+^t`k^$6#=G<Ojk9m(
zv9oK(qCIee69Oa-^upH#sj39xLVKW61xSbrRYIbtQVDV3fDovv#DPlu{=55P8-x%S
zP9AyQZ)SG(KmX5J|Nibh-%_-P>7Ss#`YxrG;4|;$hxXk)O3lIV!F%AZ;WB&^eh&8D
zqm+efa4&ofeiFV8kHWXx^*J8i#k>cfg{R;Q{26>d{1v<({;r+>72eML9r!`G_q|Ge
z3f>Dp0w0DSh8N)bpn-S7F?<4k2`<9l!t?Ncggp%{JOE#Ta^9cdIe6P0N<9geAWQ1|
z@EUv`o`!dzEUKvUP@Z3ga_&|50hmJm)H*+ytiB9o|5w`euR%nqZ$ng4KY+MUJr70R
zk05{QMSeu?&!PC`H7NGK0cHPR+WA{h-rK`wIqy#R46(Zh&N2TwFH5{$f)cOaK#A8r
zoMhosQ1p8lO1ypvC0>7Q*YCq9iPt_T@#;d3R4+i$>!(os_ltJ^CKP@C3`O6!p~P!1
zLL^=Xpv3Dq6#JGTN2#Zw#A^*M!dKvVcsoKQUMuhb{4tdCUWXE|zd?!Du@5!pegjIp
zo`VvvzeBNaaCh_kG?a6{08vdn4#ge|#eWkh``6p`XQ9OFt5D+gO(_0<4vL-Mf%5(j
zp~(FS6u-O-QBA!HW&a!P{0~sxdke~W|A2%`-AkAK(<XH&{*u^9JxVO4%{EYdcw0L@
z1jWbFK1RpnT33-TjU(#Vej19dhv^c7kJ52--H!14AYFVM(KTJ#{swhUv_tiA24dqr
zy4WJEL!YllO+3YCa&>%`F8-9(rHhZIP2wmq_)NR-0DOpkAN?S`M;G7K?X<3fE%b&f
zN4gxDvYzH<Y_-V>Ym!ZEZ@N&1jyf|kd202<gs|a@WS|cOb=C%#=BBivdAS_9&<Grv
zfP_p>Y%z8rIG>055MPx@oMbL`Wwxmih5(nRyl=;y?E*JOmbF42G$Lb@>&&Ox<)vqp
zlT0#pxel(h|KZK4HeuweEYYi0ml##rgoCw-OSf)2`br*bX5+Gv>GDuwxAsGwuw066
zCXRiTixU>3v2mGN%u6&gdfj9$(Y9Vho20NoHq}o>?;wtxdaOQk)vw#bdgu$iZVNYb
zu_^IQM?G5jY7*4ac;buF<fTr;t7<71u}=2r+G@mY^XS;*6<(hD(I$r*Bifkaf0G5T
zQ(OL9Fw%lka0F7ViAOpW1@y>v1A5~(hf)`OnzDtMsY`a_mLWSPI`;X{7310t^%!2B
z+N+k^RJk?K2Tf{RKDV_H*GZM=P{lF68&(+8+4gw5?5Q}7moW&Bkb%ov-jH$dxyjId
z=+$y&O|aUwp^AM`NRY)fO@8NFs&@1xUy>YB0IQx-7&@CJq)1_PjFc$YoHUbkQJ3u(
zD_7X0qmTA9`WNI82Wvt)v>UeQ=nJ-#mBTu5sVkAfNvFD<?xAkfy^h{u;{PBeug0r#
zz)mq+C#w}vduI~r#M_Y1mU?8?DP^)K1RuLP_3PwlQ@W#1W8$W-h(I%#Wq)B)YTjbx
z=Mj!yHvFxqPF<6@MC23qc+_E+lw(sSP4=|a)jXk2D$CwY$(E87sJ);muf|dT&BTtn
zLMUgink@C#9=sY%R)UeeiHB_{ug!}0v5N>=eZuHbVTTL*r-|6zf3nH5ZASQFe4=Yk
z)`IJNP*3@)&`;P^y;}GUxf7=@G?R%n+(W)`X6*e9$AxEevzkd7oM{&%S&B9}>I&zw
zO6B^HQmUo<ZPlSSxPt2Bq{3X@rYEVPcO<T(a;0WEs&S}_eZt9OtK@>vYu@EHQ9FaL
zsK-$1dRJZ6s{RcsGc2Q(%bQ`nV@%zd)T(+ib(z|_Wws523Z)qiHNR!Wq+(Z{P3?k=
zRlTtFdZ-s_;qruvE&LjV7%e5y<IK6)2Kww8-xfb}*~;w~T@0y9qDQJUL@R!vXO<sZ
ziO$Hq&EDuNW)Jj{UcVppjz;~5bpPm}KOgnxdp$Nrm+iU}ng6n{H?RB02J`(xJ=)9#
z{1B~h0fx+!z8K)f{JJS`aQAbooM3i}K3(X<zEj;e$y<3^;i+iFn(;s{=4s}_NFThC
z^8rfqc|x7|@ti(!$>;Xu%*CaPi(3}<JH44R<USFPRyHS?P}-Yicajm?<MlPdowjgg
z<y>@ZYoBO1v_-T?dL)P+=wqv{yrsy1{JH+<BQwicRhTR~M^1-<&L{OWEF3wmo8iL2
kTtBd&`*SmD_jAAdx!?WV?|$xgKli(zd;W*`KYZ^03Gzm9jsO4v

diff --git a/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.po
index ce6cfc9c0c9..e8f54b6d770 100644
--- a/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.po
@@ -1,77 +1,88 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# jon_atkinson <jon@jonatkinson.co.uk>, 2011.
+#   <jon@jonatkinson.co.uk>, 2012.
+# Ross Poulton <ross@rossp.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: jon_atkinson <jon@jonatkinson.co.uk>\n"
-"Language-Team: English (United Kingdom) <None>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-12 21:52+0000\n"
+"Last-Translator: Ross Poulton <ross@rossp.org>\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"django/language/en_GB/)\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Personal info"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Permissions"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Important dates"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Groups"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Password changed successfully."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Change password: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "Username"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "This value may contain only letters, numbers and @/./+/-/_ characters."
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "Password"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "Password confirmation"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "Enter the same password as above, for verification."
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "A user with that username already exists."
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "The two password fields didn't match."
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "Username"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "This value may contain only letters, numbers and @/./+/-/_ characters."
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "Password"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "Password confirmation"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "Enter the same password as above, for verification."
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -79,126 +90,146 @@ msgstr ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 
-#: forms.py:89
+#: forms.py:141
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+
+#: forms.py:143
 msgid "This account is inactive."
 msgstr "This account is inactive."
 
-#: forms.py:96
+#: forms.py:187
 msgid ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
+"That e-mail address doesn't have an associated user account. Are you sure "
+"you've registered?"
 msgstr ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
+"That e-mail address doesn't have an associated user account. Are you sure "
+"you've registered?"
 
-#: forms.py:108
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+
+#: forms.py:192
 msgid "E-mail"
 msgstr "E-mail"
 
-#: forms.py:117
-msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
-"you've registered?"
-msgstr ""
-"That e-mail address doesn't have an associated user account. Are you sure "
-"you've registered?"
-
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Password reset on %s"
-
-#: forms.py:151
+#: forms.py:249
 msgid "New password"
 msgstr "New password"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "New password confirmation"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Old password"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Your old password was entered incorrectly. Please enter it again."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Old password"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algorithm"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "iterations"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "salt"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "hash"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "work factor"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "checksum"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "name"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "codename"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "permission"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "permissions"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "group"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "groups"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "username"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "first name"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "last name"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-mail address"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "password"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "staff status"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Designates whether the user can log into this admin site."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "active"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -206,11 +237,11 @@ msgstr ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "superuser status"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -218,42 +249,43 @@ msgstr ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "last login"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "date joined"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "user permissions"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "user"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "users"
 
-#: models.py:406
-msgid "message"
-msgstr "message"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Logged out"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Enter a valid e-mail address."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Password reset on %(site_name)s"
diff --git a/django/contrib/auth/locale/es/LC_MESSAGES/django.mo b/django/contrib/auth/locale/es/LC_MESSAGES/django.mo
index 63fe734c8fd57b5f128342cc372bedfa33c591ca..afe0bcc2769f05a7f3c4ac7269a84e24fbbffd99 100644
GIT binary patch
delta 2477
zcmZXUU2GIp6vr<XX=#y`Ey|~I6^bpkyDbHgDhi4aA_kD)7ofSFz3mRn&a881Sb17C
zF;U}#WTGJ&iQf^TA*N3nKSHXBF(e?oXkv`M7$i}n(ZuM3{?6_eQEz(YH}}px_niAb
zXZvdJpZ&G3bJL$yj2p4V*ss%++6GUy@L;rEs#G7G3A^Di+zvOxweT>s@C=**Z{Tqy
zyaf)!y|5D=g6;5SI19c77bsOz?=~0C!Ztp91H0h&@GAHRyc{lQRcZ+=zz(<#UIur=
zd!P@WgD2qa@LmqP10I2U;CVO-H_ue62Ofjlh_6obLMBR+-X=H#C6PzrUicK;0M9{k
zQ7ed!iyDHm@5UxKLjKg9JZ8iDATFu|5l1;F{s-Z7_=tQbzIt3<;4@GTexbSHbtnOj
zHNQ_l{?vy&<bcnhNO=m1VqZ1ae`wBsf#To7CP`oxWJ%@VQObN3tcet#qT@XHBispR
zkp6A(eprG>pwzyVLQ2gS!CT-in1j#4Iq=OU--FjMKMBR}Cn$ki$npx<3H#vkF7#i-
z%XSu|Spp~-zXYY`N8w}eBlteNl_*=_U+`wQh3HlI1UvvGngp)G5Izs({F!r=S_gZe
zB<evArgPDM7cXD3AhjtFRZ4I@lmyoE5Qn>=G+PN?4G%QuhoMOO1{D9dAi1guC^!BX
zN^hNpa_)I3`+jYH|Fgym4XawwMQ+{+<(D_VIbRG>PxV0Aw;FOOwGK*RJD~V^kSeJF
zQd-4*)N)LI(k#^n<yO~WD=~>7=hP(IW!MT#no8=@kI9fs<^RG`OoB}fQ9wokTZj$F
zgs}#bK3a_pVbUw2+6X2;<vb=TObtp?Q>&(CO%B3dOnwnJVDisIn)Ko!Hx_xX#iRk}
zV={&@QR{k{Ff_JAUKr9BGDJlgqSgZ0eMx=VsN>}mFHV1YTIZH>C5jUhCc0=6>#`4K
zywcI@{KP&OnzHT79&Al(rm8E(xoQ*_oi?%6VU%c>M6oUQYZvLHWLfkb>$++V>Lk+6
zT9#Q#osF+`7ySG6XqxDQQK~%?YOiF%aoK1uY{0<}$MsD{mts4%?ivDTi*s$4)ejqs
z;_^)eb9452>u<f|ag<ivKT-6k4We+Il_;+_)C23P9|YOsGkWGkW14IVB&zFv`Rqhn
z-&Wh$WjrrRQGh!}o{tPg9FtPxXgg3gexOaU7+dEgZMi+~Hu+cL*>`PY+3Pdk&Y565
zig7P1uVlUbE-hy}+Se^D8CO#18k@wALZ<@b5*<Y2e%N?L?(ArLZ;J_%>{R>44%FVS
z$Bc)}S*~Nt>Xie7!vjOB^x)vg(5ivKHG_lg+qVteWe@m{^9DAO_K03NIMmoTtcTW)
ztXi8r(=o4SLzqONuQvqIL3FK8@`lO!gj-Zh+2y^coSo?C+0<J~lFCS-P_0(;No+#r
zkJ*Rwp-l>vINE2u#1$%q;y#KN6#|~A8Mg)N3VrQco3jy351s4SJ+Xb(@6&RdEERUz
zpXxEbeLMS;m3LW}n9;y`e%ZI=ql;DtMtf06P-iFKG1`W@=i)Y;?0l`Zm7^}&Q*SqC
zwF%0`vmxz-(`cL~Q9qTOd|N-1N~h`)9a%OZ!b_Y3bijXN6>UHtq$c+9tk_t(S65QY
zZqJlQebeyBU6fwg7JZb=X6NR0yToc~%ruY_q&;<ZysJMu)b&Lza<p4o0ft(;dP-bg
z`mP>N!X-Aep3UoB;f2*`l*M8^`7*s+#7$h;S@s<-NZ=7(*3rxqjZV3xOQ%BRl?WxD
zz3ibm3$NbFt`wQ;*Pn`O>Ya`+QfEJR^)0<{WqP7foc{@xJvnDjwljBjNwdStk)pY$
zRQ1Pv&v^diM40t-Kd@*l4eJy6rKDvWHd^1KRc-cY_wwv`_p%meg6vH9j?PAxYl=T=
H_C@M%+s+M-

delta 1934
zcmZvcTWl0n7{^a*DZR?26y$!aEl}vTyR;D8l*&z@f&saxu{3(xJ?svdomppQ0Rv{E
zJea64CKDe_yl^oRLZTvx2|oBhB@s2G2~l6XBt{b-j3EIZj4}HAw$tc?U-p~dnQzXV
z^L^j{%>LPPZdK*`xpl88Y(2gN|FTA@VR-T`F4*ZhrMlr6*ap9Vd*Ki8ewd!2l!ZrN
zJ)DF~;Ww}!{+`6Uc{q#vG<+6rf=x<Q)F%vD2waB?;n&IiE!e>QUvM_8pQ+R`xB#}p
z^>7~C4V$5Xt*{6mgD2pF@Fv^^7qZwPXkiz;3Kz1!`h~%E0=11wJr0K<A$1mx!i#V-
zY$RQBQM;f#-v?#m5qLMuLw@Qg7m8NTL7D$T5`P7<lzJVKlR5|M*k4^_APar~`Kc>h
zWZ_StbY>Dt2fl-JUHz8a--hyD9g}6lR+vY=HYgRI;N=DI4BQW|z^yWmHWlC_up*j%
z%s{lf0Uv-3lp~q%gmd8@D2a~2Iq=7XcVGwi^$08LbVEseBb*P1VK;mVE`~2ck?>t8
ziC>$=vZCb;0?)&r;4sWn?hw2LkHK3|HY%{YEc6oG2+zYJ{2B67`^k13T6hp%hf>IL
zvXkd4AT_ED@LssRjj|+AARsL~3gv~9P!8iMD4M+qMYHqC^Y@`t`cV?U3Z<gY6W)Z>
zqP|U@{|fo3J6t4@22QTbUsPd$WL2F+<7t!6Q92_p$!95T6k9n3m4UU%cny@ciY>xr
z14&j25)%pKle`b-$fzD%z8sOLB3X*9#XE61I4NA?V$yc8{wY+iA^~SfEytw_v0i+j
zI-2UJbWQ$3R^!r9u|8b7Hf?lxMfKBJkwiq3b@)B_Dm;zLiC33r%y_xx(2l?_mqImM
zEcroXyh!IvWV!dW$>p5L@jV^+Ix1LQvO&=aLn5Ir8n0|z_Ze*n<UO0~VTu##a%cm6
z%yC_9+|ZB1#;&%!Y@iFaFJuj-I9_jjy8dkZ@XT`jcEjrURKsWSdySoON7L8=y>i63
zd4IHXBs6XW3if!;$=fg*U8(&*manEVXmla4hc|YV*#DRx<oY^>#tX*FlVuXohy9>9
z*k^{~O4En&w&ub3)#mp4q76fnkIyx)iYJ@5#LHTCRx+t{e=4(1XZo|5fmC`Roo?E@
zC$-NWb)?kPHrkQZYtxzPy!3$1Y{(8|)}*nf-6o7u2Lj`Tu8I60s~<9+M~Q<+s@&vS
zCuiMW$2;r~G1<$PP2Q#sSX0dE{UyWHf{t&swA2m`#amiOTBfIDwGA)7(fUWtlRJWP
z$q&_bOLeqvS|kM8oU_G=Goj8|?fPLN4g({4m>i=ijf&QbY!3@YmiCoR;Gm`{jyV$-
zJRN7-7B5d$$XB=0)~l}fblJ)~6Bl~p^Ruok-RgT$U_v`_$>@N%8FTHplQS~CD}HPC
zJD2~SQ(F@sZ|jH~=RM&b4DElF6d?_@qNd65UeUOsXI0MslhV3X^~!EF+mZ>49+#9&
lpk0Rl=2F$y%=;>Sw0$(5Z10>&wV^p;<J;|B@sjy_{{d}GVO#(J

diff --git a/django/contrib/auth/locale/es/LC_MESSAGES/django.po b/django/contrib/auth/locale/es/LC_MESSAGES/django.po
index 75265c0369b..c0bbf753bf6 100644
--- a/django/contrib/auth/locale/es/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/es/LC_MESSAGES/django.po
@@ -1,78 +1,90 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Antoni Aloy <antoni.aloy@trespams.com>, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2011.
+#   <serra.guillem@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Spanish (Castilian) <>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-13 19:49+0000\n"
+"Last-Translator: Antoni Aloy <antoni.aloy@trespams.com>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"django/language/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Información personal"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Permisos"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Fechas importantes"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupos"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "La contraseña se ha cambiado con éxito."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Cambiar contraseña: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Ya existe un usuario con este nombre."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Las dos contraseñas no coinciden."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Requerido. 30 caracteres o menos. Letras, dígitos y @/./+/-/_ solamente."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Este valor puede contener sólo letras, números y @/./+/-/_."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Contraseña"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Contraseña (confirmación)"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Introduzca la misma contraseña que arriba, para verificación."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Ya existe un usuario con este nombre."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Las contraseñas no se almacenan en bruto, así que no hay manera de ver la "
+"contraseña del usuario, pero se puede cambiar la contraseña mediante <a href="
+"\"password/\">este formulario</a> ."
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Las dos contraseñas no coinciden."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -80,11 +92,7 @@ msgstr ""
 "Por favor, introduzca un nombre de usuario y contraseña correctos. Note que "
 "ambos campos son sensibles a mayúsculas/minúsculas."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Esta cuenta está inactiva."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -92,11 +100,11 @@ msgstr ""
 "Su navegador no parece tener las cookies habilitadas. Las cookies se "
 "necesitan para poder ingresar."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Correo electrónico"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Esta cuenta está inactiva."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -104,103 +112,127 @@ msgstr ""
 "Esta dirección de correo electrónico no tiene una cuenta de usuario "
 "asociada. ¿Está seguro de que se ha registrado?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Contraseña restablecida en %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"La cuenta de usuario asociada a esta dirección de correo electrónico no se "
+"puede restablecer la contraseña."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Correo electrónico"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Contraseña nueva"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Contraseña nueva (confirmación):"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Contraseña antigua"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Su contraseña antigua es incorrecta. Por favor, vuelva a introducirla "
 "correctamente."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Contraseña antigua"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algoritmo"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "iteraciones"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "sal"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "función resumen"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "factor trabajo"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "suma de verificación"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "nombre"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "nombre en código"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "permiso"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "permisos"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grupo"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupos"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "nombre de usuario"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Requerido. 30 caracteres o menos. Letras, números y @/./+/-/_"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "nombre propio"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "apellidos"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "dirección de correo electrónico"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "contraseña"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Use'[algo]$[sal]$[hash hexadecimal]' o use <a href=\"password/\">el "
-"formulario para cambiar la contraseña</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "es staff"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Indica si el usuario puede entrar en este sitio de administración."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "activo"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -208,11 +240,11 @@ msgstr ""
 "Indica si el usuario puede ser tratado como activo. Desmarque esta opción en "
 "lugar de borrar la cuenta."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "es superusuario"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -220,42 +252,43 @@ msgstr ""
 "Indica que este usuario tiene todos los permisos sin asignárselos "
 "explícitamente."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "último inicio de sesión"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "fecha de alta"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Además de los permisos asignados manualmente, este usuario también tendrá "
-"todos los permisos de los grupos en los que esté."
+"Los grupos a los que este usuario pertenece. Un usuario obtendrá todos los "
+"permisos concedidos a cada uno sus grupos."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "permisos de usuario"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "usuario"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "usuarios"
 
-#: models.py:406
-msgid "message"
-msgstr "mensaje"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Sesión terminada"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Introduzca una dirección de correo electrónico válida."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Restablecimiento de la contraseña en %(site_name)s"
diff --git a/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.mo
index f87b53a2dc355351adf4b52930d7c76d8f5172c7..20b5bcefbac67d5c370e884e815d30e832ea823b 100644
GIT binary patch
delta 1319
zcmYk+Ur19?9KiA8|D2X{S*DgP|4*Iw&OfO$BFQYtPy{Pblbhaj{@IqhxzYzI=%o;Z
z735=31WG0BrI#QfsNVF!o~p+pA?T^-q3HWtSLm>FK4<6N^Y3@g_S~~ww(!Z7dS8)z
z<b&i#NlKl>+7t>>OR7>HY{k7eg1s2UR(y*lCZ{Qtj^lU;L)d_en1k!+z)j4?4_Kho
zg8FJVq|kd851i=40xZUA+=pG5g~PZTC-DN_z*D%1XE8rRsX-jUa(snMq&{OO$|N$+
zX^J7{SG`o)X?TW=p}r#@^^-y-RGCWcfozl=6d`L?6)5l5+U*U<M;)giDC!K#IOkCM
zoktnZK#9OKI+<V1QIQUJr2&^vIzB|1Xa!d}mNhKn`yiv_<4p|XGIpSYQLkbT%2BOj
z3vOW-?jdY0yohonlemyeWu8h2E~0c?Ls{u-+>aY5XZi)@j-(L|Szrmu(bV8=Y{yZ2
zgF{%$EV98n*n|#tSBNL@7!EjjEDLx*!yK+)KbF%dp`Ay0ev3j@eh-h}6O`xgP$INp
ze}9j%vyUhX{ARcRK-ti5<Qk|<29xKxE|w>iLK>uFDas2CD3NGG`lue1_YCAD5~<X-
z%2tk~oGh13qUj+MFjYj>$Z~Z5CyD3*36F$OcC(Wz?TTC)BAJ+2nq*<gWZ4OUQeLto
zITBfHHMy27iFK;FMD1V5?W(GvlDhK+Tip~jWZAv!RKh7gJNfx@-_&8UPL{CCUEnSy
z{wwn0%c)CAIbGA?(2QjSE%&HlnUUDb^riUajP0b@<IF#?RmWOWy;pDW`WoH3?)No%
z^=4gn^!9lB%-KLB5DI!b=;e3U>%PQ$dW+jv@7J4SOIgL~-DY6aoQgfoI@)7++*RY2
z74~adG#ah5W{hAYaK*e{7c?y`JQJEQN34hz)<!3c;8;kTqP%8|nVK0HZtv4Pj&8fb
t?@qMDwzCG}{n?etu1<4g+=#dXJG)>9g*h+czj9`i<6EvvNwKy(>o1gxnY#c0

delta 1897
zcmaLXUuYaf9Ki8OdQF<tG;L!|(`q}7`O~zy<Su_ojcG8_Mna30U{#2*o!(9FHtg+Q
zclVkaD;H7mO$w(izKBs2q!0cHLVZxd_#*lc73-6VpeQ0DNFVwj`2B4zLPZ=h``Mk{
zo%zl0x0hc#-s&lTw>9yiq8*^$PXD|{sY$%BjsxwLgi<}Yh%NXT9>?$TE=;Xg%Hk~6
z;R@b?-{2r#ua5U{vzhA@K8g2Wqf%w{At$#m@F}+8wd(aBxPj}xa5L7`E42$-aT^}M
zTk#lfM1xIOz=!b(Jc3{0QEX$fN6}&@evECbuYTcVf`Qrwr5?daWJtY=Gk68Zv4L=j
zMIA-CKZUaJG;YEi@~6&mVAJX;l;@wTjz5n~rCvf}Qm<ix_0<(lWWu+RKlMHbnfMcw
z%&eef;9Df?>i6pPpD6Docvu!}LYMNjU<cO=yxfYfV-Y{V!`Mff&SHpVsp(Ig9K;(q
zi34m$BENuJ@o9VpFQL?MCx<P#AKUQ|$~>n~0*~-ETtN92E~9)~?_n2yi4ypYX7Vq!
ztYv%8;&#m9%P6T|$10K`gTwd(?!Z=}8pQ#$=%WPmHO}MDcmhuom2BiH%KeX!Tj~qk
zgFm(~yF5_GmlUTE<+=q4Qtd#AbRSC12CMh)M%n4T)$#jLo_nb3NtE~V)%)j>HPr%2
zATOXi|3;Y;N*33NP5;y6=O~$xmn3yPbZOnIs5I7A&-bJJGNeg%WC00QHY81UEM>Tp
z&L^XK=`0(Us4P)R8=%Wa(@9U#HC>w2SK8nz@o^_dz9qGrF1wJ{M<0sMR)2=_rOUsN
zeRRpFw0^o|ZLRThZ;yXEUDXk(iPU*JeJ?#lPb{Sq7i-G*1%9a*s>wpp4<h45I%^`!
zwWm!s>qL(4>B!en-s++a3Qia@66%8SO2%~`*M@<dXS2OL;)J>s+Ca}auB(k3`Z{ML
zPTZSb%>}GtvofnSnQeKUlL&O)_J=IO9FEslSy_Lvg{kNKAgco#G7WKbhD(pt{Z{j!
z?w&So&Y$U+4viZ@-k#4oIU7bZ-P#W%h&bR;qw|41bEv&oovOcmER#20j=ii+e#Q?9
zqy1)V>Bxq4HFX6Wh9*~;Xn1!xolFfT)5AJFIFcSpriN0f#^Vnpr|daLGLSq>mPYhI
zDjh$U8q(>5BSYy*vT;{ss&Tm9F<y@z9jjbxoNhkGiY1fdaT}f-pIS<7+*?c9OGQ6a
z6PAG3@>=%E{CL(DmKQ^vwc7Q=YU(&Kl4z6VY&H1>OB#EbGqUWsWCDjWnZjvj`AttV
zx3$6YB3YI<Zkk9Y-pybx4ndpv?%7gY;K+J*K4bbSvrSjKrmW*R8OONJyvaDrOP<7(
z@x3T8p<RB*XdBmL&!)NB><M!Izh#N5VqN`TMUf(u+;|7Ff^5S7*IIFnE^R(lQ_sFb
LGixi?x0L<{m;F-i

diff --git a/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.po
index 1757d5f05de..e0e57ab8a28 100644
--- a/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.po
@@ -1,80 +1,86 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Spanish (Argentinian) <>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"django/language/es_AR/)\n"
+"Language: es_AR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Información personal"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Permisos"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Fechas importantes"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupos"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Cambio de contraseña exitoso"
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Cambiar contraseña: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Ya existe un usuario con ese nombre."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Los dos campos de contraseñas no coinciden entre si."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Obligatorio. Longitud máxima 30 caracteres alfanuméricos (letras, dígitos y "
 "@/./+/-/_) solamente."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Este valor solo puede contener letras, números y @/./+/-/_."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Contraseña"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Confirmación de contraseña"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr ""
 "Para verificación, introduzca la misma contraseña que introdujo arriba."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Ya existe un usuario con ese nombre."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Los dos campos de contraseñas no coinciden entre si."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -82,11 +88,7 @@ msgstr ""
 "Por favor introduzca un nombre de usuario y una contraseña correctos. Note "
 "que ambos campos son sensibles a mayúsculas/minúsculas."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Esta cuenta está inactiva"
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -94,11 +96,11 @@ msgstr ""
 "Su navegador Web aparenta no estar configurado para aceptar cookies. Las "
 "cookies son un requerimiento para poder ingresar."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Correo electrónico"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Esta cuenta está inactiva"
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -106,105 +108,127 @@ msgstr ""
 "Esa dirección de correo electrónico no está asociada a ninguna cuenta de "
 "usuario. ¿Está seguro de que ya se ha registrado?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Reinicialización de contraseña en %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Correo electrónico"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Contraseña nueva"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Confirmación de contraseña nueva"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Contraseña antigua"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "La antigua contraseña introducida es incorrecta. Por favor introdúzcala "
 "nuevamente."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Contraseña antigua"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "nombre"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "nombre en código"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "permiso"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "permisos"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grupo"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupos"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "nombre de usuario"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Obligatorio. Longitud máxima de 30 caracteres alfanuméricos (letras, dígitos "
 "y @/./+/-/_)."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "nombre"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "apellido"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "dirección de correo electrónico"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "contraseña"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Use '[algo]$[salt]$[hexdigest]' o use el <a href=\"password/\">formulario de "
-"cambio de contraseña</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "es staff"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Indica si el usuario puede ingresar a este sitio de administración."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "activo"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -212,11 +236,11 @@ msgstr ""
 "Indica si el usuario debe ser tratado como un usuario activo. Desactive este "
 "campo en lugar de eliminar usuarios."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "es superusuario"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -224,42 +248,41 @@ msgstr ""
 "Indica que este usuario posee todos los permisos sin que sea necesario "
 "asignarle los mismos en forma explícita."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "último ingreso"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "fecha de creación"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Además de los permisos asignados manualmente, este usuario también poseerá "
-"todos los permisos de los grupos a los que pertenezca."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "permisos de usuario"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "usuario"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "usuarios"
 
-#: models.py:406
-msgid "message"
-msgstr "mensaje"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Sesión cerrada"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Introduzca una dirección de correo electrónico válida"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.mo
index 5b67a6ffd0ec391a7f764a6d42dfde4b6d0c1797..7b8c63dc4db33f32e9090b567b90fd2046da5a14 100644
GIT binary patch
delta 2469
zcmZXUU2GIp6vr=8`DoFWwOH|s3$)V3?nhfHxZ(!}A;g-h2@wJW@6O)t4(!gXb7v{|
zU^RvZjWL)BYGO3eM2$vb3@>V;3G$-G1l0Io0>t=$Ld3)mUNj;8&h8daZ}!Y@=FUC$
zoclj#_O0}}%=D>L$3exo1G^FXbCyyQ@T=Ke81t@FDh=nuYv3q+5N?FG!<V6j-@rL=
z4VRnX-Eb7{fZgx~*a=^U3*dWju~O6OqxQtNa2_vyfIaXGyczxl7s17Im0ALGunSJW
ztKc^H2=w8L@CdvQZeg?g;cIX^JPV6(<9wwC;Ja{w`06+}WTG_bZGZ(Ri97{&z-Qq)
z_%kFIwUX$#s9`AU?r3v8<fk6say8rvaZweBILbls-v>M3lk%SUYQNmT15h@8rM=)y
zC;{GWzdsE5sZY7c246yv@)#7wPPFIGwV!{7;y;^3lE4DUluE%5DD%y5x}S;T=-3C(
z!#cc*^w+~D;A8M8l-iF`NU8ZIC=x#nQ}7GOPo3bh5dH#}!3$9QmXe(W9)s7ybx?X_
zOAq=>)9qnm6-=OH{5h1Ge+~D;pWtV(#_lDUC#sa@AQT1vfR95*v@!TA+ztDCmAU~Q
zfNSA<P!c=?_rSk<@!rf$L^P?*=TJ&;3`!#3L#gGDP)_<ATnallhOEB@inN*b^C*<k
z6d>xVyP+sE4rRaXQ2Z<uMXJ->(6DN6d%=@XHh8A}{5+HmUV^gjZ77ny59K6Bp=|se
zltfQKN~<`ax&;$;nQ9J6=vHh5ldoI$nMPUFkFCTca2gxJWJsp+zpxyWU^7D$kdec#
z$1?K3SdB>^jbX!>^oo3<1x!BWEGFvC3`#TItozJ_Fpmvl@<pt{q)`U2%ZHp;<XeGB
zS+2umjAEkJZSug-*b=#6NJGjH6=jH8i)Hl{&Bs<97ae}J<GESgn`-qiicJvfl8LQL
zKAH1I*P!!byE8B~n@)DlZA_afT{q56g;B|A6ImUEv37A7+0u}9p^ht-N#8NAr_4Sb
zhuT@oG*b;{qZRI=|Bx;=V!bbHXwL-NtC*lH3+=@PIQT(XuQj?7*~vSX5qMEEa&FmO
z%?&5RsJ1p|?n=I%dw#GSg^jwq6iF9tH4Mtkgjv0=8C*~K)oQYT&cMQOQj<}RWOdUo
zn;e;!9=EMk#`D4kDsaxw^O2&2V_a!%Z8J6FSG6gXBI}%_E(&mO<9{WeoSrwCygC0+
z%2dl?gnLbS73=MGjau?h=bg(d##I#BMke;dz^STnv95+?KWN<|dGb!@;A~TklVhFh
zyHI?$o-`g(C#kMYV<VaTXl8ho&gTomt1|i3`F!Vt6PbtY9^bKFW<6;a^hkcVxh}s(
z504b`tCIs=eJj@$BU3RoeV>aXQ!?n=n#kJL#64v>Vb%+4$&s!l6Jc5pR^qr`$mOP{
zrn2}1&Y!e<vw@9s^(fqBz1ZdIxza8Q80M;68>Vb?*6n;?OD^3x-kvDv=1g+7Yun+?
z3;M4}ZLrkbX@92c=(xV_k4Ic=idF0RHQxqwPs!@4(Owu3*x92W7;OVRa9LYAot*D}
zYkHimE?d=XKxeh7){JKZ8VtAC?q$b1DTYH-_vj)0SVKBkSLoE52`Gld+e26UCuYf3
z>5Ybod_3zmlCIYEhGn&9YDM4N`#+bOE%|&)_Fw%w)4oV;wX|=eDtoTYX}b7Ak3RfS
zPkL6N95w18pBMe$nkf=7wt@958sgZ_B&#<EGxs_yvZ9onyt;1y89aiQaIPDU<Vlqq
z9FuHagNA4KY;tnp>gD6SY#?*<*zH{rM!Fssq;_%g=)x84lhWj^+Wb$SB$e8he49Ew
y)9khIQnP<}&DNe~vq!dWW8b4YZPML)Lo(9a-{GXaH}^i&-Rf*jk&9+msQv+XehnP}

delta 1928
zcmaLXU2GLa6u|KTOQE;a0{wvc0Yhn_1#Ww9TZlB30O3QRC?TMjQpwPr-Y(g@TXy$?
zprjZzK4=KZ>Vq*xK9t0e7@<#?=z}#8qlqLW`ha3$LgYnbG@AH8^nbR?i!n}m_P0B`
zcjnBT-Ts`v*g0`)LDd_Iww8E^_-cky+wuAPIMB{kDb<PRumQis-S`8p!@?}3EFQ*c
zyp9j!x7dq+Wc{7otmnFbCvgMjl$ubVa59&UFR%r_$*zCJIb7exd00JLsl~Vun{X{Q
z;vm+d!8$DCQ}`Ti!5g>}TNvyBT5QKpv4#279Zt5=F|$Ug{kR?JQs;3PFX2Y4AzgA&
zJ5lcML78|6@5d7Ir;c)9(dq@1=U>VCPa{LAH<6sw1*~Fzb%_%h@I&NJUF9GHe}=L%
z*HL!hdt}$uFWL3)D8H-XVVSTFJ<8XBZCsz?#|!a29LJAwGj_2}M=-((sp)M_q?Ui7
zY*{bMk<5?d0z8E;VS-Y_MI7d12ex8A$~eO)i66mcJc;ryypHm2UBTt}HA>=t*0cXo
z%fIP(8Jk$9gKwd1z04vz^bD@STlgS0lGOkf&|(=Sp&NJ<Z{t2ZKvuGlD@g9@DsoF*
z!=-q$fzjoGyL8AFR`Ev3bq>i%%}2>}DN4;&X7_tgR=O_h--7bouFNM<et$5#A0Shx
zV<?Hfit_y16P!@8v`$jvdrdw^*%|qfY+WZIZN)UIh%>YERVZJEv<C>8K$4XONs|>z
z8I}>eGHNx!v}uVZBui;MguFEEM4r%uG^ww&-f7aKlz?|hEg@tT(z=Mg^lbVwls8@e
zg{&lGN2PTWvTOGmpZoH(F3YnXsfpBi5z#>uh$=!&&YJbwj04-kpfVn*?d9<xjEx^_
z$HbOvUmM49V>j@19O!t=>Tw&E-6*0b(q-dUjOQKKhK`bNoz*<zM!FK&P#<$WPa7`^
zlBlM=p(GRNG20z629LOYS8}%ce6nkHC3$Dg%H+j4*OCuv+LG4Xp}l&=knu{vaNAI1
zycovpvyNM`Q9Qgt2cZm~rZQmkSZGHdZ5?O+V?pS2x2_)<Gk%FIvmQMfgyn&5vp$)~
zT}d|A4kTx4o2tt;icBfFP}`AQuica^p8MEnF<<D-7uV=wZ-22bU+60oa=V|%@3BW+
zS!#YW+tIIk3dQufLZ2=^(%)BHRiNbtO%&(%hQ^OP69-|x-eG*7B@P@;-QZc*v0j(!
zj|RzibC=|d->C;44}7~m*-<xCKS;tAQ(|}<9o)5l^4+@jna;MbG9E-~t7ScG*1fV&
zl8ufnPo0ajW3?AVSvfc{QUT*|HeHpn^<%r5F=NYyRZQqoKT|&BPQCAI#<n)O+^}$2
zHcTm<Pn&eiBbBtwvGwhV5!032tpBLZ_1zKIc<u=^;!aKaGW|&4$DxVr)McZsuiK;K
z^LZC13k$Z*NPcVRNzODr?d+pc|69zome$k%RZ1yc#Y+>H*(CSiU-PDw{i*Rz@?+Ef
WWU#qqHmi=zVVgM3?aArp-TwfGCtiU7

diff --git a/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.po
index 32877133b2a..116c767200c 100644
--- a/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.po
@@ -1,79 +1,88 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Abraham Estrada <abraham.estrada@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Spanish (Mexican) <None>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Abraham Estrada <abraham.estrada@gmail.com>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"language/es_MX/)\n"
+"Language: es_MX\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Información personal"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Permisos"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Fechas importantes"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupos"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Cambio de contraseña exitoso"
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Cambiar contraseña: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Ya existe un usuario con ese nombre."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Los dos campos de contraseñas no coinciden entre si."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Obligatorio. Longitud máxima 30 caracteres alfanuméricos (letras, dígitos y "
 "@/./+/-/_) solamente."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Este valor solo puede contener letras, números y @/./+/-/_."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Contraseña"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Confirmación de contraseña"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Para verificar, introduzca la misma contraseña que introdujo arriba."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Ya existe un usuario con ese nombre."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Las contraseñas no se almacenan en texto plano, así que no hay manera de ver "
+"la contraseña del usuario, pero se puede cambiar la contraseña mediante <a "
+"href=\"password/\">este formulario</ a>."
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Los dos campos de contraseñas no coinciden entre si."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -81,11 +90,7 @@ msgstr ""
 "Por favor introduzca un nombre de usuario y una contraseña correctos. Note "
 "que ambos campos son sensibles a mayúsculas/minúsculas."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Esta cuenta está inactiva."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -93,11 +98,11 @@ msgstr ""
 "Su navegador aparenta no estar configurado para aceptar cookies. Las cookies "
 "son un requerimiento para poder ingresar."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Correo electrónico"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Esta cuenta está inactiva."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -105,105 +110,129 @@ msgstr ""
 "Esa dirección de correo electrónico no está asociada a ninguna cuenta de "
 "usuario. ¿Está seguro de que ya se ha registrado?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Reinicialización de contraseña en %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"La cuenta de usuario asociada a esta dirección de correo electrónico no "
+"puede restablecer la contraseña."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Correo electrónico"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Contraseña nueva"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Confirmación de contraseña nueva"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Contraseña antigua"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "La antigua contraseña introducida es incorrecta. Por favor introdúzcala "
 "nuevamente."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Contraseña antigua"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algoritmo"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "repeticiones"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "salt"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "hash"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "factor trabajo"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "checksum"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "nombre"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "nombre código"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "permiso"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "permisos"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grupo"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupos"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "nombre de usuario"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Obligatorio. Longitud máxima de 30 caracteres alfanuméricos (letras, dígitos "
 "y @/./+/-/_)."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "nombre"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "apellido"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "dirección de correo electrónico"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "contraseña"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Use '[algo]$[salt]$[hexdigest]' o use el <a href=\"password/\">formulario de "
-"cambio de contraseña</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "es staff"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Indica si el usuario puede ingresar a este sitio de administración."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "activo"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -211,11 +240,11 @@ msgstr ""
 "Indica si el usuario debe ser tratado como un usuario activo. Desactive este "
 "campo en lugar de eliminar usuarios."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "es superusuario"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -223,42 +252,43 @@ msgstr ""
 "Indica que este usuario posee todos los permisos sin que sea necesario "
 "asignarle los mismos en forma explícita."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "último ingreso"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "fecha de creación"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Además de los permisos asignados manualmente, este usuario también poseerá "
-"todos los permisos de los grupos a los que pertenezca."
+"Los grupos a los que pertenece este usuario. Un usuario obtendrá todos los "
+"permisos concedidos para cada uno de su grupo."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "permisos de usuario"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "usuario"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "usuarios"
 
-#: models.py:406
-msgid "message"
-msgstr "mensaje"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Sesión cerrada"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Introduzca una dirección de correo electrónico válida."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Restablecimiento de la contraseña en %(site_name)s "
diff --git a/django/contrib/auth/locale/et/LC_MESSAGES/django.mo b/django/contrib/auth/locale/et/LC_MESSAGES/django.mo
index f9ffdafdb1d10167986897d836e465b0300bb0e2..a0327f7705829fac9a590a65a41e21df6ee2e95d 100644
GIT binary patch
delta 1300
zcmYk+OGs2v7{Ku}YCgut_$oE6M$3HUc<-p8&LWV^v@8e7iY(&l+<fKC;9MPTBeapI
zXkd^C+yvvMr!fR=gvv#&0#|J$XcN^U+C>}b|BYAZFz5Wvz2|k$ckZ3rb+2j`zZ7RI
zE0UL7MNT-BI*Co`6r_#}r5dmkOK=qZ7{yNfh$g1(Q7RM1@c@Rf74M@9-=PyXF%P$}
zLa9ad!@iNu=xiDau@EcpAU5J&?898Vj`=u+mv8}3;U=ENvMi;p;waYQTVx^i4SP@)
zk#$Z}Tw{IZr_#lZ7swpyH}X?|C}csEqf`Opq3oa%d1iGKrGJxszZLnZ6BGnR^`gvk
z4rSa$l=%#l2ux!k>#JK-WWZgyfiaYUk5LwSf)6>CHPpE7WfnP#dF;k}IDnftgw@P0
zA&=q_T*7{QhBEFi%7*d@<D!JJieeu&qBL|NYbie#;}xvLY5V#P$^)*TEVPQl_!{Ni
zC}NT`ID!T~$3}F~c|ZE_JPx^tKW!?(jmwxsIm<l4APWrI4x>Cs0O_Kl$Z@JAln6aQ
zIf`YJek&;BU!p|z4a$brQTlzb+doPCsjJTv@{)bG8@5sIXBF*4q#R{}I^-l$>9B3R
zZ5h^*<z=fOH;@TPDsmdiQT(6eD=C-rmxbl2c2k{Qk(WlIBRi2KJ5D2W%&CX-pd|Th
z<y<AiO=L+Dh2~UkC**cj9i<`>*-f2pYRAYDRyLOkr+jwu`OA(Ek#%x4S>6%eoz#Ct
zY4TA<%;D;r4u@teBWSq;hGj<L>zT3SNY+nBd^Kk~{?xg4yv3updc19JUH5t0JbJsX
zJN*NmL33^*G7$=Tx*6qjx9HwfKfS~4ZSm>t@mTIaPyM)Mg?*Y9jYgZT86y~(xM9vW
z2Te;0&x9t;Q7fW_wZNni91CeTDQAr_Q=_%P*>7L@+@=-(nme5A%iD64T-ZpATM;AR
fo|>HvZzRk)BM^UI5KD$#*=fmNMWv2-PRYVQ;J=e|

delta 1899
zcmZvcOK4nG7=TaG>DVOA!^GOg*7le-rqN6?lb1BaSfP!?L{nnbLacb&dpdKQI}hgG
zJ57Bsv>S0Ffx(5+h1$3(iaHb(M6lyVbP*MNENlf)Tu2c_#6`gGpWGG%5A&bzJpbpp
z^Ip&SzVg-1*ei-Qj_g9dY*1<jKEH{M_IgaIe)tCLf?vQR@ESY-lbe;Y@HC9WHFzid
z4vxUTqV;|@+nFcf3-BOpR;sK%VX&2j&tW(GHk$tdw=iFa9WZ{2QoG@HxDAfO+u$5*
zfd;n1EPN6^2M@z<;4JJ$*;CNMUU&s|V_*HoV48)-CZ&$S8OV})6CQ_`;DfLUckxBd
zLfKz{Vt5g@!8GKjN^}IR&Otf<VzmA;M3s6K;*+`vW7t=h7>L4mAwTsIohbecN@mue
zWZ*|g*46cB{wI`sF%FBtR`?9%>w-hf11?L+R^cJ|A)JTn@NxJE=_*T2E;85$t8fl}
z55@Cd!V(1o@H{*SCDIxlN7UEwcKB1Y{x_5e<0$Qf9dIYy8_gep@-`NrI9_Nc|BTgH
zx<&XBl*jc8d>D=swt?s1J@99E2W-1lsYhWy4B;}wwz>|bgzHdh{{&u$p$ie;g5uaa
zbYl0@PVz6c_=*Kd;SW$EzXtiKU+F}_Khb(4>5vjML5Z{t%K05o&h3HtsP;p7qz9t)
z`DpzZ6h~bs_m|5ID4E)h$i*8?K1Wf&cKx&Lk2d-ureI?<z8A`uAx*MF@b#c1AZZea
zq<t^KlTibRd^u9Odi|jqM&u3jA_+tz(t0*f|CXa+y{5b&wFi-?r41sZ_0h)Lkm%$u
zM9L-^k~W0!Hg7gQ_nvw>?v9r3f@8=IWIvKbV%1b^rJ?*#F&`FuHIpsmi-E}n+A)D;
zp3}y0+`!G}bdc9U#_EDCW?kQB#n)Mr3ytTU)rN(1&N>4eaeW>7wy4jzo~MoH=XKf!
z47~qbO&76Z9nosd$!!^(77ujB4*3{ChnpL$tZiQDLiL$^(a}ZgqXs{E{p!>4-y4qV
zzD47u^T+os`o;@D#x6T<+WNuqKAkU$6Lp6tjm{M9sr!2hk*cAdsgoI#OB2ft<)`w+
z?BtM{svh35sUe=VzHic%>8AI`Qi<e9A~mK{BNM67L~=BlY(6rdSg<8mGLSe#mL~LY
zGF3m9yiX6OCQ>7nMDu*(<W%KK^J2>!hC-9(l&$V;xhk0s3$CM%)>botZydc8hK1Uy
zEg476xxQKQb<Vn;)wRoRI`jkU*#S+$^^)<!z??R0k%Vk*wYFL`K}gE;S##p%HUm-M
zMEBi|%iPG>oMSz`JB@uDu%7IA9-)#ZBW`%%iNVU&)|Fk48PE8&%Q>S<CSwD!qJ85!
zuBUseueCNemZ!;=F+o&<q8ntT4EekV&}0Ma`oU7|<E&T>LXV!Jl!z&El;r<kU8rPa
jIU9xnVOw3olq<CvRI^bEg6iAtEe&yTG0avz=y>*DRqa^(

diff --git a/django/contrib/auth/locale/et/LC_MESSAGES/django.po b/django/contrib/auth/locale/et/LC_MESSAGES/django.po
index 35b1795aaf5..1d9995cb8f0 100644
--- a/django/contrib/auth/locale/et/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/et/LC_MESSAGES/django.po
@@ -1,80 +1,87 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# madisvain <madisvain@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-07 21:13+0000\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
 "Last-Translator: madisvain <madisvain@gmail.com>\n"
-"Language-Team: Estonian <>\n"
+"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"et/)\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Isiklikud andmd"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Õigused"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Tähtsad kuupäevad"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupid"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Salasõna edukalt muudetud."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Muuda salasõna: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Sama kasutajatunnusega kasutaja on juba olemas."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Kaks sisestatud parooli ei olnud identsed."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Kasutajatunnus"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Nõutav. 30 märki või vähem. Ainult tähed, numbrid ja /./+/-/_ tähemärgid."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "See väärtust võib sisaldada ainult tähti, numbreid ja/./+/-/_ tähemärke."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Salasõna"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Salasõna kinnitus"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr ""
 "Sisestage sama salasõna uuesti veendumaks, et sisestamisel ei tekkinud vigu"
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Sama kasutajatunnusega kasutaja on juba olemas."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Kaks sisestatud parooli ei olnud identsed."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -82,11 +89,7 @@ msgstr ""
 "Palun sisestage korrektne kasutajatunnus ja salasõna. Mõlemad väljad on "
 "tõstutundlikud."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "See konto ei ole aktiivne."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -94,11 +97,11 @@ msgstr ""
 "Teie veebibrauser ei aktsepteeri küpsiseid, aga küpsised on sisselogimiseks "
 "vajalikud."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-posti aadress"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "See konto ei ole aktiivne."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -106,102 +109,124 @@ msgstr ""
 "Selle e-posti aadressiga ei ole seotud ühtegi kasutajakontot. Veenduge, et "
 "olete registreerunud."
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Salasõna vahetatud saidil %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-posti aadress"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Uus salasõna"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Uue salasõna kinnitus"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Vana salasõna"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Te sisestasite oma vana parooli vigaselt. Palun sisestage see uuesti."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Vana salasõna"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Salasõna (uuesti)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "nimi"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "koodnimi"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "õigus"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "õigused"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grupp"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupid"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "kasutajatunnus"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Nõutav. 30 märki või vähem. Tähted, numbreid ja/./+/-/_ tähemärgid."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "eesnimi"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "perenimi"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-posti aadress"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "salasõna"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Formaat '[algoritm]$[sool]$[kuueteistkümnendtulend]' või kasutage <a href="
-"\"password/\">salasõna muutmise vormi</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "personalistaatus"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "Määrab, kas kasutaja saab sisse logida sellesse admininistreerimisliidesesse."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktiivne"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -209,52 +234,51 @@ msgstr ""
 "Määrab, kas see konto on aktiivne. Kustutamise asemel lihtsalt deaktiveerige "
 "konto."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "superkasutaja staatus"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "Määrab, kas see kasutaja omab automaatselt ja alati kõiki õigus."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "viimane sisenemine"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "liitumise kuupäev"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Lisaks neile õigustele, mis kasutajale on määratud, omab kasutaja ka neid "
-"õigusi, mis on nendel gruppidel, millesse ta kuulub."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "kasutajaõigused"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "kasutaja"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "kasutajad"
 
-#: models.py:406
-msgid "message"
-msgstr "sõnum"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Välja logitud"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Sisestage korrektne e-posti aadress:"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/eu/LC_MESSAGES/django.mo b/django/contrib/auth/locale/eu/LC_MESSAGES/django.mo
index b9c8b1f8aa2d374dca3edb791b8732f42fd2c47c..f22cc982f5b746d520b4cf3b9e8fb1ce4751507d 100644
GIT binary patch
delta 2358
zcmY+ETWnNS6oz-@R@&M^p<q>HQv_P1bD<!m+{91_0l8@+1_{|SvpaJ-({t*%ICfq}
zO?VMvz@x?lC1Qe!D867!G=WI;$(Z1UM?-w@0wyME^o1DpTQdW+J7=BmoPGA%Ywdrn
znU9tqUs=7@IsG-o*nr)S{nez@Uij5CZj9y`O7+3na2_0h```|^9=-uB{1(oHgWMLu
zEpPxHh8^%EY=LKB8~gxvD^*pWG$y`-&3yO)&Ve`J1Mnv7g59%}S`3r074C(1!$a^%
z=)l+EWjG8Eve_<p8a@qwg&DYGwo=RBIk=bj>T4dzL}}974u_y5@&Y^zUxHiVbx1C1
zCDCzFX(;P9G`J0NsmHjr!>1rFssIs31yKAa;B@%Bd?&s-Di81kl#Nd{7Mz6=;9TST
z1<0i?agz<cgd*h?D2jdGnE$Qu{wEawX)KZi+8|S^6P~8b55Vd}Ok70A`S1pm+W!mp
z!#y112z(n#=2A$h?JOvYErZe%TcDiyamb}I-0p!sl*EofIoO*}*1rqI|I-fi@8sbs
z6RY4aP%@s6m(+X_loAZUm*Gjc2kN=?CiLJz-amtqXg8Zl;0bsDz5*rCPjCzT4|1t3
zWN`={n1}xBdH9eC`bJ%cBGK<q68Q&8X=We~vDF+%j%o=MNz+i2SqH^`GnCS7hvL5r
zN|Qd(_@05{Hws0O@oM8k1&YIqP&POQCEy9jrOt4ZjXs8QqA#GF<Qf#||A3OX$VO>v
zKFgu}q!(Z^D7TVwug2up&Dm5{f;@<=#3XPZCZ&)eCzJn$r5Fm|9!nZeNq8^T-*{gK
z7h-F%G$zVQ(nFa1loObo`qsEle*bH3y)~GEy_m>8h)KgO!zK?=N=~~16BVT9G6pay
z&%^S<(AZ*mVD!{cE0a8mYTdH>uEqzcOV@?BrXO$W*f}=t`Jr(`oim{g;)^riY3&W1
z&>nHknC**?%!;a}tjA3dls!KeXyaS$dZ7+N&$qc%I`DK@uuM7u^SW#%bm-~8TBezb
z0_(2`Zu_s&nJCl~UZk_e)!Bk^^Rm$1UVww+=JiIS3%(uM)I;E|TI6KU=GulMo<FuR
zX*S2-%=)`G?|adBa3_+^*plbwneh^OYc04gJEc;5bmp?T-iRinB+2TUUn0KT+_&4-
zSD9?qi%@}cdRYf4ayW*C`qs98%s3@&ayj1yfut@9@NB~=$;Ur8kHlwZpYJrKyyxRS
zrm_W_Ee6q8yuW4B(t-&J3T=H8I-VP-k_kdx^74*be?;>5y_Vi-rWD3kTDG;Kcu|j-
zEK<jvtvlDQ?oSQ$r`PCIYAC&?KeaBEYT389|A2kg3D~cH8)*;e)v0uCU20IL2Zsg*
z;}fk5+qXJl#VhGOCPQ#HKHr+&-dhO6@u6h0TrMX<CIe^0K9_K9m>l=LQJW2e<ajbS
zN`<^+iF;)7Hff_|U(4>s+mN<V{A25(3%lFSH^oiu^W#_B&vi}eo<NsvCLg)h#E*1T
ztNTn~3M68Ry5fu=LKGT}P&pe`tgCa5Z(Uo_Tsf2XG?`|c63d-Ztv~9%+9^f>5;{eC
z$vCc&)@gh)C7L+WIZFsziKcW>Q0^cST~x4R)~$8WrH-3J!;^v-U9pa<L$<M@DSC#T
z+=QO8q*(uKd?!w{FQ{^qQ4@GYkL<%Jp(Y)%c8t)gkY$)q!}S&_*iy#HSzYj4TO?M=
z6A^Hqa@eBhh7rFHTVY9V@(C%Q&*^;MNvK_(8(*DsI6gJ^{rQcC8}m%@PRk8<KH5`j
mxs1&_6~ZV}DI#=$Kk*duqI-O%bLsRzTJH1CXWAyUocbSc|J_ai

delta 1865
zcmaKsOKenC7=TY}Tl%EX2M<v^LQ5%h$_x~ghEySdHXx6NL}MZ3lsV2^=g!>bJ}8cl
ziE+V(7|gK?7e=HTO%r0M3)I9{SZHK{G3p9gxX@@~OpJ-dnE3rOgG>L+f4_6iJ?DR(
zI~TURzp3&=Pt&|YcA@v7HyV_hgfHB~1G&_s)G&M-_QJ2=F?bv9hUsRdEPNKWz?<-X
z_&wYK|E#YM^Rk<H8omf0h3!gJ)W-}uS@;sJh2PcZzr$AM|G*WnWtmdz;cD0qcfme*
z7<NDdyI>JM37>}t;5YCPT#K=j(859ZIb4f>^)rKmEHt($^%R_hEUC-z6kLRRVH@ER
zi#i15{S*|(({MS=L4N8i50X|dL)m}6zWyr2lzIaalUjgH_*aVz#Nd07pZb7@7`_gr
zGB=@A;1;Cn>bLs*4=CrF*enja;2GN23%4?#<FHg{0Um|d;BnYWnNGu}VMQYRkb(5<
zGbk;%4JE=mP<q}#dN09#D4D*_LwdOY*T5wx0p5U;;VmfVeu84}Z`cF-IVAJVPy*lA
zP5q^phggtO8+ZhM0_Bn|$EvjCG!#eIpcwcXJ_3J*9^AUJ=3pL9Gk*u}hD~^tL?$4`
zQU@VN)NzOlHPb`=rF0<+Qi*d=4pbn?tMm2wJd}NJ*0}&B(|7Cdm!M?y5flg4p_Kkx
zD0Y5<68K+`pX#AJ6h#eI7|=4c8kK{0MLtKVjFeG6%VAVxs0NjRjrFngTD}aCdr^|F
zCLsZfh(l@bMpUXWf=Y0!(2A5nWIH;54x%Ykqaqt>sD8`!p<2g)yQCgKC2NsUbgVk6
zWh~W^zmP4cR90jg%H8}=sK};j88+3I9)vql>GftbjmnKzOU=y}8cseI2FYxsCX2H{
z7@Jb8vnIC8OWI_!UhD-W9S1tjTRm&Tq8CN1M7n57iShmCv|%Avve^-~c#%#b8|pdF
z_qFk(z(s9?y*Y89^LAT=4YqitQFp23vU_4#;@)cA;$CU}!d+<_a2wiZhV;<1@pHkc
zf$7NjG059<Suba!_|%XNLNPC)xQ3PeYtH0NDMwU9Fc*Yb{Y(%R_iQs0uF`(h?eEy*
zE_U>{6m1lloLlJF>~41KbL%@FpUR}tJ5rgQI<sRuGnPt^rPJ-lj;5yUSx-_+?I-<l
zy*-_&?n{s9%){ejnXPH0{jiDR)QQlPBHzS8IIfKsmjmB@+L>wDb0jF)3HMOfbmw6L
zOH2+kHd%VD>q<lAgz>Z16comd&Y2JsaoLNbgtY^qneqI%Y&_rUJVpv5+D3(>tSwc}
znnIvwj90WJolDBGXUiDyN+Wv4h9>m1%>@N7PGZ>?iyL+q0^+K^tXWuh*Muo(8`6a`
z5eAy}CZleud$BRnu4hHX>6Ld@A2X53%W<}r<uU|iEXMA~o|$3qfBR#z0oElMPZ~5x
vXKI$X3)m@JB9ta2KA{ChOS4AZMDJDC+_%@A=v&oPwB^L*`!>3ZeY5`pbRa`P

diff --git a/django/contrib/auth/locale/eu/LC_MESSAGES/django.po b/django/contrib/auth/locale/eu/LC_MESSAGES/django.po
index 5a13fbeb672..091a3cba98c 100644
--- a/django/contrib/auth/locale/eu/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/eu/LC_MESSAGES/django.po
@@ -1,79 +1,88 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Aitzol Naberan <anaberan@codesyntax.com>, 2011, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: aitzol <anaberan@codesyntax.com>\n"
-"Language-Team: Basque <None>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 18:38+0000\n"
+"Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n"
+"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"eu/)\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Informazio pertsonala"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Baimenak"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Data garrantzitsuak"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Taldeak"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Ondo aldatu da pasahitza."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Pasahitza aldatu: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Erabiltzaile izen hori ez dago eskuragarri."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Pasahitzak ez datoz bat."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Erabiltzaile izena"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Beharrezkoa. 30 karaktere edo gutxiago. Hizki, zenbaki eta @/./+/-/_ "
 "bakarrik."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Hizki, zenbaki eta @/./+/-/_ karaktereak bakarrik izan ditzazke"
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Pasahitza"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Pasahitza berretsi"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Idatzi berriro pasahitza."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Erabiltzaile izen hori ez dago eskuragarri."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Pasahitzak zifratuta gordetzen direnez ez dago erabiltzaile pasahitza "
+"ikusterik, baina pasahitza aldatu dezakezu <a href=\"password/\">hemen</a>"
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Pasahitzak ez datoz bat."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -81,11 +90,7 @@ msgstr ""
 "Mesedez idatzi erabiltzaile izen eta pasahitz egokiak. Maiskula eta "
 "minuskulak ondo bereiztu."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Kontu hau az dago aktibo."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -93,11 +98,11 @@ msgstr ""
 "Zure nabigatzaileak ez ditu cookiak onartzen. Cookia-k beharrezkoak dira "
 "sisteman sartzeko."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Eposta"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Kontu hau az dago aktibo."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -105,105 +110,129 @@ msgstr ""
 "E-mail helbide horrek ez du lotutako erabiltzailerik. Ziur al zaude "
 "erregistratu duzula?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Pasahitza berrezarri %s n"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"E-mail helbide honekin lotutako erabiltzaile kontuan ezin da pasahitza "
+"berrezarri."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Eposta"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Pasahitz berria"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Pasahitz berria berretsi"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Pasahitz zaharra"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Zure pasahitz zaharra ez da zuzena. Idatzi ezazu berriro."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Pasahitz zaharra"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Pasahitza (berriro)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algoritmoak"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "begiztak"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "salt"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "hash"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "work factor"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "checksum"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "izena"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "kode izena"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "baimena"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "baimenak"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "taldea"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "taldeak"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "erabiltzaile izena"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Beharrezkoa. 30 karaktere edo gutxiago. Hizki, zenbaki eta @/./+/-/_ "
 "karaktereak"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "izena"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "abizena"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-mail helbidea"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "pasahitza"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Erabili '[algo]$[salt]$[hexdigest]' edo erabili <a href=\"password/"
-"\">pasahitza aldatzeko formularioa </a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "Arduradun egoera"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "Erabiltzaileak kudeaketa gune honetan sartzeko baimena duen edo ez "
 "adierazten du."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "Aktiboa"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -211,11 +240,11 @@ msgstr ""
 "Erabiltzaile bat aktibo gisa tratatu edo ez zehazten du. Ezgaitu hau kontuak "
 "ezabatu beharrean."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "Erabiltzaile nagusia"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -223,42 +252,43 @@ msgstr ""
 "Erabiltzaileari baimen guztiak esleitzeko banan-banan aukeratu behar izan "
 "gabe."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "azken sarrera"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "erregistro eguna"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Erabiltzaile honek, eskuz emandako baimen guztiez gain, berari egokitutako "
-"talde bakoitzari emandako baimenak ere izango ditu."
+"Erabiltzailea zein taldetakoa den. Erabiltzaileak taldeari emandako baimen "
+"guztiak jasoko ditu."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "Erabiltzailearen baimenak"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "Erabiltzailea"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "Erabiltzaileak"
 
-#: models.py:406
-msgid "message"
-msgstr "mezua"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Sesiotik kanpo"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "e-mail helbide zuzena idatzi."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Pasahitza berrezarri %(site_name)s webgunean"
diff --git a/django/contrib/auth/locale/fa/LC_MESSAGES/django.mo b/django/contrib/auth/locale/fa/LC_MESSAGES/django.mo
index 62fea7aa0a87624bcc7be34a8eba659bf5956f2e..5823b9e4fa0bca1707be3df00deac584b3ef34b1 100644
GIT binary patch
delta 1897
zcmcK3Uu;uV9Ki82I@up5D;qEnoCihR*m`fbVStA4M>BL0%`g)m)ZnGNTMOOoXz!Tg
zfo2QCC6<V}Au%TYi^k3+x?wSfL>GNgAAI4(+)Is#F9u9VG(M2{<oDNgfYBEpyy@wu
zJw505yT9K(z1H??d+w*E>I;gii?NCEL6uUEVP}XpuAS9Nwc{>q#yIxlIPSvl(8d*a
zDYX(4cps**2hU+6evS2b1sm{3+@MrWU9U`p*j>vHVGQF2Y{hN37W?pSJc9S&aeNLZ
zuoti3lh{(D)C(BLhwv*Tk@^J>pd^tzkMs5-`Bgt3_A~Jb5<~rlywpwJB%!KPY85n~
zRIm}bXSEe&eP?C92YIPIywMc(1WKHzQ1%^0iD#j7U<AYDSEu+O8(x(OJdd*RJ(NUq
z_&See0r&F#QKCqTr|>m=7bQ-Vs6XHWZp2q;Qy;#MalC=|;vuS8jVa7YYfkfF3%-G}
z@k`{Tg39-6_z2&td62R`h7w=^TW|=!!P9sWd#Pd!zrZQ%X0demGu(<daTr^hxNkXB
zXPc-N-^8Q1n@Q=wJ18xiMM-oCCBXM6t^WgM-JeKq6<V`&NSjgCKa8?&FG@iNP#(pz
zC<VN<hQ3Kf878Fl`O1Q~P!8WL5?g(X5}<@UiSqSe#kPu)P!62Ldw|i-kb^26H5t<3
zJ1=>J>*cwx_0EM_`sBVOh14S#$5pLhNd0na5r$myCzV^;#^_|oMcb57{=^gZZiHH-
z+e$M!7}6Q3R?d<XCI4)WlDeM}Wo%}wW5}WGVo;+}#op?CRb$`CXgcFsj;jYP*UozO
z%JW`*&57JI_KC4%#vU|uPgKVfR>q3Eb|$OS89ii=+ZjV2v|X9$)Pu?4q?^^2GpP5O
zhS_08%p*GOq$UjYAEG#8BS$5{QkbUYIJZ-Kr)u8r9Y`dz`lOW_v-OBIq2p=CwUSOb
zn@%m?(BDJ-Gg5I~ZK%rIT(=PJjzoJRUE6gu8td8~iSF=zu3MigPeym@uI^ZLM@N*a
z{-Bk0BLf-B$)+qfor&rFsib~7dEBwH3Cq#DtyFTKv;5VFr$_d%#Tg#6hV96JZH>fq
zKeZ)U+LmzL(U@tDkB=L!1WXRuFB^{SnxmQYF+1*Nx0s{m;4yZm%~U0ZIb@mbw<5;$
zkmVh&f4;a_-xKnxR&DZX8?Sq<;ooz?8UIti5KNcyhAtIL3)=tKzZgvFQr<7<s~-i^
z{+xf&(7|Ld<$u2P;|xEu<xDW?&$6h^FR)`ug82D6e+Xu@f0_6N|HEMV_H%AGl<Zzg
zo0Gg8m;XJhE~hQ!gR?qV^o#yn`A)BTdUcTS3rq9UR535r+$xv)XvDnSULlw%QJ!>%
o29zuHFPE3kYbq`G>)*=N(j@<qKW`}SP`J6+&{U}M7Mth(0<huAcmMzZ

delta 1740
zcmZ9MZD?Cn7=TY~x3*c=+IF?8ZS{0>-KtBQtSPuqx{YaPMYK4<i63xnZqrC|Q*+bJ
z54H?vKZJ;b%Rq!73KA`)p^G>>P!UD^xham5mi5PejUuQp5Pv8>Z;WGl$a|ji@t*hV
zoSTi_8+)?r&DG}=Z6DH!Ec%o>42P=dXpdAY)eA>q3v}TaoP+zJfi`U3q||2k3haVe
zH~`OA)~~=u<_4aGH=rLiHNmNR7G8$!@Kj~~F05t#5xf&F!F%9WuobSuZSW@C0_$p&
z+6r6Y({Lwz4!#a|K?BA9Ur_9Br+Xg%s+++f7P1gq>TAePeNQKbufPU)4HB{X84|qu
z9g6;+mG$a6f?(cAhY!^bDURxfsHh$&=lh}9jlg>Rs}Tm0;ZZ0DqLq0Z%E8y5I6MQ7
zaXoLr1I({uO-j83Ywy5=Q0!fXSK%0C?SQ)}%P2ey$Kl&huHrYCy_<oL^fq88Y=SlH
zN~zl6eQ*GZp<_@gk*Unjz(MBkL(%^U?uEZVvC~ObZLkl12S?x=a4VZq@v}|D+r!`o
z7UXgL0Y4ChW~E+)1t=A0W>ZSm0ma~MDCZ79xq=BOdP#_HbsX|jvvi{W9+c8wfTI5e
zltjL5p<c4_BMTDoI+RR)g>of+UYP86KzV#UkS+Bv6a&vdZlv6HR@hsiKpvh{cn5Mn
zBEd=PMx?TPIDf0jU5fMV-pQ)AQOQ?Aki4YHlez=p(iCM;eMk_IkM=I)0VIG(6RZ8@
z5utn6s@e|87o!om9!XS^kT)es$(PQPQuiVuM7~C8lA!!8NCo}H!RnkZdnBEjo^sV_
zaw?V1SWZSqt&Gjw(N;7X&%{%X&ZKl^($-UUIvICeR$QI5oM|hOcvV|0#2h=i7nQiH
zr(HX(Ps9@mZ6(~4j@cOoiT@mprSW1%#j0(Mw@&JqM4%__eitX$h&z4W<xOW>FnuDG
zj_S1SVum<&x!wz#U2nYReDO%F&$l^gyRH@UM(QpMh62HXKxj~h1|p$wAQ%n?{bNrA
zp0tn0CEmb8<P_2Sf}yfrFswrlM#3R4;BVXisO2~~9eSzEg9$qxwG(}DXCgK1f6Q`X
z(^kw5JY`$Sh#s@kZrpP8(Bmn`9`?TRKU@E=Mnq3o#jY*ks>aoVSuV|&=B}U4mF7&|
z8*Avwu9V(1d0EuvW3#MH!4%DcSvJMBTt#gyx0chZpOiJEyI7jPrO1w1D9xJB*K(y9
zZ9X*x46~MJKFcAK$5h$wLTLs+GjiZ|7ukP8k>$KuF&9m~Vuf&U_P>a43uVQ8R+`u5
z!_sUeOpRwk*Eqz+5<%u!DTuo~fi3hYv&3lGES5d2<xD}X7QE99SL+xrvQ^ODsfPAi
fIk7AkdbIJT7jD`p&Ng52)qRQ5CCR`W-nRHR@*kEj

diff --git a/django/contrib/auth/locale/fa/LC_MESSAGES/django.po b/django/contrib/auth/locale/fa/LC_MESSAGES/django.po
index c34eceeb8e1..46f5b27224a 100644
--- a/django/contrib/auth/locale/fa/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/fa/LC_MESSAGES/django.po
@@ -1,77 +1,85 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Ali Nikneshan <ali@nikneshan.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Persian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Ali Nikneshan <ali@nikneshan.com>\n"
+"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"fa/)\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "اطلاعات شخصی"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "اجازه‌ها"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "تاریخ‌های مهم"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "گروه‌ها"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "گذرواژه با موفقیت تغییر یافت."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "تغییر گذرواژه: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "نام کاربری"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr ""
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr ""
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "گذرواژه"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "تصدیق گذرواژه"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "همان گذرواژهٔ بالایی را برای اطمینان دوباره وارد کنید."
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "کاربری با این نام کاربری وجود دارد."
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "دو فیلد گذرواژه با هم مطابقت ندارند."
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "نام کاربری"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+"الزامی. ۳۰ حرف یا کمتر. فقط حروف الفبا (ارقام، الفبا و علائم @/./+/-/_)."
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "این مقدار فقط باید حاوی حروف، اعداد و یا علائم @/./+/-/_ باشد."
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "گذرواژه"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "تصدیق گذرواژه"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "همان گذرواژهٔ بالایی را برای اطمینان دوباره وارد کنید."
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -79,11 +87,7 @@ msgstr ""
 "لطفاً نام کاربری و گذرواژه صحیح را وارد کنید. توجه کنید که هر دو مقدار به "
 "حروف کوچک و بزرگ (انگلیسی) حساس هستند."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "این حساب غیرفعال است."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -91,109 +95,134 @@ msgstr ""
 "به نطر می رسد مرورگر شما کوکی‌ها را قبول نمی‌کند. کوکی‌ها برای ورود به وبگاه "
 "لازم هستند."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "پست الکترونیکی"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "این حساب غیرفعال است."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "این پست الکترونیکی در سیستم حساب ندارد. آیا مطمئن هستید که عضو شده‌اید؟"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "ایجاد گذرواژهٔ جدید در %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "پست الکترونیکی"
+
+#: forms.py:249
 msgid "New password"
 msgstr "گذرواژهٔ جدید"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "تصدیق گذرواژهٔ جدید"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "گذرواژهٔ قدیمی"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "گذرواژهٔ قدیمی شما اشتباه بود. لطفاً دوباره وارد کنید."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "گذرواژهٔ قدیمی"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "گذرواژه (تکرار)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "نام"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "نام کد"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "اجازه"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "اجازه‌ها"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "گروه"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "گروه‌ها"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "نام کاربری"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
+"الزامی. 30 حرف یا کمتر. فقط حروف الفبا (ارقام، الفبا و علائم @/./+/-/_ )."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "نام"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "نام خانوادگی"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "نشانی پست الکترونیکی"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "گذرواژه"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "وضعیت کارمندی"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "تعبیه شده برای اینکه در وبگاه مدیریت، کاربر بتواند یا نتواند وارد شود."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "فعال"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -201,53 +230,52 @@ msgstr ""
 "برای نشان دادن اینکه آیا باید با این کاربر به عنوان کاربر فعال رفتار کرد "
 "تعبیه شده است. به جای حذف کاربر تیک را بردارید."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "ابرکاربر"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 "نشان می‌دهد که آیا این کاربر دسترسی نامحدود به کلیهٔ بخشهای وبگاه مدیریت دارد."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "آخرین ورود"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "تاریخ پیوستن"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"علاوه بر دسترسی‌هایی که به طور دستی تنظیم شده، این کاربر تمامی دسترسی‌های اعطا "
-"شده به گروه‌هایی که عضو آن‌ها هست را خواهد داشت."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "اجازه‌های کاربر"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "کاربر"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "کاربرها"
 
-#: models.py:406
-msgid "message"
-msgstr "پیغام"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "خارج شدید"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "یک نشانی پست الکترونیکی معتبر وارد کنید."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/fi/LC_MESSAGES/django.mo b/django/contrib/auth/locale/fi/LC_MESSAGES/django.mo
index 246c4cda12ed6056e1789674873d1bf4d3be4b5d..cc25ec328cae5bec96eb0a5e8cb6016008e0edf2 100644
GIT binary patch
delta 1605
zcmYk*UuYaf9Ki88P5<SRCcUa@Qe&sq+MMxndzaRj(}za1H8wP%3jQaIcbnWMce}^!
zq-XnJKu`n)3v1Cnh()gSp<;v+A1o=ziJ%mH5c(n%LGceFs1K$1Abx*$S8>>x&&=-3
z&dhIiPwzXkclBzb>$D<`lW!+~98>Br&fH8vDt0NAL=U%PgmZWvC-FMEnBAb%Mtlc{
z@jaAxu45nmiQO2ZQxEpwpi--9uybP^H}l{i_Tx0(fzRNrcmj9fn;6G6?8S@tBz}pH
z;O<RI9l=F>4jZ@^`+4~+-iJ)AUd2Pqug+58Qa@8XkAL749^KO3(J7SYZ=+0n7PsOD
zC_B1{Y)*ZFtU+Dw-2WE2)Kv<Cq<%qp&+jPXu3?<{Rg9K|q!(r9Lns4AJ8cJL;1tS4
zkKs9vX%6qEeT`Mg(G2sF$1#J`_zG6>8{|?C5w3kWixXJG)gdZtRAl0>kV}0>F@V3K
z>@-Fp3+P8Vib2$vM(H<)qgX`g_ZIHJcQKEj;L|w7hag&%`(O7F|D9B_%s!7tQC9dN
z&fpc?hI=TE;Q`FxYbX<a+Odg5Q(Z>c=@sPI)ek5~@>{3<7s`VFMj4+-5Pu2v&P4l$
zMj4Rov>lX)Od@Mhhf%(Pr%)nMK;ETJqD=e-ax$&d`GH#X5lUI$U9FZ<_jHu+uNC5Z
zQO;6!pCQYyC`lHRCd=e<R4KBAT2iu2YbQjs^-)PQWrwmzNwPWC)JkI=Zy<lys;pXe
zDF3YNC`*<d?IKGE<%5&6l;n^#S^jHDd)lZwaX0xkvixedkmVPXk5bZ2ZQA9OUJ2c*
zu6eeoZLzV|bu!jBU9JRGYkaE<#=2p&zVZF|Na$I2-Zy18*_hw-dThpR4>b9FutHB0
zhC$w=d*Q~ryimKTvhhmV6be;040Yc4eqc3q*D{%_D~zfI)k5^s=7s3omVcrP-5(vu
zrkwFqX1{ivTxNgDnQ)x$x!Ke)_qZ2&fuDMqIdVGdWLo{4`*kLpb0(rw@qyHoZ>^_~
z7_S(VjDFB8w`!xdYW&b!a9=!V$}e~}@ZGU|P>w!}4;~sRT3gAb)3sV{?7wbfzH8H!
zYOv(yZJ4g43rogd4ALda6|?B37rb<`d#2OM=>;$PKK^Xu(Vib;Lr*m8)n&I?x4P1-
zd&isga<k4YZbYANUGM#05JTN~x$jbJgKgGz7+vZgo-DEE<!1ea<<=4-ypmTc@znKn
kP;zzPExRk$8tn)4#L$#XXnbR$2e#Fs9f|AF!1kB^1zmgpIRF3v

delta 1847
zcmZwHPiz!b9Ki9nrSuP_&=#;1tG-rhrFPq0Xi=NeU=&SlBLqm))JC7(*WKyP&NTC<
z*eF?z2T3%>xZwaN#d;#5(!}UNjIJIOOh`!3i+>KHp43FW7)|{ChQ(;&%f9)%c{A_N
z{C+cgqVITr`Rk7Q<BGDI+D*NXQfd;PTEl_zO1)A$@KxM|=kWl3gLh(Ptx^^jumLaP
z4fqA_!ryECJGi)!^9&xvy|_-PvN}g&JsqE77hbNN|AI}N|AlSX(5Tdn*oj+kH*Ush
zY(ayqSi%SKN!*8*a0<Ja>=CrshaX`V>#HAW+)GDYvr-S?B+{i$;VhoUyRez<vKKXl
za{VC6!ZWx5^T<yvap0lVGbr~zSL=TfnM$2N_M~3Jde&E`X~=|cAwTsV2buU|l*n8}
ziNIG#)YVV5^IuWM)pN5f*ou#mzD;-w=OKe7Whe0vp2111BTNBKV_6pXfJQ%Fz}xXR
zlpPN8Sle&}W89Cjkx!6Y)Mf0%?~tGRlY?xig+xn=HlxM?l>4UeCY(dL@7aySe=Cg_
z=$OOT@nLLc6>$!w|9!k3d)lvVbPrB*Zqedd<fpcFkQN-kEFMK!=*^n%qNLzMlm|cG
zLHy-OzobKQ^)1Tz4=6kS8D)Y-;wabKP*Tu|(%)U{@2i~;qC{pCB~o{zr1CIIL>@!g
z=n~2Xj+JSUvScwCaIMJaC<C~he3m<E7bHzm<mu{?mQuH&d>K+CU9x~YguD|{c!uPY
zycv0A)F4&9oa?A%BA%3;9Jf>ZsA;OEO6k2y@-5ezNh)Obl1qt#lp*R!(z+S}3A6l#
z3{WL<QiiD#jcbL^y*GJr<ZYGGLmj2cJ8>&DL#<ym^)IE$_XU2u7^=zAq8~)Yi*(LJ
zmUB;=T+WFc-_wz=qk`3oHYhn^NKdFs#*2;XE^9+a-m|$uZgD~#hc?hh9M{#x4Sk)r
z5e@f0L-PTv*qqF2&D@rP&dUyT!48Kk!W@n_^m4<g)i)ZRPgRaJJ$_jC&lorF&u*Uy
zjT=G1K9O_sHjHNbwI9fu$^OQTE(CUdPwyg|I^qYp;ogb4g7NZfz1E}W{h%~HY$jH(
zG_6TBlx!H9eC7M*v!mH`W>-2ps<XSsvLortNG7xH!2a|>yX43Nr|%&sV|r&Mo7|Tf
z(b+r3MzWR9*L7~Y-*_Io9$!e@>slvg-66-D_bcr!T@B+8_@14pEVj(7pJp$y$urTs
zv-(-fl~m)w<wB{t5>?K$c9-`BPBFCBBess`L{Ypz+jojKE`|<G*9ogDG<C7MvK&R#
zm4)hx4vo>J<?1`3E*hs;bhPKNyr%;umO;t*oQ($cf}dPqP)L8Fy23?oNKHAxf{CNp
zt6XYbO@*tK4d+sox7&i;A!cO}U5fpjPniCdh1hpZl7?bv(*I;4GPSKS=>JktisQ%+
aUB6_CHj0d7q0-a-$J!-_Ojf!&p8gx45J)uu

diff --git a/django/contrib/auth/locale/fi/LC_MESSAGES/django.po b/django/contrib/auth/locale/fi/LC_MESSAGES/django.po
index 32febcf0f36..9419a89614a 100644
--- a/django/contrib/auth/locale/fi/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/fi/LC_MESSAGES/django.po
@@ -1,79 +1,86 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Antti Kaihola <akaihol+transifex@ambitone.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Finnish <None>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Antti Kaihola <akaihol+transifex@ambitone.com>\n"
+"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"fi/)\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Henkilökohtaiset tiedot"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Oikeudet"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Tärkeät päivämäärät"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Ryhmät"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Salasana muutettu onnistuneesti."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Vaihda salasana: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Käyttäjätunnus on jo rekisteröity."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Salasanat eivät täsmää."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 " Vaaditaan. Enintään 30 merkkiä. Vain kirjaimet, numerot ja @/./+/-/_ ovat "
 "sallittuja."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Tässä voidaan käyttää vain kirjaimia, numeroita ja @/./+/-/_ merkkejä."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Salasana"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Salasanan vahvistaminen"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Syötä sama salasana tarkistuksen vuoksi toistamiseen."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Käyttäjätunnus on jo rekisteröity."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Salasanat eivät täsmää."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -81,22 +88,18 @@ msgstr ""
 "Käyttäjätunnus tai salasana ei kelpaa. Huomaa, että isot ja pienet kirjaimet "
 "ovat merkitseviä."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Tämä käyttäjätili ei ole voimassa."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 "Selaimesi ei näytä sallivan evästeitä. Sisäänkirjautuminen vaatii evästeen."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Sähköposti"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Tämä käyttäjätili ei ole voimassa."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -104,103 +107,127 @@ msgstr ""
 "Sähköpostiosoitetta vastaavaa käyttäjätunnusta ei löydy. Oletko varmasti jo "
 "rekisteröitynyt?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Salasanan nollaus sivustolla %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"Tätä sähköpostiosoitetta vastaavalla käyttäjätilillä ei ole oikeutta nollata "
+"salasanaa."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Sähköposti"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Uusi salasana uudelleen"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Vanha salasana"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Vanha salasana on virheellinen. Yritä uudelleen."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Vanha salasana"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Salasana toistamiseen"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "nimi"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "tunniste"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "oikeus"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "oikeudet"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "ryhmä"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "ryhmät"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "käyttäjätunnus"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 " Vaaditaan. Enintään 30 merkkiä. Vain kirjaimet, numerot ja @/./+/-/_ ovat "
 "sallittuja."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "etunimi"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "sukunimi"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "sähköposti"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "salasana"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Syötä muodossa '[algo]$[suola]$[heksa-digest]' tai käytä <a href=\"password/"
-"\">muutoslomaketta</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "ylläpitäjä"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Määrittää, pääseekö käyttäjä tähän sivuston ylläpito-osioon."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "voimassa"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -208,53 +235,52 @@ msgstr ""
 "Määrää, voiko käyttäjä kirjautua sisään. Tällä voi estää käyttäjätilin "
 "käytön poistamatta sitä."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "pääkäyttäjä"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 "Antaa käyttäjälle kaikki oikeudet ilman, että niitä täytyy erikseen luetella."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "viimeisin kirjautuminen"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "liittynyt"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Erikseen mainittujen oikeuksien lisäksi käyttäjä saa myös kaikki niiden "
-"ryhmien oikeudet, joiden jäsen hän on."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "käyttäjän oikeudet"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "käyttäjä"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "käyttäjät"
 
-#: models.py:406
-msgid "message"
-msgstr "viesti"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Kirjautunut ulos"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Syötä kelvollinen sähköpostiosoite."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Salasanan nollaus sivustolla %(site_name)s "
diff --git a/django/contrib/auth/locale/fr/LC_MESSAGES/django.mo b/django/contrib/auth/locale/fr/LC_MESSAGES/django.mo
index 0edb77fcb34b084f2f98a6d7ffcaec8659bfec86..a6dd7dd6d98f39463b1eab050f4196f21c9a7f38 100644
GIT binary patch
delta 2455
zcmZXUTWl0n7{^b!)1sxN$W7n~A}!M0Z2`ejsUU(xus~wGAd>0q+3vvX&N63)!c*}9
zjTaKg1TP^H)L?`NniL<1QA3(wLQFu7J{Y4s88zyI!3TKJ-?uyE5>NKb?_9p~op1i%
zH~ZzH3z@;6n#UYbw3YO`=~wHN>V;p8=0Te<R;e~P5l(?i;AXfUJ_z5027Uv_!4*7a
z!ydQ<ZikKVFsz5~z)A2!I76vHbuL}_7EWN}3Y-jogLB|@I2Fzquhd+ag$=M5-T}A4
zr=SO4hv(s=@M)Yq4v)d-;P0>xuAivX0(c7ca=*IFfJl@kymhb(N+2)5?eG=28vY82
zMJ?iXj;IbOb}Lh^h5Xbe9(TfLAV*XYB95|9&hLX`;C|WXesw?w@DLQoM^l3nP%b!?
z?hiqJ>T@3A;35<$FF{f4$8`PAbpAJ#^P@460470}R5LtGn&-g5HWofcN0IsmxD8%|
zkHIH-jS4&l#Ze=Pybn%?>tPRUf-gaQskdMYd>`HmKZQ~=SJM5fP?WAC+Ieu+Wb~J!
zTg5^<+y*7Wm*F&c1ilAP!^?0Bx4jDIHP?6sTIOBc;=(g<F>EG^=V1@L3m$_n!cU+C
z+)Y94gilOG{~iYCSP+S>K}p5G5Z|hv(-P2ZDDyVRmg<Jonc4~^r_ZKy2TBS(DCaB`
z1qPvfP)W)+peS}!Hsrz&pd1*2;_wS7MRWm9hu@|9e?d{~I+Qn=hD_q94Wh1k0Fv5j
z8YER>i)poq-Tm}Vx&%`V3}vgiS_Gx2q#i^<X%dM1FU+UQWh3pLbdZHJ>5@8W%jw*&
zmeD)t^8Y|7sV=(ISB5U?jI>$u{VyGvrOd%rx~Q^(E`KKSz24fS7)7mxbV-XSBy9=3
zszP<fCk^MOV<|Xkk~V3g?hLUWRh`!IKXvHsF|XA%ZYWiPFmlR~&O4E@$!Fu<ZD_S#
zWOkIDl4(nJjE@JM0bOyd9SFj_)lO)1If%54g3#m_Ya8gOXjt?t>w3W1r=vhyV_0S>
zwkBL?Z=7GO`{GFN3u5g$W$hN7a=#dw8wMQk%Kf_A(Z$dd9-7C+Q>!;;=dG$bECgYx
zJL{}Uz8?QiYkwHT6?^k0-Dmuu+|Npo(W|SM>jBUAlLO-xGzA4sL|KB>)pMET{DiiR
zre@{1ZV;ma?-{rrQsg-p6>F|dd&%*9?d0>Ju~tGC1sI#?w&0UrCKQqr6Hhlget!^h
zyrkTsad+9clx(SgXnxVLMTNGZ6L~?|D&Mh@_Je+}TpJ>Ja<aa4wBtv~rTVoED85S<
z92cpR=7tT+I@@zg+B=r&T&}BQX?t#YE?2*~w|%SG<5~Q*uO;j*-I?pC+T~X0j?S*!
z^5js%v{|n2#CcQE-L=8PoqK(+FEp95iIVdT)7P~Yqo~rA%?=C<WTMb1Td!dD%5Jt2
z20M)#*=!}7-$}ZHtj{xc`c1YFX4~pFrn4?x2$P>1whgVHR5z+gLb2K#DJ}}DuJLSL
zob)!%)H)nK>6N|6b9~PZpVT%E^@3Y#?vKWcgBv+s3L>lXwc4QQ47Emvs0eM!q3QQ*
zgeRG3-pUIXYuD)Au_u-l6P8Gh*ya~Hg@Q*OLhT#zdDA7nU995BBN8Hx@j<2ue2cFQ
zxv2!!dVL(jl4q@6L%A_MLp-;Z>PV#$h}3B;VHv5`j80ZJ9UNNIG^TDxwfK0wyu3}p
z@g&SJ^8Ob~Mn7Ww*lTw^9rUq}bri&wKsXx)UQL|pl4U7%n@LtTXQolsZcwU3CM{@W
z9zL$!<Wkd|){5a16lHGB1L~meZSo|g=Hto!DZ{gGRI^bwD3z*exC9>#pY=_$re#x$
tDOEz_l_NuS51*`+cXF_0X7W)>+gQh^Sd#Bsc2Aa4Mr2Ke?csw`{{g>21h@bI

delta 2003
zcmZ{jU2GIp6vr>M6#7N6lmaSvtu3Xc+wRhW+7v_tX{CIGU^FR>nX<RrX=Z1Z`6&36
z#i;P0LE=QCF@Z`Sh-sq68jYG5Q;aC6X<{PrL47km5fkH!3DMt~T@p<6WX}BVJu`F9
zx&L$L%kE2^#h)81Usc!^{0{t^MM@39r*GkgO;;+_0pEfv;1zfP{sQlV>BUMJI0>uZ
z0$dBP!e01iIo`p;2Igt_4BQTDlq#yv7}OE?8m@sql;^+0rOdCx<*;grQtRL<xDsxG
zO>h|2LJQWzJbV;B1$V*k;U2h##STLQ+u%H0Lw@xegNF!IR4eru9D;<@c{mDZ;RCRm
za;Zh_f%5zyl*A)&8O%X0HN}lht7oCSf2tfm4OvRP0jWvNz)JF~Sq8G;dyq?g%uN>l
z0*W#VP!#wHqPn_Pp8o;myGmY`g!OQg_N{;&%#ZT1DE1~CfuF!Z*o;gC_&6-e0t*b*
z!yn;pDBF<=2jQ*o06YiBpcGU=BSrcK*a};roQ)wU&qtxOauT+{=gYhR?`D1($_B4B
zp#Lfce-W60jcoHp_+gnl$R05N4tBvEjZ_akcoLq3KCCCZ6nX+q!dKw^@H!M_wo<Jm
zd=T=9+7IOnjWwaa?DRMR>D37+^HY#-)yq(Rgqd>uLV5l!l%38&x}ZLXlHdwNBy|<8
zhQF5Me?$4ZYRM{vZh-QAe~|$#OH_~^-!S<dr9vq}K9qinwU?kWu%bNP2&K<rx8agN
zHX%C~lO4-1Dbh=^q9pYsN)}N*u}$2imu+|o*SMJUPpr3u<bFGMss2t}&W~6(-j|F@
zzoDFTQLYmgWyN}MQR#+pM%E{C$>9^b3*U^3bQ|zAE+<~iEnfW6qQkp=FDe9TC|~gW
z&~ihawL-(()mAoZhqmYH(9_|B(FNn@?I0i$=)C1dmg793Edn{$WV?994s;Y4Umvp_
zM_W$d#X)u3iku|S6Q(C%4PLR`?s&TDe7tu_6rWq#89%r5tN5Mj*0`l+?2v9Bv7DSY
z+By<gP6#H<@vNOQK{(p3JzthjN*S>9gm1>TwiL*J%=5E7E!&PvSZ<Cg%Mm^9`T2n!
zYg=5bc|YD+I}o3#U0IbkL15+Lnc5BULhX)tUESb#CYA0@Wj5<fZ-1sQmF`QYYYyyB
z9W+z6Y&EqLIr{acbS8N(-KR76_V;Brrm>n~D+p7Ee9H|SEA;$+{jlY_Y;j;R;daN^
zS>tru?zk6!TerGuV4vrjZSltXk-A}ujjS9?kNa~k)K^p#lSZJtBt)ef{UEZ-)deRC
zbe8zdO*k6a+Q9>lwn;~f<Cwf*QtHaZw@uKckC;$Lq3zfK3rD{8%@H%@TiS|f9lebt
zonzwl%a(Ozk=G-WLn!GRw4&ojS(%b(YN25Hp-qZz9lzf2!97M#d7*D~-s9ku#5ZcM
zO`9%G>q(Dv+2~&nbwI2wKDGSvTubAbMR9XeM|`&FZ1It#Li41apPirn-$O7zJ^!ip
zBI?usbp)j4kz?5uL@}iUk?6tf<_hIlbgO+{UT51&(!_%+KZ@5j568vk)k{i;#Kf;P
KcgB~Ry?+2{WO@$(

diff --git a/django/contrib/auth/locale/fr/LC_MESSAGES/django.po b/django/contrib/auth/locale/fr/LC_MESSAGES/django.po
index 3627dd2807c..bf576ed7826 100644
--- a/django/contrib/auth/locale/fr/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/fr/LC_MESSAGES/django.po
@@ -1,81 +1,91 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+#   <claude@2xlibre.net>, 2011, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: French <None>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: claudep <claude@2xlibre.net>\n"
+"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Information personnelle"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Permissions"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Dates importantes"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Groupes"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Mot de passe modifié avec succès"
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Modifier le mot de passe : %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Un utilisateur avec ce nom existe déjà."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Les deux mots de passe ne correspondent pas."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Requis. 30 caractères maximum. Uniquement des lettres, nombres et les "
 "caractères « @ », « . », « + », « - » et « _ »."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Cette valeur peut uniquement contenir des lettres, nombres et les caractères "
 "« @ », « . », « + », « - » et « _ »."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Mot de passe"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
-msgstr "Confirmation de votre mot de passe"
+msgstr "Confirmation du mot de passe"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Saisissez le même mot de passe que précédemment, pour vérification."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Un utilisateur avec ce nom existe déjà."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Les mots de passe ne sont pas enregistrés en clair, ce qui ne permet pas "
+"d'afficher le mot de passe de cet utilisateur, mais il est possible de le "
+"changer en utilisant <a href=\"password/\">ce formulaire</a>. "
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Les deux mots de passe ne correspondent pas."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -84,11 +94,7 @@ msgstr ""
 "chacun de ces champs est sensible à la casse (différenciation des majuscules/"
 "minuscules)."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Ce compte est inactif."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -96,11 +102,11 @@ msgstr ""
 "Votre navigateur ne semble pas avoir activé les cookies. Les cookies sont "
 "nécessaires pour se connecter."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Courriel"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Ce compte est inactif."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -108,103 +114,127 @@ msgstr ""
 "Cette adresse électronique ne correspond à aucun compte utilisateur. Êtes-"
 "vous sûr de vous être enregistré ?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Mise à jour du mot de passe sur %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"Le compte associé à cette adresse électronique ne peut pas réinitialiser son "
+"mot de passe."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Courriel"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Confirmation du nouveau mot de passe"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Ancien mot de passe"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Votre ancien mot de passe est incorrect. Veuillez le rectifier."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Ancien mot de passe"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Mot de passe (à nouveau)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algorithme"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "itérations"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "salage"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "empreinte"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "facteur travail"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "somme de contrôle"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "nom"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "nom de code"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "permission"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "permissions"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "groupe"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "groupes"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "nom d'utilisateur"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Requis. 30 caractères maximum. Uniquement des lettres, nombres et les "
 "caractères « @ », « . », « + », « - » et « _ »."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "prénom"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "nom"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "adresse électronique"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "mot de passe"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Utilisez « [algo]$[salt]$[hexdigest] » ou le <a href=\"password/\">formulaire "
-"de changement de mot de passe</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "statut équipe"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Précise si l'utilisateur peut se connecter à ce site d'administration."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "actif"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -212,11 +242,11 @@ msgstr ""
 "Précise si l'utilisateur doit être considéré comme actif. Décochez ceci "
 "plutôt que de supprimer le compte."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "statut super-utilisateur"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -224,43 +254,43 @@ msgstr ""
 "Précise que l'utilisateur possède toutes les permissions sans les assigner "
 "explicitement."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "dernière connexion"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "date d'inscription"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"En plus des permissions qui lui sont manuellement assignées, cet utilisateur "
-"recevra aussi toutes les permissions de tous les groupes auxquels il "
-"appartient. "
+"Les groupes dont fait partie cet utilisateur. Celui-ci obtient tous les "
+"droits de tous ses groupes."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "permissions de l'utilisateur"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "utilisateur"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "utilisateurs"
 
-#: models.py:406
-msgid "message"
-msgstr "message"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Déconnecté"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Entrez une adresse de courriel valide."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Mot de passe réinitialisé sur %(site_name)s"
diff --git a/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.mo
index 3e22ce4fcead2b597fa4f79e3b7564ce256beeee..32e22e864f9ab623792fe641259f855bc7982269 100644
GIT binary patch
delta 49
zcmbQpJdt@qqkxgFfw8WkiGqQFm7$5Qf%(LV+5A3<dFiEz>8Vx<X_fJQJ`;aOPflah
F1^`;_4^IF9

delta 50
zcmbQpJdt@qqky5Vfw8Wkse+-gm7$5Qfyu;)*^_w~qxgLi^U_Nb(^IV!(kkQqd?u$d
G>Hq*-ehy;*

diff --git a/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.po
index c011b2a42c4..171cffded07 100644
--- a/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.po
@@ -4,241 +4,265 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
 "PO-Revision-Date: 2011-03-15 15:33+0000\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
+"Language: fy_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fy_NL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr ""
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr ""
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr ""
 
-#: admin.py:31
-msgid "Groups"
-msgstr ""
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr ""
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr ""
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr ""
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr ""
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr ""
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr ""
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr ""
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr ""
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr ""
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr ""
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr ""
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr ""
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr ""
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr ""
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 
-#: forms.py:108
-msgid "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
 msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr ""
+
+#: forms.py:249
 msgid "New password"
 msgstr ""
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr ""
 
-#: forms.py:177
-msgid "Old password"
-msgstr ""
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr ""
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr ""
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr ""
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr ""
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr ""
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr ""
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr ""
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr ""
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr ""
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr ""
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr ""
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr ""
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr ""
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr ""
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr ""
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr ""
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr ""
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr ""
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr ""
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr ""
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr ""
 
-#: models.py:406
-msgid "message"
-msgstr ""
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr ""
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr ""
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/ga/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ga/LC_MESSAGES/django.mo
index e54228a2cb9dfa29310f27f1e75cca15671961cc..1f2bc5ce230d879968cf80a66753f816e3b4b688 100644
GIT binary patch
delta 1309
zcmYk+Ur19?9KiA8G|kQYUuyno<)8dF@11{87Zs7MBr`E6A)~JIHZ|RrySa);dg(<1
zVHEZfm<CZ4!X64jNPH>k#h!WyAA@>`h#-iHzQ1*a4*Q+Yxo79zbI$MV?oRD`<@9=f
z+HFPg5@p0<ic$x$F_ntak)~7~c47erun%L{iLcN^$0nuHaRkdTj4gNzb8rQnxQ1Ey
z0ZWvcR-f#SRPNr)7rB^=C0K#=xD~t6g=cXKUcgg$1rOmG9>t;zr3Nv8)%X&bNPR><
z$|N$+VX8CCuli^lpyMg>4D}WHs2@}^p~_S$8?sP#P>QTs)u4=TwEJ6-kJ?8?Qq&QY
z=Nv=1?<C6e43rE^U@r5kt2E?>8R@`TlpE(!CVGU+9Lo}FT!(l{G2X*|e1@`PCr>pn
zh-_B9#(G@Cz4#0B&`0{@NP2Ku8iO<>MdK&~ZlbJo4&}@jaR)v}Ig0lv3;TjH{yRo6
zoiv@m7!KeYl!a9>Ne$k>N_>d&{o5S!FAJz<+Y{J^y|{pqvTw+y)o(1s3}%z@Whe`5
zL^*;E+x^H#`KcrW11On2hce!@uP>r(U@DLNvq*J~j%_$&54?~0Tt7wTRx5V@JLDvi
zMRp>k_8+PUs|m^EE~1VgF{+f%h$`a$B5z5toWG=0cCk@*+YQNpEKYt4Qe;OCLUtmH
z@(@zwwUuL%vu-4$$l{xlEv2^G3UUmRk&V*nrqw`5TG?DOE%MsQ>o2L7bJvNTgk*@{
zQ1ZW`FmX3+HYKNfA`+gojF9CXHY_t5UrwJ*3}t*yi9g8v6MyVnYHRlBEgo;HTi1Qw
zR*&AU>(0L8o_=#`G&&j%dAhjE=Wf=$$#Hsz+uQ8Z+vBsYiu4|Hbl4n^KXEnqYey_A
z;?uNPEY@UA8lmXudGm5p$h5S`WO&RBSWzva4UZY2U|1WczGMVVEof+U&K~>9=MEb2
ub=T>HKdao4*R?ut8E$KJerUu9SVmwZ{xf?a@gk?)k?76elM<gRxc(QT1DMVL

delta 1874
zcmaLXUuYaf9Ki8On#Lw+`Y+ZtrmbVrG)>L*?wX|3kOV79OGt?&RTN_?)4RFdEqA+N
zcdu2f9>s^^iv)t&3I$`IN>Rl4Vg<pTAYvZ^1qH$CllY*b6(3XtzrV}op(qZS`^?VH
z&iv*#ySd%<`rgXzEe)?J%0cQ5>diW(Ch*)EekgA>DAkLL*oI%=ar_n^#>`r!ES|<j
zT*jUF753xrNq;XlH*%f97x58nR;r>trm>!m&#@i9Os;>ybzJ|Ao3Qa7rFP*q+=>VB
zUOa{^Xs{Ja_$0o7<9G`vv7O1DL5tmZ1KU|&{XpXg9raC0J%tlUmwFp#@fse+Cc-5a
zHHmV68fD=b+<*@9r_S)hrqy|r@fVW*SCOgIB_t+w1shmjU85lrzK8s&5BZUaKSjyR
zGD-%%L9(uXPOg7Ld9H!MvS2H|%<;8hn(H@scsqWE)A$`q2Kq^p!FjAmBzI`+!#{BZ
zyV;IJp2N*}8ehV5C};RrVha~?WF08u22lb(it?_Uzz5JlIkF2V@5W`6fIr$u{^h|>
z=$OM>cml`Rt{lZhl!$-DJvhbSE-a(mzl1Y*2YFOYZQ=a!Bu?Q?BuT1+Xe9M}P~Mpg
z%J}g%@-GoTL5J+vB)Z6)DnQB5d1TY-6_g{mi1OU!<oYVgj^0HX_W|CARg`gGBeAIO
zk-extlK$oj;c#SX8&z(s7Wo_{WsIwRmc7Z1p2RHHC+&w&z6>e%QzdW-S^|<H3rpH1
zbCQids$@X|tVkN99H8!|c2iSSO_kEQLhV~lnyP~a?^5k-<pq?opE^)$t$c=(Zuu7?
z@0Da$N}4L!SS`Feowany*-CkkI!Kkbb}uzUZCJ`S%-2<phCz8QQWK@QAdHP4>%56A
z*S<FSycc_cuj4?+uGMokEO}8xPozu6FPmcVd2Q%$e4FoMh!^Q{WJ7({D;BjWMuB#0
zOrv<$qfW>wHZQYUliTWQM<UR!O-C%k9G<^_VR`L*8&jVR!n_V`#5Baw9W9+~{ITwF
z-7{l~PB6QBCNjksT>D(!b8HmP_UIs#AZh^*8|{X+Fw!}fOqK2&&AG;R*vsnVg&-^q
zr_Jcn__{T9jU^jJ##uPh^!{KrmFZ7q2X(f8C_9kK3}iCR#~({g+cTbIAT>sohV+3<
zwl*#^ptFaD2C@sO=3NWZ&HEaMrvl%OF5GCIS$~WL%f?}}W0rQb?5Zc_)$4Ocja3(8
zqvPu0Dc9s;lXKOhp=JL?`SFd;S(7(9GQQ8SVs+6gxwcOijOVzPPHlW$y&ln@w}BVx
z$dYenx%;_%AX7QD6|3)Pqffcp3uUjUqw3XkM2{E69D`fS`ef^sorhyL3UZ;Wq6<OJ
z6lKNGY7<KSe`-Bc|8(`u+N%G141RS<|5yG^?EZW10`ae$Lf58|x(&5}Vp)~I;)Q27
GSN;JL6Hes-

diff --git a/django/contrib/auth/locale/ga/LC_MESSAGES/django.po b/django/contrib/auth/locale/ga/LC_MESSAGES/django.po
index 36e7cd45a18..0b5bf952a15 100644
--- a/django/contrib/auth/locale/ga/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ga/LC_MESSAGES/django.po
@@ -1,82 +1,88 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Irish <None>\n"
+"POT-Creation-Date: 2012-03-14 00:14-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"ga/)\n"
+"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
 "4)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Eolas pearsantach"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Ceada"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Dáta tábhactach"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grúpa"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Focal faire aithraithe rathúil"
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Athraigh focal faire: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "In ann do úsáideoir leis an ainm úsáideora."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Níl an dá focla faire comhoiriúnigh"
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Ainm úsaideoir"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Riachtanach. 30 carachtair nó níos lú. Litreacha, digite agus @/./+/-/_ "
 "amháin."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Cathaigh litreacha, digite agus na carachtair @/./+/-/_ amhain le hadhaigh "
 "an méid seo."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Focal faire"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Focal faire deimhniú"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Iontráíl an focal faire céanna mar thuas, le fíorúchán."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "In ann do úsáideoir leis an ainm úsáideora."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Níl an dá focla faire comhoiriúnigh"
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -84,11 +90,7 @@ msgstr ""
 "Le do thoil, iontráil aihm úsaideora agus focal faire ceart. Bí cúramach go "
 "bhfuil an beirt acu cásíogair."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Tá an cuntas seo neamhghníomhach."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -96,11 +98,11 @@ msgstr ""
 "Feictear nach bhfuil do brabhsálaí réidh le cuaiche a glacadh. Tá cuaiche ag "
 "teastail le logáil isteach."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "R-phost"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Tá an cuntas seo neamhghníomhach."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -108,106 +110,128 @@ msgstr ""
 "Níl cuntas in éineacht leis an r-phost sin. An bhfuil tú cinnte go bhfuil tú "
 "cláraithe?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Athsocraigh focal faire ar %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "R-phost"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Focal faire nua"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Deimnhiú focal faire nua"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Sean-focal faire "
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Cuireadh do sean-focal faire isteach go mícheart. Iontráil isteach é arís."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Sean-focal faire "
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Focal faire (arís)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "ainm"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "Ainm cód"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "cead"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "ceada"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grúpa"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grúpa"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "Ainm úsáideoir"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Riachtanach. 30 carachtair nó níos lú. Litreacha, digite agus na carachtair "
 "@/./+/-/_"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "ainm baiste"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "sloinne"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "seoladh r-phost"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "focal faire"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Úsáid '[algo]$[salt]$[hexdigest]' nó <a href=\"password/\">athraigh focal "
-"faire foirm</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "stádas foirne"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "Sainigh an bhfuil cead ag an úsáideoir logáil isteach go dtí an suíomh "
 "riaracháin seo."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "gníomhach"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -215,11 +239,11 @@ msgstr ""
 "Sainíonn an bhfuil an úsáideoir gníomhach. Míroghnaigh seo in aineonn de "
 "scriseadh cuntasí."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "stádas forúsáideoir"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -227,42 +251,41 @@ msgstr ""
 "Sainíonn go bhfuil gach ceada ag an úsáideoir seo gan iad a cur le go "
 "díreach."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "logáil deirneach"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "Dáta teacht isteach"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Breis leis na ceada sannta láimhe, faigheann an úsáideoir seo gach ceada "
-"sannta do na grúpaí a bhfuil sé/sí isteach in."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "ceada úsáideoira"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "úsáideoir"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "úsáideora"
 
-#: models.py:406
-msgid "message"
-msgstr "teachtaireacht"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Logáilte amach"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Cuir isteach seoladh ríomhphoist bhailí."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/gl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/gl/LC_MESSAGES/django.mo
index 20a61f1a056596e9215b70e4ca4530a793351edc..ddda27120ba36f161c890641007ff417f4ad2852 100644
GIT binary patch
delta 1403
zcmYk+Pe>F|9Ki9nW@YY{soDQO(;xq=wa%<2)+$70rf4M=h5bP$9k-QrR(8hLim)yQ
zT{5Pi2rrR`N+Q^TAc8tXmx8=i2eng|f^Jbk^!=@C^w{@4Z{ECle}3=jukssPhNp^h
zZz@tXc`bRur_^3-m`6cs&Q&UiEm({Ww&NAti679yqWMZKz#&|R!&rl3Sb&q5kDoDs
zUvU-P)X!`~F<<BLLc^sP#Pt}#670kcm_R>X!^L<9kKujXhrWeMwc>s}i5`~XcVt4f
zoJpF{z&z$xDJrLExP-fL3K>gji)I&8jxwQvORxcDC#}fZ)lroGC$sI{$WPf61V;@a
zL#m4?-;JP*cO3)Fug0jzjvt_W@I3qc66M25l!-p!IL9-CA)ZGVWd%OL1Natq;cDXB
zhsRNl>@~{qe#BY~5Vk_xgTqoeLPZwPiyJY8MR*%!r4uL<J;O45k8)RjWS^H27FlRL
zF2hC~!A@+!8I;IYauJdk$89)WK>Sxz2{3yrmLtcc9F!xufCup-N{B01t-RNfCRK-W
zCz??rcLpU={V4q%l*@M>Wr0^w`gtfDyH!a1Wx#vc4im^vJ*AKxzd?CFjS|W)C<FdR
z8PHFdIFU@+LMeTMvyW;eO0;Byo5_`A0+xxKfpRJ3{{2gG+cP&5W%YBZB3qHmLnJd3
zOOq@thb%jhXjG9U$)BGb!&Y*LEJ==2&(xG!lT~Obr;w1$B{_dN8`&kB%!E@yEdLI;
zcS<9N$(zU$A?{S>a+RcS=Z^XcTKWePN!PSpt;cjN$9u8huD`;GxmK5L_FKVp*TQc;
zZ+y`o?_vJq+Uk%|6AEwF3?mY*4H<QYk>7qO)M1^CIkAKtYGj0nR&9hc{fr%2xH@9g
zd87Un8`~_??nx%J4l6on#i%sIXIrY0vn^iQU)of0#&riGx}Hj<s@$Y$JF#ACsLHln
zeIS|Wv$|bJAJBXHOgoy;<CKGD)Y7AIJ(%B?eTrz&xHsiLk!}in@fETl)6rscTV#9h
umb@z4YxbXxCA1z(>rU8A<HT$;u35HL`rpQ#^rM3Mob=(M^*--h@#Vji=D6(u

delta 1869
zcmaLXUuYaf9Ki9p^m5JL{);ijztfmMjpmZO{G-Mg4cL^JTHCZ>HRfS@JGtAkcbn|q
zrEUCk>VpNrB02jY1-13Dh{ZfqUj(&2h*k=MKB@7^z9<$EK@j}@Hdj;-hs=FuXJ==A
z^PAng*7-+I`MVwQGm0`wy`B0+OsQ#nW)nY@x8h3m;yG-=&+!0$kN07!Rw;|eFo9R`
z4*Uj(@V9DzFE_Vxox*4FA#6~ptUjdCM8{{?j$c==f5AGg|HN&W*sRo@*oLh*iZ|gt
zY(#_2n8(NQY21Tf;S9Dj*;8n-3qQto)>qePOwmzOuhbEoM!M8_oW~0|iS>j_ENTYj
z{w&JEbGQYw$e&u~hfS*&P{yCC_Mb+kQm-R1skbrC`sxA=neZa=r#|3ECccc4nX4!n
z_!h~!`nh`jE6Q_m2FrrYIM4C5V3O-49&W=o@lm{l4`MB8I);0&EN6O=#voqC5&Rt`
z@+8~Zj>C8gr>fUqq6D;#JMlX1z!nZz0`Epyco4hs5tMgp2{oQZ3H;ry<X_J4eL7yk
zD>#jZnO#!;1_ro}eRzmyZpG(u2G634Kcb}cAW_JXJ%Ri263Rvr>{9MGqXgcHcVTx6
z`InSV(IF|EL3!XH5{o*55@`-)f+dvkCsB6#T($pYlyR#_Eb1&u2HvUO{}lOCSNM^6
ze?S?3UGmS7MS~@>8$~`xdCTP?NnI~hO3wx=jWyNwy(nLX6v>VRAi>Ipq>zN@le`;w
zWui<<)^DbkB^oJ%)J|#_HA&S}DIFU`-*UC7Zll4w6s1shA*G)>9JMw+LwVEXU&uXF
z$*7b8s$}g(;dAeZKArAr&rXyV@D}PWYKj_Pn~c92EAI{b(qgEl^NW5^G=-veOwn>(
z(8h7xqU#rQ(bvVC)r&UByJ1LAsPm>!GM;x*8#=ND>+~_i4RtBBfj;hfo;F_S>#Qx(
z@c#8^HeeO&$gI|6T5~!p5$K#92w8+V+(Lh4z4rXtD~X?Chjq`K@v{DW=UiyKBIN7|
z$IaTXINziFKo*RG8#g)^*o6l=7K!M%A2<UY6PcVTWQn`lqZj-jKR#e4)=G7oVu`#B
zLzAs6*S|NCPNs&E=@FeC8cPo+Q^ToL!-2<=vv%2)-6kI<BV&3nm5#=xcI))+v7yn*
zd_!B)0?F|8IIOHx&NOr-#`pULJF(h0*R+qtOD4;cS#Ryh#%r;}-k`MThn30Zmhz-y
z^M<`TeppQo4I`;E(zTJ^yd_b6n!Q@~Su%l3M*S5Nd~!}ZY}=Qi|C}J>7c$myrQ7I?
zaf~h%q9wA?%Gz*asYFKVY*4g}?XMha{z%WVf;sBhjFoKqnrVsw!4!<AcXfrmYhzpP
zuUWAFe-tHMD!QJVkqQ3mFeLdUFWLjKXH5PmyOGx4i$!O%w5=nynVpB`gsrS@fAKG*
CjYpIK

diff --git a/django/contrib/auth/locale/gl/LC_MESSAGES/django.po b/django/contrib/auth/locale/gl/LC_MESSAGES/django.po
index 710307f1054..c21a6590da4 100644
--- a/django/contrib/auth/locale/gl/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/gl/LC_MESSAGES/django.po
@@ -1,79 +1,88 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# fasouto <fsoutomoure@gmail.com>, 2011.
+# fonso <fonzzo@gmail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Leandro Regueiro <leandro.regueiro@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-08 18:36+0000\n"
-"Last-Translator: fonso <fonzzo@gmail.com>\n"
-"Language-Team: Galician <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"gl/)\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Información persoal"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Permisos"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Datas importantes"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupos"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "O contrasinal cambiouse correctamente."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Cambiar contrasinal: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Xa existe un usuario con ese nome de usuario."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Os dous campos de contrasinal non coinciden."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Usuario"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Requirido. 30 caracteres ou menos. Soamente letras, díxitos e @/./+/-/_."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Este valor soamente pode conter letras, números e os caracteres @/./+/-/_."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Contrasinal"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Confirmación do contrasinal"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Insira o mesmo contrasinal ca enriba para verificalo."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Xa existe un usuario con ese nome de usuario."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Os dous campos de contrasinal non coinciden."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -81,11 +90,7 @@ msgstr ""
 "Insira un nome de usuario e un contrasinal correctos. Teña en conta que nos "
 "dous campos se distingue entre maiúsculas e minúsculas."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Esta conta está inactiva."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -93,11 +98,11 @@ msgstr ""
 "Semella que o seu navegador non acepta 'cookies'. Requírense 'cookies' para "
 "iniciar sesión."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Correo electrónico"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Esta conta está inactiva."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -105,102 +110,124 @@ msgstr ""
 "Este enderezo de correo electrónico non ten unha conta de usuario asociada. "
 "Está seguro de que está rexistrado?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Restableceuse o contrasinal (%s)"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Correo electrónico"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Novo contrasinal"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Confirmación do novo contrasinal"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Contrasinal antigo"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Inseriu incorrectamente o seu contrasinal actual. Por favor, insírao de novo."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Contrasinal antigo"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Contrasinal (outra vez)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "nome"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "código"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "permiso"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "permisos"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grupo"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupos"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "nome de usuario"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Requirido. 30 caracteres ou menos.  Letras, díxitos e @/./+/-/_."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "nome"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "apelidos"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "enderezo de correo electrónico"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "contrasinal"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Use '[algo]$[salt]$[hexdigest]' ou utilice o <a href=\"password/"
-"\">formulario de cambio de contrasinal</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "membro do persoal"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Indica se o usuario pode entrar neste sitio de administración."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "activo"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -208,53 +235,52 @@ msgstr ""
 "Determina se este usuario se debe considerar activo. Deseleccione isto en "
 "vez de borrar contas de usuario."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "estatus de superusuario"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 "Indica que este usuario ten todos os permisos sen asignarllos explicitamente."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "última sesión"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "data de rexistro"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Ademais dos permisos asignados manualmente, este usuario gozará de todos os "
-"permisos concedidos a cada un dos grupos aos que pertence."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "permisos de usuario"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "usuario"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "usuarios"
 
-#: models.py:406
-msgid "message"
-msgstr "mensaxe"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Rematou a sesión"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Insira un enderezo de correo electrónico válido."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Cambio de contrasinal en %(site_name)s"
diff --git a/django/contrib/auth/locale/he/LC_MESSAGES/django.mo b/django/contrib/auth/locale/he/LC_MESSAGES/django.mo
index 3e55f944aa7f588c142206d2f86bdf2ac6a334dc..5e2b1b572bd8b8e2432295b79654e2222ecd1afe 100644
GIT binary patch
delta 1964
zcmY+EU2GIp6vuCY0&S7f5BV0ZNTEgcqYI@{#Q-W=TLU5j2`Cx1!|u@Con~ihRUR6R
z8e>pfrnRXo5D|qoeqj@0G{*4agI`aCn@D0HCYTtbFD9n(#ow774c_$3@7%lRoO|y7
z&h(>oH`fjRR6lD}G1{@^*p&*UI^pq|JQ$zMQmO@BgbnZ-+y(!Do8i_<rEK^-oDHwT
zJK!&H1FU4R7H)>suoKRMd*BkK29*^p9D{TD;Z?W*4#O4jEW90FhAW|gHSjNZ8=N^u
zseP~xJ_H@u1wV!d;otBu+)wc)_yybvZ@?w&uUe~=+QC8>lm<?~r{GDr4NgP$Quoq6
zuG$VIt~=tBP#Ss~&WA@Kf9g3Nh@f7AlK)z?J{++GtJq(i$3abX5lZ1pQNUMF3V#Dd
zva3*(`58+5pV538N?tX=vS9-p;~JO1jm$5SjMVBT?1ds*7s$cEVVuu!8sVd~pM;0t
z7B~c#!5`ov_$!omU<MZ|SF;exybaQW>Wt=lph%sCa&>ROW_S+DLB5A|@W)#8e*xz=
z7DVy_$8+F!FatLc^*THa6L5XKQhVV+xC&0e1Mn)Ogi6tk<Zp*hzz?7(Bc~JPs-PTX
zDMTEVYD9mL=6)9VQ~P-!hRQ=Z(J?3;zY@&@C<RVK+3*sStN1$l{o9CFq2%3wOX2Sk
ztB^zLu7*-4F^D6D9)_r^_Cc;LluhRUj*U2SVv$X*WF01BO&KZ$XGDGs%Js-tj7fby
zg7DptPh6CcPgI7yf8jvEPyso;bi4tRJ6w&$v6YyNJIe^~J#s?@#lIU9x!bV>)`rOt
zspZR&e<|xR`5KZK@5H814*YP4BqH0|@>FTK30sJ@V6B+Qeb>~fS;s4CJM(>R(YFe|
z?y-E^3%;Cvwx-#0eEU$r%G)hdhvsA|nlnYWzt7Wt*70<|XBYKhJLeWMthjN#t-Lhg
z<Z{8wvzzMNBbvBGmas4{9$cQ=(ruTctaRG#XEV$5+_b}vJ$k_Lv*pruEN?kEZT0jN
zZO_wbt59%#jc@w|*t(Cb0k_x_+?;zPc(3ZidMlT4i=^jOI%}tUz5aagc=eVQbYHZ5
z$1Qj&XL-KPxf!QWb~#iqQT=IKDwf<3Yu%`m$&S{xSh78ttlqUVw%dNj@yLrkNM{{7
zm23^;lK1G=R7bKs7^+#MAG4jJ?kYN2JLl;8^1WqmYerg+r`>#Txn}W>=B)4cbtDo4
z0|RltXcau?i2ZE5VEc)_qI=X%`(C0i(R0))WZXoKXTO!PQ7q9?-5t$3bk+{8)f||5
zU|#2pV0`}aV0Z23YevkNDVcL-QkxO;jv2>Jn-Oh>V@<bS+S&zIDjpdz=gqJgHSc4@
zPY^j_CgrKkTaq+E{<wKtn;~kBQ}9e&-x@R?7AOVR=Phd);fGP?QL)m0wZl3kGn$}W
z$&AE<>AKV&X>%gn{ESo_BX!tZ&;$gyL#s?FYN2F?G+Uo!l_m1S^NpK#rK$fPGH9-U
wF<9MT)=IZ0NVq`aq&cNR9i+l3bYSg#_}gSK-H@&v<D?gYy^ZnU&BinT0K3q+#sB~S

delta 1942
zcmaKsYfKzf6vr=!ybB0uL9o42D9?pmcOjKfQq!oVP~)RUBjv;B4$IcvS=?EyjW(M`
zjUO}(bij1umKJD4Xw;@OCdOBye$m=kA8|gZ-;5^4XbdrFV&d;CQ$DGeJ@dP-Ip^H}
zxx-H#Z*`=9s4kdOv_7m6`yx-NA^6-4JZNVNlxl|yum)a+_ro9IozQ=yQYJhM3*l9G
z8+2h1u6y(CELJl1!((s{ELAG4KBQC5#AmP`e&>yUhsBKlhE=ezNU3dbE4&%@!CE*1
z%b)?bz&LyaJ`3-L-@sv5kF!J2ge~x6SWkTQGo5>w$S+aqQ8)ydQj2g5o`-kA64E6X
zH4J6_K`4PoVFippe(Gr+99kWRvi~J-{shF8%0O~bOR#|W>O38BcmeWL@A44GpF&aQ
zDij62hp4W8^TvNdd9Q%Y5^xKAjPljM5Mzs%MbRbrB>Vsl!**nvfm1Lo5*CrZA2!0>
z@Boy+FT)0S3TELYxD`G?A>}Sap_Js9H_k$GQWw1Odr+kQ5=zO|q1=r!P9y%?tI+=@
zI(<wWhx?#N{yB`oHWnlBB<z9LU=!@9Ms|1r9)&9q-)aY0$$LTg5IhY<p+6v^sB2IZ
zDdg00a9xZ3a%p-QN#=W@WOg5vla4}hY<ug^Ln*-tZ|r!Shw|PEycNFV@hflrS1A7e
zg5s|dIS^BAPt&1fxkV1W+2nH+$w)Z&S+;vCtsVm~-|KfmDT6c#j!3x+CU-&_;^buC
z0p*Zg7<s5$u(V_&?GCINlY03ujY$)^r3E*Td&-@V({9H^UTNJ}DA(IiRBpQb3+ce*
zE0ETMNg1v;O0hF1!%lDJcG!#6VQrWn6S>ven+31r9lAG}n3}ZJP<%3xOc_>6hmDlU
z*wRKg98E<NmQE#fYQof$W-=bNZDwp8H>@cm7CWj9CL)#@?qW;S)>F2b)JLMRm^NZ|
z!g-;%r6wW)^n}@C<AW_xtJ~RExVW}n7|C-!DsFayC66D}t)oUPk{D|qwT)N`OqkDv
zqY=|ijkW4TQvBv}7%=oi(j4F2G)dqiiDbB^Y4C{&!-|leH>1ZB$@oBzG3ZQ}Ty!2T
z9cYLdc1p(*k*K9|UCW4@DsI}g5pmuwy;v3S`GdYduMPzJ10kP3<UCbYH<+9Bhjd_9
ze<;xDr<IQ2$9FJkSa!@vC6fJmzhPONXy9;;dtzoZY{t5y)_B6XQdXBgFz9rakCu;+
z-joqB`w?O7#q$06Wy|i2JLkTRtvXjKwxws>v-B6-CGBS2*W9djXZd@>U2&&nkESzA
zXIWm+ZpL-kpK({aq(A2_GFp~}tUJ%nRe5Unq<dQbhcEo+f?Q9daaID#yK^|qut>;h
z+~K|3`K99hhH1LzSY6O$nZf2=-dQBmmbJ^3-{v{KYQJ--I-Sl)=q%n|W!stmt*V@D
zWAA3pGyhgz_Y{H8N$3@PiclFzcQX$ub+=-X^E$g~zIKAOhI6L2tw<zu+(qY;+NFO0
DV|}v)

diff --git a/django/contrib/auth/locale/he/LC_MESSAGES/django.po b/django/contrib/auth/locale/he/LC_MESSAGES/django.po
index 743c056e557..b0830300214 100644
--- a/django/contrib/auth/locale/he/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/he/LC_MESSAGES/django.po
@@ -1,198 +1,224 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Alex Gaynor <alex.gaynor@gmail.com>, 2011, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Meir Kriheli <mkriheli@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Hebrew <>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Meir Kriheli <mkriheli@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"he/)\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "מידע אישי"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "הרשאות"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "תאריכים חשובים"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "קבוצות"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "הסיסמה שונתה בהצלחה."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "שינוי סיסמה: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "שם משתמש"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "שדה חובה. 30 תווים או פחות. אותיות, ספרות ו-@/./+/-/_ בלבד."
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "ערך זה יכול להכיל אותיות, ספרות והתווים @/./+/-/_ בלבד."
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "סיסמה"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "אימות סיסמה"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "יש להזין את אותה סיסמה שוב,לאימות."
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "משתמש עם שם משתמש זה קיים כבר"
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "שני שדות הסיסמה אינם זהים."
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "שם משתמש"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "שדה חובה. 30 תווים או פחות. אותיות, ספרות ו-@/./+/-/_ בלבד."
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "ערך זה יכול להכיל אותיות, ספרות והתווים @/./+/-/_ בלבד."
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "סיסמה"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "אימות סיסמה"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "יש להזין את אותה סיסמה שוב,לאימות."
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr ""
 "נא להזין שם משתמש וסיסמה נכונים. בשני השדות גודל האותיות האנגליות משנה."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "חשבון זה אינו פעיל."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "נראה שעוגיות לא מאופשרות בדפדפן שלך. הן נדרשות כדי להתחבר."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "כתובת דוא\"ל"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "חשבון זה אינו פעיל."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "כתובת דואר אלקטרוני זו אינה משוייכת למשתמש. בטוח שנרשמת ?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "איפוס סיסמה על %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr "החשבון מחובר לדוא\"ל זה לא יכול להחליף את הסיסמה."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "כתובת דוא\"ל"
+
+#: forms.py:249
 msgid "New password"
 msgstr "סיסמה חדשה"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "אימות סיסמה חדשה"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "סיסמה ישנה"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "סיסמתך הישנה הוזנה בצורה שגויה. נא להזינה שוב."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "סיסמה ישנה"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "סיסמה (שוב)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "אלגוריתם"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "חזרות"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "סיכום ביקורת"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "שם"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "שם קוד"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "הרשאה"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "הרשאות"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "קבוצה"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "קבוצות"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "שם משתמש"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "שדה חובה. 30 תווים או פחות. אותיות, ספרות והתווים @/./+/-/_ בלבד."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "שם פרטי"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "שם משפחה"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "כתובת דוא\"ל"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "סיסמה"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"יש להזין '[algo]$[salt]$[hexdigest]' או להשתמש ב<a href=\"password/\">טופס "
-"שינוי הסיסמה</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "סטטוס איש צוות"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "מציין האם המשתמש יכול להתחבר לאתר הניהול."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "פעיל"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -200,52 +226,53 @@ msgstr ""
 "מציין האם יש להתייחס למשתמש כפעיל. יש לבטל בחירה זו במקום למחוק חשבונות "
 "משתמשים."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "סטטוס משתמש על"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "מציין שלמשתמש זה יש את כל ההרשאות ללא הצורך המפורש בהענקתן."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "כניסה אחרונה"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "תאריך הצטרפות"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"בנוסף לכל ההרשאות שהוקצו ידנית, יוענקו למשתמש גם כל ההרשאות של כל קבוצה "
-"המשוייכת אליו."
+"הקבוצות שמשתמש זה שייך אליהן. משתמש יקבל את כל ההרשאות המוקצות לקבוצה שלו/"
+"שלה."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "הרשאות משתמש"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "משתמש"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "משתמשים"
 
-#: models.py:406
-msgid "message"
-msgstr "הודעה"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "יצאת מהמערכת"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "יש להזין כתובת דוא\"ל חוקית."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "החלפת הסיסמה ב-%(site_name)s"
diff --git a/django/contrib/auth/locale/hi/LC_MESSAGES/django.mo b/django/contrib/auth/locale/hi/LC_MESSAGES/django.mo
index 417b3b13b306466d473ba32966dda336685aef03..724146081871588b4afe0cdbb712a9550f3d80f8 100644
GIT binary patch
delta 2458
zcmb7^TWl0n7=TZq+*-=rauLdKQ7LtIr!7!vjj;$Q&_FRFQ6M_*PIm{kyLD$ui;@&D
z0tQS;CWs<QL1%#w6hcKH2t1gGB);)#aN>iS7!r*}jSs}{KeN@odeXDs`OoFQPd`o^
zUe<SSO8HU6Xk^Z2epaT`v#@O>Ka5PdQnk>5Q=t#r;TgCb{snE=FiNS>@O?N34nWa)
z15Sj$!U|Z%rSWh)oT*fwnpxUtgkw2)8cu?1U=4g3J_L8cxv(Er!V9npUWc3E9k>e4
z8>7@Zn1);7AbbQ)Liq-`3}RUAhpVx#PO{)n{m9QY_zP@>>&HbA9f5Lw42t2CZ~{CJ
zC8Fz);M7+TAJjLc{kxDqb&nsCq<(^;=RTBof51xYt1=`>NfngHXF+*TSCUOA4_l!a
zS_?m-Ozlt{{td5c;YO59WdBWg6ZsJ7nSi_&Z$<x0)Imzp0Y8MtVP7+gWmugBUx$+7
z!>|FKhl}8MP)aa%vQmp-4O|M>KsoP&8{t{_F#H?V!RjeWEyRHp@D1cN4YU`25C4Rz
zY2<$gi>+w?5`GQEz~O48df^o)wKJzH^*ekK4#0IYltQQaxx@!hYC4%8o~XJKS3n&(
zl=~e}0^9}pQy<JE|CB)uB1wcdpj^BQC6XVYL^6W($X5}E*it)T6YPiL;B6?)dLI(7
z9;FXRuO&-jXQ7s&AoUXax|tq_k1`)))-&Z(lpzh3U{V2Hq8Jp1WJt|rNN-R|-BjW<
zNz#o9bRS7TGU5^b{S}A%Bt7yO$u}z*Xkb!4ohH5<-Eb1I43lXvrHN!Lh@j@fc}z*Y
zWMdkW#OePRK#h=}q0wq|yLQ3oalDM-W&F+MEvvkY<*|0$=qO{khLz14U3Q_<aa|{$
zbM^Inw`bVBU0EmTc-dWs#Zfxv<kCE~JLCTT@|M&}TlOr^=0(P4zc5U%o5^=)Q^sqy
z;T3G|q)=g4Nzd77$Bj)n*Us9>k{?da^=vC;<U5QM+n!jllF58`&U5`+<y&U0>FmlE
zJS*oJDY2&7^64}RanUzN9jjdAI-dPX&g!&l2XBu$RMuukp_O!q@A;&oeJCY@;O$ta
z<zx*jl`7b-Yb32)F7FwvZSl%Bx_H%-FQokSV><k*u@C&I<1Y3!#LUK6{Sw18o9max
z%qG*UXx|Wf-rng*;$kbY(QGuB_4=Oqgi+tnY&O-IjEXkP^<pm+tel&*ynLbAcqU`z
zQdZ8`(cNhkj3<+ksHM2MywP0J^mJNWj3@J*Pw_mL?)F<MCaqqS@w~3)M53psC+>+p
zr^D`z=WH+0Rmg8Ascxbxk=oAvd?G8athAlTIEmUw2U4?<ar})HTl{Mkmsgw(gIi&6
zF)Y3t2B-D<ie3*GVQ^Fqf*=fTB3uiL2cx}P;6zwF1P+A3RsTrk{252X;sNAy++~Z^
z)iC%ZEbj4Jr_b&~d?yUfYQ3o8(LT1$YirmS?FeEg4Ept3@djQ0xq^fH*oqFt(r~}e
z=$E)kBmrmQYFufJ7ZCmK%B#-}zyCktBraUJ5IH#%Z6CW5Juyb-k!i8@sdl9l)QRE3
zaV=caPWH#c;5{t|Xo}KN(#eH^(leb=w)Yq)CP9%ptSr!ZXY=haKrP-y(MjyOX2k<>
zfARRxpHtN`<C4~POviDG3;T6328_W?RW)Vp!@eDtLvnsmE0JvD$LC^LGH^QDm8j2!
z#l70%TVZe#@35&4rHKysyQ}98-kES|WThmF{ewo#@QumUH3TAcBWF~($ch$1&#5r@
zLf+9tuMVX|cSNa`!r<~ydy4m^EMaPo=#pNNP9=Vd&XzQmqyXsZ&{f*3ZVA74O3@!(
VS>x}XUNQLX)NLaM+p0I0{R3t_`vm|1

delta 1620
zcmaLXUu;uV9Ki8Yw$-j(rEJoT&Ef4FO#ali`{U*;i>QcG(P;=`>P)Wg(hjzE_I49A
zW<XR-`15iy(U@qWw+5X8QY6HO8DkWUAtWTem_Tm)L(~^zH2P%X_jgx((Ri|RKj)r%
z?mfTrJEuEz%Ug-r%Z;^jiqcKJp8B3osXH-U!-aBBtx{`n7@N?>Tk!z;@e^#vFR%x%
zRQp@&lv>Jt3>z?oD{!cKza0Zg%_@sVga>(CiL<yIU&rh4G=}g?4CB}M2!4l~@HV2j
z5BK3?cpg{b+G`dk9KpM}--+At17u<q<TA?qs)@!%I-Ww_RTbn<eZ)m3{uHmp3mC-9
z$lU5Dl<~h*`~Sdt?tNUCLxqrJs3zo*YC(BFhVtF@*uea1fQDpX6UqzQs`nX`7bj3A
zoW>m6^DK^X|2<z@gLm+?1sR8u>UCUXD+cg2>BmM4kiJ1|!y9lL&dR>e(6|ZTK}r2Z
zT#G+qA2zXkc|ME-Sj0A*$8~rPI|=MJe1`iLR<jQ^{)x+%DYXm3L?PeZgS*jbB>ykd
zXy;_fo}I?u@f&;tFK_@P@&Zwb`%w<j97gd()z48@ehFpV&nPSW3uSyegQdS8NuIhF
zd8D>R$-g|<Nr$ZHIg}N>iktB>Y{76dFXL*IKp#grtj{A0_sWe`WlN;+sy9~N@1V-c
z*&)?Rm27rW<^26q<Y&b9yi-pm|5YS%S*09030BU;5~`Fg>dn+7Rer{@C|O9HDn-s$
z!fP#Nq}o(lR$px)+oTNYdMaD*{eI;@%1Y(mft+edYl<49N(woH-v17EOa-)6yG3uP
z3+iy)D*Z~`qtVU9!t|7_h9{>A#gdsX8DnP2vUSLRwDP|HpijRPcw(#3l`$u>h0)H8
zZBCRRXYC#v&suhAw96<IjcMC5N;%6&n?|l^?by&UW!m=Bh2mJEW9Z48na^6r)gEI<
zp*WdNm_wBx0yRGWq-EP?R$r+<)t8DVd*Z1+Bh@pQ>WwFRlgZ%7gYk#0nQ?o(kdNO*
zSc67)GUbg+_8ZCm!QPZUA8c;3&HR{UP1$D2oSCq8nMETlU3=)z{!q-HexQ)IhV*18
z({Mk*Oq*H0lpELQLTB{h@W(o{^iudk*E#8y54+A$w|r1{M>bZDMB01-+i;zCd8B`h
zMD<sZ`enyl=d3rb>^ciPQ+mF2Wu>L@RE<6oee?GJOO)%p;5y}R_a1T`W?T5rZ0Uy@
zVtsp=bl&^?Vo1j&UtS;*;7QjxL5xI7*PIvj0oU1INi@H>r1h-p9P`3^+bz?3M#;Sd
PdR&h*L@O6p4Ep{Cj%_LD

diff --git a/django/contrib/auth/locale/hi/LC_MESSAGES/django.po b/django/contrib/auth/locale/hi/LC_MESSAGES/django.po
index 518591b2d79..48fb983eb85 100644
--- a/django/contrib/auth/locale/hi/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/hi/LC_MESSAGES/django.po
@@ -1,77 +1,85 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Chandan kumar <chandankumar.093047@gmail.com>, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Sandeep Satavlekar <sandysat@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-07 07:41+0000\n"
-"Last-Translator: sandeepsatavlekar <sandysat@gmail.com>\n"
-"Language-Team: Hindi <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Chandan kumar <chandankumar.093047@gmail.com>\n"
+"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"hi/)\n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "व्यक्तिगत सूचना"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "अनुमतियाँ"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "महत्त्वपूर्ण तिथियाँ"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "वर्गों"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "शब्दकूट बदली कामयाब"
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "शब्दकूट बदलें: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "प्रवोक्ता नाम"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "जरूरी है | 30 या कम | केवल वर्णों, अक्षर, अंक और @/./+/-/_ |"
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "यह मूल्य केवल अक्षर, संख्या और @/./+/-/_ हो सकते हैं |"
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "कूटशब्द"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "कूटशब्द पुष्टि"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "सत्याप्ती के लिए ऊपर दर्ज किए शब्दकूट को फिर से प्रवेश करें"
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "इस नाम के साथ प्रवोक्ता अस्तित्व है"
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "यह दो शब्दकूट क्षेत्रों का मेल नहीं होता "
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "प्रवोक्ता नाम"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "जरूरी है | 30 या कम | केवल वर्णों, अक्षर, अंक और @/./+/-/_ |"
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "यह मूल्य केवल अक्षर, संख्या और @/./+/-/_ हो सकते हैं |"
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "कूटशब्द"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "कूटशब्द पुष्टि"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "सत्याप्ती के लिए ऊपर दर्ज किए शब्दकूट को फिर से प्रवेश करें"
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -79,22 +87,18 @@ msgstr ""
 "एक सही उपयोगकर्ता नाम और  कूटशब्द दर्ज करें. कृपया ध्यान दें कि दोनों क्षेत्र मामले के प्रति "
 "संवेदनशील होते हैं."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "यस खाता सुस्त है"
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 "ऐसा लग रहा हैं की आप के वेब-ब्राउज़र में कुकीज़ सक्षम नहीं हैं | प्रवेश हेतु कुकीज़ आवश्यक हैं |"
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "ईमेल"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "यस खाता सुस्त है"
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -102,150 +106,177 @@ msgstr ""
 "उस इ-मेल पते से जुड़ा कोई उपयोगकर्ता खता नहीं हैं | क्या आप को यकीन हैं की आप  ने पंजीकरण "
 "किया हैं?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "%s पर शब्दकूट पुनस्थाप"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr "इस ई - मेल पते के साथ जुड़े उपयोगकर्ता खाता पासवर्ड को रीसेट नहीं कर सकते है."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "ईमेल"
+
+#: forms.py:249
 msgid "New password"
 msgstr "नया शब्दकूट"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "नया शब्दकूट पुष्टि"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "पुराना शब्दकूट"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "आपने पुराना शब्दकूट गलत दर्ज किया है । कृपया फिर से दर्ज करें"
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "पुराना शब्दकूट"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "शब्दकूट (दुबारा)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "नाम"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "कोडनेम"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "अनुमति"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "अनुमतियाँ"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "वर्ग"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "वर्गों"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "प्रयोक्ता नाम"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "जरूरी है | 30 या कम वर्णों | केवल  अक्षर, संख्या और @/./+/-/_"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "पहला नाम"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "आखिरी नाम"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "ईमेल पता"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "शब्दकूट"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"'[algo]$[salt]$[hexdigest]' अथ‌वा <a href=\"password/\">शब्दकूट बदली फार्म</a> "
-"प्रयोग करें"
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "कर्मचारी स्थिति"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "तय करता हैं की उपयोगकर्ता इस साईट प्रशासन में प्रवेश कर सकता हैं या नहीं |"
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "सक्रिय"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
+"निर्दिष्ट करता है कि क्या इस उपयोगकर्ता को सक्रिय माना जाना चाहिए.खातों को हटाने की  "
+"बजाय इस अचयनित करे."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "सर्वोच्च प्रयोक्ता स्थिति"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
+"निर्दिष्ट करता है कि जो इस उपयोगकर्ता के पास सभी अनुमतियाँ उन्हें बिना बताए स्पष्ट रूप से "
+"निर्धारित है."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "पिछला लॉगिन"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "तिथि भरती"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "प्रयोक्ता अनुमतियाँ"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "उपभोक्ता"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "उपभोक्ताऐं"
 
-#: models.py:406
-msgid "message"
-msgstr "सन्देश"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
-msgstr ""
+msgstr "लाग्ड आउट "
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "मान्य ईमेल पता भरें"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "%(site_name)s पर कूटशब्द को पुनःठीक करे"
diff --git a/django/contrib/auth/locale/hr/LC_MESSAGES/django.mo b/django/contrib/auth/locale/hr/LC_MESSAGES/django.mo
index b6ec1bea17d9595e476985822399acf2a15d65a4..c7d3088d87e61726995938cbe1ffe035f5d221b0 100644
GIT binary patch
delta 1334
zcmYk*TWkzb9LMpqZK-anTdS!1x|P!H%(ivu3Q`nxi4v&@#b}3awY#-DRV4Jyi-;x@
z4-zjD9_p4Rn|RakAn_{oSRx`4B;w7Bi0^NW#L4{6XJ&TK<$unZ$<@zRjJ%JQ+%}X1
zv52@IGG+(X7gJF-l^9cpEjSyyu>*&(1z)3!MbnI#j=i`TGuVVTF@i5KjBl_4r*OV8
zBj!u+qL|h*_@N4`a6T@<wKxacu^dm~OgxWA@iMmI8{CKUN{u;z-M9*0AOo4txC=Fi
z#@S8P#rUR!n^s;tMfxy5kjwm}(txJSm`bQXWv~#Lv#CY>zdm^1gj{AT6^ml_p!zw0
zYS)SC&q1xg09G-+xx$Sa+|UagMK!#K8t5T@WLw5@Ezdr^XhkM)0N>&s+)l6R?*?jO
z<t)=ujN&qEL@slLN(r685zXWRH`RCzxr|T6YMFaD7spT?y+G~d2UI3Mkjwm{>ccR-
zcHt17#z{Ph%`{q$K59#zVLMJmn6EmlC2bcs;5NLAn!ps2wE2Xy@H=WiJ?MN^qE;vx
zSc6fXm!R4wQ2%QQp0}VT-WGUh7VD*@=;8%^n|{>NUqvnPb<_m!q9*bf*@;3~5x6FB
z9x6K>Hf38!XtE0li&#ngU-XsKFn(bm?bpAuI=IoH(d0BC6=hUJC<9G4PN?X!)u*Ym
zQBSC76&eb6#w-XFwS>;vztR%pZXKa4Nv^P*`s}o9%2@ku6FNXT3py_eqB?)4WHc0M
z9~jJJJtytOdK}Nq`Ol}1=FgOV4fzkse*2HY<Hs7~c2hjj9JB3YVtw4+XxrhAgYm=e
z#Z)epNym56Dj93E6NUfTn_`K^q`h&SO$qOJa$fvM)=B639WRqj#`ZetbSf9y@1}a(
ze*Z~%!>%>Go;R4Ztl{C|22cM?opmoYq+QP%%x3!BZZBsIT0MPE`dr59ryg?7xmIu1
zs-yG2Psvzs)_+%i+;6LB&)=%}7Mj`VyqZX-l+VyW$`3_u<;NnMi}J0}%8=hV`|2Ox
C7M<V#

delta 1846
zcmaKrPiz!b9LL|5rS=aMN-a=Pc$U^uW!qg^YHezjM8HZDNTZclOL#Dk*=c8IHZ!|L
z>!0F@m?)NPIOs_w9t;<y(WDm+S`I`HO-S^lTs)ZgHySS_CVqaq(*ud|Wq$K{@6CI^
z_xpW+Z@$=bt7q|tt?A2(HiSKZeUnmZ9KN=J7wv<zQoZm)*ap9b$Kh@GILvNT%EDP#
z57*#>@H;pF|4!z6`M8;J7QPOjf=x;-s_S$%F>w=iz;BcBAFzS(KX41IzelNEa64>=
zL-0O00h^(LEwBJzfUm+s@D@A@J8<?Aw6Gg~2|GAn{Y2+56LpPBoq*$zDfJPYfmh){
z*hsj<qK-oOJ_+UEX?QPmA&;8pMbhd`DC;jI^A{nm)O(Pa)D@WKe07zMIQ$gys1;t~
zcom8=Yfu#U9-_MXEgAm>WnY@ba$pPmnDVv3M;NcLS(N$_7T_KD49p{wocozjBFqu~
zZa54df+wIjT!13!c^JcskVn-~NC~VJN(pvBSvLSBvx9IO9Ealf6y#CodF_BpP!jxP
zGjYhq&zYEoUqO+)k91GLx8X_nE9`_5t+m>PaGddFC^fwe*{Vjj)-K}&e3J1sC;|Nm
zMfy9Cr7F!$mUFkYp@UrXE+!=7y$SmuYt<kW2S=bNbqvb-sbu~|D4Cp27(h{I0ZPf<
zf>NUQp_JkZlt5RY1axze4kc6DG1;)*<ad+}e6IeMy~&53ggIE3^dE)tXGpsrlME$j
zNl2O`BERGwj4Pw|VNy0J(V|2nZ9mq9bz>P!W70%+X#+J>-#d9r{iU{&owPn|u-dCh
zE7^%sauG#2Y5ka}wchyMJF9X%oXp7OJAlb0*^6bd^l~n}lv+Fzh2>(b#tX$TDw&|9
z9aFN518p3~D|um{OQA01tuETA;KeaBu`ZaPY<&L}ZJ2Na>+EBR7wd9tBYn>EeQo?W
z)UGYj@$cH|Mx0_D@oLSP_Pll_0-d-0F^Ay83;HT+8<*N}eJ+d~9oZN+#L*oupRE5S
z^_=dRHohCqbWO*`FM+&$+3{Q(mu7l&7)cP-fJcqaNA~O!oyEjef9Kelya`-#S$BRm
zj0&UuW^DOT!-iCS!N#$1D~B7e4d*i1flTgz&JB#@1~b{gY_{q6vCO2M_e6or)2K9}
z_h)mpb&u)X@JMcmJ(X<J&dOv{rfzhsa-(T_(*)<0jmzSERN3A9Y)UVC%|DCo<)T$n
z=En8F6V1y7Pd&e&qw?xIL8zV3F#%yl-n{2q*PFF^E{wc5@aFXD1=2Hf;p!!{cEZyX
zNyqbdFAkZHEFN5rF$Kf!S+9!3NdvBn#xZ>r)AH_)iEzOS=1fg$j{+IZgWkWljMhz+
uypsK2%{|}K|0TAFTh<GPJi@}P4a(ZD9%QSEcWr4;)pP60bEY!f`o_N>20aG=

diff --git a/django/contrib/auth/locale/hr/LC_MESSAGES/django.po b/django/contrib/auth/locale/hr/LC_MESSAGES/django.po
index afd9e526945..84c7a963090 100644
--- a/django/contrib/auth/locale/hr/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/hr/LC_MESSAGES/django.po
@@ -1,81 +1,87 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-17 18:16-0300\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Croatian <>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"hr/)\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n% "
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Osobni podaci"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Privilegije"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Važni datumi"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupe"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Lozinka uspješno promijenjena."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Promijeni lozinku: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Korisnik sa navedenim imenom već postoji."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Dva polja za lozinku nisu jednaka."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Obavezan unos. 30 alfanumeričkih znakova ili manje. Samo slova, brojevi i "
 "@/./+/-/_ znakovi."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Ova vrijednost može sadržavati samo slova, brojeve i @/./+/-/_ znakove."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Lozinka"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Potvrda lozinke"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Unesite istu lozinku, za potvrdu."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Korisnik sa navedenim imenom već postoji."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Dva polja za lozinku nisu jednaka."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -83,11 +89,7 @@ msgstr ""
 "Molim unesite ispravno korisničko ime i lozinku. Uzmite u obzir da oba polja "
 "razlikuju velika/mala slova."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Ovaj korisnički račun nije aktivan."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -95,11 +97,11 @@ msgstr ""
 "Izgleda da Vaš browser ne podržava kolačiće (cookies). Kolačići su potrebni "
 "da bi se prijavili."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Ovaj korisnički račun nije aktivan."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -107,103 +109,125 @@ msgstr ""
 "Za navedenu e-mail adresu ne postoji korisnički račun. Jeste li sigurni da "
 "ste registrirani?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Lozinka resetirana na %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-mail"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Potvrda nove lozinke"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Stara lozinka"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Vaša stara lozinka je pogrešno unesena. Molim unesite ponovo."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Stara lozinka"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Lozinka (unesi ponovo)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "ime"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "kodno ime"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "privilegija"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "privilegije"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grupa"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupe"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "korisničko ime"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Obavezan unos. 30 alfanumeričkih znakova ili manje. Samo slova, brojevi i "
 "@/./+/-/_ dozvoljeni."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "ime"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "prezime"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-mail adresa"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "lozinka"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Koristite '[algo]$[salt]$[hexdigest]' ili <a href=\"password/\">formu za "
-"promjenu lozinke</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "status osoblja"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Određuje može li se korisnik prijaviti na ove stranice administracije."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktivan"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -211,11 +235,11 @@ msgstr ""
 "Određuje treba li se ovaj korisnik tretirati kao aktivan korisnik. Koristite "
 "ovu opciju umjesto brisanja korisničkih računa."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "superuser status"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -223,42 +247,41 @@ msgstr ""
 "Određuje da ovaj korisnik ima sve privilegije te uklanja potrebu da se "
 "privilegije unose eksplicitno/ručno."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "posljednja prijava"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "datum učlanjenja"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Uz ručno dodane privilegije korisnik će također dobiti sve privilegije "
-"odobrene grupama kojima korisnik pripada."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "privilegije korisnika"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "korisnik"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "korisnici"
 
-#: models.py:406
-msgid "message"
-msgstr "poruka"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Niste logirani"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Unesite ispravnu e-mail adresu."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/hu/LC_MESSAGES/django.mo b/django/contrib/auth/locale/hu/LC_MESSAGES/django.mo
index 8959ce46e45793545e15588cb87504bf4f47a4ee..d262904d02469fd65c3d08dc23ab0c19ff0c95d4 100644
GIT binary patch
delta 1319
zcmYk*O-K}B9LMoz&8${y)k=G{Ez8neXI8Ux4?$GgD_YSDXvCybn!3B}j9Ff+L#JLa
zmV!=U*hL|%Jx0*WrDJsz@fZ~dbqYFE-=9v<!~CDm%ro;m&piKUW^ViI%8}X9{0D{-
zCpHk{A!GJq?IJ2lQ@%0P*o-T&3)^uBoAEumn77!N0_?$!n8F6UixGT-Vf=_iID>1A
z88KgjhDG#V%8g<y#<f_1HMklNV<BF^<=BU3@j4#Fk9ZWzml)HDUAPTjBNLg=*n*lw
z^R!Z(XMWSp$vzsMA!C^D$YFj`X+pEim=#cjTETkcolO<$`P!hp0XfWGDw1Ljp~g9m
z>URb;o`cH302VX98RkSCZmR)DQ60xn6HVX*+cJeV*By+a6yHHl_wfW)Fsg%T)I^_f
zJI<oEqJXq%D-x&-9-$i1gXcI|kKMtI8%Vayz2N#GYQk|W$G51AOb6Frv5V^vjmOaq
z%wdPxnY9kj<0`y^Z8#Po|MWFKXz=k5?na+9D7BNQOuRsKe2IGD4}mkN7yW`H$9%^!
z{Dmyql$0!FwgUBBC8~WV@@}T7g#2sZRvOf?6ZJwKYQ;B^!#t)^hv&#n%$Lf*9f8V>
zJ~(}BTZn2xV=1#1v6cA0X#6$We|_Cr?Z2WuQ_)AGNtFQ=tssw323Vkp5i0s^^=sA;
zwS-D3p_HqvTVTGfqSm+euQW$F+ewi5`IYK}({HEWUn$*0*u-W+8B+S<#H!q*{LxV4
z@IX41@tvd}?RI?E%f2cY&0SpbEtGw_?00rDJk?kqvm0XZT~XUk#2aJw9@`GLx5ZAn
zS9`tQR5EseUWsVE9iM;BZi>e16ZW3$XkmHjso~!KtFAZfyP0T<lj(E3?2E$YmK{C5
zpH5iT(9lqwpK+32?<MzIUDEZfbS8Dh?eaY<ZFOI9l9y9fKlPw<*|mBGt?KZx;3^UA
v8O+WVcH~YMh4UgUsidFsqTTPt{K0`#Uv_%M{oJicd0wupG#1JpUHRlMM0cEv

delta 1857
zcmZ|PTWDNG7{Kw#rD-l*(<G)z)S59(jnQnf+gzj}21{%-CZ(|zEyPsD?Bwij&h80&
z&ZcHnRv$!ss1(*d6ntpxlT^i;CqYD9eGm%<M2m>kM+I*n!6(80w>d2cI%LjoX3m-0
zH?#Tpz^{G9>#eot6={ro2l;B1QZx8`4G+@ATBZ7N1KaQmoW~#VFvfN%WigF)xP|-i
z8V=)j*xt{}X6i9~0UyLhrHbk!3VUey9J}zFu>J?uQ~w+HV%=_~?!*pk$1%JW=dcM4
zMlgd<;&XTuzrtDUVz8&s;z9fbyO>}7L}8kS>IS7w;SAEG-o!<`j7PA6<+2tvi}L;i
z%ESwJ3p&W3TI0c{)k`SfzY?~;h76@HAZt>Wu$KANWePIjd&r;qfQJnHDN1CvP$KX>
z5_R=kSpO5HUo9WYgb{Q(zBY_ef052|6j#v4FYz&)B1{I)V^Jphi$WjPunjr0`%qT;
zG|HK!P&%xmg!ns@em~>wxE;2)@UiTy8|Aw`lm(1p2cASZ;uWNedbyeS%Zt}(Si-mQ
z817}e;%Quvb{xd|mYp-dACFU?!*zTEWx{=}N(I=9a-lDv9KjY!q^_adnIBO$u-!`h
zrBKDymX$|PcHWNrup8wF#=`egC`T|G*5||br%-leQ6>mb`oD^@u!|^>co$i#x{C7s
z^&$n1tP%w_c{9oC<(Bih^0Vv@-^ejZij%7=C5{W_mm%pkvP>YGkvk!Y%~mEqfLs|h
zK$b<y0*gevk`D3gCCg7EO4ejaJv&tHMOdtyxkRO#EMb)-$1_qX?d({hDE~t4CCd>=
z8X`-yZzS$QPbCa@hb?#ED7lk-4>?Az-Hg|st13R6^YW{{n#rtsxxi!toiKr=p4BFi
zNChb`s{>C5Nvl_FE|c<oT6~=`*}QSxb!}*HvNkcmCn;a&eVfx~Qm(6w>wDU<0R{J8
zU7Z}W*o2H~%~E?(JF)_uv_n3VFh(jnSlZfku8pD3c)5hmS)XB8$3cJdblopikL$h#
z<2v4A?}BgK0Fw6EM9Q&#u-K=)oGhZU;0dFXIlKHo&uTc-P|xI2(qtX>a%1piFPE7Z
zGLxG}>uaj&GS>HvQ<`pge>5JA4M*dnIzBueABo0BVzI{g<Ixj#EhQ0%K17tp^`Th2
z@?DJY#>QjuQnaz7$uFebHR~4wn=3uhc({6Evh;Q1!k#%M&Krkb$^7O}Q&V+u%J(Gb
z-in&`vVrI8M0q2~XQ&_1E9JKe1?%c(Y<a_V%kKnU5a_h$cz)gu{PKq5t>}z(T}!jk
z%hpXAzmVnI@+S4AosrY!jjUObZYC8-XfxJXF{^1asAf~?(y_?du1Brw7wB_yp7Mro
z#wFC>MmnocJ`#?aHrf<)&;Q1~M@t}gmLCl0HREtK^nV>dx^%XwGonAcl5@?f7gS>Z
Ud-G7$?(&BPo3%k{f6JwR0Gq{0yZ`_I

diff --git a/django/contrib/auth/locale/hu/LC_MESSAGES/django.po b/django/contrib/auth/locale/hu/LC_MESSAGES/django.po
index bdaccef12d3..b481809b618 100644
--- a/django/contrib/auth/locale/hu/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/hu/LC_MESSAGES/django.po
@@ -1,79 +1,86 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Szilveszter Farkas <szilveszter.farkas@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-05 16:01+0000\n"
-"Last-Translator: szilveszter <szilveszter.farkas@gmail.com>\n"
-"Language-Team: Hungarian <>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Szilveszter Farkas <szilveszter.farkas@gmail.com>\n"
+"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"language/hu/)\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "személyes információ"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "jogosultságok"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Fontos dátumok"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Csoportok"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Sikeres jelszóváltoztatás."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Jelszó megváltoztatása: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Létezik már egy felhasználó ezzel a névvel."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "A két jelszó mező tartalma nem egyezik meg."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Felhasználó"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Kötelező. Legfeljebb 30 karakter. Betűk, számok és @/./+/-/_ karakterek."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Ez az érték csak betűket, számokat és @/./+/-/_ karaktereket tartalmazhat."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Jelszó"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Jelszó megerősítése"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Írja be a fenti jelszót ellenőrzés céljából."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Létezik már egy felhasználó ezzel a névvel."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "A két jelszó mező tartalma nem egyezik meg."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -81,11 +88,7 @@ msgstr ""
 "Írjon be egy helyes felhasználónevet és jelszót. Mindkét mező kisbetű-"
 "nagybetű érzékeny."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Ez a fiók inaktív."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -93,11 +96,11 @@ msgstr ""
 "A böngészője úgy tűnik nem támogatja a cookie-kat. A cookie-k engedélyezése "
 "szükséges a bejelentkezéshez."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-mail cím"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Ez a fiók inaktív."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -105,103 +108,125 @@ msgstr ""
 "Ehhez az e-mail címhez nem tartozik felhasználói fiók. Biztos benne, hogy "
 "regisztrált?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Jelszó beállítása: %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-mail cím"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Új jelszó"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Új jelszó megerősítése"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Régi jelszó"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "A régi jelszó hibásan lett megadva. Írja be újra."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Régi jelszó"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Jelszó újra"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "név"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "kódnév"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "jogosultság"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "jogosultságok"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "csoport"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "csoportok"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "felhasználónév"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Kötelező. Legfeljebb 30 karakter. Betűk, számok és @/./+/-/_ karakterek."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "keresztnév"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "vezetéknév"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-mail cím"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "jelszó"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Használja az \"[algo]$[salt]$[hexdigest]\" formátumot, vagy a <a href="
-"\"password/\">jelszó megváltoztatása űrlapot</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "személyzet státusz"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "Megadja, hogy a felhasználó bejelentkezhet-e erre az adminisztrációs oldalra."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktív"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -209,11 +234,11 @@ msgstr ""
 "Megadja, hogy a felhasználó aktív-e. Állítsa át ezt az értéket a fiók "
 "törlése helyett."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "rendszergazda státusz"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -221,42 +246,41 @@ msgstr ""
 "Megadja, hogy ez a felhasználó rendelkezik-e minden jogosultsággal anélkül, "
 "hogy azt külön meg kellene adni."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "utolsó bejelentkezés"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "csatlakozás dátuma"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"A kézzel beállított jogosultságok mellett a felhasználó a csoportjának "
-"jogait is megkapja."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "felhasználói jogosultságok"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "felhasználó"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "felhasználók"
 
-#: models.py:406
-msgid "message"
-msgstr "üzenet"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Kijelentkezve"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Írjon be egy érvényes e-mail címet."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/id/LC_MESSAGES/django.mo b/django/contrib/auth/locale/id/LC_MESSAGES/django.mo
index 44aa78f7a381a696a6a615af661c604ad9c00548..0b323249e54dc01c82386839e0030c7ae42918dd 100644
GIT binary patch
delta 2362
zcmY+EU2IfE6vqeoD6~M!A}Al05h%3KcDF4EmI6VMhKRO&3CdT7-RbUSckf;Az3aOA
zu=s!vMkD5`As7sr@E~AJ<jELFFopzTf*%jY#29^1G@2NLFGPdCv%Qo$*>it$XXebD
z^Ph9~)n)&7)P6`zdP~vPVGFUF6O<Z)Urgjdn>tyk4mb_YhJA1t4#J1w325Qha0*<@
z;{mu4_Q3<N8NLA<;d^j8JP+q7Ra2kD1K+@@O#BF2;IFV1-hy-ByauHf!6a;gLvRM%
z2lqe+z6~$K$KYNzdmO$C_ru@dVK_KVsWx~P4spKvk`9q5O?X>iKa@aTf(PI$a1*=%
ziAAm8bX-&qly&Q3Zif8S6Fg?Zry(vX2N6dFQ2eWK5<DvNoUe{a2OfvA@jLN?Gf)mV
z8_!>W{M02LvcWYdQeKCm*!S`HAMyKNQ2ZydNCKD+8Bz%tam}r;CU^KTI?5gW4)?-;
z;3IH1Y3ze1plomxJ_v8Yez*`P@!P{gGRs0q#D#KY)%g8&DE=oQuIe<L3qNW`e~J7G
z1IyvJP!zZgXTfPqN&pMsIaq<a;Swf?VHNI#*Pshq6QjlV8r;SEIVgch<vt4LLQ&)y
zco3#%qyGS%&lr#hZ$k-S^1Y)OHA8uy3ng+5QB5VGWI6!lDh6Y2i@6<Ahw3RPeg~lx
zYcZaG5z2W-Yjos*mt!7}Cr(1StJ9FA)p;n9UxXy3u0YxFyLkK;D1rS6xmpF(GE6>c
zky@I}uf%#W`MSwf)nxOf*a}QC>A*TMX>zCXzpw<8>$uaT2Bami`B;~{(AHr0VXLto
zOlnJllv<Hbxf_#Y@3aN-{ja+77BdCgF_CvICVwVv*!U(&h&oa;qQ?E0v_6c|Q4h%r
zO=I$(A#L#}>enJ&xt4jd`kr_~?qkk{Q<Gku(7d%+^8C=aq0X4l2GPYS?>DsvPG}Fg
zrf55&Lk;Dcspygkf{N#70&RS&T`$x@==nC&sRK`kIm@6EFs>`6szXl))-udcIk5in
zV9dW$A1;Tw>XmicxH_FPZdMlBu?09dZdMN%o%8L;`o$bPr+#vB@rL?_Bc5LzNSY1N
zR}Fu+XML|+3hthy58Hz0W*PCi^``pay5bZH(XlCQv%C>aL`j0xb-(WD^3;xPc660V
zr@b;Nkf)b+kRpR)m>b>Nb`_0N&?b}dZ4gN4q5ypx{xA6G=cyynnQ0#;Od;#}xEEDA
zXVdwhT#U9iu3wTfK~ABqZ$ig&1643Vs0&`!aYwsI9(~Z*KG77y=z8PkCKS)>5tByh
zDABZab#GUyud8R3PNn*LR(GY=q*9H;LtQ)Ub56j1U7HEJU-zbZ>g!T#bx&`9YE5*!
zX~&lKTo{)6lgUb@(jEH74V)4Ce79@EWXboA*mM{qOUcX;uER?fc$Q7pCY?;Oqj6jO
z)~}sRbfanCh2iN}Cp7P3G;0dFWZjVaimuLlcG<9Xt2VT_>$2>j1LI~K&97~IMGZH<
zP}^CbDdKF9*vXi@HhKIqBvLF%2aCru2El!!xt(%e7j5ydNt<|Yj?ZSxuF;O`bZX=)
zyLyw0N5+&)$YP0-2;=1_A6N=-r7qYC^W&@RPLWA{l?#q9Th{BWwPj<}&~j;T&@Y#C
zXbCTrw8zdR=sZ=&ca$fEZjB71bM=e}p&pB57uaIiM75doXOs*vX4%lKn(pZHmZeXQ
z?N}A%2sCdTzDf4N(G*OPQ*FHpi7S?7EXlg;<3*2tYS|yXIqO_YT!=-h(zafP8xjN4
j@0MZUMAbxVbSklEau$t?(Wi;+Ge%6Fg422HA2I4b93I{D

delta 1852
zcmaKsU2IfE6o3b43;nau7HU=M*wR9gZFgxQQVS}g*nmn}(8dCBV5hg2?%rMY-V1`7
zjq$;l05KVjF@#vliwTh!NK8x!4@MKLKGc|KOcWD+@yQqs4@R2!o$cjOC-=-Zb9UzZ
z&CD+Jp6MyyY_57o(Y7M@Azv?1Y6QNrjE*)_rBpBc0Jgxd;6C^>+y>LtN?CXe*1&nV
z7Jd&0;H^a8%a2XW)9_XJD6CVetgbU?K=CDPhu<ahKi~@H3veZ@S*}zEY=f)eR@e&n
z!g^?6Bh16+;mhy|_$}N6+c9<!TG$OggYEcNzcF|c#nM`(#^DG=rDowFcnLlRYYCTF
z)E+3mk3w-g0q=qy<Wnc;NLsxHW&In8{v5=VdJhtlx(KWAuP!kVgC9da^(mbg{v1kW
z=Al&JCrH)R@5%fxDEq2dEDjstiyU7Il%t8*EG54TC9&&pCv2lk6YvFCmW`h<cmQ65
zL+~aPNA08~20Gw**asz}If!rd4V0t!F`54f#ohwsQ_I-A1~x-Upcl5mAt;p?ZKD3G
z7#u_)5e4u7oP%=7G`q&&aVVGS3n&hMg^$C(;d5|1Mx+vN!^7|b9EP`{1hlPr(cvRd
z0vmx++3{xTFPT^rl5sI%oGd&IDTaCzilKLt-!CNdStyx&nD7deqq_!)P2GSJ*bk6T
z{X!@9ZYBC<W!@A=Rw;{YxYOi0N~ZGU<XQG2($+6RW#H0e{2-K<A?+T7q$?Lp0+uF@
zrFvb6B)bWbmm^10rqY$RnSLG8jieBbNb6ig<t-;ebuR-c-~EVWC#??|tc(^jl&Z*I
z$VNo&jI@44s&l9D+<PkL(UWN85^h26Mm8X6M2<yWt*$<^<lyd7Aufh$Bws9)A`?V9
zYa+`$&?cMpBfk*nsGy@MtBbaj_rnlPsPiU>O)hsz8x&q(vzu7rhdK^zNuTs{Ic;)b
z!G*QmEuJ{gQ?@_E221>)&&|}#x~G@N?)?=T-RmoExXZQcTxZ>p{d)a`$$5oC>n1{z
zi@=n9DeHSSj1H~Wg_4-BgfeXORLM?m?=0f~WTBMp@7!^8$^;%!CK^3iDCLLy%??+t
zyW)1$54*SOSJ&ii7#h!Atl!|~>vy`2hNre<Qt5$IW{b`Y3}psW>A`fmZr`)1QG3Fd
zR8zYs$B^Ef&Q#W=2X*G5p}~wh-!NJ;{7fORJKR9yM8jTu$Hrr&pS^mvac)U@cPTEa
z{ir>YqjW*!2c8<UIpYU<%1moB9okTzVu8;3M{LQTHh~W9QByKWbvMa2&x->?&3t_<
z_6)mNmA66G6ip=K|1y=))3#``29x>NXpd-gWb^F89Ug3O%w&Bn@fA4sQ>M>NHXUCx
zW+R)^aZbVtO~4AiZnw~M+I6k^$DM8Na@8#dHtZ%S@&13uWg-*1+bcVoJZ_c0XsvP{
b<1HV#HLVZ3!>wzpixw~LbgOnVt^583rd>Zx

diff --git a/django/contrib/auth/locale/id/LC_MESSAGES/django.po b/django/contrib/auth/locale/id/LC_MESSAGES/django.po
index 81a06d056b7..fe55f0e5cac 100644
--- a/django/contrib/auth/locale/id/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/id/LC_MESSAGES/django.po
@@ -1,79 +1,90 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# rodin <romihardiyanto@gmail.com>, 2011.
+#   <romihardiyanto@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
 "Last-Translator: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian <None>\n"
+"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"language/id/)\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Informasi pribadi"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Hak akses"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Tanggal penting"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grup"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Sandi berhasil diubah."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Ganti sandi: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Seorang pengguna dengan nama pengguna tersebut sudah ada."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Dua bidang sandi tidak cocok."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Username"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Wajib. 30 karakter atau kurang dalam kombinasi huruf, angka, dan karakter "
 "@/./+/-/_ ."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Nilai ini hanya boleh berisi huruf, angka, dan karakter @/./+/-/_ ."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Sandi"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Konfirmasi sandi"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Masukkan sandi yang sama dengan di atas, untuk verifikasi."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Seorang pengguna dengan nama pengguna tersebut sudah ada."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Sandi mentah tidak akan disimpan dan tidak ada cara untuk membaca sandi "
+"pengguna ini, namun Anda dapat mengganti sandi tersebut lewat <a href="
+"\"password/\">formulir ini</a>."
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Dua bidang sandi tidak cocok."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -81,11 +92,7 @@ msgstr ""
 "Masukkan nama pengguna dan sandi yang benar. Huruf besar/kecil pada bidang "
 "ini berpengaruh."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Akun ini tidak aktif."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -93,11 +100,11 @@ msgstr ""
 "Tampaknya peramban Anda disetel untuk tidak menerima kuki. Kuki diperlukan "
 "untuk proses masuk."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Email"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Akun ini tidak aktif."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -105,103 +112,127 @@ msgstr ""
 "Alamat email tersebut tidak terkait dengan akun apapun. Anda yakin sudah "
 "terdaftar?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Setel ulang sandi di %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"Akun pengguna yang terkait dengan alamat email ini tidak dapat menyetel "
+"ulang sandi."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Email"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Sandi baru"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Konfirmasi sandi baru"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Sandi lama"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Sandi lama Anda yang dimasukkan salah. Masukkan sekali lagi."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Sandi lama"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Sandi (ulangi)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algoritme"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "iterasi"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "garam"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "hash"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "faktor kerja"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "ceksum"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "nama"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "namasandi"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "hak akses"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "hak akses"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grup"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grup"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "nama pengguna"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Wajib. 30 karakter atau kurang dalam kombinasi huruf, angka, karakter @/./"
 "+/-/_ "
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "nama depan"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "nama belakang"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "alamat email"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "sandi"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Gunakan '[algo]$[salt]$[hexdigest]' atau <a href=\"password/\">formulir "
-"ganti sandi</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "status staf"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Menentukan apakah pengguna berhak masuk ke situs administrasi ini."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktif"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -209,11 +240,11 @@ msgstr ""
 "Menentukan apakah pengguna dianggap aktif. Hapus pilihan ini tanpa perlu "
 "menghapus akunnya."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "status superuser"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -221,43 +252,43 @@ msgstr ""
 "Menentukan apakah pengguna memiliki semua hak akses tanpa perlu diberikan "
 "secara manual."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "masuk terakhir"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "tanggal daftar"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Selain hak akses yang diberikan secara manual, pengguna ini juga akan "
-"mendapatkan hak akses yang diberikan kepada semua grup tempat dia menjadi "
-"anggotanya."
+"Grup tempat pengguna ini dikelompokkan. Pengguna akan mendapatkan semua hak "
+"akses yang diberikan pada grupnya."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "hak akses pengguna"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "pengguna"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "pengguna"
 
-#: models.py:406
-msgid "message"
-msgstr "pesan"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Keluar"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Masukkan alamat email yang valid."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Penyetelan ulang sandi di %(site_name)s"
diff --git a/django/contrib/auth/locale/is/LC_MESSAGES/django.mo b/django/contrib/auth/locale/is/LC_MESSAGES/django.mo
index af3423e0dcdffe24327df6ae6dbbff30827cb43c..114657d297413f0570207a4804b14ac52c0550fb 100644
GIT binary patch
delta 1329
zcmYk*O-K}B7{Kv&)%@5s*RN93YSS{m)|p)sb&W_WOVbh|Ln><2bzRflWq16lgI$Us
zB4H>Jx`=tn2w{&Q<;e&;c(<Sqf}Ol|i~f&{(91san|XKU{dk_4r&Ze(vp@3FUMiZ8
zC?noFl)8X*sT^p{X-ZXN3l`uY_TUt@;1>*H$^oU)aRiTI6dUk4x^WGixQW@gg(XVO
zsvWx{m8UcLBNubA1dm}29>NZE;axn4_wgpq;3eF|t5}qw)NLHZQ}`K~NNr;~$|N$+
zWe#_kU-fX(M#l$a47H2=)E^Eqp~_M!2eMIiP>QTsRifNqXZJTCKXr}+Nl{l&#_2|R
zt`B8A10@6Fn9Ka?0VndnGwHxNlm{13CVGc&D9Z}^x$b5Z$;cz@$5$vN*+m1}7@f_k
zMLdDa*ofb-7*k1~Y^V%pr8c#kNX=SN7SNB(rA9FiO_WkR!6IC;|6j#IuGet_w{Qk~
z8C~2!DMdSzRN^AaIA8G|?zqW6i&mY?Dg*RkD{i2qHj~*Ub#9b}9<i-KHlqS4_g%KV
zhKISnfwF-yl*~@r*AHzU+rG#n|M}c7Plxy(C3T<d8`e=4xQSAd??@%~T7_+utz<@C
zIC<I1iE4s`s8T{BP7?n&$#}8UUur44*l(xp6WO`cNhX#i3ritnK~g3!Ax%D8`7~>Y
zIzpOkrhe~?tl0`u2Fb{NYw>VaOGtXz+};Z(HImO?Qh1!u33-tuwUTxpQJ9=hn{&83
z#$(aAX+%uVkYNTB)@u4(av<Zk!&=JvYb`rh8vS0q!RtHY(e;3@(W^J<y0hoHw>LN$
zPK2Wo??s*pc>KC=?>@cR<MRjfCTq@BRNfU0g+0ASC}PADiD<-gc8rem1HrLSI1-wO
z*M}3<nya+EYQ!{S0Zp5lnyNSBMkEm)4o=rcf~FRWM@NH$W<rZ;L!(9{6xGH!P8gw}
y7EWl@&Mx~Z;9;m=u3O2@?4J(HpHpIe%vnfIyQ@<iacdzjlpM~la#*hmV*dd14W1PM

delta 1910
zcmaLXZHQD=7{Ku}I&SXjw(4fS^>SR@R$FIxW?ik;ZP8F`(Mm)pS+&mYoVj!J&b`}x
zSzRiIqOeaQ3{rgvQo$0xYz+jl;D;uNGC~jvf{G$~frvnazC`_>*}Fjy9roPcIp^Lv
zFVA!D{<z`QP1SE!WX~$fcIq9}&oWAl;`0l+P~OTawHeQ0Ctk$^_$@ww`9(@ud<I+a
z8s3Rt;#Rzwj&J5>2mL(0fIG2Gsj9j{V<`il;2QiQ?f;I8>Hmq#u;mt|?!r~L61U@R
zxF46G!FH_R6ZjnN!RxpW*D%=;wAhUw;u_XhKhxODz=Bq#p2SgPNS(){co}zLE8Ar+
zY9Gq|gD4A+;jQQ(e`<;ghgL75Jbx-3KaEVK-az)GE?}1R)nyto;SBPpKHwq~e}od5
zYbX);8i~64E$!bx`CXQWWx;kdq^}bP=qLPGBJ~a)#w#ePTTPe@x>%K+T&1xduj4kn
ziL&!vj<p&GFu;8%C!OUYx%?C**I%J*@DG#|wsLbhcA})L8&~0OT!%+co;%q={3VAk
zF_7SEIF0ShCZ0mcS%%r}!DA>3zJgEV1(XzJSIk9h9AzFKci;~w2hqH_1WWZGOQ?a=
zhdPPBg!mu>^59dcCA^(}1!bo%r=CVh!Ru-N&D6J3-$m9`v#Fn>MEJY({x2x0y@8Ut
zzp6AySu;Em!ucYfqvVd;&ChakdZQ<`fD6)gFG`rDtfdl^=A!aWNRbUm)HYBh3R|cW
zbva;F!XagVx{)fMMvkhfQo817e#>dInL~-%-BdY+ls@WUvo-e_O4Q_E$h}mFtdxGL
zoPNIWxpy^RD9No9c?snOl$UN3HBZgf3)wT7>ce4>Oh#(7G8u%i@nc;yv8C^8Q!Ki%
z8~8d7bX>N2(uNf`iWrG>#rTQwylHJ1aC}?b!Xs{^lgNhpgzI_Qcu}Ao8`JRq^;0Kg
z6<d^9t(jO^){g8zmu-K<BFy3XeYI<g&U7;Mi6AWM&_+zdKDwj&v6f#mhjh=F@tol3
z#<9qFF_i7eqU+cwKH8&$P&U!r@UYS4(3T$TnoOta?;4pX8{gq9^OKi?url0lM(TSO
zFU+)5Y!n%%wzu`YZG~KZYp$?O7q$)+26Oqre7^0#<GF)&%9RM@b`zx`J&-RnpUV&G
z!u>;og<7s{)sC_$mE7(3>EX1o)2SHO>zfEFBW?RxJu!~W9kQk}q(>*LXZ)f&p@$y}
zd^=M6xNU6d{4+xYqrQI0_nGP=jrybs)uZll*PCiwbWBK=9HQd8J{`3yIj+OTr8su|
zqVavBBU{maKsxCr6+Oid99wc5GdgNq3ZvK@_pD=dsc|vX1jN^k_sLS@ib?*N$8Anh
zX60mA=<*29MP#XzgnhMj?dR9-pJq2f$eh+MCQM4!W8FBXyX&*<y$fnTbvTC`Gs*uZ
u%Qj|={;xFkjE8nQHrktC#O=|NDvlu8>Z^|~%Vk<4c3{SX#!M|){_NkpEMMvX

diff --git a/django/contrib/auth/locale/is/LC_MESSAGES/django.po b/django/contrib/auth/locale/is/LC_MESSAGES/django.po
index dd05dee6baa..5b6b50249fc 100644
--- a/django/contrib/auth/locale/is/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/is/LC_MESSAGES/django.po
@@ -1,81 +1,89 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Hafsteinn Einarsson <haffi67@gmail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Logi Ragnarsson <logi@belgingur.is>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: haffi67 <haffi67@gmail.com>\n"
-"Language-Team: Icelandic <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Logi Ragnarsson <logi@belgingur.is>\n"
+"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"language/is/)\n"
+"Language: is\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Persónuupplýsingar"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Réttindi"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Mikilvægar dagsetningar"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Hópar"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Breyting á lykilorði tókst."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Breyta lykilorði: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Notandi með þetta notendanafn er nú þegar til."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Lykilorðin tvö pössuðu ekki saman."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Notandanafn"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Nauðsynlegt að fylla út. 30 stafir eða færri. Bókstafir (ekki broddstafir), "
 "tölustafir og @/./+/-/_ aðeins leyft."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Þessi reitur má aðeins innihalda bókstafi (ekki broddstafi), tölustafi og "
 "@/./+/-/_ táknin"
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Lykilorð"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Staðfesting lykilorðs"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Settu inn sama lykilorðið aftur til staðfestingar."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Notandi með þetta notendanafn er nú þegar til."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Lykilorðin tvö pössuðu ekki saman."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -83,11 +91,7 @@ msgstr ""
 "Vinsamlegast sláðu inn rétt notandanafn og lykilorð. Athugaðu að báðir "
 "reitirnir þurfa að vera stafréttir."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Þessi reikningur er óvirku."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -95,11 +99,11 @@ msgstr ""
 "Vafri þinn virðist ekki vera stilltur til að leyfa dúsur (cookies). Dúsur "
 "eru nauðsynlegar fyrir innskráningu."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Netfang"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Þessi reikningur er óvirkur."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -107,104 +111,126 @@ msgstr ""
 "Þetta netfang hefur engan tengdan notandareikning. Ertu viss um að þú hafi "
 "skráð þig?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Lykilorð endurstillt á %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Netfang"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Nýtt lykilorð"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Nýtt lykilorð (endurtekið)"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Gamalt lykilorð"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Gamla lykilorðið var vitlaust. Vinsamlegast reyndu aftur."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Gamalt lykilorð"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Lykilorð (aftur)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "nafn"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "vinnuheiti"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "réttindi"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "réttindi"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "hópur"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "hópar"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "notandanafn"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Nauðsynlegt að fylla út. 30 stafir eða færri. Bókstafir (ekki broddstafir), "
 "tölustafir og @/./+/-/_ aðeins leyft."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "skírnarnafn"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "eftirnafn"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "tölvupóstfang"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "lykilorð"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Notaðu '[algo]$[salt]$[hexdigest]' eða <a href=\"password/\">'breyta "
-"lykilorði' formið</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "staða starfsmanns"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "Segir til um hvort notandinn getur skráð sig inn á þetta stjórnunarsvæði."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "virkur"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -212,11 +238,11 @@ msgstr ""
 "Til marks um að notandinn sé virku. Taktu hakið úr þessum möguleika til að "
 "eyða aðgangi."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "staða ofurnotanda"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -224,42 +250,41 @@ msgstr ""
 "Til marks um að notandinn hafi öll réttindi án þess að taka þau sérstaklega "
 "fram."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "síðasta innskráning"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "skráning dags."
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Auk réttindanna sem notandanum var gefið sérstaklega fær hann öll þau "
-"réttindi sem hópurinn hans hefur."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "réttindi"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "notandi"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "notendur"
 
-#: models.py:406
-msgid "message"
-msgstr "skilaboð"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Útskráð(ur)"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Sláðu inn gilt tölvupóstfang."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/it/LC_MESSAGES/django.mo b/django/contrib/auth/locale/it/LC_MESSAGES/django.mo
index 8c58d225b531c5daf87722863715a461e2714e87..ff5c2ace127337bf3dfaaabb6cbf393e2868a9d0 100644
GIT binary patch
delta 2425
zcmZ9MU2IfE6vqeoDlN3M1+joQg3uP)?zVtnff`H!iF~Q37$9WWopvwm-n-ln7I<*g
zNQ_D%=0=0T?}Ui>@c=IxBN6+AQ4x(Vgb;iYG3tZS#Assto$cLHo%Gz_+_`h+ocW)#
z{d2){i^^A;#=WQ*E3nzv?_-qO48Iu5gHbbHsdhLCHp9hm3tR{9g2$kR-@plQIgeZ6
z-EcA72^-)Guok`vC&Tw(i&ACvQL^wYtl`5|I2B%pbKqZaI&7J!)NL>Y>)>WM1#X9r
zKnK1A&%rft8;9KoUxPc~PjEL}H%Y1a@D$ukeDyUGGEtiJ*1}#Wi97*!!e`-X_#-42
zwUFqzsBS3xRwV3){HcvR>fxgh7nOsEqXH=Y2jMvQxO^wRIxG`-6w1NJlMN@J1UQv^
zKLhzwXL-m0pF@%I0u;qAC+oi?@4rFuAIm05U@~M$HNjUX^Bh=S#KOnucr&~P<;MTO
zd*BYP;lkIUWL{4pMY`!w`eg-_+Lm}U!l$9!{AD-;o`jOvr%)2P2&IQE!4CLq1Nw{O
zEOtq4JE3gc2qmG1;VxK!XW^HyA0EL;61)hdrqh~~+6POp6<&v1VI$F`83$k=d<u#J
zLr~7W(2V|@n53o+-|#UgB{&Qvk>{b@=olondOP8VP)cwfiZWj%{4QC)45g&sL-GF^
z(wFM*<oj4UTF$R2CzHm6Goc(j4{{0B25*5Ypaj|qC6Vn=Zjw*d4<zq$9;H>pQ428n
zNsE#)D7TVw_h9ntMg&!s!|uQqViLF=liJ9TfKumqn3SnHZcipDI1}qk-j_kC`%<hM
zlm8F2lIq3er`&~!y45jDe*a6VZwb?|4HNm6V^Tk9y3s?VliN$JMI}*4#$t@#Qg_M=
zLu1lcGUg7WQU;kySz2WGP00uOiA+E9>bN6g8rBzzo*x=F)L9eSApT^+TXk)L6WU#_
zDcJUS*Tkr7O1fx*pyc`4KpWp`*9&zJdcMte=)luq&a&tPtm~3Fs6$T&*0Rh}6j;AC
z81e7WyQ5Ga^dg-xuFm9)J186N$Oar7cTlf1I_KMgRdWeEy%IS!x36;Gfae!hrc7Ua
zapE6sgT5CPgBy|bZkzYqK~}sjy}A-ymz;b)K0IN5qc@<*C`Gcm;@1_Qt7+e0hj*Dw
z#*0vadwLlMDY7_*x#6R2XTdmmZL(S427#n53NW|ff0B=Xs2PY)OnSe`<Oe+;_kzmg
zY-Vo|72^AASIx_rAg9pQH=*OXfy$d8)Ol~vafhc!9=}uDHrC|B_(E-e9g6SO115vi
zaZ}y;r9GYL#hu+tbUNMJy|gpEES;|1vbpmCyWa^oud|=Ddv#B`yRt96TzB{MrkBM>
z>t;;Z<Yc_O(Ho5K1t$KWF1@xb7ly^&RH{@eb%nlh182Y<=yGkCD*E0Yn+bzdF_qmz
zfxJ|nXJiI#$_Z2LwHuPRUhRbO)w=Cx?wx#XOoIg1PPLny_<a58X3-~z^!(8c^-RN)
zWkjzwltw4+Z+u7E%GLWV0qLU*`dEKIhj!?Fk>h5a%I8e$&`DkJvYuvPzs*YHaj%in
zSlt&{dQ(TCb;Y@0G%iIi2%Ozc-imXdGvH*Tk4Jk(fpIx@bmLX~u5zN$Bb~QtYJa?O
z>bvDZKPna-orxTsZyk=OO|fYF(6O%V(hs>w7TOCbx<B-W4kKooG)zQMokNGrAu7ii
zo|~bySl4u4kcp5WYaP_{9J*EFbgA_^8(F%qKu~TRk8f;wa6@agbE^p?4P23MSd3PY
zPl9>cRvKA^E=EJAhg&%OpA_-z#$EBH#?Pu<T<~sm@$sfL^*6d$a*wYxwZvnZ^|(N~
MRyS{(JgRHeza(Dyy8r+H

delta 1934
zcmaLXdu$X%9Ki7@ltNod=>q`~94fRtdi1Uo)LI)P6>JJh5CcgmWVqXINAGseeH0Cv
zi<0Ocs4-bdG%*3;&nCt|Vq#)6Dlxt=sEJ17>n~#@Q4`|h9}~a7?bg4Dlbij_&d$#M
z<~O@{YV+USweQ>OPb<oH>P^&7>XaJA$L4dOoUK=CBff$i_%ZIoAMkd}FHp+C2eARK
z;A;E|x8fgJ|3)sha-PS>aR)XjRa0-#SWL%<xDvn2&VR>6od1JMv0<T7Yj8O(!|m9K
zd$1V|wqOMh;t9MPzrZnE$z+Go!S(nquH^aZXBxZcnAfP(Asj`z)H$5M8N3S{371&Z
z7|QkiC=VXTCFmkQHO+xVt0z##Kb`eIhfJkjLSj<qv7YCv85%O-YsgQ%!9gazgp!#n
zC>i(;$-4SAJHLi<Up<56fh~BH?d!nJoQK?e1D-)y$m_ThJ4us=2eBp*zE49^avATy
zYbgDFEKBxmJD$W{*oGe=KlLq#<#-h(!1)Z8fI3m$mDSjb1(f@a;Eh;C8F#9c{7Zx{
z&~X%Ja0Hu~O(NZg$1uSj{1fHnTElF^ID|*=1hQ!L4az(};k~%4eRd(IQ38G$nL^EE
zzS&OxC8d|MfuCo7jdH_}D0}rA%HI8jGQN)G$qE`WTQgT6L)2PafdeR++>7$y11Nzy
zS^vW|8f;mbMj0?y<a3m_oXhEFxiPySS&&ko&P!Xfdo5pv6iF|OPlJ|sLW%?=S-XYG
zE0b=Cd^wW&8W~SZKgV@cc@J__O_kC$OZqKmO|^;!?~=NiDp`=Sg*uS7W<Nv8mi&cm
zqDls&^igH?bA`{nJ56(U*0UD3Q6+U7sClZSTU}hR;F-F^y8}P2hHA7@^@GTGkuI6Y
z;oQ@vRI-uvJstTvnsRj22`V-W=?Qhkc(Ey$AJv8q*K<m}46&h(LnqM3ZMm#XIrNjT
zaeap?571LiU&tH`vEG*CY{R)^@4`4avuIOta?uCLtBvcDuBKxLbkDdcyZ*$w@z9hb
zm~tK|S=R}pi5~3-GJP7#kkM0tGkIrMmFFM#gHm7DaB<3bE>UJZdeRRnLw#mAsWn|l
zMw*9`=bM)`RGct0ZgRePLvp2gXR>DTJ@*%K`K`IaHeJ{{SQyCV2lDx*efQ<|JJVK{
znj0Y<gStOoNXO-G(}i0H`wN@%l%_o<jB*D8<Ar4t`N5!$oQFJH^pm$2=jRO#C)--a
z8RNOJahc=dvn{{W)piGQwQ7}2tL<FUZJKY_wXqi&ZLF>acG{L5*GhsN*E5mLa$a$~
z$m!MPo;Z@04s6kxc7pfLYU35ja1=+3z5WcQq*wW_XSFLq__`P~f3<3Y$U2_0C3&j#
z!V-xoj0|Cfv0k5yEqyZitZirVY1>S4wY@u;?3kE%AT<BKQPpZ3IJ#`~_4cV^LgEaJ
zE?HePm1EZbZ_m>0dZ*)3@?z)6j<_7zimy$v$e#JCNZ@|OQL{VfT3@B7bK9-t?Mw$|
K4V&~VJM=G_%U;6(

diff --git a/django/contrib/auth/locale/it/LC_MESSAGES/django.po b/django/contrib/auth/locale/it/LC_MESSAGES/django.po
index dbec08defdf..ce0fc8334a4 100644
--- a/django/contrib/auth/locale/it/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/it/LC_MESSAGES/django.po
@@ -1,77 +1,88 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Federico Capoano <federico.capoano@teletu.it>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Nicola Larosa <transifex@teknico.net>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-08 17:21+0000\n"
-"Last-Translator: teknico <transifex@teknico.net>\n"
-"Language-Team: Italian <>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Nicola Larosa <transifex@teknico.net>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Informazioni personali"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Permessi"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Date importanti"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Gruppi"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "La password è stata cambiata correttamente."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Cambia la password: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "Nome utente"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "Obbligatorio. 30 caratteri o meno. Solo lettere, cifre e @/./+/-/_ ."
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "Questo valore può contenere solo lettere, cifre e @/./+/-/_ ."
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "Password"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "Conferma password"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "Inserisci la stessa password inserita sopra, come verifica."
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "Un utente con questo nome è già presente."
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "I due campi password non corrispondono."
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "Nome utente"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "Obbligatorio. 30 caratteri o meno. Solo lettere, cifre e @/./+/-/_ ."
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "Questo valore può contenere solo lettere, cifre e @/./+/-/_ ."
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "Password"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "Conferma password"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "Inserisci la stessa password inserita sopra, come verifica."
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Le password originarie non vengono conservate, quindi non c'è modo di vedere "
+"la password di questo utente, ma è possibile modificare la password usando "
+"<a href=\"password/\">questa form</a>."
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -79,11 +90,7 @@ msgstr ""
 "Inserisci nome utente e password corretti. In entrambi i campi le maiuscole "
 "sono significative."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Questo account non è attivo."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -91,11 +98,11 @@ msgstr ""
 "Il browser web sembra non avere i cookie abilitati. I cookie sono necessari "
 "per poter accedere."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Questo account non è attivo."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -103,102 +110,126 @@ msgstr ""
 "Questo indirizzo email non è associato ad alcun account utente. Sei sicuro "
 "di esserti registrato?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Password reimpostata su %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"L'account utente associato con quest'indirizzo email non può resettare la "
+"password."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-mail"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Nuova password"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Conferma nuova password"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Password attuale"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "La password attuale non è stata inserita correttamente: va inserita di nuovo."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Password attuale"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Password (di nuovo)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algoritmo"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "iterazioni"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "salt"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "hash"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "work factor"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "checksum"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "nome"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "nome in codice"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "permesso"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "permessi"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "gruppo"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "gruppi"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "nome utente"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Obbligatorio. 30 caratteri o meno. Solo lettere, cifre e @/./+/-/_"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "nome"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "cognome"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "indirizzo e-mail"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "password"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Usa '[algo]$[salt]$[hexdigest]' oppure la <a href=\"password/\">maschera di "
-"cambio password</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "privilegi di staff"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Indica se l'utente può accedere a questo sito di amministrazione."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "attivo"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -206,11 +237,11 @@ msgstr ""
 "Stabilisce se l'utente debba essere considerato attivo. Deseleziona qui, "
 "piuttosto che cancellare gli account."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "privilegi di superutente"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -218,42 +249,43 @@ msgstr ""
 "Stabilisce che l'utente ha tutti i privilegi, senza che siano stati "
 "assegnati esplicitamente."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "ultimo accesso"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "iscritto in data"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"In aggiunta ai privilegi assegnati manualmente, l'utente riceverà anche "
-"tutti i privilegi assegnati ad ogni gruppo cui appartiene."
+"I gruppi cui l'utente appartiene. Un utente otterrà tutte le autorizzazioni "
+"concesse a ciascuno dei suoi gruppi."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "privilegi utente"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "utente"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "utenti"
 
-#: models.py:406
-msgid "message"
-msgstr "messaggio"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Accesso annullato"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Inserisci un indirizzo e-mail valido."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Password reset su %(site_name)s"
diff --git a/django/contrib/auth/locale/ja/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ja/LC_MESSAGES/django.mo
index 0a2f1832d2e73e63a70b5104d0cc52c2f7046799..0312764625d419ad7dc1df0c1d7ce84f1aee2213 100644
GIT binary patch
delta 2593
zcmZvceNYs27{`B#34)0tpjhfpNCgA#5ML22XM7pU!txJo%(3NexjVSKrQ1D`e>!$I
zQxX$hQ5g~iMdd}w!7TD^%;}GsCVTm(W}GJbDM(W@PE*s2|J3(c7KO3j+_RtEXP>v<
z^ZfSu7JT7~{hTtckzuWXJPY}23}dC>*KxRDB|ODg4mbgv3KoJJ!FAwr@F*yQ--F}9
zWw^`)UjPfiZD2BZ089j1!HHlun88?#^*M?kzy!Sb1)K~Hg0sMfU>cYa&)96x1tx)|
z;M3q%a5ESH4}&+rHQ*Kmdl_s2-voaH%fNLL7@G@rf~CmMzQqkHVI1YH1&cr`L<hHl
z?}Mwr`ygsz3y>WytN<jt6%JQ}__0@TnFPK8!iD)kG>54m`PYEsz*>5b{A?H9fDIr8
zZgvdXK}yi+yzd3^W7lw@0AGRB%3C0H?6#x-!+HJ_B>y-VQ2`S{s8|Yk5M!PN#@tX`
zKp$!Lzk)Q=f5BJ5<=BP}?g428i5O%t$U$oHHjrj}(qS(+9nUwxEbul+epDT9Svoia
zoCiJ!u9}SglS4TaxnK+=hi(wXvCqK}cnkayESbXCJ79VWV|&3y@GWo-PA1LX0Nr3l
z>d^B`;2b>P0XKnh2u^V~gS0Vk8v0L%rymNM&B}DN2VCQD3rG%?AdO}xNCg@oeIQ4j
z_a8d!aCiwMyPF`z`w1lb-$Bar0Hlum6T=M|#!nmKOpp>4g5+2NJ_Bxa^g)omiX9*o
z*68TlK<Z>Sh|w}^n9YOGSdqeBWdA&5A%u!Sv+R!Bvsi!!I#fB3TnH_yl>Qg8An5#~
zMJ=V}g3vtk=mBdf1o_!wNCAY-5{?opf>6=<5Zc`E!p353(eRT)nqM}AzKCTI`ZJ;L
zb>yN`O(%Iigt|mKr&S1{wl1LuEDoXn3|g5(VEB8m7tS<3dsvTk6!eLt^&T5nKPGv7
zs7i@wQdr|&Nt0FU>iD*#Y&D?C+rv^w&at+~M`KbouaZ=?T8Vg7E=6P>Ry3|^N<{YN
za#i7)UxqTELeHzE8m=i^m1U@*imGyCzWT^NmzPB~UZX_0M+$R~UkdxkP<~_phd|iJ
zizV)l$mJ!ONStP8c4e-#1C}e1P_au|X?+*}ceXF0M61-tnRuBTRKh-JlzhI*PR^?X
z!JxHk{M;!@IY&h<6w7VDeCtL+&IWnNO7eJ=D7t`sDxLsZ;f15-9||q!g`_}`OI~k8
zR#hsUI)Hmw8&$m3pHObKPdJw%1${~c?jh#!%brR#8nRwXEXndqs-K~^5lIUuVU-0X
zRpUX$7YGmCqUBacVs@Mq)T~>HtCP_2N?tB`&}u6sY5n4bdG5lzf<@fzE-F}@=U(b|
zCvGgwdtKfUP!TV0HOemH3*7~_oqHKCSX5N7#A-;I#y9x`;TnmTR!W#rv8Gf8$^x45
zqL22K?@>b5jiecCv;CS@RpfG2S6An25h<(&%H^H;VOeukMU)EJqp7Ycm$w2lQ(Qq@
zqmoZ{RY<O!#0}0<5wDP}J4su6*H26zn>@IC-~H3N&^!B&v=5x!Yo#TBGke6@Qn}F2
z3-f?5`h?jd%qzmIvmPe5#0Cx>fAWpc>-$e!8MwGl=#9dt7y4<TzblNrWT~GKwa8=H
zUZ*LNaq0ge^xWHT4D32X_B!HR6MC~S;8hRz$4AaReAsd1hJzwyhh5<bI(u9g2k&0J
zK5*!)(2u~xJt=j{sk;8=iz6a8^;(nP9upf5FkBUC!$#_A?_FpSdK1-ed?d^+JN6M#
zYY20sWzVR$w9{ku-dpTz*WJrU?|%Bh6Aft+dY|2&^ZnD#b__N(pxpj?G^o|ya}&~7
zaVdo{yJ3UPm+zfx5N4}gLYFYwFa}|E(^T}X!NYBXwI`8B=$KQTo%Z;s8ewn13sv_D
zbC1w5$WaqTZeex`<FYVK+rZv5rA|cmdWJe?Wv7_d{HYJJkQ~7-+8&<?^8^#7E{rqe
zYoHk)LuI9=Zpakoep~m6Fx#0hP6_ips+lGa73_Ph?WxnP-KlHhuiEY1V||%gmEoK-
PgfcPFRy*c(c(MNg=!xbI

delta 1979
zcmaKrYitx%6o79_X=zJ&_F+|Ytk6PX>24`Rn_7?nT0ta0f?9}-bl5K0N3*j93Fvlq
zF<1-um=GYEQYZr2h)B^uc$gS9qQ;Pz=pWI9%NG3MBQgB&hl$@A2I3Fn&7Aq}J@?GH
z=W*xrhO_nQpC%RTRg8Jay~sCtO0~i5qj)g}3Y3}w55dXsYq$db3?GKU(Mnlx6D)+6
z;S~4-oC9zA`WbAFXB~tu!UeEIskFMtWGsqHuo`~vum6B!SpN+tz``P>?t@jZ0?vcw
za2YIxCM<(7xCU;6i{W>0DXhlXT4=#(@KadL`RWFfB`ETXm3kVsK~(B6TnC5Xqp+B8
ziA61ivcD3_!R>Gy3_~8ZnHNbb2a5epU%v<9N*#d2qy}LD=c^$m;_xKoQD=FH<IkW}
z<}#EDT!B<w{pPR#gz{Yh#&Td8e1`T-hC$XbK9-jDLuu7HxE$Vu4qQaJ(o)JVn6$tj
zp_Htebg)s+LFri(9)R2ZbtTHXSl7Y_;e055Hb5S=mDk;{7fyvopx9sX*H@v~7fqo4
za?ljgi@|#M65J2_VAVvW*26(485K-Y>H#<xu7YdeHaG;uPaQW@GHZfz2R??<f^l3F
z*{^`of*L3R%qpk;a?uz121|Udg7{SHq3qj`pw$-W_0(VQf#Rs&=V>V4eFg7<SD+mD
z7nI983S$YR28zBx>QBp56++T?hWw7=m;}5Y&hU5Ye1>4YKc5N3xeO^g#qutg+zA;H
zko=O;Dz1#0g%FRbMADL#j7CIyH4O<M1|p;87QBDipL&@|7WX4^0cFfan!MSq-%zrX
z%GD!MF&PaAck|BRcdzw+omyYz^_IC@mg$JsbJ-gnJ$hH(+Q*WK?k-!k#kvy7lo?MM
z9cId69XHI5jz}t!h#RSdk?ORJE-M*}*ftv5h?((jGaB7$m?*+=t78@>5!>jtt)#If
z5{(*W)K0i|@wCZdIl$<&8f<)E5{b`t2MQ0nPZo8%2glUA*)d<bCyJ-KH6_olHtO2V
zXgINMYP)SlQ=rp&p(7Hu?9{qCBasyMUMMZ5(V4V1K2p=g`CAgnj)t1n4V`8@Oq9OH
z*qBJhS{lq&H(hedT~ylQzFt~U7_)5K47-D+)7{IZ3*Gz1KAsK*f^!0)xkhMCbEqj0
zYzhWTRy-A0X>E>3s)0q6quFQ-hCI7qlM#BTxhXU=$S7H6+Nr?mq#3uPW-5_vHl8r!
zaZ+sA<Z(gNigZ}f*^&6hL@UPeaJLz@0;?@ECZ=6x+_J4Aqh)y_Zne6NW$j~c+cX=S
z%;8;SRr!rNb5duAboRW??o+?)+<oJyqn-Cg_Pulcc%K^S?aTG;)y}bN=k{MavqwAo
zv~$o+S5++5&QR{v0qwk^dz_Kpp4^B1-sVy5?9iFMe>=tU_SbuLW)}`}FCW(qmM6qh
zh0eTrefO!{MO^b-)Xo9jlW|Xt|2E$?+yxWM^G>)2C-e_jPKxHa)#Z)u)$;E2|8y~T
z;c)K!Yuf1}u>b0!&c2~DXLa@iFXi6ck=~KFPU|e8z3XWPq@~1k?ZPM88T8`B8<|pu
z9Ym&d_Ne=8#jkFxvaNRH?Vjr&Wpws^NjP&vXNOhpn2X6Foz3dZIq{e|<NjW`#GPLi
F`v;o?wAKIs

diff --git a/django/contrib/auth/locale/ja/LC_MESSAGES/django.po b/django/contrib/auth/locale/ja/LC_MESSAGES/django.po
index ec1aa17fb2d..f13fccb20f8 100644
--- a/django/contrib/auth/locale/ja/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ja/LC_MESSAGES/django.po
@@ -1,90 +1,96 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Shinya Okano <tokibito@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Japanese <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 14:16+0000\n"
+"Last-Translator: Shinya Okano <tokibito@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "個人情報"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "パーミッション"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "重要な日程"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "グループ"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "パスワードを変更しました"
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "パスワードの変更: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "同じユーザ名が既に登録済みです。"
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "確認用パスワードが一致しません。"
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "ユーザ名"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "この項目は必須です。半角アルファベット、半角数字、@/./+/-/_ で30文字以下にし"
 "てください。"
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "半角の英数字および次の記号 @/./+/-/_ 以外は使用できません。"
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "パスワード"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "パスワードの確認"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "確認のため、再度パスワードを入力してください。"
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "同じユーザ名が既に登録済みです。"
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"生のパスワードが格納されているので、このユーザのパスワードは参照できません"
+"が、 <a href=\"password/\">このフォーム</a> を使用してパスワードを変更できま"
+"す 。"
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "確認用パスワードが一致しません。"
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr ""
 "正しいユーザ名とパスワードを入力してください (大文字小文字は区別します) 。"
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "アカウントが無効です。"
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -92,113 +98,137 @@ msgstr ""
 "お使いのブラウザはクッキーを有効にしていないようです。ログインにはクッキーが"
 "必要です。"
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "メールアドレス"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "アカウントが無効です。"
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "メールアドレスの一致するユーザはいません。本当に登録しましたか？"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "%s のパスワードのリセット"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"この電子メールアドレスに関連付けられたユーザーアカウントはパスワードをリセッ"
+"トすることはできません。"
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "メールアドレス"
+
+#: forms.py:249
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "新しいパスワード(確認用)"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "元のパスワード"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "元のパスワードが間違っています。もう一度入力してください。"
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "元のパスワード"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "パスワード(確認用)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "アルゴリズム"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "イテレーション"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "ソルト"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "ハッシュ"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "ワークファクター"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "チェックサム"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "名前"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "コード名"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "パーミッション"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "パーミッション"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "グループ"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "グループ"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "ユーザ名"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "この項目は必須です。半角アルファベット、半角数字、次の記号 @/./+/-/_ で30文字"
 "以下にしてください。"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "名"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "姓"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "メールアドレス"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "パスワード"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"'[algo]$[salt]$[hexdigest]'形式か、<a href=\"password/\">パスワード変更フォー"
-"ム</a>を使ってください。"
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "スタッフ権限"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "ユーザが管理サイトにログイン可能かどうかを示します。"
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "有効"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -206,52 +236,53 @@ msgstr ""
 "ユーザがアクティブかどうかを示します。アカウントを消す代わりに選択を解除して"
 "ください。"
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "スーパーユーザ権限"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "全ての権限を持っているとみなされます。"
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "最終ログイン"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "登録日"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"手動で付与したパーミッションに加え、所属しているグループに付与された全ての"
-"パーミッションを獲得します。"
+"このユーザーが所属するグループ。ユーザーはグループのそれぞれに付与されている"
+"すべての権限を持ちます。"
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "ユーザパーミッション"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "ユーザ"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "ユーザ"
 
-#: models.py:406
-msgid "message"
-msgstr "メッセージ"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "ログアウト"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "有効なメールアドレスを入力してください。"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "%(site_name)s のパスワードリセット"
diff --git a/django/contrib/auth/locale/ka/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ka/LC_MESSAGES/django.mo
index d4f60e2367b6b1566e4d69ffa3e506108497d748..cd14f2d94ba12aa819b0ca247d498bf05c50289b 100644
GIT binary patch
delta 1316
zcmYk*OH30%7{Ku<lvhEih+sjqK0sdWZoyh<)JR0Iib_1_K@BOeLP1*6R`7A)z)?*a
zR}Ut{ghVeI2uUw$B#H;(QNqQ8QAmu5#)Bt~7vuliti(xYelyeEnc10dRt_!&CqI@s
z?<-P(yp8<Gq0~`q&ZQt7a4OY+ZMYfxu?Hux4d0@HIeALu;}F(h0$cG8mf|A1a2ZSR
z1A3I2RA23mT;49^4>!8egWItYw_pT|u@^Vs2%g95cnp{EBvuwEbrJiq7GEP1sV~@x
zGKtL7MRAGwRS%VRI_8iu)DPsReo@GTsz|AgP=fLW)ySGv9m?~~c7H4KQ->+o6m=YB
zoKq<8okJNfin0Tv=w^O(gNnRxOFA%v^5P82L{HG<Smtqvb_b)h;4I$8Rb0VQMlIyI
zcDARI_6b(qk9`=&B|L&b&O>%)94B{CnWiE;@Cv2vU=?M!2lrzLPhuP;PF~<v{BF1N
zHgQZ$9Kz4^_wlmWMZo;V=5nQCSjRb@#tgp1Pg~gkJyfPE_&Qv~XP9L9GC>oCth58e
zIE?aTk5Lx5fUH@)Ly3`9+<`ys{t6CWo~yHMv+YJ6QN14a{|J?9bVTqu%7SvMlsbg<
z7{bfA7at-YYNg$_^|rDwSu8_XyV!sdsMTbREaU#4<d$re^Ou!NApJ`+kt7Kkj?9V$
zX%oOIhs<$XapFTsa&6^mHj<mklH{xXR!u3^yq@Z)IoDfUVK0p)vTP&AX9b*GJGuVE
zo3))f?j&<MR^&<ylxH6}Gmg^8=vX3|j>gm8foR%DnG5-uY+u1QhxxeZkNMO!A8hgI
zt-ioMudas!L7yJdbyv?B-&tckmWn0fz7F0Bdt3B?^_+gd8)ymZAv06FJ-^$C4H#F<
z*<ycZ{ZKkR7S^<hi3xu?8I7l6myK)wxRKVzl8IrXKb_LXw1MGhd@!M1p}ZO$G_;YZ
z*5K;4TVd}=)LbjRkd2g7I?Zu+d)8An?#RB`JfCOYt*OoWtBf4i%-U3DZE9|9>Ylk=
L=E=U_cGK|}7Vx17

delta 2091
zcmaKsTWDNG7=UNf&Al;gVv|i1lQB(9Q?to#Zly5^E!b#CsU;LtVxoua>F&n8#66qV
zqOz2I@WBgPPn%R*B}ql4eW<t;6hx}nf+!dWR{Kz8#RngX3dIKn!S6r2DTv~*GvCZV
z^Iztl|LnDa_2Ja_HSW`jHb`%xf8|nY96rB^fwt^csuQljTKFYA1b={gps!dd6VAaB
zxCZZm-@-oldqLjGW;JUcd;#u-6-uSlCrmaY_yRV->xK1iu#ELza0@IcRjL`*!)<U7
z-VG1HN@&0;7=@3*=iq+04kus(#-4yCY=@u02K=j^nT#PQDp%?;I1Ul1RX7bV!hNuu
zaEV1tK-r&!;&=+)1%r^EI?BMM)d?u)Uo6O9g_u&WLt;|rp&S3|A`>zAKIEr9Vi3ch
zL&?k<lnmU2WL^DISl@=C=jO0Dtb&j8e6=vdI*M{HybfQ6<)mjFF2XX-%@K8~9)ZQf
z%)*yo4E_ow#WQ%_3zN`5;WCue)z>K13P+%1=BdJZ74lP88Kj=RgA=ft!tui?*b85Q
z9(bje{L97-1iNrh$%FpHdJylz#yX|`fQl%?;7@oE2GIT(X5k{7r*PU}>2|URyWofL
zCKN}DjrqVY!6DY)K)LvqCh{*4@1*plIv;>?^9k4jje`6HyqEP!DCe^UUMuhh6i2t<
zURca0Fb>C{1eSp#@G{&DZ^I6Fe~Oak;`wOcMw9eOASA~5EISJuq9jeSR^-eu0_Dq)
z#)Z{Zx)hkygfs~le`*Jvl2KiB`Ep3EO3AII$-79T^1fcWrc0A|me!YtGm<^0FeO7$
zfYQ3@{mv}^8A_$gU&t=Hd<D{a=+x$&#;dhDpU!;+k)(KlE~(r}_tD*1zdPefJ(P$q
z%v)+aIv-CYjaX6#jHJmrrj0-#oD9cfIvLl=kg4a*L^Nz!NGu&SVhctja$Fk-f-y7D
z#gVY37c4WOkA))<ZA7fN4w^|Ok$<QL6L>KLV%0Qew}o_2BG4hT$HECV!m)09tvFMQ
z>0|LkKqpKKGsMwuWoJrmxen`&DI*e$Pq$53MkEPB=Cgrt(6o}%9Xg(nAe?}Q4IN6D
zM@Cxb3#NKnM`uGuEXZ9pj30?7qQgDLXm)?uCRa(+v@9cNkClHg;P?9ay#4|0?;G;>
zdwu;rU&WzEyp!h9uw=mdAXysHy*_{bT)*!15Bc`k-il^>vcg+3d@vp}NA0T>Q=1Rq
zaKQ+2`e`HEQt5HqKYHry-PQXZK9ftI%cbpHn#pNrWPU!E&g9Z>IFn^(ZtGn7th2qe
zF`mk$PdX<!cShS!Hh3Cy=@rhs=4haYrA!wBPOjLWRyEstdui&9AsoKr>|sUJ@Q5aA
z9LEX4oI?6;e&$4zVU5;VaLGALoNqfK(a$dkCLb8)R>b*oF8!txJ7P9#-g6W#u!AWa
z68fBHM<v>F55nlqE>s_P`QF;N1=`LHb7@pDa>0oxf4HDBL|ND~4Nck7txLs+^Y<rP
zXkw5Xphc1ym;SeG9FOPpf0c~=b+xDS-~Q#^WB^B86OS1wqi$tCQ`MHeQWq*}$*Zh7
TQE-Y>6Hz`E=9z4J!;0%~MvVpL

diff --git a/django/contrib/auth/locale/ka/LC_MESSAGES/django.po b/django/contrib/auth/locale/ka/LC_MESSAGES/django.po
index e775d4cd9ec..acb216109b8 100644
--- a/django/contrib/auth/locale/ka/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ka/LC_MESSAGES/django.po
@@ -1,80 +1,86 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-14 21:09+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Georgian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"ka/)\n"
+"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "პირადი ინფორმაცია"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "უფლებები"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "მნიშვნელოვანი თარიღები"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "ჯგუფები"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "პაროლი წარმატებით შეიცვალა."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "შევცვალოთ პაროლი: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "მომხმარებელი ამ სახელით უკვე არსებობს."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "პაროლის ორი ველი ერთმანეთს არ ემთხვევა."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "მომხმარებელი"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "აუცილებელია. 30-მდე სიმბოლო. მხოლოდ ლათინური ასოები, ციფრები და შემდეგი "
 "სიმბოლოები: @/./+/-/_."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "დასაშვებია მხოლოდ ლათინური ასოები, ციფრები და შემდეგი სიმბოლოები: @/./+/-/_."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "პაროლი"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "პაროლის დამოწმება"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "შეიყვანეთ იგივე პაროლი, დამოწმებისათვის."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "მომხმარებელი ამ სახელით უკვე არსებობს."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "პაროლის ორი ველი ერთმანეთს არ ემთხვევა."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -82,22 +88,18 @@ msgstr ""
 "გთხოვთ, შეიყვანოთ სწორი მომხმარებლის სახელი და პაროლი. გაითვალისწინეთ, რომ "
 "ორივე ველი დამოკიდებულია რეგისტრზე."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "თქვენი ანგარიში არააქტიურია."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 "თქვენი ბროუზერი არ ღებულობს cookie-ებს. Cookie საჭიროა საიტზე შესასვლელად."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "ელ. ფოსტა"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "თქვენი ანგარიში არააქტიურია."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -105,104 +107,126 @@ msgstr ""
 "ელ.ფოსტის ეს მისამართი არ შეესაბამება არცერთ მომხმარებელს. ნამდვილად ხართ "
 "დარეგისტრირებული?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "პაროლი შეცვლილია: %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "ელ. ფოსტა"
+
+#: forms.py:249
 msgid "New password"
 msgstr "ახალი პაროლი"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "ახალი პაროლის დამოწმება"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "ძველი პაროლი"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "თქვენი ძველი პაროლი შეყვანილია არასწორად. გთხოვთ, შეიყვანოთ ხელახლა."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "ძველი პაროლი"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "პაროლი (განმეორებით)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "სახელი"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "კოდური სახელი"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "უფლება"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "უფლებები"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "ჯგუფი"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "ჯგუფები"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "მომხმარებლის სახელი"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "აუცილებელია. 30-მდე სიმბოლო. მხოლოდ ლათინური ასოები, ციფრები და შემდეგი "
 "სიმბოლოები: @/./+/-/_."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "სახელი"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "გვარი"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "ელ. ფოსტა"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "პაროლი"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"გამოიყენეთ '[algo]$[salt]$[hexdigest]' ან <a href=\"password/\">პაროლის "
-"შეცვლის ფორმა</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "თანამშრომლობის სტატუსი"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "განსაზღვრავს, აქვს თუ არა მომხმარებელს ადმინისტრირების საიტზე შესვლის უფლება."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "აქტიურია"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -210,52 +234,51 @@ msgstr ""
 "განსაზღვრავს, რომ მომხმარებელი გააქტიურებულია. მომხმარებლის წაშლის მაგივრად "
 "გადანიშნეთ ეს დროშა."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "სუპერმომხმარებლის სტატუსი"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "განსაზღვრავს, რომ ამ მომხმარებელს აქვს ყველა უფლება."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "ბოლო შესვლა"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "გაწევრიანების თარიღი"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"ინდივიდუალურად მითითებული უფლებების გარდა, ეს მომხმარებელი მიიღებს აგრეთვე "
-"ყველა იმ ჯგუფის უფლებას, რომელშიც იგი გაწევრიანებულია."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "მომხმარებლის უფლებები"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "მომხმარებელი"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "მომხმარებლები"
 
-#: models.py:406
-msgid "message"
-msgstr "შეტყობინება"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "გამოსული ხართ"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "შეიყვანეთ სწორი ელ. ფოსტის მისამართი."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/km/LC_MESSAGES/django.mo b/django/contrib/auth/locale/km/LC_MESSAGES/django.mo
index 293b6bbaea5dc17dce5c8a9aad137a6ff63689fb..63d85c4bbe6d29c6206aea8af31374c5ad060b6e 100644
GIT binary patch
delta 926
zcmYMyPe>F|9KiA4<g~l)xUOmcHFs<Yp%|Lobu*Wa6$+b41VPqeU^iRL)pU!XVh<fU
zWx-U0)FC=}Fv400ymTmnKoIO4k%uCxYjy~t?{66JvA_Mi|L@Iv?_c^&s{Xm%d?2JW
z(M9wbA_uX!i9b@TNn`|@aRATa9=wk^e1%E;hH+fS7#gNX8^+PXPE24gp20kx6RFD`
zGP|hwfjZFKEOH(b7{PJW`f1dOu460SMqThB@{_0hY5)1K{slHuUP7jpcc}Ax2-{cD
zVtx5UriF&@s5}0RIv~PqTDDLJb|Fo&4@;cV0lYx@UX)GXAKZ_#be_c})Ds$H7wvch
zd+;t6@THbnUw)A}gspte6duDT_!@`tG@spz&+st|FQXp$Mb1+vyoS2a9O^<V$ds~%
z+V5xRUpzwD;`nyrAl9{mM@A>Q95(o&&(Wp+J?g-9)CF=3((-ZCjom`6UqJRJI|xk_
zgEzGew-WlKbR9iaeM3yA-@lP~J3-pJQ6=4Bp2G-styiU~gV3)`6WoMsCp4u9y*|A%
z-4wSHyqhhk*Qal-ldy@Pg;NRAZvRBnT5@P&YI3^fRcm(1tCeROZ_O3Me-v5FXB{`^
zWcqB^EoAbJ+wZ#Zk(17;^3}>rWwPoVrFX&3x|yJ#d)Uro3vR!EGuj;~mMf+5C4VkD
s&{FiOV^_Q}dX7){AETp<LhOs-FDFy}P`snDV0|_H`DCK8*fwnZ2O<M!>i_@%

delta 1424
zcmY+DU1(HC6vrp#V;hapBsDd)CSy%gk*?is5=mpBFD<Pg8nsXeN$4ee-7MLUuy?m2
zwrrFpfeKN36Vck-s{utHHJ}fEKpWaZp`qeKp)H}KFGBlLs2~dB@7!EdI_%uvoHH~3
zbI#1{?UtvTON;dt(~8zce}%rQOsP)z*$O_io^m?e3*Uyba3lN!w!_D;3T~@VY7Oj!
zpTqazN;nT+fD3Rf{1vW(58!I0O6p$*ALCe2sZ<~Ag-!4}l#O>_Kl}|!pe{b*e;10-
zhp-lY1SQ}gWU0zReyR}q55sEgaTtLoU<L8jX$B%V14ZB>6yYnd2Ht{_`A?8s)$gJG
zCzO5vKneI5_H%loegF(Gc?y0Hx57T6Pr?Z(C)G%>cH*lx2D{nV3+u5j6MYlB3A^E9
zXg86~cI+K+1m@ukybpK7Bb?{!@E7<EdXJz4n&u;V7oc3(k5J+~fh9STTFPUr)`#2z
z-@)#J>tPYfhRJaLJQTqz;r!i@f5RC5%DScf+o9}pLVFxag7cyOuR6}3M3<X9EJ;L;
zbwlWtqeWMR?@?`LEY~B6y-b(8mm*r}nl6uc9sO0hG`VYePm-`S4mr5Sz)<^_&<r@O
z<@O?@#?WdA*#=waQjs)HT~SEz$oLZk?Ipgixs~On^g%vX9C6gn%t$U@u(Ac6unIPI
zR$GZgs*uWMbs?t<L$)5V^O=<6;Bj=u$`-A3`jED8B(rwn4VI)FU3BccKA1|UwUu^q
zI%yXer2n@ynJ0>!5LMe6TsNeXl7Sww-*gCqMk>2)?qT^tSyje%94qO5TY0rJ9*wm}
z<DEL*-W~6V#yVoLl|6f+`|M9sl27zKa_-h|#p1!bSci^xb$7(wOI6M8&sAM+eWbT$
zmz7Nxtt88aGjqccQ?|<g%6MNJ?}qVCyJuFny2I5Cr77dNMkY=e|0om28#Dg6@lF~4
z3*%21&o|z6<DCrFu#EAS!OFA7J8JwR#zWy6BKJm*8E-mRcHDSpjejig%!-b8=DTx&
z67sA?6`4_q?B0$<8fOFVm_(7^E!pl(xj#grJ%Pq@z|kPJN#h-VF7F2(ib8hkxszr8
tRf>WH4>jCNk&TUP3JR7i$d&r3d1~%(^@EDF<bwFpG?ks4`=oZD>=~T$WP|_!

diff --git a/django/contrib/auth/locale/km/LC_MESSAGES/django.po b/django/contrib/auth/locale/km/LC_MESSAGES/django.po
index a915bae682d..57e31eb6468 100644
--- a/django/contrib/auth/locale/km/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/km/LC_MESSAGES/django.po
@@ -1,87 +1,88 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English <en@li.org>\n"
+"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: km\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "ព័ត៌មានផ្ទាល់ខ្លួន"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "ការអនុញ្ញាត"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "កាលបរិច្ឆេទសំខាន់"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "ក្រុម"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr ""
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr ""
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "ឈ្មោះជាសមាជិក"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr ""
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr ""
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "ពាក្យសំងាត់"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr ""
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "សូមបំពេញពាក្យសំងាត់ដូចខាងលើ ដើម្បីត្រួតពិនិត្យ។ "
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "ឈ្មោះជាសមាជិក"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "ពាក្យសំងាត់"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr ""
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "សូមបំពេញពាក្យសំងាត់ដូចខាងលើ ដើម្បីត្រួតពិនិត្យ។ "
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr "សូមបំពេញ ឈ្មោះសមាជិក និង ពាក្យសំងាត់ ។ "
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "ឈ្មោះសមាជិកនេះ​លែងដំណើរការ"
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -89,160 +90,183 @@ msgstr ""
 "កម្មវិធីសំរាប់មើលគេហទំព័រនេះហាក់បីដូចជាមិនទាន់បានទទួលយកគុគី ។ ចាំបាច់ត្រូវកំណត់អោយ​"
 "កម្មវិធីសំរាប់មើលគេហទំព័រទទួល​យក គុគី ដើម្បីពិនិត្យចូល ។"
 
-#: forms.py:108
-msgid "E-mail"
-msgstr ""
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "ឈ្មោះសមាជិកនេះ​លែងដំណើរការ"
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "អ៊ីមែល នេះ មិនមាន​នៅក្នុង​ទិន្នន័យ​របស់​យើង​ខ្ញុំ​ទេ។"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
 msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr ""
+
+#: forms.py:249
 msgid "New password"
 msgstr ""
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr ""
 
-#: forms.py:177
-msgid "Old password"
-msgstr ""
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr ""
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "ពាក្យសំងាត់ (ម្តងទៀត)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "ឈ្មោះ"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "ឈ្មោះលេខកូត"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "អនុញ្ញាត"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "អនុញ្ញាត"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "ក្រុម"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "ក្រុម"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "ឈ្មោះជាសមាជិក"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "នាម"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "គោត្តនាម"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "អ៊ីមែល"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "ពាក្យសំងាត់"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "ស្ថានភាពបុគ្គលិក"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "កំណត់អោយសមាជិកអាចចូលមកប្រើប្រាស់ទំព័រគ្រប់គ្រងនេះ។"
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "សកម្ម"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "ស្ថានភាពអ្នកគ្រងគ្រង"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "កំណត់អោយសមាជិកនេះមានសិទ្ធិទាំងអស់។"
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "ការពិនិត្យចូលកន្លងមក"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "កាលបរិច្ឆេទចូលរួម"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"បន្ថែមចំពោះសិទ្ធិដែលគេបាន​ផ្តល់​អោយ សមាជិកនេះអាចទទួលបានសិទ្ធិទាំងអស់​ដែលកំណត់​សំរាប់​ក្រុម​"
-" ដែលសមាជិកនេះស្ថិតនៅ។"
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "ការអនុញ្ញាតអោយសមាជិក"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "សមាជិក"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "សមាជិក"
 
-#: models.py:406
-msgid "message"
-msgstr "អត្ថបទ"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "ចាកចេញ"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "សូមបំពេញអ៊ីមែល"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/kn/LC_MESSAGES/django.mo b/django/contrib/auth/locale/kn/LC_MESSAGES/django.mo
index d9f920bdc18682fa39413d162dd756470a71ba0a..0fcb49ffcb9644fecfd2eaedf373a7fc34b3e9b3 100644
GIT binary patch
delta 2232
zcma)*TWnNC7=Wi2Tqs4#T`a;_C{S=OZ9!yJu+k_hf$9q(qT#rEy1R6{+w3{(!V8;1
zC?;}~6EHC`(MSlX2AZ=`A)tNK2QP^s@kPl=<i%h@d{Gm9@cU=C3mPF#cIKNoGynbH
zcbAWMm9NijKCKvQnM;^%gHn&fuNqkxmztF7f|ubu_!As}zr&4iYqL@h!Go|Dz6WQ+
zYp@00fUWQrTnzuJofl41YPwQowVX{G7mvWD@JYA;?uIjA0nUO4;7)iHcETG_6t>)F
z6sZ;P70zMU2j7JJ)YmK+QrDp9`w`v`e}*mCSAVcUmud=C1!h3;ybaEP?GUF`Clp0%
zYWKZR6mEhN;qy=e*$L%+x^^ChB6k3aog?rqvV07l#J*aF6-oI7{1yHJEATpA48v1c
zISR!}1RR48!>e#LybeV^M4IHh1wH_?a6LQ>cfl)A<QEWrJM4#L`LKu0W;{9pM>&5>
z0sG;Lgd?dw1HXe;;T3pdj#6{s3oK&rRoDTKz~yipN-uo_r5A2Oap+Ij1LxC7%iy!~
z$iF;D@j)JxAaB%3C?0+Q*TPA-4&H>)8+yJ{-SAN;4yK{JKMsk*^pW&Nt%r>>1aGpo
z3Q9Sov}>gPQ-h#P-Q+AvB{CTjne+q6Q7f4;r0!j2r_>6FUuKB2(gQLiFd6(&jB~P=
z>?~r^atdFi|Eoh9LsBAH&`cQ;sboX`UNROkDYc?+)Pqbj`gGB;3%ZnX)7nj2t~utc
zVOv|-f^8-DYkObDah-_TlD2XwTaQ?dQ_2^Taoy>te(&j~AGSX?Jd!WCR?gK)%e5V~
zEuTu+Nu4jcYP(&kOZ?-Y6Zza=rZ8-|nS4&|$R_L0yw94K^wx~%gfW`bPBD?N9cQqZ
z&F+t=f%^3wO1$rziygLhOZmDgJ(#hxNk=C$$=oVeV=R&OwoW^=X;;2j(D^%z>XPMX
zJLlR39M9wu`9i@?xY*JIS=(~#>YdKG+Dcj87t?loYww#_-xH4YhP&74SS;SXJ{;Q+
zi?s~w2)|^%o^gmO+)p;*x+m6c-o+l%-97Qx2Cpr&NDo;BH=P-JEtS<z+}=Nx8n!ao
zNFqP%^@SEcvpVg%Bk^doR4PT>f|YYJgZ92i&UT|Ch5TOpbD|^B<X*~>k7ikmR?3bJ
z<)U3J+iIt{9?E%pLN9w?hE_I?X>WASqV~%{Wi0S71^z@(8P$P*D)0{m{y8~tzo5*g
zHv<3d!2jH=zC5p-=IddRsvHaavw=S;tL#4(QJ+Wbee)enV-Xej<3>YOf>&7M$@{FR
z`lu!)HZB?|{6WcRTsL+)m7Afnjo$f|sQ25<j<WH$f{T|B95-4f#IA8G@INt@&SCKX
zJw(Zwz<;L}f<!T9Wc`Y0^e_I~NE5+(ovj^Sq;+HYUNI5Dhb9LETTR_0y6zI`?Z9zh
z6bJ65x$f_DGH)FAHqTjFIn<hOC?A*1N?N6qcg+rWr%mQQol0A^dWcf!3fJ}InO>0k
zA|Uyw1ydQFs(7{fwTf46&FX6?pEudOU@TlP%I=m;l36bq57AZixf(vcNY4H<3_LPD
qGL_rFmqz3Dg`l<8i;^1cO|-Vp!y&w>hl1c_B|LjsLuGecU&G%5#sI?r

delta 1472
zcmaiyUuYav6o>Ej&t?-hu_kGCYm8T8urb}uZnJ@QDQyFbVvKE2!D8sc=uRdZXJ_Kh
zti=aeQzeQRgbvjg1p`u~4{e>HA_(=-hgKg7f*>sOAP7=KMJfn_-<d1{pFGUH-?^7_
z&+puG=hDQ-W9`o1t_unqXN)kaDWzthy@Lrmu~Vr9I17)!^Y8(96HdclU>c6@QtECv
z4qt~eun$Hs1Fyq9@Edp+`~mhW)mA^@JkQ1-FbC&$Zyl(?Gprj>1a5TqZ$U}$BOHJ~
zLlL?I`BaKviSJ>O{Q=kubFc@FL8R0q%%HD|I1+dSO5!Ta!UZT5pMi3~>8?E}H+l<-
z;08QR*8=!E>)WVAutQJ-o=5#XC?fZP4OoB|;b@zK-{U;Q#-FH5z&_OF38vuv(1dbe
z4IU@{Dy*{pjsA_p8QO3QF2X@r;2jRYS@<wqfn#t3$`gMM`P6qzZ4vC?9D;wr2jOE}
zTLR{~d;v<_3KW4ip%nH3oP;4P!w%dFhwf3T1Sg;rxCkYF4O0KMQ4IaZq@DW{Z>yyu
z-u?fQ8_2WV%aH$rOD69rH<Dr{@i0R=C?;<##cGBa%}t&!S#&4)foUH0crvRYAeD>B
z4aKDLQ3gdPM%R=7foE3y^oi|beuNR++1Y77(R5p@o_eye>Nb7D@paAcP1cS!YPGsw
zcOC7!+Fv&Hs@ZJRJ&zqvHw>p`*!FAMV8e3E+Cf6<o^E+&Q=hHdwl-|f)t2ew*#9|d
zHBm8ZlGQX`sw`_uD$vX3l!pj8>P|t;yOu?a+w#={5@+3JZQIcY49loH6TvIHTR}G6
z4!%vFPB%=?Gpt~&CtND!i_`hij4n-AO67d9TrBo2oXS6AzFL>s^HuIw(T9qqB(7N2
zrNfnSX|jm*%^RMde~tn@+wk3HMb8<ILrF(h5}vTldd;*8b!W*9W;40;(UY!Y9t%Fn
zEN15o$7&fCsb6-2zcY_UzxHnK2>uz&1@C94X0OH3J8^g=4ll&fMjU<`hhK{yUW>!)
zarhxi9fzOA(Hn8N8HeHaZX8~Xqc!4!r-pNTiTNmw-j(ywx*Utv59;7{@5pfyUQRM!
zCWd{EoQuOtiHwB(fA;-{MW5Q3&k;_cWZ1+b%Vwf?CCQ8S)(t3};?@hnSK0Bv=|2^m
l93F{Y9B@<7vwM!EqNfK(QvF{hbzF?2x8v}OXlbaL`WJelVDtb0

diff --git a/django/contrib/auth/locale/kn/LC_MESSAGES/django.po b/django/contrib/auth/locale/kn/LC_MESSAGES/django.po
index d1364218e04..ed4b2eda0c5 100644
--- a/django/contrib/auth/locale/kn/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/kn/LC_MESSAGES/django.po
@@ -1,77 +1,84 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+#   <karthikbgl@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Kannada <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: karthikbgl <karthikbgl@gmail.com>\n"
+"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"kn/)\n"
+"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "ವೈಯುಕ್ತಿಕ ಮಾಹಿತಿ"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "ಅನುಮತಿಗಳು"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "ಮಹತ್ವದ ದಿನಾಂಕಗಳು"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "ಗುಂಪುಗಳು"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
-msgstr ""
+msgstr "ಪಾಸ್ವರ್ಡ್ ಸಫಲವಾಗಿ ಬದಲಾಯಿಸಲಾಯಿತು"
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
-msgstr ""
+msgstr "ಪಾಸ್ವರ್ಡ್ ಬದಲಾಯಿಸಲು: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "ಆ ಬಳಕೆದಾರಹೆಸರು ಒಂದು ಬಳಕೆದಾರ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "ಎರಡು ಪ್ರವೇಶಪದ ಕ್ಷೇತ್ರಗಳ ಹೊಂದಿಕೆಯಾಗುತ್ತಿಲ್ಲ"
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "ಬಳಕೆದಾರ-ಹೆಸರು"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "ಪ್ರವೇಶಪದ"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
-msgstr ""
+msgstr "ಪಾಸ್ವರ್ಡ್ ಖಚಿತತೆ"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "ಖಚಿತಗೊಳಿಸಲು ಮೇಲಿನ ಪ್ರವೇಶಪದವನ್ನು ಇನ್ನೊಮ್ಮೆ ಬರೆಯಿರಿ."
 
-#: forms.py:31
-msgid "A user with that username already exists."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
 msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr ""
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -79,129 +86,149 @@ msgstr ""
 "ದಯವಿಟ್ಟು ಸರಿಯಾದ ಬಳಕೆದಾರ-ಪದ ಮತ್ತು  ಪ್ರವೇಶಪದ ಬರೆಯಿರಿ .ಎರಡೂ ಇಂಗ್ಲೀಷಿನ  ಸಣ್ಣ ಮತ್ತು "
 "ದೊಡ್ಡ ಅಕ್ಷರ ಸಂವೇದಿ  ಎಂಬುದನ್ನು ಗಮನದಲ್ಲಿಡಿ"
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "ಈ ಖಾತೆಯು ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ"
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "ನಿಮ್ಮ ಜಾಲವೀಕ್ಷಕದಲ್ಲಿ ಕುಕೀಗಳು ಸಕ್ರಿಯಗೊಳಿಸಲ್ಪಟ್ಟಂತಿಲ್ಲ. ಒಳಬರಲು ಕುಕೀಗಳು ಅಗತ್ಯ. "
 
-#: forms.py:108
-msgid "E-mail"
-msgstr ""
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "ಈ ಖಾತೆಯು ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ"
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
 msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr ""
+
+#: forms.py:249
 msgid "New password"
-msgstr ""
+msgstr "ಹೊಸ ಪ್ರವೇಶಪದ"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
-msgstr ""
+msgstr "ಹೊಸ ಪ್ರವೇಶಪದ ಖಚಿತತೆ"
 
-#: forms.py:177
-msgid "Old password"
-msgstr ""
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr ""
+msgstr "ನಿಮ್ಮ ಹಳೆಯ ಪ್ರವೇಶಪದ ತಪ್ಪಾಗಿ ಪ್ರವೇಶಿಸಲಾಗಿದೆ ಮತ್ತೆ ದಯವಿಟ್ಟು ನಮೂದಿಸಿ"
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "ಹಳೆಯ ಪ್ರವೇಶಪದ"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "ಪ್ರವೇಶಪದ(ಇನ್ನೊಮ್ಮೆ)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "ಹೆಸರು"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "ಸಾಂಕೇತಿಕ ಹೆಸರು"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "ಅನುಮತಿ"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "ಅನುಮತಿಗಳು"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "ಗುಂಪು"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "ಗುಂಪುಗಳು"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "ಬಳಕೆದಾರ-ಹೆಸರು"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "ಮೊದಲ ಹೆಸರು"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "ಕೊನೆಯ ಹೆಸರು"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "ಪ್ರವೇಶಪದ"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "ಸಿಬ್ಬಂದಿ ಸ್ಥಿತಿ"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "ಬಲಕೆದಾರರು ಈ ಆಡಳಿತ ತಾಣಕ್ಕೆ  ಪ್ರವೇಶಪಡೆಯಬಹುದೇ ಎಂಬುದನ್ನು ತಿಳಿಸುತ್ತದೆ."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "ಸಕ್ರಿಯ"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "ಮಹಾಬಳಕೆದಾರನ ಸ್ಧಿತಿ"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -209,42 +236,41 @@ msgstr ""
 "ಈ ಸದಸ್ಯರು ಸುವ್ಯಕ್ತವಾಗಿ  ನೀಡದಿದ್ದರೂ ಎಲ್ಲಾ ಅನುಮತಿಗಳನ್ನು ಪಡೆದಿರುವರು ಎಂಬುದನ್ನು "
 "ಸೂಚಿಸುತ್ತದೆ."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "ಕಡೇ ಸಾರಿ ಒಳಬಂದದ್ದು"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "ಸೇರಿದ ದಿನಾಂಕ"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"ವೈಯಕ್ತಿಕವಾಗಿ ನೀಡಲಾಗಿರುವ ಅನುಮತಿಗಳ ಜೊತೆಗೆ, ಈ ಸದಸ್ಯರು ತಮ್ಮ ಗುಂಪಿಗೆ ನೀಡಲಾಗಿರುವ "
-"ಅನುಮತಿಗಳನ್ನೂ ಕೂಡ ಪಡೆಯುತ್ತಾರೆ."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "ಬಳಕೆದಾರ ಅನುಮತಿಗಳು"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "ಬಳಕೆದಾರ"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "ಬಳಕೆದಾರರು"
 
-#: models.py:406
-msgid "message"
-msgstr "ಸಂದೇಶ"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "ಹೊರಬರಲಾಗಿದೆ"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "ಕ್ರಮಬದ್ಧ ವಿ-ವಿಳಾಸವೊಂದನ್ನು ಇಲ್ಲಿ ಬರೆಯಿರಿ"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/ko/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ko/LC_MESSAGES/django.mo
index d85d99a50ab8d7e14869172c0159fc51aac9ac79..0db1397df6a2f57c2f050ba7c11df81275267d69 100644
GIT binary patch
delta 1312
zcmYk*OGs2v7{Kx4qcPv(qtq-LHJ{CR?`Wbki?Ej_DT#{;Dr(Z3?-_HZ>_Hepizr38
zxyTZVjKENgS+psrRuOHaZQ81&G>A3{LG}NpD|EQu`JFj)?>YB;=iJ97GlfG->9G@v
z;wH8d(@{$8LuU*Xr8ZWnGW1{uwqXknq6gogfzcb3vSBA~!vI#{2&UpIOuz+9!Vj3E
z)R6jOb;R)WM*gs)9dj@b%W)GnVj`ZxWbDDCcnJ^S0v^JwIHgWt8y4Y9WFqw$>rp0=
zc^arrGQVn}v4@U1WDNBkxztZ8nNY<ml>$j9E67FOSrwz)@3i`>kW1~RA}Q)1$~es^
z&mBP-&xewMKD0Bxx=ceJxG5bthVtM8l!<0=oNbxM3V!cplq@`lwRi)Y@ipE;JEO}u
zQz-Y(p={}*)t^uLB!iVyLuoYXXk=q6W?~O=ueyek`VlO~hbU*@Ey~K5Q11JL_4or%
zqla{flh}d3upHYs2&FiRayFi&l7AUsg^podLpfYmczv1R9kOWk-f|JS)H0R)zh?Qz
z(#C4!1(Q+EZ$8R>MJV$)t=}HYx-{}H12)jH1&^Uj7)0s6it^wnvIun-*@;Lgw3HP|
zku8w}Cx@+oC?iOS$|W>n2l0QAuOwUcUs5b@xn4@Fh8!B1RL+7F4zP+Q*yhN~xloFH
zwz6tTv6GOJPE<r%{}yI7BikrvZM}FLw006?Ua`2yfs@Zp(kGeNPUu8Fv6+x;xQWd0
zo!GIc)W*L4z(C074>{U>AtPwMu#JV!#C?r2AI1MRpCrszSGx2nmwT5(*S+p)mtLdm
z2`z_Rt;U6}U{}EJ+Rsy7N2TtL+^5$%+?8Iv#vDt`vo#rA?MAOTo9L`B?F@zby_z;S
zI9L%H@cDyXXN`*$ej}vy4+Of6wop*(*V?;%{*HjwOMTwgVQ4)8tt_F*`sH=>1k8_#
x$HNUtG12zb>G9Rc+utVcIaa5huil?9pQg-)hf|ZI&6TA1@N$|v$}GsZ{udhtoy-6L

delta 1770
zcmaLWZEO@p7{KvqIS$%VDlG_A!LcvY3fJECO{k^ONNWlRwb5WwOI*3-?&MzT?G=2@
z)y5#wsx{YYX?Rmi2*QV^C9zG68Z{(FKQx+1Vp9BSx?5v3e(-~d|7W|Hm>4HF_nV!a
zeP;HV*^eqO)nsp$`o<Ndg?bnD+dQSZ@Z}Z!Q7-tDs>S!Q48Or{{0VnraHUcvK8t>w
z$IW;H8}SdXzm}UNTnF(Ld=Lwj%BoLktfAv;EXN<b>tAs-*MH${=wGGO7Tky%um#uS
zJ}g25i!p%*@g?lQ?{P1d6YME8u^PX?a^_b*)99olzd)%cu?y)^A7CF|!H2Mb<+2vF
z7v+8r%EZ0679+?{9pjIeR<ELrf8FbU3kju8BWqF@(Z~Gi3JnQ3h5XbUe-ijBl+4Vd
zWMBcwy86Yt{vG8xAA@DWVm!$9m0=y%M|pT7PT~%n#z)b{5!^|-vJ&_@4SC=OK8$`|
zM^?TE<^E%M0G~mIsA*h>pW`O{4rMEBB(}TJvPH#g_*Se$IXio>5)YxoA1WdL^1vH(
zbmF`CG%k3yGkb*V^LQVwV%B@H0p)P@;(mM^CC*J8LL0j=S-L#YXDF$^?m3V0Vn3FW
ze_4s`4gAgXPm~qQpL_`GQ37m28DD`iVXb%F;<*bY@NT>VpFnx8-|K%7<+))bS!yCn
zgDrFSNglja<a3l1a@+kZYrPvao*~Tl+S^dR3@I`xFYg{OITKQN7x$Bt)N^FicB*XG
z?bIxpc1r{QRaE&j0#r?vQn8GiZm+5Cq#<u{H&qUxlsamY+gd&&^45|$**3|TlzJ*>
z^Pj@!Ug4%;tJif8HdEzL$vy|EzL}73G%x!|IyKO5sjftSDxEQs867q<Cf7-Agu}5+
zES1!ml+Hv=-EXE7G0URI(g`CuV8r7uXoHSO(hP5BNX*g$mYLSaWAV5);#NvW%nXhA
zzaEXGnZ*oCRMR-TA*v&?0v$E$EhZsGELoSEUpZPv=;Nt$Sf@>kFs!56nmOcm@*dYU
zy+%Be>Z|ItjCcm3=JVlL#I!PfH9D1+MYs!YGjud<9@$mV?}e(bXg?e^k`dnJR`4UK
zbfT@^XrJj=y&}(_FfGf7<T?wcn?r$MV<6P5LyfJWra-VM7%c2Q5a=<F#UulP-DIg%
zHv~iOxL}hG?PzTZ<pPCUay^CH{B8SFNwYooWnu4{eM~rDL>PTEHM6<Mm*27Y@vMDu
zPB|aG<4le%ji1rZ*-xAc<7#RAnms(HouRAF<YnjFsPo?F;`E4iPQ1w-=iEvA)R<m=
z);T+oJ6}|pYbd^2S#2>++arS#$)0=7o*J~LPcBW&YUkR?#o4K)(_=FW#cT8L|G%u+
k6QdISzcQA4uBgoCrf9L`fxH6y@|ZJx#<?_@t6F#BZ_-UcGynhq

diff --git a/django/contrib/auth/locale/ko/LC_MESSAGES/django.po b/django/contrib/auth/locale/ko/LC_MESSAGES/django.po
index 2951557f39e..cde31a34628 100644
--- a/django/contrib/auth/locale/ko/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ko/LC_MESSAGES/django.po
@@ -1,88 +1,90 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Korean <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"ko/)\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "개인정보"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "권한"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "중요한 일정"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "그룹"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "비밀번호가 변경되었습니다."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "비밀번호 변경: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "해당 사용자명은 이미 존재합니다."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "비밀번호가 일치하지 않습니다."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "사용자명"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "필수항목입니다. 30자 이내로 입력하세요. (알파벳, 숫자, @/./+/-/_만 가능)"
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "알파벳, 숫자 및 @/./+/-/_만 가능합니다."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "비밀번호"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "비밀번호 확인"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "확인을 위해 위와 동일한 비밀번호를 입력하세요. "
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "해당 사용자명은 이미 존재합니다."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "비밀번호가 일치하지 않습니다."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr "사용자명과 비밀번호를 입력하세요. (대소문자 구별)"
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "이 계정은 유효하지 않습니다."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -90,112 +92,135 @@ msgstr ""
 "사용하시는 브라우저가 쿠키를 허용하지 않습니다.로그인하기 위해서는 쿠키 사용"
 "이 필요합니다."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "이메일 주소"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "이 계정은 유효하지 않습니다."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 "이메일주소와 일치하는 사용자가 없습니다.이 이메일주소로 등록하셨습니까?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "%s에 대한 비밀번호 초기화"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "이메일 주소"
+
+#: forms.py:249
 msgid "New password"
 msgstr "새 비밀번호:"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "새 비밀번호 확인:"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "기존 비밀번호:"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "기존 비밀번호를 잘못 입력하셨습니다. 다시 입력해 주세요."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "기존 비밀번호:"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "비밀번호 (확인)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "이름"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "코드명"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "허가"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "허가"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "그룹"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "그룹"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "사용자명"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "필수항목입니다. 30자 이내로 입력하세요. (알파벳, 숫자, @/./+/-/_만 가능)"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "이름"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "성"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "이메일 주소"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "비밀번호"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"'[algo]$[salt]$[hexdigest]' 또는 <a href=\"password/\">비밀번호 변경</a>"
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "스태프 권한"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "사용자가 관리사이트에 로그인이 가능한지를 나타냅니다."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "활성"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -203,50 +228,51 @@ msgstr ""
 "사용자가 'Django 관리'에 로그인이 가능한지를 나타냅니다.계정을 삭제하는 대신 "
 "이것을 선택 해제하세요."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "최상위 사용자 권한"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "해당 사용자에게 모든 권한을 허가합니다."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "마지막 로그인"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "등록일"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
-msgstr "해당 사용자에게 속해있는 그룹의 모든 권한을 허가합니다."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "사용자 권한"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "사용자"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "사용자(들)"
 
-#: models.py:406
-msgid "message"
-msgstr "메시지"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "로그 아웃"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "올바른 이메일 주소를 입력하세요."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/lt/LC_MESSAGES/django.mo b/django/contrib/auth/locale/lt/LC_MESSAGES/django.mo
index 7e38b7fdbd9c634346e478c3e6987e69efc03404..ab37a731f97c1402e16c09b62d48d86a048498b7 100644
GIT binary patch
delta 2384
zcmZ9MYiv|S6vqdP1-4lF0C~$mDYUfvC@oZ)f)EsWRgn6A;dFPpJKei?mOFD<%a_F%
zqX`5hH`s_qgTyEyYLKXjBA|4QCK~md5G9dB5{;iAMol#Fe|B#RIN5W5Gjq?G`Olei
z_sY^=+KLw&CLUsFJ+OJO-zPA(4Lnta2iji~8EXaq1{=Yqn;F{<c7v<H=Rpa64pxIL
zc+3amU?<oIP6M9?Bj7=BD)=fmo3SE07EYW4C*#F;U>$fKybb&foB>Xm#MlCG0aydx
z0p0>`0Urb(244bCfOml#vDg;y0QeYq0UQ9kr!dwG9tO8ze|8ofC}DMww*g!Rl8{~C
z<KP}}9ryzXEo=^UM+jR8l3!cME)YMq8jo6V6NnJ@5QyZkBuMcJL^4^P-eZ5}QwQ7&
z(!%>fheIH3a5#K_6vU6ciw7<6F-WOA15(Dm4(ERg$Cp5gzY3Cof53~l-kT8Ait*1#
zUy)8;1GyW)W^g^|f=__&gNR}ExIpro5B7rHAYL&G()(vXs*M-GMc`4e0sI0af#*Sr
zzZ||NwNz_Ob;$oxbk<^mlx9G>>s_D*p99Z<e}X%}PwFeI#p?YS3or|Q08*_igo-|J
zEl3+405^eegII!H0m;8=dZl>vbmSlP!j55ruHXbnj;BC6;Wyx|;Ey20v#TK8VHH#o
zBOt}shvV5Gt;0bQ)CSVQHiz%~LCVM@;e5IncJiUaFo?sjz2HnR0BOPF;rxdn3H&OY
zzX0M&8FaBFFiI;4rbZjJ!Is15YsTTrv5UcFFsh*<6+%0V8l8w*6AYOiZwtd-9GnA-
zhU0FKM6Q5!z*fQNlcfI=I(-aA1wGd0qSG}tsIbTq=(ND-l()m^&x5|t>l>wz3XN)o
zvNH=ttrJGqvXTa997g{U)Tj`t(e+TH>!g~vi3Vu&Ma*C)Uz@mZ!n94fy!NbcEl&w6
zP4H>;8#OIPS-H~{IoTTQoa7fpf#-!W1?{B_7oOy<w%l0l$y7Txn%j)Tq%xT21u@L6
z=0-|PW6C$uTWZGR+xdWR`LOnRQn);s5pJ3s<+uX^l$++gf@eHAxOx#bo>AU8zGzK(
z!9nfidgEeE@cpDeTGF2O^XA%4d_X$dO=CvK_`34uyr3K>c(%H^UJr68ibE_f$Hjur
zCbw>t6)%xYY9Cp^IdxJY6)6PTOl4^q%?agjkxF^e7?MsIKwsJ$#0Qrr4+d{ed8a`*
zY3(6A$C4SD%o;xz+#6Zllo2MwkXuh!rCq}uVJvraTDg@jQXU+Ov{VVl2H!^ZuUH;U
zbVfV6cp}l$u_Bu2P9!4Rw?%iz-O3<7dM9M|@a2h)vR`5q?^xNB=nP)0nYp-M<+Ljd
z2l4DRmEqc~*y9M_WQB?4WN@}--iDTpwfUZSyih2_tS4Nf2IW&RSK4^q(?c?8O*|h@
z4dI@2+`-cqX&HBHyfv~l9QAOhy;Sq)$<0&$olx7qTX+LX8!9Jlf{V3Z&O;RloAps;
z=pe<-*Vora(+(Ezk$&lPR;PSz6*rE^TTwc#Q>D{NDDIAqc!C?@r*%%X<6={zBMwgs
zN9BeGMn}q}rQljR?v0KhzH~%s4iQ#cJ%mCWUvBih%33jgpOQwDm#`8J>&G^PM_y#5
zGFZkHeoCiA4zB8kY8)#@>?1f8qbOJ7%XRk$uhhM@@@~)1LsdJ+ftAh~(qqQ;AOm?%
zW$6x3pbvy9g$Z7-oi!gx8>XZBR;nzL$00vmUM^>1!Mb|hcP#*3MoG%3@o5WRbLqq&
zzjOp&pP)MRxhpA6Ve<c%Sse?Wtd~Js!<o5Zv7%5|R=d{IjzZG0a83ljHuTk@_De@Z
arEZgINC#bw%Yt;{lIoO4r4;OM9Q+UM9{~CQ

delta 1892
zcmaLXUx-vy9Ki9TZL7QMy1L`0Tb9SobzS%0jQa<aQPlqEqUfSU!K!f9xz1i^=HB7{
z@edYbkpxjz93r9!wTA*<qU|Ajkg^>xDi8weC50%80$B>79>TuAnd@70*x&u!d+wQY
ze&^5KpZosksoZF9ctcUfh?T_G^OPFLXYS!bIoF_6FP_H~euWcw6E|Y|UZos7ij8;;
zAH?r)7;h)_y}WGWIgQWaR%}+PqAqi@h>9<<6R#)FbGVS_e{cylE>P+rT#g+$hRbj_
zwxGdQEa6jl3LnF7aTj*d*#UI08?Rs|<Evk}d7O&*O-enD<4BddfCup+Zo?+hB^R{|
z<^4XCfhTb>=8->jj0=-i&!Mz`F{wX`bfw-xa#HVM1LLcU+(?HXB7f=<7wLEwWo53R
ztiTV*s;gVc^PeccYoM_V*ox=az7+QI{4qb46}^Ew@h^M?x3Nrz@C;UDpr5#rhI5$3
zW~L(<?m(H@UM{Ec5K8--C}-h!?7}<Pj$Lf9Bs_}J-*%Mu2T;ydCGj1U#4ok6{<4=>
zsPOT7+=n}vuJ|_Y$6F|SzkO-FV}s*7pF#(#C@a)Q76r`WM*IL}B0nNIs^9QF{2Lic
zElIKdvPYWfh&?Dj7(^Lx3?<Vi6Az)Z%cIQHOX^Q0zJT<tUcu#f4%sF3NmBm>N}|`3
z`d=#Cuw}Kz^5Slh&rw!}*R`dS{gl#EM`dt+a^HuNtd#o+7Na%^ITKPOA^9X9CM21D
zLcSbX3E7fb*}!!T(M=2xnvf#<CuO)!?fL*$nf)q4R!7PpF;cs$e};0><zL8pLRL)5
z5FzL1ZsClqt?kR&q-Hga5-W&xM4FHjuV!vHygcu~j=+!0p&Boh{U9=4q;n>6c=oi(
z<=n{iJstTvns#*A2}*7lQWNTu@nTafp45hlyyxWlY2t=D4xK<BcZ)@BilJ{0H+84-
zGJu|ThC=$FiR%s8*BUR_%?o1t>caIlTzJ*K+qA~EH%~pGdnQdW?;l(<8Jc1Q)6R*U
zn|H$KV2}0#>Asdq*68WLIkLH{%=pLsAUD*t<?yue@?@FR=p%km$_|+=)^GmEj<jU$
z>6VVhk`sm|Z*9vu`&r9NqnUy9@IYo%XNEUrMh4O&>2&kN-hqA2F;}KJ@F+{MNpDDJ
zYVFcvI=ykzNXAwcE$=LvIAAi_x?6+ToAOT#9`;N2(?u&AvwM8c*<x3=PPXhOtJvh}
zr#KV0-kDd~5ya)$H$%1mm<gs_Ka>UcLp2e&jt-1ha6LEHQ`L*P>WnTkM!^jtZX<`B
zsx$q%dY*ClZRAJ(Q4{LOxMgM?>AZ<~;f7L2V<+s_1(K9U(E0kfE9$j=Dbz>lh!G0R
zA@m3B^KDm`Rxi80?hdty!pKA?OU52q^15BzzMpvCu1>A8XH&V{9uw#M!vAg-b2Hkj
zxBIW%3X7&3nd)UfR~xe6aMVhEZPRAY)V6Id^|}3K*>2m{v96IeUL4tpj$V7Z!}%Aw
C##(3q

diff --git a/django/contrib/auth/locale/lt/LC_MESSAGES/django.po b/django/contrib/auth/locale/lt/LC_MESSAGES/django.po
index a82fc29568c..ce21fc39fc9 100644
--- a/django/contrib/auth/locale/lt/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/lt/LC_MESSAGES/django.po
@@ -1,80 +1,91 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# lauris <lauris@runbox.com>, 2011.
+# Simonas Simas <simonas@kazlauskas.me>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-06 09:41+0000\n"
-"Last-Translator: lauris <lauris@runbox.com>\n"
-"Language-Team: Lithuanian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-09 16:03+0000\n"
+"Last-Translator: Simonas Simas <simonas@kazlauskas.me>\n"
+"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"language/lt/)\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Asmeninė informacija"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Leidimai"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Svarbios datos"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupės"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Slaptažodis pakeistas sėkmingai."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Pakeisti slaptažodį: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Jau egzistuoja vartotojas su tokiu vardu."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Slaptažodžio laukai nesutapo"
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Vartotojo vardas"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Privalomas. 30 arba mažiau simbolių. Raidės, skaičiai bei @/./+/-/_ "
 "simboliai."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Ši reikšmė gali turėti tik raides, skaičius  ir @/./+/-/_ simbolius."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Slaptažodžio patvirtinimas"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Patikrinimui įvesk tokį patį slaptažodį, kaip viršuje."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Jau egzistuoja vartotojas su tokiu vardu."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Neužkoduoti slaptažodžiai nėra saugomi, todėl galimybės pasižiūrėti šio "
+"vartotojo slaptažodį nėra. Tiesa galite slaptažodį pakeisti naudodamiesi <a "
+"href=\"password/\">šia forma</a>."
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Slaptažodžio laukai nesutapo"
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -82,11 +93,7 @@ msgstr ""
 "Įveskite teisingą vartotojo vardą ir slaptažodį. Abiejuose laukuose "
 "didžiosios mažosios raidės skiriasi"
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Ši paskyra yra neaktyvi."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -94,11 +101,11 @@ msgstr ""
 "Atrodo, jūsų naršyklė nepriima sausainėlių(cookies). Sausainėliai yra "
 "reikalingi norint prisijungti."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "El. paštas"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Ši paskyra yra neaktyvi."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -106,103 +113,126 @@ msgstr ""
 "Šis emailas nėra registruotas sistemoje. Ar esi tikras, kad tu "
 "užsiregistravęs?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Slaptažodžio %s atstatymas"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"Vartotojas susietas su šiuo el. pašto adresu negali atkurti slaptažodžio."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "El. paštas"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Naujas slaptažodis"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Naujo slaptažodžio patvirtinimas"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Senas slaptažodis"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Blogai įvestas senas slaptažodis. Bandykite dar kartą."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Senas slaptažodis"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Slaptažodis (dar kartą)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algoritmas"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "iteracijos"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "druska"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "maiša"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "kontrolinė suma"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "vardas"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "kodinis vardas"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "leidimas"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "leidimai"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grupė"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupės"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "vartotojo vardas"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Privalomas. 30 arba mažiau simbolių. Raidės, skaičiai bei @/./+/-/_ "
 "simboliai."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "vardas"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "pavardė"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-mailo adresas"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "slaptažodis"
 
-#: models.py:210
-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>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "personalo statusas"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Nurodo ar vartotojas gali prisijungti prie administravimo puslapio."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktyvus"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -210,52 +240,53 @@ msgstr ""
 "Nurodo ar vartotojas yra aktyvuotas. Užuot pašalinę vartotoją, galite nuimti "
 "šią žymę."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "supervartotojo statusas"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "Pažymi, kad šis vartotojas turi visas teises be specialių nustatymų."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "paskutinį kartą prisijungęs"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "data, kada prisijungė"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Prie rankiniu būdų priskirtų teisių, šis vartotojas taip pat gaus visas "
-"teises, kurias turi grupės, kurioms jis priklauso."
+"Grupės, kurioms šis vartotojas priklauso. Vartotojas gaus visas teises, "
+"kurios yra suteiktos jo grupėms."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "vartotojo leidimai"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "vartotojas"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "vartotojai"
 
-#: models.py:406
-msgid "message"
-msgstr "žinutė"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Atsijungęs"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Įvesk tinkamą e-mailą."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Slaptažodis atkurtas ant %(site_name)s"
diff --git a/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo b/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo
index fe920ed296a0d96b93dcf61b13a0981490f82bc2..91588e0bdbb13e3c18de5e86a80aed2a299b5cda 100644
GIT binary patch
delta 1307
zcmYk*OGs2v7{Ku}YMSF?e3hDMla=rB-f<Ll2qQEfWF#6%FKp7AjyVrzuA|jL+SH;H
zX=)Kd&<jE-guz`!h6`y?xN8v+E`nOMiB?JfPj1j*zVo~H%sKa*^PPL|R=zKv`I47%
zUs2q|UgD`usdlVOrlPc@C{>NEn2*EQhf~;!>u6xo4y96Y3`;SD9-Ku7uA&_`FcUvx
zu~IYYyVa1)=$-tLgE?4?Wmto|um>}62($1C4&qfjh8uVs3)7T3kHdHf-y##KZ`g@4
ziOkbQb%FU+9~Vbyc!@ki{X~B1H<e7N(v`}FOq3mzAZu0?DE;fKb`SDXZB!&hb)!7z
z1j@M6D9`huWFUY!%&)F-Ap>qp1J0uie1tO5BEI5Sma&oh08h!o$JmW4IDlK$eLqiU
zvuXjI_yiB*8p=`FNFQBQF3w0QOQ{O67U`qfQFhjcxj2aOZun99-9*-+9%2zb$1}K!
z9auuTdhjC35iO$hOJa5zUxHoeagcwR;5rQ<oW)c42W1ESq(d@u7Ucm$C`U1kvcOv?
z8Je^1@1dOa0!ju~P!{^e`hVSO|7f*;lKe|5H))WS{X#jbELK&3MJNk&QAzs|<RrGs
z0m~{&880uKETEjICP;`XAvEG3@qdx8q)5(R-fr2=zfx&k$b_<6*@+a%ND?7u$2ygZ
zkRnGTpJokFM@W%P)o))ZwZ~GZAS9#zN~@ErT7ryk?^Mz$pPhXElDd6_PV6Uk6Y_qz
ziGsv~lzE$@ClC%rOkdD+j`&O?8h@QSpSYCv!xn#*z7=1xFE=%~bdSs3=+t$uyUC?D
z>$<(~q^sYE`J?_&(AB{xud_jSZ}-z%obCp%-W;FLC`;`%{3FIh{6&VVvueyV!(L6B
znwqLNBfenNf7zI>4;rQxj)caIVKb_QwUKdOa5SV%P*3_s4Q(Q(Roi>5JFjyh7XO-Y
pF43L2X>$z3e37-KQNJvDGT@JY$ev5waBSKV?{eF0@zne~e*v8$mQMfx

delta 1883
zcmaLXUuYaf9Ki9p_Hs69)5OFy#y@pT8`H$Q<gQ7IhBR7CTSJS6w4x<VaO`dGHtyXX
zyL+jo%5gr}2T3Vj6@)$*_3d87Jcwd_kjq1Dp#h;jNb7?N3Mzt#PZqzw%eE+pLuNm-
zvvV`Q`OR*=?0&PibfYc$mZI#T-bcL>QEC!j*~o?RZd9p0T*h|1j8ph6K8nc(r7WDs
z7_Q;{_%#mUA7OtV4_mlT;;Z;LHYrt7pVQbv$0h8-YvKKGxQY9}uoYu>D776su><$u
zU3eHbqrqm(;j?%e_v2T12)mf<I9k|)UtkyOs~>3`pkqU$QqSQe(xu+RS*+qdY$RM_
zQHM~TPope6gIh6!{HX;lY+993#-9oM&mvQ)caWIW`xs??Riz;leu(_3Pq@g$HI&S(
zp=97Xl6CcKc>g=f@1hKr1)K3Tj;|euxqq7<x8Y@c5^vxU>?KWde;P{?NsWfaD>#O~
zphVu!w&cuGxP<#q0=tR~QQu%E{)7@}gu(K=t#~JPpuAJPDB~t@Cmu)1M7f3h-%aBU
zI*#E7IDt2D5}#n(a+XUd<9<My=q4V-ZLBhfb0`a5<l^F0Jc^I8ec9l7l+0Z~nP(Y^
zS$*0@{w3l|bVv%<Q0}jxyo}dTQv7H5Ts{GbJccr^73Fzn*sqbHsvjlLy~ru4XHZ_&
z=TQPJhW%$sG&r*QU^aET$mb|;Igjfp><gdthNf^s*nSx0%aC#pRThw4%Z8*#K=MiM
zph_@tssyu*S|Zc+vYV@%O%F9e)l@0n>(syHu&M5)A?N)7Rdz3BfGRJY6nQr!OY$$I
zpDLM>GDwy8=T;%Z-Su;LDC~I<N2qc}yQoQObR`u%7bzX|++x93levQH1tuTpv<WQk
z^V+1-c3``C9k@EkTDo9)IotQ?@paDRi^g$Y)`pHu-b%+AV*9%2Tb@2;JB~Jv@9K;d
z&~X0s(~QR|R$6AY%!!Vy&PW70YYqA=!W?#fpt9C*uAQk*xn5d(md`ZA(c`bo#eR+)
z)x9&u$+)vSXME!XkhNY)+ZoFbW_z{kNf7mb$BfQ;*2%ryg>b6D?(q{@lh3f1Ta%x3
zz1-NK8DH7IX=5aovwYuVDhC=r8c8LRLy6RgP7RHwh7-x*WU^`M>BO|PU`qxP6J%*r
z?@p%b<C4QV^~mUOs*-5hUYTx+$Hty=^VWE!)-<!_Fbft<hSAQ#%J$9QNy>|?uZ}Dj
zuU5_2lJR2BR#T>6JL%$ja%*MB)&<*IU9Np>b1?I@a!#9|_L(V4Gp<*cNtI(;fg9Ay
z^FBKYe{EZt)vB*$ZcVVp*MV*MwdxDTkLwq??fJ*F;keuL7*3;DV1a>3YxCJ1Q^s>0
zi^*$c&ktC>y1H!gW>@`4`gCzo_pDrK{yuVSo<RQZSmJuY*y}O<*Qpf3b#lgDeVq{H
WRElye11pOy6Oo2R>8@OCUHThH+F7Uo

diff --git a/django/contrib/auth/locale/lv/LC_MESSAGES/django.po b/django/contrib/auth/locale/lv/LC_MESSAGES/django.po
index b65962d4e32..b9e48c47826 100644
--- a/django/contrib/auth/locale/lv/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/lv/LC_MESSAGES/django.po
@@ -1,78 +1,84 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Latvian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"lv/)\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Personīgā informācija"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Tiesības"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Svarīgi datumi"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupas"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Paroles nomainīta sekmīgi."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Paroles maiņa: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "Lietotāja vārds"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "Obligāts. 30 vai mazāk zīmes. Tikai burti, cipari un  @/./+/-/_ ."
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "Šī vērtība var saturēt tikai burtus, ciparus un @/./+/-/_ simbolus"
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "Parole"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "Paroles apstiprinājums"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "Pārbaudei atkārtoti ievadiet to pašu paroli kā augstāk."
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "Lietotājs ar šādu lietotāja vārdu jau eksistē."
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "Paroles lauki nesakrita."
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "Lietotāja vārds"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "Obligāts. 30 vai mazāk zīmes. Tikai burti, cipari un  @/./+/-/_ ."
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "Šī vērtība var saturēt tikai burtus, ciparus un @/./+/-/_ simbolus"
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "Parole"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "Paroles apstiprinājums"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "Pārbaudei atkārtoti ievadiet to pašu paroli kā augstāk."
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -80,11 +86,7 @@ msgstr ""
 "Lūdzu ievadiet lietotājvārdu un paroli. Ievērojiet, ka abi lauki ir "
 "reģistrjūtīgi."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Šis konts nav aktīvs."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -92,11 +94,11 @@ msgstr ""
 "Izskatās, ka izmantotajam pārlūkam nav ieslēgtas sīkdatnes (cookies). Tās ir "
 "obligātas, lai pieslēgtos."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-pasts"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Šis konts nav aktīvs."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -104,154 +106,175 @@ msgstr ""
 "Šim e-pastam nav registrēta lietotāja konta. Vai tiešām esat "
 "piereģistrējušies?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Paroles pārstatīšana(reset) uz %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-pasts"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Jaunā parole"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Jaunās parole vēlreiz"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Vecā parole"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Jūsu iepriekšējā parole netika ievadīta korekti. Lūdzu ievadiet to atkārtoti."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Vecā parole"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Parole (vēlreiz)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "nosaukums"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "kods"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "tiesība"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "tiesības"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grupa"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupas"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "lietotāja vārds"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Obligāts. 30 vai mazāk zīmes. Tikai burti, cipari un @/./+/-/_ simboli"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "vārds"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "uzvārds"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-pasta adrese"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "parole"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Lietojiet '[algo]$[salt]$[hexdigest]', vai arī <a href=\"password/\">paroles "
-"maiņas formu</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "personāla statuss"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "Atzīmējiet, ja vēlaties, lai lietotājs var pieslēgties administrācijas lapā."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktīvs"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr "Nosaka, vai lietotājs ir aktīvs. Atceliet šo konta dzēšanas vietā."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "superlietotāja statuss"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "Lietotājam ir visas tiesības arī bez to atsevišķas piešķiršanas."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "pēdējoreiz pieslēdzies"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "datums, kad pievienojies"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Papildus manuāli piešķirtajām atļaujām, šis lietotājs papildus iegūs arī "
-"visas tiesības, kas piešķirtas arī lietotāja grupām."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "lietotāja tiesības"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "lietotājs"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "lietotāji"
 
-#: models.py:406
-msgid "message"
-msgstr "ziņa"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Atslēdzies"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Ievadiet korektu e-pasta adresi."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/mk/LC_MESSAGES/django.mo b/django/contrib/auth/locale/mk/LC_MESSAGES/django.mo
index e9a825450040fd4ad2b741653e13ebde4d8af071..4c9cdf184748528cf3710cbfcca0360241949d9c 100644
GIT binary patch
delta 2711
zcmZ9MTWl0n7{^ZmxwHjoX`$6(k1c4c?QUC&V9Uh|N*d83i6ZfqVLR<E-QB4>)2;-~
zwnZZG5-$@CfvC}_iKxj+yHbJD;DZlp;;fe^P)SVi5=@NO#25X2vr{ad?3v%3bH4Lk
z{^!iT);78}^G*4j7Zk0NUPJ%ANU3i4>1-af`Ijiw2p7O5a24DNH^b}U0cgU{;as?u
z$8xw4u7dZ&OW|{{7`_Ti;XANesf_v{nD_$DXW=Yd41a`Iz`tQ7te&S-EeyjF*bNuL
zd*OB%gD=8U@D_Lv&TfM*!~5V*a3|cnK&h4RFzhD2@^~Q=rAhBr*a0Px5qLj*0^SIJ
zfaIdCAv#-BD-^rVfSVvcbvutma0g_IibBLuHkAFl;T$+D>%>?4<OMzp#qpuQ;0-7N
z4hQRFke@oqLmYezMas{hD0U{8|2Y`{3T6Lnj3j|l$doFFlN|FEFe7Ju1|6@2O{D!g
zyaVoqzrh?#bATdsGf_6ePS_9kz-91zC>8$`j2D$DbuHtopeVZy%6c41oIUV5_);1A
z*YWZt6YJn#umZN17tXp1e#JNjyUBPXH}Db0&tNnFOSu?t!bjmbxMC^t!xFNRyRZW`
z!C#;Smsb^(dKw;M{BjlgOQkzVQ!@M-5=)(j6r=uu<fIl~Mm4YwiV|H=&T>1HqkAA=
zESPs7xu`u*zJ}+a_|FFGQ^EM73@>8%6_m=)Ly@%Ta;4f}HIxdrKuKsfY=loherlYD
zB<w-?TE2q_<@=I^<&zfw(l~DaSj4Y<-SRnS#OVt9HFUXD;#>kslL|ZO^>k5Ty2%+z
z3)9J0HOqjuhAzpkrnl0sr;A!0bV)8mmkU1K$Tg$dr$+%>U;|xbT}v1F<a?dj<W|c~
zzM3x8bDVyYKOF9=f4O8r(`)60CihGle-D0><ER$vS;2&SB9&t=&3UTm(yqjSm2!-v
zqk9a;wB5<Muaz{|F~@u`X(Y@>_rZCC86&L+4BJjysUBM!DN`pcN865-GJBe|ZD}WJ
zG8wa(*J)$7b}Vh1Ceus}+Ggr%`@;Svy>rmfyRAVTF_JnGHIjW|XkIX2LoC^+*BLsR
zGJDt85xCNi9Io5oJM6VmiFILPgPWiCM?+uA8XU0yi==m&aVy!!j1|&1`oVQN7LU98
z=B_NWdNmn^Nml#&Lhh;gja$rul@W<pgQ!5ARwRZLJ#2KM1=nVC!idGS(bJPMZCg?o
z1$Z}|i;{QG&F^*JSnzJS5%057Y)`02)Qt4og9-P};`Q}W!;UJnO&LziO4=%J*p7}{
zeX(TW70KPViW_DdamW3vcvA_A_v>CGg4Aw#NmqMYbIYpc)^^>}($TuQxn)gDOYzq3
z=56Ls%*J2yCerTEZ7r<@yEfh0+R^4dQ&P2JXh?*PTSIn#Os|_cx}i@>3q`Did#a@7
z)`qC#40MFU>2x~eq>Q8;>op$^B~2$hkg|4}5yuV>gnM@3%?ihP4jO%CIME+&EZ!1~
zI&`An{kG)ZvCXA-&0hMvm-XKFCcO#mjeFVrXnwDE!kZZTaB+Q6<xwxI^~xES%~swk
z?%ApecUJkIMTgwCD{3;2v*8Fn*s6IsslAi=VQ<14qfat_T%J1rm_L2O%Qor!DAUJe
zazC$ZnDlbmo5Em3#*ztJ@{fxHKPjC*fHlr1NO1xi%#UMul!?+waV0L<<yJ4O$u!A!
zyq>_~eJ@uqr?i5X{0Iv<EdJ-`KQ~yg`&gk2Kc!s$poEk<X5RYgOHUkMfI^WAh6#}M
z@Bc$fZXR2+<nE$sH$RL@Q`0fUkp%E2+{+i%)KB?(O;LsGWkcFKI2~HD^b;9%LyMQX
zH!ZBaXPjN*<bS+SLm??L&iQt}Oc=;?juVi?3U!A4DRdOgE)+jDoma?xvSMrIqQL0y
zpOLQ@BFaDx$vZ;2Tnt~1f>zV@2OlA8<Jja_ltU5eg0q-$nt_2F&jj!O>5Y_Cxu+}M
z9IIb?cTt_(94cT<D#&^#lqW(-tQ;gAH@(bUp5MoCKWlzwTpzzA&Le*ii_^=(?y{<z
lE4}0Sy%dxc)kJ!K=x(q2q?U`xWh4R{12xIUdyg?u)xTIzFf;%F

delta 2016
zcmaKsYiv|S6o9AD7WxtjrKPRl@GOOHy9<S2)9_Fbc?lszNeadbd)Y4R-rMZm0!GYI
zFd-2%gb7JS6J7>mNX*iuvhr9GH3p(T?rPM;`20a)jPVhoCMFucv%B!qlb-!%&YU@O
z&Y8JAy!8CS)VGt$Pbp*x`Y`%QnNn-v!Lj@xXUmmphv(pA_%YlJzk`p$V1-gP+yg72
z52wK|;Uf4)$==T51m;2bB3uEhl}f1`gIWxCU^D!pH2)2bXZ{bI2rI`aH61p=DR2pF
zfE!>9v|t^K!)M?Na5el4u7}M8+YW6w2fh!RIbZ$A;0X+4s+8IW*FsF{Jlp{<!IiLz
zbjd}nhqAr}%E5i`AsB)DseSxVv>Jlqf3#$O6%tCl2FXcXfaRR8E-{dRX~>^?j~@yA
zA(YPeP&)7pr0eRJ()=EjedRdIfpzd8*Ebn%Vt#_nGvN2|O*n@39D#4aQMiDtQ_`{@
z7%Yds!o9GIiz2pq9X7#>u$;g-D3yLdHe&x2E`UElxw^*s;(8Fu!ONk%D+|tq!!QW1
zL%F)2>*@a^49X@c^*NjY55m9T08H}YF2cKTBRtNo4)_&x;W!?`Ik+E^gKBP6>KdF6
zrP8}l5{{BBXQ~5mE_@kE;g_4}zueI+3{vq&CFY^L;;*3u_#4VqR81}VH$t&bgPfr{
zpj7lYTnM*8N%R<$#Imp*-hr*~9;8M!Aw}QlY@wavcwd$<ps2zpC!eKk7HKO&h2WUd
zSgt_643QR8DwPK&Z$d;4l453|Qlum%$x7lWuCySM^=wo=jR2}q5xF-J`IhgCR3P1u
ztCI&P(usB#M#a|3OP7Bk^HJ%rNEgc6d?3_5x6nqp6A^hdi&46x=Al7UUcAawR2(nc
zz9!)g4tQ#9e85d4EhnkNR?=qfXe%6!CZn#Sldewo+j_uG#G{^v#nW-i8MI=t=e30)
z;@II1T%w*H^z4M*AC1Md74ux<Rn3_kkppzU-Q^Jjm#EWe&Q_i`8^;ZrGvnu*BjazI
zcdBNanbkYnbX%Vli?};x_jy(<3Ht2=;b_G6k~`Y8n~?C5ig~VK%G6!`mJ=Z>GT84X
z!g{xxi1&6`%S@_z#H_06H79DORK{)3vm)j~%{=4RJZ7fXKA8#yf{Oy7#X7X8C)6DX
zb_avin>Piv*!!YVT3{9B_vnSeP{A+QtwT$Dx<d<sNc9HGO9r+kEXRvkNjK4>*IAB3
zNxgdtToJRQVLR3tb#}YUaCRbtR>Tf$wXJxM-e~Qz!>$vpupHgH%q*?ztG(~hqvLxs
zC+nUbn=<)B`6K=<Kdbzce%gQ6zv*YSf5lJd4`aU}_S4v}`8l!X@XYzw{hO?f;B(p^
z)$B;?{2^vX8J66x_@lUu7Ngx_HH&|?V9LO3hbGR5pEIi)8#?lDNEqzJBQE2>JnfI<
z594*CkjoG$u%0!qJfzoLl@o^uPg?n5CVr+=21BCi2MZD*Kimb<vgc?qsbcn>nSUqF
zDyx$8=XlCLW6rfUn01r>%$#UARc30No-)5TU0li5QPKZ>D238UPx7JG{Lq74`C;>H
yLsNbJrNT;~7RmRjdAq*7Tpmy6*wme6roLsDIoZ-#Lwlu_1WKD+%WBiwdiy_fDdBYh

diff --git a/django/contrib/auth/locale/mk/LC_MESSAGES/django.po b/django/contrib/auth/locale/mk/LC_MESSAGES/django.po
index 503e14b3ec7..e5e2e9f82ff 100644
--- a/django/contrib/auth/locale/mk/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/mk/LC_MESSAGES/django.po
@@ -1,78 +1,88 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+#   <vvangelovski@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Macedonian <>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-12 11:21+0000\n"
+"Last-Translator: vvangelovski <vvangelovski@gmail.com>\n"
+"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"language/mk/)\n"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Лични информации"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Привилегии"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Важни датуми"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Групи"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Успешна промена на лозинката."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Промени лозинка: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Веќе постои корисник со тоа корисничко име."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Двете полиња со лозинките не се совпаѓаат."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Корисник"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Задолжително. 30 или помалку знаци. Единствено букви, бројки и  @/./+/-/_ ."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Оваа вредност смее да содржи само букви, бројки и @/./+/-/_ знаци."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Лозинка"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Потврда на лозинка"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Заради верификација внесете ја истата лозинка како и горе."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Веќе постои корисник со тоа корисничко име."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Лозинките не се чуваат во оригинална форма, така што не постои начин да ја "
+"видите лозинката на овој корисник, но можете да ја смените лозинката со "
+"користење на <a href=\"password/\">оваа форма</a> ."
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Двете полиња со лозинките не се совпаѓаат."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -80,11 +90,7 @@ msgstr ""
 "Ве молам внесете точно корисничко име и лозинка. Имајте на ум дека и во "
 "двете полиња се битни големите и малите букви."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Оваа сметка е неактивна."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -92,11 +98,11 @@ msgstr ""
 "Не изгледа дека вашиот прелистувач има овозможено колачиња. Колачињата се "
 "потребни за да се најавите."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Е-пошта"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Оваа сметка е неактивна."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -104,103 +110,127 @@ msgstr ""
 "Нема регистрирано корисник со оваа адреса за е-пошта. Сигурни ли сте дека "
 "сте регистрирани?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Ресетирање на лозинка на %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"Корисничка сметка поврзана со оваа e-mail адреса не може да ја ресетира на "
+"лозинката."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Е-пошта"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Потврда за нова лозинка"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Стара лозинка"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Не ја внесовте точно вашата стара лозинка. Ве молам внесете ја повторно."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Стара лозинка"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Лозинка (повторно)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "алгоритам"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "повторувања"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "случаен клуч"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "хеш"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "фактор на работа"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "проверка"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "име"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "кодно име"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "привилегија"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "привилегии"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "група"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "групи"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "корисничко име"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Задолжително. 30 или помалку знаци. Букви, бројки и  @/./+/-/_ знаци"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "име"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "презиме"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "е-пошта"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "лозинка"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Користете '[algo]$[salt]$[hexdigest]' или користете ја <a href=\"password/"
-"\">формата за промена на лозинката</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "статус на администраторите"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "Означува дали корисникот може да се логира во сајтот за администрација."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "активен"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -208,11 +238,11 @@ msgstr ""
 "Означува дали корисникот треба да биде активен. Одштиклирајте го ова наместо "
 "да бришете корисници."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "статус на суперкорисник"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -220,42 +250,43 @@ msgstr ""
 "Означува дека овој корисник ги има сите привилегии без експлицитно да се "
 "доделуваат сите."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "последна најава"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "датум на зачленување"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Како дополнување на рачно доделени привилегии, овој корисник ќе ги добие "
-"автоматски и сите привилегии за секоја група во која тој/таа членува."
+"Групите на кои овој корисник припаѓа. Корисникот ќе ги добие сите привилегии "
+"доделени на секоја од неговите / нејзините групи."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "кориснички привилегии"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "корисник"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "корисници"
 
-#: models.py:406
-msgid "message"
-msgstr "порака"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Одјавен"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Внесeте правилна адреса за е-пошта."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Ресетирање на лозинка за  %(site_name)s"
diff --git a/django/contrib/auth/locale/ml/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ml/LC_MESSAGES/django.mo
index ba121065dd4cbad42828eb736fd0c28a1e2c0c23..0f53253e172928d3c7a5d056b56750495b093a13 100644
GIT binary patch
delta 1309
zcmYk*TS!xJ9Ki9vI=8%(m$Ydsw{FYZcFr_WR|HadNv%;}U`4F$<R#rqPg%Z<Ug{wV
z=};h%Ak;%fA?>9Xsb0#*?5RKsdI*c6dNK&2?{8}KXaDm#=fCs6{r<o6vuQDycwcC{
zr6>XFChEO3rS@TU1{X?$O{ofO#Pt}#5RPIa&Y^+nnM&EQ7dK-ZYw<ef;S0>hdCbKH
zELAF@KCd)n(0dJk<YPXTVi{IqF}7h2p2D?w7LVa2Jb?4qj!uVCCoqCL@HsM(`h?9W
zlgK<RTuw5-3USj!!((I&^#l2-B`z|d%2H|_<f81rg{)b5QQog!X|F|oYA+XpqFPbL
z=|t(*g)&|kB?5z(&-`kP8|iRO8gLw?;}pt7(|CttnL&f+4o2C7Pw*Fh$5*(>s1A9L
z@W_szvg)Jw2B*-=Irwo7yKo5;HQXFxRte>0tj2e^73~E|1+fCVF^Vnt4CQDXh0D3(
z#VRK5$KSNyCQ-zjMeLmR8=T)=o+mai7uGvz!z)hW-^opJ31Q{M2u|{xVEK|XWgC}w
z;>U8HTTvEx4tL@t(nY<*?f3y@fi{;?KI}jV^%%;At|Dtx(<mF5brF9_k_8$XFr808
zvUWFyF^;mpd2B^Dsm(f5W!s9fFez**HI{^4Caa)w5{jXfMwJErU*sz(k@J`AmPA@D
zvNI`?G#p(j7v$MNO{Yo{NuJ0KrLeZtr&);-9VxO)Icq5d<zMk~C%Lv-8a>=qQ6=0Q
zYbxO+H1heAZ^}*8savQVUn-mdEJ{w;#?$iJ28ZIqW;kYgqG8h*v1aY#$<vN6Y1aL$
zKi0$SnYtREUh50&^5}XnQ0LR@bv-+D*muOZ&^OW-kNNh~E9j}w1F84)22Y?SsMlNL
zIc4?^qc3U<SdVhF=JH<C913dM=;)~591h1u`py^^{V~JThKA$)M#LP^hO}sZIMx%_
z2DqLN_ZZsXfL4*+vGNr33=UWybB-qu=031lB?Vfty>MN+RqHOaIz4&G*G1nlt!_^!
O`PSvkNM^dfru_wUJDwH*

delta 2016
zcmaKse`r-z9Kg@qbGoVRmrmW(j?1~0zU@6XMaLQqQyZGv$}*S1#dr7i;{6!!zG-2x
zCZvfdlgkK&%JmCzl;*onj7TA*$RY&6h$yeoAO2C%><5AbeZJ>CBO^Mzb3f;N@ArIv
zp8Kx1Pjn4^R}~mlj1|mz%rA<R>W0r3^I#kcDAfeVU^V<4ZiZLkDj1rqlntMOCGZlQ
z55Iz~@b`keiI?T<L+}Oo04!5#NS$Lb9l>XCF1%9M{{pA7{}Wcgk||0pfV1H&xB||E
z8{jl(!5J_CpMbmJ8h9D5hjTIZ6trOj{20!~zq-z1ErLm<N^OPR5RrNVZinNr3ziZt
zv8eS>-uFOp+zao5QOHm2<U!JE7>fSBg8UG~lsW>5NxcaJ_*dgB#Na8&Pkq2c3}1j!
znM+VA@GYe3>gU4#S19KKD2u}x(4u|S&}Ki#;STr>yb0$}o=;&V(N00{Yd9n&zeZyo
zg}2}s+=RD9Z~`{Nno6aLIj{yk&c3@!sb%mOlu}=YOW_hONIl#N+u?4w4W5DPU?u(9
z0-uD^%9Asx|7sRrB3OchDjIu>eP>Oc?X#%}@)dKGdKGyW(QbrS;UU;utJFpK5qucF
zT&GkW`d8p<>~C<R<<cGIMoOY%@Lu>Klz@MjPyHKNR1yw8)G8>M_dtnw7YxGlP%hn1
zkZP*pyYrb=K$2IjkXLFgl*?tqmGA&;g%_X&Z$b%ln^x)}czlQj0V@(UJqBjT=O_-T
zocS!9j5HstEW^x61=$iP&Sg*tMVHJ4lRF_p0wiH|50finGM6uhBC8=OkBntZ$y}nB
zj5Sk+^izgpaeGi*Qw5SS7f|GKPugU`n8B2rE`K5SG36_e(Zb|z{yk_(z4>$&7eou;
za;CIG`V?XYvf;o;(a^edYH+|&-HCxzI%6d>I$~vP_DO9;BC$*?mDHJ(&h*=Qz)mM(
zj)TO}2`f2h#pBOu3qdq#N0y=zbM&BNr}eH_Jg%*{lhRQ;!y<mi(P$bkc0{b&){a^I
zIw}$9e!IoN2{vNMX7|$Mk!nouN~I$@Z9AADjs_?DbjgoJkLku<D;`a4U)1YZ@eJs<
zpN+(#wv*Z3s8eYP!UWu5>Hf6ccYpmr!Bk6q=Z=0W86}t7#`{v~L`RF&nO!rrxTqvy
zJB}4~*Os1M9u9_DgW=^m+}a*)3x?W4p|Z`Jf<5-mm{cJ6AXRGD%R*tJ7i!btmF;a|
zH(0j7?I~+6>DZV`+MVtvWxdlk;Be52qMe9m^|TWK_gZa(d$GL5otW0tcihkI^Sx8P
zci#72_j3pHPwjiBeeYc(J!+&!eeW$lH_VGsKetD;ymLmh7tu?;mlGqogWtb+FuzCT
z72kW$Xr0vV)!Ldmae+Hg__uNQ{dskZhkb8P{xDi>aF10E;gPsTjjcV|Kgug7l{PrW
zN^Y+^Qn9%4gwa3lduNU2+eY)m9nt58o0V%#ugxy3`fc)-|7)O0=d>}zbFc3mx$T}%
zL@qi0S8LtF6%FqG%JMD>lg}V)PG$*p+|L~#J?S*N{k}(ZCyk6M{Ub%mdz9-p?~$xM
XXLfPL*?h@-?;X>pGufSWH;VoO|1$C^

diff --git a/django/contrib/auth/locale/ml/LC_MESSAGES/django.po b/django/contrib/auth/locale/ml/LC_MESSAGES/django.po
index a272406b3f5..ddde71106cb 100644
--- a/django/contrib/auth/locale/ml/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ml/LC_MESSAGES/django.po
@@ -1,79 +1,85 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Malayalam <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"language/ml/)\n"
+"Language: ml\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "വ്യക്തിപരമായ വിവരങ്ങള്‍"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "അനുമതികള്‍"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "പ്രധാന തീയതികള്‍"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "ഗ്രൂപ്പുകള്‍"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "പാസ് വേര്‍ഡ് മാറ്റിയിരിക്കുന്നു."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "പാസ് വേര്‍ഡ് മാറ്റുക: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "ആ പേരുള്ള ഒരു ഉപയോക്താവ് നിലവിലുണ്ട്."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "പാസ് വേര്‍ഡ് നല്കിയ കള്ളികള്‍ രണ്ടും തമ്മില്‍ സാമ്യമില്ല."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "യൂസര്‍ നാമം (ഉപയോക്ത്രു നാമം)"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "നിര്‍ബന്ധം. 30 ഓ അതില്‍ കുറവോ ചിഹ്നങ്ങള്‍. അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, പിന്നെ @/./+/-/_എന്നിവയും "
 "മാത്രം."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, പിന്നെ @/./+/-/_എന്നിവയും മാത്രം."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "പാസ് വേര്‍ഡ്"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "പാസ് വേര്‍ഡ് ഉറപ്പാക്കല്‍"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "പാസ് വേര്‍ഡ് മുകളിലെ പോലെ തന്നെ നല്കുക. (ഉറപ്പു വരുത്താനാണ്.)"
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "ആ പേരുള്ള ഒരു ഉപയോക്താവ് നിലവിലുണ്ട്."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "പാസ് വേര്‍ഡ് നല്കിയ കള്ളികള്‍ രണ്ടും തമ്മില്‍ സാമ്യമില്ല."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -81,176 +87,194 @@ msgstr ""
 "ദയവായി ശരിയായ യൂസര്‍നാമവും പാസ്വേര്ഡും നല്കുക. ഇംഗ്ളീഷ് അക്ഷരങ്ങള്‍ വല്യക്ഷരമാണോ അല്ലയോ എന്നത് "
 "ശ്രദ്ധിക്കണം"
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "ഈ അക്കൗണ്ട് മരവിപ്പിച്ചതാണ്."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 "നിങ്ങളുടെ വെബ്-ബ്രൗസറിലെ കുക്കീസൊന്നും പ്രവര്‍ത്തിക്കുന്നില്ല. ഇതിലേക്ക് പ്രവേശിക്കാന്‍ അവ ആവശ്യമാണ്."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "ഇ-മെയില്‍"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "ഈ അക്കൗണ്ട് മരവിപ്പിച്ചതാണ്."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 "ആ ഇ-മെയിലുമായി ബന്ധപ്പെട്ട യൂസര് അക്കൗണ്ടൊന്നും നിലവിലില്ല. രജിസ്റ്റര്‍ ചെയ്തെന്നു തീര്‍ച്ചയാണോ?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "%s ലെ പാസ് വേര്‍ഡ് പുനസ്ഥാപിച്ചു."
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "ഇ-മെയില്‍"
+
+#: forms.py:249
 msgid "New password"
 msgstr "പുതിയ പാസ് വേര്‍ഡ്"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "പുതിയ പാസ് വേര്‍ഡ് ഉറപ്പാക്കല്‍"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "പഴയ പാസ് വേര്‍ഡ്"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "നിങ്ങളുടെ പഴയ പാസ് വേര്‍ഡ് തെറ്റായാണ് നല്കിയത്. തിരുത്തുക."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "പഴയ പാസ് വേര്‍ഡ്"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "പാസ് വേര്‍ഡ് (വീണ്ടും)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "പേര്"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "കോഡ്-നാമം"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "അനുമതി"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "അനുമതികള്‍"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "ഗ്രൂപ്പ്"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "ഗ്രൂപ്പുകള്‍"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "യൂസര്‍ നാമം (ഉപയോക്ത്രു നാമം)"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "നിര്‍ബന്ധം. 30 ഓ അതില്‍ കുറവോ ചിഹ്നങ്ങള്‍. അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, പിന്നെ @/./+/-/_എന്നിവയും "
 "മാത്രം."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "പേര് - ആദ്യഭാഗം"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "പേര് - അന്ത്യഭാഗം"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "ഇ-മെയില്‍ വിലാസം"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "പാസ് വേര്‍ഡ്"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"'[algo]$[salt]$[hexdigest]' അല്ലെങ്കില്‍ <a href=\"password/\">പാസ് വേര്‍ഡ് മാറ്റാനുള്ള "
-"ഫോം</a> ഉപയോഗിക്കുക."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "സ്റ്റാഫ് പദവി"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "ഈ യൂസര്‍ക്ക് ഈ അഡ്മിന് സൈറ്റിലേക്ക് പ്രവേശിക്കാമോ എന്നു വ്യക്തമാക്കാന്‍"
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "സജീവം"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 "ഈ യൂസര്‍ സജീവമാണോയെന്ന് വ്യക്തമാക്കുന്നു. അക്കൗണ്ട് ഡിലീറ്റ് ചെയ്യുന്നതിനു പകരം ഇത് ഒഴിവാക്കുക."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "സൂപ്പര്‍-യൂസര്‍ പദവി"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "ഈ ഉപയോക്താവിന് എടുത്തു പറയാതെ തന്നെ എല്ലാ അനുമതികളും ലഭിക്കുന്നതാണെന്ന് വ്യക്തമാക്കുന്നു"
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "അവസാനമായി ലോഗിന്‍ ചെയ്തതു"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "ചേര്‍ന്ന തീയതി"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"ഈ ഉപയോക്താവിന് നേരിട്ട് ലഭിച്ചതു കൂടാതെ അവര്‍ അംഗമായ ഗ്രൂപ്പിന് ലഭിച്ച അനുമതികളും അനുഭവിക്കാം"
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "യൂസര്‍ (ഉപയോക്താവ്)നുള്ള അനുമതികള്‍"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "യൂസര്‍ (ഉപയോക്താവ്)"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "യൂസേര്‍സ് (ഉപയോക്താക്കള്‍)"
 
-#: models.py:406
-msgid "message"
-msgstr "സന്ദേശം"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "ലോഗ്-ഔട്ട് ചെയ്തു (പുറത്തിറങ്ങി)"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "ശരിയായ ഇ-മെയില്‍ വിലാസം നല്കുക."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/mn/LC_MESSAGES/django.mo b/django/contrib/auth/locale/mn/LC_MESSAGES/django.mo
index c149d9b789d156a529cf1bd1340d9954b08afcce..fc838e920b2e25cb748cb3888f95e364d2d155e1 100644
GIT binary patch
delta 2626
zcmZXUYitx%6vr=6DQ&6HLfO^_T#HBxw7XkGU_l58kDzG5FJb`6usiLpZg-lUsTDQZ
zwxmK76f%Kmd?cC>g`iZn0h&S+V&W?#%+UD3gb+R$f*L=lsEIMg-`Sl)(c9kn-FxQV
zbI$#rJ9{Gf-6OfH)g^}&Z3X>4`ppSSwZe;&c+jTYrBov<gEQb_xEXGM%i&wlgqPuD
zxQxgBa5Y>Ecfe`z5G;ouz^U*AtWzqdh62MVoWhH1a60?}&W3-%8dz7V)EpRw6|fan
z!fo(rn1V;(1-K4w#o6QVeYhR|2zS8^WlGJ1$6+h+mB)ZglqS9PFa{-&Ubq9k2G_tF
zkX+OPqO(Osp{!dGa4qCtJ;CE{_zYx=N<zd@HkAFlVF~P!_rzEIGJpr6IDRKsa1=^_
z<H7qp<X?^O5C`8tk@6B0#jXVQpM&|YQ1(w^kt8q`Vp7%cIAxv<bDbEzMn?@}q}>O%
z!G3rZj=}^548dhYSqnGA&G0ak(p-o5Qh&o)u&hd{CaB>(@JT3&q=Na2a2a#A3jH5s
za1q05_zM(A(dyzQS_R)`z8zMQ@gMLw^OBhahbQ6Za2;8E0n3QK5PDD!@;7XOIkNAD
zr=Z-S1+_|j3?HjS{{(~IFp#|3%0&>Sph));l$z~<55U)813VGfzl9>{6(}dX5!nBP
z<fi_C@-@sr2Jsh#;x7i}@~+7-;83a+igdf6EZhy{mi9r(_+u!a-&cYCN?@OOZ*gBe
zly%D?LKT8P1m%+!ztTimQAZS!uUq`(<g`+P1@sbnBYhEFnq(@!3v=mI=2jCWq=o6^
zQK+@dm(o#KEuly0%jt5;7+pT)X1ZMPu|}>r_3+p%U<8W9@<qrc5&1-k@l6yG+2_+m
zJ*rn|@`EEkHjfmiN<&daT740UpNB$|a@EP|iGe{rk(&H_CHp5#+t|@*WgR2q=!D^z
zwtIf^hZPNW$}x9lj1IHW-C5d|GrD!BVcXqSHeqWcYwC>UXxp)}W@3@HE$t*tj42zt
z?lyL7$I`ZGV#d^Eo7wsHt^JGit}aLKwz_oO$mn>|$h6Bs^VR}3q%!S#rJ<8qv+dD(
z0@oBGhwE1r9JX26j+J3!mFt)O-q4=4x;pLKk@PMzZDrcASj~D(A-L{NrPFTz<at$A
zn<k?$$?C$sX7|FB#!Y5%l@X6yU8ul0t#}G45^QvmMb~CihmlHaBaz6Owk@fP0*p=P
zj^y3zQ`+34WuH_V>2@p2_6`+Kn(^oDt`2ug`J;1_hMiPsn>C!2m9bUYupOPY+Ebb0
z5Xs$R<qeaJwBueXUt59V&+9fLj?`{-#l|HqO_9Y-(T8;;5{oWriY$#p$~U(*J!QU-
zvhmlnmb7EKB@!*Hi!9U8mRMw|d$1x@=N<IU`~BW$-hlt6-=l-+fH&X{RJ5#bNIFhu
zEFA9c?rwInM#fIHnJ+eHOefr#wVpHMjvej{C!V8NRyfVG%V;;l9hq=r`KDkN(;XT2
z`-*M(O;a~cn)#8xhhPKVu=Ym0ymy}Gi2KU)KWgTUyISbTk|Dp(-9D|ZO8dS30l&w~
z^E}`UV|};k%g2v+XC-ee=QV>p{Jp9#pY-yVPx2h(?U0w(g;;|GA|l2CMlA4#G|Ttm
zlVke5?zGBT?zNiI+-)c0w#zENUn9^6K1RHA-sv$PZ+PdLwdayozc(n^X}`}KxHFx=
z)A(CEc4_@raVOfNf#0(-TyLz>qsK;%`91z#Zy4Sg72hNIXRFI6Rv+RB!<;-gtM(7L
z6_xkgH&hgaM0!bt6ZRI4JV1^|-7U2<a)XlEe)N>MNHJ0zakepsexKB3Sl-bG$Gs;R
z9QR00XGV{Cr~G}zR2j2ye6rNES$RkCen{@q?b^66&zw_Z7QPp$i~lA&r2swJtqO(Q
z>6JB7g_i$UVO;(Hqe-z6?xC5VPLLyp+&5}V^FP(-3AG1{r=WUg5$@dWudOWfLajvK
zrwZzvl9I`-k}KrC99rm}39T-bt8$8)aWiyQGd#_L*X5$|mB_u4wfN^c`FqvB`Vso#

delta 2029
zcmaKsYiv|S6vv0s7W(2*T1t!JP#)#A?QUBdsI?KnM+E{Q_=trM7xuDU-AA)`OC^d+
zX+UFIq8a#rkqA_xfRV~J2q~?J8pYJadugKagZRx5O^k`bgcyy#bGsydFiv;wZ|2-H
zXZ~}}+<xEkK`3*pJpY8Ewb1XQe?3j94*2qP9<<Z>O09%v;5;}1x5FRddKfHF%7)Lw
zLg>Q#;dihJ-pScl@^UuwAUp^khQ&%{)Hs7u3}3-&_-$_f8=T4fFE|Gl&QNL*tb&!W
z1y;Z<umoDL494Lz@Fn;toP?WUHNkd48!m&N!fN(cw;4Q!A+JcOXJH4#q|U<K@FLs*
zi;#;JwHeC$9Z)vzgtK4-@>BbHaA?&B#sAfu{TL*aItkIFhG0JXtBVXI;4tK;uJMq-
zpF_!v3nc?TK(elW&CP#@vMwKI*{}@mrF`>XH}hT=Yj_(ThDD_32poWuupHHyDh59>
z*aZKEQrnFbN=|efN~(w8XYd*nK?hMYAHEI)@C>Yh-#}USb8dbYu47&?SE;3ND_jLr
zP~x1LOaA4uT)=P=-hdb2o^qw+R+e$&WaA;Y8b&C1BQ&rVegOwyJ1QT56Yzcb3k<{K
zs6>Oh3#AmroOUss3s=CVD)KKcc3~iEYA=)%B%ug<1xkwFh7#x;6#pwwF54JHtD1n4
zky}tM*BvN=7A~0jY954Q-v-6r1I7PDh5;p0`1>0GzqRn>5dJ48pXEy5s#IN$A()pN
zOJ?NDkS1jyiT(wXJ0VR3%3+q!xiV@EUA`O<kfEf0le9{WM5WYJ)1}o;!T*+XL$#2B
z)K5+#*^yRHZ}vx1nUR|=|3akRk}+uwbjk9)#^=7=PxtbiMQXE_PE!2(1Ytg1WeW-h
zrtNw>mF($uR7bo!nMzxUv<_Qon|VT8;czq^O(t|YsncDy?zU6$sN-O9blghxSh3gv
zZDEKc?C=^~qK@uy?3C_}#$wuvIZ5LbEt?mS4Rn{?;1C0sXrkVnE<9_t&ge1k%v@#q
zXWlR$7A-Zk#d~(@x=t$=N$y_S=~%He=(1l7M<ceA-d(4YDGBdOX|r@!%HH=-Z8!V(
zCR5>t+V;I&Rw9DRoJH?Trs8c4R=dd*UpAXc+RPgzm4$KJajb|LDp_INl1I#<(kGq@
z1%ge1&{`d8Y7I39g3ZBT@%C+j9rpgH95t|sbhPTmV956iHtW#3*5=UaAgy?d<)i~U
zQ&z%>S?Oe|Rc}bV(6z@pV5Q7NX=7enyV+RQS-J&XJywJ$@kI7i*^|?kym|AIJL+a{
zUV<aaeb4Lnj=00_sCLKQtUJbY+&nj{CZpYtC(pZ=z1JqsPoDP<vF56K&CP0@hP^|Y
zC0DSF@;5A|d(Wv?m+_IP!(N}iz#Sp-u+D{&Kx5kd2nQmH8xxV`4ax=#y+eiGVQ<hI
zG?`hIbH+t5I{P7E>dl{X{#fOn5{q|KvoNcdIochO1?<nxzEli-L>x20@-MRm6$N?5
zo8M@TR-Mbd>yC4x>&QE--7#<Ae@joyKJqX~ivFwgtpAq|Tt)3w?}+w}G8|(d7XeYC
zO%CXemWnEG5al;7)tkPW3X?1^&2}tUJgx98){H3gN#z1_w)$yPQBybjI^O=#{QQiX
M^)(wzf6bMD03&njcmMzZ

diff --git a/django/contrib/auth/locale/mn/LC_MESSAGES/django.po b/django/contrib/auth/locale/mn/LC_MESSAGES/django.po
index 2e605f72810..b4eb91900e0 100644
--- a/django/contrib/auth/locale/mn/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/mn/LC_MESSAGES/django.po
@@ -1,79 +1,89 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Анхбаяр Анхаа <l.ankhbayar@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Ankhbayar <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian <>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
+"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"language/mn/)\n"
+"Language: mn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Хувийн мэдээлэл"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Эрхүүд"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Чухал огноо"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Бүлгүүд"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Нууц үг амжилттай өөрчлөгдлөө."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Нууц үг өөрчлөх: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Ийм хэрэглэгчийн нэртэй хэрэглэгч өмнө нь бүртгүүлсэн байна."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Хоёр нууц үг зөрж байна."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Хэрэглэгчийн нэр"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Заавал. 30 ба түүнээс бага үсэгтэй. Зөвхөн латин үсэг, тоо болон @/./+/-/_ "
 "тэмдэгтүүдийг зөвшөөрнө."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Энэ утга дотор зөвхөн үсэг, тоо болон @/./+/-/_ тэмдэгтүүд байж болно."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Нууц үг "
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Нууц үгийн баталгаа"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Батлахын тулд дээрх нууц үгээ ахин хийнэ үү."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Ийм хэрэглэгчийн нэртэй хэрэглэгч өмнө нь бүртгүүлсэн байна."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Жинхэн нууц үгүүдийг хадгалдаггүй учраас хэрэглэгчийн нууц үгийг харах "
+"боломжгүй юм. Гэхдээ та нууц үгийг <a href=\"password/\">цонхоор</a> өөрчлөх "
+"боломжтой."
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Хоёр нууц үг зөрж байна."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -81,11 +91,7 @@ msgstr ""
 "Хэрэглэгчийн нэр, нууц үгээ зөв оруулна уу. Том жижиг үсгийн ялгааг гаргах "
 "хэрэгтэй."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Энэ бүртгэл идэвхгүй байна."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -93,11 +99,11 @@ msgstr ""
 "Та вэб хөтчөө cookie ажиллахаар тохируулаагүй юм шиг байна. Нэвтрэхэд cookie "
 "шаардлагатай байдаг."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Цахим шуудан"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Энэ бүртгэл идэвхгүй байна."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -105,104 +111,127 @@ msgstr ""
 "Цахим шуудангийн энэ хаягт хэрэглэгчийн бүртгэл байхгүй байна. Та "
 "бүртгүүлсэн гэдэгтээ итгэлтэй байна уу?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Нууц үг %s дээр хийгдсэн"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"Энэ email хаягаар бүртгүүлсэн хэрэглэгчийн нууц үгийг сэргээх боломжгүй."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Цахим шуудан"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Шинэ нууц үг"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Шинэ нууц үгийн баталгаа"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Хуучин нууц үг"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Хуучин нууц үгээ буруу оруулсан байна. Ахин оруулна уу."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Хуучин нууц үг"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Нууц үг (ахиад)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "Алгоритм"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "давталтууд"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "давс"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "хаш"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "ажлын байгуулагч"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "checksum"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "нэр"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "Код"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "зөвшөөрөл"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "зөвшөөрлүүд"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "бүлэг "
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "бүлгүүд"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "хэрэглэгчийн нэр"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Заавал. 30 болон түүнээс бага тэмдэгт. Үсэг, тоо болон @/./+/-/_ тэмдэгтүүд "
 "ашиглана уу."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "нэр"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "овог"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "цахим шуудангийн хаяг"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "нууц үг"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Формат нь '[algo]$[salt]$[hexdigest]' эсвэл <a href=\"password/\">нууц үг "
-"солих цонх </a> хэрэглэнэ үү."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "Хэрэглэгчдийн төлөв"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "Уг удирдлагын сайт руу хэрэглэгч нэвтрэх боломжтой эсэхийг тодорхойлно."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "идэвхтэй"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -210,52 +239,53 @@ msgstr ""
 "Энэ хэрэглэгчийг идэвхтэй болгох эсэхийг тодорхойлно. Бүртгэлийг нь устгахын "
 "оронд сонгохгүй байхад л хангалттай."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "Удирдлагын төлөв"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "Энэ хэрэглэгчид бүх зөвшөөрөл байгааг ил тод харуулалгүй тодорхойлно. "
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "сүүлд нэвтэрсэн"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "бүртгүүлсэн огноо"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Энэ хэрэглэгч зөвшөөрлийг гар ажиллагаагаар авахаас гадна өөрийн байгаа "
-"бүлэг бүртээ зөвшөөрөл олгуулна."
+"Бүлэгүүд энэ хэрэглэгчийнхээс тусдаа. Хэрэглэгчид нь сонгосон бүлэгт "
+"олгогдсон бүх эрх зөвшөөрөгдөх болно."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "хэрэглэгчийн эрхүүд"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "хэрэглэгч "
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "хэрэглэгчид"
 
-#: models.py:406
-msgid "message"
-msgstr "мэдээлэл"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Гарсан"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Хүчинтэй цахим шуудангийн хаяг оруул"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "%(site_name)s cайт дээрх нууц үг сэргээлт"
diff --git a/django/contrib/auth/locale/nb/LC_MESSAGES/django.mo b/django/contrib/auth/locale/nb/LC_MESSAGES/django.mo
index cd855e2a2f675da2984bcf20b63748a3a7bba314..4cde54a98b80a27c687f08bd5d543391fc4e2e85 100644
GIT binary patch
delta 2472
zcmY+ETWnNC7{>=Gw-zWAs~}!RXr%@AQrZgEf|peBN>LJoAmVg)cK395&)J+g+fpB_
zKIntDXimID#i&V5BpMS;jK+8i@xe=imj_=AF+32#7!#w$7$5w7yQdW<`<>sMnfYeE
z`M&?zGu?mpPM_>(c~;S`#V*DEn5Wbz{CYkQ+TsOD^};1^73_z*;ZArBd;wbc9b5>v
z@wg0L2m9ec*bbk8t?)It6ut%5C^fA<NCv)#i<$Tdu7GFY<?tWa3D+!A>I#^FZEzGW
zg9qR}(1Xvx&)`jPADi6{UxD|+vv3UVT%uGrJPJoSUwuP|NR%eLo8b_YKput%;bZUy
z_%kFHwUN_tQGHO>U7K(O@>6&6SPu6?TvQ2?9Oa<+Pr(-Wkj!(wdPF+#X($`Nlq{Hm
za=_7K{$0pVeau5P_!3GgPe94okIDG2$@}k6{O7Ys0$2(eQXTLpWxgCvOAWsuk1J&%
zVc!Nj;dStSxC_1tCGy{(l;kfs3_B?-U3E8<zzt+iRfZSB!;qhPk_S~$N1y~c17-fb
zcJkjr=PL%Tf+wLwxPVns^Of*ExB(u4kHQ;a7t!v3MJOeD13K8kX6xW#I0|2aQrchO
zR=5BKOQyHO2jDHM$p02P#~F|m{RQPF|3XRKLc$cbLvdUUMRe<-+^7#qX0A!zuZL2a
zTcBLzPDspZKa_pPllcgW|I~Cc@h}vJ$CCxmL&?C)$@noS2Yn2sRG&i$=m#hpoq`hB
zSx9Lc>6MJiCw&nnO-i!~lMBn&%^lUWMAwCF#3b@wY%?ZJ4wV0e^_Uzw+pbJH8F&en
zO5P>K7h{81A12z8poTEfO&XId%(k`i{SVB(CCtJeOm4RglRp#rUe9e(63NyEjMA#r
zn6!Qj38|~)g{HA9q(c*3NRw<y6XC9r)fY5goAvK}_ejeV^V)B%)`BoHex&mzvM&B;
z;p=TZ&Wr3J-&AdHd}vX9+Dz)2ac(jQ^G=)4YCnjyi-OSRH)|K@sAL)R9OHV@Oz9}l
z&RT{UsyiEQaC82f^;kX9Q$bzljIVPg;}>P2om+r|=NI*`(WTH9wy)#h&c?}^bvqgx
z7J{%koH0A%Zx{X9Qw)Q8&HaCp9<!CeFESFO^$m@~^`uv+#E&fOUKtcL5oHKgH~iA^
zXN!C9u+3E_mka7-fqMoyk5uGwj7rU|ZK`U#iZ=OtXq}VLB?I(rbYAfB>BWV3X35(f
zrcw+-+^Z^AvbnOWSL3@{x34c5S5o9QG?5qhPF0MHbR{TyezQx;<2PG-=9@|spJ*Lv
zBjaUVFga2kceLF)xFwbCPxTGxY<8$`FqPe!&9?3yP2FuLJjZ^i5yBqQTe5x4bz5}b
zz|i18{B+yJ8=P0Hhxww>!?V3q6dK=o1$+4V*`c%_f7;e{b5ALXYD1aK<m6;}Zc*B|
zQKl9K<2Dz$Of8cir*uK4!n1CQHsg<FdRy;E-iEY47N2fA5bs+0$-HX3Y}p^n_j={X
zqt>V_uwnev@&~(jORmFw%CA={E}}|O_}cLq-F>bAd)vE~>?w!dg!X(tKG42*dXKG4
zGzEh<6{wgZrO;lvY>^}WGFV`>45BYzSC7v`Rx{%Wz%rr7!g?9e`b}lBj~txVBXwOy
zm)57y4M{dnsG^2BMP4@hEuctFVq;exw^d`KhAiJ{KQ+BGtk-ImW6nQJqde|e_NVZQ
z()uPpi9=7Iu9DHFQnAP?B2y)cOk{QG`1{0}w`exml#eD;suN|X39MqP+DxR?2;WiA
zj5&UJ#p+!*Hf~rBeDdu#WbHf~M&go$WmC1lMW&%?mdM2=hkC9a=cFJ$wqjpwR(?3E
z?5b66+?E^4UfVIW>3?Or@xZsCa-JhI6ajgo@1l}Sg}#~a<H?S$7AF#av14?(3CFCL
KcLh^M<mx{GgbM}$

delta 1917
zcmaLXTWl0n7{KuZw1wWGEtks0Lur8m+wQgnq}Gba#mZHJRa0u5vZu2Hvoo8S*#atV
zj4{3#(VX}|ydeZ%NQ{Ut#&`u24aSg=V0=(x^g&}{OvFSVO#FY#_QAw>(r<rr&di?6
z_wDr0?w`9#-?mh}sAwCACBzpqlp4XuXYoNhU8PhvzK*SU1^3~1xCztMN*O$iHFy=5
z;#b&@e^kc1x!FuVjVEw3)+tp|A8^sYz~|VG*DL+sa1Q;yaW2-(R%#h8#QC@Z+i(}w
zql1l@#|Q8++=kb1C$=-$K{VKfpI|%dtDm^o&cMuCr5?l)WJsOCaXgQAVJ+KbFKQ>s
z{rxBlk6{zK$e)_xgF~w)QJ#OMGX5Mgl{$s&Nu9+i)>r4bkO|*H{?xmC$i$aXGIJFr
z1K%K7SHD*JzoUGwiic&vMl_VK6{R%C`SLuxh$HwZ-ighmX%FtjlI-wRE+n<*a0oA>
z>~IFhl9Sc)F@=jzPH+-sW2aC`@CHh4-$VJ{6_gEMtK9z)Tj>9VvQ7gJ%K_ImlYgn@
zMg|VyZrp+wa2Ri(l%Sv4I`9RQ-^e?-5x>Mytl^j>LyhC3n8QB&0VOjFSY0x;1m(Fd
z<cuoaLjGmP!wg6!wxjfSBXg_!QBFKr884ue;8>-9qH_OfloOpqInYa${sokI-$(YM
zE~9MVI?6iVm$;y0Y9S#DPB(cSWg>ay<hAT3q^-J%%HYh(^;(p)O1p)Sg=BI$xipq2
zzmh9Z7GFn5*%lBbGF)zbe0CCDM2gUaG)cQOd6%c#VlJfqw-S<8X+6Y1`RZnBC2R68
zWDOx1kk(5`mZlq}Tv`5st*neJ$MwV_Vl|N_B;D#_b@j6|4(^D;Vj)%|`9c^aPLSxV
zlNkDecCuM7@xnkSp-yr}7fh7*;+T<G=bfPF`2KP2FyICzyN*Y^SQldx>7$<SYsZg6
z8`pNVy0U=InckQ=c*F~O?CF{_cK7U}eQnMf`_!Dz?3=Znwxe$1fL=A`_-;7fITky9
z0y%Rm>$xUQ##iYulIhD^8FF+kGLv_76j=Xg7-f4qh7aYOz-5<}5j`13`JrBC*p}+v
zwp;6m?DO^WYw{+J9oL?%Uv00}Z?Vf7?lGBEx<8d!uQUCFnSoS#Af2w;w>P!lOnGwD
z)K=0lsQc2H@^k3{ow;prAhR}2tJ~$oN$No41hMZVVKk`kb%KB+4jnGL**9L+_&r`Q
zX}@mhoH;aX?`|Ax*u_4Jj?1jUgngy)Bl~dEjna;&SRlb_)H{-JV5ve#cSI*7)3~mv
zvqncI;eO5}CNMe<^LoPfBF&6ml9a1r{A8V;ymT(o6H)PqiA<nFH@<Z4-`|wk-13r4
zL*klxbHzYYyS&M2ug5;p{KV2dMc<EQc`tCaGgZzksn!K1>$0=vb~cTgAn-jmPRbjw
z>A9oUowwX>oA;qT*0RF>(lUDA|5ns+v`GI~F-?$-Zq||&Q}L0*ChwS}T+Z8DKeo+n
Xo9shvi)ZJJpJjJ8ZtJu!x9#}{M*3B!

diff --git a/django/contrib/auth/locale/nb/LC_MESSAGES/django.po b/django/contrib/auth/locale/nb/LC_MESSAGES/django.po
index 321cec1b877..3863809b645 100644
--- a/django/contrib/auth/locale/nb/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/nb/LC_MESSAGES/django.po
@@ -1,89 +1,96 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+#   <jonklo@gmail.com>, 2012.
+#   <sigurdga-transifex@sigurdga.no>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Norwegian Bokmål <>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-12 14:54+0000\n"
+"Last-Translator: sigurdga <sigurdga-transifex@sigurdga.no>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"language/nb/)\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Personlig informasjon"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Rettigheter"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Viktige datoer"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupper"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Passordet er endret."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Endre passord: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "Brukernavn"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "Påkrevet. 30 tegn eller færre. Kun bokstaver, tall og @/./+/-/_."
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "Verdien kan kun inneholde bokstaver, tall og @/./+/-/_."
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "Passord"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "Passordbekreftelse"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "Skriv inn det samme passordet som ovenfor, for verifisering."
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "Det eksisterer allerede en bruker med dette brukernavnet."
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "De to passordfeltene er ikke like."
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "Brukernavn"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "Påkrevet. 30 tegn eller færre. Kun bokstaver, tall og @/./+/-/_."
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "Verdien kan kun inneholde bokstaver, tall og @/./+/-/_."
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "Passord"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "Passordbekreftelse"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "Skriv inn det samme passordet som ovenfor, for verifisering."
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Selve passordet lagres ikke, så det finnes ingen måte å se denne brukerens "
+"passord på. Du kan endre passordet med <a href=\"password/\">dette skjemaet</"
+"a>."
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr ""
-"Vennligst angi korrekt brukernavn og passord. Merk at det er forskjell på "
-"små og store bokstaver."
+"Skriv inn korrekt brukernavn og passord. Merk at det er forskjell på små og "
+"store bokstaver."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Denne kontoen er inaktiv."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -91,11 +98,11 @@ msgstr ""
 "Din nettleser ser ikke ut til å støtte informasjonskapsler (cookies). "
 "Informasjonskapsler er påkrevet for å logge inn."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-post"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Denne kontoen er inaktiv."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -103,154 +110,179 @@ msgstr ""
 "Den oppgitte e-postadressen er ikke registrert hos oss. Er du sikker på at "
 "du er registrert?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Nullstilling av passord på %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"Brukerkontoen assosiert med denne e-postadressen kan ikke nullstille "
+"passordet."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-post"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Nytt passord"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Bekreft nytt passord"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Gammelt passord"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Ditt gamle passord er galt. Vennligst prøv igjen."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Gammelt passord"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Passord (gjenta)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algoritme"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "iterasjoner"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "salt"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "hash"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "arbeidsfaktor"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "sjekksum"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "navn"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "kodenavn"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "rettighet"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "rettigheter"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "gruppe"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupper"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "brukernavn"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Påkrevet. 30 tegn eller færre. Bokstaver, tall og @/./+/-/_."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "fornavn"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "etternavn"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-postadresse"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "passord"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Bruk '[algo]$[salt]$[hexdigest]' eller <a href=\"password/\">endre passord-"
-"skjemaet</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "administrasjonsstatus"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Angir at brukeren kan logge inn på denne administrasjonssiden."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktiv"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 "Angir at denne brukeren er aktiv. Avmerk denne i stedet for å slette kontoen."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "superbruker"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
-"Angir at denne brukeren har alle rettigheter uten å eksplisitt sette de."
+"Angir at denne brukeren har alle rettigheter uten å eksplisitt sette dem."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "siste innlogging"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "registrert"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"I tillegg til de rettighetene som blir angitt manuelt, får brukeren også "
-"rettighetene til gruppene han/hun er med i."
+"Gruppene denne brukeren er tilknyttet. En bruker vil ha alle rettigheter "
+"tilhørende gruppene han/hun er medlem av."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "Brukerrettigheter"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "bruker"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "brukere"
 
-#: models.py:406
-msgid "message"
-msgstr "melding"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Logget ut"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Oppgi en gyldig e-postadresse."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Passord-nullstilling på %(site_name)s"
diff --git a/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo
index 0f86020b7bb176976453081e4c77c0c20b9960f1..b51480b2ed74e8062516b63d743aa7d20aec3abf 100644
GIT binary patch
delta 2423
zcmZ9MON<m%6oxN?Fb`yyMjSzfE6*92>F(hnFua8Dke57M03za@?mOKzU0v0ws-BkF
z3}{G*aRF8|CIq8IVkEjEnwTgF#<)NXA{!-!xG)AuWMR~WE5FlS1EZBb_1(I4?>XoG
z=X8Cr@Z{o=Td4_eDz4So<Jh0$l-doij_1bJ^q^8*uo+H+OW_{46|RDBLkqu$6X8m3
zPr&tXDLf3@;Az+b--DCkM{tHxBkHqc;s$Ku#m{gm{0+{6|G?>R#w4X?!whVNyWvCd
z5Zn(P_!hhjH^T!s+X3H!FTgvnA8u_{YCgOGcN1TI$AC<fCcQ1N4@x4(;bHh1+yHMw
za#4$j&KA`RW!>t8n;<{6i`x`<5VA!TA>ybI%KoEp0z4+~iLXw`0G@*4_)N0kJd^+z
zlJ^%OKXr+lIJg2u%4<**`ze|KJ$e2E%Kq^zk_0A0rc?@^rOdP7NG}tgqoYWC7d{6k
zkp4<|03L&<p=6$-kWzvfQ2J#ROu;IYKqsLjavDAc&p}b*5|jge3nk7EP{X@z=>G_V
zHg?U03n1lF+hGUX2amu(_%6HxpNFM(r8dH^;Q(wV3kOzU7T$!rU@IN_C_D&deE=n)
zPv9W@Y8v|QWsrHeal+$JN^la&iQY(f1`<oX4@JUHlld>9Nc#<x#IHjs&5uz0+=9}i
zx1lKTck+H5GRX795eDL*9g2evC=O;P3+6%gs0<W`o1i4}ER>VH1jUgLCD1UWwDmm;
zp!}spVYw)`T8u5h<ll`5Y6L~qJZuprfxED7OfIRp)LBX+K}WAAlR*Z~#CnqF6;R5y
z9P7p8`yfg6Ve(f_V{(Ymiyj$K%SN9PO8q)9Ih8b_d`#wJV=pO<lwl!8sp~Zc^$!lc
zrJj-pE{#dU$~C8fy2>&X^=8PY>4D^hlwtbCvlCt)*S4)(@q@^Ck<OdQhVd5@&$V`j
zPGpaGrfj?7Ba^Blrlu<<3~PRn548!b_WVePkssK6w+?+B6)lra$h@wZqdM|+Xf4xB
zRYMyr4Dapl*8SB;AN8v`XFQ!N8m}M=?Y#wTaJ+(EV{|dF18e6HczQi@X3o00!vQ}i
zugREo@%2f6bru4@S_$t*(*4%;y#h0ST5qTa*EPp=;}a9-xBCN{j4~vv>-*C2<)*Hk
zwz10Oa()#RIH#X;kRs2<sMv6Ad&<UfwaMoL8-|j)D8Sf8|4BanwP_$e-~4gPxCK98
zds*d*HdhL(<#=z)+POs&78TkCCUSf)RIUjl?fM1BYYdS*{;;KUym6!WTFa(Z6ffxk
zlSAq_)w*r@lAi3+p5A3To9*je-jiLC&9>~>-LuaQIU)XfHj#FpUXtytugk8~y-WJC
zE8<hF9Sff^LE!5lG|zMV9j>X?^qS&Oz9gfk3v#@4&M(K8TRXON7Ne-rm&w#>wR991
zFLVa%%W2O>nM&Xf+FTT7Dw+HsrSmf`_o^w_jOS*$T6QK+ecE&5o2`c~Zk+tfxYR}~
zs{&`RWTnZf<uJZF<w8e8z9HWa^!%|M_iEcKBl}IR7}a={x1N^11D=E0#-+BlglvAL
zU_+PCUboIyLp^A9NeXCLTCn{=)hXE^q#s8;H5?2()=TT{$>O3dYhyg=Znh0MrqOsh
z>Aca#%R7;lzN@;94eHJJ;#3{aoqA`0MzR&j(U<^fhwc5?^q{35i*kyz-aIxfJ#6SE
z*R}Kz>G7(BJRGH7p<!px%M`_7;yoQVw=dl>)^)*_{7S{TdC6W&diPosS#^oYB5M8r
z@O8-v7q4o!aZ~E*XrGqt{XV^sT0doMpYly;pEh%jXG~e$_owQKH}2L`p>*t?Y5S*`
Mpx-+Au+g*XU*{w8=l}o!

delta 1956
zcmaLXUu+ab9Ki7@w57dLftHG>;8-aI%C&d25G=Kkib@3|V2w&4I_0K&+uPf%yL+vI
z=KK?biDHNwV~i#s#F$88jExVz_@F-ckAy_UC-li^d{7hPlQHr8TNZsWPCED5o!Ol~
zzu#=1>wBxW{#{4o%Zjp%dOh{a2BpUF@x}a5PB$vG5#PX0`~vsk_jofFnv}9QgUxsW
z*WkA}h<{}58|hreeF2}qTQR3pU46*KQW`$P)p#+x{|#HX{|lF6^Ae@j;wtRIZMYKm
zVjCK4$12{B$MAOi3ise@20Mfnd+;M%&HU;oF7BXVQL9o9;5gEx&fsA@hdZ&A<+2vF
z2c`c2%EXg+6*|bDn&XE}tEW(&Kc2O}hzzA(Mb@OwVk7gbb6m)P?;?Nd1Ab)SPf#Lr
z0VM*Lkf^I)visjr-fQGxnXnxnBz>J&<i5(w5~)*oFTRi4v6V1AiDOuo6@JXc4fr|k
zz@Jf8xSnlwU_U;OJ5eS)kFubPcpd(T{Hetxm^G;ml!@1%#zDLqCs0ycK^gzqWyF6K
z7bj?V2;anm*u>~#_%Kf6Su9{~g;Lkx4wU{0bnz9G1vIeQ8C;J0@fgYm&!a5-YvfUN
z2?>(=wS)Le$DcGv2pc)#va%c!1l57EBb~MPp`>6iYu}FY-fda`c-Foj<!~NC$@wEF
z6CXoa=n0f@U$1jP%F-yX$$yG`juJw;)6a5a*3+9=#6{V4AIg^@<yxvtB%6?hNnvm4
zCwUXfq?@U-I7vyJh^J)>zw4+y)I3#FrF35={g$)KH0PY9^vp=~r1VpV(yPmnlU>Wd
zkWExcfs_HNg#Ak4EUZt%u|8|L5w}t$#~Y}Ua|yRvXli<);n1C7P@9d^cy%@iW8=rV
zWMa#`uT81s#%|#2IM8v~>RB6B-6*0Z(pBTvjORV34GoTOOPhJbjdU%tp`Ld=Pa7`^
zlBl(((~${u*$zaE!6UBUpPX(!lia<emYizYlswb&Y4T3%x}-ZdHKBVajpqc1*G)#o
zi=k{EExC@3;={c<2xa(mDI-RgLpyy-_bl_z2VrTTd-O=z_ztVgTJ&@fR!0WRXj0F;
zm+WdANlvzPHCJsE87Dd0wjsIDHkPbiy1QP?7Y6git-3fkTpY?5h6;t;zI*Zq?3^oG
z&F>-{!+J}hm_An+(#7q=L&d%VCAZf^aeg8+e&m@r2#57u#`oFc$V}?3o^?ys>v#R>
zV3db_r)C_RpRlGntasJoBV|1@nrv&ITzaK%So_|>$@U)_>ZHZaT3?M>kM}}%reY;C
zwQ8isf;sC4v$|w;XpfX*>+5;z(N6$MRTI08KI+a$+N@(M)+aX=25?BNJ!-XMr^1?B
zAx}Y2Ax+-D!^|09MkQmtGP#~NCe&qjMhDX}Bz@M?@=(o<tHxB~{^a<wx7*7$jAHAR
zG>hs<b}xT=p|YZ-A-U8skR0rsGXI~{=_?E3h{XE85<73$<a|JuIaxDDISziB+?waw
qFwO8n=Qqh~D@V0wOw39+VqV}VdCi8tF;z8XLzlakx^&Xhb>H7#e_sv&

diff --git a/django/contrib/auth/locale/nl/LC_MESSAGES/django.po b/django/contrib/auth/locale/nl/LC_MESSAGES/django.po
index 01585cd8f09..ba8e7f16263 100644
--- a/django/contrib/auth/locale/nl/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/nl/LC_MESSAGES/django.po
@@ -1,79 +1,91 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Harro van der Klauw <hvdklauw@gmail.com>, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Jeffrey Gelens <jeffrey@noppo.pro>, 2011, 2012.
+# Tino de Bruijn <tinodb@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Dutch <>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Harro van der Klauw <hvdklauw@gmail.com>\n"
+"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"nl/)\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Persoonlijke informatie"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Rechten"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Belangrijke datums"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Groepen"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Wachtwoord wijzigen is geslaagd."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Wijzig wachtwoord: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Een gebruiker met deze gebruikersnaam bestaat al."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "De twee ingevulde wachtwoorden zijn niet gelijk."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Vereist. 30 tekens of minder. Alleen letters, cijfers en @/,/+/-/_ tekens "
 "zijn toegestaan."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Dit veld mag alleen letters, cijfers en @/,/+/-/_ tekens bevatten."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Bevestiging wachtwoord"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Vul hetzelfde wachtwoord als hierboven in, ter bevestiging."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Een gebruiker met deze gebruikersnaam bestaat al."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Wachtwoorden worden niet als tekst opgeslagen, dus je kunt een gebruikers "
+"wachtwoord niet zien. Je kunt hem aanpassen via <a href=\"password/\">dit "
+"formulier</a>."
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "De twee ingevulde wachtwoorden zijn niet gelijk."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -81,11 +93,7 @@ msgstr ""
 "Voer een correcte gebruikersnaam en wachtwoord in. Let op, de velden zijn "
 "hoofdletter-gevoelig."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Dit account is inactief."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -93,11 +101,11 @@ msgstr ""
 "Het lijkt erop dat uw browser geen cookies accepteert. Om in te loggen "
 "moeten cookies worden geaccepteerd."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Dit account is inactief."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -105,103 +113,126 @@ msgstr ""
 "Dat e-mailadres heeft geen gerelateerd gebruikersaccount. Weet u zeker dat u "
 "zich heeft geregistreerd?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Wachtwoord hersteld op %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"De gebruiker gekoppeld aan dit e-mail adres kan het wachtwoord niet resetten."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-mail"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Nieuw wachtwoord bevestigen"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Oud wachtwoord"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Uw oude wachtwoord is niet correct ingevoerd. Voert u het alstublieft "
 "opnieuw in."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Oud wachtwoord"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Wachtwoord (nogmaals)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algoritme"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "iteraties"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "salt"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "hash"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "arbeidsfactor"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "checksum"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "naam"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "codenaam"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "recht"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "rechten"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "groep"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "groepen"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "gebruikersnaam"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Vereist. 30 tekens of minder. Letters, cijfers en /./+/-/_ tekens."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "voornaam"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "achternaam"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-mailadres"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "wachtwoord"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Gebruik '[algo]$[salt]$[hexdigest]' of gebruik het <a href=\"password/"
-"\">wachtwoord wijzigen formulier</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "stafstatus"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Bepaalt of de gebruiker kan inloggen op deze beheersite."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "actief"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -209,11 +240,11 @@ msgstr ""
 "Bepaalt of deze gebruiker als actief dient te worden behandeld. U kunt dit "
 "uitvinken in plaats van een gebruiker te verwijderen."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "supergebruikerstatus"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -221,42 +252,43 @@ msgstr ""
 "Bepaalt dat deze gebruiker alle rechten heeft, zonder deze expliciet toe te "
 "wijzen."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "laatste inlog"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "datum toegetreden"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Bovenop de rechten welke handmatig zijn toegekend, krijgt deze gebruiker ook "
-"alle rechten van de groepen waar hij of zij deel van uitmaakt."
+"De groepen waar deze gebruiker toe behoord. Een gebruiker zal alle rechten "
+"krijgen van zijn/haar groepen."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "gebruikersrechten"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "gebruiker"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "gebruikers"
 
-#: models.py:406
-msgid "message"
-msgstr "bericht"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Afmelden"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Geef een geldig e-mailadres op."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Wachtwoord reset voor %(site_name)s"
diff --git a/django/contrib/auth/locale/nn/LC_MESSAGES/django.mo b/django/contrib/auth/locale/nn/LC_MESSAGES/django.mo
index a032feef800e54621ab836559ff3f285f273ae8a..55dd7253df2dcd317bed129789650d3691cff8f5 100644
GIT binary patch
delta 1306
zcmYk+OGs2v9LMo9YMPGu>iyEO(wuU<ceF5PAw>3&)I@qgN=)NT$L!89-m)T)f>sp?
zLkppeWShbWW*sC%v~?3f(W(cvkQPCUNc#SUD|DFu`P_Tw-gExvf9B4chWYxbPc=mk
z4J}G+Bjy6e9Kz;8I@*CEW5U>hYcYZSIEfwj79A{DWlS-S;&x178{WrCT);A1#B%(I
zn~j+=-~9`PJiVGPs;~+-V=eB%_1KL;JdbPe5}v{9co-M)IBqO4W)KtDfUl5=%vU^u
znnd#)r5j>?)6c;{E<8uZFh7xx`Aw$@O{p;zP>x!`RwQTBh`PVozuty?OeY;hF~?Bj
z^rD_SjT$eGs=#HeVt#Xj13hq87jPQ&;4EsQr}&s{d4Vy`Pclk1K0vK}7CZ49_F*HV
zE3qqBhc{7M^$4|)cc}5d;1pq&=v3lAsJ*JDzEsQ9qY?_E_CAIiun#qXgL-Zp&*E*=
zZ|8$=9kUH_p1>WrfZB@BsD&(7P=A%CgIQIHE)3&q)XJAonf^lE_ZJ!4tR^cZxB-<&
zt$*Htd`yInVwq0NZw2c9Uex`kd<Rv3tsub#s%NhIU)(`e<{oO|8B`*3$WG+jPTwZq
zjo3hFg<7o^qGY!c7O{)?zv(U6q*W^cWwp|F`v;nsO64ckC9R-<P@?2vB7~Y=TW!xC
zqM1;uAzJcB#%%Ewjf5()(mFyM?Ioye{zs*<>$TJCuM+A9WE1s-_Fh%df5p1oOwn|p
zviov6mGR=P7aERx&P4WQ@pSG&$&WzxN$GO-S=o#Itr5E|65SWF?O1ew#BR6kvi=j1
z0q1IRBAId{T|5;Fwc64AefEJ+v^8e8XQzX;#XU}P*cs2x2iuP{je1@>W?7SylPz8*
z?oK2xI@elU$FtIz)R>d-CaknIJQjCHQr0;AmH3Ebxvmv1>+#QGA=l0R2%gIgl+On$
gPA4yU$q`36r{bCHRK=}aUFG{guCF>6$i{1&e=ru4zW@LL

delta 1836
zcmaKsTWB0r7{|}Ho1{sTCQWQ>)TXDgX&TLDcbkhEVo>ab*pk$sRf!SC?#b*lvop)g
zY-(xC+9&Zvic1Awf*11CDw4cJP#;VcydVLo(g*d$2L%zK_$c-FO(qY5c*r-ubIzXg
zUH;!p-rxU4PxYtv^i{<e!S2JpNhvh}FK*?*css3BAAARPz^~yc_%nP2=IWF(@GPu{
z>u@jp0S>~ylKnn@Y-OE;m*8WtNvW#(lu0uiU&2oKeX{-&Ze#s7Y=iX;N_D|Ka2Fhb
zcfpfzJG5X6EWu~t1$Y#G2T#CGoV@@I?17)bPU5RynH*zdOQTZH!3oHgdKb>ZYw&T{
zNV?>rPC)s68cN_9xC7ddKefPvqSa+6=U+|sUx&C-Z$WZW@4+<j)ioyK@I%O-`iO@(
zz5zv<btnq_2vJ@Ak*se+xtHd!1Z;s0?dyP}tS@nSCtQW1#8+?}wjt9boPt%!aFNMA
zxCEuApF_#;4wT9ocsOu3lz^{5N$fQ!t#}hkZ?8kS_c4@&Z$NoxZo=L0Hz+NX!xDF2
zEBcFrgKUWOWAF)hHQ_BNE!c~<Zg>I8JF*C+!c}-0-iC;wo}^q+^cmO(Z$eS#4wS^}
z+BeSafYhcs+c_;6_p%`wWudG`AU@SNl%7o``_DsZft9T1pxpBkR-hDg5lRc+NcI<@
zD7FM8(PbzJeNtsY%hVoB0&WiZ9L15yC!eKMBcpc%Di60L^9NxpE4&Az*tiI(Tm~WH
zPx5{!!TT}!a-=0y6pqJXo(HfVEQ4uGhR7~MzU9qvFB7Ro-WjPv#sD@H&o-nL)#P8u
z1DGfzBa4YDn}b$%$1m8yWM@Ad#_q-rVL2?ll22brRgVXLr5vh>QrQn8%ZqfuiVSN{
zTZMuXIliYOUq?lw%O)r}VaQIXOO{u$T=%@T*swiQ=;w$N>Plz=ea>-RZMmVZZ4)tZ
z|8><4h++!j)mUeC6}2rH=%UGn1i^>n4b;}_u5{q~oF5c)U_#uGM^Cu&V*T%_r*-d)
z<=X!2ftk>9BTzIi7aZG!(QL2w14$xIc+Aqpz|1|`T~1tOyT{KIEzhQwP3LodP#Vix
z<10tEZB5meOc+{r?O5aTa6Xe8%;bl4esDBDl*tX{a!seEGSg<k5d|_wP-#>j&gJ8C
zxgni@cyuUV%QSV>rkh6U$0mKxjMu(xnrS{sz=~ya+VfTpZT~<duapr}op$CU(iX*i
zD^L?ULO5gFLR~P9cGp(VFIYPCOM1ZsNa@*56vg5jH|p1OYfFKCDX7d_f${X(vb}MG
z>TzJlQ9PrmI9o(MI#WV-CpA#}rTKE#WW{wuiRgH?wiaSZMDFt1k|<qhxs`hAf0Z^Q
n8|eQM*?5IuLt`9f!uhkNWSJ<I`JvXGsfLnq3q-9QZ=3rEElfHc

diff --git a/django/contrib/auth/locale/nn/LC_MESSAGES/django.po b/django/contrib/auth/locale/nn/LC_MESSAGES/django.po
index b6da5020f8a..00d204f8828 100644
--- a/django/contrib/auth/locale/nn/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/nn/LC_MESSAGES/django.po
@@ -1,77 +1,83 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Norwegian Nynorsk <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"language/nn/)\n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Personleg informasjon"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Løyve"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Viktige datoar"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupper"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Passordet er endra."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Endre passord: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "Brukarnamn"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "Nødvendig. 30 teikn eller færre. Berre bokstavar, tall @/./+/-/_."
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "Feltet kan berre innehalde bokstavar, nummer og @/./+/-/_."
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "Passord"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "Stadfesting av passord"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "Skriv inn det samme passordet som over, for verifisering."
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "Det eksisterar allereie ein brukar med dette brukernamnet."
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "Dei to passordfelta er ikkje like."
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "Brukarnamn"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "Nødvendig. 30 teikn eller færre. Berre bokstavar, tall @/./+/-/_."
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "Feltet kan berre innehalde bokstavar, nummer og @/./+/-/_."
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "Passord"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "Stadfesting av passord"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "Skriv inn det samme passordet som over, for verifisering."
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -79,11 +85,7 @@ msgstr ""
 "Gje korrekt brukarnamn og passord. Merk at det er forskjell på små og store "
 "bokstavar."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Denne kontoen er inaktiv."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -91,11 +93,11 @@ msgstr ""
 "Nettlesaren din ser ikkje ut til å støtte informasjonskapslar (cookies). "
 "Informasjonskapslar er nødvendige for å logge inn."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-post"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Denne kontoen er inaktiv."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -103,153 +105,174 @@ msgstr ""
 "Den oppgitte e-postadressa er ikkje registrert hos oss. Er du sikker på at "
 "du er registrert?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Nullstilling av passord på %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-post"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Nytt passord"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Stadfest nytt passord"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Gammalt passord"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Det gamle passordet er feil. Prøv omatt."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Gammalt passord"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Passord (gjenta)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "namn"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "kodenamn"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "løyve"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "løyve"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "gruppe"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupper"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "brukarnamn"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Nødvendig. 30 teikn eller færre. Berre bokstavar, tall @/./+/-/_."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "fornamn"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "etternamn"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-postadresse"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "passord"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Bruk '[algo]$[salt]$[hexdigest]' eller <a href=\"password/\">endre passord-"
-"skjemaet</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "administrasjonsstatus"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Angir at brukaren kan logge inn på denne administrasjonssida."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktiv"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 "Angir at denne brukaren er aktiv. Avmerk denne i staden for å slette kontoen."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "superbrukar"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "Angir at denne brukaren har alle løyve utan å eksplisitt sette dei."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "siste innlogging"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "registrert"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"I tillegg til dei løyva som vert angitt manuelt, får brukaren òg løyve til "
-"gruppene han/hon er med i."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "Brukerløyve"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "brukar"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "brukarar"
 
-#: models.py:406
-msgid "message"
-msgstr "melding"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Logga ut"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Oppgje ei gyldig e-postadresse."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/pa/LC_MESSAGES/django.mo b/django/contrib/auth/locale/pa/LC_MESSAGES/django.mo
index 8b90a6803425037857b692cec7fcb2acde5e35cf..d9cb232b79133a8e57c89f6ece4c778e217dd421 100644
GIT binary patch
delta 1172
zcmX}r+e;Kt9Ki9j+uH7`*=Bjk%EnD|P1l*#LR%5KkVr}wiV8An$juAO?%<9X7%V*`
zL4*%OPX&S2Lxd%4L{GgWnEe3-5>Zjm<squaLi+y3p&y?4%sFTFTz=;`-FUS=|E@f6
zOA#%Ut&}T1rMmE~p9k@BjZ#gxgd6cUuEk(Lscl$>?bw3r@d6g3g{3%&oAJ6=pTQ9I
z#~4v6ub%NzOT!XY;1?{x6<mkKMM|B<YCMD%_Tf`(KtHRI31TP%AHZ|ihx_pX@~6J@
zkp5pN<Nv`j=2yYs>WV9oF;yMP4;sDpRt!_$i>yf<L>Z{p>pzY%-~h^whmoDBag^_;
zy!s84-`zo(=RVHnN%uouGBg}zmL2#UWuTAPjX&@V#>uN3(G+Spi`#Jl+wc=gMygm%
zId-FD_86YPEK2_ium3CNrQt6xpE1g;Qy3!e*Kit7VMUoz`!J1?>N#A-MU=}k!@<kh
zcd~7{BfV(g0LlVyqAYw4<-1p&%MtP~9p7lE#NdY2RM(>HAm-WSc?4wvCdP0QWx#tF
z#V20>8?XH*l3;fcHR#=G_u@*1qjLVTVotz4n`V?VlVDA5Y~s0-A`?pNqHrSa<!qD&
zg3SL9$*3$|qJ<(0lptAd@DJo}S}OJZJgO;06uJFP6bZQp8bx+nN0E>Wu_5<NrCvqh
z<lM`;MH-xjz-?zSaJMj7)Z=q%f-8;|nvb-_jrMqAw`Lg0#Gbg(;k*x3C)`G(Q%kfZ
zjgDr6DDF3NcKqa+naQP1J3E%t4x5?GNKWfdjSQyJPBh%n6C1W|E2--f6BDhrd^vI{
zb-6W@vUO`LJDR#^=X6US95pjTSv}2j+#E{jmZ>)}_-ZYwS*CM7e73L{9`qHuN=#qj
Rb?Jh?5R2se&ZF`V{{WYnhyefq

delta 1520
zcmaLWduS9#9Ki9p+<Cd2ni!+8KBCi@n2YwzUJ}KG7<@Fe^r7NgLXgF*cLBW%w--}I
z3<<<qR0`b|X$`c0NZD&eT91nUBZ7$NU;d>aB8w=rC}<1%mqNe4bp;i1xY^Il-0Zx5
zv!e~)HjUh!9{E9$4DvkkL`bQ%QV#PVB_c{SV>8y^CX8Yl>oALLcr0kYgjLk9VjOSb
z6ugJC@o`YEn50xpsS#C6VH$rd!1-w4Ok9sM(89@h0H@+%+=ky{4?e=rv6WRd;vtlY
zPT_XEh)kqrl`GYU8du{Xj55EvL_s=SMVaUZR^lC$9Xv$lP|uLD)bpS{%u5y2E0HGk
z0kS!zk)LYhA@46m8Mg!FBzjObyb&YJuXY6u8RVz-^N<P0aDZ?e!7TOvm~A1Nj4A_-
z<4XJvWv4e#j=q`MB$OSfaVsvsVQj?{C?|CtN2XJFLP3r`%&42N9;L%R?7#_>em8^m
zfA9hID&lb%pW-+k<k+@i8LL=@JMcLEgc6bj+rEu!P%d3vHRmrYE>*w0T$j<HehX#A
zF=myWBvAVG1a1l1Ev%(|4Ed=ac}Pf32laD-*8=aLe+e-`zls{pUj}aFYS-f$lnxe3
z`v?*NKYbY36etr*IA)PGSq9`F{j`XujQ4h$OM_f$xnF*g_`gbo*^lcaltsv8DkIB|
zBpe@+my+j@*?|99E<s6hp^|=yix?<0yjJE={V*>^BIa+<e@Bj3K6km@@=dpp<@n_@
z<WBh^;UHAGb0vH-`bj=FG-x|JBfr#`wmqE7_v^f6TLqoV>PEZtBJycyvu^4&_oQ=u
z4ZXIxrvMr2tNwwsWf%IIbS|%lY)cn1mhLijCU5OtSw9#I)l%QRD`RHUmVVWucjxkZ
zyIRcd(yC}U6y0mtwwZQTm!DmhN*Zm+)H0oF>rAyLjdsI`Z&;t)Xzd%Y2Xfiu$7aFm
z)U8I!?`O2@)QZmbl#__fcfO1*k9MugWvy=KTC8`<7fd*0rs+LsmKIi6p{XZ4_Ybc)
z>J|U=+}}#$@%~U%qpdyn8^7h0SNz&}60e<c#_uzc^xX4a@reK5&!xX7Un%?Sef#&^
zzhroqVUBw47{g9@?nNoR>o}Z$<1?3>_S|1R_be~a`**)L1Dug#q2Z0;O2x|IvT3Ym
R)N@@H>bV!_@6=V_{~y`j3)KJs

diff --git a/django/contrib/auth/locale/pa/LC_MESSAGES/django.po b/django/contrib/auth/locale/pa/LC_MESSAGES/django.po
index 49054235db3..4fe32314fcc 100644
--- a/django/contrib/auth/locale/pa/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/pa/LC_MESSAGES/django.po
@@ -1,247 +1,272 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"language/pa/)\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "ਅਧਿਕਾਰ"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "ਖਾਸ ਮਿਤੀਆਂ"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "ਗਰੁੱਪ"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "ਪਾਸਵਰਡ ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲਿਆ ਗਿਆ ਹੈ।"
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "ਪਾਸਵਰਡ ਬਦਲੋ: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "ਲਾਜ਼ਮੀ। ੩੦ ਜਾਂ ਘੱਟ ਅੱਖਰ ਚਾਹੀਦੇ ਹਨ। ਅੱਖਰ, ਅੰਕ @/./+/-/_ ਹੀ।"
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr ""
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "ਪਾਸਵਰਡ"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "ਪਾਸਵਰਡ ਪੁਸ਼ਟੀ"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "ਜਾਂਚ ਲਈ, ਉੱਤੇ ਦਿੱਤਾ ਪਾਸਵਰਡ ਹੀ ਦਿਓ।"
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "ਉਸ ਯੂਜ਼ਰ ਨਾਂ ਨਾਲ ਯੂਜ਼ਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "ਦੋਵੇਂ ਪਾਸਵਰਡ ਖੇਤਰ ਮਿਲਦੇ ਨਹੀਂ ਹਨ।"
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "ਯੂਜ਼ਰ ਨਾਂ"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "ਲਾਜ਼ਮੀ। ੩੦ ਜਾਂ ਘੱਟ ਅੱਖਰ ਚਾਹੀਦੇ ਹਨ। ਅੱਖਰ, ਅੰਕ @/./+/-/_ ਹੀ।"
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "ਪਾਸਵਰਡ"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "ਪਾਸਵਰਡ ਪੁਸ਼ਟੀ"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "ਜਾਂਚ ਲਈ, ਉੱਤੇ ਦਿੱਤਾ ਪਾਸਵਰਡ ਹੀ ਦਿਓ।"
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr ""
 "ਠੀਕ ਯੂਜ਼ਰ ਨਾਂ ਤੇ ਪਾਸਵਰਡ ਦਿਉ ਜੀ। ਯਾਦ ਰੱਖੋ ਕਿ ਦੋਵੇਂ ਖੇਤਰਾਂ ਅੱਖਰ ਆਕਾਰ ਪ੍ਰਤੀ ਸੰਵੇਦਨਸ਼ੀਲ ਹਨ।"
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "ਇਹ ਅਕਾਊਂਟ ਗ਼ੈਰ-ਸਰਗਰਮ ਹੈ।"
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "ਤੁਹਾਡੇ ਵੈੱਬ ਬਰਾਊਜ਼ਰ ਉੱਤੇ ਕੂਕੀਜ਼ ਚਾਲੂ ਨਹੀਂ ਜਾਪਦੇ ਹਨ। ਲਾਗਇਨ ਕਰਨ ਲਈ ਕੂਕੀਜ਼ ਚਾਹੀਦੇ ਹਨ।"
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "ਈਮੇਲ"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "ਇਹ ਅਕਾਊਂਟ ਗ਼ੈਰ-ਸਰਗਰਮ ਹੈ।"
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "%s ਉੱਤੇ ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "ਈਮੇਲ"
+
+#: forms.py:249
 msgid "New password"
 msgstr "ਨਵਾਂ ਪਾਸਵਰਡ"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "ਨਵਾਂ ਪਾਸਵਰਡ ਪੁਸ਼ਟੀ"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "ਪੁਰਾਣਾ ਪਾਸਵਰਡ"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "ਤੁਹਾਡਾ ਪੁਰਾਣਾ ਪਾਸਵਰਡ ਗਲਤ ਦਿੱਤਾ ਗਿਆ ਸੀ। ਇਸ ਨੂੰ ਫੇਰ ਦਿਉ ਜੀ।"
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "ਪੁਰਾਣਾ ਪਾਸਵਰਡ"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "ਪਾਸਵਰਡ (ਫੇਰ)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "ਨਾਂ"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "ਕੋਡ-ਨਾਂ"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "ਅਧਿਕਾਰ"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "ਅਧਿਕਾਰ"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "ਗਰੁੱਪ"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "ਗਰੁੱਪ"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "ਲਾਜ਼ਮੀ। ੩੦ ਜਾਂ ਘੱਟ ਅੱਖਰ ਚਾਹੀਦੇ ਹਨ। ਅੱਖਰ, ਅੰਕ @//+/-/_ ਹੀ।"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "ਪਹਿਲਾਂ ਨਾਂ"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "ਆਖਰੀ ਨਾਂ"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "ਈਮੇਲ ਐਡਰੈੱਸ"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "ਪਾਸਵਰਡ"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"'[algo]$[salt]$[hexdigest]' ਵਰਤੋਂ ਜਾਂ <a href=\"password/\">ਪਾਸਵਰਡ ਬਦਲੋ ਫਾਰਮ</a> "
-"ਵਰਤੋਂ।"
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "ਸਟਾਫ ਹਾਲਤ"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "ਸਰਗਰਮ"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "ਸੁਪਰਯੂਜ਼ਰ ਹਾਲਤ"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "ਆਖਰੀ ਲਾਗਇਨ"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "ਜੁਆਇੰਨ ਕਰਨ ਦੀ ਮਿਤੀ"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "ਯੂਜ਼ਰ ਅਧਿਕਾਰ"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "ਯੂਜ਼ਰ"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "ਯੂਜ਼ਰ"
 
-#: models.py:406
-msgid "message"
-msgstr "ਸੁਨੇਹਾ"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "ਲਾਗ ਆਉਟ ਕੀਤਾ"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "ਠੀਕ ਈਮੇਲ ਐਡਰੈੱਸ ਦਿਓ ਜੀ।"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo
index 92a1f08bb62df4727731b429062c491f58711559..3b590546d0f3dcb9cb72cb1b3048a10959eba70b 100644
GIT binary patch
delta 1639
zcmYk*eP|nH9Ki7>TKCd)P1`xwt-d_dZnkboF6rj9sB77*&X%<d$6&LLTXIdWN$x`K
z+SnizCcc1(!$TBtTEwC<VPf<j*9o##Q1*{F{}5q_h>9Sne+)qozrV{(e8}^B?z!Ca
z^7}n^XLh{XyKtqe<z+<~px#XVD5lgyICeb^Wx7SFezb8T1~`H5;Jx@4T9~~-sWtd2
z-hywU%y|J5_y@LPjECB=4Yw$@pteLe25=pJ3}FWz#9Q$gZo+xI4PV4Kp2H1z9*^P|
z_#kdutJEkK@G)%QcI;sCal9K@SUrOytgjZi;HQ43nZ)057!R#)MsynG|5s2JUc`2M
zA0?vmNO0<NWDn|6bpLDQr>@YDB=rl*JinogyNYqvS222$k_{-4Z$%lfGwK^C1BX!-
zdIVQErU|^0{w4-@;{Et2j^jRj8;{|SC>z^Hx-^d9U0A>ciRdLRm`lBZ(ti(c!jF-$
z>JrKX-=Zw^JxWUd#2c}jbfhtfGJX<eoQ;yvIUK>ukv+T+a%3kH<bNv{pK#-G{08N0
zc9Vt&@DO(43n-B+;sN{{IaW2qZe*c{QC`j?QQt<%)Li6~k*83edk!U|uXmDvd2opv
z65&~t2tJJb6gejKCCW>9IlBKVcGJHa^%Lw;HqwKfOjx21D7@~Ym3ex@UNimSrJO%m
zQM;%+sB)ees(gx4WK)t_0uD2k#GO<r{Y}D1NL+Y?J-C@FK}eDJNHQoT)#SfczODt?
zHOCl!vl3yJN>JgaCMlNeNTgB>s;0_!E#;0T>UP{lm3Kzo3wbBx7$wzGu4~e4hxM#y
zRdvnwr?o%bIM-5-B@UJ=Zq+v(U*}EV@`4L%-ir5mwr`zq%(B(rII;Hm*qGHEXy$V6
zEKi!A=jLo4&tIF%_Oz8On|4W?`Fz##Je@Ng$MrSWmd|3At}v?RR`bD6>!yOG_5TEC
zTR+&7O&SBq%x-NMgPA=^W3OSfPK+lHTXVK&yH4@|YYghFkqMtO?$Md-ps_bN9pAih
z)U3KCeP3~Ew&-Pt+-#~+3O<W>kMvFZeq}J7uGMNOziK+3J!L(Sax6bxsk$>(&iB%l
zbbiKk3U0bYJ8KrKbfuK;Zyk$zgPN(niyv?7Z~Gw@KWeTnJC-D8K3Hn+ZSAYLHUDCx
zTJI0OYCoAe9L6_odaI{QoiCZX=sLcs9aDRL)pcx3Z~uQbM-%nf<dN0odB5n^9J{zn
z7iBW5;D!TT&FuEd({+<2XDrXxb?wiWNvh<rd@aW^ZP{I2wsbwruUj)$p4H7w1Q$Dw
OH|9FKW5H`(PyGw~-3i42

delta 1881
zcmaKsZ-`V?6u|H3w5_|Yu9~e{*=<|hww&D=chp+8&A_ZpLs>MlZHc=(cW0iydGGb!
z8@HW`r7$c6iKaeO2xd`|M1ST}U<K)Z5DUbh=tC{^M}i=N2qFmjo$>95AUe!>zkAQS
z_ndRjd3R2A9bZ55-SYIy3fYWakA9v~Y8XDbkOy)ityB+u9j<^E;BGhv?||8>l(O&u
zY=Rfz4e)E&5C2H)J-l4XJPV(KTVab*GwKrti!q#stKnD4{5ROl{BPI}o32)BE$o0R
z;bwRZ+zDHufo-r1_rWLNJ@8Ao1Fpu|BhbQi@H4oY`08f{+c7Lyq|`%j7-CW<;TSv(
z?}m#=mt52iDDOw01RjM;U=i|Dhj?&k^)!_AM-uxnh%5C9Bq#L-OcP(7W*`pVhy2t>
zJjC%iD3!Sgr2^kVs;+)b=D$PPmu9g9Y=bY+z7?>W`6)IpgBRf*_&vM}ZlO#M!znl;
z8D3(b;WzMB_!kt1>o}GqavSvE7D!C>R$~7EN((-QlISHU{^p<rz6_<*e?nQemJdK$
z+z-X?152sDY}}7QN<9g;!*dB+Ikxn21g?SaKyfe&hu~cDel5|KGd~37WY5EG@JA@6
z?%}1x$wB#uhm!foa_TQ9eH4SxCOnudd<;s7pM{d~vE==$P)>RxvA><L4yDJRLitF~
zC-ynGiuo_eJWUpoQ2Pu6TBbT=g3gOvM{yw8%C+o4MWnAHIdnl|M0=pz3=ydkhi;r&
z4kSX%#+AGoO8YjT(vEA<87ke7jXb+h=~o8Ts7U7(H12XTRM#<(>~BP+IwHMjzA?IT
z4W$b57b4%2R7#`|l`75)t?X=Eo%M<3Cb$WeQr&`P(RAIUUr5c|8~T+XQp4rI4`buS
zx?p0<+|#B|aAL>zbnNT6WOZP}vJ*vEB3(9K#klUYHW-SYEo@+k6X{B1Lp|lVt~PGu
z>!OVrxc}N(42fb3;?<gol_g!240Or%MFhcz<MqDSbh7?#)6rDzx#sabx_i{PMSrYo
zG%{`sO7`)BQ?yY$)~)?eVm9&{G`bYp$vZm(lA7|vLSN_5M9FwXQco;;(htjneP*cs
zQ}e=9Q`tt5Db_A8`fyV&lkLysHtAgdKrWxj=Cj$B-Mca)_K+h7&TOM71A1dN*I1X$
z>)h=F`CRRbmX7@W#`DN}@IZrGUF#IA+v|9f{!q(KqE}4OX7*T99?-je*NIAcaHzJo
zb#(Fk%K;s@_4itTkX}@RX|>PHp7E^oVOs49!n5^>s;&f~nerSvdsqiybvke&<4sSL
z^ti1C{_Ja^EqIQvE3;>&<AXj6c{tjSSz0!l7S8YY97DY;!3JIM^}+aTJrpmVaV=X@
zy|v?QUCn{-i3?l1&^Es6J`>G8<Lhc@BOCiuMiO(4URNJoQcczJ?fW0x%gzJ;+atF!
suK%k!(u|60!m82LvcrLNNurrXgO0YZNwrQnrr?)3;JG8UH<um$2N|<g{{R30

diff --git a/django/contrib/auth/locale/pl/LC_MESSAGES/django.po b/django/contrib/auth/locale/pl/LC_MESSAGES/django.po
index 943897bfab7..3b907c3ca82 100644
--- a/django/contrib/auth/locale/pl/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/pl/LC_MESSAGES/django.po
@@ -1,78 +1,86 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+#   <angular.circle@gmail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Karol  <kfuks2@o2.pl>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Polish <>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Karol <kfuks2@o2.pl>\n"
+"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Dane osobowe"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Ważne daty"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupy"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Hasło zostało zmienione pomyślnie."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Zmień hasło: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "Nazwa użytkownika"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "Wymagane. 30 znaków lub mniej. Tylko litery, cyfry i znaki @/./+/-/_."
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "To pole może zawierać tylko litery, cyfry i znaki @/./+/-/_."
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "Hasło"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "Potwierdzenie hasła"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "Podaj powyższe hasło w celu weryfikacji."
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "Użytkownik o tej nazwie już istnieje."
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "Hasła się nie zgadzają."
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "Nazwa użytkownika"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "Wymagane. 30 znaków lub mniej. Tylko litery, cyfry i znaki @/./+/-/_."
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "To pole może zawierać tylko litery, cyfry i znaki @/./+/-/_."
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "Hasło"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "Potwierdzenie hasła"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "Podaj powyższe hasło w celu weryfikacji."
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -80,11 +88,7 @@ msgstr ""
 "Proszę wpisać poprawną nazwę użytkownika i hasło. Uwaga: wielkość liter ma "
 "znaczenie."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "To konto jest nieaktywne."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -92,11 +96,11 @@ msgstr ""
 "Twoja przeglądarka nie chce akceptować ciasteczek. Są one wymagane do "
 "zalogowania się."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "To konto jest nieaktywne."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -104,101 +108,125 @@ msgstr ""
 "Ten adres e-mail nie ma przypisanego konta. Jesteś pewien, że "
 "zarejestrowałeś się?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Hasło zresetowane dla %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"Użytkownik, którego konto powiązane jest z tym adresem e-mail nie może "
+"zresetować hasła."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-mail"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
-msgstr "Nowe hasło ponownie"
+msgstr "Nowe hasło (powtórz)"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Stare hasło"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Podane stare hasło jest niepoprawne. Proszę podać je jeszcze raz."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Stare hasło"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Hasło (powtórz)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "nazwa"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "nazwa kodowa"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "uprawnienie"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "uprawnienia"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grupa"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupy"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "użytkownik"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Wymagane. 30 znaków lub mniej. Tylko litery, cyfry i znaki @/./+/-/_."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "imię"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "nazwisko"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "adres e-mail"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "hasło"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Użyj '[algo]$[salt]$[hexdigest]' lub <a href=\"password/\">formularza zmiany "
-"hasła</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "w zespole"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Oznacza czy użytkownik może zalogować się do panelu admina."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktywny"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -206,11 +234,11 @@ msgstr ""
 "Oznacza czy użytkownika należy uważać za aktywnego. Odznacz to, zamiast "
 "usuwać konta."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "status administratora"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -218,42 +246,41 @@ msgstr ""
 "Oznacza, że ten użytkownik ma wszystkie uprawnienia bez jawnego "
 "przypisywania ich."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "ostatnio zalogowany"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "data przyłączenia"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Oprócz uprawnień przypisanych bezpośrednio użytkownikowi otrzyma on "
-"uprawnienia grup, do których należy."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "uprawnienia użytkownika"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "użytkownik"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "użytkownicy"
 
-#: models.py:406
-msgid "message"
-msgstr "wiadomość"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Wylogowany"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Wprowadź poprawny adres e-mail."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Reset hasła dla konta na stronie %(site_name)s"
diff --git a/django/contrib/auth/locale/pt/LC_MESSAGES/django.mo b/django/contrib/auth/locale/pt/LC_MESSAGES/django.mo
index eaa2b9260d9f63eec2b75a9608f15164df5f58ef..ab6f30462a42c71a7b3e020f1359602d2f9a075a 100644
GIT binary patch
delta 1309
zcmYk*Sx8h-9LMqhOs1vg)?%AAWs92Qy`x1rMG<XExsbF#8<S3D%go?hvm!9)A)*Cg
ziU<l6>Y)NL=BXmEm-0#Q-Gp9(45Ejkr=suAM(8mA^SN{8+_U`8nf{9R<-HRnS@(?+
zB9;<Qd}ceadIl9`Q<hmJ*5h1k$5!mYdK|$h`e&MD;~6Z&IM(4EEW~%1i({CN<G9GI
z*S=&LX7Khbekj5sT!hQ83g=@Z=HUsPgXi!NUdCNGhI_Fz$LuJ!<7ym6CbG}C8#RgM
z*+X@V`K^_Q?KBJ`W7v1(W51|0q0KfcfPB;rmLO}kHK_j8nf5y5V_T_6iZ!6dX+phs
z5H(%|m4ORb#Qb)J2fc7h4cLczaR4>Zb9}(D4B=Y7H!zA)oWT8f7dPW4Jc(tDu7zF0
zO1yzOs+U-dUs3b@#@-Sh{N%G7=i@xAN2R!#N~t@FO65h=kvu}?vNx#yAMi4cV<R3U
zU2WKp$MFX`*v3WB!mnck4iu7qrDl?btN0TSU>9l7&PR|Y8_hU@x`f}5xy;XY)UOD&
z;{~YxWyt0%h}vlw)qfjmz9!TL4i}Su#<C6?G;nvO!%fuA?`6IZq6U10oWxX7##Ac)
zVWp@n>AjVNQm;vu5Du}5_`fI<3w8dw-CF&0(HW~~rMh^!3o2Y-^AlRR79Av1^taXG
ztB7hsMaNn*^<=g<qgX>IBh#fmz|%THX=8I!>C_qP@6Ua+<%CPDAQlkHLWr1`ewfwg
zD{Q=wh<ACBm>1}Xc+q6)ZFXP!WX_~7^>p^1)QjAq4YfhHE*M%LaNTfdL(tvmy1A__
z!Tr&ToypF4EVz@m!hu>hG}X`D6bRLZ-HoZfywdFE?pQp~lzNs|ySw6y=Ox09)6>&a
z<8?)1$<9;JOEs~m=Ont~XQS<2(n&ZSXCtxGapydBcjR=`NqA0W?!L^oa3JBOKIR=s
k@5&$b6*Frj8R(o|JL`U3Fr0o|==jrHN?LrWdvkC91pvsG-v9sr

delta 1914
zcmaKsUuYav6o+rpZOmU|o7R|A?KN#pqS@?jvZ*wUwFMK6Em%^EVw%ED=4N+fXJ?(6
zO^sHU`r?CF3aik94~czfrHIm?pkgUq5u}2FqT+-4;ENAZ1Q9_L{LW@02;yPReD~g&
zd+s^EGrOPdSn4Z%zd81X!gk|#;$PG$H3?5{;D#;5l<J4eumfI)hv5%!4@_=U%ED)0
z16+l7!EfL&{H?a$&%<`+N%$h%51W-LsVfXxS@;}w!LMucUtlBizu;}K;TEOthMjOL
z+zq$DL$C!J*akiLBzysm!yE7*>>}7PXyGn+4R&$9`ia2=3-wJ(Jq0HrOX@8+124e?
zu!(fZMID6ld<x3J)9_Z9fm~{V8%3*AP~Lx~wtgBCN}Yq`q|U<_=c`K$B;b3HOMS>q
z0)GlcnN=tXd<Rio-K@=jg|aWk%W_~FJVyIEU@!9mo23<J;S~G;?uAXrGz-UJNiw|1
zpdY>qrKjIQS?{2%O|ToDh67L%_!w@6SK$tL14=7?hip}?G+J8O4MplSl-4~Bd*C9J
z0^e*$f7y7Eg+=%YoP-Zh?h$wj9*1AS1Wc2SROG-%;mgp6*CAr4y<~L~PQatE0!5iF
zzFb19?KLJKmwKoJ{Uzfg%;ZG_rSc4v4S6UncnONsuR>AabtwDJK{@yWl!`7xY1I|T
zrM~1Q&wqrX$j#ckk*XzbM~ML~Q=PbMTsQeS%2zHy<Yy`E5tF`(rSSUdNU8gw$Sc;3
zBS!TDlY+#gRic`-N|G7CMfKb9l2j=+gzv<qUvXUHV$v_M;Wbq6+qg^i+i_7vY!FXZ
zM{CN+mo9%H_u-<bSOOQ7)(u5^sz053Yb*D_5&RCk4^QH;l~n9ZUFng)FBU>I=@tAS
zGWke5CbG=)+Bl9Ixqe<pzK*h17i{3UVaQ6TJ(Dk*Ty9Yt7BYG34DgB@>SAaEeZtM<
zw8@3O&e(`S?q6Fo0jF3;qFOVzHLEj{fzH}Q$RWgV^MmEpjb}OteZmhM9oUdC<gqJU
zIo|Md-4nWZ+T=3+%+Bf1<RXx@&pB?!hS5x~_5(?xn(&y>*}%>}*i)#5O7!fT%bI+K
zTGoTl`++x>F#A@<8#mN7cs2}8raaMfc_bB24#!g?IyF3+O2?DwWU~42<MAoG;EDqA
zhf!%%4<%D;@1=AqIhr0W$D2Fr^IrL}=ArtredTM-(=CTMuV^y7Tv*xGvMPcX3x22w
zV5oInb|fG7kld|YsGRq8Whq=2t@6GNwPWYqyz8)IO?l6v;ee)OtBaAFbDuX3l}E;#
zt-S5&$Oe^V6qXHKwa!%|^_eJeXN#40s?YSCaSR<GC2jPx#cG!$o1e3T<v&}mmS@`9
zwgi@==Uh`g#AxeDBR*<N)tAuue_K(kw!+u{)d&&3n5!%Yu1|H^^Bs5Ioil6YlT*Ru
m%tBz|(kUw)8dOLBDO4ROn82?5(Z0W~5h>`I^~!rTz4kX97+m)N

diff --git a/django/contrib/auth/locale/pt/LC_MESSAGES/django.po b/django/contrib/auth/locale/pt/LC_MESSAGES/django.po
index d904572ce9e..f7eaadd2ea5 100644
--- a/django/contrib/auth/locale/pt/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/pt/LC_MESSAGES/django.po
@@ -1,78 +1,85 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Nuno Mariz <nmariz@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-11 10:43+0000\n"
-"Last-Translator: nmariz <nmariz@gmail.com>\n"
-"Language-Team: Portuguese <>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Nuno Mariz <nmariz@gmail.com>\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"language/pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Informação pessoal"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Permissões"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Datas importantes"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupos"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Palavra-passe modificada com sucesso."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Modificar a palavra-passe: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Já existe um utilizador com esse nome."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Os dois campos da palavra-passe não coincidem."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Utilizador"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Obrigatório. 30 carateres ou menos. Apenas letras, dígitos e @/./+/-/_."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Este valor apenas deverá conter letras, números e carateres @/./+/-/_."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Palavra-passe"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Confirmação da palavra-passe"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Introduza a palavra-passe como acima, para verificação."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Já existe um utilizador com esse nome."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Os dois campos da palavra-passe não coincidem."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -80,11 +87,7 @@ msgstr ""
 "Por favor introduza o utilizador e palavra-passe corretos. Note que ambos os "
 "casos diferenciam maiúsculas e minúsculas."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Esta conta não está activa."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -92,11 +95,11 @@ msgstr ""
 "Aparentemente que o seu browser não está configurado para aceitar cookies. "
 "Os cookies são necessários para poder entrar."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Esta conta não está activa."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -104,105 +107,127 @@ msgstr ""
 "Esse e-mail não tem nenhuma conta de utilizador associada. Tem a certeza que "
 "já se registou?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Palavra-passe reinicializada em %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-mail"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Nova palavra-passe"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Confirmação da nova palavra-passe"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Palavra-passe antiga"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "A sua palavra-passe antiga foi introduzida incorretamente. Por favor tente "
 "novamente."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Palavra-passe antiga"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Palavra-passe (novamente)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "nome"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "nome de código"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "permissão"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "permissões"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grupo"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupos"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "utilizador"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Obrigatório. 30 carateres ou menos. Apenas letras, números e carateres @/./"
 "+/-/_."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "primeiro nome"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "último nome"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "endereço de e-mail"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "palavra-passe"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Use '[algo]$[salt]$[hexdigest]' ou use o <a href=\"password/\">formulário de "
-"modificação da palavra-passe</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "status de equipa"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Define se o utilizador pode usar a administração do site."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "ativo"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -210,11 +235,11 @@ msgstr ""
 "Defina se este utilizador deva ser tratado como ativo. Não selecione em vez "
 "de remover as contas."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "Status de superuser"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -222,42 +247,41 @@ msgstr ""
 "Define se este utilizador tem todas as permissões sem explicitamente as "
 "atribuir."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "última entrada"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "data de registo"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Em adição às permissões definidas manualmente, este utilizador também terá "
-"todas as permissões atribuídas a cada grupo a que pertence."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "permissões do utilizador"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "utilizador"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "utilizadores"
 
-#: models.py:406
-msgid "message"
-msgstr "mensagem"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Saiu"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Introduza um endereço de e-mail válido."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.mo
index ecdeeaf76598eb7f66095ede498e22f9e819317f..82af11ca4b3086099bd7a000e0886cbca3ccc57b 100644
GIT binary patch
delta 1573
zcmYk*Piz!b9Ki86S}1f&x7`Xz6@3*KTFc_>RzNEUwoyx^ky>I*{F7#~^V*%r&a5-D
zq9$Z-Ui?QKQ4c1ds2n80WHla052jJ0;esX}If^mSXiSjA1pWSIr-?87_A_th{r&xB
zzTb7a*uGNeIi)C*)Z3|_TT0E~+|B$^>OD%0qld$o;5?qg2k<%?tgKUNJ-&zA@ifYu
zE11VWu@5ae^<zJ7Q>v}DWj7{q0}l@3AkN|)_!Mr&m+($}6LWY0H{nHm62HTTakN*d
z!?=vkU<Zph$mB<GAF{A|1s`F3b%qOm>MDQF;vZPW$2N9PbQ0zHyC@5v!2vvva-xgK
z;nX+C9@M4m{*TB{UEz-)sb5g$`3+^<HO#TTvS>+2Hldt+1ZBWP*0xawR#6su6h9$N
z^H`?+H@h0baVA;72XPwTz&c(=+1M1}+J#k=)OpyJfoHi8zd+_x-{Nif12R_qj<WDS
zDE%ysFF78@Em+1eJcJUV=d=4KFr@u9N=kZp5#-%DicS0|PyBasv6*8(fd^1>^A^tH
zd6bi1Lxca~<7n80Z0JiQy=nz{q`pRZNq<82s(wZ3cO4}HH?sTd3f+SZ7l^-vT604>
z7EvNFfpU_4C=*ZPRy>Nbq35!8oV8y=(y2}%nMq6b0j1Xx9eI9t+EVJCOnLv(muWXj
zBqTp&s(gx4WY_mnWfLRR5_N(qWxPweAtIV?T+${RmCZ|$!?CBd?8#h1zOJ_9S3)KE
zl+Ua}B}(b1CZUz6+)9;VQ#Dn-YbiUrsJn2KD(^y(dJ9$3D5;QgQ<v_4RktD&>f>Hq
z*Kxgbq32~QKig;qVeI&^cAeNn$;$c<b7PSgn?>JgnDNeH@2l3F=?-*iwV*{$CyIia
zM|XE^E-%ui)Ns6G+Hu{`M3JsJz8}PzYZJ4W(M?7j4?;KjdBalj@x~j;r+uI8t(5G^
zQu#h@+f(JeC40YZ_st(EEtnU)$P4_^L##2SD|R{UXWy^Ol_`6Fax%Boo@sf<>LzR$
zJrnq@*U$$d(=dK)CgRZXBX7yPcrbQaq35@vJwdpfe3jdgT+Qvy&pG~b%UNdLX1qAP
zkQDl#?wsg<-Lgta-@u_EmUJTRtwn{1{59~-PS-4XzPEaA^=zPBqa)+j9c>!A_`gs^
zy7PYik~Lb@wZM-Z>DP){s~?13uof}b(F{v24{qPm40s-z?!+Ot(>ar+p?YVeFlHr(
Hhui-F3Fqr_

delta 1872
zcmaLXTWB0r7{KwfO^mrTO`5jm;-#l)V~l2#-6p9TVn~A3#uSW;c#A<!vM0M!cXrpA
z*;etg)|V87B3)YWLE5wrrIdmgMSPLs`l3b%2udHcPhL<E#R|R%{=doOK@bl)`<rv-
z%(;BuOwRUv-dp~zt@gB{9H8DtU5hC-jjz=3LpfKgR3EP34*UXV@jBj*iJO$Ncm(Tk
z9dE~Pa0vg5`un)qLOX%4;siD-RaPH!v6YU`uoJ(I+P`5v?Z2@V>uy%+4s6F=cmQ|e
zVQfN!&FJEj_%a^EuW$xCne17#*n^*7C+n-9xOj+;Ee%RNh0{ovI*;>s87HxU?Xnj&
zgK|HGvhW;k!wmALj`G8y)p3;Z%TfPHWGeMGvL|%`Ygu1i=0YZX7x_~k@goy|iV~T1
zln8u_L|y$Fwf{hQu9m^FU^7-o-wsUDzR1Jd@fxP^7o5Uz!j#41Se70B%*CDfJ4#MF
zIF9tEP$qa9PvG-W`v$VMsw1Jd;&zmc#!)shit^k9%Da%lTd;_dx@D9DzSBbd<;EpC
zJiLlCIK*+~B`aeQ*HJb&$*l5@WN{kbKpDS=5{ZtsjhAr`K1O>PWkc6cLVg{YO8toP
zGXK>^{5iDRN=pWIp`2W!^!K8iYy@S2DU=k<pp2hIiNq5qCo(7txY&-bp*(jcYM+hT
zAELYqSIb<GvT(3GxLM?Llu&Uy{4D#T8@-W9+!9^igYsoa>7o*h@U*f)DI7LT!(Nol
z_EY7{k;s>ccv$xHyN}vKjZ-yMO7{lgw;WxDIhUyHrpoE03{Z!|tBuIX>EvI?-BgLF
zltHRQX|s^Z?(ox*+)CL)9ietm@1iECwX3G~tyuYCuTU!bYT7LpyujoGoi>4`o!2Iv
zb^@o6*FixCS*wfIa~<EO$JegOmrO4Ak~VZ?@;2Si5XaXg-+KC(lgnw7^9wp-11@s^
zdNkv)icQO`)-3MI>Wu6_XYHWRBFy3B2Ts+UU%gWIW~_3ee&KQ5J7;p4!u-BD-{b<w
z+85JK#`?j0uP%79X1KpGqqCk}dZ4?=rj8Z7^kDb+V%Fp{Y(47HO9jsz8#Lpq-`Cf~
z>RjvlCR6#L;k}V$JTVkcj_BmjXmU877)~S_XCIBH>`_M!9Dk6YjOzV~WH>G{tdsYR
z4ks&LHnw*?V)A)*J$58?B4?en%?&vDr9x$A)7~1#<SX|!^;i6+XIc)knUcvcQ!#jM
zDz&=SbTU?%Yd%C0O2vY&SjBMu%~X(vgDz=ssu!yl3c7mE-wb5+1M6!Oc+NtpdL_*>
z8~Jc8k?q$+#uAlMb;WZ?opBecms}lKuew6iWjKFPHp7{^(<bcIi%34$jDDdcVe<lK
z(Sd==`^{%|ES7l6c-pu5tkKrhJ^pHO+ghx0s&(m*{r^0b^nc|?Pv+Q{)n;SPFf}(?
R`(yPSh16KLvb*i|e*k66OyU3l

diff --git a/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.po
index 5f80406c4a0..8d18888c798 100644
--- a/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.po
@@ -1,80 +1,87 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Guilherme Gondim <semente+transifex@taurinus.org>, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Sandro  <sandrossv@hotmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Portuguese (Brazilian) <django-l10n-portuguese@googlegroups."
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Guilherme Gondim <semente+transifex@taurinus.org>\n"
+"Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
 "com>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Informações pessoais"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Permissões"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Datas importantes"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupos"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Senha modificada com sucesso."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Alterar senha: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Um usuário com este nome de usuário já existe."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Os dois campos de senha não combinam."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Usuário"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Obrigatório. 30 caracteres ou menos. Somente letras, dígitos e @/./+/-/_."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Este valor deve conter apenas letras, números e os caracteres @/./+/-/_."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Senha"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Confirmação de senha"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Informe a mesma senha digitada acima, para verificação."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Um usuário com este nome de usuário já existe."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Os dois campos de senha não combinam."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -82,11 +89,7 @@ msgstr ""
 "Por favor, entre com um usuário e senha corretos. Note que ambos os campos "
 "diferenciam maiúsculas e minúsculas."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Esta conta está inativa."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -94,11 +97,11 @@ msgstr ""
 "Seu navegador Web não parece estar com os cookies habilitados. Cookies são "
 "requeridos para acessar."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Esta conta está inativa."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -106,104 +109,129 @@ msgstr ""
 "Este endereço de e-mail não está associado com uma conta de usuário. Você "
 "tem certeza que está registrado?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Recuperar senha em %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"A conta de usuário associada a este endereço de e-mail não pode redefinir a "
+"senha."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-mail"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Nova senha"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Confirmação da nova senha"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Senha antiga"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "A senha antiga foi digitada incorretamente. Por favor, informe a senha "
 "novamente."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Senha antiga"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Senha (novamente)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "nome"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "apelido"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "permissão"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "permissões"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grupo"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupos"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "usuário"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Obrigatório. 30 caracteres ou menos. Letras, números e os caracteres @/./+/-/"
 "_"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "primeiro nome"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "último nome"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "endereço de e-mail"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "senha"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Use '[algo]$[salt]$[hexdigest]' ou <a href=\"password/\"> Altere a senha</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "membro da equipe"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Indica que usuário consegue acessar este site de administração."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "ativo"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -211,11 +239,11 @@ msgstr ""
 "Indica que o usuário será tratado como ativo. Ao invés de excluir contas de "
 "usuário, desmarque isso."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "status de superusuário"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -223,42 +251,41 @@ msgstr ""
 "Indica que este usuário tem todas as permissões sem atribuí-las "
 "explicitamente."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "último login"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "data de registro"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Em adição às permissões atribuídas manualmente, este usuário também terá "
-"todas as permissões dadas a cada grupo que participar."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "permissões do usuário"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "usuário"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "usuários"
 
-#: models.py:406
-msgid "message"
-msgstr "mensagem"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Sessão encerrada"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
-msgstr "Informe um endereço de email válido."
+msgstr "Informe um endereço de e-mail válido."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Redefinição de senha em %(site_name)s "
diff --git a/django/contrib/auth/locale/ro/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ro/LC_MESSAGES/django.mo
index 9fc1d26b5afc4780bae7232a3633289da2f2ef10..8caec47a09dd1aba636e95f5a1730d733ec7ee9e 100644
GIT binary patch
delta 1323
zcmYk*Ur19?9Ki82U7FLH|EF2H(&nF>_f8XaL{XU~CYewX7IB-mZKj*tO_x37OVC3E
zqvb;{QBXY;h%ktHh>BjK=)spDkX{18AgBm@tG>T+g%0<3KKI;z=bYa;_jB|8#`!Ph
z&ILsY5Zj4|4y6ubdp;GV*Qr!1_F)Bva0FA>hwsqDyiH0KU<7wy9J}xqy73LVa2ZQ*
z1#6X>S8Mi#eBR#7jZ!SdTCB%5tinMo#tXOwFXI`U!y~wiL+B|~>Kuk}H@-$XQmZ(C
z(uwqQl<GYFs}W8Pa$ynqhWddVYMn|tR7FZ{g%Xq*)FES5K9uL%?dx60q4rae6m<;c
zJHsgNoksbdfs%nKETw;Sl@od4rd+@@%8L(BI(mX1S(YX2p?!_7$WlDRF?^4s=;N!C
zIEON@RcyuYD9h_1ZL$=DC=)u1^ODL4m857ErJbfCTk0N`;bW9FeU9b$31voWC`<Dj
z!|39xvNtR|iEnMI=+#d<j5WA`hj7tN{$)fzsZ!`*`Uh|hW#%tXQuYct)CVg1QY$C}
z{DzXbUv_&PD{23=uU9g9xnGO&d_Bs*eYSxz^3Sts9~WdM!}g7k-HxFQ@H)ys?jS3X
zD~+}-wjPuXCz;$uNa|&<b%aJV5&sv-XpOADbS&$&QJU=&8L6z3>;)+@gFHe8B7>Hc
zN|E1I_Cp)dPDqhu>d2ibwar%W5t5OO(&y!D4<WN;a=En2ZzsP$`%N_vI<b?eCfG~4
z%~YAa>r6Y`gHzLSD`~`%-f<&oCNeJz(%FlJ-yE4oMSn6+T}$1ae!a^d*z48xV4&Nt
z_vpH7<b;3JoQ)=;@tD7#w}ReIJ&=1&@AU>cgL+RUUF@muH)2t9(tFBE7@>&i?~jKK
zD>{=|EY=2EBFW@*P}5SWR7cV>Vu|P_^GZj|Ols3se8LPR6WX*kK4HYdacz=%#t565
w71vr_$L&_oYsE8Pi^sA<B@KCQ8HG2xF%>i8bl=V{x(oBNP30|)%xJ}pf6J_#TmS$7

delta 1888
zcmaLXTWDNG7{KvKnxswIG`4A*##$ZI#F#dl?50W766*z<5L>iHq16~=+@0)BID5`=
zE{RuyEm%R2(xnexz^V^ER6z`aKIntwLGe})EPYU43l<f{N5%iQdr}a@A+x`k**P=c
zd~-JE_FU>;{&8#5Sw$JAUPt|^L8)ncb{!v-b4^MO;G5WqU*b{x32(z}vr-lpumvyR
zZoG*5@y~R8fG<1fXYo0_6Wf$pR-e+?#K0HWjo+vJ-*5x{zwjDtS+CUf*oE719Jk>S
z+=vF-v5d#?89apF;bH7%u}9HjAAW}2?5{4<m}H=_RjK1RjSQ)`a1PJoUD!&v#G($P
zd_RM-@hon}BJ!se`QXs%d6fC5((#v(rPM1(OzLfHVt;j>hAj9#@~1xLLl#~|$;<_m
z4E%s(UHy{w|3G=JiOI5IJHEvAb>c1b-{4`nvWqy2KjREektPpc#bt?bJ>d`FX3XKO
zC=o88+*ybx@C5Rwni-T-Z$r7Vp0q!K^4z_+1!qv+g#vEH6WE1kk=WIH9pqo`@*@U{
z_zlX-HO_G#z*DK0FhhSItM0^y@oo&!#}AQ5RWG|N;V9mL@1kVp3Q9(QN0w55qa2{4
zll)7>yUCNJwhyJh7v<#|Nyn#97CMslXHe!HLpjOgsS79@Bq#@aAsv4`?Z1N(=qD%v
zeZ5SBE32hN9$YK(bCd=6y7se_>ygr5r*=(^X?q{aFGI?;RFY8(P6C#~VQbg02PN1+
zsvK?yby=d3GD7X8_E9C(nkuEIPVKjxHq|Z~yi4i^s=R<whNz>pRz0=yrpv#Oy;OO}
zqzqH#)N6%zr>FKp-IR{ph+|Z_<D02jYST)t>2$;LR2U?cNKKb3K^Pl9)&&z=`o1=W
zf{R_?>p0MH$?A#?%Pxu-iFDcciSfLrv|*s=+rl7IT%?o8hI+|)o;F?-=%S5jc>j8|
z7_y5k$g0-lx0iHLBG4r}9I**&IDe>mq4{(tOD_dsL5DVC8RF=RRvv4)((sV(pEX`F
znCqR5j2A=6K3Q-@8^v?|ItV3*TEG)VmqI&#dru`@YPjcMzGVC&XIWc(J_ySb!{*@1
zp$+RATFN$xOtCuI`oUN(lii=mjp^L}1G&*mb~Kx9J9>X+#x6R^K;|B@bU=?}bM<*S
zof~CdHPhC$zF>UcS+Dv?+i=UoeSvQeR=;hV-E@SF6I0}=FjyJbs2fRrQb|ImWG(I1
zF2Je>lZxlc){jk?X3izP^EjFDg1k(wr+-kJJcrgv>^%3hiJ7oybR~3UM|Ndi{mN=j
z+p7=HJDXoU878|NsVDOV=j*%)t)6E&G84vjsCvBp%nlO<-s;JE{!L7)V&x7lx3@Ny
zCj&2t+~=>k|GkXJBzpep%>TL%$$#RRF!6N3>L_1w<tHQ-&LP`dSG$~FJN7m-b2(<A
Jx^v5m{{TJCO{4$-

diff --git a/django/contrib/auth/locale/ro/LC_MESSAGES/django.po b/django/contrib/auth/locale/ro/LC_MESSAGES/django.po
index 4c2d71c7716..bda1ca1f2f1 100644
--- a/django/contrib/auth/locale/ro/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ro/LC_MESSAGES/django.po
@@ -1,80 +1,88 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Daniel Ursache-Dogariu <contact@danniel.net>, 2011.
+# Denis Darii <sinednx@gmail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-11 14:14+0000\n"
-"Last-Translator: danniel <contact@danniel.net>\n"
-"Language-Team: Romanian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Daniel Ursache-Dogariu <contact@danniel.net>\n"
+"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"ro/)\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1))\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Informații personale"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Permisiuni"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Date importante"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupuri"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Parolă schimbată cu succes."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Schimbă parola: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Un utilizator cu acest nume de utilizator există deja."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Cele două câmpuri pentru parole nu coincid."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Nume utilizator"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Obligatoriu. 30 de caractere sau mai puține. Numai litere, cifre și @/./+/-/"
 "_."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Această valoare poate conține numai litere, cifre şi @/./+/-/_."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Parolă"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Confirmare parolă"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Introduceți aceeași parolă, pentru verificare."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Un utilizator cu acest nume de utilizator există deja."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Cele două câmpuri pentru parole nu coincid."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -82,11 +90,7 @@ msgstr ""
 "Introduceți un nume de utilizator și o parolă corectă. Ambele câmpuri sunt "
 "sensibile la majuscule."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Acest cont este inactiv."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -94,11 +98,11 @@ msgstr ""
 "Navigatorul dumneavoastră nu pare să aibă activat suportul pentru cookies. "
 "Acesta este necesar pentru autentificare."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Acest cont este inactiv."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -106,105 +110,127 @@ msgstr ""
 "Adresa de e-mail nu are asociat un cont de utilizator. Sigur v-ați "
 "înregistrat?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Parolă resetată pe %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-mail"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Parolă nouă"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Confirmarea parolă nouă"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Parolă veche"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Parola veche a fost introdusă greșit. Introduceți-o din nou."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Parolă veche"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Parolă (din nou)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "nume"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "nume de cod"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "permisiune"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "permisiuni"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grup"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupuri"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "nume utilizator"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Obligatoriu. 30 de caractere sau mai puține. Numai litere, numere și @/./+/-/"
 "_."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "Prenume"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "Nume"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "adresă email"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "parolă"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Folosiți '[algo]$[salt]$[hexdigest]' sau folosiți <a href=\"password/"
-"\">formularul de schimbare a parolei</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "stare autorizare"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "Marchează dacă utilizatorul se poate autentifica în acest site de "
 "administrare."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "activ"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -212,11 +238,11 @@ msgstr ""
 "Marchează dacă acest utilizator trebuie tratat ca activ sau nu. Deselectați "
 "în loc de a șterge conturi."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "stare superutilizator"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -224,42 +250,41 @@ msgstr ""
 "Marchează daca acest utilizator are toate permisiunile,  fără a le mai "
 "selecta explicit."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "ultima autentificare"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "data înscrierii"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Suplimentar permisiunilor alocate manual, acest utilizator va primi toate "
-"permisiunile alocate fiecărui grup din care face parte."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "permisiuni utilizator"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "utilizator"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "utilizatori"
 
-#: models.py:406
-msgid "message"
-msgstr "mesaj"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Deautentificat"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Introduceți o adresă de e-mail validă."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo
index a9c7b50ccfe32cc0267c2509c5040cd9c40c3583..54926d5de17738ed2a94690d3c2400ae9ce2d5ba 100644
GIT binary patch
delta 2732
zcmZXUYitx%7=}*)xwI&yQfR%v0YqEf?rw_+6uei7QByG{-X+6!+Fjl5G&{3YjAmOZ
z-ij6&H71G%6XQKuC<~>wOB!P|#)LB(f0!6GCK@#{CSHE%FQ0EZ1&k+q=9xKj&iB3N
z{m$%HZQ~n?-_*@{LD4qRFQETfrBo;UY&I9#{Iis5h6~`ia4ozIZh;%&OVEa&!?|z+
zmkZ(5a4ozaE`s}DH9QCx!uMdKQblz<8u$Xv=f!uh7XA#E!+&5sY@Dam3YdU3uoIpQ
z?}c~5415tz!5iRR1iKl&3h#rz!0m9$0;Sf#cVH*^mEi^@N+a(^*bYU=AiN(w1FwZY
zLA0n#$<7kh3T57=h#iohx|Pd0@NUQwm4=w3Tqx^z!Z~n2-jiSLmK(SiO5m5H32#72
z@J{r86!KFQE)w8VC{~_?;@H>G_^;9P?@-pyW|9b42pLj!@Gr`|92TXPOOU%7+E4^N
z4WEJwDBL*Q4`c9FvTTKqz-{m|D5Z%lR_c6s9b5(<fS1D^P@H`il1qIA<&1p}FN41=
zCfz06oL`5n@Omgt<X{Wj2@k_J;Yt+W!wIbL{OA&;CgCQsAA^6xlkm_|r8dJsR2+a6
zcm=$#ftb*TE8r|tIdD}Y+kK3i{S2@fReRnvSHhJ%w?SEOM??>b6VF4b<rI{ieG>7@
zX#9I9@qUKl%s&uQ)lwd0-5MzCVnuFb#~UMdK&e?Ll*D(z1bi4GUcCjSR8!IWAENQI
z@ReJ&9AcEhAayZa?8cO^NkXx`jV@oee9lEtc@bUgmqXP|mmNwIrJLxIkdmEh;*2yA
z#>T=@$@6+Tj;nR_R{BP|e4_1i`IO^yIp8x5!Nu^P%nS&V^d`EvvVndfUB1^dn>ZvV
zS<VheBXkCYe>jVv)LfdTi;L1$O+)eb5H=}Cqx?0^iU#BpsUJNsXHV6ln|k}4yl3S+
z-DP>U>rc*oy{5^{c=ooO)oVBV+vXLDR=@7ET({rJce&ci+dAiX+Vz~g-4)ZWqrJ4v
zV8&%!_gg!)=V;fq8D^;9+WAY|Q|n`Td%@E?oq|qTIh{&dxgMElpPImeOs+?7wsbmg
zcVD@R#Pwn3#Hy>pfZa~McXPtJ$`9uK)zp)B3VrVBOnSSWb#gt7IB|V#m|XW~vRQxk
z+%=1xZjGV@Vs*GK?oZ8czQvxNWu;P10T<Y(lgeO47Yn`gbZEP!*UDtI)zy`^U00-w
z1Kiu*f5iJg&hPf$Snz(GmF;ozEbmpRw4Hj$E%f?ZtFK(0w%oMB+q~svoSdt&mh0)P
z)04?f-(tD{c6HNiE9?0ut2=6N{2|?KrLfwstGQ`iTT60nOY7x2nQU)e*OFYHOjh64
z*>bzRBjXaUr32aRx-Hon&P#64t!?ee_5R+PWoyk|^MNUw@nDeaac%aQN-$u?cpNul
zW>Rl<3%U3XC)0IJk8Cxba(ex#n#LQO(w^7Xo=Eif_s6}wm2)%Q_QUa<?Irs1&VzQ!
za}#}ut_LZjlgM%{SUq+kUr01p-x58w>wLlgy5`=|j)l+7_P<@Ubo9g8s;Z`g<`4oZ
z!JsxLOi6Cd2f>IolcuECoOuBMSo~Y@wV4@aOlFjIu$vVnGZ~BoyMjSkcUTi_7aJT1
zhGE4_Fvix7m~u=~RDx%xhl8OoM6gTVSIjXp!SyIn(ZY-|9SqGZB=#OzyJSY+9vwv)
zH5GsBISs{;xHbn&g;2q;jv|$bQr4uF&}9OT&BQq!CUhQA?0Jtl77Ve2Gf(`?ftPIP
z4IW3_fSCw}<lx7Zc@^_Uh(G#EUCXQ*pFIyD^F%Q0@2jn^KfzpTia$rfq8}9n$Zed1
z+SmNf+J@pG7T}DSFeWOe6&{w;!G=R`51Ud<ycj3WG4UF=hvhX+%h*u@ROBd?4Q?ce
zu}_=P87ZcW%;zz(6q+B__H?cNWc@{F?<EX@NHH18!%fZOAR;Qk6X+U4M@2$NZth5<
zi4m3n)jIkrd4GhNWmzXxm-BJD6s!nOngkw}VE-!yLf@xkCGFo+e{ghQ>GG=9626g5
zeB{l9LT5!(hJvJIm`lkBIYg!jQ}SO~HnNOE`E2l%3fGjGTAJR4e`!O^&osp55`(q=
b{)Ue)khkU#8J=XH$ECm}jxNVG7*PKLAF4yG

delta 2008
zcmaKsU2GIp6vuB%DRfKGwzQ=naK%D_cFQi551UHBfQVqkiXX95GumOhWOugi?1Dyd
zOG|=E0mH-xV?=})A4o`PMM^)G1bNV?$(@*Jd;nwg!6!8;CK^rro#~cGPxsF6e$74S
z{O_5LZTxmk?q*fVTMAoGyNmWkky1P0D>HatXG)Y>3Ezj+@N>8ueh2S`k(o-_a6c@C
z1}=i%z_svJVSXixcQB5?LvS+;DV0-sI&+x#4A#T13*%qmY{vh>J7MW8r53|FSOeF?
zd2kmjhZd}WN%$mu8E%7L!JV+4!}dZOE`!%#J^s~CbRJ-$xJ;?1;10-?It#ntdAJ3Z
z5iYT)olw?0pg8V?b72hfQwMmEv^orB|Ixzy3CL0EZAeV&94x`VI!{Lq9D@AR6&`Z%
zbtuXhC<@$wsIGo4jDLsnUJ0AUVFmnv>#K%xMOS$F9vDIv@zVldgBRc!+(6X1W;(yo
zc@!?;f}VvhKymCtk@_b568-@f!fQlRC-bls{t4yknkuK>+XkhUI$#q_!AAHFjKWVK
zv8!8^#1*Eas+1ZAEiezihm-IO6?Yjv!$r5lTB4CceGEGA4R{3p1((2AYjFloLn*Sk
zL`iIF5X$<y1x`Xq{6-zR$Q^~|Peoo?;9@A5HbJ@D?U0z%6HxZYp(xY~C6hx1z6QmS
z2Uo)p$WQ&iL$2Z<DC-)zWPWpw4p$b)DUnW_WJyxNCnr*_EG&qOVj^R4(3_H2z6`Mi
zG}H|WOlm?*0$)T6Y5_{-^5r0s%5kNEt>M`~lTSmgMAO8UP9gY~3*A5&$zC#%0u*bZ
zNiB#`UqPkIzmQclQA|t}p*C+Dxi1goU0#^F8?K{?G%IKknpC_RnK^T?Xz%uPD%<O-
z9m(EQI%7E*-EC!T#*VhSyW^R7%F&sW&h*&2*G?znuFH(8la`aU5{Z|z#YD`pyPMe(
zcXiga)B0dMk<eDcO?htFvg(*P&^`8QmowNBcUrtNrDwf|XJx(jX0P%FW`F8kC~NSR
zhMsHGjh$8^mg;Kgbge`N^w=+U$78me>1x!ev>Y#?c)RD-%zwVea$-b91P4>;ZoMy+
zPPVVMHhH<wu(!3m-FvgVrZj20t`+mnm9Owj`TgGFIS=Nd;mF!>be)c_ZHu;sBdw80
zX!j%G4*Nh{QVVY-{WiTO5)Jl6T6J_|TWho_f`xWjZYI1ZZ8>hj%B0e5`XS44NU42)
zz|9Fe-fbsZ;?BO*CN?{<tQE7vdu%J&raQ7IWjVUIeUrDfqI1sla+^+PM^0CqoRRbV
zK7YVmHCO#(%A7Jo=3_JIA2XM<`N$0U{lTpC^X4Lp!)DxEGLvRhHjHWB>I-Iv%tZ6l
zXw*N<u6(dd4w}$rSX}r=Id{N6(X9RBe!t24{p>e+@5id@ZG%DAj0d|$Wo4LC@NoNh
zZAPZ!#1D?g<OEvZl#9HX^h|ACQOn4d${9t~r&u}6Uq8W35)5H`skt??G@~KC%u7`L
zGID6%x?-=t?mn+;{)ZcIM=(S%Xf7ki72dq`zh!{}<7SkSsBJwWVVDVjKx7*CPiodK
zn~6YyKr5NLikN+Yhm%q+!}UvxyvG+D_x@hcRE6_Ae;57Nr?vGO7KXj27heAlc{tsv

diff --git a/django/contrib/auth/locale/ru/LC_MESSAGES/django.po b/django/contrib/auth/locale/ru/LC_MESSAGES/django.po
index 915f81d754f..ee58be1b223 100644
--- a/django/contrib/auth/locale/ru/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ru/LC_MESSAGES/django.po
@@ -1,80 +1,91 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Eugene MechanisM <contact@mechanism.name>, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Алексей Борискин <sun.void@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Russian <>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Алексей Борискин <sun.void@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Персональная информация"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Права"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Важные даты"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Группы"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Пароль успешно изменен."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Изменение пароля: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Пользователь с таким именем уже существует."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Два поля с паролями не совпадают."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Обязательное поле. Введите 30 символов или менее. Используйте только буквы, "
 "цифры и знаки из набора @/./+/-/_."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Значение должно состоять только из букв, цифр и знаков @/./+/-/_."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Пароль"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Подтверждение пароля"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Введите тот же пароль, что и выше, для подтверждения."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Пользователь с таким именем уже существует."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Пароли не хранятся в открытом виде, поэтому нет возможности увидеть пароль "
+"этого пользователя. Но вы можете изменить пароль используя <a href="
+"\"password/\">эту форму</a>."
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Два поля с паролями не совпадают."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -82,21 +93,17 @@ msgstr ""
 "Пожалуйста, введите верные имя пользователя и пароль. Помните, оба поля "
 "чувствительны к регистру."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Эта учетная запись отключена."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "У вашего браузера не включены cookies. Cookies необходимы для входа."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Адрес электронной почты"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Эта учетная запись отключена."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -104,104 +111,128 @@ msgstr ""
 "Этот адрес электронной почты не связан ни с одной учетной записью. Вы "
 "уверены, что зарегистрированы?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Восстановление пароля на %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"Аккаунт пользователя ассоциированного с этим e-mail адресом не может "
+"сбрасывать пароль."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Адрес электронной почты"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Новый пароль"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Подтверждение нового пароля"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Старый пароль"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Ваш старый пароль введен неправильно. Пожалуйста, введите его снова."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Старый пароль"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Пароль (еще раз)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "алгоритм"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "итерации"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "соль"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "хэш"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "рабочий фактор"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "контрольная сумма"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "имя"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "кодовое название"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "право"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "права"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "группа"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "группы"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "имя пользователя"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Обязательное поле. Введите 30 символов или менее. Используйте только буквы, "
 "цифры и знаки из набора @/./+/-/_"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "имя"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "фамилия"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "адрес электронной почты"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "пароль"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Используйте '[algo]$[salt]$[hexdigest]' или <a href=\"password/\">форму для "
-"изменения пароля</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "статус персонала"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "Отметьте, если пользователь может входить в административную часть сайта."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "активный"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -209,52 +240,53 @@ msgstr ""
 "Отметьте, если пользователь должен считаться активным. Уберите эту отметку "
 "вместо удаления аккаунта."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "статус суперпользователя"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "Указывает, что пользователь имеет все права без явного их назначения."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "последний вход"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "дата регистрации"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"В добавление к правам, присвоенным вручную, этот пользователь получит все "
-"права групп, к которым он принадлежит."
+"Группы, к которым принадлежит пользователь. Пользователь будет иметь все "
+"права, указанные в каждой его/её группе."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "права пользователя"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "пользователь"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "пользователи"
 
-#: models.py:406
-msgid "message"
-msgstr "сообщение"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Не авторизован"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Введите правильный адрес электронной почты."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Сброс пароля на %(site_name)s"
diff --git a/django/contrib/auth/locale/sk/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sk/LC_MESSAGES/django.mo
index aa4ea3768c57ceddd94fd89356db6adef4931103..4214d4b4e77afc0c34e9a3404ea5c1c172056f12 100644
GIT binary patch
delta 1574
zcmYk*UuYaf9Ki8e8~Z1hKfSAM+S=;WHYPD%cJI<!J*y^AQ>s^cR7I#tSnoEuZF0Nk
z?OslO2`KuaU}X{OlciYt5Fx_#K`7CdQc?6lP$<4MZz_V=JSe_Y{QmZ~;IK2Fo!y<8
z{rzV5)1eOr7jI;`K2(%(>MrU<L#ZQJTt`Exb}2Q2E^fgHOLzev!GF-f{GCdz$1}Ja
zKS7yu1^aOgyV2mG9_+y#N-e4#$%S#;$c+iyj7RYvJc(QJb-Wkf#}qDOFJ8hI@LPNm
z_iRw=X`IEEu#JPbnaPjiL&(DF9h_o)b(Rwj^()QGcoQe_nN6LDPNUra2xZ~3*oU8?
zM05!WPJNBMgZe(X{v&dz8#E+I{f08nA1LGg#uV!-gPx?M7bWtYC<8{5zJ)Sy5@n&M
zaG7l?;bZh=a2g)RlUPE@#8T2<LwT_x>ADY}#r?Q|i?XLnoJeF}C4Pt7>0d|2s+%Ya
z-$D+xj_@UgX_OZpMVa^z%0kn~p=M}oY~o?Ojz!$X2jQdJPyX-c<Yz8ChcesU@I1;M
zzKYv$1yA5lIE6!mD;e=nUZ{l<$lJ)FKBkcuUqZHDeUW$>Wxj8a<f+v(`Il7x&IO6^
zPn1mjm1tx-1A1{M*Y}|;_yo#Vek{2^hZ6Cd$j-zi`GMl|VOq9Z?TdR#J&-8hUp(+Z
zluQg!b5!{irARtWDuKr@ki}7|l#vc`CP-i$kz{XxDnUq*;CQFFj3wSi{;owylSCxZ
z$ZwXX5`6rtN$Mmk@-0ZQsG2JOwUoUb;=SL)xukZGdKXo`57`nacXa5qle!r=4c&6X
zst&8|<*ql3{-d?J-w16l)D=5)f@o#^xzuprhR(ES*PM~|^oDnhqSF~@m&<;WC+#5c
z%Px;sZqMZg+R4^zcV63-O2Y{PUA8^X4>jjb$YPGJGpgk`D$y?+XQK0){*9KpKR=Mq
zTI1Q=er;KW+<~lh(6YKq$FnD#1vhYgFMF6Z3OaA);^(Y~buM494o0U_1G|se4cGSc
zq{njlP%Z9F*wPyd=AtX9?Nh_mFsv6$v(;*ig$>&a+!^P!G0zFjdc!~El*7QRo0U_x
zH|v}8v`u@~F@rgCq`R2(3Yw`_Q!loU^sE`tMBmovhrahRbru}_Uy1_Vw)@W+Mk%`7
zJMgFu>P+rkUD1IK{buMViSZZwCdnZmP3<|gs~4|*>1h8I&tGt_o!3<-nD-+i?MH8I
O$+TC~+l=T|=E8rou<gYF

delta 1859
zcmaLXUu+ab9Ki9pwv?7aDgP|RKMa*xQQF?M1rZCW31YB~G!^5YiaPC0@3!6Bz3lE4
zT9u2wXksAM3lF||h>3=f7;8*0u@4?iG-xCt(f9}P#lH{6Xm}*?`#Y8g6XWD&KRdI#
zGr#%G?!DG=y0iGh+Pag9vXgoX_49;M2k`k?4wN_Rl-h=6T!$BM1h3$|m|Uim#VM@E
zi+C%3jeU4E?%&46)wGlN0uJH|rHX2ila+LQhHdy&-2M|AXkWt?tY5CwZP<z%a3`+E
zVQfN!t1yR;;dA%^Ucw=4W3Z>tVh4VLZOpHJ<zzn{HH}I=jt7t~bqWvT8N44G371&Z
z5X$vYl!?c%88gUF&2V7R>P3|MUyl1vAVaA)keJk4SjYV83@0++d&p0n;~)c{N6E}Z
zlnh)(vabG!+kc}xSI5mV;VPVE`_|ze+Q)f#4PL+}@iIzAc9AA&AH$+V_zfrR_#^gX
zEz6MzccJY0AkN_-l)%1>{SG(M{skpa+2Cp*$WUq>%9d_HS-^cLTQ`g{@Azu+&$G&*
z!{AZehu`8bZssW;UAzOo$D6U1Wev%7ls%osoA6T{#VfcUd)Hpi&@4(oFQF`G9=S!G
zUQ7NZ@(<~d6<1;}pbU5k$+G%A?!St%1=mnkTEl3Pk%rjyD9>r!g!iCKJc{yFJR4s>
zhO+RJMNZf<)k>8V-6--oN~*YA{Vcb|7dm58SQDS$jq+tkkx6A`vKR?a3b9rvza3>U
z+o|&9NT5YBT`j#Fw^BQ(T~tk#BJYKizUx$vvIUa0%~W{-rF2u}-H{?ImN#AgLhho<
zUQ6krO15qk-i`KZ8f0&!Y@zO;%1d=8HA$^oFm>~Z;)8)-$cO4cF7F4C@gkizk)`cv
zlTJI4<9j;tb(FO_Z-bl@hV+CwXS{-O-C1qu$aprrom-qx7eX88BaZ88<A%P@*oYJN
zUyo)2X0d4*)tZS7S)Gvxbk_ESOu`tB*Zq3^sfDxkuO>>bG>jk8onyw$_=mTSg~p8_
zYmcU#j18m1o!Sp%&T4!EMrQ*%xu-o(P)GbA-P68zB5S-1p~pRX(hqV2J!bF1PYtz+
z`kW0zlPUe&`2LPmSF*1wwL_=+cBlHglKsi#ijjj|qjtuT1$XTuDZ6!VGF81V*{@T(
zcK4@BU#w`|^pNp9q8^y4I_O#_ZQX9ioAgVGrj7Lj5Br|oTY9ExY~?Vq6ikMJ!s&%`
zO@Aedk4zWxjyJ3JRX%X-(xMYp-qq<!IV$94)xqh&=5$avf84Wr&ZLc3`FJ9$^FgIN
zqsI$r%O)(nt@D0iX|Zy4h5*kmYBQy0mdZAop1ppf0Vi}TACZVDj+Uuq%1Sx6UC*@Y
z>BtYN!-htCW+GcDr{_#}X>rwwWuDO;;lk6+rxK+{TXIi0k^SF|Fs>c<^?&Vw<h<Zk
n$^kRzxt#S1Y<B1x*@td5QkrkxuyCoRHL*ObuFaHwTl3C8L6%S>

diff --git a/django/contrib/auth/locale/sk/LC_MESSAGES/django.po b/django/contrib/auth/locale/sk/LC_MESSAGES/django.po
index 4e289b19161..3b6f3600a45 100644
--- a/django/contrib/auth/locale/sk/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/sk/LC_MESSAGES/django.po
@@ -1,77 +1,84 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Marian Andre <marian@andre.sk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Slovak <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Marian Andre <marian@andre.sk>\n"
+"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"sk/)\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Osobné údaje"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Práva"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Dôležité dátumy"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Skupiny"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Heslo úspešne zmenené."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Zmeniť heslo: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "Používateľské meno"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "Povinné. 30 znakov alebo menej. Iba písmená, čísla a @/./+/-/_."
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "Táto hodnota môže obsahovať len písmená, číslice a znaky @/./+/-/_."
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "Heslo"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "Potvrdenie hesla"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "Kvôli overeniu zadajte rovnaké heslo ako vyššie."
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "Používateľ s takým používateľským menom už existuje."
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "Heslo a jeho potvrdenie sa nezhodujú."
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "Používateľské meno"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "Povinné. 30 znakov alebo menej. Iba písmená, čísla a @/./+/-/_."
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "Táto hodnota môže obsahovať len písmená, číslice a znaky @/./+/-/_."
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "Heslo"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "Potvrdenie hesla"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "Kvôli overeniu zadajte rovnaké heslo ako vyššie."
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -79,22 +86,18 @@ msgstr ""
 "Prosím, zadajte správne používateľské meno a heslo. Rešpektujte malé a veľké "
 "písmená."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Tento účet je neaktívny."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 "Váš prehliadač nemá povolené cookies. Cookies sú potrebné pre prihlásenie."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Tento účet je neaktívny."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -102,113 +105,136 @@ msgstr ""
 "Táto e-mail adresa nemá priradený žiadny používateľský účet. Ste si istý, že "
 "ste sa zaregistrovali?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Obnovenie hesla na %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"Používateľský účet spojený s touto e-mailovou adresu nemôže obnoviť heslo."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-mail"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Nové heslo"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Potvrdenie nového hesla"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Staré heslo"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Nezadali ste správne svoje staré heslo. Napíšte ho znovu, prosím."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Staré heslo"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Heslo (znova)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "meno"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "kódové meno"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "oprávnenie"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "oprávnenia"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "skupina"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "skupiny"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "používateľské meno"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Povinné. 30 znakov alebo menej. Len písmená, číslice a znaky @/./+/-/_."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "krstné meno"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "priezvisko"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-mailová adresa"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "heslo"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Použite '[algo]$[salt]$[hexdigest]' alebo <a href=\"password/\">formulár na "
-"zmenu hesla</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "postavenie zamestnanca"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Určuje, či sa používateľ môže prihlásiť do správy stránok."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktívny"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 "Určuje, či je účet aktívny. Odškrtnite, ak chcete vypnúť používateľský účet."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "status superpoužívateľa"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -216,42 +242,41 @@ msgstr ""
 "Určuje, či používateľ získava automaticky všetky práva aj bez priameho "
 "priradenia."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "naposledy prihlásený"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "dátum registrácie"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Okrem ručne zadaných práv bude mať používateľ aj všetky práva prislúchajúce "
-"skupinám, v ktorých sa nachádza."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "používateľské oprávnenia"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "používateľ"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "používatelia"
 
-#: models.py:406
-msgid "message"
-msgstr "správa"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Odhlásený"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Zadajte platnú e-mailovú adresu."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Obnovenie hesla pre %(site_name)s "
diff --git a/django/contrib/auth/locale/sl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sl/LC_MESSAGES/django.mo
index d961b39679615e5e77be4484e6d4ac522682f576..bf17013714e0b9fbb82cf586b5d0de982ea100c5 100644
GIT binary patch
delta 2441
zcmY+EZHQD=7{`xkzU*47yP0og$Cu4r-FaD8)7G~nODs#XqC&;a%$%LMGk5Np?!7ac
z3${i1p=iOn6hRbdNEAvRB%%*Rh6P1rFW(|eill@<qP`SSzh`z_?Qoy-yZ7AloaZ_J
z^W6K)^1~}f&vs6ENzvA0H(-BEQfepsVlo|V`qfJH!Wpm&4!~V-8@v_10xkRoPKE2}
zZiJiR0Ne*V;0v$~9)UCAaX4S8QT2Xn;9EGI7w6zC_$yol|AKSi{Ao(v1T(N5?u6IC
zJ@6su!I$AFcn5r##qNf$!@ckV%)xCll<J0W!=1!eUvWbwN|WB5a1cr&Pr-fgIk*M>
z0?9?KAUZCpAIiM-EpCNe>K?jl;Uf?iRf344A}Ia`;1u|zyeGaoBscIdl!aeyO*jT6
zz}v0&Cn1;mkWLo(9Ey}@peXizYy7v?^Y2jnCo@SBm<btDo$ynRc@Z4#XW(aa?1Xbk
zdpBGGx59(az>lE>SjIulgKOaJ@Lniq`y!nreiX_^j>GHWdr$&?2_=E=AeTBvw-jFN
zKz|vyj@46e8I%QfLt?6ZP!jOrQTQd4vwm#$I6s3$o)?q-qwraH9lQWH!GGZrxQWWW
z2O7u{>K*t9{HP24rHU8eMct?epzLHXWR4nYJ&!<1=ou(Qmq7VIjzIA{*5U~$0p5io
z{ijg;&a~d2h2nP}iXs<Axse@TZ1Ha>fu~aP5@-PwDSMzKwi(Wa+o1$9Q2ay4X4OH+
z(Kc1M8OkRu{?a&ZwGvx}NfHugR2Er=t-z$Hda*uCnpCU&7nWiuJ<%4o?lN!zCPyc2
zEhfpW!KAK4S=q!OCZBQ|lTBP|3+4M?ed(#iEbPH#SL-nOnRH`UHj!2eYdI#nmZFq4
zfJr^wA`di;$v;Dy)PXcPE@^Ts^JVr`&ByWcm~-;ADbG*p*j}x<Fg8J~3nsQv^1;-j
z?LCnf+x>y5+TLXUwECzS)-@AF!!9gD+JsgIF4j@(LR;w5k<)R>GU!E&>tS<1$4*Dq
zGR#mtvf=V*!oN@F>ajlH>N;-%oiCZ7C=>0(1RT7es5cm03hmIwB?O++jGS4rskz{g
z3#%J4W>fO@v_E@_p{v)T%aL@>`YtFk;?jCcGq@i1d_OrfwR^T3(qxn&S>5zYC#R<O
z?y%#tOg``GsK7p5-b0E4j&W&xX`8AV&)23<2yGNe>Y@PmHvV7o$@%F+$*~zHI*ng+
zA?{U`FWG!0s#lZy+BPmNnW&`DHZ-y4f=Kx$inZ^GUNC-(<jGrYJ(G<eCuiEWwxf7O
z51BktC!Ouv*Q`oq2U7j3bv8TLzb2Jko6WZE+L_vI8(zeEsjZ|vs8?nCoAa{kbpNWs
z?AqjT``mdWwjAgU(%)9`ayG1aHIsH>F*((~@Xnr69M=Xjnc?B#bR3!>@`mi=>A=RB
zTIk9)A4i#5rcmarT*jxbo1)D`ex|o=N9$=&M}G2S`<|0`&765v$1Yd3)m-37N!6=f
z^3%0Xr?%P1cRDb-`-<v{blK{h$BUW^(84tQvJG51d7|UssCXC(Ne5O(CDJO_%eL%v
zgF_Deve)pm%lTf#>(e8Kl4Dwxl8mixcm*4Ky4YMGwnd}s6uBXzis{q7DOCt)n(wL9
zT4<{_;8Zka>Z<Pa7(q6eC6^0uqW)wlmkZ5E-ZV?_zFF&&)w6yWy}wegd4cWI6;2@Z
zO8WE|I?3kZD`KbhgO}3Kwa_cLoTnS?uNInym&d#28g|66j}gWVNk+|eU0R72UP}v9
zsG8WM)x>H8WFFh9wyB!?<VYNNRfI<FhT~>jl?j2pmM}^8?2+W3*>B$1Dpgxm2+^=%
z**1*NIW-~|o8*nojq{2udV0)W8XGU*yjM=ncFs#Cb?L6aRQz)N^q9=xpAfhxPIOnH
QYsgfnTv2RX;f7WJ0fEK<#{d8T

delta 1915
zcmaLWUu+ab9Ki7@wxxfewB<kIP$>n<wRf}-t(AZxh=A5YP*X6Oa?`s#_IA(Ry&_d|
zG59ATVn{YTG%=AszL-Wd_Q?l*Fg&Q3*u+F0jPjxhPmPIDLyU>v-*t&E#>vfnW@hLA
zZ}(#F>phj9+G{T<(oXU^@;5a~9l%%b<BxQ?R;ev`1v~I2j^J&47}Ir1Su9{Z&f)!d
z3kUG`q<sqymr_sTS=^0HN>$Y76k2Hb3RmOzN&Q!Bp#C?uVf|vI*5gWCjytgv4`DMJ
zY{eozhp*rh_#Ga^)l7CAEq3D<xSI9V9SZwsSk$Q0^LPMhQdjW=&fp$wWV`G|9YlFP
zin8z+F2Nk~Q<MC0X!ROO|F@F%caW*nG_ogk4Qp9n%}|gDKSqA)Q~qS)8z?t3hjIfy
zBDb#QllpHc<7(+F3%24V!q<Tr>K`z;9e==4oX5SmhifwUCRSwPI}}#oU3?tdIgae`
z7)s1u#4>s)C-@mzTg~GNyo<8oHag2j)}f5+;_pG+p45+_tTTZ!zOt12XRJC;gY0M;
zC3b%$9$|Mm>N6;@?pVg8xET-QL6i_pqa5T<d;uFcw!EC<C<l2LW#jLotalwbtNN^+
z`<EB}X43K7#9K+n+ev*MWygP@^snJlkdxM-v^OWNK$&<0%FXnnEW8g_;t0w{^C;ua
zR45R#>O*;OFUjX9Z#j>vpXHY1K~G`^7bWFhlrKZl8ZwtqJ+*955__(Gk`fA8bQ@W2
zQ#MEl7SeXuNbV-5$eJuku3OT;0@eSu{PQlU2gvdQO6nsIR!a*vAg7j_+DewMKvF+h
z-jjQY&wW!h9-ESu4Y-3WFUe+dnk;X;nyssQyXN@*z%Q3Vb)Z=CgUEQ1&YH+l_q54o
zoyhS$9r-%STV1k2(FsFZLR~ao*|_c*ZD`1OHoJ{3PN>VF4fJWpb+vIrKMotaJ94ss
z&fETwIq2eeeevb`tMTE*<@mjZt?{{rFXQWt8{@8~@uRwD%(yxK#Ky7ExDn*-%ULI9
z!{|hh_5+!|x|Lz0^MRdsw5!DWr~M$?-?i&x-gr57nY8E$KPV3On_Y3G>63VG^Kg8z
zd3k-&hM~#D*P1uSbIp&%>sy|j$fVK(smu<Y85qh8rqYAybkoQ)sZl%W$Wc>!xsD;d
zJ)NocOAqSILqmg^-ZZJ{kO`yI(ZG12Ya%}w(oY%B<A}qBs=Hn5WUbrhcoTm7b<5iN
z;irAi?uvU`$65}t*|Nzob?DB%(b~GGa^zIG<akz%_(fYB_Z$gCx#&=LZB7UNjSHTy
zv%X8gdQP6=r0*82SJ30c$LKNvG>kjNlX1t@Q90}A$<X}U(QMPF99;^WlF6Eaufyt!
zrbx4ime_zvZ(MMVrwg_(zOwY(suADggl5u-?4%|NuF+FQcZcz_ZD(g+TDGdDeLszk
zCMurQ<$^7mD1M}4>KFt5H<X4!{}n@jJTO!Cq^uH_0xK8cFDzV*<cA#}#Z#Tb@m%MM
UrjX-u6^`r2zjSVh*DOEz595VZ+yDRo

diff --git a/django/contrib/auth/locale/sl/LC_MESSAGES/django.po b/django/contrib/auth/locale/sl/LC_MESSAGES/django.po
index 774b91e1f5a..02203a907f3 100644
--- a/django/contrib/auth/locale/sl/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/sl/LC_MESSAGES/django.po
@@ -1,81 +1,91 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+#   <zejn@kiberpipa.org>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Slovenian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: zejn <zejn@kiberpipa.org>\n"
+"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"language/sl/)\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Osebni podatki"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Pomembni datumi"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Skupine"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Geslo je bilo uspešno spremenjeno."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Spremeni geslo: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Uporabnik s tem uporabniškim imenom že obstaja."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Gesli se ne ujemata."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Uporabniško ime"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Zahtevano. 30 znakov ali manj. Samo alfanumerični znaki ali naslednji znaki "
 "@/./+/-/_."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Ta vrednost sme vsebovati le črke, števila ali kateri znak izmed @/./+/-/_."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Geslo"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Potrditev gesla"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Vpišite enako geslo kot zgoraj, da se izognete tipkarskim napakam."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Uporabnik s tem uporabniškim imenom že obstaja."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Gesla se ne shranjujejo v berljivi obliki, zato ne morete videti gesla tega "
+"uporabnika, lahko pa geslo spremenite s pomočjo <a href=\"password/\">tega "
+"obrazca</a>."
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Gesli se ne ujemata."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -83,11 +93,7 @@ msgstr ""
 "Prosimo, vnesite veljavno uporabniško ime in geslo. Opomba: obe polji "
 "upoštevata velikost črk."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Ta uporabniški račun ni aktiven."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -95,11 +101,11 @@ msgstr ""
 "Izgleda, da vaš brskalnik nima omogočenih piškotkov. Piškotki so potrebni za "
 "prijavo."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-poštni naslov"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Ta uporabniški račun ni aktiven."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -107,103 +113,125 @@ msgstr ""
 "Tega e-mail naslova ni mogoče pripisati nobenemu uporabniku. Ali ste "
 "prepričani, da ste registrirani?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Ponastavitev gesla za %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr "Uporabnik s tem e-poštnim naslovom ne more ponastaviti gesla."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-poštni naslov"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Novo geslo"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Potrditev novega gesla"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Staro geslo"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Vaše staro geslo ni pravilno. Prosim, poskusite ponovno."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Staro geslo"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Geslo (ponovno)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algoritem"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "iteracij"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "naključna vrednost"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "zgoščena vsota"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "faktor obremenitve"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "preverjevalna vsota"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "ime"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "kodno ime"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "dovoljenje"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "dovoljenja"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "skupina"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "skupine"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "uporabniško ime"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Zahtevano. 30 znakov ali manj. Samo alfanumerični znaki in kateri znak izmed "
 "@/./+/-/_"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "ime"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "priimek"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-mail naslov"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "geslo"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Uporabite '[algo]$[salt]$[hexdigest]' ali <a href=\"password/\">obrazec za "
-"spremembo gesla</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "status osebja"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Določi, če se sme uporabnik prijaviti v to administracijsko stran."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktiven"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -211,11 +239,11 @@ msgstr ""
 "Določi, če se uporabnik smatra za aktivega. Odstranite to možnost namesto da "
 "brišete račune."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "status superuporabnika"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -223,42 +251,43 @@ msgstr ""
 "Uporabnik bo imel vse pravice brez da bi mu morali posamično dodeljevati "
 "pravice."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "zadnja prijava"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "registriran od"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Poleg ročno določenih dovoljenj bo ta uporabnik dobil tudi vsa dovoljenja, "
-"ki pripadajo skupinam, katerih član je."
+"Skupine, katerih član je ta uporabnik. Uporabnik pridobi vse pravice, "
+"povezane z vsako skupino."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "uporabniška dovoljenja"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "uporabnik"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "uporabniki"
 
-#: models.py:406
-msgid "message"
-msgstr "sporočilo"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Odjavljen"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Vnesite veljaven e-mail."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Geslo na %(site_name)s je bilo ponastavljeno."
diff --git a/django/contrib/auth/locale/sq/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sq/LC_MESSAGES/django.mo
index ea791c1b0fef2e098d33a60e81874e847f6694a8..c6d99aeba86df598d92f49e21eb42000e7061ce9 100644
GIT binary patch
delta 1320
zcmYk+Pe>F|9Ki9n{!Le1|E8wZmSt-0&a5WtLPeC8|4^bohYH!;$z9W3b*EMZ*-Hcw
zg0y(Z4iQvDOC>FI5QNG@UOh=5K}1nqszY>(zQ1LJ9{Zcmdv9jmd-HoUyIl9VCibB?
zV?j|oL^biyrqpq4Oy@vp%TTHw+pz?PZ~&v&j%#ROTBcH27{Hwv#%7#D2fo2vT*o}z
z#7d=N>YLS(&fVKMQHX_DiMy}?%diXWIEeXp70=@|cHlbpV0pGu7jX#p<7;Fh^#wao
zCXsnga=66&YJkcyI-VnAsGrDB{ox=JsvM;XAP?mUs*p9ST9oS>t^Q`@r;czSDe4r;
zIDIJhokJPVhmwIYEM$H)Lq%@5Egd+Ia^nM(iJsyj+p>f%+C7X?h11xF3)q97a0)d>
zmxVpS1NZ_D;|9tWmyte_p_(uz6MCu0fITRw9!ADevsU{S?xlSnOYtqrf;X)8Cf=j{
z3(w*l=}IjKM`&xj04`j_-MEJR_|-xFi>S1*iZFI#H!h>BFq4y#`h1j^ui9$sD498m
zvXBm|-EEy8K*`{s)gM54pb*OSGnTO;^3S5x4LU0D4$597P%`rh`KfmtWPta`PNYhW
zWu0X?$_pnin`En=kg+AR8nKV~zsOfoA^R^Wm;Kr*vS(6cA@cO{BvK?JX@o397AGl{
zB6}*?X&@R2DaC|4Ra0t*rBF*q2DVDOliERoElEA8q*XpU`TTj`Qv0Rj9%4JeJCypb
zC{5nYn728)#>T^wrY~eV{XWx(#8<NBlb5r<+v1OM{>BrzOD#<<z1ihC<kWSqr^ThW
z>U!=#zw5MdJs1gwL#`9t<#jgcp44@Eo72<e)m!89_FY-MM$m7J#-G{Uopk}z9QSHk
zG#YiAlfF<Sc*U4<hYV92pA3%}LuN!9*Zd>C&~R8A<#^3EY-o`Qtv<KcYI&WJiTFqR
zg=AOWZ(H@5)r8X@SWSd{PLt{+HUDZN5{v}KjQEd&$H|utUt02Jv2Kg6l+6AE2UefU

delta 1910
zcmaKsTWB0r7=TaOZOqkPVq2rJJ*J6iwVUiVNzs_b3Q0>$wIQuoh!Ib-C%dzm-C1X5
z(^|EwFZyIDEQN|7+JY~OAPp!A=E2nmv0z21`k+3EK8O@V@kQ|aClf>wfA*j6T>tCL
z{;=!)-IedQBrYgqKiY*}ZBS|wKD(X=@_It4J@5_K0Y8P)@OyY4Ol?rg!aQt**WexS
zD>w*$i`VzCxsiDaJ_irN7Nsg`g+Ut&pTJIdJ)YlyP0as<n_%NjO6`E#;a0dG-U5%n
zR%l>5EWpR$GjIZa0jFRm#vX?j_QDTgC;rt>3=Xldu34!Qa1yelF2OligAc-H!X*|p
z1!aE*isM;$Gt5GMYKaF)s~4c0e<@x+2Qj5yfyAUP!vy|Sje!_^8}d`{@esowL8;6&
zC>8h?Qg!u9JpUESy#$BFVLN=1_I1D{^N`E8!%OgCxB{nO8)Z5TPr!;q_&I|<_%%EL
zB^@z12IZX?hv%Sy68Q}%0sR5RK{Jh&mh?h=tNY{mVc5-l4oa(@hhpynltiv<r2ew;
zE(@>1tME~n!@5Me0`stC^J+$AxRd#1cof#54?DIf#ZbKnJ$Mm51e<tcCE#O_Sk)}#
zr}FXqYzOt1OkZX}BC0}}UyKjD2BpMrL8;U`@%{%;GOa_o_gTy@Aw^W*z+2&ukS;~(
zOT}8rRs!vUa=*XAfR?H4s2o@m`5dLB+>c7OC*F`YiKNkW(MYL#pnMr3x1r)dvX(?d
zC`R;2?t&7`UR0{S4Xse|NcQpUL3`08s!<W?pUB`UqNntncPVOxR7a#A9g0S)6_7Vw
z{zC3XrE($zsARn+eD2**U+#)m?u5grlx{bgLKDmB#QBEGVc#p40ySAEd46b$q0X4l
zGB0YA$vC0o6?N$8FlTki`UNKlSP68&6wAhSpVo$jY|&=+a>NOAIk3Jy<+!dkZs6&x
z4H>xqxSI9xVl!gZn)$6cos|f5&JF}P!G=@puU^}5z5~;zJU^p-8(@YwdV}RB8h>s$
zuKQ+<oAu^;W&`7fAZJf!oU9GPxjyar5=0d6sL?s!E*$7C#ij<j$L4dUm?f7r;|rc&
z7#%QU%M(rO8yX8X2u!wmsQJopI++?wriXQUa3npHObw+{Ez?JnGj_?53M9v=(um%d
zN=N5XLppu$$WXePY}rwrX-PJYKH?SaSoPzU*|sA%ESoH+gQu2vw*KBQdDt(PtU6w=
z=}fL(D;ga#^ciL9wZI8-1*?uZI>^xnHmr7S-Y${S-xo5TZ_YS-s}Hnon<*HdyE>b9
z!kpn!SugrFA4a!AZkt7lST?@VrFzZRft`0;r%2T)`eIodXTan=eG>P&loyZv)pYxt
zT{F(SSqz<mUdS7_URyM-Q*d+vPqg8B`^j~cY0MEw(fR*=&<t_Bdh)+oA}uJp#wVyK
hLMemq|I4%Vs9#Os-;d2Lk8kRUI%dw~s@ctF{{o)FVh8{L

diff --git a/django/contrib/auth/locale/sq/LC_MESSAGES/django.po b/django/contrib/auth/locale/sq/LC_MESSAGES/django.po
index 916f280a315..d8617969221 100644
--- a/django/contrib/auth/locale/sq/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/sq/LC_MESSAGES/django.po
@@ -1,80 +1,86 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Besnik <besnik@programeshqip.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Albanian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"sq/)\n"
+"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Të dhëna personale"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Leje"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Të dhëna të rëndësishme"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupe"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Fjalëkalimi u ndryshua me sukses."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Ndryshoni fjalëkalimin: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Ka tashmë një emër të tillë përdoruesi."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Dy fushat për fjalëkalim nuk u përputhën."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Emër përdoruesi"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "E domosdoshme. 30 ose më pak shenja. Vetëm shkronja, shifra dhe shenjat @/./"
 "+/-/_ ."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Kjo vlerë mund të përmbajë vetëm shkronja, numra dhe shenja si @/./+/-/_ ."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Fjalëkalim"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Ripohim fjalëkalimi"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Jepni të njëjtin fjalëkalim si më sipër, për verifikim."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Ka tashmë një emër të tillë përdoruesi."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Dy fushat për fjalëkalim nuk u përputhën."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -82,11 +88,7 @@ msgstr ""
 "Ju lutem, jepni një emër përdoruesi dhe fjalëkalim të saktë. Mbani parasysh "
 "që për të dyja fushat luan rol shkrimi me të madhe apo me të vogël."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Kjo llogari nuk është aktive."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -94,11 +96,11 @@ msgstr ""
 "Shfletuesi juaj Web nuk duket se i ka të aktivizuara \"cookie\"-t. \"Cookie"
 "\"-t janë të domosdoshme për hyrjen."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Kjo llogari nuk është aktive."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -106,102 +108,124 @@ msgstr ""
 "Kësaj adrese e-mail nuk i përshoqërohet ndonjë llogari përdoruesi. Jeni i "
 "sigurt se jeni regjistruar?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Ricaktim fjalëkalimi më %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-mail"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Fjalëkalim i ri"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Ripohim fjalëkalimi të ri"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Fjalëkalim i vjetër"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Fjalëkalimi juaj i vjetër u dha pasaktësisht. Ju lutem, jepeni sërish."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Fjalëkalim i vjetër"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Fjalëkalim (sërish)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "emër"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "emër i koduar"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "leje"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "leje"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grup"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupe"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "emër përdoruesi"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "E domosdoshme. 30 ose më pak shenja. Shkronja, numra dhe shenjat @/./+/-/_"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "emër"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "mbiemër"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "adresë e-mail"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "fjalëkalim"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Përdorni '[algo]$[salt]$[hexdigest]' ose përdorni <a href=\"password/"
-"\">formularin për ndërrim fjalëkalimi</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "vend në ekip"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Përcakton nëse mund të hyjë ose jo përdoruesi te ky site administrimi."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "veprues"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -209,53 +233,52 @@ msgstr ""
 "Përcakton nëse ky përdorues do të duhej trajtuar si aktiv. Çpërzgjidhni "
 "këtë, në vend se të fshihni llogarira."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "gjendje superpërdoruesi"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 "Përcakton që ky përdorues ka krejt lejet, pa ia akorduar ato shprehimisht."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "hyrja e fundit"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "datë anëtarësimi"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Si shtesë e lejeve të dhëna dorazi, ky përdorues do të marrë gjithashtu "
-"krejt lejet e akorduara për secilin grup ku ai/ajo bën pjesë."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "leje përdoruesi"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "përdorues"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "përdoruesa"
 
-#: models.py:406
-msgid "message"
-msgstr "mesazh"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "I dalë"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Jepni një adresë e-mail të vlefshme."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/sr/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sr/LC_MESSAGES/django.mo
index 1047d19daf98fec2e6731f94cc9041cac85f28b4..eaf12d45d8c598140521cb43acc0acfc0b45c2c4 100644
GIT binary patch
delta 2560
zcmZXUU2GIp6vuBZ0{swZp{+&03y8GPcDF5+QobZ0ABq<BK?o8uY^S?hwmZ$vtc9m-
z`4Hn*(21n6g3-u>h)M0XQY#dB@Wp7DMSN2Oniw_lL81@(<nPQ*3&fkf^P4$y?m6fF
z&z=1z{9Q}t$MR`!DaKmn0_I-@O0~nU3%M|6-m6qCEP``kGu#EY!8LFIn(!K&4qLe_
zgd1Tq+y`gFH()V*50=97uv)2%`YbSf3up4;2Al(bgNxw5umV=kQ0hS#f+esW-Us)>
z=U^P3f>+>Ua5ur8fM?+I@OO9sZYxr189WEu$*(+as6=VX+X~yD6w(j(!I$AC_$#Cq
zwSw#{QH@ai)&|@H`Kc$l%z}F$OH>RZj<TVwKMbeAK6y`mbzE-XNhpB_1BbIv5}XU(
zXCXf|!9@am1x3oMP!#(<u>TP}--5Ef5GN_16k<~4@Fs0u1T!L?lq=HihOfax@C2Mr
z<KBU<!z#FvEUVyVcnBVXV*eBJQ$=O@=lSqqo|~X3y9bIQHe3vkz!3bP4E^P>T*n|1
z-wGU8mFEL(hQrwR!Y|+~PT&B%8Zb5wb$Bk|fSiWsq4fUoN;z353hUq;sx;twD22WY
zN8nHuUI}i@`|}lEgXB^-q5m~N*+ChXrEn#b9k)a2WfV&5k^v6~_G3`uyaGkpGf)(m
z2;P4aJYUZQH$Mlw1tnm?e5D?OrLYz@LaBT&ltL2l0eBKhqVrI`lFN|RDunS{Ae%r0
zf6#8VlG((RuUkInj0BZLE0}VqB$-GiLv|?t3zCq|ObzLw4Cx{HRJ}YfRx?GN7G@)J
z4O2eRHl}>a4NN)UlY<Rp`~x*<5QdpGOi`hgDd$7J*E@%tYB|ZvnX-Gj<PZ77;jF4h
z@{dYGkzdA=JQRNq{*ZQ5i}yW&K|Ya+?CEK*7R=t!-D9O3BkAZ4!!d35()9OBYV5dU
z?oS%sX05w_Mml5k>K?<kd#zN5t&Nnala`}x$4Z$Ub=tPH6EiW!ZS1<&IIJB@+op*b
zQ`$CD%k8Q4b^1Ws(TA<Hju=TDi5bbLIGR%qEQlwgdYz$TDYJ9^5)xPVnL|r9_yIeu
zRQI}&vBAyF_`4>WveG^F?M(WBnXr;kELMZw<R{m?@kGKsK7Co4)v2i{M6udm*Wg~6
zS-aEBdl`|4l|}{jX+`2l(ZNC|mJe;#cN_79Haa>|rfo~<q5$`%b64^1FEcycvqc}5
z8;PiuVtKcU#LUP+JKgO*UA%s2%&=n$ZBvF5x01F>7`CGmRy3Z>-y*sDVR22Nk#O9r
z#al{H{GjeMB1r9)m+WY1st-5UH?Gp*a9d+beRy>^T)eBj{u%RyxJ|tJEtK7+o5GF0
zU$|8_HnoLUyC+NLFR*OAEuH8xY`w0_NLu!zQhc(@Y_L*M_ex3i)|!~(^t6RSy}i8+
zPRdBy@lNwlL(+6YJt?cpj5v0vC)B~(s1-_ZO&d`&WT!&4#XEziHf^We8zp<Q+e@Q`
zm2Y}O-lyIrZ%lh5-casH?x=Us8_OP<Gq<2B*N<gDY<k(9XYEwk51B!4!n@#&v2xrS
z)p&4!!5j7_a(&n)yo;L4C*J3n$9YSrQOyfnPmp5R4}7#v=Z=tn+?(*T-{D0O6JA!r
z4ijO-8^v*~PUB2O{5DFsDWA(EC8aki8xhaD&gJB>#AR4Q$*Iitl;0@GxVb)xxh%1$
zAvZv(i{4QFp^r%Y63-jgo+KE<aY#gJ(B9krK5skZ1|`ObzvX-ZtR0@T`MOXzF4-XC
zkVv-hcGjt_%La!;*#`HidD|ELFA*&fWf2;Q-NjXvJAAEW-vcBN#R6HViALo5eLbXZ
z%_c^r5z<lLn_N>}%pG;zd4t)HDq0IdzRcNRkJ6!wia2sINPa;sdBxeG?8p77(y7WF
w=iw#g>yMQNzbG}i&sH_NZdG%!tjnE1#Y^s&RU?(TV}u>2HV%vw<}0iI176D5X8-^I

delta 1937
zcmaLXTTEO<7{KwN1zK3BrATp6aX{$J0=tDJw!sEXts=E;8lxt(4@dW~Y_sf=Jxg0-
z&4Or}7&XSR30TvsiI<uNSvIA#g`^szu@AGUm#6B3FHMZv#Q0!h6aU}tdU-HTnElPn
znKPGf=J0js_dxo)Ri#H2shfNk`D%$$eRy~&KcthTO0CCJSc_lcZu}lMW1vha7x!a1
zTD%*-#ZLUK*uI{Jw^0w^3)qX5N~P5Tg(@1pKtFy{tlz}t)NkQREMKNnBi3UbcH`~1
z1AXXVH4fub_&h$0*RUV`47L|tY{e_+XMS~q!gd;#R4DZ{_90E`H15N*_#jrWT-Kuc
zQJ(KXnRozKU<CP72l!#rY8<8ikz)Jn$WUquS(7@0rOdC+Qjh_skw0~T9~t;ll*m|=
z2wX>^u6{1oe?@t(l+H3?HGaVH)uKe;GB4kQb%f<L4B-*{1mD4aR-LY=aDze@$^jjM
z5Hhwphw}UaevCPkg-q}x?Qh{4{0QafuAxNYCv3t$umc-w3U^{B-bX!#(r>bc_{%`=
z(J+IHIEl$s1%2GO52?S4a+bR|@QrvB9lU~vv4so4T<R3g;ta+xvbr$QS11eo0q@0I
zDDyVe6Ms3Q&D3Pay+!*`LiZ%fN)MnM#mgxD-z>II6@9<xd2HeNXSg1JL|Itf9fgV4
z;GNVTL-wc!(-b(e{A#4*U#Xjd+;aKk<g=8)B&{u=g1DqumXOMqA*q2(5c3yI?t~<n
zNIpr~xolD*NZ=GfP-%`dpEmI;D{m#Yku_OTbAkM~TrB2yAkmNr$pw_uPVUN=3ZJ3e
zbom#ufh-Y|BzJ+k`FG+-*5t!0mq?Oanh=?wsCDE3S#G?_l$E_&viFf>Vsyk)eZwP(
zWXg%Bbl6F`)Z^L-hoh-zBCb;jof>lWh?^XadLAvF9(LlRPAvAEc4&yi-S9@bL_Iy~
zxk-I68jEQs<|T|*(OMgk3G|TL;V}kXqVaZfvi!7peA%cuv3!G>SpK;=SJ7gcE1!8n
zuN`n=k;J~10ndr0V8}fbjz(NBwQsFXBxU&gQhFRclynClXdYqygNbCgqj~GILry%x
zDvK?8Fp(VY>2S81bmffM=Ib$U`0C1sUC(nO=8SKhvA%~)W7VUfU|XQGEf~_l&Mm>N
zwm?@PP`P_o+aC8oRJPi-jc{zyn*zanzd)A`-oK?QXpU7i)W_LP&weM4y)ic$c4O_)
z_+Y~1s{G|WI}>qts|i#ORPA70qfUfTykzE;>Y=3-CO4Lwu!}ZpZmw)-I$;-bV>WAN
zwKV6B*voc7+gZCn&gQ1*^~;L7^hQm?jGfL+YCE5QV=gyN*Eu_{bH{8}Q@X_C7wsIy
z!u#iWVZmOMhyNOmmuSc^)fj7-mbVH+P8NpHc9AD@`De3sx?S1hb~aO8v!bM=)ofaI
zJ!5OHmze(5+f7aVWLhR9XaD!;80{j9`mbZly_Da~B?5Ah<&SB5p7l^83b}Dj;{q*n
qROfA0&Xe`L{m=e0XY0F5OpV_&$Nd4{qCDW;c{^>c`a`CwA@e6oL9{;r

diff --git a/django/contrib/auth/locale/sr/LC_MESSAGES/django.po b/django/contrib/auth/locale/sr/LC_MESSAGES/django.po
index d9708b6d88c..c8027911d66 100644
--- a/django/contrib/auth/locale/sr/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/sr/LC_MESSAGES/django.po
@@ -1,80 +1,89 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Janos Guljas <janos@resenje.org>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Serbian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Janos Guljas <janos@resenje.org>\n"
+"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"sr/)\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Лични подаци"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Дозволе"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Важни датуми"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Групе"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Лозинка успешно измењена."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Измени лозинку: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Корисник са тим корисничким именом већ постоји."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Два поља за лозинке се нису поклопила."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Корисник"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Неопходно. Највише 30 словних места. Само алфанумерички знаци (слова, бројке "
 "и @/./+/-/_)."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Ова вредност може садржати само слова, бројке и @/./+/-/_."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Лозинка"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Потврда лозинке"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Ради провере тачности поново унесите лозинку коју сте унели горе."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Корисник са тим корисничким именом већ постоји."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Лозинке у изворном облику се не чувају, тако да се не могу видети, али се "
+"могу променити <a href=\"password/\">овде</a>."
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Два поља за лозинке се нису поклопила."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -82,11 +91,7 @@ msgstr ""
 "Унесите тачно корисничко име и лозинку. Пазите на разлику између малих и "
 "великих слова у оба поља."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Овај налог је неактиван."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -94,11 +99,11 @@ msgstr ""
 "Изгледа да су колачићи искључени у вашем браузеру. Они морају бити укључени "
 "да би сте се пријавили."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Имејл адреса"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Овај налог је неактиван."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -106,104 +111,126 @@ msgstr ""
 "Та имејл адреса није у вези ни са једним налогом. Да ли сте сигурни да сте "
 "се већ регистровали?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Ресетовање лозинке на %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr "Корисник са овом имејл адресом није у могућности да ресетује лозинку."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Имејл адреса"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Потврда нове лозинке"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Стара лозинка"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Ваша стара лознка није правилно унесена. Унесите је поново."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Стара лозинка"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Лозинка (поновите)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "алгоритам"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "итерације"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "зачин"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "хеш"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "фактор рада"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "сума за проверу"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "име"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "шифра дозволе"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "дозвола"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "дозволе"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "група"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "групе"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "корисничко име"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Неопходно. Највише 30 словних места. Само алфанумерички знаци (слова, бројке "
 "и @/./+/-/_)."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "име"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "презиме"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "имејл адреса"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "лозинка"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Користите '[algo]$[salt]$[hexdigest]' или <a href=\"password/\">формулар за "
-"унос лозинке</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "статус члана посаде"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "Означава да ли корисник може да се пријави на овај сајт за администрацију."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "активан"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -211,53 +238,54 @@ msgstr ""
 "Означава да ли се корисник сматра активним. Деселектујте ово уместо да "
 "бришете налог."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "статус администратора"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 "Означава да ли корисник има све дозволе без додељивања појединачних дозвола."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "последња пријава"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "датум регистрације"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Поред ручно додељених дозвола, овај корисник ће имати и дозволе додељене "
-"гурпама којима припада."
+"Групе којима корисник припада. Корисник ће добити све дозволе група у којим "
+"се налази."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "корисничке дозволе"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "корисник"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "корисници"
 
-#: models.py:406
-msgid "message"
-msgstr "порука"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Одјављен"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Унесите важећу имејл адресу."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Ресетовање лозинке на сајту %(site_name)s"
diff --git a/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.mo
index 2de8ce110c7da72473377d9eb3577e9c74a8d197..173030899d188adc24b58f9162bce5bf3e4fc344 100644
GIT binary patch
delta 1204
zcmYk*OGs2v9LMqhjHdaVX|&Wdovbt;Q!`oENJS5Nhz70<dQew0HFFdli3}WQ7ZI34
zi`s-(3kyq{g{wjrQ7s}|1TCsvQ9;lyXd!)n!xcK*|M}cG_uljPpEFanud5SZ0-1M>
z5+N#xhaR&d*qA{@*_&xrhfyrTZtTFT7{xc(gWfe}S=fi0a0r|5Hu`W0b8#8-@e`Jr
zCG3aWkipk$dEiGsmSH8<<9ckxJUovDIDn_{8Xm=EY{Qalv$NQZ+i(#X$iCq*)F2w?
zIMq4Ew+?O&(eM=M!+s-|{h`u;mSa{3`KT3?BXhPI)ccKYdlPcm0V<MWCs6&IM19wZ
z>d!%CU=aO`Z{ytPgIj9ANz{kasDU2i0^2f=+NM5w3E+LyR?J~LuAnl~M(-M6hDsTn
z$HVv@mAL>FU0Dzlda<6HVr)h(Yo{Vxb{aKM7nb7~YA^4&&!>^gW~naW0xI>Dq)T4M
z3-}RhG0MlK=-@sa_mO|Cbb*G;xadA;APt&8A1d|3sEH&{6P`ky&j+Xs&A86uI(|Px
zeZPcy@2&g$o$CkJ&&t16{*?wDvcISa`RPTcy$qR?g-|KmkL*OcY;oQ0T7o)oI&9TM
z9ii+fb32Kx#Q#PAl2Yxz2G&7ZElQP&4vki?38`pBUV?2-pOX-(R1lhMJ<&+0C|f(y
zcV-)1MGc{|wpyY=?ivWKlEtOdsY9c*X~k7UnAl8gAe8<HQJlJ$IqC7W4h|2E#GP0?
zc+rXXj3!@XO{TiCe|nOSa#oU0a_9ZKLgA)RWOpzeZi(y(g`1NDc@u$lC)PXW^!Bs_
xM@J4`apL{4<oCQYsm}Z=Z$YQ?>Se57-Hi?QCw~>*NZs_6d!GjiJjvpsiGMZ@boKxM

delta 1790
zcmaLWPiP!f9Ki9Hbh9SWH8DwTQ=`7drb#q^cAK<diKQxO2@P0^|1d^<W?p7zGdr`)
zpR^|G;;HtaR2L6Dwd%1_#3<sWh(=WEAt2O~dhnnJEn*P_Dfs<uw*f(X%x^w3Z)bk*
zz2BStvj5G&>JMF+w-jw3(MNpKq|^+)xP=q#Tt=y3d>gy*5+21L@qWy=C}pvPS=_)o
z@jINrKO6nS{Mf;L9$&(P*sfGnUF6~xI=;qUyxh3|9b37-hMkzbNvXSV8*asY*n_ip
zGaAfc8K1yaoW^hQ2=<cfX|y<ipJ6ZKt6#V{L`QR*QcvOx(xu+Pc|4B~VjI(CF6s!%
z@5fLEp2J(wMGm#hiAAedP@X^8=zkqarOqI8Qtx7h@zr@QB;otWp+4axiPupovw>29
z?~$sjD~<cBDDP!>SO(1D$829W7P!B}%UyU4Wy?A#&nz003SGde43K5|Qrd2O2=|~Q
zOi@a@iVmJaS-};Q_x?iJf)+Mbp4)-4vLTd#^LPh7j2!A&PO`-z%5$eWsK31U1|5rd
z7G;mJELU8>=kQY;#GSV(wH;@03ZKV0Jd09^zp;cFMwj11l!4wu=BhqK4)r-FS-|Bk
z>MtMqPjtwNe{T32l1p7hNzlTlFMF9odA<jwe|tmSa0sO$d6bWI8f9X0$e|ogtWljn
zspP9wF4!`)jbM?RP5zFOKwj!2h6!m>1!)DMxqhY8eJI-}Z3iI}uTNS!Xsn_Bm%Io0
zWYh>Dlf0d%%50?VA$Ac1#3-Q&Y5mu!|Cbw=^*xpH-A%~qq>T}i^{eaOf~-y|buS^6
zlQvH9ZEiNch5q`!>~3`J#Jz;<@eq+GGHZp*>89%8C`>D{nkiSpC^12z9g|q@18p3~
zOS~}9NvM;e)fF3+y*Q>P)@2i<#`j;)h7LEd&Ipfqu})(f>EoX7YvaeEc5T9i|F2iw
zh*7K~S*=;vTGX!0Ko{+J%pm0Og0b30%js@X9}go(M>Zx6^B9QNp2_~&^r#-3Grk+n
z@0yE^pFq)`a6H$>$^4)WBbh{f!c#^UBfI!Of2EOXy#K&L(F87QxsiM^jLK8v=D^x?
z>z1Z$*~YPPYlqrC=q!xpCq@f<bzx$EVRAG-S!->7xpt=gsjgWPq{g-TbsQb^P2vS>
zf3)jn3Yk`{dfa?*G4P~_Y1vap!-$ne>H2FysGZQUe#r)2k;|3k&^IGGTs9@W6h>Yg
zcuRWyBn2pwQj?+nh~0e4YB!B4rfhh;#6!9gc@^WBG4+U3GRuB#cW$-!n3Rf~LCI=A
zT=9Y>s{<p2JD2Ngek}14`@hBWd{6&Z)uc+PZz8>7bQ*;5jpX&pebmv@l;!J5mrU)e
G&gwrXyez%|

diff --git a/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.po
index 52e566873f4..5bd1d90beb9 100644
--- a/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.po
@@ -4,77 +4,80 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
 "PO-Revision-Date: 2011-03-04 18:41+0000\n"
 "Last-Translator: Jannis <jannis@leidel.info>\n"
 "Language-Team: Serbian (Latin) <None>\n"
+"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr@latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Lični podaci"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Dozvole"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Važni datumi"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupe"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Lozinka uspešno izmenjena."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Izmeni lozinku: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Korisnik sa tim korisničkim imenom već postoji."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Dva polja za lozinke se nisu poklopila."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Korisnik"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Neophodno. Najviše 30 slovnih mesta. Samo alfanumerički znaci (slova, brojke "
 "i @/./+/-/_)."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Ova vrednost može sadržati samo slova, brojke i @/./+/-/_."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Lozinka"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Potvrda lozinke"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Radi provere tačnosti ponovo unesite lozinku koju ste uneli gore."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Korisnik sa tim korisničkim imenom već postoji."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Dva polja za lozinke se nisu poklopila."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -82,11 +85,7 @@ msgstr ""
 "Unesite tačno korisničko ime i lozinku. Pazite na razliku između malih i "
 "velikih slova u oba polja."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Ovaj nalog je neaktivan."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -94,11 +93,11 @@ msgstr ""
 "Izgleda da su kolačići isključeni u vašem brauzeru. Oni moraju biti "
 "uključeni da bi ste se prijavili."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "Imejl adresa"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Ovaj nalog je neaktivan."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -106,104 +105,126 @@ msgstr ""
 "Ta imejl adresa nije u vezi ni sa jednim nalogom. Da li ste sigurni da ste "
 "se već registrovali?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Resetovanje lozinke na %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "Imejl adresa"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Potvrda nove lozinke"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Stara lozinka"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Vaša stara loznka nije pravilno unesena. Unesite je ponovo."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Stara lozinka"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Lozinka (ponovite)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "ime"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "šifra dozvole"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "dozvola"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "dozvole"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grupa"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupe"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "korisničko ime"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Neophodno. Najviše 30 slovnih mesta. Samo alfanumerički znaci (slova, brojke "
 "i @/./+/-/_)."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "ime"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "prezime"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "imejl adresa"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "lozinka"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Koristite '[algo]$[salt]$[hexdigest]' ili <a href=\"password/\">formular za "
-"unos lozinke</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "status člana posade"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 "Označava da li korisnik može da se prijavi na ovaj sajt za administraciju."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktivan"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -211,11 +232,11 @@ msgstr ""
 "Označava da li se korisnik smatra aktivnim. Deselektujte ovo umesto da "
 "brišete nalog."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "status administratora"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -223,42 +244,44 @@ msgstr ""
 "Označava da li korisnik ima sve dozvole bez dodeljivanja pojedinačnih "
 "dozvola."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "poslednja prijava"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "datum registracije"
 
-#: models.py:217
+#: models.py:251
+#, fuzzy
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
 "Pored ručno dodeljenih dozvola, ovaj korisnik će imati i dozvole dodeljene "
 "gurpama kojima pripada."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "korisničke dozvole"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "korisnik"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "korisnici"
 
-#: models.py:406
-msgid "message"
-msgstr "poruka"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Odjavljen"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Unesite važeću imejl adresu."
+
+#: templates/registration/password_reset_subject.txt:2
+#, fuzzy, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Resetovanje lozinke na %s"
diff --git a/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo
index fae6484691265857701d1cec09222b4ab0c56283..fbefcd4b548277a8506205d98bec18d5710e4dce 100644
GIT binary patch
delta 2440
zcmY+EU2IfE6vqcaK3bqsL<9v#u+Spg-4+n6fYcO$h$$+5fFc=or@NQly?1kGww0&V
z2V)|dV6KYMU?S2GQ4<mpqKTT2O?)sW`1N99)F%Q)eefeDnxMb4-C~*SxxcwHXU@$0
z&$)Yf#ZRkh-?vYDMbYlUZpQwYqSPS#d@2vx%xjhEg0tX!xCZWm+u)t>HE7{ia5~(;
zV+p()u7Uet8+-}2z_;LR_#RxOR84)@9QYc}Wa3A79lQjW!oT4HxM+q_x4<lHg@bSo
zd>lRs1NbUD2e-n<2zDQQ6Fvcdf(PKXSxR-lQ*e;|)faR)iP9YJUf2iaAkV;k@Ojt|
zFG9|uR<S!vR1XxtyP6z;{M7wC=E6OYC8`7wM>#0#55Z~hX_;q#^{jN@5h#J*XgZ8R
z+2B-j{tV=&KH(t&K7%6Vc_@l~*Bt+)`TiS}^;2<@1I&gDsdjjjG%tm<UIxyh<Mr?o
z+zl_o_3$CCA(9=2_^Mx_q~ssi0~eE6Nx@Di8|{TmsXV+9CU71+4CP|Spd9ohya9gD
zhW^qy&p;=<0A-^#yd>v0!y@d3C*kXG7rck4+hGc0_#He1ceX2)gP+13@GmH-?Wb}j
zwU0wN@NxJEJUt)%x6zrw^+lpVC^vZ+isO@zdQu@Imhw;z_#70!m!YgX2F34fD5-fD
ziqxl}tosOx0_U6a-!|XBuhEg*UxX6)_ojnfU!=SiB8s{mir;Mz7nOx_z=7uYgHYD*
zgQT|MvjWN|EecDM`P;ExOulYJP&E`)w_&R=Ie8bh8j~i~D*p@1G0EdZyS3TL!o^so
z`7SlH5L<`!V0U72$UaQ!rW+F#CfZH%{jZ&PYf|zjwIH|MfXSap2R6Bh^dj#{Oyref
zlePvEweFA?n#SZmL)x-&G}0tpQFoDeU(=kBJT5qMY}yM`+IEyHapFznb-{S+(vPPf
zZ|!t}xBDYgwq5D|8P%E@)fMC1Xq*(BHi^|y?6vc8VhgLai?uIV1_Q^q9yN!wkF~Rw
zVTP*CCM(^Q^{e%Ps@I3&s?M88=SwCkile>az=9wu>WxO15<9eM85=KX?3`V;xe;(E
zPRbjzW^?-Gj6XYzNnEYC|98>{Y#2vHM&fSW-`HG_24R>!JH2CGJft~Mmc#1Cy6*Jc
z%&whw+{@(iaTOJ~XPgg^qQF958V_wVWfO$j6bgxTPL3`L(6|1o!>1Q!4y9wW-fuTy
zF-}-sR{4_654&nPeV}F2@{(~Sg|><DK^!?18s~Kw7lUZLi{$A$EuB+M=+pBp1Fa}N
ztcOe<snhn>9qW2Cxiy)dwK|vU>sgn{t<U9Jb`548v?GBdUS@z}_vzkTPs1;_LHG3b
z<<_T1S{K&(BaUvI-etqGMcwh&Efsm~c6M{iPBKw7MVr}eO}S4$G-?ZhE9uUX_m#eE
zc64;K+b1S+!H|8bJF-4oN#cVx?_IW%EgWQVoDG{HvTh{XbtPb*b|Wq653PI8+&lZ+
zlsS(C!#*e)sWwD;cka<8^)Uo-zJ4MMy{^>9bjRfS+uinJ?Y__?-ah5S`dMcqs!)ff
zm~fjQ@|Fr@O@U0*Pb7^IU9O)!7zRa>>8Vr8WE2@~qLKQEs6hQXeI?RrUAB=fRP`|B
zDAS4gf0CGG>R{#MVw|W&HuOeIF;+u1mWn*{LtERFS~00sDwLRu%agX0;E6;FZCMB1
zdTTUkQV-R~678weVttI_m!39ZXmnCP;gPFkk*E=o4@N3DinzqYP9>9cs{uZv5rjy8
zzpiV0|HM^?<H%E~a*J^hY^D-BZ^r9b?kp1ONh!GM`sw0%2h*SDy>~;ip36!CCUF>2
o(Pfh!ZQnBY>Y7f!Y1iq$?JK7_so{?Kd*+zrfc0+33{%AFKRpu+`Tzg`

delta 1924
zcmaKsTWB0r7=TY|k~W*9X_M3%ZR%-E+9vHLySZ6ItZnJlMhqpyN*d&}JK0@3mpC(<
zT54HDK@ctCAnKE`jSo^0F|<$+k!~Lh3RXnxOBEjksh~pj!3QtjzdKX}@i71S&iT*T
z|2nfbdj8y4{HD436~!1v)*+u(DRlrobsH07zFMhn_$F+DpTKeWExZq=YLv3z<FFQ9
zh3)Vf9Du*Y`fd)J*r(uWxC17XDyk1zG@w|5ZSbpj{|j8f{tvhc)-G3SJzNXdz+u=5
z$6!4)un{`&5qJvjfnUIbunl8Jpar|&W!Q#)^#hB&D3;YJbr>FisMJ|F4bQ`!u#Rwv
zMID54eh7-=DYz15A&;74B5CzBl>5)c`ZEwy>UBs=>Kv@bzdFxC488|>)Fmb{d<9Bn
zu0pB6bx76KPx1aHl;2fzSsXUPY1-EU``JIikEKEjZ~|U}_rjHw=_uR_i{jvI7E;=a
zFb%(i65(>vVyT+o8Q2cR;X9B=U0}KcUV*FObtoDB3?<;-;q5R%<Aocbyc^q~_?>K`
z{?f~1D6;S*l$Yx}xF7ao#e=6{3jPS?9a)DrY1uH8-<^gM==X3E-h}($gUyx7ybL9w
z*C3CYXOaLGo2kEK^brav;S!XKpFtjVjY%@P0jak76-o>KiuKie5~5!T#b6sGX|)lO
zgBps@_dsdIIFvxGSRWKw&@#0aA-P*aK1Znx$K}tmJ3iSIGYyx;>n%{)C*w|p<jYA&
zLNbW8T=sjQ1iKZHV5B8QiBd*C(us5-Nkk(uIw~lC%kfg(#X_>Z8<FbC=tTz0t4fAa
zHTetaLF6lt(TDJE-Ws%WW2IcNY6BcX<fYn-NYAC*YO$u~g{mX_e6KJYr~}Td=ZD4(
zb;g7idsmxGCLiWKSBIVsbC#a9d?z0SXaemRw_t4hq&6tBu9ex!m3*KJf#vHHdE3^;
z4!kI+>uSl01D&(_0&H+4@AgLXwP&M;mKUNoR`f*AtoS&3x2`klNF1Heo2HDN^`<+g
z0%M0DXFZw8XRRQd-lRQW%$GwMH9F^8GxvAQ;{Sx_XZkv}AIljxOO&xj&v?Ew+Gn;$
z#l-v3?)uT_rTR6sjuiwZ8=b4)99^y76|HaBpGzlG1IhG|P7jQv2a~D6R4Ot4aPp8f
zmzPwNyD7(r?oXx5_fms8y=`PLy(Ps+jF})zPWZ+RY!iC^hz^WXuxvZ;W-L8g+3YCq
zdh<^7c|+T>(d|*HajIdAPzxrD;b3m@`Nqpt#eIHZmIABE{P8fKHPVHGqxP0A`i0PQ
zH1_<`Lda3h3N7C?IzU?pGnQ>C-N0?AgVJ02xaT-D!MJm!1vg`S%jMTWP&PBeIbk{G
zU)HeIRd$iB1fesf1z%Inz8u|`wPR&$%ju0CZF;rY^=vx`OAF#}hWK<>)VS)!#a*i#
ztD>dm-e_k_?y>*vBa!|SpZ>2_mY#JpzR`B+Vqm#+Hz~a=*hFH5<(AI3T!`$}2ci#J
U+Y`hlRiNb2*R7kQnl*?21}I%(-2eap

diff --git a/django/contrib/auth/locale/sv/LC_MESSAGES/django.po b/django/contrib/auth/locale/sv/LC_MESSAGES/django.po
index c0b580d5401..3b0f38c5153 100644
--- a/django/contrib/auth/locale/sv/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/sv/LC_MESSAGES/django.po
@@ -1,79 +1,90 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Andreas Pelme <andreas@pelme.se>, 2011, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Samuel Linde <samuel@linde.im>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: samuellinde <samuel@linde.im>\n"
-"Language-Team: Swedish <>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Andreas Pelme <andreas@pelme.se>\n"
+"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"sv/)\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Personlig information"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Rättigheter"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Viktiga datum"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Grupper"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Lösenordet ändrades."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Ändra lösenord: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "En användare med det användarnamnet finns redan."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "De två lösenordsfälten stämde inte överens."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Användarnamn"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Obligatoriskt. 30 tecken eller färre. Endast bokstäver, siffror och @/./+/-/"
 "_."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Detta värde får endast innehålla bokstäver, siffror och @/./+/-/_."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Lösenord"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Lösenordsbekräftelse"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Fyll i samma lösenord som ovan för verifiering."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "En användare med det användarnamnet finns redan."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Klartextlösenord lagras inte, så det är inte möjligt att se denna användares "
+"lösenord, men du kan ändra lösenordet med <a href=\"password/\">detta "
+"formulär</a>."
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "De två lösenordsfälten stämde inte överens."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -81,11 +92,7 @@ msgstr ""
 "Var god ange ett korrekt användarnamn och lösenord. Tänk på att skilja "
 "mellan gemener och versaler."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Detta konto är inaktivt."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -93,11 +100,11 @@ msgstr ""
 "Din webbläsare verkar inte tillåta cookies. Cookies behövs för att kunna "
 "logga in."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-postadress"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Detta konto är inaktivt."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -105,101 +112,123 @@ msgstr ""
 "Den e-postadressen är inte associerad med något användarkonto. Är du säker "
 "på att du har registrerat dig?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Lösenord nollställt för %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr "Användarkontot med denna e-postadress kan inte återställa lösenordet."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-postadress"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Bekräfta nytt lösenord"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Gammalt lösenord"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Ditt gamla lösenord var felaktigt ifyllt. Var vänlig fyll i det igen."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Gammalt lösenord"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Lösenord (igen)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algoritm"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "iterationer"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "salt"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "hash"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "arbetsfaktor"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "kontrollsumma"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "namn"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "kodnamn"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "rättighet"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "rättigheter"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grupp"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "grupper"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "användarnamn"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Obligatorisk. 30 tecken eller färre. Bokstäver, siffror och @/./+/-/_."
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "förnamn"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "efternamn"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-postadress"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "lösenord"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Använd '[algo]$[salt]$[hexdigest]' eller använd <a href=\"password/\">Ändra "
-"lösenord-formuläret</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "personalstatus"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Avgör om användaren kan logga in på denna adminsida."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktiv"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -207,11 +236,11 @@ msgstr ""
 "Anger om användaren skall betraktas som aktiv. Avmarkera detta istället för "
 "att ta bort konton."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "superanvändare"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -219,42 +248,43 @@ msgstr ""
 "Anger att denna användare har alla rättigheter utan att uttryckligen "
 "tilldela dem."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "senaste inloggning"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "registreringsdatum"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Förutom de rättigheterna som utdelas manuellt så kommer användaren dessutom "
-"få samma rättigheter som de grupper där han/hon är medlem."
+"De grupper som användaren är medlem i. En användare får tillgång till alla "
+"rättigheter som hans/hennes grupper har."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "användarättigheter"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "användare"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "användare"
 
-#: models.py:406
-msgid "message"
-msgstr "meddelande"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Utloggad"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Fyll i en giltig e-postadress."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Lösenord återställt på %(site_name)s"
diff --git a/django/contrib/auth/locale/ta/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ta/LC_MESSAGES/django.mo
index 8d474ef754fa17d82bcaf961d34017e62ea5a97b..a47a5c3cb68704ce8348dde7319fc2d9a652e0fd 100644
GIT binary patch
delta 964
zcmY+?%WD%s9Ki8On<kpXrp9VDYD|m8mYD1&O-NlzL8*czXc1|}qOh8^rnE^+RwJmy
zgP<op1Svic(UT{|Ts(Q`LGT~wN$Sm$2U`$)p!oeIE9kJZpPAix{N}OV|0Pmi4Y}_t
z(g1lEdB0034aYiok-p&+e#Zki*{RfSyoDq941>6WKKz6ma1DF#2l~<PR%#RW;S3Jq
z4yEeq1_kM`glF(6dhoaNy{oG|KsR>tJ&ZEZF!HE0FKKT$-w)zO>N#WxHH|X<tn)vQ
z5>N>P%&)FdkVx;Kba>#@pP+Pni9G5JuO)WpEy|WndzHF}pYa@Cr}16<h-oYmg@Mm8
zf~z==zi=mxv5Exqt5Xz04160;Q-4T!d+{r-VK~qpAi(|&QIFvOp2Q^9a1XvfnyU9G
z6Rcni*PZ_nwoi^~93`M*SPxNHq#zw`;vhc8QCvpp@DpVqKNXoMi`#JqiCb+WOQKn8
zoL<~Q=E|rjS;mmNMI8Snu7<2%ss4XH%jJ?JXWU1Y6-kmn*}2xr<-GqUS&1B*9Mxtr
zr_nlJIZ`<`2{cTWz$I;MBbQI9iN>MM55c30<x<5qi*__`+E%ss+I`8@h<RRRQgMAG
zo=it|-AHEQdREtcQ^(^ctSg0Tp;U}d(AtQm^kl1@J{nD?3_aWE@kTs3tB|)A8gXyz
z$k0XGE*qLwtJM;A#Vl3}7p$v^qGfC4N@?CYZ&$UlmY+9^b0uwo_hoa=(ri;3_T`+K
d5w*?6S?_G~o%e7@W1lb6?Dao#H<yFD>km-Wb#edz

delta 1264
zcmY+?Uq}=|9Ki9>^z_Qq?2l%3jhPhY*<Id&+JCa5=#NAY6hd3KoCkM%c6$~TVL|kV
zu%N{k9}1$Eiq`6i=%s=le5eQM$p~VD{y;DNfqL%yTd$~LcRn+-GxM97oo}HZO+)YM
z%0?8ag?AxuPl-}-OqY_8HcV5h7dK)TUd2WD3On!%1~62nR1LP^DU9QEEMO%*#abN4
z890eEl^RkXDD0!*2hPXs<x>L^*hf8s65wUA{WZ!2Z?PIbqXhbeJgS7w(!YXC+N&{$
z^RWV(kx*&{RuW%DC`iXHl!<$=3VTsj+=nv2D%Ne39i2r9IE;OqnuBtb--&Vs&(rA;
z))W0Qp1=hdBv=ev@G<e#ehS@KNAwWx#C4cP8E^;NaUAOi^b7Y>4|0A>F@fLlBFgxa
z9LsVX#U=OxqxcCIV*~$5HrR<n5@0ih6=<Mz7{)rhi#+N%nM^!UZ2yWfu9V|x!4P(0
z4@&=2DDw@Y%=ZKv@C~y5zlr-M`=2__#$vM^sZ3J5fBp{Gu&U>k`@tss|JjT(xh!N3
zZxgR1`NtAW^GcFmE5GmGBo~;&B5m?>H5=wm75$w{(cc-)Dz?j!u>t>baq0auk9?`~
zv-JJY)?9XQz*gHb1KC{Ou<|-#<W1_9HWG<cK9#j}KCAQnrXDbJnUrnQV(W}y4I1h6
zac$6$w9G^sT~f9lw9TA8mP)6!k+!osY33=U{~Maj5yec%tfp~zZof{-3Ut4@(k2LV
zq^$PB$7x4O0vXe`jij@;{6Rb#j&y{haUJdGj>f`~SR^vNcXxP?c{C;K3HPw(ZoMiJ
z_4`F)I@;MCi#n?VA?IMAHLzw^)-u;Q6M+L&I}9s1Xe8;KHwvv4TS}eDnG2nPVBG1d
zshx4tb8mU>O>gXsc1~9}uD|5D*QL@XjqX$VIyS65_oC+(D3Mbcp@-)_^z%oa`|STY
vmR<1NG5?!8HTJeQcFuF}|LM-8_xR9WxDmWoRy*o{q(5^L@mXPQbw|l>^Ro5$

diff --git a/django/contrib/auth/locale/ta/LC_MESSAGES/django.po b/django/contrib/auth/locale/ta/LC_MESSAGES/django.po
index 0422439fccc..555ea7d1385 100644
--- a/django/contrib/auth/locale/ta/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ta/LC_MESSAGES/django.po
@@ -1,77 +1,83 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Tamil <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"ta/)\n"
+"Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ta\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "தனிப்பட்ட விவரம்"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "அனுமதிகள்"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "முக்கியமான தேதிகள்"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "குழுக்கள்"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr ""
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr ""
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "பயனர்ப்பெயர்"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr ""
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr ""
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "கடவுச்சொல்"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr ""
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "மேலே அதே கடவுச்சொல்லை உள்ளிடவும், சரிபார்ப்பதற்காக ."
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "பயனர்ப்பெயர்"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "கடவுச்சொல்"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr ""
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "மேலே அதே கடவுச்சொல்லை உள்ளிடவும், சரிபார்ப்பதற்காக ."
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -79,169 +85,190 @@ msgstr ""
 "தயவுசெய்து சரியான பயனர்ப்பெயர் மற்றும் கடவுச்சொல்லை உள்ளிடவும். இரண்டும் எழுத்துவகையைச் "
 "சார்ந்தது."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "இந்த கணக்கு செயல்பட துவங்கவில்லை"
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 " உங்கள் இணைய உலாவியில்  குக்கிகள்  செயலாக்கம் பெறவில்லை. உள்நுழைவதற்கு குக்கிகள் அவசியம்."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr ""
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "இந்த கணக்கு செயல்பட துவங்கவில்லை"
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
 msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr ""
+
+#: forms.py:249
 msgid "New password"
 msgstr ""
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr ""
 
-#: forms.py:177
-msgid "Old password"
-msgstr ""
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr ""
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "கடவுச்சொல்(மறுபடியும்)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "பெயர்"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "குறிமுறை பெயர்"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "அனுமதி"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "அனுமதிகள்"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "குழு"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "குழுக்கள்"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "பயனர் பெயர்"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "முதல் பெயர்"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "கடைசி பெயர்"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "மின்னஞ்சல் முகவரி"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "கடவுச்சொல்"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "பணியாளர் நிலை"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "பயனர், 'மேலாளலர்' பக்கத்தில் நுழைவதை முடிவு செய்கிறது"
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "செயல்படும்"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "மேலாளர் இருப்பு நிலை"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "இந்த பயனருக்கு எல்லா அங்கீகாரங்களும் வழங்கப்படவில்லை."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "கடைசி உள்நுழைவு"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "சேர்ந்த தேதி"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
-msgstr "பயனர் தனது அனுமதிகளோடு ,தான் உள்ள குழுவினது அனுமதிகளையும் பெறுவார்."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "பயனர் அனுமதிகள்"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "பயனர்"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "பயனர்கள்"
 
-#: models.py:406
-msgid "message"
-msgstr "செய்தி"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "வெளியே வந்துவீட்டீர்"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "முறையான e முகவரிகள் மட்டும் எழுதவும்"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/te/LC_MESSAGES/django.mo b/django/contrib/auth/locale/te/LC_MESSAGES/django.mo
index cf69bc4c2d62c22f1230264c9bd0ba1e4cec6674..f77ac1e5b820b2d1bd7c3c7328b80fecfcde71cf 100644
GIT binary patch
delta 1153
zcmX}r-%Aux6u|Mj`TJKtw9-m#GBY)HXI2wq2_lk=5Yi9|L}*$kch*{$-BGgwg%G75
z53y-f4=W*(FS@cp4?#inT7N)6Oi)nx)Kg(S^gZj^WoAD2&fc9l=bk%DHQ%czK9}dt
zD%xSrYR+DdQf+u|3m4j@9HpAj#0tEN`Iy8ST*Ov<huiQs7Gq(qQl(gddr-@c16ato
z6Spfhp}OhRa>K-3IEf`Vhh_K-FJKA}VPW3J1AQnDI)f5WPj-9}<^Lvb#cL=5-9ipE
z%|+(l&)lC->LHyXZX}U+s3nvKFJ~qw^%CWQZ&5P(fHLnBl7Vtj=Kn+vwaz8UD#}~>
zV7@@9v-lSeU?-DxwDAt_SC8o&!Fr--#%^rHo7jO1co2VJ6_$~X%xl1Y>_I=Sp#1&?
zr6lV(g+8Jm!WSqn*2qEv>Bb3J`WPMY0m>doA%}XO9e+fr?JtxP6;PK$Sc6jAQz-NM
zQ342KIo{5W=TP?43d;Y#p%4F*QGbb~nL_QuE|is%x=Gu=fvQ6ZP?lY4x07?T)ze{N
zGXLL;@?sWLu@5tiq%%RuK=w3M$RsH%s#I_za;ckSxY;y1JF)}Gw31UYmA0Exz6AMV
zBzS4^CCFZo>{#{xjYL&LVm9Y#qCGd6Sj&A>)f=+oni&iZk3<}et{pLhjy-B6Ci8-c
zwY+3oi`QuN`j2Xc5%9NpjdsH*?mp)|Z;je<dpP3lFdZwPwHW@)JmZ+=ZwVOfi8uL`
zwU<L?e8`MxjukewaVr+FBDQus8XFl1joRahulaSS8$*s04e0vV*qG0WnUT1C#k%f`
zSdJcz4Tr6u6W62qK-i274(nIBj+ld%?pS(LaaVQ};PHvVg1&ULVAYduFM8!kpC~!$
uX`a#C)SR1o?WPvEGMI8xPu$h%%=o#RT6R}w+!UR~^o`OAPkO$r$ny^!e5>aG

delta 1196
zcmX}rTSyd97{Kwfx~|t%b1TcdjOJDrTf6NphDm}5MhS&42`aJSAR@WttVR!I30+7f
zXc99a3?k`5j7ri|CI!9q7Sf9h^ibrB^pJFU=>LsVAA9C^=FFKh=X~ev*U~3tLn}qz
zaYfWnN-13)r4HlsG%m!w^o?he7~uXb`fwS`a0R3I$88ULl`7!A7IUx}^RN}S<7xN)
zB4#Nyq^?sb<iTw$$7$Sxi?|s-VlI9|KmNc|=*>_nh#km4Y8Yi=Bkuhjl=r4EA7@Y|
zw1E875*HueSMS{iA26E-pD+_YBi~Z1C?8lu8Q>?%z+S#4D=S3lSBA2XDwO_Fq^qjO
zHnQ4??c7f>_%U3^O1`fe>3smZ@D|=h$v_3O*@to5iwWF=qu7KmaVP%5ZCK9iq+cy|
z;u(zK8*IVvDE%6ky=++<4qc-%N~ITzSWYEgMrSKr7g5f}3i4CG-TN%|L-sm|GT}G|
z@i@v}pT{B`L3!^1$^@Rd?eF~LUmBKah~pZ{K)cwm{aBAOp<dj9V@M{Q$$)atsM<uG
zS5<{H5+u;sO39XNjf6}@lL}EyDRFA#e>W8};~Wy1y#xvQACh7@i2p+NSVC4V=Y)gr
ztQJ%irI;f7?kof)WD)Xjsi8<_|3yI3Dl3!NN|7{iPMoYLvon3l*W8~RIA@sa>C=IP
zVO&V|cWM2)p{KNDpB6OCaqpygG$Y|Vs~bk5+nmXG7>|U)(NH9=MWS_)SSTC|hjUJz
z2({{iJw{KmFVvJs>2=z{aAc!jOpC<o;)l#jzT*5rT_4o@wE7LrIbT&;{SmVyvpugR
z(bqkY=;p<gKA*~*^At|lvsZ0v*tVWJmAQE>d&!d(G@OQ;=9OHn`jKrd+Lq;9C%9_1
x^}@DZOVjL_ZQbWZZQjml^q61#0ka{$z)a<>7QS*ueQeL(u&o8^^Bw*?&tFO2w738O

diff --git a/django/contrib/auth/locale/te/LC_MESSAGES/django.po b/django/contrib/auth/locale/te/LC_MESSAGES/django.po
index fc766993b36..7daa0a87817 100644
--- a/django/contrib/auth/locale/te/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/te/LC_MESSAGES/django.po
@@ -1,244 +1,273 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+#   <prudhviy@gmail.com>, 2011.
+# Veeven  <veeven@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-14 14:58+0000\n"
-"Last-Translator: veeven <veeven@gmail.com>\n"
-"Language-Team: Telugu <>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: bhaskar teja yerneni <prudhviy@gmail.com>\n"
+"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"te/)\n"
+"Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "వ్యక్తిగత సమాచారం  "
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "అనుమతులు"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "ముఖ్యమైన తేదీలు"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "గుంపులు"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "సంకేతపదాన్ని విజయవంతంగా మార్చారు."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "సంకేతపదాన్ని మార్చుకోండి: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "వాడుకరిపేరు"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr ""
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr ""
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "సంకేతపదం"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "సంకేపదపు నిర్ధారణ"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "ఇందాక ఇచ్చిన అనుమతిపదం మళ్ళీ ఇవ్వండి పరిశీలన కోసము"
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "ఈ నామముతొ ఇంకొ వినియొగదారి ఉన్నరు"
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "ఈ రెండు అనుమతి పదాలు అసమానమైనంగ ఉన్నాయి"
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "వాడుకరిపేరు"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "సంకేతపదం"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "సంకేపదపు నిర్ధారణ"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "ఇందాక ఇచ్చిన అనుమతిపదం మళ్ళీ ఇవ్వండి పరిశీలన కోసము"
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr "దయచేసి సరైన  వినియొగదారి నామము అనుమతి పదం ఇవ్వండి"
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr ""
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "ఇటపా అడ్రస్  "
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "ఈ ఖాతా అచేతనమైనది"
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "%sపై అనుమతి పదం తిరిగి మార్చు "
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "ఇటపా అడ్రస్  "
+
+#: forms.py:249
 msgid "New password"
 msgstr "కొత్త సంకేతపదం"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "కొత్త సంకేతపదపు నిర్ధారణ"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "పాత  సంకేతపదం"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "పాత  సంకేతపదం"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "సంకేతపదం (మళ్ళీ)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "పేరు"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "సంహితనామము"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "అనుమతి"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "అనుమతులు"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "గుంపు"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "గుంపులు"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "వాడుకరిపేరు"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "మొదటి పేరు"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "ఇంటి పేరు"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "ఇటపా"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "సంకేతపదం"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "ఉద్యోగస్తుల  స్థితి"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "క్రియాశీలం"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr ""
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "చివరి ప్రవేశం"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "చేరిన తేదీ"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "వాడుకరి అనుమతులు"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "వాడుకరి"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "వాడుకరులు"
 
-#: models.py:406
-msgid "message"
-msgstr "సందేశం"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "నిష్క్రమించారు"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "సరైన ఇటపా ఇవ్వండి"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/th/LC_MESSAGES/django.mo b/django/contrib/auth/locale/th/LC_MESSAGES/django.mo
index 604955d0a824bb1b3cdcb9fde6cd5d5672400bc7..100c0aee058dd15b9dc3ebe0470d7ba839763d0b 100644
GIT binary patch
literal 7883
zcmdUzdyHIF9mfw31r}651yRHUify6u*cPNrA5gc25GdU=TagGMcW2JbTsm{_dheYs
zOG2cewiHM(@>(!xOR!Qj0Rfr$r-_M)qDG02|J00$fA|P78vio>;pcbGy>n-FW-BKC
z<7Do9&pr2?-{bpxoV)wG^G|<5@!8CEG1os%QEE5%)6@9jbLP90S_hs5z8~BO&Vo0B
z*Md)j2K)v1Zg3Mn9|f-iH-dM9?*qRAPJu_jbHHzd7lFO>{+HmH-1otA!9RhQfd2$P
z2wrrCQXd0L;Mw4A@IBz?z}r9{d=mUVxD)&=!fpni1MdL;49<f$o~6{~;Bip=d<zsi
zG{)TkRzR`i0C*>O7~Bs25yTXA1<Ki?ra@V^ImI0yU$u*$_ky>BY*9@RYE%r${w45q
z@c#7qmr{HT6uHl)&tCvV{_*trs~}%>f*;xcV^DbfIVgPnCY^sfz5hEX`%hz$=syQ!
zN}Ufb6XQ!j;jIga8^Cih`UE%w9t2M%XnzF{gM8J!C=p%{gAapmfmeWcoaf?n5c~x9
z-vn<4f0Eu`c)n5};(iM#`LGw1=MRCh|JUF)P?C$Gx(-|e?g4)U-V3&|cjg1+1oy9y
z3_k>)y+ElSfYl2fu0_d4?%xLA1TQ71W$-WH5%A&<J3CK+ry=jR;1`(x{YRAIt2~ll
z_`eSn-VTCd_hX>g`64Jh{0f9R^@sHSZz-Na(o0;<110VkfWp_MpyY1@lzsPsBKI&T
z{yv}L_dwbICRhM}28#XvN}m@f2ARJe<f{UHWdEa}*!K+(w-hv~PjX?Ff+G77y;pK=
z;F7Y2QkydpFWD=4*Kw`ql8@x6^n;Ic5yrvi(sWb;q0ibQQ`c}226Z*pG}pCUQkxYn
zv9-u0+-4u)`>O0FMe%hlmvFa<3%6~Z0)vml<!mm=5Aj`il#j$+V)H4v;iI{vSIFlw
z2kMLzr8cGBPfhQoHY7f3yY9p$(u;o5)JfAz>}}w+jrLlR@oG!j+~dbdTvRhnFK8IO
z;KlJ`7}YBJ@>uOKvEK;1#KdlM()42|u<6A}Xz2wLwf#8u!yvXw!cKz3g_d9Slh%?(
z7y|sD!G6;&4hvjt8s;K-;6zrvK)1q%_Jbs37ENBQ?FTyc6SK<B%$m3vc3L$(Z*+oF
ziK(Gjd)36>Z;E<v5Sx~%CQhaw#0h@uu&!%NCt{mdt%jXINZ46udwxsp3=%B!^nS19
z*R-*dSW}BkEQ{<@u{#zbGsdjW`Eb8kuj^r?_nXMC`&BQ2o1(g@y%0u;7bLnSbgEmz
zMgudUOWkS~2Qo%(bTtg>e$=)i)NUNiRH@lCN`rx3>oq(-SeH*!Z9Ho_?o_LoUGKD7
zOU0qb!?H7R8V60H!$4oYR%pLVGG$$?X7eb^I1U4^MV#uPnr#^`Hrk|wRl_I}swL@M
zmIb-hMSW|S5F$y#`H+OH`=(VRP?6D9q!eNkpjCpV_INodZbc9#I!?mK)Yj`*62!2L
z1PDUC=q+h-CN?5G&51SffUWg<o~&F7J7@{C<3;ul7GSQV!4^+9BU9gcSw?f|vTar#
z;cRaydD}3{e7@sjLQ!uli=>DogAYx->t@kJMSY7&WM;jt`3*n8bO^Y<R4iRtDwOVm
zSqZ{_AtmUv=S9J&m|U}(6E;UPRM$ci2Wt}D^!8KdfmC5w^=)0)Zjk1CQE!Jr;U(_4
z!5Y>_ra?o1+}d>rH@Xppodv1?tk~vFD-0UUga~k@yXeyj8f4DOme7budGeg-7_Zut
zszXjm>fXvNS{2D+n8zYbike>&7fAkU)2$jdeb}Y6w_)B28i=+ejmzobc#Axir!+_s
z`9az(+!N})W6-@MC74iGHgKAD;bQxrqEb|Q(*jVphn+~@X6E&L6fR0D&Vu7DEEtdW
z7rHQ2!*HKZpEZFu-;xBINhhQ_qBQMnW1&YjBwc;lij^J?bp~odWZ3wzBCSV~PLEWo
zPpG6{6qWN^d96kmaY(dPwP~vR;tqqbhB0lUq+{v3Lq9MzHA=CfJ;jN(t86@#%NE7)
z&{Q;#$o8&SwLF$#xF5Ko-C=*ST2uK+GBk`;?6ndVCtkfy^?ON&nGQ>BGNcnSR(2wn
z5!(r?L7v2lGi{%)<82tJ*(ki5E>*axR`?9hXwVhC<8F?>aB7c{K3&)qH~d=R)15|K
zm<ua<YIgTrVMdM?))scaM@4TaPj4ucHx{O^(&chx`szaYnsS+ig*|4!FEUrGD_^V2
zS5-D#b7h&&)GZKFn4>!4mWN3deRD`2>ls=~XaZ=X#1n6x9<I0SlSkq84LO>M)v&#d
z-9e+{HB4d7c<qX&2l#qzGf5UIrPAW!VlffHe%;(t3`|m5aPG#Xg;LFWS!$*GOG&e|
zZXm5fkx%WqY1hu2mFZ%6YK9UZqY86N3%H$_dyv>7cQ)Gw$a%4K@7xWAP5C-eUN=!;
zC+SxsQ!9GYyq`?XwmOm5D%?ObjVn4>u($En>CM^=x0a_=zk9gfeWTwy)bD<$-~C#@
z+w1op>h~U$c?R9(e)pAh(EDP)`?wuHDa*PC@@4Yq*?#Xpzx#q+a7^`k_sbOb-Pf)3
zqgK}Q{q9R5v3p#UiPrBjFRwltQ`rBiU4Yid?V8v6-KYB9r~BR4`n^Z&xNDbT>(Olc
zL2JiLR`E&)bien2mBngoJYx4eVV5G}pp}IMn03Sw@QhW@m`N;Np~kw@V;A;e7He_|
z<K}0!$Wq4v?!Ih^dB9r0eyb^G8*xl7TZhnb+?spL>cb6Z@jxsL5iB@^V;p$7-^Kc8
z#_SO3lgY8_U$;CHQL9*_49q1)nTev{$#-UYnk6s~U6}TUH5@ZBpD$U%7#)toA!1}P
z9-KTM*+?pom_%KYPSOUch(Q}{zTo`FToUE0;(++?h#Xlr<Y$)7-8?bK-@!IyO~_fR
zka=`E4{gqhWsXQZS#}&eH&kFx*iaEsQUQ9gh;{hEjH7y@E%KO}8D<O~9Cb*cW)Q)G
zM;#fKWzm30xW@iGH&$~7Z>=-EL&zZW@d<SdoL<BrjLkUU`oTeaJCT?XS*s}|T%>{+
ziNeW?R(+t?ra>3?aGmX`QR@gClHY0Lu|as%Zh5{hg?-3o=b(vAVB%z^x-5LyN^+5&
z#E*o0dByv_HDsjO;k@e-M3Wrr*;*QI2sRR3I&B)`@q9mNB}o-haAd}0kNUj_v%WDQ
zC$%-|b*tMZhKM6uTy--*Zfan^O99{-PCO?~+{x`eO7IJodDw>e130pZC3#1p<sk|F
z$QwE-p|>4fLXKvnJYy%1(ILiaFJC=y43lu-m=($yGvtmOKTy7!K@ZscLtoa6#i_x8
zNg9ZH7@?tHDQ3FhP^+%WT`jqW`i^t8hgQtuBukY|{QJr3g(1FQw^owaoSe8yJ&R@X
zca<)}HkP^6=j6r}y46qv9E$8H%MyTP`D1J-z@#W`0)JnGvQaUv8m;`*HstfNn4Bc<
zk!6!pW?X>}-cc~swOvR&I`o&G&84SYOR>(T?=9;8!_&N6M%f(vDT^OGaV>^uLQfjd
zybeSLDGNjJM?_p2$iZNbRrZoOyuy9i4%p7(^k~p|nhN>6g3t<CO_IPi>)atnWibQu
zSx!q;xtBr=LNVu(d&NOF^+YE?l#QkwjcK=HY1azEkHJAUUP`#je%^5oVcqy+3~@cc
z>BmOrGF3*7BA1fpUBSIJ4h}7sJJiuYv9&HYD64HrJ;uC13|vfA5D7+;TKk~Ktc=7m
zdthWJ6cZfEEE3HaMYwPg296CK1;eq;)=OTbM6Jvb@qRo_#`=&;KKEKhXww)^c5>X4
zaRpe$O9{4;DdPG-WVRHAq7B1&kHg)x1?8<k9>EqgNKeV<WijdVKW`ByJ1gBg1*wli
z957fwD6xsuVEph<m(6l#q&(~qC2xC>LBjLPUV8t7*^!a*Waraz%nA(uT_*51S(=7=
zyq^g@Ih_N!s5yx^mJto4TZ6<C_rAd`wo26v8w3YzaPJ?;otXTH;1qWKfpVn?AIDfU
zuwne|WECl{$;mGKWldVRPQN>1GrlrLCjBqP?j2Z}M_1W$BD3&4tDh0yIWF<w7@=Y*
zNk|pq*AcRg`w=;qm^U&Wj^3~Qhl~|-GKN<;Y@+~cwo^%PiOW&6U^gS|AxLOs#h77}
znPo3qMmpo9Df{mqyL9+(!a-v5E{6rKGSfIXDZ{JBd$oN96e7PxL9=1yiV2q3?rR&w
fq}6#OCJLJ%pZ6@xCboPT&@iFT=DsAtP`mm!p~jH@

delta 1906
zcmaKrU2IfE6o9Avl<l?!N(=q5twW_0q}%ScCE}(ufGCI%(Nr-4CO7V7_sVv+*}J8h
zNGjC`>I*m$q$VIG27+QDEAjRL@Iew4CB_FINQA42FT5Cn4~-$l@7&!+eeq<^e)pW2
zIdjgLnQLqRjE>!0H0P*7deLU|^D?D2!L76TLsD~;S_vIk3k}>3&%lS_G_+yQT&2q4
z`>+L`gc9>o$$tkfz@CQtVTj3LrN-2od{p5$0vq9plI_6|_EoqLUWcvl7F-Pff_1QN
zo>G-?C9H<4;STr++yy^??Qj}O{8oZK2iL$5`>P{-?8Y$x*ULmmY!$C4Ca@mL23z2K
z_$(xIWkZTl!%*h$EBW_Be(Df^?5W;`G)YZBLaUQd)}Muy?5_%ZNC&P!sq{N23w|!y
zzd~7f7s`hB;8PsaETTxIgJjnOKY^FwEqD-~An5OKIc<^FFCqI!#fI;|G#m@ggpUVt
zgfQ;FUMQ_@C!1w(BYXlnCHo?5z`g<HjPI7lJ8Ft?T(|-M3AhOU0z2Rz@N3wN^DFq<
zBKj`@&T+G%@Ftvq3piLw;2fMyrQbm5)b||xeQ?{7Vge47#K)l&avn-2FO}?XOS}Q4
z^4n1EPPD$r$LfhH3wGg<iX12zkC%89MzGI9N${tVe;$*?-vlMm%}~}QA^8R(4@lOC
zNcEhWdO!?B=E@xis-k<U6KzMAqcK#f6p@S7jY^VDsBF3l6<JY4a5v~|a7jz9;3den
z+#`7<^0d295$V{BI2?V@I&n~3aFIBLpenh&a^d7Xi>yTNN9D*w+KNz1p++e_xG!`$
zcxoV!S@K^fn|ruy*QQ){WY|@Y4-IE?c`K9G2`g`7XS9__IC&?V(fO>-r))iJ=Y|~D
z#pCKBD>GuH)30a?M>1n4I+^0Qdc?JJdelj$wUu_W#;s_tP09v3Wp}&8V2YFJG9Q*t
znr-v)=61+3pH?h0ZQ+I;&$zbk*lDGc+1<-_x>h<5QufOUCuzI+-5olcljuPv{gzJU
z>^*DShS`2Jn@e=J4ZN7LGD(swdGwxaZm7T88Zcww3ua?wzd2mFxO~WVT`Or$SFSKW
zRBkY>Rh!3Rk!Wuuwpzz}<FUR-v@aSBZ+|lKw7t)fN+TQTMqKwqW5K*=pN_4G_r+F4
zk?>Z_%|`}vR>n<R`D`w(w^*4B752Xra9!GV5_Y=F$?VAvFgcSPv66OV(6)x+dN5@<
zx_=;S;?>Vr&5XsVu3)OK&8|M+dms6p=T9B-y;EjqO;`9mf9fsYJL7wkW?gGt(=p$>
zD5Fzv_+D}7wC{c9dlTBMYp7dzJQ!xdWZ*q$MjP74re62Gk0p$JydA_l?|TK`WA+8#
z`*$$*mtem4pG16b-1k^=(D#nYs;SpzOq>^k$^WFOf-wdNK@}JL!m*mYW#&rbDs#D}
zDilONuG<T1YeQwmuD@z}n(Iw@W2d>-xHLMG;s4zTDaNDfFWAWJUHp)#ncrEi<;=SZ
jmzusTGl!cGn58W*)Q-=TO0Q@jrJgdcwrn%kTYmf-Pqexe

diff --git a/django/contrib/auth/locale/th/LC_MESSAGES/django.po b/django/contrib/auth/locale/th/LC_MESSAGES/django.po
index bb5e510347e..ddbd95d99e6 100644
--- a/django/contrib/auth/locale/th/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/th/LC_MESSAGES/django.po
@@ -1,246 +1,275 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Kowit Charoenratchatabhan <kowito@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Thai <>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-09 04:27+0000\n"
+"Last-Translator: Kowit Charoenratchatabhan <kowito@gmail.com>\n"
+"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"th/)\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: th\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "ข้อมูลส่วนตัว"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "สิทธิ์"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "วันที่ที่สำคัญ"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "กลุ่ม"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "เปลี่ยนรหัสผ่านสำเร็จแล้ว"
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "เปลี่ยนรหัสผ่าน: %s "
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "ชื่อผู้ใช้"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr ""
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr ""
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "รหัสผ่าน"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "ยืนยันรหัสผ่าน"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "ใส่รหัสผ่านเหมือนด้านบน เพื่อตรวจสอบความถูกต้อง"
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "ชื่อผู้ใช้นั้นได้ถูกใช้ไปแล้ว"
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "รหัสผ่านไม่ตรงกัน"
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "ชื่อผู้ใช้"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+"จำเป็น ต้องการไม่เกิน 30 ตัวอักษร ต้องเป็นตัวอักษรตัวเลขและเครื่องหมาย @/./+/-/_ เท่านั้น"
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "ค่านี้ต้องเป็นตัวอักษรตัวเลขและเครื่องหมาย @/./+/-/_ เท่านั้น"
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "รหัสผ่าน"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "ยืนยันรหัสผ่าน"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "ใส่รหัสผ่านเหมือนด้านบน เพื่อตรวจสอบความถูกต้อง"
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"รหัสผ่านที่ดิบจะไม่เก็บไว้ เพื่อไม่ให้มีวิธีการดูรหัสผ่านของผู้ใช้นี้ แต่คุณสามารถเปลี่ยนรหัสผ่านโดยใช้ <a "
+"href=\"password/\">แบบฟอร์มนี้</a> ."
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr "กรุณาใส่ชื่อผู้ใช้และรหัสผ่านให้ถูกต้อง มีการแยกแยะตัวพิมพ์ใหญ่-เล็ก"
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "บัญชีนี้ไม่ทำงาน"
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "เว็บเบราเซอร์ของคุณไม่สามารถใช้งานระบบคุกกี้ได้ จำเป็นต้องใช้ระบบคุกกี้ในการเข้าสู่ระบบ"
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "อีเมล"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "บัญชีนี้ไม่ทำงาน"
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "อีเมลนี้ไม่ตรงกับบัญชีใดๆในระบบ คุณแน่ใจหรือว่าคุณได้ลงทะเบียนแล้ว"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "ตั้งค่ารหัสผ่านใหม่บน %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr "บัญชีผู้ใช้ที่เกี่ยวข้องกับที่อยู่อีเมล์นี้ไม่สามารถตั้งค่ารหัสผ่าน"
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "อีเมล"
+
+#: forms.py:249
 msgid "New password"
 msgstr "รหัสผ่านใหม่"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "ยืนยันการตั้งรหัสผ่านใหม่"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "รหัสผ่านเก่า"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "ใส่รหัสผ่านเก่าผิด กรุณาใส่รหัสผ่านอีกครั้ง"
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "รหัสผ่านเก่า"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "รหัสผ่าน (อีกครั้ง)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algorithm"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "iterations"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "salt"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "hash"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "ปัจจัยการทำงาน"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "checksum"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "ชื่อ"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "รหัสชื่อ"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "สิทธิ์"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "สิทธิ์"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "กลุ่ม"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "กลุ่ม"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "ชื่อผู้ใช้"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
-msgstr ""
+msgstr "จำเป็น ต้องการไม่เกิน 30 ตัวอักษร ต้องเป็นตัวอักษรตัวเลขและตัวอักษร @/./+/-/_"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "ชื่อ"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "นามสกุล"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "อีเมล"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "รหัสผ่าน"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"ใช้ '[algo]$[salt]$[hexdigest]'หรือใช้ <a href=\"password/\">แบบฟอร์มเปลี่ยนรหัสผ่าน "
-"</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "สถานะของพนักงาน"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "กำหนดผู้ที่จะเข้ามาใช้งานในส่วนของผู้ดูแลระบบ"
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "ใช้งานได้"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr "กำหนดให้ผู้ใช้มีสถานะที่สามารถเข้ามาใช้งานได้ เลือกออกแทนที่จะลบชื่อผู้ใช้ทิ้งไป "
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "สถานะผู้ใช้พิเศษ"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "กำหนดสิทธิ์ทุกอย่างให้ผู้ใช้ โดยไม่ต้องการมอบหมายอย่างเป็นทางการ"
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "เข้าสู่ระบบครั้งสุดท้าย"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "วันที่เข้าร่วม"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
-msgstr "ด้วยสิทธิ์ที่ได้รับ ผู้ใช้นี้ยังได้รับสิทธิ์ให้ใช้อำนาจได้กับกลุ่มของตนเองอีกด้วย"
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr "กลุ่มที่ผู้ใช้อยู่ ผู้ใช้จะได้รับสิทธิ์ทั้งหมดที่กลุ่มของเขาได้รับ"
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "สิทธิ์ของผู้ใช้"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "ผู้ใช้"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "ผู้ใช้"
 
-#: models.py:406
-msgid "message"
-msgstr "ข้อความ"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "ออกจากระบบ"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "กรุณาใส่อีเมลที่ถูกต้อง"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "รีเซ็ตรหัสผ่านบน %(site_name)s"
diff --git a/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo b/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo
index 9f29116a6951a7515e999c06b08078d375aca0fa..adbb0228ccd5694593645df71c3d985e0733c0c6 100644
GIT binary patch
delta 2457
zcmY+EYlvJ$7RM`_Y%-aNnaso(qiZZ5i8C=X-IJO47~^U}Rwq746vSr?)!o(ImA;SW
zJ~G?m!tAoEA9P{W>x%56gQB9MV2lci50bQqBKSh^h4@8LSwF1kF3Pg_JKcAZSoEo1
z-MXi${&mi|{lE49*)aRr;G(}P+6CBeu<sWrwG+OzkdD^#Yo&(aQn(V1!(H%Fcs{%j
zTKFDZ49}xG1zrTl;cnOu?}EMXLAVS)3D+n!t6s<_-iJNB_#Cc)U&FQVC%6i(S)$ab
zumJnuPIw%=5nc-&ycZsXzk}DY+2!y7coX~vmf)pJm0Aa%fIB%~y~6+{N+a(QI0;3_
zpWtqIJKPGtf@o12IGrVG42s_cIk!W8>Pouh@OsD+Rfhye#ZcC_;3D`(dC&RkRvExM
zp=|um+~E-@2RxC#KLGiuSLkGeH=%^`Z731@G@t)AfBp{2`h_@&fMt*=H3;t_&1>Q8
z1}2^+juPTe;9mG|xC7qAHJb2IC^uS7B2S0wq2zuCl!N~ar8e$?a=>Hoc=&Ao{05Yp
ze*pQZPwCEp|LQ0HlEW43qTyO7iZ6l#a0=Go4e(ib2ucp8d1>IsP*SvIP^o?JA5dy$
z05zAvB0K@!0;MMIhHRlegg3*lR}%jb22;qD5bcAKf<HhJa$C;7K@oZ%lt?@ZB?Zsr
zd=XN2>ec-Dbx3s8TTmkMQU3mm{Qb93BJ$mAKJjDj@P8;@-eU40LV6*WQpZEt=q!kf
z8i#U|DJX)jha#{JNo~hxJ(N#cA|Oo!osDh6<P3tKW@VEzF{uN&(J;0VlO_t~e?f93
z>6mY)<%0q|36ls)I~QAxZN|nhsSy!1iAh>UF}c)yJ6XQ}iTS6TML2}@V&`G<XR;1E
zwn=I_(SQ=26Z4njPzvmv{8>Z!&yXgCD^1cQO`^6&ynoes?B;*ff%_NzbwU3QzZph}
z2@+i~iH)<D7eCZD6uZRk35;)tvpq}FSu?GhCXT1Ws1j=vSsjFlj*~F5m5n+MbyBxX
zx|n%AZCW}Bb!;uuOr^1n&Wew$->6GzqFZ6A%O=p}x(RCHXpcCszy&qE#prrus~4Wm
z!P#d6J;!x6tA>%krC@%Wy}RUxp;{EC&G_gkx@5gDs4)|c>aCrF^|bT6?AFEW2EwXF
zO#z|0vu-py*fV^E?RuGVIZTNFcMQvpFjQEW)Vo{T5#KmZn@T0JaV)as_Ka=v3*p(9
zJ=N@yrB4kSuNFou_f@%W%Z)hov#WY9Jfm*nx+1QTNn9Aj$}@4Iy|Ctj?vQY2kM|BO
zG+vUu-MhVyXg74#lnHY-*tcWzrjg?K$k>D~7AMCxj}*@>7JGN?9J$)=b20mkY)AH_
z-c%gx`W5xq#N@<8c4yyeeWguYptt%i3aeEj+Z|k7lY5PpLq9v%x8{<edXh9J3x(<F
z>Cq%ILF}sb_oIPL3e70oYs*PoXcj7a$yZqL=u=a(g(NBr_g;}dP3k1dKJUBnz|^w;
zE?9B+-oW~v(}{^(-Lp}4X!#v_mx)5pbc5$v-^Na_JEqv;?6&^D?4B~der?WGBg--!
zn+C`ErqbTuo@?(9DwItl^_Xk#FSqx5CSvlazYCnM9ezIYZNQydp_kG%k~G>#EE^`t
z-W^!AwUkDtVj51**Aqo;WV7xWEhKgYw4AQk_MCfdE^(19InPB@r<=(dE6UiR*=^~u
zVvrQ*l4;Mekq*5|+MY`(x3r1MQN7JY$2uQzETvu=9Pup~ZTK9yWpel>U$<=1aKyn9
zh`MXCYZ{HJ_S1+*VzznU#Hnkv9chMf!a^xgr}4)SEh~eHi=5~4r0X^|C6U<dq#;IR
zr;KqT7c<#q1ADUm!H4Gy*f%PcyBObO&kUZw?PvkVtuWw9Dh>lZ<68V9B#c`WqOUq#
fH+ss=P~6gS0hOdP*(odcEEgrDA|XkKUs68<pUNWj

delta 1940
zcmaLXZ)jCz9Ki8M+orp7%{iw|OP|cSsk`%DH$~T&7S>v7i3kas!ZYu)d(U?MjC0P_
zt{Imo@P$#rp`=$cg&@Re`6`fJ=oR`034&ITLB0u!2%_>uQQzO))t5c&IiK@9=lOSj
zzjOEJ#=qB>?<}c%TT!-AAEACVPpJ_+`4AV%xjLmb;CtAHU*dlJ0e4`gUMY){*nl_i
zQM`?P_(!dO0}oqhXYdu=g(;=V>QinO(eXKU;H_HwH(W^jA6$$L3zS-o%ds7|;Zod-
zO=z$gJ$w;g#;5Tn?!gWg8$*kocojR?U;V_*Gjz;vRO%3pAYJM_9>$CKBsOwf&Z739
zJU@W4@hCowdE`$W<HAd;S5d~Fs`bB#ET!H>&ZI729s8?`+{l6-A%E%<F0yb1B{DZq
zBJe#Db@gkl{X5FMItI&z&3K6Pwc$qEE|VovXK@lQ;RvoEOw%}yWjXmxZr0+DC^@aC
zQ%<-OW#eI#1rDKn1J_UvcpD`JcWdo?C~sUxq9xZ&Tpq_&$kJ*j%KH0I4t}bI__uO%
zhK@X*$8k)tt3eMX1z)4&KF#1|xECe2N73R3C<kp>qSO)8n8q?nWG<m>cp2p&SCF%+
zFP0F03F)_Vh<8xl{4UBH{#<MSg|g7UDC6o0gS=@9rQM1$Zy8FCS0h7JH_AFsphRjI
z<)C9I2k^?=kTSKLDi7`#`8i7NcwGHiZm2!zs+q<4wfjvd(UG!}N-(O2kpoMSgUC-(
zQo$#qdZ=<3iDa3GSIZWz>!_Vn37w`&k?%rE-yGHJDz1D>Y7JGwDy5g&U%i_Pu|z@s
zg~*2}k&?2RD$%%K__?pIhGBiJ=P}$$T|w=pW~dTgb-BL&jd^3kVNjfo)QC47gt75s
zoinke?Q4_EIk6M?Iu3MPuzK2to)bm%MA|cc(YS6&8#?m7&Gj(EiF7ftp+4@ot~PEI
zBvE5$TV6KM1-m(74Td;=Z*s2Te6nvrF_~GoF?ns_XUT_+>yovp@h;spYTSHqc-?4Z
z+!zY>rJR$uQGB>d2cax4M@iPSwy!u^Fn*p>af0JPn9~zM=nZZ*LrFRHak9H<FgerI
z-r(6NGWp~}Q+INs>8WJ(qG!w5bfzzz-Kw*F1KIv`razNO?SCPCz#ent)zZ6p{Q<ot
zldX=+^y}>Qf&T2K3?;SKL~;6HX#B`EaS#sZ=Zx?3N`sSCce&QdS-02mCxRgc`}v~D
z+w?(eya9c%7*07+K{pIOANY1C$u^HJx<6z<$KmDE&G+V&hr{BuYeIGH9p8Gcqhk{~
z1=mW)3G3>BXJ$$p66IB9ug~a$nWC#Q>+6#7E3-PP%!Z~%PZeEP+D9w1J^I>}l8qeZ
z=8Bb>qR!84A#)zgW@gTivO1>sCP~Zb9i5Sm96kic&)F%5^hIWzDV5n1GV%J1GZD%|
z$CoW9n8tpd;XWB!{Ce_Tt4Y3Ty_&SP>EvYFSoi;>wPdPGmJCOb#CFXsp32$EjB|Y^
zcEW0Ei+=IJYx&hY-)eh5d28wRj)+h6gi|u1ja3wsNTa97yO~UWS-LVwwIBHp7~61v

diff --git a/django/contrib/auth/locale/tr/LC_MESSAGES/django.po b/django/contrib/auth/locale/tr/LC_MESSAGES/django.po
index 1aa99f21d43..eb515f5161f 100644
--- a/django/contrib/auth/locale/tr/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/tr/LC_MESSAGES/django.po
@@ -1,79 +1,91 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Metin Amiroff <amiroff@gmail.com>, 2012.
+# Murat Çorlu <muratcorlu@gmail.com>, 2012.
+# Ozan  <uobasar@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Turkish <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-10 14:44+0000\n"
+"Last-Translator: Metin Amiroff <amiroff@gmail.com>\n"
+"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"tr/)\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Kişisel bilgiler"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "İzinler"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Önemli tarihler"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Gruplar"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Şifre başarı ile değiştirildi."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Şifre değiştir: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Bu isimde bir kullanıcı zaten mevcuttur."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "İki şifre alanı uyuşmuyor."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Kullanıcı adı"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Zorunlu alan. 30 karakter ya da az olmalı. Harf, rakam ve @/./+/-/_ "
 "karakterleri kullanılabilir."
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr "Bu değer sadece harf, rakam ve @/./+/-/_ karakterlerini içerebilir."
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Şifre"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Şifre onayı"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Onaylamak için, yukarıdaki şifrenin aynısını girin."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Bu isimde bir kullanıcı zaten mevcuttur."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Ham şifreler saklanmadığından kullanıcıların şifrelerini görmenin yolu "
+"yoktur, fakat <a href=\"password/\">buradaki form</a> aracılığıyla şifreyi "
+"değiştirebilirsiniz."
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "İki şifre alanı uyuşmuyor."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -81,11 +93,7 @@ msgstr ""
 "Lütfen geçerli bir kullanıcı adı ve şifre girin. Tüm alanlar büyük/küçük "
 "harf duyarlıdır."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Bu hesap aktif değil."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -93,11 +101,11 @@ msgstr ""
 "Web tarayıcınızın çerezleri desteklemediği görülüyor. Çerezler giriş için "
 "gerekli."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-posta adresi"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Bu hesap aktif değil."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -105,103 +113,125 @@ msgstr ""
 "Bu e-posta hesabıyla ilişkili kullanıcı bulunmuyor. Kayıtlı olduğunuzdan "
 "emin misiniz?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "%s sitesindeki hesabınızın şifresinin sıfırlanması"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr "BU e-posta adresi ile ilişkilendirilmiş hesabın parolası resetlenemez."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-posta adresi"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Yeni şifre"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Yeni şifre tekrarı"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Eski şifre"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Eski şifreniz hatalı. Lütfen tekrar girin."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Eski şifre"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Şifre (tekrar)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "algoritma"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "iterasyonlar"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "tuz"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "hash"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "iş faktörü"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "sağlama"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "isim"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "takma ad"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "izin"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "izinler"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "grup"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "gruplar"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "kullanıcı adı"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 "Zorunlu alan. 30 karakter ya da az olmalı. Harf, rakam ve @/./+/-/_ "
 "karakterleri kullanılabilir"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "isim"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "soyisim"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-posta adresi"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "şifre"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"'[algo]$[salt]$[hexdigest]' yazın ya da <a href=\"password/\">şifre\n"
-"değiştir formunu kullanın</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "yönetici"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Kullanıcının yönetim (admin) paneline girip giremeyeceğini belirler."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "aktif"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -209,11 +239,11 @@ msgstr ""
 "Kullanıcının aktif olup olmadığını belirler. Kullanıcı hesabını silmek "
 "yerine bu işareti kaldırın."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "süper kullanıcı"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -221,42 +251,43 @@ msgstr ""
 "Kullanıcıya ayrı ayrı izin atamasına gerek kalmadan tüm hakların verilip "
 "verilmeyeceğini belirler."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "son ziyaret"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "kayıt tarihi"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Özel olarak atanmış hakların yanı sıra, kullanıcı, üyesi olduğu grupların "
-"haklarını da alır."
+"Bu kullanıcının bağlı olduğu gruplar. Bir kullanıcı bağlı bulunduğu gruba "
+"atanan tüm yetkilere sahip olur."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "kullanıcı izinleri"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "kullanıcı"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "kullanıcılar"
 
-#: models.py:406
-msgid "message"
-msgstr "mesaj"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Çıkış yapıldı"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Geçerli bir e-posta adresi girin."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Parola resetlemesi %(site_name)s"
diff --git a/django/contrib/auth/locale/uk/LC_MESSAGES/django.mo b/django/contrib/auth/locale/uk/LC_MESSAGES/django.mo
index a72313b5bb5ad4b33862b8e29122de8a18e98837..a4d966671ff6be525b62236a23716b320148fce5 100644
GIT binary patch
delta 2708
zcmY+Ee{57$7RPS^`Oy}UN~!n*@1jVHogXa}v4B5VRzk$!kGSiutL8C%of$fv*UWok
ztudKWz+Y()d~7jMG5)|rqjBs|w?JoHqJNl;iT9~-v&N_~#-Q2VY&PpZ`j4OU=7I1s
z_kG?y@7{C1=bZayqU+0br7v6N{6%qXU|i1le}hsx;D@uham~L#sSdaRUJTd3+u>Gt
zJ$we*@MAa^uIF|Iyb-Q}_rXQ*AZ&y$!e;meT&7e>9ghs3!1=uR8eRmyhs)tluoW(w
zr__}&0h{0sxDeh8{{XXa0-l1ugZJR<R(J&d8U6rw!mSIGS_xl=JBY6g4=7O@dAGn`
zC_;9_`{0xCW_TK+MXe?}TT~a6bsHjXf&A2M+%ANFglth6NO6=4W&a4A14rdO@zp+g
zfCr#Bel}Wg6iR^CqxTiaPt~}IgTF&5<wsB|_C;j>cQpSWl>M_=Bm$ZtCe;E@)8^%{
zbR&j&$d%G=g`+SHAAzUg2hgU0qC8HNwXg^F!d<Wp9)*%XHJX0_dzgO>rLs#G*M%mb
ztltE$g?BHe{;PP{jUfqNgTz#yM+?4(?=f#}VH1k~2@f%ETcVVl+Be{Ha5D#_2ET$g
z!6QqRdPU|?65LDFgYbRG7WMl}>WL0qLjA`u{0jqOm4jU2D3nut5K886Me}!{d<CCE
z&Y3z5CG-DA{29vnxtG@cEQFZU@@T#u%D!!o>Z?0S(Zl^vG9Q4_vxlLyWDktNm!T*R
zpq$?CpnM(8mr-7LE##**bE8n<+H0VE((+y|2`FXnX2{nqiIgPUs~M{qa;Q2Ooea4o
zlMRfk7<A(7^_%D^0nrf(6w`GK>96#@i*Y?eKG9x=h>bJkfS<Y0S_%);8G}&HK|4dr
zx}G6zkc`j0q(X9%<?L`I6x|Ci`NNSvn|1Z6(om`>*NQsA^2?)Cdzq}B6}^y8q_y(=
zobiT5+Xjc6f@kGD-Di2W>sRN#)YR@~J^O*YHE4JE56ml;tYJN5x$dx2=ySDIuyx+?
zwCgzqyRTEbj`lJ(#;l874_hPJbF^#Qm@ySyyRgbVyT4QKEP8sxDe9D!*Qtz^Ps>94
z>;g7q^J%@&(wTzYzi9=5Tf@kS6*q(q`<=qz#)Nf)AI$r)Jza2$L+-DU^iDhH<kMK3
zxV||Iu7|U^oWF1G%EeB<Mo|K>I@}lcPtEVxZr4{?sgzTs3gqdevXr8ajb5hi+Kvrc
z*_^ie`U<w|igc*}&$f4-c>lZk{r=GfZ?;&uv{PXFph{)z)PP$Y^zUfgbXCT3Gm6?4
zEHCTiU6r$3Pv@L;HeY|F<o;`o?X#_%=YQ0=rHP6U=zc3jsr{CwZ9Uzw<eFI5TAfVx
zcJ;)P*CmsUx9^DEX+M~C@fX{I>|WiS?5eNp(p~F%d%FDtO>GPBvI}W@L~kE)tyIP@
zH+A3Ap7Fe)-b7+}csTAAth}4;w;zh<Z7(rYaCX@#&rJ*^`gYMECz0b`w9<B>IFRUQ
z+#bz(b#cJ|w&~u=_U0wCmp*OE<{fj=Oq<DILYrfz9E_Q1|4$eFC;p;2ff<XbnriTr
zHt+Is)YQyLnN&?#uRQ0-RlLQs8cHvmU4pZ!nbPL3=4~?-j0O{?!n^&!STG*!#zC-0
zOGx~m!09wmYi1@i60{;Q%&}miQ~&xRbT@;OL)y%+I+AT__!|@P?;1@cGZk&G274rz
zb9ImVH(j`*)Tznoq==i8*L7c0tPSPPAgUS)I)AIAQkDwU2!vKfh1mPgJM?GHeDG*6
z5gZB*>tHWyMp->Ar$4UD5#ukqcyr}M%ie~VPhIxlZ5l=R)fBu&DpHPpVTDB{c~YHV
z+&{Ijbyi&ar<#|hqE)yJt1(Fh!sgY`IEgU&N#&jpmy<Xxi*$O(n#nK-KAD;0<fP5<
zdM1hBFnUd;t|{(sT=Ltd1F{*3)nH7*mrNO@lKtc=`V%^(TcMjM<NZ?GW736ScUT<~
zkR(oodDY}7VI~e<g2(Iqi5e>%oziRzj~!7biG5xJ8&3KUFZoC1o7UA0G3lVxzkYUR
zl+;diVvrL$PMk8%a6^&&#<qLff_;d3T+tXh&9ZVR`LJ)bb^5Qit-WAEw)vm6{q6G5
S$J;o6EX<A`mL&m+rhWmLiaS;S

delta 2094
zcmaKsU2IfE6vwBf6#9jHmsW+LwtRNmU1(98f?%pZsF4s5lS1@jZ?_BE-DdADXhgOY
z3Ne8KUL-NmfROk?#AQpdK)a0}4;YD=)kH{)7~gnO6QU+2CjQRtg(r2gbAL1E&YU^_
zGw1HzRcAu!yEBX4RkT&~$LO~Tl-daQPvSv4SESTZ_#vDHzlNLPPw;6NoUD`$cf(?6
z;N$Q%TnT^o?Mr$22=gF(3$BHwN~KkfK{<x6U={q{pZ^A@GXEP+hs9Hrnhz`C9JmV3
zhV8HnTCf84!0qr&_#FHWZh}=f+W~D@2S0~ZoUiUNcpgJxiBd1ajS!PM4|l?ga2+fm
zTw+n1puFD#<=_rD4Td2<wU-B?)j=rhkNWmOh%5CTBqntM7ID71$Uq!sAU}1DhdBNc
zN@fg{4EzYmy86YR--oiVh{bYX1^k%nn+2a?{u!GWzyi|J2N%Nq@I1T;7Z7z?BD}|-
z3H}OOU@aGgZ}keSguCG#*zemrh(_#Puo)hJa&=dr1pJNv{s*|6`F*$;E|{TI16&U|
zO6{FN{$;@chA-e{cp9c=DkW7}O2xeo&%w2DH5V?*4!~0|2T#Jy6a+){Gwg$Zz<#)I
z?nLJPf+DnxsHHe(LMi58CHa@TXu}|i+kI|_qG%T+c(otSgU6w){|JiGOFnNvQFIeZ
z%5TE}{1ZxGb!?WRYk^Y4uR>x{=`;hb%uA;n^q|S-hzKuA`7D?EFC>l9Li9p!G?8L)
zDy^DM61^a$CZv%}PxTW}MAp+KC@%o6)N3nv*3u<PiCojA)l9(qmi?i6l!2%hrBZ;>
z<X)S+(Zpvcl`elF%jlANX^nJh^I;>yi@dZg@=Xh2Go7TUCG;R&Dqamuo_wre$NEG(
z)$6E@J-zWn(uyT@r<Jss$F$Yi8A(RsF`bO-WVfw*?L<$+aj-bL$BLz_X!H$jVF<_U
z&U%(a9G!CPgx(j4Mzs}n;;vItH!Ca$=x)2w!3Rqsu?F{C@p<=!DJl2t)Mf6WsW;tA
zCADr%>8`DMafcNR$9L9tI94<Xy6x9HBVpS~?p&<n332a*(rW4Mgx$5erkC^g#S@*4
zHEUk$wqjwT^ewt8p6F?9wAQ%k(yZH7*6N-tn^W9lJB}50FO)5DP1&>V{PGRkLV@7Q
zK&V-VR<?wi0>P$Wuypf_fi3plh)4~zk&YI<A{g@41)Fr}sg|bD@*u6W-ExwFtqCjU
zM6F~z(V|fwj_iqdb-Cl^D+*iJxKCDel(!RC$_nEpwP)y5#hgiLH{X{(WX8>iGVhp-
zxoU2h5tGfI(dLTD<om_`fyu}$=UZ~-x;NEkJm1HbY`xB(FxO>^7)H#eW{j;z&9E60
zV^&UJI+j1g$|IPsX>;A=WNqFZoK~LZn2cD=RgJmdb27@F)0)S@2aY+(Wbp8|$!Rmn
z38%Fg@}tLYvVIui9sy=d`;iQIp^xDB7~W1ah|-b#086fjxSV@y`rZ1oIP7ELjr=im
zm|-TvxH;&>HpYuAnL!bU*A3m7QCQ%9GP`YP$Lzxe?%BEP+=0q((|CQTYhvFub`Sq=
zAtC&-=*j-a-hZpE{9!M7WJnZ_ic~YA&Ghky5(cH%8iuybt1oafRWG^otC!D16e2`4
T9QDPF<xjX9s+-*-)uaCa-S8Y0

diff --git a/django/contrib/auth/locale/uk/LC_MESSAGES/django.po b/django/contrib/auth/locale/uk/LC_MESSAGES/django.po
index 975f454cab0..805dcfd1cd7 100644
--- a/django/contrib/auth/locale/uk/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/uk/LC_MESSAGES/django.po
@@ -1,82 +1,92 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Sergey Lysach <sergikoff88@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: sergikoff <sergikoff88@gmail.com>\n"
-"Language-Team: Ukrainian <>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-11 16:52+0000\n"
+"Last-Translator: Sergey Lysach <sergikoff88@gmail.com>\n"
+"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"language/uk/)\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Персональна інформація"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Дозволи"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Важливі дати"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Групи"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Пароль успішно змінено."
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Змінити пароль: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
+#: forms.py:58
+msgid "A user with that username already exists."
+msgstr "Користувач з таким ім'ям вже існує."
+
+#: forms.py:59 forms.py:247 forms.py:304
+msgid "The two password fields didn't match."
+msgstr "Паролі у двох полях не співпадають."
+
+#: forms.py:61 forms.py:106 forms.py:135
 msgid "Username"
 msgstr "Користувач"
 
-#: forms.py:15 forms.py:49
+#: forms.py:63 forms.py:107
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 "Обов'язкове поле. 30 або менше символів . Тільки букви, цифри, а також "
 "символи: @/./+/-/_"
 
-#: forms.py:16 forms.py:50
+#: forms.py:66 forms.py:110
 msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
 msgstr ""
 "Значення цього поля може складатися лише з літер, цифр, а також з символів: "
 "@/./+/-/_"
 
-#: forms.py:17 forms.py:67 forms.py:193
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
 msgid "Password"
 msgstr "Пароль"
 
-#: forms.py:18
+#: forms.py:70
 msgid "Password confirmation"
 msgstr "Підтвердження паролю"
 
-#: forms.py:19
+#: forms.py:72
 msgid "Enter the same password as above, for verification."
 msgstr "Повторіть пароль для перевірки."
 
-#: forms.py:31
-msgid "A user with that username already exists."
-msgstr "Користувач з таким ім'ям вже існує."
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+"Паролі не зберігаються у відкритому вигляді, тому не має можливості "
+"переглянути пароль цього користувача, але ви можете змінити пароль за "
+"допомогою <a href=\"password/\">цієї форми</a>."
 
-#: forms.py:37 forms.py:163 forms.py:205
-msgid "The two password fields didn't match."
-msgstr "Паролі у двох полях не співпадають."
-
-#: forms.py:87
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -84,11 +94,7 @@ msgstr ""
 "Будь-ласка введіть правильне ім'я та пароль. Зауважте, що обидва поля "
 "розрізняють великі і маленькі літери."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Цей запис користувача не активний."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
@@ -96,11 +102,11 @@ msgstr ""
 "Схоже, що у вашому браузері на увімкнені cookies. Cookies необхідні для "
 "входу."
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Цей запис користувача не активний."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -108,61 +114,93 @@ msgstr ""
 "Ця e-mail адреса не пов'язана з користувацьким запитом. Ви впевнені, що ви "
 "реєструвалися?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Пароль перевстановлено %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
+"Акаунт користувача, пов'язаний з цією адресою електронної пошти не може "
+"скидувати пароль."
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-mail"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Новий пароль"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Новий пароль (підтвердження):"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Старий пароль"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 "Старий пароль було введено неправильно. Будь ласка, введіть його знову."
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Старий пароль"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Зміна пароля"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr "алгоритм"
+
+#: hashers.py:219
+msgid "iterations"
+msgstr "ітерації"
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr "сіль"
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr "хеш"
+
+#: hashers.py:270
+msgid "work factor"
+msgstr "робочий фактор"
+
+#: hashers.py:272
+msgid "checksum"
+msgstr "контрольна сума"
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "ім'я"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "код"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "дозвіл"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "дозволи"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "група"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "групи"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "ім'я користувача"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
@@ -170,43 +208,35 @@ msgstr ""
 "Обов'язкове поле. 30 або менше символів. Тільки букви, цифри, а також "
 "символи: @/./+/-/_"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "ім'я"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "прізвище"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-mail адреса"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "пароль"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Використайте '[algo]$[salt]$[hexdigest]' або використайте <a href=\"password/"
-"\">форму зміни паролю</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "статус персоналу"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Визначає, чи може користувач увійти до цього сайту адміністрування."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "активний"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -214,52 +244,53 @@ msgstr ""
 "Визначає, чи можна цього користувача вважати діючим. Заберіть галочку, "
 "замість відалення запису користувача."
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "статус суперкористувача"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "Визначає, що цей користувач має всі дозволи без їх точного зазначення."
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "останній вхід"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "дата приєднання"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"На додаток до прав, які призначені вручну, цей користувач також отримує усі "
-"права, що має група, в якій він знаходиться."
+"Групи, до котрих належить користувач. Користувач отримає всі дозволи, що "
+"вказані в кожній з його/її груп."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "дозволи користувача"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "користувач"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "користувачі"
 
-#: models.py:406
-msgid "message"
-msgstr "повідомлення"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Вихід"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Уведіть коректну e-mail адресу."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "Скидання пароля на %(site_name)s"
diff --git a/django/contrib/auth/locale/ur/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ur/LC_MESSAGES/django.mo
index c5a531aadfc714f2e87a543bce607f2e0e2452a9..7d0563c25b30a61a5d39737fb258d67b605f1956 100644
GIT binary patch
literal 1254
zcmZuuL2naB6y6pZklRD)sS-tcoN&~Ry_*n07llJ1NJtH_kW((XOuS=z(Pr108QX9|
zj?%~nUqEo{xlYrxkxQ!r2cOF?VAd=3+CRV#;2Yb)l<=fa-^{)@-}m0zf4?~S#6g?}
zz5+IYPl2BR8~*_3fS14`@E`CQaQ34K=fU>v68LlQRq!3~8u$Uw2QK1%;e_LG@CNux
z@DObMUV+bmUxNuecM>`91u&jEp8z&a0Vo-V^|LVtd<>w}aaLk2Byno-C=5ujEgnY1
zgFp(U3e&8v3sQVbP=hPgPGmq_5#LN&;v1?al3GHB)v&^Kn8XF=mT12%bk?F^b}3Dt
zJ4Xk~^BNE1d8ZT!t^|o`GnGV2QPI>?LdMpZ$1|A%-Ac3|UFVuM6J4ijD53xjNkJ8;
zFePFY>aZmWPDv(rA;fM5><1wg`t#}fT^`qx+-=cFq-LwC76$CQW=*kj;#01)R%X|v
z7|+74b1i&YaJ>cQE;8>TxvuXmG53<|qLAGdt<Y-D>OAIp%=?zSC4X`8YZsCGo-57D
zlE*6II*~{Iqy^tXGOjgwO|UX<KCR23N%^|g4Zm1yx7!76--T6iuMi7eY)qz6#YQn0
z4^fP!?~6@YoPVq4Q&Z+vZ?3M)hV}|>?plKN#%Sh#15;^n4~h}ie}yV_E|t*B>*X8l
z@~qC9SA}FNaU}`DxaQO4%~0n`QB(4W-ALq?@+oeNuWEVW3Qdm7`IycxlQ*Ap%$^yf
z+gXpy@8)kB{bKrL4$Z(kHT#qf&3@LI+z)JSko86{vd50uPrK&Vte0-%YxaoJ9rLrL
zZq~!YK4l#UraNiJJR{RL2f!cD8w<~b$Q(@TO+W3zY+%)TrVod7*B*{*IJOMsyB|)z
zZ|NLwB5w}S{2p2wWS#l({BZ1y$4h^FXLwlH`(L&)#TL*bIy^4;-c;FRvaOp#GK0|&
zTd{uWZrUBauscTU_%_-d4e|B4P4A5!TKWwxUHI4)konV2i1PjaEf_^uuX#!kp8Sb7
DN0$L;

delta 129
zcmaFH*~V;fPl#nI0}wC*u?!Ha05LNV>i{tbSOBpPP|^}egVeyl<YkPW0*1N<#=3^4
z3Wmm3h9<fOCX@d&N^?O(Os$MfCaW-+v)TCN=cU?BUdR;9<CB<|UYeMmYNb$GH2F7^
F4ggUE7iRzf

diff --git a/django/contrib/auth/locale/ur/LC_MESSAGES/django.po b/django/contrib/auth/locale/ur/LC_MESSAGES/django.po
index 4880809f054..a6f1624187b 100644
--- a/django/contrib/auth/locale/ur/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/ur/LC_MESSAGES/django.po
@@ -1,244 +1,272 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-15 15:34+0000\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2011-01-19 15:33+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: Urdu <None>\n"
+"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"ur/)\n"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr ""
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr ""
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr ""
 
-#: admin.py:31
-msgid "Groups"
-msgstr ""
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr ""
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr ""
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr ""
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr ""
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr ""
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr ""
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr ""
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr ""
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr ""
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr ""
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "لفظ اجازت"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr ""
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "توثیق کے لئے ویسا ہی لفظ اجازت درج کریں جیسا اوپر کیا۔"
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr ""
+"براہ کرم درست نام صارف اور لفظ اجازت درج کریں۔ یاد رھے دونوں خانے چھوٹے بڑے "
+"حروف کی شناخت کے لئے حساس ھیں۔"
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr ""
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 
-#: forms.py:108
-msgid "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
 msgstr ""
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
 msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr ""
+
+#: forms.py:249
 msgid "New password"
-msgstr ""
+msgstr "نیا لفظ اجازت"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr ""
 
-#: forms.py:177
-msgid "Old password"
-msgstr ""
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "پرانا لفظ اجازت"
+
+#: forms.py:308
 msgid "Password (again)"
+msgstr "لفظ اجازت (دوبارہ)"
+
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
 msgstr ""
 
-#: models.py:76 models.py:104
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr ""
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr ""
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr ""
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr ""
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr ""
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr ""
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr ""
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr ""
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr ""
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr ""
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr ""
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr ""
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr ""
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr ""
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr ""
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr ""
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr ""
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr ""
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr ""
 
-#: models.py:406
-msgid "message"
-msgstr ""
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr ""
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
+msgstr "برقی خط کا درست پتہ درج کریں۔"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
 msgstr ""
diff --git a/django/contrib/auth/locale/vi/LC_MESSAGES/django.mo b/django/contrib/auth/locale/vi/LC_MESSAGES/django.mo
index 23b23e6e96393b3aef322e08a1b09f8554a5eeff..4403ddb902e5fbae1e4deb96d57012abc70a44ac 100644
GIT binary patch
delta 1238
zcmXxjUr19?9Ki82o2K*6befu4T`N=5yL+b-a}=VasQoiB46JDBvWabDo3pa8hwv$4
zaf!&6dg!T_f>9tuP;d57;d4a~LEuaI7G%-)H|`Gm-Oo99_x$^vdsmw7XiHx`&IgL(
zB^rpk4yBIZRvs71uWd@T;wDyNy;G?kG_U}}xC>+0iTBWr@6d(oSb|@0CvMnnXTDN}
zN-e1hD&_o9hr6*2ci;#X<3%jRIh?>7IDqST3~O1%Ih@8Oe2X&C4;)0t_UuGz2+z|#
zjeYnW3z%PR+7J9jnb5(q%CHn=2Mx$vsu>wm>Gpj;7SZlSHl>D<pE}7!`c0sWcL^l}
z5tQc^Q8s)V3z=Wtry>)qV4Czl!FJj{Mv)`AfG2PfWdUn=5I><0|6m>J%q9~Kaq-|d
zN=9c;CR|2Y$U~G2J;fzS*&8ag_#H`t`ioVV&(o7whi5T`qxcc8qsF<&d$VG@hQqXf
zqb#7GG*00e?8jB4tJ*^LsEXX=pStq!#z==oloa_<GSY)=PW7VfaK!#UWIKy8U=-yj
zZrU!R>@bZo{xjT*t0?n)M%my`H~A;y%6{3i>5^3KCuHC@Vjtlpq=O7X-|Qfgxjh6Q
zMz+YpNnG}bWU<YJyvVsyL50L*cP?L)EKuIRY?1UIAmkI1Bak9HlGV3MgCb{MLuf=J
zkt;2BMLxq^k?cw4a;2JzPRRRIFE{(N`9vtLSuy8(_wdzNG@cAblG=1I8A@0m^3$0_
z!G^<nRrt?(UG%uCLpM8hpI<Z0fUiq8yG_$IdP*M)rNW7DG@>7+S3v79ec9*CLz=H6
zV0K$+SB-N#9*kHoT>in9E6HRmU>FMv3*IC*6XDCDYu-pGX~g2u+0axnVZ@B-*<fTQ
zYRqw+56*;)RM=>B9k*KnEfuylT$7oxV$EUQDyg>)m%hwYl?~)saZhFDTY0s^a(Ev7
E2j`29w*UYD

delta 1912
zcmaKsU1%It6vuCxk2Xo0*rYL9(|Q||e#C6Do1}h(SejZBi><9%u$l%LcPBGLcW2|w
zByEJch)N%-(7G0aQfvsN7z}E+C?*w^4L%e^L<-`AI3VhSh$21+g8t6#1{)ABd**lN
z-aF^xe`fYY{d#-m+lGpBiqVU;U{}hN8ixDJxiIVsrFK9EHo`2t7hZx@Foc`nPf&bR
zRTkI#VLkVQ@FaW$*1#{|TKEmTRjG{nv9wTzw>50k!JA+++zhwFCO8Z?z)@HWJ-7}&
z2Oozo!w2B^@FCc-TB)OO61KyyAOY2%a0oUM><IDIlT0LVj>{;#3J2lF>S85Fq3p+@
z1Wv*_cmhgAryw<`S0S<0bZPxf$WP62A*Q+l5lLNz;_p*fLwt3Oi8#IvMVb)G!C#;#
z@jH|UDu^b5*1@M~QzPu;ev*f!b+hmQ`~*rObvWyQO)v&`Lmp8c+z3y?%q){>CX&Da
zdN#lZp-4XhC4pxlN7QL35>7*r^fJ5!ehpjUZ%``TfIQNw7B~W9@CbYb9)dr>DR_51
z`gbvTk2gj59oz@&iR!~Apd|D;jLSaU1NW{kCUgplGOs~=s`F6JzYRsfkD(~G1f}w8
zP%6J(+W&Pu`pd>2r3HCfDy@X5t{O^gfl~QaD1mlEsrVq|r#voF@k@}-6o!02(b9Z7
z6lK~<_jf``T;9Ke!wB4pZNp;NZI}#6P6mY+G8dIPWr4Ayh(fRBQ<H?{J!r<Hoigsg
zBtiK^yRjRGv^XQx(ze2o&#VVS40Ssu(us`HV;LQo#^gJ{aflLIu$wV?FGLAZYk90H
zP2~SW4eANs^z?BjuytT(|1QsGhQ0K}xUcr5#?xM4xPeX>fyuqAjYPr;oV2ThG>1(+
zZh9%l_gV3E%5W!)WO7OyELg6Y=;VmwFS}1BwUPAG+A;$s$rX=U9#PDMcr}f9ldUbu
zK-*@wPY`@KZddlpiZhM4KA!dx+B1FJkVm_pd#dv1vcr1Yh>^6?qirL;kqm%so=7;B
z=?A0RblQ_73JDJw+V;$``&!3KuDV-y#cjj2sAbvtSlUYsbQ`;JL#xZns#2!!8&-CB
z&CJeNB-$H^?bNZ}{#aim+82%196A_z)SPrgfyiD|>eoHdSn*s`_r&^l-j&@{-CS*X
zrs<A3o|(O;y02>B;k0Y+%3iJ>S-YRm6NbfelTL1J&6cv7`|~q#?b`WVD%)AxlG&4=
zb9Fpim~m|#m#t?erozSNUA=TRKdV#W!Uu7t;o@obkJ%3Mr59XFAIr~oYS;Sg-Ei@|
zqZ9cLS@Xk%kJy*B*|_+;IF2UyxztL>@o@2yQCxEEHuBJ^{Dpsg5jV$UMoL?bp(pbf
z(p}l%+V@+R&X7x>lcefMUh@I@gbQy?=)jX2=+s}eL#r~6g^Tk#5iVXNqyKA~oi5bo
v-*EiDnnxy61p&@ES{k=9w6sxosl$>$QJLI<y3J+Pj*G<M!aHu(sej`iPE3Y)

diff --git a/django/contrib/auth/locale/vi/LC_MESSAGES/django.po b/django/contrib/auth/locale/vi/LC_MESSAGES/django.po
index 930093b4c4c..88c3f8d800a 100644
--- a/django/contrib/auth/locale/vi/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/vi/LC_MESSAGES/django.po
@@ -1,98 +1,101 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Tran  <hongdiepkien@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-10 21:56+0000\n"
-"Last-Translator: greenfire <hongdiepkien@gmail.com>\n"
-"Language-Team: Vietnamese <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Tran <hongdiepkien@gmail.com>\n"
+"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"language/vi/)\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "Thông tin cá nhân"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "Quyền"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "Những ngày quan trọng"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "Các nhóm"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "Mật khẩu thay đổi thành công"
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "Thay đổi mật khẩu: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "Tên đăng nhập"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "Yêu cầu. 30 ký tự hoặc ít hơn. Chỉ là chữ cái, chữ số và @/./+/-/_."
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "Giá trị này có thể chứa chữ cái, số và ký tự @/./+/-/_."
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "Mật khẩu"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "Xác nhận mật khẩu"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "Nhập dãy mật mã trên để xác minh lại"
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "Tên đăng nhập đã được sử dụng"
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "Hai trường mật khẩu không giống nhau"
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "Tên đăng nhập"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "Yêu cầu. 30 ký tự hoặc ít hơn. Chỉ là chữ cái, chữ số và @/./+/-/_."
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "Giá trị này có thể chứa chữ cái, số và ký tự @/./+/-/_."
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "Mật khẩu"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "Xác nhận mật khẩu"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "Nhập dãy mật mã trên để xác minh lại"
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr "Hãy nhập đúng tên đăng nhập và mật khẩu. Chú ý chữ hoa, chữ thường."
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "Tài khoản này chưa được kích hoạt."
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 "Trình duyệt web của bạn không bật cookie. Cookies được yêu cầu để đăng nhập"
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "Tài khoản này chưa được kích hoạt."
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
@@ -100,152 +103,173 @@ msgstr ""
 "Không tìm thấy địa chỉ email này trong các tài khoản đã có. Bạn có chắc là "
 "đã đăng kí không?"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "Đặt lại mật khẩu trên %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-mail"
+
+#: forms.py:249
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "Xác nhận mật khẩu mới"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "Mật khẩu cũ"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "Mật khẩu cũ không chính xác. Hãy nhập lại lần nữa"
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "Mật khẩu cũ"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "Nhập lại mật khẩu"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "Tên"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "tên mã"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "cho phép"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "cho phép"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "Nhóm"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "Các nhóm"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "Tên đăng nhập"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "Yêu cầu. 30 ký tự hoặc ít hơn. Chữ cái, số và ký tự @/./+/-/_"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "Tên"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "Họ"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "Địa chỉ email"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "Mật khẩu"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Sử dụng '[algo]$[salt]$[hexdigest]' hoặc sử dụng <a href=\"password/\">thay "
-"đổi form mật khẩu </a> ."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "tình trạng nhân viên"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "Chỉ định người dùng nào được phép truy cập vào trang admin."
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "Kích hoạt"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr ""
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "Lần cuối đăng nhập"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "Ngày tham gia"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
 msgstr ""
-"Bên cạnh các quyền đã mặc định khi đăng kí, người dùng sẽ được cấp thêm các "
-"quyền của các nhóm mà người đó tham gia vào."
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "quyền của người sử dụng"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "Người dùng"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "người sử dụng"
 
-#: models.py:406
-msgid "message"
-msgstr "Tin nhắn"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "Đã thoát"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "Hãy nhập địa chỉ email hợp lệ."
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""
diff --git a/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.mo
index 324bcb3cfc60d8f7a3b1e1cbadc59070445cfefe..3065001d9f51487f7b6023d6059e9bdb843ef0db 100644
GIT binary patch
delta 1577
zcmYk+Uu+ab9Ki88to-Sfa-fJ*g{2m3E!W+<N~;$iXiy1SORbtl)HIvBZEum@)!VIy
zHKwV`pF}E+s{#KYjS);NQsSXPnns^Yh!{=O2V*2YaJ|FCsEIK?5x>9P)i~*IK09;s
zZ)avZ*|e{5{L-qL*A=OqxS2Q`QEEGOUqeR9)+p72HeQDw_Tu|^7ygYFCa+a$F&@QR
z@Hont^SA>4z*>yZs1ECJty1G^ZCKHcOZj0d#&8F&!(F%<pT+ff7^66g%W)3-@dDn9
z8<r^b01n|3Si+4MWAL5WflRFS<9*Dprg`8`Rmh&i-?0mOmIZG#h4T9ml!>RY9#5gX
z(H!z}>I-BI>S9>`E%K)>k+DgtiZafxDE<DzDD$fbCE1eYC~w|?(xEjh8z>#SP$s$`
z-{F{g@pj6;v8t8Wz#vlIj2+mIvLmmcEbKengg>Hzi`c$#o>e;!;#Oo)>Oqt<>krFA
zC<8o=^5%O{j^qGJzhfvz^#Mw|3t{~?_z>lvP_|yDvp9~A;Meu+zjSP3Hn~jOPzHV;
zJJCZ~(3jYQ-(wt`*e02%4`l(5g$^QfDJT4W0_7eb3_XO>ek%O^Sd9Ibf!+%%W<oy-
zJ&)4ib6kaAh4nv&^%ax_{u$O^MNY;~;RobDH<L@dCchLMlm95^FI&2q*hJh$BnbHw
zCCTD+f^k&?A#dMGNNNf2?*<#=U#gpM4Ivj*lH4O%xTLm#|8m)R|NLdk<eQbPPZDyO
z))Ra={)M{{B^iW9$agL2)&SLr8;BbS`P8l_<P($s7m^kQ1bLS>>R1J>XuDa>&6Z|s
z#v&_r43Fdsu9<VSjOkjAH^2DZXtQIx)<Di2wpvO9OJ0t2TR}%Noz9Qa(sZ1B+NOEt
z-?3~*v*N?1y+<=MnS$jwTH4Iz@~+0S<uaM2jnJ!@FJ!!hrGwsyWmmnK+A~{{aicw+
zxI;6HRANiq=roMl-ktG2>lxdz^SSsv%#qTPM#67r+^Hp!DWlVyimq9`%QkaE+QWIW
zyB+c|DSPLmt=-L8*Bwdeda+n+a|>q9u?MZaZ8^);M+*7fR@!y+5k0e;=6QV&`KUQ$
z>0{Y}Z9RHRZFg9a()=3lm+0fAN9(eYx+@1Jt0yNGj+|I{`?%Lu|I|7vD)XncjsM#$
zN2|Q~Qh9cNWqP7CQ~z9~qx|Zj>Su41&rDQa`?&n!)Rh-bU!MD<^47WXz7j2~XHPC1
c{Pgm<$?A*q!DvBWuQAr=U5x$Uomy%B1KV;3@Bjb+

delta 1835
zcmaLWdu&rx9Ki82n1yYQ!4L;NuX7J4l(n#-E_KnUm<1e&M2vIF-Fj(j`dE6qAtLF9
zz_#oWv<xyb<vBwFZiYsdZET3~4@5L1Modi97~8J<M@)==m}uhn*Ih|Wj3@ow&$;KG
zp2zRpyT7=vB>F>P_JE?SBkm!tWhqsMZ_VdIIi9Ul1)jjA_yumpAMr7C+@_R)ucHmG
z<GuJTuEpQ2_6i;raPPo9_yp!E6;;zzZl~dMT!A;N`(JS(_kZDHv@KBTJ}kmzxDM~Y
zjhKfz=3@Z2;ck2ezs3!?g27%v155E!T*3S*O=Ud|^Kz7W3G0w1brKu#EIx@jESI&Y
z4JgmIpiJC=i_nAoR2vsItvXQpcUtZJ$WUq!S(7@2+03ubQjq~aLVjwTiwyi3N@lL3
zWZ-)w>*^Ql{x_8WWz$(E%twRcTZ#{Jzl%RF!P6-B7f_D*CzQ-ACtXol;j2{2&_D<F
zq8$Ge(pO!^?f8{-U&(f5CoYsTU2omLh%(-G<flAb<fz(E#_7dE97O4NZV~yH2XPvn
z$4_t*7BZ^Xgj?}E%Goa<4KiREK7uZkvyPxF=o;4J4YXq^+n0%6K$+)dOAoRa6<I?5
zrNdqtWXIi>eOAYJP@cbUIc#~(GHy9xc^PG*D=0ht#%fPn?Ke>t`lr=yi_(iDQ$+-e
zzE$L$WT*1U$!A$XNGYE~IdPs<Ux|_(DR&W!oq56Josc36kx%kLf>%bZBIL`tlZcYp
zOj*OVgeWB>bs8b1c#h1sY*p3WRAiU;6Y>H|Sxr=BYICWTT}npf#ghz5sU&zeZxufG
z;>?RuW;H#4)x>h*A;Ljq$Mx)kS<z?1q1F~t)dgBY;fNlLXl^}Xa39okx7!!-g@Rfn
zq(!`j)?$PMKGUSd)B<|2RrmXMX*vy_py6Ic7oVxMnnqaL>GS(F-EW38j}f8b|JPqV
zVP-MhGOD3BFY{_1S%Ky?DorL~3}0~dyS9_@4{beJv95(pTeb2A-R}uCmNb~UKLTFk
z4Y$u@n32YEEfkhHGwXBdnm26hc)YlUMePiQ-Ic|)&0am|Vd++jwj&e{xGMG9cyi(V
zEL*@ZP2Ceq<(#i}+8t}{&T7rMw#HdycT_nXxtllHw-{|c*|7a-l2W6saX2&m995e0
z(V8k}?91GuLbKUx1oUQ8bNy3`{gJ!U=Bf_`joMgCUPHk~*3hbZ7~oCsYfsh3ujcu(
zqBE2G)NE&8`h$+tk>S+PF*Q4QIx%q|)!maE8%~c*&rFS^-g|p?@L*zcIC=W;&5OM=
zht8zB#uDSl5*LpqCi|27FQmHLlS5}1DcwJooIaBNxF<2ul^z|YW#;HUo~DMn=LY$?
zeXp8rZ%=kk%nVK@rv_B)x%|e$<miE!;~lb!k?F)lzgB9-ujKE}itQ<=-<FuV#DxEw
t`&8FqtJi;}K5=Ozb!dEUiu8#y$-V(eeC%q$ced1pu2jcp?9}3>zX33Qc6tB+

diff --git a/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.po
index 1eff7162144..c4658eb5dc4 100644
--- a/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.po
@@ -1,246 +1,273 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Lele Long <schemacs@gmail.com>, 2011.
+# Ziang Song <songziang@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
-"Last-Translator: schemacs <schemacs@gmail.com>\n"
-"Language-Team: Chinese (China) <None>\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
+"Last-Translator: Ziang Song <songziang@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"language/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "个人信息"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "权限"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "重要日期"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "组"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "密码修改成功。"
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "修改密码：%s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "用户名"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "必填。不多于30个字符。只能用字母、数字和字符 @/./+/-/_ 。"
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "该值只能包含字母、数字和字符@/./+/-/_ 。"
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "密码"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "密码确认"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "为了校验，输入与上面相同的密码。"
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "已存在一位使用该名字的用户。"
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "两个密码字段不一致。"
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "用户名"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "必填。不多于30个字符。只能用字母、数字和字符 @/./+/-/_ 。"
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "该值只能包含字母、数字和字符@/./+/-/_ 。"
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "密码"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "密码确认"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "为了校验，输入与上面相同的密码。"
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr "请输入正确的用户名和密码。请注意两者都是大小写敏感的。"
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "该帐号未激活。"
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "你的浏览器好象不允许使用cookie。登录需要使用启用cookie。"
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "E-mail"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "该帐号未激活。"
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "该电子邮件地址没有关联任何用户帐号。你确定已经注册过了？"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "密码重设于 %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr "和这封电子邮件相关的账户不能重置密码。"
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "E-mail"
+
+#: forms.py:249
 msgid "New password"
 msgstr "新密码"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "新密码确认"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "旧密码"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "你的旧密码不正确。请重新输入。"
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "旧密码"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "密码(重复)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "名称"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "代码名称"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "权限"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "权限"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "组"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "组"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "用户名"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "必填。不多于30个字符。只能用字母、数字和字符 @/./+/-/_ 。"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "名字"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "姓氏"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "e-mail 地址"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "密码"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"使用 '[algo]$[salt]$[hexdigest]' 或使用 <a href=\"password/\">修改密码表单</"
-"a>"
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "职员状态"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "指明用户是否可以登录到这个管理站点。"
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "有效"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr "指明用户是否被认为活跃的。以反选代替删除帐号。"
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "超级用户状态"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "指明该用户缺省拥有所有权限。"
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "上次登录"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "加入日期"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
-msgstr "除了手工设置权限以外，用户也会从其所在组获得赋予该组的所有权限。"
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "用户权限"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "用户"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "用户"
 
-#: models.py:406
-msgid "message"
-msgstr "消息"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "退出登录"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "输入一个有效的 e-mail 地址。"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr "重置 %(site_name)s 的密码"
diff --git a/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.mo
index 70783cea488db6087b664223237ddf3b9d124706..c95b0dd5804c16447038b2fce4534c754f2d26d0 100644
GIT binary patch
delta 1298
zcmYk+OGs2v7{Ku}YML|VtB0ADQ<?c1?;Xw5SqPD(lI0MRiwYZc(lMP8=bGupBB(_O
z1D6V;2q7a3!Wi6CLeeH`B@ws~cZuevR_&z!HyokEeCK!W=e_6L^SHh*ns-mE=B7MS
z6fbd*c<E5;3|1slQR-5ZD#d!-jos+SQLM)=7{sI<N~K~S9>NG#<0NL`B06yiGjIj-
zm6}i+I+4uNJNZL4W@A1c#xmTCE$G5d+=Vx>1IO?zF5!91OH=A9cH?pUgbbwC@Epn@
zGENiKHO5zd8mCFTMfy;`k)QfYB?GE-r7|G{Wd;SvJF8-p`zv(58u_UPDi%dGqx5qD
z<+;l!{RL1~U=XtzUyaj{2OdfSV<-<!qYN~QkJ*+v^l;roFLK`qp2GVmOTB=y5`Rzz
zsHG~xMwGvYQ1Z{I<i%%kf<Dzd8nQ<pP_Dn}8-Ae7d<AoH6ZxqvD(S$*KFD=0wqqeS
zqorNI>s+VONdfkvY~?*{z^P2uUj|+#aS_+igS8}OfS`5&WuPd^i`>z9Tl-WyjdI^>
zeLb)JsQs+{s$I%r{iVZY67pu7C@bJ#eQ7F}wg4qxj_gFD9MhI)^H2_)9JZrGDZv6H
zW^SNt#s5XVlKry(GO)~cyPVJsIW#Ot;w(st1FVt=wl}f=vQkpyvz1S?jHn=_$fPP0
zEu{`<g<?X^+IFdT(<&!qwmF0xIQi`4^OqSH5+-qk*hk3n%KwTz@u`%UBdcX_C^BpX
z!j`)yU<IT0LTW7DmG;YF&!lhJZ=7>ARUWh2<2~s%O`o^MW7e9c)8FQ~6ucFRh9Y54
zBTxC<Ri-y_pIPVjR{6|YJLYO@E$OqYA)jH4j*eDZ!+~%#bR&4XG90vwq2Wk>u-l3n
zLq<=3Alw@<2B=2@y+LEVud}_wD0Q~#gwLJG*gsuY;{J?rN5;m3$@N!v*PhI*J$qp{
TWOl{lncp4uO7^O~m^1bdwrH5t

delta 1817
zcmaLXe{2(F7{Kv&P%4ZcgH1#f@tm7;LbsM}M9G|z$aI0Qh0M%kqPwg|Thbq+*MWlC
zPJsbKGgBChEE&v6mY~~W#bg6VG$!JY#2L-_3;e_Nx*4M+#y?H`KJ8&*Vtmu*KJWY9
zd++<+b9cS0O_s!O6*^8U%4T96@ok<`4fxtZ4wUl_rONRF7U4J8gg@aE=w76hfqT)3
z)A#`1z$*OH?l0$L0c|(Fj!$F0QgJm!Wf>h`;aZ%r+qZEs?Z0p(I`2|yJ+8skxEb%p
z9k>*AT#g}Z!9%zWf57dymdRd3155F9T+8}uj!Hcp3zjJL0yZFBY6y4ZCESWj*e-if
z+fmN%LRq*KSD+91sr?+dY1M@?zT5792boIsBYRTsp@a3+B`PxEIPy~y9Ax4zP%<-(
zl7X8@*41xz`wx`s91NBPmtz}`uLxbVV_YoP4WT^V6v`v{1tl}<Nmrb@@=__meJBI^
zP<H+`%K7iH4R6`~PjS0)C-o@Lw8?I_p<K5Y`Kf&z3Ne8)PttCmM;Vt|LH^~$BpuE8
zB|eAim{l~e4M*{QEZ}zJ*>Au)+=|a*0%apJxDzdOVa=-CLhZJDQP$gsvavT-k$>6A
zyY_&ywuAP-i*`F@J8Aow?RDGlY-dm=zKOEY+bEfG(kUBUX{(|1yW>=NWNM9^B<>V>
zUNV7va`IW06H>}@C=V{M>l;wM3@P^!teJhm<eiYh64_7kVdRxj8wvSx?jho`D=C`@
zc?U`fNu5SWDbA67FYIdeQAipeB;*B@QbAN_Yq`%*?oR$f9wQ{fQYs1F&3_7?dvW$f
zdBpB|2y2LYiAM=H;YfKLy?OCxqmj-IQ#FJ-BGH&0j%i*!X3!36y4M?s1tMWB7SUpU
zL+dc2p@3=9V`?Ei+^GkHuWC9SzOdol$dG`kb(%(0I}iv4H9crXG@lWp68zVtz9_30
zUYXU<+gJNFpX@;M8<i%DFh?L<k(^%CTg21{B2ljvHB6>qAEjpMCFies&01Nj9`r?a
zm$aICFb00(6>q?2n6ceuS|lo)$Zoh+*Zfgq&y&R+_EeR{b?tsV?BibUOui=)4b@ia
zb*XKO7v?!bhH2`)Wc`wlYCJA?mCIA3d8)Q}s$K4Cw>!V7(Y4FiACL^Vo*_$Hv`ubL
zcAUFf^E|$#+LLtUH#%!~M#4s2@_K%2!44Md)P0OR=zqDnB~`riP+mMUHJrJ8Sj~68
zJ$JFoI`h6YFsSDHhi4~`TE~0RJ*Tac-RaSDnRAD&4^GVY_s&lAq=)-{zj|^$(VtHA
z%zk<;b82KRab$L4&>DCvJ#{91Y&?DBliaLUvdbDcF4rDUP|3~kbK*^v>A#Zho>W%f
zc=F?AErsc^qnV+rvW1Zk(*q-t+Wh4|<~9CrYOP~^*4Z)bztTE;ZPYq7k(+hy!brMr
XRFYbeys;wfoEte|b&Vyj6de2;bM0x*

diff --git a/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.po
index b2ac3d23d2f..09a1b63165f 100644
--- a/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.po
@@ -1,245 +1,272 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# tcc <tcchou@tcchou.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
-"PO-Revision-Date: 2011-03-04 18:41+0000\n"
+"POT-Creation-Date: 2012-03-14 00:15-0700\n"
+"PO-Revision-Date: 2012-03-08 12:07+0000\n"
 "Last-Translator: tcc <tcchou@tcchou.org>\n"
-"Language-Team: Chinese (Taiwan) <None>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"language/zh_TW/)\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: admin.py:28
+#: admin.py:41
 msgid "Personal info"
 msgstr "個人資訊"
 
-#: admin.py:29
+#: admin.py:42
 msgid "Permissions"
 msgstr "權限"
 
-#: admin.py:30
+#: admin.py:44
 msgid "Important dates"
 msgstr "重要日期"
 
-#: admin.py:31
-msgid "Groups"
-msgstr "群組"
-
-#: admin.py:113
+#: admin.py:125
 msgid "Password changed successfully."
 msgstr "密碼修改成功"
 
-#: admin.py:123
+#: admin.py:135
 #, python-format
 msgid "Change password: %s"
 msgstr "密碼變更: %s"
 
-#: forms.py:14 forms.py:48 forms.py:66
-msgid "Username"
-msgstr "使用者名稱"
-
-#: forms.py:15 forms.py:49
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr "必要的。30 個字或更少, 只包含字母、數字和 @/./+/-/_。"
-
-#: forms.py:16 forms.py:50
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr "這資料值只能包含字母、數字和 @/./+/-/_ 字元。"
-
-#: forms.py:17 forms.py:67 forms.py:193
-msgid "Password"
-msgstr "密碼"
-
-#: forms.py:18
-msgid "Password confirmation"
-msgstr "密碼確認"
-
-#: forms.py:19
-msgid "Enter the same password as above, for verification."
-msgstr "為檢查用，請輸入與上面相同的密碼。"
-
-#: forms.py:31
+#: forms.py:58
 msgid "A user with that username already exists."
 msgstr "一個相同名稱的使用者已經存在。"
 
-#: forms.py:37 forms.py:163 forms.py:205
+#: forms.py:59 forms.py:247 forms.py:304
 msgid "The two password fields didn't match."
 msgstr "兩個密碼欄位不同。"
 
-#: forms.py:87
+#: forms.py:61 forms.py:106 forms.py:135
+msgid "Username"
+msgstr "使用者名稱"
+
+#: forms.py:63 forms.py:107
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr "必要的。30 個字或更少, 只包含字母、數字和 @/./+/-/_。"
+
+#: forms.py:66 forms.py:110
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "這資料值只能包含字母、數字和 @/./+/-/_ 字元。"
+
+#: forms.py:68 forms.py:112 forms.py:136 forms.py:306
+msgid "Password"
+msgstr "密碼"
+
+#: forms.py:70
+msgid "Password confirmation"
+msgstr "密碼確認"
+
+#: forms.py:72
+msgid "Enter the same password as above, for verification."
+msgstr "為檢查用，請輸入與上面相同的密碼。"
+
+#: forms.py:113
+msgid ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
+msgstr ""
+
+#: forms.py:139
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr "請輸入有效的使用者名稱與密碼。請注意兩個欄位都有分大小寫"
 
-#: forms.py:89
-msgid "This account is inactive."
-msgstr "這個帳戶未啟用"
-
-#: forms.py:96
+#: forms.py:141
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr "你的Web瀏覽器好像不允許使用cookie。登入時需要使用cookie。"
 
-#: forms.py:108
-msgid "E-mail"
-msgstr "電子信箱"
+#: forms.py:143
+msgid "This account is inactive."
+msgstr "這個帳戶未啟用"
 
-#: forms.py:117
+#: forms.py:187
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr "這個電子郵件地址沒有和任何使用者帳號有關聯。你確定你已經註冊了？"
 
-#: forms.py:143
-#, python-format
-msgid "Password reset on %s"
-msgstr "密碼重設在 %s"
+#: forms.py:189
+msgid ""
+"The user account associated with this e-mail address cannot reset the "
+"password."
+msgstr ""
 
-#: forms.py:151
+#: forms.py:192
+msgid "E-mail"
+msgstr "電子信箱"
+
+#: forms.py:249
 msgid "New password"
 msgstr "新密碼"
 
-#: forms.py:152
+#: forms.py:251
 msgid "New password confirmation"
 msgstr "新密碼確認"
 
-#: forms.py:177
-msgid "Old password"
-msgstr "舊密碼"
-
-#: forms.py:185
+#: forms.py:280
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr "你的舊密碼不正確。請重新輸入。"
 
-#: forms.py:194
+#: forms.py:283
+msgid "Old password"
+msgstr "舊密碼"
+
+#: forms.py:308
 msgid "Password (again)"
 msgstr "密碼(重複)"
 
-#: models.py:76 models.py:104
+#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
+#: hashers.py:389
+msgid "algorithm"
+msgstr ""
+
+#: hashers.py:219
+msgid "iterations"
+msgstr ""
+
+#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+msgid "salt"
+msgstr ""
+
+#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+msgid "hash"
+msgstr ""
+
+#: hashers.py:270
+msgid "work factor"
+msgstr ""
+
+#: hashers.py:272
+msgid "checksum"
+msgstr ""
+
+#: models.py:66 models.py:113
 msgid "name"
 msgstr "名稱"
 
-#: models.py:78
+#: models.py:68
 msgid "codename"
 msgstr "代碼"
 
-#: models.py:82
+#: models.py:72
 msgid "permission"
 msgstr "權限"
 
-#: models.py:83 models.py:105
+#: models.py:73 models.py:115
 msgid "permissions"
 msgstr "權限"
 
-#: models.py:108
+#: models.py:120
 msgid "group"
 msgstr "群組"
 
-#: models.py:109 models.py:216
+#: models.py:121 models.py:250
 msgid "groups"
 msgstr "群組"
 
-#: models.py:206
+#: models.py:232
 msgid "username"
 msgstr "使用者名稱"
 
-#: models.py:206
+#: models.py:233
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr "必要的。30 個字或更少, 只包含字母、數字和 @/./+/-/_。"
 
-#: models.py:207
+#: models.py:235
 msgid "first name"
 msgstr "名字"
 
-#: models.py:208
+#: models.py:236
 msgid "last name"
 msgstr "姓氏"
 
-#: models.py:209
+#: models.py:237
 msgid "e-mail address"
 msgstr "電子郵件地址"
 
-#: models.py:210
+#: models.py:238
 msgid "password"
 msgstr "密碼"
 
-#: models.py:210
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"使用 '[algo]$[salt]$[hexdigest]' 或是 <a href=\"password/\">修改密碼表單</a>."
-
-#: models.py:211
+#: models.py:239
 msgid "staff status"
 msgstr "工作人員狀態"
 
-#: models.py:211
+#: models.py:240
 msgid "Designates whether the user can log into this admin site."
 msgstr "指定是否使用者可以登入此管理網站。"
 
-#: models.py:212
+#: models.py:242
 msgid "active"
 msgstr "有效"
 
-#: models.py:212
+#: models.py:243
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr "指定使用者是否有效。請取消選擇而不是刪除帳號。"
 
-#: models.py:213
+#: models.py:245
 msgid "superuser status"
 msgstr "超級使用者狀態"
 
-#: models.py:213
+#: models.py:246
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr "指定是否使用者可以登入到這個管理網站"
 
-#: models.py:214
+#: models.py:248
 msgid "last login"
 msgstr "上次登入"
 
-#: models.py:215
+#: models.py:249
 msgid "date joined"
 msgstr "加入日期"
 
-#: models.py:217
+#: models.py:251
 msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
-msgstr "除了手動指定的權限之外，這個使用者也會得到其群組擁有的所有權限。"
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of his/her group."
+msgstr ""
 
-#: models.py:218
+#: models.py:255
 msgid "user permissions"
 msgstr "使用者權限"
 
-#: models.py:222
+#: models.py:260
 msgid "user"
 msgstr "使用者"
 
-#: models.py:223
+#: models.py:261
 msgid "users"
 msgstr "使用者"
 
-#: models.py:406
-msgid "message"
-msgstr "訊息"
-
-#: views.py:91
+#: views.py:93
 msgid "Logged out"
 msgstr "登出"
 
-#: management/commands/createsuperuser.py:23
+#: management/commands/createsuperuser.py:27
 msgid "Enter a valid e-mail address."
 msgstr "輸入有效的電子郵件地址。"
+
+#: templates/registration/password_reset_subject.txt:2
+#, python-format
+msgid "Password reset on %(site_name)s"
+msgstr ""