Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

updated english basic translation file (for two new date formats)

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 845cc95caa707ee366b04551a69046bd8de6aeff 1 parent 9194038
authored September 25, 2006
BIN  django/conf/locale/en/LC_MESSAGES/django.mo
Binary file not shown
672  django/conf/locale/en/LC_MESSAGES/django.po
@@ -3,12 +3,11 @@
3 3
 # This file is distributed under the same license as the PACKAGE package.
4 4
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5 5
 #
6  
-#, fuzzy
7 6
 msgid ""
8 7
 msgstr ""
9 8
 "Project-Id-Version: PACKAGE VERSION\n"
10 9
 "Report-Msgid-Bugs-To: \n"
11  
-"POT-Creation-Date: 2006-05-16 10:10+0200\n"
  10
+"POT-Creation-Date: 2006-09-25 15:43+0200\n"
12 11
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 12
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 13
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -73,7 +72,7 @@ msgstr ""
73 72
 msgid "is public"
74 73
 msgstr ""
75 74
 
76  
-#: contrib/comments/models.py:85 contrib/admin/views/doc.py:289
  75
+#: contrib/comments/models.py:85 contrib/admin/views/doc.py:304
77 76
 msgid "IP address"
78 77
 msgstr ""
79 78
 
@@ -200,12 +199,12 @@ msgstr ""
200 199
 msgid "No voting for yourself"
201 200
 msgstr ""
202 201
 
203  
-#: contrib/comments/views/comments.py:28
  202
+#: contrib/comments/views/comments.py:27
204 203
 msgid ""
205 204
 "This rating is required because you've entered at least one other rating."
206 205
 msgstr ""
207 206
 
208  
-#: contrib/comments/views/comments.py:112
  207
+#: contrib/comments/views/comments.py:111
209 208
 #, python-format
210 209
 msgid ""
211 210
 "This comment was posted by a user who has posted fewer than %(count)s "
@@ -220,7 +219,7 @@ msgid_plural ""
220 219
 msgstr[0] ""
221 220
 msgstr[1] ""
222 221
 
223  
-#: contrib/comments/views/comments.py:117
  222
+#: contrib/comments/views/comments.py:116
224 223
 #, python-format
225 224
 msgid ""
226 225
 "This comment was posted by a sketchy user:\n"
@@ -228,22 +227,22 @@ msgid ""
228 227
 "%(text)s"
229 228
 msgstr ""
230 229
 
231  
-#: contrib/comments/views/comments.py:189
  230
+#: contrib/comments/views/comments.py:188
232 231
 #: contrib/comments/views/comments.py:280
233 232
 msgid "Only POSTs are allowed"
234 233
 msgstr ""
235 234
 
236  
-#: contrib/comments/views/comments.py:193
  235
+#: contrib/comments/views/comments.py:192
237 236
 #: contrib/comments/views/comments.py:284
238 237
 msgid "One or more of the required fields wasn't submitted"
239 238
 msgstr ""
240 239
 
241  
-#: contrib/comments/views/comments.py:197
  240
+#: contrib/comments/views/comments.py:196
242 241
 #: contrib/comments/views/comments.py:286
243 242
 msgid "Somebody tampered with the comment form (security violation)"
244 243
 msgstr ""
245 244
 
246  
-#: contrib/comments/views/comments.py:207
  245
+#: contrib/comments/views/comments.py:206
247 246
 #: contrib/comments/views/comments.py:292
248 247
 msgid ""
249 248
 "The comment form had an invalid 'target' parameter -- the object ID was "
@@ -262,18 +261,9 @@ msgid "Username:"
262 261
 msgstr ""
263 262
 
264 263
 #: contrib/comments/templates/comments/form.html:6
265  
-#: contrib/admin/templates/admin/login.html:20
266  
-msgid "Password:"
267  
-msgstr ""
268  
-
269  
-#: contrib/comments/templates/comments/form.html:6
270  
-msgid "Forgotten your password?"
271  
-msgstr ""
272  
-
273  
-#: contrib/comments/templates/comments/form.html:8
274 264
 #: contrib/admin/templates/admin/object_history.html:3
275 265
 #: contrib/admin/templates/admin/change_list.html:5
276  
-#: contrib/admin/templates/admin/base.html:23
  266
+#: contrib/admin/templates/admin/base.html:25
277 267
 #: contrib/admin/templates/admin/delete_confirmation.html:3
278 268
 #: contrib/admin/templates/admin/change_form.html:10
279 269
 #: contrib/admin/templates/registration/password_change_done.html:3
@@ -291,6 +281,15 @@ msgstr ""
291 281
 msgid "Log out"
292 282
 msgstr ""
293 283
 
  284
+#: contrib/comments/templates/comments/form.html:8
  285
+#: contrib/admin/templates/admin/login.html:20
  286
+msgid "Password:"
  287
+msgstr ""
  288
+
  289
+#: contrib/comments/templates/comments/form.html:8
  290
+msgid "Forgotten your password?"
  291
+msgstr ""
  292
+
294 293
 #: contrib/comments/templates/comments/form.html:12
295 294
 msgid "Ratings"
296 295
 msgstr ""
@@ -309,13 +308,13 @@ msgstr ""
309 308
 msgid "Post a photo"
310 309
 msgstr ""
311 310
 
312  
-#: contrib/comments/templates/comments/form.html:27
  311
+#: contrib/comments/templates/comments/form.html:28
313 312
 #: contrib/comments/templates/comments/freeform.html:5
314 313
 msgid "Comment:"
315 314
 msgstr ""
