Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Updated core base translation files with new strings. Refs #17822.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit b403e43c5164d07af88e924a5fdbd3f051c6cb9e 1 parent a78e61b
Jannis Leidel authored March 05, 2012
BIN  django/conf/locale/en/LC_MESSAGES/django.mo
Binary file not shown
186  django/conf/locale/en/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@ msgid ""
4 4
 msgstr ""
5 5
 "Project-Id-Version: Django\n"
6 6
 "Report-Msgid-Bugs-To: \n"
7  
-"POT-Creation-Date: 2011-12-22 23:56+0100\n"
  7
+"POT-Creation-Date: 2012-03-05 02:24+0100\n"
8 8
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
9 9
 "Last-Translator: Django team\n"
10 10
 "Language-Team: English <en@li.org>\n"
@@ -289,70 +289,70 @@ msgstr ""
289 289
 msgid "Enter a valid URL."
290 290
 msgstr ""
291 291
 
292  
-#: core/validators.py:164 forms/fields.py:474
  292
+#: core/validators.py:165 forms/fields.py:474
293 293
 msgid "Enter a valid e-mail address."
294 294
 msgstr ""
295 295
 
296  
-#: core/validators.py:167 forms/fields.py:1022
  296
+#: core/validators.py:168 forms/fields.py:1023
297 297
 msgid ""
298 298
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
299 299
 msgstr ""
300 300
 
301  
-#: core/validators.py:170 core/validators.py:187 forms/fields.py:996
  301
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
302 302
 msgid "Enter a valid IPv4 address."
303 303
 msgstr ""
304 304
 
305  
-#: core/validators.py:174 core/validators.py:188
  305
+#: core/validators.py:175 core/validators.py:189
306 306
 msgid "Enter a valid IPv6 address."
307 307
 msgstr ""
308 308
 
309  
-#: core/validators.py:183 core/validators.py:186
  309
+#: core/validators.py:184 core/validators.py:187
310 310
 msgid "Enter a valid IPv4 or IPv6 address."
311 311
 msgstr ""
312 312
 
313  
-#: core/validators.py:208 db/models/fields/__init__.py:636
  313
+#: core/validators.py:209 db/models/fields/__init__.py:638
314 314
 msgid "Enter only digits separated by commas."
315 315
 msgstr ""
316 316
 
317  
-#: core/validators.py:214
  317
+#: core/validators.py:215
318 318
 #, python-format
319 319
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
320 320
 msgstr ""
321 321
 
322  
-#: core/validators.py:232 forms/fields.py:209 forms/fields.py:262
  322
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
323 323
 #, python-format
324 324
 msgid "Ensure this value is less than or equal to %(limit_value)s."
325 325
 msgstr ""
326 326
 
327  
-#: core/validators.py:237 forms/fields.py:210 forms/fields.py:263
  327
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
328 328
 #, python-format
329 329
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
330 330
 msgstr ""
331 331
 
332  
-#: core/validators.py:243
  332
+#: core/validators.py:244
333 333
 #, python-format
334 334
 msgid ""
335 335
 "Ensure this value has at least %(limit_value)d characters (it has "
336 336
 "%(show_value)d)."
337 337
 msgstr ""
338 338
 
339  
-#: core/validators.py:249
  339
+#: core/validators.py:250
340 340
 #, python-format
341 341
 msgid ""
342 342
 "Ensure this value has at most %(limit_value)d characters (it has "
343 343
 "%(show_value)d)."
344 344
 msgstr ""
345 345
 
346  
-#: db/models/base.py:765
  346
+#: db/models/base.py:770
347 347
 #, python-format
348 348
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
349 349
 msgstr ""
350 350
 
351  
-#: db/models/base.py:788 forms/models.py:570
  351
+#: db/models/base.py:793 forms/models.py:577
352 352
 msgid "and"
353 353
 msgstr ""
354 354
 
355  
-#: db/models/base.py:789 db/models/fields/__init__.py:65
  355
+#: db/models/base.py:794 db/models/fields/__init__.py:65
356 356
 #, python-format
357 357
 msgid "%(model_name)s with this %(field_label)s already exists."
358 358
 msgstr ""
@@ -375,159 +375,181 @@ msgstr ""
375 375
 msgid "Field of type: %(field_type)s"
376 376
 msgstr ""
377 377
 
378  
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:948
379  
-#: db/models/fields/__init__.py:1103 db/models/fields/__init__.py:1114
380  
-#: db/models/fields/__init__.py:1141
  378
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
381 379
 msgid "Integer"
382 380
 msgstr ""
383 381
 
384  
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:946
  382
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
385 383
 #, python-format
386 384
 msgid "'%s' value must be an integer."
387 385
 msgstr ""
388 386
 
389  
-#: db/models/fields/__init__.py:551
  387
