Django

Code

Show
Ignore:
Timestamp:
04/27/08 12:17:04 (7 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7458,7471-7473,7476-7478,7480 via svnmerge from trunk.

This includes all necessary patches for compatibility with queryset-refactor.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7441 to /django/trunk:1-7481

  • django/branches/gis/django/conf/locale/fr/LC_MESSAGES/django.po

    r7279 r7482  
    42784278#: utils/timesince.py:21 
    42794279msgid "year" 
    4280 msgstr "année" 
     4280msgid_plural "years" 
     4281msgstr[0] "année" 
     4282msgstr[1] "années" 
    42814283 
    42824284#: utils/timesince.py:22 
    42834285msgid "month" 
    4284 msgstr "mois" 
     4286msgid_plural "months" 
     4287msgstr[0] "mois" 
     4288msgstr[1] "mois" 
    42854289 
    42864290#: utils/timesince.py:23 
    42874291msgid "week" 
    4288 msgstr "semaine" 
     4292msgid_plural "weeks" 
     4293msgstr[0] "semaine" 
     4294msgstr[1] "semaines" 
    42894295 
    42904296#: utils/timesince.py:24 
    42914297msgid "day" 
    4292 msgstr "journée" 
     4298msgid_plural "days" 
     4299msgstr[0] "journée" 
     4300msgstr[1] "journées" 
    42934301 
    42944302#: utils/timesince.py:25 
    42954303msgid "hour" 
    4296 msgstr "heure" 
     4304msgid_plural "hours" 
     4305msgstr[0] "heure" 
     4306msgstr[1] "heures" 
    42974307 
    42984308#: utils/timesince.py:26