316 315
 
317  
-#: contrib/comments/templates/comments/form.html:32
318  
-#: contrib/comments/templates/comments/freeform.html:9
  316
+#: contrib/comments/templates/comments/form.html:35
  317
+#: contrib/comments/templates/comments/freeform.html:10
319 318
 msgid "Preview comment"
320 319
 msgstr ""
321 320
 
@@ -331,7 +330,7 @@ msgid ""
331 330
 msgstr ""
332 331
 
333 332
 #: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
334  
-#: contrib/admin/filterspecs.py:143
  333
+#: contrib/admin/filterspecs.py:143 contrib/admin/filterspecs.py:169
335 334
 msgid "All"
336 335
 msgstr ""
337 336
 
@@ -395,214 +394,283 @@ msgstr ""
395 394
 msgid "log entries"
396 395
 msgstr ""
397 396
 
398  
-#: contrib/admin/templatetags/admin_list.py:228
  397
+#: contrib/admin/templatetags/admin_list.py:230
399 398
 msgid "All dates"
400 399
 msgstr ""
401 400
 
402  
-#: contrib/admin/views/decorators.py:9 contrib/auth/forms.py:36
403  
-#: contrib/auth/forms.py:41
  401
+#: contrib/admin/views/decorators.py:10 contrib/auth/forms.py:59
404 402
 msgid ""
405 403
 "Please enter a correct username and password. Note that both fields are case-"
406 404
 "sensitive."
407 405
 msgstr ""
408 406
 
409  
-#: contrib/admin/views/decorators.py:23
  407
+#: contrib/admin/views/decorators.py:24
410 408
 #: contrib/admin/templates/admin/login.html:25
411 409
 msgid "Log in"
412 410
 msgstr ""
413 411
 
414  
-#: contrib/admin/views/decorators.py:61
  412
+#: contrib/admin/views/decorators.py:62
415 413
 msgid ""
416 414
 "Please log in again, because your session has expired. Don't worry: Your "
417 415
 "submission has been saved."
418 416
 msgstr ""
419 417
 
420  
-#: contrib/admin/views/decorators.py:68
  418
+#: contrib/admin/views/decorators.py:69
421 419
 msgid ""
422 420
 "Looks like your browser isn't configured to accept cookies. Please enable "
423 421
 "cookies, reload this page, and try again."
424 422
 msgstr ""
425 423
 
426  
-#: contrib/admin/views/decorators.py:82
  424
+#: contrib/admin/views/decorators.py:83
427 425
 msgid "Usernames cannot contain the '@' character."
428 426
 msgstr ""
429 427
 
430  
-#: contrib/admin/views/decorators.py:84
  428
+#: contrib/admin/views/decorators.py:85
431 429
 #, python-format
432 430
 msgid "Your e-mail address is not your username. Try '%s' instead."
433 431
 msgstr ""
434 432
 
435  
-#: contrib/admin/views/main.py:226
  433
+#: contrib/admin/views/main.py:223
436 434
 msgid "Site administration"
437 435
 msgstr ""
438 436
 
439  
-#: contrib/admin/views/main.py:260
  437
+#: contrib/admin/views/main.py:257 contrib/admin/views/auth.py:17
440 438
 #, python-format
441 439
 msgid "The %(name)s \"%(obj)s\" was added successfully."
442 440
 msgstr ""
443 441
 
444  
-#: contrib/admin/views/main.py:264 contrib/admin/views/main.py:348
  442
+#: contrib/admin/views/main.py:261 contrib/admin/views/main.py:347
  443
+#: contrib/admin/views/auth.py:22
445 444
 msgid "You may edit it again below."
446 445
 msgstr ""
447 446
 
448  
-#: contrib/admin/views/main.py:272 contrib/admin/views/main.py:357
  447
+#: contrib/admin/views/main.py:271 contrib/admin/views/main.py:356
449 448
 #, python-format
450 449
 msgid "You may add another %s below."
451 450
 msgstr ""
452 451
 
453  
-#: contrib/admin/views/main.py:290
  452
+#: contrib/admin/views/main.py:289
454 453
 #, python-format
455 454
 msgid "Add %s"
456 455
 msgstr ""
457 456
 
458  
-#: contrib/admin/views/main.py:336
  457
+#: contrib/admin/views/main.py:335
459 458
 #, python-format
460 459
 msgid "Added %s."
461 460
 msgstr ""
462 461
 
463  
-#: contrib/admin/views/main.py:336 contrib/admin/views/main.py:338
464  
-#: contrib/admin/views/main.py:340
  462
+#: contrib/admin/views/main.py:335 contrib/admin/views/main.py:337
  463
+#: contrib/admin/views/main.py:339
465 464
 msgid "and"
466 465
 msgstr ""
467 466
 
468  
-#: contrib/admin/views/main.py:338
  467
+#: contrib/admin/views/main.py:337
469 468
 #, python-format
470 469
 msgid "Changed %s."
471 470
 msgstr ""
472 471
 
473  
-#: contrib/admin/views/main.py:340
  472
+#: contrib/admin/views/main.py:339
474 473
 #, python-format
475 474
 msgid "Deleted %s."
476 475
 msgstr ""
477 476
 
478  
-#: contrib/admin/views/main.py:343
  477
+#: contrib/admin/views/main.py:342
479 478
 msgid "No fields changed."
480 479
 msgstr ""
481 480
 
482  
-#: contrib/admin/views/main.py:346
  481
+#: contrib/admin/views/main.py:345
483 482
 #, python-format
484 483
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
485 484
 msgstr ""
