Django

Code

Show
Ignore:
Timestamp:
02/28/08 15:24:51 (9 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7105-7168 via svnmerge from trunk.

Files:

Legend:

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

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

    r7103 r7176  
    4949    ('es', gettext_noop('Spanish')), 
    5050    ('es-ar', gettext_noop('Argentinean Spanish')), 
     51    ('eu', gettext_noop('Basque')), 
    5152    ('fa', gettext_noop('Persian')), 
    5253    ('fi', gettext_noop('Finnish')), 
    5354    ('fr', gettext_noop('French')), 
    54     ('ga', gettext_noop('Gaeilge')), 
     55    ('ga', gettext_noop('Irish')), 
    5556    ('gl', gettext_noop('Galician')), 
    5657    ('hu', gettext_noop('Hungarian')), 
     
    6061    ('it', gettext_noop('Italian')), 
    6162    ('ja', gettext_noop('Japanese')), 
     63    ('ka', gettext_noop('Georgian')), 
    6264    ('ko', gettext_noop('Korean')), 
    6365    ('km', gettext_noop('Khmer')),