+#: db/models/fields/__init__.py:552
390 388
 #, python-format
391 389
 msgid "'%s' value must be either True or False."
392 390
 msgstr ""
393 391
 
394  
-#: db/models/fields/__init__.py:553
  392
+#: db/models/fields/__init__.py:554
395 393
 msgid "Boolean (Either True or False)"
396 394
 msgstr ""
397 395
 
398  
-#: db/models/fields/__init__.py:603 db/models/fields/__init__.py:1124
  396
+#: db/models/fields/__init__.py:605
399 397
 #, python-format
400 398
 msgid "String (up to %(max_length)s)"
401 399
 msgstr ""
402 400
 
403  
-#: db/models/fields/__init__.py:631
  401
+#: db/models/fields/__init__.py:633
404 402
 msgid "Comma-separated integers"
405 403
 msgstr ""
406 404
 
407  
-#: db/models/fields/__init__.py:645
  405
+#: db/models/fields/__init__.py:647
408 406
 #, python-format
409 407
 msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
410 408
 msgstr ""
411 409
 
412  
-#: db/models/fields/__init__.py:647 db/models/fields/__init__.py:732
  410
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
413 411
 #, python-format
414 412
 msgid ""
415 413
 "'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
416 414
 msgstr ""
417 415
 
418  
-#: db/models/fields/__init__.py:650
  416
+#: db/models/fields/__init__.py:652
419 417
 msgid "Date (without time)"
420 418
 msgstr ""
421 419
 
422  
-#: db/models/fields/__init__.py:730
  420
+#: db/models/fields/__init__.py:732
423 421
 #, python-format
424 422
 msgid ""
425 423
 "'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
426 424
 "uuuuuu]][TZ] format."
427 425
 msgstr ""
428 426
 
429  
-#: db/models/fields/__init__.py:734
  427
+#: db/models/fields/__init__.py:736
430 428
 #, python-format
431 429
 msgid ""
432 430
 "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
433 431
 "it is an invalid date/time."
434 432
 msgstr ""
435 433
 
436  
-#: db/models/fields/__init__.py:738
  434
+#: db/models/fields/__init__.py:740
437 435
 msgid "Date (with time)"
438 436
 msgstr ""
439 437
 
440  
-#: db/models/fields/__init__.py:818
  438
+#: db/models/fields/__init__.py:831
441 439
 #, python-format
442 440
 msgid "'%s' value must be a decimal number."
443 441
 msgstr ""
444 442
 
445  
-#: db/models/fields/__init__.py:820
  443
+#: db/models/fields/__init__.py:833
446 444
 msgid "Decimal number"
447 445
 msgstr ""
448 446
 
449  
-#: db/models/fields/__init__.py:877
  447
+#: db/models/fields/__init__.py:890
450 448
 msgid "E-mail address"
451 449
 msgstr ""
452 450
 
453  
-#: db/models/fields/__init__.py:893 db/models/fields/files.py:214
454  
-#: db/models/fields/files.py:321
  451
+#: db/models/fields/__init__.py:906
455 452
 msgid "File path"
456 453
 msgstr ""
457 454
 
458  
-#: db/models/fields/__init__.py:917
  455
+#: db/models/fields/__init__.py:930
459 456
 #, python-format
460 457
 msgid "'%s' value must be a float."
461 458
 msgstr ""
462 459
 
463  
-#: db/models/fields/__init__.py:919
  460
+#: db/models/fields/__init__.py:932
464 461
 msgid "Floating point number"
465 462
 msgstr ""
466 463
 
467  
-#: db/models/fields/__init__.py:980
  464
+#: db/models/fields/__init__.py:993
468 465
 msgid "Big (8 byte) integer"
469 466
 msgstr ""
470 467
 
471  
-#: db/models/fields/__init__.py:994
  468
+#: db/models/fields/__init__.py:1007
472 469
 msgid "IPv4 address"
473 470
 msgstr ""
474 471
 
475  
-#: db/models/fields/__init__.py:1010
  472
+#: db/models/fields/__init__.py:1023
476 473
 msgid "IP address"
477 474
 msgstr ""
478 475
 
479  
-#: db/models/fields/__init__.py:1052
  476
+#: db/models/fields/__init__.py:1065
480 477
 #, python-format
481 478
 msgid "'%s' value must be either None, True or False."
482 479
 msgstr ""
483 480
 
484  
-#: db/models/fields/__init__.py:1054
  481
+#: db/models/fields/__init__.py:1067
485 482
 msgid "Boolean (Either True, False or None)"
486 483
 msgstr ""
487 484
 
488  
-#: db/models/fields/__init__.py:1147
  485
+#: db/models/fields/__init__.py:1116
  486
+msgid "Positive integer"
  487
+msgstr ""
  488
+
  489
+#: db/models/fields/__init__.py:1127
  490
