=== modified file 'django/conf/global_settings.py'
--- django/conf/global_settings.py	2008-02-29 18:38:44 +0000
+++ django/conf/global_settings.py	2008-03-01 22:49:13 +0000
@@ -226,25 +226,25 @@
 
 # Default formatting for date objects. See all available format strings here:
 # http://www.djangoproject.com/documentation/templates/#now
-DATE_FORMAT = 'N j, Y'
+DATE_FORMAT = gettext_noop('N j, Y')
 
 # Default formatting for datetime objects. See all available format strings here:
 # http://www.djangoproject.com/documentation/templates/#now
-DATETIME_FORMAT = 'N j, Y, P'
+DATETIME_FORMAT = gettext_noop('N j, Y, P')
 
 # Default formatting for time objects. See all available format strings here:
 # http://www.djangoproject.com/documentation/templates/#now
-TIME_FORMAT = 'P'
+TIME_FORMAT = gettext_noop('P')
 
 # Default formatting for date objects when only the year and month are relevant.
 # See all available format strings here:
 # http://www.djangoproject.com/documentation/templates/#now
-YEAR_MONTH_FORMAT = 'F Y'
+YEAR_MONTH_FORMAT = gettext_noop('F Y')
 
 # Default formatting for date objects when only the month and day are relevant.
 # See all available format strings here:
 # http://www.djangoproject.com/documentation/templates/#now
-MONTH_DAY_FORMAT = 'F j'
+MONTH_DAY_FORMAT = gettext_noop('F j')
 
 # Do you want to manage transactions manually?
 # Hint: you really don't!

=== modified file 'django/conf/locale/ar/LC_MESSAGES/django.po'
--- django/conf/locale/ar/LC_MESSAGES/django.po	2006-07-10 14:14:00 +0000
+++ django/conf/locale/ar/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -1987,3 +1987,18 @@
 msgid "MONTH_DAY_FORMAT"
 msgstr ""
 
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/bg/LC_MESSAGES/django.po'
--- django/conf/locale/bg/LC_MESSAGES/django.po	2007-05-14 08:12:03 +0000
+++ django/conf/locale/bg/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2668,3 +2668,18 @@
 "starts with \"%(start)s\".)"
 msgstr "Атрибутът \"%(attr)s\" на ред %(line)s има невалидна стойност. (Редът започва с \"%(start)s\".)"
 
+
+msgid "N j, Y"
+msgstr "j N, Y"
+
+msgid "N j, Y, P"
+msgstr "j N, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "j F"

=== modified file 'django/conf/locale/bn/LC_MESSAGES/django.po'
--- django/conf/locale/bn/LC_MESSAGES/django.po	2006-05-16 08:07:45 +0000
+++ django/conf/locale/bn/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -1991,3 +1991,18 @@
 #, fuzzy
 #~ msgid "count"
 #~ msgstr "অভ্যন্তরস্থ বস্তু"
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/ca/LC_MESSAGES/django.po'
--- django/conf/locale/ca/LC_MESSAGES/django.po	2008-02-03 04:18:40 +0000
+++ django/conf/locale/ca/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -4234,3 +4234,18 @@
 #~ "Introdueixi un codi postal. És necessari un espai entre les dues parts "
 #~ "del codi postal."
 
+
+msgid "N j, Y"
+msgstr "F j, Y"
+
+msgid "N j, Y, P"
+msgstr "F j, Y, H:i"
+
+msgid "P"
+msgstr "H:i"
+
+msgid "F Y"
+msgstr "j de/d' F del Y"
+
+msgid "F j"
+msgstr "j de/d' F del Y"

=== modified file 'django/conf/locale/cs/LC_MESSAGES/django.po'
--- django/conf/locale/cs/LC_MESSAGES/django.po	2007-06-24 11:48:41 +0000
+++ django/conf/locale/cs/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -3032,3 +3032,18 @@
 #: utils/translation/trans_real.py:377
 msgid "MONTH_DAY_FORMAT"
 msgstr "j. F"