486 485
 
487  
-#: contrib/admin/views/main.py:354
  486
+#: contrib/admin/views/main.py:353
488 487
 #, python-format
489 488
 msgid ""
490 489
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
491 490
 msgstr ""
492 491
 
493  
-#: contrib/admin/views/main.py:392
  492
+#: contrib/admin/views/main.py:391
494 493
 #, python-format
495 494
 msgid "Change %s"
496 495
 msgstr ""
497 496
 
498  
-#: contrib/admin/views/main.py:470
  497
+#: contrib/admin/views/main.py:473
499 498
 #, python-format
500 499
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
501 500
 msgstr ""
502 501
 
503  
-#: contrib/admin/views/main.py:475
  502
+#: contrib/admin/views/main.py:478
504 503
 #, python-format
505 504
 msgid "One or more %(fieldname)s in %(name)s:"
506 505
 msgstr ""
507 506
 
508  
-#: contrib/admin/views/main.py:508
  507
+#: contrib/admin/views/main.py:511
509 508
 #, python-format
510 509
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
511 510
 msgstr ""
512 511
 
513  
-#: contrib/admin/views/main.py:511
  512
+#: contrib/admin/views/main.py:514
514 513
 msgid "Are you sure?"
515 514
 msgstr ""
516 515
 
517  
-#: contrib/admin/views/main.py:533
  516
+#: contrib/admin/views/main.py:536
518 517
 #, python-format
519 518
 msgid "Change history: %s"
520 519
 msgstr ""
521 520
 
522  
-#: contrib/admin/views/main.py:565
  521
+#: contrib/admin/views/main.py:570
523 522
 #, python-format
524 523
 msgid "Select %s"
525 524
 msgstr ""
526 525
 
527  
-#: contrib/admin/views/main.py:565
  526
+#: contrib/admin/views/main.py:570
528 527
 #, python-format
529 528
 msgid "Select %s to change"
530 529
 msgstr ""
531 530
 
532  
-#: contrib/admin/views/doc.py:277 contrib/admin/views/doc.py:286
533  
-#: contrib/admin/views/doc.py:288 contrib/admin/views/doc.py:294
534  
-#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:297
  531
+#: contrib/admin/views/main.py:758
  532
+msgid "Database error"
  533
+msgstr ""
  534
+
  535
+#: contrib/admin/views/doc.py:46 contrib/admin/views/doc.py:48
  536
+#: contrib/admin/views/doc.py:50
  537
+msgid "tag:"
  538
+msgstr ""
  539
+
  540
+#: contrib/admin/views/doc.py:77 contrib/admin/views/doc.py:79
  541
+#: contrib/admin/views/doc.py:81
  542
+msgid "filter:"
  543
+msgstr ""
  544
+
  545
+#: contrib/admin/views/doc.py:135 contrib/admin/views/doc.py:137
  546
+#: contrib/admin/views/doc.py:139
  547
+msgid "view:"
  548
+msgstr ""
  549
+
  550
+#: contrib/admin/views/doc.py:164
  551
+#, python-format
  552
+msgid "App %r not found"
  553
+msgstr ""
  554
+
  555
+#: contrib/admin/views/doc.py:171
  556
+#, python-format
  557
+msgid "Model %r not found in app %r"
  558
+msgstr ""
  559
+
  560
+#: contrib/admin/views/doc.py:183
  561
+#, python-format
  562
+msgid "the related `%s.%s` object"
  563
+msgstr ""
  564
+
  565
+#: contrib/admin/views/doc.py:183 contrib/admin/views/doc.py:205
  566
+#: contrib/admin/views/doc.py:219 contrib/admin/views/doc.py:224
  567
+msgid "model:"
  568
+msgstr ""
  569
+
  570
+#: contrib/admin/views/doc.py:214
  571
+#, python-format
  572
+msgid "related `%s.%s` objects"
  573
+msgstr ""
  574
+
  575
+#: contrib/admin/views/doc.py:219
  576
+#, python-format
  577
+msgid "all %s"
  578
+msgstr ""
  579
+
  580
+#: contrib/admin/views/doc.py:224
  581
+#, python-format
  582
+msgid "number of %s"
  583
+msgstr ""
  584
+
  585
+#: contrib/admin/views/doc.py:229
  586
+#, python-format
  587
+msgid "Fields on %s objects"
  588
+msgstr ""
  589
+
  590
+#: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:301
  591
+#: contrib/admin/views/doc.py:303 contrib/admin/views/doc.py:309
  592
+#: contrib/admin/views/doc.py:310 contrib/admin/views/doc.py:312
535 593
 msgid "Integer"
536 594
 msgstr ""
537 595
 
538  
-#: contrib/admin/views/doc.py:278
  596
+#: contrib/admin/views/doc.py:292
539 597
 msgid "Boolean (Either True or False)"
540 598
 msgstr ""
541 599
 
542  
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:296
  600
+#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:311
543 601
 #, python-format
544 602
 msgid "String (up to %(maxlength)s)"
545 603
 msgstr ""
546 604
 
547  
-#: contrib/admin/views/doc.py:280
  605
+#: contrib/admin/views/doc.py:294
548 606
 msgid "Comma-separated integers"
549 607
 msgstr ""
550 608
 
551  
-#: contrib/admin/views/doc.py:281
  609
+#: contrib/admin/views/doc.py:295
552 610
 msgid "Date (without time)"
553 611
 msgstr ""
554 612
 
555  
-#: contrib/admin/views/doc.py:282
  613
+#: contrib/admin/views/doc.py:296
556 614
 msgid "Date (with time)"
