1
1
# Galician translation for bzr
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
8
8
"Project-Id-Version: bzr\n"
9
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2011-09-16 21:13+0000\n"
12
"Last-Translator: Fran DiƩguez <Unknown>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
13
"Language-Team: Galician <gl@li.org>\n"
14
14
"MIME-Version: 1.0\n"
15
15
"Content-Type: text/plain; charset=UTF-8\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-07-11 04:32+0000\n"
19
"X-Generator: Launchpad (build 15593)\n"
18
"X-Launchpad-Export-Date: 2012-02-04 06:19+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
25
#: bzrlib/branch.py:854
25
#: bzrlib/branch.py:872
29
#: bzrlib/branch.py:2955
29
#: bzrlib/branch.py:3205
31
31
msgid "Pushed up to revision %d."
34
#: bzrlib/branch.py:2957
34
#: bzrlib/branch.py:3207
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
41
#: bzrlib/branch.py:2960
41
#: bzrlib/branch.py:3210
42
42
msgid "No new revisions or tags to push."
43
43
msgstr "Non hai revisiĆ³ns ou etiquetas para empurar (push)."
45
#: bzrlib/branch.py:2962
45
#: bzrlib/branch.py:3212
46
46
msgid "No new revisions to push."
47
47
msgstr "Non hai revisiĆ³ns novas para empurrar (push)."
49
#: bzrlib/branch.py:2982
49
#: bzrlib/branch.py:3232
50
50
msgid "checked branch {0} format {1}"
53
#: bzrlib/branch.py:2985
53
#: bzrlib/branch.py:3235
55
55
msgid "found error:%s"
56
56
msgstr "atopouse un erro: %s"
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
60
60
msgid "Ignoring files outside view. View is %s"
61
61
msgstr "Ignorando os ficheiros fĆ³ra da vista. A vista Ć© %s"
63
#: bzrlib/builtins.py:260
63
#: bzrlib/builtins.py:218
65
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
66
msgstr "bzr %s --revision toma exactamente un identificador de revisiĆ³n"
68
#: bzrlib/builtins.py:315
68
#: bzrlib/builtins.py:303
69
69
msgid "Display status summary."
70
70
msgstr "Mostrar o resumo do estado."
72
#: bzrlib/builtins.py:317
72
#: bzrlib/builtins.py:305
74
74
"This reports on versioned and unknown files, reporting them\n"
75
75
"grouped by state. Possible states are:"
178
178
"Para comparar o cartafol de traballo con unha revisiĆ³n especĆfica, pase\n"
179
179
"unha revisiĆ³n ao argumento Ā«revisionĀ»."
181
#: bzrlib/builtins.py:366
181
#: bzrlib/builtins.py:354
183
183
"To see which files have changed in a specific revision, or between\n"
184
184
"two revisions, pass a revision range to the revision argument.\n"
185
185
"This will produce the same results as calling 'bzr diff --summarize'."
188
#: bzrlib/builtins.py:375
188
#: bzrlib/builtins.py:363
189
189
msgid "Use short status indicators."
190
190
msgstr "Usar os indicadores de estado curtos"
192
#: bzrlib/builtins.py:377
192
#: bzrlib/builtins.py:365
193
193
msgid "Only show versioned files."
194
194
msgstr "Mostrar sĆ³ os ficheiros versionados."
196
#: bzrlib/builtins.py:379
196
#: bzrlib/builtins.py:367
197
197
msgid "Don't show pending merges."
198
198
msgstr "Non mostrar as combinaciĆ³ns (merge) pendentes"
200
#: bzrlib/builtins.py:382
200
#: bzrlib/builtins.py:370
201
201
msgid "Do not mark object type using indicator."
204
#: bzrlib/builtins.py:397
204
#: bzrlib/builtins.py:385
205
205
msgid "bzr status --revision takes exactly one or two revision specifiers"
208
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
208
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
209
209
msgid "You can only supply one of revision_id or --revision"
212
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
212
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
213
213
msgid "You must supply either --revision or a revision_id"
214
214
msgstr "Debe fornecer ou --revision ou un id_de_revision"
216
#: bzrlib/builtins.py:451
216
#: bzrlib/builtins.py:439
218
218
msgid "Repository %r does not support access to raw revision texts"
221
#: bzrlib/builtins.py:462
221
#: bzrlib/builtins.py:450
222
222
msgid "The repository {0} contains no revision {1}."
225
#: bzrlib/builtins.py:469
225
#: bzrlib/builtins.py:457
226
226
msgid "You cannot specify a NULL revision."
229
#: bzrlib/builtins.py:561
229
#: bzrlib/builtins.py:549
230
230
msgid "Remove the working tree from a given branch/checkout."
233
#: bzrlib/builtins.py:563
233
#: bzrlib/builtins.py:551
235
235
"Since a lightweight checkout is little more than a working tree\n"
236
236
"this will refuse to run against one."
239
#: bzrlib/builtins.py:566
239
#: bzrlib/builtins.py:554
240
240
msgid "To re-create the working tree, use \"bzr checkout\"."
243
#: bzrlib/builtins.py:572
243
#: bzrlib/builtins.py:560
245
245
"Remove the working tree even if it has uncommitted or shelved changes."
248
#: bzrlib/builtins.py:586
248
#: bzrlib/builtins.py:574
249
249
msgid "No working tree to remove"
252
#: bzrlib/builtins.py:588
252
#: bzrlib/builtins.py:576
253
253
msgid "You cannot remove the working tree of a remote path"
254
254
msgstr "Non pode eliminar o cartafol de traballo desde unha ruta remota"
256
#: bzrlib/builtins.py:597
256
#: bzrlib/builtins.py:585
257
257
msgid "You cannot remove the working tree from a lightweight checkout"
260
#: bzrlib/builtins.py:637
260
#: bzrlib/builtins.py:625
262
262
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
263
263
"instead. Use \"--force\" if you are sure you want to reset the working tree."
266
#: bzrlib/builtins.py:648
266
#: bzrlib/builtins.py:636
268
268
", the header appears corrupt, try passing -r -1 to set the state to the last "
272
#: bzrlib/builtins.py:652
272
#: bzrlib/builtins.py:640
273
273
msgid "failed to reset the tree state{0}"
276
#: bzrlib/builtins.py:656
276
#: bzrlib/builtins.py:644
277
277
msgid "Show current revision number."
280
#: bzrlib/builtins.py:658
280
#: bzrlib/builtins.py:646
281
281
msgid "This is equal to the number of revisions on this branch."
284
#: bzrlib/builtins.py:671
284
#: bzrlib/builtins.py:659
285
285
msgid "--tree and --revision can not be used together"
288
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
288
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
289
289
msgid "Tags can only be placed on a single revision, not on a range"
292
#: bzrlib/builtins.py:712
292
#: bzrlib/builtins.py:700
293
293
msgid "Show revno of working tree."
296
#: bzrlib/builtins.py:760
296
#: bzrlib/builtins.py:748
297
297
msgid "Add specified files or directories."
300
#: bzrlib/builtins.py:762
300
#: bzrlib/builtins.py:750
302
302
"In non-recursive mode, all the named items are added, regardless\n"
303
303
"of whether they were previously ignored. A warning is given if\n"
304
304
"any of the named files are already versioned."
307
#: bzrlib/builtins.py:766
307
#: bzrlib/builtins.py:754
309
309
"In recursive mode (the default), files are treated the same way\n"
310
310
"but the behaviour for directories is different. Directories that\n"
352
352
"into a subdirectory of this one."
355
#: bzrlib/builtins.py:796
355
#: bzrlib/builtins.py:784
357
357
"Any files matching patterns in the ignore list will not be added\n"
358
358
"unless they are explicitly mentioned."
361
#: bzrlib/builtins.py:799
361
#: bzrlib/builtins.py:787
363
363
"In recursive mode, files larger than the configuration option \n"
364
364
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
368
#: bzrlib/builtins.py:806
368
#: bzrlib/builtins.py:794
369
369
msgid "Don't recursively add the contents of directories."
372
#: bzrlib/builtins.py:813
372
#: bzrlib/builtins.py:800
373
373
msgid "Lookup file ids from this tree."
376
#: bzrlib/builtins.py:849
376
#: bzrlib/builtins.py:836
377
377
msgid "ignored {0} matching \"{1}\"\n"
380
#: bzrlib/builtins.py:854
380
#: bzrlib/builtins.py:841
381
381
msgid "Create a new versioned directory."
384
#: bzrlib/builtins.py:856
384
#: bzrlib/builtins.py:843
385
385
msgid "This is equivalent to creating the directory and then adding it."
388
#: bzrlib/builtins.py:863
388
#: bzrlib/builtins.py:850
389
389
msgid "No error if existing, make parent directories as needed."
392
#: bzrlib/builtins.py:897
392
#: bzrlib/builtins.py:884
394
394
msgid "added %s\n"
397
#: bzrlib/builtins.py:939
397
#: bzrlib/builtins.py:926
399
399
msgid "invalid kind %r specified"
402
#: bzrlib/builtins.py:976
402
#: bzrlib/builtins.py:963
403
403
msgid "Move or rename a file."
406
#: bzrlib/builtins.py:978
406
#: bzrlib/builtins.py:965
407
407
msgid " bzr mv SOURCE... DESTINATION"
410
#: bzrlib/builtins.py:980
410
#: bzrlib/builtins.py:967
412
412
"If the last argument is a versioned directory, all the other names\n"
413
413
"are moved into it. Otherwise, there must be exactly two arguments\n"
414
414
"and the file is changed to a new name."
417
#: bzrlib/builtins.py:984
417
#: bzrlib/builtins.py:971
419
419
"If OLDNAME does not exist on the filesystem but is versioned and\n"
420
420
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
423
423
"The same is valid when moving many SOURCE files to a DESTINATION."
426
#: bzrlib/builtins.py:990
426
#: bzrlib/builtins.py:977
427
427
msgid "Files cannot be moved between branches."
430
#: bzrlib/builtins.py:997
430
#: bzrlib/builtins.py:984
432
432
"Move only the bzr identifier of the file, because the file has already been "
436
#: bzrlib/builtins.py:999
436
#: bzrlib/builtins.py:986
437
437
msgid "Automatically guess renames."
440
#: bzrlib/builtins.py:1000
440
#: bzrlib/builtins.py:987
441
441
msgid "Avoid making changes when guessing renames."
444
#: bzrlib/builtins.py:1009
444
#: bzrlib/builtins.py:996
445
445
msgid "--dry-run requires --auto."
448
#: bzrlib/builtins.py:1013
448
#: bzrlib/builtins.py:1000
449
449
msgid "missing file argument"
452
#: bzrlib/builtins.py:1017
452
#: bzrlib/builtins.py:1004
453
453
msgid "can not move root of branch"
456
#: bzrlib/builtins.py:1023
456
#: bzrlib/builtins.py:1010
457
457
msgid "Only one path may be specified to --auto."
460
#: bzrlib/builtins.py:1026
460
#: bzrlib/builtins.py:1013
461
461
msgid "--after cannot be specified with --auto."
464
#: bzrlib/builtins.py:1062
464
#: bzrlib/builtins.py:1050
465
465
msgid "to mv multiple files the destination must be a versioned directory"
468
#: bzrlib/builtins.py:1114
468
#: bzrlib/builtins.py:1102
469
469
msgid "Turn this branch into a mirror of another branch."
472
#: bzrlib/builtins.py:1116
472
#: bzrlib/builtins.py:1104
474
474
"By default, this command only works on branches that have not diverged.\n"
475
475
"Branches are considered diverged if the destination branch's most recent \n"
499
499
"value will only be saved if the remote location can be accessed."
502
#: bzrlib/builtins.py:1134
502
#: bzrlib/builtins.py:1122
504
504
"The --verbose option will display the revisions pulled using the log_format\n"
505
505
"configuration option. You can use a different format by overriding it with\n"
506
506
"-Olog_format=<other_format>."
509
#: bzrlib/builtins.py:1138
509
#: bzrlib/builtins.py:1126
511
511
"Note: The location can be specified either in the form of a branch,\n"
512
512
"or in the form of a path to a file containing a merge directive generated\n"
516
#: bzrlib/builtins.py:1146
516
#: bzrlib/builtins.py:1134
517
517
msgid "Show logs of pulled revisions."
520
#: bzrlib/builtins.py:1148
520
#: bzrlib/builtins.py:1136
522
522
"Branch to pull into, rather than the one containing the working directory."
525
#: bzrlib/builtins.py:1151
525
#: bzrlib/builtins.py:1139
527
527
"Perform a local pull in a bound branch. Local pulls are not applied to the "
531
#: bzrlib/builtins.py:1189
531
#: bzrlib/builtins.py:1168
532
532
msgid "Need working tree for --show-base."
535
#: bzrlib/builtins.py:1205
535
#: bzrlib/builtins.py:1184
536
536
msgid "No pull location known or specified."
539
#: bzrlib/builtins.py:1211
539
#: bzrlib/builtins.py:1190
541
541
msgid "Using saved parent location: %s\n"
544
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
544
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
545
545
msgid "Cannot use -r with merge directives or bundles"
548
#: bzrlib/builtins.py:1261
548
#: bzrlib/builtins.py:1238
549
549
msgid "Update a mirror of this branch."
552
#: bzrlib/builtins.py:1263
552
#: bzrlib/builtins.py:1240
554
554
"The target branch will not have its working tree populated because this\n"
555
555
"is both expensive, and is not supported on remote file systems."
558
#: bzrlib/builtins.py:1266
558
#: bzrlib/builtins.py:1243
560
560
"Some smart servers or protocols *may* put the working tree in place in\n"
564
#: bzrlib/builtins.py:1269
564
#: bzrlib/builtins.py:1246
566
566
"This command only works on branches that have not diverged. Branches are\n"
567
567
"considered diverged if the destination branch's most recent commit is one\n"
568
568
"that has not been merged (directly or indirectly) by the source branch."
571
#: bzrlib/builtins.py:1273
571
#: bzrlib/builtins.py:1250
573
573
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
574
574
"the other branch completely, discarding its unmerged changes."
577
#: bzrlib/builtins.py:1276
577
#: bzrlib/builtins.py:1253
579
579
"If you want to ensure you have the different changes in the other branch,\n"
580
580
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
581
581
"After that you will be able to do a push without '--overwrite'."
584
#: bzrlib/builtins.py:1280
584
#: bzrlib/builtins.py:1257
586
586
"If there is no default push location set, the first push will set it (use\n"
587
587
"--no-remember to avoid setting it). After that, you can omit the\n"
589
589
"value will only be saved if the remote location can be accessed."
592
#: bzrlib/builtins.py:1285
592
#: bzrlib/builtins.py:1262
594
594
"The --verbose option will display the revisions pushed using the log_format\n"
595
595
"configuration option. You can use a different format by overriding it with\n"
596
596
"-Olog_format=<other_format>."
599
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
599
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
601
601
"Branch to push from, rather than the one containing the working directory."
604
#: bzrlib/builtins.py:1299
604
#: bzrlib/builtins.py:1276
606
606
"By default push will fail if the target directory exists, but does not "
607
607
"already have a control directory. This flag will allow push to proceed."
610
#: bzrlib/builtins.py:1304
610
#: bzrlib/builtins.py:1281
612
612
"Create a stacked branch that references the public location of the parent "
616
#: bzrlib/builtins.py:1307
616
#: bzrlib/builtins.py:1284
618
618
"Create a stacked branch that refers to another branch for the commit "
619
619
"history. Only the work not present in the referenced branch is included in "
620
620
"the branch created."
623
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
623
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
625
625
"Refuse to push if there are uncommitted changes in the working tree, --no-"
626
626
"strict disables the check."
629
#: bzrlib/builtins.py:1315
629
#: bzrlib/builtins.py:1292
630
630
msgid "Don't populate the working tree, even for protocols that support it."
633
#: bzrlib/builtins.py:1318
634
msgid "Overwrite tags only."
637
#: bzrlib/builtins.py:1369
633
#: bzrlib/builtins.py:1336
638
634
msgid "Could not determine branch to refer to."
641
#: bzrlib/builtins.py:1378
637
#: bzrlib/builtins.py:1345
644
640
"No push location known or specified. To push to the parent branch (at %s), "
645
641
"use 'bzr push :parent'."
648
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
644
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
649
645
msgid "No push location known or specified."
652
#: bzrlib/builtins.py:1388
648
#: bzrlib/builtins.py:1355
654
650
msgid "Using saved push location: %s"
657
#: bzrlib/builtins.py:1398
653
#: bzrlib/builtins.py:1365
658
654
msgid "Create a new branch that is a copy of an existing branch."
661
#: bzrlib/builtins.py:1400
657
#: bzrlib/builtins.py:1367
663
659
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
664
660
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
669
665
"create ./foo-bar."
672
#: bzrlib/builtins.py:1407
668
#: bzrlib/builtins.py:1374
674
670
"To retrieve the branch as of a particular revision, supply the --revision\n"
675
671
"parameter, as in \"branch foo/bar -r 5\"."
678
#: bzrlib/builtins.py:1410
674
#: bzrlib/builtins.py:1377
679
675
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
682
#: bzrlib/builtins.py:1420
678
#: bzrlib/builtins.py:1387
683
679
msgid "Create a branch without a working-tree."
686
#: bzrlib/builtins.py:1422
682
#: bzrlib/builtins.py:1389
687
683
msgid "Switch the checkout in the current directory to the new branch."
690
#: bzrlib/builtins.py:1425
686
#: bzrlib/builtins.py:1392
692
688
"Create a stacked branch referring to the source branch. The new branch will "
693
689
"depend on the availability of the source branch for all operations."
696
#: bzrlib/builtins.py:1429
692
#: bzrlib/builtins.py:1396
697
693
msgid "Do not use a shared repository, even if available."
700
#: bzrlib/builtins.py:1431
696
#: bzrlib/builtins.py:1398
702
698
"By default branch will fail if the target directory exists, but does not "
703
699
"already have a control directory. This flag will allow branch to proceed."
706
#: bzrlib/builtins.py:1436
702
#: bzrlib/builtins.py:1403
707
703
msgid "Bind new branch to from location."
710
#: bzrlib/builtins.py:1483
706
#: bzrlib/builtins.py:1450
712
708
msgid "Target directory \"%s\" already exists."
715
#: bzrlib/builtins.py:1495
711
#: bzrlib/builtins.py:1462
717
713
msgid "Parent of \"%s\" does not exist."
720
#: bzrlib/builtins.py:1514
716
#: bzrlib/builtins.py:1481
721
717
msgid "The branch {0} has no revision {1}."
724
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
720
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
726
722
msgid "Created new stacked branch referring to %s."
729
#: bzrlib/builtins.py:1533
725
#: bzrlib/builtins.py:1500
731
727
msgid "Branched %d revision."
732
728
msgid_plural "Branched %d revisions."
736
#: bzrlib/builtins.py:1538
732
#: bzrlib/builtins.py:1505
738
734
msgid "New branch bound to %s"
741
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
737
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
743
739
msgid "Switched to branch: %s"
746
#: bzrlib/builtins.py:1548
742
#: bzrlib/builtins.py:1515
747
743
msgid "List the branches available at the current location."
750
#: bzrlib/builtins.py:1550
746
#: bzrlib/builtins.py:1517
752
748
"This command will print the names of all the branches at the current\n"
756
#: bzrlib/builtins.py:1557
752
#: bzrlib/builtins.py:1524
758
754
"Recursively scan for branches rather than just looking in the specified "
762
#: bzrlib/builtins.py:1586
758
#: bzrlib/builtins.py:1554
763
759
msgid "(default)"
766
#: bzrlib/builtins.py:1598
762
#: bzrlib/builtins.py:1566
767
763
msgid "Create a new checkout of an existing branch."
770
#: bzrlib/builtins.py:1600
766
#: bzrlib/builtins.py:1568
772
768
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
862
858
"out the old content of that file to a new location."
865
#: bzrlib/builtins.py:1724
861
#: bzrlib/builtins.py:1694
867
863
"The 'dir' argument, if given, must be the location of the root of a\n"
868
864
"working tree to update. By default, the working tree that contains the \n"
869
865
"current working directory is used."
872
#: bzrlib/builtins.py:1740
868
#: bzrlib/builtins.py:1710
873
869
msgid "bzr update --revision takes exactly one revision"
876
#: bzrlib/builtins.py:1748
872
#: bzrlib/builtins.py:1718
877
873
msgid "bzr update can only update a whole tree, not a file or subdirectory"
880
#: bzrlib/builtins.py:1779
876
#: bzrlib/builtins.py:1749
881
877
msgid "Tree is up to date at revision {0} of branch {1}"
884
#: bzrlib/builtins.py:1795
880
#: bzrlib/builtins.py:1765
887
883
"branch has no revision %s\n"
888
884
"bzr update --revision only works for a revision in the branch history"
891
#: bzrlib/builtins.py:1801
887
#: bzrlib/builtins.py:1771
892
888
msgid "Updated to revision {0} of branch {1}"
895
#: bzrlib/builtins.py:1805
891
#: bzrlib/builtins.py:1775
897
893
"Your local commits will now show as pending merges with 'bzr status', and "
898
894
"can be committed with 'bzr commit'."
901
#: bzrlib/builtins.py:1814
897
#: bzrlib/builtins.py:1784
902
898
msgid "Show information about a working tree, branch or repository."
905
#: bzrlib/builtins.py:1816
901
#: bzrlib/builtins.py:1786
907
903
"This command will show all known locations and formats associated to the\n"
908
904
"tree, branch or repository."
911
#: bzrlib/builtins.py:1819
907
#: bzrlib/builtins.py:1789
913
909
"In verbose mode, statistical information is included with each report.\n"
914
910
"To see extended statistic information, use a verbosity level of 2 or\n"
915
911
"higher by specifying the verbose option multiple times, e.g. -vv."
918
#: bzrlib/builtins.py:1823
914
#: bzrlib/builtins.py:1793
919
915
msgid "Branches and working trees will also report any missing revisions."
922
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
923
#: bzrlib/builtins.py:6466
918
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
919
#: bzrlib/builtins.py:6442
924
920
msgid ":Examples:"
927
#: bzrlib/builtins.py:1827
923
#: bzrlib/builtins.py:1797
928
924
msgid " Display information on the format and related locations:"
931
#: bzrlib/builtins.py:1829
927
#: bzrlib/builtins.py:1799
932
928
msgid " bzr info"
935
#: bzrlib/builtins.py:1831
931
#: bzrlib/builtins.py:1801
937
933
" Display the above together with extended format information and\n"
938
934
" basic statistics (like the number of files in the working tree and\n"
939
935
" number of revisions in the branch and repository):"
942
#: bzrlib/builtins.py:1835
938
#: bzrlib/builtins.py:1805
943
939
msgid " bzr info -v"
946
#: bzrlib/builtins.py:1837
942
#: bzrlib/builtins.py:1807
947
943
msgid " Display the above together with number of committers to the branch:"
950
#: bzrlib/builtins.py:1839
946
#: bzrlib/builtins.py:1809
951
947
msgid " bzr info -vv"
954
#: bzrlib/builtins.py:1858
950
#: bzrlib/builtins.py:1828
955
951
msgid "Remove files or directories."
958
#: bzrlib/builtins.py:1860
954
#: bzrlib/builtins.py:1830
960
956
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
961
957
"delete them if they can easily be recovered using revert otherwise they\n"
962
"will be backed up (adding an extension of the form .~#~). If no options or\n"
958
"will be backed up (adding an extention of the form .~#~). If no options or\n"
963
959
"parameters are given Bazaar will scan for files that are being tracked by\n"
964
960
"Bazaar but missing in your tree and stop tracking them for you."
967
#: bzrlib/builtins.py:1868
963
#: bzrlib/builtins.py:1838
968
964
msgid "Only remove files that have never been committed."
971
#: bzrlib/builtins.py:1870
967
#: bzrlib/builtins.py:1840
972
968
msgid "The file deletion mode to be used."
975
#: bzrlib/builtins.py:1871
971
#: bzrlib/builtins.py:1841
976
972
msgid "Deletion Strategy"
979
#: bzrlib/builtins.py:1872
975
#: bzrlib/builtins.py:1842
980
976
msgid "Backup changed files (default)."
983
#: bzrlib/builtins.py:1873
979
#: bzrlib/builtins.py:1843
984
980
msgid "Delete from bzr but leave the working copy."
987
#: bzrlib/builtins.py:1874
983
#: bzrlib/builtins.py:1844
988
984
msgid "Don't backup changed files."
991
#: bzrlib/builtins.py:1875
987
#: bzrlib/builtins.py:1845
993
989
"Delete all the specified files, even if they can not be recovered and even "
994
990
"if they are non-empty directories. (deprecated, use no-backup)"
997
#: bzrlib/builtins.py:1884
993
#: bzrlib/builtins.py:1854
998
994
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1001
#: bzrlib/builtins.py:1901
997
#: bzrlib/builtins.py:1871
1002
998
msgid "No matching files."
1005
#: bzrlib/builtins.py:1962
1001
#: bzrlib/builtins.py:1932
1006
1002
msgid "Reconcile bzr metadata in a branch."
1009
#: bzrlib/builtins.py:1964
1005
#: bzrlib/builtins.py:1934
1011
1007
"This can correct data mismatches that may have been caused by\n"
1012
1008
"previous ghost operations or bzr upgrades. You should only\n"
1086
1082
" bzr commit -m \"imported project\""
1089
#: bzrlib/builtins.py:2071
1085
#: bzrlib/builtins.py:2041
1091
1087
"Create the path leading up to the branch if it does not already exist."
1094
#: bzrlib/builtins.py:2074
1090
#: bzrlib/builtins.py:2044
1095
1091
msgid "Specify a format for this branch. See \"help formats\"."
1098
#: bzrlib/builtins.py:2082
1094
#: bzrlib/builtins.py:2052
1100
1096
"Never change revnos or the existing log. Append revisions to it only."
1103
#: bzrlib/builtins.py:2085
1099
#: bzrlib/builtins.py:2055
1104
1100
msgid "Create a branch without a working tree."
1107
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1103
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1108
1104
#, python-format
1110
1106
"Parent directory of %s does not exist.\n"
1111
1107
"You may supply --create-prefix to create all leading parent directories."
1114
#: bzrlib/builtins.py:2139
1110
#: bzrlib/builtins.py:2109
1116
1112
"This branch format cannot be set to append-revisions-only. Try --default."
1119
#: bzrlib/builtins.py:2150
1115
#: bzrlib/builtins.py:2120
1120
1116
msgid "Created a {0} (format: {1})\n"
1123
#: bzrlib/builtins.py:2159
1119
#: bzrlib/builtins.py:2129
1124
1120
#, python-format
1125
1121
msgid "Using shared repository: %s\n"
1128
#: bzrlib/builtins.py:2163
1124
#: bzrlib/builtins.py:2133
1129
1125
msgid "Create a shared repository for branches to share storage space."
1132
#: bzrlib/builtins.py:2165
1128
#: bzrlib/builtins.py:2135
1134
1130
"New branches created under the repository directory will store their\n"
1135
1131
"revisions in the repository, not in the branch directory. For branches\n"
1222
1218
" 0 - no change"
1225
#: bzrlib/builtins.py:2250
1221
#: bzrlib/builtins.py:2220
1228
1224
" Shows the difference in the working tree versus the last commit::"
1231
#: bzrlib/builtins.py:2253
1227
#: bzrlib/builtins.py:2223
1232
1228
msgid " bzr diff"
1235
#: bzrlib/builtins.py:2255
1231
#: bzrlib/builtins.py:2225
1236
1232
msgid " Difference between the working tree and revision 1::"
1239
#: bzrlib/builtins.py:2257
1235
#: bzrlib/builtins.py:2227
1240
1236
msgid " bzr diff -r1"
1243
#: bzrlib/builtins.py:2259
1239
#: bzrlib/builtins.py:2229
1244
1240
msgid " Difference between revision 3 and revision 1::"
1247
#: bzrlib/builtins.py:2261
1243
#: bzrlib/builtins.py:2231
1248
1244
msgid " bzr diff -r1..3"
1251
#: bzrlib/builtins.py:2263
1247
#: bzrlib/builtins.py:2233
1252
1248
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1255
#: bzrlib/builtins.py:2265
1251
#: bzrlib/builtins.py:2235
1256
1252
msgid " bzr diff -r1..3 xxx"
1259
#: bzrlib/builtins.py:2267
1255
#: bzrlib/builtins.py:2237
1260
1256
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1263
#: bzrlib/builtins.py:2269
1259
#: bzrlib/builtins.py:2239
1264
1260
msgid " bzr diff -c2"
1267
#: bzrlib/builtins.py:2271
1263
#: bzrlib/builtins.py:2241
1269
1265
" To see the changes introduced by revision X::\n"
1271
1267
" bzr diff -cX"
1274
#: bzrlib/builtins.py:2275
1270
#: bzrlib/builtins.py:2245
1276
1272
" Note that in the case of a merge, the -c option shows the changes\n"
1277
1273
" compared to the left hand parent. To see the changes against\n"
1278
1274
" another parent, use::"
1281
#: bzrlib/builtins.py:2279
1277
#: bzrlib/builtins.py:2249
1282
1278
msgid " bzr diff -r<chosen_parent>..X"
1285
#: bzrlib/builtins.py:2281
1281
#: bzrlib/builtins.py:2251
1287
1283
" The changes between the current revision and the previous revision\n"
1288
1284
" (equivalent to -c-1 and -r-2..-1)"
1291
#: bzrlib/builtins.py:2284
1287
#: bzrlib/builtins.py:2254
1292
1288
msgid " bzr diff -r-2.."
1295
#: bzrlib/builtins.py:2286
1291
#: bzrlib/builtins.py:2256
1296
1292
msgid " Show just the differences for file NEWS::"
1299
#: bzrlib/builtins.py:2288
1295
#: bzrlib/builtins.py:2258
1300
1296
msgid " bzr diff NEWS"
1303
#: bzrlib/builtins.py:2290
1299
#: bzrlib/builtins.py:2260
1304
1300
msgid " Show the differences in working tree xxx for file NEWS::"
1307
#: bzrlib/builtins.py:2292
1303
#: bzrlib/builtins.py:2262
1308
1304
msgid " bzr diff xxx/NEWS"
1311
#: bzrlib/builtins.py:2294
1307
#: bzrlib/builtins.py:2264
1312
1308
msgid " Show the differences from branch xxx to this working tree:"
1315
#: bzrlib/builtins.py:2296
1311
#: bzrlib/builtins.py:2266
1316
1312
msgid " bzr diff --old xxx"
1319
#: bzrlib/builtins.py:2298
1315
#: bzrlib/builtins.py:2268
1320
1316
msgid " Show the differences between two branches for file NEWS::"
1323
#: bzrlib/builtins.py:2300
1319
#: bzrlib/builtins.py:2270
1324
1320
msgid " bzr diff --old xxx --new yyy NEWS"
1327
#: bzrlib/builtins.py:2302
1323
#: bzrlib/builtins.py:2272
1328
1324
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1331
#: bzrlib/builtins.py:2304
1327
#: bzrlib/builtins.py:2274
1333
1329
" bzr diff --prefix old/:new/\n"
1337
1333
" bzr diff --using /usr/bin/diff --diff-options -wu"
1340
#: bzrlib/builtins.py:2314
1336
#: bzrlib/builtins.py:2284
1341
1337
msgid "Pass these options to the external diff program."
1344
#: bzrlib/builtins.py:2317
1340
#: bzrlib/builtins.py:2287
1346
1342
"Set prefixes added to old and new filenames, as two values separated by a "
1347
1343
"colon. (eg \"old/:new/\")."
1350
#: bzrlib/builtins.py:2320
1346
#: bzrlib/builtins.py:2290
1351
1347
msgid "Branch/tree to compare from."
1354
#: bzrlib/builtins.py:2324
1350
#: bzrlib/builtins.py:2294
1355
1351
msgid "Branch/tree to compare to."
1358
#: bzrlib/builtins.py:2330
1354
#: bzrlib/builtins.py:2300
1359
1355
msgid "Use this command to compare files."
1362
#: bzrlib/builtins.py:2335
1358
#: bzrlib/builtins.py:2305
1363
1359
msgid "Diff format to use."
1366
#: bzrlib/builtins.py:2337
1362
#: bzrlib/builtins.py:2307
1367
1363
msgid "Diff format"
1370
#: bzrlib/builtins.py:2359
1366
#: bzrlib/builtins.py:2329
1371
1367
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1374
#: bzrlib/builtins.py:2363
1370
#: bzrlib/builtins.py:2333
1375
1371
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1378
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1379
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1374
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1375
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1380
1376
msgid "{0} and {1} are mutually exclusive"
1383
#: bzrlib/builtins.py:2388
1379
#: bzrlib/builtins.py:2358
1385
1381
"List files deleted in the working tree.\n"
1389
#: bzrlib/builtins.py:2465
1385
#: bzrlib/builtins.py:2436
1390
1386
msgid "Show the tree root directory."
1393
#: bzrlib/builtins.py:2467
1389
#: bzrlib/builtins.py:2438
1395
1391
"The root is the nearest enclosing directory with a .bzr control\n"
1399
#: bzrlib/builtins.py:2482
1395
#: bzrlib/builtins.py:2453
1400
1396
msgid "The limit argument must be an integer."
1403
#: bzrlib/builtins.py:2490
1399
#: bzrlib/builtins.py:2461
1404
1400
msgid "The levels argument must be an integer."
1407
#: bzrlib/builtins.py:2495
1403
#: bzrlib/builtins.py:2466
1408
1404
msgid "Show historical log for a branch or subset of a branch."
1411
#: bzrlib/builtins.py:2497
1407
#: bzrlib/builtins.py:2468
1413
1409
"log is bzr's default tool for exploring the history of a branch.\n"
1414
1410
"The branch to use is taken from the first parameter. If no parameters\n"
1530
1526
" a nested merge revision and the log will be truncated accordingly."
1533
#: bzrlib/builtins.py:2571
1529
#: bzrlib/builtins.py:2542
1534
1530
msgid ":Path filtering:"
1537
#: bzrlib/builtins.py:2573
1533
#: bzrlib/builtins.py:2544
1539
1535
" If parameters are given and the first one is not a branch, the log\n"
1540
1536
" will be filtered to show only those revisions that changed the\n"
1541
1537
" nominated files or directories."
1544
#: bzrlib/builtins.py:2577
1540
#: bzrlib/builtins.py:2548
1546
1542
" Filenames are interpreted within their historical context. To log a\n"
1547
1543
" deleted file, specify a revision range so that the file existed at\n"
1548
1544
" the end or start of the range."
1551
#: bzrlib/builtins.py:2581
1547
#: bzrlib/builtins.py:2552
1553
1549
" Historical context is also important when interpreting pathnames of\n"
1554
1550
" renamed files/directories. Consider the following example:"
1557
#: bzrlib/builtins.py:2584
1553
#: bzrlib/builtins.py:2555
1559
1555
" * revision 1: add tutorial.txt\n"
1560
1556
" * revision 2: modify tutorial.txt\n"
1561
1557
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1564
#: bzrlib/builtins.py:2588
1560
#: bzrlib/builtins.py:2559
1565
1561
msgid " In this case:"
1568
#: bzrlib/builtins.py:2590
1564
#: bzrlib/builtins.py:2561
1569
1565
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1572
#: bzrlib/builtins.py:2592
1568
#: bzrlib/builtins.py:2563
1574
1570
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1577
#: bzrlib/builtins.py:2594
1573
#: bzrlib/builtins.py:2565
1579
1575
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1580
1576
" the original file in revision 2."
1583
#: bzrlib/builtins.py:2597
1579
#: bzrlib/builtins.py:2568
1585
1581
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1586
1582
" was no file called guide.txt in revision 2."
1589
#: bzrlib/builtins.py:2600
1585
#: bzrlib/builtins.py:2571
1591
1587
" Renames are always followed by log. By design, there is no need to\n"
1592
1588
" explicitly ask for this (and no way to stop logging a file back\n"
1593
1589
" until it was last renamed)."
1596
#: bzrlib/builtins.py:2604
1592
#: bzrlib/builtins.py:2575
1597
1593
msgid ":Other filtering:"
1600
#: bzrlib/builtins.py:2606
1596
#: bzrlib/builtins.py:2577
1602
1598
" The --match option can be used for finding revisions that match a\n"
1603
1599
" regular expression in a commit message, committer, author or bug.\n"
1669
1665
" trading disk space for faster speed."
1672
#: bzrlib/builtins.py:2653
1668
#: bzrlib/builtins.py:2624
1673
1669
msgid "Show from oldest to newest."
1676
#: bzrlib/builtins.py:2656
1672
#: bzrlib/builtins.py:2627
1677
1673
msgid "Show files changed in each revision."
1680
#: bzrlib/builtins.py:2662
1676
#: bzrlib/builtins.py:2633
1681
1677
msgid "Show just the specified revision. See also \"help revisionspec\"."
1684
#: bzrlib/builtins.py:2666
1680
#: bzrlib/builtins.py:2637
1685
1681
msgid "What names to list as authors - first, all or committer."
1688
#: bzrlib/builtins.py:2667
1684
#: bzrlib/builtins.py:2638
1689
1685
msgid "Authors"
1692
#: bzrlib/builtins.py:2672
1688
#: bzrlib/builtins.py:2643
1693
1689
msgid "Number of levels to display - 0 for all, 1 for flat."
1696
#: bzrlib/builtins.py:2682
1692
#: bzrlib/builtins.py:2653
1697
1693
msgid "Limit the output to the first N revisions."
1700
#: bzrlib/builtins.py:2687
1696
#: bzrlib/builtins.py:2658
1701
1697
msgid "Show changes made in each revision as a patch."
1704
#: bzrlib/builtins.py:2689
1700
#: bzrlib/builtins.py:2660
1705
1701
msgid "Show merged revisions like --levels 0 does."
1708
#: bzrlib/builtins.py:2693
1704
#: bzrlib/builtins.py:2664
1709
1705
msgid "Do not report commits with more than one parent."
1712
#: bzrlib/builtins.py:2695
1708
#: bzrlib/builtins.py:2666
1714
1710
"Display only the revisions that are not part of both ancestries (require -"
1718
#: bzrlib/builtins.py:2699
1714
#: bzrlib/builtins.py:2670
1719
1715
msgid "Show digital signature validity."
1722
#: bzrlib/builtins.py:2702
1718
#: bzrlib/builtins.py:2673
1723
1719
msgid "Show revisions whose properties match this expression."
1726
#: bzrlib/builtins.py:2706
1722
#: bzrlib/builtins.py:2677
1727
1723
msgid "Show revisions whose message matches this expression."
1730
#: bzrlib/builtins.py:2710
1726
#: bzrlib/builtins.py:2681
1731
1727
msgid "Show revisions whose committer matches this expression."
1734
#: bzrlib/builtins.py:2714
1730
#: bzrlib/builtins.py:2685
1735
1731
msgid "Show revisions whose authors match this expression."
1738
#: bzrlib/builtins.py:2718
1734
#: bzrlib/builtins.py:2689
1739
1735
msgid "Show revisions whose bugs match this expression."
1742
#: bzrlib/builtins.py:2772
1738
#: bzrlib/builtins.py:2743
1743
1739
msgid "--exclude-common-ancestry requires -r with two revisions"
1746
#: bzrlib/builtins.py:2800
1742
#: bzrlib/builtins.py:2771
1747
1743
#, python-format
1748
1744
msgid "Path unknown at end or start of revision range: %s"
1751
#: bzrlib/builtins.py:2917
1747
#: bzrlib/builtins.py:2888
1752
1748
#, python-format
1753
1749
msgid "bzr %s doesn't accept two revisions in different branches."
1756
#: bzrlib/builtins.py:2933
1752
#: bzrlib/builtins.py:2904
1757
1753
#, python-format
1758
1754
msgid "bzr %s --revision takes one or two values."
1761
#: bzrlib/builtins.py:2978
1757
#: bzrlib/builtins.py:2949
1763
1759
"List files in a tree.\n"
1767
#: bzrlib/builtins.py:2987
1763
#: bzrlib/builtins.py:2958
1768
1764
msgid "Recurse into subdirectories."
1771
#: bzrlib/builtins.py:2989
1767
#: bzrlib/builtins.py:2960
1772
1768
msgid "Print paths relative to the root of the branch."
1775
#: bzrlib/builtins.py:2991
1771
#: bzrlib/builtins.py:2962
1776
1772
msgid "Print unknown files."
1779
#: bzrlib/builtins.py:2992
1775
#: bzrlib/builtins.py:2963
1780
1776
msgid "Print versioned files."
1783
#: bzrlib/builtins.py:2995
1779
#: bzrlib/builtins.py:2966
1784
1780
msgid "Print ignored files."
1787
#: bzrlib/builtins.py:2997
1783
#: bzrlib/builtins.py:2968
1788
1784
msgid "List entries of a particular kind: file, directory, symlink."
1791
#: bzrlib/builtins.py:3010
1787
#: bzrlib/builtins.py:2981
1792
1788
msgid "invalid kind specified"
1795
#: bzrlib/builtins.py:3013
1791
#: bzrlib/builtins.py:2984
1796
1792
msgid "Cannot set both --verbose and --null"
1799
#: bzrlib/builtins.py:3022
1795
#: bzrlib/builtins.py:2993
1800
1796
msgid "cannot specify both --from-root and PATH"
1803
#: bzrlib/builtins.py:3109
1799
#: bzrlib/builtins.py:3080
1804
1800
msgid "Ignore specified files or patterns."
1807
#: bzrlib/builtins.py:3111
1803
#: bzrlib/builtins.py:3082
1808
1804
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1811
#: bzrlib/builtins.py:3113
1807
#: bzrlib/builtins.py:3084
1813
1809
"If a .bzrignore file does not exist, the ignore command\n"
1814
1810
"will create one and add the specified files or patterns to the newly\n"
1855
1851
" the shell on Unix."
1858
#: bzrlib/builtins.py:3142
1854
#: bzrlib/builtins.py:3113
1860
1856
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1861
1857
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1864
#: bzrlib/builtins.py:3145
1860
#: bzrlib/builtins.py:3116
1867
1863
" Ignore the top level Makefile::"
1870
#: bzrlib/builtins.py:3148
1866
#: bzrlib/builtins.py:3119
1871
1867
msgid " bzr ignore ./Makefile"
1874
#: bzrlib/builtins.py:3150
1870
#: bzrlib/builtins.py:3121
1875
1871
msgid " Ignore .class files in all directories...::"
1878
#: bzrlib/builtins.py:3152
1874
#: bzrlib/builtins.py:3123
1879
1875
msgid " bzr ignore \"*.class\""
1882
#: bzrlib/builtins.py:3154
1878
#: bzrlib/builtins.py:3125
1883
1879
msgid " ...but do not ignore \"special.class\"::"
1886
#: bzrlib/builtins.py:3156
1882
#: bzrlib/builtins.py:3127
1887
1883
msgid " bzr ignore \"!special.class\""
1890
#: bzrlib/builtins.py:3158
1886
#: bzrlib/builtins.py:3129
1891
1887
msgid " Ignore files whose name begins with the \"#\" character::"
1894
#: bzrlib/builtins.py:3160
1890
#: bzrlib/builtins.py:3131
1895
1891
msgid " bzr ignore \"RE:^#\""
1898
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1894
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1899
1895
msgid " Ignore .o files under the lib directory::"
1902
#: bzrlib/builtins.py:3164
1898
#: bzrlib/builtins.py:3135
1903
1899
msgid " bzr ignore \"lib/**/*.o\""
1906
#: bzrlib/builtins.py:3168
1902
#: bzrlib/builtins.py:3139
1907
1903
msgid " bzr ignore \"RE:lib/.*\\.o\""
1910
#: bzrlib/builtins.py:3170
1906
#: bzrlib/builtins.py:3141
1911
1907
msgid " Ignore everything but the \"debian\" toplevel directory::"
1914
#: bzrlib/builtins.py:3172
1910
#: bzrlib/builtins.py:3143
1916
1912
" bzr ignore \"RE:(?!debian/).*\"\n"
1955
#: bzrlib/builtins.py:3238
1951
#: bzrlib/builtins.py:3209
1956
1952
msgid "List ignored files and the patterns that matched them."
1959
#: bzrlib/builtins.py:3240
1955
#: bzrlib/builtins.py:3211
1961
1957
"List all the ignored files and the ignore pattern that caused the file to\n"
1965
#: bzrlib/builtins.py:3243
1961
#: bzrlib/builtins.py:3214
1966
1962
msgid "Alternatively, to list just the files::"
1969
#: bzrlib/builtins.py:3245
1965
#: bzrlib/builtins.py:3216
1970
1966
msgid " bzr ls --ignored"
1973
#: bzrlib/builtins.py:3279
1969
#: bzrlib/builtins.py:3250
1974
1970
#, python-format
1975
1971
msgid "not a valid revision-number: %r"
1978
#: bzrlib/builtins.py:3286
1974
#: bzrlib/builtins.py:3257
1980
1976
"Export current or past revision to a destination directory or archive."
1983
#: bzrlib/builtins.py:3288
1979
#: bzrlib/builtins.py:3259
1984
1980
msgid "If no revision is specified this exports the last committed revision."
1987
#: bzrlib/builtins.py:3290
1983
#: bzrlib/builtins.py:3261
1989
1985
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1990
1986
"given, try to find the format with the extension. If no extension\n"
1991
1987
"is found exports to a directory (equivalent to --format=dir)."
1994
#: bzrlib/builtins.py:3294
1990
#: bzrlib/builtins.py:3265
1996
1992
"If root is supplied, it will be used as the root directory inside\n"
1997
1993
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1998
1994
"to the exported filename. The root option has no effect for 'dir' format."
2001
#: bzrlib/builtins.py:3298
1997
#: bzrlib/builtins.py:3269
2003
1999
"If branch is omitted then the branch containing the current working\n"
2004
2000
"directory will be used."
2007
#: bzrlib/builtins.py:3301
2003
#: bzrlib/builtins.py:3272
2009
2005
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2012
#: bzrlib/builtins.py:3303
2008
#: bzrlib/builtins.py:3274
2014
2010
" ================= =========================\n"
2015
2011
" Supported formats Autodetected by extension\n"
2022
2018
" ================= ========================="
2025
#: bzrlib/builtins.py:3317
2021
#: bzrlib/builtins.py:3288
2026
2022
msgid "Type of file to export to."
2029
#: bzrlib/builtins.py:3320
2025
#: bzrlib/builtins.py:3291
2030
2026
msgid "Apply content filters to export the convenient form."
2033
#: bzrlib/builtins.py:3324
2029
#: bzrlib/builtins.py:3295
2034
2030
msgid "Name of the root directory inside the exported file."
2037
#: bzrlib/builtins.py:3326
2033
#: bzrlib/builtins.py:3297
2039
2035
"Set modification time of files to that of the last revision in which it was "
2043
#: bzrlib/builtins.py:3329
2039
#: bzrlib/builtins.py:3300
2045
2041
"Export the working tree contents rather than that of the last revision."
2048
#: bzrlib/builtins.py:3348
2044
#: bzrlib/builtins.py:3319
2049
2045
msgid "--uncommitted requires a working tree"
2052
#: bzrlib/builtins.py:3357
2048
#: bzrlib/builtins.py:3328
2053
2049
#, python-format
2054
2050
msgid "Unsupported export format: %s"
2057
#: bzrlib/builtins.py:3361
2053
#: bzrlib/builtins.py:3332
2059
2055
"Write the contents of a file as of a given revision to standard output."
2062
#: bzrlib/builtins.py:3363
2058
#: bzrlib/builtins.py:3334
2063
2059
msgid "If no revision is nominated, the last revision is used."
2066
#: bzrlib/builtins.py:3365
2062
#: bzrlib/builtins.py:3336
2068
2064
"Note: Take care to redirect standard output when using this command on a\n"
2072
#: bzrlib/builtins.py:3371
2068
#: bzrlib/builtins.py:3342
2073
2069
msgid "The path name in the old tree."
2076
#: bzrlib/builtins.py:3372
2072
#: bzrlib/builtins.py:3343
2077
2073
msgid "Apply content filters to display the convenience form."
2080
#: bzrlib/builtins.py:3383
2076
#: bzrlib/builtins.py:3354
2081
2077
msgid "bzr cat --revision takes exactly one revision specifier"
2084
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2080
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2085
2081
msgid "{0!r} is not present in revision {1}"
2088
#: bzrlib/builtins.py:3443
2084
#: bzrlib/builtins.py:3414
2089
2085
msgid "Commit changes into a new revision."
2092
#: bzrlib/builtins.py:3445
2088
#: bzrlib/builtins.py:3416
2094
2090
"An explanatory message needs to be given for each commit. This is\n"
2095
2091
"often done by using the --message option (getting the message from the\n"
2178
2174
" one or more bugs. See ``bzr help bugs`` for details."
2181
#: bzrlib/builtins.py:3503
2177
#: bzrlib/builtins.py:3474
2182
2178
msgid "Do not consider changes made to a given path."
2185
#: bzrlib/builtins.py:3506
2181
#: bzrlib/builtins.py:3477
2186
2182
msgid "Description of the new revision."
2189
#: bzrlib/builtins.py:3509
2185
#: bzrlib/builtins.py:3480
2190
2186
msgid "Commit even if nothing has changed."
2193
#: bzrlib/builtins.py:3513
2189
#: bzrlib/builtins.py:3484
2194
2190
msgid "Take commit message from this file."
2197
#: bzrlib/builtins.py:3515
2193
#: bzrlib/builtins.py:3486
2198
2194
msgid "Refuse to commit if there are unknown files in the working tree."
2201
#: bzrlib/builtins.py:3518
2197
#: bzrlib/builtins.py:3489
2203
2199
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2204
2200
"08:00:00 +0100'."
2207
#: bzrlib/builtins.py:3521
2203
#: bzrlib/builtins.py:3492
2208
2204
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2211
#: bzrlib/builtins.py:3524
2207
#: bzrlib/builtins.py:3495
2212
2208
msgid "Set the author's name, if it's different from the committer."
2215
#: bzrlib/builtins.py:3527
2211
#: bzrlib/builtins.py:3498
2217
2213
"Perform a local commit in a bound branch. Local commits are not pushed to "
2218
2214
"the master branch until a normal commit is performed."
2221
#: bzrlib/builtins.py:3533
2217
#: bzrlib/builtins.py:3504
2223
2219
"When no message is supplied, show the diff along with the status summary in "
2224
2220
"the message editor."
2227
#: bzrlib/builtins.py:3536
2223
#: bzrlib/builtins.py:3507
2229
2225
"When committing to a foreign version control system do not push data that "
2230
2226
"can not be natively represented."
2233
#: bzrlib/builtins.py:3554
2229
#: bzrlib/builtins.py:3525
2234
2230
#, python-format
2236
2232
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2246
2242
"Commit refused."
2249
#: bzrlib/builtins.py:3572
2245
#: bzrlib/builtins.py:3543
2250
2246
#, python-format
2251
2247
msgid "Unrecognized bug %s. Commit refused."
2254
#: bzrlib/builtins.py:3575
2250
#: bzrlib/builtins.py:3546
2255
2251
#, python-format
2258
2254
"Commit refused."
2261
#: bzrlib/builtins.py:3599
2257
#: bzrlib/builtins.py:3570
2262
2258
msgid "Could not parse --commit-time: "
2261
#: bzrlib/builtins.py:3610
2262
msgid "please specify either --message or --file"
2265
2265
#: bzrlib/builtins.py:3639
2266
msgid "please specify either --message or --file"
2269
#: bzrlib/builtins.py:3668
2270
2266
msgid "please specify a commit message with either --message or --file"
2273
#: bzrlib/builtins.py:3671
2269
#: bzrlib/builtins.py:3642
2275
2271
"Empty commit message specified. Please specify a commit message with either -"
2276
2272
"-message or --file or leave a blank message with --message \"\"."
2279
#: bzrlib/builtins.py:3691
2275
#: bzrlib/builtins.py:3662
2281
2277
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2282
2278
"-unchanged to force an empty commit."
2285
#: bzrlib/builtins.py:3695
2281
#: bzrlib/builtins.py:3666
2287
2283
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2288
2284
"resolve FILE\" to resolve."
2291
#: bzrlib/builtins.py:3699
2287
#: bzrlib/builtins.py:3670
2292
2288
msgid "Commit refused because there are unknown files in the working tree."
2295
#: bzrlib/builtins.py:3702
2291
#: bzrlib/builtins.py:3673
2298
2294
"To commit to master branch, run update and then commit.\n"
2299
2295
"You can also pass --local to commit to continue working disconnected."
2302
#: bzrlib/builtins.py:3710
2298
#: bzrlib/builtins.py:3681
2304
2300
"Validate working tree structure, branch consistency and repository history."
2307
#: bzrlib/builtins.py:3712
2303
#: bzrlib/builtins.py:3683
2309
2305
"This command checks various invariants about branch and repository storage\n"
2310
2306
"to detect data corruption or bzr bugs."
2313
#: bzrlib/builtins.py:3715
2309
#: bzrlib/builtins.py:3686
2315
2311
"The working tree and branch checks will only give output if a problem is\n"
2316
2312
"detected. The output fields of the repository check are:"
2319
#: bzrlib/builtins.py:3718
2315
#: bzrlib/builtins.py:3689
2322
2318
" This is just the number of revisions checked. It doesn't\n"
2323
2319
" indicate a problem."
2326
#: bzrlib/builtins.py:3722
2322
#: bzrlib/builtins.py:3693
2328
2324
"versionedfiles\n"
2329
2325
" This is just the number of versionedfiles checked. It\n"
2330
2326
" doesn't indicate a problem."
2333
#: bzrlib/builtins.py:3726
2329
#: bzrlib/builtins.py:3697
2335
2331
"unreferenced ancestors\n"
2336
2332
" Texts that are ancestors of other texts, but\n"
2354
2350
" indicate a problem."
2357
#: bzrlib/builtins.py:3741
2353
#: bzrlib/builtins.py:3712
2359
2355
"If no restrictions are specified, all Bazaar data that is found at the "
2361
2357
"location will be checked."
2364
#: bzrlib/builtins.py:3746
2360
#: bzrlib/builtins.py:3717
2365
2361
msgid " Check the tree and branch at 'foo'::"
2368
#: bzrlib/builtins.py:3748
2364
#: bzrlib/builtins.py:3719
2369
2365
msgid " bzr check --tree --branch foo"
2372
#: bzrlib/builtins.py:3750
2368
#: bzrlib/builtins.py:3721
2373
2369
msgid " Check only the repository at 'bar'::"
2376
#: bzrlib/builtins.py:3752
2372
#: bzrlib/builtins.py:3723
2377
2373
msgid " bzr check --repo bar"
2380
#: bzrlib/builtins.py:3754
2376
#: bzrlib/builtins.py:3725
2381
2377
msgid " Check everything at 'baz'::"
2384
#: bzrlib/builtins.py:3756
2380
#: bzrlib/builtins.py:3727
2385
2381
msgid " bzr check baz"
2388
#: bzrlib/builtins.py:3762
2384
#: bzrlib/builtins.py:3733
2389
2385
msgid "Check the branch related to the current directory."
2392
#: bzrlib/builtins.py:3764
2388
#: bzrlib/builtins.py:3735
2393
2389
msgid "Check the repository related to the current directory."
2396
#: bzrlib/builtins.py:3766
2392
#: bzrlib/builtins.py:3737
2397
2393
msgid "Check the working tree related to the current directory."
2400
#: bzrlib/builtins.py:3780
2396
#: bzrlib/builtins.py:3751
2401
2397
msgid "Upgrade a repository, branch or working tree to a newer format."
2404
#: bzrlib/builtins.py:3782
2400
#: bzrlib/builtins.py:3753
2406
2402
"When the default format has changed after a major new release of\n"
2407
2403
"Bazaar, you may be informed during certain operations that you\n"
2442
#: bzrlib/builtins.py:3808
2438
#: bzrlib/builtins.py:3779
2444
2440
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2445
2441
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2448
#: bzrlib/builtins.py:3816
2444
#: bzrlib/builtins.py:3787
2449
2445
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2452
#: bzrlib/builtins.py:3820
2448
#: bzrlib/builtins.py:3791
2453
2449
msgid "Branch format"
2456
#: bzrlib/builtins.py:3822
2452
#: bzrlib/builtins.py:3793
2457
2453
msgid "Remove the backup.bzr directory if successful."
2460
#: bzrlib/builtins.py:3824
2456
#: bzrlib/builtins.py:3795
2461
2457
msgid "Show what would be done, but don't actually do anything."
2464
#: bzrlib/builtins.py:3839
2460
#: bzrlib/builtins.py:3810
2465
2461
msgid "Show or set bzr user id."
2468
#: bzrlib/builtins.py:3841
2464
#: bzrlib/builtins.py:3812
2471
2467
" Show the email of the current user::"
2474
#: bzrlib/builtins.py:3844
2470
#: bzrlib/builtins.py:3815
2475
2471
msgid " bzr whoami --email"
2478
#: bzrlib/builtins.py:3846
2474
#: bzrlib/builtins.py:3817
2479
2475
msgid " Set the current user::"
2482
#: bzrlib/builtins.py:3848
2478
#: bzrlib/builtins.py:3819
2483
2479
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2486
#: bzrlib/builtins.py:3852
2482
#: bzrlib/builtins.py:3823
2487
2483
msgid "Display email address only."
2490
#: bzrlib/builtins.py:3854
2486
#: bzrlib/builtins.py:3825
2491
2487
msgid "Set identity for the current branch instead of globally."
2494
#: bzrlib/builtins.py:3880
2490
#: bzrlib/builtins.py:3851
2495
2491
msgid "--email can only be used to display existing identity"
2498
#: bzrlib/builtins.py:3904
2494
#: bzrlib/builtins.py:3873
2499
2495
msgid "Print or set the branch nickname."
2502
#: bzrlib/builtins.py:3906
2498
#: bzrlib/builtins.py:3875
2504
"If unset, the colocated branch name is used for colocated branches, and\n"
2505
"the branch directory name is used for other branches. To print the\n"
2506
"current nickname, execute with no argument."
2500
"If unset, the tree root directory name is used as the nickname.\n"
2501
"To print the current nickname, execute with no argument."
2509
#: bzrlib/builtins.py:3910
2504
#: bzrlib/builtins.py:3878
2511
2506
"Bound branches use the nickname of its master branch unless it is set\n"
2515
#: bzrlib/builtins.py:3930
2510
#: bzrlib/builtins.py:3898
2516
2511
msgid "Set/unset and display aliases."
2519
#: bzrlib/builtins.py:3932
2514
#: bzrlib/builtins.py:3900
2522
2517
" Show the current aliases::"
2525
#: bzrlib/builtins.py:3935
2520
#: bzrlib/builtins.py:3903
2526
2521
msgid " bzr alias"
2529
#: bzrlib/builtins.py:3937
2524
#: bzrlib/builtins.py:3905
2530
2525
msgid " Show the alias specified for 'll'::"
2533
#: bzrlib/builtins.py:3939
2528
#: bzrlib/builtins.py:3907
2534
2529
msgid " bzr alias ll"
2537
#: bzrlib/builtins.py:3941
2532
#: bzrlib/builtins.py:3909
2538
2533
msgid " Set an alias for 'll'::"
2541
#: bzrlib/builtins.py:3943
2536
#: bzrlib/builtins.py:3911
2542
2537
msgid " bzr alias ll=\"log --line -r-10..-1\""
2545
#: bzrlib/builtins.py:3945
2540
#: bzrlib/builtins.py:3913
2546
2541
msgid " To remove an alias for 'll'::"
2549
#: bzrlib/builtins.py:3947
2544
#: bzrlib/builtins.py:3915
2550
2545
msgid " bzr alias --remove ll"
2553
#: bzrlib/builtins.py:3952
2548
#: bzrlib/builtins.py:3920
2554
2549
msgid "Remove the alias."
2557
#: bzrlib/builtins.py:3970
2552
#: bzrlib/builtins.py:3938
2558
2553
msgid "bzr alias --remove expects an alias to remove."
2561
#: bzrlib/builtins.py:4151
2556
#: bzrlib/builtins.py:4119
2563
2558
"subunit not available. subunit needs to be installed to use --subunit."
2566
#: bzrlib/builtins.py:4168
2561
#: bzrlib/builtins.py:4136
2568
2563
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2571
#: bzrlib/builtins.py:4215
2566
#: bzrlib/builtins.py:4183
2572
2567
msgid "Show version of bzr."
2575
#: bzrlib/builtins.py:4219
2570
#: bzrlib/builtins.py:4187
2576
2571
msgid "Print just the version number."
2579
#: bzrlib/builtins.py:4238
2574
#: bzrlib/builtins.py:4206
2580
2575
msgid "It sure does!\n"
2583
#: bzrlib/builtins.py:4262
2578
#: bzrlib/builtins.py:4230
2584
2579
#, python-format
2585
2580
msgid "merge base is revision %s\n"
2588
#: bzrlib/builtins.py:4266
2583
#: bzrlib/builtins.py:4234
2589
2584
msgid "Perform a three-way merge."
2592
#: bzrlib/builtins.py:4268
2587
#: bzrlib/builtins.py:4236
2594
2589
"The source of the merge can be specified either in the form of a branch,\n"
2595
2590
"or in the form of a path to a file containing a merge directive generated\n"
2665
2660
"merge revision which has more than two parents."
2668
#: bzrlib/builtins.py:4315
2663
#: bzrlib/builtins.py:4283
2670
2665
"If one would like to merge changes from the working tree of the other\n"
2671
2666
"branch without merging any committed revisions, the --uncommitted option\n"
2672
2667
"can be given."
2675
#: bzrlib/builtins.py:4319
2670
#: bzrlib/builtins.py:4287
2677
2672
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2678
2673
"you to apply each diff hunk and file change, similar to \"shelve\"."
2681
#: bzrlib/builtins.py:4322
2676
#: bzrlib/builtins.py:4290
2684
2679
" To merge all new revisions from bzr.dev::"
2687
#: bzrlib/builtins.py:4325
2682
#: bzrlib/builtins.py:4293
2688
2683
msgid " bzr merge ../bzr.dev"
2691
#: bzrlib/builtins.py:4327
2686
#: bzrlib/builtins.py:4295
2692
2687
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2695
#: bzrlib/builtins.py:4329
2690
#: bzrlib/builtins.py:4297
2696
2691
msgid " bzr merge -r 82 ../bzr.dev"
2699
#: bzrlib/builtins.py:4331
2694
#: bzrlib/builtins.py:4299
2700
2695
msgid " To merge the changes introduced by 82, without previous changes::"
2703
#: bzrlib/builtins.py:4333
2698
#: bzrlib/builtins.py:4301
2704
2699
msgid " bzr merge -r 81..82 ../bzr.dev"
2707
#: bzrlib/builtins.py:4335
2702
#: bzrlib/builtins.py:4303
2708
2703
msgid " To apply a merge directive contained in /tmp/merge::"
2711
#: bzrlib/builtins.py:4337
2706
#: bzrlib/builtins.py:4305
2712
2707
msgid " bzr merge /tmp/merge"
2715
#: bzrlib/builtins.py:4339
2710
#: bzrlib/builtins.py:4307
2717
2712
" To create a merge revision with three parents from two branches\n"
2718
2713
" feature1a and feature1b:"
2721
#: bzrlib/builtins.py:4342
2716
#: bzrlib/builtins.py:4310
2723
2718
" bzr merge ../feature1a\n"
2724
2719
" bzr merge ../feature1b --force\n"
2725
2720
" bzr commit -m 'revision with three parents'"
2728
#: bzrlib/builtins.py:4354
2723
#: bzrlib/builtins.py:4322
2729
2724
msgid "Merge even if the destination tree has uncommitted changes."
2732
#: bzrlib/builtins.py:4360
2727
#: bzrlib/builtins.py:4328
2734
2729
"Apply uncommitted changes from a working copy, instead of branch changes."
2737
#: bzrlib/builtins.py:4362
2732
#: bzrlib/builtins.py:4330
2739
2734
"If the destination is already completely merged into the source, pull from "
2740
2735
"the source rather than merging. When this happens, you do not need to "
2741
2736
"commit the result."
2744
#: bzrlib/builtins.py:4367
2739
#: bzrlib/builtins.py:4335
2746
2741
"Branch to merge into, rather than the one containing the working directory."
2749
#: bzrlib/builtins.py:4369
2744
#: bzrlib/builtins.py:4337
2750
2745
msgid "Instead of merging, show a diff of the merge."
2753
#: bzrlib/builtins.py:4371
2748
#: bzrlib/builtins.py:4339
2754
2749
msgid "Select changes interactively."
2757
#: bzrlib/builtins.py:4393
2752
#: bzrlib/builtins.py:4361
2759
2754
"Merging into empty branches not currently supported, "
2760
2755
"https://bugs.launchpad.net/bzr/+bug/308562"
2763
#: bzrlib/builtins.py:4420
2758
#: bzrlib/builtins.py:4388
2764
2759
msgid "Cannot use --uncommitted with bundles or merge directives."
2767
#: bzrlib/builtins.py:4431
2762
#: bzrlib/builtins.py:4399
2768
2763
msgid "Cannot use --uncommitted and --revision at the same time."
2771
#: bzrlib/builtins.py:4451
2766
#: bzrlib/builtins.py:4419
2772
2767
msgid "merger: "
2775
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2770
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2776
2771
msgid "Nothing to do."
2779
#: bzrlib/builtins.py:4457
2774
#: bzrlib/builtins.py:4425
2780
2775
msgid "Cannot pull individual files"
2783
#: bzrlib/builtins.py:4465
2778
#: bzrlib/builtins.py:4433
2784
2779
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2787
#: bzrlib/builtins.py:4523
2782
#: bzrlib/builtins.py:4491
2788
2783
#, python-format
2789
2784
msgid "Show-base is not supported for this merge type. %s"
2792
#: bzrlib/builtins.py:4532
2787
#: bzrlib/builtins.py:4500
2793
2788
#, python-format
2794
2789
msgid "Conflict reduction is not supported for merge type %s."
2797
#: bzrlib/builtins.py:4536
2792
#: bzrlib/builtins.py:4504
2798
2793
msgid "Cannot do conflict reduction and show base."
2801
#: bzrlib/builtins.py:4647
2796
#: bzrlib/builtins.py:4615
2802
2797
msgid "No location specified or remembered"
2805
#: bzrlib/builtins.py:4649
2800
#: bzrlib/builtins.py:4617
2806
2801
msgid "{0} remembered {1} location {2}"
2809
#: bzrlib/builtins.py:4655
2804
#: bzrlib/builtins.py:4623
2810
2805
msgid "Redo a merge."
2813
#: bzrlib/builtins.py:4657
2808
#: bzrlib/builtins.py:4625
2815
2810
"Use this if you want to try a different merge technique while resolving\n"
2816
2811
"conflicts. Some merge techniques are better than others, and remerge\n"
2817
2812
"lets you try different ones on different files."
2820
#: bzrlib/builtins.py:4661
2815
#: bzrlib/builtins.py:4629
2822
2817
"The options for remerge have the same meaning and defaults as the ones for\n"
2823
2818
"merge. The difference is that remerge can (only) be run when there is a\n"
2824
2819
"pending merge, and it lets you specify particular files."
2827
#: bzrlib/builtins.py:4665
2822
#: bzrlib/builtins.py:4633
2830
2825
" Re-do the merge of all conflicted files, and show the base text in\n"
2831
2826
" conflict regions, in addition to the usual THIS and OTHER texts::"
2834
#: bzrlib/builtins.py:4669
2829
#: bzrlib/builtins.py:4637
2835
2830
msgid " bzr remerge --show-base"
2838
#: bzrlib/builtins.py:4671
2833
#: bzrlib/builtins.py:4639
2840
2835
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2841
2836
" additional processing to reduce the size of conflict regions::"
2844
#: bzrlib/builtins.py:4674
2839
#: bzrlib/builtins.py:4642
2845
2840
msgid " bzr remerge --merge-type weave --reprocess foobar"
2848
#: bzrlib/builtins.py:4681
2843
#: bzrlib/builtins.py:4649
2849
2844
msgid "Show base revision text in conflicts."
2852
#: bzrlib/builtins.py:4693
2847
#: bzrlib/builtins.py:4661
2854
2849
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2858
#: bzrlib/builtins.py:4751
2860
"Set files in the working tree back to the contents of a previous revision."
2853
#: bzrlib/builtins.py:4717
2854
msgid "Revert files to a previous revision."
2863
#: bzrlib/builtins.py:4753
2857
#: bzrlib/builtins.py:4719
2865
2859
"Giving a list of files will revert only those files. Otherwise, all files\n"
2866
2860
"will be reverted. If the revision is not specified with '--revision', the\n"
2867
"working tree basis revision is used. A revert operation affects only the\n"
2868
"working tree, not any revision history like the branch and repository or\n"
2869
"the working tree basis revision."
2861
"last committed revision is used."
2872
#: bzrlib/builtins.py:4759
2864
#: bzrlib/builtins.py:4723
2874
2866
"To remove only some changes, without reverting to a prior version, use\n"
2875
2867
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2876
2868
"will remove the changes introduced by the second last commit (-2), without\n"
2877
2869
"affecting the changes introduced by the last commit (-1). To remove\n"
2878
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2879
"To update the branch to a specific revision or the latest revision and\n"
2880
"update the working tree accordingly while preserving local changes, see the\n"
2870
"certain changes on a hunk-by-hunk basis, see the shelve command."
2884
#: bzrlib/builtins.py:4768
2873
#: bzrlib/builtins.py:4729
2886
"Uncommitted changes to files that are reverted will be discarded.\n"
2887
"Howver, by default, any files that have been manually changed will be\n"
2888
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2889
"files have '.~#~' appended to their name, where # is a number."
2875
"By default, any files that have been manually changed will be backed up\n"
2876
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2877
"'.~#~' appended to their name, where # is a number."
2892
#: bzrlib/builtins.py:4773
2880
#: bzrlib/builtins.py:4733
2894
2882
"When you provide files, you can use their current pathname or the pathname\n"
2895
2883
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2968
2956
" 0 - no missing revisions"
2971
#: bzrlib/builtins.py:4887
2959
#: bzrlib/builtins.py:4847
2973
2961
" Determine the missing revisions between this and the branch at the\n"
2974
2962
" remembered pull location::"
2977
#: bzrlib/builtins.py:4890
2965
#: bzrlib/builtins.py:4850
2978
2966
msgid " bzr missing"
2981
#: bzrlib/builtins.py:4892
2969
#: bzrlib/builtins.py:4852
2982
2970
msgid " Determine the missing revisions between this and another branch::"
2985
#: bzrlib/builtins.py:4894
2973
#: bzrlib/builtins.py:4854
2986
2974
msgid " bzr missing http://server/branch"
2989
#: bzrlib/builtins.py:4896
2977
#: bzrlib/builtins.py:4856
2991
2979
" Determine the missing revisions up to a specific revision on the other\n"
2995
#: bzrlib/builtins.py:4899
2983
#: bzrlib/builtins.py:4859
2996
2984
msgid " bzr missing -r ..-10"
2999
#: bzrlib/builtins.py:4901
2987
#: bzrlib/builtins.py:4861
3001
2989
" Determine the missing revisions up to a specific revision on this\n"
3005
#: bzrlib/builtins.py:4904
2993
#: bzrlib/builtins.py:4864
3006
2994
msgid " bzr missing --my-revision ..-10"
3009
#: bzrlib/builtins.py:4911
2997
#: bzrlib/builtins.py:4871
3010
2998
msgid "Reverse the order of revisions."
3013
#: bzrlib/builtins.py:4913
3001
#: bzrlib/builtins.py:4873
3014
3002
msgid "Display changes in the local branch only."
3017
#: bzrlib/builtins.py:4914
3005
#: bzrlib/builtins.py:4874
3018
3006
msgid "Same as --mine-only."
3021
#: bzrlib/builtins.py:4916
3009
#: bzrlib/builtins.py:4876
3022
3010
msgid "Display changes in the remote branch only."
3025
#: bzrlib/builtins.py:4917
3013
#: bzrlib/builtins.py:4877
3026
3014
msgid "Same as --theirs-only."
3029
#: bzrlib/builtins.py:4922
3017
#: bzrlib/builtins.py:4882
3031
3019
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3035
#: bzrlib/builtins.py:4926
3023
#: bzrlib/builtins.py:4886
3037
3025
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3041
#: bzrlib/builtins.py:4929
3029
#: bzrlib/builtins.py:4889
3042
3030
msgid "Show all revisions in addition to the mainline ones."
3045
#: bzrlib/builtins.py:4983
3033
#: bzrlib/builtins.py:4943
3046
3034
msgid "No peer location known or specified."
3049
#: bzrlib/builtins.py:4987
3037
#: bzrlib/builtins.py:4947
3050
3038
msgid "Using saved parent location: {0}\n"
3053
#: bzrlib/builtins.py:5020
3041
#: bzrlib/builtins.py:4980
3054
3042
#, python-format
3055
3043
msgid "You have %d extra revision:\n"
3056
3044
msgid_plural "You have %d extra revisions:\n"
3060
#: bzrlib/builtins.py:5040
3048
#: bzrlib/builtins.py:4996
3061
3049
#, python-format
3062
3050
msgid "You are missing %d revision:\n"
3063
3051
msgid_plural "You are missing %d revisions:\n"
3067
#: bzrlib/builtins.py:5055
3055
#: bzrlib/builtins.py:5008
3068
3056
msgid "This branch has no new revisions.\n"
3071
#: bzrlib/builtins.py:5058
3059
#: bzrlib/builtins.py:5011
3072
3060
msgid "Other branch has no new revisions.\n"
3075
#: bzrlib/builtins.py:5063
3063
#: bzrlib/builtins.py:5016
3076
3064
msgid "Branches are up to date.\n"
3079
#: bzrlib/builtins.py:5074
3067
#: bzrlib/builtins.py:5027
3080
3068
msgid "Compress the data within a repository."
3083
#: bzrlib/builtins.py:5076
3071
#: bzrlib/builtins.py:5029
3085
3073
"This operation compresses the data within a bazaar repository. As\n"
3086
3074
"bazaar supports automatic packing of repository, this operation is\n"
3087
3075
"normally not required to be done manually."
3090
#: bzrlib/builtins.py:5080
3078
#: bzrlib/builtins.py:5033
3092
3080
"During the pack operation, bazaar takes a backup of existing repository\n"
3093
3081
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3139
3127
"plugins using the Python programming language."
3142
#: bzrlib/builtins.py:5138
3130
#: bzrlib/builtins.py:5091
3143
3131
msgid "Show testament (signing-form) of a revision."
3146
#: bzrlib/builtins.py:5141
3134
#: bzrlib/builtins.py:5094
3147
3135
msgid "Produce long-format testament."
3150
#: bzrlib/builtins.py:5143
3138
#: bzrlib/builtins.py:5096
3151
3139
msgid "Produce a strict-format testament."
3154
#: bzrlib/builtins.py:5169
3142
#: bzrlib/builtins.py:5122
3155
3143
msgid "Show the origin of each line in a file."
3158
#: bzrlib/builtins.py:5171
3146
#: bzrlib/builtins.py:5124
3160
3148
"This prints out the given file with an annotation on the left side\n"
3161
3149
"indicating which revision, author and date introduced the change."
3164
#: bzrlib/builtins.py:5174
3152
#: bzrlib/builtins.py:5127
3166
3154
"If the origin is the same for a run of consecutive lines, it is\n"
3167
3155
"shown only at the top, unless the --all option is given."
3170
#: bzrlib/builtins.py:5182
3158
#: bzrlib/builtins.py:5135
3171
3159
msgid "Show annotations on all lines."
3174
#: bzrlib/builtins.py:5183
3162
#: bzrlib/builtins.py:5136
3175
3163
msgid "Show commit date in annotations."
3178
#: bzrlib/builtins.py:5270
3166
#: bzrlib/builtins.py:5223
3179
3167
msgid "Cannot sign a range of non-revision-history revisions"
3182
#: bzrlib/builtins.py:5282
3170
#: bzrlib/builtins.py:5235
3183
3171
msgid "Please supply either one revision, or a range."
3186
#: bzrlib/builtins.py:5286
3174
#: bzrlib/builtins.py:5239
3188
3176
"Convert the current branch into a checkout of the supplied branch.\n"
3189
3177
"If no branch is supplied, rebind to the last bound location."
3192
#: bzrlib/builtins.py:5289
3180
#: bzrlib/builtins.py:5242
3194
3182
"Once converted into a checkout, commits must succeed on the master branch\n"
3195
3183
"before they will be applied to the local branch."
3198
#: bzrlib/builtins.py:5292
3186
#: bzrlib/builtins.py:5245
3200
3188
"Bound branches use the nickname of its master branch unless it is set\n"
3201
3189
"locally, in which case binding will update the local nickname to be\n"
3202
3190
"that of the master."
3205
#: bzrlib/builtins.py:5307
3193
#: bzrlib/builtins.py:5260
3206
3194
msgid "No location supplied. This format does not remember old locations."
3209
#: bzrlib/builtins.py:5313
3197
#: bzrlib/builtins.py:5265
3210
3198
msgid "Branch is already bound"
3213
#: bzrlib/builtins.py:5316
3201
#: bzrlib/builtins.py:5267
3214
3202
msgid "No location supplied and no previous location known"
3217
#: bzrlib/builtins.py:5322
3205
#: bzrlib/builtins.py:5273
3218
3206
msgid "These branches have diverged. Try merging, and then bind again."
3221
#: bzrlib/builtins.py:5329
3209
#: bzrlib/builtins.py:5280
3222
3210
msgid "Convert the current checkout into a regular branch."
3225
#: bzrlib/builtins.py:5331
3213
#: bzrlib/builtins.py:5282
3227
3215
"After unbinding, the local branch is considered independent and subsequent\n"
3228
3216
"commits will be local only."
3231
#: bzrlib/builtins.py:5342
3219
#: bzrlib/builtins.py:5293
3232
3220
msgid "Local branch is not bound"
3235
#: bzrlib/builtins.py:5346
3223
#: bzrlib/builtins.py:5297
3236
3224
msgid "Remove the last committed revision."
3239
#: bzrlib/builtins.py:5348
3227
#: bzrlib/builtins.py:5299
3241
3229
"--verbose will print out what is being removed.\n"
3242
3230
"--dry-run will go through all the motions, but not actually\n"
3243
3231
"remove anything."
3246
#: bzrlib/builtins.py:5352
3234
#: bzrlib/builtins.py:5303
3248
3236
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3249
3237
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3250
3238
"branch at revision 15."
3253
#: bzrlib/builtins.py:5356
3241
#: bzrlib/builtins.py:5307
3255
3243
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3256
3244
"it may make is to restore any pending merges that were present before\n"
3260
#: bzrlib/builtins.py:5367
3248
#: bzrlib/builtins.py:5318
3261
3249
msgid "Don't actually make changes."
3264
#: bzrlib/builtins.py:5368
3252
#: bzrlib/builtins.py:5319
3265
3253
msgid "Say yes to all questions."
3268
#: bzrlib/builtins.py:5370
3256
#: bzrlib/builtins.py:5321
3269
3257
msgid "Keep tags that point to removed revisions."
3260
#: bzrlib/builtins.py:5323
3261
msgid "Only remove the commits from the local branch when in a checkout."
3272
3264
#: bzrlib/builtins.py:5372
3273
msgid "Only remove the commits from the local branch when in a checkout."
3276
#: bzrlib/builtins.py:5421
3277
3265
msgid "No revisions to uncommit.\n"
3280
#: bzrlib/builtins.py:5436
3268
#: bzrlib/builtins.py:5387
3281
3269
msgid "Dry-run, pretending to remove the above revisions.\n"
3284
#: bzrlib/builtins.py:5439
3272
#: bzrlib/builtins.py:5390
3285
3273
msgid "The above revision(s) will be removed.\n"
3288
#: bzrlib/builtins.py:5443
3276
#: bzrlib/builtins.py:5394
3289
3277
msgid "Uncommit these revisions"
3292
#: bzrlib/builtins.py:5446
3280
#: bzrlib/builtins.py:5397
3293
3281
msgid "Canceled\n"
3296
#: bzrlib/builtins.py:5453
3284
#: bzrlib/builtins.py:5404
3297
3285
#, python-format
3299
3287
"You can restore the old tip by running:\n"
3300
3288
" bzr pull . -r revid:%s\n"
3303
#: bzrlib/builtins.py:5458
3291
#: bzrlib/builtins.py:5409
3304
3292
msgid "Break a dead lock."
3307
#: bzrlib/builtins.py:5460
3295
#: bzrlib/builtins.py:5411
3309
3297
"This command breaks a lock on a repository, branch, working directory or\n"
3313
#: bzrlib/builtins.py:5463
3301
#: bzrlib/builtins.py:5414
3315
3303
"CAUTION: Locks should only be broken when you are sure that the process\n"
3316
3304
"holding the lock has been stopped."
3319
#: bzrlib/builtins.py:5466
3307
#: bzrlib/builtins.py:5417
3321
3309
"You can get information on what locks are open via the 'bzr info\n"
3322
3310
"[location]' command."
3325
#: bzrlib/builtins.py:5469
3313
#: bzrlib/builtins.py:5420
3328
3316
" bzr break-lock\n"
3330
3318
" bzr break-lock --conf ~/.bazaar"
3333
#: bzrlib/builtins.py:5478
3321
#: bzrlib/builtins.py:5429
3334
3322
msgid "LOCATION is the directory where the config lock is."
3337
#: bzrlib/builtins.py:5480
3325
#: bzrlib/builtins.py:5431
3338
3326
msgid "Do not ask for confirmation before breaking the lock."
3341
#: bzrlib/builtins.py:5515
3329
#: bzrlib/builtins.py:5466
3342
3330
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3345
#: bzrlib/builtins.py:5516
3333
#: bzrlib/builtins.py:5467
3346
3334
msgid "Run the bzr server."
3349
#: bzrlib/builtins.py:5522
3337
#: bzrlib/builtins.py:5473
3350
3338
msgid "Serve on stdin/out for use from inetd or sshd."
3353
#: bzrlib/builtins.py:5523
3341
#: bzrlib/builtins.py:5474
3354
3342
msgid "protocol"
3357
#: bzrlib/builtins.py:5524
3345
#: bzrlib/builtins.py:5475
3358
3346
msgid "Protocol to serve."
3361
#: bzrlib/builtins.py:5528
3362
msgid "Listen for connections on nominated address."
3365
#: bzrlib/builtins.py:5530
3349
#: bzrlib/builtins.py:5479
3367
"Listen for connections on nominated port. Passing 0 as the port number will "
3368
"result in a dynamically allocated port. The default port depends on the "
3351
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3352
"Passing 0 as the port number will result in a dynamically allocated port. "
3353
"The default port depends on the protocol."
3372
#: bzrlib/builtins.py:5535
3356
#: bzrlib/builtins.py:5485
3373
3357
msgid "Serve contents of this directory."
3376
#: bzrlib/builtins.py:5537
3360
#: bzrlib/builtins.py:5487
3378
3362
"By default the server is a readonly server. Supplying --allow-writes "
3379
3363
"enables write access to the contents of the served directory and below. "
3382
3366
"uncontrolled write access to your file system."
3369
#: bzrlib/builtins.py:5496
3370
msgid "Override the default idle client timeout (5min)."
3385
3373
#: bzrlib/builtins.py:5546
3386
msgid "Override the default idle client timeout (5min)."
3389
#: bzrlib/builtins.py:5564
3390
3374
msgid "Combine a tree into its containing tree."
3393
#: bzrlib/builtins.py:5566
3377
#: bzrlib/builtins.py:5548
3394
3378
msgid "This command requires the target tree to be in a rich-root format."
3397
#: bzrlib/builtins.py:5568
3381
#: bzrlib/builtins.py:5550
3399
3383
"The TREE argument should be an independent tree, inside another tree, but\n"
3400
3384
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3401
3385
"running \"bzr branch\" with the target inside a tree.)"
3404
#: bzrlib/builtins.py:5572
3388
#: bzrlib/builtins.py:5554
3406
3390
"The result is a combined tree, with the subtree no longer an independent\n"
3407
3391
"part. This is marked as a merge of the subtree into the containing tree,\n"
3408
3392
"and all history is preserved."
3411
#: bzrlib/builtins.py:5590
3395
#: bzrlib/builtins.py:5572
3412
3396
#, python-format
3414
3398
"Can't join trees because %s doesn't support rich root data.\n"
3415
3399
"You can use bzr upgrade on the repository."
3418
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3402
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3419
3403
msgid "Cannot join {0}. {1}"
3422
#: bzrlib/builtins.py:5610
3406
#: bzrlib/builtins.py:5592
3423
3407
msgid "Split a subdirectory of a tree into a separate tree."
3426
#: bzrlib/builtins.py:5612
3410
#: bzrlib/builtins.py:5594
3428
3412
"This command will produce a target tree in a format that supports\n"
3429
3413
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3430
3414
"converted into earlier formats like 'dirstate-tags'."
3433
#: bzrlib/builtins.py:5616
3417
#: bzrlib/builtins.py:5598
3435
3419
"The TREE argument should be a subdirectory of a working tree. That\n"
3436
3420
"subdirectory will be converted into an independent tree, with its own\n"
3437
3421
"branch. Commits in the top-level tree will not apply to the new subtree."
3440
#: bzrlib/builtins.py:5696
3424
#: bzrlib/builtins.py:5678
3441
3425
msgid "No submit branch specified or known"
3444
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3428
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3445
3429
msgid "No public branch specified or known"
3448
#: bzrlib/builtins.py:5710
3432
#: bzrlib/builtins.py:5691
3449
3433
msgid "bzr merge-directive takes at most two one revision identifiers"
3436
#: bzrlib/builtins.py:5700
3437
msgid "No revisions to bundle."
3452
3440
#: bzrlib/builtins.py:5719
3453
msgid "No revisions to bundle."
3456
#: bzrlib/builtins.py:5738
3457
3441
msgid "Mail or create a merge-directive for submitting changes."
3460
#: bzrlib/builtins.py:5740
3444
#: bzrlib/builtins.py:5721
3461
3445
msgid "A merge directive provides many things needed for requesting merges:"
3464
#: bzrlib/builtins.py:5742
3448
#: bzrlib/builtins.py:5723
3465
3449
msgid "* A machine-readable description of the merge to perform"
3468
#: bzrlib/builtins.py:5744
3452
#: bzrlib/builtins.py:5725
3469
3453
msgid "* An optional patch that is a preview of the changes requested"
3472
#: bzrlib/builtins.py:5746
3456
#: bzrlib/builtins.py:5727
3474
3458
"* An optional bundle of revision data, so that the changes can be applied\n"
3475
3459
" directly from the merge directive, without retrieving data from a\n"
3479
#: bzrlib/builtins.py:5750
3463
#: bzrlib/builtins.py:5731
3481
3465
"`bzr send` creates a compact data set that, when applied using bzr\n"
3482
3466
"merge, has the same effect as merging from the source branch. "
3485
#: bzrlib/builtins.py:5753
3469
#: bzrlib/builtins.py:5734
3487
3471
"By default the merge directive is self-contained and can be applied to any\n"
3488
3472
"branch containing submit_branch in its ancestory without needing access to\n"
3489
3473
"the source branch."
3492
#: bzrlib/builtins.py:5757
3476
#: bzrlib/builtins.py:5738
3494
3478
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3495
3479
"revisions, but only a structured request to merge from the\n"
3581
3565
"set them, and use `bzr info` to display them."
3584
#: bzrlib/builtins.py:5832
3568
#: bzrlib/builtins.py:5813
3585
3569
msgid "Write merge directive to this file or directory; use - for stdout."
3588
#: bzrlib/builtins.py:5836
3572
#: bzrlib/builtins.py:5817
3590
3574
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3591
3575
"strict disables the check."
3594
#: bzrlib/builtins.py:5838
3578
#: bzrlib/builtins.py:5819
3595
3579
msgid "Mail the request to this address."
3598
#: bzrlib/builtins.py:5842
3582
#: bzrlib/builtins.py:5823
3599
3583
msgid "Body for the email."
3602
#: bzrlib/builtins.py:5895
3586
#: bzrlib/builtins.py:5876
3603
3587
msgid "Do not include a bundle in the merge directive."
3606
#: bzrlib/builtins.py:5896
3590
#: bzrlib/builtins.py:5877
3607
3591
msgid "Do not include a preview patch in the merge directive."
3610
#: bzrlib/builtins.py:5899
3594
#: bzrlib/builtins.py:5880
3611
3595
msgid "Remember submit and public branch."
3614
#: bzrlib/builtins.py:5901
3598
#: bzrlib/builtins.py:5882
3616
3600
"Branch to generate the submission from, rather than the one containing the "
3617
3601
"working directory."
3620
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3604
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3624
#: bzrlib/builtins.py:5912
3608
#: bzrlib/builtins.py:5893
3625
3609
msgid "Use the specified output format."
3628
#: bzrlib/builtins.py:5934
3612
#: bzrlib/builtins.py:5915
3629
3613
msgid "Create, remove or modify a tag naming a revision."
3632
#: bzrlib/builtins.py:5936
3616
#: bzrlib/builtins.py:5917
3634
3618
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3635
3619
"(--revision) option can be given -rtag:X, where X is any previously\n"
3639
#: bzrlib/builtins.py:5940
3623
#: bzrlib/builtins.py:5921
3641
3625
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3642
3626
"along when you branch, push, pull or merge."
3645
#: bzrlib/builtins.py:5943
3629
#: bzrlib/builtins.py:5924
3647
3631
"It is an error to give a tag name that already exists unless you pass\n"
3648
3632
"--force, in which case the tag is moved to point to the new revision."
3651
#: bzrlib/builtins.py:5946
3635
#: bzrlib/builtins.py:5927
3653
3637
"To rename a tag (change the name but keep it on the same revsion), run "
3655
3639
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3658
#: bzrlib/builtins.py:5949
3642
#: bzrlib/builtins.py:5930
3660
3644
"If no tag name is specified it will be determined through the \n"
3661
3645
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3666
#: bzrlib/builtins.py:5959
3650
#: bzrlib/builtins.py:5940
3667
3651
msgid "Delete this tag rather than placing it."
3670
#: bzrlib/builtins.py:5962
3654
#: bzrlib/builtins.py:5943
3671
3655
msgid "Branch in which to place the tag."
3674
#: bzrlib/builtins.py:5964
3658
#: bzrlib/builtins.py:5945
3675
3659
msgid "Replace existing tags."
3678
#: bzrlib/builtins.py:5979
3662
#: bzrlib/builtins.py:5960
3679
3663
msgid "No tag specified to delete."
3682
#: bzrlib/builtins.py:5981
3666
#: bzrlib/builtins.py:5962
3683
3667
#, python-format
3684
3668
msgid "Deleted tag %s."
3687
#: bzrlib/builtins.py:5995
3671
#: bzrlib/builtins.py:5976
3688
3672
msgid "Please specify a tag name."
3691
#: bzrlib/builtins.py:6003
3675
#: bzrlib/builtins.py:5984
3692
3676
#, python-format
3693
3677
msgid "Tag %s already exists for that revision."
3696
#: bzrlib/builtins.py:6007
3680
#: bzrlib/builtins.py:5988
3697
3681
#, python-format
3698
3682
msgid "Created tag %s."
3701
#: bzrlib/builtins.py:6009
3685
#: bzrlib/builtins.py:5990
3702
3686
#, python-format
3703
3687
msgid "Updated tag %s."
3706
#: bzrlib/builtins.py:6013
3690
#: bzrlib/builtins.py:5994
3707
3691
msgid "List tags."
3710
#: bzrlib/builtins.py:6015
3694
#: bzrlib/builtins.py:5996
3712
3696
"This command shows a table of tag names and the revisions they reference."
3715
#: bzrlib/builtins.py:6021
3699
#: bzrlib/builtins.py:6002
3716
3700
msgid "Branch whose tags should be displayed."
3719
#: bzrlib/builtins.py:6023
3703
#: bzrlib/builtins.py:6004
3720
3704
msgid "Sort tags by different criteria."
3723
#: bzrlib/builtins.py:6023
3707
#: bzrlib/builtins.py:6004
3724
3708
msgid "Sorting"
3727
#: bzrlib/builtins.py:6092
3711
#: bzrlib/builtins.py:6073
3728
3712
msgid "Reconfigure the type of a bzr directory."
3731
#: bzrlib/builtins.py:6094
3715
#: bzrlib/builtins.py:6075
3732
3716
msgid "A target configuration must be specified."
3735
#: bzrlib/builtins.py:6096
3719
#: bzrlib/builtins.py:6077
3737
3721
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3738
3722
"The order of preference is\n"
3743
3727
"If none of these is available, --bind-to must be specified."
3746
#: bzrlib/builtins.py:6110
3730
#: bzrlib/builtins.py:6091
3747
3731
msgid "Tree type"
3750
#: bzrlib/builtins.py:6111
3734
#: bzrlib/builtins.py:6092
3751
3735
msgid "The relation between branch and tree."
3754
#: bzrlib/builtins.py:6113
3738
#: bzrlib/builtins.py:6094
3755
3739
msgid "Reconfigure to be an unbound branch with no working tree."
3758
#: bzrlib/builtins.py:6114
3742
#: bzrlib/builtins.py:6095
3759
3743
msgid "Reconfigure to be an unbound branch with a working tree."
3762
#: bzrlib/builtins.py:6115
3746
#: bzrlib/builtins.py:6096
3763
3747
msgid "Reconfigure to be a bound branch with a working tree."
3766
#: bzrlib/builtins.py:6116
3750
#: bzrlib/builtins.py:6097
3767
3751
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3770
#: bzrlib/builtins.py:6121
3754
#: bzrlib/builtins.py:6102
3771
3755
msgid "Repository type"
3774
#: bzrlib/builtins.py:6122
3758
#: bzrlib/builtins.py:6103
3775
3759
msgid "Location fo the repository."
3778
#: bzrlib/builtins.py:6124
3762
#: bzrlib/builtins.py:6105
3780
3764
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3783
#: bzrlib/builtins.py:6126
3767
#: bzrlib/builtins.py:6107
3784
3768
msgid "Reconfigure to use a shared repository."
3787
#: bzrlib/builtins.py:6130
3771
#: bzrlib/builtins.py:6111
3788
3772
msgid "Trees in Repository"
3791
#: bzrlib/builtins.py:6131
3775
#: bzrlib/builtins.py:6112
3792
3776
msgid "Whether new branches in the repository have trees."
3795
#: bzrlib/builtins.py:6133
3779
#: bzrlib/builtins.py:6114
3797
3781
"Reconfigure repository to create working trees on branches by default."
3800
#: bzrlib/builtins.py:6135
3784
#: bzrlib/builtins.py:6116
3802
3786
"Reconfigure repository to not create working trees on branches by default."
3805
#: bzrlib/builtins.py:6138
3789
#: bzrlib/builtins.py:6119
3806
3790
msgid "Branch to bind checkout to."
3809
#: bzrlib/builtins.py:6140
3793
#: bzrlib/builtins.py:6121
3810
3794
msgid "Perform reconfiguration even if local changes will be lost."
3813
#: bzrlib/builtins.py:6143
3797
#: bzrlib/builtins.py:6124
3814
3798
msgid "Reconfigure a branch to be stacked on another branch."
3817
#: bzrlib/builtins.py:6147
3801
#: bzrlib/builtins.py:6128
3819
3803
"Reconfigure a branch to be unstacked. This may require copying substantial "
3820
3804
"data into it."
3823
#: bzrlib/builtins.py:6157
3807
#: bzrlib/builtins.py:6138
3824
3808
msgid "Can't use both --stacked-on and --unstacked"
3827
#: bzrlib/builtins.py:6171
3811
#: bzrlib/builtins.py:6152
3828
3812
msgid "No target configuration specified"
3831
#: bzrlib/builtins.py:6206
3815
#: bzrlib/builtins.py:6187
3832
3816
msgid "Set the branch of a checkout and update."
3835
#: bzrlib/builtins.py:6208
3819
#: bzrlib/builtins.py:6189
3837
3821
"For lightweight checkouts, this changes the branch being referenced.\n"
3838
3822
"For heavyweight checkouts, this checks that there are no local commits\n"
3911
3895
"want to switch back to your view after that."
3914
#: bzrlib/builtins.py:6305
3898
#: bzrlib/builtins.py:6281
3917
3901
" To define the current view::"
3920
#: bzrlib/builtins.py:6308
3904
#: bzrlib/builtins.py:6284
3921
3905
msgid " bzr view file1 dir1 ..."
3924
#: bzrlib/builtins.py:6310
3908
#: bzrlib/builtins.py:6286
3925
3909
msgid " To list the current view::"
3928
#: bzrlib/builtins.py:6312
3912
#: bzrlib/builtins.py:6288
3929
3913
msgid " bzr view"
3932
#: bzrlib/builtins.py:6314
3916
#: bzrlib/builtins.py:6290
3933
3917
msgid " To delete the current view::"
3936
#: bzrlib/builtins.py:6316
3920
#: bzrlib/builtins.py:6292
3937
3921
msgid " bzr view --delete"
3940
#: bzrlib/builtins.py:6318
3924
#: bzrlib/builtins.py:6294
3941
3925
msgid " To disable the current view without deleting it::"
3944
#: bzrlib/builtins.py:6320
3928
#: bzrlib/builtins.py:6296
3945
3929
msgid " bzr view --switch off"
3948
#: bzrlib/builtins.py:6322
3932
#: bzrlib/builtins.py:6298
3949
3933
msgid " To define a named view and switch to it::"
3952
#: bzrlib/builtins.py:6324
3936
#: bzrlib/builtins.py:6300
3953
3937
msgid " bzr view --name view-name file1 dir1 ..."
3956
#: bzrlib/builtins.py:6326
3940
#: bzrlib/builtins.py:6302
3957
3941
msgid " To list a named view::"
3960
#: bzrlib/builtins.py:6328
3944
#: bzrlib/builtins.py:6304
3961
3945
msgid " bzr view --name view-name"
3964
#: bzrlib/builtins.py:6330
3948
#: bzrlib/builtins.py:6306
3965
3949
msgid " To delete a named view::"
3968
#: bzrlib/builtins.py:6332
3952
#: bzrlib/builtins.py:6308
3969
3953
msgid " bzr view --name view-name --delete"
3972
#: bzrlib/builtins.py:6334
3956
#: bzrlib/builtins.py:6310
3973
3957
msgid " To switch to a named view::"
3976
#: bzrlib/builtins.py:6336
3960
#: bzrlib/builtins.py:6312
3977
3961
msgid " bzr view --switch view-name"
3980
#: bzrlib/builtins.py:6338
3964
#: bzrlib/builtins.py:6314
3981
3965
msgid " To list all views defined::"
3984
#: bzrlib/builtins.py:6340
3968
#: bzrlib/builtins.py:6316
3985
3969
msgid " bzr view --all"
3988
#: bzrlib/builtins.py:6342
3972
#: bzrlib/builtins.py:6318
3989
3973
msgid " To delete all views::"
3992
#: bzrlib/builtins.py:6344
3976
#: bzrlib/builtins.py:6320
3993
3977
msgid " bzr view --delete --all"
3996
#: bzrlib/builtins.py:6351
3980
#: bzrlib/builtins.py:6327
3997
3981
msgid "Apply list or delete action to all views."
4000
#: bzrlib/builtins.py:6354
3984
#: bzrlib/builtins.py:6330
4001
3985
msgid "Delete the view."
4004
#: bzrlib/builtins.py:6357
3988
#: bzrlib/builtins.py:6333
4005
3989
msgid "Name of the view to define, list or delete."
4008
#: bzrlib/builtins.py:6361
3992
#: bzrlib/builtins.py:6337
4009
3993
msgid "Name of the view to switch to."
4012
#: bzrlib/builtins.py:6380
3996
#: bzrlib/builtins.py:6356
4013
3997
msgid "Both --delete and a file list specified"
4016
#: bzrlib/builtins.py:6383
4000
#: bzrlib/builtins.py:6359
4017
4001
msgid "Both --delete and --switch specified"
4020
#: bzrlib/builtins.py:6386
4004
#: bzrlib/builtins.py:6362
4021
4005
msgid "Deleted all views.\n"
4024
#: bzrlib/builtins.py:6388
4008
#: bzrlib/builtins.py:6364
4025
4009
msgid "No current view to delete"
4028
#: bzrlib/builtins.py:6391
4012
#: bzrlib/builtins.py:6367
4029
4013
#, python-format
4030
4014
msgid "Deleted '%s' view.\n"
4033
#: bzrlib/builtins.py:6395
4017
#: bzrlib/builtins.py:6371
4034
4018
msgid "Both --switch and a file list specified"
4037
#: bzrlib/builtins.py:6398
4021
#: bzrlib/builtins.py:6374
4038
4022
msgid "Both --switch and --all specified"
4041
#: bzrlib/builtins.py:6401
4025
#: bzrlib/builtins.py:6377
4042
4026
msgid "No current view to disable"
4045
#: bzrlib/builtins.py:6403
4029
#: bzrlib/builtins.py:6379
4046
4030
#, python-format
4047
4031
msgid "Disabled '%s' view.\n"
4050
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4034
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4051
4035
msgid "Using '{0}' view: {1}\n"
4054
#: bzrlib/builtins.py:6410
4038
#: bzrlib/builtins.py:6386
4055
4039
msgid "Views defined:\n"
4058
#: bzrlib/builtins.py:6419
4042
#: bzrlib/builtins.py:6395
4059
4043
msgid "No views defined.\n"
4062
#: bzrlib/builtins.py:6426
4046
#: bzrlib/builtins.py:6402
4063
4047
msgid "Cannot change the 'off' pseudo view"
4066
#: bzrlib/builtins.py:6434
4050
#: bzrlib/builtins.py:6410
4067
4051
msgid "No current view.\n"
4070
#: bzrlib/builtins.py:6437
4054
#: bzrlib/builtins.py:6413
4071
4055
msgid "'{0}' view is: {1}\n"
4074
#: bzrlib/builtins.py:6457
4058
#: bzrlib/builtins.py:6433
4075
4059
msgid " <no hooks installed>\n"
4078
#: bzrlib/builtins.py:6461
4062
#: bzrlib/builtins.py:6437
4079
4063
msgid "Remove a branch."
4082
#: bzrlib/builtins.py:6463
4066
#: bzrlib/builtins.py:6439
4084
4068
"This will remove the branch from the specified location but \n"
4085
4069
"will keep any working tree or repository in place."
4088
#: bzrlib/builtins.py:6468
4072
#: bzrlib/builtins.py:6444
4089
4073
msgid " Remove the branch at repo/trunk::"
4092
#: bzrlib/builtins.py:6470
4076
#: bzrlib/builtins.py:6446
4093
4077
msgid " bzr remove-branch repo/trunk"
4096
#: bzrlib/builtins.py:6477
4097
msgid "Remove branch even if it is the active branch."
4100
#: bzrlib/builtins.py:6491
4101
msgid "Branch is active. Use --force to remove it."
4104
#: bzrlib/builtins.py:6495
4080
#: bzrlib/builtins.py:6461
4105
4081
msgid "Plaintext diff output."
4108
#: bzrlib/builtins.py:6496
4084
#: bzrlib/builtins.py:6462
4109
4085
msgid "Temporarily set aside some changes from the current tree."
4112
#: bzrlib/builtins.py:6498
4088
#: bzrlib/builtins.py:6464
4114
4090
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4115
4091
"ie. out of the way, until a later time when you can bring them back from\n"
4170
#: bzrlib/builtins.py:6537
4146
#: bzrlib/builtins.py:6503
4171
4147
msgid "Shelve all changes."
4174
#: bzrlib/builtins.py:6539
4150
#: bzrlib/builtins.py:6505
4175
4151
msgid "Method to use for writing diffs."
4178
#: bzrlib/builtins.py:6539
4154
#: bzrlib/builtins.py:6505
4182
#: bzrlib/builtins.py:6543
4158
#: bzrlib/builtins.py:6509
4183
4159
msgid "List shelved changes."
4186
#: bzrlib/builtins.py:6545
4162
#: bzrlib/builtins.py:6511
4187
4163
msgid "Destroy removed changes instead of shelving them."
4190
#: bzrlib/builtins.py:6574
4166
#: bzrlib/builtins.py:6540
4191
4167
msgid "No shelved changes."
4194
#: bzrlib/builtins.py:6585
4170
#: bzrlib/builtins.py:6551
4195
4171
msgid "Restore shelved changes."
4198
#: bzrlib/builtins.py:6587
4174
#: bzrlib/builtins.py:6553
4200
4176
"By default, the most recently shelved changes are restored. However if you\n"
4201
4177
"specify a shelf by id those changes will be restored instead. This works\n"
4202
4178
"best when the changes don't depend on each other."
4205
#: bzrlib/builtins.py:6596
4181
#: bzrlib/builtins.py:6562
4206
4182
msgid "The action to perform."
4209
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4185
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4213
#: bzrlib/builtins.py:6598
4189
#: bzrlib/builtins.py:6564
4214
4190
msgid "Apply changes and remove from the shelf."
4217
#: bzrlib/builtins.py:6599
4193
#: bzrlib/builtins.py:6565
4218
4194
msgid "Show changes, but do not apply or remove them."
4221
#: bzrlib/builtins.py:6600
4197
#: bzrlib/builtins.py:6566
4223
4199
"Instead of unshelving the changes, show the diff that would result from "
4227
#: bzrlib/builtins.py:6602
4203
#: bzrlib/builtins.py:6568
4228
4204
msgid "Delete changes without applying them."
4231
#: bzrlib/builtins.py:6603
4207
#: bzrlib/builtins.py:6569
4232
4208
msgid "Apply changes but don't delete them."
4235
#: bzrlib/builtins.py:6618
4211
#: bzrlib/builtins.py:6584
4236
4212
msgid "Remove unwanted files from working tree."
4239
#: bzrlib/builtins.py:6620
4215
#: bzrlib/builtins.py:6586
4241
4217
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4242
4218
"files are never deleted."
4245
#: bzrlib/builtins.py:6623
4221
#: bzrlib/builtins.py:6589
4247
4223
"Another class is 'detritus', which includes files emitted by bzr during\n"
4248
4224
"normal operations and selftests. (The value of these files decreases with\n"
4252
#: bzrlib/builtins.py:6627
4228
#: bzrlib/builtins.py:6593
4254
4230
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4255
4231
"flags are respected, and may be combined."
4258
#: bzrlib/builtins.py:6630
4234
#: bzrlib/builtins.py:6596
4259
4235
msgid "To check what clean-tree will do, use --dry-run."
4262
#: bzrlib/builtins.py:6633
4238
#: bzrlib/builtins.py:6599
4263
4239
msgid "Delete all ignored files."
4266
#: bzrlib/builtins.py:6634
4242
#: bzrlib/builtins.py:6600
4268
4244
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4271
#: bzrlib/builtins.py:6637
4247
#: bzrlib/builtins.py:6603
4272
4248
msgid "Delete files unknown to bzr (default)."
4275
#: bzrlib/builtins.py:6638
4251
#: bzrlib/builtins.py:6604
4276
4252
msgid "Show files to delete instead of deleting them."
4279
#: bzrlib/builtins.py:6640
4255
#: bzrlib/builtins.py:6606
4280
4256
msgid "Do not prompt before deleting."
5194
#: bzrlib/errors.py:818
5159
#: bzrlib/errors.py:809
5195
5160
msgid "Revision is not compatible with %(repo_format)s"
5198
#: bzrlib/errors.py:828
5163
#: bzrlib/errors.py:819
5199
5164
msgid "%(context_info)s%(path)s is already versioned."
5202
#: bzrlib/errors.py:849
5167
#: bzrlib/errors.py:840
5203
5168
msgid "%(context_info)s%(path)s is not versioned."
5206
#: bzrlib/errors.py:870
5171
#: bzrlib/errors.py:861
5207
5172
msgid "Path(s) are not versioned: %(paths_as_string)s"
5210
#: bzrlib/errors.py:881
5175
#: bzrlib/errors.py:872
5211
5176
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5214
#: bzrlib/errors.py:900
5179
#: bzrlib/errors.py:891
5215
5180
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5218
#: bzrlib/errors.py:908
5183
#: bzrlib/errors.py:899
5220
5185
"Filename %(filename)r is not valid in your current filesystem encoding "
5221
5186
"%(fs_encoding)s"
5224
#: bzrlib/errors.py:919
5189
#: bzrlib/errors.py:910
5225
5190
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5228
#: bzrlib/errors.py:937
5193
#: bzrlib/errors.py:928
5229
5194
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5232
#: bzrlib/errors.py:976
5197
#: bzrlib/errors.py:967
5233
5198
msgid "Cannot lock %(lock)s: %(why)s"
5236
#: bzrlib/errors.py:986
5201
#: bzrlib/errors.py:977
5238
5203
"A transaction related operation was attempted after the transaction finished."
5241
#: bzrlib/errors.py:1013
5206
#: bzrlib/errors.py:1004
5242
5207
msgid "Cannot lock: transport is read only: %(transport)s"
5245
#: bzrlib/errors.py:1021
5210
#: bzrlib/errors.py:1012
5246
5211
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5249
#: bzrlib/errors.py:1032
5214
#: bzrlib/errors.py:1023
5251
5216
"Lock was broken while still open: %(lock)s - check storage consistency!"
5254
#: bzrlib/errors.py:1043
5219
#: bzrlib/errors.py:1034
5256
5221
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5257
5222
"%(holder)r, wanted to break %(target)r"
5260
#: bzrlib/errors.py:1055
5225
#: bzrlib/errors.py:1046
5262
5227
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5263
5228
"Use 'bzr break-lock' to clear it"
5266
#: bzrlib/errors.py:1068
5231
#: bzrlib/errors.py:1059
5267
5232
msgid "Lock not held: %(lock)s"
5270
#: bzrlib/errors.py:1097
5235
#: bzrlib/errors.py:1088
5271
5236
msgid "No changes to commit"
5274
#: bzrlib/errors.py:1102
5239
#: bzrlib/errors.py:1093
5276
5241
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5279
#: bzrlib/errors.py:1112
5244
#: bzrlib/errors.py:1103
5281
5246
"Excluding paths during commit is not supported by repository at "
5282
5247
"%(repository)r."
5285
#: bzrlib/errors.py:1121
5250
#: bzrlib/errors.py:1112
5287
5252
"The specified commit message contains characters unsupported by the current "
5291
#: bzrlib/errors.py:1127
5256
#: bzrlib/errors.py:1118
5292
5257
msgid "Upgrade URL cannot work with readonly URLs."
5295
#: bzrlib/errors.py:1132
5260
#: bzrlib/errors.py:1123
5296
5261
msgid "The branch format %(format)s is already at the most recent format."
5299
#: bzrlib/errors.py:1155
5264
#: bzrlib/errors.py:1146
5300
5265
msgid "Option --change does not accept revision ranges"
5303
#: bzrlib/errors.py:1160
5268
#: bzrlib/errors.py:1151
5304
5269
msgid "No namespace registered for string: %(spec)r"
5307
#: bzrlib/errors.py:1179
5272
#: bzrlib/errors.py:1170
5309
5274
"Requested revision: '%(spec)s' does not exist in branch: "
5310
5275
"%(branch_url)s%(extra)s"
5313
#: bzrlib/errors.py:1193
5278
#: bzrlib/errors.py:1184
5315
5280
"Operation denied because it would change the main history, which is not "
5316
5281
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5319
#: bzrlib/errors.py:1204
5284
#: bzrlib/errors.py:1195
5321
5286
"These branches have diverged. Use the missing command to see how.\n"
5322
5287
"Use the merge command to reconcile them."
5325
#: bzrlib/errors.py:1224
5290
#: bzrlib/errors.py:1215
5327
5292
"Branches have no common ancestor, and no merge base revision was specified."
5330
#: bzrlib/errors.py:1230
5295
#: bzrlib/errors.py:1221
5332
5297
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5300
#: bzrlib/errors.py:1227
5301
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5335
5304
#: bzrlib/errors.py:1236
5336
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5306
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5339
5309
#: bzrlib/errors.py:1245
5341
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5310
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5344
5313
#: bzrlib/errors.py:1254
5345
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5348
#: bzrlib/errors.py:1263
5349
5314
msgid "Branch %(branch)s has no commits."
5352
#: bzrlib/errors.py:1281
5317
#: bzrlib/errors.py:1272
5354
5319
"Bound branch %(branch)s is out of date with master branch "
5355
5320
"%(master)s.%(extra_help)s"
5358
#: bzrlib/errors.py:1293
5323
#: bzrlib/errors.py:1284
5360
5325
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5361
5326
"bound to %(remote)s."
5329
#: bzrlib/errors.py:1296
5330
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5364
5333
#: bzrlib/errors.py:1305
5365
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5368
#: bzrlib/errors.py:1314
5370
5335
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5339
#: bzrlib/errors.py:1317
5340
msgid "Error in processing weave: %(msg)s"
5374
5343
#: bzrlib/errors.py:1326
5375
msgid "Error in processing weave: %(msg)s"
5378
#: bzrlib/errors.py:1335
5379
5344
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5382
#: bzrlib/errors.py:1346
5347
#: bzrlib/errors.py:1337
5383
5348
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5351
#: bzrlib/errors.py:1347
5352
msgid "Weave invariant violated: %(what)s"
5386
5355
#: bzrlib/errors.py:1356
5387
msgid "Weave invariant violated: %(what)s"
5390
#: bzrlib/errors.py:1365
5391
5356
msgid "Parents are mismatched between two revisions. %(msg)s"
5394
#: bzrlib/errors.py:1387
5359
#: bzrlib/errors.py:1378
5396
5361
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5400
#: bzrlib/errors.py:1399
5365
#: bzrlib/errors.py:1390
5401
5366
msgid "Versioned file error"
5404
#: bzrlib/errors.py:1404
5369
#: bzrlib/errors.py:1395
5405
5370
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5408
#: bzrlib/errors.py:1414
5373
#: bzrlib/errors.py:1405
5409
5374
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5412
#: bzrlib/errors.py:1424
5377
#: bzrlib/errors.py:1415
5413
5378
msgid "Text did not match its checksum: %(msg)s"
5381
#: bzrlib/errors.py:1541
5382
msgid "Export format %(format)r not supported"
5416
5385
#: bzrlib/errors.py:1550
5417
msgid "Export format %(format)r not supported"
5420
#: bzrlib/errors.py:1559
5421
5386
msgid "Transport error: %(msg)s %(orig_error)s"
5424
#: bzrlib/errors.py:1585
5389
#: bzrlib/errors.py:1576
5425
5390
msgid "Generic bzr smart protocol error: %(details)s"
5428
#: bzrlib/errors.py:1593
5393
#: bzrlib/errors.py:1584
5429
5394
msgid "Received bad protocol version marker: %(marker)r"
5432
#: bzrlib/errors.py:1625
5397
#: bzrlib/errors.py:1616
5433
5398
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5436
#: bzrlib/errors.py:1630
5401
#: bzrlib/errors.py:1621
5437
5402
msgid "Connection error: %(msg)s %(orig_error)s"
5440
#: bzrlib/errors.py:1635
5405
#: bzrlib/errors.py:1626
5441
5406
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5444
#: bzrlib/errors.py:1656
5409
#: bzrlib/errors.py:1647
5445
5410
msgid "Connection closed: %(msg)s %(orig_error)s"
5448
#: bzrlib/errors.py:1661
5413
#: bzrlib/errors.py:1652
5449
5414
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5452
#: bzrlib/errors.py:1666
5417
#: bzrlib/errors.py:1657
5453
5418
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5456
#: bzrlib/errors.py:1676
5421
#: bzrlib/errors.py:1667
5457
5422
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5460
#: bzrlib/errors.py:1691
5425
#: bzrlib/errors.py:1682
5461
5426
msgid "Certificate error: %(error)s"
5464
#: bzrlib/errors.py:1699
5429
#: bzrlib/errors.py:1690
5465
5430
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5468
#: bzrlib/errors.py:1713
5433
#: bzrlib/errors.py:1704
5469
5434
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5437
#: bzrlib/errors.py:1712
5438
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5472
5441
#: bzrlib/errors.py:1721
5473
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5476
#: bzrlib/errors.py:1730
5477
5442
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5480
#: bzrlib/errors.py:1744
5445
#: bzrlib/errors.py:1735
5481
5446
msgid "Too many redirections"
5484
#: bzrlib/errors.py:1749
5449
#: bzrlib/errors.py:1740
5485
5450
msgid "Working tree has conflicts."
5453
#: bzrlib/errors.py:1744
5454
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5488
5457
#: bzrlib/errors.py:1753
5489
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5492
#: bzrlib/errors.py:1762
5494
5459
"Error(s) parsing config file %(filename)s:\n"
5498
#: bzrlib/errors.py:1772
5463
#: bzrlib/errors.py:1763
5500
5465
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5501
5466
"See ``bzr help %(name)s``"
5469
#: bzrlib/errors.py:1773
5470
msgid "%(username)r does not seem to contain a reasonable email address"
5504
5473
#: bzrlib/errors.py:1782
5505
msgid "%(username)r does not seem to contain a reasonable email address"
5508
#: bzrlib/errors.py:1791
5509
5474
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5512
#: bzrlib/errors.py:1799
5477
#: bzrlib/errors.py:1790
5513
5478
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5516
#: bzrlib/errors.py:1807
5481
#: bzrlib/errors.py:1798
5517
5482
msgid "Unable to import library \"%(library)s\": %(error)s"
5520
#: bzrlib/errors.py:1815
5485
#: bzrlib/errors.py:1806
5521
5486
msgid "python-gpgme is not installed, it is needed to verify signatures"
5524
#: bzrlib/errors.py:1823
5489
#: bzrlib/errors.py:1814
5526
5491
"The working tree for %(basedir)s has changed since the last commit, but "
5527
5492
"weave merge requires that it be unchanged"
5530
#: bzrlib/errors.py:1833
5495
#: bzrlib/errors.py:1824
5532
5497
"Can't reprocess and show base, because reprocessing obscures the "
5533
5498
"relationship of conflicting lines to the base"
5536
#: bzrlib/errors.py:1839
5501
#: bzrlib/errors.py:1830
5537
5502
msgid "Cycle in graph %(graph)r"
5540
#: bzrlib/errors.py:1867
5505
#: bzrlib/errors.py:1858
5541
5506
msgid "File %(filename)s is not conflicted."
5509
#: bzrlib/errors.py:1880
5510
msgid "No bundle was found in \"%(filename)s\"."
5544
5513
#: bzrlib/errors.py:1889
5545
msgid "No bundle was found in \"%(filename)s\"."
5548
#: bzrlib/errors.py:1898
5549
5514
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5552
#: bzrlib/errors.py:1908
5517
#: bzrlib/errors.py:1899
5553
5518
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5556
#: bzrlib/errors.py:1921
5521
#: bzrlib/errors.py:1912
5557
5522
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5560
#: bzrlib/errors.py:1931
5525
#: bzrlib/errors.py:1922
5561
5526
msgid "Key %(key)s is already present in map"
5564
#: bzrlib/errors.py:1936
5529
#: bzrlib/errors.py:1927
5565
5530
msgid "The prefix %(prefix)s is in the help search path twice."
5568
#: bzrlib/errors.py:1946
5533
#: bzrlib/errors.py:1937
5570
5535
"No final name for trans_id %(trans_id)r\n"
5571
5536
"file-id: %(file_id)r\n"
5572
5537
"root trans-id: %(root_trans_id)r\n"
5575
#: bzrlib/errors.py:1978
5540
#: bzrlib/errors.py:1969
5576
5541
msgid "Attempt to reuse a transform that has already been applied."
5579
#: bzrlib/errors.py:1983
5544
#: bzrlib/errors.py:1974
5580
5545
msgid "Moving the root directory is not supported at this time"
5583
#: bzrlib/errors.py:1988
5548
#: bzrlib/errors.py:1979
5584
5549
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5587
#: bzrlib/errors.py:1999
5552
#: bzrlib/errors.py:1990
5589
5554
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5592
#: bzrlib/errors.py:2035
5557
#: bzrlib/errors.py:2026
5594
5559
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5597
#: bzrlib/errors.py:2065
5562
#: bzrlib/errors.py:2056
5598
5563
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5601
#: bzrlib/errors.py:2073
5566
#: bzrlib/errors.py:2064
5602
5567
msgid "Nothing to merge."
5570
#: bzrlib/errors.py:2069
5571
msgid "Format %(format)s cannot be initialised by this version of bzr."
5605
5574
#: bzrlib/errors.py:2078
5606
msgid "Format %(format)s cannot be initialised by this version of bzr."
5609
#: bzrlib/errors.py:2087
5611
5576
"Cannot convert from format %(from_format)s to format %(format)s. "
5615
#: bzrlib/errors.py:2099
5580
#: bzrlib/errors.py:2090
5616
5581
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5619
#: bzrlib/errors.py:2107
5584
#: bzrlib/errors.py:2098
5620
5585
msgid "%(exe_name)s could not be found on this machine"
5623
#: bzrlib/errors.py:2115
5588
#: bzrlib/errors.py:2106
5624
5589
msgid "Diff is not installed on this machine: %(msg)s"
5627
#: bzrlib/errors.py:2123
5592
#: bzrlib/errors.py:2114
5628
5593
msgid "Diff3 is not installed on this machine."
5631
#: bzrlib/errors.py:2129
5596
#: bzrlib/errors.py:2120
5632
5597
msgid "The content being inserted is already present."
5635
#: bzrlib/errors.py:2134
5600
#: bzrlib/errors.py:2125
5637
5602
"This tree contains left-over files from a failed operation.\n"
5638
5603
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5655
5620
" keep, and delete it when you are done."
5658
#: bzrlib/errors.py:2166
5623
#: bzrlib/errors.py:2157
5660
5625
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5661
5626
"examine %(pending_deletion)s to see if it contains any files you wish to "
5662
5627
"keep, and delete it when you are done."
5665
#: bzrlib/errors.py:2176
5630
#: bzrlib/errors.py:2167
5666
5631
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5669
#: bzrlib/errors.py:2190
5634
#: bzrlib/errors.py:2181
5671
5636
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5674
#: bzrlib/errors.py:2203
5639
#: bzrlib/errors.py:2194
5675
5640
msgid "Error in merge modified format"
5678
#: bzrlib/errors.py:2208
5643
#: bzrlib/errors.py:2199
5679
5644
msgid "Format error in conflict listings"
5682
#: bzrlib/errors.py:2212
5647
#: bzrlib/errors.py:2203
5684
5649
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5685
5650
"Error: %(description)s"
5688
#: bzrlib/errors.py:2223
5653
#: bzrlib/errors.py:2214
5690
5655
"An error has been detected in the repository %(repo_path)s.\n"
5691
5656
"Please run bzr reconcile on this repository."
5694
#: bzrlib/errors.py:2234
5659
#: bzrlib/errors.py:2225
5696
5661
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5697
5662
"reason: %(reason)s"
5700
#: bzrlib/errors.py:2247
5665
#: bzrlib/errors.py:2238
5702
5667
"An inconsistent delta was supplied: %(delta)r\n"
5703
5668
"reason: %(reason)s"
5671
#: bzrlib/errors.py:2250
5672
msgid "To use this feature you must upgrade your branch at %(path)s."
5706
5675
#: bzrlib/errors.py:2259
5707
msgid "To use this feature you must upgrade your branch at %(path)s."
5710
#: bzrlib/errors.py:2268
5711
5676
msgid "To use this feature you must upgrade your repository at %(path)s."
5714
#: bzrlib/errors.py:2273
5679
#: bzrlib/errors.py:2264
5716
5681
"To use this feature you must upgrade your branch at %(path)s to a format "
5717
5682
"which supports rich roots."
5720
#: bzrlib/errors.py:2279
5685
#: bzrlib/errors.py:2270
5721
5686
msgid "Cannot perform local-only commits on unbound branches."
5724
#: bzrlib/errors.py:2284
5689
#: bzrlib/errors.py:2275
5725
5690
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5728
#: bzrlib/errors.py:2305
5693
#: bzrlib/errors.py:2296
5729
5694
msgid "Ghost tags not supported by format %(format)r."
5732
#: bzrlib/errors.py:2313
5697
#: bzrlib/errors.py:2304
5733
5698
msgid "File is binary but should be text."
5701
#: bzrlib/errors.py:2309
5702
msgid "The path %(path)s is not permitted on this platform"
5736
5705
#: bzrlib/errors.py:2318
5737
msgid "The path %(path)s is not permitted on this platform"
5740
#: bzrlib/errors.py:2327
5742
5707
"Testament did not match expected value.\n"
5743
5708
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5744
5709
" {%(measured)s}"
5712
#: bzrlib/errors.py:2330
5713
msgid "Not a bzr revision-bundle: %(text)r"
5747
5716
#: bzrlib/errors.py:2339
5748
msgid "Not a bzr revision-bundle: %(text)r"
5717
msgid "Bad bzr revision-bundle: %(text)r"
5751
5720
#: bzrlib/errors.py:2348
5752
msgid "Bad bzr revision-bundle: %(text)r"
5755
#: bzrlib/errors.py:2357
5756
5721
msgid "Malformed bzr revision-bundle header: %(text)r"
5759
#: bzrlib/errors.py:2362
5724
#: bzrlib/errors.py:2353
5760
5725
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5763
#: bzrlib/errors.py:2367
5728
#: bzrlib/errors.py:2358
5764
5729
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5767
#: bzrlib/errors.py:2372
5732
#: bzrlib/errors.py:2363
5768
5733
msgid "End of line marker was not \\n in bzr revision-bundle"
5771
#: bzrlib/errors.py:2382
5736
#: bzrlib/errors.py:2373
5772
5737
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5775
#: bzrlib/errors.py:2392
5740
#: bzrlib/errors.py:2383
5776
5741
msgid "Root class for inventory serialization errors"
5779
#: bzrlib/errors.py:2396
5744
#: bzrlib/errors.py:2387
5781
5746
"The inventory was not in the expected format:\n"
5785
#: bzrlib/errors.py:2405
5750
#: bzrlib/errors.py:2396
5786
5751
msgid "This operation requires rich root data storage"
5754
#: bzrlib/errors.py:2409
5755
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5789
5758
#: bzrlib/errors.py:2418
5790
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5793
#: bzrlib/errors.py:2427
5795
5760
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5799
#: bzrlib/errors.py:2434
5764
#: bzrlib/errors.py:2425
5801
5766
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5802
5767
"ghost at {%(ghost_revision_id)s}"
5805
#: bzrlib/errors.py:2444
5770
#: bzrlib/errors.py:2435
5806
5771
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5809
#: bzrlib/errors.py:2495
5774
#: bzrlib/errors.py:2486
5811
5776
"A merge directive must provide either a bundle or a public branch location."
5814
#: bzrlib/errors.py:2502
5779
#: bzrlib/errors.py:2493
5815
5780
msgid "Bad merge directive payload %(start)r"
5818
#: bzrlib/errors.py:2512
5783
#: bzrlib/errors.py:2503
5819
5784
msgid "Preview patch does not match requested changes."
5822
#: bzrlib/errors.py:2518
5787
#: bzrlib/errors.py:2509
5823
5788
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5826
#: bzrlib/errors.py:2528
5791
#: bzrlib/errors.py:2519
5828
5793
"Your branch does not have all of the revisions required in order to merge "
5829
5794
"this merge directive and the target location specified in the merge "
5830
5795
"directive is not a branch: %(location)s."
5833
#: bzrlib/errors.py:2540
5798
#: bzrlib/errors.py:2531
5834
5799
msgid "Unsupported entry kind %(kind)s"
5837
#: bzrlib/errors.py:2548
5802
#: bzrlib/errors.py:2539
5838
5803
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5841
#: bzrlib/errors.py:2558
5806
#: bzrlib/errors.py:2549
5842
5807
msgid "Subsume target %(other_tree)s needs to be upgraded."
5845
#: bzrlib/errors.py:2577
5810
#: bzrlib/errors.py:2568
5846
5811
msgid "No such tag: %(tag_name)s"
5814
#: bzrlib/errors.py:2576
5815
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5849
5818
#: bzrlib/errors.py:2585
5850
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5853
#: bzrlib/errors.py:2594
5854
5819
msgid "Tag %(tag_name)s already exists."
5857
#: bzrlib/errors.py:2602
5822
#: bzrlib/errors.py:2593
5859
5824
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5860
5825
"bugs\" for more information on this feature."
5863
#: bzrlib/errors.py:2612
5828
#: bzrlib/errors.py:2603
5865
5830
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5868
#: bzrlib/errors.py:2622
5833
#: bzrlib/errors.py:2613
5870
5835
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5873
#: bzrlib/errors.py:2632
5838
#: bzrlib/errors.py:2623
5874
5839
msgid "Invalid line in bugs property: '%(line)s'"
5877
#: bzrlib/errors.py:2640
5842
#: bzrlib/errors.py:2631
5878
5843
msgid "Invalid bug status: '%(status)s'"
5881
#: bzrlib/errors.py:2648
5846
#: bzrlib/errors.py:2639
5882
5847
msgid "Could not understand response from smart server: %(response_tuple)r"
5885
#: bzrlib/errors.py:2687
5850
#: bzrlib/errors.py:2678
5886
5851
msgid "Server sent an unexpected error: %(error_tuple)r"
5889
#: bzrlib/errors.py:2706
5854
#: bzrlib/errors.py:2697
5890
5855
msgid "Unrecognised container format: %(container_format)r"
5893
#: bzrlib/errors.py:2714
5858
#: bzrlib/errors.py:2705
5894
5859
msgid "Unexpected end of container stream"
5897
#: bzrlib/errors.py:2719
5862
#: bzrlib/errors.py:2710
5898
5863
msgid "Unknown record type: %(record_type)r"
5901
#: bzrlib/errors.py:2727
5866
#: bzrlib/errors.py:2718
5902
5867
msgid "Invalid record: %(reason)s"
5905
#: bzrlib/errors.py:2735
5870
#: bzrlib/errors.py:2726
5906
5871
msgid "Container has data after end marker: %(excess)r"
5909
#: bzrlib/errors.py:2743
5874
#: bzrlib/errors.py:2734
5910
5875
msgid "Container has multiple records with the same name: %(name)s"
5913
#: bzrlib/errors.py:2756
5878
#: bzrlib/errors.py:2747
5914
5879
msgid "Corrupt or incompatible data stream: %(reason)s"
5917
#: bzrlib/errors.py:2764
5882
#: bzrlib/errors.py:2755
5918
5883
msgid "SMTP error: %(error)s"
5921
#: bzrlib/errors.py:2772
5886
#: bzrlib/errors.py:2763
5922
5887
msgid "No message supplied."
5925
#: bzrlib/errors.py:2777
5890
#: bzrlib/errors.py:2768
5926
5891
msgid "No mail-to address (--mail-to) or output (-o) specified."
5929
#: bzrlib/errors.py:2782
5894
#: bzrlib/errors.py:2773
5895
msgid "Unknown mail client: %(mail_client)s"
5898
#: bzrlib/errors.py:2781
5931
5900
"Unable to find mail client with the following names: "
5932
5901
"%(mail_command_list_string)s"
5935
#: bzrlib/errors.py:2792
5904
#: bzrlib/errors.py:2791
5936
5905
msgid "SMTP connection to %(host)s refused"
5939
#: bzrlib/errors.py:2801
5908
#: bzrlib/errors.py:2800
5940
5909
msgid "Please specify smtp_server. No server at default %(host)s."
5943
#: bzrlib/errors.py:2815
5912
#: bzrlib/errors.py:2814
5945
5914
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5949
#: bzrlib/errors.py:2827
5918
#: bzrlib/errors.py:2826
5950
5919
msgid "'%(display_url)s' is already a branch."
5953
#: bzrlib/errors.py:2832
5922
#: bzrlib/errors.py:2831
5954
5923
msgid "'%(display_url)s' is already a tree."
5957
#: bzrlib/errors.py:2837
5926
#: bzrlib/errors.py:2836
5958
5927
msgid "'%(display_url)s' is already a checkout."
5961
#: bzrlib/errors.py:2842
5930
#: bzrlib/errors.py:2841
5962
5931
msgid "'%(display_url)s' is already a lightweight checkout."
5965
#: bzrlib/errors.py:2847
5934
#: bzrlib/errors.py:2846
5966
5935
msgid "'%(display_url)s' is already using a shared repository."
5969
#: bzrlib/errors.py:2852
5938
#: bzrlib/errors.py:2851
5970
5939
msgid "'%(display_url)s' is already standalone."
5973
#: bzrlib/errors.py:2857
5942
#: bzrlib/errors.py:2856
5974
5943
msgid "Shared repository '%(display_url)s' already creates working trees."
5977
#: bzrlib/errors.py:2863
5946
#: bzrlib/errors.py:2862
5979
5948
"Shared repository '%(display_url)s' already doesn't create working trees."
5982
#: bzrlib/errors.py:2869
5951
#: bzrlib/errors.py:2868
5983
5952
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5986
#: bzrlib/errors.py:2874
5955
#: bzrlib/errors.py:2873
5987
5956
msgid "No location could be found to bind to at %(display_url)s."
5990
#: bzrlib/errors.py:2879
5959
#: bzrlib/errors.py:2878
5992
5961
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5993
5962
"status).%(more)s"
5996
#: bzrlib/errors.py:2898
5965
#: bzrlib/errors.py:2897
5998
5967
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5999
5968
"list).%(more)s"
6002
#: bzrlib/errors.py:2904
5971
#: bzrlib/errors.py:2903
6003
5972
msgid "Variable {%(name)s} is not available."
6006
#: bzrlib/errors.py:2912
5975
#: bzrlib/errors.py:2911
6007
5976
msgid "No template specified."
6010
#: bzrlib/errors.py:2917
5979
#: bzrlib/errors.py:2916
6011
5980
msgid "Unable to create symlink %(path_str)son this platform"
6014
#: bzrlib/errors.py:2932
5983
#: bzrlib/errors.py:2931
6016
5985
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6017
5986
"\"original\", \"local\"."
6020
#: bzrlib/errors.py:2966
5989
#: bzrlib/errors.py:2965
6022
5991
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6025
#: bzrlib/errors.py:2978
5994
#: bzrlib/errors.py:2977
6026
5995
msgid "The \"%(config_id)s\" configuration does not exist."
6029
#: bzrlib/errors.py:2986
5998
#: bzrlib/errors.py:2985
6030
5999
msgid "The \"%(option_name)s\" configuration option does not exist."
6033
#: bzrlib/errors.py:2994
6002
#: bzrlib/errors.py:2993
6034
6003
msgid "The alias \"%(alias_name)s\" does not exist."
6037
#: bzrlib/errors.py:3008
6006
#: bzrlib/errors.py:3007
6038
6007
msgid "\"%(alias_name)s\" is not a valid location alias."
6041
#: bzrlib/errors.py:3016
6010
#: bzrlib/errors.py:3015
6042
6011
msgid "No %(alias_name)s location assigned."
6045
#: bzrlib/errors.py:3024
6014
#: bzrlib/errors.py:3023
6046
6015
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6049
#: bzrlib/errors.py:3034
6018
#: bzrlib/errors.py:3033
6050
6019
msgid "Unknown rules detected: %(unknowns_str)s."
6053
#: bzrlib/errors.py:3045
6022
#: bzrlib/errors.py:3044
6054
6023
msgid "Tip change rejected: %(msg)s"
6057
#: bzrlib/errors.py:3053
6026
#: bzrlib/errors.py:3052
6058
6027
msgid "Shelf corrupt."
6061
#: bzrlib/errors.py:3058
6030
#: bzrlib/errors.py:3057
6062
6031
msgid "Corruption while decompressing repository file%(orig_error)s"
6065
#: bzrlib/errors.py:3070
6034
#: bzrlib/errors.py:3069
6066
6035
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6069
#: bzrlib/errors.py:3078
6038
#: bzrlib/errors.py:3077
6070
6039
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6073
#: bzrlib/errors.py:3086
6042
#: bzrlib/errors.py:3085
6075
6044
"An attempt to access a url outside the server jail was made: '%(url)s'."
6078
#: bzrlib/errors.py:3094
6047
#: bzrlib/errors.py:3093
6079
6048
msgid "The user aborted the operation."
6082
#: bzrlib/errors.py:3099
6051
#: bzrlib/errors.py:3098
6083
6052
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6086
#: bzrlib/errors.py:3109
6055
#: bzrlib/errors.py:3108
6087
6056
msgid "No such view: %(view_name)s."
6090
#: bzrlib/errors.py:3119
6059
#: bzrlib/errors.py:3118
6092
6061
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6093
6062
"to a later format."
6096
#: bzrlib/errors.py:3128
6065
#: bzrlib/errors.py:3127
6098
6067
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6101
#: bzrlib/errors.py:3195
6070
#: bzrlib/errors.py:3194
6102
6071
msgid "%(bzrdir)r does not support co-located branches."
6105
#: bzrlib/errors.py:3201
6074
#: bzrlib/errors.py:3200
6107
6076
"Unable to determine your name.\n"
6108
6077
"Please, set your name with the 'whoami' command.\n"
6109
6078
"E.g. bzr whoami \"Your Name <name@example.com>\""
6112
#: bzrlib/errors.py:3210
6081
#: bzrlib/errors.py:3209
6113
6082
msgid "Invalid pattern(s) found. %(msg)s"
6116
#: bzrlib/errors.py:3218
6085
#: bzrlib/errors.py:3217
6118
6087
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6119
6088
"unbind` to fix."
6122
#: bzrlib/errors.py:3229
6091
#: bzrlib/errors.py:3228
6123
6092
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6126
#: bzrlib/errors.py:3238
6095
#: bzrlib/errors.py:3237
6127
6096
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6130
#: bzrlib/errors.py:3247
6099
#: bzrlib/errors.py:3246
6132
6101
"No compatible object available for operations from %(source)r to %(target)r."
6135
#: bzrlib/errors.py:3257
6104
#: bzrlib/errors.py:3256
6137
6106
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6138
6107
"%(arguments)s."
6141
#: bzrlib/errors.py:3267
6110
#: bzrlib/errors.py:3266
6143
6112
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6144
6113
"format %(format)r"
6147
#: bzrlib/errors.py:3279
6116
#: bzrlib/errors.py:3278
6149
6118
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6153
#: bzrlib/errors.py:3292
6122
#: bzrlib/errors.py:3291
6154
6123
msgid "Binary files section encountered."
6157
#: bzrlib/errors.py:3300
6126
#: bzrlib/errors.py:3299
6159
6128
"Malformed patch header. %(desc)s\n"
6163
#: bzrlib/errors.py:3309
6132
#: bzrlib/errors.py:3308
6165
6134
"Malformed hunk header. %(desc)s\n"
6169
#: bzrlib/errors.py:3318
6138
#: bzrlib/errors.py:3317
6171
6140
"Malformed line. %(desc)s\n"
6175
#: bzrlib/errors.py:3328
6144
#: bzrlib/errors.py:3327
6177
6146
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6178
6147
"but patch says it should be \"%(patch_line)s\""
6181
#: bzrlib/errors.py:3339
6150
#: bzrlib/errors.py:3338
6182
6151
msgid "The feature %(feature)s has already been registered."
6230
6199
"regular push."
6233
#: bzrlib/gpg.py:366
6234
msgid "No GnuPG key results for pattern: {0}"
6237
#: bzrlib/gpg.py:439
6202
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6238
6203
msgid "{0} commits with valid signatures"
6241
#: bzrlib/gpg.py:445
6206
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6242
6207
msgid "{0} commit with unknown key"
6243
6208
msgid_plural "{0} commits with unknown keys"
6247
#: bzrlib/gpg.py:453
6212
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6248
6213
msgid "{0} commit not valid"
6249
6214
msgid_plural "{0} commits not valid"
6253
#: bzrlib/gpg.py:461
6218
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6254
6219
msgid "{0} commit not signed"
6255
6220
msgid_plural "{0} commits not signed"
6259
#: bzrlib/gpg.py:469
6224
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6260
6225
msgid "{0} commit with key now expired"
6261
6226
msgid_plural "{0} commits with key now expired"
6265
#: bzrlib/gpg.py:489
6266
msgid "{0} commit by author {1} with key {2} now expired"
6267
msgid_plural "{0} commits by author {1} with key {2} now expired"
6230
#: bzrlib/gpg.py:343
6231
msgid "No GnuPG key results for pattern: {0}"
6271
#: bzrlib/gpg.py:505
6234
#: bzrlib/gpg.py:386
6272
6235
msgid "{0} signed {1} commit"
6273
6236
msgid_plural "{0} signed {1} commits"
6277
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6240
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6278
6241
msgid "{0} commit by author {1}"
6279
6242
msgid_plural "{0} commits by author {1}"
6283
#: bzrlib/gpg.py:554
6246
#: bzrlib/gpg.py:433
6284
6247
msgid "Unknown key {0} signed {1} commit"
6285
6248
msgid_plural "Unknown key {0} signed {1} commits"
6252
#: bzrlib/gpg.py:452
6253
msgid "{0} commit by author {1} with key {2} now expired"
6254
msgid_plural "{0} commits by author {1} with key {2} now expired"
6289
6258
#: bzrlib/groupcompress.py:1739
6290
6259
#, python-format
6291
6260
msgid "Insert claimed random_id=True, but then inserted %r two times"
6294
#: bzrlib/hooks.py:313
6263
#: bzrlib/hooks.py:331
6295
6264
#, python-format
6296
6265
msgid "Introduced in: %s"
6299
#: bzrlib/hooks.py:316
6268
#: bzrlib/hooks.py:334
6300
6269
#, python-format
6301
6270
msgid "Deprecated in: %s"
6585
6550
" otherwise error."
6588
#: bzrlib/plugins/launchpad/cmds.py:62
6553
#: bzrlib/plugins/launchpad/__init__.py:99
6591
6556
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6592
6557
" --project fooproject"
6595
#: bzrlib/plugins/launchpad/cmds.py:69
6560
#: bzrlib/plugins/launchpad/__init__.py:106
6596
6561
msgid "Launchpad project short name to associate with the branch."
6599
#: bzrlib/plugins/launchpad/cmds.py:76
6564
#: bzrlib/plugins/launchpad/__init__.py:113
6601
6566
"Short name for the branch; by default taken from the last component of the "
6605
#: bzrlib/plugins/launchpad/cmds.py:80
6570
#: bzrlib/plugins/launchpad/__init__.py:117
6606
6571
msgid "One-sentence description of the branch."
6609
#: bzrlib/plugins/launchpad/cmds.py:83
6574
#: bzrlib/plugins/launchpad/__init__.py:120
6610
6575
msgid "Longer description of the purpose or contents of the branch."
6613
#: bzrlib/plugins/launchpad/cmds.py:86
6578
#: bzrlib/plugins/launchpad/__init__.py:123
6614
6579
msgid "Branch author's email address, if not yourself."
6617
#: bzrlib/plugins/launchpad/cmds.py:89
6582
#: bzrlib/plugins/launchpad/__init__.py:126
6618
6583
msgid "The bug this branch fixes."
6621
#: bzrlib/plugins/launchpad/cmds.py:92
6586
#: bzrlib/plugins/launchpad/__init__.py:129
6622
6587
msgid "Prepare the request but don't actually send it."
6625
#: bzrlib/plugins/launchpad/cmds.py:114
6590
#: bzrlib/plugins/launchpad/__init__.py:151
6627
6592
"register-branch requires a public branch url - see bzr help register-branch."
6630
#: bzrlib/plugins/launchpad/cmds.py:122
6595
#: bzrlib/plugins/launchpad/__init__.py:159
6631
6596
msgid "--product is deprecated; please use --project."
6634
#: bzrlib/plugins/launchpad/cmds.py:152
6599
#: bzrlib/plugins/launchpad/__init__.py:191
6635
6600
msgid "Open a Launchpad branch page in your web browser."
6638
#: bzrlib/plugins/launchpad/cmds.py:157
6603
#: bzrlib/plugins/launchpad/__init__.py:196
6639
6604
msgid "Do not actually open the browser. Just say the URL we would use."
6642
#: bzrlib/plugins/launchpad/cmds.py:192
6607
#: bzrlib/plugins/launchpad/__init__.py:231
6643
6608
#, python-format
6644
6609
msgid "Opening %s in web browser"
6647
#: bzrlib/plugins/launchpad/cmds.py:200
6612
#: bzrlib/plugins/launchpad/__init__.py:241
6648
6613
msgid "Show or set the Launchpad user ID."
6651
#: bzrlib/plugins/launchpad/cmds.py:202
6616
#: bzrlib/plugins/launchpad/__init__.py:243
6653
6618
"When communicating with Launchpad, some commands need to know your\n"
6654
6619
"Launchpad user ID. This command can be used to set or show the\n"
6655
6620
"user ID that Bazaar will use for such communication."
6658
#: bzrlib/plugins/launchpad/cmds.py:206
6623
#: bzrlib/plugins/launchpad/__init__.py:247
6661
6626
" Show the Launchpad ID of the current user::"
6664
#: bzrlib/plugins/launchpad/cmds.py:209
6629
#: bzrlib/plugins/launchpad/__init__.py:250
6665
6630
msgid " bzr launchpad-login"
6668
#: bzrlib/plugins/launchpad/cmds.py:211
6633
#: bzrlib/plugins/launchpad/__init__.py:252
6669
6634
msgid " Set the Launchpad ID of the current user to 'bob'::"
6672
#: bzrlib/plugins/launchpad/cmds.py:213
6637
#: bzrlib/plugins/launchpad/__init__.py:254
6673
6638
msgid " bzr launchpad-login bob"
6676
#: bzrlib/plugins/launchpad/cmds.py:220
6641
#: bzrlib/plugins/launchpad/__init__.py:261
6677
6642
msgid "Don't check that the user name is valid."
6680
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6645
#: bzrlib/plugins/launchpad/__init__.py:276
6646
#: bzrlib/plugins/launchpad/__init__.py:287
6681
6647
msgid "Launchpad user ID exists and has SSH keys.\n"
6684
#: bzrlib/plugins/launchpad/cmds.py:238
6650
#: bzrlib/plugins/launchpad/__init__.py:279
6685
6651
msgid "No Launchpad user ID configured.\n"
6688
#: bzrlib/plugins/launchpad/cmds.py:249
6654
#: bzrlib/plugins/launchpad/__init__.py:290
6689
6655
#, python-format
6690
6656
msgid "Launchpad user ID set to '%s'.\n"
6693
#: bzrlib/plugins/launchpad/cmds.py:255
6659
#: bzrlib/plugins/launchpad/__init__.py:298
6694
6660
msgid "Ask Launchpad to mirror a branch now."
6697
#: bzrlib/plugins/launchpad/cmds.py:272
6663
#: bzrlib/plugins/launchpad/__init__.py:318
6698
6664
msgid "Propose merging a branch on Launchpad."
6701
#: bzrlib/plugins/launchpad/cmds.py:274
6667
#: bzrlib/plugins/launchpad/__init__.py:320
6703
6669
"This will open your usual editor to provide the initial comment. When it\n"
6704
6670
"has created the proposal, it will open it in your default web browser."
6707
#: bzrlib/plugins/launchpad/cmds.py:277
6673
#: bzrlib/plugins/launchpad/__init__.py:323
6709
6675
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6710
6676
"is not supplied, the remembered submit branch will be used. If no submit\n"
6711
6677
"branch is remembered, the development focus will be used."
6714
#: bzrlib/plugins/launchpad/cmds.py:281
6680
#: bzrlib/plugins/launchpad/__init__.py:327
6716
6682
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6717
6683
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6761
6723
"are opened in a web browser."
6764
#: bzrlib/plugins/launchpad/cmds.py:342
6726
#: bzrlib/plugins/launchpad/__init__.py:389
6766
6728
"Any revision involved in the merge may be specified-- the revision in\n"
6767
6729
"which the merge was performed, or one of the revisions that was merged."
6770
#: bzrlib/plugins/launchpad/cmds.py:345
6732
#: bzrlib/plugins/launchpad/__init__.py:392
6771
6733
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6774
#: bzrlib/plugins/launchpad/cmds.py:347
6736
#: bzrlib/plugins/launchpad/__init__.py:394
6775
6737
msgid " bzr lp-find-proposal -r annotate:README:1"
6778
#: bzrlib/plugins/launchpad/cmds.py:363
6740
#: bzrlib/plugins/launchpad/__init__.py:409
6779
6741
msgid "No review found."
6782
#: bzrlib/plugins/launchpad/cmds.py:364
6744
#: bzrlib/plugins/launchpad/__init__.py:410
6783
6745
#, python-format
6784
6746
msgid "%d proposals(s) found."
6787
#: bzrlib/plugins/launchpad/cmds.py:374
6749
#: bzrlib/plugins/launchpad/__init__.py:420
6788
6750
msgid "Finding revision-id"
6791
#: bzrlib/plugins/launchpad/cmds.py:381
6753
#: bzrlib/plugins/launchpad/__init__.py:427
6792
6754
msgid "Finding merge"
6795
#: bzrlib/plugins/launchpad/cmds.py:386
6757
#: bzrlib/plugins/launchpad/__init__.py:432
6796
6758
msgid "Finding revno"
6799
#: bzrlib/plugins/launchpad/cmds.py:392
6761
#: bzrlib/plugins/launchpad/__init__.py:437
6800
6762
msgid "Finding Launchpad branch"
6803
#: bzrlib/plugins/launchpad/cmds.py:395
6765
#: bzrlib/plugins/launchpad/__init__.py:440
6804
6766
msgid "Finding proposals"
6769
#: bzrlib/plugins/launchpad/account.py:66
6770
msgid "Setting ssh/sftp usernames for launchpad.net."
6807
6773
#: bzrlib/plugins/launchpad/lp_api.py:241
6808
6774
#: bzrlib/plugins/launchpad/lp_api.py:246
6809
6775
#, python-format
6850
#: bzrlib/plugins/launchpad/lp_propose.py:150
6816
#: bzrlib/plugins/launchpad/lp_propose.py:149
6851
6817
#, python-format
6852
6818
msgid "There is already a branch merge proposal: %s"
6855
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6821
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6856
6822
msgid "pb parameter to convert() is deprecated"
6859
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6825
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6860
6826
msgid "starting upgrade from format 4 to 5"
6863
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6829
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6864
6830
msgid "note: upgrade may be faster if all store files are ungzipped first"
6867
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6833
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6868
6834
msgid "converting revision"
6837
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6838
msgid "upgraded to weaves:"
6871
6841
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6872
msgid "upgraded to weaves:"
6875
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6876
6842
#, python-format
6877
6843
msgid "%6d revisions and inventories"
6880
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6846
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6881
6847
#, python-format
6882
6848
msgid "%6d revisions not present"
6885
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6851
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6886
6852
#, python-format
6887
6853
msgid "%6d texts"
6890
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6856
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6891
6857
msgid "writing weave"
6894
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6860
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6861
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6896
6862
msgid "inventory"
6899
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6865
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6900
6866
msgid "write revision"
6903
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6869
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6904
6870
msgid "loading revision"
6907
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6873
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6908
6874
#, python-format
6909
6875
msgid "revision {%s} not present in branch; will be converted as a ghost"
6912
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6878
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6913
6879
msgid "starting upgrade from format 5 to 6"
6916
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6882
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6917
6883
#, python-format
6918
6884
msgid "adding prefixes to %s"
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6887
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6922
6888
msgid "starting upgrade from format 6 to metadir"
6925
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6891
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6926
6892
msgid "Removing ancestry.weave"
6929
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6930
6896
msgid "Finding branch files"
6933
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6899
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6934
6900
msgid "Upgrading repository"
6937
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6903
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6938
6904
msgid "Upgrading branch"
6941
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6907
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6942
6908
msgid "No working tree."
6945
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6911
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6946
6912
msgid "Upgrading working tree"
6949
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6915
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6950
6916
#, python-format
6951
6917
msgid "Make %s lock"
6954
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6920
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6955
6921
#, python-format
6956
6922
msgid "Moving %s"
9821
9803
"of bzr that requires authentication (smtp for example)."
9824
#: en/help_topics/configuration.txt:391
9806
#: en/help_topics/configuration.txt:379
9826
9808
"The syntax of the file obeys the same rules as the others except for the\n"
9827
9809
"option policies which don't apply."
9830
#: en/help_topics/configuration.txt:394
9812
#: en/help_topics/configuration.txt:382
9832
9814
"For more information on the possible uses of the authentication "
9833
9815
"configuration\n"
9834
9816
"file see :doc:`authentication-help`."
9837
#: en/help_topics/configuration.txt:397
9819
#: en/help_topics/configuration.txt:385
9840
9822
"Common options\n"
9841
9823
"--------------"
9844
#: en/help_topics/configuration.txt:401
9826
#: en/help_topics/configuration.txt:389
9846
9828
"debug_flags\n"
9850
#: en/help_topics/configuration.txt:404
9832
#: en/help_topics/configuration.txt:392
9852
9834
"A comma-separated list of debugging options to turn on. The same values\n"
9853
9835
"can be used as with the -D command-line option (see `help global-options`).\n"
9854
9836
"For example::"
9857
#: en/help_topics/configuration.txt:408
9839
#: en/help_topics/configuration.txt:396
9858
9840
msgid " debug_flags = hpss"
9861
#: en/help_topics/configuration.txt:412
9843
#: en/help_topics/configuration.txt:400
9862
9844
msgid " debug_flags = hpss,evil"
9865
#: en/help_topics/configuration.txt:414
9847
#: en/help_topics/configuration.txt:402
9871
#: en/help_topics/configuration.txt:417
9853
#: en/help_topics/configuration.txt:405
9873
9855
"The email address to use when committing a branch. Typically takes the form\n"
9877
#: en/help_topics/configuration.txt:420
9859
#: en/help_topics/configuration.txt:408
9878
9860
msgid " email = Full Name <account@hostname.tld>"
9881
#: en/help_topics/configuration.txt:422
9863
#: en/help_topics/configuration.txt:410
9887
#: en/help_topics/configuration.txt:425
9869
#: en/help_topics/configuration.txt:413
9889
9871
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9890
9872
"a commit message. This setting is trumped by the environment variable\n"
9978
9960
"to sign newly committed revisions, even if the branch requires signatures."
9981
#: en/help_topics/configuration.txt:474
9963
#: en/help_topics/configuration.txt:462
9983
9965
"dirstate.fdatasync\n"
9984
9966
"~~~~~~~~~~~~~~~~~~"
9987
#: en/help_topics/configuration.txt:477
9969
#: en/help_topics/configuration.txt:465
9989
9971
"If true (default), working tree metadata changes are flushed through the\n"
9990
9972
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9991
9973
"should not be lost if the machine crashes. See also repository.fdatasync."
9994
#: en/help_topics/configuration.txt:481
9976
#: en/help_topics/configuration.txt:469
9996
9978
"gpg_signing_key\n"
9997
9979
"~~~~~~~~~~~~~~~"
10000
#: en/help_topics/configuration.txt:484
9982
#: en/help_topics/configuration.txt:472
10002
9984
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10003
9985
"address, key fingerprint or full key ID. When unset or when set to\n"
10004
9986
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10007
#: en/help_topics/configuration.txt:488
9989
#: en/help_topics/configuration.txt:476
10013
#: en/help_topics/configuration.txt:491
9995
#: en/help_topics/configuration.txt:479
10015
9997
"Only useful in ``locations.conf``. Defines whether or not the\n"
10016
9998
"configuration for this section applies to subdirectories:"
10019
#: en/help_topics/configuration.txt:494
10001
#: en/help_topics/configuration.txt:482
10022
10004
" (default) This section applies to subdirectories as well."
10025
#: en/help_topics/configuration.txt:497
10007
#: en/help_topics/configuration.txt:485
10028
10010
" This section only applies to the branch at this directory and not\n"
10029
10011
" branches below it."
10032
#: en/help_topics/configuration.txt:501
10014
#: en/help_topics/configuration.txt:489
10034
10016
"gpg_signing_command\n"
10035
10017
"~~~~~~~~~~~~~~~~~~~"
10038
#: en/help_topics/configuration.txt:504
10020
#: en/help_topics/configuration.txt:492
10040
10022
"(Default: \"gpg\"). Which program should be used to sign and check "
10041
10023
"revisions.\n"
10042
10024
"For example::"
10045
#: en/help_topics/configuration.txt:507
10027
#: en/help_topics/configuration.txt:495
10046
10028
msgid " gpg_signing_command = /usr/bin/gnpg"
10049
#: en/help_topics/configuration.txt:509
10031
#: en/help_topics/configuration.txt:497
10051
10033
"The specified command must accept the options \"--clearsign\" and \"-u "
10055
#: en/help_topics/configuration.txt:511
10037
#: en/help_topics/configuration.txt:499
10057
10039
"bzr_remote_path\n"
10058
10040
"~~~~~~~~~~~~~~~"
10061
#: en/help_topics/configuration.txt:514
10043
#: en/help_topics/configuration.txt:502
10063
10045
"(Default: \"bzr\"). The path to the command that should be used to run the "
10065
10047
"server for bzr. This value may only be specified in locations.conf, because:"
10068
#: en/help_topics/configuration.txt:517
10050
#: en/help_topics/configuration.txt:505
10070
10052
"- it's needed before branch.conf is accessible\n"
10071
10053
"- allowing remote branch.conf files to specify commands would be a security\n"
10075
#: en/help_topics/configuration.txt:521
10057
#: en/help_topics/configuration.txt:509
10076
10058
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10079
#: en/help_topics/configuration.txt:523
10061
#: en/help_topics/configuration.txt:511
10081
10063
"smtp_server\n"
10082
10064
"~~~~~~~~~~~"
10085
#: en/help_topics/configuration.txt:526
10067
#: en/help_topics/configuration.txt:514
10087
10069
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10088
10070
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10091
#: en/help_topics/configuration.txt:529
10073
#: en/help_topics/configuration.txt:517
10093
10075
"smtp_username, smtp_password\n"
10094
10076
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10097
#: en/help_topics/configuration.txt:532
10079
#: en/help_topics/configuration.txt:520
10099
10081
"User and password to authenticate to the SMTP server. If smtp_username\n"
10100
10082
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10303
10285
"--remember``."
10306
#: en/help_topics/configuration.txt:646
10288
#: en/help_topics/configuration.txt:634
10308
10290
"push_location\n"
10309
10291
"~~~~~~~~~~~~~"
10312
#: en/help_topics/configuration.txt:649
10294
#: en/help_topics/configuration.txt:637
10314
10296
"If present, the location of the default branch for push. This option\n"
10315
10297
"is normally set by the first ``push`` or ``push --remember``."
10318
#: en/help_topics/configuration.txt:652
10300
#: en/help_topics/configuration.txt:640
10320
10302
"push_strict\n"
10321
10303
"~~~~~~~~~~~"
10324
#: en/help_topics/configuration.txt:655
10306
#: en/help_topics/configuration.txt:643
10326
10308
"If present, defines the ``--strict`` option default value for checking\n"
10327
10309
"uncommitted changes before pushing."
10330
#: en/help_topics/configuration.txt:658
10312
#: en/help_topics/configuration.txt:646
10332
10314
"dpush_strict\n"
10333
10315
"~~~~~~~~~~~~"
10336
#: en/help_topics/configuration.txt:661
10318
#: en/help_topics/configuration.txt:649
10338
10320
"If present, defines the ``--strict`` option default value for checking\n"
10339
10321
"uncommitted changes before pushing into a different VCS without any\n"
10340
10322
"custom bzr metadata."
10343
#: en/help_topics/configuration.txt:665
10325
#: en/help_topics/configuration.txt:653
10345
10327
"bound_location\n"
10346
10328
"~~~~~~~~~~~~~~"
10349
#: en/help_topics/configuration.txt:668
10331
#: en/help_topics/configuration.txt:656
10351
10333
"The location that commits should go to when acting as a checkout.\n"
10352
10334
"This option is normally set by ``bind``."
10355
#: en/help_topics/configuration.txt:671
10337
#: en/help_topics/configuration.txt:659
10361
#: en/help_topics/configuration.txt:674
10343
#: en/help_topics/configuration.txt:662
10363
10345
"If set to \"True\", the branch should act as a checkout, and push each "
10364
10346
"commit to\n"
10365
10347
"the bound_location. This option is normally set by ``bind``/``unbind``."
10368
#: en/help_topics/configuration.txt:677
10350
#: en/help_topics/configuration.txt:665
10370
10352
"send_strict\n"
10371
10353
"~~~~~~~~~~~"
10374
#: en/help_topics/configuration.txt:680
10356
#: en/help_topics/configuration.txt:668
10376
10358
"If present, defines the ``--strict`` option default value for checking\n"
10377
10359
"uncommitted changes before sending a merge directive."
10380
#: en/help_topics/configuration.txt:683
10362
#: en/help_topics/configuration.txt:671
10382
10364
"add.maximum_file_size\n"
10383
10365
"~~~~~~~~~~~~~~~~~~~~~"
10386
#: en/help_topics/configuration.txt:686
10368
#: en/help_topics/configuration.txt:674
10388
10370
"Defines the maximum file size the command line \"add\" operation will allow\n"
10389
10371
"in recursive mode, with files larger than this value being skipped. You may "
12018
11972
"set of command names."
12021
#: en/help_topics/hooks.txt:201
12027
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12028
msgid "Introduced in: 2.6"
12031
#: en/help_topics/hooks.txt:206
12032
msgid "Called after executing a command. Called with the command object."
12035
#: en/help_topics/hooks.txt:208
12041
#: en/help_topics/hooks.txt:213
12042
msgid "Called prior to executing a command. Called with the command object."
11975
#: en/help_topics/hooks.txt:212
12045
11981
#: en/help_topics/hooks.txt:215
12051
#: en/help_topics/hooks.txt:218
12057
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12058
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12059
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12060
#: en/help_topics/hooks.txt:446
11987
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11988
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11989
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11990
#: en/help_topics/hooks.txt:443
12061
11991
msgid "Introduced in: 2.4"
11994
#: en/help_topics/hooks.txt:220
11996
"Invoked when a config option is read. The signature is (stack, name,\n"
12064
12000
#: en/help_topics/hooks.txt:223
12066
"Invoked when a config option is read. The signature is (stack, name,\n"
12070
#: en/help_topics/hooks.txt:226
12076
#: en/help_topics/hooks.txt:231
12006
#: en/help_topics/hooks.txt:228
12077
12007
msgid "Invoked when a config store is loaded. The signature is (store)."
12080
#: en/help_topics/hooks.txt:233
12010
#: en/help_topics/hooks.txt:230
12086
#: en/help_topics/hooks.txt:238
12016
#: en/help_topics/hooks.txt:235
12088
12018
"Invoked when a config option is removed. The signature is (stack,\n"
12092
#: en/help_topics/hooks.txt:241
12022
#: en/help_topics/hooks.txt:238
12098
#: en/help_topics/hooks.txt:246
12028
#: en/help_topics/hooks.txt:243
12099
12029
msgid "Invoked when a config store is saved. The signature is (store)."
12102
#: en/help_topics/hooks.txt:248
12032
#: en/help_topics/hooks.txt:245
12038
#: en/help_topics/hooks.txt:250
12040
"Invoked when a config option is set. The signature is (stack, name,\n"
12108
12044
#: en/help_topics/hooks.txt:253
12110
"Invoked when a config option is set. The signature is (stack, name,\n"
12046
"ControlDirHooks\n"
12114
12050
#: en/help_topics/hooks.txt:256
12116
"ControlDirHooks\n"
12120
#: en/help_topics/hooks.txt:259
12122
12052
"post_repo_init\n"
12123
12053
"~~~~~~~~~~~~~~"
12126
#: en/help_topics/hooks.txt:264
12056
#: en/help_topics/hooks.txt:261
12128
12058
"Invoked after a repository has been initialized. post_repo_init is\n"
12129
12059
"called with a bzrlib.controldir.RepoInitHookParams."
12062
#: en/help_topics/hooks.txt:264
12132
12068
#: en/help_topics/hooks.txt:267
12138
#: en/help_topics/hooks.txt:270
12139
12069
msgid "Introduced in: 1.14"
12142
#: en/help_topics/hooks.txt:272
12072
#: en/help_topics/hooks.txt:269
12144
12074
"Invoked before attempting to open a ControlDir with the transport that\n"
12145
12075
"the open will use."
12078
#: en/help_topics/hooks.txt:272
12148
12084
#: en/help_topics/hooks.txt:275
12154
#: en/help_topics/hooks.txt:278
12156
12086
"repository\n"
12160
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12161
#: en/help_topics/hooks.txt:524
12090
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12091
#: en/help_topics/hooks.txt:521
12162
12092
msgid "Introduced in: 1.15"
12165
#: en/help_topics/hooks.txt:283
12095
#: en/help_topics/hooks.txt:280
12167
12097
"Invoked when displaying the statistics for a repository. repository is\n"
12168
12098
"called with a statistics dictionary as returned by the repository and\n"
12169
12099
"a file-like object to write to."
12102
#: en/help_topics/hooks.txt:284
12172
12108
#: en/help_topics/hooks.txt:287
12178
#: en/help_topics/hooks.txt:290
12180
12110
"lock_acquired\n"
12181
12111
"~~~~~~~~~~~~~"
12184
#: en/help_topics/hooks.txt:295
12114
#: en/help_topics/hooks.txt:292
12186
12116
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12189
#: en/help_topics/hooks.txt:297
12119
#: en/help_topics/hooks.txt:294
12191
12121
"lock_broken\n"
12192
12122
"~~~~~~~~~~~"
12195
#: en/help_topics/hooks.txt:302
12125
#: en/help_topics/hooks.txt:299
12196
12126
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12199
#: en/help_topics/hooks.txt:304
12129
#: en/help_topics/hooks.txt:301
12201
12131
"lock_released\n"
12202
12132
"~~~~~~~~~~~~~"
12205
#: en/help_topics/hooks.txt:309
12135
#: en/help_topics/hooks.txt:306
12207
12137
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12140
#: en/help_topics/hooks.txt:308
12210
12146
#: en/help_topics/hooks.txt:311
12148
"merge_file_content\n"
12149
"~~~~~~~~~~~~~~~~~~"
12216
12152
#: en/help_topics/hooks.txt:314
12218
"merge_file_content\n"
12219
"~~~~~~~~~~~~~~~~~~"
12222
#: en/help_topics/hooks.txt:317
12223
12153
msgid "Introduced in: 2.1"
12226
#: en/help_topics/hooks.txt:319
12156
#: en/help_topics/hooks.txt:316
12228
12158
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12229
12159
"object when starting a merge. Should return either None or a subclass\n"
12233
12163
"AbstractPerFileMerger API docs for details on how it is used by merge."
12236
#: en/help_topics/hooks.txt:326
12166
#: en/help_topics/hooks.txt:323
12238
12168
"post_merge\n"
12242
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12243
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12244
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12172
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12173
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12174
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12245
12175
msgid "Introduced in: 2.5"
12248
#: en/help_topics/hooks.txt:331
12178
#: en/help_topics/hooks.txt:328
12250
12180
"Called after a merge. Receives a Merger object as the single argument.\n"
12251
12181
"The return value is ignored."
12254
#: en/help_topics/hooks.txt:334
12184
#: en/help_topics/hooks.txt:331
12256
12186
"pre_merge\n"
12260
#: en/help_topics/hooks.txt:339
12190
#: en/help_topics/hooks.txt:336
12262
12192
"Called before a merge. Receives a Merger object as the single\n"
12196
#: en/help_topics/hooks.txt:339
12198
"MergeDirectiveHooks\n"
12199
"-------------------"
12266
12202
#: en/help_topics/hooks.txt:342
12268
"MergeDirectiveHooks\n"
12269
"-------------------"
12204
"merge_request_body\n"
12205
"~~~~~~~~~~~~~~~~~~"
12272
12208
#: en/help_topics/hooks.txt:345
12274
"merge_request_body\n"
12275
"~~~~~~~~~~~~~~~~~~"
12278
#: en/help_topics/hooks.txt:348
12279
12209
msgid "Introduced in: 1.15.0"
12282
#: en/help_topics/hooks.txt:350
12212
#: en/help_topics/hooks.txt:347
12284
12214
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12285
12215
"request. Callbacks must return a body. If more than one callback is\n"
12286
12216
"registered, the output of one callback is provided to the next."
12219
#: en/help_topics/hooks.txt:351
12221
"MessageEditorHooks\n"
12222
"------------------"
12289
12225
#: en/help_topics/hooks.txt:354
12291
"MessageEditorHooks\n"
12292
"------------------"
12227
"commit_message_template\n"
12228
"~~~~~~~~~~~~~~~~~~~~~~~"
12295
12231
#: en/help_topics/hooks.txt:357
12297
"commit_message_template\n"
12298
"~~~~~~~~~~~~~~~~~~~~~~~"
12301
#: en/help_topics/hooks.txt:360
12302
12232
msgid "Introduced in: 1.10"
12305
#: en/help_topics/hooks.txt:362
12235
#: en/help_topics/hooks.txt:359
12307
12237
"Called when a commit message is being generated.\n"
12308
12238
"commit_message_template is called with the bzrlib.commit.Commit object\n"