+
+msgid "N j, Y"
+msgstr "j. n. Y"
+
+msgid "N j, Y, P"
+msgstr "j. n. Y, H:i"
+
+msgid "P"
+msgstr "H:i"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "j. F"

=== modified file 'django/conf/locale/cy/LC_MESSAGES/django.po'
--- django/conf/locale/cy/LC_MESSAGES/django.po	2008-02-05 23:56:08 +0000
+++ django/conf/locale/cy/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -1989,3 +1989,18 @@
 #, fuzzy
 #~ msgid "count"
 #~ msgstr "cynnwys"
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/da/LC_MESSAGES/django.po'
--- django/conf/locale/da/LC_MESSAGES/django.po	2006-09-25 13:48:41 +0000
+++ django/conf/locale/da/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -1925,3 +1925,18 @@
 msgid "yes,no,maybe"
 msgstr "ja,nej,måske"
 
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/de/LC_MESSAGES/django.po'
--- django/conf/locale/de/LC_MESSAGES/django.po	2008-02-03 04:26:00 +0000
+++ django/conf/locale/de/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2836,3 +2836,18 @@
 #, python-format
 msgid "The %(verbose_name)s was deleted."
 msgstr "%(verbose_name)s wurde gelöscht"
+
+msgid "N j, Y"
+msgstr "j. N Y"
+
+msgid "N j, Y, P"
+msgstr "j. N Y, H:i"
+
+msgid "P"
+msgstr "H:i"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "j. F"

=== modified file 'django/conf/locale/el/LC_MESSAGES/django.po'
--- django/conf/locale/el/LC_MESSAGES/django.po	2007-09-13 19:28:24 +0000
+++ django/conf/locale/el/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2766,3 +2766,18 @@
 "starts with \"%(start)s\".)"
 msgstr "χαρακτηριστικό ενεργό τιμή Γραμμή με έναρξη"
 
+
+msgid "N j, Y"
+msgstr "j N Y"
+
+msgid "N j, Y, P"
+msgstr "j N Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "j F"

=== modified file 'django/conf/locale/en/LC_MESSAGES/django.po'
--- django/conf/locale/en/LC_MESSAGES/django.po	2007-11-29 16:59:35 +0000
+++ django/conf/locale/en/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -3766,3 +3766,18 @@
 #, python-format
 msgid "The %(verbose_name)s was deleted."
 msgstr ""
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/es/LC_MESSAGES/django.po'
--- django/conf/locale/es/LC_MESSAGES/django.po	2007-10-27 04:26:44 +0000
+++ django/conf/locale/es/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -3767,3 +3767,18 @@
 msgid "The %(verbose_name)s was deleted."
 msgstr "El %(verbose_name)s ha sido eliminado."
 
+
+msgid "N j, Y"
+msgstr "j N Y"
+
+msgid "N j, Y, P"
+msgstr "j N Y P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "j \\de F"

=== modified file 'django/conf/locale/es_AR/LC_MESSAGES/django.po'
--- django/conf/locale/es_AR/LC_MESSAGES/django.po	2008-02-03 04:36:49 +0000
+++ django/conf/locale/es_AR/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -4446,3 +4446,18 @@
 
 #~ msgid "packages"
 #~ msgstr "paquetes"
+
+msgid "N j, Y"
+msgstr "j N Y"
+
+msgid "N j, Y, P"
+msgstr "j N Y P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "j \\de F"