557 615
 msgstr ""
558 616
 
559  
-#: contrib/admin/views/doc.py:283
  617
+#: contrib/admin/views/doc.py:297
560 618
 msgid "E-mail address"
561 619
 msgstr ""
562 620
 
563  
-#: contrib/admin/views/doc.py:284 contrib/admin/views/doc.py:287
  621
+#: contrib/admin/views/doc.py:298 contrib/admin/views/doc.py:299
  622
+#: contrib/admin/views/doc.py:302
564 623
 msgid "File path"
565 624
 msgstr ""
566 625
 
567  
-#: contrib/admin/views/doc.py:285
  626
+#: contrib/admin/views/doc.py:300
568 627
 msgid "Decimal number"
569 628
 msgstr ""
570 629
 
571  
-#: contrib/admin/views/doc.py:291
  630
+#: contrib/admin/views/doc.py:306
572 631
 msgid "Boolean (Either True, False or None)"
573 632
 msgstr ""
574 633
 
575  
-#: contrib/admin/views/doc.py:292
  634
+#: contrib/admin/views/doc.py:307
576 635
 msgid "Relation to parent model"
577 636
 msgstr ""
578 637
 
579  
-#: contrib/admin/views/doc.py:293
  638
+#: contrib/admin/views/doc.py:308
580 639
 msgid "Phone number"
581 640
 msgstr ""
582 641
 
583  
-#: contrib/admin/views/doc.py:298
  642
+#: contrib/admin/views/doc.py:313
584 643
 msgid "Text"
585 644
 msgstr ""
586 645
 
587  
-#: contrib/admin/views/doc.py:299
  646
+#: contrib/admin/views/doc.py:314
588 647
 msgid "Time"
589 648
 msgstr ""
590 649
 
591  
-#: contrib/admin/views/doc.py:300 contrib/flatpages/models.py:7
  650
+#: contrib/admin/views/doc.py:315 contrib/flatpages/models.py:7
592 651
 msgid "URL"
593 652
 msgstr ""
594 653
 
595  
-#: contrib/admin/views/doc.py:301
  654
+#: contrib/admin/views/doc.py:316
596 655
 msgid "U.S. state (two uppercase letters)"
597 656
 msgstr ""
598 657
 
599  
-#: contrib/admin/views/doc.py:302
  658
+#: contrib/admin/views/doc.py:317
600 659
 msgid "XML text"
601 660
 msgstr ""
602 661
 
  662
+#: contrib/admin/views/doc.py:343
  663
+#, python-format
  664
+msgid "%s does not appear to be a urlpattern object"
  665
+msgstr ""
  666
+
  667
+#: contrib/admin/views/auth.py:28
  668
+msgid "Add user"
  669
+msgstr ""
  670
+
603 671
 #: contrib/admin/templates/admin/object_history.html:3
604 672
 #: contrib/admin/templates/admin/change_list.html:5
605  
-#: contrib/admin/templates/admin/base.html:23
  673
+#: contrib/admin/templates/admin/base.html:25
606 674
 #: contrib/admin/templates/admin/delete_confirmation.html:3
607 675
 #: contrib/admin/templates/admin/change_form.html:10
608 676
 #: contrib/admin/templates/registration/password_change_done.html:3
@@ -613,7 +681,7 @@ msgstr ""
613 681
 
614 682
 #: contrib/admin/templates/admin/object_history.html:3
615 683
 #: contrib/admin/templates/admin/change_list.html:5
616  
-#: contrib/admin/templates/admin/base.html:23
  684
+#: contrib/admin/templates/admin/base.html:25
617 685
 #: contrib/admin/templates/admin/delete_confirmation.html:3
618 686
 #: contrib/admin/templates/admin/change_form.html:10
619 687
 #: contrib/admin/templates/registration/password_change_done.html:3
@@ -634,9 +702,10 @@ msgstr ""
634 702
 #: contrib/admin/templates/admin/object_history.html:5
635 703
 #: contrib/admin/templates/admin/500.html:4
636 704
 #: contrib/admin/templates/admin/change_list.html:6
637  
-#: contrib/admin/templates/admin/base.html:28
  705
+#: contrib/admin/templates/admin/base.html:30
638 706
 #: contrib/admin/templates/admin/delete_confirmation.html:6
639 707
 #: contrib/admin/templates/admin/change_form.html:13
  708
+#: contrib/admin/templates/admin/invalid_setup.html:4
640 709
 #: contrib/admin/templates/registration/password_change_done.html:4
641 710
 #: contrib/admin/templates/registration/password_reset_form.html:4
642 711
 #: contrib/admin/templates/registration/logged_out.html:4
@@ -713,6 +782,11 @@ msgstr ""
713 782
 msgid "Models available in the %(name)s application."
714 783
 msgstr ""
715 784
 
  785
+#: contrib/admin/templates/admin/index.html:18
  786
+#, python-format
  787
+msgid "%(name)s"
  788
+msgstr ""
  789
+
716 790
 #: contrib/admin/templates/admin/index.html:28
717 791
 #: contrib/admin/templates/admin/change_form.html:15
718 792
 msgid "Add"
@@ -747,7 +821,7 @@ msgstr ""
747 821
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
748 822
 msgstr ""
749 823
 
750  
-#: contrib/admin/templates/admin/base.html:23
  824
+#: contrib/admin/templates/admin/base.html:25
751 825
 msgid "Welcome,"
752 826
 msgstr ""
753 827
 
