From 8256abc181eb4634d0d09242752654b44b7b3447 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Wed, 14 Mar 2012 09:05:08 +0000
Subject: [PATCH] Pulled the humanize translations updates from Transifex. Refs
 #17822.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 .../humanize/locale/ar/LC_MESSAGES/django.mo  | Bin 1671 -> 1728 bytes
 .../humanize/locale/ar/LC_MESSAGES/django.po  | 353 ++++++++++++++++--
 .../humanize/locale/az/LC_MESSAGES/django.mo  | Bin 406 -> 2312 bytes
 .../humanize/locale/az/LC_MESSAGES/django.po  | 269 ++++++++++---
 .../humanize/locale/bg/LC_MESSAGES/django.mo  | Bin 1319 -> 1375 bytes
 .../humanize/locale/bg/LC_MESSAGES/django.po  | 253 +++++++++++--
 .../humanize/locale/bn/LC_MESSAGES/django.mo  | Bin 1363 -> 1425 bytes
 .../humanize/locale/bn/LC_MESSAGES/django.po  | 252 +++++++++++--
 .../humanize/locale/bs/LC_MESSAGES/django.mo  | Bin 1368 -> 1429 bytes
 .../humanize/locale/bs/LC_MESSAGES/django.po  | 282 ++++++++++++--
 .../humanize/locale/ca/LC_MESSAGES/django.mo  | Bin 1207 -> 4005 bytes
 .../humanize/locale/ca/LC_MESSAGES/django.po  | 262 +++++++++++--
 .../humanize/locale/cs/LC_MESSAGES/django.mo  | Bin 1306 -> 4648 bytes
 .../humanize/locale/cs/LC_MESSAGES/django.po  | 278 ++++++++++++--
 .../humanize/locale/cy/LC_MESSAGES/django.mo  | Bin 443 -> 443 bytes
 .../humanize/locale/cy/LC_MESSAGES/django.po  | 287 ++++++++++++--
 .../humanize/locale/da/LC_MESSAGES/django.mo  | Bin 1210 -> 4102 bytes
 .../humanize/locale/da/LC_MESSAGES/django.po  | 253 +++++++++++--
 .../humanize/locale/de/LC_MESSAGES/django.mo  | Bin 1505 -> 4125 bytes
 .../humanize/locale/de/LC_MESSAGES/django.po  | 249 +++++++++---
 .../humanize/locale/el/LC_MESSAGES/django.mo  | Bin 1383 -> 5281 bytes
 .../humanize/locale/el/LC_MESSAGES/django.po  | 254 +++++++++++--
 .../humanize/locale/en/LC_MESSAGES/django.mo  | Bin 343 -> 356 bytes
 .../humanize/locale/en/LC_MESSAGES/django.po  |   8 +-
 .../locale/en_GB/LC_MESSAGES/django.mo        | Bin 1254 -> 4062 bytes
 .../locale/en_GB/LC_MESSAGES/django.po        | 252 +++++++++++--
 .../humanize/locale/es/LC_MESSAGES/django.mo  | Bin 1236 -> 3716 bytes
 .../humanize/locale/es/LC_MESSAGES/django.po  | 258 +++++++++++--
 .../locale/es_AR/LC_MESSAGES/django.mo        | Bin 1236 -> 1299 bytes
 .../locale/es_AR/LC_MESSAGES/django.po        | 252 +++++++++++--
 .../locale/es_MX/LC_MESSAGES/django.mo        | Bin 1236 -> 4181 bytes
 .../locale/es_MX/LC_MESSAGES/django.po        | 252 +++++++++++--
 .../humanize/locale/et/LC_MESSAGES/django.mo  | Bin 1221 -> 1283 bytes
 .../humanize/locale/et/LC_MESSAGES/django.po  | 252 +++++++++++--
 .../humanize/locale/eu/LC_MESSAGES/django.mo  | Bin 1225 -> 4006 bytes
 .../humanize/locale/eu/LC_MESSAGES/django.po  | 253 +++++++++++--
 .../humanize/locale/fa/LC_MESSAGES/django.mo  | Bin 1205 -> 1263 bytes
 .../humanize/locale/fa/LC_MESSAGES/django.po  | 227 +++++++++--
 .../humanize/locale/fi/LC_MESSAGES/django.mo  | Bin 1250 -> 2394 bytes
 .../humanize/locale/fi/LC_MESSAGES/django.po  | 253 +++++++++++--
 .../humanize/locale/fr/LC_MESSAGES/django.mo  | Bin 1272 -> 4120 bytes
 .../humanize/locale/fr/LC_MESSAGES/django.po  | 253 +++++++++++--
 .../locale/fy_NL/LC_MESSAGES/django.mo        | Bin 401 -> 401 bytes
 .../locale/fy_NL/LC_MESSAGES/django.po        | 237 ++++++++++--
 .../humanize/locale/ga/LC_MESSAGES/django.mo  | Bin 1457 -> 1521 bytes
 .../humanize/locale/ga/LC_MESSAGES/django.po  | 328 ++++++++++++++--
 .../humanize/locale/gl/LC_MESSAGES/django.mo  | Bin 1237 -> 1737 bytes
 .../humanize/locale/gl/LC_MESSAGES/django.po  | 254 +++++++++++--
 .../humanize/locale/he/LC_MESSAGES/django.mo  | Bin 1342 -> 2529 bytes
 .../humanize/locale/he/LC_MESSAGES/django.po  | 253 +++++++++++--
 .../humanize/locale/hi/LC_MESSAGES/django.mo  | Bin 981 -> 4952 bytes
 .../humanize/locale/hi/LC_MESSAGES/django.po  | 266 +++++++++++--
 .../humanize/locale/hr/LC_MESSAGES/django.mo  | Bin 1356 -> 1418 bytes
 .../humanize/locale/hr/LC_MESSAGES/django.po  | 281 ++++++++++++--
 .../humanize/locale/hu/LC_MESSAGES/django.mo  | Bin 1218 -> 4002 bytes
 .../humanize/locale/hu/LC_MESSAGES/django.po  | 253 +++++++++++--
 .../humanize/locale/id/LC_MESSAGES/django.mo  | Bin 1161 -> 3503 bytes
 .../humanize/locale/id/LC_MESSAGES/django.po  | 228 +++++++++--
 .../humanize/locale/is/LC_MESSAGES/django.mo  | Bin 1250 -> 4217 bytes
 .../humanize/locale/is/LC_MESSAGES/django.po  | 254 +++++++++++--
 .../humanize/locale/it/LC_MESSAGES/django.mo  | Bin 1241 -> 4696 bytes
 .../humanize/locale/it/LC_MESSAGES/django.po  | 255 +++++++++++--
 .../humanize/locale/ja/LC_MESSAGES/django.mo  | Bin 1136 -> 1836 bytes
 .../humanize/locale/ja/LC_MESSAGES/django.po  | 228 +++++++++--
 .../humanize/locale/ka/LC_MESSAGES/django.mo  | Bin 1305 -> 1363 bytes
 .../humanize/locale/ka/LC_MESSAGES/django.po  | 227 +++++++++--
 .../humanize/locale/km/LC_MESSAGES/django.mo  | Bin 391 -> 391 bytes
 .../humanize/locale/km/LC_MESSAGES/django.po  | 212 +++++++++--
 .../humanize/locale/kn/LC_MESSAGES/django.mo  | Bin 386 -> 437 bytes
 .../humanize/locale/kn/LC_MESSAGES/django.po  | 218 +++++++++--
 .../humanize/locale/ko/LC_MESSAGES/django.mo  | Bin 1131 -> 1189 bytes
 .../humanize/locale/ko/LC_MESSAGES/django.po  | 227 +++++++++--
 .../humanize/locale/lt/LC_MESSAGES/django.mo  | Bin 1387 -> 4941 bytes
 .../humanize/locale/lt/LC_MESSAGES/django.po  | 283 ++++++++++++--
 .../humanize/locale/lv/LC_MESSAGES/django.mo  | Bin 1334 -> 1392 bytes
 .../humanize/locale/lv/LC_MESSAGES/django.po  | 277 ++++++++++++--
 .../humanize/locale/mk/LC_MESSAGES/django.mo  | Bin 1346 -> 4603 bytes
 .../humanize/locale/mk/LC_MESSAGES/django.po  | 253 +++++++++++--
 .../humanize/locale/ml/LC_MESSAGES/django.mo  | Bin 1659 -> 6348 bytes
 .../humanize/locale/ml/LC_MESSAGES/django.po  | 253 +++++++++++--
 .../humanize/locale/mn/LC_MESSAGES/django.mo  | Bin 1311 -> 4712 bytes
 .../humanize/locale/mn/LC_MESSAGES/django.po  | 253 +++++++++++--
 .../humanize/locale/nb/LC_MESSAGES/django.mo  | Bin 1223 -> 4091 bytes
 .../humanize/locale/nb/LC_MESSAGES/django.po  | 253 +++++++++++--
 .../humanize/locale/nl/LC_MESSAGES/django.mo  | Bin 1218 -> 4045 bytes
 .../humanize/locale/nl/LC_MESSAGES/django.po  | 262 +++++++++++--
 .../humanize/locale/nn/LC_MESSAGES/django.mo  | Bin 1228 -> 1286 bytes
 .../humanize/locale/nn/LC_MESSAGES/django.po  | 252 +++++++++++--
 .../humanize/locale/pa/LC_MESSAGES/django.mo  | Bin 1374 -> 1432 bytes
 .../humanize/locale/pa/LC_MESSAGES/django.po  | 252 +++++++++++--
 .../humanize/locale/pl/LC_MESSAGES/django.mo  | Bin 1359 -> 2742 bytes
 .../humanize/locale/pl/LC_MESSAGES/django.po  | 278 ++++++++++++--
 .../humanize/locale/pt/LC_MESSAGES/django.mo  | Bin 1223 -> 1285 bytes
 .../humanize/locale/pt/LC_MESSAGES/django.po  | 252 +++++++++++--
 .../locale/pt_BR/LC_MESSAGES/django.mo        | Bin 1276 -> 2383 bytes
 .../locale/pt_BR/LC_MESSAGES/django.po        | 252 +++++++++++--
 .../humanize/locale/ro/LC_MESSAGES/django.mo  | Bin 1342 -> 2623 bytes
 .../humanize/locale/ro/LC_MESSAGES/django.po  | 279 ++++++++++++--
 .../humanize/locale/ru/LC_MESSAGES/django.mo  | Bin 1606 -> 5757 bytes
 .../humanize/locale/ru/LC_MESSAGES/django.po  | 293 +++++++++++++--
 .../humanize/locale/sk/LC_MESSAGES/django.mo  | Bin 1321 -> 4727 bytes
 .../humanize/locale/sk/LC_MESSAGES/django.po  | 278 ++++++++++++--
 .../humanize/locale/sl/LC_MESSAGES/django.mo  | Bin 1404 -> 5054 bytes
 .../humanize/locale/sl/LC_MESSAGES/django.po  | 305 +++++++++++++--
 .../humanize/locale/sq/LC_MESSAGES/django.mo  | Bin 1117 -> 1175 bytes
 .../humanize/locale/sq/LC_MESSAGES/django.po  | 252 +++++++++++--
 .../humanize/locale/sr/LC_MESSAGES/django.mo  | Bin 1472 -> 5467 bytes
 .../humanize/locale/sr/LC_MESSAGES/django.po  | 282 ++++++++++++--
 .../locale/sr_Latn/LC_MESSAGES/django.mo      | Bin 1369 -> 1369 bytes
 .../locale/sr_Latn/LC_MESSAGES/django.po      | 272 ++++++++++++--
 .../humanize/locale/sv/LC_MESSAGES/django.mo  | Bin 1210 -> 4071 bytes
 .../humanize/locale/sv/LC_MESSAGES/django.po  | 253 +++++++++++--
 .../humanize/locale/ta/LC_MESSAGES/django.mo  | Bin 391 -> 442 bytes
 .../humanize/locale/ta/LC_MESSAGES/django.po  | 243 ++++++++++--
 .../humanize/locale/te/LC_MESSAGES/django.mo  | Bin 1031 -> 2218 bytes
 .../humanize/locale/te/LC_MESSAGES/django.po  | 256 +++++++++++--
 .../humanize/locale/th/LC_MESSAGES/django.mo  | Bin 1307 -> 3907 bytes
 .../humanize/locale/th/LC_MESSAGES/django.po  | 229 ++++++++++--
 .../humanize/locale/tr/LC_MESSAGES/django.mo  | Bin 1146 -> 3475 bytes
 .../humanize/locale/tr/LC_MESSAGES/django.po  | 229 ++++++++++--
 .../humanize/locale/uk/LC_MESSAGES/django.mo  | Bin 1510 -> 5682 bytes
 .../humanize/locale/uk/LC_MESSAGES/django.po  | 283 ++++++++++++--
 .../humanize/locale/ur/LC_MESSAGES/django.mo  | Bin 1306 -> 1365 bytes
 .../humanize/locale/ur/LC_MESSAGES/django.po  | 252 +++++++++++--
 .../humanize/locale/vi/LC_MESSAGES/django.mo  | Bin 909 -> 967 bytes
 .../humanize/locale/vi/LC_MESSAGES/django.po  | 227 +++++++++--
 .../locale/zh_CN/LC_MESSAGES/django.mo        | Bin 1151 -> 2093 bytes
 .../locale/zh_CN/LC_MESSAGES/django.po        | 228 +++++++++--
 .../locale/zh_TW/LC_MESSAGES/django.mo        | Bin 1145 -> 1199 bytes
 .../locale/zh_TW/LC_MESSAGES/django.po        | 226 +++++++++--
 130 files changed, 14577 insertions(+), 1903 deletions(-)

diff --git a/django/contrib/humanize/locale/ar/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ar/LC_MESSAGES/django.mo
index 8aed818103672f7ac05e20653e3e8d4a2438d750..1382da17b190f06b733637bf4f84d622aa28c087 100644
GIT binary patch
delta 339
zcmZqYJ-|C*PyH)K28Ovz3=F*t3=ADC5L%2CC<f#&0n$7`+KG*UfdfeU18FWG9RZ|)
z+8C0d;;B$N4=P>`<yQh}AYy2Oig!ZkZXgXZx0j7U4s75opa95%r9c{F!8#xfL<~DO
zM>6&>h8XD@80#9EC>R)68CvQZm>U>y1^DX*rIuwDXXfYWx+IpQS}7PA7y{K9fz%lq
zTNzkr8vp^9PhxS2Zb(sLUU5!hNq&))f`4&wVs4^>_he&c12>I~l9B=|ef{$Ca=j9e
zqRh0^3cbA468(ar{H)aEl4AV={gkZ4y!3qi93WYmn4YSiSfsBBG#A3NQb;VCoXH%$
J`6BZ+CIGtjM@s+z

delta 282
zcmX@W+s->-PyI$l28Ovz3=F*t3=IA(5c)2Vo(tq>vobL70BKG(1_llwEe52yfV4c2
z25Mu_f{N=vX;Y}U9hC0?q=AUR6Dl46rGtPp$lMS%205^Si9i961vx+(WI-vA1|o)r
z&5?{fjDCi?2FAKZ1`0-oRt6T@28IR(Tmk;NL8)b##hLkex-N+&sa6U`28LjDhUN-}
z=2pf)bwI%7lUQ7$8&Z^*SDcerl3!${ke@x-lG%XG#xFlF)o${7=4c+D#Ju#<#B`t$
MiA9?^S++9)0I7{GDF6Tf

diff --git a/django/contrib/humanize/locale/ar/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ar/LC_MESSAGES/django.po
index e4447b8ea6..f3ee822fc4 100644
--- a/django/contrib/humanize/locale/ar/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ar/LC_MESSAGES/django.po
@@ -1,37 +1,53 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Ossama Khayat <okhayat@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 21:08+0100\n"
-"PO-Revision-Date: 2011-03-17 17:38+0000\n"
-"Last-Translator: okhayat <okhayat@gmail.com>\n"
-"Language-Team: Arabic <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: Ossama Khayat <okhayat@gmail.com>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "اليوم"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "أمس"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "غداً"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr " "
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr " "
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr " "
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr " "
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -42,6 +58,17 @@ msgstr[3] "%(value).1f مليون"
 msgstr[4] "%(value).1f مليون"
 msgstr[5] "%(value).1f مليون"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -53,7 +80,18 @@ msgstr[3] "%(value).1f مليار"
 msgstr[4] "%(value).1f مليار"
 msgstr[5] "%(value).1f مليار"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -64,50 +102,307 @@ msgstr[3] "%(value).1f ترليونات"
 msgstr[4] "%(value).1f ترليون"
 msgstr[5] "%(value).1f ترليون"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "واحد"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "إثنان"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "ثلالثة"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "أربعة"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "خمسة"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "ستة"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "سبعة"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "ثمانية"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "تسعة"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "اليوم"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "غداً"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "أمس"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
diff --git a/django/contrib/humanize/locale/az/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/az/LC_MESSAGES/django.mo
index d1e665e700f16349810707b512cd4c40864d3868..158df1717c3154fa2fd7194ca86f39a65e74b211 100644
GIT binary patch
literal 2312
zcmai!OKclO7{@0NC>X+{EssJeBOoH7Y`jiDO*aGqX{$yeB2<C<*gLkTS<g5-V<*mu
z3#XoYun<B>2o8ut4sgl=lt!u#oalv1B_yN@sX`zjH~<p=&mP-}<CKxdzy1F6J$7Du
z^XTYRhQ`rPQXgULH1RI{p<M@G1Y4fJgOjjN+|AhY;DTof9EW`cd=A_KUj}b@dt|g@
zzW_c9{aujqtbzA{AA$I>Pdz^ePr&{XJO%E8D9wKM<F`PhX16_m^W%Sjl<zOE|LgS;
zh!j5x()bb2G4MXv$3V(=61*Se;8m=}OW-ls-`>mEQSb&x_AT&H@Ne)DaO_COJ_XLf
z4#6{E0-gmw178Jif-~T86wQJcK}c)^#H+FoK$K)3f|UOX_%Qe}NPb^|D9OGC$$uN9
z_x{e0?}8Nnz2^^J|Iza&km7#v_OBrM{|Qo_f4okMfa$l-1f+JOxH11sF;Dtu4$_)X
zqrG|n{TXz6-)^J5d=UL9blQjG=ue<Oj!x@JwP~KTmeexnG=FMzUZ~N$A8J1__B2TQ
z^q9BV_(WYKH90wzEAqTb5@q!NYLy{=!!(x;aXcW}19gWfgZV8#s0>NnlLY*A%}Fjw
z1`{lpns$?vghbm`doIP)RJb<lL;QL}f?HWIIv&W^5xe=kOE0Kjx9is%5}KDyEgeWl
zl27Kxdjb7i9jD%aRHd?GMOBxqh;XKbtED1wsv<|nCt{g6fr-;H3?Jzw(lOIYOGYbU
zz%*u7)}>}vZ7}PYE8~|+$()Hr1OFA1rto#^hBc&hG9`IAHJ4?<1&eX;zDzC7SH#a<
z7P@3Imt@tXE?BZ96$fwCN;X(A5zj2Yvl1+%QaJbq=Y*3HpAK`=K{ylSUg2RF<<17-
znJ|Q7a7oq`<=p2tO@6tVD4abVqGjF|)&(o6&^8gyq!E8JQGC%>L_;N}&R-LWdPBh^
zYf9;&c^x6TR1+l`tVmHoz@|*|LgBR)pC~(5jk4MG_4O%7NmWs9Olj$|)y`CHwwjIG
zGt4GFO;&7XCwoaFE;chui%aMGE0UWEGYdvLsqv<bDyHn@1~Mi>={a5~i_}Ut|K7@l
zV7Bi^#fvfx&g+7Sl`chmHm_V}IidXyE||1pBd)7$)6VDSc;|6G%<Q}3xJV6w&E5Mc
zAZ_4FKv!w6*1m!J0z1l{Fw46^I6o2YdCKEfb4{(an!MGl*IUgbV_aEcOZvxo(1Xt2
zK&&-76?ceikN4v&wyklek^>G0BM&LqjXO|JxWngXMSpZ}C8&p%>5ehmYOb!TO_rCt
zpRjo6oA$PK@3dc1Y-CsIyjXB;OBb$fvDmDw)i#;Zv0~T@*3}y_hJsH7e7ahfJKH;7
ZuzZb|cD8ZxMP8JdT2&~$ty@ja{sUuyXDI*x

delta 195
zcmeAWn#OE#Pl#nI0}wC*u?!Ha05LNV>i{tbSO9ShP|^}egVeylWKCAjL_=KzV_id2
z1w&&iLknF469WUT0Ds+})UwRt%=|oEm&B4(D+MD1L$Epn69q#HD`QJ-10dk?Nh~hW
z4Jk^@E6zzQ$uF`}@Jh_f%Pdx~$pX_3IjNZ`sX3ExvMRCJ_~qxN+D&$3i{|l3%u6p#
OOb42pST%Vzn<@aB)hr4C

diff --git a/django/contrib/humanize/locale/az/LC_MESSAGES/django.po b/django/contrib/humanize/locale/az/LC_MESSAGES/django.po
index af6356f484..009ce6e4e8 100644
--- a/django/contrib/humanize/locale/az/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/az/LC_MESSAGES/django.po
@@ -1,97 +1,278 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Azerbaijani <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "bu gün"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "dünən"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "sabah"
+
+#: templatetags/humanize.py:24
 msgid "th"
-msgstr ""
+msgstr "-ıncı"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
-msgstr ""
+msgstr "-ıncı"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
-msgstr ""
+msgstr "-ıncı"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
-msgstr ""
+msgstr "-ıncı"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
-msgstr[0] ""
+msgstr[0] "%(value).1f milyon"
+
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s milyon"
 
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
-msgstr[0] ""
+msgstr[0] "%(value).1f milyard"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s milyard"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
+msgstr[0] "%(value).1f trilyon"
+
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s trilyon"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
-msgstr ""
+msgstr "bir"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
-msgstr ""
+msgstr "iki"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
-msgstr ""
+msgstr "üç"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
-msgstr ""
+msgstr "dörd"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
-msgstr ""
+msgstr "beş"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
-msgstr ""
+msgstr "altı"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
-msgstr ""
+msgstr "yeddi"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
-msgstr ""
+msgstr "səkkiz"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
-msgstr ""
+msgstr "doqquz"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr ""
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s əvvəl"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr ""
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "indi"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr ""
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+"one: bir saniyə əvvəl\n"
+"other: %(count)s saniyə əvvəl"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+"one: bir dəqiqə əvvəl\n"
+"other: %(count)s dəqiqə əvvəl"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+"one: bir saat əvvəl\n"
+"other: %(count)s saat əvvəl"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s sonra"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+"one: bir saniyə sonra\n"
+"other: %(count)s saniyə sonra"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+"one: bir dəqiqə sonra\n"
+"other: %(count)s dəqiqə sonra"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+"one: bir saat sonra\n"
+"other: %(count)s saat sonra"
diff --git a/django/contrib/humanize/locale/bg/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/bg/LC_MESSAGES/django.mo
index 7c63556da852820974b948cc6a8e09ec9ab4ba5a..51069e51f5b8761b53aa07052d50ec8fa6ed8236 100644
GIT binary patch
delta 338
zcmXZVy-ve06a`?1P=qWt7A6#l1q800q^Q)a6;ly^SrC&;O-NP6C2<KGFTjA*5iuej
zpexV8hS=D60Twu>v8?;)ULRe*(og#McK_rN^1MJun-J1jBqWA6(Dg5H8GgVe_yt$s
zH^e1BC=~uem!pmOd=<L+8g%oGdcFhk6$zo+*J_aU|G<77?A8y5&@D)2=iY;N7BLaC
zuoVa)!wwT|A?WcDJJq*YnVFn*mDMtcM2KAEa$zjR-nPJ@Jylwk6e=%A%9=t3i5Zw8
z=uKmP_h9qd+Og!ks;Z`Sne0m6HFItGxG+O~X-hulgQ3b(!$+tSm1^Ek`4-mBI~nxT
MY3^Ul-u)Br55@09EdT%j

delta 282
zcmcc5wVZ3hp88})28Ovz3=HNB3=E7c3=GCV+7d{E__;uu14u6g(riF_9gyY$(p!Nv
z5HTDA5?ny~IFJUZy95=#4HbU?6@LvC{{p0eRx$hp(jfExurSDhH8Qh84B!FMAPG?*
z4Ki3}b0lLAqo1L!fw8Wkse+-gm7#^Mfr)_uSAf56P-<Cbab|v=u1jJ`s+EF~fgxC(
zftiAVnU$frwgC`u`6L#X=!O&}<`w58mgE;%DU{?)wqQ18v+>K%OSPN4nK_!rCowO*
QG%+1$L{j=@UX~z609em4h5!Hn

diff --git a/django/contrib/humanize/locale/bg/LC_MESSAGES/django.po b/django/contrib/humanize/locale/bg/LC_MESSAGES/django.po
index 8c5df10f9d..72702885ce 100644
--- a/django/contrib/humanize/locale/bg/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/bg/LC_MESSAGES/django.po
@@ -1,42 +1,65 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# 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:18-0400\n"
-"PO-Revision-Date: 2011-03-06 06:17+0000\n"
-"Last-Translator: tlubenov <tlubenov@gmail.com>\n"
-"Language-Team: Bulgarian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: Todor Lubenov <tlubenov@gmail.com>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "днес"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "вчера"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "Утре"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "и"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "ви"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "ри"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "ти"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f милион"
 msgstr[1] "%(value).1f милиона"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f милиард"
 msgstr[1] "%(value).1f милиарда"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f трилион"
 msgstr[1] "%(value).1f трилиона"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "един"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "два"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "три"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "четири"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "пет"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "шест"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "седем"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "осем"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "девет"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "днес"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "Утре"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "вчера"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/django/contrib/humanize/locale/bn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/bn/LC_MESSAGES/django.mo
index 420320ecc29f0ffbf8ea79176ce122e6175f4024..cc84cafd6c268373c9382da448371902fd349efd 100644
GIT binary patch
delta 319
zcmcc2HIaM5p8A=L3=DIb7#M6B7#Pf1Aap5^_5|`b18FuO{TE2{0BIIh1_n+bEeNEU
zfwVM`2Fc4qX*H<0E|3PPGlYs;L&cq-d^f1PFDru_*nn`LfCNxO98{tlNb>{vjhiDG
zdl*fPbPbGk4NVjb46F<-bq&l747dXPb%RpNGK(|w^K@MjOH!>Aj0_Bc>Wo0@42`V}
zEGA1a%dz>SW~QX(Og3lMb<@ZwDJihh*Do(G*DEPX%qz}JORdn$OD)kaD9X=DO)e?c
qFVIiPO3X{o*UtfxrHSdO`bl~Enp{3mo|QsU-sCjq=*{PtTNweI-aE1Y

delta 257
zcmbQpeVJ>*p89A;28Ovz3=Fmm3=BV+A+$LQ1A`}!Ukaqzfb@PK%>$&50clPkeHlmt
zl``Cg%0GnCFQDS@fiy_nXQ=pJs5lEN#5@il4U*?)Wsn0~APE$Z017BTB`kq7KalUd
zIg+u5(bQ1az*yJNRKd{L%FsgBz{J3SE5KhjD77rJI5R&_*Cnwe)k?w0z!0p?z(m2&
p!phikvJ|u2WP4^ECL6oS8=0edd=m50OB2(9DwFaybF;KD0s#IPC`|wW

diff --git a/django/contrib/humanize/locale/bn/LC_MESSAGES/django.po b/django/contrib/humanize/locale/bn/LC_MESSAGES/django.po
index dee59bb2c3..0e2869602b 100644
--- a/django/contrib/humanize/locale/bn/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/bn/LC_MESSAGES/django.po
@@ -1,42 +1,64 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Bengali <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "আজ"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "গতকাল"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "আগামীকাল"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "তম"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "ম"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "য়"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "য়"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f মিলিয়ন"
 msgstr[1] "%(value).1f মিলিয়ন"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f বিলিয়ন"
 msgstr[1] "%(value).1f বিলিয়ন"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f ট্রিলিয়ন"
 msgstr[1] "%(value).1f ট্রিলিয়ন"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "এক"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "দুই"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "তিন"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "চার"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "পাঁচ"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "ছয়"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "সাত"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "আট"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "নয়"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "আজ"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "আগামীকাল"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "গতকাল"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/django/contrib/humanize/locale/bs/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/bs/LC_MESSAGES/django.mo
index 9aba4f4913e5220b6739ec6190f809ad6c163e8d..1f3fdc26dd003161451c7379cdfadc40c614418d 100644
GIT binary patch
delta 347
zcmXZUK}*9h6bJBE>lEvEkRBDul6C_%I|*ela44dnC_?69&8Tf{vQ<267eP=FVR-aY
z?CR00cl{842VXTI<d>KCfBEuWmtWo|KMug#9KbdJJkA5O&`*@3OEmzzLWH_#2VF$F
zD2~7(iW`osXZF2s>)3jQR`c5SOIzR8VCC<Fu?^nY#sj*51JAQ#=gBz@32Ts`=`+TI
zEy6Y!^Y(Vhz8op7vXn%^NbZL$z+716f(B=s>kOB-BeWq0g-CTGOjdBetrC^{(J&Wj
zHc}t=)0W$8uU;CHb4tsyteYyVF62!;m4@a;Hjw8=)13APB8@Ye;5ihrq&-d7@c;jc
P`#n9qc28#C?!@^8B{@jh

delta 286
zcmbQreS>Slp85@p3=DIb7#JKG7#RFm7#OU9^aLPn1*FdaX&_=?XJueu2GTr0njJ_B
z0BN8W1_>YyL=4hUS`jL)4&`e>X#*e)(r*Tpw}SF*SsCQO1~@_$x<e&=fixRXL*V8}
z#vaBnLtO)7T_XbpBSR|#3vB~K0|TxAf8C(evdrSl{5)Nk#FA7i1tSAPm^wo<D-#oK
z10dk?Nh~hW4Jk^@E6zzQ$uF`}NJ}X#NX*MG%S@i^$ZW!7V>fv>b2N`nVqSV_Vmi>6
Lq~gt@EDekRgj6j~

diff --git a/django/contrib/humanize/locale/bs/LC_MESSAGES/django.po b/django/contrib/humanize/locale/bs/LC_MESSAGES/django.po
index bc3ca6a685..5c50164f2f 100644
--- a/django/contrib/humanize/locale/bs/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/bs/LC_MESSAGES/django.po
@@ -1,37 +1,53 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Filip Dupanović <filip.dupanovic@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-20 21:08+0100\n"
-"PO-Revision-Date: 2011-03-20 16:44+0000\n"
-"Last-Translator: fdupanovic <filip.dupanovic@gmail.com>\n"
-"Language-Team: Bosnian <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: Filip Dupanović <filip.dupanovic@gmail.com>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "deset"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "jučer"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "sutra"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "-i"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "-vi"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "-i"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "-i"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -39,6 +55,14 @@ msgstr[0] "%(value).1f million"
 msgstr[1] "%(value).1f miliona"
 msgstr[2] "%(value).1f miliona"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -47,7 +71,15 @@ msgstr[0] "%(value).1f milijarda"
 msgstr[1] "%(value).1f milijarde"
 msgstr[2] "%(value).1f milijardi"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -55,50 +87,238 @@ msgstr[0] "%(value).1f bilion"
 msgstr[1] "%(value).1f biliona"
 msgstr[2] "%(value).1f biliona"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "jedan"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dva"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tri"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "četiri"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "pet"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "šest"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "sedam"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "osam"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "devet"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "deset"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "sutra"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "jučer"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
diff --git a/django/contrib/humanize/locale/ca/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ca/LC_MESSAGES/django.mo
index b115dbed243f64c92a7786a5c3c9919d7783e345..2e1dcfa02b03a958e3d82b90dc16c2b7c80183fe 100644
GIT binary patch
literal 4005
zcmai$O^g&p7=}y19|lo=R76w?5t(u6ncf8z2bYKoL=p*z3-O?bV!CFw$xPMIRWrky
z5D&x{6D}UqgP0IC(Ssb+11C@G&3GX3tj4PsqX#));`?>i{B_sH&eS|zZ@v9>_4oBu
z%`cnRe#mfyXpf;?y@Rm@I$wh?9Obo)?Ex#`4EP$j8@%N7&z=6G<3C^x<Gb$4_&OM%
zf7$UHu!8=t;4X08-C6tq+=>1fko1AmKXF_E>HdE>ZoMaqv*6ePcVqlx@JaA{a4-0q
z>u<O>>xbYD=x>2Ek4qq?!oCDCb#~qHTW}ltH^3*ro8X<`pKknbkWzHZ@wOXh>#}%j
zKpI~M(sdggH@fjHj@v+7%65R{FN657z4-bRwRjFJqyKY>v1h=4!KcZ$KFixlko1A$
zXJ8fmpB!(4l!ux7GQI)Q_3wgDfnU4+O_1_-%W?aL%y-C9f^?rNjyFJ>*YA$&@6YPD
zAEf-A1p~0}`d_&I4<P09FK{oo>47Zoha49`l$gB&Vk+z;xCML@L^@a(q&y{#eUS3|
zwj00X^miODJN-S7eD8x)=PQmMfK>mFK#F_S>DNHIUlon&L%$DtA2y?5>gn+yz8^uW
zW!?1qad%F!wxiK+s)9zjpy#3-4-cd+eMahUM4O=#98{M_)3Yo`^t+&Ud-9+h??R)R
z43AAXLAleq&^tuWg~v$q$3c4jhtam8Q4J=KhtQ$-VviH?nxzNj3O^xCpxhVjo~%@7
zoBUkdZpT{vuNKLM$LUvFTDNq2Dx^p1c;fjqrIp9&S9QaByngjUPeh5wy}BMNU-Sz-
zziwpLXJ1vm=y!W%>zjB%G==K=lwu7H_i4Ej8eS0c)ib=P6zgWVPb=2UaG&O@mf@?Z
z#Y&Oar+Ug{_$p$dMC9~{o&t>|fn2Gcm0YwmemM=@Q?^10B+;bm$kI%72T2=ve4`<O
zDKxZ-a`7^87|&To7me>b^o@pu;!C=h<ie5Ug1Pb01>;zmX*3|?){<q-xGz}~mop`7
zFA;4UcjVgL<w&-zz=Km7{3D}4Dq<>Dl2Il!m_*FTzEsS_7n!llF5#0%$*hjVGQK-H
zN#L~u&6cIHG9md?qR-2Q4UR{_S(zBDg>`=9yihG&IxV|8vB3$`ilgA=UdsfFy3R|d
zPA&!ui4+#z;E1rY&ga6}xggvZ%<ku5Sf70%2%ir_7=zQYA5+YnFMO8I?W>33Oo*fO
zsxUTKOoTFRVRcgHhn2;m#}BvlGJjE|ovJ|RC7Vdo6&+J;=*}Trr&>MHlEI=BojP9-
zR<u#4@{+aPdaX7X462r*#!Y##s-&%Tvu8E6ZY@e5u?Bw{qSg?#$|zu+H$>^g@e@bK
zDVeQ?r3J05RG8{=7td_*ir2br5vzl|u_O{B?fjX=W5I#3k8a+SNpMs(bQG&rogX+C
z+tR5v6+Aemla8r#)lIu*e(oU8PUp*t@0{nemD1E6g2f~jDDvd?<uo%TrmI)H@|{Q2
zYTBAx!)Qm$q-h)7CKr#^HWYT+m#$=aXC~&Y>0*|*W@6szR<pc$C>QPNf>yL=a^9XT
zYI(O)i)LEaisn?!oAKWw?<8r`mTnPKRUIkg%)0$(GS*O<j+LwCaEqFZl&fTRx9KQ_
zBDx(aH}OIN-3FDj4XZTq`i%Ccg0)b%(e{+H7K=9AoeIW$!G@bt&X_A!`cHu}-W0s2
zvVDlo$IE)UH5nG|5f^$Z*ZG8PEEU{YG$UL1%Q+P-m2%NCn=hJkr_ls9rbJ9fgCeJc
zIhQY3X72Z5%Nnt2FjNfdY!=XMM_5UQ8&ibc7*TLXg`KCz=&Yw$g1yIL=P@{2`HIm(
T%>-hyNOo4Pu}Gu46esLI<MuBH

literal 1207
zcmaiyO=}b}7{{a5xAnbxR7k;>7D=6HE3DHO#J)ha)mqkG6eZos&Zf*JYm(W%T=Y~t
z2t}j^5k>IQlLx(e>le^3;P>z#_>aaG*9F5o^UL$kf1W%U@~yjTlVF@doJD*_oI^a=
zgBQjZ@Dlhn@H^Otyk{>V`@vga7kD>t0mMV@hx{S94|z4{8R)-T3VJi>E^s-luLV8@
z55d0<`Z^onVelpR2)(=kFCzbeMc?OnG}8;tfWEIHa1A_w{0WH9$U5ljJp)mKJP-Ot
z&|d^@2K^Q2eXl`0<Za-4(4S`u^z}Xj{Uhl2@oU`(zqdcfpK%Nm@Aoy2ApHL?A@CVF
zjqu|X;snB<_ax#dqSH7Y#Dks}dRsg%L|=bgql+@nrB?sd8XbI{G-o;(cSIqxx+68&
z5~QXJLsUwXRDx)PNr@FLp@@|$#5&^Yc#IIl>6EYH-O$G9W#X1KSryg^<K;P{mqgXE
z>69%9V{w#(PAqYi>C(JtYU9|f&1A}M6q#ieozT+UoeCQ_f;)KG1a~5#15q5aXpqHM
zX*`(3Wfl!Z5sYkJw4|@u=8J}CTuuhBU5+qHGu%2>F<jZ4J8cqrlPe`H9YGu5^<2nQ
z<o#0B^cc)4D|jYYMes&K$GPJ<S9Ihye!*C2c6xSl_Z)G5R2tXH35EKrO*HDnio4Rx
zxm3fnTIa?JH+ru!#mc)r-$zXtHmRyQl`2bUc~QEZeG^*crMbK?JZDqdG;Bgu^H*v|
z2ZrhI>1eN_J)<=4E4AMXx&7%MNh|x8hHKGoqh4$G`CHL${H1wgtB{UVrK*z01$Rae
jMU*Z`p@_jXakwNFv+XT{HA^_`Bo&SAcO=zF>(Y>)f@}@F

diff --git a/django/contrib/humanize/locale/ca/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ca/LC_MESSAGES/django.po
index 0168f67ac3..db1ebbd618 100644
--- a/django/contrib/humanize/locale/ca/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ca/LC_MESSAGES/django.po
@@ -1,100 +1,296 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Antoni Aloy <antoni.aloy@trespams.com>, 2011, 2012.
+# Carles Barrobés <carles@barrobes.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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Catalan <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-05 23:00+0000\n"
+"Last-Translator: Antoni Aloy <antoni.aloy@trespams.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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "avui"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "ahir"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "demà"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "è"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "r"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "n"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "r"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milió"
 msgstr[1] "%(value).1f  milions"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s milió"
+msgstr[1] "%(value)s milions"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
-msgstr[0] "%(value).1f bilió"
-msgstr[1] "%(value).1f bilions"
+msgstr[0] "%(value).1f miliard"
+msgstr[1] "%(value).1f miliards"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s miliard"
+msgstr[1] "%(value)s miliards"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
-msgstr[0] "%(value).1f trilió"
-msgstr[1] "%(value).1f trilions"
+msgstr[0] "%(value).1f bilió"
+msgstr[1] "%(value).1f bilions"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s bilió"
+msgstr[1] "%(value)s bilió"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f quadrilió"
+msgstr[1] "%(value).1f quadrilions"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s quadrilió"
+msgstr[1] "%(value)s quadrilions"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f quintilió"
+msgstr[1] "%(value).1f quintilions"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s quintilió"
+msgstr[1] "%(value)s quintilions"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sextilió"
+msgstr[1] "%(value).1f sextilions"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s sextilió"
+msgstr[1] "%(value)s sextilions"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septilió"
+msgstr[1] "%(value).1f septilions"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s septilió"
+msgstr[1] "%(value)s septilions"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f octilió"
+msgstr[1] "%(value).1f octilions"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s octilió"
+msgstr[1] "%(value)s octilions"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f nonilió"
+msgstr[1] "%(value).1f nonilions"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s nonilió"
+msgstr[1] "%(value)s nonilions"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f decilió"
+msgstr[1] "%(value).1f decilions"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s decilió"
+msgstr[1] "%(value)s decilions"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googols"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googols"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "un"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dos"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tres"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "quatre"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "cinc"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "sis"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "set"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "vuit"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "nou"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "avui"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "fa %(delta)s"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "demà"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "ara"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "ahir"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "fa un segon"
+msgstr[1] "fa %(count)s segons"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "fa un minut"
+msgstr[1] "fa %(count)s minuts"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "fa una hora"
+msgstr[1] "fa %(count)s hores"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s des d'ara"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "d'aquí a un segon"
+msgstr[1] "d'aquí a %(count)s segons"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "d'aquí a un minut"
+msgstr[1] "d'aquí a %(count)s minuts"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "d'aquí a una hora"
+msgstr[1] "d'aquí a %(count)s hores"
diff --git a/django/contrib/humanize/locale/cs/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/cs/LC_MESSAGES/django.mo
index 5ed027f79af498c6f2a72c8b688a210039add69b..76151125e3f70ab32db85f0a25e226a813778af4 100644
GIT binary patch
literal 4648
zcmai%%a0UA9LEbmaR*TZ5%ERA3d{mMk6n;uU;tUbkhl?X;pU-tx^}kNnd+gdXLe^3
zPM$d$L-1lW8cmRBVu%O5z@Cf;{{SBs^k8B%l4uMEzrXI9o_^HE&enXozQ0F3el^p*
zKW<+44#QPJdmin*HH=Ns{aSqBDz0N}FE|G72j2j9gIBfwf!4p({2MI8KKgLPH$e;i
zw>3Wp$I$-?90f-niSk?EPV_H=q%UgyhUOiR#{W%o+xjTalx7>;4g0&`F7Rvc0Qj@+
zZ+tZBSHK<6-vVhKS3yjLeGFpi?55@y;CA$HgD-;LgAaj!X!~CvZP7oP544?)METZ&
zWFG-3ZlmTVZQr7~9YiSG0g`_a#2-6=kIztxm%%#v_X>=i14lP7b`)%DegeKqc987W
zW0C(NcpUvNL9*WmPlCrbM)6m{!{~nnPJw@dhrmORGd2k>fUkfbf@J>%B>#O+MD|&b
z>^Hz8;13|hZ`;J!32+*uGj$C-1%3lgfNP$N?1w<IcR^bBM<DJ0ryxqkZh>3D+u%0v
zI}qE!?twT0>{pQL_PgeNZT}afJP)+KW^)v`UULK_`v%QTAm!Vt`_JqCPLRecp;3Kk
zu5=zCGi*h8J%!I_(8^Ia{Cq**)0&<`qwmxhnuSK=>_Qt{*m8!lgcr6aJm1uL3GG?B
z!F2#_CmNmY<V9zA6m4HZ#F80~0V|^6*o6Coval^^9F5N5(`dAxbf%LR?e!kCy;{U^
z3oqI$st4O$?AfiZ7%Nrh_^jJ%xt{!A%@GZQr&(=!Uejx(QW~VTA)iT;o-}xxRj&~k
ze9h{WuI=~+@6~lznzCQ%nsp^QCihk4C9}6t4onlzi7HoJlajBY;wCLqLdA1Jwt9-^
zm3-Y4H);8rDQ?nC)lz&lHD4+6HK~R&DZYxBD-n4bL_>jM$;MvEZXmeb^zhATcwHHc
z(FT&JLN#`o^Sw4UZPDNtn`}&>;YlZxFA@j&v`ZW`9CzRsn{3JFy{?~0N0Lsa?Qy^`
zSL75Mgxj1C*qqxFY!2Z}+CkU1TY=ja>vk6%(F$xVoVLMii4#eONmmL+JK=%8!<6U=
z$&|aqRKS9H{P{w#z;o<AKHHw}!#7y;SYN0>_#~hAz00BzSmzw;lJFIN3v2xJWm`7A
z!UfUs{J@%4P1mtbb(_kX@oKzq{`DDa$`^J3U+c6Th#DWSRL8B#gjGGrE0tRHh*ddU
zsld^?AbKw4O!<wIUv;8ZncQE&Rd~%-fi>gXQnl>B^K1N4%XVx&Z8yXMKh`FkRJL?x
zy`@rP`8fP#vuihnH6!eHjZZC$#yl_12SKM+E-x-FmIBJ<&WWXx6hXNYtx%OaWhY!%
zxup}78>&1Or>pUXDomf7J~P~iYN=9~@?;<+CfM&_r2!6hxzn;;d6YNiZC{C?esSik
zH97R7!RLf;oskXCab>f{CuiNDaK1%lw$6HfTh+Migk4piILf2jdQsNv)iHj8S9pyV
z<?;GB-?N9yWA%e1Rw0fTQV$jUy0|uqXcGG-F{Lf^!tZ@PL&A{Gk}#w)Wqt_hu^LI~
z@JL&^m5QY`WFEhfl#Y$GOzdDjnfRfc&N0+;dBP{5X(wVsHdSm$tp;xs`7ByYXV79Q
zntlwko1wLIuohQYMs7Qzxq334WT7|EGkL=7xpOs8(@6$uY8|w;%p@Wy9UEzh!Ncce
zdjDc+7#d6Qn2HZdo0@e>PR1v^6FD-cc<_8r2F53t4_+ao$zZWLrJt8lOC3xiu~EYb
zCu@~dGa2GTIQ$79?^sUGJs~F+t&d?cUQ5YXEhXag3Ct_WFzsZVbY|IuqnHdI%-EBu
z47nqx_&`cV546M-qXU-{l2MTh#_OzH7f$s0;dOOy_(%_5OYFA0x?x$rt#ldgGJ$=A
zrZXwA(3Os1#K>S8a%jOwQ71EKBxXj9L_O?0J*W($hPr9c*nly^`^=D`mKibBn5WvT
zbN5ET?p_P}E7x6=WAM(?3-`O_sUWS+cCjN38R{kGh#rN@zPxjjT^5eC@t>^{PMfW~
ekGC3hN-UtnjueV5-?@pm0p=iv_3mC1xc?8|#14o6

literal 1306
zcmaiyPfrvv7{)82=%}b*JZVx7BE-x(!(xI1gGT-&s3?+^i^invba!Vn+iu$K!gBKD
zjc8&#7~{bYVEh8!gqsIEcvNqmj2BPDnD|sG1lYu;Z-4VX`@EgEv;ET3`J7;!LYzUo
zL!3oC*oOsU9lQX3bld<3ke}-y<N$aR>;&&R&V!ibzRMqi`;ix&UIuMl)#-Jo8^=ZW
z`?BLB@DTiuLA%cr@G$rcTtY9ez!>>yG%*4e9G`;L{{h4#>sY$LPaw+3XYe5S6}0_)
zbNY7>ll*Y{Pp5A<{sJ+{Z^sT4+kLt~t9QG+7qssINDsn#>^c68V|cLrp?z`$VZXnJ
zuzU0(>^O-yj<DxFfjEk2H@cl@&qvPpH(A!;1G%t77t$<CrTDK_YvXID8P&$PCGxaf
zF{G3>IVs78A|fFo6`V+fN{Hr7E{IN-h&IGjFcs&-$b_}9)}&H$k(fnET3j2htURk^
zl^2aao%r)yX&fb@6ICY4(wpOTsf<6P%W2|YZ<MuPkP-D}?-cxT#hHQEpJ0YZbT9}*
zKgj#xWg6zAaM%xqf&fN;jyF@g=Pq9`M8n}If8}C;;oV}|_yxs;&X|!ZqBocjsivc7
z1H6{;G~rn;6(u<avnV%MnfnFKY7re@=EVvfy^Rkr=FLpcOm3ed%mv=K6ow1z-m0Tb
z!<WpZdd5;QLW>oqG&k|R!jwO}?Xz8!xbi1OQ6{M<M|5~0HCu0uXi<B!SwpeRpOUJk
zBP!~DQyu3==;mYGFXA{HpjT-?Bib*<;z8QiN5yD7WW^BTpts|~;3A|9e@8p9)lS@_
z?Ye<>Ln-!_O0o8KM=h=|jBTWywVO87N?jxM)t82>u9()^i<IO@!kbp8@<cGCnkO}~
d_8J!qNsbt6N(9$r`TZNC7)jtJ&D9l-=RZh=FGc_W

diff --git a/django/contrib/humanize/locale/cs/LC_MESSAGES/django.po b/django/contrib/humanize/locale/cs/LC_MESSAGES/django.po
index 7fdd571ef1..d46aef71d7 100644
--- a/django/contrib/humanize/locale/cs/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/cs/LC_MESSAGES/django.po
@@ -1,36 +1,52 @@
 # 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Czech <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "dnes"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "včera"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "zítra"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -38,6 +54,14 @@ msgstr[0] "%(value).1f milion"
 msgstr[1] "%(value).1f miliony"
 msgstr[2] "%(value).1f milionů"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] " %(value)s milion"
+msgstr[1] " %(value)s miliony"
+msgstr[2] " %(value)s milionů"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -46,7 +70,15 @@ msgstr[0] "%(value).1f miliarda"
 msgstr[1] "%(value).1f miliardy"
 msgstr[2] "%(value).1f miliard"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s miliarda"
+msgstr[1] "%(value)s miliardy"
+msgstr[2] "%(value)s miliard"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -54,50 +86,238 @@ msgstr[0] "%(value).1f bilion"
 msgstr[1] "%(value).1f biliony"
 msgstr[2] "%(value).1f bilionů"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s bilion"
+msgstr[1] "%(value)s biliony"
+msgstr[2] "%(value)s bilionů"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f biliarda"
+msgstr[1] "%(value).1f biliardy"
+msgstr[2] "%(value).1f biliard"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s biliarda"
+msgstr[1] "%(value)s biliardy"
+msgstr[2] "%(value)s biliard"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f trilion"
+msgstr[1] "%(value).1f triliony"
+msgstr[2] "%(value).1f trilionů"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s trilion"
+msgstr[1] "%(value)s triliony"
+msgstr[2] "%(value)s trilionů"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f triliarda"
+msgstr[1] "%(value).1f triliardy"
+msgstr[2] "%(value).1f triliard"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s triliard"
+msgstr[1] "%(value)s triliardy"
+msgstr[2] "%(value)s triliard"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f kvadrilion"
+msgstr[1] "%(value).1f kvadriliony"
+msgstr[2] "%(value).1f kvadrilionů"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s kvadrilion"
+msgstr[1] "%(value)s kvadriliony"
+msgstr[2] "%(value)s kvadrilionů"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f kvadriliarda"
+msgstr[1] "%(value).1f kvadriliardy"
+msgstr[2] "%(value).1f kvadriliard"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s kvadriliarda"
+msgstr[1] "%(value)s kvadriliardy"
+msgstr[2] "%(value)s kvadriliard"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f kvintilion"
+msgstr[1] "%(value).1f kvintiliony"
+msgstr[2] "%(value).1f kvintilionů"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s kvintilion"
+msgstr[1] "%(value)s kvintiliony"
+msgstr[2] "%(value)s kvintilionů"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f kvintiliarda"
+msgstr[1] "%(value).1f kvintiliardy"
+msgstr[2] "%(value).1f kvintiliard"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s kvintiliarda"
+msgstr[1] "%(value)s kvintiliardy"
+msgstr[2] "%(value)s kvintiliard"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googoly"
+msgstr[2] "%(value).1f googolů"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googoly"
+msgstr[2] "%(value)s googolů"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "jedna"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dvě"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tři"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "čtyři"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "pět"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "šest"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "sedm"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "osm"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "devět"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "dnes"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s v minulosti"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "zítra"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "nyní"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "včera"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "před sekundou"
+msgstr[1] "před %(count)s sekundami"
+msgstr[2] "před %(count)s sekundami"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "před minutou"
+msgstr[1] "před %(count)s minutami"
+msgstr[2] "před %(count)s minutami"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "před hodinou"
+msgstr[1] "před %(count)s hodinami"
+msgstr[2] "před %(count)s hodinami"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s v budoucnosti"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "za sekundu"
+msgstr[1] "za %(count)s sekundy"
+msgstr[2] "za %(count)s sekund"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "za minutu"
+msgstr[1] "za %(count)s minuty"
+msgstr[2] "za %(count)s minut"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "za hodinu"
+msgstr[1] "za %(count)s hodiny"
+msgstr[2] "za %(count)s hodin"
diff --git a/django/contrib/humanize/locale/cy/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/cy/LC_MESSAGES/django.mo
index c3c4943c56192b38a61d31fb6f31577e1860fb0a..7d6e42c0b1675d4583d7db18df5036a735aac87c 100644
GIT binary patch
delta 46
zcmdnZyqkGKqkxgFfw8WkiGqQFm7%4sf%(LV**rdpdFiEz>8Vx<$(0j-M^8>>i~s;X
CR1VVs

delta 47
zcmdnZyqkGKqky5Vfw8Wkse+-gm7#^Mfyu;)*^@aLqj-E0^U_Nb(^IV!k}D@CF-8Ia
DK=BRZ

diff --git a/django/contrib/humanize/locale/cy/LC_MESSAGES/django.po b/django/contrib/humanize/locale/cy/LC_MESSAGES/django.po
index 3aa7b8a524..ca8ee3bf24 100644
--- a/django/contrib/humanize/locale/cy/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/cy/LC_MESSAGES/django.po
@@ -4,34 +4,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
 "PO-Revision-Date: 2011-03-15 15:28+0000\n"
 "Last-Translator: Django team\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr ""
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr ""
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr ""
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr ""
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -40,6 +52,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -49,7 +70,16 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -58,50 +88,261 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr ""
 
-#: templatetags/humanize.py:96
-msgid "today"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
 msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
diff --git a/django/contrib/humanize/locale/da/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/da/LC_MESSAGES/django.mo
index 98211a107d18deb0be5718140f2a80e44d9642f2..6af86464dbdabf0d5c66ce23d8da0e83588dae51 100644
GIT binary patch
literal 4102
zcmai$&yN&E6vs<Jkx>*uMO35!S7wBsABzzjTw`1yLEVVBc;nDc*Yq?yQ$2Lm%&-Se
z9{dZ82P82X^k6*b#Tes>qcMcUgv1!-VvI2)CdA-@M8B`QrhB@(Rx4Zm>H5~I*H!QJ
z^xL1etbdQ8HPN3y|KJYB7U_N+E@;*DjO_($;6CsTa1K0g^pB1Ho#8F8f%!dmC43Wf
zFn-7I3$TXqFW??<<K2mW2i%46DUkGu(JvTY2I={K7;f8;_*pa@fOD9CAKVRo3+@N6
zoAIW5l5rE<3H>xk`#29`E9_GcTW6meehF^J_$%;9@G5vG_@|k_2~vpuHoR@-*~Y}*
zI*{f!g0yav;bt?x)o?qArEDii_EivnY(Fj^A{Wnrbna^v#twk%?oG~l5UgQ*8f<~@
zf;9g%xDUKxxc$Cl{wPR!n1HnI61W$<0#d$iffWC}n-c%WL9!1)n!gB={r84{feywy
z?oa%^3R3(>AlY32Y29V83f=_cckF>Aze^zP^DIblzX;O#KQiM_K>V@KaM=oe10o#k
z3P|z1YWRcUH8cMsNPd0-$?tWe|7!S~ng1Q6yx#yR{x?DLdmF?n#{L26d3AJ}r@hnr
zumv4QiQ7ZCK8oH*hVgZWxu-omj!wTRiZ{iI{O(4dHiVEN>~Y(SE5(D_Q|OPycgZ_T
zd7;?OHhPEmpg%JsK8SmyJ&reCoA`V<MjSs5()k`i--b@_^lW<=gQw9cchvB@#f@UP
zf$rw2W4AvNwR)?|-wyiyAe8^Bd7@*nw5xs?`e8rk(jpBk{%o2IrNz>&h8=COwX0`G
zt`}LX*VY4R^L}<@*OeIB%-599*{!Xzwr#v5s#11sN;!v$+q6Oo6)y?J>?vMW%6U`V
zrj>K1xJ|QVOYybTa;C`ErdraZ_!?p<MPz9aEeT2`7qOBfEx7B4_~mrMk<>K`Ac-ng
zQ<H8K4iL17#V(z4v4u`3y@J0)occ2+>7wkpQ@eD^mAn^@qJle;j59NzF35Z(M(KnI
z{GMjrU@TY{%b9fbD02Hc7>M<ARZsM_i-S`b>@%q&=`k5d!6*_T7<o*Iv5-s!=a|w=
z_wW}9!F1@ktGEurD1xn?glttPEh3UnMBy3H(av$tc}qkJ-@-OOa>kW@SUD+%VWgcU
z<p-Yg^2k@ta@gjT6R$5ji;-|OY@H*n7HvM?Y|T5(15WE%-fXs8&pXY7%_a<;lVTi@
z&z#*n*|iR|n}_x_(JHUGN;}JuD^=gsVbtb}y(myRK+InWMdS;qgyb)Drs_-nK)dxo
zcEcC3R{A5?7tXS92iUnQ1J&czp4P*5qcNFG>Y5w}U2(21g>DR!<EqB6;l-zH^o@sx
z=Qe7ozc%;W%F^+rqghm1^=4%;lv+sac6EqjYrN%+Vc!kpVczMvkrI00)bcUsP-aID
z?~2GdDm$SUNWaYwy&dSvi9Y4rITl6()#h>-57ol_VV>MBR3+cFz+1ISu8hRr6Bmh|
zEn!npL^*k7Y<|~8``L-Y8sAd5P|6Bc#jhIGQKJ<s(?=C5?2KMoVX9Jj*V#m2O<co^
z_EWK7n|^R+BRCZcwku<Mg`Cj~D-uV=t)yzf`ak~nn6WffWY%dW<?Pa^=51%?oP9pq
zRM7Idw$-n4o)u3YFq7q+ntN&*z2Yvd`85?gZ)?e|;?pFiKY~oMKfkcsG}k%nG<PMp
z*iz22n9cNm4Oj`CR5Gpt4<G2PHpKM}Ut%+n+I1tB%Mo|GHrs3x_DZabQ09t`6M5FL
zG0YZcyGV_*NqlgrB9;7-nC{ltWUDfliCs1mYK?j)1}J=yz@esfZo2R3I9pLibz^eG
k5U)B@t78<m6@}Y6)9?`B`|RV2nuhv-;)Z+w@}-FV3+5Y3d;kCd

literal 1210
zcmaiyO=}b}7{{a5xAnbxR7gRwrDUCHE3DIQ5&HsFtF^2>s0is!b~bf3S(5CwD+qci
zf}nzW5b42#con>Q^9$$~@N?+Re`?xlT{O%;zvRh3nI|*Px89yt1nmTL68Z$4g6`}<
zhxP?L3w{m!0S;i^x08_F;1#e3yb-tn;vu)g{4Tf)^J<7^px?I?;>{3ufy-h2e&9oJ
zAN;GJKj#^^AAAAcLN06IAm-n(=<_;_WIV5dKCcyYe&2&Ie*|J1Sp~6`JPv#k;!i>E
ze-7dyFGKuw;2Y4duYvv^Z$Y2md(fZv0o((A1pRxwrx)@u@7rjHF!1O2JqIBF{R<Gb
zk>ikW$DkvSzwc4#Ak?iL4#B;iXZqVbZ;63oT%(IJ&!txXjWxRXy2YI7V%!W0nbjSs
z$+jRh-7-X_L`fxxhD=JVXbVNGTp`vGSI1+7AWo;egTA4S(aXdwYtj+c3FE_aMlXq~
zV>2mR5XRyv37uTxD$|8|(bUGVS)0j}U20{PRdhlNbJr_u!U*o*Ws}^Agbqb<%%Wiy
zpQrI~5|>ys5=AhwdC`{s%x%7CgvO<0_`+a>R=CQoV->@d&AHPip_jQ*($X=c0bb07
zOhsOls;0+bR#}T@f>i`>AXN@WosNwcW@l!nwyqEtqr!w%PADARX(C4_R@}K}&ZQcq
z)jBs;xbn@)G%IcSd<r#T*p#a3RH`hYrA6sBUzyO97v}Po;W?YurePDRn(I?r9vY>;
zhUI=m`^q#PDEv_p>%W@g7yVv48$n_I4sR=|P%7J;|0q5<wR0#F(LlWzL5ippg6b#|
e+i9ax?pX|r#9>L|Vi|fANCt<~7-yf~8S)cq7z(!l

diff --git a/django/contrib/humanize/locale/da/LC_MESSAGES/django.po b/django/contrib/humanize/locale/da/LC_MESSAGES/django.po
index 2890331e36..176e126f53 100644
--- a/django/contrib/humanize/locale/da/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/da/LC_MESSAGES/django.po
@@ -1,42 +1,65 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Christian Joergensen <christian@gmta.info>, 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Danish <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: Christian Joergensen <christian@gmta.info>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "i dag"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "i går"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "i morgen"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f million"
 msgstr[1] "%(value).1f millioner"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s million"
+msgstr[1] "%(value)s millioner"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f milliard"
 msgstr[1] "%(value).1f milliarder"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s milliard"
+msgstr[1] "%(value)s milliarder"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f billion"
 msgstr[1] "%(value).1f billioner"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s billion"
+msgstr[1] "%(value)s billioner"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f billiard"
+msgstr[1] "%(value).1f billiarder"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s billiard"
+msgstr[1] "%(value)s billiarder"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f trillion"
+msgstr[1] "%(value).1f trillioner"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s trillion"
+msgstr[1] "%(value)s trillioner"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f trilliard"
+msgstr[1] "%(value).1f trilliarder"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s trilliard"
+msgstr[1] "%(value)s trilliarder"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f kvadrillion"
+msgstr[1] "%(value).1f kvadrillioner"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s kvadrillion"
+msgstr[1] "%(value)s kvadrillioner"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f kvadrilliard"
+msgstr[1] "%(value).1f kvadrilliarder"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s kvadrilliard"
+msgstr[1] "%(value)s kvadrilliarder"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f kvintillion"
+msgstr[1] "%(value).1f kvintillioner"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s kvintillion"
+msgstr[1] "%(value)s kvintillioner"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f kvintilliard"
+msgstr[1] "%(value).1f kvintilliarder"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s kvintilliard"
+msgstr[1] "%(value)s kvintilliarder"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f gogol"
+msgstr[1] "%(value).1f gogoler"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s gogol"
+msgstr[1] "%(value)s gogoler"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "en"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "to"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tre"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "fire"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "fem"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "seks"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "syv"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "otte"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "ni"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "i dag"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s siden"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "i morgen"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "nu"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "i går"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "et sekund siden"
+msgstr[1] "%(count)s sekunder siden"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "et minut siden"
+msgstr[1] "%(count)s minutter siden"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "en time siden"
+msgstr[1] "%(count)s timer siden"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s fra nu af"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "et sekund fra nu af"
+msgstr[1] "%(count)s sekunder fra nu af"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "et minut fra nu af"
+msgstr[1] "%(count)s minutter fra nu af"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "en time fra nu af"
+msgstr[1] "%(count)s timer fra nu af"
diff --git a/django/contrib/humanize/locale/de/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/de/LC_MESSAGES/django.mo
index 1639f6ecbd0facb15b53fe959e901169a45bd439..f55963b72db90d630de7485b4ab77882f4ad2b59 100644
GIT binary patch
literal 4125
zcmai%O^g&p6vs;!l^sP_5D~v9#FZJL=VKv?18al@gv5<}ES~hxJ6$`|I8!}T)yx11
zCvP6S8BOG3G%+5G(U_PRiHA+}U^MZn#*Y&RqA}3~V~FwprfYh-r)y(nYkpJzdiDC%
zdo^9~)5dkLGqfuDgXouUVr+rFPvHZtxQ?-%U<up>o&;yXOICl!>R(%42P>H0aZAk8
zpoj4*mLGv7jDH4qfYZ0e{ylIz#%Dm%2UdT}auuZKU$fkDTkL1SvIEXy{tfUE@Cvva
z{KbwptdGZ4a2xcOK#JoMh)~#jAVOy!Sbhv{#rRY3VemWfX7CR?|0hT(`rGn`ooCar
zzbTOBr$Jh`!E(mVZ?fD9Vkz4Ol6?`xAKQ(OcTtNcK-$L-1;+M*>u--a50)@iU=6%%
z^>0D4pSmN?R~4lB7r`?48c6G|fJN{sNVT8Y5c42Nc~l_P?M<tH36lMFa3{#`jOUMm
zk7L{iY2Dl4W8hcdqu}o#t=n{0tRJv!fHeOqNO}Jdq&j?J$De_C6#D{1i0m5>>0sa6
z`5!^D{}rUXUA6PqKpYYFo1Op5>i<~Y0O@)E+WD!O*nS!$eFnslVVgmEUKyS0Q$?rq
zun`?w8n%1zc^`Tu9u7YrvfnAD2hiy^Mfvv7DK0vjqelCqy-~yChUc5UQ(o?;FKD~b
z>32c7O*cBjJJ2cjqjopGp!~yp<Jb)IgKe@+=p3ES;l1cv(CJL4+hz=?Zd6-pIBvs6
zIiY;8*<#;s_e7~&Tj9%LyB$XIf3-j~9F}gi8AZ*gopI@qIu3s>O-9mT=~knLaoD=m
zb3H#$4(qk`P`bRI>$!C;x-RoI<@0W9r)*q-=R}>Wu1m?+P;-|yQ9{jg!esR{&nx-5
zY3|bUHPhUsxvHi4T57&hWb0BLWzu{NF;^n8bcl`uC6bR^$(|A1Z$|j#G@_m~B}yQP
zdZ;EQD=O+BX#<B{GUX$LMkIp?f3Z07XHAkt<L8d-k||&ER@74y?ntuE?0m9d>?<}(
zCPdh58MYGk1zW*#CVkUWe%pi{v2L~)h_>;uaY}=GCUGPKCPOJ0Wg-Gqz_jQK$#i(0
zX~Rqle@X~uqQJj^&rYNiY|S8I7lbxKk$gf$XGOz!#{=&Lp)}rwb$<A)FPl-}l;}pv
zc#FCj2Hv4wQ+rEMofl3#zvL|_;Tza`hkYaJe6CuX^QwEi+Fo9*)@x6B)hDY}7<#8f
zKO~<SyE(F}?WtGy?W&>`p7XWwmXt4b+c%M_^Mf)_tMBt;epAS0)oZl)0l$?Do}nLJ
zTXg)eU2a63r?Fl(dzki?gx{(2XNBsZT*a0#-Fl@m7!1mWoQEsod|3)p>Bd{um2M>%
z?zGaj9x8#TloEe+yax)4#}|)`GgB*93k#7nLL%Y|U2NUpq*uCaKa~4<qvb0t%>0?9
zqu#!;9X)(SDDQ}DL_sK<b-r&oG=&pws=IeIQXO6AvO65=`MLc({yJZjeEU4Fl?s`w
zWRc$4z6yj}&0b|EM?db|g3L^I(P<Hgi_WKHX0nThVNG15R>P4@U%APXC#+L?ZiT(7
z9J@%(WFK?Lxr0Q_8ZWsnl##erG`aYb3w2^e>?jxfSk4ABjB&!b)l!Z%&!2>pHg>6b
zlG#iM6MA|<rp`(6G|%Yi1(Vgcf#9{2wo2kiZ7vl>&N@}wR1hae|8Sw*q}?aAO&KRz
z+Hh3Zl-)?mI82^25wEMxnvctw^XrT><8)l#ex$g-dtITvbont7#<xi<N*2nj6~=j^
zv9HtO<(|YlBkRnnDQ_dYjJw1v<<Gd>4aKy#*edJH8u<;n23J3qE36+1Wh1lqA8jwW
y4Dmk~DSDEf73QL0$PEM?ie=Oa_jF5RSZ09|A!`Xr816Y-9PHu%N^^M8N%kM<WKeAY

literal 1505
zcmaiyyKfXR5XKFJM~?SfLLiI~kSN(>Hwh?g2ttGef;bUH2NHD7?cAQDJ#S?DE`*kr
z5(*k<5EK-MjshVB1w}-chKB!v0?|<LIdLABoP_1^@8;XNnOX1rJkarsVI74Xhb_QP
z!k%oxfwf~ZW9Pt5&j{>>e;+&zKK6VAo`F9PZUujV9pE3&zaTc-v}H-}0I^vo4yW%1
z-T(G^{fO6(d7kjkx#wAM2jY7{Y<2-hCwK{bfZj*IUidH2gzI<S^EcQ9|0IgJes6jz
z(DnNi#AeUE{}Oap@yh$JL09js*WZEL;J*j4*$1zG^85_Cyk9_U_6>)N|L*k#a69}T
zpuh6Pcy}l6{dU6KIsn@XbKhwfY<anNJ`CFf+XveZbNQE->-8Ya)j$ch8+Hg*fVp*K
z3Al`|rpOx9U5u)HN@khN)qk~mo49tG)olVdh-O3GcFOwvhHq5bq+XForZvl|vPrC(
zH#AcTQ&JJjVLD-knxvSK51Fyd*041Zvw0%saMp9J^I2wRb2dlDl6LZh&ZntjgYhJ|
zN7~@xVt##Es5CE3(oC*xP%^1Zf@_V`1m!&Dg^4@mU__I!hz+g_OEK>YqbLY31mQ&<
z4aCtvPuLfR2n;5vDP7K%xc(p<;L%{*f2k+LD%=*v24yXj$%M^y%x?*$q~Vv*26#0i
znNU`gs+wOxuu2;urJzir9`hTd>q7C%R|=)^(&*|dM8&W$k}FFJspn?Uqos%T{7fdK
z8se3j(1z^r-SSv4xEkkLsFDswRV7cPN@G4aCGASdm?u=2$QoK?!C0>ACgy5p(KW+;
zLwxDyaF^nzhI!OoXc@qgn<1eSYOl6V>tgV_3HBO3@7h_v)@C%lwkFc>jpf&9t0}#>
zru2%^l5Txj!&i%nikr}{A61n#C23Y<iW-WMRQPEmO}PoBO3lD6vP6?)HELL57|#^X
M9?e2Y7w1#4f7CBu0{{R3

diff --git a/django/contrib/humanize/locale/de/LC_MESSAGES/django.po b/django/contrib/humanize/locale/de/LC_MESSAGES/django.po
index 8a7843bbc8..cf2c6534bb 100644
--- a/django/contrib/humanize/locale/de/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/de/LC_MESSAGES/django.po
@@ -1,148 +1,295 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# André Hagenbruch <ahagenbruch@googlemail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-06 14:14+0200\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: German <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: André Hagenbruch <ahagenbruch@googlemail.com>\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"
 
-#: templatetags/humanize.py:21
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "heute"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "gestern"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "morgen"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:21
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:21
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:21
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:68
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f Million"
 msgstr[1] "%(value).1f Millionen"
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] "%(value)s Million"
 msgstr[1] "%(value)s Millionen"
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f Milliarde"
 msgstr[1] "%(value).1f Milliarden"
 
-#: templatetags/humanize.py:75
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] "%(value)s Milliarde"
 msgstr[1] "%(value)s Milliarden"
 
-#: templatetags/humanize.py:80
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f Billion"
 msgstr[1] "%(value).1f Billionen"
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] "%(value)s Billion"
 msgstr[1] "%(value)s Billionen"
 
-#: templatetags/humanize.py:98
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f Billiarde"
+msgstr[1] "%(value).1f Billiarden"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s Billiarde"
+msgstr[1] "%(value)s Billiarden"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f Trillion"
+msgstr[1] "%(value).1f Trillionen"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s Trillion"
+msgstr[1] "%(value)s Trillionen"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f Trilliarde"
+msgstr[1] "%(value).1f Trilliarden"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s Trilliarde"
+msgstr[1] "%(value)s Trilliarden"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f Quadrillion"
+msgstr[1] "%(value).1f Quadrillionen"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s Quadrillion"
+msgstr[1] "%(value)s Quadrillionen"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f Quadrilliarde"
+msgstr[1] "%(value).1f Quadrilliarden"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s Quadrilliarde"
+msgstr[1] "%(value)s Quadrilliarden"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f Quintillion"
+msgstr[1] "%(value).1f Quintillionen"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s Quintillion"
+msgstr[1] "%(value)s Quintillionen"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f Quintilliarde"
+msgstr[1] "%(value).1f Quintilliarden"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s Quintilliarde"
+msgstr[1] "%(value)s Quintilliarden"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f Sedezilliarde"
+msgstr[1] "%(value).1f Sedezilliarden"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s Sedezilliarde"
+msgstr[1] "%(value)s Sedezilliarden"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "ein"
 
-#: templatetags/humanize.py:98
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "zwei"
 
-#: templatetags/humanize.py:98
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "drei"
 
-#: templatetags/humanize.py:98
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "vier"
 
-#: templatetags/humanize.py:98
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "fünf"
 
-#: templatetags/humanize.py:98
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "sechs"
 
-#: templatetags/humanize.py:98
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "sieben"
 
-#: templatetags/humanize.py:98
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "acht"
 
-#: templatetags/humanize.py:98
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "neun"
 
-#: templatetags/humanize.py:121
-msgid "today"
-msgstr "heute"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "vor %(delta)s"
 
-#: templatetags/humanize.py:123
-msgid "tomorrow"
-msgstr "morgen"
-
-#: templatetags/humanize.py:125
-msgid "yesterday"
-msgstr "gestern"
-
-#: templatetags/humanize.py:147
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
 msgid "now"
-msgstr ""
+msgstr "jetzt"
 
-#: templatetags/humanize.py:149
+#: templatetags/humanize.py:191
 #, python-format
-msgid "%s seconds ago"
-msgstr ""
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "vor einer Sekunde"
+msgstr[1] "vor %(count)s Sekunden"
 
-#: templatetags/humanize.py:151
+#: templatetags/humanize.py:196
+#, python-format
 msgid "a minute ago"
-msgstr ""
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "vor einer Minute"
+msgstr[1] "vor %(count)s Minuten"
 
-#: templatetags/humanize.py:153
+#: templatetags/humanize.py:201
 #, python-format
-msgid "%s minutes ago"
-msgstr ""
-
-#: templatetags/humanize.py:155
 msgid "an hour ago"
-msgstr ""
+msgid_plural "%(count)s hours ago"
+msgstr[0] "vor einer Stunde"
+msgstr[1] "vor %(count)s Stunden"
 
-#: templatetags/humanize.py:157
+#: templatetags/humanize.py:207
 #, python-format
-msgid "%s hours ago"
-msgstr ""
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "in %(delta)s"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "in einer Sekunde"
+msgstr[1] "in %(count)s Sekunden"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "in einer Minute"
+msgstr[1] "in %(count)s Minuten"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "in einer Stunde"
+msgstr[1] "in %(count)s Stunden"
diff --git a/django/contrib/humanize/locale/el/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/el/LC_MESSAGES/django.mo
index d6accb280b120ec095e4c38bfd7d3369c5bce0b7..535491c021e206979863a076a9cf01ea242536f3 100644
GIT binary patch
literal 5281
zcmb7`U2GIp6vr=uBC9BZiulC^thB&%x0NU?)ELW0h%^>#HIOJ7c5k<XyEDt&*_OtT
zP`-Q+NHj5;XpD&uK3Ft0G*~P&%A?6lc<@zyHO9om1T^u%|Jk|wHGA8gPJ8z^_uO;O
zx#ygFXXclcOFm?{QfN=2eY%LTUb<h5A6)HA7~2STfSbVsU>kT+$-hwYpA_$aNsMo}
zJLGGif&LlANw5R`U%?IFvU@`N2DlFWL6GF5O8$xBO_2Qmp}2Z!Xs1`P0JdTLBXB)<
z9oz!`ruxh84f`o@E#z;4w2qS?mcqUSv2=D>@mp{W`d7iH!CT;6;9qL|Z;(>-kK%u7
zoGlCOEe2_P8A$V%E3Q!Es}$FOn9A0Iq~8wWpKZa<XQ;*V-~sf1PB4}MH{KV<`5w3%
z{Yfwf-T`U+$o*meCOCxt=H;RM1Mn^MZ-ay2-~){HfnR|~z<)u?|Dgv%yYGNx?+1{^
z+g61AbKp_*e+Nmv{~^W>gA*XFbLmRP_JD^#+Ebr{q<;(C4{lw>*h}CzxC#6br1<{?
z5hA+{VkvCV!(skcfYjdvQXaR1q_-2Kd3!-@3D&R1-%#?yN}f^jV~PbeUIdXMHU^Tt
z^B~!IUyXkZBK@orjr>q7v>y;gc|8Dw3VRHV_Iu@eO5IQ`pFpEC)q!T9k^S{(l?$aP
zuYvkVXL*0q{WEBf(+#dIXjB*4+w~Xi;SFe%!^(vcFl+<Xjz)Wk_BG1KkW$9cD1VQl
ztwy6gU4K1-&a-G6m5_2m7o7<lAuOPM#LSmOM`za%KWgRkmSeY+Wkp7#sh8#)C+FlF
zOlm|0jXj;rc5IENUg~5#jjmpLykurwjrQDf%hp*xUee2@DC*Sb6ra#*YsH>!;Y~u>
zR9&5<xrUPKWRVg|-Xw@tPx59-bKNA@$(m~>xlX35mgI9un=3`SI;o~ilFuP*DiLXF
zgqi|XMJ94(mpsAEoP(2-aZ0w=K?x+GEK92@L#|Um(nd9U)gcp0$T)U3VlNa{>?xJ%
zq?+G~UUkT{`LI)RBj!k?jH&VJgqp2TsX8F6+_1-ntP#P6FrC?^S8~m~XBEVfw)U*Z
zdnN*>H0VdFhU_e}En6_kgaf)+CdG)bnY2zY=`n8@|E>_sbF$_behZH4Lf0F0*qD%>
za7o<nI>$uDGxlYT*M%$bEKKuV$4ootBo2zA<9bG)%vo9E<x)->15TPJ`d=L|dR<|9
z&^30Mo=EfVR9Cl=dd}$D%2TOy*LEZILMjDC<DeL^$YxZpn|Ezbr@A+%a3%Je(lZ8J
z)0TPDbKEq4#gU#VdB0gSvsS^vCUHu9=ZJ*|q2<Vzas|`McV?Wzi<oNXN@h+N1Hvq%
z`Cf$kHg6yHyka_;9336)^vJ9=Bu;eN!b=vzU}dtH%$8$J=9Ph@$R|6h=F(i`6Mg&o
zcGq&!)tO54I<_ZltaYr2pgrvIWHE1A_70vIHeD&ap22}V#<rRsIUf?PvD?l#S<B9)
z`L?5$m*~$^#f?3VTaamP7t3AQ)4hX-w>|APU)RICIuZ>p5&w!m9h~u}{A>PXaMqvo
zXZ)GqVleJc`?GNsC!>mFZ31mNIL+gkZaJgTN8~X{FI|l&j%!`ujlN*zI{u~>6j7`>
z5kIs3HB?|Bd5bZl(Fg2L1!qy+1$c=!C*tQ6WvxXt^h~aOGzD>{_>FE5%&8VmqPsZ8
zjHnO)#=Plj3<Gh`uO11ZT#a}qa9-8gq9u=Yrsq|QSZjGYYmbVu*_QhC_9F+k`VGV@
zyF>E19wIGO>isPA93zqio?^_1aUvUX6+^#1hInVO-b1_@4L;%=#M-8pe4!_o61$Ld
z8&AJJgqDY}e)%nx>rO0!rKe}>^V&jjk|6=~j=j$D+C3Fq;QnR2V<x%(eVCizLX$@A
z<FBIRPcV9Q>*kVJKVc5PSK#+td9#cM7pe|s=Uat-3PP)2lU@mSBP-PFY4S9KtWEOZ
z64KW^S_`?XFcq9utC{h?shid4yQ&(V-ry2~rgBg=7=A7XXK1x^I8-0km4GT;|0+|D
zk7+8?S+(G>%&a^boQLrV2GI?Fx-7a%isQ6YGWRvU#X_&xBb84w|4MKX@3i1u|2qtx
GX8!}^#98wI

delta 665
zcmZvZ&r1SP5XWD+iLPd8Qb7qT9YR9bMGIS`x_F3$DEdJd!BXqCA#14pz>7i9r6}mp
zu|vn8YeZ08x{Lh--J(-oBRbS~>UC>&zx#PJ^Jd;W_9FHw*PcVt8H0tPe&`O0K+7%o
zz#8Bn_$2rN#^6U=8EXTlKna`?TmbR1obXpb7yMNbw?L}f_>I@trbtu-cf^LO;2!8f
z!2w8(PCzfn!6giH4$i=TM=}FWVw!o{2U6V&D1%Kf0DgcdVIE8&vl?SQEZhimgOrGX
zRH%q}OvF{egvgJ8e(W0u>3}RqeHKN21;l(mw+(@mqrQLEj)g0W4;|`*=oe5U49L15
zvLMs}(TzJHI`BWEn=u}h()>{hlTO`1-e{9f-QFJ4w$>{wZ*Q9{U)(A&XN@_wWAabW
zey0{!6LD==(Gt3rimOR}?CsTmf@)IHQhH)^NQKE+qg;v4l?<m`Fe=58u2==LS}ZH+
zUryN0nw>XydDGk1njYiRa?YPM9Ba$4OkFVx{8B#T555dP3PgA#AoDN3n;&ES)-}*x
SzhU+3`aPc8`W2rJ&wc~h?qDDQ

diff --git a/django/contrib/humanize/locale/el/LC_MESSAGES/django.po b/django/contrib/humanize/locale/el/LC_MESSAGES/django.po
index 3d7695675f..f19e150aca 100644
--- a/django/contrib/humanize/locale/el/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/el/LC_MESSAGES/django.po
@@ -1,42 +1,66 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Dimitris Glezos <glezos@indifex.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Kostas Papadimitriou <vinilios@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: glezos <glezos@indifex.com>\n"
-"Language-Team: Greek <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-12 19:02+0000\n"
+"Last-Translator: Kostas Papadimitriou <vinilios@gmail.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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "σήμερα"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "χθες"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "αύριο"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "η"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "η"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "η"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "η"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f εκατομμύριο"
 msgstr[1] "%(value).1f εκατομμύρια"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] " %(value)s  εκατομμύριο"
+msgstr[1] " %(value)s  εκατομμύρια"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +68,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f δισεκατομμύριο"
 msgstr[1] "%(value).1f δισεκατομμύρια"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s δισεκατομμύριο"
+msgstr[1] "%(value)s δισεκατομμύρια"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f τρισεκατομμύριο"
 msgstr[1] "%(value).1f τρισεκατομμύρια"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s τρισεκατομμύριο"
+msgstr[1] "%(value)s τρισεκατομμύρια"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f τετράκις εκατομμύριο"
+msgstr[1] "%(value).1f τετράκις εκατομμύρια"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s τετράκις εκατομμύριο"
+msgstr[1] "%(value)s τετράκις εκατομμύρια"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f πεντάκις εκατομμύριo"
+msgstr[1] "%(value).1f πεντάκις εκατομμύρια"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s πεντάκις εκατομμύριo"
+msgstr[1] "%(value)s πεντάκις εκατομμύρια"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f εξάκις εκατομμύριo"
+msgstr[1] "%(value).1f εξάκις εκατομμύρια"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s εξάκις εκατομμύριo"
+msgstr[1] "%(value)s εξάκις εκατομμύρια"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f επτάκις εκατομμύριο"
+msgstr[1] "%(value).1f επτάκις εκατομμύρια"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s επτάκις εκατομμύριο"
+msgstr[1] "%(value)s επτάκις εκατομμύρια"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f οκτάκις εκατομμύριο"
+msgstr[1] "%(value).1f οκτάκις εκατομμύρια"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s οκτάκις εκατομμύριο"
+msgstr[1] "%(value)s οκτάκις εκατομμύρια"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f εννεάκις εκατομμύριο"
+msgstr[1] "%(value).1f εννεάκις εκατομμύρια"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s εννεάκις εκατομμύριο"
+msgstr[1] "%(value)s εννεάκις εκατομμύρια"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f δεκάκις εκατομμύριο"
+msgstr[1] "%(value).1f δεκάκις εκατομμύρια"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s δεκάκις εκατομμύριο"
+msgstr[1] "%(value)s δεκάκις εκατομμύρια"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googol"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googol"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "ένα"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "δύο"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "τρία"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "τέσσερα"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "πέντε"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "έξι"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "εφτά"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "οκτώ"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "εννιά"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "σήμερα"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "πριν από %(delta)s"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "αύριο"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "τώρα"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "χθες"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "πριν από ένα δευτερόλεπτο"
+msgstr[1] "πριν από %(count)s δευτερόλεπτα"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "πριν από ένα λεπτό"
+msgstr[1] "πριν από %(count)s λεπτά"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "πριν από μια ώρα"
+msgstr[1] "πριν από %(count)s ώρες"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "σε %(delta)s"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "σε ένα δευτερόλεπτο"
+msgstr[1] "σε %(count)s δευτερόλεπτα"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "σε ένα λεπτό"
+msgstr[1] "σε %(count)s λεπτά"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "σε μία ώρα"
+msgstr[1] "σε %(count)s ώρες"
diff --git a/django/contrib/humanize/locale/en/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/en/LC_MESSAGES/django.mo
index ba05bc9d70f7aef593f0822f575b7fc81ca798c3..dcd912cc33c4514249e330bce13c683effce0a03 100644
GIT binary patch
delta 47
zcmcc4^n_`G3ZvFU)ffRIT?1oXLlXr911m#IT?6xp6SH}I67$ka6Vp?z6jJjh{*D0v
DK5-78

delta 35
rcmaFDbe(B}3Zv{q)ffRoT?12HLo)?Kb1P#5Z3Cl;6SF6CGDZUcttkmY

diff --git a/django/contrib/humanize/locale/en/LC_MESSAGES/django.po b/django/contrib/humanize/locale/en/LC_MESSAGES/django.po
index e3fb66abb0..a49426a358 100644
--- a/django/contrib/humanize/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/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: 2011-12-22 23:56+0100\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -13,15 +13,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests.py:102 templatetags/humanize.py:164
+#: tests.py:108 templatetags/humanize.py:164
 msgid "today"
 msgstr ""
 
-#: tests.py:102 templatetags/humanize.py:168
+#: tests.py:108 templatetags/humanize.py:168
 msgid "yesterday"
 msgstr ""
 
-#: tests.py:102 templatetags/humanize.py:166
+#: tests.py:108 templatetags/humanize.py:166
 msgid "tomorrow"
 msgstr ""
 
diff --git a/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.mo
index 77525f5d872c431df227458e15580db828e300b1..4ad1b4b66c6cea779c6dad59071c4685c4493204 100644
GIT binary patch
literal 4062
zcmeH}L1<h>7{^BwtzC__jkQ*-omyjeZQj1Oso1!6MVh8kG#G252a)o+Z}#m=cV{+l
zX0yp5r{c-8C{(bZpin%tAQi-ecn}dmLGY%6ClR6GK@T4MfBPnzWOt$$y=BO}-<$vU
z&G%-$@9mrXuxI!Uh8Cbdfd2MPj7`z~5H4u>VaASt1@I{N0yqY)TK!$Ce`Wax=)->a
zmW(fg9>y0fuYv`Pe*_PMJ8#Y6d*C6A=RwjtR=;HVIY`g{)pFmCEY6f=6C8v6P4FS`
zQ*a#o$&N>E%f<nC5c;bitz#9$QrP<-md-x3yaw*a_&WF?_$_!dc*EL%2Ps8=TK;A2
zY-bj42qgPXkmik8?y~k#%l#mxvV$P`=Ry3jaa^vU7LS8RF#aW%?SJ>}**+^E=~a;O
z^19`9kn;bt<>(z*{--P#!2;~>fRyJiL5lMmNcrD8lIh1m(qFN>2-0(|Sbh&uoS{22
zdLZThWsvf}3XX%9?f7duz5!DH58Rc_tALdM7^M6+EmIJWU>$G|_!>xge9PJ|ft0Vy
zmhV~n2O!0}V)d(5|H$%VYyZUZGm!HC1xWF}0g-a{9f<U^B0AaW_d)Litp!`?w!3k?
z7v0Z>-Rl8+PqFStr{5Ii$wSAh+szHoZL~k6z1w!-O8KSsF#3JnyDW!P7s~C%MmePV
zJ-R{MjeC@x<<V&mlm~2sjiPgO%HKWc`_So~-q`kH@CZ89oEl!YZljv)pu4gBQrKvV
zLa|ii=aWVwQSx84NK_r3ZZ%daR*g*|9a7T~&!tHv9iDDgRgJ^ftuD61D0O&mttZkI
zeX;G<wP?BAx0ILN-cH%L7Cs>Af$F-H!5V7r()voM`GC-0J<SJ|!MbVg(gtg$xl40Z
zOY^PN!Ag;@OLde<^DV@I5|O7vbQGv3g~*j`8^Oa^;g?fYZD|UWKoWIV?YY!a)kM-d
z4!@o$#1g7XMt$)zaV?&8=}lUH?wViE6iQxK?X)i(Nj8|Z_a>~z%A9%zk;HYwYRQsd
zHB4tRH0?BOn4~F&$MTVAm=GJMG`KCjKr&)7k%Cbs6qrU#izOkMPL`QA%+&Fh3c-wu
z!WCSbDox>QI*P3bZA41)Y^oMS)p%zj?<J9Hd<)C`)Ium@l{+h1DmC7Wj+4kc*^ae0
zr^-Ax`}~|Ym5R{7*E<y&QRWjtX~GMRd8NmA5R^+#c){@?fTMR-EF~0klivjSm5!Bz
z$)f>U?zvDKZ!Qg`ZiGgqWxk-~xzJolq*jtYiP6*OYeKQAitP(eVU~>BVJy5k5jM+w
zTE>k;*Li+kCPqa3*+j;XY8H6DZcMA}`<+gwXy_qHO)M9sFn%lBy7pUs)ZMY)urYlh
z&pmU}FZ3Q#=3ON>b7p3GJx`@#kegD{2#NKtw2%mc_ug+c!bG0n)q0p}VJh=;r@hH_
zKUzXfq~5fwstAiL^U3px$;~$CE$~jOw5iKnwz@-InK;3-+e%*YLls^s<Tf2F+vivR
z>FxUV(Mj+6&i#|__}G#Amh!*{FY|WFz0cmpe?<mF*J;&XZ}(ZXeSSI0w0(a4FXz|h
MGi!bHAD>fy1GfS?fdBvi

literal 1254
zcmb`Fy=xRf7{*79U+Z_Y5`{@2=8!pelL+S~7bIU2Vl;+}jbfPG&h5=*Z|0btyCh;^
zWow}}g4hT)7J`+aAXr(corU;+*!fJHTtp7i_%hG_cAkCb-FKJwXMf*Qf;a`8f!;%B
zp*y>9L3{<zgWo)Vfd%Xbb`!D}oCEv7o1V8oEOOiL?}B@<uX;ZP-MNPMTi&;xYySB?
z&j;WE<Ua&mok!q7@G*EFy*vk9f2Yxe;{@pXYk=-OPe3g4%<~0^BjlyuzXDy|*WP~v
zx^r*6|IYg#JU{y9pFBT<uD>s!tMeUn{rv#Z-e#?Sa3AFIw&DnGT)yk&5aj-U0O1%p
z3As1{9fMrG<IrKKR~+@`e#diz9iFvCp%~TZip(;p)s9}XM_w<_njVQ=Q^>S#NlkVH
zsp+;MDj`ZLK{R9%l8cT|B$w+Xx5U=5j1a`?gm2*5)W+yFV%Id;5V;k`*$YNDMAfp{
zgxwM*$EU<}s=-yNgGJHO#<KZ5l?j_@r#Y+Wm<9_sDs0jSZjsBTxD_!S3ZsaH!z{W)
zqv1Fzv2Y{|k;oQBN4lE-<b@+ND#gQ>FNBET8qY1O7_Rb+TWw<6&}y06RjG2V=oofa
zpe>_V)y4MeI8Ldw%~QcDf;VG2t<p^9bvn4Dq!kIBlPXPgvp~nL<L8VA^Rx5Q+g}(J
z!(dV?D-_<m(ZVNKv2HK6GA`99t=758g)J{tW>{%E&vjT6hE1!gPEbCkr4?zrjl@)_
z<*O6HLe@4sV>8+`^O&mE<~A=6jnY52<v~RU$}}njI}S~+;p#Osy}a(s{5`E*^ZyUh
EZ>~olEC2ui

diff --git a/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.po
index eafc495a96..4f975d096f 100644
--- a/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.po
@@ -1,42 +1,66 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+#   <ben@firshman.co.uk>, 2011.
+# jon_atkinson <jon@jonatkinson.co.uk>, 2011.
+#   <jon@jonatkinson.co.uk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
 "Last-Translator: jon_atkinson <jon@jonatkinson.co.uk>\n"
-"Language-Team: English (United Kingdom) <None>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "today"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "yesterday"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "tomorrow"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f million"
 msgstr[1] "%(value).1f million"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s million"
+msgstr[1] "%(value)s million"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +68,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f billion"
 msgstr[1] "%(value).1f billion"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s billion"
+msgstr[1] "%(value)s billion"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trillion"
 msgstr[1] "%(value).1f trillion"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s trillion"
+msgstr[1] "%(value)s trillion"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f quadrillion"
+msgstr[1] "%(value).1f quadrillion"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s quadrillion"
+msgstr[1] "%(value)s quadrillion"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f quintillion"
+msgstr[1] "%(value).1f quintillion"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s quintillion"
+msgstr[1] "%(value)s quintillion"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sextillion"
+msgstr[1] "%(value).1f sextillion"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s sextillion"
+msgstr[1] "%(value)s sextillion"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septillion"
+msgstr[1] "%(value).1f septillion"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s septillion"
+msgstr[1] "%(value)s septillion"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f octillion"
+msgstr[1] "%(value).1f octillion"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s octillion"
+msgstr[1] "%(value)s octillion"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f nonillion"
+msgstr[1] "%(value).1f nonillion"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s nonillion"
+msgstr[1] "%(value)s nonillion"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f decillion"
+msgstr[1] "%(value).1f decillion"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s decillion"
+msgstr[1] "%(value)s decillion"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googol"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googol"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "one"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "two"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "three"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "four"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "five"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "six"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "seven"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "eight"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "nine"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "today"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s ago"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "tomorrow"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "now"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "yesterday"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "a second ago"
+msgstr[1] "%(count)s seconds ago"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "a minute ago"
+msgstr[1] "%(count)s minutes ago"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "an hour ago"
+msgstr[1] "%(count)s hours ago"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s from now"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "a second from now"
+msgstr[1] "%(count)s seconds from now"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "a minute from now"
+msgstr[1] "%(count)s minutes from now"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "an hour from now"
+msgstr[1] "%(count)s hours from now"
diff --git a/django/contrib/humanize/locale/es/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/es/LC_MESSAGES/django.mo
index b7d5d3d24d65d7bc72cee9b4a5abef6ae1447dac..11581050a4186b89e692ea9c5e086cfe6f5d0527 100644
GIT binary patch
literal 3716
zcmai$O^g&p7={b^5eF5)AMn3W)|~}<ein^5%ObcyLIM$RA>m|->6)3wnW~|ydY6qx
zFJ6r&<H3U`P4q$x@uD}mNW7ZJ!59-SCSEl0pyA^CbyxQ=-L<hYHP6;tZ++GERZrFa
zvUAf%4CMgoQ>gE3U~B>W`5t_se7}*gS@0G(1ODaOyEZYlAMIDcCis@)Ct!f~503wW
zb7;?QX6$+J9JmKeT>E2?;(rTLyx$zRZ^_0jI7)B^{U3tQfnS64%(q>8^SxQS4n7P0
z0!Z^FAVRWFK|Bik%<)U`akQ_4&w#f;TJrC%{|^vLWq&&U?fU-#Dc&8YZ`hiR+w8a%
zr2cJ=J3xHcE__iu4&Ddu1;0S98{j^)Z$qT@ZLDSam;-5j=fD>DuH$vEf%dPC+qY%@
zBj5|rdmzR60Hl210PEmSAjM<%XL%05eP~{Cd>`D4_H~fr{0JTe?|`%5;RhHy28JNz
z|8wv#cnhSwZh6qH8^o5d9UwkzH@=<(XF<yE5=i+u>3ABXyqtIa7oC0yq_}T7J#_3l
z{R&9qG>ENW#<kye{qKQDZ@NZ+J%)-D6b0Ss`$6vtttT(ERw|S;EG;b@-%p_KPFq+T
z_%JHH$B&@yLZx?z^7bey{f;OHJ5i}%tJ1a8eo&$Pr#+(b5GuWgw3eq)x1;6-uSWWt
zpnOpdsbD+O^-^xA(4HNjKW6GHVwlLeM!Ux^N5f&H)&FXJt^0a7W%EcQPc)yVyVm3M
zt5*{d#vb?jdZc{OuO@!o$g$79u6)h!_R7}x;1$tScEP8V(rtJ}C}-O6s#49d;Xcim
zUBlN?tC=OQPxYkL@O8vWO3CRFJqax&fgGsBN-p{uZ*Ny8%Fa<@NHnQhSbDJ@aiv#1
zzM@Ou5xQE1rFfZ`$8(lq&}81+S9A%*2ReyM;Yf19Tz@fO5-T$m9Wv?<EbB!plJzj0
zDPfaX3~e-$n`Y{v99n^eQyTm|MIaS26)DLm6B>*|X5@-g%tY6ivCIzeiKS##hhh!i
zBOS-^+EvZgq_Hw4`E0DO$gT}eg~3G`8=Ns6e*B71eO)^*$2zvb8Pku#;I*W0f@R&|
zwX?4;2TQRO7T(~vu(HGFTkZLvbuehZ$Xl&W`<0;ea;pVna9*xN6tm=Oy~O7acG|7|
zEtJ}6VQjD*3uT7F>bS#?DXUe)j}7%2KP=KlL!fcg#?p+%$TYfobOhs6KM{QyEK4!!
z@HfUnMP|V3ONbW@BcbMaePHdl(`>G;t~M;q5cTA>hLW~9&em<3<7SvHw>fm-n$k4q
zir^hCP3_F7GbbkLX*XK6C9SMfc<i+?)^G8;H^)N}sRiC0h}cNGcwzZuaA@MA$$K&m
zPN=R9Bh~NlLzg34J3FM!4^HZMWI9}p)23ORU*OrFi*?2KEb=z~dAR#JpaVn1A^lV)
zcSJ6lDYbO`&}HJ0Xza}!)Ax%{%g&&(GgI*rPEXxUMEV0S+jG4#AU})B19H7Gz@12C
zzmq-o^jNCeQ@LWNOSkMTYuVvFwHFh~FrIIa;d$CU(!@kLzw4UMLQOqbeh=LJV7XQ@
z=6RmB=4#2D=Xl!eS3PMjZiiA>cN0uUbz;d{O)V*@X&}0iCn~!SG)tS46E?jiwBf99
zaKXnSwo%MOTqy$`3)+dPTLu2ADWAv4exmU6Dox~MLle2bJwYZD<$jOJ%_MNG;NeR1
zkVcbay`IsNDN?J)p}Pakx)DwrmTq{l7I(woj41A!O0K^9hN%R13CmKKD9s?5NLq<I
cCNk8*hmK=5&}(cYZhj?{V4*fltjU=D2ccc+82|tP

literal 1236
zcma))O=}b}7{{ZwzKrkHqe6NRyU5g;w&FVN7O^i-wOH%gi=w1E+1ZrYWJxmHt|w1=
z5d_79pcfB<ClLjq2!cI&P``lR!<+xq*kW1HhdlYs^Ussy$t2(VdY%y2QTQ?V2l#RL
z&28vlU%`{$H_snn332~+LVCeVU=MiJa{)vnH+*~x+<~~}^$c|Lmb~8by7gT4<99so
zg1eD_4|MB11owcC!3?!L2V=y&D8kiw*7G*#>bj54?e_rO2|fZbg*^58GtjO3!s{=+
z{t84Ruf6`x^S#$sK{xLsxC>nK@n=8&1w?u4d-s8EZ+DL0wjUpEzN=*~-2MLmj%nlw
z+}UCHLAX2bA^1LcH#^`(R|h#U&}MnTOM`KpE{Z%CO8!%8cFF6eS=}XZL*ycBSW*{l
zPU@=AM5aUv$%%sNlo;OTk{Gc<j3u^#ra328rL2R#skBzh#4an+;l^_9<T<UDc+G}0
zX}G|(!BG-Axx{3qf_dIj+J>_x6KQy%$V^yO2@U41RKp3)nMH0m$t+LkP!z{uG#tif
zXgr+6<uDqFA|!_Mye-_CTk@h28kdvdbEhI$aG4n!RyC6*XIANiUSv`VL&s1Ccs}PM
z<@unHbv2G;nH4PKVU@FHLa((LQW|t%0*i=TFj=Bw<H79A?9}FY;=w4GP||XVeL5`^
zZ25{k-O8DeqqNpw+HhOBUY!ohn|ZFDI@jTptf^GUETQE^VK??qC^x}eUTBtw(@Hl@
zLS<_`G?k%I`s=eYAZdSv#--qo_knw-?(T7G=D!E>wYPu1GPlB3&ArCIX{y#xq$Y42
vQY)C%ihNonvcQueg<KDe;FjYN3FC&)tVV$i)geu`_J&DDQe_D1a7}&!DsCJY

diff --git a/django/contrib/humanize/locale/es/LC_MESSAGES/django.po b/django/contrib/humanize/locale/es/LC_MESSAGES/django.po
index f278aebf72..30c70560f8 100644
--- a/django/contrib/humanize/locale/es/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/es/LC_MESSAGES/django.po
@@ -1,100 +1,296 @@
 # 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Spanish (Castilian) <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-05 23:10+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "hoy"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "ayer"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "mañana"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "º"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "º"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "º"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "º"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f millón"
 msgstr[1] "%(value).1f millón"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s millon"
+msgstr[1] "%(value)s millones"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
-msgstr[0] "%(value).1f mil millones"
-msgstr[1] "%(value).1f mil millones"
+msgstr[0] "%(value).1f millardo"
+msgstr[1] "%(value).1f millardos"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s millardo"
+msgstr[1] "%(value)s millardos"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f billón"
 msgstr[1] "%(value).1f billón"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s billón"
+msgstr[1] "%(value)s billones"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f cuatrillón"
+msgstr[1] "%(value).1f cuatrillones"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s cuatrillón"
+msgstr[1] "%(value)s cuatrillones"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f quintillón"
+msgstr[1] "%(value).1f quintillones"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s quintillón"
+msgstr[1] "%(value)s quintillón"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sextillón"
+msgstr[1] "%(value).1f sextillones"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s sextillón"
+msgstr[1] "%(value)s sextillones"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septillón"
+msgstr[1] "%(value).1f septillones"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s septillón"
+msgstr[1] "%(value)s septillones"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f octillón"
+msgstr[1] "%(value).1f octillones"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s octillón"
+msgstr[1] "%(value)s octillones"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googol"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] " %(value)s  googol"
+msgstr[1] " %(value)s  googol"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "uno"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dos"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tres"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "cuatro"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "cinco"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "seis"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "siete"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "ocho"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "nueve"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "hoy"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "hace %(delta)s"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "mañana"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "ahora"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "ayer"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "hace un segundo"
+msgstr[1] "hace %(count)s segundos"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "hace un minuto"
+msgstr[1] "hace %(count)s minutos "
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "hace una hora"
+msgstr[1] "hace %(count)s horas"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s a partir de ahora"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "un segundo a partir de ahora"
+msgstr[1] "%(count)s segundos a partir de ahora"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "un minuto a partir de ahora"
+msgstr[1] " %(count)s minutos a partir de ahora"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "una hora a partir de ahora"
+msgstr[1] "%(count)s horas a partir de ahora"
diff --git a/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.mo
index 2f88ef3d7627746f144b2006171cc25208171b60..ffac545ac79f5d1a07400d4bd9b9b29f0890f35e 100644
GIT binary patch
delta 328
zcmcb@Ihkw1p8C~{3=DIb7#Oq|7#KWR7#K8wbP1H63#5UF;TVu$1=6R1G#ik<2&92p
z7;ZqtZv$y&Apap${3%rY1&{_JhIdf$&rtdsRQx9kgFIN{KcE0RP$3i07LY+)KpH5-
zz{k2dim{u~)JWIBSl7@*!N9=E&{EgH+`xb<z+X2gwJftZGe1w)C9x#cO2Np$5U9=w
zq|VUT%D`f>6tf(gPikgLYR+VHW;6dpO$CjNl9B=|ef{$Ca=ntG#Ju9nwA2c{ywno?
zf};Ga)Z~(4{Q~`zti-(ZeEl3CS(=!hs-IdM?--=7$>jqTuu=evOfF%Lo_wGAD*&|i
BMP>j1

delta 265
zcmbQtb%k@np86a{28Ovz3=CQf3=CW>3=A4T+7wF10cjv&Xa^FkK)MG=vjOQzKpLop
zVJ1|34v=OB@)tqHmqEo>0%;&(SPvE70;RV@#donV$b&WR2MVwQ6&?oCAcIar6`W_;
z9L3npXlkfyV61Css$ghrWoV&mU}9jv72vNMlv<WqoSC1e>ylWKYNcRgU<g)cV4`4X
wVP$MNS&CV1vOTjYduC#urh<*#<ipI-{62|!>7|M3K;@~$@s2^0Wm&!f08Y9q)Bpeg

diff --git a/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po
index 74b26fe023..83e0e1f1be 100644
--- a/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po
@@ -1,42 +1,64 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Spanish (Argentinian) <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "hoy"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "ayer"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "mañana"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "to"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "ro"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "do"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "ro"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f millón"
 msgstr[1] "%(value).1f millones"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f millardo"
 msgstr[1] "%(value).1f millardos"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f billón"
 msgstr[1] "%(value).1f billones"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "uno"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dos"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tres"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "cuatro"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "cinco"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "seis"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "siete"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "ocho"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "nueve"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "hoy"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "mañana"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "ayer"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.mo
index f077de583300757c48c604b00c020ba93cf4589a..03faf2f55ab67565b16c24ef5296b00c87dbfac3 100644
GIT binary patch
literal 4181
zcmai$&yN&E6vs<Jfl-uSil9jGV`T>Dnb}1V2NuC)2^co6uoy4K6f-q5O=hZwuIl}9
z;N&0R$&jEo4|?%{9y|~e6Am6c84q5J8c!HwV&Xv(J@|dy)iXQYwXw1_pQ&%XdR_fq
zO}+hT+xia}S{?m4^p755Y=*wC!v|V<J!6N!3U~y36Py5VI{jm(f9v=+Si}5*M^at^
z1B~BuyaQG+{uw*~ZhAEJAAtKXz6z4Q<n#|6?}7CE-yL^uNd3$>_Q46v-val8Ux7!#
zU)*@}#&lc<_d<UMq<!23u@&|Sh^@2F96twlVf-cdJop{>F!-mN{|lrLJ#hTj&9hCZ
zzjYwZZvtuEX2&gVe!Jr?5KGx!knGDK{@77`+(9mmgJq2Gm(u-jeJqXFX^`|bNO5@|
zr1!lGQZDa1?s}ZDD#ounu7HOz{uDd}eh-qLe?W@+!OdwLFMy;g$6Mf0jK6mL10+AY
zpGY|iRxlobWOo~U75oOI=WKYAv9n+eB)>PnQ{Zio;{F3jdH4}TirKFqma^Z#XTb*`
z#c{`$)NZHa9+2X80HpatPCpEi-@4OZay;SmlOU}-1LBCVb8dXe&Ci1fe-gWm<OiM3
z!!~r<7quPe&!E?6;MyKX@=g1u-xS3qK&SWGkDfJzkRj|z!{d@X(%>NaZu){ov83Mx
zo$b|)&M@VRa*(yH_=2=2@x`%8;)$@a?dTkx;`226PINlctJ_l;yns%*qK4y^G>Rd`
zhfS0hMK6|>>SUW=3wym#tN+znvgxt(s~xR7x;N(1BlSK0e45hAW9e6Q(|T<E>Wx^m
zB9HajdZ>KfZ^VAx$brv%O?laG?Uk)>;|0+avg=cdIW*j-<x*&PLC9y%@S;-8o8dmK
zm@~tDnlD?1uca0<MYcZGlP1I05DO_HOONPD&`=VHm5Qz8qNDN4Y3f+n3I&ivlc+<J
zcBK0V+LFg^I3=)!rdF+-zf{cpIg{a{(Q`Aq;gnFktK%r=jwI*I%?}rhe5FRi2^n^}
zmbJr0$=X=Xl(2CmdN%CK^%Lcm>{)>qr!e?uhK^K=sZdEqk<eh&Vn!}X#Z0)&jAgcq
zzeq}EbxW+^v#+BFwsuLg6=|%DNS=@Mb=kDR#a8f^j12C=20wRQsE#gOmIEExV9s>H
zR`6QfF~Ndv@Y4Jn3&Bhzg@tW!PFUICQ}xNIpnfcve394djmcMn`pfk?41>#ZF(jWk
zyZUh~X&jq6Qb#LY62=A#kx-^5td1J|?6pXAMW4?a8;O?Sr$j1Lv1<~}bowIfRhznh
z8jDpY79ANZNYQWbD+8fI)8*wkxg0iig_pb54jQ%E($Z2Di<Jr6a=EIctqsyQH?={n
zmAr7R=X}+qd3WyZT4m_G!4su4cX4iZ6sE~)y)>hhl?vNm86XZ8$G$e`iBO&7&8~=y
zw9{7?&Icz(cC>}IjDlI!)U8l;8vMky(3a+VbO?g;I_jGSSA%3|rl(Hw^y_q4@qN>L
zvQiqWD^$MjeNil5I1gsbFul?8rm0#m&fRQOCsQfsl&-hDOVSDsi#Htk^sDJDmv@`0
z1;@=;Bv(k@JktvcvfD1dAkzyA+?|)Vce2Mkx%i6aiCi%EZaxvmOow%ARRa84G0#~w
z%Q?*DI4fsk4=Cg^t!Oz<X&P6*aaPiDhQ-WgH7#eDWpCVPrsj;Z%#9moYR=e`&0$$9
zm=-cQtZO;btcr~VZ<TmKG$kJugrulx=2Z=gRa*5l7knTh8%Fqdgp00@M84o@)QN&k
zmmUTuMs{M=(kvN|9`5AiIqtj1NzvY8lzV|>haQa{B~U#h;qftg5E=O1M>o5gHA7sN
zEI9$gH*%#CK^Yd!LNM_DDn?OcY5ZcPS)@@QrIjd_p`nq*Uxd_k^$P2Ydv}BqtfdVT
ID>7pL0WxK46#xJL

literal 1236
zcmaiy&1)1f7{;U4ukpKjR7elvt}=C|TVb7ci`WmSx?1a61dEc+W_MF&lO@S+yPiDh
zMGzDZf?hlbo<tM`5j^zhLH!5(KfL*5jV-ndhP?UB`^=Nco8kRAIPi>M977yOd`6r=
zEN;Vs@f|z`{_y+-=8+F=CuAph85{twdoF;O<hIZ6fIE<<Uay00-?G<RUbmhr{{21A
z``{k<AAs&VkHNj*Q!qm<FTou007W<!z|-I&=<0fi#hv#E+yy=Xv4uSM`U}u~_m$UQ
zd;JZFN#1(>gXc%De*)dUFW_!)&F5eJ`)?r1>zzFay0hIq{*D89aQj^?`w;H`2MBB<
zM-gruK^#K3`yNK@NAw#9z3A#7CvzQ^wRwIxuF)ltWkSjSYRx{rewx*NjO!v7^@b%i
z(cz?~+M38JkwS8!5V}eX?{G<sSS7|1+rZSE6RWDMi?yk=Rx8A=DAMJ|a_!_ft(JLe
z!`W)Mz_r0u5<0caWL*XGyrr}a%cd@>;l*~{gcX(0VD4HaoYb6Ic*7}Xc|u2`I1Zyi
z7@wnYA&HA&G#W)PhV#55+&4G*qEQ+blfwBk5k_!@85>qKlO|(U>4aWlQVK)IQ3iM+
z<D$y5VIga30%lonvpNqeoHY}Aqs3rp&|I0Xij>Jb9lwg7F%gt!%hMY-iie|MQc24t
zPU^N$vgNDxY%60zj?uKiwBfdNvoaGFH+-(58rR{pOjT9LdP0j!!md}4P;Ty)Zv}H%
zTeB>jQMzdoDqFqOlt#wrpT|;8(xDQK^TC!TS$n^=aZtVa$LP9bv(af=jJ+<|?Cgm>
zt4bS+qym>AX`5NCNL3NpM$3@4R0O#Z+;TLLFfOy08nrZ3mo(YhJ0=-+7{a<-li%4>
B8D0PY

diff --git a/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po
index 96ed948c5f..8a6a11133e 100644
--- a/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po
@@ -1,42 +1,64 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Spanish (Mexican) <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-06 20:32+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "hoy"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "ayer"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "mañana"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "to"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "ro"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "do"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "ro"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f millón"
 msgstr[1] "%(value).1f millones"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s millones"
+msgstr[1] "%(value)s millones"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f billón"
 msgstr[1] "%(value).1f billones"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s billiones"
+msgstr[1] "%(value)s billiones"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trillón"
 msgstr[1] "%(value).1f trillones"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s trilliones"
+msgstr[1] "%(value)s trilliones"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f cuatrillón"
+msgstr[1] "%(value).1f cuatrillones"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s cuatrillón"
+msgstr[1] "%(value)s cuatrillones"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f quintillón"
+msgstr[1] "%(value).1f quintillones"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s quintillón"
+msgstr[1] "%(value)s quintillones"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sextillón"
+msgstr[1] "%(value).1f sextillones"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s sextillón"
+msgstr[1] "%(value)s sextillones"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septillón"
+msgstr[1] "%(value).1f septillones"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s septillón"
+msgstr[1] "%(value)s septillones"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f octillón"
+msgstr[1] "%(value).1f octillones"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s octillón"
+msgstr[1] "%(value)s octillones"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f nonillion"
+msgstr[1] "%(value).1f nonillion"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s nonillón"
+msgstr[1] "%(value)s nonillones"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f decillón"
+msgstr[1] "%(value).1f decillones"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s decillón"
+msgstr[1] "%(value)s decillones"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googoles"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googoles"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "uno"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dos"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tres"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "cuatro"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "cinco"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "seis"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "siete"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "ocho"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "nueve"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "hoy"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "hace %(delta)s"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "mañana"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "ahora"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "ayer"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "hace un segundo"
+msgstr[1] "hace %(count)s segundos"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "Hace %(count)s minuto"
+msgstr[1] "Hace %(count)s minutos"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "Hace %(count)s hora"
+msgstr[1] "Hace %(count)s horas"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s a partir de ahora"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "un segundo a partir de ahora"
+msgstr[1] "%(count)s segundos a partir de ahora"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "un minuto a partir de ahora"
+msgstr[1] "%(count)s minutos a partir de ahora"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "una hora a partir de ahora"
+msgstr[1] "%(count)s horas a partir de ahora"
diff --git a/django/contrib/humanize/locale/et/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/et/LC_MESSAGES/django.mo
index 44bac2d14544965a9bfd6422b884898fadaf38f3..24c7e3fa858cce9e53a391923dcd9dbeff970595 100644
GIT binary patch
delta 318
zcmX@g*~~RzPyH-L28Ovz3=EnK3=9@53=A4TItfUF_}xI79Y}8l(m=$p7fK%j(m-tt
z$AL6R{v=fVB2@eukY)pl-++qWhl)Re($ApcFIX7l7+8S{-vR|d^k=BVPbmFwb0lLA
zqp6Xufw8WkiGqQFm7%4sfw_SJSAf56P-<Cbab|v=u1jJ`s+EF~fgw<x5lEe(v6X?v
zWGQAjHlNhYl+>Kb=FEC-8W|-e1y=g{<>lpiB}IvO#hGcT6?%E8CHe(L`B|ySCB^y$
n`YBn7dFlE3IY6>BF+EiuD67fk1LavMq?SxhXO5nHp7|R9_Gd&v

delta 255
zcmZqXI?6d=Pkjs{1H)V<1_n(A28LhE3=A4TT7?C|_XX1IKz=!p1|o)fDBS|2f!Y{4
zfiy_I8!A2-Dn0{9vjN3tLB$tB#g{?p6;Sb2EDUlCtU!h9fdU|UD^y}Pls>RIlCg);
z)KJ&JSl7^0!O+;s&_dV1#K3?nz+X2gwJftZGe1w)C9x#cO2Np$5UkF?M8VL)%Gh$U
i6tmo9duClG8@tJyn4`IU67$ka6VrhzQzvt?`~U#Mr6^_q

diff --git a/django/contrib/humanize/locale/et/LC_MESSAGES/django.po b/django/contrib/humanize/locale/et/LC_MESSAGES/django.po
index 2f570d6bc9..0fbf9820ea 100644
--- a/django/contrib/humanize/locale/et/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/et/LC_MESSAGES/django.po
@@ -1,42 +1,64 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Estonian <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "täna"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "eile"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "homme"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f miljon"
 msgstr[1] "%(value).11f miljonit"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f miljard"
 msgstr[1] "%(value).1f miljardit"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f triljon"
 msgstr[1] "%(value).1f triljonit"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "üks"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "kaks"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "kolm"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "neli"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "viis"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "kuus"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "seitse"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "kaheksa"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "üheksa"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "täna"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "homme"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "eile"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo
index aff236ab37481202f56c14bf64b5290a711af55d..0497e9881a857d12a5591c6af4cca49d5cf7c1bb 100644
GIT binary patch
literal 4006
zcmai1O^g&p6fR{^8ATCPL{SP6*b#cBcm0FGHOc}?0*bhpcrdYMy0*8Wr)%h{-ao^^
z7~@GV#$bZM7!RI2=!Fvp<H3U`4_^IAym^qsgT{F9d)+lXKV7?4ruysp-dC@x-m9+4
z{IqrABZlIm?nM3MCdOvzeFGjSlM{^X2iAcHfUf}e0xwzqbIX5k@h@N#_B|U5d===S
z{f@=2fOWKg2JQiFx~1^%0e7Q)4oLix<*!)$7D(g&ZgKmqg`ZiAUEp5WF9RO|UI!io
z{$kskZ!6k9a2NPDfHaRwKum>w0mRhVmlnSU?m+t*@L}K&z?*?Lto=_Qh3IdK|5`iS
zRQTHfB>N^H_1kQ5i?wgFxC4l;Y!{I9lR*5~K|HP^7f%5nMf=AZY`}kj6rVk}7yJvr
z$Iy;}b>L-S1NaT_0Pu#zop%)N7lHf08z9B|ifvy9Qe1ws{KV!Wp8J3_?kOPo&w%@Z
zpIZFR;vYbo*Y-OL-4P(^q;0=%@fwhHzgpaQ7h^~%s{<+iK9J(@BoIG#*y2eb>0SpS
zB<xKf<?TF>^gU}gmVe9gZvzoV_O7+R2c&U6u=pX6{Co_gJYBW?XF%%LK&AZ9_d)w%
zD=Ma*mwWKMAGKLD^XEhMo#yl)Dt%KFHxHHOPkXap5Hf~v=Vc3?lrJij?+5a?V$V{Z
zXm1Y}$`!?ta^Ej^;|1x?^F=YDbzvE78!AVo_1%ZM9hLU<aJd%^+82~FD%fUup;+M)
z!UQH4MV!fcV``qaqd1OK^1oalI}W9r4V4O2JmS(pbshd(T%r<((#@)lacJG_#Y_aL
zL%lX1B`)t5GdHhg&m~`zUUsXUv~f+mLh4F(T}(BHn!C8M6lz`}#<Qn+m8s@Ua~D_5
zndUCel`YNJVyl@Vt&4S}N%J+xN{UG7ARP%RDS=oenUP$C3SUk~Wr?X%0EyH&TT13r
z)kV;j9J<mZFoljvf-!#u+4pB9Wv9WoeO+l1313iII_8cj>&)8A4g+6>s5HnZTrg}t
zT9j-a-B}_`mWtR!T{*FLGLW$mSU82jZ7Cfk0ZXDpGKz!(rUBD(Q6@}B%S;<)7Vt}@
zWJU#I1<$TZQ)tbSVk=S`nG$^_Rp({LcqaqzHJNIhg)M&UyhuV-J1cuCHQs3*MuB%U
z3$-_=TD*4V<vDLQmBK*l9TP^j__RMY?fH*;Q%`W;Z%rNc{HJ{%Lhr0xjL7Gh&Ogkj
z{MPiL13pUal+ebTOGTn%VN}}U&qroe#r!4FmSFiaA}QXU>!?8LmBfhUMn`p@Mb9M6
zL@2#EDY`9wROpMD<dX}=^jgj4($Z4HklScpE;kZsn!RGNy4h<6`5K$C_0W`AvtIgZ
zahcUlpFDkh5R<8fUz=5lkqPFy(!-(+_IR@wizqq5I}0M!(#)KjJK-G~=xFeHnR>?)
z%sfiM7C+REOzlie8TU@8w5wY@>E%s5Gkt^?uQQVg-#x>p>NSS@Nkx44#u~X-ax)9$
zYJ^*CL^mQM0qiWya4`*g8&Ty}hBIr_6CV-fX6!j!N@F9A>iP<npIT$m5s!TVyO0Sw
z55}~kZU-86AwRdq)FYlt1wIVAjMmeZ3TWx<T3>4wjOM#uv<f?AaoC?OXPI9}FjZ5i
z2kWN$s7UZw0*C#S$y;k6B#s8^=Y{w8)UcDju}Iq3oCiI4aTSrfK|TiNq16q{j&u!=
zyk4q?b?c>RR5zTWwPIqo8w)ZS+v_Fcye*7n28Vcl5oH`-2QH+HB&cbcVXY%~6`6=G
zJZc$cNs!Ac9<2@At<+Rp4r~LTDh;x>G_vB546JXhxFUlkS8=MZMy#!HNyMT**YfVc
zlKQt$v6c`k!nM+t0ghwpsZtzzjKXA1t75emVI>j%WLRn;LKH%Q3$7jEaKw|LuVViJ
DtU(`J

literal 1225
zcmaiyO=}b}7{^nsZ{vIQsE~rz7Rfr(R#>OqB7K8WtF^4XC_;8OJDW0_teMQVy9W^u
zf+r6}Jn6}Uc=O^#FM=OHzkuJvoBy=w3uUPxPkxhso+o*ddHxLaza?mwVOL<^VOL>K
z`Y@pV0&jr7J^z9um=7Ky<QTXJ_Ja>SS3z|0*w3GWM=`H@Jpo<Zn%7%ix1Q^Mz3ce`
zJPH3-pxfsScnaJEtH|X&cn$MDB;hy&4uOl{anOM1q=Ui5Kll1e(Czcu>ziJG2fF+|
zc>N=YW5_4J{ux9kUp&8p&i@;TRLBpn{{&r}TN{A6T--f&+F5+Kd|b?Fn0x;KhA?so
z=GsNrd6>)d0_+T|S3Bp$6OPx1+dR$1NFl1zicC|f)qk~S55HcTH9Z`6MIn=hC3V>r
zq^@&ARE;R91ko^4BbjImMKZZTGD~a&-3URfuJI1WrZz^e6T7ZSM`TtQCodblCaRV#
z)Yz&p8Lkr3*)^^b9ju6!HkK`AiL9~dJjqyD$23@eP-Zhma0_2H%dLp%Xc$E-9AnXK
z8jZzKk%i-72uHRe+S2WLz%Lx9Q86C7b2CH>?(xjBvf(OAxz#47T-vTq=_FUYBB0-`
z>YB(p%JPjuRX3*)p^}^@f|Uht#&nuz&vHR0@8cP!f~AF}xxKqYg)o@W$_j-uIxQq?
z#fH7rO1V@MwA$b%6SnlIJkN@IelC}~Fl<iYWT}#v7Aw;39vf4U2g_-0c*^FrX=X81
zt*vQR8l9lqpQT|%2TL>>2?%OLOS->m4wj3S1jTTe)7CO^g>abH_B!d}zjY<4Xp}+9
rbCPglP#6_a!*gz}aJwURdAB7|Ig%81q=qyu2K7~ucp!`fQJVY%)mafe

diff --git a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po
index aa785021a1..8cbfd616ab 100644
--- a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po
@@ -1,42 +1,65 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: aitzol <anaberan@codesyntax.com>\n"
-"Language-Team: Basque <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-09 10:28+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "gaur"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "atzo"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "bihar"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "garren"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "garren"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "garren"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "miloi %(value).1f "
 msgstr[1] "%(value).1f miloi"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "milioi %(value)s"
+msgstr[1] "%(value)s milioi"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "biloi %(value).1f "
 msgstr[1] "%(value).1f biloi"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "bilioi %(value)s"
+msgstr[1] "%(value)s bilioi"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "triloi %(value).1f "
 msgstr[1] "%(value).1f triloi"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "trilioi %(value)s"
+msgstr[1] "%(value)s trilioi"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "kuatrilioi %(value).1f "
+msgstr[1] "%(value).1f kuatrilioi"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "kuatrilioi %(value)s"
+msgstr[1] "%(value)s kuatrilioi"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "kintilioi %(value).1f"
+msgstr[1] "%(value).1f kintilioi"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "kintilioi %(value)s"
+msgstr[1] "%(value)s kintilioi"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "sextilioi %(value).1f"
+msgstr[1] "%(value).1f sextilioi"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "sextilioi %(value)s"
+msgstr[1] "%(value)s sextilioi"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "septilioi %(value).1f"
+msgstr[1] "%(value).1f septilioi"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "septilioi %(value)s"
+msgstr[1] "%(value)s septilioi"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "octilioi %(value).1f"
+msgstr[1] "%(value).1f octilioi"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "octillioi %(value)s"
+msgstr[1] " %(value)s  octilioi"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "nonilioi %(value).1f "
+msgstr[1] "%(value).1f nonilioi"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "nonilioi %(value)s"
+msgstr[1] "%(value)s nonilioi"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "dezilioi %(value).1f"
+msgstr[1] "%(value).1f deziioi"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "dezilioi %(value)s "
+msgstr[1] "%(value)s dezilioi"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "gugol %(value).1f"
+msgstr[1] "%(value).1f gugol"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "gugol %(value)s"
+msgstr[1] "%(value)s gugol"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "bat"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "bi"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "hiru"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "lau"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "bost"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "sei"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "zazpi"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "zortzi"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "bederatzi"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "gaur"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "duela %(delta)s"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "bihar"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "orain"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "atzo"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "duela segundu bat"
+msgstr[1] "duela %(count)s segundu"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "duela minutu  bat"
+msgstr[1] "duela %(count)s minutu "
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "duela ordubete"
+msgstr[1] "duela %(count)s ordu"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s barru"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "segundu bat barru"
+msgstr[1] "%(count)s segundu barru"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "minutu bat barru"
+msgstr[1] "%(count)s minutu barru"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "ordubete barru"
+msgstr[1] "%(count)s ordu barru"
diff --git a/django/contrib/humanize/locale/fa/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/fa/LC_MESSAGES/django.mo
index 6db0ae0367b74ec849eae597a931479afc73c80a..72fffafe98ff32bf3b1fbb39b5756409a8918975 100644
GIT binary patch
delta 318
zcmdnW`JQvap883Q3=DIb7#JiN7#Iv#AhaixP6E<wK=EoQ-2|jLfc#D<e-f0Q38aCD
zVF8rC6iTmwif@MUcR=a=Q1N3d3~~%yK#iw?0w9C0K_%`3X^{An&5?{fjHX7q2FALE
zCJF`yR)&_k2Id9^Tmk;NL8)b##hLkex-N+&sa6U`28KX&Mj&;D##ROvlckvD*nCnm
zQ&Mv#n=|XWX=Id?6j<r&mzS68l@ulB6=$ZUR_NuWmgpB0<!7ZPmlW$4=%-{Q=B4NB
g=K#sl#Pn4Cv_ySPE*~h*N+B(Aau##+<V(zt0gjbHR{#J2

delta 260
zcmaFQxs`Lmp85zz28Ovz3=9$s3=H3xAv8Y=gw_DkY(Q~GDD45HIe>hBC_e&9#{+2~
zVn~DXv!QemRJ;<(uY=O9Q1KoX1~~>UpvH+n0g%CSpb|@gG)R2a=19gKMpHvw17lr7
zQw2j~D?<xi0}}%St^j}CpwzO=;>`R!U6;g?R4WA|14FPn0}};93oB#G$x_U6lkJ&x
g*lhgr^HS|5Z)A?<@kz`}FHKAbs!mIs%+2xy00v1X-v9sr

diff --git a/django/contrib/humanize/locale/fa/LC_MESSAGES/django.po b/django/contrib/humanize/locale/fa/LC_MESSAGES/django.po
index a30e8899d1..dc16c7b927 100644
--- a/django/contrib/humanize/locale/fa/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/fa/LC_MESSAGES/django.po
@@ -1,97 +1,266 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Persian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "امروز"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "دیروز"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "فردا"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "اُم"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "اُم"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "اُم"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "اُم"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f میلیون"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f بیلیون"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f تریلون"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "یک"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "دو"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "سه"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "چهار"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "پنج"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "شش"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "هفت"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "هشت"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "نُه"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "امروز"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "فردا"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "دیروز"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
diff --git a/django/contrib/humanize/locale/fi/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/fi/LC_MESSAGES/django.mo
index 619de7b858541ebd222c95af10feab05f9c55dae..85121c5e608e6398d0de7facbfe384860a810f94 100644
GIT binary patch
literal 2394
zcmai!&2Jk;7{(_MD0L|xEd>Il9iS;m!}=ou5gdYmG!Yd9(#mk3ddK#}>lw2%>%@Np
zXHGpJq`-v}e?wFRCpf?jaYEt(5|xlRR7ic^-SIk(7qQye-_G;C^UTNY%&%u=KV!H!
z%6Td?j4cuG!voiM;7j25o_D}S)aUMJ>_u?HvklIp{weqZ_zn0n_>-^C%x3jV;6>=y
zLGt+od;q)!;$~lXeg)2<{xx_3ybYpj_M4CY4#JxK;rW-3{|%DgKVJXW>oX9k{VYiF
z6P~BRhfqHYlHYmoB*?)pu@+arE2#hYV8*+imrpQu8Txh4eb3K9%KsJ&z&qdqcoCgY
z{ax@9H~?w>w?OLeHi)j+4<Nc=KZB2fzkttze}WheJBeh<KZOU4_Z)~RvN@3A7r+w8
zLGoMjdd+ji>#u^i*%}_OW}9CBz_S68AN>;)r;GYIoxWw>Py2Tcp7rnatxlmlhk~i+
z7k$fzQJz7e@9+f5Qz%cOoI#<vJc>edri<qAc>0$8FZ4?5@`%@HO)x}u&ez%e!azic
zTrAgG{HBT`W%U1Qy@I?V&BX<YQ=*;fw@5keZ~3%RV4X_>`8siui?+c8n<mk2kxWRm
zshX#>V$<W=>=oqYA;GO|8XX?<%fykNPstmN`yJ)wA)$H4B=IpjlDwIZ=MBbQSyCR5
zs@-v{r3R9<(41-El2}Ae_2lgQLMS6AFmYOj;z(|!L#CCMj8?*camcJ3NX@L;XVx*-
z!5vG<oC(Dc&z^~6<hnh>hSEA2le`m~UD<TOwJ`Wt#uooqonPG*x@}4~WZ%Rt*tTsI
z2Ja+o8#GLvmv%mE1RJpw4!OZq;bfgJS8K~bbtS01!mHJK?e(DgTD6MA;D#J1@|?(9
zro7rpy}G(o#Z`J=SQj*6p=~6biR=7r?VRH83Dq%?;BSa-`nKdKMYZJqTcUSUIn24-
zG`%;`Ubhp`mO(>`UY&0#t(EQYg^qLmdZn_rw^z=ambG-1el}-Y=~u#Zs+GuFR9dRC
zm>br4OO>{-ZEud3rdF<&HjH*sW5~lk=I-P^93!Fh8gF()Y^7WOsIe8Sj`L{TEg1)!
zx@khC+jYK*@t1ZY`tZS)iF>xrbw91z_2o65y{<24{`@+xEtV#>JT}&@h(lE<iYe6?
zT`W$jI9zt8Qb*!AHQm>f-H)Z?X%l`~8c9dfMm^-iP7jxKB!bcIPv}>$%3;NkbM#!G
z2)20^%2Ji)-6TRFp*|*)kH)O*;(RIa^?}?rtz(xJ*-pn?v1uyjmZ<%Q;qgdUbVAv+
zLbHLwE@E0nyN3su*yxbRmt`cl!vl-LJJNNr!;xHO!_?&PKr=mbY}kcS83%=OR`y8k
hCP^xlS=U58oE8ud4=B<}Oiyb3JzYVqq>Atj?g1=NYwZ94

literal 1250
zcmaiyzi$&U6vqveU&rsl2$DM>TF`~Nwn*XHREYkN3KU8ST|gi==Ukjz?8xU!8wSLL
zm|#E^69ZC(*qIP8Wk!O93Gsh0An|o^Ta`xQ$?rb*zJB(5zVpxizEuJ{1wRe{1V016
zzY7o8SMVJ8&G8pFgm_>#A$!5=U>|tfaS_BI_gwq{+=IB{^aQl)>P~Mt-8e40`A3dV
zzyrvC3fg^MfCs^s;6wEC8a$8qHzq9y(TwFC(B?e`ZM|pUKJYn+Wn|UOzXCDH8>hbo
zJ;d)oyY9WyKRAAL`e)GY-vw=dU!4Bk@ds$@*gg8;wzkdNup@Y}=Ry1A5Zr!$TNlg7
zNw~EW@MCaW=Q#W@yq6ty;(p7sgKd`Pe5eps>5@oOq2zzHW{<pHn$bNHH$^Uznjuxu
z=A^1}O=L`@ken#Ej!DMbT#`(zkjxNM!_b@)qhi*<v#GRJ%fu`z(&3rm+RF1<)p^DE
zv$4O(b%vuvbgIr|qPzv(Qrh@)St4TpYMx|%Sw+;Fzg6}pHD?C7{uDDjqQgNL`oV}F
zUZUYh6c+tpGzgIBFYvaod;XIbjMA_eja<GEz`PqQGk#e!nWfAq9not{N|DiVv;kg8
zxrljM5VEQ!kSvp&CEPD_){N+kuqib<eiNTy!ke3&o8CG{SO~mHB@LI@ztcjahOd~5
zt&|BlMk_U@Gj2+E%QJp)E6?^(<=UT?6%`AaM6|dh%x2w)R)sg8=9;DcjMB|4qO!Ff
zW~JdV`uDXoDCt0nhC|-Adx8I5XF3)=MYcm#O7<4FtGI#n9jO~4BMnxIc_U+zv<3bJ
zkvy$;*GPeM*7fe1B%KEI0&b5m8E;ypk>~4DfizUw#1(?rU9&T_Ts65wV-03kagpN2
F{Q(1tAie+q

diff --git a/django/contrib/humanize/locale/fi/LC_MESSAGES/django.po b/django/contrib/humanize/locale/fi/LC_MESSAGES/django.po
index d7e0842874..440d527d0e 100644
--- a/django/contrib/humanize/locale/fi/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/fi/LC_MESSAGES/django.po
@@ -1,42 +1,65 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Finnish <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "tänään"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "eilen"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "huomenna"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f miljoona"
 msgstr[1] "%(value).1f miljoonaa"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s miljoona"
+msgstr[1] "%(value)s miljoonaa"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f miljardi"
 msgstr[1] "%(value).1f miljardia"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s miljardi"
+msgstr[1] "%(value)s miljardia"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f biljoona"
 msgstr[1] "%(value).1f biljoonaa"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s biljoona"
+msgstr[1] "%(value)s biljoonaa"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "yksi"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "kaksi"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "kolme"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "neljä"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "viisi"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "kuusi"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "seitsemän"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "kahdeksan"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "yhdeksän"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "tänään"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s sitten"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "huomenna"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "nyt"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "eilen"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "sekunti sitten"
+msgstr[1] "%(count)s sekuntia sitten"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "minuutti sitten"
+msgstr[1] "%(count)s minuuttia sitten"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "tunti sitten"
+msgstr[1] "%(count)s tuntia sitten"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s tästä hetkestä"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "sekunnin kuluttua"
+msgstr[1] "%(count)s sekunnin kuluttua"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "minuutin kuluttua"
+msgstr[1] "%(count)s minuutin kuluttua"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "tunnin kuluttua"
+msgstr[1] "%(count)s tunnin kuluttua"
diff --git a/django/contrib/humanize/locale/fr/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/fr/LC_MESSAGES/django.mo
index 7a83c96bd7e7872fbcd541dc2e6bda00e1583752..fd04a3365a0d3d56c354b043097225ecad4f07c6 100644
GIT binary patch
literal 4120
zcmai$O^g&p7={Z$k<mp274eT!SecRSou0)g4zMvUkdTNXF5HZ1rfX)J^i&UB)%$Z;
zFM2ldKs@LHqX~NOfCr5S4}u316Ag*+;6aTi6E7x)Xd;Qe-*ip?OxMQB)I42pz4di<
zeLYq4)Amgl8H$Vg5bC=d7+aw0jrc;TZ(?j8*Z}u~FM-qGn$h1k`ZtDuflc)9xi#g>
zpo8}7hF8D_+CPJPz%93>@g49{w9kN~FB|<G!)qYj|98Wko6|T8h68XK{cnShfnR_#
z;4h{<b$i-&!QIeb0cjp<Ag01DgP1z|*zgl@7uuhJkAT;~Tfjd||DPZ&(cgwQO+VX`
z#@h%|{}zzOO&M-8{W}bIff&kmgXFJ+_^=s#y@gyn1=4eTU1Mw(yaDb7_uj$S6W|Gu
z`nBPEAm#E~!+${<=iZs}RglKL3D&{SP5W1nqdhgn*yG?VNd0FFUjt{*zHInCNO3l7
zP1kV-q;Y3K($`G;Ly*RO2U5J7hSPVY&+!6C>#ht}K%|(hf!n}0Kn!6QK}?Z-0FwU-
zSOY%=X??#m{a=~>>maS?4<M$>el-2Rft2qXAeM&x1JeCA<7O0htKkk1%RgE>%8!dm
z@56Rfnh%wGQ13@=Qp1#o4e8zwqS9}wf$E^redygB7n&D66BXQU^nTMd<@W))K%upx
z-vzzf#X|4!9#mTEak(28^h~tQ^bXN;;_=uHRE|pPbRX(YRC=e2<z6%>fBTF`YfFXJ
z1V156puXgViD=BWy8K)ahCw9%SMx>3;<T&1DC$LFDWpXjSmN0<8A*%Nu0|bg@!Hi3
ziRZ@__xgGuZP70zc3p{~&AzU@Vs~3*ZJT&SRF&-7lxhwYw`mh8RJ<ZgW>4{|Qq7y<
zHm#a7#ci4`TZ*rzRx?Fjn`%ju;_HZ&6p_;+S`w5=9@a`GT5zuy;g{2i5~&-sfF!Ds
znpwJWG{B-QTYOoUhbeR-=}*K<#c@1i$p+>39s9B_Px5}0#1r92GQmuLHXx6cnz9ZN
z^!l20gC)Vb7|x`plh_M&Fc6!j>%IuJhX<!+u=iwvq|am^1*4USz}RO>ED6a}u)>sP
zx{psR1k;i4t>SwS#WB2kIby3qX%UlrDvr*Jj&@G?&RG#F?1gQ9^t>l~QSG!CMzMBI
zs$Sqb&m}$OEJkf!JN4qCvk(hU!|NRNv}p4=w>9Uu2b|WE+;!WnXB_uw*M-qJEtUd`
zS@O-1uXUj99^CJu)Sma0b{1n#s?gI>+~%FoOMEfphtrE^=T^etTr6g#(DQK1UgGtH
zvnaeln;(yb?DToPul2CqY%VV^&uR)4bj1n{Xb#f{RLx=2A3awyG!dHJxY@|!wRtzL
zojh^!SiTOeS+}+jNi8Jiw>rdwYP{FYVdw?&5byN8SP6aP%;It9VD6)vcSY<Rlby&9
zWUtK+o(pvCR7hENjz{r8wYeOQn(D~hA)a0ysY^c3Ta8-r+_-vaw1ap^ZQ;<$RaKO^
zf9)gdA(hExd(U!8;oK^j%&p1?WG0rZmTim<*lcqvo2z>nnKQL)wryu*FX)p4s(V^G
zAk)hOEIS+db9vHU+1^t7ST5PGUb6hl$i&>L^2BC&EocR!E!8-+EQzLLs`zKbv<tDa
zY*y|W$$~9UWbVtgqA^Qi!I)`9V<CM7Ye6lWv(%N$nOZdGc`JBxv1}dZtYoc<S;BH(
zCMgz#e3g4Vk;0r=V<kTa%vr{KY!F4`s9m)cBBrO2sD?BhDvvp~P6W-2g{Xaz#Fm&N
zxezh6O~f;%eiCTb3FHNatm$GjbB?7G%Z@d6SS7=GakxofQY2kAz+Q?C){~kgvfNJz
l8y#lpsMriE#n5pSDCQ;Sag_S|Fdya%3JD}DtRIM&{Ray^TipNv

literal 1272
zcmaiyy>AmS7{(2huj9Kgf@B8N7PvOo7AaiQ2+<FzK%tb-g%8QiIf<i-o!Y*%Wk5(s
zh^+%+1F1;-11t=PsS_g%Oh~M3EKG=n$EoR;B4PQx-}&)#uV4H8y}RorK|6&wjrfQ-
zgSfv7546u<5BSCNH`s^q+1-Tf1+Rl$;BC)25S`rf<A>lLjLTlHg6_Mz*PC9qo{N6|
zk>?Ze0Q}EDmuCe$2)+OxpqAI*MU4Mo@;um!VjS;)uCB+PPr-c{KL-zkD_(yEA_aNl
z^|xMs2fFp%gGay*e*P2a>i-HJ0>6PS?+*~2{Pg?<qP(`Z8+0DGkAKbObot%dE{{9^
z0O4|+M7VYWaSY-1dmQ2F?$nNYalhla-WE$U-q#;h=)6c%q2zzHMh9Of&FT)u4Uvm#
z&60{}aZ*v4CNd#XNKO<&C&cg;m&AxAVl1&Wbj>-jDq+ibHk8(Ck=R8=mbtN9J9$Q{
zIxpLBDhcPfHrPr`$Lma1RWQq&O51SSR7DbA&8j9Wsh9>cw@Trd=FGwyjx)<+I+%;1
zFgFxNmuNH;NBJ-}oXf!&&hnOUId}MS!!*jrLzge)(1IJx*s!FTG%2%6$MhPLQW#o5
z8Q_(ai-f2BLRM4}W?9Wxm4_wH8Zn*JT$XFJa1$p`45p{1CpNbc_2+^yB`udozuZKf
zmM__XX3B&dq2(IWhTGA*rO7bA>2qaNxDF>|StUYNW162Ac4OI?R&+3vW}2npq|yx&
zQ`u|}&FJ6=U4I?zm9$8szF_OESX*uXZie5q<^F7{rh~lwUU{#QJFFe9;M%Ge4XI_q
zlCqEsWFcc#b5bx_v&ahr4n*>-LNd8sG`wlsw`kp}y?5J(Rx4o$%j&p>Ne>nw32)$F
LfozG?1lQy*Psl2K

diff --git a/django/contrib/humanize/locale/fr/LC_MESSAGES/django.po b/django/contrib/humanize/locale/fr/LC_MESSAGES/django.po
index 4bd5a4cefb..425ccdb839 100644
--- a/django/contrib/humanize/locale/fr/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/fr/LC_MESSAGES/django.po
@@ -1,42 +1,65 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+#   <claude@2xlibre.net>, 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: French <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "aujourd'hui"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "hier"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "demain"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "<sup>e</sup>"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "<sup>er</sup>"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "<sup>e</sup>"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "<sup>e</sup>"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f million"
 msgstr[1] "%(value).1f millions"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s million"
+msgstr[1] "%(value)s millions"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f milliard"
 msgstr[1] "%(value).1f milliards"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s milliard"
+msgstr[1] "%(value)s milliards"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f billion"
 msgstr[1] "%(value).1f billions"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s billion"
+msgstr[1] "%(value)s billions"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f quadrillion"
+msgstr[1] "%(value).1f quadrillions"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s quadrillion"
+msgstr[1] "%(value)s quadrillions"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f quintillion"
+msgstr[1] "%(value).1f quintillions"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s quintillion"
+msgstr[1] "%(value)s quintillions"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sextillion"
+msgstr[1] "%(value).1f sextillions"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s sextillion"
+msgstr[1] "%(value)s sextillion"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septillion"
+msgstr[1] "%(value).1f septillions"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s septillion"
+msgstr[1] "%(value)s septillions"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f octillion"
+msgstr[1] "%(value).1f octillions"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s octillion"
+msgstr[1] "%(value)s octillions"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f nonillion"
+msgstr[1] "%(value).1f nonillions"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s nonillion"
+msgstr[1] "%(value)s nonillions"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f décillion"
+msgstr[1] "%(value).1f décillions"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s décillion"
+msgstr[1] "%(value)s décillions"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f gogol"
+msgstr[1] "%(value).1f gogols"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s gogol"
+msgstr[1] "%(value)s gogols"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "un"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "deux"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "trois"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "quatre"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "cinq"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "six"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "sept"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "huit"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "neuf"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "aujourd'hui"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "il y a %(delta)s"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "demain"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "maintenant"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "hier"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "il y a une seconde"
+msgstr[1] "il y a %(count)s secondes"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "il y a une minute"
+msgstr[1] "il y a %(count)s minutes"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "il y a une heure"
+msgstr[1] "il y a %(count)s heures"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "dans %(delta)s"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "dans une seconde"
+msgstr[1] "dans %(count)s secondes"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "dans une minute"
+msgstr[1] "dans %(count)s minutes"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "dans une heure"
+msgstr[1] "dans %(count)s heures"
diff --git a/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.mo
index 35e4d9216b864b942c026925d4175eaa638af97f..5438271b5f97381ef01ac1cdbd0c82f219cf0d7e 100644
GIT binary patch
delta 49
zcmbQpJdt@qqkxgFfw8WkiGqQFm7%4sf%(LV+5A3<dFiEz>8Vx<X_fJQJ`;aOPflah
F1^`=x4^#jE

delta 50
zcmbQpJdt@qqky5Vfw8Wkse+-gm7#^Mfyu;)*^_w~qxgLi^U_Nb(^IV!(kkQqd?u$d
G>Hq*-`VMCR

diff --git a/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.po
index e77a56518f..dcd08818f2 100644
--- a/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.po
@@ -4,39 +4,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
 "PO-Revision-Date: 2011-03-15 15:28+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr ""
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr ""
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr ""
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr ""
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] ""
 msgstr[1] ""
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +63,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr ""
 
-#: templatetags/humanize.py:96
-msgid "today"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
 msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/django/contrib/humanize/locale/ga/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ga/LC_MESSAGES/django.mo
index 74c699de5ce294c28ae0f6cb4df8143c9141a2c5..f6e74cdf5aa124cbf93bf6c58ab7fe56e3e6d46f 100644
GIT binary patch
delta 348
zcmdnU{gHdZp8A7~3=DIb7#K1b7#QMNAoK|!oeSg}vNA9LnGExRG!QW?0TLWQdKHic
zYGK$6q(SoAfHX6Z-VGJs52V?E{6kRjlTh)qQ2GLp2I;%Z${+_e_y$k_Wbi#84KnCC
zkOm@#*PA05dl+MlbPbGk4NVjb46F<-bq&l747dXPb%RpNGK(|w^K@MjOH!>Aj0_Bc
z>Wo0@42`V}EVK=PfXgSbxI{OkC^4@%C$S{I$V$OCGdUwMHAf*NBflswBQqywvMIB+
zn?^=SNr9EVetCJhUI|EbW?E{6US4X6enC-wR%&udv3`MmN>*ZCdcJ-RkStA1Pt{LP
Y)Yk-B0O46Fq$f^JV~*Z@j`=Yo0A$@yA^-pY

delta 284
zcmey!y^(vup87^c28Ovz3=A0z3=Hxt5V`|M=K}d3fiw^?#IrIm01-n9kl+B)SwI@7
zg`pTogXGJAG&7K{hKkn%X*M9g2`b(R74L=86M!^G-(*$>Ik3SqfC3<c=K*PuLCb+O
z5HYOY9Ld<j7+|PtV61Css$ghrWoV&mU}9jv72vNMlv<WqoSC1e>ylWKYNcRgU<g)c
zV4+}WZe?JuZ2$yZK8eL8x*<i0dBr)2CHX~G3b~od*^`}^wb^X^^7B&dCU0hr=J83)
SOD|1K2O5%|xS5yb2_pc6>@ubR

diff --git a/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po
index 35f5714768..1756f4eaec 100644
--- a/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po
@@ -1,37 +1,53 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Michael Thornhill <michael@maithu.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-08 17:07+0000\n"
-"Last-Translator: mick <michael@maithu.com>\n"
-"Language-Team: Irish <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: Michael Thornhill <michael@maithu.com>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "inniu"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "inné"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "amárach"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "ú"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "ú"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "ú"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "ú"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -41,6 +57,16 @@ msgstr[2] "%(value).1f milliún"
 msgstr[3] "%(value).1f milliún"
 msgstr[4] "%(value).1f milliún"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -51,7 +77,17 @@ msgstr[2] "%(value).1f billiún"
 msgstr[3] "%(value).1f billiún"
 msgstr[4] "%(value).1f billiún"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -61,50 +97,284 @@ msgstr[2] "%(value).1f trilliún"
 msgstr[3] "%(value).1f trilliún"
 msgstr[4] "%(value).1f trilliún"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "aon"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dó"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "trí"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "ceathair"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "cúig"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "sé"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "seacht"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "ocht"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "naoi"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "inniu"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "amárach"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "inné"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
diff --git a/django/contrib/humanize/locale/gl/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/gl/LC_MESSAGES/django.mo
index d6278dd606be021fe78ddebb7578fd219b5c0a59..c94b5042704fb0f60ea9d5bf64562f83bcffac10 100644
GIT binary patch
literal 1737
zcmaizU5gw=6o$*Vi8|3};%7jx^07EW=$W34=-SCjG}(k;mMqI8xvq4d>8a3DHC9#6
z?4o!fUIc`os2~c01W{0gkPF3J2w8uJ@xmYCThq0>+0KR(b?WK!)~QopUH=@I`I?~|
zguM#;4>k+?^)WOkr*<*+I{0p&1Y7XG0FQuoz{B9Zz+I0s_8R<Ia5uOJ&VcU+E`xrq
zOCW|Y9drYtvPsZC1pWArgZ^pIuLph>`fmh&1wM)RZ$VUc6U|fLPvDQ(%PsIt_*am$
z3El|&9XtyEU+@UHdr!6h7I+B$MbNMR0}vr>9QYCV4E#?(zmLyBANOVOzX|*<=-&t4
z4EoQ3zXbiaz}p}y`y=>&1^x~CE7=cw1-1|7_q$R2+#AKO%dhDGY%lCtm@hu>i!i?r
ze>T26QDNHpdwDtd&x0?)o({eTj&NEUXrF_<;Jw-ASQI6-+TA|CDvLsD^+;{FL)=c9
zGdl!6AX;7@yQK*9snQV_xyG_mT`Je|-Cnd)Rd7qGR#`2i5<`gM16`V0gqNy*lKH@~
zz8n+lLu5+0(ul&zA<fJ-Gb)_Gq<#r1V@fJw8fG$PX-tY)xyr0#Zh&ftnA4e9Lp#*Q
z=m~QZ&DO{|GG1Ob`WmG!I-f<C$ygkB!p~e2D%Xt_8foLAC7a7EdaulF)YA!XEMM$J
zrws{**yxOKl<>K@I~T>rqwX6#j+5@&QT$dMBQRQ_vGh5&#m)J+?(rm^KNh1jE(q(Q
zo)O9x!fBK63nWx#G+&{-B#DocMWwV&P)_ATA&YjZhwosx%1e<`)FUxW_&HI?R0_qL
z1LsCbr!$#M+RkT}eOhfRa-C7NXWJQdvguYkMaa>~i%x4ZW5V;Iv2=cEaqDQh?YMDT
zD@O`TUK?TWj#iPe5K^7s=|C7uZsAhzY&5?W=O^!zi569=GpX`~&tH|Uv0V6Djm~N_
zv<X+EscRSJPVnk;p{e+x1>S8nw!HxSozp*b{kF384*Y`|J+!yLkopL(ZBOH0T|F>p
zTY=S+xIb)Dv1}kDFIDv_^wg_86}=f_aiJ=!2L*K_Y9R1ljHqSul4V*t%~FYzWvOsx
sBU5-J?CzgTX}qIS`A^&pp^?@*sLl}P(5u9TV*S?o4=mFqQsR2q|57)sy8r+H

delta 625
zcmZvZze~eV5XYZwT5YYi)`E*d1VKe2iLw3&)yYlK>flllVohR16KT^54%W$~LxrG|
z;vxtxE{Y(6i;K9lgRB3Co8K4D%_HCY<nFz@caQhp^%<*urG;|_%Rv3m3p4<2w86oe
z;4s)CeuJZk2SbcSz(r61SBdK&K31T36AU9RQr-f2-R^I`#tvw~BOcO*BjO3zfr3+z
zH)?<}&<D3M%oR9=ID{!iz**uJ$Oo&#@dM9@7a&U5B`B~OW7m|pA>IZHjNK9MDgQux
zqWm-Q6^x?c8^s^QCW!fh!_y$&!!Pn@UHA#-;rKM25PyO=ggVv>aqEGS5WjH>N<jZv
zHznKsxzKUau&o`BnReA+rduibPPm>`Bw3Y|tf;7(G9$^8vK-H^NNYybF59jnE$E)1
zi4(FC?31TOS=H36KQ8oTOug(@JXg$_0r%0-@GW5|np<`qW8QBGg~XEXSQXtu3v16G
Wi#(=W+jCjbc8c)2S91MERQmyMZ%?KG

diff --git a/django/contrib/humanize/locale/gl/LC_MESSAGES/django.po b/django/contrib/humanize/locale/gl/LC_MESSAGES/django.po
index 521bbfad73..448a830073 100644
--- a/django/contrib/humanize/locale/gl/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/gl/LC_MESSAGES/django.po
@@ -1,42 +1,66 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# fasouto <fsoutomoure@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:18-0400\n"
-"PO-Revision-Date: 2011-03-07 03:35+0000\n"
-"Last-Translator: fasouto <fsoutomoure@gmail.com>\n"
-"Language-Team: Galician <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "hoxe"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "onte"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "mañá"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "º"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "º"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "º"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "º"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f millón"
 msgstr[1] "%(value).1f millóns"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s millón"
+msgstr[1] "%(value)s millóns"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +68,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f mil millóns"
 msgstr[1] "%(value).1f miles de millóns"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f billón"
 msgstr[1] "%(value).1f billóns"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "un"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dous"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tres"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "catro"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "cinco"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "seis"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "sete"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "oito"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "nove"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "hoxe"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "hai %(delta)s"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "mañá"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "onte"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "hai un segundo"
+msgstr[1] "hai %(count)s segundos"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "hai un minuto"
+msgstr[1] "hai %(count)s minutos"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "hai unha hora"
+msgstr[1] "hai %(count)s horas"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/django/contrib/humanize/locale/he/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/he/LC_MESSAGES/django.mo
index 75463c201571d871f90337990bbdc7d6bf05c0e5..1b88063475a7dbf914d75aea605aeff05e9a1d25 100644
GIT binary patch
literal 2529
zcma)+OKclO7{@0NC>YA4EssK>!y_VTyMCmtNVfz5X-g{+5vqWYI8E&Fddqso?2hf^
zz#YM*RceLMKuc60DHk}yu}B~!PKdp6LV^PakdQcm_<!rk+D<mW#^c|7um3kQJI;^0
zhC2)o$Jj?>h_Qpj8}NnaYw!v18_VCpG1z-=Wb83;%F+WzV7~)C3VseA0>8KR&~Vp&
z9NZ88OCagI0p0{&0`XxVT7C@fh5ae`F!&XS*6b%6{~3fd`_=L{8~+0&y+5u0FY6zI
zlj?^-itn)83El#GH%NN>z*|8MF5@f?fX858znQV4;NKwGM|Ln)0u|_hSFHUVNashQ
z#6uwEy=wWk^?zyk3z$QE51JD9TOI&+!9Hqv8boXM8i*1$2U7m)*59)Bn>PNI<pt}1
z&+;S7&ush)kaVwG|F@PufY^R=C#WAiI7+rNnRU<bemm#jZab%UbsNS*7&wabp?7&Z
z#se7i9`<0|hjA|k?UT;_PK>)S=%Kycoy@xTg{HL5JFM?P5KCnDSeuQEwnWgBWBF2*
z&-p>%YxSSLdPZKB&x9F?Tb$9BzFD5l`Vrsi$&gN60{N<GBp05>2Ftps%ovG~GfKQ^
zN;TAVu5>#iFAWJE$+A|JO?qADhMrAHi+X)G^3sq{yr!GsCOL9hF&j?{dRpD2G$4Ji
zW?0p4NmfNUQ^GVu5g5NNhet*$GB5%gr(?*Dq(Z8~l&>VClh9yTVUcV}#Ug*6MTVIg
zKB1J%=!#gtcU^}ea!p&a1sNF`l6xl9=VaM9XDZGsGK_G)Tz=x5P@c}6l?@#lXFBry
zit}94i=0{Q^4!dev(8i~g+Z=!LKx}t@nUJ*DIRu8M|iR5mX0~aCyPZSI%j3eC(VJp
zamp(lc8e1Si+FM`h{!mzp-@pEj1FD?Y#`_P^I}2ikUu40<h{gr#;XfI$d`5fX%s21
zDLm=SN>O+DX*n0lHXp4S({KxgcDtQ7r07>st)wY5y8Da@jY1{aULmjwg_<mkrFt%}
z$=vjr>65+VDCLW}DXolDSmr_l`!#YNih=OeabB*8Fp_5S<=IotL@$q;S7qp&RApW9
zmFMz_Ip5@F0(#lbDIL}$m#ao%Mw8>md3QQFs`w+5yfl^@_?gEa#LMvt#`$<HUi_C3
zQr^!FcjC+21+HwZdKZ1V9k<l=hXyMnzRf!SPoTd~U;ZX{fAijckUto}SzV2>I36#?
zpTrkgYWIGYNu(2BWATM}HSWZVY3_!dm7D6WlRW;iwY$+l^}dRX4t*7UJyy5XrzQ8V
zeI1*?S~8Vw?mFI12g^p<Qu3nKX-YSWss=V<{|)u)rLJV9EWQ@omaFk4Oqb&hX)WP)
z!lJ7RA5E<`WhDL9khP9=TxLn*WwcK6R^Uq#E|L~*F_yR#uaQLeq~SS_uC#|0_7B93
BL$Uw>

delta 662
zcmZvZO(;ZB6vvNe3^TqziUsw?2I=WNLorDfRw$oYAob$S%+qv7GjAxHQOefhQY@70
zD0>Up*jbVCN)ihT8<yDl-*N1m-v9pI`QLNTJGb{ze;Lj{)dltl(Ev3=7f=hdP=p0>
z1Ga&;%x|y*c|;>B0Y||AILVv^@z6Zyi(oPGCH51bI=Axc=V_HUJmxwVY%n*$G91_j
zRihm+1WIrY!yJPB$iJ}J3wC1~l_$Y4c+5Owo`XU7S6~_CiLTkW<AR662GJ|?o&8Uy
zhVfP7N>B~f1geG+_S>0J5c3soTL-EdRsR>2cqyL7f(uYNq<(>FjPFoAq@ot8hSZH~
zpbF@}sA97el#g0OzG-ufj+;n&6nEDgil=iK63Zl9;mD7`R@^eosA2W$Ry1by8D@`Z
zh9}02DQC^ix@lny+ny8CyG^T5XZGk;Uo6_+X(Ga7cGfdyGPcO3Y%iUO=_9rfZdM;y
zDR3y|xXVte%N6mod@gCy1_tF|aK2*97KxmlK-;7v_k;JcA=FxR;ve}3<e&N{{;|I+
HbD`7^L;7EV

diff --git a/django/contrib/humanize/locale/he/LC_MESSAGES/django.po b/django/contrib/humanize/locale/he/LC_MESSAGES/django.po
index 1c22e8443d..21e3cab554 100644
--- a/django/contrib/humanize/locale/he/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/he/LC_MESSAGES/django.po
@@ -1,42 +1,65 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Alex Gaynor <alex.gaynor@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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Hebrew <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: Alex Gaynor <alex.gaynor@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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "היום"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "אתמול"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "מחר"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "רביעי"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "ראשון"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "שני"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "שלישי"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f מיליון"
 msgstr[1] "%(value).1f מיליונים"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s מיליון"
+msgstr[1] "%(value)s מיליון"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f מיליארד"
 msgstr[1] "%(value).1f מיליארדים"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s מיליארד"
+msgstr[1] "%(value)s מיליארד"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f טריליון"
 msgstr[1] "%(value).1f טריליונים"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s טריליון"
+msgstr[1] "%(value)s טריליון"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "אחד"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "שניים"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "שלושה"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "ארבעה"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "חמישה"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "שישה"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "שבעה"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "שמונה"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "תשעה"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "היום"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "לפני %(delta)s"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "מחר"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "עכשיו"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "אתמול"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "לפני שנייה"
+msgstr[1] "לפני %(count)s שניות"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "לפני דקה"
+msgstr[1] "לפני %(count)s דקות"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "לפני שעה"
+msgstr[1] "לפני %(count)s שעות"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "בעוד %(delta)s"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "בעוד שנייה"
+msgstr[1] "בעוד %(count)s שניות"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "בעוד דקה"
+msgstr[1] "בעוד %(count)s דקות"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "בעוד שעה"
+msgstr[1] "בעוד %(count)s שעות"
diff --git a/django/contrib/humanize/locale/hi/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/hi/LC_MESSAGES/django.mo
index 3176b7e3cbb6eac25c09b0e8d4dd2f389824dde7..136633afecda47feeedaac35f61bb1edd5944cbf 100644
GIT binary patch
literal 4952
zcmb7`TZ|J`7{?Dcl_JVTUGc`jb)^-iom~i*;u^zpk?6(+7JV?94DD<?(9V>Z=`K8w
zh(>w9%Y#`!AVF|eSF;FiqC%p}1CKuOWQd7Qd^5b5@Srh1`2S{3+wJu9!lb9aIp6u8
zZ@zQB?@asKviai-mx}fT+POK54bc5OeBp}EXKXc?0M~%K!5;9auzxP>KMVd1rZC>U
zAmm<9LH}LBZ@~omzk}W2!h1sh3b+dWeIVJ#g#E1G4UnFHTd?ci(9eKi5$wVEDe!6V
zCvYw3i~i#K!oCWwg#AsB;y4N-6!s;E(Ag!yX>bMlKY&kxH^I5!Ut;_YNL%!e;D2JA
zEe!q518ICANb?p8E)nC)1y_KW%2tA;kAwKIwfMS-Tx<aQ(Z3aAY!}$Ih_Q{J29o_#
zknF#JFN3S@4_O3XNB<hQ8(g}Wu{XdBxCXoqZU%3I+rgd(7+VJ(1j&9LB>OFJC%E##
zkU4NK`j^2$aNd&eIlIBt=zj&$yqn+-uxlw}L*QHB9`G`_4V=3y9N!5drR*aRp|Wuh
zOJ*0rN5Cnt3%mi6?pMJ-K+^pw`ga8X74|vHL;WJbWgzKS2zCp*BDh{~3-~Z}TS06;
zOQKPJR5YpwxM$ds;Ccw(kD^h%SFR_;4dwE2G&)lWGzE>~r`oJs*!p12)W>!Od7=Af
z&>o{3Tx-$jT=Y<9)<rekjrQCu8@86A3|JhE*17-<X<}Fk<7iZew5PP6RMWFBTJy7L
zlta2uZox%o0!Ih|#7DJ4Sx+Q;NBDlDP%tdBtu3o(Bucq8XIVL`Q0G!&DoXsxY^G&O
zlya+;aV1*0^-x*M+7fkhyJ5<_A1cf3j$V?<o0<>H)l#!73%tSTG-Ow1Y0RO+WwuBP
z9o}GwX3yb`md3m}TxM&`nZso^S+*SB%-WbK(#ouoG&#J9u^~mIlo%xms+u(Hm05Om
zuH`J8oQzdA-2`nQ8J)mdm5kU{5t}w9(N%{ugpje!Y{Xw^toRd>>ZICpE4u2CX7apM
zwj=JyB%F!y>V%rFP*fezja=SkBgUxCMlhY3np?KDf@>7@`91NhUT`%moVGzeQgviz
znQ53hqn)roJIfq>R5zJp9A=Ko+&n(Et~1xlYDe&0v}_w%cg$i(bjQ_gG7s6-0X^d?
zyRyn_y6xaynC9CKXlBle?a@n??J9##&d4fT%Q;6Gw$eN{^y;uOVC$L-t+GvX^)&BO
zd;1i1ozlCWt7^J;v!ZTPRS1<m`lvxZBRUnjP3gW3YgAmZS2V{}hHcGs3Yu%#X+DtG
z%q({NV7aK-{P|4S4SGp+^E!3?#usx%%_t-@R`CT)H*;kzrz^v{R!sAk3^Qx+c;0nO
z=~QZLY%J-LYhy$|oHTVeRSFmEq)Mr5u+CILI7sD<RHEuG&GSZVaM$4W+P?HA)!2Y#
zy1I#YkCd=*7j>R06*R-#!V#wJ=x+bM;T_7RnvNbmqT9-LGh<~9GneL@_8V?&s6bg)
zc35`NNprIlbe;abEj+yKkDGi|KkrS%>V8OkZ_4+s``&c$ecAUW?{4@Df8x0BUG*p4
zZsDUN(J6o8gztsl(~%%rjeXNP{x-vt!BZz&`{+pYiSLd3o)_`NBP;1l1xHtcz%KaS
zkKFgZ_q}&~?_|VRr>co#zK0}Xk+Y+F50+?j<9_E_<Qz`Fu6IfW6m@!+Ld5VPRa9ND
zlEMt#cB(!}JL*kEb}(vnu-8q`L)*bNWlr-ukjQJDCO02xTI4jX<zSoAruiL6+Eq2V
z=|t16qRCHZnojCC^wz1egEA(EcO`3Iy)~DeX=N2%u_3yTv422V5_ln;M+Zmv8oj(H
zj^lJx{wOuq_#WOIQ(~num#khP_X&}RrFxF>Ho;5o0$etUsI{{GsZHIth%V~C7USt4
zwDZ0<(>%J0X5x6grb%2Cxi`}yqKXKq@xAwb?=t|KGvj-BrJq6POwhT4#8v+2MRu=d
zo|QFB#LJK#jI;d#fU!&X3CA5Jr8ayuaPPrz7DWQ!ZvsvGF0dcNofrJ_PvQ>Yoda+@
Xrvbd^PKX|l(@T~9AmHa`Cc*v(?h|L<

delta 567
zcmXYt&r1S99L1;d=cZ*s)FEOc=#mS&m?9!|>6Ub<L(pl$RhMKHU5zez=wc9h*b0IU
z1qu=r6$GB_(zQc}APB-gpi|c_y;;9sc=MU}zB9A4^SSilt$&AI=L|Ik%|UHw28xVe
zKs7)&cmle>7V!)mg})?!1&+brP~HK>zAokWls^%lhy6P14JWJ*`mo^@6bHS5e()X4
zLtl^wejUvKxB-g(4k+?HqCqSX4?wZ*h<t<Ca`HN37qsA-8n?tpVh^0g0WTo#;9L%H
zUQB#g94?6fH3@m0+3<D5bez2SIq`xa@)MwY5rg=fpa^v%m$z8fsOc<Qtd^OXVWwf~
z_Mh)Kq$z4t(PFX|O=<~6U9p?~*)=Cr<Fb}W#^TE=N=oyJrEHhESt)R<SWe0nZf117
zRN)q{74&^xmQx}+L}35;7d)xWqN%UiTheYI&COhu=k%nUH|#qpVmHI{!9n|B(C)KA
MyF2Kd+P~rKKcEd(jsO4v

diff --git a/django/contrib/humanize/locale/hi/LC_MESSAGES/django.po b/django/contrib/humanize/locale/hi/LC_MESSAGES/django.po
index 268bde6913..2ccb2bb203 100644
--- a/django/contrib/humanize/locale/hi/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/hi/LC_MESSAGES/django.po
@@ -1,100 +1,296 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# chandankumar(ciypro) <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:18-0400\n"
-"PO-Revision-Date: 2011-03-06 18:56+0000\n"
-"Last-Translator: sandeepsatavlekar <sandysat@gmail.com>\n"
-"Language-Team: Hindi <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-04 08:26+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "आज"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "कल (बीता)"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "कल"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "वाँ"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "ला"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "रा"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "रा"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value).1f मिलियन"
+msgstr[1] "%(value).1f मिलियन"
+
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s मिलियन"
+msgstr[1] "%(value)s मिलियन"
 
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value).1f बिलियन"
+msgstr[1] "%(value).1f बिलियन"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s बिलियन"
+msgstr[1] "%(value)s बिलियन"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(value).1f खरब"
+msgstr[1] "%(value).1f खरब"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s खरब"
+msgstr[1] "%(value)s खरब"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f करोड़ शंख"
+msgstr[1] "%(value).1f करोड़ शंख"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s करोड़ शंख"
+msgstr[1] "%(value)s करोड़ शंख"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f कुइनतिलिअन "
+msgstr[1] "%(value).1f कुइनतिलिअन "
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s कुइनतिलिअन "
+msgstr[1] "%(value)s कुइनतिलिअन "
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f सेक्सतिलियन"
+msgstr[1] "%(value).1f सेक्सतिलियन"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s सेक्सतिलियन"
+msgstr[1] "%(value)s सेक्सतिलियन"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f सेपतिलियन "
+msgstr[1] "%(value).1f सेपतिलियन "
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s सेपतिलियन "
+msgstr[1] "%(value)s सेपतिलियन "
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f ओकतिलियन "
+msgstr[1] "%(value).1f ओकतिलियन "
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s ओकतिलियन "
+msgstr[1] "%(value)s ओकतिलियन "
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f नोनिलियन"
+msgstr[1] "%(value).1f नोनिलियन"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s नोनिलियन"
+msgstr[1] "%(value)s नोनिलियन"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f देसीलियन"
+msgstr[1] "%(value).1f देसीलियन"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s देसीलियन"
+msgstr[1] "%(value)s देसीलियन"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f गोगोल"
+msgstr[1] "%(value).1f गोगोल"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s गोगोल"
+msgstr[1] "%(value)s गोगोल"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "एक"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "दो"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "तीन"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "चार"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "पाँच"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "छह"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "सात"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "आठ"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "नौ"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "आज"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s पहले"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "कल"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "अभी"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "कल (बीता)"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "एक सेकेंड पहले"
+msgstr[1] "%(count)s सेकेंड पहले"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] " एक मिनट पहले"
+msgstr[1] "%(count)s मिनट पहले"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "एक घंटा पहले"
+msgstr[1] "%(count)s घंटे पहले"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s अब से"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "अब से एक सेकेंड"
+msgstr[1] "अब से %(count)s सेकेंड"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "अब से एक मिनट"
+msgstr[1] "अब से %(count)s मिनट"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "अब से एक घंटा"
+msgstr[1] "अब से %(count)s घंटे"
diff --git a/django/contrib/humanize/locale/hr/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/hr/LC_MESSAGES/django.mo
index dc59c029c98e3b2d88443786fd627bb34855dbdf..9924896e79b5e571dd7d3ba62c6f7305e8e02f32 100644
GIT binary patch
delta 319
zcmX@Z)x|wwPyHiC28Ovz3=ED83=9n{3=FnF`Vf$|1kwzw3=BXfgB6fw2GaIGnjJ_x
z18JZZ25%q@L=1jVIs_^n1?9&=>13#QCX~(r(jfElSsCQO1{6aTRzfA}fixRXLG$KF
z#vVpfBV7YyT|*NE0|P5VOI-tV0|TxAf8C(evdrSl{5)Nk#FA7i1tSAPpgJRvIzwYC
z1B=O0%yMi#shKIMIg`zq_1rWvN=gc>^!3Zj%k@f%67z~P(^4z+@={Cm3ySiyQj<%H
r^$YY<vJ&&s^YwFpWNBi0s(wb1z9yFslxL-oQ8YQ7IePPX=2}Jop)5T4

delta 257
zcmeC;KEpL(PyG@`28Ovz3=ED83=B>z3=FnFx&=sE0_j6Q8i*MF010Lw&B)5Yzz(EY
zfizGH122#UA_f5{Ed~{rf%4^{v?^3w8%pZ|X^?q_tPFBs15BX`t)UW*K$;Dxz;$yZ
zV-KULp{{|ku91O)k)f4=g|>mAfdN;5ziv=!S!Qu&ex9yNVo9o%f{}qCSe=21f}w?#
nvE^hbX1U4s%(_fAc9S<TNAvh3=B1Y=rUO-G6m8~Vsbd5H?7t$0

diff --git a/django/contrib/humanize/locale/hr/LC_MESSAGES/django.po b/django/contrib/humanize/locale/hr/LC_MESSAGES/django.po
index dde4e4229d..2607fb8ddf 100644
--- a/django/contrib/humanize/locale/hr/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/hr/LC_MESSAGES/django.po
@@ -1,37 +1,52 @@
 # 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-20 21:08+0100\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Croatian <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "danas"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "jučer"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "sutra"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -39,6 +54,14 @@ msgstr[0] "%(value).1f milijun"
 msgstr[1] "%(value).1f milijuna"
 msgstr[2] "%(value).1f milijuna"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -47,7 +70,15 @@ msgstr[0] "%(value).1f milijarda"
 msgstr[1] "%(value).1f milijarde"
 msgstr[2] "%(value).1f milijarde"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -55,50 +86,238 @@ msgstr[0] "%(value).1f bilion"
 msgstr[1] "%(value).1f biliona"
 msgstr[2] "%(value).1f bilion"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "jedan"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dva"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tri"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "četiri"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "pet"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "šest"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "sedam"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "osam"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "devet"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "danas"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "sutra"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "jučer"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
diff --git a/django/contrib/humanize/locale/hu/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/hu/LC_MESSAGES/django.mo
index 6dce9967c03df1e2e811f44d3299c0a50d2a5b98..5b9ef54e45987806bab7f54a6ae378eb4da62131 100644
GIT binary patch
literal 4002
zcma)<&yN&E6vs=&9}NCP{DFWL$jYwJJ2Q(vU~tt4OGF`VHml)aVw#!So@RQghOX+}
z9W)_gjEQIr3W<p(W(kRK@gNBvJb0Lpcp@>;tNsBd1`j42jPd)XYkqc(QrVi%)c3ur
zSM^@^6#Tk&)mer%iM|p2qnj9;2LHYpA86NZVQd@tC%7G4zlyOja0Vp329o}n<qu#U
z<KHbe+{&1T@vD|ia0276!N<X$Kw9T7a5K2+wp4!sB)x2T3ZyufEPn%Ooi(?od>S0X
z_$_b?_&&G;ykN(_*ztAnG3aA=r1NG#gk}oFmRVwX9HbPSu;Y^;Qoug2JZ0^lfHeP8
ztAB3wFD<{a_H&jOK>V?9@ImW+2d)Oc2hSt-S3o+~(Hvtt!80J8>qpB!K+5mBHK~0c
zNO@TXY2JB|>{mg``#<1zaL1jg{V+)OlOW~$TafDTGe~~dt$piVY5wOyivJEs_H!V`
zxeC&}>maSS@$NL<L2wVo$HCp;Wv~cd1Icg8J!!t?Ksx_nJAM<y@!1g&rDYY6>QMv9
zuVL-R>Wfx?+v+DQ-vw#@dmz>CLp%Q1@{HvdAjO+Rr*qMn#?d<s+igEbboTqvA3~@1
zV+Z=f=xfl|qf^^}PS4b8bd-l->2_OdNqE41r)P!oPL1;SAo_hYKzjmx8@he<*d`Lu
z9z~~ItfK+ilPMS;<#vrxvUWo$+GpPiQqCSh$K%8}I<<T0V{ClUj}kF4SzO>p!YB%r
z{9mmi$_`Jr8YmU0XkbZ)RClcB(xj3OPq(Vd#^LK$k0pL3c6g80L+M)mSmM^TXt>-*
z%FAwVr)*ps&xkrxU6+!rq2?}asDzqlgyHIGo>j7S)7+(HYo@tNb5%?8QEIkQ<m*x$
zWzu|vm?;r?Iz&f-x{{Av$;1fm2MTXaStZg;Py$KRZMEyN5UV<pw&d{ZntW`btYl?q
zy;SV1XI;9JdT~2`U6U_)RVDGzawOTsti3y-w^r)ZHHa{%8nzHF3bughOjei-rC@X*
z1;!Po#iEc*hs#VGW~%s$g<wWi{3br@Dvsf6mK19WZA47+Y^;uovhfa7yf;Lw@sn2K
z`;PiDP`NqLP_gk2=^(6lFC~HY=2eO3W?!54_Qt|D@b&ijMwIwep*ZCgc6!C9c%e`#
z?)D1L77B3m=EP!1YYzDpp5et}X=>;80$T2%uZ=e!`%*`~QE`dC(pr&9^V!x#Y?99@
zS@WCxIYS=df>?gBitRQ1Nh!?pm@I?D4}>=_{CbJMoXEhBLu7rtYD}Y)&o3=4O?Ic!
zoO~lavd%a1mG(*VkzFKTP4W}nB}=@T<PIG;G}FsWak7xxtE3SUJ8m{`bb|*r--!HB
z?&0OCA8TQzU!ULa?dti_z86I7&B(H<gfb}cT}MKbn~jp#kG%aVuImz)jrLGaPwnC9
z*XeP|H&658M6P=y;NEHfGPG7u?9OfE6zPhpE!r1!!2Q21L%&VrJS26)UCQpDCk;lq
zQQclFj{T0Zw6EcezgtazGg^b2af-FYPP{?qQMz5EzbcdfhkPR{?^M>_1MTBE#h#<P
z)_TM<;JAZ^s@w_PJHJcmMeX++rFL@KpC;O&ThG?eUcv*_)}18xZy;0C{wV#9z1aP#
zqio$UgL_Z+*gv<Uh@i<EA}*Ij#KmzDT{&$G-j~kxlratZCkDTOPWRM8-u2dsR+Y>`
zy%-}LTyuxx4NvVwZC#36EBIHi>rh!6#p+Xs!(>ddsiHD#T{cX%E(T5f52F@FLY7%w
n;X=b|P^!2USk*W9N`n>L>8$Rvs*0rFU^QXPmD9|KfJXlUH^OX|

delta 655
zcmZvZO)mpM7{`ac=vJ$xjZ{LcLnBfvyGl}<rg4;VK*Xgq*|1inw$hhKBvKrR^guGW
zhzM>HadG41<j5Cra`gek#edf0=E?l$x6j+mGui9jXQ}?);XY-sDAWx-K|Rny6E@f@
z*blxDzrX?bea(z{z)8>z&JgE8ES4ib54zwlQQQJW-`a1y&Ne7fC2mr|7I6pkp<y2s
z2OWVD$iYPna{-EhzLAWBaZHl{CqZ%1CMf#0$=?Oh#tuL)t21^;1;>;)0kPN_#m^~z
zNxTBR$lrjto86LsM|>bYg5n}EL<b~##6$iph!58^HgQNRBz}P(LLZAj!rGw_Bwieb
z0?>cfM!^>T=}Pg2JL>4g)6VZbL0<C3c*D0B))Y0VXrr>0)U}kNj_@8SmUDvYh^(db
z<XA$5`KOFZRhcUrcBN=kOJ!Zo8n#`i$munQ<3+QuY!-(K_DU&(V%w@2mZ{8{#=0&~
s)NIQr7YtiYXZVMd3;gAEd9}tf{ydjjBaX6xHa-~W<g=kJz7ZP!0Zfus#{d8T

diff --git a/django/contrib/humanize/locale/hu/LC_MESSAGES/django.po b/django/contrib/humanize/locale/hu/LC_MESSAGES/django.po
index cebed0d409..ce5928269d 100644
--- a/django/contrib/humanize/locale/hu/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/hu/LC_MESSAGES/django.po
@@ -1,42 +1,65 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# János Péter Ronkay <transifex@hangya.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Hungarian <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-06 11:23+0000\n"
+"Last-Translator: János Péter Ronkay <transifex@hangya.net>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "ma"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "tegnap"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "holnap"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value)1f millió"
 msgstr[1] "%(value)1f millió"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s millió"
+msgstr[1] "%(value)s millió"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value)1f milliárd"
 msgstr[1] "%(value)1f milliárd"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] " %(value)s milliárd"
+msgstr[1] " %(value)s milliárd"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value)1f trilliárd"
 msgstr[1] "%(value)1f trilliárd"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s billió"
+msgstr[1] "%(value)s billió"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f billiárd"
+msgstr[1] "%(value).1f billiárd"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s billiárd"
+msgstr[1] "%(value)s billiárd"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f trillió"
+msgstr[1] "%(value).1f trillió"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s trillió"
+msgstr[1] "%(value)s trillió"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f trilliárd"
+msgstr[1] "%(value).1f trilliárd"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s trilliárd"
+msgstr[1] "%(value)s trilliárd"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f kvadrillió"
+msgstr[1] "%(value).1f kvadrillió"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s kvadrillió"
+msgstr[1] "%(value)s kvadrillió"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f kvadrilliárd"
+msgstr[1] "%(value).1f kvadrilliárd"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s kvadrilliárd"
+msgstr[1] "%(value)s kvadrilliárd"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f kvintillió"
+msgstr[1] "%(value).1f kvintillió"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s kvintillió"
+msgstr[1] "%(value)s kvintillió"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f kvintilliárd"
+msgstr[1] "%(value).1f kvintilliárd"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s kvintilliárd"
+msgstr[1] "%(value)s kvintilliárd"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googol"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googol"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "egy"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "kettő"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "három"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "négy"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "öt"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "hat"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "hét"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "nyolc"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "kilenc"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "ma"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "holnap"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "most"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "tegnap"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "egy másodperccel ezelőtt"
+msgstr[1] "%(count)s másodperccel ezelőtt"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "egy perccel ezelőtt"
+msgstr[1] "%(count)s perccel ezelőtt"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "egy órával ezelőtt"
+msgstr[1] "%(count)s órával ezelőtt"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "egy másodperccel ezután"
+msgstr[1] "%(count)s másodperccel ezután"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "egy perccel ezután"
+msgstr[1] "%(count)s perccel ezután"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "egy órával ezután"
+msgstr[1] "%(count)s órával ezután"
diff --git a/django/contrib/humanize/locale/id/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/id/LC_MESSAGES/django.mo
index 24a8dfd91d158738a9cc6b2b12275d8f8640bedf..cebed926469beddbdf574a3825cbf984bb4478b0 100644
GIT binary patch
literal 3503
zcmai$O>7)B6vqwyfGiYB3oYfVrXe(GI{Q(elr2RSX)8sdqLh@LI5<1b#Mv2pJN6`v
zP<x>lBqR=iKq{Pi=m{Y>zzGS78(ct~`8aSxLWmyVz=8kU@ox6R5mvmv_218L?Dsrx
z^YgB)?=!SI`XlHc-Nx7)ecyr)wCSyk9Rz2<S@0Eb3cTX=8(#m;^KY<*`N?f1Uj-wK
z-}L+poWb}Pa1xx@Uiy!~$1%PDlD_8k>z?0$^!(pF_uf(Zne)uRDa?NW9ss`r4}-t@
z@s2yoaUI+b{dJJ`aRtOy*i8^yXP<a}4(`MFOYkx92k>_APd|SPq!9h%`LCa66Q#c`
zAk9yJv~GvzPCvifb03JMY(Gf$(;)uXVSK!cTpR^=Vf<}{vHQWFKpOuA?gY2pRqA^@
zXTd$tPkLSiAHZ1q@ilNa#@9hw|0ziRzV_oE!Fw?N&Fi;3x8GepXP;*kBtLV0d=b14
z;}oR0T?HQnKlI}-{P=rtFZ4gahr#VT7(<HK0g&Q<2&8<}K=S_#NcQs}#ZiD1uh=sK
zY2B)ye*>iTSG|7C>u-6!?e%v+^79@@_8)^3{~I9f=O&2ovno2-(fdK?qF7OUs8K#1
zM5p`SYjkF6<crQn@6-%>gpRA*y_-O{;SmgB=r+p5tpEN5_>lj87^L@N%8z@XJ3NVg
zs3(9Ff24~|qthLtbKQ$hapdR}Ke`(fPrB2Cjqb>k=m))s>(y-(TZ#vpnqC!YA!n+M
zCBCTAR2luhS}a=u%dnallbCeKWkAXT{z95II$#-AP0Iyr!|J6%#CgDab6x3>_e(`s
zx3Uv5-&DRFwhqcJwDB>~j%7EbjOWnukT#M+%g2P#>{&jpjOWerkT#w(%R^cyTb6I8
zj%SK&Luw#RmTw}CrHCv8Vjw|%Ng!6baFUC};LT~7Lc19XAc?lC_Dz;@lObqp0lWT`
zz!q9Y$0PnqvFFd5^cQVBw`bR%5}GfYA|G)_l6U6k`wKRFl}7yusgh;Kmei_bOIXgd
za78Xsr!u*9YC4vw6F4}9Aw1J}q+_O)mW(1{z&vJFu1d|Uy3DL&ZW({Ml+2k}tm88?
zc@A5*X4ty4PUa+^%gu^xxoAF)UX!^+Eo|~rD?%rxa$a^!?xM3cQE~KQk=SU#G<oIR
z%L~z5E`@__bV@kc<VWg_BT@aSsPQzf*PD&!qWZJ-It-)pa#fMf5xe?PENM25%+}E=
zFA3|Sg<NQx3TN^r&rPf}e;#R8%Oa1}y3o#?OfsR;YRhCVV1-T!k;rI4imb`!b&LR5
zg(OWcJJ)H}YHMq2RYxw>lDu5i($zZUL2a#5i@WEmrQS<T#kHBf&n8!K<?Q^~(;M+<
zRO^*Fqn*^)=XwVRcDUcQPAZf>&Rf`{mF~oag)`By4Lf@HlFXyix<$uHn*7+Ja+Px_
zWji`!^2|25?sSLtMB_Lwzn-X9hJHCvLe@n-B*i#ts*2$st&wU(zilgp6GIETg=Tc2
zX`}FtitX~pVO;Lkicz_&3*&0r23*rCzdo?}Zk1F6N2KyQa=<{b9Xgz^p@Ta>xg0&1
z<$+_7ICiLBsT+1^<=BBNr{k1n{hB4UavXOy;VJ&l7_3s=nONis)u}CTLz02nSUS}X
zt}ACYTel*z;40FG*PytFj?gSsnP4*O2#3e_D$d}Bd)n}F6dWrv{Ko_r{ry{%FDgB*
iSSgm7)FSKE9+e1&S3_~76<d_nv{_sT)|MGW&He-D#dkLV

literal 1161
zcmaiyTWb_C7>1+P(|E34T8I~-MN(&Mh3)i!*n?E9u4P+<N+I3J&SpE4EJ<d!D+qey
ztry~@|HL1mf589IJKwBnOJ%_@U!LThH_7)+=J)v6H-dHxaU1aiF@bn@3LV-{@E-Up
z@Bo~|{LX1Y&Vnz%G4M^`7Kn#zhxrb82J>dnbI`Br1ic${7uXN)-v@pKFTnp9^!t1P
zFM?meZRGMD9LM|sFRz1_k<3kS0z3~UpwDj>oj-RG#1gU$`hA~)ct}0yo1pi-4f;;d
zn}MyMOVF=Zp!fGdpWg@2pZf_!dc$`<zjFxhKWtYp@P41mC4~R}5dzDG`2*wz;u^x&
zJFE>H)vgB7pG)rE@A0A%lT%5H?#iN&TK!imNBBl*&Wtb~i9+UWM_RHcNK03SsEjD7
z1knhS5i5E^5i9qJb;Pyt7$Jz$86Ti8wK2L+Twjxcuud2+*NyIorekXv+Y-j2l$0)a
zxXN|3A-dW)wr+Eov8PpTSwp8Zs=scqB_p_lmo0NAQu-)P5*AOh<S|XA)1=1YnK*`#
zZHS)qd;a5#XJ}GOr)M9;Xwge<9cvh_Y{8v2DSghBl9tXR4e&`JWG0F!sakpwW|dbw
z7px(8nbI|tp>`{|qVumXT8!4$)>n>8Nv7gxNh>E5ju>>2s}uX~VYlE?&CzC?8!Ozx
zW@DArj(t9rmN0BZHFYLcp3>T`bVo<0RAy1Vs0=UIsy3xfsp<}=b|IOge}@ZkbmE`D
zT@Sc9A$2OpPYC{+2bChImUp=#g)BJ{WtTgD(N>iB*&ti)Du3Iq>Qrqa6fY02Tjrdg
VBuS-`WLH?dN3x2OJyAkb<PY&G`g8yQ

diff --git a/django/contrib/humanize/locale/id/LC_MESSAGES/django.po b/django/contrib/humanize/locale/id/LC_MESSAGES/django.po
index d2e74092df..f7d994f5a1 100644
--- a/django/contrib/humanize/locale/id/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/id/LC_MESSAGES/django.po
@@ -1,97 +1,267 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Indonesian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-06 20:12+0000\n"
+"Last-Translator: rodin <romihardiyanto@gmail.com>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "hari ini"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "kemarin"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "besok"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f juta"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s juta"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f milyar"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s miliar"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trilyun"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s triliun"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f kuadriliun"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s kuadriliun"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f kuintiliun"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s kuintiliun"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sekstiliun"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s sekstiliun"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septiliun"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s septiliun"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f oktiliun"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s oktiliun"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f noniliun"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s noniliun"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f desiliun"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s desiliun"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "satu"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dua"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tiga"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "empat"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "lima"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "enam"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "tujuh"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "delapan"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "sembilan"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "hari ini"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s yang lalu"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "besok"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "sekarang"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "kemarin"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "%(count)s detik yang lalu"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "%(count)s menit yang lalu"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "%(count)s jam yang lalu"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s dari sekarang"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "%(count)s detik dari sekarang"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "%(count)s menit dari sekarang"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "%(count)s jam dari sekarang"
diff --git a/django/contrib/humanize/locale/is/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/is/LC_MESSAGES/django.mo
index 4bdc50cbd9370d5bcc206731cd870c4ba591c5e6..907c8eff2b53a9ec689c1344ad9f815bd77879c1 100644
GIT binary patch
literal 4217
zcmai%O^g&p6vs<hQASV%6!D8fT-g<RK9=vnC4?_SbOXXdVj_oTx~8{xXR3#;>isxy
z^615w7-Q5JW1^=`P!o+LdKoUpc<|!UkFysO4r*f5|C_Gv>FKVGovrzG{okusRqu6o
zWq;Z-_7=lcM|%S8y}KAYMfdCQgKJ`pu|41<xEFjG90zY0{Uf7)XZQzLgMIfs2`_;T
z`mY&&3QnT`Gq@Yvus(_JfV<GY43fTN^mh&WAkF`q;r4rzIHwG|;5h7WgHMBBgZsc=
zOn=jTNxu&6gnkvIb=&~46!r;-rL$GT&%hn%e+fPX{s7(${%-7dKuXb{hJPD7+mOUt
z2a<gQNaHpcZZ`I<hC4tEWjjIgp8)a4_TlFP)Z!3G`TViM*kN$}{mDL$gOm>s+z-A1
z9tCfM<o^#yd9Q9{>>&6m*Z|)ItKe;LFL(!}@jEvq`M(72K|cm5&if#Z{~jd&bq^$Y
ztAP~n70>}+2Wi|_;1u{PI00^ZFzHW&)bD{5_Z`D;LCXJMAm#sG5G7+{n;Clu+z3Kq
zPk~4WtAgZL2Wi|v(?4eHCrtk&Ncnuh=r0=1fOv%1dBZCpQpK)<6fXcN{~<V-5BF4`
zIvPC>ThOqz!L<#)kD}F*?%?-Hb5C<Wjz;g)BpT(2=A~ydy^vCd^bamfH^?t_o<Vzz
zZgA~GqxWK*I=PFU;oWG@<uu9{?S=A8d!YSL?zW<FG<psnLEDZ-&vgEJ7@cR)sD^am
zaT{EeYpMqupICG|v6!qj+WcD3=>(ztU(FLOi>F=n!_W^qBOxtP*AmaB$xvE6?P}Q4
z7GJx1J$Ajw;=Q&WNL%#lv0Yc9XLDauUbcH%Wo=t{NmQlk+LUq)6}M@H5-MI2iq%uR
ztd#4fxJ@h9OmUlLtCr$xspU$MuT8a-N%1wrQi;gZB3cTRNiK3FV=cJrhj?>ZVJ!6|
zC6GilP&1cy6n2rcC5vBXa<PO~D7`|wL`>rumu%2*-qbHMxsuO?aa0ILk_l$)*??iJ
z#3?g~z@O8s9V`mg#&9NG9Y=0Q2VF5XKH-UucCm3vgWZw^k{*+R6pS(vf|19RSQL_}
zV3{e+^c?;oA(#$5cLl%QFpA)-mqNB8lok=m7ou=pw6t^1bFPR;;ak|`r{`Vihn0(>
z7e?BdQGVb#Cu3hZvtg50E}WlrPDR4i@O4hRS~U4oy)os~_dAUPyk2iMjym<j^*S7#
zi()aLm?M5uPUA3d9BCdnw6~6{@{+5xGaI>5bzB`rP435DH<ljK{d{&?y*BSgGC1LP
z-Jnx#h27&AC;iy<g)=MMZj+yDiH<A1pv5QVwC*))wWXz{s;0O>TP#<l(6wH&TUG1T
zyul`G7%~V_3sh|~3)$p>s?405IWtU3qgt<=3Z)hji(Tnq*BTFbt=Dk_d5pK_+(-#M
zeR=k*b7bg8leb0WoRO{23#8xVN3I3Ba-l;dcg}`US2elp4Z3Q2>KIRMrza%eHO(87
zm620~J}1aR|0W)r{2`X<?x?=7n7rDyF(bCZxWbo>&Pj_jn6>};=-HWy!5S+m`e)04
zp)|(r-=q({effD~Vf}Qd+XiKN!GG`-nlCObQ`cNqam2!6x~TGQl4zFV4Go1=WveYz
zd!Ua_keoEdE$7r+XvMRf7gkfSjEpJNe~r^`B!_1D;!3mG^V!QyUG`6tYFTdHG_qb>
z@{-ekkfjmdtkBs@rFf?0icgD7CoC>Lr;m&nRySA0G(2r+WF={7a|=l&L~XA`LBzZL
zRoTC#W3KwE7*4NWc3K)!H?xVh&JAHnw>%(?t;9nA7CyY$_@QfRD#lLrQtZ@_#$M>e
z3k$K*_^_Lu41?!vao0r3X{FdX8}icsP-_<_YPZYUcmk0m<Rm>v(=4T1H#+`vl>OBh
zKewdIL?9&;HQ)aNXXr9+tE~S`)L%vLRqnYy!`bO$<*tu1>P3Mm{Qk!{K&k&9qV=n?

delta 675
zcmZvZ&r2IY6vv-+jqWC`@dqeq=z1ze6SE{jTtf7$K`Mxsl)|E$WJ5BM%|^jX1i^y`
z6$g(Zf)^D*h=>Ql!$QyMsV5Kp2YQws+V8B>TOa$K&%E#KoA;J|)qkq3mwx4l5QESt
zbPvU#uN_zrkKiZpN%9r^jC|}JQ5QH5D&V5zGKhx?GXDm4B43ey2^4jeH@`(|^1zea
zkS}aXZh<{0*a5{w`=APP(84gs;3V=tI2;EjF--z2fTGbZC<Z*h(hVMgD5K-RZxNjY
z8=^CLa4z#pP&B-j{*B}<7=nK%`2dEIe+NawXHX3I0~C#f*AIyr@ge`>JvN<rEck%n
z0`Utp2z4|7iRgoRA#q_8ia`I155nYQN|yV|pwMBck3V)Phaq*yc1mTBiq5)C#d^~v
zwo1%lHviqT9W~;~RNR=-jg)C*;>k4MQ-^bbnM~_O#!O9*ClOlSYIyM_*J6#T<<(tN
zpR*Wq8hW-8aJFhYt9CWvuwtG6Qb$7Bg*vly{EJqI<SkZeS|!`mod&<q%6u(6!L>;2
fqu*wZOa7_nS(vU?qhiHxyRZ_({HrE6qceX2k7;Dc

diff --git a/django/contrib/humanize/locale/is/LC_MESSAGES/django.po b/django/contrib/humanize/locale/is/LC_MESSAGES/django.po
index 4c847f9eb6..ca6c99f3aa 100644
--- a/django/contrib/humanize/locale/is/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/is/LC_MESSAGES/django.po
@@ -1,42 +1,66 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+#   <gudmundur.bjarni@gmail.com>, 2012.
+# Hafsteinn Einarsson <haffi67@gmail.com>, 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Icelandic <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-17 18:46+0000\n"
+"Last-Translator: gudmundur <gudmundur.bjarni@gmail.com>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "í dag"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "gærdagur"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "morgundagur"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milljón"
 msgstr[1] "%(value).1f milljónir"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s milljón"
+msgstr[1] "%(value)s milljónir"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +68,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f milljarður"
 msgstr[1] "%(value).1f milljarðar"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s milljarður"
+msgstr[1] "%(value)s milljarðar"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f billjarður"
 msgstr[1] "%(value).1f billjónir"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s billjón"
+msgstr[1] "%(value)s billjónir"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f billjarður"
+msgstr[1] "%(value).1f billjarðar"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s billjarður"
+msgstr[1] "%(value)s billjarðar"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f trilljón"
+msgstr[1] "%(value).1f trilljónir"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s trilljón"
+msgstr[1] "%(value)s trilljónir"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f trilljarður"
+msgstr[1] "%(value).1f trilljarðar"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s trilljarður"
+msgstr[1] "%(value)s trilljarðar"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f kvaðrilljón"
+msgstr[1] "%(value).1f kvaðrilljónir"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s kvaðrilljón"
+msgstr[1] "%(value)s kvaðrilljónir"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f kvaðrilljarður"
+msgstr[1] "%(value).1f kvaðrilljarðar"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s kvaðrilljarður"
+msgstr[1] "%(value)s kvaðrilljarðar"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f kvintilljón"
+msgstr[1] "%(value).1f kvintilljónir"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s kvintilljón"
+msgstr[1] "%(value)s kvintilljónir"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f kvintilljarður"
+msgstr[1] "%(value).1f kvintilljarðar"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s kvintilljarður"
+msgstr[1] "%(value)s kvintilljarðar"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googol"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googol"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "einn"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "tveir"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "þrír"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "fjórir"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "fimm"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "sex"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "sjö"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "átta"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "níu"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "í dag"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s síðan"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "morgundagur"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "núna"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "gærdagur"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "fyrir sekúndu síðan"
+msgstr[1] "%(count)s sekúndum síðan"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "fyrir mínútu síðan"
+msgstr[1] "%(count)s mínútum síðan"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "fyrir klukkustund"
+msgstr[1] "fyrir %(count)s klukkustundum"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "eftir %(delta)s"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "eftir sekúndu"
+msgstr[1] "eftir %(count)s sekúndur"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "eftir mínútu"
+msgstr[1] "eftir %(count)s mínútur"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "eftir klukkustund"
+msgstr[1] "eftir %(count)s klukkustundir"
diff --git a/django/contrib/humanize/locale/it/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/it/LC_MESSAGES/django.mo
index d162192a3499252dd7395b64f2fcd84c37cc1215..1d2b3b582d3dea91ee19db260352ec36870b3d1b 100644
GIT binary patch
literal 4696
zcmb7`PmB~r6vj&dl~EJ{MHHk~SecRSo!P}dFtDO75J^A~7L5lF#dOVV!A#fCU9$@Z
zPF_5k7-OOyOgwn<AQux+4|*~2WK2A&2QS78i3d5L@q67h)6?D6qjskI*Y&+uud3dw
zp6;JEt$l~#XyDwA^Ml(MTcrCnxZtR+Wo!>v1NVY2gVW$utAAwm?=1fW>#*-ym+&m;
zq5X#Cr(g~3pTS+=`a6>N9yo>eIgs>KtG{pg4M^kvZn^c&B+jB`51fYmUGOpROK=AK
z#kM!xm9!h+PUx?LG>@wwroui3F?IHd<uz~{+Mj`sg5QI;gEy@G50FxH)AE+Jv-L^5
zH6Yp7gVb+><wk4YY`G0YSGE%*|0;+do56)@@ibUN`-ci+8vF~Sb@uK~^7b|uqJ15F
z4V=A)vBTh-;Pc?O;HzL|Lt;M<lKurqasCD`g1hfc^8Xe{`M(DCz#qYL;F0?nI|#l9
zE|3nM1-EQW?8_kOUx6IF1<ryy?oaA*0&JkI!H2;Q!76wiq`dzMqO|Nc5G7+bKun$8
z1UG~0HYIu729p1Fko>2>IB(WI15!QfR)5Os2P_X+{V+&z7D0;hqSa4X{Va&|$7`Va
z(A;T1KxRlud~Ct>A)NK38DDqUdz#ZDIO&<9`gu5M9NL@11F4VKNNuDm-rsb;8z<$6
zjv1U&IH^|S2kl|1(-UJNQpK<h;=E$p#CbrO;{0)t_Ths#x8kHdJ$^iZ#^X5mSP|PS
zJ}5_24>nz05#52T&Ca#?dDZPI9sH~2%a+5_t#-8T=x!#YL+Ux=xwJqB4o|nLTgKt*
zRxb^NA3D6tbrraxUmCdeNcLUsrSfIBw^KH*i5JAEP+gZ&tYO4mTCRi<F9`YSMZBmK
z>lSgBR;*dXU7D*}5ie7Vl_Fo4>L^phOT<En$kQP@3N(@gaup1W<f5bT<h1l4Ff~db
ziBYVMT-u@TA!(})zmZ8`3N0P@xp;{<jAva&oziiKej}3z__7{^xo{-eVAekBkj6@!
zMh2-m%Z9bpiezncXMr$-P;`yz$+go}Uv`ba!YK`I%P3Ibvp@xsQ6@AP`Ye(wGGLLq
z%p$|gGJc_y%xGU+!L_Hu5WZ$rvnw((G9>wQs4vKt@s9i6D>97mU)bbFE{LF`D`#Y1
zhsHY@b(HVDFz7_yl5X<K=~GMIVkm`yuXjWk+2r$$xp}X#&zpOaHyX{k1772qMgxxC
z8M&e;X2x%x{O0yG8~gV*a8yo+$aqVk2%@eqI&AWnR7-aSKOsUL34X|sNwwwW=Zw4<
zz&0C5^DMdroq^~`Z%K+?lOH#tt5BxuvN8Q;y}r7-Iy>q~J?i~rsZqUO_v01TyEa5!
znR;y$u*sFFoIHN=Xqu6^*+yki2Sx^%>6Jc~Y_P-Y{jN~KLEc&xVI<AMxus*?{?w1A
z-Ik$uG-zpG1)V0}e;$!fcd6dqF&*}zCJ*{?Gg_EG$dlWJYQU!!_*|`$d4=G=M2XO+
zrz3rRSy2^4YzXcv`U9d)s_fp;uhe%uMy6lxkC0xg4vD5h+cZCYyxwwJ2Xj_>e7LfE
zXGc-yJ+9|^CaE2F7{7Npm!_%UoGXRHo{3ekQ_=s|Yzh%_Gng0*<rue*-{;~^E|bf-
zv@$N|No$UW&O{qUh+n$d2W2Fs8!eG0<i)w}VXx8*mGsIz4en2e%)>DnDYLH087~>U
zr;6DccOAdajP@U&i8Q<8k;d<HQFB=@STotpSxcV<_bhU~b0bfjV`dhmo|7w*8GdpV
zimvYcPwOm3VuK+0RMNaH5GwQeq)1C0e8Gh;qp0wig%yuXa8Evgasd-@7;)&5_DhEz
zdZxBPut$d?J3$@FWOlJB^-bfDN2+UMG;68g(m*nN<QfywGKL>b@!E%twA0t0;~NQ|
lTXxxlKr={qVH=67q6U5@luUOziut-H@J{kEgp#3R{{W@H8hHQ!

literal 1241
zcmaiy&1)1f7{;U4ukpKjR7erAMN((l3hT66)PBHPi?yu1RD^UVJIykiY%`f{>&cTh
z5fl#|JP2Mq2%bC?1raaaDtPw)=*=fJZEamJ<jrsL<jp%zX7a1M>m@-uhd7V;gt&ls
zunz;;I(QlU;kg0!VcxT!kb~e9*ahD6oCDFxyq`Y=4`5#NdJ4LI4X?MnZatU%`XkTB
z;1T3M0bQME;8E}eI1ewcLFZ=!i_Ygon7Ii~fzH=c42Qty;9>9;h%Mv|h)&*OaCP5#
z{XOXXeen86udjK2_WBnPoqWUK>VNn8y4Qb#u(w&O8+1AD99!)K9^8AKmtzR`{R0HH
zk+TTb&LB=9+<8wUjw3p?lU{V^BbR#HJS#+Be^jRnGRve^|J9lu@;YhObV%G5g-jPM
zsmrz?bzK;u5~8FML?cW>a?uuw<Z^}Nme@sfBLuNJ;j0*%+8Dh|?6M}SBDcagdB*65
zs99D?*qksqjuO-H23M&LW<^UI%ck>GChS&`=B%n?8qD0SvN0pLMJ^lXR>X85j3O2e
zvgjI(2IHv2!l5ukBAXR$>1yuD3x{Y_iU+S>3DJT(Jh!ZBxXLqbwTbC%u9VE_2yB2i
zG9eR@^-ERPqexb1!BfGif;VGYu{@Jp(UH+$x-vbnbB3rt492vwLZS9*3nr~tu~%Ce
zmui^S7P-lVE#I$BveHhT^H3LtO{khqq)KC2T99`8oiW8^CMyij*rYbiJf^C(InB!h
z!}QN%xmVGiGL8CzU3UWiT5^-<PNMurbpP}3Tjq9awKp$CNvUZfsjuEKf$vJt)@o9d
vYN-%pso>TcO}?%XrE#SSwfT$>V+HP#bPMR#;DV*8B#CZvm`Jcy3M0vHHhCOM

diff --git a/django/contrib/humanize/locale/it/LC_MESSAGES/django.po b/django/contrib/humanize/locale/it/LC_MESSAGES/django.po
index bf5c4dadb2..ff93cba363 100644
--- a/django/contrib/humanize/locale/it/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/it/LC_MESSAGES/django.po
@@ -1,42 +1,67 @@
 # 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.
+#   <lukefiltroman@gmail.com>, 2011.
+# Nicola Larosa <transifex@teknico.net>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Italian <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "oggi"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "ieri"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "domani"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "º"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "º"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "º"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "º"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milione"
 msgstr[1] "%(value).1f milioni"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s milione"
+msgstr[1] "%(value)s milioni"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +69,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f miliardo"
 msgstr[1] "%(value).1f miliardi"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s miliardo"
+msgstr[1] "%(value)s miliardi"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f migliaio di miliardi"
 msgstr[1] "%(value).1f migliaia di miliardi"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s migliaio di miliardi"
+msgstr[1] "%(value)s migliaia di miliardi"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f milione di miliardi"
+msgstr[1] "%(value).1f milioni di miliardi"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s milione di miliardi"
+msgstr[1] "%(value)s milioni di miliardi"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f miliardo di miliardi"
+msgstr[1] "%(value).1f miliardi di miliardi"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s miliardo di miliardi"
+msgstr[1] "%(value)s miliardi di miliardi"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f migliaio di miliardi di miliardi"
+msgstr[1] "%(value).1f migliaia di miliardi di miliardi"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s migliaio di miliardi di miliardi"
+msgstr[1] "%(value)s migliaia di miliardi di miliardi"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f milione di miliardi di miliardi"
+msgstr[1] "%(value).1f milioni di miliardi di miliardi"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s milione di miliardi di miliardi"
+msgstr[1] "%(value)s milioni di miliardi di miliardi"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f miliardo di miliardi di miliardi"
+msgstr[1] "%(value).1f miliardi di miliardi di miliardi"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s miliardo di miliardi di miliardi"
+msgstr[1] "%(value)s miliardi di miliardi di miliardi"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f migliaio di miliardi di miliardi di miliardi"
+msgstr[1] "%(value).1f migliaioa di miliardi di miliardi di miliardi"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s migliaio di miliardi di miliardi di miliardi"
+msgstr[1] "%(value)s migliaia di miliardi di miliardi di miliardi"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f milione di miliardi di miliardi di miliardi"
+msgstr[1] "%(value).1f milioni di miliardi di miliardi di miliardi"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s milione di miliardi di miliardi di miliardi"
+msgstr[1] "%(value)s milioni di miliardi di miliardi di miliardi"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googol"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googol"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "uno"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "due"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tre"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "quattro"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "cinque"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "sei"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "sette"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "otto"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "nove"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "oggi"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s fa"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "domani"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "adesso"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "ieri"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "un secondo fa"
+msgstr[1] "%(count)s secondi fa"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "un minuto fa"
+msgstr[1] "%(count)s minuti fa"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "un'ora fa"
+msgstr[1] "%(count)s ore fa"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s da adesso"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "un secondo da adesso"
+msgstr[1] "%(count)s secondi da adesso"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "un minuto da adesso"
+msgstr[1] "%(count)s minuti da adesso"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "un'ora da adesso"
+msgstr[1] "%(count)s ore da adesso"
diff --git a/django/contrib/humanize/locale/ja/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ja/LC_MESSAGES/django.mo
index e317504d9a88949da36f49d3de2ab39198706000..489ad4af63f1e1d805534ed9c95a0a57815c5924 100644
GIT binary patch
literal 1836
zcmaiz-)kII6vt0(;*V|p)mrP1YA;GKQD=8HjV7I%qP7jR7#nNUhoW%1dv|uynR}O+
zySs@GLTjv6sc5Cu;Ik+yJ}ZK6BGP}rCqddx5PcE_(HFmG_hy!a1rKxQbI&>7d+x89
zpLYyhBG`Rsd(eiq5RHMqgKY0zNAwW*zT-C_=YIho0Jm)=dK4^z?4NZ0Yv5k^Ux2K?
z0uF<JfkWWGj_lkGe;B+U+zX;K9R%^vQ+Pp2GmghV&OZxsz2{u~B^N*G_=?L*#}K>`
z`UK>9E$}ArRq!JAx(x1szx(<g9|muQKkYaR?t=fa^E2na4)VAa@GkI6kdN+r#~&Pj
z1h*r81!VnCARhV+FV_D7^1A+X{@)-T`p5ZOZs_T@f*c=q-0tE#oxjU*kBdL({1NB#
z8SwnPR^AVv;hku_Ha5Nsw%gGP-5$}s;BBtY;O~Uj%I9+n8r#i1bnj*x`h2!*I99^c
zbPqeQooM{6vF+}G?f`jDT^ku~$+)S;ishO(6~%F6H2q&J8K4^!v*`d~9+V=9bkiy!
zLxU+Rrm5{%=7L!_noDY_NrX1-0lGXTMW!l7S2xw`1=s62Nj|7Q@47BeNiFK8nQkh_
zAy>@h^8x)@JyD)eQCPQBi&~0m7*1N+W-4PFC2DA7w5nn&v2i|z!I`{}u9A+lB0dQN
zrd7&ROKHlYManGMI-XQ1vZgAR@J>vcLTlTGmQ-d{%Hg@xEU1e0j#j-FRhr?(195mk
z>d+KUsD??cH=Bh~)qA=bX5PFBL}Bjuymu&7(n9MUmR1E~+%J!N{ywifA$&h5@Av#k
z--pmUp;{5w+@$lTM0p|@pM1oJ6`qlq_2yHlvshY_2IBd8q?e>Pep+fHp0MV0bSkpu
z$uN;oT&$SnAcp9$DMRJWE13l1m~2R`G9^aq);5AtsoicDEmw?cYO$!5Ej4=k%u0<?
zwY$Ai>}r%2WN9p~7>ET~m_0gsq<<XcqF*><v{f3*TxwvyRxP4pEF*nDRO&L#l%0NI
ze#V>X>v-~-O1&exVycl212Kh76y{>SY;VS-Nfrp*=(^c-`GDwkr~Sf)Kdy7(OlNs{
zLuhT~yK7&+xgpef<6Qq|=)85VbN&Kd`}XatXWqGb_I&;&BGFf^eR^@Q3W>gIb>-}@
zmp>RR?B!^R9-|42a9{2wt&7syrO($s{)+bVvZ%c7PSWG+T_@Pbg4GW{q1BJxWsIZq
H8F&5z8p_a0

literal 1136
zcmaiy%W4!s6oyNUxAq=g8fX`yK`QCaBs%F_5Oa~J(McF1K@ls{HJuuIs)p*CN#aT&
zMiA761Ql^9hzr+(;xp(AxXR@b#GQX>B_T54q5uBs{B^qPoTh)Ywk#9G3FsvB1!{xt
z?7$824Lk#Wcl-smBR{p1klo-_umzlOoC0x?+b+Kg?m}L2egfL(D$cJt-#E^>{rip&
zz<sD+0_}UAgZsf3;52%93$`NviA_rn%^U&SKx`B0*y$L8d*J6>9y#_qf6(P4j+dQ3
z=2&q4EtgL_-gAE9a^Z42tL@94Y3JC8Ls-~(&^|c;+3)W`c#Ir}Y#f8^EOy?b&_SqK
z9Cqej%hP8YEUokQj<D>{h%^;S{@1HEscYsL-K22S<RY0hq%0bolvQ05851caCkoOr
z$#{cHl8Jee8DeH}Y0imJF<ZdBs<c*f#LOwOz%#?OwF_ERc*)SQm`-t>VU)-pt}vM>
zZ<5!PHgr5oL`*N$lZ+Ns<a>o1MLMK8GpMD*%<#zX3c`>EIU4r(VJ-^uH0TZj6w*oF
z5cZw_)CJvsn2&P3=K_Rxjb(-wHIrG&jM9;Rg-IzgzaMRY7gH``o^}XXR)Z*(Nu4E}
z7CEch(i)RI<9`2je1k!6d~AGVYml%b@P?E$T;hO*8ag$6-gMSdCS;#qnq@lUX5eOV
zl;*eUY$Ii^>4+?;SjZ&u^E1M19vt}<<`vSqW+@$2x|&74to=!|fw0g2yBr9-ZGXh-
z(}$~zi`%UA*I!pYJ>F)mK3XDq(nGq*`tpbMHy=qa2{)D($oY+>+su)b&rjA~z9Va|
Mo>_EZ@!l?e1B&qdX8-^I

diff --git a/django/contrib/humanize/locale/ja/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ja/LC_MESSAGES/django.po
index ddde0c1076..103f915104 100644
--- a/django/contrib/humanize/locale/ja/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ja/LC_MESSAGES/django.po
@@ -1,97 +1,267 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Japanese <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-08 14:27+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "今日"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "昨日"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "明日"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "番目"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "番目"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "番目"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "番目"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f 百万"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f 十億"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f 兆"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "1"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "2"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "3"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "4"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "5"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "6"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "7"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "8"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "9"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "今日"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s前"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "明日"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "今"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "昨日"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "%(count)s秒前"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "%(count)s分前"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "%(count)s時間前"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "今から%(delta)s"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "今から%(count)s秒"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "今から%(count)s分"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "今から%(count)s時間"
diff --git a/django/contrib/humanize/locale/ka/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ka/LC_MESSAGES/django.mo
index 2a1b792bc5e23c4c082000d7b644668cc7816253..43f12bdb5426ffbed8daa459176547ac808f237d 100644
GIT binary patch
delta 319
zcmbQqb(w3zp8Cm*3=DIb7#LI-7#Iv$7#I|RbQq8Z@hgBdCy<^Cq<Mh!awxq8NCOeW
zK`8$il)elVe*mQUf$~qG^j9Fw4&<}4LiF(hX^?qBtPFBshCEb22S|e~v;@*11DrQU
zGWIZ<8tEDs>l&IU7#LU?TIw2@8yIi}`0ECxmSq-a=I80UB$lLFDHs_T0@WFT)EOFE
z8CXn~VwPj`NzF`2&6#Y@tmmeYQBqQ1rLSLJUanVCl$ckXnU-3imzP?iUr>~vm6}{q
stY4s?l9ia3p0A$+Buf+1Q}weG^)<PCpgb#u?8M30%+Z@KGrKVY0A$=gK>z>%

delta 261
zcmcc2HIr+?p87~e28Ovz3=Ap^3=H3y85k6Sv<wS`ZwI6~f&643%>$%!p>!3H1|o)b
zD8C0v&xDFE1Je9J`PEQ*H;`rr@=rtMF9T_ic{f-X<iL!lP=QZC8f4*rAPq8rb8{qP
z52LA}u7R<xp{atQv6Z2Pu7Qbx0at*(Zcu7jW^rbIo~}z`Nvf5Ck%1vtoq>shp@o&P
q<zy*lxykm-x@<On`FW{!lQ%I(^Y|p@rI#kA165}yZsuWeX9NIBbSl08

diff --git a/django/contrib/humanize/locale/ka/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ka/LC_MESSAGES/django.po
index fc1577dda1..ad1109cc4a 100644
--- a/django/contrib/humanize/locale/ka/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ka/LC_MESSAGES/django.po
@@ -1,97 +1,266 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Georgian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "დღეს"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "გუშინ"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "ხვალ"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "-ე"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "-ლი"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "-ე"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "-ე"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f მილიონი"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f მილიარდი"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f ტრილიონი"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "ერთი"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "ორი"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "სამი"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "ოთხი"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "ხუთი"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "ექვსი"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "შვიდი"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "რვა"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "ცხრა"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "დღეს"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "ხვალ"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "გუშინ"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
diff --git a/django/contrib/humanize/locale/km/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/km/LC_MESSAGES/django.mo
index e3731543d8546d66f9e6cf39ab4ffc213319bd6d..48492d0d5ea94cc1bb19148f6142abdd3a4e278e 100644
GIT binary patch
delta 46
zcmZo?ZfBm*C}5;(V61CsqF`WPWoW5uU_NnTHjhtYUV3R_da9K|cJ9RA(UX%IRRAo&
B4l@7%

delta 47
zcmZo?ZfBm*C}5~-V61Css$ghrWoV&mU@~!H_GC`RC?220y!6t<^i(T_?A*yojH&=G
C0S!X{

diff --git a/django/contrib/humanize/locale/km/LC_MESSAGES/django.po b/django/contrib/humanize/locale/km/LC_MESSAGES/django.po
index e931bd4758..531f962c88 100644
--- a/django/contrib/humanize/locale/km/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/km/LC_MESSAGES/django.po
@@ -4,94 +4,260 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
 "PO-Revision-Date: 2011-03-15 15:28+0000\n"
 "Last-Translator: Django team\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr ""
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr ""
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr ""
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr ""
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] ""
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr ""
 
-#: templatetags/humanize.py:96
-msgid "today"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
 msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
diff --git a/django/contrib/humanize/locale/kn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/kn/LC_MESSAGES/django.mo
index e09397a2e03c9bf448cf1173b700a611407ec27e..cc5359e940453109552eae5673ff19d284100cbc 100644
GIT binary patch
delta 123
zcmZo--pV{dg|T{~YK(x9u7R<xp^1Wlft8`9u7UZ)iPBt#x`vhthNf1A#uK+$xoKpS
zloVL$>z9|8>y;EG<`rkArB>+WrIzRy6y;~7CYKcJ7wD&CCFZ5)>*oN;(!}&s{p>t_
UO)eiO&q^UXZ{oM;$#IM-0OIr~_y7O^

delta 73
zcmdnW+{8RVh0$Z8YK(xPu7R<xp{atQv6Z2Pu7SzKiPBsU0aGg@%Zb~p*lhgr^HS|5
Zn=wZ7_$20~mnNpCS}A1bO`gE03IMS!6axSN

diff --git a/django/contrib/humanize/locale/kn/LC_MESSAGES/django.po b/django/contrib/humanize/locale/kn/LC_MESSAGES/django.po
index 16a08a63a5..934e63cbad 100644
--- a/django/contrib/humanize/locale/kn/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/kn/LC_MESSAGES/django.po
@@ -1,97 +1,265 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-15 15:29+0000\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2011-01-19 15:13+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: Kannada <None>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr ""
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr ""
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr ""
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr ""
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] ""
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr ""
 
-#: templatetags/humanize.py:96
-msgid "today"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
 msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
diff --git a/django/contrib/humanize/locale/ko/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ko/LC_MESSAGES/django.mo
index 1c7b5007852c97eeb7612c4b7655b7bd8af7b6ee..bc65ee3bf7da362036fd3ba529681cd9a4cd9b86 100644
GIT binary patch
delta 318
zcmaFOv6OSdp8AQ53=DIb7#IW@7#Q?fAhaWp<^%GBfizH>Aqh&SK<P9f%?1?Dfb#R9
zbRkr{7|O4L(lt==Iw;)=74KnTkOLdk2bGu#m6!wN&)Xcy*u!XQq-$WTYiOciU|?lv
zscT?vV89jNuN#zFmRX#cpQr1RSdwa`U}RtjRA&TIXJ~9?U@=*WS&q#oH8UkOXR<l7
zj+;hCNlAf~zJ7Umxn4<8VqS4(T55$}UTTScK~a8IYH~@jet~{UR$^XyzJ3mnEKN*L
a)z8k?*W~hn@~jlH^CxFAM^C=UJPQDa2tADe

delta 260
zcmZ3=`I=+Gp89Y`28Ovz3=Dz{3=ChHAv8M+0|OtBFA1c9(hM3<S_?|+0BJU$xE_>m
z3Z>1V;+9ap1C(}xin~B*Z>V?>3xgckpb)4;G*lu9%1_xG$=JhaYN%^qtZQhhU}$V*
zXrXIhVqm}(;IA8$T9#RynV+ZYl30>zrC?-W2v%ocqF`uYWo$WFidk;5J+n5OjbDCV
bs@>!b%+WkPiFxUziRnPq+4+;XSY`tN&hsP!

diff --git a/django/contrib/humanize/locale/ko/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ko/LC_MESSAGES/django.po
index 784bf2cc6a..e6c56321ef 100644
--- a/django/contrib/humanize/locale/ko/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ko/LC_MESSAGES/django.po
@@ -1,97 +1,266 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Korean <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "오늘"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "어제"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "내일"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "번째"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "번째"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "번째"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "번째"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f백만"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f십억"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f조"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "1"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "2"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "3"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "4"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "5"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "6"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "7"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "8"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "9"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "오늘"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "내일"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "어제"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
diff --git a/django/contrib/humanize/locale/lt/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/lt/LC_MESSAGES/django.mo
index dd4eeab3226f42026d6bade5a58c86e6524c93ba..c5007479a6a1e9bf4875dc58ae9b04ea8ab70a99 100644
GIT binary patch
literal 4941
zcma)<O>7%Q6vqb|C@};|KWNKWrwwUi(v8>Y2d!HdXwp`NM1(fwfW%=NPn?bIU3X{J
zX;6CsapZ`q3OE!FoO&ooZ~_UDT*?Jb+)8gC^@4;D9D3mYyyN}yL||q8^ZehNzu(TA
z^=|HL9{7miW#f1j$0rXkHc6j1;0>?Q0mk-$MQ{v!6C44rYW;Jq|ET#lSVDaGp@`=}
z3*+}SZ-GUOe+7rZ!G|M%3*3$I1(5V*t$(cf14!S0Pjmam$Y)Zs1&$zo4cr5M3+@N+
z>haJc(bxueL4OCNI<A5!g?#~{baqqoOK>N~-+<49KZ6f~f9Uw1AT7~9n)h{_4Mu(&
zK#C87G;c_Ala6oE+zDbT+XYhoD2P9{A8&Wii^Jd)#@ilc><suecntgud=<O{&Vc-}
zDDHtY{#tWjh_Tl&J_nNiDM)_zz!RYTc;w@QhcLbclK*cYec$jCQM>`t_@?GxAo)}`
zMf!Un`P~Ljf`d;oHVsaLr@`ysEO-~31k0NldmRixI{)uM>cediEoMJ~uwuV}TfpBz
zTA%wmP9o)R1Sx+Ar1(}4EoVEl&b7Wza}1<Dmq1$QgCO~w0I5$?dVB`N^0RRqRG*E5
z_5;42VQIRrt$5#oqZAFh@6YMaRLe6s=$b0xuy9bFdvNq#XaPf;x-UA{G5z@k@M-;d
zKS<Zbh#vPqdw3Yfi#-9v(lTrZHj0DJjm`^g>aHIL>HMC;u^k8P>GW$G277Vr(_%rB
z){54Xjf{4jW+;l|<pqAxZ8lxs`%kSV<_(!<weI_MznQT#NG*e(N%MTqkZD%^d1c5o
ztCvEj78tVE*Im!#eknBTQnXF!>&lnS*+yBJ3hxtTUw2JPe-9-$X}K0k-Y4X{Cwafp
z-#5ukT7S<ZH)*DBNxq)i-zmy9sfIR5zK+<}BFZ#~h6crwgSGNPCAd@faplbWp{I(p
zfF#PU8mBA-ehZ7XY{-j44oaB!y;{yM5_^6+C7zUgZ!a$nIUZm1!ysozk~Y)vctYY8
zCB*^Z))y69a65u6U^??06$VaIxh*j;GFlT&<>16=8O)K`$g45W^#r4p@WG(Qr058b
zN%u07im65X1wt_8*PIo+xBMVLu3GllijYbKB+mx^l9*T4*_!p12qb<BD|~9n@#=oz
zoM`)jvSwu6tyw3-y0qr}3NOsQF=tH%!coYzrW_?Ie8MhISoQ&{e309ArF_(~U$Si^
zTIWQ^CC^-*eUz6ER}PiOY`hB7j#SoM;CQm>C_kw1^KQ%c97)9caTyI?X*lmTolrI$
zIo=W{FwLunPF+}Y!f93bw5t|F$8*uC(M6@&l~QSWd3jusue%^Fk9$Iu+R@p{QoB^^
zo@A-1T}n+=D#o4_-c*H|vooiXMJbQlg-PF2!b7nuZJf2jCNH&{j_V!c^NUU(g{oed
zJ8d0F^61MKL|~or=KY%M)hqnSMOPJOo78gav>&u&g?sJpP*x8d<I%_Js5er!tJN~!
zyO+~Pdv~>5<}Y)bBOT)t)d>o9)9mAAn_syS<so1fkyu9JM6r;$3E|hsU2@QMX_npp
zBX@rq-6iTzCOy%!HnG0;RVKe4;vSjvh_vkdu9lnIJ(0c&dTMsQS@qB~+;0r$k&a}Y
zQjuIee#7jQ=vk*&&-pYu-CMGus&pjlm5TJat#^)%P7=wx#gUv_^xJPJEfvUmC4sz^
z+mPl3lc`9~EQ#dY=oVrqE0(i92Dy8i&R-ZQF)>KQR1NxRAy-0LO&gdl2RusTE{2|x
zo|(T8bTOIBAkoq@^(Bz0IklNn7a^WSQWr+rBc*42;;o!<Nz}AQtY#ci8#v>U*3&L2
zJ?9f|-JDONXMJKl<CARLj7>^TyCibfB-yT6mz18dN%V|Qyj_zYTghWF?a&i3y&bq>
z?MC$Mw0gZaOdd$|LzOwO`k@PpZp!L4?u9<DITxJ(zulQ<vej$YE9(Ti7OAMNM~X)1
z)l3CN5h434iXv;@QB8Wjxu{;yTvf`Zzb^bU=%B6-`oBGjpn>`fk~N4TC`zZKT=Pl3
zxul*$YNoSxLxuQnkF|x@a9Km(!4QL}oAIL|I?;PbOd4RJ$eQS^U~<&1jw|R6O*(B+
i3as70u5h~&$tqZp(D1xeLoN$el)uDkA<n3QcK-{kAc(*K

delta 663
zcmZvZOH0E*5XV<dt4X!iR(wE(2%<=dB)-s6i-I1+`b4}aLfWP^q8mvXUzZAkM};mP
z1+RVwJ&1S|>KE_}2znMT{<p3-hyBklGqW>0keB{<rTi9^t_iFiibMBM542SW2djbu
z;H%&lIEc8no{#{z07~Gh;0B08HbuM*HXzQ4d=cb*yTAD|IS_@C;E}j+DtHDqq2U7L
zgRVdsWZ*59xdCSpr?JHhcn<RT8RUHmUgHnO;DTT`$mgiFxJ*c&C?rH-7;MCaagk4p
z{G8xCh}mQj<cq9<IAjYByO6AiEfD+FYEh6s&KLT#7JM{h;CNFA;=e$F`0yCStqp30
z_(Kt>8T!w{Jjr^c6nm1|xhlanRt-p%pxkNM#hnr<*oPJ=IKE40o=}@w?7QhaVrcq^
zW{j!ENYa?l^ig&xcTLrj`nal3CXLC24pTCwSJKv9lX`n*$#IkFp6R=`r>1^6?fNw9
z91rE3efA;8gQ+ElT4}bTY=$x>E&68BLJPZ79@ugyz&=A$EF6|AVVyljI~2|INZvX;
Kp*Cxd&HMlaw^zXc

diff --git a/django/contrib/humanize/locale/lt/LC_MESSAGES/django.po b/django/contrib/humanize/locale/lt/LC_MESSAGES/django.po
index 8f8fae7a66..972775a422 100644
--- a/django/contrib/humanize/locale/lt/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/lt/LC_MESSAGES/django.po
@@ -1,37 +1,54 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-06 09:19+0000\n"
-"Last-Translator: lauris <lauris@runbox.com>\n"
-"Language-Team: Lithuanian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-09 16:51+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "šiandien"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "vakar"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "rytoj"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "-as"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "-as"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "-as"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "-as"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -39,6 +56,14 @@ msgstr[0] "%(value).1f milijonas"
 msgstr[1] "%(value).1f milijonai"
 msgstr[2] "%(value).1f milijonai"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s milijonas"
+msgstr[1] "%(value)s milijonai"
+msgstr[2] "%(value)s milijonų"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -47,7 +72,15 @@ msgstr[0] "%(value).1f milijardas"
 msgstr[1] "%(value).1f milijardai"
 msgstr[2] "%(value).1f milijardai"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s milijardas"
+msgstr[1] "%(value)s milijardai"
+msgstr[2] "%(value)s milijardų"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -55,50 +88,238 @@ msgstr[0] "%(value).1f trilijonas"
 msgstr[1] "%(value).1f trilijonai"
 msgstr[2] "%(value).1f trilijonai"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s trilijonas"
+msgstr[1] "%(value)s trilijonai"
+msgstr[2] "%(value)s trilijonų"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f kvadrilijonas"
+msgstr[1] "%(value).1f kvadrilijonai"
+msgstr[2] "%(value).1f kvadrilijonų"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s kvadrilijonas"
+msgstr[1] "%(value)s kvadrilijonai"
+msgstr[2] "%(value)s kvadrilijonų"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f kvintilijonas"
+msgstr[1] "%(value).1f kvintilijonai"
+msgstr[2] "%(value).1f kvintilijonų"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s kvintilijonas"
+msgstr[1] "%(value)s kvintilijonai"
+msgstr[2] "%(value)s kvintilijonų"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sikstilijonas"
+msgstr[1] "%(value).1f sikstilijonai"
+msgstr[2] "%(value).1f sikstilijonų"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s sikstilijonas"
+msgstr[1] "%(value)s sikstilijonai"
+msgstr[2] "%(value)s sikstilijonų"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septilijonas"
+msgstr[1] "%(value).1f septilijonai"
+msgstr[2] "%(value).1f septilijonų"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s septilijonas"
+msgstr[1] "%(value)s septilijonai"
+msgstr[2] "%(value)s septilijonų"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f oktilijonas"
+msgstr[1] "%(value).1f oktilijonai"
+msgstr[2] "%(value).1f oktilijonų"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s oktilijonas"
+msgstr[1] "%(value)s oktilijonai"
+msgstr[2] "%(value)s oktilijonų"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f naintilijonas"
+msgstr[1] "%(value).1f naintilijonai"
+msgstr[2] "%(value).1f naintilijonų"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s naintilijonas"
+msgstr[1] "%(value)s naintilijonai"
+msgstr[2] "%(value)s naintilijonų"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f decilijonas"
+msgstr[1] "%(value).1f decilijonai"
+msgstr[2] "%(value).1f decilijonų"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s decilijonas"
+msgstr[1] "%(value)s decilijonai"
+msgstr[2] "%(value)s decilijonų"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f gugolas"
+msgstr[1] "%(value).1f gugolai"
+msgstr[2] "%(value).1f gugolų"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s gugolas"
+msgstr[1] "%(value)s gugolai"
+msgstr[2] "%(value)s gugolų"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "vienas"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "du"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "trys"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "keturi"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "penki"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "šeši"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "septyni"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "aštuoni"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "devyni"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "šiandien"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "prieš %(delta)s"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "rytoj"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "dabar"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "vakar"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "prieš sekundę"
+msgstr[1] "prieš %(count)s sekundes"
+msgstr[2] "prieš %(count)s sekundžių"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "prieš minutę"
+msgstr[1] "prieš %(count)s minutes"
+msgstr[2] "prieš %(count)s minučių"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "prieš valandą"
+msgstr[1] "prieš %(count)s valandas"
+msgstr[2] "prieš %(count)s valandų"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s nuo dabar"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "sekundė nuo dabar"
+msgstr[1] "%(count)s sekundės nuo dabar"
+msgstr[2] "%(count)s sekundžių nuo dabar"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "minutė nuo dabar"
+msgstr[1] "%(count)s minutės nuo dabar"
+msgstr[2] "%(count)s minučių nuo dabar"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "valanda nuo dabar"
+msgstr[1] "%(count)s valandos nuo dabar"
+msgstr[2] "%(count)s valandų nuo dabar"
diff --git a/django/contrib/humanize/locale/lv/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/lv/LC_MESSAGES/django.mo
index 0e9075008be93075ad6ed0f1ea93609ad58651d7..58e600af80eedb33e0859a545c89f36b19da0eb0 100644
GIT binary patch
delta 319
zcmdnS^?_@`p87qE3=DIb7#Qpr7#N~h7#OU9^h_WP;$H>Q>_A$Cm4N|>7-WD18<184
z(m*W?nm`&PuLGokh`|IZZUv+{fP7o1xEoa52TJ=x#e-NG<iG|*00n?{F(g3gRH%Zi
z&5?{fjHX7q2FALECJF`yR)&_k2Id9^Tmk;NL8)b##hLkex-N+&sa6U`28KX&Mj&;D
z##ROvlckvD*nCnmQ&Mv#n=|XWX=Id?6j<r&mzS68l@ulB6=$ZUR_NuWmgpB0<!7ZP
tmlW$4=%-{Q=B4NB=K#sl#Pn4CoHBh)E*~h*N+G9gau##+=1a^ei~!56JH`M2

delta 261
zcmeyswT)}Sp86(628Ovz3=DP*3=9e^3=GylIvz-a__KjDJCMEwq*;OVBOuKNq+bAO
zpcaPrQ29?#`Cm|RkYWy?JTs66>Ei(sAoW5}S`;cS!O9>9wm=Rj0MyH%2Bo#33Jf+!
zGWIZ<8tNJt>l&IW7#dp{TId>>7#MH``0ECxmSq-a=I80UB$lLFDHs_Tg4G$AC>UB;
r8Cy=4VwRh1&#c2{<CmY8YBzZ!b2N`nVqSV_VmeTDPT6K|mQ+Rn4?HI>

diff --git a/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po b/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po
index 95d2e5e6cf..dc66aad98c 100644
--- a/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po
@@ -1,37 +1,52 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Latvian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "šodien"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "vakar"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "rīt"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -39,6 +54,14 @@ msgstr[0] "%(value).1f miljons"
 msgstr[1] "%(value).1f miljoni"
 msgstr[2] "%(value).1f miljonu"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -47,7 +70,15 @@ msgstr[0] "%(value).1f miljards"
 msgstr[1] "%(value).1f miljardi"
 msgstr[2] "%(value).1f miljardu"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -55,50 +86,238 @@ msgstr[0] "%(value).1f triljons"
 msgstr[1] "%(value).1f triljoni"
 msgstr[2] "%(value).1f triljonu"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "viens"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "divi"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "trīs"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "četri"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "pieci"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "seši"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "septiņi"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "astoņi"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "deviņi"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "šodien"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "rīt"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "vakar"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
diff --git a/django/contrib/humanize/locale/mk/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/mk/LC_MESSAGES/django.mo
index e28d8ac6a532ed82646e234eede786977cfe4866..5c197d60926a404df376f10780950d3221712ebe 100644
GIT binary patch
literal 4603
zcmb7`-;Wbj6vwZE3KbMVMf}ADTxf;aPM6=s6~h97#8t#aebHoS?{<f6XUfcU7alOc
z8Z|}}UW_IfUo`QFWPv4Y7K#s&X!K?J4=ArjA4oKj2Oj*MnY(T0&Mn4CZ$ER-uY2d5
zGq?S9`NGc`E)(NfjIZuvY>4g`;0srFA!8fB9JmpD1MCA&N%=QY{)^;4U>^E)55#;E
zG%%l%ya?tn{|#IRE`BhMZ-8qsKLV0`Qp(Ru{s7YYe@L!;D2_8ESp)l^{{mbKHo;Bc
zEjeGhD4v_(YRKOOX&<LRY=wOXV(aXJ<Rx$w=2yYz!4`Nwcw6fK0x3mzB=1T+TO7w*
z0Fr(&NPbHtmr4B!$yFd+*=msNvmicf6TX_L#Wrvd^S?8U?E(iLj`Qk(1<bz&Nghfr
zSrXUpfaIs(Zqm#7vZah|#e4+Z34Q`@2XBHK!Mh;UFZ)O=e@F5hNO69WT=ZzX?g5bG
zAAp;|o8Zgf9dH}CeHmkWKnE;>7r`yypWr5N&13QNzXqbT>}?QRW$%H@!Eq2vviCvC
z<7XgJ!Onq{xAT(UO8o_?pO*4#QhrnNN08R}8Kk%^kmB5u^4~#<e;Y*lSw9BpO$_P>
z+7tQF^*F{;7<rn=>p4lP<ue%cPUSER3|e<B#{7j;N6$)gq$A2d-M@hGG~M8eas*Ou
zcVE=Q>o8vI5@O2?ZNRb^)I-$QC<9x8!7(U*PhzaZpq}o&p1@>1#s(>*9MDDY1YRL*
zAUk1I8zR?V80AOpYSng~|CE(QNn@#(R$RB@RudsLqM9b2PUg6d#!@eJOM%8#FFoF{
z%AUr$x7>Dg(T_Lua$nSS<~_wH^wwH&pxby#=%=cylca0tbDc~nq0dtSwR%2JOVV}o
zxlWd@na_1HUA27POPa0}+3KX4GWooRFjXS5)Ce^NYKtu7%4r0GTNM{?PRVUJL5>ng
zLO+tWO-4PphNMku?Aj^|TPV3sS&0`5=i^C}wo_-_dAqjCa`>3r@RV>QlEI|D?a+x8
z8?_a}u8ak2)SeJ*6z<Hif`(^R1G^>`_GQbW8d!L6N`qe04&;=XV>^OTCS1@fGha*y
zhxzsi<_9bo!^abX1#a0oiSL^0d9V#8U3OCVf$&It$a9a0QeYe`8*d5E$5~k9dyiR8
z#myWRb=M1wVZUORjXjNuZ;ZG_o;mdTh%w{|D}b%B*9t_D5154k!`y5Xws6xd7Iqru
zcGHBRaac^)6f<ErU=+6U!a#9LVWWvF^Qz?s#)xM*e$@(GugE7Ru)e6e6aKi(U+SK{
zQmI*XwZG)nUWS`fX;>9uj0me%<il1;lyO#~QrWQ}s2B73$;rw7fa2Pt;zYkAf_y!G
zT0dXUm!pTwS7nrZZ9JcA$1L*NcxL$E@V-t`3jJng$aMnYV6!Ldc<KO6p08Ie+u6lS
zW0vQOVDQMueq%?+jusykp0Up<xn<j_6#0&$c91z#rIH)_U9aXBxl@m({@}na9^VdT
z9p1+aCLbK+1-^bgkEbSIgLxsxcXN{$c_EYdjR~)Zv*ERHw)JH=-8vo4gwy{^JriDO
zeHcdwZ-mXHuc8cRlj_T@sqiwquJsVB_Hw7`b$TkAWZP?Zic($eMmX0x+sju`s=jmK
zrEof&K|Z70rgy9{(8ZVyo4xlyF%$zOM(a#?CH%f;gtS`cKi4{Q?+A*48sluwEVT40
zpWmY=HOfv`L8-J{yR*`&u6;t8?!|6l(pJ}Qu<jBk?UhFB-jkwA`YBD;?Wd@cewya$
z_SLA<{z_x1{)#%`pKhxz@3b=Qt2C7At*Dd!y;>^SYw*E)aT;&O45u#~64P-3o2@By
z`*cU$`9+Qj9P8nJl|1yWr0V6CS~W_@98SV!boREl)d`TWP*+YUvF+sA39b6fSHdQ5
zeS}m0jP7Y;4P~PJq}>k6I#C!hzJb$XD!h(}_+dE95Cy=m3r@oBRpcL*`TfpM@#loz
zU>t0bGaX--DJta|tJ9yA=#gfkHCi9T42P5a+Y*;J4$ve`I0s*<Csmr{IFwm<DcaL%
G-2MyiW{$T2

delta 669
zcmZwE&npCB7zgmj8q3aF%-XVP)yP58YNlOT+mbVzC`pl;m|e5hto8?mT2T%Tls88w
zH*T^w2XT_i_yfpYIVs7-_Z_dBr+wx#?~mu*=WV`w?&RuAP&y?<2pK`%AiIzYb$B2g
z*bAS8U$773ZVyodoPZLX7S2NaXkLsLVLir6Vm=FbUG8_jO6y{wEZh_uwuHN|2?Ym`
zA9M_Tkii`^a|TB+?nD<loP&e#5c0ZP=!Flk89ERp^bBRH620PuZ+sIAAMOItr<nJk
zU0&c9wm^QM0$X4h^7>veuR$5(A&CCm+Xf-8;rsp~fS39-9`50ge*#{J|D|>$4+YtZ
z<Tq|Z@*DgYyb)sEQi|P6A)Y5*g*gq<iPzU*TG^E{WvmU8GKET!>}9eo+hpHO`)ztu
zi$(Q8RgWe0L{y8jBVTyboz&v0o=C=q`!$4|HcI8_Owq7Qd81q?Ce?Anwylzy%DIl^
zO>5cA4_J1lz}|fkPimA+$@9%=!_HQWteI5TR@sGo%2a<Nd-Mm{r9aHJ108HL(9R~6
Ut^j&+uAQ25<<y?`*ts(I1INZ-f&c&j

diff --git a/django/contrib/humanize/locale/mk/LC_MESSAGES/django.po b/django/contrib/humanize/locale/mk/LC_MESSAGES/django.po
index 69e3891da9..4078610a5c 100644
--- a/django/contrib/humanize/locale/mk/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/mk/LC_MESSAGES/django.po
@@ -1,42 +1,65 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+#   <vvangelovski@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Macedonian <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-15 12:41+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "денеска"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "вчера"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "утре"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f милион"
 msgstr[1] "%(value).1f милион"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s милион"
+msgstr[1] "%(value)s милиони"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f милијарда"
 msgstr[1] "%(value).1f милијарда"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s милијарда"
+msgstr[1] "%(value)s милијарди"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f трилион"
 msgstr[1] "%(value).1f трилион"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s трилион"
+msgstr[1] "%(value)s трилиони"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f квадрилион"
+msgstr[1] "%(value).1f квадрилиони"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s квадрилион"
+msgstr[1] "%(value)s квадрилиони"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f квинтилион"
+msgstr[1] "%(value).1f квинтилиони"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s квинтилион"
+msgstr[1] "%(value)s квинтилиони"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f секстилион"
+msgstr[1] "%(value).1f секстилиони"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s секстилион"
+msgstr[1] "%(value)s секстилиони"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f септилион"
+msgstr[1] "%(value).1f септилиони"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s септилион"
+msgstr[1] "%(value)s септилиони"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f октилион"
+msgstr[1] "%(value).1f октилиони"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s октилион"
+msgstr[1] "%(value)s октилиони"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f нонилион"
+msgstr[1] "%(value).1f нонилиони"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s нонилион"
+msgstr[1] "%(value)s нонилиони"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f децилион"
+msgstr[1] "%(value).1f децилиони"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s децилион"
+msgstr[1] "%(value)s децилиони"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f гугол"
+msgstr[1] "%(value).1f гуголи"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s гугол"
+msgstr[1] "%(value)s гуголи"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "еден"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "два"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "три"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "четири"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "пет"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "шест"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "седум"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "осум"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "девет"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "денеска"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "пред %(delta)s"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "утре"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "сега"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "вчера"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "пред една секунда"
+msgstr[1] "пред %(count)s секунди"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "пред една минута"
+msgstr[1] "пред %(count)s минути"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "пред еден час"
+msgstr[1] "пред %(count)s часа"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "за %(delta)s"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "за една секунда"
+msgstr[1] "за %(count)s секунди"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "за една минута"
+msgstr[1] "за %(count)s минути"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "за еден час"
+msgstr[1] "за %(count)s часа"
diff --git a/django/contrib/humanize/locale/ml/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ml/LC_MESSAGES/django.mo
index 05cfebe54ba5160c4438aae88c110f9897b99e86..06d250d685c4e53ce2021614ccea8e3b800a2782 100644
GIT binary patch
literal 6348
zcmb`KUyKt)9LGlw|4>Ewqayxe5KmfRuRZ<<6i<l<7=ouK9`Z!Y($4i3+ugFez2jnt
z9t2EOG%>l5Ab}W+0#Sr>&%+1wf%xPTiN-hG=p!#CK4_v3et)~uEp4a0Yq?ElKb_zF
ze!rRd{bpu&e_c3doZ(8LJc4ra7RGw%e+O>3;&T{V0Vcqe;45G!cu>mENcoSFe}hT1
zFTXA1tDuJZVaZEi0`=d(<>1`gL;o7M4E0?g$w#F8W67%^^?zM*@g1R`UdaO3iT2~*
z<KPu=73j<QygS2s3S0{L9+1Xy5X4Z}=OBj8zLcB*m!LicJ_cR`Zw3F9?SFw3qJJd+
zlkIG7=&u8$_PHS0&6Auj+ZRbL0b$CPf}|e@@nfrSJB3_44Zel?&oRbyaMxX7ex|@9
zsQ(L+eC%$<9Pkft6x=;8<Tc41_k{XCfTz*E<6g!#g4e-4VCQ_so&yg{UIj_sv4AlP
z)WH&XP4b0>Vf_j?2KkyrjP-$&;0V}pA7kghH^IYT=ly5{&w<qb`U8wjfWLqk0(*CH
z$P*x@z|MoT9;d){;7=e@&teZU1{Z7rh#y;l8`*CLsl6Yh`0bX|rTh&^8^n;=C`fki
zgVf(iSwAP+zXcI~)`dd(q5VPYfou`N;KI~`F(hT3@TmMxxqKLf=8!<4JwW55wOPK9
znxJp0BizCIrvFc%JVbwRtwLFbLTmfRi`MXRl&5YGA~g)lfyGfM2DGkejz|gPD6|d{
zZiY|>YZ{0yis_RmE2IR=Ex2e;U<+XY@nJn*5{a(vLB7|>=MBr8R+beRg{E4Xv#gwz
zuX3pn6%_tdGSe~@nrf+)aTU61>Hd<QwH4Zp<%X&9zQ3fFJEEvkZzw*X)>evL)xhh7
zPF;3YlKLDvTqUbXp~LG0wb^rcy`(;G4p+(QbLMcBOqDH%H<H$8igZ;{MVcJmKv<U|
z(o_f)35rBIVr7<G!S$Slos+RjrkkJulF$jHk;<TL6%e!$g<jO8V+a|`%+~k|g=K$I
zB{Hh?Th@!3bdwKRCA-EQiKH{x9vM`8g-TI_FmgjK8#IOm8-zJCb+=^edDke2Ii2yW
z$h$fwPGL~DM2^fXGYwNPii8E)S>}jgVKT=!z#NykL-^T3FxSfJqqr9=+lH<?VzE)-
zxWXoJzisUk8CTn$)m{^}gR?Nrx9ro+oE6(Cik9taeNN8EYR{K)jy7PWd945C0j<{-
zx(i)xi|&dvU!Ce+t)<pz-D`O&mG0iCrPilXP}FvcVS{|u=%v>4?se(48&;-p#a`4M
zR~xW()5+_uWvBU0eV-7{5PwNGZ2pWL)@&2C&AEbZ<hwFf;aQlOxssj}+JMjtY2K&j
z^-+`pj}N(SF`Z0~jEr=-<klDz2f9q*CX3-@on$eY4d$54ODD-fKADJIrg<SB>)YP9
zwGxx=u2ihoGF@R}tfNIt+Qk}A7W2AcZsM6C-FAfAvuj|RwxOa&oev6I+iGU4tYPNT
ze8XPDjrHd#<JvaME;wm!7K5tOvw9N`|MtX9zO09LCt_6(5#Rg5_rCYN34iif`Tmvf
zok8{Yw~z6-?|tKYpZeaoKlz^TorZ2=mhC_BCy)Bx<tC%3>9A#k<No9!-@_d<_&S_e
zjmzmZE;Jb*Md`C3P!mC*5XdRtJ5(E}S#WVSn8Vp7W2u=~%LX5nXK*Q45SM1&Rr{7$
zTL{^t?|tWcNG|?goO!piV~ibuP@(4*CLHzLj`8JS)t{Grw%GG57>9$0qhQW$^?y??
zPEVU>+ErEii8niiX3w94ernIWXje_!*uvpNzFJgoc21GI>Dm>iRMpg`Yj5E=q2aWs
z-p&a^-Lz{LZQ$0<9qMv6Oj|oPs(NkRw9O-fdcA4WHV=wQ-#6i)@d;A3@SCUw>+7OF
zIfhV#k8mvOF?v#z&(5HML>B@P9qMpi{@iF_1@-ahbwuUC_ulcn@Bx8)<<%w9#akJ@
zwb5%@qcMi3BHdXl?ivj~a#uBYxW*2Y5egSem@v$b9;z5%_*{=h-XKm*Y^yp{`DtZ(
zGaYZ+F`MZ`sv?KAbtZW2DF=^US`k&5V8pEH3Tw%>-Dou%W82YEI>qj)$~nA$K;Iv<
z=j3`m;(Mop`U%|8j@M!w<g_KQ`^w+E!KSPZTq~209Kk=nQVs!F>(Qz{Pv1sOHdjSG
zG^%*{(D%I15^m`zsWi!ckZ>#j>MF9uflyTsXN*spqp-$1Gkvv1;kiMXf^wAo4|?Ep
AiU0rr

delta 655
zcmZwEJxjwt7zgmvroqH&wN@;?U^=NtB%u|w77^WSQ3MgCA_SY(lzNrED7Zur9UK&T
zIEs^lAHYT2#Lc0)x%d%umJaoQ@kSr=+>hs8a(BtA*$lX!A?cbR!pLFd6LJK(-G&Cy
zfMf7Y_yZ?UN81VU!xWU@ns5W+AsJEcKp*N|(VvHWUE#0aB?n@lDm)Ssj)f<%0}IX}
zf6*0GAcGbTa|2z}EexJP7pJ*}e(Vy2cfto4K>Y$`_zwH|$`3K&TMV=y-$2GJZV%)O
z28B@=LOl-o26K?VI3?;$F}??JKJT`CK1%N*z>6-lzBC$KfOI1HFHn*EbM_&5^dk8t
z-a#PW=)dUZoh&LP*|QYpS(kfR!!OlkWx#gwdsUKi4sDVv)yjls33aH=njNP-rf$S^
zb6PWF33Em_;_On1%zK?iTr+19vDrxjp{A`$RbMY#v{JOHrE)@BwkUNfTC(7|P_&(_
zU7T`guEf5SAvw8HqV_ynRWpIKMe{W)Zzr_<BD+@~Svs)f<yNrHE(Ua_Mn>6U<l+~A
C9a@C|

diff --git a/django/contrib/humanize/locale/ml/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ml/LC_MESSAGES/django.po
index da69b99b97..b4774b33e7 100644
--- a/django/contrib/humanize/locale/ml/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ml/LC_MESSAGES/django.po
@@ -1,42 +1,65 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Rajeesh Nair <rajeeshrnair@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Malayalam <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-07 15:48+0000\n"
+"Last-Translator: Rajeesh Nair <rajeeshrnair@gmail.com>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "ഇന്ന്"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "ഇന്നലെ"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "നാളെ"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "ആം"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "ആം"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "ആം"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "ആം"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f മില്ല്യണ്‍ (ദശലക്ഷം)"
 msgstr[1] "%(value).1f മില്ല്യണ്‍ (ദശലക്ഷം)"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s ദശലക്ഷം"
+msgstr[1] "%(value)s ദശലക്ഷം"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f ബില്ല്യണ്‍ (ശതകോടി)"
 msgstr[1] "%(value).1f ബില്ല്യണ്‍ (ശതകോടി)"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s ശതകോടി"
+msgstr[1] "%(value)s ശതകോടി"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f ട്രില്ല്യണ്‍ (ലക്ഷം കോടി)"
 msgstr[1] "%(value).1f ട്രില്ല്യണ്‍ (ലക്ഷം കോടി)"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s ലക്ഷം കോടി"
+msgstr[1] "%(value)s ലക്ഷം കോടി"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f ക്വാഡ്രില്ല്യണ്‍"
+msgstr[1] "%(value).1f ക്വാഡ്രില്ല്യണ്‍"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s ക്വാഡ്രില്ല്യണ്‍"
+msgstr[1] "%(value)s ക്വാഡ്രില്ല്യണ്‍"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f ക്വിന്റില്ല്യണ്‍"
+msgstr[1] "%(value).1f ക്വിന്റില്ല്യണ്‍"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s ക്വിന്റില്ല്യണ്‍"
+msgstr[1] "%(value)s ക്വിന്റില്ല്യണ്‍"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f സെക്സ്റ്റില്ല്യണ്‍"
+msgstr[1] "%(value).1f സെക്സ്റ്റില്ല്യണ്‍"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s സെക്സ്റ്റില്ല്യണ്‍"
+msgstr[1] "%(value)s സെക്സ്റ്റില്ല്യണ്‍"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f സെപ്റ്റില്ല്യണ്‍"
+msgstr[1] "%(value).1f സെപ്റ്റില്ല്യണ്‍"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s സെപ്റ്റില്ല്യണ്‍"
+msgstr[1] "%(value)s സെപ്റ്റില്ല്യണ്‍"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f ഒക്റ്റില്ല്യണ്‍"
+msgstr[1] "%(value).1f ഒക്റ്റില്ല്യണ്‍"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s ഒക്റ്റില്ല്യണ്‍"
+msgstr[1] "%(value)s ഒക്റ്റില്ല്യണ്‍"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f നോനില്ല്യണ്‍"
+msgstr[1] "%(value).1f നോനില്ല്യണ്‍"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s നോനില്ല്യണ്‍"
+msgstr[1] "%(value)s നോനില്ല്യണ്‍"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f ഡെസില്ല്യണ്‍"
+msgstr[1] "%(value).1f ഡെസില്ല്യണ്‍"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s ഡെസില്ല്യണ്‍"
+msgstr[1] "%(value)s ഡെസില്ല്യണ്‍"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f ഗൂഗോള്‍"
+msgstr[1] "%(value).1f ഗൂഗോള്‍"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s ഗൂഗോള്‍"
+msgstr[1] "%(value)s ഗൂഗോള്‍"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "ഒന്ന്"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "രണ്ട്"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "മൂന്ന്"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "നാല്"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "അഞ്ച്"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "ആറ്"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "ഏഴ്"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "എട്ട്"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "ഒന്‍പത്"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "ഇന്ന്"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s മുമ്പ്"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "നാളെ"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "ഇപ്പോള്‍"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "ഇന്നലെ"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "ഒരു സെക്കന്‍ഡ് മുമ്പ്"
+msgstr[1] "%(count)s സെക്കന്‍ഡുകള്‍ മുമ്പ്"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "ഒരു മിനുറ്റ് മുമ്പ്"
+msgstr[1] "%(count)s മിനുറ്റുകള്‍ മുമ്പ്"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "ഒരു മണിക്കൂര്‍ മുമ്പ്"
+msgstr[1] "%(count)s മണിക്കൂര്‍ മുമ്പ്"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "ഇപ്പോള്‍ മുതല്‍ %(delta)s"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "ഇപ്പോള്‍ മുതല്‍ ഒരു സെക്കന്‍ഡ്"
+msgstr[1] "ഇപ്പോള്‍ മുതല്‍ %(count)s സെക്കന്‍ഡുകള്‍"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "ഇപ്പോള്‍ മുതല്‍ ഒരു മിനുട്ട്"
+msgstr[1] "ഇപ്പോള്‍ മുതല്‍ %(count)s മിനുട്ടുകള്‍"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "ഇപ്പോള്‍ മുതല്‍ ഒരു മണിക്കൂര്‍"
+msgstr[1] "ഇപ്പോള്‍ മുതല്‍ %(count)s മണിക്കൂറുകള്‍"
diff --git a/django/contrib/humanize/locale/mn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/mn/LC_MESSAGES/django.mo
index a907bb017ab28809afff771f090323d7de197b02..972c3310356a8b86d4614c27804d9b30346bcbde 100644
GIT binary patch
literal 4712
zcmb7`U2GIp6vwZEBC9BZi1^iuwXzjvKZ+l)wJH`cBsLT%COjB3>`u3XyEDtoY)fNE
zpadZyq#9#<P@jAtm>9Poq+q*E)JI=tY<%_OQHdW35Bfl&|1)!Ux4Uz<-A?w-Z}0z}
zd+xpGoSEI9Hmv@L;Yy%Aj`rytjP=s@Rk-1bu4Zf-*a>b24}l%vX`z2E^zQ}#0pl2N
zzboJoP(lBk-~`x-{?A}Lxc2VAzXEPW|0qcMh|oU~{0^k`ZwhW+6Zq*B%!3^m{}_A<
zEQ341UqpZ1JwZPKwn2Xjq<x$Qu@!a&#MarDf|KAD^k={)K@YqW{9BCQ0x3lQ3f>mu
zY;E9g6-eW2L7KNtaJ?AcD7Xd0RMrNPeH6rp?ZE8|<l+TzC;Goef;euvH#ldnpbj3x
z_&9h3{0%$=_S_fbaU9%-{(|6^b%DRPLCVXAU?=zuxEs6)QXV?)M=rqE!GqvuU?2Dg
z_zKwl0AqW=cLmE}9R2^mUNF8MdjM_036Sjn0=vQFgTZ=vkj{SvL~2<H#8KG{xB>hY
zd<gszr1<;}Ql9<<Y2Gc6=G_+Kt1yY?uK{snwgIGhZG!D$d>e?Pur9$pAo=ST{bL})
z&thn#C(x)KAp7$Ge_xM)bneRag!n>hK88lm6vbCTqkU3sRxX6v-y`)A7Qepf`_pKT
z(idDi(ENP(z1odxxE<};n#2$ShV-*28p_76Yovp1MB`{whYzD|Mx&Zud~HJK8MJLe
zq!`jgvBo2Wf`|^QxuVt?OAhkmdM>A%#<E&QOG_-}YSuKfX0FbqM9NG2$uz?>B$jg3
zOgj==xq7mwW-N(yb6q!N-cJ_gx~&yt=1t{Oa%-vV$Tl7l?ND}QN;ro$muU?tw0THq
z%%07|N;q#emucag*<7Z{vSssTYB*D5D^n$DvUw9Rlp?Z}h>`?VB^9wUijKzBtcfQl
zZ59oulLAPh?W<LjLCee|Xd@E4>X3>pq)j8!;4cs>{)9<&Qf=LeU3Ew`_>ft&8r+d2
zoQd)3gqp9ws5+qO*&&Aw>cbiv#B^q;PSH|xj-J<6cSJK<&QWo23WI#4>d442LpL-=
zkuX6k!)$F>GnlQPVz$GaA$%-NV~&|oM{&=amIYg9#AKtI?PwOs{g!z`OFPPejPj;t
z*?1SG_}&w$ku@WSwSs9mN}rw8Gs<hltgQ@~DIV!RIH2@en(Dw-*{eEQigzWFT}oo7
zl6;OQ5~<{FCGlb+0Yl}mHmsA+I=e0<`8-c{rFQP#p1>7(L$w`cz)}r6r#hyU;_mxy
z**ot}xFv7gJ5%YF+!B8&7gLRQhK{SFs`Y9%uj;v2+RVQU7e=<IW;JC%Q}Zd_XJY?3
z9Z8E0IZh!JkB^Lu#2i{eAJk6849$rbf`i-fLOkQ2H=Ywt;&~(9S#_D>c_Y$ypl@F-
zKFL@j(rX%yW?<i=1q8rBy~hhVRX4hMdPucw&FMKhuwU6#v!lfaHA~rNq|J<OWK(?C
zaovgZ=P3Kie$&d^DQ*<}uHDns&4aH!QG;*o;mOWO-4BX4=3S=HOnB$qxmHIo!#j_8
zWAzi{a>MJ5ek>)Dcb1Y=?=LL5*S+)HyXcnOS#Qjp0!zs7CGO7r@RfVRovoX{B4eCq
z+?@$rA|7xz<6TB~8uxm)ty}sVaOZHai#%}TyPONTT%qB0x9m=N=O|-MTrF#{aMhh$
zxJrq~0jUDQkz3jX(VC@bp%Q2#vq;30ccIQp3nszA%anR|x^A+3#O6W0Hk4~~Ib4#k
zm5OJno^giDD6c81rs{SuW9h-V$|dUt!9PnYRcrGVn6_4j*iK88EtX!cT32Y+tPU$~
zmKkqeg2KU42FsKm0<&}pSN7OgongK5Cj-I5f$%(xd6(QW$L8kT^1@XV(sC9JGu>%=
zu;}g9eC{F}6x=oUYdnQzJk3p3Zf+AAS>(C4^A@e%^WOu__8=Mcd<}8Cfr!ahZeoGc
zmN09M;jt~blgyo_7aCOrf>!zavnU4@Y0)AI-h1vf?<{lYq0YPW4C%vLpZNo%%m(TV
yl6ofiaq!3dae4()k|r5eL7s8<x4`^|NSJ#U8UBIHdmmsa?C%0jiXRo)Df=I~f4IK@

delta 641
zcmZwEze_?<6bJBQJ<a#DQWKIWP%5H9@MS`T1kJg$v>1VzsfDkIeo%{65VaI^30lJ0
zhLC;?MYS}wy@$}y(9%->LE+N(*lp|Ld7pdE{f!@eWv%$;Q%(rYkLX6+BYF_iHhj=b
zH~=l_HylJBY9g}338=tH=@i6|k}{ux&B)WTo`t+_;kRC-WjU}a-H;Quq$TLYf<4F^
z9YGZen8sz!U=+Cxx9Ep4$axa-x+Ca-r%;1s$orf_g^ENMa>A7yxPv_L5xU{CtiMQK
z<@g(H!}zE43-W<2cple15cg}m)(80#JpR{O(P>WLg9nfc!G8fCjD4sB!Oe?kNAQb1
z2)@vNjSnOdQsUxC@pBwIyu!3A#}2hKlh5W>X+FQ6q4}k?6*A_?$Qv0^ckX)ha3mVm
zV?jMSs*i*t!{Sg4XpLfIIH-?^s@kQF8;iNw)Mjc$ysJY^@iCFqlI}#x$gZWbnbBau
x5I0&u9JqX9-xUzct-ZbGgIP6i&3m$T(77b@x>m7DwF<gnt3>9FwJqx2!VlTDV7CAO

diff --git a/django/contrib/humanize/locale/mn/LC_MESSAGES/django.po b/django/contrib/humanize/locale/mn/LC_MESSAGES/django.po
index 278ed0e360..382d269244 100644
--- a/django/contrib/humanize/locale/mn/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/mn/LC_MESSAGES/django.po
@@ -1,42 +1,65 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Ankhbayar <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-15 12:39+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "өнөөдөр"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "өчигдөр"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "маргааш"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "-р"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "-р"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "-р"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "-р"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f сая"
 msgstr[1] "%(value).1f сая"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s сая"
+msgstr[1] "%(value)s сая"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f тэр бум"
 msgstr[1] "%(value).1f тэр бум"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s тэрбум"
+msgstr[1] "%(value)s тэрбум"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f их наяд"
 msgstr[1] "%(value).1f их наяд"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s их наяд"
+msgstr[1] "%(value)s их наяд"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f их маш дэлэгмэл"
+msgstr[1] "%(value).1f их маш дэлэгмэл"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s их маш дэлэгмэл"
+msgstr[1] "%(value)s их маш дэлэгмэл"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f их ингуумэл"
+msgstr[1] "%(value).1f их ингуумэл"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s их ингуумэл"
+msgstr[1] "%(value)s их ингуумэл"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f ялгаруулагч"
+msgstr[1] "%(value).1f ялгаруулагч"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s ялгаруулагч"
+msgstr[1] "%(value)s ялгаруулагч"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f их өвөр дээр"
+msgstr[1] "%(value).1f их өвөр дээр"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s их өвөр дээр"
+msgstr[1] "%(value)s их өвөр дээр"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f хязгаар үзэгдэл"
+msgstr[1] "%(value).1f хязгаар үзэгдэл"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s хязгаар үзэгдэл"
+msgstr[1] "%(value)s хязгаар үзэгдэл"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f их шалтгааны зүйл"
+msgstr[1] "%(value).1f их шалтгааны зүйл"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s их шалтгааны зүйл"
+msgstr[1] "%(value)s их шалтгааны зүйл"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f эрхэт"
+msgstr[1] "%(value).1f эрхэт"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s эрхэт"
+msgstr[1] "%(value)s эрхэт"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googol"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s сэтгэшгүй"
+msgstr[1] "%(value)s сэтгэшгүй"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "нэг"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "хоёр"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "гурав"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "дөрөв"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "тав"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "зургаа"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "долоо"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "найм"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "ес"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "өнөөдөр"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s өмнө"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "маргааш"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "одоо"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "өчигдөр"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "секундын өмнө"
+msgstr[1] "%(count)s секундын өмнө"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "%(count)s минутын өмнө"
+msgstr[1] "%(count)s минутын өмнө"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "%(count)s цагын өмнө"
+msgstr[1] "%(count)s цагын өмнө"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s дараа"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "секундын дараа"
+msgstr[1] "%(count)s секундын дараа"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "минутын дараа"
+msgstr[1] "%(count)s минутын дараа"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "цагийн дараа"
+msgstr[1] "%(count)s цагийн дараа"
diff --git a/django/contrib/humanize/locale/nb/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/nb/LC_MESSAGES/django.mo
index 80647908c5bb0e1544b5e7281f07a8bfe43fa8ab..19c28c3118356731e7b9549a9d36ca47e23b2c46 100644
GIT binary patch
literal 4091
zcmai1&x;&I6fR9P?!;(Jj4?({C2`G+o1PzQFmdAgBbx*QMq{$^=An0{rnh%yswQ1E
zyU8IZ{{Zn20!C1fMMMPkA|6C=1(6&i2M>xw@uDDtK|v1+es8+EXQsPWi>dy)zWVA_
z)qB<TcCT+)e~F<~QSV26{U*j{>3tm@D8==R?E{v8Q@|I1lfa9Xf6MY$E&d6tpnvZz
zF`fZ>XuoXn17Hd5?}2-P6Sv0pJ>YJ%&jN{Gw)_=~t3aCn7mM3B#CB#ac7c=VzYN?1
z`~<ik_=9b4x-D*3fxE!J1f+Fb1Y#-dZ6KD;-m~~2a0l8S0Urcj1Kte$&G!EeBp3Z<
z@o(GDCSrT*fYd($q;Z=pZnphfE$#qfDBA@jeG!Ns+mFX<h{a<-+V{0W?8kqA`_P`+
z7_a{fko<em;=8~a+TU2*czYa&86fdpU<vpJknDVE+c$vZ_nn(!KRyK{ov`={&_nxU
zi$4LU(B5`O%s&Gp|0^JkyJY!KZTnZ--hO91&oLm)9|Fn$uL5cRmw^<AD?t3%n|Ry>
zd>;sRu+M<x&(DFR|H9%`+y9kqUjvezuPy(r#qVtYbs)|ABar<6Gmz}w0OE+TKY%n}
z8I}6!`=Il%1r=Kvl)Le~7qt>M2hRuWJFRUeDt%Mr5Aq$^-GiDGxRAl^gR&V<@+Xyt
zQ12VO#b=hj3-aw~p)*YJdSrwoKOyX_h&q8v`@=TaR#c8k`@08qJ1U*&(XtJVhfyge
zRB+4&g?zYy-X@Dney1-=<ywo+hn-HS<o|L_(Qqi;Y@k%2I%6gsRM%n8#YrU{N;j(-
z#-Vky=lXs#a;VqlL+P@9uJ7ix=(*%;(&yc3Cv98{&yhM8T^Ey&q2?|w6GF{%L^gVw
z=b3!mG<R|Nm}&0fT+z~eEjAx1(z;kjm^5F5%!P=Q4$={zl=9&#**Ajwfx?&5P<?4i
z<Uk_zfK4T>NOj?~Wrr^9^09=5lFf|0m`v<hNjhjaZ=y@Pe90G7KgyUR${Mr%>42fF
zSd?~%Fjz3G6)p+Z!f+;i(~ta)3A<wbWU(na#>d9V4ep-QkZdv;O2Nnz3K%t+7E3}h
z9iC^}FtdPPBm^_6>0iLJtD*>6v#i(!p^b=$J{74&(J<bLruU+VH15JWKf374Kow4l
zo{EfjQU_tvJJJudH>c{naO(LvZ#ELXfz~_f8&T)e)!MXIeblQR;MHoq_PAF)Sgk_n
zofb<W+05vwhj{Hkefr>36{Ya3uZ=es`BHa$qoO)rRI=Ss{D~N!4!VBWDK}L2Nl0bT
z_XFY03BOzC&#7ox1R;WRM76uCD;-{3Fs4_pRF;>Q%Z5ybEpfgqg{k!7jp|CT(j4rs
z(y_)Wa=ubZP1m`cFPuDa^4QQHwQ{vEtE3SU>%7pzh7HblrPuL8d6+jA{74Hkb9U~y
zcW9`i$y*}wj>(2<hBB!0L-V02oa#`tz2hqCYE0D|H1*8%VIIHE6eZt1!)v9&SOOW`
zBtAksn!FNHL}PSQXve*tvKe*e8l$8bQyE?ME+e7kGRpjYM%t9ks8!o_@uzG?-ClBM
ztr0#qB7eWpdfH1VpBdq}=4il>&gt9QwFfOyJ~QG!{^}S}+WavZ^&vH;OJkd!1Il6c
z6pSe|(N411m?j(PG>?s`(s+){nQ~*wG?pXElp9lyL~%qr!e-QI1jp1VJEk6nZ$vyK
zGukwAW8#z@Q)i=@{*?ihFeXl7hU>72%Xyd=2DuHlu<aO8wj!U))fJaE=^{1GS05QJ
zYd5CH>{?|qc({gCn{)}uDHG+45}B^lYLYQSbFnJnS67Tdk`rBIyGUR+Npee8oV1ex
rWh6948()1#;@=g$*hfZdYrK}3frXGa{QyrSvH-3$3h%+{O2qyJ<M&V*

literal 1223
zcmaiyO=}b}7{{ZnZ{vIQsE{7SmXhsGTVb7ci}VeuR%=-cq6q0ucAD*MvShNmttUYc
zJc!^69;62k74_iBqk^zsK)-<B!<+xqwAH$3$dh04pMR2PW}fdo-7g5*X~Y@CC&XFA
zojn-PzJlk$Z=OHEeyn@<60#4x0(OHpJQqQ9a@()(f?Zgby`F$>U)Ae%uUpTSe}2#N
zK6nuRhoC#>33v#61`6b|4h~@5g(O^FgPylQch3XR?Rx~GlgAjajXVXhl{^RC^Os(K
z<=5*VI(hB&H=b`n=YJ2n^FM$tzmK3h?=!d``~tdroTmrjH0RrDM=^2dxIKpv?)wJ_
zY$K--uAM|2N4WPrfjENb)Q)-afaAHoCQlopKNnW$l1x*n)qk~G2VW=6nhwToQOIQ3
zl8S5!Qqc`VR7{jqf@p+^NhX>?kxZ_V%o4kdZiFCK$9xTAO&g<I#I`h96PXpp$@4~6
zMcK01m@NvE;Z-6!Rplzt!Gfr3W7%Am$e2wul8lvfM1%S3B{pdUxA3wlZbd|g@?psG
z!z{c&!{I0_u>43q4<lO;P3g|u<;#!Iun-Mj9LS>uS9xYx$#9jW+-eii%Umg$(J`a}
zUP^_GMVgbUqQ_xYNrNYXl?1Ov^qMv;kw~uSgkGt&H&Qw_9?Z?oP4B!-n9B!~T3MlR
z%UT`jTCr*e>nWFNl$Mvd$%HN5EX}aOj?ZON5r$2xvW}%nB3f9IcKh~-s-<8)Z5W=i
z8EtAAg!<+(D-Mm)U(;frqP;~L_6L7d$L3$>_*=i1(UvI8-}0{N@>R3T`Hwn;v%O(0
tN=DRBJ4TQks)n@RDNM3z17)+4VVWZr&m@g`f)Uk{pqQ-2JZWzj@)O0b5qbas

diff --git a/django/contrib/humanize/locale/nb/LC_MESSAGES/django.po b/django/contrib/humanize/locale/nb/LC_MESSAGES/django.po
index 591af2a488..f2a32a6a57 100644
--- a/django/contrib/humanize/locale/nb/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/nb/LC_MESSAGES/django.po
@@ -1,42 +1,65 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+#   <jonklo@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Norwegian Bokmål <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-08 14:27+0000\n"
+"Last-Translator: jonklo <jonklo@gmail.com>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "i dag"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "i går"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "i morgen"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f million"
 msgstr[1] "%(value).1f millioner"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s million"
+msgstr[1] "%(value)s millioner"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f milliard"
 msgstr[1] "%(value).1f milliarder"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s milliard"
+msgstr[1] "%(value)s milliarder"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f billion"
 msgstr[1] "%(value).1f billioner"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s billion"
+msgstr[1] "%(value)s billioner"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f kvadrillion"
+msgstr[1] "%(value).1f kvadrillioner"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s kvadrillion"
+msgstr[1] "%(value)s kvadrillioner"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f kvintillion"
+msgstr[1] "%(value).1f kvintillioner"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s kvintillion"
+msgstr[1] "%(value)s kvintillioner"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sekstillion"
+msgstr[1] "%(value).1f sekstillioner"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s sekstillion"
+msgstr[1] "%(value)s sekstillioner"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septillion"
+msgstr[1] "%(value).1f septillioner"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s septillion"
+msgstr[1] "%(value)s septillioner"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f oktillion"
+msgstr[1] "%(value).1f oktillioner"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s oktillion"
+msgstr[1] "%(value)s oktillioner"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f nonillion"
+msgstr[1] "%(value).1f nonillioner"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s nonillion"
+msgstr[1] "%(value)s nonillioner"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f desillion"
+msgstr[1] "%(value).1f desillioner"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s desillion"
+msgstr[1] "%(value)s desillioner"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googoler"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googoler"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "én"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "to"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tre"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "fire"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "fem"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "seks"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "sju"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "åtte"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "ni"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "i dag"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s siden"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "i morgen"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "nå"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "i går"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "ett sekund siden"
+msgstr[1] "%(count)s sekunder siden"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "ett minutt siden"
+msgstr[1] "%(count)s minutter siden"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "en time siden"
+msgstr[1] "%(count)s timer siden"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s fra nå"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "ett sekund fra nå"
+msgstr[1] "%(count)s sekunder fra nå"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "ett minutt fra nå"
+msgstr[1] "%(count)s minutter fra nå"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "en time fra nå"
+msgstr[1] "%(count)s timer fra nå"
diff --git a/django/contrib/humanize/locale/nl/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/nl/LC_MESSAGES/django.mo
index d103acc16226e928fcc6c3cb276955d0a7097288..8caabe9eb62d423260aa5cbf3112ea1467ff02ab 100644
GIT binary patch
literal 4045
zcma);PmB~r6vj)zKRddDpdu<#h$}NLy)y$MFt|opAR&=}xEMKbD5h(Ad(%@rbXV`}
zl5isNU_6-+qv(kPA;d(y=!JM#ZypRMZ%X3Pi-`v{n&|hsYkFq7Ya^Ad{!M-L`c?IN
z)&2ITP3x~Pv<CWf=%3xk*c|;{hYMPDJ!8AT8aNHU4NifVjDF4N-y8k`)-k{HfsF5f
z4#t-aZ-F(8e+GAg6Axzo9dHN6XF$^XM!#yf3ex(&8g6+g^D}4I1*b6oG57*_8{7@v
zHRH*LvvC954*eWR`?v&RE9^Rmt+Ou-zXG>n{5AMIcn7>6{LRe&4pNBzH2lZRvx&^#
zI*{fkK)P?zaHE;uY`7J~t!z6;_EivnY&R~SA{VcMyD+{}$>RAJNY7b&B-2lV6z{&_
zb))|X)}a4u^xC7@_$)~NE`t>3o8UC~14!}z+vwXSGyP4&E=cyDfVBQ?qyJ*Y8y?H%
z_kp`He-?Zhd>@<vZyEhANcT@}VC+S3FGz8J&+we#dGK-Q9=H))0TB-N0Z94!5Tv+%
zWX4y_{8cml9He+&Gx~MI8z8NB6U5PAUxGMN>>Hzh3sOG518F_lJB{i6p!2W^9gmQ<
zCvbfly`Bxz>o)V7)_xY9-YLq1gHG$v*&H;4jv?G>qi3W%P@}j!lm5zLNqM1|jW#;N
zln;vWpi#V#ZdOIdu}R~E$6%Y$IXcDbDfBJqbf!n!lNh{&PG^G}j#=6$Rum^TRb3K6
zB5O0v4nOY)fgh^>)m+)OSlU%D481TIb7_&f7JoKPh00=SSHrfp*xJ<#iEtx}_1e0x
zY~C*<c0HCooB5jZvfbJ$Yum<4VqD6uO)2Lv<~FU6!kCwYV)kNQR?2ycxlJqQEao=N
zmaUktrIs^Awl>w0rkJlGmQqBP7SWQRToQ<tO0?v{3-RW(!$j#C1(3uzRdbV06m}7`
zzQrz|64*jJRBpjvCJy`=ll-RPx&ym>N+`Y%CQ-p1NyeF(&u<v|%8c>}>3a*Bb^ImC
zI=G!Fp_51i+V9HsQ&m?6THwJc4ECAak#d>xm1Go&5R6<F%O$B;>@TxeGrfSnNJ^$d
zSFGUL4WkIQx*xI?8EYAld@2eTWm`MPUFTgH#rPJs_>o1Sys&aw_QFUzCt}Zcox_P2
zJM&?SS5BRrcjh7~G;EzCLdzE4(`fE-8hf4QE4<NYH4i$C{f!0;ozrs3C!Yno#(v&B
z*xGk+x`9@COT^llkA#W?p~I-f59901UlV~`7Rr^;l28#=Q=U|BcwONKGwrbZI&M>5
zB0TBLOVP!q6Ww0m)dj74t$MxR@6Tv*>38JvjFP(E%N{hY_v&u?eD%OMsH>n}%iXoO
z3Mwa#pEx><M{}l8nG2Pc3j18?;ej>IcfA(~UmfD@1rfzk&z_k-<{TK>(c&E$IY(7H
zbg}ssKXBgHl~Vy_+c_3S-55*t(qTNi=Mc|+&Q=xQG0U5^%2)xxmt;{O!=ts!rkS_7
zWV@DL_=r(Sv`Dm4h?7-Zy{HXVxpzISL6+UxbyVw;txcoPN@>GZ(R?XO#%t-RlVT#Q
zBJHafhoY8Nh_NTKDTAnvE}MV13wIZiXRlIY`^r`v-RaQxy{Y9~<rS!~yJD`=dR(w6
zr77kX$(Ents^j}ErN?+2k7qeI14T-e7NSIRPX^LWUxe`rrSh2(V|=%`N=j8qaWg@t
zS)q~n?ZdKRX2v}a%uB9w>k;1x>Q#BeqbluSbUa+0RO3ptQLmQ##SShq!s85T)X?`p
y87$6}#K)T9;a6|0-cU@ki)m%LC}aGV4F7ma24hzUkD)A)vF@W(c|O%8jQ#`Ky))qe

literal 1218
zcmaiyO=}b}7{{a5xADDtR7?+Ii=@u971n9Dh<%Z&#kH&jQG|3SJDX)TSu)w(ZV#dt
zJ&A(oK`40f(1SNGiYNO8^b7bk#GC)r*lO8g$dlhZ|9K|!pULyRzwZ^nIE6Tk_>4G%
zxW5Yv##it>_|5YtID~v)Hz9k$8(<%J+j9}bB=>y&0NjJT;`J1C&(*!&^t$!z`1>oK
zkH7<{e*(IFo`VO$m*8D^Sp}WHAGqmw7G@l;fzFrqw4PlMkC2C;^YPg8sn?(R`~~RV
z_uA`kJXb+X@)pZ}@Ey1heDC!Sp!53?guRV-^n<R(>3_x%T)6$6mqQ5m{{sXbBPS7V
zoIo5yxbHoVIE?5uj(XAgA?F6$JZp)e;iyWNWR^*-{;M^5)b-M==~1{T3Ypd{smit>
zRoyZ~B}7Rjh(?%%<f1JU$>lQ1EwMFBBLuNJ;a#i^ZH(>^+tH*eax09JOGej4#j?4C
zEeez4Q(`(@=PK2~f@o@E*?gYLgk5c=IV<a!2BlkNHf032sAbdKikOasQN+Sg7G0vz
zXdD$-I2MK|WDBA#-JaX(!Z8{Z;?c_&LX6-h&n+t(uJVjqZDM+zD<yL}0UO|zOvprJ
z!%|iCB#Kqq;;CR|!5gsJvXvU0m<;CU=4ZCPAQ}#XDXpwf*ty$;MJtx=#b(B(8mE;S
zH@UFIJLOqc*s605s=}}tRndu5X-o@C(r&&nrYZ|cS<CQ@&1%!gAv8DAyf`vWe_s{{
z6&)zjXejunBXH7njsyC;b9T}+j&OV3b`4!u-$~;Yv`Aalt5}2~Up^5fQtY|Dw!WrZ
iy0XzFD<XFZW@4luZLSi|Q-UUO#kPaSNu}!&WWNA2#uDcM

diff --git a/django/contrib/humanize/locale/nl/LC_MESSAGES/django.po b/django/contrib/humanize/locale/nl/LC_MESSAGES/django.po
index 4457b47a7e..085a105c8a 100644
--- a/django/contrib/humanize/locale/nl/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/nl/LC_MESSAGES/django.po
@@ -1,42 +1,66 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+#   <alexandervanratingen@gmail.com>, 2011, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Tino de Bruijn <tinodb@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Dutch <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-07 19:59+0000\n"
+"Last-Translator: Blue <alexandervanratingen@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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "vandaag"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "gisteren"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "morgen"
+
+#: templatetags/humanize.py:24
 msgid "th"
-msgstr "º"
+msgstr "e"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
-msgstr "º"
+msgstr "e"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
-msgstr "º"
+msgstr "e"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
-msgstr "º"
+msgstr "e"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f miljoen"
 msgstr[1] "%(value).1f miljoen"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s miljoen"
+msgstr[1] "%(value)s miljoen"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +68,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f miljard"
 msgstr[1] "%(value).1f miljard"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s miljard"
+msgstr[1] "%(value)s miljard"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f biljoen"
 msgstr[1] "%(value).1f biljoen"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s biljoen"
+msgstr[1] "%(value)s biljoen"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f biljard"
+msgstr[1] "%(value).1f biljard"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s biljard"
+msgstr[1] "%(value)s biljard"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f triljoen"
+msgstr[1] "%(value).1f triljoen"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s triljoen"
+msgstr[1] "%(value)s triljoen"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f triljard"
+msgstr[1] "%(value).1f triljard"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s triljard"
+msgstr[1] "%(value)s triljard"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f quadriljoen"
+msgstr[1] "%(value).1f quadriljoen"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s quadriljoen"
+msgstr[1] "%(value)s quadriljoen"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f quadriljard"
+msgstr[1] "%(value).1f quadriljard"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s quadriljard"
+msgstr[1] "%(value)s quadriljard"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f quintiljoen"
+msgstr[1] "%(value).1f quintiljoen"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s quintiljoen"
+msgstr[1] "%(value)s quintiljoen"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f quintiljard"
+msgstr[1] "%(value).1f quintiljard"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s quintiljard"
+msgstr[1] "%(value)s quintiljard"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googol"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googol"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "één"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "twee"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "drie"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "vier"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "vijf"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "zes"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "zeven"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "acht"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "negen"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "vandaag"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s geleden"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "morgen"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "nu"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "gisteren"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "een seconde geleden"
+msgstr[1] "%(count)s seconden geleden"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "een minuut geleden"
+msgstr[1] "%(count)s minuten geleden"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "een uur geleden"
+msgstr[1] "%(count)s uur geleden"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s van nu"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "een seconde van nu"
+msgstr[1] "%(count)s seconden van nu"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "een minuut van nu"
+msgstr[1] "%(count)s minuten van nu"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "een uur geleden"
+msgstr[1] "%(count)s uur van nu"
diff --git a/django/contrib/humanize/locale/nn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/nn/LC_MESSAGES/django.mo
index 93e4fd49c614e03172795509df9cfc2ffeb5a715..290135e77ce46b9daeddfc8cc21aae57525dda16 100644
GIT binary patch
delta 318
zcmX@Z*~T?tPyJ#>28Ovz3=G-~3=EDe3=En;Iu}Y$2hyxS{y`wk45W_(X&_=a4J3ft
z7%l*5pjL)UQ1Po!@moL|r2Y<6`~g(_DU^N=m4C^?AP2VKEl_|1sNpk^1{wGVNV5Uy
z|C=Kjdl*fPbPbGk4NVjb46F<-bq&l747dXPb%RpNGK(|w^K@MjOH!>Aj0_Bc>Wo0@
z42`V}EGA1a%dz>SW~QX(Og3jWchkryDJihh*Do(G*DEPX%qz}JORdn$OD)kaD9X=D
uO)e?cFVIiPO3X{o*UtfxrHSdO`gwW!np{3mo|Qsg-sBSI=*f4OKL7x6@<i4E

delta 260
zcmZqUI>R|(PkkmM1H)V<1_o^g1_pK(1_n(aZ49Mjfix?S-wvdifpjmB1|o)uKmw?Z
zVH%JIYGs%K6`u_iUjU>*>K8%9mqEo>L+Q0p`SmOea$pNK0|hvM8g>F{kb#GQG#ijU
zx;c`uhtbqf*T7iU&{V<D*vimC*TBTUfGfaXHz>6%vp6$9PuC@}B-Kj6$iNV+&cH;$
t(89{ta<UY&++=%ZGd3H){Jd1V$-9}Od3+M{(n}N5fvWTJCX2Fs1OPoIDoOwV

diff --git a/django/contrib/humanize/locale/nn/LC_MESSAGES/django.po b/django/contrib/humanize/locale/nn/LC_MESSAGES/django.po
index 611c6c25e3..3d3fa52e3f 100644
--- a/django/contrib/humanize/locale/nn/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/nn/LC_MESSAGES/django.po
@@ -1,42 +1,64 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Norwegian Nynorsk <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "i dag"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "i går"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "i morgon"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f million"
 msgstr[1] "%(value).1f millionar"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f milliard"
 msgstr[1] "%(value).1f milliardar"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f billion"
 msgstr[1] "%(value).1f billionar"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "éin"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "to"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tre"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "fire"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "fem"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "seks"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "sju"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "åtte"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "ni"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "i dag"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "i morgon"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "i går"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/django/contrib/humanize/locale/pa/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/pa/LC_MESSAGES/django.mo
index baf4ff0e566e92d07199f2b1321e0f935e729095..e70085cbc06921ccad431d8e029a073f0eb5a9b6 100644
GIT binary patch
delta 319
zcmcb|HG_M?p8Ca%3=DIb7#M6B7#JK`Aap&H-V3BTf#ScRG%G8F&kv;8fZ~!+S^+Aq
z4&@s{`4&*V6O``>rGtSq4^V$BD}x-^f-I;&36KUE+z6!kfpo{_NX8yUQzKmiV_icN
z1p@;sLrYx)a{~je0Ds+})UwRt%=|oEm&B4(D+MD1L!de%kUB$SD+7zkQp|E}KB<{0
zsX3F)na$laGD=Dctn~HE%ggmjiW2jRGt*Kl^zu?m^b3mevr>~wiuDWhQ?e5C()0Cm
gfMjW6da8awqP`}V50q!6P>?veggJWi9p)xR05DcOdjJ3c

delta 261
zcmbQieUEFxp88Bi28Ovz3=Fmm3=Hfn5ZV<=Hv?%-p!h*3eHuz%1=4Il@%vEv8C3i&
zl>Z&d{|DuButLn?htiTjng^&~nUz5fY=Hq(zzRr%40Z?7{6N}ob0lLAqp6{;fw8Wk
zse+-gm7#^Mfr)_uSAf56P-<Cbab|v=u1jJ`s+EF~fgxC(fr)~lg_W`8WGQC3$@a`<
hY&L%Rd8u}jcQZ%x_$20~mnNnIRTm^~7G-H>1OUOdDDwaS

diff --git a/django/contrib/humanize/locale/pa/LC_MESSAGES/django.po b/django/contrib/humanize/locale/pa/LC_MESSAGES/django.po
index 25b37bf04e..03c2929115 100644
--- a/django/contrib/humanize/locale/pa/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/pa/LC_MESSAGES/django.po
@@ -1,42 +1,64 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Panjabi (Punjabi) <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "ਅੱਜ"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "ਕੱਲ੍ਹ"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "ਭਲਕੇ"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "ਵਾਂ"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "ਲਾਂ"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "ਜਾ"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "ਜਾ"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f ਮਿਲੀਅਨ"
 msgstr[1] "%(value).1f ਮਿਲੀਅਨ"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f ਬਿਲੀਅਨ"
 msgstr[1] "%(value).1f ਬਿਲੀਅਨ"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f ਟਰਲੀਅਨ"
 msgstr[1] "%(value).1f ਟਰਲੀਅਨ"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "ਇੱਕ"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "ਦੋ"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "ਤਿੰਨ"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "ਚਾਰ"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "ਪੰਜ"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "ਛੇ"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "ਸੱਤ"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "ਅੱਠ"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "ਨੌ"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "ਅੱਜ"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "ਭਲਕੇ"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "ਕੱਲ੍ਹ"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/django/contrib/humanize/locale/pl/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/pl/LC_MESSAGES/django.mo
index 0b128481564c5b3b66416f8154b9a5509b8d3f7a..da651482a6e931e59056088731518e55f26c2991 100644
GIT binary patch
literal 2742
zcmai!J!~UI6vqb$9GK5L;P^UV_(+Jwt-W@leE8xEA|FyD!bL}p5;XCS*BjO|*6!Gj
ztrRrqbQJ|46hTRabTrpfK&WYHpn>8js3<Am|GZ;6Ua!Px-~M*~^WK|}-F?4ZnE8UC
zy#l)gd;K29is0pYaYMTcz5)IT&VuLfOZv-T9{mr&*T7pK<+yG8KZCEL|2KFUyf~Be
zH$dvw!I#0$K+1CmydV4(#KnHMybC^u{$Jor;5j(a(&j+&%Y&GL6)ekkd<n$GR;|8n
z^$p8y5Et9Ayaqmq{tb}weE>cL9)Q2#OhRxS{jGD1t%09d{$TkpxC(s@NtVEl<!x{o
z{Xf7GcnL`>;Je@=cnhR_-`oB_Af{q&j<E;8CCe)K82X#wqu_fWty6%wn8c0ZT9zG<
z#*abD^D&4evYQ~C+ovF%<L9>jr5*noq&(k%6#uQ&zXNd$>=782$T;jGj2gYiVZ%1r
z<1l(xXB(~kX&B|C`KdjeV6Y#0d=f_Q`UTiiFj~hmuoq#}o`=ylN{!Y|`*{LJ`?~<6
z?+?pl=V8>IO_1DY=Q|>7%Y30!=LbO;23oQI(|oOc9ZtAqNX?9FS(=G59H+#1YIRvk
zY8f$~64EP(`A`vfQf(u-@HO^U(`{w)G)!VVP)9EHNH@9C-3-6ckl?YbY2~HzCE_rj
zbr}VX=N<ZuhJ@k`-HuY}NV3W7_$XkUD{&eP$iQzHRu4Lo)e+8=FzrZ$CTPl;*?CWf
zMquM~4A~>2M9O0-P?FI}XfX0vEIU%MI5=XlVWxpAl9Czii5~7v9YydpUCnwjHZmf4
zFVcsyW}F?*d0$2`zQ79KJQT{;x$Cl}BjfDGe&9K8xBb}J*A<@IySDFaL{b>|I-A1C
z3NO2*vg0l|rA6+#mC~x?F1s!qo$Im_P|gXzGWnGjD(=dgE?Vv#5gTVe5-JXb(NTqC
z_I4<uS`gJj$=7VRko4d3n<5AcHQl_5NO%fgI{Q*ID|}CfLEPZ;4P#oBVzJxp77V2g
z>hh?dq$#$N&Bn!6(Hrcs7}^ZQR#?oB@>O^%%<b;%ZjH~RRB&?}S{bRZ)?N#nHu4A=
zLlLMeyw(s=EKT*s{<gC+_M^$`GIF+5O?!dzD}3c3FuA>u-ng@^qh?&;sx|1w)rBjV
zmPV@cs#-1ab?$Nu&z9V))iR%(8$7O67wK`HWOuFP^5f%yPCjlPF(t&5^SOxvfxj#e
z_&(0o7OVBL#2@d_&o!=1sUMljRU*j@w{$Q~l&WiqG(ELe>0ngFbZ{a~1}ECt;6Z7b
z*z`ylhmNGl$kcX+g>1app)whk+GvtotMqiqCI^-6^aNi~vyDTXD0sb0H4*!^44$4a
zJf;IPG!%u8+RB@rD$%FrO61XG!|2J(Ha1ISzV`Zonw}4z3=O3BW@Wn$>}eQ3nLJT@
zSt8SMAe*ceoSvNCWVJpj8=d*ElnzdKa8^TwIex&f7THZg5Fq;OP<kkyPAxzI#bcAj
kefiT@$mqoV9&=DZBM@P6AP(7K+eDgqUBSAwzK)>$2MN#4o&W#<

delta 694
zcmZvZJxd%x7{^CX&$#g=UQQ&SFjgkWgxNa<T`p>fAjCj?BPkSN@#fY!)>*mTQ?NN9
zB$gJF6c+gmffT7yTF3YW%oj+NPDtVZImgb2`Oj~jd0ysO_Q&vr*SacnePOU7Gz$HM
z#-ObZY_Q+p1bFFq4L*ZE-pN=uxD0lItB&tLEVk+VZ7>Ia$K6LD)zxqBTWsG2GRH%g
zaO8LlK0v`IkQ$wWy`Tj@W0<etJp2--sDKT}Zy-JN7tDkI9Irv@LqU(VFg*^GIEak`
z!ypwr0ee6WqJ}*M@fH)#mo7dHVzC$4sQ#6^Uji{-J5~UxCw<7B_2ZCR$3{&bLi7tf
zh#q?kkqtqE5Pk6@s1Lf&2HYhLZ2xzT+umH!zHh5EqI9&Iv6?<mtd=wz%v71tMp?i6
zL(3PkEc|Kimji!B$SEnkmA7I|9q3diMl6Pz3V2ES?L0Zf{h6RVJ1Jq_n=sA9Mk6$7
z9A-%);IBhtbjmCBHWy;0t15o3O)Z&2vWc2uq{M~__X56>#5&#Om5w?4F~8Y&7Y+D+
fZ2#oH+h0A#O0PH|BF(BtS{>^1v-1<%^j_Wovz%cq

diff --git a/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po b/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po
index 3f79a7d6e9..7fae0509ba 100644
--- a/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po
@@ -1,37 +1,53 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+#   <angular.circle@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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Polish <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: angularcircle <angular.circle@gmail.com>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "dzisiaj"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "wczoraj"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "jutro"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "-y"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "-szy"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "-gi"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "-ci"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -39,6 +55,14 @@ msgstr[0] "%(value).1f milion"
 msgstr[1] "%(value).1f miliony"
 msgstr[2] "%(value).1f milionów"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s milion"
+msgstr[1] "%(value)s miliony"
+msgstr[2] "%(value)s milionów"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -47,7 +71,15 @@ msgstr[0] "%(value).1f miliard"
 msgstr[1] "%(value).1f miliardy"
 msgstr[2] "%(value).1f miliardów"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s miliard"
+msgstr[1] "%(value)s miliardy"
+msgstr[2] "%(value)s miliardów"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -55,50 +87,238 @@ msgstr[0] "%(value).1f bilion"
 msgstr[1] "%(value).1f biliony"
 msgstr[2] "%(value).1f bilionów"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googole"
+msgstr[2] "%(value).1f googolów"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googole"
+msgstr[2] "%(value)s googolów"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "jeden"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dwa"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "trzy"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "cztery"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "pięć"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "sześć"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "siedem"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "osiem"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "dziewięć"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "dzisiaj"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s temu"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "jutro"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "teraz"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "wczoraj"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "sekundę temu"
+msgstr[1] "%(count)s sekundy temu"
+msgstr[2] "%(count)s sekund temu"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "minutę temu"
+msgstr[1] "%(count)s minuty temu"
+msgstr[2] "%(count)s minut temu"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "godzinę temu"
+msgstr[1] "%(count)s  godzin temu"
+msgstr[2] "%(count)s  godziny temu"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "za %(delta)s "
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "za sekundę"
+msgstr[1] "za %(count)s sekundy"
+msgstr[2] "za %(count)s sekund"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "za minutę"
+msgstr[1] "za %(count)s minuty"
+msgstr[2] "za %(count)s minut"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "za godzinę"
+msgstr[1] "za %(count)s godziny"
+msgstr[2] "za %(count)s godzin"
diff --git a/django/contrib/humanize/locale/pt/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/pt/LC_MESSAGES/django.mo
index 5b43c02be25c168c6d04d0557197125638c8d41a..60de6e928cb4e42a672a4bca77e0d48e28ec4c52 100644
GIT binary patch
delta 318
zcmX@k*~&FxPyHN528Ovz3=A3!3=CE*5IPx1YXSK^KpKb`wgU-PAiW1jvjOQtKpLop
z;Utg-B8D?i{zWK#1uA|WO5cHsKZMdxfHcUw=PV3zU<2L)1=xWCpMW$FG5mrm_`f-l
zv4_#rNY}tv*U&`4z`)ATQrE!Tz<?{jUpFYVEVDQ>KTp>su_V<>!N|Z6sLlwa&d}J(
zz+$o#vmBdGYGz7m&SZ0D12>I~l9B=|ef{$Ca=ntG#Ju9nwA2c{ywno?f};Ga)Z~(4
q{Q~`zti-(ZeEl3CS(=!hs$Wo|ugT>D<yk2dluXWKj-Gsx`5OQLCq!ZZ

delta 255
zcmZqWI?g#^PkkIC1H)V<1_liV28KV(5L%Umfk6w%_XE;E#83$&Sb=mMkY)qYEkGKm
zg`pcr0}(?Xls_3tPlJljgwpe%;)|j5G9V2yZzT(Z9N2*MKmm53z!o44L=1bN3Jz|L
zWb9!yHPkgQ)-^O$Ff_I@w9qv$F)-i?@YfAWEz2y<%+J$xNi0dVQZO<w1gkSJQ82Wy
lGPay7#Vj}3o>`yC#%}T!=4fu8#Ju#<#B`v_g2}urKLE;kD0~0_

diff --git a/django/contrib/humanize/locale/pt/LC_MESSAGES/django.po b/django/contrib/humanize/locale/pt/LC_MESSAGES/django.po
index 66501dbf45..b0ba086621 100644
--- a/django/contrib/humanize/locale/pt/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/pt/LC_MESSAGES/django.po
@@ -1,42 +1,64 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Portuguese <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "hoje"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "ontem"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "amanhã"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "º"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "º"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "º"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "º"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milhão"
 msgstr[1] "%(value).1f milhões"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f bilião"
 msgstr[1] "%(value).1f biliões"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trilião"
 msgstr[1] "%(value).1f triliões"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "um"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dois"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "três"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "quatro"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "cinco"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "seis"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "sete"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "oito"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "nove"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "hoje"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "amanhã"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "ontem"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.mo
index 200081bd5c8e5660521b0d9eae27f0bd469b4222..fddf65ba0eee094c7083244ea61ae2e8207b385b 100644
GIT binary patch
literal 2383
zcmai!KWrRD6voG32pl+=ga9ES3=ju9X3d_B6tn&#D|RAT!onCs3zOUN-bTAKmzh~7
zrl+EesHiL?3ZS8&p`gG*f(8oG&>#w=G!#TaqC(<(yK{Hk-Ab%(?l<qfZ{M4lota-x
zjDN)NaI~}3#u%F=-iJRt--9oKKX~2)XJDVcpRpIgb<YHxg8d=*0{A8PGI+<^W8;;5
z9()e|H$lpC1AGAd7{reqdVUI?hW$Bs4*U*8Y4*F1-vyDH{o(nikN*WyzQ4WyAMYQ7
zlinW(DSpgz0(=PeNs#iL1s?`EcpGbR5uAqo&4U&1f)`;=9%Jl0xa9dBcmehYAkF^^
za25Q?$B(1P8tes-=HtK!ybWTA>_-r#*v}wJuwTGQ@Hg-bcn_rUPhfDQp9D#N3MBs-
z&vQQhyype)pY@yr>Aj|pUji{iw(RW<AKwHq{c=yBboo%-3E!t2Py0RxPx?O1?GdzR
z(I{{Cp>O#p+B0Z0-Y3wWLVFVJ1RAaVV`wyIdKzetm%VDgP?y%_xcAYTV2JFLx7pP6
zzQ_tWGuPbX*U~IYwfbLQUZbn?Ia4DXaoUl(b)Mn;mXCUBQukZ}dQ~{dMWQjmmM)Z=
zp(NzArMD;9Gdkx=->lK~LV{b_(kdRxS2?@+yrlP1ziwC83kk*Bx-diO$mNsyc<+UN
zu1eGk$TVp?wwLZpwujf560R^Jb7?Ner>0|>If04OGSo+UiB!x~swAV8(4dK#mHSdL
zo8Ds9G1tb=NXeXz#R2|vZ49*Tre+7yI%&wgZS-~7a=~UCyd#ap{)+g<b)gd7*pVG=
zT(D)6G!8Boi4Asj#2edh>;~&b3I}blA)Ji(eAt{1!iAvuDi6b``C1TO3PT8k9l4)U
z&H>##>6!~sxHuc)X}m713wDiAHWN;ph`%LNY&2iCC9U0GYipN_G@EPbd=+|?6e5wq
zt`vF1w=u{fDWsKr`mz!4r`Zf&j>{<oSu<1t&7u;lC0Zw$OpGo%b}(7QJMP`fJB_W)
ztt<VNXwHR=b*-FK7~w$&Q+4u|d!>_!R4wsVTNo?d%G<kFgT=m%X0j(ua7DFroT?<^
zi`P=u*v{xX2UoSpZNyclH0{d#60f=|(~7V1=1gPwfVYo6p))aX5wwrKl6Js}^EM(Z
zeZxXJb0f;i`Cn;y$_I4bGbkD^TORzu(OEuHvg@K;?W059tWLTvjsDRokH5C88|H#{
zgmJ0iad}f1F?<JT9GwwORl&-nQ1NgH@1+{PTa%zaqOQC~R8?tf42rt_cgRKgi8b#H
z32PKOb(*zOY$tZ35YEtU=v@@f939e5=s8BF|LxbfBXHf|PQloUoWX%@EAf|FGVnu|
W&+sX57ch|vh40Q{jVSH?oc#;voM%@6

delta 677
zcmZwEJxE(o6bJCreA%S+D;7#i3r`&Sp-<jx6zrpe6sH=fRdGl~xx|-vCETmYON1^d
z2wgi|I(F~W#Yu4xyA%qxrHhc_)Wu0$1VP0Aji;N3ocqhUU++BL&+K`+d6-RnBE%i!
z1LO|!A#(l(2E;G;2>xcz;1ksSF`^`#gbDbDorCz%Tdo&i9CeZB%g~-%xted%DlbIr
zI&XN#zK1t)-~+T5eS~Rfpg}XA;bYW3y08}DQ@8<bV_z}Y2X4X?+=4hlyD&jbqHjF$
zo&C{XAlhgD@caSWg7(5gUjGL>P#<x9!t19H{k8XIp?$c0k^j+&Kk*q1wwqf>`w22g
zoTEOZjb3Co(!OyI@;36i=;BG+i1{1qH%GC;-B6a7BPz*8NF`mbl3F4qRcMYA8ztZM
za;`t>__@FzbG;GI%S^p?r^AM<Nv+%o5ru*C%=6p(yb;GA3v$l~JwzriYLPoz6{=Pd
zk*)^LE1{IEIWJb)j#omt6jp|%DrwV74#cHU<{~*{f>fb9FI2fM%D8(qT6{TeOzO)$
aEh9}usfwD`>LRLY+S?|j8=<+M9=!z8ab;})

diff --git a/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po
index 1415420461..95ea208813 100644
--- a/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po
@@ -1,43 +1,65 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Portuguese (Brazilian) <django-l10n-portuguese@googlegroups."
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: Sandro <sandrossv@hotmail.com>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "hoje"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "ontem"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "amanhã"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "º"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "º"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "º"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "º"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milhão"
 msgstr[1] "%(value).1f milhões"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s milhão"
+msgstr[1] "%(value)s milhões"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -45,57 +67,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f bilhão"
 msgstr[1] "%(value).1f bilhões"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s bilhão"
+msgstr[1] "%(value)s bilhões"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trilhão"
 msgstr[1] "%(value).1f trilhões"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s trilhão"
+msgstr[1] "%(value)s trilhões"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "um"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dois"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "três"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "quatro"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "cinco"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "seis"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "sete"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "oito"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "nove"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "hoje"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s atrás"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "amanhã"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "agora"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "ontem"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "há 1 segundo"
+msgstr[1] "há %(count)s segundos"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "há 1 minuto"
+msgstr[1] "há %(count)s minutos"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "há 1 hora"
+msgstr[1] "há %(count)s horas"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s a partir de agora"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "1 segundo a partir de agora"
+msgstr[1] "%(count)s segundos a partir de agora"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "1 minuto a partir de agora"
+msgstr[1] "%(count)s minutos a partir de agora"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "1 hora a partir de agora"
+msgstr[1] "%(count)s horas a partir de agora"
diff --git a/django/contrib/humanize/locale/ro/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ro/LC_MESSAGES/django.mo
index 7478fa5766c6ab93afe3f94dffb46797146eb80b..b379cdad6cd6863bb0a827d348155d073c9bf5a0 100644
GIT binary patch
literal 2623
zcmai!&u<$=6vrne5O67l77B$xmzK0P?b_?4f@E8#Rnu0AL_~-TXC~gUGi5zvW@qyQ
z_0|*O%mHygaNvT3#D9Q95k);AA#vk?5D38mBqTV1#P_Yo>mON(k;k8%?|bv!o7vg<
z{>b#Z49!EIr9Q>jS>gfwq1^$`fL}ZQ0ah?Reh*`(z!k?1IEV2&;7RZ^@ErK98&6I5
z$IpQ$puYlAoHxOH!S_M@*oTfEgU2!c1bhbk5=3hDqqF}EA~gHW@potc6Qp>5IsIR!
zPeG*l(;(Sr91nr_V|)~(c(dRGpa*`Ay?7qHjPbAcF}4hzn_=t<_y!n)pMp!^FW^P+
z6oQf8>md1k0G<JV09U~hf}aPQU;}&`q`Y5&NX70tegi&)@ps@O;7=g={q5}kfLIzk
zQ0nV5jt4=M$_|4R?-)qyo^?C{(!7%(N@iz3@~?pu{{?3cK`cKz6DU1vH1Cjmrr1xo
zXAeB;p6Oj3M1LBc;tv|V%Lmb)M5lTlMSmRq82S-(%6%C9VRULppRJpo>AX;*I%!X+
zJ%x@fV2{y&+FW^?$Em1P>uqmS#<A4uf3<FbUy)`_f#W_g*_XFSnT(%!`;~&wxy0eG
zQY$>((O6(hr^;3+2#HCi<}PicyPncJ1%A1Sdx>ai6-~tJi-UO1C7(3RJMha*TzOkM
zH51`Ta>1NEpD>KocghVycD5{Q%Wc8hn9dZpso}AeT`@gZjznxZ7EaqxY{>(uh$*QA
zqn*&8iC7}Gg<^@^Wr<~W3qK<SvpV8?`0r|C;A?j@+Y^ZuhU9glZ-|!lS0n#5VG^9L
z(7SqrtBx*hh@LjqUrRbN@~@<w#Bb`*E3LoW^jD1F7QX&fZbj(L2laVBSn%uTy&wqd
zOMdWT5Wvyj5ZjVsj`_`#Uwt7A7S9G~rI&bO{ifk6iMiD#^b&2P@-AkmCY#(S!7q2Z
zT*lRw?k;13>ZH6Q{HEaD(A&^mt|Z=2dCS^fSgY;q>{KnqlWnnERl?SK{Z%HlUM<QN
zSBqVYn$fjN9x?QcF0HMuT^nvjy&9BOw6a2>$h{s`YsD@i#$2ikUTce+MA*iw&FlW+
z(2tV0h4HVcmX4(Agx=z&w59c!UbTN+n{E<%s+SFu#=-@!|JW$2Mx%Zy2+QTNnyUxF
za($_C^QId#8bRgs>9TqjtW++|hxJOOG<F-{o0A;pVD#2-nivx!LEk6&j_V{&+%TEM
zalS@_y7_eMMrHb(C+GLIf&lvs*`+bIfLs~oNxY)s`;H@}J7F|$K2wjYlT{~PQEA9J
zlzA)dda3H)Pb?b^KX`YOP0Cr>*&W9QGifO_8JjqM;}sa-s*T7ESx!y2T&kkmw<eSI
zb-~!sC7(J>=DZ3l$Tn$o8MWD;4TVh>&@UJ1$-f}M=vsyaO)OIPENe;ClB~zANe4OH
zC5c@dT$h-a?PDxB?!(koh<#2ONq64kJu3)_U};Q0YlLLDcy8Z%OS0}4AJI)3Y00E8
GlKlrn6{i^h

delta 676
zcmZvZyGjE=6o$tbS6%Nh;$1e45@cmJQ8Xclh@Ijc3nRj?nZ%Va8#a>&HW36H3yVcN
zAHdpHwDAG77kfd_N)RmkN5{^?{PXR(%$YOnUG!G3Jx9Xl1Qvycpc`ly+Nr|^djQA4
zN5xMt4nGzmqybz6!{D0Y7KlZ%%HIX+;X5i`0Oh&;-*}CbR6-~osDeYqBd`evPC(h{
z3~UAi@D#&bf^+cWm|_;(2j{^nP}aYK^1^q;4;BCV@oUH+D+@J69n|2rgIJ^o8}1;3
ziX$M-k{H+sj)Jm&0+fBGR6Ye_zMmcuP}azY{8<}5>Nl{-<}Hx?1v(^~cSF*;pbkjB
zxD#rH{<C%!lmi7%p;+(|+U{j;VNZ~}TV*8gReZv8gu9#tZ{g!T+q9CVJ!RO*v^`^5
zla{5gu9)kr>Xu!Pn+sI1w2`pv-?~Y|o=)3|aSNs|(Xuc%eag#4Dm*`J<S6GZD;gQc
z<AOS3P6Z}76Twr%fR<VIIGYVJTDEnG@<N3c(A@W~FSNe8ey=2m<8sF(B`W+1DKbj9
LSGhk9G(GhV4INwA

diff --git a/django/contrib/humanize/locale/ro/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ro/LC_MESSAGES/django.po
index f5489d02e9..a4da93f494 100644
--- a/django/contrib/humanize/locale/ro/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ro/LC_MESSAGES/django.po
@@ -1,37 +1,54 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Daniel Ursache-Dogariu <contact@danniel.net>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+#   <sorin.sbarnea@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-14 17:12+0000\n"
-"Last-Translator: danniel <contact@danniel.net>\n"
-"Language-Team: Romanian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: sorin <sorin.sbarnea@gmail.com>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "astăzi"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "ieri"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "mâine"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "ul"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "ul"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "lea"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "lea"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -39,6 +56,14 @@ msgstr[0] "%(value).1f milion"
 msgstr[1] "%(value).1f milioane"
 msgstr[2] "%(value).1f de milione"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s milion"
+msgstr[1] "%(value)s milioane"
+msgstr[2] "%(value)s de milioane"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -47,7 +72,15 @@ msgstr[0] "%(value).1f miliard"
 msgstr[1] "%(value).1f miliarde"
 msgstr[2] "%(value).1f de miliarde"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s miliard"
+msgstr[1] "%(value)s miliarde"
+msgstr[2] "%(value)s de miliarde"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -55,50 +88,238 @@ msgstr[0] "%(value).1f trilion"
 msgstr[1] "%(value).1f trilioane"
 msgstr[2] "%(value).1f de trilioane"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s trilion"
+msgstr[1] "%(value)s trilioane"
+msgstr[2] "%(value)s de trilioane"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "unu"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "doi"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "trei"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "patru"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "cinci"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "șase"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "șapte"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "opt"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "nouă"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "astăzi"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "acum %(delta)s"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "mâine"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "acum"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "ieri"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "acum o secundă"
+msgstr[1] "acum %(count)s secunde"
+msgstr[2] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "acum un minut"
+msgstr[1] "acum %(count)s minute "
+msgstr[2] "acum %(count)s de minute "
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "acum o oră"
+msgstr[1] "acum %(count)s ore"
+msgstr[2] "acum %(count)s de ore"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s de acum"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "o secundă de acum"
+msgstr[1] "%(count)s secunde de acum"
+msgstr[2] "%(count)s de secunde de acum"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "un minut de acum"
+msgstr[1] "%(count)s minute de acum"
+msgstr[2] "%(count)s de ore de acum"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "o oră de acum"
+msgstr[1] "%(count)s ore de acum"
+msgstr[2] "%(count)s de ore de acum"
diff --git a/django/contrib/humanize/locale/ru/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ru/LC_MESSAGES/django.mo
index 85b41a84a33989afa58d45507e5cd0c890c4f0fa..9fcdb887a14aaf6d6a8f45ac9700cee0a04f1f29 100644
GIT binary patch
literal 5757
zcmai1U2GIp6ut`nu*#31B7$-O3oS6+*@99R7L5fWMnc6xVxq=jce)+eohdW3EhLZt
zO+-^7YGQoA2NNHBGFeIqP-uC;_~OfK^jUp0(Fct&`hbbwnYp{2nR~aL_U<?LobP_;
z-gEBVnf+<`!p|5k9c>NT7xyvNNB0Zxfva;NW1E0oz%9TxfE~ay!v2-8e=qPKU>5!j
z4@CGTP(y!A;1ysO`ac6V02e(N>1)7s=pP1>eN@;l3%m=Y_`eBU`B0?OC$I|afd6yg
zdf+s0EASW5U;J>?*MVzce+NkOI0M8~*w;WzoqZ#40=NqO>%eD$4dDI2KZO4;Af@PE
zf%k-;EsFFO0Li}yNaGd@TqgW01g-*NC|e68ekTzBY%4zgMlD_dzD@l{7&{955cnGK
zci<7=jz=T=M*{x@+OQ8Sj_@vU2>qTVQU5ZK^fF7M@ns<OXMlTvtCum>4}1?u_A3IH
zJQnF37x*KP=2KW6*}nwRd={->tVrVpehakF?|eMMPl0cte^20%Cm6$&Ssh4um=^u-
zfS|A+1pW%7`ur#S_dgkpTMDFcYk=hM5dF=-4Eo!IeYe0qAhr;D6^K-@gFuS^uCN~m
z(l{50^s{a>($~>wKVX^RI6yeRr+~EIo7XeqhHAMQZ4Fu%8l3@(yB@81p)_G^>LbnJ
z{-*oq(4M9nTwBrTT+rT*U$loeplyyBQ4)r2!8*~fZNhzxvNDu_aWvY8SQcA}MteGb
zA+2m9+9qM79MDBM#Sy{;I!BC3&Ft#V4f3N_rD8euyta~AR4~=nvg4GUN<va$sw(tU
zHrufkOtsZ1`U<YvdZK2OTm`$m-Lh5cCu(ZDXAZ0AZOtduY^B*(O<Xd1Qgu}pxrQEB
z*-|C+xMWCI&*QR1uA9eIHo0aVSJ_n6@_0L|Tq)wJtco&uyp2&R5iu1;MS)r-1G%zm
zzR8WUgOgKqYPR1+2_&NzT3eJs*Qp|DqY7TjWnc<L$1bJxB4bleP+Eg#<2HFMmtpfE
zr{<>Q$RxyszcpZ1D<ZWVrd1yD*`PIIvOx@Iw&B-YqvBgtb74nk$*lMW7EWnUds;$v
ziP@HIGRlMlbW6-LM@*Y})=B31%pbzPYnse=O2#RCRvp&`*B^D*Dbw>!m(2aHbIdII
z+WwMu#B@D;7v}k%V}@OJGKb7z$Mv-XUfC*Xuhhz(HsIuWrvKo8*5{gr53aVy@Xb8$
z(Q`eTzD>(*=enNHy{PFsbR9(PkU3(JW{Rip;CgTV`Q9x$uFUI(=W7G5VS5$BcicP=
zJ`QdL*Mh0WIegya!6(5?<7{vP-KpS4FwJ*)HM@Jnu}UwOtA<tSE;`lSP_fH3qikve
zrcurFLp9H{P_@n>-yhCrv!kP<-9E*z2F;V*w&`bwqm_Hv;cO{faJC{OvTiNg)e_8e
zx0X4u|G?ha1m(K*OrK->rj3c88b$_uZ20VO#jxz1yf|dIp6M435A4%=XL%HS&~&xE
zcF`$Wb~(>`k6M1Fze45L_Bn3V%X51;?0SW5J9%_l=(Ia>dZCcx8#i*g)z=krIsOvY
zIq2x`F7z~Ay9(RsHXNbv%IW;{>1YTzdKbpzFs7#~lXx}-w~^Fa_`4C*k><%cok4wW
z_e?O6Buoa^8t=CP%mmZ(xYGfo@qrZLYGW+83iGX`bjzHUoOMW2v#F3~nsB8hlTJx?
z8nc^jp9IOBmX`@qh#4H0^X)@O?sN#5AcdF;CW3k}Nk>ua7b!_fN;;I9qzs4CKG&*9
zNusF2$)t3+@Vn;D9KlqCR464y83<o(^M#Tqs$eon3U_{vdNoqcbcnP&F7ENRUmUV4
zCaiF#WThkDI@cI0Ig`?|J0;#a{BhBiF)21{PKhLrdt4~tNQxz0DM9Ig$3-P)QdoAU
z#HFJh7nht#aoL>`S03hg03{(AL`_iyl8$jYkVKFJ$&_Ru)gg|BQMnUAlmtZx>FB0|
zNCY{IOi2Yw9pHF~lq)Hoc1E(zxAO4dPdCQ!^)bfrV5<k$>A?VX1!H_ZM%>@HfY*hy
zc<Z~)m11LTKF0WbjMyy0QcdCQVH!`hHY-VR+N>qcnRhjDa-+?95}Y<GigV&?x`4O1
zbMaZsCK9=WFR0JyMXBR{WxgXJb*7s^=Je8j!n1oOT*U3hMHbv?T*7v`7>zpL7^hu;
zWi@{f#dcX@M#9hVf_0P8!y%Yx3WYx&#7yCyq&EeIkDII&webPA8=k}zcbo)5Z@Bp*
d61`SV;vM7?3%B@0_`s}FAiN4;1!69B_CI9_Due(4

delta 692
zcmZvZ!Al!K6vjtgQ?stFF^LLQSW%Fok&Tg}G1!YI8wEkUD8ib=xW#OAvm3FOloomt
z1s@*$4+N#CAhcc-uWs<-$(vU%o<s$|S?ActeDBBiX5P*l_I2P&sob?ndkhhQI-$Q%
z7qn1=gz&&VuqyZjeuD3=Wvm|j3QFLN;2em>=7nDb>)<n@o(Fl~xA%I5t%(gsa6=sU
zF8Bj%K*Mj4e`p5`f&?C5n0;^)eiBoxgO?!ppK*%<9)Z07pYT^8ANa=i6~=DGfqSv>
zAp9dJ<KT;^e+axcDj*gMAvJ>?Ait<j)Q3UdHwI!p|Fx|ktUn0gM-y^g8VL_zjS&9@
zypc~AhIoV^72+>$f%rxL3qA;=ZYf0<QiN+a5F)Q$+6@HTb7p?UVasMY$Cit(&8#f5
zOe;sv4Zm9AF+C9*(zT&@QXlEp<Fp;@81swzuofRlCPw>pgq$`?PHfgTtkSCC6z!xo
zVHOH*NlRr5rem9fnH4u{TE#Lw2778#<Fp{pD`~^ZyGA~j)NGed<!jnkWm;>D3aT`%
tq^O{DLCw^rPSKaJOw($#=7<iXy&>=1J7eClcjEo2?o@wPx9DTr(i>tWYj^+v

diff --git a/django/contrib/humanize/locale/ru/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ru/LC_MESSAGES/django.po
index 21bdd1eea7..61a31d4ad6 100644
--- a/django/contrib/humanize/locale/ru/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ru/LC_MESSAGES/django.po
@@ -1,44 +1,69 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Dimmus <dmitri.chudinov@gmail.com>, 2011.
+# 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-20 21:08+0100\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Dimmus <dmitri.chudinov@gmail.com>\n"
-"Language-Team: Russian <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-07 08:58+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "сегодня"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "вчера"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "завтра"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "ий"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "ый"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "ой"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "ий"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f миллион"
 msgstr[1] "%(value).1f миллиона"
-msgstr[2] "%(value).1f миллиона"
-msgstr[3] "%(value).1f миллиона"
+msgstr[2] "%(value).1f миллионов"
+
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s миллион"
+msgstr[1] "%(value)s миллиона"
+msgstr[2] "%(value)s миллионов"
 
 #: templatetags/humanize.py:57
 #, python-format
@@ -46,62 +71,256 @@ msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f миллиард"
 msgstr[1] "%(value).1f миллиарда"
-msgstr[2] "%(value).1f миллиарда"
-msgstr[3] "%(value).1f миллиарда"
+msgstr[2] "%(value).1f миллиардов"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s миллиард"
+msgstr[1] "%(value)s миллиарда"
+msgstr[2] "%(value)s миллиардов"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f триллион"
 msgstr[1] "%(value).1f триллиона"
-msgstr[2] "%(value).1f триллиона"
-msgstr[3] "%(value).1f триллиона"
+msgstr[2] "%(value).1f триллионов"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s триллион"
+msgstr[1] "%(value)s триллиона"
+msgstr[2] "%(value)s триллионов"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f квадриллион"
+msgstr[1] "%(value).1f квадриллиона"
+msgstr[2] "%(value).1f квадриллионов"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s квадриллион"
+msgstr[1] "%(value)s квадриллиона"
+msgstr[2] "%(value)s квадриллионов"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f квинтиллион"
+msgstr[1] "%(value).1f квинтиллиона"
+msgstr[2] "%(value).1f квинтиллионов"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s квинтиллион"
+msgstr[1] "%(value)s квинтиллиона"
+msgstr[2] "%(value)s квинтиллионов"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f секстиллион"
+msgstr[1] "%(value).1f секстиллиона"
+msgstr[2] "%(value).1f секстиллионов"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s секстиллион"
+msgstr[1] "%(value)s секстиллиона"
+msgstr[2] "%(value)s секстиллионов"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f септиллион"
+msgstr[1] "%(value).1f септиллиона"
+msgstr[2] "%(value).1f септиллионов"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s септиллион"
+msgstr[1] "%(value)s септиллиона"
+msgstr[2] "%(value)s септиллионов"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f октиллион"
+msgstr[1] "%(value).1f октиллиона"
+msgstr[2] "%(value).1f октиллионов"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s октиллион"
+msgstr[1] "%(value)s октиллиона"
+msgstr[2] "%(value)s октиллионов"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f нониллион"
+msgstr[1] "%(value).1f нониллиона"
+msgstr[2] "%(value).1f нониллионов"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s нониллион"
+msgstr[1] "%(value)s нониллиона"
+msgstr[2] "%(value)s нониллионов"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f дециллион"
+msgstr[1] "%(value).1f дециллиона"
+msgstr[2] "%(value).1f дециллионов"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s дециллион"
+msgstr[1] "%(value)s дециллиона"
+msgstr[2] "%(value)s дециллионов"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f гугол"
+msgstr[1] "%(value).1f гугола"
+msgstr[2] "%(value).1f гуголов"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s гугол"
+msgstr[1] "%(value)s гугола"
+msgstr[2] "%(value)s гуголов"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "один"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "два"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "три"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "четыре"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "пять"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "шесть"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "семь"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "восемь"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "девять"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "сегодня"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s назад"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "завтра"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "сейчас"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "вчера"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "%(count)s секунду назад"
+msgstr[1] "%(count)s секунды назад"
+msgstr[2] "%(count)s секунд назад"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "%(count)s минуту назад"
+msgstr[1] "%(count)s минуты назад"
+msgstr[2] "%(count)s минут назад"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "%(count)s час назад"
+msgstr[1] "%(count)s часа назад"
+msgstr[2] "%(count)s часов назад"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "через %(delta)s"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "через %(count)s секунду"
+msgstr[1] "через %(count)s секунды"
+msgstr[2] "через %(count)s секунд"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "через %(count)s минуту"
+msgstr[1] "через %(count)s минуты"
+msgstr[2] "через %(count)s минут"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "через %(count)s час"
+msgstr[1] "через %(count)s часа"
+msgstr[2] "через %(count)s часов"
diff --git a/django/contrib/humanize/locale/sk/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sk/LC_MESSAGES/django.mo
index 1cbc2b7fa587ddc7c0ad27989830cfb507fbc95a..0a4d1c04c7cc73f8d81ed891a821b4ee5ebce3d1 100644
GIT binary patch
literal 4727
zcmb7`&yN&E6vvAnij0B?DxxAKxXX;tJ2MOFI<U)+1tRJOgoVUJ6PxMU+1{P09=d8~
zSrUvt&c>7RpckUX#Do~#0|^E_jGRnN{0G#NiSc6ML1Q@hecd%ZJ=3)Uovr;$ec$U>
zuimSf?w>cV{(#{sVLXoU@e0N!>GLZ5!<Apn*iNtj?gC!{hrmll|HSA&82$|wVc&6A
z%+sKQ`MZW+fd$Ne0e66F?~da;;FFl20ZCsl`bUNxkk<dhaPyit&ZJ=j9D@Bra65P%
z+ztL}=Iic>=Ou6(^w&Yk;}VEe*ykWpXIBir2De~-6?_8x30w*OY3zT2RHA<jZyGyW
z8^>D(l6@^m_pLMBVC<U=w}7~nZ3D?a58{vQ#=kGoi)X<DnE#ez>_u?+UdG12^WX&d
z1^5#9J4p6t?u+%ez(bgS2a<iox_CYX(tYoP`@kQ;BVcYlW24{+ko0#z(!Vuab$`6>
z3n1Cw2FZTi%vWxR?Gqs7y8s>rubTP4;3Vdi2N>HAz6l-#zX7T4H$m#dij9n+#cU0T
zrP+EACbku%Iu=2+l#PPqUokvr?8nUfI7o3$82zl_t02|+HIUYQ10+9T^tzchL6o13
zU{HTb7<3*WM|lD4L5xQ*iZn6TRzq6jF%0@n6)+qOT4y^(_d@9z+7n$UPjtR%@)X9S
z^a0my4EkQs*-l?{hIe2*of4@|I0h__L1&2SgZ8jZ7#xG@_b|q03_8>4>mf{rF?Jde
z$1S?3MpSP$lyAHBmMDyrXZSh4UiSleOU)Bii>F<!1wk#S_l2}b4NE+mCIe~lw5vf?
zTYT;6`IhU27VqVCU)rLdZ`pMvnl|@k<qLLitE_E_XGE3hu1(4IP;r|!&_cyC!eI9l
z&nnrzDQ?rUJyYDK*}A3pa%#3y<ZDwcZBl$0G1DUQw1}1lC6bF;$(9z}tp)hzRD+h(
z1u7tkDpC`dnJ{ReXbTp<#N;A{Y9PIVc(K@xXIzq-dh2%m5|b<WY|sh^!jWWx8GCX=
zFIMc77=&M&)ojLZ3pRt>nRIn4bnDu0h}A=RPt>)GjZ+!ymL!n$nDnJ!REYo#J*Grk
zNT&P?OlhWP@fQlgbl|y*_}>V^5WadLV2eU&5t4i|4CX{tJI6ietOyl;3oHD{oGWWV
z?v!W-p?0QJ&G($ct(tPCg9^``JTdJ|hQihGb&j}NRQPDAJnEG8IOV;(RH~GpcS_Hd
zN^o>eiMCHM`}{`9ue_&H8rxOEm3!G$+L;brsp_r{!U~^qLmve{B)w4Z{f%gL(52ak
znxBBbthL;laHfUZsPNPEpzY4{{H)f^O0l@GurQ)2m_H*fj7Xu2&3KEd*erU{&Wd#t
zp{VAIg(O~utNGm2@u{P|N|Z-Rxye9kA(7!?6I<0d*~Mnv_2oWZopnPc^!S<SW6oI5
zj~1U1p>tGL1J9SW3LiV?>)gpY_1QTVgbh{UvKdX)_?~?{{y3hO<KyK5Kfp`8!t-)s
ze3TClbGd(fFNtM{qq)AP3VvSv&SkVQqq?EDm=VdfPn>T@UwuF0eM>_o)WDA+Jz8&1
ziuSP7{{S|cWd}<#Xj`|?S(2?gHe_N&PefZeZehrj1Fsd?Fw2UW+v#V~&ur;V)cJOt
zawf>_7zXMRt(!R`|D$I1Lpw(%eGM{Nf0K=f1bFu?EqaPlF<pzcIH>h4t$6An_r4^3
za&P^fJP>5yAX}dN#$zC7+HqFOrrdX^Q(2@6)~8xi&IC!0Z2!g+xj%|IE$Lr~=w&G`
ze6JUoGaP#jRIGbalZGqamD0<0wbXf|jV32Ib$d!pM@Y$iLAr-Cz4xw`zCX?&yX*8}
zH9K6A=^J|owHXSJ-cvf)bkJhatoQ7Xb+_R!Z-`x5Jn-;Db}wSjsh1xFU0l|Z7@|d$
zm~Tlhn?kHxQs^1tPqq|di!B9MI@j=i)lECfVV0hE*%Tt#l0l+JA8hMK2HWy5bgsx`
z^+1URYj!@p@fo{uSuci3z0La+s@i?C>L!fWCr`AaTjIjc2@fw%(OZ;<Xg4kkg>dFY
Z3K2ai6uaoo;pKvPZI`vbe-8~~{{i0dJwE^d

delta 691
zcmZvZ&r2IY6vs#1#AFkHr9yg8*@z%gR<cAPE+O&ar3Rri*n=W0X0qKFXC=Ev^pb+m
zV+#)LrAQI<(0{;_x8Pk5y?7|zgdTgb#Y?|0jyE6sozK2E-#7D?y`TD_w|}LyFAOmX
zjX@XCIJDk_1#tyVgV&1xz!~J3UdAHeGN^%X6jwn!Y)$1GU?1{LRd+$^t3TG;Y)5T`
zihIg%p!fldq2VJ)2Ym+Ppal0Z%rRI(p2ieK@SWmUkOupSg)Y1Squ?!w7Ip{rvo>SD
zmEn)t_^a{<kQ#c>O${-{1W1Dng0Qd@NWQeHPpEtn#C+Y$Qy_WhL!M#)FMVY!ba(=y
zU!X&D=nIHq1R8?qi-(~k^jr*5QD(G)>}aE;qv(jdifBjCc$$0e`;gVV7H2hox5-46
z2~TkO5IY>U%xuoI<_#-nTX{1(CqKnsu6K*sIm61^xrJ9*gkE-n(5y5a5j338Z`#Id
zM+h%43iU1*8{Dh%#;hl5ei3Hj?m8|vE8N+(jkgWI<!l*+6<_e8T+-K)PX^lvw&ZtR
k%JW1?ejCV*`2pW%JDt<ZGj@3r?l(Oew#r*nk)>4rKT?5cwg3PC

diff --git a/django/contrib/humanize/locale/sk/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sk/LC_MESSAGES/django.po
index 7d82fb67de..451a42d69e 100644
--- a/django/contrib/humanize/locale/sk/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/sk/LC_MESSAGES/django.po
@@ -1,36 +1,52 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Slovak <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "dnes"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "včera"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "zajtra"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -38,6 +54,14 @@ msgstr[0] "%(value).1f milión"
 msgstr[1] "%(value).1f milióny"
 msgstr[2] "%(value).1f miliónov"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] " %(value)s milión"
+msgstr[1] " %(value)s milióny"
+msgstr[2] " %(value)s miliónov"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -46,7 +70,15 @@ msgstr[0] "%(value).1f miliárda"
 msgstr[1] "%(value).1f miliardy"
 msgstr[2] "%(value).1f miliárd"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] " %(value)s miliarda"
+msgstr[1] " %(value)s miliardy"
+msgstr[2] " %(value)s miliárd"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -54,50 +86,238 @@ msgstr[0] "%(value).1f bilión"
 msgstr[1] "%(value).1f bilióny"
 msgstr[2] "%(value).1f biliónov"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s bilión"
+msgstr[1] "%(value)s bilióny"
+msgstr[2] "%(value)s biliónov"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f biliardy"
+msgstr[1] "%(value).1f biliardy"
+msgstr[2] "%(value).1f biliárd"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s biliarda"
+msgstr[1] "%(value)s biliardy"
+msgstr[2] "%(value)s biliárd"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f triliónu"
+msgstr[1] "%(value).1f triliónu"
+msgstr[2] "%(value).1f triliónu"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s trilión"
+msgstr[1] "%(value)s trilióny"
+msgstr[2] "%(value)s triliónov"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f triliardy"
+msgstr[1] "%(value).1f triliardy"
+msgstr[2] "%(value).1f triliárd"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s triliarda"
+msgstr[1] "%(value)s triliardy"
+msgstr[2] "%(value)s triliárd"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f kvadriliónu"
+msgstr[1] "%(value).1f kvadriliónu"
+msgstr[2] "%(value).1f kvadriliónov"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s kvadrilión"
+msgstr[1] "%(value)s kvadrilióny"
+msgstr[2] "%(value)s kvadriliónov"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f kvadriliardy"
+msgstr[1] "%(value).1f kvadriliardy"
+msgstr[2] "%(value).1f kvadriliárd"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s kvadriliarda"
+msgstr[1] "%(value)s kvadriliardy"
+msgstr[2] "%(value)s kvadriliárd"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f kvintiliónu"
+msgstr[1] "%(value).1f kvintiliónu"
+msgstr[2] "%(value).1f kvintiliónov"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s kvintilión"
+msgstr[1] "%(value)s kvintilióny"
+msgstr[2] "%(value)s kvintiliónov"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f kvintiliardy"
+msgstr[1] "%(value).1f kvintiliardy"
+msgstr[2] "%(value).1f kvintiliárd"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s kvintiliarda"
+msgstr[1] "%(value)s kvintiliardy"
+msgstr[2] "%(value)s kvintiliárd"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googol"
+msgstr[2] "%(value).1f googol"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googol"
+msgstr[2] "%(value)s googol"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "jeden"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dva"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tri"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "štyri"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "päť"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "šesť"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "sedem"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "osem"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "deväť"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "dnes"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "pred %(delta)s"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "zajtra"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "teraz"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "včera"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "pred sekundou"
+msgstr[1] "pred %(count)s sekundami"
+msgstr[2] "pred %(count)s sekundami"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "pred minútou"
+msgstr[1] "pred %(count)s minútami"
+msgstr[2] "pred %(count)s minútami"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "pred hodinou"
+msgstr[1] "pred %(count)s hodinami"
+msgstr[2] "pred %(count)s hodinami"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s odteraz"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "sekundu odteraz"
+msgstr[1] "%(count)s sekundy odteraz"
+msgstr[2] "%(count)s sekúnd odteraz"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "minútu odteraz"
+msgstr[1] "%(count)s minúty odteraz"
+msgstr[2] "%(count)s minút odteraz"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "hodinu odteraz"
+msgstr[1] "%(count)s hodiny odteraz"
+msgstr[2] "%(count)s hodín odteraz"
diff --git a/django/contrib/humanize/locale/sl/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sl/LC_MESSAGES/django.mo
index dc17ceddfe2fb182aa3ead184262a310b2c58db8..1cb838cda41bff18fd8e9a1432f720c87bf20a7c 100644
GIT binary patch
literal 5054
zcmai1O^g&p6fSfH9q|wR0TeC8)m^c7W_C%y!4+fygStYNl?x%JnXaAf-I=bTt7aAu
zJs1;W42g-#$%L$bC%tImMGq#5@qm%Ui^lkqcrczwJZYkdUv<}1cXijs%G7*Y-+TSN
zs(SUNYkyuh^d>>8qThx7#wtRlfNQVD7utp)LLLNe1a1XB4jcw{H2=EhKh^j<P-(5d
zCdDbBhq2JO3>?MyTi_Pp-$13mc{L&T0`~zG-vTQBRgE75Rs0_{u33}nOlUj?9ESZY
z@IK&&z=wgC_4r>srq`y=O#=~{ECDfP@`A>ffEzJB3%nb+47>{Xxwd}+R9o}4#!K3M
z8L0HW)BF#b|4HMo+WwoyKY;j<EBI1+e*v!p{sa69IarOs494G72ssL**AsFOcm{YF
zcnO&BYg0S}Y=QqC*aYsrfsp5b?*i3$=*IN9dEk>6f2PN4ZX)CfjE@4J0=@%OajyVX
zoIN+E`sX$N2|NP+nOjo+J)nAS)w*=wrh(frZUJ`zF8~|BUx4GlP3zPBo(8IQ&j689
zas-Gekz*R$K(+7B1J%C12vm7`8K|CnMcdD5`)eA{YyK^b7l6wDZEb&F;|H4m2#BLW
zJ^^Cele4PwQbkwi0Mkz91t7PgZ$KYY1Km{3sHS4viT)7!2)a6ZYF+9~4;oTIke;Mr
z8%^7Szc%U7Rv<;cUylc%&Z0Wks&)nqTTgHdk~&dmN9_~RMz9oe54zgF+tKep-;ADb
zw_z}h{(vTN%#x<|SnUTH9_jn-9vdC2&(Y&yyB+fAf4P7)9iDEs#d(XjElCH}ap<|Y
zh(``jH_MyS;p=8k^!y-pc(2TdkxTtV&&><gb-AxdpLBaWY3Z7Hi4>*mx|nhf1$A+S
z6bf1*irEvi%#`ycsEaG-Oi&l+%9fxjvE@uDUl;30lb|b*r4%Vo2kA(Vp?vIB)RT<*
zEsn}*@?IoI)dnh3B&>0ni+Kl|w&d_LCLdF1@+c_irQ|?QyO@WvxC1|9@*_IWdoeXc
z=Bs#-8Cckwmt-#NGcpGYiG10M{k9A{Y-o5SU~TDRVQQIfi-`~gBnl%&)Ji!p4v1iV
z77-DiBtjB7k59}Pkv#BE;k(1*7`}3elT%Dc7AyKt%okWwdItjU2#W=N>l$?Lf*-Yb
zWrlTmEWK&b3IlIXuO+-$-k_C32WP#hnE4XE-d<m_1|6@}$GzHwSKmf!wMP9BueQBb
zgQGXY`k~Ua{Kl1EeWFp@v9*R)dD<7!n~nWQw0+6r20hIdBKoNM-n|$eXK^>|`eQt9
zJqFjP)$?1-n`M5dK@Yb%793*pN9LvMHmcR7rKK^cq{2CNax7x9+D#WIs@-aktgG7A
zB303@jvC1Z746FOf$4qOKGer*l_?%c7GZv;x>%^hxvh5Fei-ef&3Qi-Oin&KyWiW9
z`KjP@EcW(AO&)|%t3h`h4`t<0TV>hX&*P40(5RaX#pJe~H2rgOBpR;QYLk<7x{KB*
zT+-n<hV^VXLC>5Sn6|+*4%5VF#d?|GS7pIRa$RKTBAJV{xa0>fTqwK<4Qq!ov>nXQ
zyl-h2ekaviH>GUVl(QvMuAqnImu9LtTTzp?q$UfR$xm=e)v&g%p>1VD7qs~z-fSgp
z!`j-0wzUmi(58$1<Sky3&l~Ird5aw+Zz;rC>?bdYQkWcXN68uNAUQ)JM*4Osg~(_-
zLdM$xGQOn0C|sEk%<#ns#!w7l422l#eO9a@&Dq+Tv~@L^(@d@qcCi~Od)81{p&QDS
zqQ2Ew`<vsk>E+0L2v>PKE<wf89=PPCN@bnQwlK3&NgJoURJok>eX5{liZj1XL*_Qg
za8?#f{pCCjmzOkTev*c?G+m`D@->*(%{k|lb96zwT(3&ou(r0LZEZta+F60+HX|eR
z${Fi)Ey$XpvYZWT3mZB=<y<LS+QqUIv{aOa%IjqX*^OC{-bOk8gUpY<JjYHOOESo=
zhUxW{xY$$!6YfO;BooE#!Ibwq;mU?Y)I47Zk@Bn<Ii*vUMV$6xgf2YVi%XB;7Rv?e
zkS>$t;<60m5Z6lVhq=xUH1zG3;OZLSsw&Cpz+WIN^3%&}0F8^wxS9^GuMi6ShzYXL
Q!&Z}^?~^{J6XT)(00l*w8vp<R

literal 1404
zcmaiyOHUL*5XW1^*ZM|}nzRQZ#LPOwu5le$eDE-cAi~PQS8R5Ahn~!KZ@POIFdRI2
zGad{_4}1@ga@VT|zlS&f4Gm;r6FXD$oBDT6RrO5$>F?VlSl3|JVc%glU~i7$hV>J?
z1^)8<3l71*d7O}w;0)LYzVKWEago>Fe+Qm`U-x<ny7w}#x4dpWSN;A6&yV04#D4-^
zo-g28@GH29UcP|~@Jnc7(ZzZG23=o86m##Dz*FEo5U-Fi5Eprbo7;cl^%<|vdDguC
z%JVJg;@|uI#541H3p|Z|3!=T98vUTF?ar~cF5toCalM>_x$j?qxt_1W+`0n01as%T
z3_B0&wJv(m)g=Ri9hSHGP%&!IWs&DX$^UB29&x=it9u0Qi(I5DmNZ0%lZI+*A`>Eo
z<V3-ALJaS4NsL${#uB@NOLI=FO4vH?O{KM3C3aPjb#5%zPM+5)<8>QMC&3ce21kkM
zM8;&Q3JbiYv<+rWDw5!FJ2gQ~#k4U0ycUdW&Mabs31)drhr=ie!cq|3rBNx4DnVEd
zLj(p3ydzxBLvdl5MwPg9|8|H~c*cwkYMM!tGplq=pE4<hp`&O6e3)~Q@VqEwLyaL=
zrfrt;pvGA<ri;14kp+`<bPgY3tS~!0J9%)Ds2CQ;m9$)<!g>p>TE1rQv~nio2(7O$
zZMdzztW5=#gE-eogX>^Y)>R^88q><Mu=|x`YVyK--qtJ+rj%})n9A0UYpUfDy8Boi
zlmk&1R;v+xKtqa<U3VC6bl{fg#>U=O8C%2HDh(C7rU_G$G5o7uqUa^^UgBX*WQT?p
zWt?`Tj1!NPaiZ#U<#aQ8IH%XTb9%8mrx%e^8Qvr<ZprqR6<W9vPcYV&aP+n_;|T(`
cw=ltbQ;w*FNp48iMjn!M80q}@%r(o%KcXK+MgRZ+

diff --git a/django/contrib/humanize/locale/sl/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sl/LC_MESSAGES/django.po
index cf6e79e10b..7a75cf60fd 100644
--- a/django/contrib/humanize/locale/sl/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/sl/LC_MESSAGES/django.po
@@ -1,37 +1,55 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Jure Cuhalev <gandalf@owca.info>, 2011.
+#   <zejn@kiberpipa.org>, 2011.
+# zejn <zejn@kiberpipa.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Slovenian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "danes"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "včeraj"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "jutri"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -40,6 +58,15 @@ msgstr[1] "%(value).1f milijona"
 msgstr[2] "%(value).1f milijoni"
 msgstr[3] "%(value).1f milijonov"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s milijon"
+msgstr[1] "%(value)s milijona"
+msgstr[2] "%(value)s milijoni"
+msgstr[3] "%(value)s milijonov"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -49,7 +76,16 @@ msgstr[1] "%(value).1f miljardi"
 msgstr[2] "%(value).1f miljarde"
 msgstr[3] "%(value).1f miljard"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s miljarda"
+msgstr[1] "%(value)s miljardi"
+msgstr[2] "%(value)s miljarde"
+msgstr[3] "%(value)s miljard"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -58,50 +94,261 @@ msgstr[1] "%(value).1f triljona"
 msgstr[2] "%(value).1f triljoni"
 msgstr[3] "%(value).1f triljonov"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s triljon"
+msgstr[1] "%(value)s triljona"
+msgstr[2] "%(value)s triljoni"
+msgstr[3] "%(value)s triljonov"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f  kvadrilijon"
+msgstr[1] "%(value).1f  kvadrilijona"
+msgstr[2] "%(value).1f  kvadrilijoni"
+msgstr[3] "%(value).1f  kvadrilijonov"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s kvadrilijon"
+msgstr[1] "%(value)s kvadrilijona"
+msgstr[2] "%(value)s kvadrilijoni"
+msgstr[3] "%(value)s kvadrilijonov"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f kvintilijon"
+msgstr[1] "%(value).1f kvintilijona"
+msgstr[2] "%(value).1f kvintilijoni"
+msgstr[3] "%(value).1f kvintilijonov"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s kvintilijon"
+msgstr[1] "%(value)s kvintilijona"
+msgstr[2] "%(value)s kvintilijoni"
+msgstr[3] "%(value)s kvintilijonov"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sekstilijon"
+msgstr[1] "%(value).1f sekstilijona"
+msgstr[2] "%(value).1f sekstilijoni"
+msgstr[3] "%(value).1f sekstilijonov"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s sekstilijon"
+msgstr[1] "%(value)s sekstilijona"
+msgstr[2] "%(value)s sekstilijoni"
+msgstr[3] "%(value)s sekstilijonov"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septilijon"
+msgstr[1] "%(value).1f septilijona"
+msgstr[2] "%(value).1f septilijoni"
+msgstr[3] "%(value).1f septilijonov"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s septilijon"
+msgstr[1] "%(value)s septilijona"
+msgstr[2] "%(value)s septilijon"
+msgstr[3] "%(value)s septilijonov"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f oktilijon"
+msgstr[1] "%(value).1f oktilijona"
+msgstr[2] "%(value).1f oktilijoni"
+msgstr[3] "%(value).1f oktilijonov"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s oktilijon"
+msgstr[1] "%(value)s oktilijona"
+msgstr[2] "%(value)s oktilijoni"
+msgstr[3] "%(value)s oktilijonov"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f nonilijon"
+msgstr[1] "%(value).1f nonilijona"
+msgstr[2] "%(value).1f nonilijoni"
+msgstr[3] "%(value).1f nonilijonov"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s nonilijon"
+msgstr[1] "%(value)s nonilijona"
+msgstr[2] "%(value)s nonilijon"
+msgstr[3] "%(value)s nonilijonov"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f decilijon"
+msgstr[1] "%(value).1f decilijona"
+msgstr[2] "%(value).1f decilijoni"
+msgstr[3] "%(value).1f decilijonov"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s decilijon"
+msgstr[1] "%(value)s decilijona"
+msgstr[2] "%(value)s decilijoni"
+msgstr[3] "%(value)s decilijonov"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googola"
+msgstr[2] "%(value).1f googoli"
+msgstr[3] "%(value).1f googolov"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googola"
+msgstr[2] "%(value)s googoli"
+msgstr[3] "%(value)s googolov"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "ena"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dva"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tri"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "štiri"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "pet"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "šest"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "sedem"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "osem"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "devet"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "danes"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "Pred %(delta)s"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "jutri"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "zdaj"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "včeraj"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "pred sekundo"
+msgstr[1] ""
+msgstr[2] "pred %(count)s sekundami"
+msgstr[3] "pred %(count)s sekundami"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "pred minuto"
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] "pred minuto"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] "pred eno uro"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "čez %(delta)s"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "čez sekundo"
+msgstr[1] ""
+msgstr[2] "čez %(count)s sekunde"
+msgstr[3] "čez %(count)s sekund"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "čez minuto"
+msgstr[1] ""
+msgstr[2] "čez %(count)s minute"
+msgstr[3] "čez %(count)s minut"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "čez eno uro"
+msgstr[1] ""
+msgstr[2] "čez %(count)s ure"
+msgstr[3] "čez %(count)s ur"
diff --git a/django/contrib/humanize/locale/sq/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sq/LC_MESSAGES/django.mo
index 42a74f7e1d9b5fc4d37ed1aeb602e1099bf1ec2e..cf96fc6a8cff8f3b5df688c8b2523306759a7422 100644
GIT binary patch
delta 268
zcmcc1F`aY5ocdXe3=Eb`3=EnK3=CJ885q=o^gkdC;;XSRFt7sY04N;>q}hP{7$D6K
zq?3U(5HVy!`2|3l1IVuc(m*2^8liM6kOt}N1kymO7$!i)C$lhYmS#+26fn{?FxE9R
zQ7|yDGPKk+FrPe;NrD$BXao{8G`2FZn7oZij?E`EGbJ@=@?|DHH;s&vk^(Dz{qpj1
zy^^BDyyDEX)C#@4)Dr!IqWrAX<dS0j0{xV%#Ju!;{Tv`!nwXxdUtFlK$>js(St%43
NPG)D0o}AD84gh_=HgW&}

delta 210
zcmbQvd6#3tocaVt1_nze1_n(A28LP83=HZ(`UsE)@!tSxRv<0L0-<GqG#ikw1f<!4
zv?h=SA_hY!-wa4|0Qq)68mN`Q9ZGuxX^=jDAPuyNAq*-W$-=N%nlX)0z);t~Sl7^0
z!O+;s&_dV1Wb#BN30|<Efr)~lg_W`8<ZVoHlW#NWvf23M=cU?B_G6Cb@kz`}FHKBO
NwNfZ9oV<ehJpd!E9>f3u

diff --git a/django/contrib/humanize/locale/sq/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sq/LC_MESSAGES/django.po
index c2784ad01f..bc5c7f2d0e 100644
--- a/django/contrib/humanize/locale/sq/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/sq/LC_MESSAGES/django.po
@@ -1,42 +1,64 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Albanian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "sot"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "dje"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "nesër"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr ""
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milion"
 msgstr[1] "%(value).1f milionë"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f miliard"
 msgstr[1] "%(value).1f miliardë"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trilion"
 msgstr[1] "%(value).1f trilionë"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "një"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dy"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tre"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "katër"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "pesë"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "gjashtë"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "shtatë"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "tetë"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "nëntë"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "sot"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "nesër"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "dje"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/django/contrib/humanize/locale/sr/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sr/LC_MESSAGES/django.mo
index aef8a7547f07277a20f33ed8c79cf6f013985a01..e6e8aa9f8cc50e9dad3a2cc5566994779ea7b245 100644
GIT binary patch
literal 5467
zcmb7H-)|IE7`+Intf2goAEI&*3SD5jvjr3v76}Cu6s@HgHJWtj-fpMa&MY&tEhLZt
zP1JwDXrewDqYs!AXhSWuKKP>XW%gAQe<VI=jERX4^5BE#+qt{lnYptqliodh&-w1T
z-`wxsne9)jm%Pt#>1dCmeY}XVF8aP0AGq3=Ft!7j2JQmB3Ty*jlKiKV|6bz1zzp=Q
zO9MO&)X*Q3cpaEV|7YM<;IjJze+{?={WCz~M<xG}#BYE!|DO`qKM?qINgM{YLH_{w
z6mSN(8~BUtuXr%%>%h(6-v&}1mw-rxeGWwG>`RF^fE&@j1$+`%1>OhzTk8J+X^HMi
z{7>p^S>U%ANcu7$jawmcrPS9*+z7-_wi!tA?Lhpo-T3$wwRjr%GWr`HVyq8X1ik?L
z7D)W6<&3=v?2~vKIDr1T6#-rX_M!iq>>qoWv0n7A0m*04Bf<ESz$55?1|<G>AjM@@
z2KWxJ5B(n{9$XcS`vge*T_EN2#%jji0)7GP0WMt==&u7Q&#!>pz_n``I}Q{;y8mlH
zl$K2baSQAY5L2=5fJl}709*|G1DFE-1*CCzWq;A5fxa9_`br?_n}Af`ZBpL}q<K1k
z6t_>}VadM;q;Wk!EI;c&qrQ$t`vJFA%Ll+PHQRuep^m(skVv_1LZdU4Mx!%8^U~g|
zUnoiKUa3#_O8c9xZD^0xz6E=h&IRr5=8N|5R<xZ>Buc=rEm%7m?IF5vl#yY{8Aqdi
zxDIVS8tv)k3%AR*qwSC+tqomtCUAt1K>LVMs)%$)c7UHXOC{5`=H&{aUlFNhi?&^~
zOCd`IHLUPcah7c<BGs(j?<r!{?750ja1_zWylJW2&sEgCE6S?yMEblsT1k7V#ABoz
ztFDTP*U;rEE>c35$B1b4TpnlQb#u9ji`UHMDo#}`mnX6DN>QweRg}r)31qB96saH;
z1!_<R*2=1Qf*VB}C#T=8SYDbIkVv=2HbMp*dl-v0s)%by22$v^twO{vAnSfIq%ml2
z-g;a^GAur5SDc6)QPNE6jRA9BK~O^wW^vGC1LlZe0~pRM!>c$($uoz=lD77OD0v2M
zoR&eYG>ohQvrJ1cS_vEI6qqYUgvDI*Jaawf4dTxcf_ZkqxPZ@L+i?)<joR#ja6RD=
z-R;;zqTka_6tvfb<KkJE<41=Kt7xZsMA>#c?UY+I3)+!N(banG98Yz>(yMhj!tfBQ
z9W^|W<DGi8Q`7fo*}YuXbJ=G#{TW?Hpw=TsO!5rHb!weD&+g0V`*!KLQZE^<r}a99
z<(3T3c5?irVc9N!zET=8Tz(MA*zRFRxWXC|9kx?Egb`M;VibkeD~#bBKP{ZICMwiE
z=y~N_CNnxZ+ToF(IUvq=Si;McgS&Jy<xHV=bD5H~$hb}>-7w5?*GZi^aq8IIVq`n?
zRF`de!a|Z4%D7t(n>$l38K!lB_YWG5E4=)f-s9T-xj349KseeltKTk|Rx!u-pEbQy
zcZo`^9k-ofH^;4Vt?TCZ9N@v%e7n__)${o*-@cvGSA9!9o8`}Oog*CmL;23SbTGe{
zzSc(Q2eUfAcrh4)7(I<KS&ZpSr$X-`|GGcr-$tADXA%W}e8JL$Kj}|buO^ws<f!$$
z0XM5-{!L_iJDgI3jv6Kkcam~!5~5};q#0VlB+G~xwVg+vt*z*|x=ax<YCVrU?cean
z{fX-3q|6lo(J2-fGUd-C?+fyX1gNHI9a6o5&G&WUByl-1#lixnt5;f25eZODGEd0W
z#ClXiQq($0bh+}Fhv_D>RzmE6HqIeN#l*1bJaXfxHd{8xuvG%xbU>R;n&_}iq7XTf
z&1MlPY}ita9L8qTh!i$$DJqU%v#~-Bn=dFJa`2)PMCAActpei5uE{<whRhctM-E%m
zJR-;KTLy%VT(fmZ2%APFJhLwQlf3#N9$yo9iOl*pxlcQDraFd4%{Y?*bH5<(MZM*Z
z*R99>nI>cAlayrIN{i%+)al7PjW_cQJp$tS-jhBRBvxOJ>R8CWIu^}4Y97u!q{2Fq
zJFPWB#?|XQuM*Cc);AcU$Wcxa%Z_;1%+f&r4ifYyt5;d|T>^iK-URie8~+T{-R1uV
zOrscjxZViHlG6nCja)*cRSUrkw83bW>U)U9dkj2Yyn$NVmNg#=q#Ul${zC@XffMvY
K0fu0Z8T%hrN??Ql

delta 705
zcmZvZ!Al!K6vn5z2D6E4q7i$jWjz&@Em@*qmmq=%MI|7H_K;RsbrM(7NxMlDdWk3q
zUKBFuLGV)Oq2NJ8(L)b{|G?U7q4eV2Ybg}Jw~jX-^UZJGn|W{F%>Ej@iZy<BY5NS8
zf?hyBpg!pRGfc1md<EVp{sjl%_qQ<C2F`#QIH&j)#9#&GFMzG^msGq2Qr_xAyum)H
zjhf=RI`Bnt18hgaHb{l`z$hre?`Y--%)y^T7sLZF58i^5=iqA*Z~}~j(;(G(2kNYW
zPQwLbMYZu+`E`&AY=9VS2UFMpNChRRgNKUWRQv>_ybBQhg}GfI<xu?5I<RP+#e@s6
z7(~B-3et0SLu5&)6QUa@AiBX*W>8S}Ygu`%rAW<4QU+~WGZO9PUTLMqiryM$#Y)|0
zVwnj~aQUx&D`8vdjAf6QcE+(st@N<mjXwVn2Ghf)J?doM45eZEtXr*FdEXV)vRkY8
zjydfL;Z@D-YRK_2_m+A2wI_;|F&q}9x?AE_p1U6%bDsN)o-533t|IuDoYD*N#}kfO
z_2pOnr+gXD$veZ4Gl{7D6W8P=*8h!|3}PDMNqL;=Gpyi}1!uu|a2lN7Y&Lre_Z#?d
A9{>OV

diff --git a/django/contrib/humanize/locale/sr/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sr/LC_MESSAGES/django.po
index 3c09c91609..a2697e8c19 100644
--- a/django/contrib/humanize/locale/sr/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/sr/LC_MESSAGES/django.po
@@ -1,37 +1,53 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Serbian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-20 15:05+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "десет"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "јуче"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "сутра"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "-и"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "-ви"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "-и"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "-и"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -39,6 +55,14 @@ msgstr[0] "%(value).1f милион"
 msgstr[1] "%(value).1f милиона"
 msgstr[2] "%(value).1f милиона"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s милион"
+msgstr[1] "%(value)s милиона"
+msgstr[2] "%(value)s милиона"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -47,7 +71,15 @@ msgstr[0] "%(value).1f билион"
 msgstr[1] "%(value).1f билиона"
 msgstr[2] "%(value).1f билиона"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s билион"
+msgstr[1] "%(value)s билиона"
+msgstr[2] "%(value)s билиона"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -55,50 +87,238 @@ msgstr[0] "%(value).1f трилион"
 msgstr[1] "%(value).1f трилиона"
 msgstr[2] "%(value).1f трилиона"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s трилион"
+msgstr[1] "%(value)s трилиона"
+msgstr[2] "%(value)s трилиона"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f квадрилион"
+msgstr[1] "%(value).1f квадрилиона"
+msgstr[2] "%(value).1f квадрилиона"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s квадрилион"
+msgstr[1] "%(value)s квадрилиона"
+msgstr[2] "%(value)s квадрилиона"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f квинтилион"
+msgstr[1] "%(value).1f квинтилиона"
+msgstr[2] "%(value).1f квинтилиона"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s квинтилион"
+msgstr[1] "%(value)s квинтилиона"
+msgstr[2] "%(value)s квинтилиона"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f секстилион"
+msgstr[1] "%(value).1f секстилиона"
+msgstr[2] "%(value).1f секстилиона"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s секстилион"
+msgstr[1] "%(value)s секстилиона"
+msgstr[2] "%(value)s секстилиона"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f септилион"
+msgstr[1] "%(value).1f септилиона"
+msgstr[2] "%(value).1f септилиона"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s септилион"
+msgstr[1] "%(value)s септилиона"
+msgstr[2] "%(value)s септилиона"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f окталион"
+msgstr[1] "%(value).1f окталиона"
+msgstr[2] "%(value).1f окталиона"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s окталион"
+msgstr[1] "%(value)s окталиона"
+msgstr[2] "%(value)s окталиона"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f нонилион"
+msgstr[1] "%(value).1f нонилиона"
+msgstr[2] "%(value).1f нонилиона"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s нонилион"
+msgstr[1] "%(value)s нонилиона"
+msgstr[2] "%(value)s нонилиона"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f дектилион"
+msgstr[1] "%(value).1f дектилиона"
+msgstr[2] "%(value).1f дектилиона"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s дектилион"
+msgstr[1] "%(value)s дектилиона"
+msgstr[2] "%(value)s дектилиона"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f гугол"
+msgstr[1] "%(value).1f гугола"
+msgstr[2] "%(value).1f гугола"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s гугол"
+msgstr[1] "%(value)s гугола"
+msgstr[2] "%(value)s гугола"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "један"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "два"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "три"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "четири"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "пет"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "шест"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "седам"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "осам"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "девет"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "десет"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "пре %(delta)s"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "сутра"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "сада"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "јуче"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "пре једне секунде"
+msgstr[1] "пре %(count)s секунде"
+msgstr[2] "пре %(count)s секунди"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "пре једног минута"
+msgstr[1] "пре %(count)s минута"
+msgstr[2] "пре %(count)s минута"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "пре једног сата"
+msgstr[1] "пре %(count)s сата"
+msgstr[2] "пре %(count)s сати"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "за %(delta)s"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "за једну секунду"
+msgstr[1] "за %(count)s секунде"
+msgstr[2] "за %(count)s секунди"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "за један минут"
+msgstr[1] "за %(count)s минута"
+msgstr[2] "за %(count)s минута"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "за један сат"
+msgstr[1] "за %(count)s сата"
+msgstr[2] "за %(count)s сати"
diff --git a/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.mo
index 7fa06ca557d3c693ca0b991a5ad3fff1d423bd0c..5d8b9972637722b6d01f0e6caa05e9a8831d7c08 100644
GIT binary patch
delta 56
zcmcb~b(3quQzii;T?1oXLlXr911m#IT?6yUUzzHJd=m50OB2&mtrUuj9C8v%GV>-E
MF-LEHz+A})005>E!T<mO

delta 56
zcmcb~b(3quQzijJT?1oXLsJDqV=F@oT?3QJUzzGAw=qWv`6TA0mnNpCS}7D4Ipidk
MWae$Y&s@a_00G<*)c^nh

diff --git a/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po
index 4482c7bcf5..6a178dbf73 100644
--- a/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po
@@ -4,34 +4,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
 "PO-Revision-Date: 2011-03-04 18:39+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "deset"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "juče"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "sutra"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "-i"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "-vi"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "-i"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "-i"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -39,6 +51,14 @@ msgstr[0] "%(value).1f milion"
 msgstr[1] "%(value).1f miliona"
 msgstr[2] "%(value).1f miliona"
 
+#: templatetags/humanize.py:54
+#, fuzzy, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value).1f milion"
+msgstr[1] "%(value).1f miliona"
+msgstr[2] "%(value).1f miliona"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -47,7 +67,15 @@ msgstr[0] "%(value).1f bilion"
 msgstr[1] "%(value).1f biliona"
 msgstr[2] "%(value).1f biliona"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, fuzzy, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value).1f bilion"
+msgstr[1] "%(value).1f biliona"
+msgstr[2] "%(value).1f biliona"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -55,50 +83,238 @@ msgstr[0] "%(value).1f trilion"
 msgstr[1] "%(value).1f triliona"
 msgstr[2] "%(value).1f triliona"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, fuzzy, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value).1f trilion"
+msgstr[1] "%(value).1f triliona"
+msgstr[2] "%(value).1f triliona"
+
+#: templatetags/humanize.py:65
+#, fuzzy, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f trilion"
+msgstr[1] "%(value).1f triliona"
+msgstr[2] "%(value).1f triliona"
+
+#: templatetags/humanize.py:66
+#, fuzzy, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value).1f trilion"
+msgstr[1] "%(value).1f triliona"
+msgstr[2] "%(value).1f triliona"
+
+#: templatetags/humanize.py:69
+#, fuzzy, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f trilion"
+msgstr[1] "%(value).1f triliona"
+msgstr[2] "%(value).1f triliona"
+
+#: templatetags/humanize.py:70
+#, fuzzy, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value).1f trilion"
+msgstr[1] "%(value).1f triliona"
+msgstr[2] "%(value).1f triliona"
+
+#: templatetags/humanize.py:73
+#, fuzzy, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f trilion"
+msgstr[1] "%(value).1f triliona"
+msgstr[2] "%(value).1f triliona"
+
+#: templatetags/humanize.py:74
+#, fuzzy, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value).1f trilion"
+msgstr[1] "%(value).1f triliona"
+msgstr[2] "%(value).1f triliona"
+
+#: templatetags/humanize.py:77
+#, fuzzy, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f trilion"
+msgstr[1] "%(value).1f triliona"
+msgstr[2] "%(value).1f triliona"
+
+#: templatetags/humanize.py:78
+#, fuzzy, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value).1f trilion"
+msgstr[1] "%(value).1f triliona"
+msgstr[2] "%(value).1f triliona"
+
+#: templatetags/humanize.py:81
+#, fuzzy, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f trilion"
+msgstr[1] "%(value).1f triliona"
+msgstr[2] "%(value).1f triliona"
+
+#: templatetags/humanize.py:82
+#, fuzzy, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value).1f trilion"
+msgstr[1] "%(value).1f triliona"
+msgstr[2] "%(value).1f triliona"
+
+#: templatetags/humanize.py:85
+#, fuzzy, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f milion"
+msgstr[1] "%(value).1f miliona"
+msgstr[2] "%(value).1f miliona"
+
+#: templatetags/humanize.py:86
+#, fuzzy, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value).1f milion"
+msgstr[1] "%(value).1f miliona"
+msgstr[2] "%(value).1f miliona"
+
+#: templatetags/humanize.py:89
+#, fuzzy, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f milion"
+msgstr[1] "%(value).1f miliona"
+msgstr[2] "%(value).1f miliona"
+
+#: templatetags/humanize.py:90
+#, fuzzy, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value).1f milion"
+msgstr[1] "%(value).1f miliona"
+msgstr[2] "%(value).1f miliona"
+
+#: templatetags/humanize.py:93
+#, fuzzy, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f milion"
+msgstr[1] "%(value).1f miliona"
+msgstr[2] "%(value).1f miliona"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "jedan"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "dva"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tri"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "četiri"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "pet"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "šest"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "sedam"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "osam"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "devet"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "deset"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "sutra"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "juče"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
diff --git a/django/contrib/humanize/locale/sv/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sv/LC_MESSAGES/django.mo
index dbec4dc565b340d105ca70ae7691de9ab2144363..4db04555f7a3b7c8225e415756a314d04cf7a563 100644
GIT binary patch
literal 4071
zcmb7`ONbmr7{^QV(2OR=M2+#4igC?MlAgyZF`2lcZW0I>U6W029y-%Cv%Q(Ao^;jB
zWP<@wFJ1)+qPMUJqWA)ZKn}79Lcj-zr=aodMetw*5B|UI>YnbNTEu3$e^dYZ*Vk3w
z*F81AY+3sb!%@fi5YG2+VQiMZufYXJc`akR!3ww+d>NbqFB<)_(XSc)1=i5NYhBEf
zpo8`shM$2Iw0{M6fg9Gx@f~m{+NVI$M@E0oa0R6M|8BVLwm8nLVGo=_|0VEI@G7_u
zykXiKZ;#t`a0m2PK$^!z5L00vfS5Y_*zj|3JKA4?kAOddw}O9|{y#xV(M`jDOh4NY
z$6EtZ{|1o8Z8Y3$`nMWx2QifG0Lfnl@nQRLxrAEm2P<fQS7NLI-UN4pd+vyN0;GIj
z0IB~&ko?z;zW&a*e?PbvdK;wiZ-bPtD<IY921t3|v@zy1NdD6x^}i01|5Ky?Y<TOY
zI9?T`{?p*&;H%(1@G@8ie*mlC-yr$Qcg68v1lOT`0i^Z622vf~1o2^S;j#sM7o<FX
z1d{I))BeJ=zclSDrhV1$YomW-_^r{efpnkmK|CVtC)2(T(tLgck^X4TR3Caj=y{;I
zU<uK253cv)ti{df`mp&<b9@jdy;D>V${`-z=-C9K11V%kdvt8ZmGVu;V>lm(zQsAD
z_kwbkJ?I&xdhN-GcjG(C9_1U4O|%XygKfphaZ>*7!?_J7J=59aUNop~^lZ?9$1FN1
zN0c8nRUW$Cfv8j)ZGOh@cKty9r{;;4#c5YNLC^`hxsVpAXNhOiWFRe0yBf5##cNm3
z4O}m@xL4PGX^VbtVAqxC+w7~#=k0E*tZfsY5Y<F=ZOUW~6}M@H5-L6+6sxEBq%v7I
z#ckST%@nt3wrVN9nmSo2^4e5OnG|0|oG1}FEuy7BspKM8a-aowI|1IDRxpsdLJ1^M
zMQUnkhd~cX8(Dm5my0R10_hdv#bOfASkgh``zF4$%awc~7=(pzB$;5QKOHcR6`Rry
z;dd4^Yx_gN+8EBHs|TUm)qYQ`oho~xt6eOd(qQjN14)lbUkXN<2*A)|N(_Z$%0JJP
zW_kgiPza_2&t1Z`7la|adK9oFp|l7|o(qFT(bCQ_&p9nZh2O#^KfLJ5PEa}_`a!6j
z<ErC(&hvwga^{03FU`F)@63k6)$lrpT`ih?y55*}>Q6Y0CwaZzY#emzPu1%%Iw!=?
zr<es_eLsdYrw{I}<0!r0D(%dNu2fxD2Vs*xCq2Yhd`@(Gf<NuX&1d`6tSa#gM##><
z?FeUHxV<JnITD_)7I=9<>wdFV8;wR)P4WD;IA4`Q*ZT1)Rjpt1qQ%v^CPYmQYn3!$
zldECr__5<h#>r?@>!sO1Y9TSnr9M`x@o?ArUDua~cx%B8mC!S%=8rlD#y+}vTZGOL
z*$O;gcAEUa8DE#?x>RcCXb|>Plgob8R5R0uc>HyyEcwnE-l&w)-J?-$)6dAFi}EHL
zS4I<Is?v6Lb{M_PId?%Xj41qykvWzMKAJ;epNyq~FPTBXJC-N>(Kck6ajF+aV9TCx
z8?E3R-_)8Uyfnq^#rK?;dm<P7^y@V-l|;;Vsa`b0Ox&@Q@kJX(E?}zUT*<n!&xFd>
zKIbk}IN7*zo<eow+vf5!j-OdYR?NjaJ4~yWrk>2HnsXN`8g0{*hny=}_5Znl!E33b
z;z_|W6HTPt{Ub3K&?s;T8E;kCbv&2;P3AYS(CDeH9j+`(E(aE8+6A)`X9w8Bia}#p
zWTF~lI(9sP)SLDpE;gGU?U4DoMrtN#>`KRtV;W=Hv$CwU%i5yH+DoB}H6^=Pa)+dy
vj%Z@r^0C7Wn9!P`r4|Pae;QcRrH>8;^F6o2eC$~r<XjI|mYLsKSq|C19uY*9

literal 1210
zcmaiyO=}b}7{{a5xADDtR7erAMP{98E3DIQ5&HtQ7HeI5sR-##b~ejwvLxBvt{{k@
z;6W5r5JV3`@#w{)w|)Wr0)CI){HKlEQWgyP=a>BF$>hn*^Jj4213|k0U4(u@m!L-n
zFrfVcuY$ilx4;pshYk{Q7+e4c!26ynAUav~>&M_BtSjEnK)0{%{igS=XU9K(;`t0b
zhWMADd(Rv2IQR}+MJ}H~m(La+x;!r<8OH_Cont_^uM47+rx>t>Joo+!&sW}m?bmNT
z-+TX~=O^!f0ny1<3`fCle*GPE=l%eZ-u8SDJOa6U{A;H$ae291PC)Ma2N1TA^N?%j
zpfixW?^)<1)UTcPrptp|8E&(@#YYNpm9B|A7fSxuYxIfh=ULq+uxE0S)hwxsHYZip
z(nO|23dxCrbV>|wb4iR?C&m(6L)V-Wt5Vj**ic%l4zV3Yy4+Z<oxP-0omXr)pN1=3
z8(bx!Gj%326)f|n(l%T)nMlLit;~dFmC#`6UOAlBoLR(%GtBaYjz)1DMq^=ogT`Y?
zTnwY}C_-Sk%-h1fb6;FEPUB)ScJo?<7TjgVhGos9$(dC;p?8>+!q7>i0p7~FNO@im
zvZ|&KEVCBNcv$AFk<bSno(fZ=lT*Rs{Nn8H9pXY1Oe<-*#JjsqBx(7&z23~3kQ200
zW7=?AdRU$di@R|yhbq_MtgNV1$Sk47HDP;aCe*ZprM#tC9?mJ<FbS2-?WHM=PSBlc
zX;{*s5{*ZKUQNV>D#gF9GyI}|wX?_Ly63uza*_KAYRB3W=XRs=_Qvg6h}+z-mXRuN
ukZM;ml5muXBHUUxHT4!MWt}8=z=+kHh?HeSpguAjY}=a~L}Z&An*0TN;0*}?

diff --git a/django/contrib/humanize/locale/sv/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sv/LC_MESSAGES/django.po
index 9d77dc47c2..1312488cb2 100644
--- a/django/contrib/humanize/locale/sv/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/sv/LC_MESSAGES/django.po
@@ -1,42 +1,65 @@
 # 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Swedish <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-06 20:29+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "idag"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "igår"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "imorgon"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr ":a"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr ":a"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr ":e"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr ":e"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f miljon"
 msgstr[1] "%(value).1f miljoner"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s miljon"
+msgstr[1] "%(value)s miljoner"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value)1.f miljard"
 msgstr[1] "%(value)1.f miljarder"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s miljard"
+msgstr[1] "%(value)s miljarder"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value)1.f biljon"
 msgstr[1] "%(value)1.f biljoner"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s triljon"
+msgstr[1] "%(value)s triljoner"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f biljard"
+msgstr[1] "%(value).1f biljarder"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s biljard"
+msgstr[1] "%(value)s biljarder"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f kvintiljon"
+msgstr[1] "%(value).1f kvintiljoner"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s kvintiljon"
+msgstr[1] "%(value)s kvintiljoner"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f triljard"
+msgstr[1] "%(value).1f triljarder"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s triljard"
+msgstr[1] "%(value)s triljarder"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f kvadriljon"
+msgstr[1] "%(value).1f kvadriljoner"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s kvadriljon"
+msgstr[1] "%(value)s kvadriljoner"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f kvadriljard"
+msgstr[1] "%(value).1f kvadriljarder"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s kvadriljard"
+msgstr[1] "%(value)s kvadriljarder"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f kvintiljon"
+msgstr[1] "%(value).1f kvintiljoner"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s kvintiljon"
+msgstr[1] "%(value)s kvintiljoner"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f kvintiljard"
+msgstr[1] "%(value).1f kvintiljarder"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s kvintiljard"
+msgstr[1] "%(value)s kvintiljarder"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+msgstr[1] "%(value).1f googoler"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+msgstr[1] "%(value)s googoler"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "ett"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "två"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "tre"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "fyra"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "fem"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "sex"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "sju"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "åtta"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "nio"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "idag"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s sedan"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "imorgon"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "nu"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "igår"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "en sekund sedan"
+msgstr[1] "%(count)s sekunder sedan"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "en minut sedan"
+msgstr[1] "%(count)s minuter sedan"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "en timma sedan"
+msgstr[1] "%(count)s timmar sedan"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s från nu"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "en sekund från nu"
+msgstr[1] "%(count)s sekunder från nu"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "en minut från nu"
+msgstr[1] "%(count)s minuter från nu"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "en timma från nu"
+msgstr[1] "%(count)s timmar från nu"
diff --git a/django/contrib/humanize/locale/ta/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ta/LC_MESSAGES/django.mo
index 5f6a32f5895a86678755039bc296cf04592aec88..0d85225212bcae926e84c56d040ca7dd70c73587 100644
GIT binary patch
delta 123
zcmZo?-o-pYg|T6xYK(x9u7R<xp^1Wlft8`9u7UZ)iPBt#x`vhthNf1A#uK+$xM^gR
zloVL$>z9|8>y;EG<`rkArB>+WrIzRy6y;~7CYKcJ7wD&CCFZ5)>*oN;(!}&s{gOm|
UO)eiO&q|>rapITg$uW%D0O;u`00000

delta 73
zcmdnR+|E2fh0%ASYK(xPu7R<xp{atQv6Z2Pu7SzKiPBsU0aGg@i;3GT*lhgr^HS|5
Zn=nT6_$20~mnNpCS}BwyPVQsW0RXhS6b=9Y

diff --git a/django/contrib/humanize/locale/ta/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ta/LC_MESSAGES/django.po
index aa51b889dc..3af574885d 100644
--- a/django/contrib/humanize/locale/ta/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ta/LC_MESSAGES/django.po
@@ -1,42 +1,63 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-15 15:28+0000\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2011-01-19 15:13+0000\n"
 "Last-Translator: Django team\n"
-"Language-Team: Tamil <None>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr ""
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr ""
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr ""
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr ""
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr ""
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] ""
 msgstr[1] ""
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +65,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr ""
 
-#: templatetags/humanize.py:96
-msgid "today"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
 msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/django/contrib/humanize/locale/te/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/te/LC_MESSAGES/django.mo
index f6eee3304177572fa4f0559287c3c9b1bb027395..f3c77a14a283ddea58f1fe0a4c345ce15a77356b 100644
GIT binary patch
literal 2218
zcma)+%WoS+9LEO;FY|1nJSrXoQlvz5<F$)K*brW6gDM&kDz_Xsps9DfUSrRi-EkZr
zIJ82vYI#%@Q6vPaA_7E}C~FXcLj@elg*#WYe*hP5960d(?T*)R9>B=6pPk?Qe&6~1
zW@i2S-mw*iwjcc=^gqzY(XU>I2ioHGj6Dv%3LXHp8Lye~HSkf`{{$z&JvT6RBRB(&
zfiD=&gAZc-GWZB6L4>e(%={S;KlYyC1(4=H0!eSx*grM)HN$l?|E1wq;4Sd~7Q~NT
z#p71+XYdkg`W0+o+<@py;BTM{K712$1y6&=!E4|NaR1GW-3Pt}lFnIhFL)88x<3cY
z;4dJp_ZRp8_%}##`;ZLz9{_3oIgoVb3>S?3HN)4z+cEzJcsJNI<F~=PFg|DaF-S*5
z+O)3}1JjP}4p=Gn9(1IY>fQ;`{!)&#zk^0+HfWS5)k1gUUiACXZ$lq6Y!NG<Q(b$|
z_n|YvTfXXO$%PlN@ri2CQF<~m#wfMsF10XdaTRoT@XMzJk7PAa?iRhwIM6dLdC+j(
zfnPo)6t4%JaElz7jF_3v1BP0eQ$8VmudZ3mUy`hbaHfRrgrceamK+<OaAi{q6i(Z)
z^Gq(JT&8>_8SO*>hAxZbl2k16mszBluHzR<$#md~9-gfr4B@N00qe;~%aF{AVbG9O
zZ5?r~6EckaKso$SLntpO9Fy%J)Yd}e`L6Y1$BV2=;PArYD-~-lltRPTIwZ7oc-bzM
zE&HHVdXn3=Q+nF6pR#Q@TF2y)PnsisW%4T>bnNLTY_!5r5oxOu3Kcbl4nl{Ytc&PP
z5ppdXg7;*or1JSQ?Xct4m;B!IUQ77RscO)A7NN@P2v1rSDOwJ%$Y#gu@QJ$CZKqi5
zcDqxWbp4uKo>Ed5+gY_yv0Zf2B8yF<P}H(Gnd>=NyRdL%;qY)%N>g@WE>K!3B-?AF
zYAu(c*c85+;nlhbBdKSPSLUthp&u<?lc9B3RRh;op2Me4`ns^#q$9WHgRm7jT(#3-
zG+UnG+3W0t;*ZVp(qw@p@x>%w;Yqxa#6KnRm85?viNDWYU|mW2?<aAb&aE5krte}~
z*pEs4&2C};wiLpW{(1gi(y33blO=~_KTG1%yRAC>PzKdx0hB3<-7Rd#MY7%5p6TX9
zGF_CCE36{BB)+uUN}CfjuK#BfhpIo&xx`-&4sUyUBdR0b$SHGA;tz&rNf+S@968l+
zfnNKk@P-Rw_AH54$u#^o8SL!HJweEsB)*(ppv$N~y+a%6{la#vk^UA1TID<R^`w6;
ztp-;Qm6>ct_2`<eL2R(k=`t(XGDhaZ%mbr$=?bSskUVvqWST^3Jj>Jh^GW<k<^^Yj
TAa%+p8w|a(4+VuFyAAda!45<)

delta 614
zcmXw#ze~eF6vwaH+FE~iPzTX~qoyQQMMEhLP9jvKi#i3o){}UZCUp`r2x_Me(Lv~-
zpjaHVih_ga;^N@osvsQ%{{$WVUV1+GzR$hydv}-IMbBQu{fq?<38DuYfKH)4Xf%L?
z*at&k2@HZ|$pf$n^^vSAU^D6y>7RjOUsd{-(!Y_sYxG@m-&l}GFoF%wpg8CiYz5!I
zW#|LyM?HzA@Y7%nTmr?sg(Ui$(l1HB0*d)#$qVV<`g94o$D$nr4`4U=BI|ds3-!0;
z4~TE@F9ZA+YXQaKQDGp&eAr(#UPmn3WG#M9yr8&4L?;v)MiQ5IK!mc~nnSW|i;`@<
zSRj0raK@=uZr*WqRZFP)grX-5eM;5FH7&Z3Ru}0Ovss?2v!+80WlYokIc;3gr;Nn(
zh=z#Ho3^873MRKL)5#YMWzOWB*-CQV=Zr<!Dz)N_XY(lx^IXx)Q8h!&4MWLLtC%Y)
v$w12c3a+&OcMZj%UMdvty{cdD)@#*z?Wtb7^z%8gw-+Ate#1jvJhJ@<6<KNT

diff --git a/django/contrib/humanize/locale/te/LC_MESSAGES/django.po b/django/contrib/humanize/locale/te/LC_MESSAGES/django.po
index e7a849accf..7d6ab1624e 100644
--- a/django/contrib/humanize/locale/te/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/te/LC_MESSAGES/django.po
@@ -1,42 +1,66 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# bhaskar teja yerneni <prudhviy@gmail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+#   <prudhviy@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Telugu <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "ఈ రోజు"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "నిన్న"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "రెపు"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "వ"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "వ"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "వ"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "వ"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] ""
 msgstr[1] ""
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +68,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "ఒక్కటి"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "రెండు"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "మూడు"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "నాలుగు"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "ఐదు"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "ఆరు"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "ఏడు"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
-msgstr "యెనిమిధి"
+msgstr "ఎనిమిది "
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "తొమ్మిది"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "ఈ రోజు"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s క్రితము"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "రెపు"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "ఇప్పుడు "
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "నిన్న"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "ఒక క్షణం క్రితము "
+msgstr[1] "%(count)s క్షణాలు క్రితము "
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "ఒక నిముషము క్రితము "
+msgstr[1] "%(count)s నిముషాల క్రితము "
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "ఒక గంట క్రితము "
+msgstr[1] "%(count)s గంటల క్రితము "
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "ఇప్పటినుండి %(delta)s కు"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "ఒక క్షణములో "
+msgstr[1] "%(count)s క్షణాలో "
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "ఒక నిముషములో "
+msgstr[1] "%(count)s నిముషాలో "
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "ఒక గంట సమయములో "
+msgstr[1] "%(count)s గంటల సమయము లో "
diff --git a/django/contrib/humanize/locale/th/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/th/LC_MESSAGES/django.mo
index 88347f84674415a5e0c5b06a8080767b2ac5e110..4043e1affed49aeb3c538b5b7ee3d71070b0869c 100644
GIT binary patch
literal 3907
zcmb7`O^g&p6vs;emC+Rhl@C8CT#;R&=L3kWgBZdB2@!O~WpBnbGqp2~J>5fB%`O~B
zM2&zqBS;jYL1H%1kO+eG9`vG#QRBhHn+djO5;5VR2V?xd?&_J@?V5lUdVXF1diAQ_
zd)2jET{QP3Lo4EW7|)s87#pVdIru>vn9JB|a1dMrz6h=Y4{QCL)_>Ie3oKx~e_q0u
zKnwjhG%tXI=>G=xgY)l5{9E8k^!I|KPip<N<~Ja%e@%1Aor#}e%?7v%<EOyKz^}ly
zV5IwfcP0HIxB~jiAnoHYh^??G5L;*GH7|n8(7ysc3jPe<4*sdfZ-A7dzcv5S<7|H7
zZw^S~^Ff-|r@2s%FV<WJVk%n!lKlXPe{3y&-a{>(0x2&)<rsSaybdk`=iQy;Z7E3l
z7R@nm3Hq+)o8W`!pV9mRd>s8BK+3~)a51>x9>x}e{UF(I07-vN^A(WRk($TB`_cbM
z^AbpYzX#WVe}L=3<$a881fSP@3*3PI*I*gE0aCpAdlL?6ZUt9E-v!dSR3PQ?9T2YB
z36Sz|7F+;c(&OLi@$Wz!750nPf7QGS(t5vxH2)g76#Q4~OW=(1y%I$FSsoA7hrSOw
z4>Sj+aijQYE}i$ZJ)&QzmJi{fy$|BC@X&tfY^DvN$FWeKa!+}qMtNKwza?ju_Csg8
zyHV}>@jTfj-iLRTlMUdZ80lP7Zm5nN59N<)OXq{mba$iLK7ogFP7TK_ZuCvy6T$`t
zCTzDQ2J@wHzRz)8$M<fkRYk>MX;y2#U-R7=E)7z{;LoIazGtvBtA0fpY|ZL{mR$`D
z*1dJdGkHJIGV4+_P3Ar2gJx@^tV|ovh%!@Mlaj5W<R)!a2_?@6v#Te0R>{^)a+8*=
zndBzTR4vJSso6@Atw}YMN%9_IrbJ|E5Df)tOEz-lwUpp?&BvEh@mro6qy&;EW3_EE
z9{3F;ZPH-Z9<s58itklt`AfvqpEhYv>a3gEwTEnv*Zo#7%N<GDnI3OX==e&E+5^I=
z)fF3eCIlPDbmrNr71*wF8e;CMfvRwojld}l=8?7|ugW~f6O1z9gF%%^F(EuAor6p&
zrt0_?2*H$JwGZL9;RgY1)uhi338_Rt@<`zC7ZqjgtXg9tkhlxWeA|B8tNFP-qUi_9
z+AV8N)!N#sNo&+E^W4Y_qt<XBYz13uo2^8duPc_;S;h5MX#+17%cZBS;>KbThSnZ2
z;gHW6cI(Klw7y&%T2n;J?Xsn^Mg!ZEuC4r_%*UKc-FEnx@6{&!z<#ym@@FQf6YE=Q
z4cl?^6~FN;rh2uOT@%)*up4DQO4A1FN;S)c!sO&+UXfR4TpY}MLKT`xtg_H7RO1i}
zuAW~|^}=A=TbZkRZuidJ+dC;K<%_vt-&4ZFRu451v%(QCG+o>AHgRk>kV0+VJG#Rf
z>e$iZ<07!OdlkRxc(pPg+UKa;h)V^xcKAU<mburAyK-}B6Hi_@7jrZIctqi+QFti|
zKZwFlqUqyNcrgm!pJ9=`ujp^vtP6^yDEtg_qwvdU`dAbm?ddRkCDH8c1w^XpvPtyp
z#X`E_7D?pHl|gb8o{M8XAB7(qw<}@tVH947<1*yu7H{(&zO#w=fA?@U1vkG&dHNp|
z$q`#8r0(~wyDttLN8(fzUe>=T?(~t=e2T$gdZEH0%HOs=8J`2>7N-Fs=3w+P5<bKK
zRDArp=f!K$5jqn)paU6&XW`=}^KNaux2c@ueJYxMJ@$)}nl9NLSSPM1G*0ThUYwxQ
zQFwyUHxYkTc*BQ==#Npx(wi6=OP4l9o0=I?hzmNJevPu4x<@eYM&ak3EYJEL=?;&l
zpneEB*;{x--{$f5km|G8C`yu?__SW}M{q6*!#Hu6+!;VnsPNImGm3O2Hh}~uN##=8
F{{VEQ=okP1

delta 676
zcmZvZ!Ak-`6vn6ABv&&vp@NDPgo@bMMFU+#I+p~IbSZ+RR$Z|*bS;QrjUWi3qM=ho
z*AAT$BB7iAKwUhB|3T;I(l<8Vdh9p9neV+f`<87@-HOg<NVp-0Ff;+ZL6gvC9~Q(r
zI1PSqeuJ|(NBRjF0GB}lT;*H`@sJIE-U3}XZ*xBnvcBS<?~py7usIKS!69cI97Mw@
z$S%4BJs<^FG0Z&}!TAeGHfRvjM8PD;>b5uwoD~o)<OuW;hY$ywVHoE;ao0@{@&LNw
zKXJdo`2w<wn_viRfn#8s`(Gd%=o`d*-LGYJ>@M~py%@sAmBGTM@j~nuh!Fb72*e@?
zvEkSY1CS5;FZ|4;5g|oeLYV2=9i;CA!nNBoYMA+gO>*YGL2~6<g;+bpGA)Dt44wp3
zS&7N&f~3YYH6bf;df^#c@0v<nQWIJ%Ij11Rj9#_nY(=-KCEYGpG-*k<EVC-5id`<2
z40FdQ&6`%PoJO&gujzS1&KmlzCS?n{DW%eMMcnZ9QkrBJ=%ctsquv?X_Kwqe|I{!B
T>on_~*W*s}tn>Oz8~&?b9@u5x

diff --git a/django/contrib/humanize/locale/th/LC_MESSAGES/django.po b/django/contrib/humanize/locale/th/LC_MESSAGES/django.po
index 1629abca19..d1b59f6571 100644
--- a/django/contrib/humanize/locale/th/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/th/LC_MESSAGES/django.po
@@ -1,97 +1,268 @@
 # 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.
+# Vichai Vongvorakul <vongvichai@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Thai <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: Vichai Vongvorakul <vongvichai@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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "วันนี้"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "เมื่อวานนี้"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "พรุ่งนี้"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f หนึ่งล้าน"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s ล้าน"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f สิบล้าน"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s พันล้าน"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f ร้อยล้าน"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] " %(value)s  ล้านล้าน"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f quadrillion"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s quadrillion"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f quintillion"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s quintillion"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f sextillion"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s sextillion"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septillion"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s septillion"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f octillion"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s octillion"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f nonillion"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s nonillion"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f decillion"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s decillion"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "หนึ่ง"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "สอง"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "สาม"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "สี่"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "ห้า"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "หก"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "เจ็ด"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "แปด"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "เก้า"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "วันนี้"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr " %(delta)s  ที่ผ่านมา"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "พรุ่งนี้"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "ขณะนี้"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "เมื่อวานนี้"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "%(count)s วินาทีที่ผ่านมา"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "%(count)s นาทีที่แล้ว"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "%(count)s ชั่วโมงที่แล้ว"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s จากนี้"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "%(count)s วินาทีต่อจากนี้"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] " %(count)s  นาทีต่อจากนี้"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "%(count)s ชั่วโมงต่อจากนี้"
diff --git a/django/contrib/humanize/locale/tr/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/tr/LC_MESSAGES/django.mo
index 6656d3a4a0c1b871b39643b7395d527312e76fd9..5e06065e53fef86b8ba38f762f13c82fd0ca0d06 100644
GIT binary patch
literal 3475
zcmai$O^g&p6vs;el~EKy`S1e@VP(hNo)199L3DM2gv5<2%yKavYNu;vnwhB@x~g|r
zA{V)NFyUY{(S(BsE_#3iUf{HlXuRmz#E+|9h#vG{qW?EtGrK!oi<PbUb^YI~*H!P;
z)a*}N)_=^<O6bp^e|{fh)AYO!A86z28QTx$!3ppka16ZY^e>$Lo#S6%5%#?sQl16_
zj4wG}1M?XF4DJOtK9I%_z&#kxfu#4G{+Z(vNbmpMar=X5oN31nI0pMC;B(+Da1#8*
zjW<1%j!WQf=<k8Fj*B3c!mff?I{V7;I=B<#ufbj558(aaU1$Fjq!j(__>Z%*jcL4f
zAlWy9G;fpRW@q2(xD&)wwi_h>aS(rO5+9dQi<iJH7=M#v><REkkj8f%*FBu-+Z-pr
zCt;s*Jmc7Q`~chv`={V$@Jo>5-E!ma9e;KDAC4OyN$2fwoOGOWtb&gtP7~Y)UI00G
z*^RHe@wXuD<2R7<`Y%ZN-?b^t|2~k$dGIl?2-13A2ayhT+S%to90m3+NO_xg_Bu#)
zY=RW0<8<SgIC~GI`R_Yk0x8ai&i)Zd?<=5Fedzl^=YewdC^|LT#}0Hl?}PTNd!SfP
zqtkaPj~<}Y`{-;A8eYM${eGibOt|NL;8X5-65NA6=Eeii8QzQj!ax8i|0ow5N2fDH
z`==aI{x~|FL#oYobjtn8MrY=E^!-l6@#;6qCB8yf!1#h_Co*3s*ZF+ZZbw@EuNKOh
z$J4Jiv~KA3s*oP3<B8|flvW;3zp882<Lg(?B_fPH-fQcT@<l(F_;n+@KKC`{^L}ry
zY<&yQh$d5ApOUSi;XZAogobB?(drqVRkC$6+^1!0X1GuDRm<?T)NG~5*Qa{QWcV6l
zrbOiF5j_PON&>l3iIrS5G`=}CohX~91d?d_>d>Vg>kg9E^Y{%-0!yfA6^_J9#X&sh
zGMu#h-htoHBouGzBpwMzk_+bS!wJi=Qm3IoMvbOr^=Lt|I;JxvY!ZvMjXHAu*mx-0
zR$$|l2ESz(NQF#AN;1lX2IG(!xgZrY(RpSpvrYWPQZlPUv53!(j$`=Ro@R^ESQ(Q%
z8|$;OW`mPqa7M-kcVUGeJ1bN}=T6D4j%_ew8c`U$nKVpL)fJwbeY+Y=$5L4M2FHYz
z6@H*pJ`j`+2IWJ%RH~F;2}&=QN^lHL$%Tkwj{22&`B3G>gA*mR+*`ufpc)Hh+QRC%
z!e^w76n~==#kyYSuZr|xs?iZqyHL}e*Dysj648)BRf<l9SChCEnI<1^THCD@i@jd2
zU@2f!m*)#g+G01|rYUxdVSjhUwhK|TaWOv(Sm8F#&77P$zMPG6p_H4}%1VV*E_Sh9
zi_=}~wne0l@LE&EM%tru)f2(tWj}g(UB<z2RnuXl8WnzcKC-#lHq|;fq2rFJaMkS(
z&C&7^o<1He<yQS}-~w3`@hT~l2I9z1*2rB%zic#h#H)YNjEcI2i+5CP3HoMcRHPuQ
zrnkbVuaPa!I!B}SugH}<q`P-yp8uv@`961ru9h<UGCaF0Xqi0??zz?BvimVODuZkc
z?yFF=qL$!GH&jisJ694eREVo%`7&@0Mypt?xW9~0(W1P^Jm-*|C+t0E!JN*)`lAbM
zUf#LF!lfIr#mfhGO?I`;f`1u9-AXQCCs8Mi*nAX2T9kOig?0NH1_icsbLlFZPZ~=%
R6+<O&UsEh<MR*Cu{{gt`bvpn6

literal 1146
zcmaiyOK;RL5XTLaN5i{tEK)cisF0V07PO=f0ewgXmX<112&zinjW_Gvti3qSw%ZdY
zt{f0Y#F29^oO;`GhcCd#K;p*VU|LaDV&w79^UruZPV#MJ=pBJwgpa~^;FsWQhcLmu
zfLFn<jz7RL#Fq~fauj?B4uMY`S3wN&!o}<05yUm8r=Z=}bb80>#&N?v-*S8fo<RO<
z(AIea4ufyOXXxcUID+^)9$F5gnG4`3XwL~i+uv;$PlDJ+?zwmtv~?GqUI8)45+=Jp
zcKUP2H4uZWV>$-b9Gjr6^Af}$1txortzrAJx%M7^>@*fOAMKNqaQpr}xZP{}w{{+W
z7H;o*4t@$g$j&(NxaE~=U6vJmtQ6M$s>m{-<bSpHfV@GP(E}3qL@v^XA$8H^q^=50
zWJ08noG7?XNY1-ll3Z+(+z`{i(3}&a64t}qR$8kKVm1`%@!W82<z=m!yk_WPLRY!Y
zah1rQYciQCZ-sZ1HnftbBBA$-G^eqOd~bOvrn8zegIqet43GSqK^W3toQAjja6Agj
zG?)kiB+?b$6}IMqykNo)%hC9q>jBJr#BxJp&19Z2qjcmyU{Z?QpF$hp-HeNbXC)!)
zY6i(NEm+EF%vn3~<3hJY-tea$;}y(!mBq^Z{yoA{;LR#&xJ3P42aOuOX>N2fCgh}F
zYcQR2GyODPpymBM+ee*iIxlM~5i*VZa#fhUb5TQk%UPjWMi-QB=aDZvzruVvob-P$
zrvvY=9|9k`$Miqaf#1e{<sP)0x5O5y^3NYg(*L9lDUn3A3P?g@-Q$TMEHk^?2uh^C
X)Bi}SMcUty1c&TyOCnkVI}!f`(kl3H

diff --git a/django/contrib/humanize/locale/tr/LC_MESSAGES/django.po b/django/contrib/humanize/locale/tr/LC_MESSAGES/django.po
index c828d7f090..8a6561b83d 100644
--- a/django/contrib/humanize/locale/tr/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/tr/LC_MESSAGES/django.po
@@ -1,97 +1,268 @@
 # 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 Sahin <martinamca@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Turkish <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-10 14:53+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "bugün"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "dün"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "yarın"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "."
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "."
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milyon"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s milyon"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f milyar"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s milyar"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trilyon"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s trilyon"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f katrilyon"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s katrilyon"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f kentilyon"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s kentilyon"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f seksilyon"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s seksilyon"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f septilyon"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s septilyon"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f oktilyon"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s oktilyon"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f nonilyon"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s nonilyon"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f desilyon"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s desilyon"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f googol"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s googol"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "bir"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "iki"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "üç"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "dört"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "beş"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "altı"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "yedi"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "sekiz"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "dokuz"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "bugün"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s önce"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "yarın"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "şimdi"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "dün"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "%(count)s saniye önce"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "%(count)s dakika önce"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "%(count)s saat önce"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "şu andan %(delta)s"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "şu andan %(count)s saniye sonra"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "şu andan %(count)s dakika sonra"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "şu andan %(count)s saat sonra"
diff --git a/django/contrib/humanize/locale/uk/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/uk/LC_MESSAGES/django.mo
index 5e753cd6e7f3b9b5512170dd4907c8fd662f120d..da61af4acde7d857b0dc5969ab2a0228af499fc5 100644
GIT binary patch
literal 5682
zcmai1TWl0n7(QIQu!<n4h&K+G(pH%6Y(c3Di<fc<24aOmV$_&ncXm5;cV?NHZD|C<
zB?^foK8Yq86Jv}|Cbg8bw6r{!_~OgVqdtI7#>5wlQB3r~@86m3&dxd0PI~s+^ZnoX
z|Nor-oU_wgtCoJu@Th1{p?$uHv0nPV1Rr=hmNM23>;!HBz7A{yo(cJ{LjK1P?*h}X
zZ@eeKBR~cH3n6|7>_q=Ia3gTpy@7uPxE}qZK;nl({<9Fj2U7gsLtJxT;HNjl3a}0K
zPk<YMGr+CDU&8+K`-8p;TnGMbAmwoeh*a1&K%~yT4RH*(7X1m}Ge94>7<ebN{|Tfe
z`X|KyLOWX)_*()b`!XPnTOQ)d(7rmvwLlDI>wu*10OF5r#m8@`#q+>pWPgCM<G>-{
ztH7Ut#BX{q;NK1L7SII$^6~&jfdlBTdno8%0=|X*U0@%ue?`#$8n_4j#VZ4TKag~v
zhWHnd{2YEbz-b`mvuRb(zX+s!?f~Ba?qAK=JHRi2)L-;S(0>zn1pR3s@hcu>ECn=x
zG;bG(DX{l|aK%0ZLdw1XQhlxhF(oz$q;Wq0Y5n}r{xc9;gxwD9zlQuDA^siO{{>=7
zZ1H13ywyM&$ARRx9f;*;U1;QAMWg*dIbrGQ59ReZ8twPF=jreZ)$&O+I#Zo!bOy-(
z2DG_{=0S6%hjO9)P0uE@C+gpVJxk|;_IC84J-iX^*$9b}Fl-Cffktad`x<3sC;{VW
zv=1>Ywg!#%bo9Y;u+3=gAxUdM53M<l5EAGZ(#kcxvnx~N$BlB?u*?Oyf}WQs<!s5a
zN>;hWrG%<T{K+`eG9^kmYvo;uR?eQRX$4!NPUa0$=KW+%&O3TlCQqbK$<<QYl_f5a
zj!<10Bi7L2GA>p^hYLi!dJY#Ev2G5RabnFJF5_g?a(EIeR*JMTR#GO1Cy+vkNGTyD
z1!_<l*2=88I@d}TPEOvcnQkX7Adya;ZAgl?Rl%YSOLPsBh7|IaS%~=y$T@$Zq%o)&
zcTU$ZX(k`AYIe*WQK7TY-WbsI6^I%J-6##XtY{4Btcc;v)ZCh_m0hEvFKz26=w(;K
z#AzAimWCs<z)Zu`8Lfl`v<uA9hjf!U#wq5w%pJg=t?SIS3fc%hE0%3T>keCNM0Z@>
zCc4kIPUv}8IZ#lJ>9&KrFw6Ix(9DvRI;>YM+f@!ZC8MCcQY$%1zm?^wzSsJdUR&2(
zXq7#ht7mz)n(0>5ZAxZ4SJiCh1x4MVst_uN^&x|N#&sE<*^zy&dy9%Ebx?C$rQg;}
zr>wb_o#jV#yQGisgCmZXAK<$jbd5o)SnTO}sZ`O7a#!A}?8Y#&RMSej(ywckEI&GE
zYldl{P#puVTg|4^!^6W}F1a;|`l&8cchl8ivQE01F4X6kE{9IiwZU{}!)2D&22+O)
z9NODllT4SI>a|Q)H<9Z|6_a+c$J5m^g6`z`0nK)FH+QsupVHIRQShQ}D|^knRWQs_
zmiHVt+*DtgDz5Ca?241+X0_gRa@%(D;A^hKY|E&*T!wGn%;~GTK9|Yx7rDwIM}K#&
zd(N~gx1GM$N2t3pDnETX7y^yji7^?B>F!Lm{2X~V{43tHf7$=YKkJRpWAY~FF~Y}K
zt9jhJ=6~Q#l56j}H|xzTV2-;N#)~1Y`WL*ba6R4Xx<UI_5)JWe!$pu~+G2`l*<utk
zoS}&a>nn3DnB(pRff!=eoAS>mud`r|hY$o}h$(N(8}-JqKN8C+mBd3yMbdB}XXcv~
zJc$x-w6)w)kr2*5=Uww|&J#=~h=r0#<bkIAa|?wMB(h+FNDOy=o_hH)W2{nfbBl9_
zCtMkEL&Ry^6n7{b_C_T!QZTkU7R+(yjr$<#v_VEL3B-!fkt?E^e(V&-4Xv3aUk(^2
z9PMa!g0a=HV2)2&IMh++g0a=PV2(SN9^+^Lsh~B8R3ZrkD(ND?8cI)i<hUeBVu57G
zH!>fYxh059APXTJ+ISE_Achen@j$VY9SspPwNylU<o)+?^W)A(oAEDj++4Fb`xoGI
z?xj4c@Fo{hH0}OHydIpz%{#%PF5o+2NeZ*DhSf_lh4+IQ{BFrJr+YtCBxD{@$TN=!
z5;Kozu;B99MKrAbMl+tg;!V3e>!w|rbJLuZaZ{0$Z&ShOcNjluSG*g{yV;I+$n*YX
zn&d3~%Fz!H_R8G<F^%ohvIwD-!N+w*cfB_@=f|7yM&V=Bn_$>@^)+EwnCqx+J)(c9
n9-Knf>A+Us<s`X`LG*e!POo5$oFQAXj#3=F(opu4Dlz{9`<(aV

delta 670
zcmZwEPbdU&6bJAhJ2ta+*<HI)sO2KDnr$hzO)lDlEtFhVG#G0wvznbDE-T_B$}bM$
zC~;9jDK`h#nR22W9bKH{;`{iydF`9ey!V^mzxJx*t*Z1Ilnxjoglt6KBb$)pWq2TL
z*a{utCu~FAT+Ubp9E1`a5spFpSVq(n(1m(h^s|uW&HwgGY)K55!WHqsns6OfV!}40
zh4!EfIXuH*PT&~o0i1$7hU4%9df+g2qwh1&3pGdwHlUA{7+b*$ZLlQ<cA*<JhqS<v
z=${HN#P}ujWBeA<!jGc=1Zmz2#QA=18-%nb?eiBtytvYM-~y})Nq+%Nq|?<RDFVnE
zB;9~EqmBNHYHIRkDajwC5aqr*!0ifY-!0c^x$K<DW^>CLn=M!d(`T5T(>4B8x#^EZ
zm3TDP9f`#gv7V^X#dqcUzMrOorjm&FwkrrvS}mH<QA5>>3#wT#5|NaZvLZ=UpE0!6
z{(PZmYI?rVsjG_`f0rA|lYM;1lkuiiJ!`31EfKNu{M_@*(_SB+^vgWu?dPtV5uOXT
Y1f4_sj@j4tjeXVX>^U3G4!6To-wvN;-v9sr

diff --git a/django/contrib/humanize/locale/uk/LC_MESSAGES/django.po b/django/contrib/humanize/locale/uk/LC_MESSAGES/django.po
index 23800d9d5f..f669cb556b 100644
--- a/django/contrib/humanize/locale/uk/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/uk/LC_MESSAGES/django.po
@@ -1,37 +1,54 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Sergey Lysach <sergikoff88@gmail.com>, 2012.
+# Андрей Костенко <andrey@kostenko.name>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-05 10:39+0000\n"
-"Last-Translator: GuGu <andrey@kostenko.name>\n"
-"Language-Team: Ukrainian <>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-03-11 17: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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "сьогодні"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "вчора"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "завтра"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "ий"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "ий"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "ій"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "ий"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
@@ -39,6 +56,14 @@ msgstr[0] "%(value).1f мільйон"
 msgstr[1] "%(value).1f мільйони"
 msgstr[2] "%(value).1f мільйонів"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s мільйон"
+msgstr[1] "%(value)s мільйони"
+msgstr[2] "%(value)s мільйонів"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -47,7 +72,15 @@ msgstr[0] "%(value).1f мільярд"
 msgstr[1] "%(value).1f мільярди"
 msgstr[2] "%(value).1f мільярдів"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s мільярд"
+msgstr[1] "%(value)s мільярди"
+msgstr[2] "%(value)s мільярдів"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
@@ -55,50 +88,238 @@ msgstr[0] "%(value).1f трильйон"
 msgstr[1] "%(value).1f трильйони"
 msgstr[2] "%(value).1f трильйонів"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s трильйон"
+msgstr[1] "%(value)s трильйони"
+msgstr[2] "%(value)s трильйонів"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] "%(value).1f квадрильйон"
+msgstr[1] "%(value).1f квадрильйони"
+msgstr[2] "%(value).1f квадрильйонів"
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] "%(value)s квадрильйон"
+msgstr[1] "%(value)s квадрильйони"
+msgstr[2] "%(value)s квадрильйонів"
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] "%(value).1f квінтильйон"
+msgstr[1] "%(value).1f квінтильйона"
+msgstr[2] "%(value).1f квінтильйонів"
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] "%(value)s квінтильйон"
+msgstr[1] "%(value)s квінтильйона"
+msgstr[2] "%(value)s квінтильйонів"
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] "%(value).1f секстильйон"
+msgstr[1] "%(value).1f секстильйона"
+msgstr[2] "%(value).1f секстильйонів"
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] "%(value)s секстильйон"
+msgstr[1] "%(value)s секстильйона"
+msgstr[2] "%(value)s секстильйонів"
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] "%(value).1f септильйон"
+msgstr[1] "%(value).1f септильйона"
+msgstr[2] "%(value).1f септильйонів"
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] "%(value)s септильйон"
+msgstr[1] "%(value)s септильйона"
+msgstr[2] "%(value)s септильйонів"
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] "%(value).1f октильйон"
+msgstr[1] "%(value).1f октильйони"
+msgstr[2] "%(value).1f октильйонів"
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] "%(value)s октильйон"
+msgstr[1] "%(value)s октильйони"
+msgstr[2] "%(value)s октильйонів"
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] "%(value).1f нонільйон"
+msgstr[1] "%(value).1f нонільйони"
+msgstr[2] "%(value).1f нонільйонів"
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] "%(value)s нонільйон"
+msgstr[1] "%(value)s нонільйони"
+msgstr[2] "%(value)s нонільйонів"
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] "%(value).1f децильйон"
+msgstr[1] "%(value).1f децильйони"
+msgstr[2] "%(value).1f децильйонів"
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] "%(value)s децильйон"
+msgstr[1] "%(value)s децильйони"
+msgstr[2] "%(value)s децильйонів"
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] "%(value).1f гугол"
+msgstr[1] "%(value).1f гуголі"
+msgstr[2] "%(value).1f гуголів"
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] "%(value)s гугол"
+msgstr[1] "%(value)s гуголі"
+msgstr[2] "%(value)s гуголів"
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "один"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "два"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "три"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "чотири"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "п'ять"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "шість"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "сім"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "вісім"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "дев'ять"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "сьогодні"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s тому"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "завтра"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "зараз"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "вчора"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "секунду тому"
+msgstr[1] "%(count)s секунди тому"
+msgstr[2] "%(count)s секунд тому"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "хвилину тому"
+msgstr[1] "%(count)s хвилини тому"
+msgstr[2] "%(count)s хвилин тому"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "годину тому"
+msgstr[1] "%(count)s години тому"
+msgstr[2] "%(count)s годин тому"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "через %(delta)s"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "через секунду"
+msgstr[1] "через %(count)s секунди"
+msgstr[2] "через %(count)s секунд"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "через хвилину"
+msgstr[1] "через %(count)s хвилини"
+msgstr[2] "через %(count)s хвилин"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "через годину"
+msgstr[1] "через %(count)s години"
+msgstr[2] "через %(count)s годин"
diff --git a/django/contrib/humanize/locale/ur/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ur/LC_MESSAGES/django.mo
index abaea07c99056ca33c05c8b9defdd9a58eea403f..0c3173ad26362db5d6d538bdc04671511c9f3d77 100644
GIT binary patch
delta 320
zcmbQmb(L$vp8BPX3=DIb7#K7e7#N&cAapK}HU#pg18EK*eG*Dv0@7?i{%s)51*9JV
zX&_>F3l;wa75@q4v#>(sxq&pu904E=(k}_66<8VMzyj((0YRXI9*_nZ=m4bofwb%9
zNX8yUQzKmiV_icN1p@;sLrYx)a{~je0Ds+})UwRt%=|oEm&B4(D+MD1L!de%kUB$S
zD+7zkQp_sszKMCo`T0eYZJCYSG%`v`3as??%gf94N{WCInQ5sNdU>fO`UOS#S*gh-
s#rg&MDOrhm>G}FOK(aJ3JypN7NMDo72g<WjC@q>?${fA<F0(Bo0LNWE-2eap

delta 261
zcmcc0HH&M)p870C28Ovz3=EnK3=AAB5ZVYx8v^+;K$-(c_d)6DK$;E6UjU@Jfb?=8
z4MYr^pyJ!1;`^ZdlRz4X7%l(_kU3YO;`gBRQx*m}uz_!Y0)jvVpMf+GF|e{SFz^Fu
zuFa8*J&dM?x(3F&hNcRJ##V+Fx&|f&23!IDx<RRBnZ=p;dAcr%C8<^lMh1ppbp|F1
uh89-FmXoEJRVKSJ8?xE><>#f^P2S5K&Eu1pmtLBf4pd!Qv{{_Rju8Mk=qjB6

diff --git a/django/contrib/humanize/locale/ur/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ur/LC_MESSAGES/django.po
index 184791289f..2620ea008b 100644
--- a/django/contrib/humanize/locale/ur/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/ur/LC_MESSAGES/django.po
@@ -1,42 +1,64 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Mansoorulhaq <mansoorulhaq1986@gmail.com>\n"
-"Language-Team: Urdu <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "آج"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "گزستہ کل"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "آئندہ کل"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "واں"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "پہلا"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "دوسرا"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "تیسرا"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f ملین"
 msgstr[1] "%(value).1f ملین"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
@@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f بلین"
 msgstr[1] "%(value).1f بلین"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f ٹریلین"
 msgstr[1] "%(value).1f ٹریلین"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "ایک"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "دو"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "تین"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "چار"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "پانچ"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "چھ"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "سات"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "آتھ"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "نو"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "آج"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "آئندہ کل"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "گزستہ کل"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/django/contrib/humanize/locale/vi/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/vi/LC_MESSAGES/django.mo
index 4b764f29aa880b9e0f7bb877d60d8c9a3816cf21..94002dcc462ee157510469e44ee581ef5e598b5a 100644
GIT binary patch
delta 293
zcmeBWKh8d3N&Qqt28P=}%)-FHP{<6S%YZa1kY5d?nSgX7l-~lSyP)C|p!~@|8l-<F
zRD2$kUI?X^0BH`O{Bj`838XgwX&_?Q#mvA4me@C0lku0Sk*<NUuAzy7fq|8wrLKXw
zfdN;5ziv=!S!Qu&ex9yNVo9o%f{}qCP@NG-ouRRnfyLwqCOI~r)XbFBoXMq325uS|
zB_#z``ugSN<$5JWiFw7DX{i-@d8sA(1x5K;smUe9`UUzaS&4b+`T99PvNSP0Rlh7#
WUz5uR%Ck}^%bdKLDSEOna}@wb5k3L{

delta 235
zcmX@k-pf8=NqsaU1H)|~W?^7pFlUC)Hb9yc$ae(NOhDQl%J+iO0Z{QUC_fTNgY?Hk
z#Z#bkI+V@=(i}kfTp-N}q|1Ob5HU0`Gq8arS|)2U{xUVxH89pSG*vJ(wlcKPH83$S
z;0o~94N5J`EY8f&({)KKNwrciGB5<IGcZvww6HR^oE*U<H@TKcpUuWEKQGm8@+YQf
U9-qX#^wPw1pz5;B$v({001}TSAOHXW

diff --git a/django/contrib/humanize/locale/vi/LC_MESSAGES/django.po b/django/contrib/humanize/locale/vi/LC_MESSAGES/django.po
index 682780f5dc..6e1d1f12b5 100644
--- a/django/contrib/humanize/locale/vi/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/vi/LC_MESSAGES/django.po
@@ -1,97 +1,266 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Vietnamese <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "Hôm nay"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "Hôm qua"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "Ngày mai"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] ""
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] ""
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "Một"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "Hai"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "Ba"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "Bốn"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "Năm"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "Sáu"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "Bảy"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "Tám"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "Chín"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "Hôm nay"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "Ngày mai"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "Hôm qua"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
diff --git a/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.mo
index 76a5a7dc120d21c2ed2a91af1900c970bcfe71aa..0230140533913b4c7fb28150d6528f180db61408 100644
GIT binary patch
literal 2093
zcmaizUuYaf9LFaywt5<^P5o0_b*PQztb4bYD#oo5@!CS6(O6F(e39wh+}@VGnR90@
zm*hzi|J2&3MNx@=5JV$Is4tR6un!_yeD$&TwAUagRw(!&qTjij?By;84m<mq-*<lV
zoj<$t%hsWH2nt2rY3cwWdkhEhLirKA8$56MCzwXO{R%?v1oM_YIEwfLxC{IWychi0
z#sfp`csF<l^d~^$^Bj03xCr7QpICkdZby6?ydC@=#MC6V{i`6X$#0gIZ2x7@`2A(|
zf2=+L(TpDgP5)-gVel%%BcSoy30@6S@FSeXJ>XWv=Qp)^!SWAq3-rOwZH`#(25*9X
zzvW@eqUF5hTb4_pnfILKca}eZ#{VbF3!qv5@3#LEh$WEAHvZf8|7+txY|8j<0?oLT
z<*?PafM)zQ%N<tVW#hX*Y`^tSpxG)oN-}KQI2Lk?ZBuZ>w#~P?2K6>nEF~%CTV9KL
zE2>$~Hq@I@%~_fAHEX>d)$G}n6zUDFR{MW3O|#zXthNI*-|0phlhLsm7S?$>lPlAs
zK^O*7{I6E+lh;qvQJ=&OqS`QTKc&}S(Tz$U>qKJ67j?}k^CdP|ly#xg#>9xKr6wum
zNLHzkjXrrv7o&<7r6~3IwZ%0*o01Ib%)6GCbTL6IvL5x=8OfU2{$xPMtDTf|@W8KV
zQVwP~DPuShOxGh8>Y&PpM#oA#)C?Op$I!ngF%l&r0>Ozn2?<6eqWBCKL<O@%X`(B5
zBF>4HB{qk5RYnnVbwiRlt~8H~JRQknyr`W+CFf}#Dg0j^-G7V;U#5=mnvAqFrTn1e
zJX-gaQ;;4_O+Q|6@)2hmxz2v3xkty{+_>ZJb#nJn*Y$D_I_?9mi$v!Lp9zd-SKheE
z%kA~ti9Ie#>M&E<DMU=DkZBot^qBzj(<dcf4=KFoP5g*oWkHxJ%Id=yA^bY?xl`b*
z>d|}!=b$(pGYyueV->AyUN+lkG&0)w24y~*5nN|$?cJ(uEn8}BG8<Z}?0n_f{A1a4
z;_cCvlA1a+b)a)Jxs032OQE^IlILpJyXLd-4Ot-e(PD)~itEXz3J0BuPM%ppnMck6
zQIw@X_#T}&8tBw?Xg<7iP)1edQBiA!YBINvwwse~s_U*dPreYZoa>TS-~TpVex*x7
zygp0Oo?(ji3{o^1vUcs7ufF{2sgL8cCz{7kuDfL&`OSrO^6KZO`ek?IuI%QSH!i;W
z^+xYRMt1Y1(<EMbn=}^}G0)naNXD!ekd2EFpZ$=mE}Ut8utehJ=gn1!mtTa<m-ZsW
a%g0Il&1=n1zaSUiTQG=MUPp7uH2(w6BPx~v

literal 1151
zcmaiy%W4!s6oxArZ|yy1sZcH?2~x4!L>N04B$EW9PE5iW1cRY7Q`6I-r)sFK$!!%8
z6~)U!1tnzXLJ{|46nzDK0arcx4DS3ZmI;vo5B>L7=kHV1r@H!kTk8vgXopThpP*CF
zObc#^uV4rG&GHx6h5Ym`LiT`Hz*cb5avH=%Zrc17xEp!F`XOlM&0D`}eQmjDpRZW1
zg8NZ_4>apM1rLDFzyf+%2iuUhpb5iv%MQ@g`<8>2Lm;M*QJarh=Bz(y^StE^>(5xu
zT7M4Qi*-tt73*u8FM()pbFZc^Q)~9|Hx6T9`ZK*8gv|GMAWS1CAQQ)-qmbF}G3XG~
zERI-npW&I#g&?l+u5PbH=b|`{r1-B_X;RnB)2d0~mdT^AtVt<a;G`sLiijc+k>Er^
zsz?&Pzy(R7C6Z{O%eWNhM9X5ZjC(~YB^QZalw_GFnk!>ZC^^pynvE6NG*=0>;?v>z
zK!nnn;#H|M%Ozn{WJ9$uVR`9OXX09(Wfc!JYT0n0xlhl#p2yrC=3Ss(kMCue+v~b0
zWK(=0GHd=*=k`)B<M&)V>mr=1L84h+1tN(9EtO9%2SP*%?MEBnrI<%W9(PBgBnMF}
z!deh=mghmmr`a;LpK#h~20<6?AIGN{baG?4k?s9>-L8|BLUV!lELYL6=1clqH4Y-t
zM+@aZC0q|&&yTXqcAe>`#1$J61zC(l=+n$xq_^Jh)0OgUcHEhWYbuD@s8p52r=q%<
zCIem{{WBbJogM#1<MHiu<I4`~=c~_Y{r(OMxv6U0eMi!b=cKW=W{x`juujtYsyXSj
geg{wA+jCCq4@mm)VdM2%^5f+bgLLB&hHuR9H|-1uFaQ7m

diff --git a/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.po
index 599208f0af..92c70962e5 100644
--- a/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.po
@@ -1,97 +1,267 @@
 # This file is distributed under the same license as the Django package.
 #
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Chinese (China) <None>\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "今天"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "昨天"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "明天"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f 百万"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] "%(value)s 百万"
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f 十亿"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] "%(value)s 十亿"
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f 万亿"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] "%(value)s 万亿"
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "一"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "二"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "三"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "四"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "五"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "六"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "七"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "八"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "九"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "今天"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr "%(delta)s 之前"
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "明天"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr "现在"
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "昨天"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] "%(count)s 秒钟之前"
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] "%(count)s 分钟之前"
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] "%(count)s 小时之前"
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr "%(delta)s 之后"
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] "%(count)s 秒钟之后"
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] "%(count)s 分钟之后"
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] "%(count)s 小时之后"
diff --git a/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.mo
index 77cf0c6e2a2249c4326f3fc36f96d5a89258d116..0f24502f04a402d5dcbdaf67aeace3a536e84023 100644
GIT binary patch
delta 313
zcmey#v7U3np89Ew3=DIb7#M^Y7#K`gAhbJ><_GelfHX6Z&Vtf;P`U_61GO-eLHU(X
zx)v(l2<5jx=?<uP50vhQicex;kYiv28Z-?k0HWtYC6++>D>g?m_Ar_n=^7a88k#5=
z7+4uv>Kd3E7;pvn>jtHkWfo`V=jpm6mZVxK7#SD>)fs`*85&y|SWK2;_V>}qC@Cqh
z($_C9FV`z6O3W+HOiQiM%S$cMFDS~-N=+^))-TXc$x6&i&)3fZlBJ31srpqJ@gd>*
Wnp{3m0V@Tt$mD$H=*hR3=K}z0Zas(q

delta 259
zcmZ3_`IBS9p85nv28Ovz3=BdH3=IF6A+#V10|P&huL7ijLJTHQ+5$@30BN8W1_vnL
z8A`iD#l4|?KPVjp6%T{bkx=m%76v&6HlRTXKmib)4wcA*@{2Y{GWIZ<8tNJt>l&IW
z7#dp{TId>>7#MH``0ECxmSq-a=I80UB$lLFDHs_Tg4G$AC>UB;8Cy=4V)kdV@ypLk
dwVS+^Ihx-mF)zI|F&(I~DkDB5d@?`F0sxAvC4m3{

diff --git a/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.po
index f72877f643..f3062e9918 100644
--- a/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.po
@@ -1,97 +1,267 @@
 # 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:18-0400\n"
-"PO-Revision-Date: 2011-03-04 18:39+0000\n"
+"POT-Creation-Date: 2012-03-14 00:19-0700\n"
+"PO-Revision-Date: 2012-02-14 13:08+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"
 
-#: templatetags/humanize.py:19
+#: tests.py:108 templatetags/humanize.py:164
+msgid "today"
+msgstr "今天"
+
+#: tests.py:108 templatetags/humanize.py:168
+msgid "yesterday"
+msgstr "昨天"
+
+#: tests.py:108 templatetags/humanize.py:166
+msgid "tomorrow"
+msgstr "明天"
+
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr "th"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr "st"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr "nd"
 
-#: templatetags/humanize.py:19
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr "rd"
 
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f 百萬"
 
+#: templatetags/humanize.py:54
+#, python-format
+msgid "%(value)s million"
+msgid_plural "%(value)s million"
+msgstr[0] ""
+
 #: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f 十億"
 
-#: templatetags/humanize.py:60
+#: templatetags/humanize.py:58
+#, python-format
+msgid "%(value)s billion"
+msgid_plural "%(value)s billion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f 兆"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:62
+#, python-format
+msgid "%(value)s trillion"
+msgid_plural "%(value)s trillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:65
+#, python-format
+msgid "%(value).1f quadrillion"
+msgid_plural "%(value).1f quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:66
+#, python-format
+msgid "%(value)s quadrillion"
+msgid_plural "%(value)s quadrillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:69
+#, python-format
+msgid "%(value).1f quintillion"
+msgid_plural "%(value).1f quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:70
+#, python-format
+msgid "%(value)s quintillion"
+msgid_plural "%(value)s quintillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:73
+#, python-format
+msgid "%(value).1f sextillion"
+msgid_plural "%(value).1f sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:74
+#, python-format
+msgid "%(value)s sextillion"
+msgid_plural "%(value)s sextillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:77
+#, python-format
+msgid "%(value).1f septillion"
+msgid_plural "%(value).1f septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:78
+#, python-format
+msgid "%(value)s septillion"
+msgid_plural "%(value)s septillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:81
+#, python-format
+msgid "%(value).1f octillion"
+msgid_plural "%(value).1f octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:82
+#, python-format
+msgid "%(value)s octillion"
+msgid_plural "%(value)s octillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:85
+#, python-format
+msgid "%(value).1f nonillion"
+msgid_plural "%(value).1f nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:86
+#, python-format
+msgid "%(value)s nonillion"
+msgid_plural "%(value)s nonillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:89
+#, python-format
+msgid "%(value).1f decillion"
+msgid_plural "%(value).1f decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:90
+#, python-format
+msgid "%(value)s decillion"
+msgid_plural "%(value)s decillion"
+msgstr[0] ""
+
+#: templatetags/humanize.py:93
+#, python-format
+msgid "%(value).1f googol"
+msgid_plural "%(value).1f googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:94
+#, python-format
+msgid "%(value)s googol"
+msgid_plural "%(value)s googol"
+msgstr[0] ""
+
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr "一"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr "二"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr "三"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr "四"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr "五"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr "六"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr "七"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr "八"
 
-#: templatetags/humanize.py:76
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr "九"
 
-#: templatetags/humanize.py:96
-msgid "today"
-msgstr "今天"
+#: templatetags/humanize.py:185
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s ago"
+msgstr ""
 
-#: templatetags/humanize.py:98
-msgid "tomorrow"
-msgstr "明天"
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
+msgid "now"
+msgstr ""
 
-#: templatetags/humanize.py:100
-msgid "yesterday"
-msgstr "昨天"
+#: templatetags/humanize.py:191
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:196
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:201
+#, python-format
+msgid "an hour ago"
+msgid_plural "%(count)s hours ago"
+msgstr[0] ""
+
+#: templatetags/humanize.py:207
+#, python-format
+msgctxt "naturaltime"
+msgid "%(delta)s from now"
+msgstr ""
+
+#: templatetags/humanize.py:213
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+
+#: templatetags/humanize.py:218
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+
+#: templatetags/humanize.py:223
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""