=== modified file 'django/conf/locale/eu/LC_MESSAGES/django.po'
--- django/conf/locale/eu/LC_MESSAGES/django.po	2008-02-15 11:29:27 +0000
+++ django/conf/locale/eu/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -4246,3 +4246,18 @@
 msgid "The %(verbose_name)s was deleted."
 msgstr "%(verbose_name)s ezabatua izan da."
 
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/fa/LC_MESSAGES/django.po'
--- django/conf/locale/fa/LC_MESSAGES/django.po	2008-02-03 04:29:38 +0000
+++ django/conf/locale/fa/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -4234,3 +4234,18 @@
 
 #~ msgid "%d milliseconds"
 #~ msgstr "%d میلی‌ثانیه"
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/fi/LC_MESSAGES/django.po'
--- django/conf/locale/fi/LC_MESSAGES/django.po	2007-09-15 04:54:17 +0000
+++ django/conf/locale/fi/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -3577,3 +3577,18 @@
 #: oldforms/__init__.py:764
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Syötä kokonaisluku väliltä 0 ja 32767."
+
+msgid "N j, Y"
+msgstr "j.n.Y"
+
+msgid "N j, Y, P"
+msgstr "j.n.Y G:i"
+
+msgid "P"
+msgstr "G:i"
+
+msgid "F Y"
+msgstr "N Y"
+
+msgid "F j"
+msgstr "N j, Y"

=== modified file 'django/conf/locale/fr/LC_MESSAGES/django.po'
--- django/conf/locale/fr/LC_MESSAGES/django.po	2007-08-11 05:47:44 +0000
+++ django/conf/locale/fr/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -3083,3 +3083,18 @@
 
 #~ msgid "Messages"
 #~ msgstr "Messages"
+
+msgid "N j, Y"
+msgstr "j F Y"
+
+msgid "N j, Y, P"
+msgstr "j F Y, G:i"
+
+msgid "P"
+msgstr "G:i:s"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "j F"

=== modified file 'django/conf/locale/ga/LC_MESSAGES/django.po'
--- django/conf/locale/ga/LC_MESSAGES/django.po	2008-02-03 04:22:11 +0000
+++ django/conf/locale/ga/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -4202,3 +4202,18 @@
 msgid "The %(verbose_name)s was deleted."
 msgstr ""
 
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/gl/LC_MESSAGES/django.po'
--- django/conf/locale/gl/LC_MESSAGES/django.po	2007-06-24 11:56:42 +0000
+++ django/conf/locale/gl/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -3026,3 +3026,18 @@
 
 #~ msgid "packages"
 #~ msgstr "paquetes"
+
+msgid "N j, Y"
+msgstr "d-m-Y"
+
+msgid "N j, Y, P"
+msgstr "d-m-Y H:i"
+
+msgid "P"
+msgstr "H:i"
+
+msgid "F Y"
+msgstr "m Y"
+
+msgid "F j"
+msgstr "d m"

=== modified file 'django/conf/locale/he/LC_MESSAGES/django.po'
--- django/conf/locale/he/LC_MESSAGES/django.po	2007-11-11 04:39:35 +0000
+++ django/conf/locale/he/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -3872,3 +3872,18 @@
 msgid "The %(verbose_name)s was deleted."
 msgstr "ה-%(verbose_name)s נמחק."
 
+
+msgid "N j, Y"
+msgstr "d.m.Y"
+
+msgid "N j, Y, P"
+msgstr "d.m.y H:i:s"
+
+msgid "P"
+msgstr "H:i:s"
+
+msgid "F Y"
+msgstr "d.m.Y"
+
+msgid "F j"
+msgstr "d.m.Y"

=== modified file 'django/conf/locale/hr/LC_MESSAGES/django.po'
--- django/conf/locale/hr/LC_MESSAGES/django.po	2008-01-09 11:42:58 +0000
+++ django/conf/locale/hr/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -4344,3 +4344,18 @@
 #, python-format
 msgid "The %(verbose_name)s was deleted."
 msgstr "%(verbose_name)s je izbrisano"
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/hu/LC_MESSAGES/django.po'
--- django/conf/locale/hu/LC_MESSAGES/django.po	2007-09-13 19:39:10 +0000
+++ django/conf/locale/hu/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -3495,3 +3495,18 @@
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
+
+msgid "N j, Y"
+msgstr "Y. F j."
+
+msgid "N j, Y, P"
+msgstr "Y. F j., H:i"
+
+msgid "P"
+msgstr "H:i"
+
+msgid "F Y"
+msgstr "Y. F j."
+
+msgid "F j"
+msgstr "Y. F j."