+msgid "Positive small integer"
  491
+msgstr ""
  492
+
  493
+#: db/models/fields/__init__.py:1138
  494
+#, python-format
  495
+msgid "Slug (up to %(max_length)s)"
  496
+msgstr ""
  497
+
  498
+#: db/models/fields/__init__.py:1156
  499
+msgid "Small integer"
  500
+msgstr ""
  501
+
  502
+#: db/models/fields/__init__.py:1162
489 503
 msgid "Text"
490 504
 msgstr ""
491 505
 
492  
-#: db/models/fields/__init__.py:1165
  506
+#: db/models/fields/__init__.py:1180
493 507
 #, python-format
494 508
 msgid ""
495 509
 "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
496 510
 msgstr ""
497 511
 
498  
-#: db/models/fields/__init__.py:1167
  512
+#: db/models/fields/__init__.py:1182
499 513
 #, python-format
500 514
 msgid ""
501 515
 "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
502 516
 "time."
503 517
 msgstr ""
504 518
 
505  
-#: db/models/fields/__init__.py:1170
  519
+#: db/models/fields/__init__.py:1185
506 520
 msgid "Time"
507 521
 msgstr ""
508 522
 
509  
-#: db/models/fields/__init__.py:1234
  523
+#: db/models/fields/__init__.py:1249
510 524
 msgid "URL"
511 525
 msgstr ""
512 526
 
513  
-#: db/models/fields/related.py:902
  527
+#: db/models/fields/files.py:214
  528
+msgid "File"
  529
+msgstr ""
  530
+
  531
+#: db/models/fields/files.py:321
  532
+msgid "Image"
  533
+msgstr ""
  534
+
  535
+#: db/models/fields/related.py:903
514 536
 #, python-format
515 537
 msgid "Model %(model)s with pk %(pk)r does not exist."
516 538
 msgstr ""
517 539
 
518  
-#: db/models/fields/related.py:904
  540
+#: db/models/fields/related.py:905
519 541
 msgid "Foreign Key (type determined by related field)"
520 542
 msgstr ""
521 543
 
522  
-#: db/models/fields/related.py:1032
  544
+#: db/models/fields/related.py:1033
523 545
 msgid "One-to-one relationship"
524 546
 msgstr ""
525 547
 
526  
-#: db/models/fields/related.py:1095
  548
+#: db/models/fields/related.py:1096
527 549
 msgid "Many-to-many relationship"
528 550
 msgstr ""
529 551
 
530  
-#: db/models/fields/related.py:1119
  552
+#: db/models/fields/related.py:1120
531 553
 msgid ""
532 554
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
533 555
 msgstr ""
@@ -559,11 +581,11 @@ msgstr ""
559 581
 msgid "Ensure that there are no more than %s digits before the decimal point."
560 582
 msgstr ""
561 583
 
562  
-#: forms/fields.py:365 forms/fields.py:962
  584
+#: forms/fields.py:365 forms/fields.py:963
563 585
 msgid "Enter a valid date."
564 586
 msgstr ""
565 587
 
566  
-#: forms/fields.py:388 forms/fields.py:963
  588
+#: forms/fields.py:388 forms/fields.py:964
567 589
 msgid "Enter a valid time."
568 590
 msgstr ""
569 591
 
@@ -604,7 +626,7 @@ msgstr ""
604 626
 msgid "Select a valid choice. %(value)s is not one of the available choices."
605 627
 msgstr ""
606 628
 
607  
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:992
  629
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
608 630
 msgid "Enter a list of values."
609 631
 msgstr ""
610 632
 
@@ -616,41 +638,41 @@ msgstr ""
616 638
 msgid "Delete"
617 639
 msgstr ""
618 640
 
619  
-#: forms/models.py:564
  641
+#: forms/models.py:571
620 642
 #, python-format
621 643
 msgid "Please correct the duplicate data for %(field)s."
622 644
 msgstr ""
623 645
 
624  
-#: forms/models.py:568
  646
+#: forms/models.py:575
625 647
 #, python-format
626 648
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
627 649
 msgstr ""
628 650
 
629  
-#: forms/models.py:574
  651
+#: forms/models.py:581
630 652
 #, python-format
631 653
 msgid ""
632 654
 "Please correct the duplicate data for %(field_name)s which must be unique "
633 655
 "for the %(lookup)s in %(date_field)s."
634 656
 msgstr ""
635 657
 
636  
-#: forms/models.py:582
  658
+#: forms/models.py:589
637 659
 msgid "Please correct the duplicate values below."
638 660
 msgstr ""
639 661
 
640  
-#: forms/models.py:842
  662
+#: forms/models.py:849
641 663
 msgid "The inline foreign key did not match the parent instance primary key."
642 664
 msgstr ""
643 665
 
644  
-#: forms/models.py:903
  666
