Django

Code

Show
Ignore:
Timestamp:
04/18/08 18:53:24 (9 months ago)
Author:
jkocherhans
Message:

newforms-admin: Merged from trunk up to [7435].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7377 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7435

  • django/branches/newforms-admin/django/conf/global_settings.py

    r7378 r7436  
    7171    ('pl', gettext_noop('Polish')), 
    7272    ('pt', gettext_noop('Portugese')), 
    73     ('pt-br', gettext_noop('Brazilian')), 
     73    ('pt-br', gettext_noop('Brazilian Portuguese')), 
    7474    ('ro', gettext_noop('Romanian')), 
    7575    ('ru', gettext_noop('Russian')),