=== modified file 'django/conf/locale/is/LC_MESSAGES/django.po'
--- django/conf/locale/is/LC_MESSAGES/django.po	2008-02-03 04:16:02 +0000
+++ django/conf/locale/is/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -4264,3 +4264,18 @@
 #~ msgid "count"
 #~ msgstr "innihald"
 
+
+msgid "N j, Y"
+msgstr "j. N Y"
+
+msgid "N j, Y, P"
+msgstr "j. N Y, H:i"
+
+msgid "P"
+msgstr "H:i"
+
+msgid "F Y"
+msgstr "j. N Y"
+
+msgid "F j"
+msgstr "j. N Y"

=== modified file 'django/conf/locale/it/LC_MESSAGES/django.po'
--- django/conf/locale/it/LC_MESSAGES/django.po	2008-02-03 04:10:01 +0000
+++ django/conf/locale/it/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -4355,3 +4355,18 @@
 msgid "The %(verbose_name)s was deleted."
 msgstr "%(verbose_name)s è stato cancellato."
 
+
+msgid "N j, Y"
+msgstr "j F Y"
+
+msgid "N j, Y, P"
+msgstr "j F Y, H:i"
+
+msgid "P"
+msgstr "H:i"
+
+msgid "F Y"
+msgstr "Y F"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/ja/LC_MESSAGES/django.po'
--- django/conf/locale/ja/LC_MESSAGES/django.po	2008-01-09 11:42:28 +0000
+++ django/conf/locale/ja/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -4321,3 +4321,18 @@
 #, python-format
 msgid "The %(verbose_name)s was deleted."
 msgstr " %(verbose_name)s を削除しました。"
+
+msgid "N j, Y"
+msgstr "Y/m/d"
+
+msgid "N j, Y, P"
+msgstr "Y/m/d H:i"
+
+msgid "P"
+msgstr "H:i"
+
+msgid "F Y"
+msgstr "Y/m/d"
+
+msgid "F j"
+msgstr "m/d"

=== modified file 'django/conf/locale/ka/LC_MESSAGES/django.po'
--- django/conf/locale/ka/LC_MESSAGES/django.po	2008-02-29 16:45:36 +0000
+++ django/conf/locale/ka/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -4511,3 +4511,18 @@
 #, python-format
 msgid "The %(verbose_name)s was deleted."
 msgstr "%(verbose_name)s წაიშალა."
+
+msgid "N j, Y"
+msgstr "d.m.Y"
+
+msgid "N j, Y, P"
+msgstr "d.m.Y H:i"
+
+msgid "P"
+msgstr "H:i"
+
+msgid "F Y"
+msgstr "d.m.Y"
+
+msgid "F j"
+msgstr "d.m.Y"

=== modified file 'django/conf/locale/km/LC_MESSAGES/django.po'
--- django/conf/locale/km/LC_MESSAGES/django.po	2007-09-13 19:51:26 +0000
+++ django/conf/locale/km/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2506,3 +2506,18 @@
 msgid "End date"
 msgstr "បញ្ជប់នៅ"
 
+
+msgid "N j, Y"
+msgstr "ថ្ងៃទី j ​ខែ N ឆ្នាំ Y"
+
+msgid "N j, Y, P"
+msgstr "ថ្ងៃទី j ​ខែ N ឆ្នាំ Y ម៉ោង P"
+
+msgid "P"
+msgstr "ម៉ោង P"
+
+msgid "F Y"
+msgstr "ខែ F ឆ្នាំ Y"
+
+msgid "F j"
+msgstr "ថ្ងៃទី​​ j ខែ F"