@@ -759,16 +833,16 @@ msgstr ""
759 833
 #: contrib/admin/templates/admin/delete_confirmation.html:14
760 834
 #, python-format
761 835
 msgid ""
762  
-"Deleting the %(object_name)s '%(object)s' would result in deleting related "
763  
-"objects, but your account doesn't have permission to delete the following "
764  
-"types of objects:"
  836
+"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
  837
+"related objects, but your account doesn't have permission to delete the "
  838
+"following types of objects:"
765 839
 msgstr ""
766 840
 
767 841
 #: contrib/admin/templates/admin/delete_confirmation.html:21
768 842
 #, python-format
769 843
 msgid ""
770  
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
771  
-"the following related items will be deleted:"
  844
+"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
  845
+"All of the following related items will be deleted:"
772 846
 msgstr ""
773 847
 
774 848
 #: contrib/admin/templates/admin/delete_confirmation.html:26
@@ -777,13 +851,33 @@ msgstr ""
777 851
 
778 852
 #: contrib/admin/templates/admin/filter.html:2
779 853
 #, python-format
780  
-msgid " By %(title)s "
  854
+msgid " By %(filter_title)s "
781 855
 msgstr ""
782 856
 
783 857
 #: contrib/admin/templates/admin/search_form.html:8
784 858
 msgid "Go"
785 859
 msgstr ""
786 860
 
  861
+#: contrib/admin/templates/admin/search_form.html:10
  862
+#, python-format
  863
+msgid "1 result"
  864
+msgid_plural "%(counter)s results"
  865
+msgstr[0] ""
  866
+msgstr[1] ""
  867
+
  868
+#: contrib/admin/templates/admin/search_form.html:10
  869
+#, python-format
  870
+msgid "%(full_result_count)s total"
  871
+msgstr ""
  872
+
  873
+#: contrib/admin/templates/admin/pagination.html:10
  874
+msgid "Show all"
  875
+msgstr ""
  876
+
  877
+#: contrib/admin/templates/admin/filters.html:4
  878
+msgid "Filter"
  879
+msgstr ""
  880
+
787 881
 #: contrib/admin/templates/admin/change_form.html:21
788 882
 msgid "View on site"
789 883
 msgstr ""
@@ -818,6 +912,35 @@ msgstr ""
818 912
 msgid "Save"
819 913
 msgstr ""
820 914
 
  915
+#: contrib/admin/templates/admin/invalid_setup.html:8
  916
+msgid ""
  917
+"Something's wrong with your database installation. Make sure the appropriate "
  918
+"database tables have been created, and make sure the database is readable by "
  919
+"the appropriate user."
  920
+msgstr ""
  921
+
  922
+#: contrib/admin/templates/admin/auth/user/add_form.html:6
  923
+msgid ""
  924
+"First, enter a username and password. Then, you'll be able to edit more user "
  925
+"options."
  926
+msgstr ""
  927
+
  928
+#: contrib/admin/templates/admin/auth/user/add_form.html:12
  929
+msgid "Username"
  930
+msgstr ""
  931
+
  932
+#: contrib/admin/templates/admin/auth/user/add_form.html:18
  933
+msgid "Password"
  934
+msgstr ""
  935
+
  936
+#: contrib/admin/templates/admin/auth/user/add_form.html:23
  937
+msgid "Password (again)"
  938
+msgstr ""
  939
+
  940
+#: contrib/admin/templates/admin/auth/user/add_form.html:24
  941
+msgid "Enter the same password as above, for verification."
  942
+msgstr ""
  943
+
821 944
 #: contrib/admin/templates/registration/password_change_done.html:4
822 945
 #: contrib/admin/templates/registration/password_change_form.html:4
823 946
 #: contrib/admin/templates/registration/password_change_form.html:6
@@ -1018,11 +1141,11 @@ msgid ""
1018 1141
 "'http://'."
1019 1142
 msgstr ""
1020 1143
 
1021  
-#: contrib/redirects/models.py:12
  1144
+#: contrib/redirects/models.py:13
1022 1145
 msgid "redirect"
1023 1146
 msgstr ""
1024 1147
 
1025  
-#: contrib/redirects/models.py:13
  1148
+#: contrib/redirects/models.py:14
1026 1149
 msgid "redirects"
1027 1150
 msgstr ""
1028 1151
 
@@ -1049,8 +1172,8 @@ msgstr ""
1049 1172
 
1050 1173
 #: contrib/flatpages/models.py:13
1051 1174
 msgid ""
1052  
-"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
1053  
-"use 'flatpages/default'."
  1175
+"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
  1176
+"will use 'flatpages/default.html'."
1054 1177
 msgstr ""
1055 1178
 
1056 1179
 #: contrib/flatpages/models.py:14
@@ -1069,151 +1192,177 @@ msgstr ""
1069 1192
 msgid "flat pages"
1070 1193
 msgstr ""
1071 1194
 
1072  
-#: contrib/auth/models.py:13 contrib/auth/models.py:26
  1195
+#: contrib/auth/views.py:39
  1196
+msgid "Logged out"
  1197
+msgstr ""
  1198
+
  1199
+#: contrib/auth/models.py:38 contrib/auth/models.py:57
1073 1200
 msgid "name"
1074 1201
 msgstr ""
1075 1202
 
1076  
-#: contrib/auth/models.py:15
  1203
+#: contrib/auth/models.py:40
1077 1204
 msgid "codename"
1078 1205
 msgstr ""
1079 1206
 
1080  
-#: contrib/auth/models.py:17
  1207
+#: contrib/auth/models.py:42
1081 1208
 msgid "permission"
