« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6138.3.6
- compare with another revision
- compare with revision 1185.65.19
- download diff
- download tarball
- view history from revision 6138.3.6
- Committer: Jonathan Riddell
- Date: 2011-09-16 09:18:49 UTC
- mfrom: (6138.2.8 i18n-gettext-strings)
- mto: This revision was merged to the branch mainline in revision 6143.
- Revision ID: jriddell@canonical.com-20110916091849-3pf4nzd4wzmnafub
merge in i18n-gettext-builtin.py-strings
added
removed
po/bzr.pot
8
8
msgstr ""
9
9
"Project-Id-Version: bzr\n"
10
10
"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
11
"POT-Creation-Date: 2011-09-14 12:41+0100\n"
11
"POT-Creation-Date: 2011-09-16 10:15+0100\n"
12
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
"Language-Team: LANGUAGE <LL@li.org>\n"
18
18
"Content-Transfer-Encoding: 8bit\n"
19
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
20
21
#: bzrlib/builtins.py:116 bzrlib/builtins.py:2756
21
#: bzrlib/builtins.py:116 bzrlib/builtins.py:2758
22
22
#, python-format
23
23
msgid "Ignoring files outside view. View is %s"
24
24
msgstr ""
151
151
msgid "bzr status --revision takes exactly one or two revision specifiers"
152
152
msgstr ""
153
153
154
#: bzrlib/builtins.py:336 bzrlib/builtins.py:4875
154
#: bzrlib/builtins.py:336 bzrlib/builtins.py:4877
155
155
msgid "You can only supply one of revision_id or --revision"
156
156
msgstr ""
157
157
158
#: bzrlib/builtins.py:339 bzrlib/builtins.py:4877
158
#: bzrlib/builtins.py:339 bzrlib/builtins.py:4879
159
159
msgid "You must supply either --revision or a revision_id"
160
160
msgstr ""
161
161
165
165
msgstr ""
166
166
167
167
#: bzrlib/builtins.py:357
168
#, python-format
169
msgid "The repository %s contains no revision %s."
168
msgid "The repository {0} contains no revision {1}."
170
169
msgstr ""
171
170
172
171
#: bzrlib/builtins.py:364
309
308
msgid "Lookup file ids from this tree."
310
309
msgstr ""
311
310
312
#: bzrlib/builtins.py:726
313
#, python-format
314
msgid "ignored %s matching \"%s\"\n"
311
#: bzrlib/builtins.py:727
312
msgid "ignored {0} matching \"{1}\"\n"
315
313
msgstr ""
316
314
317
#: bzrlib/builtins.py:731
315
#: bzrlib/builtins.py:732
318
316
msgid "Create a new versioned directory."
319
317
msgstr ""
320
318
321
#: bzrlib/builtins.py:733
319
#: bzrlib/builtins.py:734
322
320
msgid "This is equivalent to creating the directory and then adding it."
323
321
msgstr ""
324
322
325
#: bzrlib/builtins.py:747
323
#: bzrlib/builtins.py:748
326
324
#, python-format
327
325
msgid "added %s\n"
328
326
msgstr ""
329
327
330
#: bzrlib/builtins.py:791
328
#: bzrlib/builtins.py:792
331
329
#, python-format
332
330
msgid "invalid kind %r specified"
333
331
msgstr ""
334
332
335
#: bzrlib/builtins.py:828
333
#: bzrlib/builtins.py:829
336
334
msgid "Move or rename a file."
337
335
msgstr ""
338
336
339
#: bzrlib/builtins.py:830
337
#: bzrlib/builtins.py:831
340
338
msgid " bzr mv SOURCE... DESTINATION"
341
339
msgstr ""
342
340
343
#: bzrlib/builtins.py:832
341
#: bzrlib/builtins.py:833
344
342
msgid ""
345
343
"If the last argument is a versioned directory, all the other names\n"
346
344
"are moved into it. Otherwise, there must be exactly two arguments\n"
347
345
"and the file is changed to a new name."
348
346
msgstr ""
349
347
350
#: bzrlib/builtins.py:836
348
#: bzrlib/builtins.py:837
351
349
msgid ""
352
350
"If OLDNAME does not exist on the filesystem but is versioned and\n"
353
351
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
356
354
"The same is valid when moving many SOURCE files to a DESTINATION."
357
355
msgstr ""
358
356
359
#: bzrlib/builtins.py:842
357
#: bzrlib/builtins.py:843
360
358
msgid "Files cannot be moved between branches."
361
359
msgstr ""
362
360
363
361
# help of 'after' option of 'mv' command
364
#: bzrlib/builtins.py:849
362
#: bzrlib/builtins.py:850
365
363
msgid ""
366
364
"Move only the bzr identifier of the file, because the file has already been "
367
365
"moved."
368
366
msgstr ""
369
367
370
368
# help of 'auto' option of 'mv' command
371
#: bzrlib/builtins.py:851
369
#: bzrlib/builtins.py:852
372
370
msgid "Automatically guess renames."
373
371
msgstr ""
374
372
375
373
# help of 'dry-run' option of 'mv' command
376
#: bzrlib/builtins.py:852
374
#: bzrlib/builtins.py:853
377
375
msgid "Avoid making changes when guessing renames."
378
376
msgstr ""
379
377
380
#: bzrlib/builtins.py:861
378
#: bzrlib/builtins.py:862
381
379
msgid "--dry-run requires --auto."
382
380
msgstr ""
383
381
384
#: bzrlib/builtins.py:865
382
#: bzrlib/builtins.py:866
385
383
msgid "missing file argument"
386
384
msgstr ""
387
385
388
#: bzrlib/builtins.py:872
386
#: bzrlib/builtins.py:873
389
387
msgid "Only one path may be specified to --auto."
390
388
msgstr ""
391
389
392
#: bzrlib/builtins.py:875
390
#: bzrlib/builtins.py:876
393
391
msgid "--after cannot be specified with --auto."
394
392
msgstr ""
395
393
396
#: bzrlib/builtins.py:912
394
#: bzrlib/builtins.py:913
397
395
msgid "to mv multiple files the destination must be a versioned directory"
398
396
msgstr ""
399
397
400
#: bzrlib/builtins.py:964
398
#: bzrlib/builtins.py:965
401
399
msgid "Turn this branch into a mirror of another branch."
402
400
msgstr ""
403
401
404
#: bzrlib/builtins.py:966
402
#: bzrlib/builtins.py:967
405
403
msgid ""
406
404
"By default, this command only works on branches that have not diverged.\n"
407
405
"Branches are considered diverged if the destination branch's most recent \n"
409
407
"parent."
410
408
msgstr ""
411
409
412
#: bzrlib/builtins.py:971
410
#: bzrlib/builtins.py:972
413
411
msgid ""
414
412
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
415
413
"from one into the other. Once one branch has merged, the other should\n"
416
414
"be able to pull it again."
417
415
msgstr ""
418
416
419
#: bzrlib/builtins.py:975
417
#: bzrlib/builtins.py:976
420
418
msgid ""
421
419
"If you want to replace your local changes and just want your branch to\n"
422
420
"match the remote one, use pull --overwrite. This will work even if the two\n"
423
421
"branches have diverged."
424
422
msgstr ""
425
423
426
#: bzrlib/builtins.py:979
424
#: bzrlib/builtins.py:980
427
425
msgid ""
428
426
"If there is no default location set, the first pull will set it (use\n"
429
427
"--no-remember to avoid setting it). After that, you can omit the\n"
431
429
"value will only be saved if the remote location can be accessed."
432
430
msgstr ""
433
431
434
#: bzrlib/builtins.py:984
432
#: bzrlib/builtins.py:985
435
433
msgid ""
436
434
"Note: The location can be specified either in the form of a branch,\n"
437
435
"or in the form of a path to a file containing a merge directive generated\n"
439
437
msgstr ""
440
438
441
439
# help of 'verbose' option of 'pull' command
442
#: bzrlib/builtins.py:992
440
#: bzrlib/builtins.py:993
443
441
msgid "Show logs of pulled revisions."
444
442
msgstr ""
445
443
446
444
# help of 'directory' option of 'pull' command
447
#: bzrlib/builtins.py:994
445
#: bzrlib/builtins.py:995
448
446
msgid ""
449
447
"Branch to pull into, rather than the one containing the working directory."
450
448
msgstr ""
451
449
452
450
# help of 'local' option of 'pull' command
453
#: bzrlib/builtins.py:997
451
#: bzrlib/builtins.py:998
454
452
msgid ""
455
453
"Perform a local pull in a bound branch. Local pulls are not applied to the "
456
454
"master branch."
457
455
msgstr ""
458
456
459
#: bzrlib/builtins.py:1026
457
#: bzrlib/builtins.py:1027
460
458
msgid "Need working tree for --show-base."
461
459
msgstr ""
462
460
463
#: bzrlib/builtins.py:1042
461
#: bzrlib/builtins.py:1043
464
462
msgid "No pull location known or specified."
465
463
msgstr ""
466
464
467
#: bzrlib/builtins.py:1048
465
#: bzrlib/builtins.py:1049
468
466
#, python-format
469
467
msgid "Using saved parent location: %s\n"
470
468
msgstr ""
471
469
472
#: bzrlib/builtins.py:1055 bzrlib/builtins.py:4107
470
#: bzrlib/builtins.py:1056 bzrlib/builtins.py:4109
473
471
msgid "Cannot use -r with merge directives or bundles"
474
472
msgstr ""
475
473
476
#: bzrlib/builtins.py:1096
474
#: bzrlib/builtins.py:1097
477
475
msgid "Update a mirror of this branch."
478
476
msgstr ""
479
477
480
#: bzrlib/builtins.py:1098
478
#: bzrlib/builtins.py:1099
481
479
msgid ""
482
480
"The target branch will not have its working tree populated because this\n"
483
481
"is both expensive, and is not supported on remote file systems."
484
482
msgstr ""
485
483
486
#: bzrlib/builtins.py:1101
484
#: bzrlib/builtins.py:1102
487
485
msgid ""
488
486
"Some smart servers or protocols *may* put the working tree in place in\n"
489
487
"the future."
490
488
msgstr ""
491
489
492
#: bzrlib/builtins.py:1104
490
#: bzrlib/builtins.py:1105
493
491
msgid ""
494
492
"This command only works on branches that have not diverged. Branches are\n"
495
493
"considered diverged if the destination branch's most recent commit is one\n"
496
494
"that has not been merged (directly or indirectly) by the source branch."
497
495
msgstr ""
498
496
499
#: bzrlib/builtins.py:1108
497
#: bzrlib/builtins.py:1109
500
498
msgid ""
501
499
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
502
500
"the other branch completely, discarding its unmerged changes."
503
501
msgstr ""
504
502
505
#: bzrlib/builtins.py:1111
503
#: bzrlib/builtins.py:1112
506
504
msgid ""
507
505
"If you want to ensure you have the different changes in the other branch,\n"
508
506
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
509
507
"After that you will be able to do a push without '--overwrite'."
510
508
msgstr ""
511
509
512
#: bzrlib/builtins.py:1115
510
#: bzrlib/builtins.py:1116
513
511
msgid ""
514
512
"If there is no default push location set, the first push will set it (use\n"
515
513
"--no-remember to avoid setting it). After that, you can omit the\n"
518
516
msgstr ""
519
517
520
518
# help of 'directory' option of 'push' command
521
#: bzrlib/builtins.py:1127
519
#: bzrlib/builtins.py:1128
522
520
msgid ""
523
521
"Branch to push from, rather than the one containing the working directory."
524
522
msgstr ""
525
523
526
524
# help of 'use-existing-dir' option of 'push' command
527
#: bzrlib/builtins.py:1130
525
#: bzrlib/builtins.py:1131
528
526
msgid ""
529
527
"By default push will fail if the target directory exists, but does not "
530
528
"already have a control directory. This flag will allow push to proceed."
531
529
msgstr ""
532
530
533
531
# help of 'stacked' option of 'push' command
534
#: bzrlib/builtins.py:1135
532
#: bzrlib/builtins.py:1136
535
533
msgid ""
536
534
"Create a stacked branch that references the public location of the parent "
537
535
"branch."
538
536
msgstr ""
539
537
540
538
# help of 'stacked-on' option of 'push' command
541
#: bzrlib/builtins.py:1138
539
#: bzrlib/builtins.py:1139
542
540
msgid ""
543
541
"Create a stacked branch that refers to another branch for the commit "
544
542
"history. Only the work not present in the referenced branch is included in "
546
544
msgstr ""
547
545
548
546
# help of 'strict' option of 'push' command
549
#: bzrlib/builtins.py:1143
547
#: bzrlib/builtins.py:1144
550
548
msgid ""
551
549
"Refuse to push if there are uncommitted changes in the working tree, --no-"
552
550
"strict disables the check."
553
551
msgstr ""
554
552
555
553
# help of 'no-tree' option of 'push' command
556
#: bzrlib/builtins.py:1146
554
#: bzrlib/builtins.py:1147
557
555
msgid "Don't populate the working tree, even for protocols that support it."
558
556
msgstr ""
559
557
560
#: bzrlib/builtins.py:1190
558
#: bzrlib/builtins.py:1191
561
559
msgid "Could not determine branch to refer to."
562
560
msgstr ""
563
561
564
#: bzrlib/builtins.py:1197
562
#: bzrlib/builtins.py:1198
565
563
msgid "No push location known or specified."
566
564
msgstr ""
567
565
568
#: bzrlib/builtins.py:1201
566
#: bzrlib/builtins.py:1202
569
567
#, python-format
570
568
msgid "Using saved push location: %s"
571
569
msgstr ""
572
570
573
#: bzrlib/builtins.py:1211
571
#: bzrlib/builtins.py:1212
574
572
msgid "Create a new branch that is a copy of an existing branch."
575
573
msgstr ""
576
574
577
#: bzrlib/builtins.py:1213
575
#: bzrlib/builtins.py:1214
578
576
msgid ""
579
577
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
580
578
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
585
583
"create ./foo-bar."
586
584
msgstr ""
587
585
588
#: bzrlib/builtins.py:1220
586
#: bzrlib/builtins.py:1221
589
587
msgid ""
590
588
"To retrieve the branch as of a particular revision, supply the --revision\n"
591
589
"parameter, as in \"branch foo/bar -r 5\"."
592
590
msgstr ""
593
591
594
#: bzrlib/builtins.py:1223
592
#: bzrlib/builtins.py:1224
595
593
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
596
594
msgstr ""
597
595
598
596
# help of 'no-tree' option of 'branch' command
599
#: bzrlib/builtins.py:1233
597
#: bzrlib/builtins.py:1234
600
598
msgid "Create a branch without a working-tree."
601
599
msgstr ""
602
600
603
601
# help of 'switch' option of 'branch' command
604
#: bzrlib/builtins.py:1235
602
#: bzrlib/builtins.py:1236
605
603
msgid "Switch the checkout in the current directory to the new branch."
606
604
msgstr ""
607
605
608
606
# help of 'stacked' option of 'branch' command
609
#: bzrlib/builtins.py:1238
607
#: bzrlib/builtins.py:1239
610
608
msgid ""
611
609
"Create a stacked branch referring to the source branch. The new branch will "
612
610
"depend on the availability of the source branch for all operations."
613
611
msgstr ""
614
612
615
613
# help of 'standalone' option of 'branch' command
616
#: bzrlib/builtins.py:1242
614
#: bzrlib/builtins.py:1243
617
615
msgid "Do not use a shared repository, even if available."
618
616
msgstr ""
619
617
620
618
# help of 'use-existing-dir' option of 'branch' command
621
#: bzrlib/builtins.py:1244
619
#: bzrlib/builtins.py:1245
622
620
msgid ""
623
621
"By default branch will fail if the target directory exists, but does not "
624
622
"already have a control directory. This flag will allow branch to proceed."
625
623
msgstr ""
626
624
627
625
# help of 'bind' option of 'branch' command
628
#: bzrlib/builtins.py:1249
626
#: bzrlib/builtins.py:1250
629
627
msgid "Bind new branch to from location."
630
628
msgstr ""
631
629
632
#: bzrlib/builtins.py:1290
630
#: bzrlib/builtins.py:1291
633
631
#, python-format
634
632
msgid "Target directory \"%s\" already exists."
635
633
msgstr ""
636
634
637
#: bzrlib/builtins.py:1300
635
#: bzrlib/builtins.py:1301
638
636
#, python-format
639
637
msgid "Parent of \"%s\" does not exist."
640
638
msgstr ""
641
639
642
#: bzrlib/builtins.py:1314
643
#, python-format
644
msgid "The branch %s has no revision %s."
640
#: bzrlib/builtins.py:1315
641
msgid "The branch {0} has no revision {1}."
645
642
msgstr ""
646
643
647
#: bzrlib/builtins.py:1322
644
#: bzrlib/builtins.py:1323
648
645
#, python-format
649
646
msgid "Created new stacked branch referring to %s."
650
647
msgstr ""
651
648
652
#: bzrlib/builtins.py:1326
649
#: bzrlib/builtins.py:1327
653
650
#, python-format
654
651
msgid "Branched %d revision(s)."
655
652
msgstr ""
656
653
657
#: bzrlib/builtins.py:1331
654
#: bzrlib/builtins.py:1332
658
655
#, python-format
659
656
msgid "New branch bound to %s"
660
657
msgstr ""
661
658
662
#: bzrlib/builtins.py:1336 bzrlib/builtins.py:5916
659
#: bzrlib/builtins.py:1337 bzrlib/builtins.py:5918
663
660
#, python-format
664
661
msgid "Switched to branch: %s"
665
662
msgstr ""
666
663
667
#: bzrlib/builtins.py:1341
664
#: bzrlib/builtins.py:1342
668
665
msgid "List the branches available at the current location."
669
666
msgstr ""
670
667
671
#: bzrlib/builtins.py:1343
668
#: bzrlib/builtins.py:1344
672
669
msgid ""
673
670
"This command will print the names of all the branches at the current "
674
671
"location."
675
672
msgstr ""
676
673
677
#: bzrlib/builtins.py:1352
674
#: bzrlib/builtins.py:1353
678
675
msgid " (default)\n"
679
676
msgstr ""
680
677
681
#: bzrlib/builtins.py:1358
678
#: bzrlib/builtins.py:1359
682
679
msgid "Create a new checkout of an existing branch."
683
680
msgstr ""
684
681
685
#: bzrlib/builtins.py:1360
682
#: bzrlib/builtins.py:1361
686
683
msgid ""
687
684
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
688
685
"for\n"
692
689
"location using SFTP."
693
690
msgstr ""
694
691
695
#: bzrlib/builtins.py:1365
692
#: bzrlib/builtins.py:1366
696
693
msgid ""
697
694
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
698
695
"will\n"
704
701
"create ./foo-bar."
705
702
msgstr ""
706
703
707
#: bzrlib/builtins.py:1372
704
#: bzrlib/builtins.py:1373
708
705
msgid ""
709
706
"To retrieve the branch as of a particular revision, supply the --revision\n"
710
707
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
715
712
msgstr ""
716
713
717
714
# help of 'lightweight' option of 'checkout' command
718
#: bzrlib/builtins.py:1382
715
#: bzrlib/builtins.py:1383
719
716
msgid ""
720
717
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
721
718
"the branch for every operation. Normal checkouts can perform common "
724
721
msgstr ""
725
722
726
723
# help of 'files-from' option of 'branch' command
727
#: bzrlib/builtins.py:1389
724
#: bzrlib/builtins.py:1390
728
725
msgid "Get file contents from this tree."
729
726
msgstr ""
730
727
731
728
# help of 'hardlink' option of 'branch' command
732
#: bzrlib/builtins.py:1391
729
#: bzrlib/builtins.py:1392
733
730
msgid "Hard-link working tree files where possible."
734
731
msgstr ""
735
732
736
#: bzrlib/builtins.py:1432
733
#: bzrlib/builtins.py:1433
737
734
msgid ""
738
735
"Show list of renamed files.\n"
739
736
" "
740
737
msgstr ""
741
738
742
#: bzrlib/builtins.py:1462
739
#: bzrlib/builtins.py:1463
743
740
msgid "Update a tree to have the latest code committed to its branch."
744
741
msgstr ""
745
742
746
#: bzrlib/builtins.py:1464
743
#: bzrlib/builtins.py:1465
747
744
msgid ""
748
745
"This will perform a merge into the working tree, and may generate\n"
749
746
"conflicts. If you have any local changes, you will still\n"
750
747
"need to commit them after the update for the update to be complete."
751
748
msgstr ""
752
749
753
#: bzrlib/builtins.py:1468
750
#: bzrlib/builtins.py:1469
754
751
msgid ""
755
752
"If you want to discard your local changes, you can just do a\n"
756
753
"'bzr revert' instead of 'bzr commit' after the update."
757
754
msgstr ""
758
755
759
#: bzrlib/builtins.py:1471
756
#: bzrlib/builtins.py:1472
760
757
msgid ""
761
758
"If you want to restore a file that has been removed locally, use\n"
762
759
"'bzr revert' instead of 'bzr update'."
763
760
msgstr ""
764
761
765
#: bzrlib/builtins.py:1474
762
#: bzrlib/builtins.py:1475
766
763
msgid ""
767
764
"If the tree's branch is bound to a master branch, it will also update\n"
768
765
"the branch from the master."
769
766
msgstr ""
770
767
771
#: bzrlib/builtins.py:1489
768
#: bzrlib/builtins.py:1490
772
769
msgid "bzr update --revision takes exactly one revision"
773
770
msgstr ""
774
771
775
#: bzrlib/builtins.py:1520
776
#, python-format
777
msgid "Tree is up to date at revision %s of branch %s"
772
#: bzrlib/builtins.py:1521
773
msgid "Tree is up to date at revision {0} of branch {1}"
778
774
msgstr ""
779
775
780
#: bzrlib/builtins.py:1536
776
#: bzrlib/builtins.py:1537
781
777
#, python-format
782
778
msgid ""
783
779
"branch has no revision %s\n"
784
780
"bzr update --revision only works for a revision in the branch history"
785
781
msgstr ""
786
782
787
#: bzrlib/builtins.py:1542
788
#, python-format
789
msgid "Updated to revision %s of branch %s"
783
#: bzrlib/builtins.py:1543
784
msgid "Updated to revision {0} of branch {1}"
790
785
msgstr ""
791
786
792
#: bzrlib/builtins.py:1546
787
#: bzrlib/builtins.py:1547
793
788
msgid ""
794
789
"Your local commits will now show as pending merges with 'bzr status', and "
795
790
"can be committed with 'bzr commit'."
796
791
msgstr ""
797
792
798
#: bzrlib/builtins.py:1555
793
#: bzrlib/builtins.py:1556
799
794
msgid "Show information about a working tree, branch or repository."
800
795
msgstr ""
801
796
802
#: bzrlib/builtins.py:1557
797
#: bzrlib/builtins.py:1558
803
798
msgid ""
804
799
"This command will show all known locations and formats associated to the\n"
805
800
"tree, branch or repository."
806
801
msgstr ""
807
802
808
#: bzrlib/builtins.py:1560
803
#: bzrlib/builtins.py:1561
809
804
msgid ""
810
805
"In verbose mode, statistical information is included with each report.\n"
811
806
"To see extended statistic information, use a verbosity level of 2 or\n"
812
807
"higher by specifying the verbose option multiple times, e.g. -vv."
813
808
msgstr ""
814
809
815
#: bzrlib/builtins.py:1564
810
#: bzrlib/builtins.py:1565
816
811
msgid "Branches and working trees will also report any missing revisions."
817
812
msgstr ""
818
813
819
#: bzrlib/builtins.py:1568
814
#: bzrlib/builtins.py:1569
820
815
msgid " Display information on the format and related locations:"
821
816
msgstr ""
822
817
823
#: bzrlib/builtins.py:1570
818
#: bzrlib/builtins.py:1571
824
819
msgid " bzr info"
825
820
msgstr ""
826
821
827
#: bzrlib/builtins.py:1572
822
#: bzrlib/builtins.py:1573
828
823
msgid ""
829
824
" Display the above together with extended format information and\n"
830
825
" basic statistics (like the number of files in the working tree and\n"
831
826
" number of revisions in the branch and repository):"
832
827
msgstr ""
833
828
834
#: bzrlib/builtins.py:1576
829
#: bzrlib/builtins.py:1577
835
830
msgid " bzr info -v"
836
831
msgstr ""
837
832
838
#: bzrlib/builtins.py:1578
833
#: bzrlib/builtins.py:1579
839
834
msgid " Display the above together with number of committers to the branch:"
840
835
msgstr ""
841
836
842
#: bzrlib/builtins.py:1580
837
#: bzrlib/builtins.py:1581
843
838
msgid " bzr info -vv"
844
839
msgstr ""
845
840
846
#: bzrlib/builtins.py:1599
841
#: bzrlib/builtins.py:1600
847
842
msgid "Remove files or directories."
848
843
msgstr ""
849
844
850
#: bzrlib/builtins.py:1601
845
#: bzrlib/builtins.py:1602
851
846
msgid ""
852
847
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
853
848
"delete them if they can easily be recovered using revert otherwise they\n"
857
852
msgstr ""
858
853
859
854
# help of 'new' option of 'remove' command
860
#: bzrlib/builtins.py:1609
855
#: bzrlib/builtins.py:1610
861
856
msgid "Only remove files that have never been committed."
862
857
msgstr ""
863
858
864
859
# help of 'file-deletion-strategy' option of 'remove' command
865
#: bzrlib/builtins.py:1611
860
#: bzrlib/builtins.py:1612
866
861
msgid "The file deletion mode to be used."
867
862
msgstr ""
868
863
869
864
# title of 'file-deletion-strategy' option of 'remove' command
870
#: bzrlib/builtins.py:1612
865
#: bzrlib/builtins.py:1613
871
866
msgid "Deletion Strategy"
872
867
msgstr ""
873
868
874
#: bzrlib/builtins.py:1625
869
#: bzrlib/builtins.py:1626
875
870
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
876
871
msgstr ""
877
872
878
#: bzrlib/builtins.py:1642
873
#: bzrlib/builtins.py:1643
879
874
msgid "No matching files."
880
875
msgstr ""
881
876
882
#: bzrlib/builtins.py:1703
877
#: bzrlib/builtins.py:1704
883
878
msgid "Reconcile bzr metadata in a branch."
884
879
msgstr ""
885
880
886
#: bzrlib/builtins.py:1705
881
#: bzrlib/builtins.py:1706
887
882
msgid ""
888
883
"This can correct data mismatches that may have been caused by\n"
889
884
"previous ghost operations or bzr upgrades. You should only\n"
891
886
"advises you to run it."
892
887
msgstr ""
893
888
894
#: bzrlib/builtins.py:1710
889
#: bzrlib/builtins.py:1711
895
890
msgid ""
896
891
"If a second branch is provided, cross-branch reconciliation is\n"
897
892
"also attempted, which will check that data like the tree root\n"
899
894
"correctly in both branches."
900
895
msgstr ""
901
896
902
#: bzrlib/builtins.py:1715
897
#: bzrlib/builtins.py:1716
903
898
msgid ""
904
899
"At the same time it is run it may recompress data resulting in\n"
905
900
"a potential saving in disk space or performance gain."
906
901
msgstr ""
907
902
908
#: bzrlib/builtins.py:1718
903
#: bzrlib/builtins.py:1719
909
904
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
910
905
msgstr ""
911
906
912
#: bzrlib/builtins.py:1782
907
#: bzrlib/builtins.py:1783
913
908
msgid "Make a directory into a versioned branch."
914
909
msgstr ""
915
910
916
#: bzrlib/builtins.py:1784
911
#: bzrlib/builtins.py:1785
917
912
msgid ""
918
913
"Use this to create an empty branch, or before importing an\n"
919
914
"existing project."
920
915
msgstr ""
921
916
922
#: bzrlib/builtins.py:1787
917
#: bzrlib/builtins.py:1788
923
918
msgid ""
924
919
"If there is a repository in a parent directory of the location, then\n"
925
920
"the history of the branch will be stored in the repository. Otherwise\n"
927
922
"in the .bzr directory."
928
923
msgstr ""
929
924
930
#: bzrlib/builtins.py:1792
925
#: bzrlib/builtins.py:1793
931
926
msgid ""
932
927
"If there is already a branch at the location but it has no working tree,\n"
933
928
"the tree can be populated with 'bzr checkout'."
934
929
msgstr ""
935
930
936
#: bzrlib/builtins.py:1795
931
#: bzrlib/builtins.py:1796
937
932
msgid "Recipe for importing a tree of files::"
938
933
msgstr ""
939
934
940
#: bzrlib/builtins.py:1797
935
#: bzrlib/builtins.py:1798
941
936
msgid ""
942
937
" cd ~/project\n"
943
938
" bzr init\n"
947
942
msgstr ""
948
943
949
944
# help of 'create-prefix' option of 'init' command
950
#: bzrlib/builtins.py:1808
945
#: bzrlib/builtins.py:1809
951
946
msgid "Create the path leading up to the branch if it does not already exist."
952
947
msgstr ""
953
948
954
949
# help of 'format' option of 'init' command
955
#: bzrlib/builtins.py:1811
950
#: bzrlib/builtins.py:1812
956
951
msgid "Specify a format for this branch. See \"help formats\"."
957
952
msgstr ""
958
953
959
954
# help of 'append-revisions-only' option of 'init' command
960
#: bzrlib/builtins.py:1819
955
#: bzrlib/builtins.py:1820
961
956
msgid "Never change revnos or the existing log. Append revisions to it only."
962
957
msgstr ""
963
958
964
959
# help of 'no-tree' option of 'init' command
965
#: bzrlib/builtins.py:1822
960
#: bzrlib/builtins.py:1823
966
961
msgid "Create a branch without a working tree."
967
962
msgstr ""
968
963
969
#: bzrlib/builtins.py:1842
964
#: bzrlib/builtins.py:1843
970
965
#, python-format
971
966
msgid ""
972
967
"Parent directory of %s does not exist.\n"
973
968
"You may supply --create-prefix to create all leading parent directories."
974
969
msgstr ""
975
970
976
#: bzrlib/builtins.py:1876
971
#: bzrlib/builtins.py:1877
977
972
msgid ""
978
973
"This branch format cannot be set to append-revisions-only. Try --default."
979
974
msgstr ""
980
975
981
#: bzrlib/builtins.py:1887
982
#, python-format
983
msgid "Created a %s (format: %s)\n"
976
#: bzrlib/builtins.py:1888
977
msgid "Created a {0} (format: {1})\n"
984
978
msgstr ""
985
979
986
#: bzrlib/builtins.py:1895
980
#: bzrlib/builtins.py:1897
987
981
#, python-format
988
982
msgid "Using shared repository: %s\n"
989
983
msgstr ""
990
984
991
#: bzrlib/builtins.py:1899
985
#: bzrlib/builtins.py:1901
992
986
msgid "Create a shared repository for branches to share storage space."
993
987
msgstr ""
994
988
995
#: bzrlib/builtins.py:1901
989
#: bzrlib/builtins.py:1903
996
990
msgid ""
997
991
"New branches created under the repository directory will store their\n"
998
992
"revisions in the repository, not in the branch directory. For branches\n"
1000
994
"speeds up the creation of new branches."
1001
995
msgstr ""
1002
996
1003
#: bzrlib/builtins.py:1906
997
#: bzrlib/builtins.py:1908
1004
998
msgid ""
1005
999
"If the --no-trees option is given then the branches in the repository\n"
1006
1000
"will not have working trees by default. They will still exist as \n"
1010
1004
"branches, such as on a server."
1011
1005
msgstr ""
1012
1006
1013
#: bzrlib/builtins.py:1913
1007
#: bzrlib/builtins.py:1915
1014
1008
msgid ""
1015
1009
":Examples:\n"
1016
1010
" Create a shared repository holding just branches::"
1017
1011
msgstr ""
1018
1012
1019
#: bzrlib/builtins.py:1916
1013
#: bzrlib/builtins.py:1918
1020
1014
msgid ""
1021
1015
" bzr init-repo --no-trees repo\n"
1022
1016
" bzr init repo/trunk"
1023
1017
msgstr ""
1024
1018
1025
#: bzrlib/builtins.py:1919
1019
#: bzrlib/builtins.py:1921
1026
1020
msgid " Make a lightweight checkout elsewhere::"
1027
1021
msgstr ""
1028
1022
1029
#: bzrlib/builtins.py:1921
1023
#: bzrlib/builtins.py:1923
1030
1024
msgid ""
1031
1025
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1032
1026
" cd trunk-checkout\n"
1034
1028
msgstr ""
1035
1029
1036
1030
# help of 'format' option of 'init-repository' command
1037
#: bzrlib/builtins.py:1929
1031
#: bzrlib/builtins.py:1931
1038
1032
msgid ""
1039
1033
"Specify a format for this repository. See \"bzr help formats\" for details."
1040
1034
msgstr ""
1041
1035
1042
1036
# title of 'format' option of 'init-repository' command
1043
#: bzrlib/builtins.py:1933
1037
#: bzrlib/builtins.py:1935
1044
1038
msgid "Repository format"
1045
1039
msgstr ""
1046
1040
1047
1041
# help of 'no-trees' option of 'init-repository' command
1048
#: bzrlib/builtins.py:1935
1042
#: bzrlib/builtins.py:1937
1049
1043
msgid "Branches in the repository will default to not having a working tree."
1050
1044
msgstr ""
1051
1045
1052
#: bzrlib/builtins.py:1959
1046
#: bzrlib/builtins.py:1961
1053
1047
msgid "Show differences in the working tree, between revisions or branches."
1054
1048
msgstr ""
1055
1049
1056
#: bzrlib/builtins.py:1961
1050
#: bzrlib/builtins.py:1963
1057
1051
msgid ""
1058
1052
"If no arguments are given, all changes for the current tree are listed.\n"
1059
1053
"If files are given, only the changes in those files are listed.\n"
1063
1057
"given."
1064
1058
msgstr ""
1065
1059
1066
#: bzrlib/builtins.py:1968
1060
#: bzrlib/builtins.py:1970
1067
1061
msgid ""
1068
1062
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1069
1063
"produces patches suitable for \"patch -p1\"."
1070
1064
msgstr ""
1071
1065
1072
#: bzrlib/builtins.py:1971
1066
#: bzrlib/builtins.py:1973
1073
1067
msgid ""
1074
1068
"Note that when using the -r argument with a range of revisions, the\n"
1075
1069
"differences are computed between the two specified revisions. That\n"
1079
1073
"in the range."
1080
1074
msgstr ""
1081
1075
1082
#: bzrlib/builtins.py:1978
1076
#: bzrlib/builtins.py:1980
1083
1077
msgid ""
1084
1078
":Exit values:\n"
1085
1079
" 1 - changed\n"
1088
1082
" 0 - no change"
1089
1083
msgstr ""
1090
1084
1091
#: bzrlib/builtins.py:1984
1085
#: bzrlib/builtins.py:1986
1092
1086
msgid ""
1093
1087
":Examples:\n"
1094
1088
" Shows the difference in the working tree versus the last commit::"
1095
1089
msgstr ""
1096
1090
1097
#: bzrlib/builtins.py:1987
1091
#: bzrlib/builtins.py:1989
1098
1092
msgid " bzr diff"
1099
1093
msgstr ""
1100
1094
1101
#: bzrlib/builtins.py:1989
1095
#: bzrlib/builtins.py:1991
1102
1096
msgid " Difference between the working tree and revision 1::"
1103
1097
msgstr ""
1104
1098
1105
#: bzrlib/builtins.py:1991
1099
#: bzrlib/builtins.py:1993
1106
1100
msgid " bzr diff -r1"
1107
1101
msgstr ""
1108
1102
1109
#: bzrlib/builtins.py:1993
1103
#: bzrlib/builtins.py:1995
1110
1104
msgid " Difference between revision 3 and revision 1::"
1111
1105
msgstr ""
1112
1106
1113
#: bzrlib/builtins.py:1995
1107
#: bzrlib/builtins.py:1997
1114
1108
msgid " bzr diff -r1..3"
1115
1109
msgstr ""
1116
1110
1117
#: bzrlib/builtins.py:1997
1111
#: bzrlib/builtins.py:1999
1118
1112
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1119
1113
msgstr ""
1120
1114
1121
#: bzrlib/builtins.py:1999
1115
#: bzrlib/builtins.py:2001
1122
1116
msgid " bzr diff -r1..3 xxx"
1123
1117
msgstr ""
1124
1118
1125
#: bzrlib/builtins.py:2001
1119
#: bzrlib/builtins.py:2003
1126
1120
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1127
1121
msgstr ""
1128
1122
1129
#: bzrlib/builtins.py:2003
1123
#: bzrlib/builtins.py:2005
1130
1124
msgid " bzr diff -c2"
1131
1125
msgstr ""
1132
1126
1133
#: bzrlib/builtins.py:2005
1127
#: bzrlib/builtins.py:2007
1134
1128
msgid ""
1135
1129
" To see the changes introduced by revision X::\n"
1136
1130
" \n"
1137
1131
" bzr diff -cX"
1138
1132
msgstr ""
1139
1133
1140
#: bzrlib/builtins.py:2009
1134
#: bzrlib/builtins.py:2011
1141
1135
msgid ""
1142
1136
" Note that in the case of a merge, the -c option shows the changes\n"
1143
1137
" compared to the left hand parent. To see the changes against\n"
1144
1138
" another parent, use::"
1145
1139
msgstr ""
1146
1140
1147
#: bzrlib/builtins.py:2013
1141
#: bzrlib/builtins.py:2015
1148
1142
msgid " bzr diff -r<chosen_parent>..X"
1149
1143
msgstr ""
1150
1144
1151
#: bzrlib/builtins.py:2015
1145
#: bzrlib/builtins.py:2017
1152
1146
msgid ""
1153
1147
" The changes between the current revision and the previous revision\n"
1154
1148
" (equivalent to -c-1 and -r-2..-1)"
1155
1149
msgstr ""
1156
1150
1157
#: bzrlib/builtins.py:2018
1151
#: bzrlib/builtins.py:2020
1158
1152
msgid " bzr diff -r-2.."
1159
1153
msgstr ""
1160
1154
1161
#: bzrlib/builtins.py:2020
1155
#: bzrlib/builtins.py:2022
1162
1156
msgid " Show just the differences for file NEWS::"
1163
1157
msgstr ""
1164
1158
1165
#: bzrlib/builtins.py:2022
1159
#: bzrlib/builtins.py:2024
1166
1160
msgid " bzr diff NEWS"
1167
1161
msgstr ""
1168
1162
1169
#: bzrlib/builtins.py:2024
1163
#: bzrlib/builtins.py:2026
1170
1164
msgid " Show the differences in working tree xxx for file NEWS::"
1171
1165
msgstr ""
1172
1166
1173
#: bzrlib/builtins.py:2026
1167
#: bzrlib/builtins.py:2028
1174
1168
msgid " bzr diff xxx/NEWS"
1175
1169
msgstr ""
1176
1170
1177
#: bzrlib/builtins.py:2028
1171
#: bzrlib/builtins.py:2030
1178
1172
msgid " Show the differences from branch xxx to this working tree:"
1179
1173
msgstr ""
1180
1174
1181
#: bzrlib/builtins.py:2030
1175
#: bzrlib/builtins.py:2032
1182
1176
msgid " bzr diff --old xxx"
1183
1177
msgstr ""
1184
1178
1185
#: bzrlib/builtins.py:2032
1179
#: bzrlib/builtins.py:2034
1186
1180
msgid " Show the differences between two branches for file NEWS::"
1187
1181
msgstr ""
1188
1182
1189
#: bzrlib/builtins.py:2034
1183
#: bzrlib/builtins.py:2036
1190
1184
msgid " bzr diff --old xxx --new yyy NEWS"
1191
1185
msgstr ""
1192
1186
1193
#: bzrlib/builtins.py:2036
1187
#: bzrlib/builtins.py:2038
1194
1188
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1195
1189
msgstr ""
1196
1190
1197
#: bzrlib/builtins.py:2038
1191
#: bzrlib/builtins.py:2040
1198
1192
msgid ""
1199
1193
" bzr diff --prefix old/:new/\n"
1200
1194
" \n"
1204
1198
msgstr ""
1205
1199
1206
1200
# help of 'diff-options' option of 'diff' command
1207
#: bzrlib/builtins.py:2048
1201
#: bzrlib/builtins.py:2050
1208
1202
msgid "Pass these options to the external diff program."
1209
1203
msgstr ""
1210
1204
1211
1205
# help of 'prefix' option of 'diff' command
1212
#: bzrlib/builtins.py:2051
1206
#: bzrlib/builtins.py:2053
1213
1207
msgid ""
1214
1208
"Set prefixes added to old and new filenames, as two values separated by a "
1215
1209
"colon. (eg \"old/:new/\")."
1216
1210
msgstr ""
1217
1211
1218
1212
# help of 'old' option of 'diff' command
1219
#: bzrlib/builtins.py:2054
1213
#: bzrlib/builtins.py:2056
1220
1214
msgid "Branch/tree to compare from."
1221
1215
msgstr ""
1222
1216
1223
1217
# help of 'new' option of 'diff' command
1224
#: bzrlib/builtins.py:2058
1218
#: bzrlib/builtins.py:2060
1225
1219
msgid "Branch/tree to compare to."
1226
1220
msgstr ""
1227
1221
1228
1222
# help of 'using' option of 'diff' command
1229
#: bzrlib/builtins.py:2064
1223
#: bzrlib/builtins.py:2066
1230
1224
msgid "Use this command to compare files."
1231
1225
msgstr ""
1232
1226
1233
1227
# help of 'format' option of 'diff' command
1234
#: bzrlib/builtins.py:2069
1228
#: bzrlib/builtins.py:2071
1235
1229
msgid "Diff format to use."
1236
1230
msgstr ""
1237
1231
1238
1232
# title of 'format' option of 'diff' command
1239
#: bzrlib/builtins.py:2071
1233
#: bzrlib/builtins.py:2073
1240
1234
msgid "Diff format"
1241
1235
msgstr ""
1242
1236
1243
#: bzrlib/builtins.py:2093
1237
#: bzrlib/builtins.py:2095
1244
1238
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1245
1239
msgstr ""
1246
1240
1247
#: bzrlib/builtins.py:2097
1241
#: bzrlib/builtins.py:2099
1248
1242
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1249
1243
msgstr ""
1250
1244
1251
#: bzrlib/builtins.py:2101
1245
#: bzrlib/builtins.py:2103
1252
1246
msgid "--using and --format are mutually exclusive."
1253
1247
msgstr ""
1254
1248
1255
#: bzrlib/builtins.py:2121
1249
#: bzrlib/builtins.py:2123
1256
1250
msgid ""
1257
1251
"List files deleted in the working tree.\n"
1258
1252
" "
1259
1253
msgstr ""
1260
1254
1261
#: bzrlib/builtins.py:2199
1255
#: bzrlib/builtins.py:2201
1262
1256
msgid "Show the tree root directory."
1263
1257
msgstr ""
1264
1258
1265
#: bzrlib/builtins.py:2201
1259
#: bzrlib/builtins.py:2203
1266
1260
msgid ""
1267
1261
"The root is the nearest enclosing directory with a .bzr control\n"
1268
1262
"directory."
1269
1263
msgstr ""
1270
1264
1271
#: bzrlib/builtins.py:2216
1265
#: bzrlib/builtins.py:2218
1272
1266
msgid "The limit argument must be an integer."
1273
1267
msgstr ""
1274
1268
1275
#: bzrlib/builtins.py:2224
1269
#: bzrlib/builtins.py:2226
1276
1270
msgid "The levels argument must be an integer."
1277
1271
msgstr ""
1278
1272
1279
#: bzrlib/builtins.py:2229
1273
#: bzrlib/builtins.py:2231
1280
1274
msgid "Show historical log for a branch or subset of a branch."
1281
1275
msgstr ""
1282
1276
1283
#: bzrlib/builtins.py:2231
1277
#: bzrlib/builtins.py:2233
1284
1278
msgid ""
1285
1279
"log is bzr's default tool for exploring the history of a branch.\n"
1286
1280
"The branch to use is taken from the first parameter. If no parameters\n"
1288
1282
"Here are some simple examples::"
1289
1283
msgstr ""
1290
1284
1291
#: bzrlib/builtins.py:2236
1285
#: bzrlib/builtins.py:2238
1292
1286
msgid ""
1293
1287
" bzr log log the current branch\n"
1294
1288
" bzr log foo.py log a file in its branch\n"
1295
1289
" bzr log http://server/branch log a branch on a server"
1296
1290
msgstr ""
1297
1291
1298
#: bzrlib/builtins.py:2240
1292
#: bzrlib/builtins.py:2242
1299
1293
msgid ""
1300
1294
"The filtering, ordering and information shown for each revision can\n"
1301
1295
"be controlled as explained below. By default, all revisions are\n"
1305
1299
"were merged."
1306
1300
msgstr ""
1307
1301
1308
#: bzrlib/builtins.py:2247
1302
#: bzrlib/builtins.py:2249
1309
1303
msgid ":Output control:"
1310
1304
msgstr ""
1311
1305
1312
#: bzrlib/builtins.py:2249
1306
#: bzrlib/builtins.py:2251
1313
1307
msgid ""
1314
1308
" The log format controls how information about each revision is\n"
1315
1309
" displayed. The standard log formats are called ``long``, ``short``\n"
1317
1311
" for more details on log formats."
1318
1312
msgstr ""
1319
1313
1320
#: bzrlib/builtins.py:2254
1314
#: bzrlib/builtins.py:2256
1321
1315
msgid ""
1322
1316
" The following options can be used to control what information is\n"
1323
1317
" displayed::"
1324
1318
msgstr ""
1325
1319
1326
#: bzrlib/builtins.py:2257
1320
#: bzrlib/builtins.py:2259
1327
1321
msgid ""
1328
1322
" -l N display a maximum of N revisions\n"
1329
1323
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1332
1326
" --show-ids display revision-ids (and file-ids), not just revnos"
1333
1327
msgstr ""
1334
1328
1335
#: bzrlib/builtins.py:2263
1329
#: bzrlib/builtins.py:2265
1336
1330
msgid ""
1337
1331
" Note that the default number of levels to display is a function of the\n"
1338
1332
" log format. If the -n option is not used, the standard log formats show\n"
1339
1333
" just the top level (mainline)."
1340
1334
msgstr ""
1341
1335
1342
#: bzrlib/builtins.py:2267
1336
#: bzrlib/builtins.py:2269
1343
1337
msgid ""
1344
1338
" Status summaries are shown using status flags like A, M, etc. To see\n"
1345
1339
" the changes explained using words like ``added`` and ``modified``\n"
1346
1340
" instead, use the -vv option."
1347
1341
msgstr ""
1348
1342
1349
#: bzrlib/builtins.py:2271
1343
#: bzrlib/builtins.py:2273
1350
1344
msgid ":Ordering control:"
1351
1345
msgstr ""
1352
1346
1353
#: bzrlib/builtins.py:2273
1347
#: bzrlib/builtins.py:2275
1354
1348
msgid ""
1355
1349
" To display revisions from oldest to newest, use the --forward option.\n"
1356
1350
" In most cases, using this option will have little impact on the total\n"
1358
1352
" display revisions like --reverse does when it can."
1359
1353
msgstr ""
1360
1354
1361
#: bzrlib/builtins.py:2278
1355
#: bzrlib/builtins.py:2280
1362
1356
msgid ":Revision filtering:"
1363
1357
msgstr ""
1364
1358
1365
#: bzrlib/builtins.py:2280
1359
#: bzrlib/builtins.py:2282
1366
1360
msgid ""
1367
1361
" The -r option can be used to specify what revision or range of revisions\n"
1368
1362
" to filter against. The various forms are shown below::"
1369
1363
msgstr ""
1370
1364
1371
#: bzrlib/builtins.py:2283
1365
#: bzrlib/builtins.py:2285
1372
1366
msgid ""
1373
1367
" -rX display revision X\n"
1374
1368
" -rX.. display revision X and later\n"
1376
1370
" -rX..Y display from X to Y inclusive"
1377
1371
msgstr ""
1378
1372
1379
#: bzrlib/builtins.py:2288
1373
#: bzrlib/builtins.py:2290
1380
1374
msgid ""
1381
1375
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1382
1376
" Some common examples are given below::"
1383
1377
msgstr ""
1384
1378
1385
#: bzrlib/builtins.py:2291
1379
#: bzrlib/builtins.py:2293
1386
1380
msgid ""
1387
1381
" -r-1 show just the tip\n"
1388
1382
" -r-10.. show the last 10 mainline revisions\n"
1392
1386
" -rdate:yesterday.. show changes since yesterday"
1393
1387
msgstr ""
1394
1388
1395
#: bzrlib/builtins.py:2298
1389
#: bzrlib/builtins.py:2300
1396
1390
msgid ""
1397
1391
" When logging a range of revisions using -rX..Y, log starts at\n"
1398
1392
" revision Y and searches back in history through the primary\n"
1402
1396
" a nested merge revision and the log will be truncated accordingly."
1403
1397
msgstr ""
1404
1398
1405
#: bzrlib/builtins.py:2305
1399
#: bzrlib/builtins.py:2307
1406
1400
msgid ":Path filtering:"
1407
1401
msgstr ""
1408
1402
1409
#: bzrlib/builtins.py:2307
1403
#: bzrlib/builtins.py:2309
1410
1404
msgid ""
1411
1405
" If parameters are given and the first one is not a branch, the log\n"
1412
1406
" will be filtered to show only those revisions that changed the\n"
1413
1407
" nominated files or directories."
1414
1408
msgstr ""
1415
1409
1416
#: bzrlib/builtins.py:2311
1410
#: bzrlib/builtins.py:2313
1417
1411
msgid ""
1418
1412
" Filenames are interpreted within their historical context. To log a\n"
1419
1413
" deleted file, specify a revision range so that the file existed at\n"
1420
1414
" the end or start of the range."
1421
1415
msgstr ""
1422
1416
1423
#: bzrlib/builtins.py:2315
1417
#: bzrlib/builtins.py:2317
1424
1418
msgid ""
1425
1419
" Historical context is also important when interpreting pathnames of\n"
1426
1420
" renamed files/directories. Consider the following example:"
1427
1421
msgstr ""
1428
1422
1429
#: bzrlib/builtins.py:2318
1423
#: bzrlib/builtins.py:2320
1430
1424
msgid ""
1431
1425
" * revision 1: add tutorial.txt\n"
1432
1426
" * revision 2: modify tutorial.txt\n"
1433
1427
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1434
1428
msgstr ""
1435
1429
1436
#: bzrlib/builtins.py:2322
1430
#: bzrlib/builtins.py:2324
1437
1431
msgid " In this case:"
1438
1432
msgstr ""
1439
1433
1440
#: bzrlib/builtins.py:2324
1434
#: bzrlib/builtins.py:2326
1441
1435
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1442
1436
msgstr ""
1443
1437
1444
#: bzrlib/builtins.py:2326
1438
#: bzrlib/builtins.py:2328
1445
1439
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1446
1440
msgstr ""
1447
1441
1448
#: bzrlib/builtins.py:2328
1442
#: bzrlib/builtins.py:2330
1449
1443
msgid ""
1450
1444
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1451
1445
" the original file in revision 2."
1452
1446
msgstr ""
1453
1447
1454
#: bzrlib/builtins.py:2331
1448
#: bzrlib/builtins.py:2333
1455
1449
msgid ""
1456
1450
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1457
1451
" was no file called guide.txt in revision 2."
1458
1452
msgstr ""
1459
1453
1460
#: bzrlib/builtins.py:2334
1454
#: bzrlib/builtins.py:2336
1461
1455
msgid ""
1462
1456
" Renames are always followed by log. By design, there is no need to\n"
1463
1457
" explicitly ask for this (and no way to stop logging a file back\n"
1464
1458
" until it was last renamed)."
1465
1459
msgstr ""
1466
1460
1467
#: bzrlib/builtins.py:2338
1461
#: bzrlib/builtins.py:2340
1468
1462
msgid ":Other filtering:"
1469
1463
msgstr ""
1470
1464
1471
#: bzrlib/builtins.py:2340
1465
#: bzrlib/builtins.py:2342
1472
1466
msgid ""
1473
1467
" The --match option can be used for finding revisions that match a\n"
1474
1468
" regular expression in a commit message, committer, author or bug.\n"
1477
1471
" --match-message can be used to only match a specific field."
1478
1472
msgstr ""
1479
1473
1480
#: bzrlib/builtins.py:2346
1474
#: bzrlib/builtins.py:2348
1481
1475
msgid ":Tips & tricks:"
1482
1476
msgstr ""
1483
1477
1484
#: bzrlib/builtins.py:2348
1478
#: bzrlib/builtins.py:2350
1485
1479
msgid ""
1486
1480
" GUI tools and IDEs are often better at exploring history than command\n"
1487
1481
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1490
1484
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1491
1485
msgstr ""
1492
1486
1493
#: bzrlib/builtins.py:2354
1487
#: bzrlib/builtins.py:2356
1494
1488
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1495
1489
msgstr ""
1496
1490
1497
#: bzrlib/builtins.py:2356
1491
#: bzrlib/builtins.py:2358
1498
1492
msgid ""
1499
1493
" [ALIASES]\n"
1500
1494
" tip = log -r-1\n"
1502
1496
" show = log -v -p"
1503
1497
msgstr ""
1504
1498
1505
#: bzrlib/builtins.py:2361
1499
#: bzrlib/builtins.py:2363
1506
1500
msgid ""
1507
1501
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1508
1502
" will show the last 10 mainline revisions. To see the details of a\n"
1509
1503
" particular revision X, ``bzr show -rX``."
1510
1504
msgstr ""
1511
1505
1512
#: bzrlib/builtins.py:2365
1506
#: bzrlib/builtins.py:2367
1513
1507
msgid ""
1514
1508
" If you are interested in looking deeper into a particular merge X,\n"
1515
1509
" use ``bzr log -n0 -rX``."
1516
1510
msgstr ""
1517
1511
1518
#: bzrlib/builtins.py:2368
1512
#: bzrlib/builtins.py:2370
1519
1513
msgid ""
1520
1514
" ``bzr log -v`` on a branch with lots of history is currently\n"
1521
1515
" very slow. A fix for this issue is currently under development.\n"
1523
1517
" be given when using the -v option."
1524
1518
msgstr ""
1525
1519
1526
#: bzrlib/builtins.py:2373
1520
#: bzrlib/builtins.py:2375
1527
1521
msgid ""
1528
1522
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1529
1523
" used to find revisions matching user names, commit messages, etc.\n"
1531
1525
" a list of words but not others."
1532
1526
msgstr ""
1533
1527
1534
#: bzrlib/builtins.py:2378
1528
#: bzrlib/builtins.py:2380
1535
1529
msgid ""
1536
1530
" When exploring non-mainline history on large projects with deep\n"
1537
1531
" history, the performance of log can be greatly improved by installing\n"
1540
1534
msgstr ""
1541
1535
1542
1536
# help of 'forward' option of 'log' command
1543
#: bzrlib/builtins.py:2387
1537
#: bzrlib/builtins.py:2389
1544
1538
msgid "Show from oldest to newest."
1545
1539
msgstr ""
1546
1540
1547
1541
# help of 'verbose' option of 'log' command
1548
#: bzrlib/builtins.py:2390
1542
#: bzrlib/builtins.py:2392
1549
1543
msgid "Show files changed in each revision."
1550
1544
msgstr ""
1551
1545
1552
1546
# help of 'change' option of 'log' command
1553
#: bzrlib/builtins.py:2396
1547
#: bzrlib/builtins.py:2398
1554
1548
msgid "Show just the specified revision. See also \"help revisionspec\"."
1555
1549
msgstr ""
1556
1550
1557
1551
# help of 'authors' option of 'log' command
1558
#: bzrlib/builtins.py:2400
1552
#: bzrlib/builtins.py:2402
1559
1553
msgid "What names to list as authors - first, all or committer."
1560
1554
msgstr ""
1561
1555
1562
1556
# title of 'authors' option of 'log' command
1563
#: bzrlib/builtins.py:2401
1557
#: bzrlib/builtins.py:2403
1564
1558
msgid "Authors"
1565
1559
msgstr ""
1566
1560
1567
1561
# help of 'levels' option of 'log' command
1568
#: bzrlib/builtins.py:2406
1562
#: bzrlib/builtins.py:2408
1569
1563
msgid "Number of levels to display - 0 for all, 1 for flat."
1570
1564
msgstr ""
1571
1565
1572
1566
# help of 'limit' option of 'log' command
1573
#: bzrlib/builtins.py:2416
1567
#: bzrlib/builtins.py:2418
1574
1568
msgid "Limit the output to the first N revisions."
1575
1569
msgstr ""
1576
1570
1577
1571
# help of 'show-diff' option of 'log' command
1578
#: bzrlib/builtins.py:2421
1572
#: bzrlib/builtins.py:2423
1579
1573
msgid "Show changes made in each revision as a patch."
1580
1574
msgstr ""
1581
1575
1582
1576
# help of 'include-merges' option of 'log' command
1583
#: bzrlib/builtins.py:2423
1577
#: bzrlib/builtins.py:2425
1584
1578
msgid "Show merged revisions like --levels 0 does."
1585
1579
msgstr ""
1586
1580
1587
1581
# help of 'exclude-common-ancestry' option of 'log' command
1588
#: bzrlib/builtins.py:2425
1582
#: bzrlib/builtins.py:2427
1589
1583
msgid ""
1590
1584
"Display only the revisions that are not part of both ancestries (require -"
1591
1585
"rX..Y)"
1592
1586
msgstr ""
1593
1587
1594
1588
# help of 'signatures' option of 'log' command
1595
#: bzrlib/builtins.py:2429
1589
#: bzrlib/builtins.py:2431
1596
1590
msgid "Show digital signature validity"
1597
1591
msgstr ""
1598
1592
1599
1593
# help of 'match' option of 'log' command
1600
#: bzrlib/builtins.py:2432
1594
#: bzrlib/builtins.py:2434
1601
1595
msgid "Show revisions whose properties match this expression."
1602
1596
msgstr ""
1603
1597
1604
1598
# help of 'match-message' option of 'log' command
1605
#: bzrlib/builtins.py:2436
1599
#: bzrlib/builtins.py:2438
1606
1600
msgid "Show revisions whose message matches this expression."
1607
1601
msgstr ""
1608
1602
1609
1603
# help of 'match-committer' option of 'log' command
1610
#: bzrlib/builtins.py:2440
1604
#: bzrlib/builtins.py:2442
1611
1605
msgid "Show revisions whose committer matches this expression."
1612
1606
msgstr ""
1613
1607
1614
1608
# help of 'match-author' option of 'log' command
1615
#: bzrlib/builtins.py:2444
1609
#: bzrlib/builtins.py:2446
1616
1610
msgid "Show revisions whose authors match this expression."
1617
1611
msgstr ""
1618
1612
1619
1613
# help of 'match-bugs' option of 'log' command
1620
#: bzrlib/builtins.py:2448
1614
#: bzrlib/builtins.py:2450
1621
1615
msgid "Show revisions whose bugs match this expression."
1622
1616
msgstr ""
1623
1617
1624
#: bzrlib/builtins.py:2485
1618
#: bzrlib/builtins.py:2487
1625
1619
msgid "--exclude-common-ancestry requires -r with two revisions"
1626
1620
msgstr ""
1627
1621
1628
#: bzrlib/builtins.py:2491
1622
#: bzrlib/builtins.py:2493
1629
1623
msgid "--levels and --include-merges are mutually exclusive"
1630
1624
msgstr ""
1631
1625
1632
#: bzrlib/builtins.py:2498
1626
#: bzrlib/builtins.py:2500
1633
1627
msgid "--revision and --change are mutually exclusive"
1634
1628
msgstr ""
1635
1629
1636
#: bzrlib/builtins.py:2511
1630
#: bzrlib/builtins.py:2513
1637
1631
#, python-format
1638
1632
msgid "Path unknown at end or start of revision range: %s"
1639
1633
msgstr ""
1640
1634
1641
#: bzrlib/builtins.py:2628
1635
#: bzrlib/builtins.py:2630
1642
1636
#, python-format
1643
1637
msgid "bzr %s doesn't accept two revisions in different branches."
1644
1638
msgstr ""
1645
1639
1646
#: bzrlib/builtins.py:2644
1640
#: bzrlib/builtins.py:2646
1647
1641
#, python-format
1648
1642
msgid "bzr %s --revision takes one or two values."
1649
1643
msgstr ""
1650
1644
1651
#: bzrlib/builtins.py:2689
1645
#: bzrlib/builtins.py:2691
1652
1646
msgid ""
1653
1647
"List files in a tree.\n"
1654
1648
" "
1655
1649
msgstr ""
1656
1650
1657
1651
# help of 'recursive' option of 'ls' command
1658
#: bzrlib/builtins.py:2698
1652
#: bzrlib/builtins.py:2700
1659
1653
msgid "Recurse into subdirectories."
1660
1654
msgstr ""
1661
1655
1662
1656
# help of 'from-root' option of 'ls' command
1663
#: bzrlib/builtins.py:2700
1657
#: bzrlib/builtins.py:2702
1664
1658
msgid "Print paths relative to the root of the branch."
1665
1659
msgstr ""
1666
1660
1667
1661
# help of 'unknown' option of 'ls' command
1668
#: bzrlib/builtins.py:2702
1662
#: bzrlib/builtins.py:2704
1669
1663
msgid "Print unknown files."
1670
1664
msgstr ""
1671
1665
1672
1666
# help of 'versioned' option of 'ls' command
1673
#: bzrlib/builtins.py:2703
1667
#: bzrlib/builtins.py:2705
1674
1668
msgid "Print versioned files."
1675
1669
msgstr ""
1676
1670
1677
1671
# help of 'ignored' option of 'ls' command
1678
#: bzrlib/builtins.py:2706
1672
#: bzrlib/builtins.py:2708
1679
1673
msgid "Print ignored files."
1680
1674
msgstr ""
1681
1675
1682
1676
# help of 'kind' option of 'ls' command
1683
#: bzrlib/builtins.py:2708
1677
#: bzrlib/builtins.py:2710
1684
1678
msgid "List entries of a particular kind: file, directory, symlink."
1685
1679
msgstr ""
1686
1680
1687
#: bzrlib/builtins.py:2721
1681
#: bzrlib/builtins.py:2723
1688
1682
msgid "invalid kind specified"
1689
1683
msgstr ""
1690
1684
1691
#: bzrlib/builtins.py:2724
1685
#: bzrlib/builtins.py:2726
1692
1686
msgid "Cannot set both --verbose and --null"
1693
1687
msgstr ""
1694
1688
1695
#: bzrlib/builtins.py:2733
1689
#: bzrlib/builtins.py:2735
1696
1690
msgid "cannot specify both --from-root and PATH"
1697
1691
msgstr ""
1698
1692
1699
#: bzrlib/builtins.py:2820
1693
#: bzrlib/builtins.py:2822
1700
1694
msgid "Ignore specified files or patterns."
1701
1695
msgstr ""
1702
1696
1703
#: bzrlib/builtins.py:2822
1697
#: bzrlib/builtins.py:2824
1704
1698
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1705
1699
msgstr ""
1706
1700
1707
#: bzrlib/builtins.py:2824
1701
#: bzrlib/builtins.py:2826
1708
1702
msgid ""
1709
1703
"If a .bzrignore file does not exist, the ignore command\n"
1710
1704
"will create one and add the specified files or patterns to the newly\n"
1713
1707
"the use of the ignore command will require an explicit add command."
1714
1708
msgstr ""
1715
1709
1716
#: bzrlib/builtins.py:2830
1710
#: bzrlib/builtins.py:2832
1717
1711
msgid ""
1718
1712
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1719
1713
"After adding, editing or deleting that file either indirectly by\n"
1721
1715
"it."
1722
1716
msgstr ""
1723
1717
1724
#: bzrlib/builtins.py:2835
1718
#: bzrlib/builtins.py:2837
1725
1719
msgid ""
1726
1720
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1727
1721
"the global ignore file can be found in the application data directory as\n"
1730
1724
"can be edited directly using an editor."
1731
1725
msgstr ""
1732
1726
1733
#: bzrlib/builtins.py:2841
1727
#: bzrlib/builtins.py:2843
1734
1728
msgid ""
1735
1729
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1736
1730
"precedence over regular ignores. Such exceptions are used to specify\n"
1737
1731
"files that should be versioned which would otherwise be ignored."
1738
1732
msgstr ""
1739
1733
1740
#: bzrlib/builtins.py:2845
1734
#: bzrlib/builtins.py:2847
1741
1735
msgid ""
1742
1736
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1743
1737
"precedence over the '!' exception patterns."
1744
1738
msgstr ""
1745
1739
1746
#: bzrlib/builtins.py:2848
1740
#: bzrlib/builtins.py:2850
1747
1741
msgid ""
1748
1742
":Notes: \n"
1749
1743
" \n"
1751
1745
" the shell on Unix."
1752
1746
msgstr ""
1753
1747
1754
#: bzrlib/builtins.py:2853
1748
#: bzrlib/builtins.py:2855
1755
1749
msgid ""
1756
1750
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1757
1751
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1758
1752
msgstr ""
1759
1753
1760
#: bzrlib/builtins.py:2856
1754
#: bzrlib/builtins.py:2858
1761
1755
msgid ""
1762
1756
":Examples:\n"
1763
1757
" Ignore the top level Makefile::"
1764
1758
msgstr ""
1765
1759
1766
#: bzrlib/builtins.py:2859
1760
#: bzrlib/builtins.py:2861
1767
1761
msgid " bzr ignore ./Makefile"
1768
1762
msgstr ""
1769
1763
1770
#: bzrlib/builtins.py:2861
1764
#: bzrlib/builtins.py:2863
1771
1765
msgid " Ignore .class files in all directories...::"
1772
1766
msgstr ""
1773
1767
1774
#: bzrlib/builtins.py:2863
1768
#: bzrlib/builtins.py:2865
1775
1769
msgid " bzr ignore \"*.class\""
1776
1770
msgstr ""
1777
1771
1778
#: bzrlib/builtins.py:2865
1772
#: bzrlib/builtins.py:2867
1779
1773
msgid " ...but do not ignore \"special.class\"::"
1780
1774
msgstr ""
1781
1775
1782
#: bzrlib/builtins.py:2867
1776
#: bzrlib/builtins.py:2869
1783
1777
msgid " bzr ignore \"!special.class\""
1784
1778
msgstr ""
1785
1779
1786
#: bzrlib/builtins.py:2869
1780
#: bzrlib/builtins.py:2871
1787
1781
msgid " Ignore files whose name begins with the \"#\" character::"
1788
1782
msgstr ""
1789
1783
1790
#: bzrlib/builtins.py:2871
1784
#: bzrlib/builtins.py:2873
1791
1785
msgid " bzr ignore \"RE:^#\""
1792
1786
msgstr ""
1793
1787
1794
#: bzrlib/builtins.py:2873
1788
#: bzrlib/builtins.py:2875
1795
1789
msgid " Ignore .o files under the lib directory::"
1796
1790
msgstr ""
1797
1791
1798
#: bzrlib/builtins.py:2875
1792
#: bzrlib/builtins.py:2877
1799
1793
msgid " bzr ignore \"lib/**/*.o\""
1800
1794
msgstr ""
1801
1795
1802
#: bzrlib/builtins.py:2879
1796
#: bzrlib/builtins.py:2881
1803
1797
msgid " bzr ignore \"RE:lib/.*\\.o\""
1804
1798
msgstr ""
1805
1799
1806
#: bzrlib/builtins.py:2881
1800
#: bzrlib/builtins.py:2883
1807
1801
msgid " Ignore everything but the \"debian\" toplevel directory::"
1808
1802
msgstr ""
1809
1803
1810
#: bzrlib/builtins.py:2883
1804
#: bzrlib/builtins.py:2885
1811
1805
msgid ""
1812
1806
" bzr ignore \"RE:(?!debian/).*\"\n"
1813
1807
" \n"
1820
1814
msgstr ""
1821
1815
1822
1816
# help of 'default-rules' option of 'ignore' command
1823
#: bzrlib/builtins.py:2897
1817
#: bzrlib/builtins.py:2899
1824
1818
msgid "Display the default ignore rules that bzr uses."
1825
1819
msgstr ""
1826
1820
1827
#: bzrlib/builtins.py:2909
1821
#: bzrlib/builtins.py:2911
1828
1822
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1829
1823
msgstr ""
1830
1824
1831
#: bzrlib/builtins.py:2925
1825
#: bzrlib/builtins.py:2927
1832
1826
msgid "NAME_PATTERN should not be an absolute path"
1833
1827
msgstr ""
1834
1828
1835
#: bzrlib/builtins.py:2938
1829
#: bzrlib/builtins.py:2940
1836
1830
#, python-format
1837
1831
msgid ""
1838
1832
"Warning: the following files are version controlled and match your ignore "
1842
1836
"them.\n"
1843
1837
msgstr ""
1844
1838
1845
#: bzrlib/builtins.py:2945
1839
#: bzrlib/builtins.py:2947
1846
1840
msgid "List ignored files and the patterns that matched them."
1847
1841
msgstr ""
1848
1842
1849
#: bzrlib/builtins.py:2947
1843
#: bzrlib/builtins.py:2949
1850
1844
msgid ""
1851
1845
"List all the ignored files and the ignore pattern that caused the file to\n"
1852
1846
"be ignored."
1853
1847
msgstr ""
1854
1848
1855
#: bzrlib/builtins.py:2950
1849
#: bzrlib/builtins.py:2952
1856
1850
msgid "Alternatively, to list just the files::"
1857
1851
msgstr ""
1858
1852
1859
#: bzrlib/builtins.py:2952
1853
#: bzrlib/builtins.py:2954
1860
1854
msgid " bzr ls --ignored"
1861
1855
msgstr ""
1862
1856
1863
#: bzrlib/builtins.py:2986
1857
#: bzrlib/builtins.py:2988
1864
1858
#, python-format
1865
1859
msgid "not a valid revision-number: %r"
1866
1860
msgstr ""
1867
1861
1868
#: bzrlib/builtins.py:2993
1862
#: bzrlib/builtins.py:2995
1869
1863
msgid "Export current or past revision to a destination directory or archive."
1870
1864
msgstr ""
1871
1865
1872
#: bzrlib/builtins.py:2995
1866
#: bzrlib/builtins.py:2997
1873
1867
msgid "If no revision is specified this exports the last committed revision."
1874
1868
msgstr ""
1875
1869
1876
#: bzrlib/builtins.py:2997
1870
#: bzrlib/builtins.py:2999
1877
1871
msgid ""
1878
1872
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1879
1873
"given, try to find the format with the extension. If no extension\n"
1880
1874
"is found exports to a directory (equivalent to --format=dir)."
1881
1875
msgstr ""
1882
1876
1883
#: bzrlib/builtins.py:3001
1877
#: bzrlib/builtins.py:3003
1884
1878
msgid ""
1885
1879
"If root is supplied, it will be used as the root directory inside\n"
1886
1880
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1887
1881
"to the exported filename. The root option has no effect for 'dir' format."
1888
1882
msgstr ""
1889
1883
1890
#: bzrlib/builtins.py:3005
1884
#: bzrlib/builtins.py:3007
1891
1885
msgid ""
1892
1886
"If branch is omitted then the branch containing the current working\n"
1893
1887
"directory will be used."
1894
1888
msgstr ""
1895
1889
1896
#: bzrlib/builtins.py:3008
1890
#: bzrlib/builtins.py:3010
1897
1891
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
1898
1892
msgstr ""
1899
1893
1900
#: bzrlib/builtins.py:3010
1894
#: bzrlib/builtins.py:3012
1901
1895
msgid ""
1902
1896
" ================= =========================\n"
1903
1897
" Supported formats Autodetected by extension\n"
1911
1905
msgstr ""
1912
1906
1913
1907
# help of 'format' option of 'export' command
1914
#: bzrlib/builtins.py:3024
1908
#: bzrlib/builtins.py:3026
1915
1909
msgid "Type of file to export to."
1916
1910
msgstr ""
1917
1911
1918
1912
# help of 'filters' option of 'export' command
1919
#: bzrlib/builtins.py:3027
1913
#: bzrlib/builtins.py:3029
1920
1914
msgid "Apply content filters to export the convenient form."
1921
1915
msgstr ""
1922
1916
1923
1917
# help of 'root' option of 'export' command
1924
#: bzrlib/builtins.py:3031
1918
#: bzrlib/builtins.py:3033
1925
1919
msgid "Name of the root directory inside the exported file."
1926
1920
msgstr ""
1927
1921
1928
1922
# help of 'per-file-timestamps' option of 'export' command
1929
#: bzrlib/builtins.py:3033
1923
#: bzrlib/builtins.py:3035
1930
1924
msgid ""
1931
1925
"Set modification time of files to that of the last revision in which it was "
1932
1926
"changed."
1933
1927
msgstr ""
1934
1928
1935
#: bzrlib/builtins.py:3057
1929
#: bzrlib/builtins.py:3059
1936
1930
msgid "Write the contents of a file as of a given revision to standard output."
1937
1931
msgstr ""
1938
1932
1939
#: bzrlib/builtins.py:3059
1933
#: bzrlib/builtins.py:3061
1940
1934
msgid "If no revision is nominated, the last revision is used."
1941
1935
msgstr ""
1942
1936
1943
#: bzrlib/builtins.py:3061
1937
#: bzrlib/builtins.py:3063
1944
1938
msgid ""
1945
1939
"Note: Take care to redirect standard output when using this command on a\n"
1946
1940
"binary file."
1947
1941
msgstr ""
1948
1942
1949
1943
# help of 'filters' option of 'cat' command
1950
#: bzrlib/builtins.py:3068
1944
#: bzrlib/builtins.py:3070
1951
1945
msgid "Apply content filters to display the convenience form."
1952
1946
msgstr ""
1953
1947
1954
#: bzrlib/builtins.py:3079
1948
#: bzrlib/builtins.py:3081
1955
1949
msgid "bzr cat --revision takes exactly one revision specifier"
1956
1950
msgstr ""
1957
1951
1958
#: bzrlib/builtins.py:3104 bzrlib/builtins.py:3116
1959
#, python-format
1960
msgid "%r is not present in revision %s"
1952
#: bzrlib/builtins.py:3106 bzrlib/builtins.py:3118
1953
msgid "{0!r} is not present in revision {1}"
1961
1954
msgstr ""
1962
1955
1963
#: bzrlib/builtins.py:3139
1956
#: bzrlib/builtins.py:3141
1964
1957
msgid "Commit changes into a new revision."
1965
1958
msgstr ""
1966
1959
1967
#: bzrlib/builtins.py:3141
1960
#: bzrlib/builtins.py:3143
1968
1961
msgid ""
1969
1962
"An explanatory message needs to be given for each commit. This is\n"
1970
1963
"often done by using the --message option (getting the message from the\n"
1974
1967
"boilerplate text loaded into the editor, use the --show-diff option."
1975
1968
msgstr ""
1976
1969
1977
#: bzrlib/builtins.py:3148
1970
#: bzrlib/builtins.py:3150
1978
1971
msgid ""
1979
1972
"By default, the entire tree is committed and the person doing the\n"
1980
1973
"commit is assumed to be the author. These defaults can be overridden\n"
1981
1974
"as explained below."
1982
1975
msgstr ""
1983
1976
1984
#: bzrlib/builtins.py:3152
1977
#: bzrlib/builtins.py:3154
1985
1978
msgid ":Selective commits:"
1986
1979
msgstr ""
1987
1980
1988
#: bzrlib/builtins.py:3154
1981
#: bzrlib/builtins.py:3156
1989
1982
msgid ""
1990
1983
" If selected files are specified, only changes to those files are\n"
1991
1984
" committed. If a directory is specified then the directory and\n"
1992
1985
" everything within it is committed."
1993
1986
msgstr ""
1994
1987
1995
#: bzrlib/builtins.py:3158
1988
#: bzrlib/builtins.py:3160
1996
1989
msgid ""
1997
1990
" When excludes are given, they take precedence over selected files.\n"
1998
1991
" For example, to commit only changes within foo, but not changes\n"
1999
1992
" within foo/bar::"
2000
1993
msgstr ""
2001
1994
2002
#: bzrlib/builtins.py:3162
1995
#: bzrlib/builtins.py:3164
2003
1996
msgid " bzr commit foo -x foo/bar"
2004
1997
msgstr ""
2005
1998
2006
#: bzrlib/builtins.py:3164
1999
#: bzrlib/builtins.py:3166
2007
2000
msgid " A selective commit after a merge is not yet supported."
2008
2001
msgstr ""
2009
2002
2010
#: bzrlib/builtins.py:3166
2003
#: bzrlib/builtins.py:3168
2011
2004
msgid ":Custom authors:"
2012
2005
msgstr ""
2013
2006
2014
#: bzrlib/builtins.py:3168
2007
#: bzrlib/builtins.py:3170
2015
2008
msgid ""
2016
2009
" If the author of the change is not the same person as the committer,\n"
2017
2010
" you can specify the author's name using the --author option. The\n"
2021
2014
" author."
2022
2015
msgstr ""
2023
2016
2024
#: bzrlib/builtins.py:3175
2017
#: bzrlib/builtins.py:3177
2025
2018
msgid ":Checks:"
2026
2019
msgstr ""
2027
2020
2028
#: bzrlib/builtins.py:3177
2021
#: bzrlib/builtins.py:3179
2029
2022
msgid ""
2030
2023
" A common mistake is to forget to add a new file or directory before\n"
2031
2024
" running the commit command. The --strict option checks for unknown\n"
2034
2027
" for details."
2035
2028
msgstr ""
2036
2029
2037
#: bzrlib/builtins.py:3183
2030
#: bzrlib/builtins.py:3185
2038
2031
msgid ":Things to note:"
2039
2032
msgstr ""
2040
2033
2041
#: bzrlib/builtins.py:3185
2034
#: bzrlib/builtins.py:3187
2042
2035
msgid ""
2043
2036
" If you accidentially commit the wrong changes or make a spelling\n"
2044
2037
" mistake in the commit message say, you can use the uncommit command\n"
2045
2038
" to undo it. See ``bzr help uncommit`` for details."
2046
2039
msgstr ""
2047
2040
2048
#: bzrlib/builtins.py:3189
2041
#: bzrlib/builtins.py:3191
2049
2042
msgid ""
2050
2043
" Hooks can also be configured to run after a commit. This allows you\n"
2051
2044
" to trigger updates to external systems like bug trackers. The --fixes\n"
2054
2047
msgstr ""
2055
2048
2056
2049
# help of 'exclude' option of 'commit' command
2057
#: bzrlib/builtins.py:3199
2050
#: bzrlib/builtins.py:3201
2058
2051
msgid "Do not consider changes made to a given path."
2059
2052
msgstr ""
2060
2053
2061
2054
# help of 'message' option of 'commit' command
2062
#: bzrlib/builtins.py:3202
2055
#: bzrlib/builtins.py:3204
2063
2056
msgid "Description of the new revision."
2064
2057
msgstr ""
2065
2058
2066
2059
# help of 'unchanged' option of 'commit' command
2067
#: bzrlib/builtins.py:3205
2060
#: bzrlib/builtins.py:3207
2068
2061
msgid "Commit even if nothing has changed."
2069
2062
msgstr ""
2070
2063
2071
2064
# help of 'file' option of 'commit' command
2072
#: bzrlib/builtins.py:3209
2065
#: bzrlib/builtins.py:3211
2073
2066
msgid "Take commit message from this file."
2074
2067
msgstr ""
2075
2068
2076
2069
# help of 'strict' option of 'commit' command
2077
#: bzrlib/builtins.py:3211
2070
#: bzrlib/builtins.py:3213
2078
2071
msgid "Refuse to commit if there are unknown files in the working tree."
2079
2072
msgstr ""
2080
2073
2081
2074
# help of 'commit-time' option of 'commit' command
2082
#: bzrlib/builtins.py:3214
2075
#: bzrlib/builtins.py:3216
2083
2076
msgid ""
2084
2077
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2085
2078
"08:00:00 +0100'."
2086
2079
msgstr ""
2087
2080
2088
2081
# help of 'fixes' option of 'commit' command
2089
#: bzrlib/builtins.py:3217
2082
#: bzrlib/builtins.py:3219
2090
2083
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2091
2084
msgstr ""
2092
2085
2093
2086
# help of 'author' option of 'commit' command
2094
#: bzrlib/builtins.py:3220
2087
#: bzrlib/builtins.py:3222
2095
2088
msgid "Set the author's name, if it's different from the committer."
2096
2089
msgstr ""
2097
2090
2098
2091
# help of 'local' option of 'commit' command
2099
#: bzrlib/builtins.py:3223
2092
#: bzrlib/builtins.py:3225
2100
2093
msgid ""
2101
2094
"Perform a local commit in a bound branch. Local commits are not pushed to "
2102
2095
"the master branch until a normal commit is performed."
2103
2096
msgstr ""
2104
2097
2105
2098
# help of 'show-diff' option of 'commit' command
2106
#: bzrlib/builtins.py:3229
2099
#: bzrlib/builtins.py:3231
2107
2100
msgid ""
2108
2101
"When no message is supplied, show the diff along with the status summary in "
2109
2102
"the message editor."
2110
2103
msgstr ""
2111
2104
2112
2105
# help of 'lossy' option of 'commit' command
2113
#: bzrlib/builtins.py:3232
2106
#: bzrlib/builtins.py:3234
2114
2107
msgid ""
2115
2108
"When committing to a foreign version control system do not push data that "
2116
2109
"can not be natively represented."
2117
2110
msgstr ""
2118
2111
2119
#: bzrlib/builtins.py:3250
2112
#: bzrlib/builtins.py:3252
2120
2113
#, python-format
2121
2114
msgid ""
2122
2115
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2124
2117
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2125
2118
msgstr ""
2126
2119
2127
#: bzrlib/builtins.py:3259
2120
#: bzrlib/builtins.py:3261
2128
2121
#, python-format
2129
2122
msgid ""
2130
2123
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2132
2125
"Commit refused."
2133
2126
msgstr ""
2134
2127
2135
#: bzrlib/builtins.py:3268
2128
#: bzrlib/builtins.py:3270
2136
2129
#, python-format
2137
2130
msgid "Unrecognized bug %s. Commit refused."
2138
2131
msgstr ""
2139
2132
2140
#: bzrlib/builtins.py:3271
2133
#: bzrlib/builtins.py:3273
2141
2134
#, python-format
2142
2135
msgid ""
2143
2136
"%s\n"
2144
2137
"Commit refused."
2145
2138
msgstr ""
2146
2139
2147
#: bzrlib/builtins.py:3295
2140
#: bzrlib/builtins.py:3297
2148
2141
msgid "Could not parse --commit-time: "
2149
2142
msgstr ""
2150
2143
2151
#: bzrlib/builtins.py:3335
2144
#: bzrlib/builtins.py:3337
2152
2145
msgid "please specify either --message or --file"
2153
2146
msgstr ""
2154
2147
2155
#: bzrlib/builtins.py:3364
2148
#: bzrlib/builtins.py:3366
2156
2149
msgid "please specify a commit message with either --message or --file"
2157
2150
msgstr ""
2158
2151
2159
#: bzrlib/builtins.py:3367
2152
#: bzrlib/builtins.py:3369
2160
2153
msgid ""
2161
2154
"Empty commit message specified. Please specify a commit message with either "
2162
2155
"--message or --file or leave a blank message with --message \"\"."
2163
2156
msgstr ""
2164
2157
2165
#: bzrlib/builtins.py:3387
2158
#: bzrlib/builtins.py:3389
2166
2159
msgid ""
2167
2160
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2168
2161
"--unchanged to force an empty commit."
2169
2162
msgstr ""
2170
2163
2171
#: bzrlib/builtins.py:3391
2164
#: bzrlib/builtins.py:3393
2172
2165
msgid ""
2173
2166
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2174
2167
"resolve FILE\" to resolve."
2175
2168
msgstr ""
2176
2169
2177
#: bzrlib/builtins.py:3395
2170
#: bzrlib/builtins.py:3397
2178
2171
msgid "Commit refused because there are unknown files in the working tree."
2179
2172
msgstr ""
2180
2173
2181
#: bzrlib/builtins.py:3398
2174
#: bzrlib/builtins.py:3400
2182
2175
msgid ""
2183
2176
"\n"
2184
2177
"To commit to master branch, run update and then commit.\n"
2185
2178
"You can also pass --local to commit to continue working disconnected."
2186
2179
msgstr ""
2187
2180
2188
#: bzrlib/builtins.py:3406
2181
#: bzrlib/builtins.py:3408
2189
2182
msgid ""
2190
2183
"Validate working tree structure, branch consistency and repository history."
2191
2184
msgstr ""
2192
2185
2193
#: bzrlib/builtins.py:3408
2186
#: bzrlib/builtins.py:3410
2194
2187
msgid ""
2195
2188
"This command checks various invariants about branch and repository storage\n"
2196
2189
"to detect data corruption or bzr bugs."
2197
2190
msgstr ""
2198
2191
2199
#: bzrlib/builtins.py:3411
2192
#: bzrlib/builtins.py:3413
2200
2193
msgid ""
2201
2194
"The working tree and branch checks will only give output if a problem is\n"
2202
2195
"detected. The output fields of the repository check are:"
2203
2196
msgstr ""
2204
2197
2205
#: bzrlib/builtins.py:3414
2198
#: bzrlib/builtins.py:3416
2206
2199
msgid ""
2207
2200
"revisions\n"
2208
2201
" This is just the number of revisions checked. It doesn't\n"
2209
2202
" indicate a problem."
2210
2203
msgstr ""
2211
2204
2212
#: bzrlib/builtins.py:3418
2205
#: bzrlib/builtins.py:3420
2213
2206
msgid ""
2214
2207
"versionedfiles\n"
2215
2208
" This is just the number of versionedfiles checked. It\n"
2216
2209
" doesn't indicate a problem."
2217
2210
msgstr ""
2218
2211
2219
#: bzrlib/builtins.py:3422
2212
#: bzrlib/builtins.py:3424
2220
2213
msgid ""
2221
2214
"unreferenced ancestors\n"
2222
2215
" Texts that are ancestors of other texts, but\n"
2224
2217
" subtle problem that Bazaar can work around."
2225
2218
msgstr ""
2226
2219
2227
#: bzrlib/builtins.py:3427
2220
#: bzrlib/builtins.py:3429
2228
2221
msgid ""
2229
2222
"unique file texts\n"
2230
2223
" This is the total number of unique file contents\n"
2231
2224
" seen in the checked revisions. It does not indicate a problem."
2232
2225
msgstr ""
2233
2226
2234
#: bzrlib/builtins.py:3431
2227
#: bzrlib/builtins.py:3433
2235
2228
msgid ""
2236
2229
"repeated file texts\n"
2237
2230
" This is the total number of repeated texts seen\n"
2240
2233
" indicate a problem."
2241
2234
msgstr ""
2242
2235
2243
#: bzrlib/builtins.py:3437
2236
#: bzrlib/builtins.py:3439
2244
2237
msgid ""
2245
2238
"If no restrictions are specified, all Bazaar data that is found at the "
2246
2239
"given\n"
2247
2240
"location will be checked."
2248
2241
msgstr ""
2249
2242
2250
#: bzrlib/builtins.py:3440
2243
#: bzrlib/builtins.py:3442
2251
2244
msgid ":Examples:"
2252
2245
msgstr ""
2253
2246
2254
#: bzrlib/builtins.py:3442
2247
#: bzrlib/builtins.py:3444
2255
2248
msgid " Check the tree and branch at 'foo'::"
2256
2249
msgstr ""
2257
2250
2258
#: bzrlib/builtins.py:3444
2251
#: bzrlib/builtins.py:3446
2259
2252
msgid " bzr check --tree --branch foo"
2260
2253
msgstr ""
2261
2254
2262
#: bzrlib/builtins.py:3446
2255
#: bzrlib/builtins.py:3448
2263
2256
msgid " Check only the repository at 'bar'::"
2264
2257
msgstr ""
2265
2258
2266
#: bzrlib/builtins.py:3448
2259
#: bzrlib/builtins.py:3450
2267
2260
msgid " bzr check --repo bar"
2268
2261
msgstr ""
2269
2262
2270
#: bzrlib/builtins.py:3450
2263
#: bzrlib/builtins.py:3452
2271
2264
msgid " Check everything at 'baz'::"
2272
2265
msgstr ""
2273
2266
2274
#: bzrlib/builtins.py:3452
2267
#: bzrlib/builtins.py:3454
2275
2268
msgid " bzr check baz"
2276
2269
msgstr ""
2277
2270
2278
2271
# help of 'branch' option of 'check' command
2279
#: bzrlib/builtins.py:3458
2272
#: bzrlib/builtins.py:3460
2280
2273
msgid "Check the branch related to the current directory."
2281
2274
msgstr ""
2282
2275
2283
2276
# help of 'repo' option of 'check' command
2284
#: bzrlib/builtins.py:3460
2277
#: bzrlib/builtins.py:3462
2285
2278
msgid "Check the repository related to the current directory."
2286
2279
msgstr ""
2287
2280
2288
2281
# help of 'tree' option of 'check' command
2289
#: bzrlib/builtins.py:3462
2282
#: bzrlib/builtins.py:3464
2290
2283
msgid "Check the working tree related to the current directory."
2291
2284
msgstr ""
2292
2285
2293
#: bzrlib/builtins.py:3476
2286
#: bzrlib/builtins.py:3478
2294
2287
msgid "Upgrade a repository, branch or working tree to a newer format."
2295
2288
msgstr ""
2296
2289
2297
#: bzrlib/builtins.py:3478
2290
#: bzrlib/builtins.py:3480
2298
2291
msgid ""
2299
2292
"When the default format has changed after a major new release of\n"
2300
2293
"Bazaar, you may be informed during certain operations that you\n"
2303
2296
"with older repositories or with older versions of Bazaar."
2304
2297
msgstr ""
2305
2298
2306
#: bzrlib/builtins.py:3484
2299
#: bzrlib/builtins.py:3486
2307
2300
msgid ""
2308
2301
"If you wish to upgrade to a particular format rather than the\n"
2309
2302
"current default, that can be specified using the --format option.\n"
2313
2306
"2.x default) so downgrading is not always possible."
2314
2307
msgstr ""
2315
2308
2316
#: bzrlib/builtins.py:3491
2309
#: bzrlib/builtins.py:3493
2317
2310
msgid ""
2318
2311
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2319
2312
"process (where # is a number). By default, this is left there on\n"
2324
2317
"afterwards."
2325
2318
msgstr ""
2326
2319
2327
#: bzrlib/builtins.py:3499
2320
#: bzrlib/builtins.py:3501
2328
2321
msgid ""
2329
2322
"If the location given is a shared repository, dependent branches\n"
2330
2323
"are also converted provided the repository converts successfully.\n"
2332
2325
"tried."
2333
2326
msgstr ""
2334
2327
2335
#: bzrlib/builtins.py:3504
2328
#: bzrlib/builtins.py:3506
2336
2329
msgid ""
2337
2330
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2338
2331
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2339
2332
msgstr ""
2340
2333
2341
2334
# help of 'format' option of 'upgrade' command
2342
#: bzrlib/builtins.py:3512
2335
#: bzrlib/builtins.py:3514
2343
2336
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2344
2337
msgstr ""
2345
2338
2346
2339
# title of 'format' option of 'init' command
2347
#: bzrlib/builtins.py:3516
2340
#: bzrlib/builtins.py:3518
2348
2341
msgid "Branch format"
2349
2342
msgstr ""
2350
2343
2351
2344
# help of 'clean' option of 'upgrade' command
2352
#: bzrlib/builtins.py:3518
2345
#: bzrlib/builtins.py:3520
2353
2346
msgid "Remove the backup.bzr directory if successful."
2354
2347
msgstr ""
2355
2348
2356
#: bzrlib/builtins.py:3535
2349
#: bzrlib/builtins.py:3537
2357
2350
msgid "Show or set bzr user id."
2358
2351
msgstr ""
2359
2352
2360
#: bzrlib/builtins.py:3537
2353
#: bzrlib/builtins.py:3539
2361
2354
msgid ""
2362
2355
":Examples:\n"
2363
2356
" Show the email of the current user::"
2364
2357
msgstr ""
2365
2358
2366
#: bzrlib/builtins.py:3540
2359
#: bzrlib/builtins.py:3542
2367
2360
msgid " bzr whoami --email"
2368
2361
msgstr ""
2369
2362
2370
#: bzrlib/builtins.py:3542
2363
#: bzrlib/builtins.py:3544
2371
2364
msgid " Set the current user::"
2372
2365
msgstr ""
2373
2366
2374
#: bzrlib/builtins.py:3544
2367
#: bzrlib/builtins.py:3546
2375
2368
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2376
2369
msgstr ""
2377
2370
2378
2371
# help of 'email' option of 'whoami' command
2379
#: bzrlib/builtins.py:3548
2372
#: bzrlib/builtins.py:3550
2380
2373
msgid "Display email address only."
2381
2374
msgstr ""
2382
2375
2383
2376
# help of 'branch' option of 'whoami' command
2384
#: bzrlib/builtins.py:3550
2377
#: bzrlib/builtins.py:3552
2385
2378
msgid "Set identity for the current branch instead of globally."
2386
2379
msgstr ""
2387
2380
2388
#: bzrlib/builtins.py:3574
2381
#: bzrlib/builtins.py:3576
2389
2382
msgid "--email can only be used to display existing identity"
2390
2383
msgstr ""
2391
2384
2392
#: bzrlib/builtins.py:3596
2385
#: bzrlib/builtins.py:3598
2393
2386
msgid "Print or set the branch nickname."
2394
2387
msgstr ""
2395
2388
2396
#: bzrlib/builtins.py:3598
2389
#: bzrlib/builtins.py:3600
2397
2390
msgid ""
2398
2391
"If unset, the tree root directory name is used as the nickname.\n"
2399
2392
"To print the current nickname, execute with no argument."
2400
2393
msgstr ""
2401
2394
2402
#: bzrlib/builtins.py:3601
2395
#: bzrlib/builtins.py:3603
2403
2396
msgid ""
2404
2397
"Bound branches use the nickname of its master branch unless it is set\n"
2405
2398
"locally."
2406
2399
msgstr ""
2407
2400
2408
#: bzrlib/builtins.py:3621
2401
#: bzrlib/builtins.py:3623
2409
2402
msgid "Set/unset and display aliases."
2410
2403
msgstr ""
2411
2404
2412
#: bzrlib/builtins.py:3623
2405
#: bzrlib/builtins.py:3625
2413
2406
msgid ""
2414
2407
":Examples:\n"
2415
2408
" Show the current aliases::"
2416
2409
msgstr ""
2417
2410
2418
#: bzrlib/builtins.py:3626
2411
#: bzrlib/builtins.py:3628
2419
2412
msgid " bzr alias"
2420
2413
msgstr ""
2421
2414
2422
#: bzrlib/builtins.py:3628
2415
#: bzrlib/builtins.py:3630
2423
2416
msgid " Show the alias specified for 'll'::"
2424
2417
msgstr ""
2425
2418
2426
#: bzrlib/builtins.py:3630
2419
#: bzrlib/builtins.py:3632
2427
2420
msgid " bzr alias ll"
2428
2421
msgstr ""
2429
2422
2430
#: bzrlib/builtins.py:3632
2423
#: bzrlib/builtins.py:3634
2431
2424
msgid " Set an alias for 'll'::"
2432
2425
msgstr ""
2433
2426
2434
#: bzrlib/builtins.py:3634
2427
#: bzrlib/builtins.py:3636
2435
2428
msgid " bzr alias ll=\"log --line -r-10..-1\""
2436
2429
msgstr ""
2437
2430
2438
#: bzrlib/builtins.py:3636
2431
#: bzrlib/builtins.py:3638
2439
2432
msgid " To remove an alias for 'll'::"
2440
2433
msgstr ""
2441
2434
2442
#: bzrlib/builtins.py:3638
2435
#: bzrlib/builtins.py:3640
2443
2436
msgid " bzr alias --remove ll"
2444
2437
msgstr ""
2445
2438
2446
2439
# help of 'remove' option of 'alias' command
2447
#: bzrlib/builtins.py:3643
2440
#: bzrlib/builtins.py:3645
2448
2441
msgid "Remove the alias."
2449
2442
msgstr ""
2450
2443
2451
#: bzrlib/builtins.py:3661
2444
#: bzrlib/builtins.py:3663
2452
2445
msgid "bzr alias --remove expects an alias to remove."
2453
2446
msgstr ""
2454
2447
2455
#: bzrlib/builtins.py:3833
2448
#: bzrlib/builtins.py:3835
2456
2449
msgid "subunit not available. subunit needs to be installed to use --subunit."
2457
2450
msgstr ""
2458
2451
2459
#: bzrlib/builtins.py:3850
2452
#: bzrlib/builtins.py:3852
2460
2453
msgid ""
2461
2454
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2462
2455
msgstr ""
2463
2456
2464
#: bzrlib/builtins.py:3897
2457
#: bzrlib/builtins.py:3899
2465
2458
msgid "Show version of bzr."
2466
2459
msgstr ""
2467
2460
2468
2461
# help of 'short' option of 'version' command
2469
#: bzrlib/builtins.py:3901
2462
#: bzrlib/builtins.py:3903
2470
2463
msgid "Print just the version number."
2471
2464
msgstr ""
2472
2465
2473
#: bzrlib/builtins.py:3920
2466
#: bzrlib/builtins.py:3922
2474
2467
msgid "It sure does!\n"
2475
2468
msgstr ""
2476
2469
2477
#: bzrlib/builtins.py:3944
2470
#: bzrlib/builtins.py:3946
2478
2471
#, python-format
2479
2472
msgid "merge base is revision %s\n"
2480
2473
msgstr ""
2481
2474
2482
#: bzrlib/builtins.py:3948
2475
#: bzrlib/builtins.py:3950
2483
2476
msgid "Perform a three-way merge."
2484
2477
msgstr ""
2485
2478
2486
#: bzrlib/builtins.py:3950
2479
#: bzrlib/builtins.py:3952
2487
2480
msgid ""
2488
2481
"The source of the merge can be specified either in the form of a branch,\n"
2489
2482
"or in the form of a path to a file containing a merge directive generated\n"
2494
2487
"the current working tree."
2495
2488
msgstr ""
2496
2489
2497
#: bzrlib/builtins.py:3958
2490
#: bzrlib/builtins.py:3960
2498
2491
msgid ""
2499
2492
"When merging from a branch, by default bzr will try to merge in all new\n"
2500
2493
"work from the other branch, automatically determining an appropriate base\n"
2501
2494
"revision. If this fails, you may need to give an explicit base."
2502
2495
msgstr ""
2503
2496
2504
#: bzrlib/builtins.py:3962
2497
#: bzrlib/builtins.py:3964
2505
2498
msgid ""
2506
2499
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2507
2500
"try to merge in all new work up to and including revision OTHER."
2508
2501
msgstr ""
2509
2502
2510
#: bzrlib/builtins.py:3965
2503
#: bzrlib/builtins.py:3967
2511
2504
msgid ""
2512
2505
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2513
2506
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2518
2511
"changes from the other branch is not stored in the commit."
2519
2512
msgstr ""
2520
2513
2521
#: bzrlib/builtins.py:3973
2514
#: bzrlib/builtins.py:3975
2522
2515
msgid "Revision numbers are always relative to the source branch."
2523
2516
msgstr ""
2524
2517
2525
#: bzrlib/builtins.py:3980
2518
#: bzrlib/builtins.py:3982
2526
2519
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2527
2520
msgstr ""
2528
2521
2529
#: bzrlib/builtins.py:3982
2522
#: bzrlib/builtins.py:3984
2530
2523
msgid ""
2531
2524
"If there is no default branch set, the first merge will set it (use\n"
2532
2525
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2534
2527
"only be saved if the remote location can be accessed."
2535
2528
msgstr ""
2536
2529
2537
#: bzrlib/builtins.py:3987
2530
#: bzrlib/builtins.py:3989
2538
2531
msgid ""
2539
2532
"The results of the merge are placed into the destination working\n"
2540
2533
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2541
2534
"committed to record the result of the merge."
2542
2535
msgstr ""
2543
2536
2544
#: bzrlib/builtins.py:3991
2537
#: bzrlib/builtins.py:3993
2545
2538
msgid ""
2546
2539
"merge refuses to run if there are any uncommitted changes, unless\n"
2547
2540
"--force is given. If --force is given, then the changes from the source \n"
2550
2543
"merge revision which has more than two parents."
2551
2544
msgstr ""
2552
2545
2553
#: bzrlib/builtins.py:3997
2546
#: bzrlib/builtins.py:3999
2554
2547
msgid ""
2555
2548
"If one would like to merge changes from the working tree of the other\n"
2556
2549
"branch without merging any committed revisions, the --uncommitted option\n"
2557
2550
"can be given."
2558
2551
msgstr ""
2559
2552
2560
#: bzrlib/builtins.py:4001
2553
#: bzrlib/builtins.py:4003
2561
2554
msgid ""
2562
2555
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2563
2556
"you to apply each diff hunk and file change, similar to \"shelve\"."
2564
2557
msgstr ""
2565
2558
2566
#: bzrlib/builtins.py:4004
2559
#: bzrlib/builtins.py:4006
2567
2560
msgid ""
2568
2561
":Examples:\n"
2569
2562
" To merge all new revisions from bzr.dev::"
2570
2563
msgstr ""
2571
2564
2572
#: bzrlib/builtins.py:4007
2565
#: bzrlib/builtins.py:4009
2573
2566
msgid " bzr merge ../bzr.dev"
2574
2567
msgstr ""
2575
2568
2576
#: bzrlib/builtins.py:4009
2569
#: bzrlib/builtins.py:4011
2577
2570
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2578
2571
msgstr ""
2579
2572
2580
#: bzrlib/builtins.py:4011
2573
#: bzrlib/builtins.py:4013
2581
2574
msgid " bzr merge -r 82 ../bzr.dev"
2582
2575
msgstr ""
2583
2576
2584
#: bzrlib/builtins.py:4013
2577
#: bzrlib/builtins.py:4015
2585
2578
msgid " To merge the changes introduced by 82, without previous changes::"
2586
2579
msgstr ""
2587
2580
2588
#: bzrlib/builtins.py:4015
2581
#: bzrlib/builtins.py:4017
2589
2582
msgid " bzr merge -r 81..82 ../bzr.dev"
2590
2583
msgstr ""
2591
2584
2592
#: bzrlib/builtins.py:4017
2585
#: bzrlib/builtins.py:4019
2593
2586
msgid " To apply a merge directive contained in /tmp/merge::"
2594
2587
msgstr ""
2595
2588
2596
#: bzrlib/builtins.py:4019
2589
#: bzrlib/builtins.py:4021
2597
2590
msgid " bzr merge /tmp/merge"
2598
2591
msgstr ""
2599
2592
2600
#: bzrlib/builtins.py:4021
2593
#: bzrlib/builtins.py:4023
2601
2594
msgid ""
2602
2595
" To create a merge revision with three parents from two branches\n"
2603
2596
" feature1a and feature1b:"
2604
2597
msgstr ""
2605
2598
2606
#: bzrlib/builtins.py:4024
2599
#: bzrlib/builtins.py:4026
2607
2600
msgid ""
2608
2601
" bzr merge ../feature1a\n"
2609
2602
" bzr merge ../feature1b --force\n"
2611
2604
msgstr ""
2612
2605
2613
2606
# help of 'force' option of 'merge' command
2614
#: bzrlib/builtins.py:4036
2607
#: bzrlib/builtins.py:4038
2615
2608
msgid "Merge even if the destination tree has uncommitted changes."
2616
2609
msgstr ""
2617
2610
2618
2611
# help of 'uncommitted' option of 'merge' command
2619
#: bzrlib/builtins.py:4042
2612
#: bzrlib/builtins.py:4044
2620
2613
msgid ""
2621
2614
"Apply uncommitted changes from a working copy, instead of branch changes."
2622
2615
msgstr ""
2623
2616
2624
2617
# help of 'pull' option of 'merge' command
2625
#: bzrlib/builtins.py:4044
2618
#: bzrlib/builtins.py:4046
2626
2619
msgid ""
2627
2620
"If the destination is already completely merged into the source, pull from "
2628
2621
"the source rather than merging. When this happens, you do not need to "
2630
2623
msgstr ""
2631
2624
2632
2625
# help of 'directory' option of 'merge' command
2633
#: bzrlib/builtins.py:4049
2626
#: bzrlib/builtins.py:4051
2634
2627
msgid ""
2635
2628
"Branch to merge into, rather than the one containing the working directory."
2636
2629
msgstr ""
2637
2630
2638
2631
# help of 'preview' option of 'merge' command
2639
#: bzrlib/builtins.py:4051
2632
#: bzrlib/builtins.py:4053
2640
2633
msgid "Instead of merging, show a diff of the merge."
2641
2634
msgstr ""
2642
2635
2643
2636
# help of 'interactive' option of 'merge' command
2644
#: bzrlib/builtins.py:4053
2637
#: bzrlib/builtins.py:4055
2645
2638
msgid "Select changes interactively."
2646
2639
msgstr ""
2647
2640
2648
#: bzrlib/builtins.py:4075
2641
#: bzrlib/builtins.py:4077
2649
2642
msgid ""
2650
2643
"Merging into empty branches not currently supported, https://bugs.launchpad."
2651
2644
"net/bzr/+bug/308562"
2652
2645
msgstr ""
2653
2646
2654
#: bzrlib/builtins.py:4102
2647
#: bzrlib/builtins.py:4104
2655
2648
msgid "Cannot use --uncommitted with bundles or merge directives."
2656
2649
msgstr ""
2657
2650
2658
#: bzrlib/builtins.py:4113
2651
#: bzrlib/builtins.py:4115
2659
2652
msgid "Cannot use --uncommitted and --revision at the same time."
2660
2653
msgstr ""
2661
2654
2662
#: bzrlib/builtins.py:4133
2655
#: bzrlib/builtins.py:4135
2663
2656
msgid "merger: "
2664
2657
msgstr ""
2665
2658
2666
#: bzrlib/builtins.py:4135
2659
#: bzrlib/builtins.py:4137
2667
2660
msgid "Nothing to do."
2668
2661
msgstr ""
2669
2662
2670
#: bzrlib/builtins.py:4139
2663
#: bzrlib/builtins.py:4141
2671
2664
msgid "Cannot pull individual files"
2672
2665
msgstr ""
2673
2666
2674
#: bzrlib/builtins.py:4147
2667
#: bzrlib/builtins.py:4149
2675
2668
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2676
2669
msgstr ""
2677
2670
2678
#: bzrlib/builtins.py:4205
2671
#: bzrlib/builtins.py:4207
2679
2672
#, python-format
2680
2673
msgid "Show-base is not supported for this merge type. %s"
2681
2674
msgstr ""
2682
2675
2683
#: bzrlib/builtins.py:4214
2676
#: bzrlib/builtins.py:4216
2684
2677
#, python-format
2685
2678
msgid "Conflict reduction is not supported for merge type %s."
2686
2679
msgstr ""
2687
2680
2688
#: bzrlib/builtins.py:4218
2681
#: bzrlib/builtins.py:4220
2689
2682
msgid "Cannot do conflict reduction and show base."
2690
2683
msgstr ""
2691
2684
2692
#: bzrlib/builtins.py:4329
2685
#: bzrlib/builtins.py:4331
2693
2686
msgid "No location specified or remembered"
2694
2687
msgstr ""
2695
2688
2696
#: bzrlib/builtins.py:4331
2697
#, python-format
2698
msgid "%s remembered %s location %s"
2689
#: bzrlib/builtins.py:4333
2690
msgid "{0} remembered {1} location {2}"
2699
2691
msgstr ""
2700
2692
2701
#: bzrlib/builtins.py:4337
2693
#: bzrlib/builtins.py:4339
2702
2694
msgid "Redo a merge."
2703
2695
msgstr ""
2704
2696
2705
#: bzrlib/builtins.py:4339
2697
#: bzrlib/builtins.py:4341
2706
2698
msgid ""
2707
2699
"Use this if you want to try a different merge technique while resolving\n"
2708
2700
"conflicts. Some merge techniques are better than others, and remerge\n"
2709
2701
"lets you try different ones on different files."
2710
2702
msgstr ""
2711
2703
2712
#: bzrlib/builtins.py:4343
2704
#: bzrlib/builtins.py:4345
2713
2705
msgid ""
2714
2706
"The options for remerge have the same meaning and defaults as the ones for\n"
2715
2707
"merge. The difference is that remerge can (only) be run when there is a\n"
2716
2708
"pending merge, and it lets you specify particular files."
2717
2709
msgstr ""
2718
2710
2719
#: bzrlib/builtins.py:4347
2711
#: bzrlib/builtins.py:4349
2720
2712
msgid ""
2721
2713
":Examples:\n"
2722
2714
" Re-do the merge of all conflicted files, and show the base text in\n"
2723
2715
" conflict regions, in addition to the usual THIS and OTHER texts::"
2724
2716
msgstr ""
2725
2717
2726
#: bzrlib/builtins.py:4351
2718
#: bzrlib/builtins.py:4353
2727
2719
msgid " bzr remerge --show-base"
2728
2720
msgstr ""
2729
2721
2730
#: bzrlib/builtins.py:4353
2722
#: bzrlib/builtins.py:4355
2731
2723
msgid ""
2732
2724
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2733
2725
" additional processing to reduce the size of conflict regions::"
2734
2726
msgstr ""
2735
2727
2736
#: bzrlib/builtins.py:4356
2728
#: bzrlib/builtins.py:4358
2737
2729
msgid " bzr remerge --merge-type weave --reprocess foobar"
2738
2730
msgstr ""
2739
2731
2740
2732
# help of 'show-base' option of 'merge' command
2741
#: bzrlib/builtins.py:4363
2733
#: bzrlib/builtins.py:4365
2742
2734
msgid "Show base revision text in conflicts."
2743
2735
msgstr ""
2744
2736
2745
#: bzrlib/builtins.py:4375
2737
#: bzrlib/builtins.py:4377
2746
2738
msgid ""
2747
2739
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2748
2740
"merges."
2749
2741
msgstr ""
2750
2742
2751
#: bzrlib/builtins.py:4431
2743
#: bzrlib/builtins.py:4433
2752
2744
msgid "Revert files to a previous revision."
2753
2745
msgstr ""
2754
2746
2755
#: bzrlib/builtins.py:4433
2747
#: bzrlib/builtins.py:4435
2756
2748
msgid ""
2757
2749
"Giving a list of files will revert only those files. Otherwise, all files\n"
2758
2750
"will be reverted. If the revision is not specified with '--revision', the\n"
2759
2751
"last committed revision is used."
2760
2752
msgstr ""
2761
2753
2762
#: bzrlib/builtins.py:4437
2754
#: bzrlib/builtins.py:4439
2763
2755
msgid ""
2764
2756
"To remove only some changes, without reverting to a prior version, use\n"
2765
2757
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2768
2760
"certain changes on a hunk-by-hunk basis, see the shelve command."
2769
2761
msgstr ""
2770
2762
2771
#: bzrlib/builtins.py:4443
2763
#: bzrlib/builtins.py:4445
2772
2764
msgid ""
2773
2765
"By default, any files that have been manually changed will be backed up\n"
2774
2766
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2775
2767
"'.~#~' appended to their name, where # is a number."
2776
2768
msgstr ""
2777
2769
2778
#: bzrlib/builtins.py:4447
2770
#: bzrlib/builtins.py:4449
2779
2771
msgid ""
2780
2772
"When you provide files, you can use their current pathname or the pathname\n"
2781
2773
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2783
2775
"reverted."
2784
2776
msgstr ""
2785
2777
2786
#: bzrlib/builtins.py:4452
2778
#: bzrlib/builtins.py:4454
2787
2779
msgid ""
2788
2780
"If you have newly added files since the target revision, they will be\n"
2789
2781
"removed. If the files to be removed have been changed, backups will be\n"
2791
2783
"deleted."
2792
2784
msgstr ""
2793
2785
2794
#: bzrlib/builtins.py:4457
2786
#: bzrlib/builtins.py:4459
2795
2787
msgid ""
2796
2788
"The working tree contains a list of revisions that have been merged but\n"
2797
2789
"not yet committed. These revisions will be included as additional parents\n"
2803
2795
"reverting any files."
2804
2796
msgstr ""
2805
2797
2806
#: bzrlib/builtins.py:4466
2798
#: bzrlib/builtins.py:4468
2807
2799
msgid ""
2808
2800
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2809
2801
"changes from a branch in a single revision. To do this, perform the merge\n"
2818
2810
msgstr ""
2819
2811
2820
2812
# help of 'no-backup' option of 'revert' command
2821
#: bzrlib/builtins.py:4480
2813
#: bzrlib/builtins.py:4482
2822
2814
msgid "Do not save backups of reverted files."
2823
2815
msgstr ""
2824
2816
2825
2817
# help of 'forget-merges' option of 'revert' command
2826
#: bzrlib/builtins.py:4482
2818
#: bzrlib/builtins.py:4484
2827
2819
msgid "Remove pending merge marker, without changing any files."
2828
2820
msgstr ""
2829
2821
2830
#: bzrlib/builtins.py:4513
2822
#: bzrlib/builtins.py:4515
2831
2823
msgid ""
2832
2824
"Show help on a command or other topic.\n"
2833
2825
" "
2834
2826
msgstr ""
2835
2827
2836
2828
# help of 'long' option of 'help' command
2837
#: bzrlib/builtins.py:4518
2829
#: bzrlib/builtins.py:4520
2838
2830
msgid "Show help on all commands."
2839
2831
msgstr ""
2840
2832
2841
#: bzrlib/builtins.py:4547
2833
#: bzrlib/builtins.py:4549
2842
2834
msgid "Show unmerged/unpulled revisions between two branches."
2843
2835
msgstr ""
2844
2836
2845
#: bzrlib/builtins.py:4549
2837
#: bzrlib/builtins.py:4551
2846
2838
msgid "OTHER_BRANCH may be local or remote."
2847
2839
msgstr ""
2848
2840
2849
#: bzrlib/builtins.py:4551
2841
#: bzrlib/builtins.py:4553
2850
2842
msgid ""
2851
2843
"To filter on a range of revisions, you can use the command -r begin..end\n"
2852
2844
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2857
2849
" 0 - no missing revisions"
2858
2850
msgstr ""
2859
2851
2860
#: bzrlib/builtins.py:4561
2852
#: bzrlib/builtins.py:4563
2861
2853
msgid ""
2862
2854
" Determine the missing revisions between this and the branch at the\n"
2863
2855
" remembered pull location::"
2864
2856
msgstr ""
2865
2857
2866
#: bzrlib/builtins.py:4564
2858
#: bzrlib/builtins.py:4566
2867
2859
msgid " bzr missing"
2868
2860
msgstr ""
2869
2861
2870
#: bzrlib/builtins.py:4566
2862
#: bzrlib/builtins.py:4568
2871
2863
msgid " Determine the missing revisions between this and another branch::"
2872
2864
msgstr ""
2873
2865
2874
#: bzrlib/builtins.py:4568
2866
#: bzrlib/builtins.py:4570
2875
2867
msgid " bzr missing http://server/branch"
2876
2868
msgstr ""
2877
2869
2878
#: bzrlib/builtins.py:4570
2870
#: bzrlib/builtins.py:4572
2879
2871
msgid ""
2880
2872
" Determine the missing revisions up to a specific revision on the other\n"
2881
2873
" branch::"
2882
2874
msgstr ""
2883
2875
2884
#: bzrlib/builtins.py:4573
2876
#: bzrlib/builtins.py:4575
2885
2877
msgid " bzr missing -r ..-10"
2886
2878
msgstr ""
2887
2879
2888
#: bzrlib/builtins.py:4575
2880
#: bzrlib/builtins.py:4577
2889
2881
msgid ""
2890
2882
" Determine the missing revisions up to a specific revision on this\n"
2891
2883
" branch::"
2892
2884
msgstr ""
2893
2885
2894
#: bzrlib/builtins.py:4578
2886
#: bzrlib/builtins.py:4580
2895
2887
msgid " bzr missing --my-revision ..-10"
2896
2888
msgstr ""
2897
2889
2898
2890
# help of 'reverse' option of 'missing' command
2899
#: bzrlib/builtins.py:4585
2891
#: bzrlib/builtins.py:4587
2900
2892
msgid "Reverse the order of revisions."
2901
2893
msgstr ""
2902
2894
2903
2895
# help of 'mine-only' option of 'missing' command
2904
#: bzrlib/builtins.py:4587
2896
#: bzrlib/builtins.py:4589
2905
2897
msgid "Display changes in the local branch only."
2906
2898
msgstr ""
2907
2899
2908
2900
# help of 'this' option of 'missing' command
2909
#: bzrlib/builtins.py:4588
2901
#: bzrlib/builtins.py:4590
2910
2902
msgid "Same as --mine-only."
2911
2903
msgstr ""
2912
2904
2913
2905
# help of 'theirs-only' option of 'missing' command
2914
#: bzrlib/builtins.py:4590
2906
#: bzrlib/builtins.py:4592
2915
2907
msgid "Display changes in the remote branch only."
2916
2908
msgstr ""
2917
2909
2918
2910
# help of 'other' option of 'missing' command
2919
#: bzrlib/builtins.py:4591
2911
#: bzrlib/builtins.py:4593
2920
2912
msgid "Same as --theirs-only."
2921
2913
msgstr ""
2922
2914
2923
2915
# help of 'revision' option of 'missing' command
2924
#: bzrlib/builtins.py:4596
2916
#: bzrlib/builtins.py:4598
2925
2917
msgid ""
2926
2918
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
2927
2919
"details."
2928
2920
msgstr ""
2929
2921
2930
2922
# help of 'my-revision' option of 'missing' command
2931
#: bzrlib/builtins.py:4600
2923
#: bzrlib/builtins.py:4602
2932
2924
msgid ""
2933
2925
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
2934
2926
"details."
2935
2927
msgstr ""
2936
2928
2937
2929
# help of 'include-merges' option of 'missing' command
2938
#: bzrlib/builtins.py:4603
2930
#: bzrlib/builtins.py:4605
2939
2931
msgid "Show all revisions in addition to the mainline ones."
2940
2932
msgstr ""
2941
2933
2942
#: bzrlib/builtins.py:4639
2934
#: bzrlib/builtins.py:4641
2943
2935
msgid "No peer location known or specified."
2944
2936
msgstr ""
2945
2937
2946
#: bzrlib/builtins.py:4643
2938
#: bzrlib/builtins.py:4645
2947
2939
msgid "Using saved parent location: {0}\n"
2948
2940
msgstr ""
2949
2941
2950
#: bzrlib/builtins.py:4676
2942
#: bzrlib/builtins.py:4678
2951
2943
#, python-format
2952
2944
msgid "You have %d extra revision(s):\n"
2953
2945
msgstr ""
2954
2946
2955
#: bzrlib/builtins.py:4690
2947
#: bzrlib/builtins.py:4692
2956
2948
#, python-format
2957
2949
msgid "You are missing %d revision(s):\n"
2958
2950
msgstr ""
2959
2951
2960
#: bzrlib/builtins.py:4700
2952
#: bzrlib/builtins.py:4702
2961
2953
msgid "This branch has no new revisions.\n"
2962
2954
msgstr ""
2963
2955
2964
#: bzrlib/builtins.py:4703
2956
#: bzrlib/builtins.py:4705
2965
2957
msgid "Other branch has no new revisions.\n"
2966
2958
msgstr ""
2967
2959
2968
#: bzrlib/builtins.py:4708
2960
#: bzrlib/builtins.py:4710
2969
2961
msgid "Branches are up to date.\n"
2970
2962
msgstr ""
2971
2963
2972
#: bzrlib/builtins.py:4719
2964
#: bzrlib/builtins.py:4721
2973
2965
msgid "Compress the data within a repository."
2974
2966
msgstr ""
2975
2967
2976
#: bzrlib/builtins.py:4721
2968
#: bzrlib/builtins.py:4723
2977
2969
msgid ""
2978
2970
"This operation compresses the data within a bazaar repository. As\n"
2979
2971
"bazaar supports automatic packing of repository, this operation is\n"
2980
2972
"normally not required to be done manually."
2981
2973
msgstr ""
2982
2974
2983
#: bzrlib/builtins.py:4725
2975
#: bzrlib/builtins.py:4727
2984
2976
msgid ""
2985
2977
"During the pack operation, bazaar takes a backup of existing repository\n"
2986
2978
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
2989
2981
"used."
2990
2982
msgstr ""
2991
2983
2992
#: bzrlib/builtins.py:4731
2984
#: bzrlib/builtins.py:4733
2993
2985
msgid ""
2994
2986
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
2995
2987
"during or immediately after repacking, you may be left with a state\n"
2998
2990
msgstr ""
2999
2991
3000
2992
# help of 'clean-obsolete-packs' option of 'pack' command
3001
#: bzrlib/builtins.py:4740
2993
#: bzrlib/builtins.py:4742
3002
2994
msgid "Delete obsolete packs to save disk space."
3003
2995
msgstr ""
3004
2996
3005
#: bzrlib/builtins.py:4754
2997
#: bzrlib/builtins.py:4756
3006
2998
msgid "List the installed plugins."
3007
2999
msgstr ""
3008
3000
3009
#: bzrlib/builtins.py:4756
3001
#: bzrlib/builtins.py:4758
3010
3002
msgid ""
3011
3003
"This command displays the list of installed plugins including\n"
3012
3004
"version of plugin and a short description of each."
3013
3005
msgstr ""
3014
3006
3015
#: bzrlib/builtins.py:4759
3007
#: bzrlib/builtins.py:4761
3016
3008
msgid "--verbose shows the path where each plugin is located."
3017
3009
msgstr ""
3018
3010
3019
#: bzrlib/builtins.py:4761
3011
#: bzrlib/builtins.py:4763
3020
3012
msgid ""
3021
3013
"A plugin is an external component for Bazaar that extends the\n"
3022
3014
"revision control system, by adding or replacing code in Bazaar.\n"
3025
3017
"customizing log output."
3026
3018
msgstr ""
3027
3019
3028
#: bzrlib/builtins.py:4767
3020
#: bzrlib/builtins.py:4769
3029
3021
msgid ""
3030
3022
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3031
3023
"for further information on plugins including where to find them and how to\n"
3033
3025
"plugins using the Python programming language."
3034
3026
msgstr ""
3035
3027
3036
#: bzrlib/builtins.py:4783
3028
#: bzrlib/builtins.py:4785
3037
3029
msgid "Show testament (signing-form) of a revision."
3038
3030
msgstr ""
3039
3031
3040
3032
# help of 'long' option of 'testament' command
3041
#: bzrlib/builtins.py:4786
3033
#: bzrlib/builtins.py:4788
3042
3034
msgid "Produce long-format testament."
3043
3035
msgstr ""
3044
3036
3045
3037
# help of 'strict' option of 'testament' command
3046
#: bzrlib/builtins.py:4788
3038
#: bzrlib/builtins.py:4790
3047
3039
msgid "Produce a strict-format testament."
3048
3040
msgstr ""
3049
3041
3050
#: bzrlib/builtins.py:4814
3042
#: bzrlib/builtins.py:4816
3051
3043
msgid "Show the origin of each line in a file."
3052
3044
msgstr ""
3053
3045
3054
#: bzrlib/builtins.py:4816
3046
#: bzrlib/builtins.py:4818
3055
3047
msgid ""
3056
3048
"This prints out the given file with an annotation on the left side\n"
3057
3049
"indicating which revision, author and date introduced the change."
3058
3050
msgstr ""
3059
3051
3060
#: bzrlib/builtins.py:4819
3052
#: bzrlib/builtins.py:4821
3061
3053
msgid ""
3062
3054
"If the origin is the same for a run of consecutive lines, it is\n"
3063
3055
"shown only at the top, unless the --all option is given."
3064
3056
msgstr ""
3065
3057
3066
3058
# help of 'all' option of 'annotate' command
3067
#: bzrlib/builtins.py:4827
3059
#: bzrlib/builtins.py:4829
3068
3060
msgid "Show annotations on all lines."
3069
3061
msgstr ""
3070
3062
3071
3063
# help of 'long' option of 'annotate' command
3072
#: bzrlib/builtins.py:4828
3064
#: bzrlib/builtins.py:4830
3073
3065
msgid "Show commit date in annotations."
3074
3066
msgstr ""
3075
3067
3076
#: bzrlib/builtins.py:4915
3068
#: bzrlib/builtins.py:4917
3077
3069
msgid "Cannot sign a range of non-revision-history revisions"
3078
3070
msgstr ""
3079
3071
3080
#: bzrlib/builtins.py:4927
3072
#: bzrlib/builtins.py:4929
3081
3073
msgid "Please supply either one revision, or a range."
3082
3074
msgstr ""
3083
3075
3084
#: bzrlib/builtins.py:4931
3076
#: bzrlib/builtins.py:4933
3085
3077
msgid ""
3086
3078
"Convert the current branch into a checkout of the supplied branch.\n"
3087
3079
"If no branch is supplied, rebind to the last bound location."
3088
3080
msgstr ""
3089
3081
3090
#: bzrlib/builtins.py:4934
3082
#: bzrlib/builtins.py:4936
3091
3083
msgid ""
3092
3084
"Once converted into a checkout, commits must succeed on the master branch\n"
3093
3085
"before they will be applied to the local branch."
3094
3086
msgstr ""
3095
3087
3096
#: bzrlib/builtins.py:4937
3088
#: bzrlib/builtins.py:4939
3097
3089
msgid ""
3098
3090
"Bound branches use the nickname of its master branch unless it is set\n"
3099
3091
"locally, in which case binding will update the local nickname to be\n"
3100
3092
"that of the master."
3101
3093
msgstr ""
3102
3094
3103
#: bzrlib/builtins.py:4952
3095
#: bzrlib/builtins.py:4954
3104
3096
msgid "No location supplied. This format does not remember old locations."
3105
3097
msgstr ""
3106
3098
3107
#: bzrlib/builtins.py:4957
3099
#: bzrlib/builtins.py:4959
3108
3100
msgid "Branch is already bound"
3109
3101
msgstr ""
3110
3102
3111
#: bzrlib/builtins.py:4959
3103
#: bzrlib/builtins.py:4961
3112
3104
msgid "No location supplied and no previous location known"
3113
3105
msgstr ""
3114
3106
3115
#: bzrlib/builtins.py:4965
3107
#: bzrlib/builtins.py:4967
3116
3108
msgid "These branches have diverged. Try merging, and then bind again."
3117
3109
msgstr ""
3118
3110
3119
#: bzrlib/builtins.py:4972
3111
#: bzrlib/builtins.py:4974
3120
3112
msgid "Convert the current checkout into a regular branch."
3121
3113
msgstr ""
3122
3114
3123
#: bzrlib/builtins.py:4974
3115
#: bzrlib/builtins.py:4976
3124
3116
msgid ""
3125
3117
"After unbinding, the local branch is considered independent and subsequent\n"
3126
3118
"commits will be local only."
3127
3119
msgstr ""
3128
3120
3129
#: bzrlib/builtins.py:4985
3121
#: bzrlib/builtins.py:4987
3130
3122
msgid "Local branch is not bound"
3131
3123
msgstr ""
3132
3124
3133
#: bzrlib/builtins.py:4989
3125
#: bzrlib/builtins.py:4991
3134
3126
msgid "Remove the last committed revision."
3135
3127
msgstr ""
3136
3128
3137
#: bzrlib/builtins.py:4991
3129
#: bzrlib/builtins.py:4993
3138
3130
msgid ""
3139
3131
"--verbose will print out what is being removed.\n"
3140
3132
"--dry-run will go through all the motions, but not actually\n"
3141
3133
"remove anything."
3142
3134
msgstr ""
3143
3135
3144
#: bzrlib/builtins.py:4995
3136
#: bzrlib/builtins.py:4997
3145
3137
msgid ""
3146
3138
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3147
3139
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3148
3140
"branch at revision 15."
3149
3141
msgstr ""
3150
3142
3151
#: bzrlib/builtins.py:4999
3143
#: bzrlib/builtins.py:5001
3152
3144
msgid ""
3153
3145
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3154
3146
"it may make is to restore any pending merges that were present before\n"
3156
3148
msgstr ""
3157
3149
3158
3150
# help of 'dry-run' option of 'uncommit' command
3159
#: bzrlib/builtins.py:5010
3151
#: bzrlib/builtins.py:5012
3160
3152
msgid "Don't actually make changes."
3161
3153
msgstr ""
3162
3154
3163
3155
# help of 'force' option of 'uncommit' command
3164
#: bzrlib/builtins.py:5011
3156
#: bzrlib/builtins.py:5013
3165
3157
msgid "Say yes to all questions."
3166
3158
msgstr ""
3167
3159
3168
3160
# help of 'keep-tags' option of 'uncommit' command
3169
#: bzrlib/builtins.py:5013
3161
#: bzrlib/builtins.py:5015
3170
3162
msgid "Keep tags that point to removed revisions."
3171
3163
msgstr ""
3172
3164
3173
3165
# help of 'local' option of 'uncommit' command
3174
#: bzrlib/builtins.py:5015
3166
#: bzrlib/builtins.py:5017
3175
3167
msgid "Only remove the commits from the local branch when in a checkout."
3176
3168
msgstr ""
3177
3169
3178
#: bzrlib/builtins.py:5064
3170
#: bzrlib/builtins.py:5066
3179
3171
msgid "No revisions to uncommit.\n"
3180
3172
msgstr ""
3181
3173
3182
#: bzrlib/builtins.py:5079
3174
#: bzrlib/builtins.py:5081
3183
3175
msgid "Dry-run, pretending to remove the above revisions.\n"
3184
3176
msgstr ""
3185
3177
3186
#: bzrlib/builtins.py:5082
3178
#: bzrlib/builtins.py:5084
3187
3179
msgid "The above revision(s) will be removed.\n"
3188
3180
msgstr ""
3189
3181
3190
#: bzrlib/builtins.py:5086
3182
#: bzrlib/builtins.py:5088
3191
3183
msgid "Uncommit these revisions"
3192
3184
msgstr ""
3193
3185
3194
#: bzrlib/builtins.py:5089
3186
#: bzrlib/builtins.py:5091
3195
3187
msgid "Canceled\n"
3196
3188
msgstr ""
3197
3189
3198
#: bzrlib/builtins.py:5096
3190
#: bzrlib/builtins.py:5098
3199
3191
#, python-format
3200
3192
msgid ""
3201
3193
"You can restore the old tip by running:\n"
3202
3194
" bzr pull . -r revid:%s\n"
3203
3195
msgstr ""
3204
3196
3205
#: bzrlib/builtins.py:5101
3197
#: bzrlib/builtins.py:5103
3206
3198
msgid "Break a dead lock."
3207
3199
msgstr ""
3208
3200
3209
#: bzrlib/builtins.py:5103
3201
#: bzrlib/builtins.py:5105
3210
3202
msgid ""
3211
3203
"This command breaks a lock on a repository, branch, working directory or\n"
3212
3204
"config file."
3213
3205
msgstr ""
3214
3206
3215
#: bzrlib/builtins.py:5106
3207
#: bzrlib/builtins.py:5108
3216
3208
msgid ""
3217
3209
"CAUTION: Locks should only be broken when you are sure that the process\n"
3218
3210
"holding the lock has been stopped."
3219
3211
msgstr ""
3220
3212
3221
#: bzrlib/builtins.py:5109
3213
#: bzrlib/builtins.py:5111
3222
3214
msgid ""
3223
3215
"You can get information on what locks are open via the 'bzr info\n"
3224
3216
"[location]' command."
3225
3217
msgstr ""
3226
3218
3227
#: bzrlib/builtins.py:5112
3219
#: bzrlib/builtins.py:5114
3228
3220
msgid ""
3229
3221
":Examples:\n"
3230
3222
" bzr break-lock\n"
3233
3225
msgstr ""
3234
3226
3235
3227
# help of 'config' option of 'break-lock' command
3236
#: bzrlib/builtins.py:5121
3228
#: bzrlib/builtins.py:5123
3237
3229
msgid "LOCATION is the directory where the config lock is."
3238
3230
msgstr ""
3239
3231
3240
3232
# help of 'force' option of 'break-lock' command
3241
#: bzrlib/builtins.py:5123
3233
#: bzrlib/builtins.py:5125
3242
3234
msgid "Do not ask for confirmation before breaking the lock."
3243
3235
msgstr ""
3244
3236
3245
#: bzrlib/builtins.py:5159
3237
#: bzrlib/builtins.py:5161
3246
3238
msgid "Run the bzr server."
3247
3239
msgstr ""
3248
3240
3249
3241
# help of 'inet' option of 'serve' command
3250
#: bzrlib/builtins.py:5165
3242
#: bzrlib/builtins.py:5167
3251
3243
msgid "Serve on stdin/out for use from inetd or sshd."
3252
3244
msgstr ""
3253
3245
3254
3246
# title of 'protocol' option of 'serve' command
3255
#: bzrlib/builtins.py:5166
3247
#: bzrlib/builtins.py:5168
3256
3248
msgid "protocol"
3257
3249
msgstr ""
3258
3250
3259
3251
# help of 'protocol' option of 'serve' command
3260
#: bzrlib/builtins.py:5167
3252
#: bzrlib/builtins.py:5169
3261
3253
msgid "Protocol to serve."
3262
3254
msgstr ""
3263
3255
3264
3256
# help of 'port' option of 'serve' command
3265
#: bzrlib/builtins.py:5171
3257
#: bzrlib/builtins.py:5173
3266
3258
msgid ""
3267
3259
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3268
3260
"Passing 0 as the port number will result in a dynamically allocated port. "
3270
3262
msgstr ""
3271
3263
3272
3264
# help of 'directory' option of 'serve' command
3273
#: bzrlib/builtins.py:5177
3265
#: bzrlib/builtins.py:5179
3274
3266
msgid "Serve contents of this directory."
3275
3267
msgstr ""
3276
3268
3277
3269
# help of 'allow-writes' option of 'serve' command
3278
#: bzrlib/builtins.py:5179
3270
#: bzrlib/builtins.py:5181
3279
3271
msgid ""
3280
3272
"By default the server is a readonly server. Supplying --allow-writes "
3281
3273
"enables write access to the contents of the served directory and below. "
3284
3276
"uncontrolled write access to your file system."
3285
3277
msgstr ""
3286
3278
3287
#: bzrlib/builtins.py:5224
3279
#: bzrlib/builtins.py:5226
3288
3280
msgid "Combine a tree into its containing tree."
3289
3281
msgstr ""
3290
3282
3291
#: bzrlib/builtins.py:5226
3283
#: bzrlib/builtins.py:5228
3292
3284
msgid "This command requires the target tree to be in a rich-root format."
3293
3285
msgstr ""
3294
3286
3295
#: bzrlib/builtins.py:5228
3287
#: bzrlib/builtins.py:5230
3296
3288
msgid ""
3297
3289
"The TREE argument should be an independent tree, inside another tree, but\n"
3298
3290
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3299
3291
"running \"bzr branch\" with the target inside a tree.)"
3300
3292
msgstr ""
3301
3293
3302
#: bzrlib/builtins.py:5232
3294
#: bzrlib/builtins.py:5234
3303
3295
msgid ""
3304
3296
"The result is a combined tree, with the subtree no longer an independent\n"
3305
3297
"part. This is marked as a merge of the subtree into the containing tree,\n"
3306
3298
"and all history is preserved."
3307
3299
msgstr ""
3308
3300
3309
#: bzrlib/builtins.py:5250
3301
#: bzrlib/builtins.py:5252
3310
3302
#, python-format
3311
3303
msgid ""
3312
3304
"Can't join trees because %s doesn't support rich root data.\n"
3313
3305
"You can use bzr upgrade on the repository."
3314
3306
msgstr ""
3315
3307
3316
#: bzrlib/builtins.py:5259 bzrlib/builtins.py:5265
3317
#, python-format
3318
msgid "Cannot join %s. %s"
3308
#: bzrlib/builtins.py:5262 bzrlib/builtins.py:5268
3309
msgid "Cannot join {0}. {1}"
3319
3310
msgstr ""
3320
3311
3321
#: bzrlib/builtins.py:5270
3312
#: bzrlib/builtins.py:5272
3322
3313
msgid "Split a subdirectory of a tree into a separate tree."
3323
3314
msgstr ""
3324
3315
3325
#: bzrlib/builtins.py:5272
3316
#: bzrlib/builtins.py:5274
3326
3317
msgid ""
3327
3318
"This command will produce a target tree in a format that supports\n"
3328
3319
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3329
3320
"converted into earlier formats like 'dirstate-tags'."
3330
3321
msgstr ""
3331
3322
3332
#: bzrlib/builtins.py:5276
3323
#: bzrlib/builtins.py:5278
3333
3324
msgid ""
3334
3325
"The TREE argument should be a subdirectory of a working tree. That\n"
3335
3326
"subdirectory will be converted into an independent tree, with its own\n"
3336
3327
"branch. Commits in the top-level tree will not apply to the new subtree."
3337
3328
msgstr ""
3338
3329
3339
#: bzrlib/builtins.py:5356
3330
#: bzrlib/builtins.py:5358
3340
3331
msgid "No submit branch specified or known"
3341
3332
msgstr ""
3342
3333
3343
#: bzrlib/builtins.py:5364
3334
#: bzrlib/builtins.py:5366
3344
3335
msgid "No public branch specified or known"
3345
3336
msgstr ""
3346
3337
3347
#: bzrlib/builtins.py:5369
3338
#: bzrlib/builtins.py:5371
3348
3339
msgid "bzr merge-directive takes at most two one revision identifiers"
3349
3340
msgstr ""
3350
3341
3351
#: bzrlib/builtins.py:5378
3342
#: bzrlib/builtins.py:5380
3352
3343
msgid "No revisions to bundle."
3353
3344
msgstr ""
3354
3345
3355
#: bzrlib/builtins.py:5397
3346
#: bzrlib/builtins.py:5399
3356
3347
msgid "Mail or create a merge-directive for submitting changes."
3357
3348
msgstr ""
3358
3349
3359
#: bzrlib/builtins.py:5399
3350
#: bzrlib/builtins.py:5401
3360
3351
msgid "A merge directive provides many things needed for requesting merges:"
3361
3352
msgstr ""
3362
3353
3363
#: bzrlib/builtins.py:5401
3354
#: bzrlib/builtins.py:5403
3364
3355
msgid "* A machine-readable description of the merge to perform"
3365
3356
msgstr ""
3366
3357
3367
#: bzrlib/builtins.py:5403
3358
#: bzrlib/builtins.py:5405
3368
3359
msgid "* An optional patch that is a preview of the changes requested"
3369
3360
msgstr ""
3370
3361
3371
#: bzrlib/builtins.py:5405
3362
#: bzrlib/builtins.py:5407
3372
3363
msgid ""
3373
3364
"* An optional bundle of revision data, so that the changes can be applied\n"
3374
3365
" directly from the merge directive, without retrieving data from a\n"
3375
3366
" branch."
3376
3367
msgstr ""
3377
3368
3378
#: bzrlib/builtins.py:5409
3369
#: bzrlib/builtins.py:5411
3379
3370
msgid ""
3380
3371
"`bzr send` creates a compact data set that, when applied using bzr\n"
3381
3372
"merge, has the same effect as merging from the source branch. "
3382
3373
msgstr ""
3383
3374
3384
#: bzrlib/builtins.py:5412
3375
#: bzrlib/builtins.py:5414
3385
3376
msgid ""
3386
3377
"By default the merge directive is self-contained and can be applied to any\n"
3387
3378
"branch containing submit_branch in its ancestory without needing access to\n"
3388
3379
"the source branch."
3389
3380
msgstr ""
3390
3381
3391
#: bzrlib/builtins.py:5416
3382
#: bzrlib/builtins.py:5418
3392
3383
msgid ""
3393
3384
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3394
3385
"revisions, but only a structured request to merge from the\n"
3397
3388
"included if known, so that people can check it later."
3398
3389
msgstr ""
3399
3390
3400
#: bzrlib/builtins.py:5422
3391
#: bzrlib/builtins.py:5424
3401
3392
msgid ""
3402
3393
"The submit branch defaults to the parent of the source branch, but can be\n"
3403
3394
"overridden. Both submit branch and public branch will be remembered in\n"
3406
3397
"be changed using --from."
3407
3398
msgstr ""
3408
3399
3409
#: bzrlib/builtins.py:5428
3400
#: bzrlib/builtins.py:5430
3410
3401
msgid ""
3411
3402
"Both the submit branch and the public branch follow the usual behavior with\n"
3412
3403
"respect to --remember: If there is no default location set, the first send\n"
3415
3406
"--remember. The value will only be saved if the location can be accessed."
3416
3407
msgstr ""
3417
3408
3418
#: bzrlib/builtins.py:5434
3409
#: bzrlib/builtins.py:5436
3419
3410
msgid ""
3420
3411
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3421
3412
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3423
3414
"in the merge directive."
3424
3415
msgstr ""
3425
3416
3426
#: bzrlib/builtins.py:5439
3417
#: bzrlib/builtins.py:5441
3427
3418
msgid ""
3428
3419
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3429
3420
"given, in which case it is sent to a file."
3430
3421
msgstr ""
3431
3422
3432
#: bzrlib/builtins.py:5442
3423
#: bzrlib/builtins.py:5444
3433
3424
msgid ""
3434
3425
"Mail is sent using your preferred mail program. This should be transparent\n"
3435
3426
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3436
3427
"If the preferred client can't be found (or used), your editor will be used."
3437
3428
msgstr ""
3438
3429
3439
#: bzrlib/builtins.py:5446
3430
#: bzrlib/builtins.py:5448
3440
3431
msgid ""
3441
3432
"To use a specific mail program, set the mail_client configuration option.\n"
3442
3433
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3448
3439
"supported clients."
3449
3440
msgstr ""
3450
3441
3451
#: bzrlib/builtins.py:5453
3442
#: bzrlib/builtins.py:5455
3452
3443
msgid ""
3453
3444
"If mail is being sent, a to address is required. This can be supplied\n"
3454
3445
"either on the commandline, by setting the submit_to configuration\n"
3456
3447
"in the submit branch."
3457
3448
msgstr ""
3458
3449
3459
#: bzrlib/builtins.py:5458
3450
#: bzrlib/builtins.py:5460
3460
3451
msgid ""
3461
3452
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3462
3453
"and\n"
3466
3457
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3467
3458
msgstr ""
3468
3459
3469
#: bzrlib/builtins.py:5464
3460
#: bzrlib/builtins.py:5466
3470
3461
msgid ""
3471
3462
"The merge directives created by bzr send may be applied using bzr merge or\n"
3472
3463
"bzr pull by specifying a file containing a merge directive as the location."
3473
3464
msgstr ""
3474
3465
3475
#: bzrlib/builtins.py:5467
3466
#: bzrlib/builtins.py:5469
3476
3467
msgid ""
3477
3468
"bzr send makes extensive use of public locations to map local locations "
3478
3469
"into\n"
3481
3472
msgstr ""
3482
3473
3483
3474
# help of 'output' option of 'send' command
3484
#: bzrlib/builtins.py:5491
3475
#: bzrlib/builtins.py:5493
3485
3476
msgid "Write merge directive to this file or directory; use - for stdout."
3486
3477
msgstr ""
3487
3478
3488
3479
# help of 'strict' option of 'send' command
3489
#: bzrlib/builtins.py:5495
3480
#: bzrlib/builtins.py:5497
3490
3481
msgid ""
3491
3482
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3492
3483
"strict disables the check."
3493
3484
msgstr ""
3494
3485
3495
3486
# help of 'mail-to' option of 'send' command
3496
#: bzrlib/builtins.py:5497
3487
#: bzrlib/builtins.py:5499
3497
3488
msgid "Mail the request to this address."
3498
3489
msgstr ""
3499
3490
3500
3491
# help of 'body' option of 'send' command
3501
#: bzrlib/builtins.py:5501
3492
#: bzrlib/builtins.py:5503
3502
3493
msgid "Body for the email."
3503
3494
msgstr ""
3504
3495
3505
3496
# help of 'no-bundle' option of 'send' command
3506
#: bzrlib/builtins.py:5554
3497
#: bzrlib/builtins.py:5556
3507
3498
msgid "Do not include a bundle in the merge directive."
3508
3499
msgstr ""
3509
3500
3510
3501
# help of 'no-patch' option of 'send' command
3511
#: bzrlib/builtins.py:5555
3502
#: bzrlib/builtins.py:5557
3512
3503
msgid "Do not include a preview patch in the merge directive."
3513
3504
msgstr ""
3514
3505
3515
3506
# help of 'remember' option of 'send' command
3516
#: bzrlib/builtins.py:5558
3507
#: bzrlib/builtins.py:5560
3517
3508
msgid "Remember submit and public branch."
3518
3509
msgstr ""
3519
3510
3520
3511
# help of 'from' option of 'send' command
3521
#: bzrlib/builtins.py:5560
3512
#: bzrlib/builtins.py:5562
3522
3513
msgid ""
3523
3514
"Branch to generate the submission from, rather than the one containing the "
3524
3515
"working directory."
3525
3516
msgstr ""
3526
3517
3527
3518
# title of 'format' option of 'send' command
3528
#: bzrlib/builtins.py:5570
3519
#: bzrlib/builtins.py:5572
3529
3520
msgid "format"
3530
3521
msgstr ""
3531
3522
3532
3523
# help of 'format' option of 'send' command
3533
#: bzrlib/builtins.py:5571
3524
#: bzrlib/builtins.py:5573
3534
3525
msgid "Use the specified output format."
3535
3526
msgstr ""
3536
3527
3537
#: bzrlib/builtins.py:5593
3528
#: bzrlib/builtins.py:5595
3538
3529
msgid "Create, remove or modify a tag naming a revision."
3539
3530
msgstr ""
3540
3531
3541
#: bzrlib/builtins.py:5595
3532
#: bzrlib/builtins.py:5597
3542
3533
msgid ""
3543
3534
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3544
3535
"(--revision) option can be given -rtag:X, where X is any previously\n"
3545
3536
"created tag."
3546
3537
msgstr ""
3547
3538
3548
#: bzrlib/builtins.py:5599
3539
#: bzrlib/builtins.py:5601
3549
3540
msgid ""
3550
3541
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3551
3542
"along when you branch, push, pull or merge."
3552
3543
msgstr ""
3553
3544
3554
#: bzrlib/builtins.py:5602
3545
#: bzrlib/builtins.py:5604
3555
3546
msgid ""
3556
3547
"It is an error to give a tag name that already exists unless you pass\n"
3557
3548
"--force, in which case the tag is moved to point to the new revision."
3558
3549
msgstr ""
3559
3550
3560
#: bzrlib/builtins.py:5605
3551
#: bzrlib/builtins.py:5607
3561
3552
msgid ""
3562
3553
"To rename a tag (change the name but keep it on the same revsion), run "
3563
3554
"``bzr\n"
3564
3555
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3565
3556
msgstr ""
3566
3557
3567
#: bzrlib/builtins.py:5608
3558
#: bzrlib/builtins.py:5610
3568
3559
msgid ""
3569
3560
"If no tag name is specified it will be determined through the \n"
3570
3561
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3573
3564
msgstr ""
3574
3565
3575
3566
# help of 'delete' option of 'tag' command
3576
#: bzrlib/builtins.py:5618
3567
#: bzrlib/builtins.py:5620
3577
3568
msgid "Delete this tag rather than placing it."
3578
3569
msgstr ""
3579
3570
3580
3571
# help of 'directory' option of 'tag' command
3581
#: bzrlib/builtins.py:5621
3572
#: bzrlib/builtins.py:5623
3582
3573
msgid "Branch in which to place the tag."
3583
3574
msgstr ""
3584
3575
3585
3576
# help of 'force' option of 'tag' command
3586
#: bzrlib/builtins.py:5623
3577
#: bzrlib/builtins.py:5625
3587
3578
msgid "Replace existing tags."
3588
3579
msgstr ""
3589
3580
3590
#: bzrlib/builtins.py:5638
3581
#: bzrlib/builtins.py:5640
3591
3582
msgid "No tag specified to delete."
3592
3583
msgstr ""
3593
3584
3594
#: bzrlib/builtins.py:5640
3585
#: bzrlib/builtins.py:5642
3595
3586
#, python-format
3596
3587
msgid "Deleted tag %s."
3597
3588
msgstr ""
3598
3589
3599
#: bzrlib/builtins.py:5645
3590
#: bzrlib/builtins.py:5647
3600
3591
msgid "Tags can only be placed on a single revision, not on a range"
3601
3592
msgstr ""
3602
3593
3603
#: bzrlib/builtins.py:5654
3594
#: bzrlib/builtins.py:5656
3604
3595
msgid "Please specify a tag name."
3605
3596
msgstr ""
3606
3597
3607
#: bzrlib/builtins.py:5662
3598
#: bzrlib/builtins.py:5664
3608
3599
#, python-format
3609
3600
msgid "Tag %s already exists for that revision."
3610
3601
msgstr ""
3611
3602
3612
#: bzrlib/builtins.py:5666
3603
#: bzrlib/builtins.py:5668
3613
3604
#, python-format
3614
3605
msgid "Created tag %s."
3615
3606
msgstr ""
3616
3607
3617
#: bzrlib/builtins.py:5668
3608
#: bzrlib/builtins.py:5670
3618
3609
#, python-format
3619
3610
msgid "Updated tag %s."
3620
3611
msgstr ""
3621
3612
3622
#: bzrlib/builtins.py:5672
3613
#: bzrlib/builtins.py:5674
3623
3614
msgid "List tags."
3624
3615
msgstr ""
3625
3616
3626
#: bzrlib/builtins.py:5674
3617
#: bzrlib/builtins.py:5676
3627
3618
msgid ""
3628
3619
"This command shows a table of tag names and the revisions they reference."
3629
3620
msgstr ""
3630
3621
3631
3622
# help of 'directory' option of 'tags' command
3632
#: bzrlib/builtins.py:5680
3623
#: bzrlib/builtins.py:5682
3633
3624
msgid "Branch whose tags should be displayed."
3634
3625
msgstr ""
3635
3626
3636
3627
# help of 'sort' option of 'tags' command
3637
#: bzrlib/builtins.py:5682
3628
#: bzrlib/builtins.py:5684
3638
3629
msgid "Sort tags by different criteria."
3639
3630
msgstr ""
3640
3631
3641
3632
# title of 'sort' option of 'tags' command
3642
#: bzrlib/builtins.py:5682
3633
#: bzrlib/builtins.py:5684
3643
3634
msgid "Sorting"
3644
3635
msgstr ""
3645
3636
3646
#: bzrlib/builtins.py:5727
3637
#: bzrlib/builtins.py:5729
3647
3638
msgid "Reconfigure the type of a bzr directory."
3648
3639
msgstr ""
3649
3640
3650
#: bzrlib/builtins.py:5729
3641
#: bzrlib/builtins.py:5731
3651
3642
msgid "A target configuration must be specified."
3652
3643
msgstr ""
3653
3644
3654
#: bzrlib/builtins.py:5731
3645
#: bzrlib/builtins.py:5733
3655
3646
msgid ""
3656
3647
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3657
3648
"The order of preference is\n"
3663
3654
msgstr ""
3664
3655
3665
3656
# title of 'tree_type' option of 'reconfigure' command
3666
#: bzrlib/builtins.py:5745
3657
#: bzrlib/builtins.py:5747
3667
3658
msgid "Tree type"
3668
3659
msgstr ""
3669
3660
3670
3661
# help of 'tree_type' option of 'reconfigure' command
3671
#: bzrlib/builtins.py:5746
3662
#: bzrlib/builtins.py:5748
3672
3663
msgid "The relation between branch and tree."
3673
3664
msgstr ""
3674
3665
3675
3666
# title of 'repository_type' option of 'reconfigure' command
3676
#: bzrlib/builtins.py:5756
3667
#: bzrlib/builtins.py:5758
3677
3668
msgid "Repository type"
3678
3669
msgstr ""
3679
3670
3680
3671
# help of 'repository_type' option of 'reconfigure' command
3681
#: bzrlib/builtins.py:5757
3672
#: bzrlib/builtins.py:5759
3682
3673
msgid "Location fo the repository."
3683
3674
msgstr ""
3684
3675
3685
3676
# title of 'repository_trees' option of 'reconfigure' command
3686
#: bzrlib/builtins.py:5765
3677
#: bzrlib/builtins.py:5767
3687
3678
msgid "Trees in Repository"
3688
3679
msgstr ""
3689
3680
3690
3681
# help of 'repository_trees' option of 'reconfigure' command
3691
#: bzrlib/builtins.py:5766
3682
#: bzrlib/builtins.py:5768
3692
3683
msgid "Whether new branches in the repository have trees."
3693
3684
msgstr ""
3694
3685
3695
3686
# help of 'bind-to' option of 'reconfigure' command
3696
#: bzrlib/builtins.py:5773
3687
#: bzrlib/builtins.py:5775
3697
3688
msgid "Branch to bind checkout to."
3698
3689
msgstr ""
3699
3690
3700
3691
# help of 'force' option of 'reconfigure' command
3701
#: bzrlib/builtins.py:5775
3692
#: bzrlib/builtins.py:5777
3702
3693
msgid "Perform reconfiguration even if local changes will be lost."
3703
3694
msgstr ""
3704
3695
3705
3696
# help of 'stacked-on' option of 'reconfigure' command
3706
#: bzrlib/builtins.py:5778
3697
#: bzrlib/builtins.py:5780
3707
3698
msgid "Reconfigure a branch to be stacked on another branch."
3708
3699
msgstr ""
3709
3700
3710
3701
# help of 'unstacked' option of 'reconfigure' command
3711
#: bzrlib/builtins.py:5782
3702
#: bzrlib/builtins.py:5784
3712
3703
msgid ""
3713
3704
"Reconfigure a branch to be unstacked. This may require copying substantial "
3714
3705
"data into it."
3715
3706
msgstr ""
3716
3707
3717
#: bzrlib/builtins.py:5792
3708
#: bzrlib/builtins.py:5794
3718
3709
msgid "Can't use both --stacked-on and --unstacked"
3719
3710
msgstr ""
3720
3711
3721
#: bzrlib/builtins.py:5806
3712
#: bzrlib/builtins.py:5808
3722
3713
msgid "No target configuration specified"
3723
3714
msgstr ""
3724
3715
3725
#: bzrlib/builtins.py:5841
3716
#: bzrlib/builtins.py:5843
3726
3717
msgid "Set the branch of a checkout and update."
3727
3718
msgstr ""
3728
3719
3729
#: bzrlib/builtins.py:5843
3720
#: bzrlib/builtins.py:5845
3730
3721
msgid ""
3731
3722
"For lightweight checkouts, this changes the branch being referenced.\n"
3732
3723
"For heavyweight checkouts, this checks that there are no local commits\n"
3734
3725
"of the new location and binds to it."
3735
3726
msgstr ""
3736
3727
3737
#: bzrlib/builtins.py:5848
3728
#: bzrlib/builtins.py:5850
3738
3729
msgid ""
3739
3730
"In both cases, the working tree is updated and uncommitted changes\n"
3740
3731
"are merged. The user can commit or revert these as they desire."
3741
3732
msgstr ""
3742
3733
3743
#: bzrlib/builtins.py:5851
3734
#: bzrlib/builtins.py:5853
3744
3735
msgid "Pending merges need to be committed or reverted before using switch."
3745
3736
msgstr ""
3746
3737
3747
#: bzrlib/builtins.py:5853
3738
#: bzrlib/builtins.py:5855
3748
3739
msgid ""
3749
3740
"The path to the branch to switch to can be specified relative to the parent\n"
3750
3741
"directory of the current branch. For example, if you are currently in a\n"
3752
3743
"/path/to/newbranch."
3753
3744
msgstr ""
3754
3745
3755
#: bzrlib/builtins.py:5858
3746
#: bzrlib/builtins.py:5860
3756
3747
msgid ""
3757
3748
"Bound branches use the nickname of its master branch unless it is set\n"
3758
3749
"locally, in which case switching will update the local nickname to be\n"
3760
3751
msgstr ""
3761
3752
3762
3753
# help of 'force' option of 'switch' command
3763
#: bzrlib/builtins.py:5866
3754
#: bzrlib/builtins.py:5868
3764
3755
msgid "Switch even if local commits will be lost."
3765
3756
msgstr ""
3766
3757
3767
3758
# help of 'create-branch' option of 'switch' command
3768
#: bzrlib/builtins.py:5869
3759
#: bzrlib/builtins.py:5871
3769
3760
msgid "Create the target branch from this one before switching to it."
3770
3761
msgstr ""
3771
3762
3772
#: bzrlib/builtins.py:5881
3763
#: bzrlib/builtins.py:5883
3773
3764
msgid "You must supply either a revision or a location"
3774
3765
msgstr ""
3775
3766
3776
#: bzrlib/builtins.py:5892
3767
#: bzrlib/builtins.py:5894
3777
3768
msgid "cannot create branch without source branch"
3778
3769
msgstr ""
3779
3770
3780
#: bzrlib/builtins.py:5938
3771
#: bzrlib/builtins.py:5940
3781
3772
msgid "Manage filtered views."
3782
3773
msgstr ""
3783
3774
3784
#: bzrlib/builtins.py:5940
3775
#: bzrlib/builtins.py:5942
3785
3776
msgid ""
3786
3777
"Views provide a mask over the tree so that users can focus on\n"
3787
3778
"a subset of a tree when doing their work. After creating a view,\n"
3791
3782
"must be within the current view."
3792
3783
msgstr ""
3793
3784
3794
#: bzrlib/builtins.py:5947
3785
#: bzrlib/builtins.py:5949
3795
3786
msgid ""
3796
3787
"In most cases, a view has a short life-span: it is created to make\n"
3797
3788
"a selected change and is deleted once that change is committed.\n"
3799
3790
"and switch between them."
3800
3791
msgstr ""
3801
3792
3802
#: bzrlib/builtins.py:5952
3793
#: bzrlib/builtins.py:5954
3803
3794
msgid ""
3804
3795
"To disable the current view without deleting it, you can switch to\n"
3805
3796
"the pseudo view called ``off``. This can be useful when you need\n"
3807
3798
"want to switch back to your view after that."
3808
3799
msgstr ""
3809
3800
3810
#: bzrlib/builtins.py:5957
3801
#: bzrlib/builtins.py:5959
3811
3802
msgid ""
3812
3803
":Examples:\n"
3813
3804
" To define the current view::"
3814
3805
msgstr ""
3815
3806
3816
#: bzrlib/builtins.py:5960
3807
#: bzrlib/builtins.py:5962
3817
3808
msgid " bzr view file1 dir1 ..."
3818
3809
msgstr ""
3819
3810
3820
#: bzrlib/builtins.py:5962
3811
#: bzrlib/builtins.py:5964
3821
3812
msgid " To list the current view::"
3822
3813
msgstr ""
3823
3814
3824
#: bzrlib/builtins.py:5964
3815
#: bzrlib/builtins.py:5966
3825
3816
msgid " bzr view"
3826
3817
msgstr ""
3827
3818
3828
#: bzrlib/builtins.py:5966
3819
#: bzrlib/builtins.py:5968
3829
3820
msgid " To delete the current view::"
3830
3821
msgstr ""
3831
3822
3832
#: bzrlib/builtins.py:5968
3823
#: bzrlib/builtins.py:5970
3833
3824
msgid " bzr view --delete"
3834
3825
msgstr ""
3835
3826
3836
#: bzrlib/builtins.py:5970
3827
#: bzrlib/builtins.py:5972
3837
3828
msgid " To disable the current view without deleting it::"
3838
3829
msgstr ""
3839
3830
3840
#: bzrlib/builtins.py:5972
3831
#: bzrlib/builtins.py:5974
3841
3832
msgid " bzr view --switch off"
3842
3833
msgstr ""
3843
3834
3844
#: bzrlib/builtins.py:5974
3835
#: bzrlib/builtins.py:5976
3845
3836
msgid " To define a named view and switch to it::"
3846
3837
msgstr ""
3847
3838
3848
#: bzrlib/builtins.py:5976
3839
#: bzrlib/builtins.py:5978
3849
3840
msgid " bzr view --name view-name file1 dir1 ..."
3850
3841
msgstr ""
3851
3842
3852
#: bzrlib/builtins.py:5978
3843
#: bzrlib/builtins.py:5980
3853
3844
msgid " To list a named view::"
3854
3845
msgstr ""
3855
3846
3856
#: bzrlib/builtins.py:5980
3847
#: bzrlib/builtins.py:5982
3857
3848
msgid " bzr view --name view-name"
3858
3849
msgstr ""
3859
3850
3860
#: bzrlib/builtins.py:5982
3851
#: bzrlib/builtins.py:5984
3861
3852
msgid " To delete a named view::"
3862
3853
msgstr ""
3863
3854
3864
#: bzrlib/builtins.py:5984
3855
#: bzrlib/builtins.py:5986
3865
3856
msgid " bzr view --name view-name --delete"
3866
3857
msgstr ""
3867
3858
3868
#: bzrlib/builtins.py:5986
3859
#: bzrlib/builtins.py:5988
3869
3860
msgid " To switch to a named view::"
3870
3861
msgstr ""
3871
3862
3872
#: bzrlib/builtins.py:5988
3863
#: bzrlib/builtins.py:5990
3873
3864
msgid " bzr view --switch view-name"
3874
3865
msgstr ""
3875
3866
3876
#: bzrlib/builtins.py:5990
3867
#: bzrlib/builtins.py:5992
3877
3868
msgid " To list all views defined::"
3878
3869
msgstr ""
3879
3870
3880
#: bzrlib/builtins.py:5992
3871
#: bzrlib/builtins.py:5994
3881
3872
msgid " bzr view --all"
3882
3873
msgstr ""
3883
3874
3884
#: bzrlib/builtins.py:5994
3875
#: bzrlib/builtins.py:5996
3885
3876
msgid " To delete all views::"
3886
3877
msgstr ""
3887
3878
3888
#: bzrlib/builtins.py:5996
3879
#: bzrlib/builtins.py:5998
3889
3880
msgid " bzr view --delete --all"
3890
3881
msgstr ""
3891
3882
3892
3883
# help of 'all' option of 'view' command
3893
#: bzrlib/builtins.py:6003
3884
#: bzrlib/builtins.py:6005
3894
3885
msgid "Apply list or delete action to all views."
3895
3886
msgstr ""
3896
3887
3897
3888
# help of 'delete' option of 'view' command
3898
#: bzrlib/builtins.py:6006
3889
#: bzrlib/builtins.py:6008
3899
3890
msgid "Delete the view."
3900
3891
msgstr ""
3901
3892
3902
3893
# help of 'name' option of 'view' command
3903
#: bzrlib/builtins.py:6009
3894
#: bzrlib/builtins.py:6011
3904
3895
msgid "Name of the view to define, list or delete."
3905
3896
msgstr ""
3906
3897
3907
3898
# help of 'switch' option of 'view' command
3908
#: bzrlib/builtins.py:6013
3899
#: bzrlib/builtins.py:6015
3909
3900
msgid "Name of the view to switch to."
3910
3901
msgstr ""
3911
3902
3912
#: bzrlib/builtins.py:6032
3903
#: bzrlib/builtins.py:6034
3913
3904
msgid "Both --delete and a file list specified"
3914
3905
msgstr ""
3915
3906
3916
#: bzrlib/builtins.py:6035
3907
#: bzrlib/builtins.py:6037
3917
3908
msgid "Both --delete and --switch specified"
3918
3909
msgstr ""
3919
3910
3920
#: bzrlib/builtins.py:6038
3911
#: bzrlib/builtins.py:6040
3921
3912
msgid "Deleted all views.\n"
3922
3913
msgstr ""
3923
3914
3924
#: bzrlib/builtins.py:6040
3915
#: bzrlib/builtins.py:6042
3925
3916
msgid "No current view to delete"
3926
3917
msgstr ""
3927
3918
3928
#: bzrlib/builtins.py:6043
3919
#: bzrlib/builtins.py:6045
3929
3920
#, python-format
3930
3921
msgid "Deleted '%s' view.\n"
3931
3922
msgstr ""
3932
3923
3933
#: bzrlib/builtins.py:6047
3924
#: bzrlib/builtins.py:6049
3934
3925
msgid "Both --switch and a file list specified"
3935
3926
msgstr ""
3936
3927
3937
#: bzrlib/builtins.py:6050
3928
#: bzrlib/builtins.py:6052
3938
3929
msgid "Both --switch and --all specified"
3939
3930
msgstr ""
3940
3931
3941
#: bzrlib/builtins.py:6053
3932
#: bzrlib/builtins.py:6055
3942
3933
msgid "No current view to disable"
3943
3934
msgstr ""
3944
3935
3945
#: bzrlib/builtins.py:6055
3936
#: bzrlib/builtins.py:6057
3946
3937
#, python-format
3947
3938
msgid "Disabled '%s' view.\n"
3948
3939
msgstr ""
3949
3940
3950
#: bzrlib/builtins.py:6059 bzrlib/builtins.py:6081
3951
#, python-format
3952
msgid "Using '%s' view: %s\n"
3941
#: bzrlib/builtins.py:6061 bzrlib/builtins.py:6083
3942
msgid "Using '{0}' view: {1}\n"
3953
3943
msgstr ""
3954
3944
3955
#: bzrlib/builtins.py:6062
3945
#: bzrlib/builtins.py:6064
3956
3946
msgid "Views defined:\n"
3957
3947
msgstr ""
3958
3948
3959
#: bzrlib/builtins.py:6071
3949
#: bzrlib/builtins.py:6073
3960
3950
msgid "No views defined.\n"
3961
3951
msgstr ""
3962
3952
3963
#: bzrlib/builtins.py:6078
3953
#: bzrlib/builtins.py:6080
3964
3954
msgid "Cannot change the 'off' pseudo view"
3965
3955
msgstr ""
3966
3956
3967
#: bzrlib/builtins.py:6086
3957
#: bzrlib/builtins.py:6088
3968
3958
msgid "No current view.\n"
3969
3959
msgstr ""
3970
3960
3971
#: bzrlib/builtins.py:6089
3972
#, python-format
3973
msgid "'%s' view is: %s\n"
3961
#: bzrlib/builtins.py:6091
3962
msgid "'{0}' view is: {1}\n"
3974
3963
msgstr ""
3975
3964
3976
#: bzrlib/builtins.py:6109
3965
#: bzrlib/builtins.py:6111
3977
3966
msgid " <no hooks installed>\n"
3978
3967
msgstr ""
3979
3968
3980
#: bzrlib/builtins.py:6113
3969
#: bzrlib/builtins.py:6115
3981
3970
msgid "Remove a branch."
3982
3971
msgstr ""
3983
3972
3984
#: bzrlib/builtins.py:6115
3973
#: bzrlib/builtins.py:6117
3985
3974
msgid ""
3986
3975
"This will remove the branch from the specified location but \n"
3987
3976
"will keep any working tree or repository in place."
3988
3977
msgstr ""
3989
3978
3990
#: bzrlib/builtins.py:6120
3979
#: bzrlib/builtins.py:6122
3991
3980
msgid " Remove the branch at repo/trunk::"
3992
3981
msgstr ""
3993
3982
3994
#: bzrlib/builtins.py:6122
3983
#: bzrlib/builtins.py:6124
3995
3984
msgid " bzr remove-branch repo/trunk"
3996
3985
msgstr ""
3997
3986
3998
#: bzrlib/builtins.py:6138
3987
#: bzrlib/builtins.py:6140
3999
3988
msgid "Temporarily set aside some changes from the current tree."
4000
3989
msgstr ""
4001
3990
4002
#: bzrlib/builtins.py:6140
3991
#: bzrlib/builtins.py:6142
4003
3992
msgid ""
4004
3993
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4005
3994
"ie. out of the way, until a later time when you can bring them back from\n"
4008
3997
"will they survive its deletion."
4009
3998
msgstr ""
4010
3999
4011
#: bzrlib/builtins.py:6146
4000
#: bzrlib/builtins.py:6148
4012
4001
msgid "If shelve --list is specified, previously-shelved changes are listed."
4013
4002
msgstr ""
4014
4003
4015
#: bzrlib/builtins.py:6148
4004
#: bzrlib/builtins.py:6150
4016
4005
msgid ""
4017
4006
"Shelve is intended to help separate several sets of changes that have\n"
4018
4007
"been inappropriately mingled. If you just want to get rid of all changes\n"
4020
4009
"shelve all text changes at once, use shelve --all."
4021
4010
msgstr ""
4022
4011
4023
#: bzrlib/builtins.py:6153
4012
#: bzrlib/builtins.py:6155
4024
4013
msgid ""
4025
4014
"If filenames are specified, only the changes to those files will be\n"
4026
4015
"shelved. Other files will be left untouched."
4027
4016
msgstr ""
4028
4017
4029
#: bzrlib/builtins.py:6156
4018
#: bzrlib/builtins.py:6158
4030
4019
msgid ""
4031
4020
"If a revision is specified, changes since that revision will be shelved."
4032
4021
msgstr ""
4033
4022
4034
#: bzrlib/builtins.py:6158
4023
#: bzrlib/builtins.py:6160
4035
4024
msgid ""
4036
4025
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4037
4026
"restore the most recently shelved changes."
4038
4027
msgstr ""
4039
4028
4040
#: bzrlib/builtins.py:6161
4029
#: bzrlib/builtins.py:6163
4041
4030
msgid ""
4042
4031
"For complicated changes, it is possible to edit the changes in a separate\n"
4043
4032
"editor program to decide what the file remaining in the working copy\n"
4044
4033
"should look like. To do this, add the configuration option"
4045
4034
msgstr ""
4046
4035
4047
#: bzrlib/builtins.py:6165
4036
#: bzrlib/builtins.py:6167
4048
4037
msgid " change_editor = PROGRAM @new_path @old_path"
4049
4038
msgstr ""
4050
4039
4051
#: bzrlib/builtins.py:6167
4040
#: bzrlib/builtins.py:6169
4052
4041
msgid ""
4053
4042
"where @new_path is replaced with the path of the new version of the \n"
4054
4043
"file and @old_path is replaced with the path of the old version of \n"
4058
4047
msgstr ""
4059
4048
4060
4049
# help of 'all' option of 'shelve' command
4061
#: bzrlib/builtins.py:6179
4050
#: bzrlib/builtins.py:6181
4062
4051
msgid "Shelve all changes."
4063
4052
msgstr ""
4064
4053
4065
4054
# help of 'writer' option of 'shelve' command
4066
#: bzrlib/builtins.py:6181
4055
#: bzrlib/builtins.py:6183
4067
4056
msgid "Method to use for writing diffs."
4068
4057
msgstr ""
4069
4058
4070
4059
# title of 'writer' option of 'shelve' command
4071
#: bzrlib/builtins.py:6181
4060
#: bzrlib/builtins.py:6183
4072
4061
msgid "writer"
4073
4062
msgstr ""
4074
4063
4075
4064
# help of 'list' option of 'shelve' command
4076
#: bzrlib/builtins.py:6185
4065
#: bzrlib/builtins.py:6187
4077
4066
msgid "List shelved changes."
4078
4067
msgstr ""
4079
4068
4080
4069
# help of 'destroy' option of 'shelve' command
4081
#: bzrlib/builtins.py:6187
4070
#: bzrlib/builtins.py:6189
4082
4071
msgid "Destroy removed changes instead of shelving them."
4083
4072
msgstr ""
4084
4073
4085
#: bzrlib/builtins.py:6216
4074
#: bzrlib/builtins.py:6218
4086
4075
msgid "No shelved changes."
4087
4076
msgstr ""
4088
4077
4089
#: bzrlib/builtins.py:6227
4078
#: bzrlib/builtins.py:6229
4090
4079
msgid "Restore shelved changes."
4091
4080
msgstr ""
4092
4081
4093
#: bzrlib/builtins.py:6229
4082
#: bzrlib/builtins.py:6231
4094
4083
msgid ""
4095
4084
"By default, the most recently shelved changes are restored. However if you\n"
4096
4085
"specify a shelf by id those changes will be restored instead. This works\n"
4098
4087
msgstr ""
4099
4088
4100
4089
# help of 'action' option of 'unshelve' command
4101
#: bzrlib/builtins.py:6238
4090
#: bzrlib/builtins.py:6240
4102
4091
msgid "The action to perform."
4103
4092
msgstr ""
4104
4093
4105
#: bzrlib/builtins.py:6260
4094
#: bzrlib/builtins.py:6262
4106
4095
msgid "Remove unwanted files from working tree."
4107
4096
msgstr ""
4108
4097
4109
#: bzrlib/builtins.py:6262
4098
#: bzrlib/builtins.py:6264
4110
4099
msgid ""
4111
4100
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4112
4101
"files are never deleted."
4113
4102
msgstr ""
4114
4103
4115
#: bzrlib/builtins.py:6265
4104
#: bzrlib/builtins.py:6267
4116
4105
msgid ""
4117
4106
"Another class is 'detritus', which includes files emitted by bzr during\n"
4118
4107
"normal operations and selftests. (The value of these files decreases with\n"
4119
4108
"time.)"
4120
4109
msgstr ""
4121
4110
4122
#: bzrlib/builtins.py:6269
4111
#: bzrlib/builtins.py:6271
4123
4112
msgid ""
4124
4113
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4125
4114
"flags are respected, and may be combined."
4126
4115
msgstr ""
4127
4116
4128
#: bzrlib/builtins.py:6272
4117
#: bzrlib/builtins.py:6274
4129
4118
msgid "To check what clean-tree will do, use --dry-run."
4130
4119
msgstr ""
4131
4120
4132
4121
# help of 'ignored' option of 'clean-tree' command
4133
#: bzrlib/builtins.py:6275
4122
#: bzrlib/builtins.py:6277
4134
4123
msgid "Delete all ignored files."
4135
4124
msgstr ""
4136
4125
4137
4126
# help of 'detritus' option of 'clean-tree' command
4138
#: bzrlib/builtins.py:6276
4127
#: bzrlib/builtins.py:6278
4139
4128
msgid ""
4140
4129
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4141
4130
msgstr ""
4142
4131
4143
4132
# help of 'unknown' option of 'clean-tree' command
4144
#: bzrlib/builtins.py:6279
4133
#: bzrlib/builtins.py:6281
4145
4134
msgid "Delete files unknown to bzr (default)."
4146
4135
msgstr ""
4147
4136
4148
4137
# help of 'dry-run' option of 'clean-tree' command
4149
#: bzrlib/builtins.py:6280
4138
#: bzrlib/builtins.py:6282
4150
4139
msgid "Show files to delete instead of deleting them."
4151
4140
msgstr ""
4152
4141
4153
4142
# help of 'force' option of 'clean-tree' command
4154
#: bzrlib/builtins.py:6282
4143
#: bzrlib/builtins.py:6284
4155
4144
msgid "Do not prompt before deleting."
4156
4145
msgstr ""
4157
4146
6039
6028
6040
6029
#: dummy/help_topics/basic/detail.txt:1
6041
6030
msgid ""
6042
"Bazaar 2.5.0dev1 -- a free distributed version-control tool\n"
6031
"Bazaar 2.5.0dev2 -- a free distributed version-control tool\n"
6043
6032
"http://bazaar.canonical.com/"
6044
6033
msgstr ""
6045
6034
7602
7591
"fetch-ghosts Attempt to retrieve ghosts from another branch. "
7603
7592
"[bzrtools]\n"
7604
7593
"graph-ancestry Produce ancestry graphs using dot. [bzrtools]\n"
7605
"grep Print lines matching PATTERN for specified files and\n"
7606
" revisions. [grep]\n"
7607
7594
"heads Show all revisions in a repository not having "
7608
7595
"descendants.\n"
7609
7596
" [bzrtools]\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1