=== modified file 'django/conf/locale/kn/LC_MESSAGES/django.po'
--- django/conf/locale/kn/LC_MESSAGES/django.po	2008-02-05 23:56:08 +0000
+++ django/conf/locale/kn/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2534,3 +2534,18 @@
 msgid "yes,no,maybe"
 msgstr "ಹೌದು,ಇಲ್ಲ,ಇರಬಹುದು"
 
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/ko/LC_MESSAGES/django.po'
--- django/conf/locale/ko/LC_MESSAGES/django.po	2007-09-13 19:27:50 +0000
+++ django/conf/locale/ko/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2795,3 +2795,18 @@
 #: oldforms/__init__.py:750
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "0 ~ 32,767 사이의 정수를 입력하세요."
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/lv/LC_MESSAGES/django.po'
--- django/conf/locale/lv/LC_MESSAGES/django.po	2007-05-09 13:41:48 +0000
+++ django/conf/locale/lv/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2863,3 +2863,18 @@
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/mk/LC_MESSAGES/django.po'
--- django/conf/locale/mk/LC_MESSAGES/django.po	2007-04-09 13:18:23 +0000
+++ django/conf/locale/mk/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2753,3 +2753,18 @@
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Внесете правилно. %s не е еден од достапните вредности."
 
+
+msgid "N j, Y"
+msgstr "j M Y"
+
+msgid "N j, Y, P"
+msgstr "j M Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/nl/LC_MESSAGES/django.po'
--- django/conf/locale/nl/LC_MESSAGES/django.po	2008-02-29 16:46:04 +0000
+++ django/conf/locale/nl/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -4240,3 +4240,18 @@
 #~ msgid "Use '[algo]$[salt]$[hexdigest]'"
 #~ msgstr "Gebruik '[algo]$[salt]$[hexdigest]'"
 
+
+msgid "N j, Y"
+msgstr "j-n-Y"
+
+msgid "N j, Y, P"
+msgstr "j-n-Y H:i"
+
+msgid "P"
+msgstr "H:i"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "j F"

=== modified file 'django/conf/locale/no/LC_MESSAGES/django.po'
--- django/conf/locale/no/LC_MESSAGES/django.po	2007-09-13 19:52:26 +0000
+++ django/conf/locale/no/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2585,3 +2585,18 @@
 msgid "This URL appears to be a broken link."
 msgstr "Denne URL'en fører til en side som ikke eksisterer."
 
+
+msgid "N j, Y"
+msgstr "j. M Y"
+
+msgid "N j, Y, P"
+msgstr "h:i, j. M Y"
+
+msgid "P"
+msgstr "h:i"
+
+msgid "F Y"
+msgstr "Y M"
+
+msgid "F j"
+msgstr "j. M"

=== modified file 'django/conf/locale/pl/LC_MESSAGES/django.po'
--- django/conf/locale/pl/LC_MESSAGES/django.po	2008-02-29 20:23:48 +0000
+++ django/conf/locale/pl/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -4405,3 +4405,18 @@
 
 #~ msgid "%d milliseconds"
 #~ msgstr "%d milisekund"
+
+msgid "N j, Y"
+msgstr "Y-m-d"
+
+msgid "N j, Y, P"
+msgstr "Y-m-d H:i:s"
+
+msgid "P"
+msgstr "H:i:s"
+
+msgid "F Y"
+msgstr "Y-m"
+
+msgid "F j"
+msgstr "m-d"

=== modified file 'django/conf/locale/pt/LC_MESSAGES/django.po'
--- django/conf/locale/pt/LC_MESSAGES/django.po	2008-02-05 23:56:08 +0000
+++ django/conf/locale/pt/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2126,3 +2126,18 @@
 #: template/defaultfilters.py:401
 msgid "yes,no,maybe"
 msgstr "sim,não,talvez"
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/pt_BR/LC_MESSAGES/django.po'
--- django/conf/locale/pt_BR/LC_MESSAGES/django.po	2007-04-05 01:55:55 +0000
+++ django/conf/locale/pt_BR/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2696,3 +2696,18 @@
 #, fuzzy
 #~ msgid "count"
 #~ msgstr "contagem"
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/ro/LC_MESSAGES/django.po'
--- django/conf/locale/ro/LC_MESSAGES/django.po	2007-06-28 06:56:00 +0000
+++ django/conf/locale/ro/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -1991,3 +1991,18 @@
 #, fuzzy
 #~ msgid "count"
 #~ msgstr "conţinut"
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/ru/LC_MESSAGES/django.po'
--- django/conf/locale/ru/LC_MESSAGES/django.po	2007-05-19 17:57:43 +0000
+++ django/conf/locale/ru/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -3023,3 +3023,18 @@
 
 #~ msgid "Use '[algo]$[salt]$[hexdigest]'"
 #~ msgstr "Используйте '[algo]$[salt]$[hexdigest]'"