1082 1209
 msgstr ""
1083 1210
 
1084  
-#: contrib/auth/models.py:18 contrib/auth/models.py:27
  1211
+#: contrib/auth/models.py:43 contrib/auth/models.py:58
1085 1212
 msgid "permissions"
1086 1213
 msgstr ""
1087 1214
 
1088  
-#: contrib/auth/models.py:29
  1215
+#: contrib/auth/models.py:60
1089 1216
 msgid "group"
1090 1217
 msgstr ""
1091 1218
 
1092  
-#: contrib/auth/models.py:30 contrib/auth/models.py:65
  1219
+#: contrib/auth/models.py:61 contrib/auth/models.py:100
1093 1220
 msgid "groups"
1094 1221
 msgstr ""
1095 1222
 
1096  
-#: contrib/auth/models.py:55
  1223
+#: contrib/auth/models.py:90
1097 1224
 msgid "username"
1098 1225
 msgstr ""
1099 1226
 
1100  
-#: contrib/auth/models.py:56
  1227
+#: contrib/auth/models.py:90
  1228
+msgid ""
  1229
+"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
  1230
+"digits and underscores)."
  1231
+msgstr ""
  1232
+
  1233
+#: contrib/auth/models.py:91
1101 1234
 msgid "first name"
1102 1235
 msgstr ""
1103 1236
 
1104  
-#: contrib/auth/models.py:57
  1237
+#: contrib/auth/models.py:92
1105 1238
 msgid "last name"
1106 1239
 msgstr ""
1107 1240
 
1108  
-#: contrib/auth/models.py:58
  1241
+#: contrib/auth/models.py:93
1109 1242
 msgid "e-mail address"
1110 1243
 msgstr ""
1111 1244
 
1112  
-#: contrib/auth/models.py:59
  1245
+#: contrib/auth/models.py:94
1113 1246
 msgid "password"
1114 1247
 msgstr ""
1115 1248
 
1116  
-#: contrib/auth/models.py:59
  1249
+#: contrib/auth/models.py:94
1117 1250
 msgid "Use '[algo]$[salt]$[hexdigest]'"
1118 1251
 msgstr ""
1119 1252
 
1120  
-#: contrib/auth/models.py:60
  1253
+#: contrib/auth/models.py:95
1121 1254
 msgid "staff status"
1122 1255
 msgstr ""
1123 1256
 
1124  
-#: contrib/auth/models.py:60
  1257
+#: contrib/auth/models.py:95
1125 1258
 msgid "Designates whether the user can log into this admin site."
1126 1259
 msgstr ""
1127 1260
 
1128  
-#: contrib/auth/models.py:61
  1261
+#: contrib/auth/models.py:96
1129 1262
 msgid "active"
1130 1263
 msgstr ""
1131 1264
 
1132  
-#: contrib/auth/models.py:62
  1265
+#: contrib/auth/models.py:96
  1266
+msgid ""
  1267
+"Designates whether this user can log into the Django admin. Unselect this "
  1268
+"instead of deleting accounts."
  1269
+msgstr ""
  1270
+
  1271
+#: contrib/auth/models.py:97
1133 1272
 msgid "superuser status"
1134 1273
 msgstr ""
1135 1274
 
1136  
-#: contrib/auth/models.py:63
  1275
+#: contrib/auth/models.py:97
  1276
+msgid ""
  1277
+"Designates that this user has all permissions without explicitly assigning "
  1278
+"them."
  1279
+msgstr ""
  1280
+
  1281
+#: contrib/auth/models.py:98
1137 1282
 msgid "last login"
1138 1283
 msgstr ""
1139 1284
 
1140  
-#: contrib/auth/models.py:64
  1285
+#: contrib/auth/models.py:99
1141 1286
 msgid "date joined"
1142 1287
 msgstr ""
1143 1288
 
1144  
-#: contrib/auth/models.py:66
  1289
+#: contrib/auth/models.py:101
1145 1290
 msgid ""
1146 1291
 "In addition to the permissions manually assigned, this user will also get "
1147 1292
 "all permissions granted to each group he/she is in."
1148 1293
 msgstr ""
1149 1294
 
1150  
-#: contrib/auth/models.py:67
  1295
+#: contrib/auth/models.py:102
1151 1296
 msgid "user permissions"
1152 1297
 msgstr ""
1153 1298
 
1154  
-#: contrib/auth/models.py:70
  1299
+#: contrib/auth/models.py:105
1155 1300
 msgid "user"
1156 1301
 msgstr ""
1157 1302
 
1158  
-#: contrib/auth/models.py:71
  1303
+#: contrib/auth/models.py:106
1159 1304
 msgid "users"
1160 1305
 msgstr ""
1161 1306
 
1162  
-#: contrib/auth/models.py:76
  1307
+#: contrib/auth/models.py:111
1163 1308
 msgid "Personal info"
1164 1309
 msgstr ""
1165 1310
 
1166  
-#: contrib/auth/models.py:77
  1311
+#: contrib/auth/models.py:112
1167 1312
 msgid "Permissions"
1168 1313
 msgstr ""
1169 1314
 
1170  
-#: contrib/auth/models.py:78
  1315
+#: contrib/auth/models.py:113
1171 1316
 msgid "Important dates"
1172 1317
 msgstr ""
1173 1318
 
1174  
-#: contrib/auth/models.py:79
  1319
+#: contrib/auth/models.py:114
1175 1320
 msgid "Groups"
1176 1321
 msgstr ""
1177 1322
 
1178  
-#: contrib/auth/models.py:219
  1323
