diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index 7c815ae17d..1e301665c6 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:29+0100\n" +"POT-Creation-Date: 2012-10-15 10:55+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -297,385 +297,386 @@ msgstr "" msgid "Traditional Chinese" msgstr "" -#: core/validators.py:24 forms/fields.py:51 +#: core/validators.py:21 forms/fields.py:52 msgid "Enter a valid value." msgstr "" -#: core/validators.py:99 forms/fields.py:601 -msgid "This URL appears to be a broken link." +#: core/validators.py:104 forms/fields.py:464 +msgid "Enter a valid email address." msgstr "" -#: core/validators.py:131 forms/fields.py:600 -msgid "Enter a valid URL." -msgstr "" - -#: core/validators.py:165 forms/fields.py:474 -msgid "Enter a valid e-mail address." -msgstr "" - -#: core/validators.py:168 forms/fields.py:1023 +#: core/validators.py:107 forms/fields.py:1013 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" -#: core/validators.py:171 core/validators.py:188 forms/fields.py:997 +#: core/validators.py:110 core/validators.py:129 forms/fields.py:987 msgid "Enter a valid IPv4 address." msgstr "" -#: core/validators.py:175 core/validators.py:189 +#: core/validators.py:115 core/validators.py:130 msgid "Enter a valid IPv6 address." msgstr "" -#: core/validators.py:184 core/validators.py:187 +#: core/validators.py:125 core/validators.py:128 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: core/validators.py:209 db/models/fields/__init__.py:638 +#: core/validators.py:151 db/models/fields/__init__.py:655 msgid "Enter only digits separated by commas." msgstr "" -#: core/validators.py:215 +#: core/validators.py:157 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "" -#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262 +#: core/validators.py:176 forms/fields.py:210 forms/fields.py:263 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "" -#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263 +#: core/validators.py:182 forms/fields.py:211 forms/fields.py:264 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "" -#: core/validators.py:244 +#: core/validators.py:189 #, python-format msgid "" "Ensure this value has at least %(limit_value)d characters (it has " "%(show_value)d)." msgstr "" -#: core/validators.py:250 +#: core/validators.py:196 #, python-format msgid "" "Ensure this value has at most %(limit_value)d characters (it has " "%(show_value)d)." msgstr "" -#: db/models/base.py:764 +#: db/models/base.py:843 #, python-format msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s." msgstr "" -#: db/models/base.py:787 forms/models.py:577 +#: db/models/base.py:866 forms/models.py:573 msgid "and" msgstr "" -#: db/models/base.py:788 db/models/fields/__init__.py:65 +#: db/models/base.py:867 db/models/fields/__init__.py:70 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "" -#: db/models/fields/__init__.py:62 +#: db/models/fields/__init__.py:67 #, python-format msgid "Value %r is not a valid choice." msgstr "" -#: db/models/fields/__init__.py:63 +#: db/models/fields/__init__.py:68 msgid "This field cannot be null." msgstr "" -#: db/models/fields/__init__.py:64 +#: db/models/fields/__init__.py:69 msgid "This field cannot be blank." msgstr "" -#: db/models/fields/__init__.py:71 +#: db/models/fields/__init__.py:76 #, python-format msgid "Field of type: %(field_type)s" msgstr "" -#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961 +#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985 msgid "Integer" msgstr "" -#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959 +#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983 #, python-format msgid "'%s' value must be an integer." msgstr "" -#: db/models/fields/__init__.py:552 +#: db/models/fields/__init__.py:569 #, python-format msgid "'%s' value must be either True or False." msgstr "" -#: db/models/fields/__init__.py:554 +#: db/models/fields/__init__.py:571 msgid "Boolean (Either True or False)" msgstr "" -#: db/models/fields/__init__.py:605 +#: db/models/fields/__init__.py:622 #, python-format msgid "String (up to %(max_length)s)" msgstr "" -#: db/models/fields/__init__.py:633 +#: db/models/fields/__init__.py:650 msgid "Comma-separated integers" msgstr "" -#: db/models/fields/__init__.py:647 +#: db/models/fields/__init__.py:664 #, python-format msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format." msgstr "" -#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734 +#: db/models/fields/__init__.py:666 db/models/fields/__init__.py:754 #, python-format msgid "" "'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date." msgstr "" -#: db/models/fields/__init__.py:652 +#: db/models/fields/__init__.py:669 msgid "Date (without time)" msgstr "" -#: db/models/fields/__init__.py:732 +#: db/models/fields/__init__.py:752 #, python-format msgid "" "'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" -#: db/models/fields/__init__.py:736 +#: db/models/fields/__init__.py:756 #, python-format msgid "" "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but " "it is an invalid date/time." msgstr "" -#: db/models/fields/__init__.py:740 +#: db/models/fields/__init__.py:760 msgid "Date (with time)" msgstr "" -#: db/models/fields/__init__.py:831 +#: db/models/fields/__init__.py:849 #, python-format msgid "'%s' value must be a decimal number." msgstr "" -#: db/models/fields/__init__.py:833 +#: db/models/fields/__init__.py:851 msgid "Decimal number" msgstr "" -#: db/models/fields/__init__.py:890 -msgid "E-mail address" +#: db/models/fields/__init__.py:908 +msgid "Email address" msgstr "" -#: db/models/fields/__init__.py:906 +#: db/models/fields/__init__.py:927 msgid "File path" msgstr "" -#: db/models/fields/__init__.py:930 +#: db/models/fields/__init__.py:954 #, python-format msgid "'%s' value must be a float." msgstr "" -#: db/models/fields/__init__.py:932 +#: db/models/fields/__init__.py:956 msgid "Floating point number" msgstr "" -#: db/models/fields/__init__.py:993 +#: db/models/fields/__init__.py:1017 msgid "Big (8 byte) integer" msgstr "" -#: db/models/fields/__init__.py:1007 +#: db/models/fields/__init__.py:1031 msgid "IPv4 address" msgstr "" -#: db/models/fields/__init__.py:1023 +#: db/models/fields/__init__.py:1047 msgid "IP address" msgstr "" -#: db/models/fields/__init__.py:1065 +#: db/models/fields/__init__.py:1090 #, python-format msgid "'%s' value must be either None, True or False." msgstr "" -#: db/models/fields/__init__.py:1067 +#: db/models/fields/__init__.py:1092 msgid "Boolean (Either True, False or None)" msgstr "" -#: db/models/fields/__init__.py:1116 +#: db/models/fields/__init__.py:1141 msgid "Positive integer" msgstr "" -#: db/models/fields/__init__.py:1127 +#: db/models/fields/__init__.py:1152 msgid "Positive small integer" msgstr "" -#: db/models/fields/__init__.py:1138 +#: db/models/fields/__init__.py:1163 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "" -#: db/models/fields/__init__.py:1156 +#: db/models/fields/__init__.py:1181 msgid "Small integer" msgstr "" -#: db/models/fields/__init__.py:1162 +#: db/models/fields/__init__.py:1187 msgid "Text" msgstr "" -#: db/models/fields/__init__.py:1180 +#: db/models/fields/__init__.py:1205 #, python-format msgid "" "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format." msgstr "" -#: db/models/fields/__init__.py:1182 +#: db/models/fields/__init__.py:1207 #, python-format msgid "" "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid " "time." msgstr "" -#: db/models/fields/__init__.py:1185 +#: db/models/fields/__init__.py:1210 msgid "Time" msgstr "" -#: db/models/fields/__init__.py:1249 +#: db/models/fields/__init__.py:1272 msgid "URL" msgstr "" -#: db/models/fields/files.py:214 +#: db/models/fields/files.py:211 +#, python-format +msgid "Filename is %(extra)d characters too long." +msgstr "" + +#: db/models/fields/files.py:221 msgid "File" msgstr "" -#: db/models/fields/files.py:321 +#: db/models/fields/files.py:347 msgid "Image" msgstr "" -#: db/models/fields/related.py:903 +#: db/models/fields/related.py:950 #, python-format msgid "Model %(model)s with pk %(pk)r does not exist." msgstr "" -#: db/models/fields/related.py:905 +#: db/models/fields/related.py:952 msgid "Foreign Key (type determined by related field)" msgstr "" -#: db/models/fields/related.py:1033 +#: db/models/fields/related.py:1082 msgid "One-to-one relationship" msgstr "" -#: db/models/fields/related.py:1096 +#: db/models/fields/related.py:1149 msgid "Many-to-many relationship" msgstr "" -#: db/models/fields/related.py:1120 +#: db/models/fields/related.py:1174 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" -#: forms/fields.py:50 +#: forms/fields.py:51 msgid "This field is required." msgstr "" -#: forms/fields.py:208 +#: forms/fields.py:209 msgid "Enter a whole number." msgstr "" -#: forms/fields.py:240 forms/fields.py:261 +#: forms/fields.py:241 forms/fields.py:262 msgid "Enter a number." msgstr "" -#: forms/fields.py:264 -#, python-format -msgid "Ensure that there are no more than %s digits in total." -msgstr "" - #: forms/fields.py:265 #, python-format -msgid "Ensure that there are no more than %s decimal places." +msgid "Ensure that there are no more than %s digits in total." msgstr "" #: forms/fields.py:266 #, python-format +msgid "Ensure that there are no more than %s decimal places." +msgstr "" + +#: forms/fields.py:267 +#, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "" -#: forms/fields.py:365 forms/fields.py:963 +#: forms/fields.py:355 forms/fields.py:953 msgid "Enter a valid date." msgstr "" -#: forms/fields.py:388 forms/fields.py:964 +#: forms/fields.py:378 forms/fields.py:954 msgid "Enter a valid time." msgstr "" -#: forms/fields.py:409 +#: forms/fields.py:399 msgid "Enter a valid date/time." msgstr "" -#: forms/fields.py:485 +#: forms/fields.py:475 msgid "No file was submitted. Check the encoding type on the form." msgstr "" -#: forms/fields.py:486 +#: forms/fields.py:476 msgid "No file was submitted." msgstr "" -#: forms/fields.py:487 +#: forms/fields.py:477 msgid "The submitted file is empty." msgstr "" -#: forms/fields.py:488 +#: forms/fields.py:478 #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." msgstr "" -#: forms/fields.py:489 +#: forms/fields.py:479 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" -#: forms/fields.py:544 +#: forms/fields.py:534 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: forms/fields.py:689 forms/fields.py:769 +#: forms/fields.py:580 +msgid "Enter a valid URL." +msgstr "" + +#: forms/fields.py:666 forms/fields.py:746 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "" -#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999 +#: forms/fields.py:747 forms/fields.py:835 forms/models.py:999 msgid "Enter a list of values." msgstr "" -#: forms/formsets.py:317 forms/formsets.py:319 +#: forms/formsets.py:323 forms/formsets.py:325 msgid "Order" msgstr "" -#: forms/formsets.py:321 +#: forms/formsets.py:327 msgid "Delete" msgstr "" -#: forms/models.py:571 +#: forms/models.py:567 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "" -#: forms/models.py:575 +#: forms/models.py:571 #, python-format msgid "Please correct the duplicate data for %(field)s, which must be unique." msgstr "" -#: forms/models.py:581 +#: forms/models.py:577 #, python-format msgid "" "Please correct the duplicate data for %(field_name)s which must be unique " "for the %(lookup)s in %(date_field)s." msgstr "" -#: forms/models.py:589 +#: forms/models.py:585 msgid "Please correct the duplicate values below." msgstr "" @@ -697,94 +698,94 @@ msgstr "" msgid "\"%s\" is not a valid value for a primary key." msgstr "" -#: forms/util.py:70 +#: forms/util.py:81 #, python-format msgid "" "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." msgstr "" -#: forms/widgets.py:325 +#: forms/widgets.py:336 msgid "Currently" msgstr "" -#: forms/widgets.py:326 +#: forms/widgets.py:337 msgid "Change" msgstr "" -#: forms/widgets.py:327 +#: forms/widgets.py:338 msgid "Clear" msgstr "" -#: forms/widgets.py:582 +#: forms/widgets.py:591 msgid "Unknown" msgstr "" -#: forms/widgets.py:583 +#: forms/widgets.py:592 msgid "Yes" msgstr "" -#: forms/widgets.py:584 +#: forms/widgets.py:593 msgid "No" msgstr "" -#: template/defaultfilters.py:797 +#: template/defaultfilters.py:794 msgid "yes,no,maybe" msgstr "" -#: template/defaultfilters.py:825 template/defaultfilters.py:830 +#: template/defaultfilters.py:822 template/defaultfilters.py:833 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "" msgstr[1] "" -#: template/defaultfilters.py:832 +#: template/defaultfilters.py:835 #, python-format msgid "%s KB" msgstr "" -#: template/defaultfilters.py:834 +#: template/defaultfilters.py:837 #, python-format msgid "%s MB" msgstr "" -#: template/defaultfilters.py:836 +#: template/defaultfilters.py:839 #, python-format msgid "%s GB" msgstr "" -#: template/defaultfilters.py:838 +#: template/defaultfilters.py:841 #, python-format msgid "%s TB" msgstr "" -#: template/defaultfilters.py:839 +#: template/defaultfilters.py:842 #, python-format msgid "%s PB" msgstr "" -#: utils/dateformat.py:45 +#: utils/dateformat.py:47 msgid "p.m." msgstr "" -#: utils/dateformat.py:46 +#: utils/dateformat.py:48 msgid "a.m." msgstr "" -#: utils/dateformat.py:51 +#: utils/dateformat.py:53 msgid "PM" msgstr "" -#: utils/dateformat.py:52 +#: utils/dateformat.py:54 msgid "AM" msgstr "" -#: utils/dateformat.py:101 +#: utils/dateformat.py:103 msgid "midnight" msgstr "" -#: utils/dateformat.py:103 +#: utils/dateformat.py:105 msgid "noon" msgstr "" @@ -1060,148 +1061,133 @@ msgctxt "alt. month" msgid "December" msgstr "" -#: utils/text.py:65 +#: utils/text.py:70 #, python-format msgctxt "String to return when truncating text" msgid "%(truncated_text)s..." msgstr "" -#: utils/text.py:234 +#: utils/text.py:239 msgid "or" msgstr "" #. Translators: This string is used as a separator between list elements -#: utils/text.py:251 +#: utils/text.py:256 msgid ", " msgstr "" -#: utils/timesince.py:20 +#: utils/timesince.py:22 msgid "year" msgid_plural "years" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:21 +#: utils/timesince.py:23 msgid "month" msgid_plural "months" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:22 +#: utils/timesince.py:24 msgid "week" msgid_plural "weeks" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:23 +#: utils/timesince.py:25 msgid "day" msgid_plural "days" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:24 +#: utils/timesince.py:26 msgid "hour" msgid_plural "hours" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:25 +#: utils/timesince.py:27 msgid "minute" msgid_plural "minutes" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:41 +#: utils/timesince.py:43 msgid "minutes" msgstr "" -#: utils/timesince.py:46 +#: utils/timesince.py:48 #, python-format msgid "%(number)d %(type)s" msgstr "" -#: utils/timesince.py:52 +#: utils/timesince.py:54 #, python-format msgid ", %(number)d %(type)s" msgstr "" -#: views/static.py:52 +#: views/static.py:55 msgid "Directory indexes are not allowed here." msgstr "" -#: views/static.py:54 +#: views/static.py:57 #, python-format msgid "\"%(path)s\" does not exist" msgstr "" -#: views/static.py:95 +#: views/static.py:98 #, python-format msgid "Index of %(directory)s" msgstr "" -#: views/generic/create_update.py:121 -#, python-format -msgid "The %(verbose_name)s was created successfully." -msgstr "" - -#: views/generic/create_update.py:164 -#, python-format -msgid "The %(verbose_name)s was updated successfully." -msgstr "" - -#: views/generic/create_update.py:207 -#, python-format -msgid "The %(verbose_name)s was deleted." -msgstr "" - -#: views/generic/dates.py:33 +#: views/generic/dates.py:42 msgid "No year specified" msgstr "" -#: views/generic/dates.py:58 +#: views/generic/dates.py:98 msgid "No month specified" msgstr "" -#: views/generic/dates.py:99 +#: views/generic/dates.py:157 msgid "No day specified" msgstr "" -#: views/generic/dates.py:138 +#: views/generic/dates.py:213 msgid "No week specified" msgstr "" -#: views/generic/dates.py:198 views/generic/dates.py:215 +#: views/generic/dates.py:368 views/generic/dates.py:393 #, python-format msgid "No %(verbose_name_plural)s available" msgstr "" -#: views/generic/dates.py:467 +#: views/generic/dates.py:646 #, python-format msgid "" "Future %(verbose_name_plural)s not available because %(class_name)s." "allow_future is False." msgstr "" -#: views/generic/dates.py:501 +#: views/generic/dates.py:678 #, python-format msgid "Invalid date string '%(datestr)s' given format '%(format)s'" msgstr "" -#: views/generic/detail.py:51 +#: views/generic/detail.py:54 #, python-format msgid "No %(verbose_name)s found matching the query" msgstr "" -#: views/generic/list.py:45 +#: views/generic/list.py:49 msgid "Page is not 'last', nor can it be converted to an int." msgstr "" -#: views/generic/list.py:50 +#: views/generic/list.py:54 #, python-format msgid "Invalid page (%(page_number)s)" msgstr "" -#: views/generic/list.py:117 +#: views/generic/list.py:134 #, python-format msgid "Empty list and '%(class_name)s.allow_empty' is False." msgstr "" diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.po b/django/contrib/admin/locale/en/LC_MESSAGES/django.po index 6e3bb60e7d..497c7463c2 100644 --- a/django/contrib/admin/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:34+0100\n" +"POT-Creation-Date: 2012-10-15 10:56+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -32,39 +32,39 @@ msgstr "" msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378 +#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 msgid "All" msgstr "" -#: filters.py:232 +#: filters.py:238 msgid "Yes" msgstr "" -#: filters.py:233 +#: filters.py:239 msgid "No" msgstr "" -#: filters.py:247 +#: filters.py:253 msgid "Unknown" msgstr "" -#: filters.py:306 +#: filters.py:308 msgid "Any date" msgstr "" -#: filters.py:307 +#: filters.py:309 msgid "Today" msgstr "" -#: filters.py:311 +#: filters.py:313 msgid "Past 7 days" msgstr "" -#: filters.py:315 +#: filters.py:317 msgid "This month" msgstr "" -#: filters.py:319 +#: filters.py:321 msgid "This year" msgstr "" @@ -74,134 +74,129 @@ msgid "" "that both fields are case-sensitive." msgstr "" -#: forms.py:18 +#: forms.py:19 msgid "Please log in again, because your session has expired." msgstr "" -#: forms.py:37 -#, python-format -msgid "Your e-mail address is not your username. Try '%s' instead." -msgstr "" - -#: helpers.py:20 +#: helpers.py:23 msgid "Action:" msgstr "" -#: models.py:19 +#: models.py:24 msgid "action time" msgstr "" -#: models.py:22 +#: models.py:27 msgid "object id" msgstr "" -#: models.py:23 +#: models.py:28 msgid "object repr" msgstr "" -#: models.py:24 +#: models.py:29 msgid "action flag" msgstr "" -#: models.py:25 +#: models.py:30 msgid "change message" msgstr "" -#: models.py:30 +#: models.py:35 msgid "log entry" msgstr "" -#: models.py:31 +#: models.py:36 msgid "log entries" msgstr "" -#: models.py:40 +#: models.py:45 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:42 +#: models.py:47 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:44 +#: models.py:49 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:46 +#: models.py:51 msgid "LogEntry Object" msgstr "" -#: options.py:150 options.py:166 +#: options.py:151 options.py:167 msgid "None" msgstr "" -#: options.py:671 +#: options.py:672 #, python-format msgid "Changed %s." msgstr "" -#: options.py:671 options.py:681 +#: options.py:672 options.py:682 msgid "and" msgstr "" -#: options.py:676 +#: options.py:677 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "" -#: options.py:680 +#: options.py:681 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:685 +#: options.py:686 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "" -#: options.py:689 +#: options.py:690 msgid "No fields changed." msgstr "" -#: options.py:772 +#: options.py:773 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: options.py:776 options.py:824 +#: options.py:777 options.py:825 msgid "You may edit it again below." msgstr "" -#: options.py:788 options.py:837 +#: options.py:789 options.py:838 #, python-format msgid "You may add another %s below." msgstr "" -#: options.py:822 +#: options.py:823 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" -#: options.py:830 +#: options.py:831 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -#: options.py:899 options.py:1159 +#: options.py:900 options.py:1159 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:918 +#: options.py:919 msgid "No action selected." msgstr "" -#: options.py:998 +#: options.py:999 #, python-format msgid "Add %s" msgstr "" @@ -249,34 +244,34 @@ msgstr "" msgid "Change history: %s" msgstr "" -#: sites.py:315 tests.py:61 templates/admin/login.html:49 -#: templates/registration/password_reset_complete.html:20 -#: views/decorators.py:23 +#: sites.py:322 tests.py:57 templates/admin/login.html:48 +#: templates/registration/password_reset_complete.html:19 +#: views/decorators.py:24 msgid "Log in" msgstr "" -#: sites.py:380 +#: sites.py:388 msgid "Site administration" msgstr "" -#: sites.py:432 +#: sites.py:440 #, python-format msgid "%s administration" msgstr "" -#: widgets.py:87 +#: widgets.py:90 msgid "Date:" msgstr "" -#: widgets.py:87 +#: widgets.py:91 msgid "Time:" msgstr "" -#: widgets.py:161 +#: widgets.py:165 msgid "Lookup" msgstr "" -#: widgets.py:267 +#: widgets.py:271 msgid "Add Another" msgstr "" @@ -288,39 +283,39 @@ msgstr "" msgid "We're sorry, but the requested page could not be found." msgstr "" -#: templates/admin/500.html:7 templates/admin/app_index.html:8 -#: templates/admin/base.html:45 templates/admin/change_form.html:21 -#: templates/admin/change_list.html:43 -#: templates/admin/delete_confirmation.html:8 -#: templates/admin/delete_selected_confirmation.html:8 -#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8 -#: templates/admin/auth/user/change_password.html:15 -#: templates/registration/logged_out.html:5 -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:7 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 +#: templates/admin/500.html:6 templates/admin/app_index.html:7 +#: templates/admin/base.html:47 templates/admin/change_form.html:19 +#: templates/admin/change_list.html:41 +#: templates/admin/delete_confirmation.html:7 +#: templates/admin/delete_selected_confirmation.html:7 +#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 +#: templates/admin/auth/user/change_password.html:13 +#: templates/registration/logged_out.html:4 +#: templates/registration/password_change_done.html:6 +#: templates/registration/password_change_form.html:7 +#: templates/registration/password_reset_complete.html:6 +#: templates/registration/password_reset_confirm.html:6 +#: templates/registration/password_reset_done.html:6 +#: templates/registration/password_reset_form.html:6 msgid "Home" msgstr "" -#: templates/admin/500.html:8 +#: templates/admin/500.html:7 msgid "Server error" msgstr "" -#: templates/admin/500.html:12 +#: templates/admin/500.html:11 msgid "Server error (500)" msgstr "" -#: templates/admin/500.html:15 +#: templates/admin/500.html:14 msgid "Server Error (500)" msgstr "" -#: templates/admin/500.html:16 +#: templates/admin/500.html:15 msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." +"There's been an error. It's been reported to the site administrators via " +"email and should be fixed shortly. Thanks for your patience." msgstr "" #: templates/admin/actions.html:4 @@ -344,7 +339,7 @@ msgstr "" msgid "Clear selection" msgstr "" -#: templates/admin/app_index.html:11 templates/admin/index.html:19 +#: templates/admin/app_index.html:10 templates/admin/index.html:21 #, python-format msgid "%(name)s" msgstr "" @@ -354,22 +349,22 @@ msgid "Welcome," msgstr "" #: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:4 -#: templates/registration/password_change_form.html:5 +#: templates/registration/password_change_done.html:3 +#: templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "" -#: templates/admin/base.html:35 -#: templates/admin/auth/user/change_password.html:19 -#: templates/admin/auth/user/change_password.html:53 -#: templates/registration/password_change_done.html:4 -#: templates/registration/password_change_form.html:5 +#: templates/admin/base.html:36 +#: templates/admin/auth/user/change_password.html:17 +#: templates/admin/auth/user/change_password.html:51 +#: templates/registration/password_change_done.html:3 +#: templates/registration/password_change_form.html:4 msgid "Change password" msgstr "" -#: templates/admin/base.html:36 -#: templates/registration/password_change_done.html:4 -#: templates/registration/password_change_form.html:5 +#: templates/admin/base.html:38 +#: templates/registration/password_change_done.html:3 +#: templates/registration/password_change_form.html:4 msgid "Log out" msgstr "" @@ -381,35 +376,35 @@ msgstr "" msgid "Django administration" msgstr "" -#: templates/admin/change_form.html:24 templates/admin/index.html:29 +#: templates/admin/change_form.html:22 templates/admin/index.html:33 msgid "Add" msgstr "" -#: templates/admin/change_form.html:34 templates/admin/object_history.html:12 +#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 msgid "History" msgstr "" -#: templates/admin/change_form.html:35 +#: templates/admin/change_form.html:33 #: templates/admin/edit_inline/stacked.html:9 #: templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "" -#: templates/admin/change_form.html:46 templates/admin/change_list.html:69 -#: templates/admin/login.html:18 -#: templates/admin/auth/user/change_password.html:29 -#: templates/registration/password_change_form.html:21 +#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 +#: templates/admin/login.html:17 +#: templates/admin/auth/user/change_password.html:27 +#: templates/registration/password_change_form.html:20 msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "" msgstr[1] "" -#: templates/admin/change_list.html:60 +#: templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "" -#: templates/admin/change_list.html:80 +#: templates/admin/change_list.html:78 msgid "Filter" msgstr "" @@ -426,12 +421,12 @@ msgstr "" msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:12 +#: templates/admin/delete_confirmation.html:11 #: templates/admin/submit_line.html:4 msgid "Delete" msgstr "" -#: templates/admin/delete_confirmation.html:19 +#: templates/admin/delete_confirmation.html:18 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -439,30 +434,30 @@ msgid "" "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:27 +#: templates/admin/delete_confirmation.html:26 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -#: templates/admin/delete_confirmation.html:35 +#: templates/admin/delete_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -#: templates/admin/delete_confirmation.html:40 -#: templates/admin/delete_selected_confirmation.html:45 +#: templates/admin/delete_confirmation.html:39 +#: templates/admin/delete_selected_confirmation.html:44 msgid "Yes, I'm sure" msgstr "" -#: templates/admin/delete_selected_confirmation.html:11 +#: templates/admin/delete_selected_confirmation.html:10 msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:18 +#: templates/admin/delete_selected_confirmation.html:17 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -470,14 +465,14 @@ msgid "" "types of objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:26 +#: templates/admin/delete_selected_confirmation.html:25 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:34 +#: templates/admin/delete_selected_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -489,67 +484,63 @@ msgstr "" msgid " By %(filter_title)s " msgstr "" -#: templates/admin/index.html:18 +#: templates/admin/index.html:20 #, python-format -msgid "Models available in the %(name)s application." +msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:35 +#: templates/admin/index.html:39 msgid "Change" msgstr "" -#: templates/admin/index.html:45 +#: templates/admin/index.html:49 msgid "You don't have permission to edit anything." msgstr "" -#: templates/admin/index.html:53 +#: templates/admin/index.html:57 msgid "Recent Actions" msgstr "" -#: templates/admin/index.html:54 +#: templates/admin/index.html:58 msgid "My Actions" msgstr "" -#: templates/admin/index.html:58 +#: templates/admin/index.html:62 msgid "None available" msgstr "" -#: templates/admin/index.html:72 +#: templates/admin/index.html:76 msgid "Unknown content" msgstr "" -#: templates/admin/invalid_setup.html:13 +#: templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -#: templates/admin/login.html:34 -msgid "Username:" -msgstr "" - -#: templates/admin/login.html:38 +#: templates/admin/login.html:37 msgid "Password:" msgstr "" -#: templates/admin/login.html:45 +#: templates/admin/login.html:44 msgid "Forgotten your password or username?" msgstr "" -#: templates/admin/object_history.html:24 +#: templates/admin/object_history.html:23 msgid "Date/time" msgstr "" -#: templates/admin/object_history.html:25 +#: templates/admin/object_history.html:24 msgid "User" msgstr "" -#: templates/admin/object_history.html:26 +#: templates/admin/object_history.html:25 msgid "Action" msgstr "" -#: templates/admin/object_history.html:40 +#: templates/admin/object_history.html:39 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -601,147 +592,147 @@ msgstr "" msgid "Enter a username and password." msgstr "" -#: templates/admin/auth/user/change_password.html:33 +#: templates/admin/auth/user/change_password.html:31 #, python-format msgid "Enter a new password for the user %(username)s." msgstr "" -#: templates/admin/auth/user/change_password.html:40 +#: templates/admin/auth/user/change_password.html:38 msgid "Password" msgstr "" -#: templates/admin/auth/user/change_password.html:46 -#: templates/registration/password_change_form.html:43 +#: templates/admin/auth/user/change_password.html:44 +#: templates/registration/password_change_form.html:42 msgid "Password (again)" msgstr "" -#: templates/admin/auth/user/change_password.html:47 +#: templates/admin/auth/user/change_password.html:45 msgid "Enter the same password as above, for verification." msgstr "" -#: templates/admin/edit_inline/stacked.html:67 -#: templates/admin/edit_inline/tabular.html:115 -#, python-format -msgid "Add another %(verbose_name)s" +#: templates/admin/edit_inline/stacked.html:26 +#: templates/admin/edit_inline/tabular.html:76 +msgid "Remove" msgstr "" -#: templates/admin/edit_inline/stacked.html:70 -#: templates/admin/edit_inline/tabular.html:118 -msgid "Remove" +#: templates/admin/edit_inline/stacked.html:27 +#: templates/admin/edit_inline/tabular.html:75 +#, python-format +msgid "Add another %(verbose_name)s" msgstr "" #: templates/admin/edit_inline/tabular.html:17 msgid "Delete?" msgstr "" -#: templates/registration/logged_out.html:9 +#: templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "" -#: templates/registration/logged_out.html:11 +#: templates/registration/logged_out.html:10 msgid "Log in again" msgstr "" -#: templates/registration/password_change_done.html:8 -#: templates/registration/password_change_form.html:9 -#: templates/registration/password_change_form.html:13 -#: templates/registration/password_change_form.html:25 +#: templates/registration/password_change_done.html:7 +#: templates/registration/password_change_form.html:8 +#: templates/registration/password_change_form.html:12 +#: templates/registration/password_change_form.html:24 msgid "Password change" msgstr "" -#: templates/registration/password_change_done.html:12 -#: templates/registration/password_change_done.html:16 +#: templates/registration/password_change_done.html:11 +#: templates/registration/password_change_done.html:15 msgid "Password change successful" msgstr "" -#: templates/registration/password_change_done.html:18 +#: templates/registration/password_change_done.html:17 msgid "Your password was changed." msgstr "" -#: templates/registration/password_change_form.html:27 +#: templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -#: templates/registration/password_change_form.html:33 +#: templates/registration/password_change_form.html:32 msgid "Old password" msgstr "" -#: templates/registration/password_change_form.html:38 +#: templates/registration/password_change_form.html:37 msgid "New password" msgstr "" -#: templates/registration/password_change_form.html:49 -#: templates/registration/password_reset_confirm.html:27 +#: templates/registration/password_change_form.html:48 +#: templates/registration/password_reset_confirm.html:26 msgid "Change my password" msgstr "" -#: templates/registration/password_reset_complete.html:8 -#: templates/registration/password_reset_confirm.html:12 -#: templates/registration/password_reset_done.html:8 -#: templates/registration/password_reset_form.html:8 -#: templates/registration/password_reset_form.html:12 -#: templates/registration/password_reset_form.html:16 +#: templates/registration/password_reset_complete.html:7 +#: templates/registration/password_reset_confirm.html:11 +#: templates/registration/password_reset_done.html:7 +#: templates/registration/password_reset_form.html:7 +#: templates/registration/password_reset_form.html:11 +#: templates/registration/password_reset_form.html:15 msgid "Password reset" msgstr "" -#: templates/registration/password_reset_complete.html:12 -#: templates/registration/password_reset_complete.html:16 +#: templates/registration/password_reset_complete.html:11 +#: templates/registration/password_reset_complete.html:15 msgid "Password reset complete" msgstr "" -#: templates/registration/password_reset_complete.html:18 +#: templates/registration/password_reset_complete.html:17 msgid "Your password has been set. You may go ahead and log in now." msgstr "" -#: templates/registration/password_reset_confirm.html:8 +#: templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "" -#: templates/registration/password_reset_confirm.html:18 +#: templates/registration/password_reset_confirm.html:17 msgid "Enter new password" msgstr "" -#: templates/registration/password_reset_confirm.html:20 +#: templates/registration/password_reset_confirm.html:19 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" -#: templates/registration/password_reset_confirm.html:24 +#: templates/registration/password_reset_confirm.html:23 msgid "New password:" msgstr "" -#: templates/registration/password_reset_confirm.html:26 +#: templates/registration/password_reset_confirm.html:25 msgid "Confirm password:" msgstr "" -#: templates/registration/password_reset_confirm.html:32 +#: templates/registration/password_reset_confirm.html:31 msgid "Password reset unsuccessful" msgstr "" -#: templates/registration/password_reset_confirm.html:34 +#: templates/registration/password_reset_confirm.html:33 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -#: templates/registration/password_reset_done.html:12 -#: templates/registration/password_reset_done.html:16 +#: templates/registration/password_reset_done.html:11 +#: templates/registration/password_reset_done.html:15 msgid "Password reset successful" msgstr "" -#: templates/registration/password_reset_done.html:18 +#: templates/registration/password_reset_done.html:17 msgid "" -"We've e-mailed you instructions for setting your password to the e-mail " +"We've emailed you instructions for setting your password to the email " "address you submitted. You should be receiving it shortly." msgstr "" #: templates/registration/password_reset_email.html:2 #, python-format msgid "" -"You're receiving this e-mail because you requested a password reset for your " +"You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" @@ -762,34 +753,34 @@ msgstr "" msgid "The %(site_name)s team" msgstr "" -#: templates/registration/password_reset_form.html:18 +#: templates/registration/password_reset_form.html:17 msgid "" -"Forgotten your password? Enter your e-mail address below, and we'll e-mail " +"Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:22 -msgid "E-mail address:" +#: templates/registration/password_reset_form.html:21 +msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:22 +#: templates/registration/password_reset_form.html:21 msgid "Reset my password" msgstr "" -#: templatetags/admin_list.py:336 +#: templatetags/admin_list.py:344 msgid "All dates" msgstr "" -#: views/main.py:31 +#: views/main.py:33 msgid "(None)" msgstr "" -#: views/main.py:74 -#, python-format -msgid "Select %s" -msgstr "" - #: views/main.py:76 #, python-format +msgid "Select %s" +msgstr "" + +#: views/main.py:78 +#, python-format msgid "Select %s to change" msgstr "" diff --git a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po index 8f55140ff2..c2af7901d5 100644 --- a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:36+0100\n" +"POT-Creation-Date: 2012-10-15 10:56+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,63 +13,75 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: views.py:57 views.py:59 views.py:61 +#: views.py:58 views.py:60 views.py:62 msgid "tag:" msgstr "" -#: views.py:92 views.py:94 views.py:96 +#: views.py:93 views.py:95 views.py:97 msgid "filter:" msgstr "" -#: views.py:155 views.py:157 views.py:159 +#: views.py:156 views.py:158 views.py:160 msgid "view:" msgstr "" -#: views.py:187 +#: views.py:188 #, python-format msgid "App %r not found" msgstr "" -#: views.py:194 +#: views.py:195 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "" -#: views.py:206 +#: views.py:207 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "" -#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258 -#: views.py:263 +#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259 +#: views.py:264 msgid "model:" msgstr "" -#: views.py:221 views.py:253 +#: views.py:222 views.py:254 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "" -#: views.py:225 views.py:258 +#: views.py:226 views.py:259 #, python-format msgid "all %s" msgstr "" -#: views.py:230 views.py:263 +#: views.py:231 views.py:264 #, python-format msgid "number of %s" msgstr "" -#: views.py:268 +#: views.py:269 #, python-format msgid "Fields on %s objects" msgstr "" -#: views.py:360 +#: views.py:361 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "" +#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6 +#: templates/admin_doc/missing_docutils.html:6 +#: templates/admin_doc/model_detail.html:14 +#: templates/admin_doc/model_index.html:8 +#: templates/admin_doc/template_detail.html:6 +#: templates/admin_doc/template_filter_index.html:7 +#: templates/admin_doc/template_tag_index.html:7 +#: templates/admin_doc/view_detail.html:6 +#: templates/admin_doc/view_index.html:7 +msgid "Home" +msgstr "" + #: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7 #: templates/admin_doc/missing_docutils.html:7 #: templates/admin_doc/model_detail.html:15 @@ -79,30 +91,18 @@ msgstr "" #: templates/admin_doc/template_tag_index.html:8 #: templates/admin_doc/view_detail.html:7 #: templates/admin_doc/view_index.html:8 -msgid "Home" -msgstr "" - -#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8 -#: templates/admin_doc/missing_docutils.html:8 -#: templates/admin_doc/model_detail.html:16 -#: templates/admin_doc/model_index.html:10 -#: templates/admin_doc/template_detail.html:8 -#: templates/admin_doc/template_filter_index.html:9 -#: templates/admin_doc/template_tag_index.html:9 -#: templates/admin_doc/view_detail.html:8 -#: templates/admin_doc/view_index.html:9 msgid "Documentation" msgstr "" -#: templates/admin_doc/bookmarklets.html:9 +#: templates/admin_doc/bookmarklets.html:8 msgid "Bookmarklets" msgstr "" -#: templates/admin_doc/bookmarklets.html:12 +#: templates/admin_doc/bookmarklets.html:11 msgid "Documentation bookmarklets" msgstr "" -#: templates/admin_doc/bookmarklets.html:16 +#: templates/admin_doc/bookmarklets.html:15 msgid "" "\n" "