+
+msgid "N j, Y"
+msgstr "d.m.Y"
+
+msgid "N j, Y, P"
+msgstr "d.m.Y H:i"
+
+msgid "P"
+msgstr "H:i"
+
+msgid "F Y"
+msgstr "d.m.Y"
+
+msgid "F j"
+msgstr "d.m.Y"

=== modified file 'django/conf/locale/sk/LC_MESSAGES/django.po'
--- django/conf/locale/sk/LC_MESSAGES/django.po	2007-08-11 06:54:58 +0000
+++ django/conf/locale/sk/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -3383,3 +3383,18 @@
 
 #~ msgid "AnonymousUser"
 #~ msgstr "Neregistrovaný užívateľ"
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/sl/LC_MESSAGES/django.po'
--- django/conf/locale/sl/LC_MESSAGES/django.po	2007-07-06 08:35:25 +0000
+++ django/conf/locale/sl/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2965,3 +2965,18 @@
 #~ msgid "Slovene"
 #~ msgstr "Slovensko"
 
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/sr/LC_MESSAGES/django.po'
--- django/conf/locale/sr/LC_MESSAGES/django.po	2007-02-26 08:26:58 +0000
+++ django/conf/locale/sr/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -1914,3 +1914,18 @@
 #~ msgid "count"
 #~ msgstr "sadržaj"
 
+
+msgid "N j, Y"
+msgstr "D, d.m.Y."
+
+msgid "N j, Y, P"
+msgstr "d.m.Y. H:i:s"
+
+msgid "P"
+msgstr "H:i:s"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/sv/LC_MESSAGES/django.po'
--- django/conf/locale/sv/LC_MESSAGES/django.po	2008-02-03 04:32:32 +0000
+++ django/conf/locale/sv/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -4432,3 +4432,18 @@
 #, python-format
 msgid "The %(verbose_name)s was deleted."
 msgstr "%(verbose_name)s togs bort."
+
+msgid "N j, Y"
+msgstr "Y-m-d"
+
+msgid "N j, Y, P"
+msgstr "Y-m-d H:i"
+
+msgid "P"
+msgstr "H:i"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "j F"

=== modified file 'django/conf/locale/ta/LC_MESSAGES/django.po'
--- django/conf/locale/ta/LC_MESSAGES/django.po	2007-03-20 23:50:14 +0000
+++ django/conf/locale/ta/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2134,3 +2134,18 @@
 msgid "yes,no,maybe"
 msgstr "ஆம், இல்லை, இருக்கலாம்"
 
+
+msgid "N j, Y"
+msgstr "தேதி_முறை"
+
+msgid "N j, Y, P"
+msgstr "தேதிநேரம்_முறை"
+
+msgid "P"
+msgstr "நேரம்_முறை"
+
+msgid "F Y"
+msgstr "வருடம்_மாதம்_முறை"
+
+msgid "F j"
+msgstr "மாதம்_நாள்_முறை"

