Django

Code

Show
Ignore:
Timestamp:
11/30/07 00:23:24 (1 year ago)
Author:
jkocherhans
Message:

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

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-6655,6658-6671 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-6776

  • django/branches/newforms-admin/django/conf/locale/en/LC_MESSAGES/djangojs.po

    r1589 r6777  
    88"Project-Id-Version: PACKAGE VERSION\n" 
    99"Report-Msgid-Bugs-To: \n" 
    10 "POT-Creation-Date: 2005-12-09 11:51+0100\n" 
     10"POT-Creation-Date: 2007-11-29 10:58-0600\n" 
    1111"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
    1313"Language-Team: LANGUAGE <LL@li.org>\n" 
    1414"MIME-Version: 1.0\n" 
    15 "Content-Type: text/plain; charset=utf-8\n" 
     15"Content-Type: text/plain; charset=UTF-8\n" 
    1616"Content-Transfer-Encoding: 8bit\n" 
    1717 
    …… 
    4646msgstr "" 
    4747 
    48 #: contrib/admin/media/js/dateparse.js:26 
    4948#: contrib/admin/media/js/calendar.js:24 
     49#: contrib/admin/media/js/dateparse.js:32 
    5050msgid "" 
    5151"January February March April May June July August September October November " 
    5252"December" 
    53 msgstr "" 
    54  
    55 #: contrib/admin/media/js/dateparse.js:27 
    56 msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday" 
    5753msgstr "" 
    5854 
    …… 
    6157msgstr "" 
    6258 
    63 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:45 
    64 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:80 
     59#: contrib/admin/media/js/dateparse.js:33 
     60msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday" 
     61msgstr "" 
     62 
     63#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34 
     64#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72 
     65msgid "Show" 
     66msgstr "" 
     67 
     68#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63 
     69msgid "Hide" 
     70msgstr "" 
     71 
     72#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47 
     73#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81 
    6574msgid "Now" 
    6675msgstr "" 
    6776 
    68 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:48 
     77#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51 
    6978msgid "Clock" 
    7079msgstr "" 
    7180 
    72 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:77 
     81#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78 
    7382msgid "Choose a time" 
    7483msgstr "" 
    7584 
    76 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:81 
     85#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82 
    7786msgid "Midnight" 
    7887msgstr "" 
    7988 
    80 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:82 
     89#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83 
    8190msgid "6 a.m." 
    8291msgstr "" 
    8392 
    84 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:83 
     93#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84 
    8594msgid "Noon" 
    8695msgstr "" 
    8796 
    88 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:87 
    89 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:168 
     97#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88 
     98#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183 
    9099msgid "Cancel" 
    91100msgstr "" 
    92101 
    93 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:111 
    94 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:162 
     102#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128 
     103#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177 
    95104msgid "Today" 
    96105msgstr "" 
    97106 
    98 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:114 
     107#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132 
    99108msgid "Calendar" 
    100109msgstr "" 
    101110 
    102 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:160 
     111#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175 
    103112msgid "Yesterday" 
    104113msgstr "" 
    105114 
    106 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:164 
     115#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179 
    107116msgid "Tomorrow" 
    108117msgstr ""