1
# SOME DESCRIPTIVE TITLE.
2
# Copyright (C) YEAR Canonical
3
# This file is distributed under the same license as the PACKAGE package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
9
"Project-Id-Version: bzr\n"
10
"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
11
"POT-Creation-Date: 2011-08-24 15:14+0100\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
17
"Content-Type: text/plain; charset=CHARSET\n"
18
"Content-Transfer-Encoding: 8bit\n"
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
21
#: bzrlib/builtins.py:209
22
msgid "Display status summary."
25
#: bzrlib/builtins.py:211
27
"This reports on versioned and unknown files, reporting them\n"
28
"grouped by state. Possible states are:"
31
#: bzrlib/builtins.py:214
34
" Versioned in the working copy but not in the previous revision."
37
#: bzrlib/builtins.py:217
40
" Versioned in the previous revision but removed or deleted\n"
41
" in the working copy."
44
#: bzrlib/builtins.py:221
47
" Path of this file changed from the previous revision;\n"
48
" the text may also have changed. This includes files whose\n"
49
" parent directory was renamed."
52
#: bzrlib/builtins.py:226
55
" Text has changed since the previous revision."
58
#: bzrlib/builtins.py:229
61
" File kind has been changed (e.g. from file to directory)."
64
#: bzrlib/builtins.py:232
67
" Not versioned and not matching an ignore pattern."
70
#: bzrlib/builtins.py:235
72
"Additionally for directories, symlinks and files with a changed\n"
73
"executable bit, Bazaar indicates their type using a trailing\n"
74
"character: '/', '@' or '*' respectively. These decorations can be\n"
75
"disabled using the '--no-classify' option."
78
#: bzrlib/builtins.py:240
80
"To see ignored files use 'bzr ignored'. For details on the\n"
81
"changes to file texts, use 'bzr diff'."
84
#: bzrlib/builtins.py:243
86
"Note that --short or -S gives status flags for each item, similar\n"
87
"to Subversion's status command. To get output similar to svn -q,\n"
91
#: bzrlib/builtins.py:247
93
"If no arguments are specified, the status of the entire working\n"
94
"directory is shown. Otherwise, only the status of the specified\n"
95
"files or directories is reported. If a directory is given, status\n"
96
"is reported for everything inside that directory."
99
#: bzrlib/builtins.py:252
101
"Before merges are committed, the pending merge tip revisions are\n"
102
"shown. To see all pending merge revisions, use the -v option.\n"
103
"To skip the display of pending merge information altogether, use\n"
104
"the no-pending option or specify a file/directory."
107
#: bzrlib/builtins.py:257
109
"To compare the working directory to a specific revision, pass a\n"
110
"single revision to the revision argument."
113
#: bzrlib/builtins.py:260
115
"To see which files have changed in a specific revision, or between\n"
116
"two revisions, pass a revision range to the revision argument.\n"
117
"This will produce the same results as calling 'bzr diff --summarize'."
120
# help of 'short' option of 'status' command
121
#: bzrlib/builtins.py:269
122
msgid "Use short status indicators."
125
# help of 'versioned' option of 'status' command
126
#: bzrlib/builtins.py:271
127
msgid "Only show versioned files."
130
# help of 'no-pending' option of 'status' command
131
#: bzrlib/builtins.py:273
132
msgid "Don't show pending merges."
135
# help of 'no-classify' option of 'status' command
136
#: bzrlib/builtins.py:276
137
msgid "Do not mark object type using indicator."
140
#: bzrlib/builtins.py:455
141
msgid "Remove the working tree from a given branch/checkout."
144
#: bzrlib/builtins.py:457
146
"Since a lightweight checkout is little more than a working tree\n"
147
"this will refuse to run against one."
150
#: bzrlib/builtins.py:460
151
msgid "To re-create the working tree, use \"bzr checkout\"."
154
# help of 'force' option of 'remove-tree' command
155
#: bzrlib/builtins.py:466
156
msgid "Remove the working tree even if it has uncommitted or shelved changes."
159
#: bzrlib/builtins.py:551
160
msgid "Show current revision number."
163
#: bzrlib/builtins.py:553
164
msgid "This is equal to the number of revisions on this branch."
167
# help of 'tree' option of 'revno' command
168
#: bzrlib/builtins.py:594
169
msgid "Show revno of working tree"
172
#: bzrlib/builtins.py:642
173
msgid "Add specified files or directories."
176
#: bzrlib/builtins.py:644
178
"In non-recursive mode, all the named items are added, regardless\n"
179
"of whether they were previously ignored. A warning is given if\n"
180
"any of the named files are already versioned."
183
#: bzrlib/builtins.py:648
185
"In recursive mode (the default), files are treated the same way\n"
186
"but the behaviour for directories is different. Directories that\n"
187
"are already versioned do not give a warning. All directories,\n"
188
"whether already versioned or not, are searched for files or\n"
189
"subdirectories that are neither versioned or ignored, and these\n"
190
"are added. This search proceeds recursively into versioned\n"
191
"directories. If no names are given '.' is assumed."
194
#: bzrlib/builtins.py:656
196
"Therefore simply saying 'bzr add' will version all files that\n"
197
"are currently unknown."
200
#: bzrlib/builtins.py:659
202
"Adding a file whose parent directory is not versioned will\n"
203
"implicitly add the parent, and so on up to the root. This means\n"
204
"you should never need to explicitly add a directory, they'll just\n"
205
"get added when you add a file in the directory."
208
#: bzrlib/builtins.py:664
210
"--dry-run will show which files would be added, but not actually\n"
214
#: bzrlib/builtins.py:667
216
"--file-ids-from will try to use the file ids from the supplied path.\n"
217
"It looks up ids trying to find a matching parent directory with the\n"
218
"same filename, and then by pure path. This option is rarely needed\n"
219
"but can be useful when adding the same logical file into two\n"
220
"branches that will be merged later (without showing the two different\n"
221
"adds as a conflict). It is also useful when merging another project\n"
222
"into a subdirectory of this one."
225
#: bzrlib/builtins.py:675
227
"Any files matching patterns in the ignore list will not be added\n"
228
"unless they are explicitly mentioned."
231
#: bzrlib/builtins.py:678
233
"In recursive mode, files larger than the configuration option \n"
234
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
238
# help of 'no-recurse' option of 'add' command
239
#: bzrlib/builtins.py:685
240
msgid "Don't recursively add the contents of directories."
243
# help of 'file-ids-from' option of 'add' command
244
#: bzrlib/builtins.py:691
245
msgid "Lookup file ids from this tree."
248
#: bzrlib/builtins.py:731
249
msgid "Create a new versioned directory."
252
#: bzrlib/builtins.py:733
253
msgid "This is equivalent to creating the directory and then adding it."
256
#: bzrlib/builtins.py:828
257
msgid "Move or rename a file."
260
#: bzrlib/builtins.py:830
261
msgid " bzr mv SOURCE... DESTINATION"
264
#: bzrlib/builtins.py:832
266
"If the last argument is a versioned directory, all the other names\n"
267
"are moved into it. Otherwise, there must be exactly two arguments\n"
268
"and the file is changed to a new name."
271
#: bzrlib/builtins.py:836
273
"If OLDNAME does not exist on the filesystem but is versioned and\n"
274
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
275
"assumes that the file has been manually moved and only updates\n"
276
"its internal inventory to reflect that change.\n"
277
"The same is valid when moving many SOURCE files to a DESTINATION."
280
#: bzrlib/builtins.py:842
281
msgid "Files cannot be moved between branches."
284
# help of 'after' option of 'mv' command
285
#: bzrlib/builtins.py:849
287
"Move only the bzr identifier of the file, because the file has already been "
291
# help of 'auto' option of 'mv' command
292
#: bzrlib/builtins.py:851
293
msgid "Automatically guess renames."
296
# help of 'dry-run' option of 'mv' command
297
#: bzrlib/builtins.py:852
298
msgid "Avoid making changes when guessing renames."
301
#: bzrlib/builtins.py:964
302
msgid "Turn this branch into a mirror of another branch."
305
#: bzrlib/builtins.py:966
307
"By default, this command only works on branches that have not diverged.\n"
308
"Branches are considered diverged if the destination branch's most recent \n"
309
"commit is one that has not been merged (directly or indirectly) into the \n"
313
#: bzrlib/builtins.py:971
315
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
316
"from one into the other. Once one branch has merged, the other should\n"
317
"be able to pull it again."
320
#: bzrlib/builtins.py:975
322
"If you want to replace your local changes and just want your branch to\n"
323
"match the remote one, use pull --overwrite. This will work even if the two\n"
324
"branches have diverged."
327
#: bzrlib/builtins.py:979
329
"If there is no default location set, the first pull will set it (use\n"
330
"--no-remember to avoid settting it). After that, you can omit the\n"
331
"location to use the default. To change the default, use --remember. The\n"
332
"value will only be saved if the remote location can be accessed."
335
#: bzrlib/builtins.py:984
337
"Note: The location can be specified either in the form of a branch,\n"
338
"or in the form of a path to a file containing a merge directive generated\n"
342
# help of 'verbose' option of 'pull' command
343
#: bzrlib/builtins.py:992
344
msgid "Show logs of pulled revisions."
347
# help of 'directory' option of 'pull' command
348
#: bzrlib/builtins.py:994
350
"Branch to pull into, rather than the one containing the working directory."
353
# help of 'local' option of 'pull' command
354
#: bzrlib/builtins.py:997
356
"Perform a local pull in a bound branch. Local pulls are not applied to the "
360
#: bzrlib/builtins.py:1097
361
msgid "Update a mirror of this branch."
364
#: bzrlib/builtins.py:1099
366
"The target branch will not have its working tree populated because this\n"
367
"is both expensive, and is not supported on remote file systems."
370
#: bzrlib/builtins.py:1102
372
"Some smart servers or protocols *may* put the working tree in place in\n"
376
#: bzrlib/builtins.py:1105
378
"This command only works on branches that have not diverged. Branches are\n"
379
"considered diverged if the destination branch's most recent commit is one\n"
380
"that has not been merged (directly or indirectly) by the source branch."
383
#: bzrlib/builtins.py:1109
385
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
386
"the other branch completely, discarding its unmerged changes."
389
#: bzrlib/builtins.py:1112
391
"If you want to ensure you have the different changes in the other branch,\n"
392
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
393
"After that you will be able to do a push without '--overwrite'."
396
#: bzrlib/builtins.py:1116
398
"If there is no default push location set, the first push will set it (use\n"
399
"--no-remember to avoid settting it). After that, you can omit the\n"
400
"location to use the default. To change the default, use --remember. The\n"
401
"value will only be saved if the remote location can be accessed."
404
# help of 'directory' option of 'push' command
405
#: bzrlib/builtins.py:1128
407
"Branch to push from, rather than the one containing the working directory."
410
# help of 'use-existing-dir' option of 'push' command
411
#: bzrlib/builtins.py:1131
413
"By default push will fail if the target directory exists, but does not "
414
"already have a control directory. This flag will allow push to proceed."
417
# help of 'stacked' option of 'push' command
418
#: bzrlib/builtins.py:1136
420
"Create a stacked branch that references the public location of the parent "
424
# help of 'stacked-on' option of 'push' command
425
#: bzrlib/builtins.py:1139
427
"Create a stacked branch that refers to another branch for the commit "
428
"history. Only the work not present in the referenced branch is included in "
429
"the branch created."
432
# help of 'strict' option of 'push' command
433
#: bzrlib/builtins.py:1144
435
"Refuse to push if there are uncommitted changes in the working tree, --no-"
436
"strict disables the check."
439
# help of 'no-tree' option of 'push' command
440
#: bzrlib/builtins.py:1147
441
msgid "Don't populate the working tree, even for protocols that support it."
444
#: bzrlib/builtins.py:1212
445
msgid "Create a new branch that is a copy of an existing branch."
448
#: bzrlib/builtins.py:1214
450
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
451
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
453
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
454
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
455
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
459
#: bzrlib/builtins.py:1221
461
"To retrieve the branch as of a particular revision, supply the --revision\n"
462
"parameter, as in \"branch foo/bar -r 5\"."
465
#: bzrlib/builtins.py:1224
466
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
469
# help of 'no-tree' option of 'branch' command
470
#: bzrlib/builtins.py:1234
471
msgid "Create a branch without a working-tree."
474
# help of 'switch' option of 'branch' command
475
#: bzrlib/builtins.py:1236
476
msgid "Switch the checkout in the current directory to the new branch."
479
# help of 'stacked' option of 'branch' command
480
#: bzrlib/builtins.py:1239
482
"Create a stacked branch referring to the source branch. The new branch will "
483
"depend on the availability of the source branch for all operations."
486
# help of 'standalone' option of 'branch' command
487
#: bzrlib/builtins.py:1243
488
msgid "Do not use a shared repository, even if available."
491
# help of 'use-existing-dir' option of 'branch' command
492
#: bzrlib/builtins.py:1245
494
"By default branch will fail if the target directory exists, but does not "
495
"already have a control directory. This flag will allow branch to proceed."
498
# help of 'bind' option of 'branch' command
499
#: bzrlib/builtins.py:1250
500
msgid "Bind new branch to from location."
503
#: bzrlib/builtins.py:1342
504
msgid "List the branches available at the current location."
507
#: bzrlib/builtins.py:1344
509
"This command will print the names of all the branches at the current "
513
#: bzrlib/builtins.py:1359
514
msgid "Create a new checkout of an existing branch."
517
#: bzrlib/builtins.py:1361
519
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
521
"the branch found in '.'. This is useful if you have removed the working "
523
"or if it was never created - i.e. if you pushed the branch to its current\n"
524
"location using SFTP."
527
#: bzrlib/builtins.py:1366
529
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
531
"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./"
533
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
534
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
535
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
539
#: bzrlib/builtins.py:1373
541
"To retrieve the branch as of a particular revision, supply the --revision\n"
542
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
544
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
549
# help of 'lightweight' option of 'checkout' command
550
#: bzrlib/builtins.py:1383
552
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
553
"the branch for every operation. Normal checkouts can perform common "
554
"operations like diff and status without such access, and also support local "
558
# help of 'files-from' option of 'branch' command
559
#: bzrlib/builtins.py:1390
560
msgid "Get file contents from this tree."
563
# help of 'hardlink' option of 'branch' command
564
#: bzrlib/builtins.py:1392
565
msgid "Hard-link working tree files where possible."
568
#: bzrlib/builtins.py:1433
570
"Show list of renamed files.\n"
574
#: bzrlib/builtins.py:1463
575
msgid "Update a tree to have the latest code committed to its branch."
578
#: bzrlib/builtins.py:1465
580
"This will perform a merge into the working tree, and may generate\n"
581
"conflicts. If you have any local changes, you will still\n"
582
"need to commit them after the update for the update to be complete."
585
#: bzrlib/builtins.py:1469
587
"If you want to discard your local changes, you can just do a\n"
588
"'bzr revert' instead of 'bzr commit' after the update."
591
#: bzrlib/builtins.py:1472
593
"If you want to restore a file that has been removed locally, use\n"
594
"'bzr revert' instead of 'bzr update'."
597
#: bzrlib/builtins.py:1475
599
"If the tree's branch is bound to a master branch, it will also update\n"
600
"the branch from the master."
603
#: bzrlib/builtins.py:1556
604
msgid "Show information about a working tree, branch or repository."
607
#: bzrlib/builtins.py:1558
609
"This command will show all known locations and formats associated to the\n"
610
"tree, branch or repository."
613
#: bzrlib/builtins.py:1561
615
"In verbose mode, statistical information is included with each report.\n"
616
"To see extended statistic information, use a verbosity level of 2 or\n"
617
"higher by specifying the verbose option multiple times, e.g. -vv."
620
#: bzrlib/builtins.py:1565
621
msgid "Branches and working trees will also report any missing revisions."
624
#: bzrlib/builtins.py:1569
625
msgid " Display information on the format and related locations:"
628
#: bzrlib/builtins.py:1571
632
#: bzrlib/builtins.py:1573
634
" Display the above together with extended format information and\n"
635
" basic statistics (like the number of files in the working tree and\n"
636
" number of revisions in the branch and repository):"
639
#: bzrlib/builtins.py:1577
643
#: bzrlib/builtins.py:1579
644
msgid " Display the above together with number of committers to the branch:"
647
#: bzrlib/builtins.py:1581
648
msgid " bzr info -vv"
651
#: bzrlib/builtins.py:1600
652
msgid "Remove files or directories."
655
#: bzrlib/builtins.py:1602
657
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
658
"delete them if they can easily be recovered using revert otherwise they\n"
659
"will be backed up (adding an extention of the form .~#~). If no options or\n"
660
"parameters are given Bazaar will scan for files that are being tracked by\n"
661
"Bazaar but missing in your tree and stop tracking them for you."
664
# help of 'new' option of 'remove' command
665
#: bzrlib/builtins.py:1610
666
msgid "Only remove files that have never been committed."
669
# help of 'file-deletion-strategy' option of 'remove' command
670
#: bzrlib/builtins.py:1612
671
msgid "The file deletion mode to be used."
674
# title of 'file-deletion-strategy' option of 'remove' command
675
#: bzrlib/builtins.py:1613
676
msgid "Deletion Strategy"
679
#: bzrlib/builtins.py:1704
680
msgid "Reconcile bzr metadata in a branch."
683
#: bzrlib/builtins.py:1706
685
"This can correct data mismatches that may have been caused by\n"
686
"previous ghost operations or bzr upgrades. You should only\n"
687
"need to run this command if 'bzr check' or a bzr developer\n"
688
"advises you to run it."
691
#: bzrlib/builtins.py:1711
693
"If a second branch is provided, cross-branch reconciliation is\n"
694
"also attempted, which will check that data like the tree root\n"
695
"id which was not present in very early bzr versions is represented\n"
696
"correctly in both branches."
699
#: bzrlib/builtins.py:1716
701
"At the same time it is run it may recompress data resulting in\n"
702
"a potential saving in disk space or performance gain."
705
#: bzrlib/builtins.py:1719
706
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
709
#: bzrlib/builtins.py:1783
710
msgid "Make a directory into a versioned branch."
713
#: bzrlib/builtins.py:1785
715
"Use this to create an empty branch, or before importing an\n"
719
#: bzrlib/builtins.py:1788
721
"If there is a repository in a parent directory of the location, then\n"
722
"the history of the branch will be stored in the repository. Otherwise\n"
723
"init creates a standalone branch which carries its own history\n"
724
"in the .bzr directory."
727
#: bzrlib/builtins.py:1793
729
"If there is already a branch at the location but it has no working tree,\n"
730
"the tree can be populated with 'bzr checkout'."
733
#: bzrlib/builtins.py:1796
734
msgid "Recipe for importing a tree of files::"
737
#: bzrlib/builtins.py:1798
743
" bzr commit -m \"imported project\""
746
# help of 'create-prefix' option of 'init' command
747
#: bzrlib/builtins.py:1809
748
msgid "Create the path leading up to the branch if it does not already exist."
751
# help of 'format' option of 'init' command
752
#: bzrlib/builtins.py:1812
753
msgid "Specify a format for this branch. See \"help formats\"."
756
# help of 'append-revisions-only' option of 'init' command
757
#: bzrlib/builtins.py:1820
758
msgid "Never change revnos or the existing log. Append revisions to it only."
761
# help of 'no-tree' option of 'init' command
762
#: bzrlib/builtins.py:1823
763
msgid "Create a branch without a working tree."
766
#: bzrlib/builtins.py:1900
767
msgid "Create a shared repository for branches to share storage space."
770
#: bzrlib/builtins.py:1902
772
"New branches created under the repository directory will store their\n"
773
"revisions in the repository, not in the branch directory. For branches\n"
774
"with shared history, this reduces the amount of storage needed and \n"
775
"speeds up the creation of new branches."
778
#: bzrlib/builtins.py:1907
780
"If the --no-trees option is given then the branches in the repository\n"
781
"will not have working trees by default. They will still exist as \n"
782
"directories on disk, but they will not have separate copies of the \n"
783
"files at a certain revision. This can be useful for repositories that\n"
784
"store branches which are interacted with through checkouts or remote\n"
785
"branches, such as on a server."
788
#: bzrlib/builtins.py:1914
791
" Create a shared repository holding just branches::"
794
#: bzrlib/builtins.py:1917
796
" bzr init-repo --no-trees repo\n"
797
" bzr init repo/trunk"
800
#: bzrlib/builtins.py:1920
801
msgid " Make a lightweight checkout elsewhere::"
804
#: bzrlib/builtins.py:1922
806
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
807
" cd trunk-checkout\n"
811
# help of 'format' option of 'init-repository' command
812
#: bzrlib/builtins.py:1930
814
"Specify a format for this repository. See \"bzr help formats\" for details."
817
# title of 'format' option of 'init-repository' command
818
#: bzrlib/builtins.py:1934
819
msgid "Repository format"
822
# help of 'no-trees' option of 'init-repository' command
823
#: bzrlib/builtins.py:1936
824
msgid "Branches in the repository will default to not having a working tree."
827
#: bzrlib/builtins.py:1960
828
msgid "Show differences in the working tree, between revisions or branches."
831
#: bzrlib/builtins.py:1962
833
"If no arguments are given, all changes for the current tree are listed.\n"
834
"If files are given, only the changes in those files are listed.\n"
835
"Remote and multiple branches can be compared by using the --old and\n"
836
"--new options. If not provided, the default for both is derived from\n"
837
"the first argument, if any, or the current tree if no arguments are\n"
841
#: bzrlib/builtins.py:1969
843
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
844
"produces patches suitable for \"patch -p1\"."
847
#: bzrlib/builtins.py:1972
849
"Note that when using the -r argument with a range of revisions, the\n"
850
"differences are computed between the two specified revisions. That\n"
851
"is, the command does not show the changes introduced by the first \n"
852
"revision in the range. This differs from the interpretation of \n"
853
"revision ranges used by \"bzr log\" which includes the first revision\n"
857
#: bzrlib/builtins.py:1979
861
" 2 - unrepresentable changes\n"
866
#: bzrlib/builtins.py:1985
869
" Shows the difference in the working tree versus the last commit::"
872
#: bzrlib/builtins.py:1988
876
#: bzrlib/builtins.py:1990
877
msgid " Difference between the working tree and revision 1::"
880
#: bzrlib/builtins.py:1992
881
msgid " bzr diff -r1"
884
#: bzrlib/builtins.py:1994
885
msgid " Difference between revision 3 and revision 1::"
888
#: bzrlib/builtins.py:1996
889
msgid " bzr diff -r1..3"
892
#: bzrlib/builtins.py:1998
893
msgid " Difference between revision 3 and revision 1 for branch xxx::"
896
#: bzrlib/builtins.py:2000
897
msgid " bzr diff -r1..3 xxx"
900
#: bzrlib/builtins.py:2002
901
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
904
#: bzrlib/builtins.py:2004
905
msgid " bzr diff -c2"
908
#: bzrlib/builtins.py:2006
910
" To see the changes introduced by revision X::\n"
915
#: bzrlib/builtins.py:2010
917
" Note that in the case of a merge, the -c option shows the changes\n"
918
" compared to the left hand parent. To see the changes against\n"
919
" another parent, use::"
922
#: bzrlib/builtins.py:2014
923
msgid " bzr diff -r<chosen_parent>..X"
926
#: bzrlib/builtins.py:2016
928
" The changes between the current revision and the previous revision\n"
929
" (equivalent to -c-1 and -r-2..-1)"
932
#: bzrlib/builtins.py:2019
933
msgid " bzr diff -r-2.."
936
#: bzrlib/builtins.py:2021
937
msgid " Show just the differences for file NEWS::"
940
#: bzrlib/builtins.py:2023
941
msgid " bzr diff NEWS"
944
#: bzrlib/builtins.py:2025
945
msgid " Show the differences in working tree xxx for file NEWS::"
948
#: bzrlib/builtins.py:2027
949
msgid " bzr diff xxx/NEWS"
952
#: bzrlib/builtins.py:2029
953
msgid " Show the differences from branch xxx to this working tree:"
956
#: bzrlib/builtins.py:2031
957
msgid " bzr diff --old xxx"
960
#: bzrlib/builtins.py:2033
961
msgid " Show the differences between two branches for file NEWS::"
964
#: bzrlib/builtins.py:2035
965
msgid " bzr diff --old xxx --new yyy NEWS"
968
#: bzrlib/builtins.py:2037
969
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
972
#: bzrlib/builtins.py:2039
974
" bzr diff --prefix old/:new/\n"
976
" Show the differences using a custom diff program with options::\n"
978
" bzr diff --using /usr/bin/diff --diff-options -wu"
981
# help of 'diff-options' option of 'diff' command
982
#: bzrlib/builtins.py:2049
983
msgid "Pass these options to the external diff program."
986
# help of 'prefix' option of 'diff' command
987
#: bzrlib/builtins.py:2052
989
"Set prefixes added to old and new filenames, as two values separated by a "
990
"colon. (eg \"old/:new/\")."
993
# help of 'old' option of 'diff' command
994
#: bzrlib/builtins.py:2055
995
msgid "Branch/tree to compare from."
998
# help of 'new' option of 'diff' command
999
#: bzrlib/builtins.py:2059
1000
msgid "Branch/tree to compare to."
1003
# help of 'using' option of 'diff' command
1004
#: bzrlib/builtins.py:2065
1005
msgid "Use this command to compare files."
1008
# help of 'format' option of 'diff' command
1009
#: bzrlib/builtins.py:2070
1010
msgid "Diff format to use."
1013
# title of 'format' option of 'diff' command
1014
#: bzrlib/builtins.py:2072
1018
#: bzrlib/builtins.py:2122
1020
"List files deleted in the working tree.\n"
1024
#: bzrlib/builtins.py:2200
1025
msgid "Show the tree root directory."
1028
#: bzrlib/builtins.py:2202
1030
"The root is the nearest enclosing directory with a .bzr control\n"
1034
#: bzrlib/builtins.py:2230
1035
msgid "Show historical log for a branch or subset of a branch."
1038
#: bzrlib/builtins.py:2232
1040
"log is bzr's default tool for exploring the history of a branch.\n"
1041
"The branch to use is taken from the first parameter. If no parameters\n"
1042
"are given, the branch containing the working directory is logged.\n"
1043
"Here are some simple examples::"
1046
#: bzrlib/builtins.py:2237
1048
" bzr log log the current branch\n"
1049
" bzr log foo.py log a file in its branch\n"
1050
" bzr log http://server/branch log a branch on a server"
1053
#: bzrlib/builtins.py:2241
1055
"The filtering, ordering and information shown for each revision can\n"
1056
"be controlled as explained below. By default, all revisions are\n"
1057
"shown sorted (topologically) so that newer revisions appear before\n"
1058
"older ones and descendants always appear before ancestors. If displayed,\n"
1059
"merged revisions are shown indented under the revision in which they\n"
1063
#: bzrlib/builtins.py:2248
1064
msgid ":Output control:"
1067
#: bzrlib/builtins.py:2250
1069
" The log format controls how information about each revision is\n"
1070
" displayed. The standard log formats are called ``long``, ``short``\n"
1071
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1072
" for more details on log formats."
1075
#: bzrlib/builtins.py:2255
1077
" The following options can be used to control what information is\n"
1081
#: bzrlib/builtins.py:2258
1083
" -l N display a maximum of N revisions\n"
1084
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1085
" -v display a status summary (delta) for each revision\n"
1086
" -p display a diff (patch) for each revision\n"
1087
" --show-ids display revision-ids (and file-ids), not just revnos"
1090
#: bzrlib/builtins.py:2264
1092
" Note that the default number of levels to display is a function of the\n"
1093
" log format. If the -n option is not used, the standard log formats show\n"
1094
" just the top level (mainline)."
1097
#: bzrlib/builtins.py:2268
1099
" Status summaries are shown using status flags like A, M, etc. To see\n"
1100
" the changes explained using words like ``added`` and ``modified``\n"
1101
" instead, use the -vv option."
1104
#: bzrlib/builtins.py:2272
1105
msgid ":Ordering control:"
1108
#: bzrlib/builtins.py:2274
1110
" To display revisions from oldest to newest, use the --forward option.\n"
1111
" In most cases, using this option will have little impact on the total\n"
1112
" time taken to produce a log, though --forward does not incrementally\n"
1113
" display revisions like --reverse does when it can."
1116
#: bzrlib/builtins.py:2279
1117
msgid ":Revision filtering:"
1120
#: bzrlib/builtins.py:2281
1122
" The -r option can be used to specify what revision or range of revisions\n"
1123
" to filter against. The various forms are shown below::"
1126
#: bzrlib/builtins.py:2284
1128
" -rX display revision X\n"
1129
" -rX.. display revision X and later\n"
1130
" -r..Y display up to and including revision Y\n"
1131
" -rX..Y display from X to Y inclusive"
1134
#: bzrlib/builtins.py:2289
1136
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1137
" Some common examples are given below::"
1140
#: bzrlib/builtins.py:2292
1142
" -r-1 show just the tip\n"
1143
" -r-10.. show the last 10 mainline revisions\n"
1144
" -rsubmit:.. show what's new on this branch\n"
1145
" -rancestor:path.. show changes since the common ancestor of this\n"
1146
" branch and the one at location path\n"
1147
" -rdate:yesterday.. show changes since yesterday"
1150
#: bzrlib/builtins.py:2299
1152
" When logging a range of revisions using -rX..Y, log starts at\n"
1153
" revision Y and searches back in history through the primary\n"
1154
" (\"left-hand\") parents until it finds X. When logging just the\n"
1155
" top level (using -n1), an error is reported if X is not found\n"
1156
" along the way. If multi-level logging is used (-n0), X may be\n"
1157
" a nested merge revision and the log will be truncated accordingly."
1160
#: bzrlib/builtins.py:2306
1161
msgid ":Path filtering:"
1164
#: bzrlib/builtins.py:2308
1166
" If parameters are given and the first one is not a branch, the log\n"
1167
" will be filtered to show only those revisions that changed the\n"
1168
" nominated files or directories."
1171
#: bzrlib/builtins.py:2312
1173
" Filenames are interpreted within their historical context. To log a\n"
1174
" deleted file, specify a revision range so that the file existed at\n"
1175
" the end or start of the range."
1178
#: bzrlib/builtins.py:2316
1180
" Historical context is also important when interpreting pathnames of\n"
1181
" renamed files/directories. Consider the following example:"
1184
#: bzrlib/builtins.py:2319
1186
" * revision 1: add tutorial.txt\n"
1187
" * revision 2: modify tutorial.txt\n"
1188
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1191
#: bzrlib/builtins.py:2323
1192
msgid " In this case:"
1195
#: bzrlib/builtins.py:2325
1196
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1199
#: bzrlib/builtins.py:2327
1200
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1203
#: bzrlib/builtins.py:2329
1205
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1206
" the original file in revision 2."
1209
#: bzrlib/builtins.py:2332
1211
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1212
" was no file called guide.txt in revision 2."
1215
#: bzrlib/builtins.py:2335
1217
" Renames are always followed by log. By design, there is no need to\n"
1218
" explicitly ask for this (and no way to stop logging a file back\n"
1219
" until it was last renamed)."
1222
#: bzrlib/builtins.py:2339
1223
msgid ":Other filtering:"
1226
#: bzrlib/builtins.py:2341
1228
" The --match option can be used for finding revisions that match a\n"
1229
" regular expression in a commit message, committer, author or bug.\n"
1230
" Specifying the option several times will match any of the supplied\n"
1231
" expressions. --match-author, --match-bugs, --match-committer and\n"
1232
" --match-message can be used to only match a specific field."
1235
#: bzrlib/builtins.py:2347
1236
msgid ":Tips & tricks:"
1239
#: bzrlib/builtins.py:2349
1241
" GUI tools and IDEs are often better at exploring history than command\n"
1242
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1243
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1244
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1245
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1248
#: bzrlib/builtins.py:2355
1249
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1252
#: bzrlib/builtins.py:2357
1256
" top = log -l10 --line\n"
1260
#: bzrlib/builtins.py:2362
1262
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1263
" will show the last 10 mainline revisions. To see the details of a\n"
1264
" particular revision X, ``bzr show -rX``."
1267
#: bzrlib/builtins.py:2366
1269
" If you are interested in looking deeper into a particular merge X,\n"
1270
" use ``bzr log -n0 -rX``."
1273
#: bzrlib/builtins.py:2369
1275
" ``bzr log -v`` on a branch with lots of history is currently\n"
1276
" very slow. A fix for this issue is currently under development.\n"
1277
" With or without that fix, it is recommended that a revision range\n"
1278
" be given when using the -v option."
1281
#: bzrlib/builtins.py:2374
1283
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1284
" used to find revisions matching user names, commit messages, etc.\n"
1285
" Among other features, this plugin can find all revisions containing\n"
1286
" a list of words but not others."
1289
#: bzrlib/builtins.py:2379
1291
" When exploring non-mainline history on large projects with deep\n"
1292
" history, the performance of log can be greatly improved by installing\n"
1293
" the historycache plugin. This plugin buffers historical information\n"
1294
" trading disk space for faster speed."
1297
# help of 'forward' option of 'log' command
1298
#: bzrlib/builtins.py:2388
1299
msgid "Show from oldest to newest."
1302
# help of 'verbose' option of 'log' command
1303
#: bzrlib/builtins.py:2391
1304
msgid "Show files changed in each revision."
1307
# help of 'change' option of 'log' command
1308
#: bzrlib/builtins.py:2397
1309
msgid "Show just the specified revision. See also \"help revisionspec\"."
1312
# help of 'authors' option of 'log' command
1313
#: bzrlib/builtins.py:2401
1314
msgid "What names to list as authors - first, all or committer."
1317
# title of 'authors' option of 'log' command
1318
#: bzrlib/builtins.py:2402
1322
# help of 'levels' option of 'log' command
1323
#: bzrlib/builtins.py:2407
1324
msgid "Number of levels to display - 0 for all, 1 for flat."
1327
# help of 'limit' option of 'log' command
1328
#: bzrlib/builtins.py:2417
1329
msgid "Limit the output to the first N revisions."
1332
# help of 'show-diff' option of 'log' command
1333
#: bzrlib/builtins.py:2422
1334
msgid "Show changes made in each revision as a patch."
1337
# help of 'include-merges' option of 'log' command
1338
#: bzrlib/builtins.py:2424
1339
msgid "Show merged revisions like --levels 0 does."
1342
# help of 'exclude-common-ancestry' option of 'log' command
1343
#: bzrlib/builtins.py:2426
1345
"Display only the revisions that are not part of both ancestries (require -"
1349
# help of 'signatures' option of 'log' command
1350
#: bzrlib/builtins.py:2430
1351
msgid "Show digital signature validity"
1354
# help of 'match' option of 'log' command
1355
#: bzrlib/builtins.py:2433
1356
msgid "Show revisions whose properties match this expression."
1359
# help of 'match-message' option of 'log' command
1360
#: bzrlib/builtins.py:2437
1361
msgid "Show revisions whose message matches this expression."
1364
# help of 'match-committer' option of 'log' command
1365
#: bzrlib/builtins.py:2441
1366
msgid "Show revisions whose committer matches this expression."
1369
# help of 'match-author' option of 'log' command
1370
#: bzrlib/builtins.py:2445
1371
msgid "Show revisions whose authors match this expression."
1374
# help of 'match-bugs' option of 'log' command
1375
#: bzrlib/builtins.py:2449
1376
msgid "Show revisions whose bugs match this expression."
1379
#: bzrlib/builtins.py:2690
1381
"List files in a tree.\n"
1385
# help of 'recursive' option of 'ls' command
1386
#: bzrlib/builtins.py:2699
1387
msgid "Recurse into subdirectories."
1390
# help of 'from-root' option of 'ls' command
1391
#: bzrlib/builtins.py:2701
1392
msgid "Print paths relative to the root of the branch."
1395
# help of 'unknown' option of 'ls' command
1396
#: bzrlib/builtins.py:2703
1397
msgid "Print unknown files."
1400
# help of 'versioned' option of 'ls' command
1401
#: bzrlib/builtins.py:2704
1402
msgid "Print versioned files."
1405
# help of 'ignored' option of 'ls' command
1406
#: bzrlib/builtins.py:2707
1407
msgid "Print ignored files."
1410
# help of 'kind' option of 'ls' command
1411
#: bzrlib/builtins.py:2709
1412
msgid "List entries of a particular kind: file, directory, symlink."
1415
#: bzrlib/builtins.py:2821
1416
msgid "Ignore specified files or patterns."
1419
#: bzrlib/builtins.py:2823
1420
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1423
#: bzrlib/builtins.py:2825
1425
"If a .bzrignore file does not exist, the ignore command\n"
1426
"will create one and add the specified files or patterns to the newly\n"
1427
"created file. The ignore command will also automatically add the \n"
1428
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1429
"the use of the ignore command will require an explicit add command."
1432
#: bzrlib/builtins.py:2831
1434
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1435
"After adding, editing or deleting that file either indirectly by\n"
1436
"using this command or directly by using an editor, be sure to commit\n"
1440
#: bzrlib/builtins.py:2836
1442
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1443
"the global ignore file can be found in the application data directory as\n"
1444
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1445
"Global ignores are not touched by this command. The global ignore file\n"
1446
"can be edited directly using an editor."
1449
#: bzrlib/builtins.py:2842
1451
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1452
"precedence over regular ignores. Such exceptions are used to specify\n"
1453
"files that should be versioned which would otherwise be ignored."
1456
#: bzrlib/builtins.py:2846
1458
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1459
"precedence over the '!' exception patterns."
1462
#: bzrlib/builtins.py:2849
1466
"* Ignore patterns containing shell wildcards must be quoted from\n"
1467
" the shell on Unix."
1470
#: bzrlib/builtins.py:2854
1472
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1473
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1476
#: bzrlib/builtins.py:2857
1479
" Ignore the top level Makefile::"
1482
#: bzrlib/builtins.py:2860
1483
msgid " bzr ignore ./Makefile"
1486
#: bzrlib/builtins.py:2862
1487
msgid " Ignore .class files in all directories...::"
1490
#: bzrlib/builtins.py:2864
1491
msgid " bzr ignore \"*.class\""
1494
#: bzrlib/builtins.py:2866
1495
msgid " ...but do not ignore \"special.class\"::"
1498
#: bzrlib/builtins.py:2868
1499
msgid " bzr ignore \"!special.class\""
1502
#: bzrlib/builtins.py:2870
1503
msgid " Ignore files whose name begins with the \"#\" character::"
1506
#: bzrlib/builtins.py:2872
1507
msgid " bzr ignore \"RE:^#\""
1510
#: bzrlib/builtins.py:2874
1511
msgid " Ignore .o files under the lib directory::"
1514
#: bzrlib/builtins.py:2876
1515
msgid " bzr ignore \"lib/**/*.o\""
1518
#: bzrlib/builtins.py:2880
1519
msgid " bzr ignore \"RE:lib/.*\\.o\""
1522
#: bzrlib/builtins.py:2882
1523
msgid " Ignore everything but the \"debian\" toplevel directory::"
1526
#: bzrlib/builtins.py:2884
1528
" bzr ignore \"RE:(?!debian/).*\"\n"
1530
" Ignore everything except the \"local\" toplevel directory,\n"
1531
" but always ignore autosave files ending in ~, even under local/::\n"
1533
" bzr ignore \"*\"\n"
1534
" bzr ignore \"!./local\"\n"
1535
" bzr ignore \"!!*~\""
1538
# help of 'default-rules' option of 'ignore' command
1539
#: bzrlib/builtins.py:2898
1540
msgid "Display the default ignore rules that bzr uses."
1543
#: bzrlib/builtins.py:2946
1544
msgid "List ignored files and the patterns that matched them."
1547
#: bzrlib/builtins.py:2948
1549
"List all the ignored files and the ignore pattern that caused the file to\n"
1553
#: bzrlib/builtins.py:2951
1554
msgid "Alternatively, to list just the files::"
1557
#: bzrlib/builtins.py:2953
1558
msgid " bzr ls --ignored"
1561
#: bzrlib/builtins.py:2994
1562
msgid "Export current or past revision to a destination directory or archive."
1565
#: bzrlib/builtins.py:2996
1566
msgid "If no revision is specified this exports the last committed revision."
1569
#: bzrlib/builtins.py:2998
1571
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1572
"given, try to find the format with the extension. If no extension\n"
1573
"is found exports to a directory (equivalent to --format=dir)."
1576
#: bzrlib/builtins.py:3002
1578
"If root is supplied, it will be used as the root directory inside\n"
1579
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1580
"to the exported filename. The root option has no effect for 'dir' format."
1583
#: bzrlib/builtins.py:3006
1585
"If branch is omitted then the branch containing the current working\n"
1586
"directory will be used."
1589
#: bzrlib/builtins.py:3009
1590
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
1593
#: bzrlib/builtins.py:3011
1595
" ================= =========================\n"
1596
" Supported formats Autodetected by extension\n"
1597
" ================= =========================\n"
1600
" tbz2 .tar.bz2, .tbz2\n"
1601
" tgz .tar.gz, .tgz\n"
1603
" ================= ========================="
1606
# help of 'format' option of 'export' command
1607
#: bzrlib/builtins.py:3025
1608
msgid "Type of file to export to."
1611
# help of 'filters' option of 'export' command
1612
#: bzrlib/builtins.py:3028
1613
msgid "Apply content filters to export the convenient form."
1616
# help of 'root' option of 'export' command
1617
#: bzrlib/builtins.py:3032
1618
msgid "Name of the root directory inside the exported file."
1621
# help of 'per-file-timestamps' option of 'export' command
1622
#: bzrlib/builtins.py:3034
1624
"Set modification time of files to that of the last revision in which it was "
1628
#: bzrlib/builtins.py:3058
1629
msgid "Write the contents of a file as of a given revision to standard output."
1632
#: bzrlib/builtins.py:3060
1633
msgid "If no revision is nominated, the last revision is used."
1636
#: bzrlib/builtins.py:3062
1638
"Note: Take care to redirect standard output when using this command on a\n"
1642
# help of 'filters' option of 'cat' command
1643
#: bzrlib/builtins.py:3069
1644
msgid "Apply content filters to display the convenience form."
1647
#: bzrlib/builtins.py:3140
1648
msgid "Commit changes into a new revision."
1651
#: bzrlib/builtins.py:3142
1653
"An explanatory message needs to be given for each commit. This is\n"
1654
"often done by using the --message option (getting the message from the\n"
1655
"command line) or by using the --file option (getting the message from\n"
1656
"a file). If neither of these options is given, an editor is opened for\n"
1657
"the user to enter the message. To see the changed files in the\n"
1658
"boilerplate text loaded into the editor, use the --show-diff option."
1661
#: bzrlib/builtins.py:3149
1663
"By default, the entire tree is committed and the person doing the\n"
1664
"commit is assumed to be the author. These defaults can be overridden\n"
1665
"as explained below."
1668
#: bzrlib/builtins.py:3153
1669
msgid ":Selective commits:"
1672
#: bzrlib/builtins.py:3155
1674
" If selected files are specified, only changes to those files are\n"
1675
" committed. If a directory is specified then the directory and\n"
1676
" everything within it is committed."
1679
#: bzrlib/builtins.py:3159
1681
" When excludes are given, they take precedence over selected files.\n"
1682
" For example, to commit only changes within foo, but not changes\n"
1686
#: bzrlib/builtins.py:3163
1687
msgid " bzr commit foo -x foo/bar"
1690
#: bzrlib/builtins.py:3165
1691
msgid " A selective commit after a merge is not yet supported."
1694
#: bzrlib/builtins.py:3167
1695
msgid ":Custom authors:"
1698
#: bzrlib/builtins.py:3169
1700
" If the author of the change is not the same person as the committer,\n"
1701
" you can specify the author's name using the --author option. The\n"
1702
" name should be in the same format as a committer-id, e.g.\n"
1703
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
1704
" the change you can specify the option multiple times, once for each\n"
1708
#: bzrlib/builtins.py:3176
1712
#: bzrlib/builtins.py:3178
1714
" A common mistake is to forget to add a new file or directory before\n"
1715
" running the commit command. The --strict option checks for unknown\n"
1716
" files and aborts the commit if any are found. More advanced pre-commit\n"
1717
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
1721
#: bzrlib/builtins.py:3184
1722
msgid ":Things to note:"
1725
#: bzrlib/builtins.py:3186
1727
" If you accidentially commit the wrong changes or make a spelling\n"
1728
" mistake in the commit message say, you can use the uncommit command\n"
1729
" to undo it. See ``bzr help uncommit`` for details."
1732
#: bzrlib/builtins.py:3190
1734
" Hooks can also be configured to run after a commit. This allows you\n"
1735
" to trigger updates to external systems like bug trackers. The --fixes\n"
1736
" option can be used to record the association between a revision and\n"
1737
" one or more bugs. See ``bzr help bugs`` for details."
1740
# help of 'exclude' option of 'commit' command
1741
#: bzrlib/builtins.py:3200
1742
msgid "Do not consider changes made to a given path."
1745
# help of 'message' option of 'commit' command
1746
#: bzrlib/builtins.py:3203
1747
msgid "Description of the new revision."
1750
# help of 'unchanged' option of 'commit' command
1751
#: bzrlib/builtins.py:3206
1752
msgid "Commit even if nothing has changed."
1755
# help of 'file' option of 'commit' command
1756
#: bzrlib/builtins.py:3210
1757
msgid "Take commit message from this file."
1760
# help of 'strict' option of 'commit' command
1761
#: bzrlib/builtins.py:3212
1762
msgid "Refuse to commit if there are unknown files in the working tree."
1765
# help of 'commit-time' option of 'commit' command
1766
#: bzrlib/builtins.py:3215
1768
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
1772
# help of 'fixes' option of 'commit' command
1773
#: bzrlib/builtins.py:3218
1774
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
1777
# help of 'author' option of 'commit' command
1778
#: bzrlib/builtins.py:3221
1779
msgid "Set the author's name, if it's different from the committer."
1782
# help of 'local' option of 'commit' command
1783
#: bzrlib/builtins.py:3224
1785
"Perform a local commit in a bound branch. Local commits are not pushed to "
1786
"the master branch until a normal commit is performed."
1789
# help of 'show-diff' option of 'commit' command
1790
#: bzrlib/builtins.py:3230
1792
"When no message is supplied, show the diff along with the status summary in "
1793
"the message editor."
1796
# help of 'lossy' option of 'commit' command
1797
#: bzrlib/builtins.py:3233
1799
"When committing to a foreign version control system do not push data that "
1800
"can not be natively represented."
1803
#: bzrlib/builtins.py:3391
1805
"Validate working tree structure, branch consistency and repository history."
1808
#: bzrlib/builtins.py:3393
1810
"This command checks various invariants about branch and repository storage\n"
1811
"to detect data corruption or bzr bugs."
1814
#: bzrlib/builtins.py:3396
1816
"The working tree and branch checks will only give output if a problem is\n"
1817
"detected. The output fields of the repository check are:"
1820
#: bzrlib/builtins.py:3399
1823
" This is just the number of revisions checked. It doesn't\n"
1824
" indicate a problem."
1827
#: bzrlib/builtins.py:3403
1830
" This is just the number of versionedfiles checked. It\n"
1831
" doesn't indicate a problem."
1834
#: bzrlib/builtins.py:3407
1836
"unreferenced ancestors\n"
1837
" Texts that are ancestors of other texts, but\n"
1838
" are not properly referenced by the revision ancestry. This is a\n"
1839
" subtle problem that Bazaar can work around."
1842
#: bzrlib/builtins.py:3412
1844
"unique file texts\n"
1845
" This is the total number of unique file contents\n"
1846
" seen in the checked revisions. It does not indicate a problem."
1849
#: bzrlib/builtins.py:3416
1851
"repeated file texts\n"
1852
" This is the total number of repeated texts seen\n"
1853
" in the checked revisions. Texts can be repeated when their file\n"
1854
" entries are modified, but the file contents are not. It does not\n"
1855
" indicate a problem."
1858
#: bzrlib/builtins.py:3422
1860
"If no restrictions are specified, all Bazaar data that is found at the "
1862
"location will be checked."
1865
#: bzrlib/builtins.py:3425
1869
#: bzrlib/builtins.py:3427
1870
msgid " Check the tree and branch at 'foo'::"
1873
#: bzrlib/builtins.py:3429
1874
msgid " bzr check --tree --branch foo"
1877
#: bzrlib/builtins.py:3431
1878
msgid " Check only the repository at 'bar'::"
1881
#: bzrlib/builtins.py:3433
1882
msgid " bzr check --repo bar"
1885
#: bzrlib/builtins.py:3435
1886
msgid " Check everything at 'baz'::"
1889
#: bzrlib/builtins.py:3437
1890
msgid " bzr check baz"
1893
# help of 'branch' option of 'check' command
1894
#: bzrlib/builtins.py:3443
1895
msgid "Check the branch related to the current directory."
1898
# help of 'repo' option of 'check' command
1899
#: bzrlib/builtins.py:3445
1900
msgid "Check the repository related to the current directory."
1903
# help of 'tree' option of 'check' command
1904
#: bzrlib/builtins.py:3447
1905
msgid "Check the working tree related to the current directory."
1908
#: bzrlib/builtins.py:3461
1909
msgid "Upgrade a repository, branch or working tree to a newer format."
1912
#: bzrlib/builtins.py:3463
1914
"When the default format has changed after a major new release of\n"
1915
"Bazaar, you may be informed during certain operations that you\n"
1916
"should upgrade. Upgrading to a newer format may improve performance\n"
1917
"or make new features available. It may however limit interoperability\n"
1918
"with older repositories or with older versions of Bazaar."
1921
#: bzrlib/builtins.py:3469
1923
"If you wish to upgrade to a particular format rather than the\n"
1924
"current default, that can be specified using the --format option.\n"
1925
"As a consequence, you can use the upgrade command this way to\n"
1926
"\"downgrade\" to an earlier format, though some conversions are\n"
1927
"a one way process (e.g. changing from the 1.x default to the\n"
1928
"2.x default) so downgrading is not always possible."
1931
#: bzrlib/builtins.py:3476
1933
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
1934
"process (where # is a number). By default, this is left there on\n"
1935
"completion. If the conversion fails, delete the new .bzr directory\n"
1936
"and rename this one back in its place. Use the --clean option to ask\n"
1937
"for the backup.bzr directory to be removed on successful conversion.\n"
1938
"Alternatively, you can delete it by hand if everything looks good\n"
1942
#: bzrlib/builtins.py:3484
1944
"If the location given is a shared repository, dependent branches\n"
1945
"are also converted provided the repository converts successfully.\n"
1946
"If the conversion of a branch fails, remaining branches are still\n"
1950
#: bzrlib/builtins.py:3489
1952
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
1953
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
1956
# help of 'format' option of 'upgrade' command
1957
#: bzrlib/builtins.py:3497
1958
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
1961
# title of 'format' option of 'init' command
1962
#: bzrlib/builtins.py:3501
1963
msgid "Branch format"
1966
# help of 'clean' option of 'upgrade' command
1967
#: bzrlib/builtins.py:3503
1968
msgid "Remove the backup.bzr directory if successful."
1971
#: bzrlib/builtins.py:3520
1972
msgid "Show or set bzr user id."
1975
#: bzrlib/builtins.py:3522
1978
" Show the email of the current user::"
1981
#: bzrlib/builtins.py:3525
1982
msgid " bzr whoami --email"
1985
#: bzrlib/builtins.py:3527
1986
msgid " Set the current user::"
1989
#: bzrlib/builtins.py:3529
1990
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
1993
# help of 'email' option of 'whoami' command
1994
#: bzrlib/builtins.py:3533
1995
msgid "Display email address only."
1998
# help of 'branch' option of 'whoami' command
1999
#: bzrlib/builtins.py:3535
2000
msgid "Set identity for the current branch instead of globally."
2003
#: bzrlib/builtins.py:3581
2004
msgid "Print or set the branch nickname."
2007
#: bzrlib/builtins.py:3583
2009
"If unset, the tree root directory name is used as the nickname.\n"
2010
"To print the current nickname, execute with no argument."
2013
#: bzrlib/builtins.py:3586
2015
"Bound branches use the nickname of its master branch unless it is set\n"
2019
#: bzrlib/builtins.py:3606
2020
msgid "Set/unset and display aliases."
2023
#: bzrlib/builtins.py:3608
2026
" Show the current aliases::"
2029
#: bzrlib/builtins.py:3611
2033
#: bzrlib/builtins.py:3613
2034
msgid " Show the alias specified for 'll'::"
2037
#: bzrlib/builtins.py:3615
2038
msgid " bzr alias ll"
2041
#: bzrlib/builtins.py:3617
2042
msgid " Set an alias for 'll'::"
2045
#: bzrlib/builtins.py:3619
2046
msgid " bzr alias ll=\"log --line -r-10..-1\""
2049
#: bzrlib/builtins.py:3621
2050
msgid " To remove an alias for 'll'::"
2053
#: bzrlib/builtins.py:3623
2054
msgid " bzr alias --remove ll"
2057
# help of 'remove' option of 'alias' command
2058
#: bzrlib/builtins.py:3628
2059
msgid "Remove the alias."
2062
#: bzrlib/builtins.py:3867
2063
msgid "Show version of bzr."
2066
# help of 'short' option of 'version' command
2067
#: bzrlib/builtins.py:3871
2068
msgid "Print just the version number."
2071
#: bzrlib/builtins.py:3918
2072
msgid "Perform a three-way merge."
2075
#: bzrlib/builtins.py:3920
2077
"The source of the merge can be specified either in the form of a branch,\n"
2078
"or in the form of a path to a file containing a merge directive generated\n"
2079
"with bzr send. If neither is specified, the default is the upstream branch\n"
2080
"or the branch most recently merged using --remember. The source of the\n"
2081
"merge may also be specified in the form of a path to a file in another\n"
2082
"branch: in this case, only the modifications to that file are merged into\n"
2083
"the current working tree."
2086
#: bzrlib/builtins.py:3928
2088
"When merging from a branch, by default bzr will try to merge in all new\n"
2089
"work from the other branch, automatically determining an appropriate base\n"
2090
"revision. If this fails, you may need to give an explicit base."
2093
#: bzrlib/builtins.py:3932
2095
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2096
"try to merge in all new work up to and including revision OTHER."
2099
#: bzrlib/builtins.py:3935
2101
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2102
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2103
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2104
"not already contain revision BASE, such a merge is commonly referred to as\n"
2105
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2106
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2107
"changes from the other branch is not stored in the commit."
2110
#: bzrlib/builtins.py:3943
2111
msgid "Revision numbers are always relative to the source branch."
2114
#: bzrlib/builtins.py:3950
2115
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2118
#: bzrlib/builtins.py:3952
2120
"If there is no default branch set, the first merge will set it (use\n"
2121
"--no-remember to avoid settting it). After that, you can omit the branch\n"
2122
"to use the default. To change the default, use --remember. The value will\n"
2123
"only be saved if the remote location can be accessed."
2126
#: bzrlib/builtins.py:3957
2128
"The results of the merge are placed into the destination working\n"
2129
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2130
"committed to record the result of the merge."
2133
#: bzrlib/builtins.py:3961
2135
"merge refuses to run if there are any uncommitted changes, unless\n"
2136
"--force is given. If --force is given, then the changes from the source \n"
2137
"will be merged with the current working tree, including any uncommitted\n"
2138
"changes in the tree. The --force option can also be used to create a\n"
2139
"merge revision which has more than two parents."
2142
#: bzrlib/builtins.py:3967
2144
"If one would like to merge changes from the working tree of the other\n"
2145
"branch without merging any committed revisions, the --uncommitted option\n"
2149
#: bzrlib/builtins.py:3971
2151
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2152
"you to apply each diff hunk and file change, similar to \"shelve\"."
2155
#: bzrlib/builtins.py:3974
2158
" To merge all new revisions from bzr.dev::"
2161
#: bzrlib/builtins.py:3977
2162
msgid " bzr merge ../bzr.dev"
2165
#: bzrlib/builtins.py:3979
2166
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2169
#: bzrlib/builtins.py:3981
2170
msgid " bzr merge -r 82 ../bzr.dev"
2173
#: bzrlib/builtins.py:3983
2174
msgid " To merge the changes introduced by 82, without previous changes::"
2177
#: bzrlib/builtins.py:3985
2178
msgid " bzr merge -r 81..82 ../bzr.dev"
2181
#: bzrlib/builtins.py:3987
2182
msgid " To apply a merge directive contained in /tmp/merge::"
2185
#: bzrlib/builtins.py:3989
2186
msgid " bzr merge /tmp/merge"
2189
#: bzrlib/builtins.py:3991
2191
" To create a merge revision with three parents from two branches\n"
2192
" feature1a and feature1b:"
2195
#: bzrlib/builtins.py:3994
2197
" bzr merge ../feature1a\n"
2198
" bzr merge ../feature1b --force\n"
2199
" bzr commit -m 'revision with three parents'"
2202
# help of 'force' option of 'merge' command
2203
#: bzrlib/builtins.py:4006
2204
msgid "Merge even if the destination tree has uncommitted changes."
2207
# help of 'uncommitted' option of 'merge' command
2208
#: bzrlib/builtins.py:4012
2210
"Apply uncommitted changes from a working copy, instead of branch changes."
2213
# help of 'pull' option of 'merge' command
2214
#: bzrlib/builtins.py:4014
2216
"If the destination is already completely merged into the source, pull from "
2217
"the source rather than merging. When this happens, you do not need to "
2218
"commit the result."
2221
# help of 'directory' option of 'merge' command
2222
#: bzrlib/builtins.py:4019
2224
"Branch to merge into, rather than the one containing the working directory."
2227
# help of 'preview' option of 'merge' command
2228
#: bzrlib/builtins.py:4021
2229
msgid "Instead of merging, show a diff of the merge."
2232
# help of 'interactive' option of 'merge' command
2233
#: bzrlib/builtins.py:4023
2234
msgid "Select changes interactively."
2237
#: bzrlib/builtins.py:4307
2238
msgid "Redo a merge."
2241
#: bzrlib/builtins.py:4309
2243
"Use this if you want to try a different merge technique while resolving\n"
2244
"conflicts. Some merge techniques are better than others, and remerge\n"
2245
"lets you try different ones on different files."
2248
#: bzrlib/builtins.py:4313
2250
"The options for remerge have the same meaning and defaults as the ones for\n"
2251
"merge. The difference is that remerge can (only) be run when there is a\n"
2252
"pending merge, and it lets you specify particular files."
2255
#: bzrlib/builtins.py:4317
2258
" Re-do the merge of all conflicted files, and show the base text in\n"
2259
" conflict regions, in addition to the usual THIS and OTHER texts::"
2262
#: bzrlib/builtins.py:4321
2263
msgid " bzr remerge --show-base"
2266
#: bzrlib/builtins.py:4323
2268
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2269
" additional processing to reduce the size of conflict regions::"
2272
#: bzrlib/builtins.py:4326
2273
msgid " bzr remerge --merge-type weave --reprocess foobar"
2276
# help of 'show-base' option of 'merge' command
2277
#: bzrlib/builtins.py:4333
2278
msgid "Show base revision text in conflicts."
2281
#: bzrlib/builtins.py:4401
2282
msgid "Revert files to a previous revision."
2285
#: bzrlib/builtins.py:4403
2287
"Giving a list of files will revert only those files. Otherwise, all files\n"
2288
"will be reverted. If the revision is not specified with '--revision', the\n"
2289
"last committed revision is used."
2292
#: bzrlib/builtins.py:4407
2294
"To remove only some changes, without reverting to a prior version, use\n"
2295
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2296
"will remove the changes introduced by the second last commit (-2), without\n"
2297
"affecting the changes introduced by the last commit (-1). To remove\n"
2298
"certain changes on a hunk-by-hunk basis, see the shelve command."
2301
#: bzrlib/builtins.py:4413
2303
"By default, any files that have been manually changed will be backed up\n"
2304
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2305
"'.~#~' appended to their name, where # is a number."
2308
#: bzrlib/builtins.py:4417
2310
"When you provide files, you can use their current pathname or the pathname\n"
2311
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2312
"name. If you name a directory, all the contents of that directory will be\n"
2316
#: bzrlib/builtins.py:4422
2318
"If you have newly added files since the target revision, they will be\n"
2319
"removed. If the files to be removed have been changed, backups will be\n"
2320
"created as above. Directories containing unknown files will not be\n"
2324
#: bzrlib/builtins.py:4427
2326
"The working tree contains a list of revisions that have been merged but\n"
2327
"not yet committed. These revisions will be included as additional parents\n"
2328
"of the next commit. Normally, using revert clears that list as well as\n"
2329
"reverting the files. If any files are specified, revert leaves the list\n"
2330
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2331
".`` in the tree root to revert all files but keep the recorded merges,\n"
2332
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2333
"reverting any files."
2336
#: bzrlib/builtins.py:4436
2338
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2339
"changes from a branch in a single revision. To do this, perform the merge\n"
2340
"as desired. Then doing revert with the \"--forget-merges\" option will "
2342
"the content of the tree as it was, but it will clear the list of pending\n"
2343
"merges. The next commit will then contain all of the changes that are\n"
2344
"present in the other branch, but without any other parent revisions.\n"
2345
"Because this technique forgets where these changes originated, it may\n"
2346
"cause additional conflicts on later merges involving the same source and\n"
2350
# help of 'no-backup' option of 'revert' command
2351
#: bzrlib/builtins.py:4450
2352
msgid "Do not save backups of reverted files."
2355
# help of 'forget-merges' option of 'revert' command
2356
#: bzrlib/builtins.py:4452
2357
msgid "Remove pending merge marker, without changing any files."
2360
#: bzrlib/builtins.py:4483
2362
"Show help on a command or other topic.\n"
2366
# help of 'long' option of 'help' command
2367
#: bzrlib/builtins.py:4488
2368
msgid "Show help on all commands."
2371
#: bzrlib/builtins.py:4517
2372
msgid "Show unmerged/unpulled revisions between two branches."
2375
#: bzrlib/builtins.py:4519
2376
msgid "OTHER_BRANCH may be local or remote."
2379
#: bzrlib/builtins.py:4521
2381
"To filter on a range of revisions, you can use the command -r begin..end\n"
2382
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2386
" 1 - some missing revisions\n"
2387
" 0 - no missing revisions"
2390
#: bzrlib/builtins.py:4531
2392
" Determine the missing revisions between this and the branch at the\n"
2393
" remembered pull location::"
2396
#: bzrlib/builtins.py:4534
2397
msgid " bzr missing"
2400
#: bzrlib/builtins.py:4536
2401
msgid " Determine the missing revisions between this and another branch::"
2404
#: bzrlib/builtins.py:4538
2405
msgid " bzr missing http://server/branch"
2408
#: bzrlib/builtins.py:4540
2410
" Determine the missing revisions up to a specific revision on the other\n"
2414
#: bzrlib/builtins.py:4543
2415
msgid " bzr missing -r ..-10"
2418
#: bzrlib/builtins.py:4545
2420
" Determine the missing revisions up to a specific revision on this\n"
2424
#: bzrlib/builtins.py:4548
2425
msgid " bzr missing --my-revision ..-10"
2428
# help of 'reverse' option of 'missing' command
2429
#: bzrlib/builtins.py:4555
2430
msgid "Reverse the order of revisions."
2433
# help of 'mine-only' option of 'missing' command
2434
#: bzrlib/builtins.py:4557
2435
msgid "Display changes in the local branch only."
2438
# help of 'this' option of 'missing' command
2439
#: bzrlib/builtins.py:4558
2440
msgid "Same as --mine-only."
2443
# help of 'theirs-only' option of 'missing' command
2444
#: bzrlib/builtins.py:4560
2445
msgid "Display changes in the remote branch only."
2448
# help of 'other' option of 'missing' command
2449
#: bzrlib/builtins.py:4561
2450
msgid "Same as --theirs-only."
2453
# help of 'revision' option of 'missing' command
2454
#: bzrlib/builtins.py:4566
2456
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
2460
# help of 'my-revision' option of 'missing' command
2461
#: bzrlib/builtins.py:4570
2463
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
2467
# help of 'include-merges' option of 'missing' command
2468
#: bzrlib/builtins.py:4573
2469
msgid "Show all revisions in addition to the mainline ones."
2472
#: bzrlib/builtins.py:4689
2473
msgid "Compress the data within a repository."
2476
#: bzrlib/builtins.py:4691
2478
"This operation compresses the data within a bazaar repository. As\n"
2479
"bazaar supports automatic packing of repository, this operation is\n"
2480
"normally not required to be done manually."
2483
#: bzrlib/builtins.py:4695
2485
"During the pack operation, bazaar takes a backup of existing repository\n"
2486
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
2487
"automatically when it is safe to do so. To save disk space by removing\n"
2488
"the backed up pack files, the --clean-obsolete-packs option may be\n"
2492
#: bzrlib/builtins.py:4701
2494
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
2495
"during or immediately after repacking, you may be left with a state\n"
2496
"where the deletion has been written to disk but the new packs have not\n"
2497
"been. In this case the repository may be unusable."
2500
# help of 'clean-obsolete-packs' option of 'pack' command
2501
#: bzrlib/builtins.py:4710
2502
msgid "Delete obsolete packs to save disk space."
2505
#: bzrlib/builtins.py:4724
2506
msgid "List the installed plugins."
2509
#: bzrlib/builtins.py:4726
2511
"This command displays the list of installed plugins including\n"
2512
"version of plugin and a short description of each."
2515
#: bzrlib/builtins.py:4729
2516
msgid "--verbose shows the path where each plugin is located."
2519
#: bzrlib/builtins.py:4731
2521
"A plugin is an external component for Bazaar that extends the\n"
2522
"revision control system, by adding or replacing code in Bazaar.\n"
2523
"Plugins can do a variety of things, including overriding commands,\n"
2524
"adding new commands, providing additional network transports and\n"
2525
"customizing log output."
2528
#: bzrlib/builtins.py:4737
2530
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
2531
"for further information on plugins including where to find them and how to\n"
2532
"install them. Instructions are also provided there on how to write new\n"
2533
"plugins using the Python programming language."
2536
#: bzrlib/builtins.py:4753
2537
msgid "Show testament (signing-form) of a revision."
2540
# help of 'long' option of 'testament' command
2541
#: bzrlib/builtins.py:4756
2542
msgid "Produce long-format testament."
2545
# help of 'strict' option of 'testament' command
2546
#: bzrlib/builtins.py:4758
2547
msgid "Produce a strict-format testament."
2550
#: bzrlib/builtins.py:4784
2551
msgid "Show the origin of each line in a file."
2554
#: bzrlib/builtins.py:4786
2556
"This prints out the given file with an annotation on the left side\n"
2557
"indicating which revision, author and date introduced the change."
2560
#: bzrlib/builtins.py:4789
2562
"If the origin is the same for a run of consecutive lines, it is\n"
2563
"shown only at the top, unless the --all option is given."
2566
# help of 'all' option of 'annotate' command
2567
#: bzrlib/builtins.py:4797
2568
msgid "Show annotations on all lines."
2571
# help of 'long' option of 'annotate' command
2572
#: bzrlib/builtins.py:4798
2573
msgid "Show commit date in annotations."
2576
#: bzrlib/builtins.py:4901
2578
"Convert the current branch into a checkout of the supplied branch.\n"
2579
"If no branch is supplied, rebind to the last bound location."
2582
#: bzrlib/builtins.py:4904
2584
"Once converted into a checkout, commits must succeed on the master branch\n"
2585
"before they will be applied to the local branch."
2588
#: bzrlib/builtins.py:4907
2590
"Bound branches use the nickname of its master branch unless it is set\n"
2591
"locally, in which case binding will update the local nickname to be\n"
2592
"that of the master."
2595
#: bzrlib/builtins.py:4942
2596
msgid "Convert the current checkout into a regular branch."
2599
#: bzrlib/builtins.py:4944
2601
"After unbinding, the local branch is considered independent and subsequent\n"
2602
"commits will be local only."
2605
#: bzrlib/builtins.py:4959
2606
msgid "Remove the last committed revision."
2609
#: bzrlib/builtins.py:4961
2611
"--verbose will print out what is being removed.\n"
2612
"--dry-run will go through all the motions, but not actually\n"
2616
#: bzrlib/builtins.py:4965
2618
"If --revision is specified, uncommit revisions to leave the branch at the\n"
2619
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
2620
"branch at revision 15."
2623
#: bzrlib/builtins.py:4969
2625
"Uncommit leaves the working tree ready for a new commit. The only change\n"
2626
"it may make is to restore any pending merges that were present before\n"
2630
# help of 'dry-run' option of 'uncommit' command
2631
#: bzrlib/builtins.py:4980
2632
msgid "Don't actually make changes."
2635
# help of 'force' option of 'uncommit' command
2636
#: bzrlib/builtins.py:4981
2637
msgid "Say yes to all questions."
2640
# help of 'local' option of 'uncommit' command
2641
#: bzrlib/builtins.py:4983
2642
msgid "Only remove the commits from the local branch when in a checkout."
2645
#: bzrlib/builtins.py:5068
2646
msgid "Break a dead lock."
2649
#: bzrlib/builtins.py:5070
2651
"This command breaks a lock on a repository, branch, working directory or\n"
2655
#: bzrlib/builtins.py:5073
2657
"CAUTION: Locks should only be broken when you are sure that the process\n"
2658
"holding the lock has been stopped."
2661
#: bzrlib/builtins.py:5076
2663
"You can get information on what locks are open via the 'bzr info\n"
2664
"[location]' command."
2667
#: bzrlib/builtins.py:5079
2671
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
2672
" bzr break-lock --conf ~/.bazaar"
2675
# help of 'config' option of 'break-lock' command
2676
#: bzrlib/builtins.py:5088
2677
msgid "LOCATION is the directory where the config lock is."
2680
# help of 'force' option of 'break-lock' command
2681
#: bzrlib/builtins.py:5090
2682
msgid "Do not ask for confirmation before breaking the lock."
2685
#: bzrlib/builtins.py:5126
2686
msgid "Run the bzr server."
2689
# help of 'inet' option of 'serve' command
2690
#: bzrlib/builtins.py:5132
2691
msgid "Serve on stdin/out for use from inetd or sshd."
2694
# title of 'protocol' option of 'serve' command
2695
#: bzrlib/builtins.py:5133
2699
# help of 'protocol' option of 'serve' command
2700
#: bzrlib/builtins.py:5134
2701
msgid "Protocol to serve."
2704
# help of 'port' option of 'serve' command
2705
#: bzrlib/builtins.py:5138
2707
"Listen for connections on nominated port of the form [hostname:]portnumber. "
2708
"Passing 0 as the port number will result in a dynamically allocated port. "
2709
"The default port depends on the protocol."
2712
# help of 'directory' option of 'serve' command
2713
#: bzrlib/builtins.py:5144
2714
msgid "Serve contents of this directory."
2717
# help of 'allow-writes' option of 'serve' command
2718
#: bzrlib/builtins.py:5146
2720
"By default the server is a readonly server. Supplying --allow-writes "
2721
"enables write access to the contents of the served directory and below. "
2722
"Note that ``bzr serve`` does not perform authentication, so unless some form "
2723
"of external authentication is arranged supplying this option leads to global "
2724
"uncontrolled write access to your file system."
2727
#: bzrlib/builtins.py:5191
2728
msgid "Combine a tree into its containing tree."
2731
#: bzrlib/builtins.py:5193
2732
msgid "This command requires the target tree to be in a rich-root format."
2735
#: bzrlib/builtins.py:5195
2737
"The TREE argument should be an independent tree, inside another tree, but\n"
2738
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
2739
"running \"bzr branch\" with the target inside a tree.)"
2742
#: bzrlib/builtins.py:5199
2744
"The result is a combined tree, with the subtree no longer an independent\n"
2745
"part. This is marked as a merge of the subtree into the containing tree,\n"
2746
"and all history is preserved."
2749
#: bzrlib/builtins.py:5237
2750
msgid "Split a subdirectory of a tree into a separate tree."
2753
#: bzrlib/builtins.py:5239
2755
"This command will produce a target tree in a format that supports\n"
2756
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
2757
"converted into earlier formats like 'dirstate-tags'."
2760
#: bzrlib/builtins.py:5243
2762
"The TREE argument should be a subdirectory of a working tree. That\n"
2763
"subdirectory will be converted into an independent tree, with its own\n"
2764
"branch. Commits in the top-level tree will not apply to the new subtree."
2767
#: bzrlib/builtins.py:5364
2768
msgid "Mail or create a merge-directive for submitting changes."
2771
#: bzrlib/builtins.py:5366
2772
msgid "A merge directive provides many things needed for requesting merges:"
2775
#: bzrlib/builtins.py:5368
2776
msgid "* A machine-readable description of the merge to perform"
2779
#: bzrlib/builtins.py:5370
2780
msgid "* An optional patch that is a preview of the changes requested"
2783
#: bzrlib/builtins.py:5372
2785
"* An optional bundle of revision data, so that the changes can be applied\n"
2786
" directly from the merge directive, without retrieving data from a\n"
2790
#: bzrlib/builtins.py:5376
2792
"`bzr send` creates a compact data set that, when applied using bzr\n"
2793
"merge, has the same effect as merging from the source branch. "
2796
#: bzrlib/builtins.py:5379
2798
"By default the merge directive is self-contained and can be applied to any\n"
2799
"branch containing submit_branch in its ancestory without needing access to\n"
2800
"the source branch."
2803
#: bzrlib/builtins.py:5383
2805
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
2806
"revisions, but only a structured request to merge from the\n"
2807
"public_location. In that case the public_branch is needed and it must be\n"
2808
"up-to-date and accessible to the recipient. The public_branch is always\n"
2809
"included if known, so that people can check it later."
2812
#: bzrlib/builtins.py:5389
2814
"The submit branch defaults to the parent of the source branch, but can be\n"
2815
"overridden. Both submit branch and public branch will be remembered in\n"
2816
"branch.conf the first time they are used for a particular branch. The\n"
2817
"source branch defaults to that containing the working directory, but can\n"
2818
"be changed using --from."
2821
#: bzrlib/builtins.py:5395
2823
"Both the submit branch and the public branch follow the usual behavior with\n"
2824
"respect to --remember: If there is no default location set, the first send\n"
2825
"will set it (use --no-remember to avoid settting it). After that, you can\n"
2826
"omit the location to use the default. To change the default, use\n"
2827
"--remember. The value will only be saved if the location can be accessed."
2830
#: bzrlib/builtins.py:5401
2832
"In order to calculate those changes, bzr must analyse the submit branch.\n"
2833
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
2834
"If a public location is known for the submit_branch, that location is used\n"
2835
"in the merge directive."
2838
#: bzrlib/builtins.py:5406
2840
"The default behaviour is to send the merge directive by mail, unless -o is\n"
2841
"given, in which case it is sent to a file."
2844
#: bzrlib/builtins.py:5409
2846
"Mail is sent using your preferred mail program. This should be transparent\n"
2847
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
2848
"If the preferred client can't be found (or used), your editor will be used."
2851
#: bzrlib/builtins.py:5413
2853
"To use a specific mail program, set the mail_client configuration option.\n"
2854
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
2855
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
2857
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
2858
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
2860
"supported clients."
2863
#: bzrlib/builtins.py:5420
2865
"If mail is being sent, a to address is required. This can be supplied\n"
2866
"either on the commandline, by setting the submit_to configuration\n"
2867
"option in the branch itself or the child_submit_to configuration option\n"
2868
"in the submit branch."
2871
#: bzrlib/builtins.py:5425
2873
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
2875
"merge directive format 2. It is significantly faster and smaller than\n"
2876
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
2877
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
2878
"format 1. It is compatible with Bazaar 0.12 - 0.18."
2881
#: bzrlib/builtins.py:5431
2883
"The merge directives created by bzr send may be applied using bzr merge or\n"
2884
"bzr pull by specifying a file containing a merge directive as the location."
2887
#: bzrlib/builtins.py:5434
2889
"bzr send makes extensive use of public locations to map local locations "
2891
"URLs that can be used by other people. See `bzr help configuration` to\n"
2892
"set them, and use `bzr info` to display them."
2895
# help of 'output' option of 'send' command
2896
#: bzrlib/builtins.py:5458
2897
msgid "Write merge directive to this file or directory; use - for stdout."
2900
# help of 'strict' option of 'send' command
2901
#: bzrlib/builtins.py:5462
2903
"Refuse to send if there are uncommitted changes in the working tree, --no-"
2904
"strict disables the check."
2907
# help of 'mail-to' option of 'send' command
2908
#: bzrlib/builtins.py:5464
2909
msgid "Mail the request to this address."
2912
# help of 'body' option of 'send' command
2913
#: bzrlib/builtins.py:5468
2914
msgid "Body for the email."
2917
# help of 'no-bundle' option of 'send' command
2918
#: bzrlib/builtins.py:5521
2919
msgid "Do not include a bundle in the merge directive."
2922
# help of 'no-patch' option of 'send' command
2923
#: bzrlib/builtins.py:5522
2924
msgid "Do not include a preview patch in the merge directive."
2927
# help of 'remember' option of 'send' command
2928
#: bzrlib/builtins.py:5525
2929
msgid "Remember submit and public branch."
2932
# help of 'from' option of 'send' command
2933
#: bzrlib/builtins.py:5527
2935
"Branch to generate the submission from, rather than the one containing the "
2936
"working directory."
2939
# title of 'format' option of 'send' command
2940
#: bzrlib/builtins.py:5537
2944
# help of 'format' option of 'send' command
2945
#: bzrlib/builtins.py:5538
2946
msgid "Use the specified output format."
2949
#: bzrlib/builtins.py:5560
2950
msgid "Create, remove or modify a tag naming a revision."
2953
#: bzrlib/builtins.py:5562
2955
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
2956
"(--revision) option can be given -rtag:X, where X is any previously\n"
2960
#: bzrlib/builtins.py:5566
2962
"Tags are stored in the branch. Tags are copied from one branch to another\n"
2963
"along when you branch, push, pull or merge."
2966
#: bzrlib/builtins.py:5569
2968
"It is an error to give a tag name that already exists unless you pass\n"
2969
"--force, in which case the tag is moved to point to the new revision."
2972
#: bzrlib/builtins.py:5572
2974
"To rename a tag (change the name but keep it on the same revsion), run "
2976
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
2979
#: bzrlib/builtins.py:5575
2981
"If no tag name is specified it will be determined through the \n"
2982
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
2983
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
2987
# help of 'delete' option of 'tag' command
2988
#: bzrlib/builtins.py:5585
2989
msgid "Delete this tag rather than placing it."
2992
# help of 'directory' option of 'tag' command
2993
#: bzrlib/builtins.py:5588
2994
msgid "Branch in which to place the tag."
2997
# help of 'force' option of 'tag' command
2998
#: bzrlib/builtins.py:5590
2999
msgid "Replace existing tags."
3002
#: bzrlib/builtins.py:5629
3006
#: bzrlib/builtins.py:5631
3008
"This command shows a table of tag names and the revisions they reference."
3011
# help of 'directory' option of 'tags' command
3012
#: bzrlib/builtins.py:5637
3013
msgid "Branch whose tags should be displayed."
3016
# help of 'sort' option of 'tags' command
3017
#: bzrlib/builtins.py:5639
3018
msgid "Sort tags by different criteria."
3021
# title of 'sort' option of 'tags' command
3022
#: bzrlib/builtins.py:5639
3026
#: bzrlib/builtins.py:5684
3027
msgid "Reconfigure the type of a bzr directory."
3030
#: bzrlib/builtins.py:5686
3031
msgid "A target configuration must be specified."
3034
#: bzrlib/builtins.py:5688
3036
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3037
"The order of preference is\n"
3038
"1. For a lightweight checkout, the current bound location.\n"
3039
"2. For branches that used to be checkouts, the previously-bound location.\n"
3040
"3. The push location.\n"
3041
"4. The parent location.\n"
3042
"If none of these is available, --bind-to must be specified."
3045
# title of 'target_type' option of 'reconfigure' command
3046
#: bzrlib/builtins.py:5702
3050
# help of 'target_type' option of 'reconfigure' command
3051
#: bzrlib/builtins.py:5703
3052
msgid "The type to reconfigure the directory to."
3055
# help of 'bind-to' option of 'reconfigure' command
3056
#: bzrlib/builtins.py:5718
3057
msgid "Branch to bind checkout to."
3060
# help of 'force' option of 'reconfigure' command
3061
#: bzrlib/builtins.py:5720
3062
msgid "Perform reconfiguration even if local changes will be lost."
3065
# help of 'stacked-on' option of 'reconfigure' command
3066
#: bzrlib/builtins.py:5723
3067
msgid "Reconfigure a branch to be stacked on another branch."
3070
# help of 'unstacked' option of 'reconfigure' command
3071
#: bzrlib/builtins.py:5727
3073
"Reconfigure a branch to be unstacked. This may require copying substantial "
3077
#: bzrlib/builtins.py:5775
3078
msgid "Set the branch of a checkout and update."
3081
#: bzrlib/builtins.py:5777
3083
"For lightweight checkouts, this changes the branch being referenced.\n"
3084
"For heavyweight checkouts, this checks that there are no local commits\n"
3085
"versus the current bound branch, then it makes the local branch a mirror\n"
3086
"of the new location and binds to it."
3089
#: bzrlib/builtins.py:5782
3091
"In both cases, the working tree is updated and uncommitted changes\n"
3092
"are merged. The user can commit or revert these as they desire."
3095
#: bzrlib/builtins.py:5785
3096
msgid "Pending merges need to be committed or reverted before using switch."
3099
#: bzrlib/builtins.py:5787
3101
"The path to the branch to switch to can be specified relative to the parent\n"
3102
"directory of the current branch. For example, if you are currently in a\n"
3103
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3104
"/path/to/newbranch."
3107
#: bzrlib/builtins.py:5792
3109
"Bound branches use the nickname of its master branch unless it is set\n"
3110
"locally, in which case switching will update the local nickname to be\n"
3111
"that of the master."
3114
# help of 'force' option of 'switch' command
3115
#: bzrlib/builtins.py:5800
3116
msgid "Switch even if local commits will be lost."
3119
# help of 'create-branch' option of 'switch' command
3120
#: bzrlib/builtins.py:5803
3121
msgid "Create the target branch from this one before switching to it."
3124
#: bzrlib/builtins.py:5872
3125
msgid "Manage filtered views."
3128
#: bzrlib/builtins.py:5874
3130
"Views provide a mask over the tree so that users can focus on\n"
3131
"a subset of a tree when doing their work. After creating a view,\n"
3132
"commands that support a list of files - status, diff, commit, etc -\n"
3133
"effectively have that list of files implicitly given each time.\n"
3134
"An explicit list of files can still be given but those files\n"
3135
"must be within the current view."
3138
#: bzrlib/builtins.py:5881
3140
"In most cases, a view has a short life-span: it is created to make\n"
3141
"a selected change and is deleted once that change is committed.\n"
3142
"At other times, you may wish to create one or more named views\n"
3143
"and switch between them."
3146
#: bzrlib/builtins.py:5886
3148
"To disable the current view without deleting it, you can switch to\n"
3149
"the pseudo view called ``off``. This can be useful when you need\n"
3150
"to see the whole tree for an operation or two (e.g. merge) but\n"
3151
"want to switch back to your view after that."
3154
#: bzrlib/builtins.py:5891
3157
" To define the current view::"
3160
#: bzrlib/builtins.py:5894
3161
msgid " bzr view file1 dir1 ..."
3164
#: bzrlib/builtins.py:5896
3165
msgid " To list the current view::"
3168
#: bzrlib/builtins.py:5898
3172
#: bzrlib/builtins.py:5900
3173
msgid " To delete the current view::"
3176
#: bzrlib/builtins.py:5902
3177
msgid " bzr view --delete"
3180
#: bzrlib/builtins.py:5904
3181
msgid " To disable the current view without deleting it::"
3184
#: bzrlib/builtins.py:5906
3185
msgid " bzr view --switch off"
3188
#: bzrlib/builtins.py:5908
3189
msgid " To define a named view and switch to it::"
3192
#: bzrlib/builtins.py:5910
3193
msgid " bzr view --name view-name file1 dir1 ..."
3196
#: bzrlib/builtins.py:5912
3197
msgid " To list a named view::"
3200
#: bzrlib/builtins.py:5914
3201
msgid " bzr view --name view-name"
3204
#: bzrlib/builtins.py:5916
3205
msgid " To delete a named view::"
3208
#: bzrlib/builtins.py:5918
3209
msgid " bzr view --name view-name --delete"
3212
#: bzrlib/builtins.py:5920
3213
msgid " To switch to a named view::"
3216
#: bzrlib/builtins.py:5922
3217
msgid " bzr view --switch view-name"
3220
#: bzrlib/builtins.py:5924
3221
msgid " To list all views defined::"
3224
#: bzrlib/builtins.py:5926
3225
msgid " bzr view --all"
3228
#: bzrlib/builtins.py:5928
3229
msgid " To delete all views::"
3232
#: bzrlib/builtins.py:5930
3233
msgid " bzr view --delete --all"
3236
# help of 'all' option of 'view' command
3237
#: bzrlib/builtins.py:5937
3238
msgid "Apply list or delete action to all views."
3241
# help of 'delete' option of 'view' command
3242
#: bzrlib/builtins.py:5940
3243
msgid "Delete the view."
3246
# help of 'name' option of 'view' command
3247
#: bzrlib/builtins.py:5943
3248
msgid "Name of the view to define, list or delete."
3251
# help of 'switch' option of 'view' command
3252
#: bzrlib/builtins.py:5947
3253
msgid "Name of the view to switch to."
3256
#: bzrlib/builtins.py:6047
3257
msgid "Remove a branch."
3260
#: bzrlib/builtins.py:6049
3262
"This will remove the branch from the specified location but \n"
3263
"will keep any working tree or repository in place."
3266
#: bzrlib/builtins.py:6054
3267
msgid " Remove the branch at repo/trunk::"
3270
#: bzrlib/builtins.py:6056
3271
msgid " bzr remove-branch repo/trunk"
3274
#: bzrlib/builtins.py:6072
3275
msgid "Temporarily set aside some changes from the current tree."
3278
#: bzrlib/builtins.py:6074
3280
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
3281
"ie. out of the way, until a later time when you can bring them back from\n"
3282
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
3283
"your working tree, and so they aren't propagated along with your branch nor\n"
3284
"will they survive its deletion."
3287
#: bzrlib/builtins.py:6080
3288
msgid "If shelve --list is specified, previously-shelved changes are listed."
3291
#: bzrlib/builtins.py:6082
3293
"Shelve is intended to help separate several sets of changes that have\n"
3294
"been inappropriately mingled. If you just want to get rid of all changes\n"
3295
"and you don't need to restore them later, use revert. If you want to\n"
3296
"shelve all text changes at once, use shelve --all."
3299
#: bzrlib/builtins.py:6087
3301
"If filenames are specified, only the changes to those files will be\n"
3302
"shelved. Other files will be left untouched."
3305
#: bzrlib/builtins.py:6090
3307
"If a revision is specified, changes since that revision will be shelved."
3310
#: bzrlib/builtins.py:6092
3312
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
3313
"restore the most recently shelved changes."
3316
#: bzrlib/builtins.py:6095
3318
"For complicated changes, it is possible to edit the changes in a separate\n"
3319
"editor program to decide what the file remaining in the working copy\n"
3320
"should look like. To do this, add the configuration option"
3323
#: bzrlib/builtins.py:6099
3324
msgid " change_editor = PROGRAM @new_path @old_path"
3327
#: bzrlib/builtins.py:6101
3329
"where @new_path is replaced with the path of the new version of the \n"
3330
"file and @old_path is replaced with the path of the old version of \n"
3331
"the file. The PROGRAM should save the new file with the desired \n"
3332
"contents of the file in the working tree.\n"
3336
# help of 'all' option of 'shelve' command
3337
#: bzrlib/builtins.py:6113
3338
msgid "Shelve all changes."
3341
# help of 'writer' option of 'shelve' command
3342
#: bzrlib/builtins.py:6115
3343
msgid "Method to use for writing diffs."
3346
# title of 'writer' option of 'shelve' command
3347
#: bzrlib/builtins.py:6115
3351
# help of 'list' option of 'shelve' command
3352
#: bzrlib/builtins.py:6119
3353
msgid "List shelved changes."
3356
# help of 'destroy' option of 'shelve' command
3357
#: bzrlib/builtins.py:6121
3358
msgid "Destroy removed changes instead of shelving them."
3361
#: bzrlib/builtins.py:6161
3362
msgid "Restore shelved changes."
3365
#: bzrlib/builtins.py:6163
3367
"By default, the most recently shelved changes are restored. However if you\n"
3368
"specify a shelf by id those changes will be restored instead. This works\n"
3369
"best when the changes don't depend on each other."
3372
# help of 'action' option of 'unshelve' command
3373
#: bzrlib/builtins.py:6172
3374
msgid "The action to perform."
3377
#: bzrlib/builtins.py:6194
3378
msgid "Remove unwanted files from working tree."
3381
#: bzrlib/builtins.py:6196
3383
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
3384
"files are never deleted."
3387
#: bzrlib/builtins.py:6199
3389
"Another class is 'detritus', which includes files emitted by bzr during\n"
3390
"normal operations and selftests. (The value of these files decreases with\n"
3394
#: bzrlib/builtins.py:6203
3396
"If no options are specified, unknown files are deleted. Otherwise, option\n"
3397
"flags are respected, and may be combined."
3400
#: bzrlib/builtins.py:6206
3401
msgid "To check what clean-tree will do, use --dry-run."
3404
# help of 'ignored' option of 'clean-tree' command
3405
#: bzrlib/builtins.py:6209
3406
msgid "Delete all ignored files."
3409
# help of 'detritus' option of 'clean-tree' command
3410
#: bzrlib/builtins.py:6210
3412
"Delete conflict files, merge and revert backups, and failed selftest dirs."
3415
# help of 'unknown' option of 'clean-tree' command
3416
#: bzrlib/builtins.py:6213
3417
msgid "Delete files unknown to bzr (default)."
3420
# help of 'dry-run' option of 'clean-tree' command
3421
#: bzrlib/builtins.py:6214
3422
msgid "Show files to delete instead of deleting them."
3425
# help of 'force' option of 'clean-tree' command
3426
#: bzrlib/builtins.py:6216
3427
msgid "Do not prompt before deleting."
3430
#: bzrlib/cmd_version_info.py:50
3431
msgid "Show version information about this tree."
3434
#: bzrlib/cmd_version_info.py:52
3436
"You can use this command to add information about version into\n"
3437
"source code of an application. The output can be in one of the\n"
3438
"supported formats or in a custom format based on a template."
3441
#: bzrlib/cmd_version_info.py:56
3442
msgid "For example::"
3445
#: bzrlib/cmd_version_info.py:58
3447
" bzr version-info --custom \\\n"
3448
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
3451
#: bzrlib/cmd_version_info.py:61
3453
"will produce a C header file with formatted string containing the\n"
3454
"current revision number. Other supported variables in templates are:"
3457
#: bzrlib/cmd_version_info.py:64
3459
" * {date} - date of the last revision\n"
3460
" * {build_date} - current date\n"
3461
" * {revno} - revision number\n"
3462
" * {revision_id} - revision id\n"
3463
" * {branch_nick} - branch nickname\n"
3464
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
3468
# help of 'format' option of 'version-info' command
3469
#: bzrlib/cmd_version_info.py:74
3470
msgid "Select the output format."
3473
# help of 'all' option of 'version-info' command
3474
#: bzrlib/cmd_version_info.py:78
3475
msgid "Include all possible information."
3478
# help of 'check-clean' option of 'version-info' command
3479
#: bzrlib/cmd_version_info.py:79
3480
msgid "Check if tree is clean."
3483
# help of 'include-history' option of 'version-info' command
3484
#: bzrlib/cmd_version_info.py:81
3485
msgid "Include the revision-history."
3488
# help of 'include-file-revisions' option of 'version-info' command
3489
#: bzrlib/cmd_version_info.py:83
3490
msgid "Include the last revision for each file."
3493
# help of 'template' option of 'version-info' command
3494
#: bzrlib/cmd_version_info.py:84
3495
msgid "Template for the output."
3498
#: bzrlib/commands.py:479
3499
msgid "No help for this command."
3502
#: bzrlib/commands.py:492
3504
msgid ":Purpose: %s\n"
3507
#: bzrlib/commands.py:494
3514
#: bzrlib/commands.py:496
3516
msgid ":Usage: %s\n"
3519
#: bzrlib/commands.py:515
3524
#: bzrlib/commands.py:526
3532
#: bzrlib/commands.py:536
3535
"See bzr help %s for more details and examples.\n"
3539
#: bzrlib/commands.py:541
3543
#: bzrlib/commands.py:545
3545
msgid ":From: plugin \"%s\"\n"
3548
#: bzrlib/commands.py:557
3550
msgid ":doc:`%s <%s-help>`"
3553
#: bzrlib/commands.py:560
3555
msgid ":See also: %s"
3558
#: bzrlib/commit_signature_commands.py:34
3559
msgid "Sign all commits by a given committer."
3562
#: bzrlib/commit_signature_commands.py:36
3564
"If location is not specified the local tree is used.\n"
3565
"If committer is not specified the default committer is used."
3568
#: bzrlib/commit_signature_commands.py:39
3569
msgid "This does not sign commits that already have signatures."
3572
# help of 'dry-run' option of 'sign-my-commits' command
3573
#: bzrlib/commit_signature_commands.py:47
3575
"Don't actually sign anything, just print the revisions that would be signed."
3578
#: bzrlib/commit_signature_commands.py:101
3579
msgid "Verify all commit signatures."
3582
#: bzrlib/commit_signature_commands.py:103
3583
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
3586
# help of 'acceptable-keys' option of 'verify-signatures' command
3587
#: bzrlib/commit_signature_commands.py:108
3589
"Comma separated list of GPG key patterns which are acceptable for "
3593
#: bzrlib/commit_signature_commands.py:166
3594
msgid "All commits signed with verifiable keys"
3597
#: bzrlib/config.py:3118
3598
msgid "Display, set or remove a configuration option."
3601
#: bzrlib/config.py:3120
3602
msgid "Display the active value for a given option."
3605
#: bzrlib/config.py:3122
3607
"If --all is specified, NAME is interpreted as a regular expression and all\n"
3608
"matching options are displayed mentioning their scope. The active value\n"
3609
"that bzr will take into account is the first one displayed for each option."
3612
#: bzrlib/config.py:3126
3613
msgid "If no NAME is given, --all .* is implied."
3616
#: bzrlib/config.py:3128
3618
"Setting a value is achieved by using name=value without spaces. The value\n"
3619
"is set in the most relevant scope and can be checked by displaying the\n"
3623
# help of 'scope' option of 'config' command
3624
#: bzrlib/config.py:3139
3625
msgid "Reduce the scope to the specified configuration file"
3628
# help of 'all' option of 'config' command
3629
#: bzrlib/config.py:3143
3630
msgid "Display all the defined values for the matching options."
3633
# help of 'remove' option of 'config' command
3634
#: bzrlib/config.py:3145
3635
msgid "Remove the option from the configuration file"
3638
#: bzrlib/conflicts.py:47
3639
msgid "List files with conflicts."
3642
#: bzrlib/conflicts.py:49
3644
"Merge will do its best to combine the changes in two branches, but there\n"
3645
"are some kinds of problems only a human can fix. When it encounters those,\n"
3646
"it will mark a conflict. A conflict means that you need to fix something,\n"
3647
"before you should commit."
3650
#: bzrlib/conflicts.py:54
3652
"Conflicts normally are listed as short, human-readable messages. If --text\n"
3653
"is supplied, the pathnames of files with text conflicts are listed,\n"
3654
"instead. (This is useful for editing all files with text conflicts.)"
3657
#: bzrlib/conflicts.py:58
3658
msgid "Use bzr resolve when you have fixed a problem."
3661
# help of 'text' option of 'conflicts' command
3662
#: bzrlib/conflicts.py:63
3663
msgid "List paths of files with text conflicts."
3666
# help of 'action' option of 'resolve' command
3667
#: bzrlib/conflicts.py:95
3668
msgid "How to resolve the conflict."
3671
#: bzrlib/conflicts.py:101
3672
msgid "Mark a conflict as resolved."
3675
#: bzrlib/conflicts.py:108
3677
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
3678
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
3680
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
3683
# help of 'all' option of 'resolve' command
3684
#: bzrlib/conflicts.py:116
3685
msgid "Resolve all conflicts in this tree."
3688
# title of 'action' option of 'resolve' command
3689
#: bzrlib/conflicts.py:688
3693
#: bzrlib/errors.py:208
3694
msgid "The tree builder is already building a tree."
3697
#: bzrlib/errors.py:229
3698
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
3701
#: bzrlib/errors.py:248
3703
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
3704
"versions \"%(minimum)s\" to \"%(current)s\"."
3707
#: bzrlib/errors.py:260
3708
msgid "The transport '%(transport)s' is only accessible within this process."
3711
#: bzrlib/errors.py:278
3712
msgid "Invalid revision number %(revno)s"
3715
#: bzrlib/errors.py:287
3716
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
3719
#: bzrlib/errors.py:298
3720
msgid "Reserved revision-id {%(revision_id)s}"
3723
#: bzrlib/errors.py:312
3724
msgid "There is no public branch set for \"%(branch_url)s\"."
3727
#: bzrlib/errors.py:322
3729
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
3730
"obtain a list of topics."
3733
#: bzrlib/errors.py:331
3734
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
3737
#: bzrlib/errors.py:341
3739
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
3742
#: bzrlib/errors.py:350
3743
msgid "The branch '%(branch)s' is not stacked."
3746
#: bzrlib/errors.py:364
3747
msgid "No WorkingTree exists for \"%(base)s\"."
3750
#: bzrlib/errors.py:373
3751
msgid "Not currently building a tree."
3754
#: bzrlib/errors.py:378
3755
msgid "%(url)s is not a local path."
3758
#: bzrlib/errors.py:406
3759
msgid "%(not_locked)r is not write locked but needs to be."
3762
#: bzrlib/errors.py:414
3763
msgid "Error in command line options"
3766
#: bzrlib/errors.py:419
3767
msgid "%(value)s is not an index of type %(_type)s."
3770
#: bzrlib/errors.py:429
3771
msgid "Error in data for index %(value)s."
3774
#: bzrlib/errors.py:438
3775
msgid "The key '%(key)s' is already in index '%(index)s'."
3778
#: bzrlib/errors.py:448
3779
msgid "The key '%(key)s' is not a valid key."
3782
#: bzrlib/errors.py:457
3783
msgid "Could not parse options for index %(value)s."
3786
#: bzrlib/errors.py:466
3787
msgid "The value '%(value)s' is not a valid value."
3790
#: bzrlib/errors.py:494
3791
msgid "Generic path error: %(path)r%(extra)s)"
3794
#: bzrlib/errors.py:507
3795
msgid "No such file: %(path)r%(extra)s"
3798
#: bzrlib/errors.py:512
3799
msgid "File exists: %(path)r%(extra)s"
3802
#: bzrlib/errors.py:518
3804
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
3805
"after to tell bzr about a rename that has already happened)%(extra)s"
3808
#: bzrlib/errors.py:534
3809
msgid "\"%(path)s\" is not a directory %(extra)s"
3812
#: bzrlib/errors.py:539
3813
msgid "\"%(path)s\" is not in the working directory %(extra)s"
3816
#: bzrlib/errors.py:544
3817
msgid "Directory not empty: \"%(path)s\"%(extra)s"
3820
#: bzrlib/errors.py:549
3821
msgid "Hard-linking \"%(path)s\" is not supported"
3824
#: bzrlib/errors.py:564
3825
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
3828
#: bzrlib/errors.py:569
3829
msgid "Permission denied: \"%(path)s\"%(extra)s"
3832
#: bzrlib/errors.py:574
3833
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
3836
#: bzrlib/errors.py:579
3837
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
3840
#: bzrlib/errors.py:590
3841
msgid "URLs differ by more than path: %(from_)r and %(to)r"
3844
#: bzrlib/errors.py:612
3845
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
3848
#: bzrlib/errors.py:622
3849
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
3852
#: bzrlib/errors.py:630
3854
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
3855
"upgrade the branch to permit branch stacking."
3858
#: bzrlib/errors.py:641
3859
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
3862
#: bzrlib/errors.py:651
3864
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
3865
"need to upgrade the repository to permit branch stacking."
3868
#: bzrlib/errors.py:662
3869
msgid "Error reading from %(path)r."
3872
#: bzrlib/errors.py:681
3873
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
3876
#: bzrlib/errors.py:697
3877
msgid "Path \"%(path)s\" is not unicode normalized"
3880
#: bzrlib/errors.py:705
3881
msgid "Not a branch: \"%(path)s\"%(detail)s."
3884
#: bzrlib/errors.py:747
3885
msgid "No submit branch available for branch \"%(path)s\""
3888
#: bzrlib/errors.py:756
3889
msgid "Already a branch: \"%(path)s\"."
3892
#: bzrlib/errors.py:762
3894
"Directory contains a branch, but no working tree (use bzr checkout if you "
3895
"wish to build a working tree): \"%(path)s\""
3898
#: bzrlib/errors.py:767
3900
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
3903
#: bzrlib/errors.py:777
3905
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
3908
#: bzrlib/errors.py:787
3909
msgid "No repository present: \"%(path)s\""
3912
#: bzrlib/errors.py:795
3913
msgid "File \"%(path)s\" is not in branch %(branch_base)s."
3916
#: bzrlib/errors.py:807
3918
"Unsupported branch format: %(format)s\n"
3919
"Please run 'bzr upgrade'"
3922
#: bzrlib/errors.py:813
3923
msgid "Unknown %(kind)s format: %(format)r"
3926
#: bzrlib/errors.py:822
3927
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
3930
#: bzrlib/errors.py:835
3933
"is not compatible with\n"
3938
#: bzrlib/errors.py:851
3939
msgid "Revision is not compatible with %(repo_format)s"
3942
#: bzrlib/errors.py:861
3943
msgid "%(context_info)s%(path)s is already versioned."
3946
#: bzrlib/errors.py:882
3947
msgid "%(context_info)s%(path)s is not versioned."
3950
#: bzrlib/errors.py:903
3951
msgid "Path(s) are not versioned: %(paths_as_string)s"
3954
#: bzrlib/errors.py:914
3955
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
3958
#: bzrlib/errors.py:933
3959
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
3962
#: bzrlib/errors.py:941
3964
"Filename %(filename)r is not valid in your current filesystem encoding "
3968
#: bzrlib/errors.py:952
3969
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
3972
#: bzrlib/errors.py:970
3973
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
3976
#: bzrlib/errors.py:1009
3977
msgid "Cannot lock %(lock)s: %(why)s"
3980
#: bzrlib/errors.py:1019
3982
"A transaction related operation was attempted after the transaction finished."
3985
#: bzrlib/errors.py:1046
3986
msgid "Cannot lock: transport is read only: %(transport)s"
3989
#: bzrlib/errors.py:1054
3990
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
3993
#: bzrlib/errors.py:1065
3994
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
3997
#: bzrlib/errors.py:1076
3999
"Lock was released and re-acquired before being broken: %(lock)s: held by "
4000
"%(holder)r, wanted to break %(target)r"
4003
#: bzrlib/errors.py:1088
4005
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
4006
"Use 'bzr break-lock' to clear it"
4009
#: bzrlib/errors.py:1101
4010
msgid "Lock not held: %(lock)s"
4013
#: bzrlib/errors.py:1130
4014
msgid "No changes to commit"
4017
#: bzrlib/errors.py:1135
4019
"Selected-file commit of merges is not supported yet: files %(files_str)s"
4022
#: bzrlib/errors.py:1145
4024
"Excluding paths during commit is not supported by repository at %(repository)"
4028
#: bzrlib/errors.py:1154
4030
"The specified commit message contains characters unsupported by the current "
4034
#: bzrlib/errors.py:1160
4035
msgid "Upgrade URL cannot work with readonly URLs."
4038
#: bzrlib/errors.py:1165
4039
msgid "The branch format %(format)s is already at the most recent format."
4042
#: bzrlib/errors.py:1188
4043
msgid "Option --change does not accept revision ranges"
4046
#: bzrlib/errors.py:1193
4047
msgid "No namespace registered for string: %(spec)r"
4050
#: bzrlib/errors.py:1212
4052
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
4056
#: bzrlib/errors.py:1226
4057
msgid "%(branch)s is missing %(object_type)s {%(object_id)s}"
4060
#: bzrlib/errors.py:1231
4062
"Operation denied because it would change the main history, which is not "
4063
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
4066
#: bzrlib/errors.py:1242
4068
"These branches have diverged. Use the missing command to see how.\n"
4069
"Use the merge command to reconcile them."
4072
#: bzrlib/errors.py:1262
4074
"Branches have no common ancestor, and no merge base revision was specified."
4077
#: bzrlib/errors.py:1268
4079
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
4082
#: bzrlib/errors.py:1274
4083
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
4086
#: bzrlib/errors.py:1283
4088
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
4091
#: bzrlib/errors.py:1292
4092
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
4095
#: bzrlib/errors.py:1312
4096
msgid "Branch %(branch)s has no commits."
4099
#: bzrlib/errors.py:1330
4101
"Bound branch %(branch)s is out of date with master branch %(master)s."
4105
#: bzrlib/errors.py:1342
4107
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
4108
"bound to %(remote)s."
4111
#: bzrlib/errors.py:1354
4112
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
4115
#: bzrlib/errors.py:1363
4117
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
4121
#: bzrlib/errors.py:1375
4122
msgid "Error in processing weave: %(msg)s"
4125
#: bzrlib/errors.py:1384
4126
msgid "Revision {%(revision_id)s} already present in %(weave)s"
4129
#: bzrlib/errors.py:1395
4130
msgid "Revision {%(revision_id)s} not present in %(weave)s"
4133
#: bzrlib/errors.py:1405
4134
msgid "Weave invariant violated: %(what)s"
4137
#: bzrlib/errors.py:1414
4138
msgid "Parents are mismatched between two revisions. %(msg)s"
4141
#: bzrlib/errors.py:1436
4143
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
4147
#: bzrlib/errors.py:1448
4148
msgid "Versioned file error"
4151
#: bzrlib/errors.py:1453
4152
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
4155
#: bzrlib/errors.py:1463
4156
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
4159
#: bzrlib/errors.py:1473
4160
msgid "Text did not match its checksum: %(msg)s"
4163
#: bzrlib/errors.py:1598
4164
msgid "Export format %(format)r not supported"
4167
#: bzrlib/errors.py:1607
4168
msgid "Transport error: %(msg)s %(orig_error)s"
4171
#: bzrlib/errors.py:1633
4172
msgid "Generic bzr smart protocol error: %(details)s"
4175
#: bzrlib/errors.py:1641
4176
msgid "Received bad protocol version marker: %(marker)r"
4179
#: bzrlib/errors.py:1672
4180
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
4183
#: bzrlib/errors.py:1677
4184
msgid "Connection error: %(msg)s %(orig_error)s"
4187
#: bzrlib/errors.py:1682
4188
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
4191
#: bzrlib/errors.py:1703
4192
msgid "Connection closed: %(msg)s %(orig_error)s"
4195
#: bzrlib/errors.py:1708
4196
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
4199
#: bzrlib/errors.py:1718
4200
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
4203
#: bzrlib/errors.py:1733
4204
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
4207
#: bzrlib/errors.py:1747
4208
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
4211
#: bzrlib/errors.py:1755
4212
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
4215
#: bzrlib/errors.py:1764
4216
msgid "%(source)s is%(permanently)s redirected to %(target)s"
4219
#: bzrlib/errors.py:1778
4220
msgid "Too many redirections"
4223
#: bzrlib/errors.py:1783
4224
msgid "Working tree has conflicts."
4227
#: bzrlib/errors.py:1787
4228
msgid "Config file %(filename)s is not UTF-8 encoded\n"
4231
#: bzrlib/errors.py:1796
4233
"Error(s) parsing config file %(filename)s:\n"
4237
#: bzrlib/errors.py:1807
4238
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
4241
#: bzrlib/errors.py:1815
4242
msgid "%(username)r does not seem to contain a reasonable email address"
4245
#: bzrlib/errors.py:1824
4246
msgid "Failed to GPG sign data with command \"%(command_line)s\""
4249
#: bzrlib/errors.py:1832
4250
msgid "Failed to verify GPG signature data with error \"%(error)s\""
4253
#: bzrlib/errors.py:1840
4254
msgid "Unable to import library \"%(library)s\": %(error)s"
4257
#: bzrlib/errors.py:1848
4258
msgid "python-gpgme is not installed, it is needed to verify signatures"
4261
#: bzrlib/errors.py:1856
4263
"The working tree for %(basedir)s has changed since the last commit, but "
4264
"weave merge requires that it be unchanged"
4267
#: bzrlib/errors.py:1866
4269
"Can't reprocess and show base, because reprocessing obscures the "
4270
"relationship of conflicting lines to the base"
4273
#: bzrlib/errors.py:1872
4274
msgid "Cycle in graph %(graph)r"
4277
#: bzrlib/errors.py:1900
4278
msgid "File %(filename)s is not conflicted."
4281
#: bzrlib/errors.py:1922
4282
msgid "No bundle was found in \"%(filename)s\"."
4285
#: bzrlib/errors.py:1931
4286
msgid "Unable to handle bundle version %(version)s: %(msg)s"
4289
#: bzrlib/errors.py:1941
4290
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
4293
#: bzrlib/errors.py:1954
4294
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
4297
#: bzrlib/errors.py:1964
4298
msgid "Key %(key)s is already present in map"
4301
#: bzrlib/errors.py:1969
4302
msgid "The prefix %(prefix)s is in the help search path twice."
4305
#: bzrlib/errors.py:1977
4306
msgid "Tree transform is malformed %(conflicts)r"
4309
#: bzrlib/errors.py:1979
4311
"No final name for trans_id %(trans_id)r\n"
4312
"file-id: %(file_id)r\n"
4313
"root trans-id: %(root_trans_id)r\n"
4316
#: bzrlib/errors.py:2011
4317
msgid "Attempt to reuse a transform that has already been applied."
4320
#: bzrlib/errors.py:2016
4321
msgid "Moving the root directory is not supported at this time"
4324
#: bzrlib/errors.py:2021
4325
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
4328
#: bzrlib/errors.py:2032
4330
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
4333
#: bzrlib/errors.py:2068
4335
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
4338
#: bzrlib/errors.py:2077
4340
"Can't safely remove modified or unknown files:\n"
4341
"%(changes_as_text)sUse --keep to not delete them, or --force to delete them "
4345
#: bzrlib/errors.py:2114
4346
msgid "Unable to import paramiko (required for sftp support): %(error)s"
4349
#: bzrlib/errors.py:2122
4350
msgid "Nothing to merge."
4353
#: bzrlib/errors.py:2127
4354
msgid "Format %(format)s cannot be initialised by this version of bzr."
4357
#: bzrlib/errors.py:2136
4359
"Cannot convert from format %(from_format)s to format %(format)s. "
4363
#: bzrlib/errors.py:2148
4364
msgid "Could not find an appropriate Differ for file \"%(path)s\""
4367
#: bzrlib/errors.py:2156
4368
msgid "%(exe_name)s could not be found on this machine"
4371
#: bzrlib/errors.py:2164
4372
msgid "Diff is not installed on this machine: %(msg)s"
4375
#: bzrlib/errors.py:2172
4376
msgid "Diff3 is not installed on this machine."
4379
#: bzrlib/errors.py:2178
4380
msgid "The content being inserted is already present."
4383
#: bzrlib/errors.py:2183
4385
"This tree contains left-over files from a failed operation.\n"
4386
" Please examine %(limbo_dir)s to see if it contains any files you wish "
4388
" keep, and delete it when you are done."
4391
#: bzrlib/errors.py:2194
4393
"This tree contains left-over files from a failed operation.\n"
4394
" Please examine %(pending_deletion)s to see if it contains any files you\n"
4395
" wish to keep, and delete it when you are done."
4398
#: bzrlib/errors.py:2204
4400
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
4401
" Please examine %(limbo_dir)s to see if it contains any files you wish "
4403
" keep, and delete it when you are done."
4406
#: bzrlib/errors.py:2215
4408
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
4409
"examine %(pending_deletion)s to see if it contains any files you wish to "
4410
"keep, and delete it when you are done."
4413
#: bzrlib/errors.py:2225
4414
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
4417
#: bzrlib/errors.py:2239
4418
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
4421
#: bzrlib/errors.py:2252
4422
msgid "Error in merge modified format"
4425
#: bzrlib/errors.py:2257
4426
msgid "Format error in conflict listings"
4429
#: bzrlib/errors.py:2261
4431
"Inconsistency in dirstate file %(dirstate_path)s.\n"
4432
"Error: %(description)s"
4435
#: bzrlib/errors.py:2272
4437
"An error has been detected in the repository %(repo_path)s.\n"
4438
"Please run bzr reconcile on this repository."
4441
#: bzrlib/errors.py:2283
4443
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
4444
"reason: %(reason)s"
4447
#: bzrlib/errors.py:2296
4449
"An inconsistent delta was supplied: %(delta)r\n"
4450
"reason: %(reason)s"
4453
#: bzrlib/errors.py:2308
4454
msgid "To use this feature you must upgrade your branch at %(path)s."
4457
#: bzrlib/errors.py:2317
4458
msgid "To use this feature you must upgrade your repository at %(path)s."
4461
#: bzrlib/errors.py:2322
4463
"To use this feature you must upgrade your branch at %(path)s to a format "
4464
"which supports rich roots."
4467
#: bzrlib/errors.py:2328
4468
msgid "Cannot perform local-only commits on unbound branches."
4471
#: bzrlib/errors.py:2333
4472
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
4475
#: bzrlib/errors.py:2354
4476
msgid "File is binary but should be text."
4479
#: bzrlib/errors.py:2359
4480
msgid "The path %(path)s is not permitted on this platform"
4483
#: bzrlib/errors.py:2368
4485
"Testament did not match expected value.\n"
4486
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
4490
#: bzrlib/errors.py:2380
4491
msgid "Not a bzr revision-bundle: %(text)r"
4494
#: bzrlib/errors.py:2389
4495
msgid "Bad bzr revision-bundle: %(text)r"
4498
#: bzrlib/errors.py:2398
4499
msgid "Malformed bzr revision-bundle header: %(text)r"
4502
#: bzrlib/errors.py:2403
4503
msgid "Malformed patches in bzr revision-bundle: %(text)r"
4506
#: bzrlib/errors.py:2408
4507
msgid "Malformed footer in bzr revision-bundle: %(text)r"
4510
#: bzrlib/errors.py:2413
4511
msgid "End of line marker was not \\n in bzr revision-bundle"
4514
#: bzrlib/errors.py:2423
4515
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
4518
#: bzrlib/errors.py:2433
4519
msgid "Root class for inventory serialization errors"
4522
#: bzrlib/errors.py:2437
4524
"The inventory was not in the expected format:\n"
4528
#: bzrlib/errors.py:2446
4529
msgid "This operation requires rich root data storage"
4532
#: bzrlib/errors.py:2459
4533
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
4536
#: bzrlib/errors.py:2468
4538
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
4542
#: bzrlib/errors.py:2475
4544
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
4545
"ghost at {%(ghost_revision_id)s}"
4548
#: bzrlib/errors.py:2485
4549
msgid "Ghost revision {%(revision_id)s} cannot be used here."
4552
#: bzrlib/errors.py:2536
4554
"A merge directive must provide either a bundle or a public branch location."
4557
#: bzrlib/errors.py:2543
4558
msgid "Bad merge directive payload %(start)r"
4561
#: bzrlib/errors.py:2553
4562
msgid "Preview patch does not match requested changes."
4565
#: bzrlib/errors.py:2559
4566
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
4569
#: bzrlib/errors.py:2569
4571
"Your branch does not have all of the revisions required in order to merge "
4572
"this merge directive and the target location specified in the merge "
4573
"directive is not a branch: %(location)s."
4576
#: bzrlib/errors.py:2581
4577
msgid "Unsupported entry kind %(kind)s"
4580
#: bzrlib/errors.py:2589
4581
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
4584
#: bzrlib/errors.py:2599
4585
msgid "Subsume target %(other_tree)s needs to be upgraded."
4588
#: bzrlib/errors.py:2618
4589
msgid "No such tag: %(tag_name)s"
4592
#: bzrlib/errors.py:2626
4593
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
4596
#: bzrlib/errors.py:2635
4597
msgid "Tag %(tag_name)s already exists."
4600
#: bzrlib/errors.py:2643
4602
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
4603
"\" for more information on this feature."
4606
#: bzrlib/errors.py:2653
4608
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
4611
#: bzrlib/errors.py:2663
4613
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
4616
#: bzrlib/errors.py:2673
4617
msgid "Invalid line in bugs property: '%(line)s'"
4620
#: bzrlib/errors.py:2681
4621
msgid "Invalid bug status: '%(status)s'"
4624
#: bzrlib/errors.py:2689
4625
msgid "Could not understand response from smart server: %(response_tuple)r"
4628
#: bzrlib/errors.py:2728
4629
msgid "Server sent an unexpected error: %(error_tuple)r"
4632
#: bzrlib/errors.py:2747
4633
msgid "Unrecognised container format: %(container_format)r"
4636
#: bzrlib/errors.py:2755
4637
msgid "Unexpected end of container stream"
4640
#: bzrlib/errors.py:2760
4641
msgid "Unknown record type: %(record_type)r"
4644
#: bzrlib/errors.py:2768
4645
msgid "Invalid record: %(reason)s"
4648
#: bzrlib/errors.py:2776
4649
msgid "Container has data after end marker: %(excess)r"
4652
#: bzrlib/errors.py:2784
4653
msgid "Container has multiple records with the same name: %(name)s"
4656
#: bzrlib/errors.py:2797
4657
msgid "Corrupt or incompatible data stream: %(reason)s"
4660
#: bzrlib/errors.py:2805
4661
msgid "SMTP error: %(error)s"
4664
#: bzrlib/errors.py:2813
4665
msgid "No message supplied."
4668
#: bzrlib/errors.py:2818
4669
msgid "No mail-to address (--mail-to) or output (-o) specified."
4672
#: bzrlib/errors.py:2823
4673
msgid "Unknown mail client: %(mail_client)s"
4676
#: bzrlib/errors.py:2831
4678
"Unable to find mail client with the following names: "
4679
"%(mail_command_list_string)s"
4682
#: bzrlib/errors.py:2841
4683
msgid "SMTP connection to %(host)s refused"
4686
#: bzrlib/errors.py:2850
4687
msgid "Please specify smtp_server. No server at default %(host)s."
4690
#: bzrlib/errors.py:2864
4692
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
4696
#: bzrlib/errors.py:2876
4697
msgid "'%(display_url)s' is already a branch."
4700
#: bzrlib/errors.py:2881
4701
msgid "'%(display_url)s' is already a tree."
4704
#: bzrlib/errors.py:2886
4705
msgid "'%(display_url)s' is already a checkout."
4708
#: bzrlib/errors.py:2891
4709
msgid "'%(display_url)s' is already a lightweight checkout."
4712
#: bzrlib/errors.py:2896
4713
msgid "'%(display_url)s' is already using a shared repository."
4716
#: bzrlib/errors.py:2901
4717
msgid "'%(display_url)s' is already standalone."
4720
#: bzrlib/errors.py:2906
4721
msgid "Shared repository '%(display_url)s' already creates working trees."
4724
#: bzrlib/errors.py:2912
4726
"Shared repository '%(display_url)s' already doesn't create working trees."
4729
#: bzrlib/errors.py:2918
4730
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
4733
#: bzrlib/errors.py:2923
4734
msgid "No location could be found to bind to at %(display_url)s."
4737
#: bzrlib/errors.py:2928
4739
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
4743
#: bzrlib/errors.py:2947
4745
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
4749
#: bzrlib/errors.py:2953
4750
msgid "Variable {%(name)s} is not available."
4753
#: bzrlib/errors.py:2961
4754
msgid "No template specified."
4757
#: bzrlib/errors.py:2966
4758
msgid "Unable to create symlink %(path_str)son this platform"
4761
#: bzrlib/errors.py:2981
4763
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
4767
#: bzrlib/errors.py:3015
4769
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
4772
#: bzrlib/errors.py:3027
4773
msgid "The \"%(config_id)s\" configuration does not exist."
4776
#: bzrlib/errors.py:3035
4777
msgid "The \"%(option_name)s\" configuration option does not exist."
4780
#: bzrlib/errors.py:3043
4781
msgid "The alias \"%(alias_name)s\" does not exist."
4784
#: bzrlib/errors.py:3057
4785
msgid "\"%(alias_name)s\" is not a valid location alias."
4788
#: bzrlib/errors.py:3065
4789
msgid "No %(alias_name)s location assigned."
4792
#: bzrlib/errors.py:3073
4793
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
4796
#: bzrlib/errors.py:3083
4797
msgid "Unknown rules detected: %(unknowns_str)s."
4800
#: bzrlib/errors.py:3096
4802
"Hook '%(hook_name)s' during %(hook_stage)s failed:\n"
4803
"%(traceback_text)s%(exc_value)s"
4806
#: bzrlib/errors.py:3119
4807
msgid "Tip change rejected: %(msg)s"
4810
#: bzrlib/errors.py:3127
4811
msgid "Shelf corrupt."
4814
#: bzrlib/errors.py:3132
4815
msgid "Corruption while decompressing repository file%(orig_error)s"
4818
#: bzrlib/errors.py:3144
4819
msgid "No changes are shelved with id \"%(shelf_id)d\"."
4822
#: bzrlib/errors.py:3152
4823
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
4826
#: bzrlib/errors.py:3160
4827
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
4830
#: bzrlib/errors.py:3168
4831
msgid "The user aborted the operation."
4834
#: bzrlib/errors.py:3173
4835
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
4838
#: bzrlib/errors.py:3183
4839
msgid "No such view: %(view_name)s."
4842
#: bzrlib/errors.py:3193
4844
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
4845
"to a later format."
4848
#: bzrlib/errors.py:3202
4850
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
4853
#: bzrlib/errors.py:3269
4854
msgid "%(bzrdir)r does not support co-located branches."
4857
#: bzrlib/errors.py:3275
4859
"Unable to determine your name.\n"
4860
"Please, set your name with the 'whoami' command.\n"
4861
"E.g. bzr whoami \"Your Name <name@example.com>\""
4864
#: bzrlib/errors.py:3284
4865
msgid "Invalid pattern(s) found. %(msg)s"
4868
#: bzrlib/errors.py:3292
4870
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
4874
#: bzrlib/errors.py:3303
4875
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
4878
#: bzrlib/errors.py:3312
4879
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
4882
#: bzrlib/errors.py:3321
4884
"No compatible object available for operations from %(source)r to %(target)r."
4887
#: bzrlib/gpg.py:126 bzrlib/gpg.py:464
4888
msgid "{0} commits with valid signatures"
4891
#: bzrlib/gpg.py:130 bzrlib/gpg.py:469
4892
msgid "{0} commit with unknown key"
4893
msgid_plural "{0} commits with unknown keys"
4897
#: bzrlib/gpg.py:136 bzrlib/gpg.py:476
4898
msgid "{0} commit not valid"
4899
msgid_plural "{0} commits not valid"
4903
#: bzrlib/gpg.py:142 bzrlib/gpg.py:483
4904
msgid "{0} commit not signed"
4905
msgid_plural "{0} commits not signed"
4909
#: bzrlib/gpg.py:148 bzrlib/gpg.py:490
4910
msgid "{0} commit with key now expired"
4911
msgid_plural "{0} commits with key now expired"
4915
#: bzrlib/gpg.py:346
4916
msgid "No GnuPG key results for pattern: {}"
4919
#: bzrlib/gpg.py:389
4920
msgid "{0} signed {1} commit"
4921
msgid_plural "{0} signed {1} commits"
4925
#: bzrlib/gpg.py:406 bzrlib/gpg.py:422
4926
msgid "{0} commit by author {1}"
4927
msgid_plural "{0} commits by author {1}"
4931
#: bzrlib/gpg.py:436
4932
msgid "Unknown key {0} signed {1} commit"
4933
msgid_plural "Unknown key {0} signed {1} commits"
4937
#: bzrlib/gpg.py:454
4938
msgid "{0} commit by author {1} with key {2} now expired"
4939
msgid_plural "{0} commits by author {1} with key {2} now expired"
4943
# help of 'help' option
4944
#: bzrlib/option.py:515
4945
msgid "Show help message."
4948
# help of 'usage' option
4949
#: bzrlib/option.py:517
4950
msgid "Show usage message and options."
4953
# help of 'verbose' option
4954
#: bzrlib/option.py:519
4955
msgid "Display more information."
4958
# help of 'quiet' option
4959
#: bzrlib/option.py:522
4960
msgid "Only display errors and warnings."
4963
# help of 'overwrite' option
4964
#: bzrlib/option.py:527
4965
msgid "Ignore differences between branches and overwrite unconditionally."
4968
# help of 'message' option
4969
#: bzrlib/option.py:538
4970
msgid "Message string."
4973
# help of 'null' option
4974
#: bzrlib/option.py:541
4975
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
4978
# help of 'profile' option
4979
#: bzrlib/option.py:544
4980
msgid "Show performance profiling information."
4983
# help of 'revision' option
4984
#: bzrlib/option.py:548
4985
msgid "See \"help revisionspec\" for details."
4988
# help of 'change' option
4989
#: bzrlib/option.py:553
4991
"Select changes introduced by the specified revision. See also \"help "
4995
# help of 'show-ids' option
4996
#: bzrlib/option.py:555
4997
msgid "Show internal object ids."
5000
# help of 'timezone' option
5001
#: bzrlib/option.py:558
5002
msgid "Display timezone as local, original, or utc."
5005
# help of 'log-format' option
5006
#: bzrlib/option.py:563
5007
msgid "Use specified log format."
5010
# title of 'log-format' option
5011
#: bzrlib/option.py:565
5015
# help of 'long' option
5016
#: bzrlib/option.py:567
5017
msgid "Use detailed log format. Same as --log-format long"
5020
# help of 'short' option
5021
#: bzrlib/option.py:569
5022
msgid "Use moderately short log format. Same as --log-format short"
5025
# help of 'line' option
5026
#: bzrlib/option.py:570
5027
msgid "Use log format with one line per revision. Same as --log-format line"
5030
# help of 'merge-type' option
5031
#: bzrlib/option.py:573
5032
msgid "Select a particular merge algorithm."
5035
# title of 'merge-type' option
5036
#: bzrlib/option.py:575
5037
msgid "Merge algorithm"
5040
# help of 'remember' option
5041
#: bzrlib/option.py:577
5042
msgid "Remember the specified location as a default."
5045
# help of 'reprocess' option
5046
#: bzrlib/option.py:579
5047
msgid "Reprocess to reduce spurious conflicts."
5050
# help of 'dry-run' option
5051
#: bzrlib/option.py:582
5052
msgid "Show what would be done, but don't actually do anything."
5055
# help of 'name-from-revision' option
5056
#: bzrlib/option.py:583
5057
msgid "The path name in the old tree."
5060
# help of 'directory' option
5061
#: bzrlib/option.py:585
5062
msgid "Branch to operate on, instead of working directory"
5065
# help of 'plugin' option of 'bash-completion' command
5066
#: bzrlib/plugins/bash_completion/bashcomp.py:407
5067
msgid "Enable completions for the selected plugin (default: all plugins)"
5070
#: bzrlib/plugins/bash_completion/bashcomp.py:409
5071
msgid "Generate a shell function for bash command line completion."
5074
#: bzrlib/plugins/bash_completion/bashcomp.py:411
5076
"This command generates a shell function which can be used by bash to\n"
5077
"automatically complete the currently typed command when the user presses\n"
5078
"the completion key (usually tab)."
5081
#: bzrlib/plugins/bash_completion/bashcomp.py:415
5083
"Commonly used like this:\n"
5084
" eval \"`bzr bash-completion`\""
5087
# help of 'function-name' option of 'bash-completion' command
5088
#: bzrlib/plugins/bash_completion/bashcomp.py:421
5089
msgid "Name of the generated function (default: _bzr)"
5092
# help of 'function-only' option of 'bash-completion' command
5093
#: bzrlib/plugins/bash_completion/bashcomp.py:423
5094
msgid "Generate only the shell function, don't enable it"
5097
#: bzrlib/plugins/launchpad/__init__.py:78
5098
msgid "Register a branch with launchpad.net."
5101
#: bzrlib/plugins/launchpad/__init__.py:80
5103
"This command lists a bzr branch in the directory of branches on\n"
5104
"launchpad.net. Registration allows the branch to be associated with\n"
5105
"bugs or specifications."
5108
#: bzrlib/plugins/launchpad/__init__.py:84
5110
"Before using this command you must register the project to which the\n"
5111
"branch belongs, and create an account for yourself on launchpad.net."
5114
#: bzrlib/plugins/launchpad/__init__.py:87
5117
" public_url: The publicly visible url for the branch to register.\n"
5118
" This must be an http or https url (which Launchpad can read\n"
5119
" from to access the branch). Local file urls, SFTP urls, and\n"
5120
" bzr+ssh urls will not work.\n"
5121
" If no public_url is provided, bzr will use the configured\n"
5122
" public_url if there is one for the current branch, and\n"
5126
#: bzrlib/plugins/launchpad/__init__.py:96
5129
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
5130
" --project fooproject"
5133
# help of 'project' option of 'register-branch' command
5134
#: bzrlib/plugins/launchpad/__init__.py:103
5135
msgid "Launchpad project short name to associate with the branch."
5138
# help of 'branch-name' option of 'register-branch' command
5139
#: bzrlib/plugins/launchpad/__init__.py:110
5141
"Short name for the branch; by default taken from the last component of the "
5145
# help of 'branch-title' option of 'register-branch' command
5146
#: bzrlib/plugins/launchpad/__init__.py:114
5147
msgid "One-sentence description of the branch."
5150
# help of 'branch-description' option of 'register-branch' command
5151
#: bzrlib/plugins/launchpad/__init__.py:117
5152
msgid "Longer description of the purpose or contents of the branch."
5155
# help of 'author' option of 'register-branch' command
5156
#: bzrlib/plugins/launchpad/__init__.py:120
5157
msgid "Branch author's email address, if not yourself."
5160
# help of 'link-bug' option of 'register-branch' command
5161
#: bzrlib/plugins/launchpad/__init__.py:123
5162
msgid "The bug this branch fixes."
5165
# help of 'dry-run' option of 'register-branch' command
5166
#: bzrlib/plugins/launchpad/__init__.py:126
5167
msgid "Prepare the request but don't actually send it."
5170
#: bzrlib/plugins/launchpad/__init__.py:186
5171
msgid "Open a Launchpad branch page in your web browser."
5174
# help of 'dry-run' option of 'launchpad-open' command
5175
#: bzrlib/plugins/launchpad/__init__.py:191
5176
msgid "Do not actually open the browser. Just say the URL we would use."
5179
#: bzrlib/plugins/launchpad/__init__.py:236
5180
msgid "Show or set the Launchpad user ID."
5183
#: bzrlib/plugins/launchpad/__init__.py:238
5185
"When communicating with Launchpad, some commands need to know your\n"
5186
"Launchpad user ID. This command can be used to set or show the\n"
5187
"user ID that Bazaar will use for such communication."
5190
#: bzrlib/plugins/launchpad/__init__.py:242
5193
" Show the Launchpad ID of the current user::"
5196
#: bzrlib/plugins/launchpad/__init__.py:245
5197
msgid " bzr launchpad-login"
5200
#: bzrlib/plugins/launchpad/__init__.py:247
5201
msgid " Set the Launchpad ID of the current user to 'bob'::"
5204
#: bzrlib/plugins/launchpad/__init__.py:249
5205
msgid " bzr launchpad-login bob"
5208
# help of 'no-check' option of 'launchpad-login' command
5209
#: bzrlib/plugins/launchpad/__init__.py:256
5210
msgid "Don't check that the user name is valid."
5213
#: bzrlib/plugins/launchpad/__init__.py:292
5214
msgid "Ask Launchpad to mirror a branch now."
5217
#: bzrlib/plugins/launchpad/__init__.py:312
5218
msgid "Propose merging a branch on Launchpad."
5221
#: bzrlib/plugins/launchpad/__init__.py:314
5223
"This will open your usual editor to provide the initial comment. When it\n"
5224
"has created the proposal, it will open it in your default web browser."
5227
#: bzrlib/plugins/launchpad/__init__.py:317
5229
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
5230
"is not supplied, the remembered submit branch will be used. If no submit\n"
5231
"branch is remembered, the development focus will be used."
5234
#: bzrlib/plugins/launchpad/__init__.py:321
5236
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
5237
"the merge proposal. This can be overriden by specifying --review (-R).\n"
5238
"The parameter the launchpad account name of the desired reviewer. This\n"
5239
"may optionally be followed by '=' and the review type. For example:"
5242
#: bzrlib/plugins/launchpad/__init__.py:326
5243
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
5246
#: bzrlib/plugins/launchpad/__init__.py:328
5248
"This will propose a merge, request \"jrandom\" to perform a review of\n"
5249
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
5252
# help of 'staging' option of 'lp-propose-merge' command
5253
#: bzrlib/plugins/launchpad/__init__.py:333
5254
msgid "Propose the merge on staging."
5257
# help of 'message' option of 'lp-propose-merge' command
5258
#: bzrlib/plugins/launchpad/__init__.py:335
5259
msgid "Commit message."
5262
# help of 'approve' option of 'lp-propose-merge' command
5263
#: bzrlib/plugins/launchpad/__init__.py:337
5264
msgid "Mark the proposal as approved immediately."
5267
# help of 'review' option of 'lp-propose-merge' command
5268
#: bzrlib/plugins/launchpad/__init__.py:339
5269
msgid "Requested reviewer and optional type."
5272
#: bzrlib/plugins/launchpad/__init__.py:376
5273
msgid "Find the proposal to merge this revision."
5276
#: bzrlib/plugins/launchpad/__init__.py:378
5278
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
5279
"This works only if the selected branch was the merge proposal target, and\n"
5280
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
5281
"are opened in a web browser."
5284
#: bzrlib/plugins/launchpad/__init__.py:383
5286
"Any revision involved in the merge may be specified-- the revision in\n"
5287
"which the merge was performed, or one of the revisions that was merged."
5290
#: bzrlib/plugins/launchpad/__init__.py:386
5291
msgid "So, to find the merge proposal that reviewed line 1 of README::"
5294
#: bzrlib/plugins/launchpad/__init__.py:388
5295
msgid " bzr lp-find-proposal -r annotate:README:1"
added
removed
po/bzr.pot