=== modified file 'django/conf/locale/te/LC_MESSAGES/django.po'
--- django/conf/locale/te/LC_MESSAGES/django.po	2007-09-14 12:39:03 +0000
+++ django/conf/locale/te/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2107,3 +2107,18 @@
 msgid "yes,no,maybe"
 msgstr "అవును, కాదు , ఏమొ"
 
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/tr/LC_MESSAGES/django.po'
--- django/conf/locale/tr/LC_MESSAGES/django.po	2008-01-09 11:41:35 +0000
+++ django/conf/locale/tr/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2466,3 +2466,18 @@
 
 #~ msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 #~ msgstr "<a href=\"/password_reset/\">Şifrenizi mi unuttunuz?</a>"
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/uk/LC_MESSAGES/django.po'
--- django/conf/locale/uk/LC_MESSAGES/django.po	2006-05-16 08:07:45 +0000
+++ django/conf/locale/uk/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -1968,3 +1968,18 @@
 
 #~ msgid "packages"
 #~ msgstr "пакунки"
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/zh_CN/LC_MESSAGES/django.po'
--- django/conf/locale/zh_CN/LC_MESSAGES/django.po	2007-07-16 04:47:52 +0000
+++ django/conf/locale/zh_CN/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2635,3 +2635,18 @@
 msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
 msgstr "在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)"
 
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/conf/locale/zh_TW/LC_MESSAGES/django.po'
--- django/conf/locale/zh_TW/LC_MESSAGES/django.po	2007-11-11 04:38:53 +0000
+++ django/conf/locale/zh_TW/LC_MESSAGES/django.po	2008-03-01 22:49:37 +0000
@@ -2688,3 +2688,18 @@
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
 "starts with \"%(start)s\".)"
 msgstr "第 \"%(line)s\" 的 \"%(attr)s\" 屬性是無效的值 (行開始於 \"%(start)s\")。"
+
+msgid "N j, Y"
+msgstr "N j, Y"
+
+msgid "N j, Y, P"
+msgstr "N j, Y, P"
+
+msgid "P"
+msgstr "P"
+
+msgid "F Y"
+msgstr "F Y"
+
+msgid "F j"
+msgstr "F j"

=== modified file 'django/contrib/admin/templatetags/admin_list.py'
--- django/contrib/admin/templatetags/admin_list.py	2007-12-04 19:17:25 +0000
+++ django/contrib/admin/templatetags/admin_list.py	2008-03-01 22:49:13 +0000
@@ -7,7 +7,7 @@
 from django.utils.html import escape, conditional_escape
 from django.utils.text import capfirst
 from django.utils.safestring import mark_safe
-from django.utils.translation import get_date_formats, get_partial_date_formats, ugettext as _
+from django.utils.translation import ugettext as _
 from django.utils.encoding import smart_unicode, smart_str, force_unicode
 from django.template import Library
 import datetime
@@ -161,13 +161,12 @@
             # Dates and times are special: They're formatted in a certain way.
             elif isinstance(f, models.DateField) or isinstance(f, models.TimeField):
                 if field_val:
-                    (date_format, datetime_format, time_format) = get_date_formats()
                     if isinstance(f, models.DateTimeField):
-                        result_repr = capfirst(dateformat.format(field_val, datetime_format))
+                        result_repr = capfirst(dateformat.format(field_val, _(settings.DATETIME_FORMAT)))
                     elif isinstance(f, models.TimeField):
-                        result_repr = capfirst(dateformat.time_format(field_val, time_format))
+                        result_repr = capfirst(dateformat.time_format(field_val, _(settings.TIME_FORMAT)))
                     else:
-                        result_repr = capfirst(dateformat.format(field_val, date_format))
+                        result_repr = capfirst(dateformat.format(field_val, _(settings.DATE_FORMAT)))
                 else:
                     result_repr = EMPTY_CHANGELIST_VALUE
                 row_class = ' class="nowrap"'
@@ -221,7 +220,6 @@
         year_lookup = cl.params.get(year_field)
         month_lookup = cl.params.get(month_field)
         day_lookup = cl.params.get(day_field)
-        year_month_format, month_day_format = get_partial_date_formats()
 
         link = lambda d: mark_safe(cl.get_query_string(d, [field_generic]))
 
@@ -231,9 +229,9 @@
                 'show': True,
                 'back': {
                     'link': link({year_field: year_lookup, month_field: month_lookup}),
-                    'title': dateformat.format(day, year_month_format)
+                    'title': dateformat.format(day, _(settings.YEAR_MONTH_FORMAT))
                 },
-                'choices': [{'title': dateformat.format(day, month_day_format)}]
+                'choices': [{'title': dateformat.format(day, _(settings.MONTH_DAY_FORMAT))}]
             }
         elif year_lookup and month_lookup:
             days = cl.query_set.filter(**{year_field: year_lookup, month_field: month_lookup}).dates(field_name, 'day')