+#: forms/models.py:910
645 667
 msgid "Select a valid choice. That choice is not one of the available choices."
646 668
 msgstr ""
647 669
 
648  
-#: forms/models.py:993
  670
+#: forms/models.py:1000
649 671
 #, python-format
650 672
 msgid "Select a valid choice. %s is not one of the available choices."
651 673
 msgstr ""
652 674
 
653  
-#: forms/models.py:995
  675
+#: forms/models.py:1002
654 676
 #, python-format
655 677
 msgid "\"%s\" is not a valid value for a primary key."
656 678
 msgstr ""
@@ -662,62 +684,62 @@ msgid ""
662 684
 "may be ambiguous or it may not exist."
663 685
 msgstr ""
664 686
 
665  
-#: forms/widgets.py:326
  687
+#: forms/widgets.py:325
666 688
 msgid "Currently"
667 689
 msgstr ""
668 690
 
669  
-#: forms/widgets.py:327
  691
+#: forms/widgets.py:326
670 692
 msgid "Change"
671 693
 msgstr ""
672 694
 
673  
-#: forms/widgets.py:328
  695
+#: forms/widgets.py:327
674 696
 msgid "Clear"
675 697
 msgstr ""
676 698
 
677  
-#: forms/widgets.py:583
  699
+#: forms/widgets.py:582
678 700
 msgid "Unknown"
679 701
 msgstr ""
680 702
 
681  
-#: forms/widgets.py:584
  703
+#: forms/widgets.py:583
682 704
 msgid "Yes"
683 705
 msgstr ""
684 706
 
685  
-#: forms/widgets.py:585
  707
+#: forms/widgets.py:584
686 708
 msgid "No"
687 709
 msgstr ""
688 710
 
689  
-#: template/defaultfilters.py:785
  711
+#: template/defaultfilters.py:797
690 712
 msgid "yes,no,maybe"
691 713
 msgstr ""
692 714
 
693  
-#: template/defaultfilters.py:813 template/defaultfilters.py:818
  715
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
694 716
 #, python-format
695 717
 msgid "%(size)d byte"
696 718
 msgid_plural "%(size)d bytes"
697 719
 msgstr[0] ""
698 720
 msgstr[1] ""
699 721
 
700  
-#: template/defaultfilters.py:820
  722
+#: template/defaultfilters.py:832
701 723
 #, python-format
702 724
 msgid "%s KB"
703 725
 msgstr ""
704 726
 
705  
-#: template/defaultfilters.py:822
  727
+#: template/defaultfilters.py:834
706 728
 #, python-format
707 729
 msgid "%s MB"
708 730
 msgstr ""
709 731
 
710  
-#: template/defaultfilters.py:824
  732
+#: template/defaultfilters.py:836
711 733
 #, python-format
712 734
 msgid "%s GB"
713 735
 msgstr ""
714 736
 
715  
-#: template/defaultfilters.py:826
  737
+#: template/defaultfilters.py:838
716 738
 #, python-format
717 739
 msgid "%s TB"
718 740
 msgstr ""
719 741
 
720  
-#: template/defaultfilters.py:827
  742
+#: template/defaultfilters.py:839
721 743
 #, python-format
722 744
 msgid "%s PB"
723 745
 msgstr ""
@@ -1083,6 +1105,20 @@ msgstr ""
1083 1105
 msgid ", %(number)d %(type)s"
1084 1106
 msgstr ""
1085 1107
 
  1108
+#: views/static.py:52
  1109
+msgid "Directory indexes are not allowed here."
  1110
+msgstr ""
  1111
+
  1112
+#: views/static.py:54
  1113
+#, python-format
  1114
+msgid "\"%(path)s\" does not exist"
  1115
+msgstr ""
  1116
+
  1117
+#: views/static.py:95
  1118
+#, python-format
  1119
+msgid "Index of %(directory)s"
  1120
+msgstr ""
  1121
+
1086 1122
 #: views/generic/create_update.py:121
1087 1123
 #, python-format
1088 1124
 msgid "The %(verbose_name)s was created successfully."
2  django/views/static.py
@@ -51,7 +51,7 @@ def serve(request, path, document_root=None, show_indexes=False):
51 51
             return directory_index(newpath, fullpath)
52 52
         raise Http404(_(u"Directory indexes are not allowed here."))
53 53
     if not os.path.exists(fullpath):
54  
-        raise Http404(_(u'"%s" does not exist') % fullpath)
  54
+        raise Http404(_(u'"%(path)s" does not exist') % {'path': fullpath})
55 55
     # Respect the If-Modified-Since header.
56 56
     statobj = os.stat(fullpath)
57 57
     mimetype, encoding = mimetypes.guess_type(fullpath)

0 notes on commit b403e43

Please sign in to comment.
Something went wrong with that request. Please try again.