Django

Code

Show
Ignore:
Timestamp:
02/08/08 14:57:56 (1 year ago)
Author:
jbronn
Message:

gis: Merged revisions 7044-7102 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7043 to /django/trunk:1-7102
  • django/branches/gis/django/conf/global_settings.py

    r6920 r7103  
    4848    ('en', gettext_noop('English')), 
    4949    ('es', gettext_noop('Spanish')), 
    50     ('es_AR', gettext_noop('Argentinean Spanish')), 
     50    ('es-ar', gettext_noop('Argentinean Spanish')), 
    5151    ('fa', gettext_noop('Persian')), 
    5252    ('fi', gettext_noop('Finnish')),