+#: contrib/auth/models.py:256
1179 1324
 msgid "message"
1180 1325
 msgstr ""
1181 1326
 
1182  
-#: contrib/auth/forms.py:30
  1327
+#: contrib/auth/forms.py:52
1183 1328
 msgid ""
1184 1329
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
1185 1330
 "required for logging in."
1186 1331
 msgstr ""
1187 1332
 
1188  
-#: contrib/contenttypes/models.py:25
  1333
+#: contrib/auth/forms.py:61
  1334
+msgid "This account is inactive."
  1335
+msgstr ""
  1336
+
  1337
+#: contrib/contenttypes/models.py:20
1189 1338
 msgid "python model class name"
1190 1339
 msgstr ""
1191 1340
 
1192  
-#: contrib/contenttypes/models.py:28
  1341
+#: contrib/contenttypes/models.py:23
1193 1342
 msgid "content type"
1194 1343
 msgstr ""
1195 1344
 
1196  
-#: contrib/contenttypes/models.py:29
  1345
+#: contrib/contenttypes/models.py:24
1197 1346
 msgid "content types"
1198 1347
 msgstr ""
1199 1348
 
1200  
-#: contrib/sessions/models.py:35
  1349
+#: contrib/sessions/models.py:51
1201 1350
 msgid "session key"
1202 1351
 msgstr ""
1203 1352
 
1204  
-#: contrib/sessions/models.py:36
  1353
+#: contrib/sessions/models.py:52
1205 1354
 msgid "session data"
1206 1355
 msgstr ""
1207 1356
 
1208  
-#: contrib/sessions/models.py:37
  1357
+#: contrib/sessions/models.py:53
1209 1358
 msgid "expire date"
1210 1359
 msgstr ""
1211 1360
 
1212  
-#: contrib/sessions/models.py:41
  1361
+#: contrib/sessions/models.py:57
1213 1362
 msgid "session"
1214 1363
 msgstr ""
1215 1364
 
1216  
-#: contrib/sessions/models.py:42
  1365
+#: contrib/sessions/models.py:58
1217 1366
 msgid "sessions"
1218 1367
 msgstr ""
1219 1368
 
@@ -1233,18 +1382,6 @@ msgstr ""
1233 1382
 msgid "sites"
1234 1383
 msgstr ""
1235 1384
 
1236  
-#: utils/translation.py:360
1237  
-msgid "DATE_FORMAT"
1238  
-msgstr "N j, Y"
1239  
-
1240  
-#: utils/translation.py:361
1241  
-msgid "DATETIME_FORMAT"
1242  
-msgstr "N j, Y, P"
1243  
-
1244  
-#: utils/translation.py:362
1245  
-msgid "TIME_FORMAT"
1246  
-msgstr "P"
1247  
-
1248 1385
 #: utils/dates.py:6
1249 1386
 msgid "Monday"
1250 1387
 msgstr ""
@@ -1433,275 +1570,332 @@ msgid_plural "minutes"
1433 1570
 msgstr[0] ""
1434 1571
 msgstr[1] ""
1435 1572
 
1436  
-#: conf/global_settings.py:37
  1573
+#: utils/translation/trans_real.py:362
  1574
+msgid "DATE_FORMAT"
  1575
+msgstr "N j, Y"
  1576
+
  1577
+#: utils/translation/trans_real.py:363
  1578
+msgid "DATETIME_FORMAT"
  1579
+msgstr "N j, Y, P"
  1580
+
  1581
+#: utils/translation/trans_real.py:364
  1582
+msgid "TIME_FORMAT"
  1583
+msgstr "P"
  1584
+
  1585
+#: utils/translation/trans_real.py:380
  1586
+msgid "YEAR_MONTH_FORMAT"
  1587
+msgstr "F Y"
  1588
+
  1589
+#: utils/translation/trans_real.py:381
  1590
+msgid "MONTH_DAY_FORMAT"
  1591
+msgstr "F j"
  1592
+
  1593
+#: conf/global_settings.py:39
  1594
+msgid "Arabic"
  1595
+msgstr ""
  1596
+
  1597
+#: conf/global_settings.py:40
1437 1598
 msgid "Bengali"
1438 1599
 msgstr ""
1439 1600
 
1440  
-#: conf/global_settings.py:38
  1601
+#: conf/global_settings.py:41
1441 1602
 msgid "Czech"
1442 1603
 msgstr ""
1443 1604
 
1444  
-#: conf/global_settings.py:39
  1605
+#: conf/global_settings.py:42
1445 1606
 msgid "Welsh"
1446 1607
 msgstr ""
1447 1608
 
1448  
-#: conf/global_settings.py:40
  1609
+#: conf/global_settings.py:43
1449 1610
 msgid "Danish"
1450 1611
 msgstr ""
1451 1612
 
1452  
-#: conf/global_settings.py:41
  1613
+#: conf/global_settings.py:44
1453 1614
 msgid "German"
1454 1615
 msgstr ""
1455 1616
 
1456  
-#: conf/global_settings.py:42
  1617
+#: conf/global_settings.py:45
1457 1618
 msgid "Greek"
1458 1619
 msgstr ""
1459 1620
 
1460  
-#: conf/global_settings.py:43
  1621
+#: conf/global_settings.py:46
1461 1622
 msgid "English"
1462 1623
 msgstr ""
1463 1624
 
1464  
-#: conf/global_settings.py:44
  1625
+#: conf/global_settings.py:47
1465 1626
 msgid "Spanish"
1466 1627
 msgstr ""
1467 1628
 