@@ -245,7 +243,7 @@
                 },
                 'choices': [{
                     'link': link({year_field: year_lookup, month_field: month_lookup, day_field: day.day}),
-                    'title': dateformat.format(day, month_day_format)
+                    'title': dateformat.format(day, _(settings.MONTH_DAY_FORMAT))
                 } for day in days]
             }
         elif year_lookup:
@@ -258,7 +256,7 @@
                 },
                 'choices': [{
                     'link': link({year_field: year_lookup, month_field: month.month}),
-                    'title': dateformat.format(month, year_month_format)
+                    'title': dateformat.format(month, _(settings.YEAR_MONTH_FORMAT))
                 } for month in months]
             }
         else:

=== modified file 'django/contrib/databrowse/datastructures.py'
--- django/contrib/databrowse/datastructures.py	2008-02-03 01:52:45 +0000
+++ django/contrib/databrowse/datastructures.py	2008-03-01 22:49:13 +0000
@@ -3,10 +3,11 @@
 convenience functionality and permalink functions for the databrowse app.
 """
 
+from django.conf import settings
 from django.db import models
 from django.utils import dateformat
 from django.utils.text import capfirst
-from django.utils.translation import get_date_formats
+from django.utils.translation import ugettext as _
 from django.utils.encoding import smart_unicode, smart_str, iri_to_uri
 from django.utils.safestring import mark_safe
 from django.db.models.query import QuerySet
@@ -156,13 +157,12 @@
             objs = dict(self.field.choices).get(self.raw_value, EMPTY_VALUE)
         elif isinstance(self.field, models.DateField) or isinstance(self.field, models.TimeField):
             if self.raw_value:
-                date_format, datetime_format, time_format = get_date_formats()
                 if isinstance(self.field, models.DateTimeField):
-                    objs = capfirst(dateformat.format(self.raw_value, datetime_format))
+                    objs = capfirst(dateformat.format(self.raw_value, _(settings.DATETIME_FORMAT)))
                 elif isinstance(self.field, models.TimeField):
-                    objs = capfirst(dateformat.time_format(self.raw_value, time_format))
+                    objs = capfirst(dateformat.time_format(self.raw_value, _(settings.TIME_FORMAT)))
                 else:
-                    objs = capfirst(dateformat.format(self.raw_value, date_format))
+                    objs = capfirst(dateformat.format(self.raw_value, _(settings.DATE_FORMAT)))
             else:
                 objs = EMPTY_VALUE
         elif isinstance(self.field, models.BooleanField) or isinstance(self.field, models.NullBooleanField):

=== modified file 'django/contrib/databrowse/plugins/calendars.py'
--- django/contrib/databrowse/plugins/calendars.py	2008-02-19 00:08:08 +0000
+++ django/contrib/databrowse/plugins/calendars.py	2008-03-01 22:49:13 +0000
@@ -4,7 +4,6 @@
 from django.contrib.databrowse.sites import DatabrowsePlugin
 from django.shortcuts import render_to_response
 from django.utils.text import capfirst
-from django.utils.translation import get_date_formats
 from django.utils.encoding import force_unicode
 from django.utils.safestring import mark_safe
 from django.views.generic import date_based

=== modified file 'django/template/defaultfilters.py'
--- django/template/defaultfilters.py	2008-02-25 06:02:35 +0000
+++ django/template/defaultfilters.py	2008-03-01 22:49:13 +0000
@@ -620,7 +620,7 @@
     if not value:
         return u''
     if arg is None:
-        arg = settings.DATE_FORMAT
+        arg = ugettext(settings.DATE_FORMAT)
     return format(value, arg)
 date.is_safe = False
 
@@ -630,7 +630,7 @@
     if value in (None, u''):
         return u''
     if arg is None:
-        arg = settings.TIME_FORMAT
+        arg = ugettext(settings.TIME_FORMAT)
     return time_format(value, arg)
 time.is_safe = False
 