To install bookmarklets, drag the link to your bookmarks\n" @@ -113,60 +113,73 @@ msgid "" "your computer is \"internal\").

\n" msgstr "" -#: templates/admin_doc/bookmarklets.html:26 +#: templates/admin_doc/bookmarklets.html:25 msgid "Documentation for this page" msgstr "" -#: templates/admin_doc/bookmarklets.html:27 +#: templates/admin_doc/bookmarklets.html:26 msgid "" "Jumps you from any page to the documentation for the view that generates " "that page." msgstr "" -#: templates/admin_doc/bookmarklets.html:29 +#: templates/admin_doc/bookmarklets.html:28 msgid "Show object ID" msgstr "" -#: templates/admin_doc/bookmarklets.html:30 +#: templates/admin_doc/bookmarklets.html:29 msgid "" "Shows the content-type and unique ID for pages that represent a single " "object." msgstr "" -#: templates/admin_doc/bookmarklets.html:32 +#: templates/admin_doc/bookmarklets.html:31 msgid "Edit this object (current window)" msgstr "" -#: templates/admin_doc/bookmarklets.html:33 +#: templates/admin_doc/bookmarklets.html:32 msgid "Jumps to the admin page for pages that represent a single object." msgstr "" -#: templates/admin_doc/bookmarklets.html:35 +#: templates/admin_doc/bookmarklets.html:34 msgid "Edit this object (new window)" msgstr "" -#: templates/admin_doc/bookmarklets.html:36 +#: templates/admin_doc/bookmarklets.html:35 msgid "As above, but opens the admin page in a new window." msgstr "" -#: templates/admin_doc/model_detail.html:17 -#: templates/admin_doc/model_index.html:11 +#: templates/admin_doc/model_detail.html:16 +#: templates/admin_doc/model_index.html:10 msgid "Models" msgstr "" -#: templates/admin_doc/template_detail.html:9 +#: templates/admin_doc/template_detail.html:8 msgid "Templates" msgstr "" -#: templates/admin_doc/template_filter_index.html:10 +#: templates/admin_doc/template_filter_index.html:9 msgid "Filters" msgstr "" -#: templates/admin_doc/template_tag_index.html:10 +#: templates/admin_doc/template_tag_index.html:9 msgid "Tags" msgstr "" -#: templates/admin_doc/view_detail.html:9 -#: templates/admin_doc/view_index.html:10 +#: templates/admin_doc/view_detail.html:8 +#: templates/admin_doc/view_index.html:9 msgid "Views" msgstr "" + +#: tests/__init__.py:23 +msgid "Boolean (Either True or False)" +msgstr "" + +#: tests/__init__.py:29 +msgid "A custom field type" +msgstr "" + +#: tests/__init__.py:33 +#, python-format +msgid "Field of type: %(field_type)s" +msgstr "" diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.po b/django/contrib/auth/locale/en/LC_MESSAGES/django.po index c70a660c5c..9b0cab8372 100644 --- a/django/contrib/auth/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:36+0100\n" +"POT-Creation-Date: 2012-10-15 10:56+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -25,48 +25,56 @@ msgstr "" msgid "Important dates" msgstr "" -#: admin.py:125 +#: admin.py:126 msgid "Password changed successfully." msgstr "" -#: admin.py:135 +#: admin.py:136 #, python-format msgid "Change password: %s" msgstr "" -#: forms.py:62 +#: forms.py:31 tests/forms.py:249 tests/forms.py:254 +msgid "No password set." +msgstr "" + +#: forms.py:37 tests/forms.py:259 tests/forms.py:265 +msgid "Invalid password format or unknown hashing algorithm." +msgstr "" + +#: forms.py:65 msgid "A user with that username already exists." msgstr "" -#: forms.py:63 forms.py:251 forms.py:308 +#: forms.py:66 forms.py:257 forms.py:317 msgid "The two password fields didn't match." msgstr "" -#: forms.py:65 forms.py:110 forms.py:139 +#: forms.py:68 forms.py:113 msgid "Username" msgstr "" -#: forms.py:67 forms.py:111 +#: forms.py:70 forms.py:114 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" -#: forms.py:70 forms.py:114 +#: forms.py:73 forms.py:117 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" -#: forms.py:72 forms.py:116 forms.py:140 forms.py:310 +#: forms.py:75 forms.py:119 forms.py:140 forms.py:319 msgid "Password" msgstr "" -#: forms.py:74 +#: forms.py:77 msgid "Password confirmation" msgstr "" -#: forms.py:76 +#: forms.py:79 msgid "Enter the same password as above, for verification." msgstr "" -#: forms.py:117 +#: forms.py:120 msgid "" "Raw passwords are not stored, so there is no way to see this user's " "password, but you can change the password using this " @@ -89,178 +97,178 @@ msgstr "" msgid "This account is inactive." msgstr "" -#: forms.py:191 +#: forms.py:196 msgid "" -"That e-mail address doesn't have an associated user account. Are you sure " +"That email address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" -#: forms.py:193 +#: forms.py:198 tests/forms.py:347 msgid "" -"The user account associated with this e-mail address cannot reset the " +"The user account associated with this email address cannot reset the " "password." msgstr "" -#: forms.py:196 -msgid "E-mail" +#: forms.py:201 +msgid "Email" msgstr "" -#: forms.py:253 +#: forms.py:259 msgid "New password" msgstr "" -#: forms.py:255 +#: forms.py:261 msgid "New password confirmation" msgstr "" -#: forms.py:284 +#: forms.py:290 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" -#: forms.py:287 +#: forms.py:293 msgid "Old password" msgstr "" -#: forms.py:312 +#: forms.py:321 msgid "Password (again)" msgstr "" -#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 -#: hashers.py:389 +#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378 +#: hashers.py:412 msgid "algorithm" msgstr "" -#: hashers.py:219 +#: hashers.py:242 msgid "iterations" msgstr "" -#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413 msgid "salt" msgstr "" -#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414 msgid "hash" msgstr "" -#: hashers.py:270 +#: hashers.py:293 msgid "work factor" msgstr "" -#: hashers.py:272 +#: hashers.py:295 msgid "checksum" msgstr "" -#: models.py:66 models.py:113 +#: models.py:72 models.py:121 msgid "name" msgstr "" -#: models.py:68 +#: models.py:74 msgid "codename" msgstr "" -#: models.py:72 +#: models.py:78 msgid "permission" msgstr "" -#: models.py:73 models.py:115 +#: models.py:79 models.py:123 msgid "permissions" msgstr "" -#: models.py:120 +#: models.py:128 msgid "group" msgstr "" -#: models.py:121 models.py:250 +#: models.py:129 models.py:317 msgid "groups" msgstr "" #: models.py:232 -msgid "username" +msgid "password" msgstr "" #: models.py:233 +msgid "last login" +msgstr "" + +#: models.py:298 +msgid "username" +msgstr "" + +#: models.py:299 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" -#: models.py:235 +#: models.py:302 +msgid "Enter a valid username." +msgstr "" + +#: models.py:304 msgid "first name" msgstr "" -#: models.py:236 +#: models.py:305 msgid "last name" msgstr "" -#: models.py:237 -msgid "e-mail address" +#: models.py:306 +msgid "email address" msgstr "" -#: models.py:238 -msgid "password" -msgstr "" - -#: models.py:239 +#: models.py:307 msgid "staff status" msgstr "" -#: models.py:240 +#: models.py:308 msgid "Designates whether the user can log into this admin site." msgstr "" -#: models.py:242 +#: models.py:310 msgid "active" msgstr "" -#: models.py:243 +#: models.py:311 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -#: models.py:245 +#: models.py:313 msgid "superuser status" msgstr "" -#: models.py:246 +#: models.py:314 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -#: models.py:248 -msgid "last login" -msgstr "" - -#: models.py:249 +#: models.py:316 msgid "date joined" msgstr "" -#: models.py:251 +#: models.py:318 msgid "" "The groups this user belongs to. A user will get all permissions granted to " "each of his/her group." msgstr "" -#: models.py:255 +#: models.py:322 msgid "user permissions" msgstr "" -#: models.py:260 +#: models.py:331 msgid "user" msgstr "" -#: models.py:261 +#: models.py:332 msgid "users" msgstr "" -#: views.py:93 +#: views.py:97 msgid "Logged out" msgstr "" -#: management/commands/createsuperuser.py:27 -msgid "Enter a valid e-mail address." -msgstr "" - #: templates/registration/password_reset_subject.txt:2 #, python-format msgid "Password reset on %(site_name)s" diff --git a/django/contrib/comments/locale/en/LC_MESSAGES/django.po b/django/contrib/comments/locale/en/LC_MESSAGES/django.po index 04466bdc41..b41b89011a 100644 --- a/django/contrib/comments/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/comments/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:37+0100\n" +"POT-Creation-Date: 2012-10-15 10:56+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,57 +13,57 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:12 +#: admin.py:25 msgid "Content" msgstr "" -#: admin.py:15 +#: admin.py:28 msgid "Metadata" msgstr "" -#: admin.py:42 +#: admin.py:55 msgid "flagged" msgid_plural "flagged" msgstr[0] "" msgstr[1] "" -#: admin.py:43 +#: admin.py:56 msgid "Flag selected comments" msgstr "" -#: admin.py:47 +#: admin.py:60 msgid "approved" msgid_plural "approved" msgstr[0] "" msgstr[1] "" -#: admin.py:48 +#: admin.py:61 msgid "Approve selected comments" msgstr "" -#: admin.py:52 +#: admin.py:65 msgid "removed" msgid_plural "removed" msgstr[0] "" msgstr[1] "" -#: admin.py:53 +#: admin.py:66 msgid "Remove selected comments" msgstr "" -#: admin.py:65 +#: admin.py:78 #, python-format msgid "1 comment was successfully %(action)s." msgid_plural "%(count)s comments were successfully %(action)s." msgstr[0] "" msgstr[1] "" -#: feeds.py:13 +#: feeds.py:14 #, python-format msgid "%(site_name)s comments" msgstr "" -#: feeds.py:23 +#: feeds.py:20 #, python-format msgid "Latest comments on %(site_name)s" msgstr "" @@ -100,78 +100,78 @@ msgid "" "If you enter anything in this field your comment will be treated as spam" msgstr "" -#: models.py:22 +#: models.py:23 msgid "content type" msgstr "" -#: models.py:24 +#: models.py:25 msgid "object ID" msgstr "" -#: models.py:50 models.py:168 +#: models.py:53 models.py:177 msgid "user" msgstr "" -#: models.py:52 +#: models.py:55 msgid "user's name" msgstr "" -#: models.py:53 +#: models.py:56 msgid "user's email address" msgstr "" -#: models.py:54 +#: models.py:57 msgid "user's URL" msgstr "" -#: models.py:56 models.py:76 models.py:169 +#: models.py:59 models.py:79 models.py:178 msgid "comment" msgstr "" -#: models.py:59 +#: models.py:62 msgid "date/time submitted" msgstr "" -#: models.py:60 +#: models.py:63 msgid "IP address" msgstr "" -#: models.py:61 +#: models.py:64 msgid "is public" msgstr "" -#: models.py:62 +#: models.py:65 msgid "" "Uncheck this box to make the comment effectively disappear from the site." msgstr "" -#: models.py:64 +#: models.py:67 msgid "is removed" msgstr "" -#: models.py:65 +#: models.py:68 msgid "" "Check this box if the comment is inappropriate. A \"This comment has been " "removed\" message will be displayed instead." msgstr "" -#: models.py:77 +#: models.py:80 msgid "comments" msgstr "" -#: models.py:119 +#: models.py:124 msgid "" "This comment was posted by an authenticated user and thus the name is read-" "only." msgstr "" -#: models.py:128 +#: models.py:134 msgid "" "This comment was posted by an authenticated user and thus the email is read-" "only." msgstr "" -#: models.py:153 +#: models.py:160 #, python-format msgid "" "Posted by %(user)s at %(date)s\n" @@ -181,19 +181,19 @@ msgid "" "http://%(domain)s%(url)s" msgstr "" -#: models.py:170 +#: models.py:179 msgid "flag" msgstr "" -#: models.py:171 +#: models.py:180 msgid "date" msgstr "" -#: models.py:181 +#: models.py:190 msgid "comment flag" msgstr "" -#: models.py:182 +#: models.py:191 msgid "comment flags" msgstr "" diff --git a/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po index 8643f2eae1..c45c2aff9c 100644 --- a/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:37+0100\n" +"POT-Creation-Date: 2012-10-15 10:56+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,29 +13,29 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: models.py:123 +#: models.py:130 msgid "python model class name" msgstr "" -#: models.py:127 +#: models.py:134 msgid "content type" msgstr "" -#: models.py:128 +#: models.py:135 msgid "content types" msgstr "" -#: views.py:15 +#: views.py:17 #, python-format msgid "Content type %(ct_id)s object has no associated model" msgstr "" -#: views.py:19 +#: views.py:21 #, python-format msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" msgstr "" -#: views.py:25 +#: views.py:27 #, python-format msgid "%(ct_name)s objects don't have a get_absolute_url() method" msgstr "" diff --git a/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po index 68840db86c..ded87e5420 100644 --- a/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:37+0100\n" +"POT-Creation-Date: 2012-10-15 10:56+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -17,7 +17,7 @@ msgstr "" msgid "Advanced options" msgstr "" -#: forms.py:7 models.py:7 +#: forms.py:7 models.py:11 msgid "URL" msgstr "" @@ -45,40 +45,44 @@ msgstr "" msgid "Flatpage with url %(url)s already exists for site %(site)s" msgstr "" -#: models.py:8 +#: models.py:12 msgid "title" msgstr "" -#: models.py:9 +#: models.py:13 msgid "content" msgstr "" -#: models.py:10 +#: models.py:14 msgid "enable comments" msgstr "" -#: models.py:11 +#: models.py:15 msgid "template name" msgstr "" -#: models.py:12 +#: models.py:16 msgid "" "Example: 'flatpages/contact_page.html'. If this isn't provided, the system " "will use 'flatpages/default.html'." msgstr "" -#: models.py:13 +#: models.py:17 msgid "registration required" msgstr "" -#: models.py:13 +#: models.py:17 msgid "If this is checked, only logged-in users will be able to view the page." msgstr "" -#: models.py:18 +#: models.py:22 msgid "flat page" msgstr "" -#: models.py:19 +#: models.py:23 msgid "flat pages" msgstr "" + +#: tests/forms.py:97 +msgid "This field is required." +msgstr "" diff --git a/django/contrib/formtools/locale/en/LC_MESSAGES/django.po b/django/contrib/formtools/locale/en/LC_MESSAGES/django.po index 15d57af7e9..04fa380ffa 100644 --- a/django/contrib/formtools/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/formtools/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:38+0100\n" +"POT-Creation-Date: 2012-10-15 10:56+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" diff --git a/django/contrib/gis/locale/en/LC_MESSAGES/django.po b/django/contrib/gis/locale/en/LC_MESSAGES/django.po index 2b2f16d851..6ce301287e 100644 --- a/django/contrib/gis/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:38+0100\n" +"POT-Creation-Date: 2012-10-15 10:56+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,76 +13,76 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: views.py:7 +#: views.py:9 msgid "No feeds are registered." msgstr "" -#: views.py:17 +#: views.py:19 #, python-format msgid "Slug %r isn't registered." msgstr "" -#: db/models/fields.py:50 +#: db/models/fields.py:51 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type." msgstr "" -#: db/models/fields.py:270 +#: db/models/fields.py:271 msgid "Point" msgstr "" -#: db/models/fields.py:274 +#: db/models/fields.py:275 msgid "Line string" msgstr "" -#: db/models/fields.py:278 +#: db/models/fields.py:279 msgid "Polygon" msgstr "" -#: db/models/fields.py:282 +#: db/models/fields.py:283 msgid "Multi-point" msgstr "" -#: db/models/fields.py:286 +#: db/models/fields.py:287 msgid "Multi-line string" msgstr "" -#: db/models/fields.py:290 +#: db/models/fields.py:291 msgid "Multi polygon" msgstr "" -#: db/models/fields.py:294 +#: db/models/fields.py:295 msgid "Geometry collection" msgstr "" -#: forms/fields.py:17 +#: forms/fields.py:19 msgid "No geometry value provided." msgstr "" -#: forms/fields.py:18 +#: forms/fields.py:20 msgid "Invalid geometry value." msgstr "" -#: forms/fields.py:19 +#: forms/fields.py:21 msgid "Invalid geometry type." msgstr "" -#: forms/fields.py:20 +#: forms/fields.py:22 msgid "" "An error occurred when transforming the geometry to the SRID of the geometry " "form field." msgstr "" -#: sitemaps/views.py:44 +#: sitemaps/views.py:46 #, python-format msgid "No sitemap available for section: %r" msgstr "" -#: sitemaps/views.py:58 +#: sitemaps/views.py:60 #, python-format msgid "Page %s empty" msgstr "" -#: sitemaps/views.py:60 +#: sitemaps/views.py:62 #, python-format msgid "No page '%s'" msgstr "" diff --git a/django/contrib/humanize/locale/en/LC_MESSAGES/django.po b/django/contrib/humanize/locale/en/LC_MESSAGES/django.po index 7d64ec0c2d..0e46126adb 100644 --- a/django/contrib/humanize/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:40+0100\n" +"POT-Creation-Date: 2012-10-15 10:57+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,276 +13,276 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: tests.py:108 templatetags/humanize.py:164 +#: tests.py:125 templatetags/humanize.py:167 msgid "today" msgstr "" -#: tests.py:108 templatetags/humanize.py:168 +#: tests.py:125 templatetags/humanize.py:171 msgid "yesterday" msgstr "" -#: tests.py:108 templatetags/humanize.py:166 +#: tests.py:125 templatetags/humanize.py:169 msgid "tomorrow" msgstr "" -#: templatetags/humanize.py:24 +#: templatetags/humanize.py:25 msgid "th" msgstr "" -#: templatetags/humanize.py:24 +#: templatetags/humanize.py:25 msgid "st" msgstr "" -#: templatetags/humanize.py:24 +#: templatetags/humanize.py:25 msgid "nd" msgstr "" -#: templatetags/humanize.py:24 +#: templatetags/humanize.py:25 msgid "rd" msgstr "" -#: templatetags/humanize.py:53 +#: templatetags/humanize.py:54 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:55 #, python-format msgid "%(value)s million" msgid_plural "%(value)s million" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:57 +#: templatetags/humanize.py:58 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:58 +#: templatetags/humanize.py:59 #, python-format msgid "%(value)s billion" msgid_plural "%(value)s billion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:61 +#: templatetags/humanize.py:62 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:62 +#: templatetags/humanize.py:63 #, python-format msgid "%(value)s trillion" msgid_plural "%(value)s trillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:65 +#: templatetags/humanize.py:66 #, python-format msgid "%(value).1f quadrillion" msgid_plural "%(value).1f quadrillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:66 +#: templatetags/humanize.py:67 #, python-format msgid "%(value)s quadrillion" msgid_plural "%(value)s quadrillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:69 +#: templatetags/humanize.py:70 #, python-format msgid "%(value).1f quintillion" msgid_plural "%(value).1f quintillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:70 +#: templatetags/humanize.py:71 #, python-format msgid "%(value)s quintillion" msgid_plural "%(value)s quintillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:73 +#: templatetags/humanize.py:74 #, python-format msgid "%(value).1f sextillion" msgid_plural "%(value).1f sextillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:74 +#: templatetags/humanize.py:75 #, python-format msgid "%(value)s sextillion" msgid_plural "%(value)s sextillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:77 +#: templatetags/humanize.py:78 #, python-format msgid "%(value).1f septillion" msgid_plural "%(value).1f septillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:78 +#: templatetags/humanize.py:79 #, python-format msgid "%(value)s septillion" msgid_plural "%(value)s septillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:81 +#: templatetags/humanize.py:82 #, python-format msgid "%(value).1f octillion" msgid_plural "%(value).1f octillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:82 +#: templatetags/humanize.py:83 #, python-format msgid "%(value)s octillion" msgid_plural "%(value)s octillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:85 +#: templatetags/humanize.py:86 #, python-format msgid "%(value).1f nonillion" msgid_plural "%(value).1f nonillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:86 +#: templatetags/humanize.py:87 #, python-format msgid "%(value)s nonillion" msgid_plural "%(value)s nonillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:89 +#: templatetags/humanize.py:90 #, python-format msgid "%(value).1f decillion" msgid_plural "%(value).1f decillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:90 +#: templatetags/humanize.py:91 #, python-format msgid "%(value)s decillion" msgid_plural "%(value)s decillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:93 +#: templatetags/humanize.py:94 #, python-format msgid "%(value).1f googol" msgid_plural "%(value).1f googol" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:94 +#: templatetags/humanize.py:95 #, python-format msgid "%(value)s googol" msgid_plural "%(value)s googol" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:144 msgid "one" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:144 msgid "two" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:144 msgid "three" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:144 msgid "four" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:144 msgid "five" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:144 msgid "six" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:144 msgid "seven" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:144 msgid "eight" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:144 msgid "nine" msgstr "" -#: templatetags/humanize.py:185 +#: templatetags/humanize.py:190 #, python-format msgctxt "naturaltime" msgid "%(delta)s ago" msgstr "" -#: templatetags/humanize.py:188 templatetags/humanize.py:210 +#: templatetags/humanize.py:193 templatetags/humanize.py:215 msgid "now" msgstr "" -#: templatetags/humanize.py:191 +#: templatetags/humanize.py:196 #, python-format msgid "a second ago" msgid_plural "%(count)s seconds ago" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:196 +#: templatetags/humanize.py:201 #, python-format msgid "a minute ago" msgid_plural "%(count)s minutes ago" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:201 +#: templatetags/humanize.py:206 #, python-format msgid "an hour ago" msgid_plural "%(count)s hours ago" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:207 +#: templatetags/humanize.py:212 #, python-format msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "" -#: templatetags/humanize.py:213 +#: templatetags/humanize.py:218 #, python-format msgid "a second from now" msgid_plural "%(count)s seconds from now" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:218 +#: templatetags/humanize.py:223 #, python-format msgid "a minute from now" msgid_plural "%(count)s minutes from now" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:223 +#: templatetags/humanize.py:228 #, python-format msgid "an hour from now" msgid_plural "%(count)s hours from now" diff --git a/django/contrib/localflavor/locale/en/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/en/LC_MESSAGES/django.po index 678bef78d0..ffccefdfbc 100644 --- a/django/contrib/localflavor/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/localflavor/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:41+0100\n" +"POT-Creation-Date: 2012-10-15 10:57+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -33,6 +33,10 @@ msgstr "" msgid "Invalid CUIT." msgstr "" +#: ar/forms.py:84 +msgid "Invalid legal type. Type must be 27, 20, 23 or 30." +msgstr "" + #: at/at_states.py:5 msgid "Burgenland" msgstr "" @@ -194,6 +198,14 @@ msgstr "" msgid "Enter a postal code in the format XXX XXX." msgstr "" +#: ca/forms.py:47 us/forms.py:30 +msgid "Phone numbers must be in XXX-XXX-XXXX format." +msgstr "" + +#: ca/forms.py:69 +msgid "Enter a Canadian province or territory." +msgstr "" + #: ca/forms.py:110 msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format." msgstr "" @@ -302,6 +314,10 @@ msgstr "" msgid "Zurich" msgstr "" +#: ch/forms.py:37 +msgid "Phone numbers must be in 0XX XXX XX XX format." +msgstr "" + #: ch/forms.py:68 msgid "" "Enter a valid Swiss identity or passport card number in X1234567<0 or " @@ -413,14 +429,10 @@ msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX." msgstr "" #: cz/forms.py:53 -msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'" -msgstr "" - -#: cz/forms.py:54 msgid "Enter a valid birth number." msgstr "" -#: cz/forms.py:115 +#: cz/forms.py:102 msgid "Enter a valid IC number." msgstr "" @@ -499,7 +511,7 @@ msgid "" msgstr "" #: es/es_provinces.py:5 -msgid "Arava" +msgid "Araba" msgstr "" #: es/es_provinces.py:6 @@ -1093,11 +1105,26 @@ msgstr "" msgid "Wales" msgstr "" -#: hr/forms.py:75 -msgid "Enter a valid 13 digit JMBG" +#: hk/forms.py:37 +#, python-format +msgid "Phone number should not start with one of the followings: %s." +msgstr "" + +#: hk/forms.py:40 +#, python-format +msgid "Phone number must be in one of the following formats: %s." +msgstr "" + +#: hk/forms.py:42 +#, python-format +msgid "Phone number should start with one of the followings: %s." msgstr "" #: hr/forms.py:76 +msgid "Enter a valid 13 digit JMBG" +msgstr "" + +#: hr/forms.py:77 msgid "Error in date segment" msgstr "" @@ -1141,87 +1168,87 @@ msgstr "" msgid "Card issue number cannot be zero" msgstr "" -#: hr/hr_choices.py:12 +#: hr/hr_choices.py:14 msgid "Grad Zagreb" msgstr "" -#: hr/hr_choices.py:13 +#: hr/hr_choices.py:15 msgid "Bjelovarsko-bilogorska županija" msgstr "" -#: hr/hr_choices.py:14 +#: hr/hr_choices.py:16 msgid "Brodsko-posavska županija" msgstr "" -#: hr/hr_choices.py:15 +#: hr/hr_choices.py:17 msgid "Dubrovačko-neretvanska županija" msgstr "" -#: hr/hr_choices.py:16 +#: hr/hr_choices.py:18 msgid "Istarska županija" msgstr "" -#: hr/hr_choices.py:17 +#: hr/hr_choices.py:19 msgid "Karlovačka županija" msgstr "" -#: hr/hr_choices.py:18 +#: hr/hr_choices.py:20 msgid "Koprivničko-križevačka županija" msgstr "" -#: hr/hr_choices.py:19 +#: hr/hr_choices.py:21 msgid "Krapinsko-zagorska županija" msgstr "" -#: hr/hr_choices.py:20 +#: hr/hr_choices.py:22 msgid "Ličko-senjska županija" msgstr "" -#: hr/hr_choices.py:21 +#: hr/hr_choices.py:23 msgid "Međimurska županija" msgstr "" -#: hr/hr_choices.py:22 +#: hr/hr_choices.py:24 msgid "Osječko-baranjska županija" msgstr "" -#: hr/hr_choices.py:23 +#: hr/hr_choices.py:25 msgid "Požeško-slavonska županija" msgstr "" -#: hr/hr_choices.py:24 +#: hr/hr_choices.py:26 msgid "Primorsko-goranska županija" msgstr "" -#: hr/hr_choices.py:25 +#: hr/hr_choices.py:27 msgid "Sisačko-moslavačka županija" msgstr "" -#: hr/hr_choices.py:26 +#: hr/hr_choices.py:28 msgid "Splitsko-dalmatinska županija" msgstr "" -#: hr/hr_choices.py:27 +#: hr/hr_choices.py:29 msgid "Šibensko-kninska županija" msgstr "" -#: hr/hr_choices.py:28 +#: hr/hr_choices.py:30 msgid "Varaždinska županija" msgstr "" -#: hr/hr_choices.py:29 +#: hr/hr_choices.py:31 msgid "Virovitičko-podravska županija" msgstr "" -#: hr/hr_choices.py:30 +#: hr/hr_choices.py:32 msgid "Vukovarsko-srijemska županija" msgstr "" -#: hr/hr_choices.py:31 +#: hr/hr_choices.py:33 msgid "Zadarska županija" msgstr "" -#: hr/hr_choices.py:32 +#: hr/hr_choices.py:34 msgid "Zagrebačka županija" msgstr "" @@ -1625,11 +1652,11 @@ msgstr "" msgid "Wicklow" msgstr "" -#: il/forms.py:31 +#: il/forms.py:32 msgid "Enter a postal code in the format XXXXX" msgstr "" -#: il/forms.py:50 +#: il/forms.py:51 msgid "Enter a valid ID number." msgstr "" @@ -1858,7 +1885,7 @@ msgstr "" msgid "Okinawa" msgstr "" -#: kw/forms.py:25 +#: kw/forms.py:27 msgid "Enter a valid Kuwaiti Civil ID number" msgstr "" @@ -1880,339 +1907,339 @@ msgstr "" msgid "The UMCN is not valid." msgstr "" -#: mk/mk_choices.py:8 +#: mk/mk_choices.py:10 msgid "Aerodrom" msgstr "" -#: mk/mk_choices.py:9 +#: mk/mk_choices.py:11 msgid "Aračinovo" msgstr "" -#: mk/mk_choices.py:10 +#: mk/mk_choices.py:12 msgid "Berovo" msgstr "" -#: mk/mk_choices.py:11 +#: mk/mk_choices.py:13 msgid "Bitola" msgstr "" -#: mk/mk_choices.py:12 +#: mk/mk_choices.py:14 msgid "Bogdanci" msgstr "" -#: mk/mk_choices.py:13 +#: mk/mk_choices.py:15 msgid "Bogovinje" msgstr "" -#: mk/mk_choices.py:14 +#: mk/mk_choices.py:16 msgid "Bosilovo" msgstr "" -#: mk/mk_choices.py:15 +#: mk/mk_choices.py:17 msgid "Brvenica" msgstr "" -#: mk/mk_choices.py:16 +#: mk/mk_choices.py:18 msgid "Butel" msgstr "" -#: mk/mk_choices.py:17 +#: mk/mk_choices.py:19 msgid "Valandovo" msgstr "" -#: mk/mk_choices.py:18 +#: mk/mk_choices.py:20 msgid "Vasilevo" msgstr "" -#: mk/mk_choices.py:19 +#: mk/mk_choices.py:21 msgid "Vevčani" msgstr "" -#: mk/mk_choices.py:20 +#: mk/mk_choices.py:22 msgid "Veles" msgstr "" -#: mk/mk_choices.py:21 +#: mk/mk_choices.py:23 msgid "Vinica" msgstr "" -#: mk/mk_choices.py:22 +#: mk/mk_choices.py:24 msgid "Vraneštica" msgstr "" -#: mk/mk_choices.py:23 +#: mk/mk_choices.py:25 msgid "Vrapčište" msgstr "" -#: mk/mk_choices.py:24 +#: mk/mk_choices.py:26 msgid "Gazi Baba" msgstr "" -#: mk/mk_choices.py:25 +#: mk/mk_choices.py:27 msgid "Gevgelija" msgstr "" -#: mk/mk_choices.py:26 +#: mk/mk_choices.py:28 msgid "Gostivar" msgstr "" -#: mk/mk_choices.py:27 +#: mk/mk_choices.py:29 msgid "Gradsko" msgstr "" -#: mk/mk_choices.py:28 +#: mk/mk_choices.py:30 msgid "Debar" msgstr "" -#: mk/mk_choices.py:29 +#: mk/mk_choices.py:31 msgid "Debarca" msgstr "" -#: mk/mk_choices.py:30 +#: mk/mk_choices.py:32 msgid "Delčevo" msgstr "" -#: mk/mk_choices.py:31 +#: mk/mk_choices.py:33 msgid "Demir Kapija" msgstr "" -#: mk/mk_choices.py:32 +#: mk/mk_choices.py:34 msgid "Demir Hisar" msgstr "" -#: mk/mk_choices.py:33 +#: mk/mk_choices.py:35 msgid "Dolneni" msgstr "" -#: mk/mk_choices.py:34 +#: mk/mk_choices.py:36 msgid "Drugovo" msgstr "" -#: mk/mk_choices.py:35 +#: mk/mk_choices.py:37 msgid "Gjorče Petrov" msgstr "" -#: mk/mk_choices.py:36 +#: mk/mk_choices.py:38 msgid "Želino" msgstr "" -#: mk/mk_choices.py:37 +#: mk/mk_choices.py:39 msgid "Zajas" msgstr "" -#: mk/mk_choices.py:38 +#: mk/mk_choices.py:40 msgid "Zelenikovo" msgstr "" -#: mk/mk_choices.py:39 +#: mk/mk_choices.py:41 msgid "Zrnovci" msgstr "" -#: mk/mk_choices.py:40 +#: mk/mk_choices.py:42 msgid "Ilinden" msgstr "" -#: mk/mk_choices.py:41 +#: mk/mk_choices.py:43 msgid "Jegunovce" msgstr "" -#: mk/mk_choices.py:42 +#: mk/mk_choices.py:44 msgid "Kavadarci" msgstr "" -#: mk/mk_choices.py:43 +#: mk/mk_choices.py:45 msgid "Karbinci" msgstr "" -#: mk/mk_choices.py:44 +#: mk/mk_choices.py:46 msgid "Karpoš" msgstr "" -#: mk/mk_choices.py:45 +#: mk/mk_choices.py:47 msgid "Kisela Voda" msgstr "" -#: mk/mk_choices.py:46 +#: mk/mk_choices.py:48 msgid "Kičevo" msgstr "" -#: mk/mk_choices.py:47 +#: mk/mk_choices.py:49 msgid "Konče" msgstr "" -#: mk/mk_choices.py:48 +#: mk/mk_choices.py:50 msgid "Koćani" msgstr "" -#: mk/mk_choices.py:49 +#: mk/mk_choices.py:51 msgid "Kratovo" msgstr "" -#: mk/mk_choices.py:50 +#: mk/mk_choices.py:52 msgid "Kriva Palanka" msgstr "" -#: mk/mk_choices.py:51 +#: mk/mk_choices.py:53 msgid "Krivogaštani" msgstr "" -#: mk/mk_choices.py:52 +#: mk/mk_choices.py:54 msgid "Kruševo" msgstr "" -#: mk/mk_choices.py:53 +#: mk/mk_choices.py:55 msgid "Kumanovo" msgstr "" -#: mk/mk_choices.py:54 +#: mk/mk_choices.py:56 msgid "Lipkovo" msgstr "" -#: mk/mk_choices.py:55 +#: mk/mk_choices.py:57 msgid "Lozovo" msgstr "" -#: mk/mk_choices.py:56 +#: mk/mk_choices.py:58 msgid "Mavrovo i Rostuša" msgstr "" -#: mk/mk_choices.py:57 +#: mk/mk_choices.py:59 msgid "Makedonska Kamenica" msgstr "" -#: mk/mk_choices.py:58 +#: mk/mk_choices.py:60 msgid "Makedonski Brod" msgstr "" -#: mk/mk_choices.py:59 +#: mk/mk_choices.py:61 msgid "Mogila" msgstr "" -#: mk/mk_choices.py:60 +#: mk/mk_choices.py:62 msgid "Negotino" msgstr "" -#: mk/mk_choices.py:61 +#: mk/mk_choices.py:63 msgid "Novaci" msgstr "" -#: mk/mk_choices.py:62 +#: mk/mk_choices.py:64 msgid "Novo Selo" msgstr "" -#: mk/mk_choices.py:63 +#: mk/mk_choices.py:65 msgid "Oslomej" msgstr "" -#: mk/mk_choices.py:64 +#: mk/mk_choices.py:66 msgid "Ohrid" msgstr "" -#: mk/mk_choices.py:65 +#: mk/mk_choices.py:67 msgid "Petrovec" msgstr "" -#: mk/mk_choices.py:66 +#: mk/mk_choices.py:68 msgid "Pehčevo" msgstr "" -#: mk/mk_choices.py:67 +#: mk/mk_choices.py:69 msgid "Plasnica" msgstr "" -#: mk/mk_choices.py:68 +#: mk/mk_choices.py:70 msgid "Prilep" msgstr "" -#: mk/mk_choices.py:69 +#: mk/mk_choices.py:71 msgid "Probištip" msgstr "" -#: mk/mk_choices.py:70 +#: mk/mk_choices.py:72 msgid "Radoviš" msgstr "" -#: mk/mk_choices.py:71 +#: mk/mk_choices.py:73 msgid "Rankovce" msgstr "" -#: mk/mk_choices.py:72 +#: mk/mk_choices.py:74 msgid "Resen" msgstr "" -#: mk/mk_choices.py:73 +#: mk/mk_choices.py:75 msgid "Rosoman" msgstr "" -#: mk/mk_choices.py:74 +#: mk/mk_choices.py:76 msgid "Saraj" msgstr "" -#: mk/mk_choices.py:75 +#: mk/mk_choices.py:77 msgid "Sveti Nikole" msgstr "" -#: mk/mk_choices.py:76 +#: mk/mk_choices.py:78 msgid "Sopište" msgstr "" -#: mk/mk_choices.py:77 +#: mk/mk_choices.py:79 msgid "Star Dojran" msgstr "" -#: mk/mk_choices.py:78 +#: mk/mk_choices.py:80 msgid "Staro Nagoričane" msgstr "" -#: mk/mk_choices.py:79 +#: mk/mk_choices.py:81 msgid "Struga" msgstr "" -#: mk/mk_choices.py:80 +#: mk/mk_choices.py:82 msgid "Strumica" msgstr "" -#: mk/mk_choices.py:81 +#: mk/mk_choices.py:83 msgid "Studeničani" msgstr "" -#: mk/mk_choices.py:82 +#: mk/mk_choices.py:84 msgid "Tearce" msgstr "" -#: mk/mk_choices.py:83 +#: mk/mk_choices.py:85 msgid "Tetovo" msgstr "" -#: mk/mk_choices.py:84 +#: mk/mk_choices.py:86 msgid "Centar" msgstr "" -#: mk/mk_choices.py:85 +#: mk/mk_choices.py:87 msgid "Centar-Župa" msgstr "" -#: mk/mk_choices.py:86 +#: mk/mk_choices.py:88 msgid "Čair" msgstr "" -#: mk/mk_choices.py:87 +#: mk/mk_choices.py:89 msgid "Čaška" msgstr "" -#: mk/mk_choices.py:88 +#: mk/mk_choices.py:90 msgid "Češinovo-Obleševo" msgstr "" -#: mk/mk_choices.py:89 +#: mk/mk_choices.py:91 msgid "Čučer-Sandevo" msgstr "" -#: mk/mk_choices.py:90 +#: mk/mk_choices.py:92 msgid "Štip" msgstr "" -#: mk/mk_choices.py:91 +#: mk/mk_choices.py:93 msgid "Šuto Orizari" msgstr "" @@ -2228,23 +2255,23 @@ msgstr "" msgid "Unique master citizen number (13 digits)" msgstr "" -#: mx/forms.py:65 +#: mx/forms.py:67 msgid "Enter a valid zip code in the format XXXXX." msgstr "" -#: mx/forms.py:108 +#: mx/forms.py:110 msgid "Enter a valid RFC." msgstr "" -#: mx/forms.py:109 +#: mx/forms.py:111 msgid "Invalid checksum for RFC." msgstr "" -#: mx/forms.py:189 +#: mx/forms.py:191 msgid "Enter a valid CURP." msgstr "" -#: mx/forms.py:190 +#: mx/forms.py:192 msgid "Invalid checksum for CURP." msgstr "" @@ -2264,131 +2291,131 @@ msgstr "" msgid "Mexican CURP" msgstr "" -#: mx/mx_states.py:13 +#: mx/mx_states.py:14 msgid "Aguascalientes" msgstr "" -#: mx/mx_states.py:14 +#: mx/mx_states.py:15 msgid "Baja California" msgstr "" -#: mx/mx_states.py:15 +#: mx/mx_states.py:16 msgid "Baja California Sur" msgstr "" -#: mx/mx_states.py:16 +#: mx/mx_states.py:17 msgid "Campeche" msgstr "" -#: mx/mx_states.py:17 +#: mx/mx_states.py:18 msgid "Chihuahua" msgstr "" -#: mx/mx_states.py:18 +#: mx/mx_states.py:19 msgid "Chiapas" msgstr "" -#: mx/mx_states.py:19 +#: mx/mx_states.py:20 msgid "Coahuila" msgstr "" -#: mx/mx_states.py:20 +#: mx/mx_states.py:21 msgid "Colima" msgstr "" -#: mx/mx_states.py:21 +#: mx/mx_states.py:22 msgid "Distrito Federal" msgstr "" -#: mx/mx_states.py:22 +#: mx/mx_states.py:23 msgid "Durango" msgstr "" -#: mx/mx_states.py:23 +#: mx/mx_states.py:24 msgid "Guerrero" msgstr "" -#: mx/mx_states.py:24 +#: mx/mx_states.py:25 msgid "Guanajuato" msgstr "" -#: mx/mx_states.py:25 +#: mx/mx_states.py:26 msgid "Hidalgo" msgstr "" -#: mx/mx_states.py:26 +#: mx/mx_states.py:27 msgid "Jalisco" msgstr "" -#: mx/mx_states.py:27 +#: mx/mx_states.py:28 msgid "Estado de México" msgstr "" -#: mx/mx_states.py:28 +#: mx/mx_states.py:29 msgid "Michoacán" msgstr "" -#: mx/mx_states.py:29 +#: mx/mx_states.py:30 msgid "Morelos" msgstr "" -#: mx/mx_states.py:30 +#: mx/mx_states.py:31 msgid "Nayarit" msgstr "" -#: mx/mx_states.py:31 +#: mx/mx_states.py:32 msgid "Nuevo León" msgstr "" -#: mx/mx_states.py:32 +#: mx/mx_states.py:33 msgid "Oaxaca" msgstr "" -#: mx/mx_states.py:33 +#: mx/mx_states.py:34 msgid "Puebla" msgstr "" -#: mx/mx_states.py:34 +#: mx/mx_states.py:35 msgid "Querétaro" msgstr "" -#: mx/mx_states.py:35 +#: mx/mx_states.py:36 msgid "Quintana Roo" msgstr "" -#: mx/mx_states.py:36 +#: mx/mx_states.py:37 msgid "Sinaloa" msgstr "" -#: mx/mx_states.py:37 +#: mx/mx_states.py:38 msgid "San Luis Potosí" msgstr "" -#: mx/mx_states.py:38 +#: mx/mx_states.py:39 msgid "Sonora" msgstr "" -#: mx/mx_states.py:39 +#: mx/mx_states.py:40 msgid "Tabasco" msgstr "" -#: mx/mx_states.py:40 +#: mx/mx_states.py:41 msgid "Tamaulipas" msgstr "" -#: mx/mx_states.py:41 +#: mx/mx_states.py:42 msgid "Tlaxcala" msgstr "" -#: mx/mx_states.py:42 +#: mx/mx_states.py:43 msgid "Veracruz" msgstr "" -#: mx/mx_states.py:43 +#: mx/mx_states.py:44 msgid "Yucatán" msgstr "" -#: mx/mx_states.py:44 +#: mx/mx_states.py:45 msgid "Zacatecas" msgstr "" @@ -2558,31 +2585,31 @@ msgstr "" msgid "West Pomerania" msgstr "" -#: pt/forms.py:17 +#: pt/forms.py:19 msgid "Enter a zip code in the format XXXX-XXX." msgstr "" -#: pt/forms.py:37 +#: pt/forms.py:39 msgid "Phone numbers must have 9 digits, or start by + or 00." msgstr "" -#: ro/forms.py:20 +#: ro/forms.py:22 msgid "Enter a valid CIF." msgstr "" -#: ro/forms.py:57 +#: ro/forms.py:59 msgid "Enter a valid CNP." msgstr "" -#: ro/forms.py:142 +#: ro/forms.py:143 msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format" msgstr "" -#: ro/forms.py:174 +#: ro/forms.py:175 msgid "Phone numbers must be in XXXX-XXXXXX format." msgstr "" -#: ro/forms.py:199 +#: ro/forms.py:200 msgid "Enter a valid postal code in the format XXXXXX" msgstr "" @@ -2978,87 +3005,87 @@ msgstr "" msgid "Enter a Swedish postal code in the format XXXXX." msgstr "" -#: se/se_counties.py:15 +#: se/se_counties.py:16 msgid "Stockholm" msgstr "" -#: se/se_counties.py:16 +#: se/se_counties.py:17 msgid "Västerbotten" msgstr "" -#: se/se_counties.py:17 +#: se/se_counties.py:18 msgid "Norrbotten" msgstr "" -#: se/se_counties.py:18 +#: se/se_counties.py:19 msgid "Uppsala" msgstr "" -#: se/se_counties.py:19 +#: se/se_counties.py:20 msgid "Södermanland" msgstr "" -#: se/se_counties.py:20 +#: se/se_counties.py:21 msgid "Östergötland" msgstr "" -#: se/se_counties.py:21 +#: se/se_counties.py:22 msgid "Jönköping" msgstr "" -#: se/se_counties.py:22 +#: se/se_counties.py:23 msgid "Kronoberg" msgstr "" -#: se/se_counties.py:23 +#: se/se_counties.py:24 msgid "Kalmar" msgstr "" -#: se/se_counties.py:24 +#: se/se_counties.py:25 msgid "Gotland" msgstr "" -#: se/se_counties.py:25 +#: se/se_counties.py:26 msgid "Blekinge" msgstr "" -#: se/se_counties.py:26 +#: se/se_counties.py:27 msgid "Skåne" msgstr "" -#: se/se_counties.py:27 +#: se/se_counties.py:28 msgid "Halland" msgstr "" -#: se/se_counties.py:28 +#: se/se_counties.py:29 msgid "Västra Götaland" msgstr "" -#: se/se_counties.py:29 +#: se/se_counties.py:30 msgid "Värmland" msgstr "" -#: se/se_counties.py:30 +#: se/se_counties.py:31 msgid "Örebro" msgstr "" -#: se/se_counties.py:31 +#: se/se_counties.py:32 msgid "Västmanland" msgstr "" -#: se/se_counties.py:32 +#: se/se_counties.py:33 msgid "Dalarna" msgstr "" -#: se/se_counties.py:33 +#: se/se_counties.py:34 msgid "Gävleborg" msgstr "" -#: se/se_counties.py:34 +#: se/se_counties.py:35 msgid "Västernorrland" msgstr "" -#: se/se_counties.py:35 +#: se/se_counties.py:36 msgid "Jämtland" msgstr "" @@ -3446,10 +3473,6 @@ msgstr "" msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX." msgstr "" -#: us/forms.py:30 -msgid "Phone numbers must be in XXX-XXX-XXXX format." -msgstr "" - #: us/forms.py:59 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format." msgstr "" @@ -3478,11 +3501,11 @@ msgstr "" msgid "Enter a valid CI number." msgstr "" -#: za/forms.py:21 +#: za/forms.py:22 msgid "Enter a valid South African ID number" msgstr "" -#: za/forms.py:55 +#: za/forms.py:56 msgid "Enter a valid South African postal code" msgstr "" diff --git a/django/contrib/messages/locale/en/LC_MESSAGES/django.po b/django/contrib/messages/locale/en/LC_MESSAGES/django.po index 7789b497fa..6f16dd0411 100644 --- a/django/contrib/messages/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/messages/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:43+0100\n" +"POT-Creation-Date: 2012-10-15 10:57+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,6 +13,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: tests/base.py:100 +#: tests/base.py:101 msgid "lazy message" msgstr "" diff --git a/django/contrib/redirects/locale/en/LC_MESSAGES/django.po b/django/contrib/redirects/locale/en/LC_MESSAGES/django.po index 5209952d17..885b5fdb97 100644 --- a/django/contrib/redirects/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/redirects/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:43+0100\n" +"POT-Creation-Date: 2012-10-15 10:57+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,30 +13,30 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: models.py:7 +#: models.py:9 msgid "redirect from" msgstr "" -#: models.py:8 +#: models.py:10 msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." msgstr "" -#: models.py:9 +#: models.py:11 msgid "redirect to" msgstr "" -#: models.py:10 +#: models.py:12 msgid "" "This can be either an absolute path (as above) or a full URL starting with " "'http://'." msgstr "" -#: models.py:13 +#: models.py:15 msgid "redirect" msgstr "" -#: models.py:14 +#: models.py:16 msgid "redirects" msgstr "" diff --git a/django/contrib/sessions/locale/en/LC_MESSAGES/django.po b/django/contrib/sessions/locale/en/LC_MESSAGES/django.po index b0c82d86a5..5147a71fe5 100644 --- a/django/contrib/sessions/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/sessions/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:43+0100\n" +"POT-Creation-Date: 2012-10-15 10:57+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" diff --git a/django/contrib/sites/locale/en/LC_MESSAGES/django.po b/django/contrib/sites/locale/en/LC_MESSAGES/django.po index 5d70211d57..410b61b9c7 100644 --- a/django/contrib/sites/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/sites/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:43+0100\n" +"POT-Creation-Date: 2012-10-15 10:57+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,18 +13,18 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: models.py:37 +#: models.py:39 msgid "domain name" msgstr "" -#: models.py:38 +#: models.py:40 msgid "display name" msgstr "" -#: models.py:43 +#: models.py:45 msgid "site" msgstr "" -#: models.py:44 +#: models.py:46 msgid "sites" msgstr ""