1468  
-#: conf/global_settings.py:45
  1629
+#: conf/global_settings.py:48
  1630
+msgid "Argentinean Spanish"
  1631
+msgstr ""
  1632
+
  1633
+#: conf/global_settings.py:49
  1634
+msgid "Finnish"
  1635
+msgstr ""
  1636
+
  1637
+#: conf/global_settings.py:50
1469 1638
 msgid "French"
1470 1639
 msgstr ""
1471 1640
 
1472  
-#: conf/global_settings.py:46
  1641
+#: conf/global_settings.py:51
1473 1642
 msgid "Galician"
1474 1643
 msgstr ""
1475 1644
 
1476  
-#: conf/global_settings.py:47
  1645
+#: conf/global_settings.py:52
1477 1646
 msgid "Hungarian"
1478 1647
 msgstr ""
1479 1648
 
1480  
-#: conf/global_settings.py:48
  1649
+#: conf/global_settings.py:53
1481 1650
 msgid "Hebrew"
1482 1651
 msgstr ""
1483 1652
 
1484  
-#: conf/global_settings.py:49
  1653
+#: conf/global_settings.py:54
1485 1654
 msgid "Icelandic"
1486 1655
 msgstr ""
1487 1656
 
1488  
-#: conf/global_settings.py:50
  1657
+#: conf/global_settings.py:55
1489 1658
 msgid "Italian"
1490 1659
 msgstr ""
1491 1660
 
1492  
-#: conf/global_settings.py:51
  1661
+#: conf/global_settings.py:56
1493 1662
 msgid "Japanese"
1494 1663
 msgstr ""
1495 1664
 
1496  
-#: conf/global_settings.py:52
  1665
+#: conf/global_settings.py:57
1497 1666
 msgid "Dutch"
1498 1667
 msgstr ""
1499 1668
 
1500  
-#: conf/global_settings.py:53
  1669
+#: conf/global_settings.py:58
1501 1670
 msgid "Norwegian"
1502 1671
 msgstr ""
1503 1672
 
1504  
-#: conf/global_settings.py:54
  1673
+#: conf/global_settings.py:59
1505 1674
 msgid "Brazilian"
1506 1675
 msgstr ""
1507 1676
 
1508  
-#: conf/global_settings.py:55
  1677
+#: conf/global_settings.py:60
1509 1678
 msgid "Romanian"
1510 1679
 msgstr ""
1511 1680
 
1512  
-#: conf/global_settings.py:56
  1681
+#: conf/global_settings.py:61
1513 1682
 msgid "Russian"
1514 1683
 msgstr ""
1515 1684
 
1516  
-#: conf/global_settings.py:57
  1685
+#: conf/global_settings.py:62
1517 1686
 msgid "Slovak"
1518 1687
 msgstr ""
1519 1688
 
1520  
-#: conf/global_settings.py:58
  1689
+#: conf/global_settings.py:63
1521 1690
 msgid "Slovenian"
1522 1691
 msgstr ""
1523 1692
 
1524  
-#: conf/global_settings.py:59
  1693
+#: conf/global_settings.py:64
1525 1694
 msgid "Serbian"
1526 1695
 msgstr ""
1527 1696
 
1528  
-#: conf/global_settings.py:60
  1697
+#: conf/global_settings.py:65
1529 1698
 msgid "Swedish"
1530 1699
 msgstr ""
1531 1700
 
1532  
-#: conf/global_settings.py:61
  1701
+#: conf/global_settings.py:66
  1702
+msgid "Tamil"
  1703
+msgstr ""
  1704
+
  1705
+#: conf/global_settings.py:67
  1706
+msgid "Turkish"
  1707
+msgstr ""
  1708
+
  1709
+#: conf/global_settings.py:68
1533 1710
 msgid "Ukrainian"
1534 1711
 msgstr ""
1535 1712
 
1536  
-#: conf/global_settings.py:62
  1713
+#: conf/global_settings.py:69
1537 1714
 msgid "Simplified Chinese"
1538 1715
 msgstr ""
1539 1716
 
1540  
-#: conf/global_settings.py:63
  1717
+#: conf/global_settings.py:70
1541 1718
 msgid "Traditional Chinese"
1542 1719
 msgstr ""
1543 1720
 
1544  
-#: core/validators.py:60
  1721
+#: core/validators.py:63
1545 1722
 msgid "This value must contain only letters, numbers and underscores."
1546 1723
 msgstr ""
1547 1724
 
1548  
-#: core/validators.py:64
  1725
+#: core/validators.py:67
1549 1726
 msgid ""
1550 1727
 "This value must contain only letters, numbers, underscores, dashes or "
1551 1728
 "slashes."
1552 1729
 msgstr ""
1553 1730
 
1554  
-#: core/validators.py:72
  1731
+#: core/validators.py:71
  1732
+msgid "This value must contain only letters, numbers, underscores or hyphens."
  1733
+msgstr ""
  1734
+
  1735
+#: core/validators.py:75
1555 1736
 msgid "Uppercase letters are not allowed here."
1556 1737
 msgstr ""
1557 1738
 
1558  
-#: core/validators.py:76
  1739
+#: core/validators.py:79
1559 1740
 msgid "Lowercase letters are not allowed here."
1560 1741
 msgstr ""
1561 1742
 
1562  
-#: core/validators.py:83
  1743
+#: core/validators.py:86
1563 1744
 msgid "Enter only digits separated by commas."
1564 1745
 msgstr ""
1565 1746
 
1566  
-#: core/validators.py:95
  1747
+#: core/validators.py:98