Merge lp:~jelmer/brz/alpha2 into lp:brz

Proposed by Jelmer Vernooij on 2018-11-17
Status: Merged
Approved by: Jelmer Vernooij on 2018-11-17
Approved revision: 7187
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/alpha2
Merge into: lp:brz
Diff against target: 12767 lines (+2989/-2733)
3 files modified
breezy/__init__.py (+1/-1)
doc/developers/releasing.txt (+1/-1)
po/brz.pot (+2987/-2731)
To merge this branch: bzr merge lp:~jelmer/brz/alpha2
Reviewer Review Type Date Requested Status
Martin Packman 2018-11-17 Approve on 2018-11-17
Review via email: mp+358948@code.launchpad.net

Commit message

Release 3.0.0 alpha 2.

Description of the change

Release 3.0.0 alpha 2.

To post a comment you must log in.
Martin Packman (gz) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/__init__.py'
2--- breezy/__init__.py 2018-11-16 19:09:31 +0000
3+++ breezy/__init__.py 2018-11-17 19:35:08 +0000
4@@ -51,7 +51,7 @@
5 # Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
6 # releaselevel of 'dev' for unreleased under-development code.
7
8-version_info = (3, 0, 0, 'alpha', 1)
9+version_info = (3, 0, 0, 'alpha', 2)
10
11
12 def _format_version_tuple(version_info):
13
14=== modified file 'doc/developers/releasing.txt'
15--- doc/developers/releasing.txt 2018-09-16 12:41:42 +0000
16+++ doc/developers/releasing.txt 2018-11-17 19:35:08 +0000
17@@ -183,7 +183,7 @@
18 - upload a tarball to launchpad,
19 - upload a tarball to pypi,
20 - mail bazaar@lists.canonical.com,
21-- post an annoucement on the home page.
22+- post an announcement on the home page.
23
24 Uploading tarballs are described below, just use alpha versions (3, 0, 0,
25 'alpha', 1) in ``./breezy/__init__.py``
26
27=== modified file 'po/brz.pot'
28--- po/brz.pot 2017-05-21 18:10:28 +0000
29+++ po/brz.pot 2018-11-17 19:35:08 +0000
30@@ -8,7 +8,7 @@
31 msgstr ""
32 "Project-Id-Version: brz\n"
33 "Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
34-"POT-Creation-Date: 2017-05-21 14:44+0000\n"
35+"POT-Creation-Date: 2018-11-17 19:23+0000\n"
36 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
37 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
38 "Language-Team: LANGUAGE <LL@li.org>\n"
39@@ -18,79 +18,164 @@
40 "Content-Transfer-Encoding: 8bit\n"
41 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
42
43-#: breezy/add.py:93
44+#: breezy/add.py:95
45 #, python-brace-format
46 msgid "skipping {0} (larger than {1} of {2} bytes)"
47 msgstr ""
48
49-#: breezy/branch.py:872
50+#: breezy/bisect.py:266
51+msgid "Find an interesting commit using a binary search."
52+msgstr ""
53+
54+#: breezy/bisect.py:268
55+msgid ""
56+"Bisecting, in a nutshell, is a way to find the commit at which\n"
57+"some testable change was made, such as the introduction of a bug\n"
58+"or feature. By identifying a version which did not have the\n"
59+"interesting change and a later version which did, a developer\n"
60+"can test for the presence of the change at various points in\n"
61+"the history, eventually ending up at the precise commit when\n"
62+"the change was first introduced."
63+msgstr ""
64+
65+#: breezy/bisect.py:276
66+msgid ""
67+"This command uses subcommands to implement the search, each\n"
68+"of which changes the state of the bisection. The\n"
69+"subcommands are:"
70+msgstr ""
71+
72+#: breezy/bisect.py:280
73+msgid ""
74+"brz bisect start\n"
75+" Start a bisect, possibly clearing out a previous bisect."
76+msgstr ""
77+
78+#: breezy/bisect.py:283
79+msgid ""
80+"brz bisect yes [-r rev]\n"
81+" The specified revision (or the current revision, if not given)\n"
82+" has the characteristic we're looking for,"
83+msgstr ""
84+
85+#: breezy/bisect.py:287
86+msgid ""
87+"brz bisect no [-r rev]\n"
88+" The specified revision (or the current revision, if not given)\n"
89+" does not have the characteristic we're looking for,"
90+msgstr ""
91+
92+#: breezy/bisect.py:291
93+msgid ""
94+"brz bisect move -r rev\n"
95+" Switch to a different revision manually. Use if the bisect\n"
96+" algorithm chooses a revision that is not suitable. Try to\n"
97+" move as little as possible."
98+msgstr ""
99+
100+#: breezy/bisect.py:296
101+msgid ""
102+"brz bisect reset\n"
103+" Clear out a bisection in progress."
104+msgstr ""
105+
106+#: breezy/bisect.py:299
107+msgid ""
108+"brz bisect log [-o file]\n"
109+" Output a log of the current bisection to standard output, or\n"
110+" to the specified file."
111+msgstr ""
112+
113+#: breezy/bisect.py:303
114+msgid ""
115+"brz bisect replay <logfile>\n"
116+" Replay a previously-saved bisect log, forgetting any bisection\n"
117+" that might be in progress."
118+msgstr ""
119+
120+#: breezy/bisect.py:307
121+msgid ""
122+"brz bisect run <script>\n"
123+" Bisect automatically using <script> to determine 'yes' or 'no'.\n"
124+" <script> should exit with:\n"
125+" 0 for yes\n"
126+" 125 for unknown (like build failed so we could not test)\n"
127+" anything else for no"
128+msgstr ""
129+
130+# help of 'output' option of 'bisect' command
131+#: breezy/bisect.py:317
132+msgid "Write log to this file."
133+msgstr ""
134+
135+#: breezy/branch.py:832
136 msgid "Unstacking"
137 msgstr ""
138
139-#: breezy/branch.py:3012
140+#: breezy/branch.py:2021
141 #, python-format
142 msgid "Pushed up to revision %d."
143 msgstr ""
144
145-#: breezy/branch.py:3014
146+#: breezy/branch.py:2023
147 #, python-format
148 msgid "%d tag updated."
149 msgid_plural "%d tags updated."
150 msgstr[0] ""
151 msgstr[1] ""
152
153-#: breezy/branch.py:3017
154+#: breezy/branch.py:2027
155 msgid "No new revisions or tags to push."
156 msgstr ""
157
158-#: breezy/branch.py:3019
159+#: breezy/branch.py:2029
160 msgid "No new revisions to push."
161 msgstr ""
162
163-#: breezy/branch.py:3039
164+#: breezy/branch.py:2049
165 #, python-brace-format
166 msgid "checked branch {0} format {1}"
167 msgstr ""
168
169-#: breezy/branch.py:3042
170+#: breezy/branch.py:2052
171 #, python-format
172 msgid "found error:%s"
173 msgstr ""
174
175-#: breezy/builtins.py:251 breezy/builtins.py:3043 breezy/workingtree.py:324
176+#: breezy/builtins.py:258 breezy/builtins.py:3058 breezy/workingtree.py:243
177 #, python-format
178 msgid "Ignoring files outside view. View is %s"
179 msgstr ""
180
181-#: breezy/builtins.py:260
182+#: breezy/builtins.py:268
183 #, python-format
184 msgid "brz %s --revision takes exactly one revision identifier"
185 msgstr ""
186
187-#: breezy/builtins.py:315
188+#: breezy/builtins.py:323
189 msgid "Display status summary."
190 msgstr ""
191
192-#: breezy/builtins.py:317
193+#: breezy/builtins.py:325
194 msgid ""
195 "This reports on versioned and unknown files, reporting them\n"
196 "grouped by state. Possible states are:"
197 msgstr ""
198
199-#: breezy/builtins.py:320
200+#: breezy/builtins.py:328
201 msgid ""
202 "added\n"
203 " Versioned in the working copy but not in the previous revision."
204 msgstr ""
205
206-#: breezy/builtins.py:323
207+#: breezy/builtins.py:331
208 msgid ""
209 "removed\n"
210 " Versioned in the previous revision but removed or deleted\n"
211 " in the working copy."
212 msgstr ""
213
214-#: breezy/builtins.py:327
215+#: breezy/builtins.py:335
216 msgid ""
217 "renamed\n"
218 " Path of this file changed from the previous revision;\n"
219@@ -98,25 +183,25 @@
220 " parent directory was renamed."
221 msgstr ""
222
223-#: breezy/builtins.py:332
224+#: breezy/builtins.py:340
225 msgid ""
226 "modified\n"
227 " Text has changed since the previous revision."
228 msgstr ""
229
230-#: breezy/builtins.py:335
231+#: breezy/builtins.py:343
232 msgid ""
233 "kind changed\n"
234 " File kind has been changed (e.g. from file to directory)."
235 msgstr ""
236
237-#: breezy/builtins.py:338
238+#: breezy/builtins.py:346
239 msgid ""
240 "unknown\n"
241 " Not versioned and not matching an ignore pattern."
242 msgstr ""
243
244-#: breezy/builtins.py:341
245+#: breezy/builtins.py:349
246 msgid ""
247 "Additionally for directories, symlinks and files with a changed\n"
248 "executable bit, Bazaar indicates their type using a trailing\n"
249@@ -124,20 +209,20 @@
250 "disabled using the '--no-classify' option."
251 msgstr ""
252
253-#: breezy/builtins.py:346
254+#: breezy/builtins.py:354
255 msgid ""
256 "To see ignored files use 'brz ignored'. For details on the\n"
257 "changes to file texts, use 'brz diff'."
258 msgstr ""
259
260-#: breezy/builtins.py:349
261+#: breezy/builtins.py:357
262 msgid ""
263 "Note that --short or -S gives status flags for each item, similar\n"
264 "to Subversion's status command. To get output similar to svn -q,\n"
265 "use brz status -SV."
266 msgstr ""
267
268-#: breezy/builtins.py:353
269+#: breezy/builtins.py:361
270 msgid ""
271 "If no arguments are specified, the status of the entire working\n"
272 "directory is shown. Otherwise, only the status of the specified\n"
273@@ -145,7 +230,7 @@
274 "is reported for everything inside that directory."
275 msgstr ""
276
277-#: breezy/builtins.py:358
278+#: breezy/builtins.py:366
279 msgid ""
280 "Before merges are committed, the pending merge tip revisions are\n"
281 "shown. To see all pending merge revisions, use the -v option.\n"
282@@ -153,13 +238,13 @@
283 "the no-pending option or specify a file/directory."
284 msgstr ""
285
286-#: breezy/builtins.py:363
287+#: breezy/builtins.py:371
288 msgid ""
289 "To compare the working directory to a specific revision, pass a\n"
290 "single revision to the revision argument."
291 msgstr ""
292
293-#: breezy/builtins.py:366
294+#: breezy/builtins.py:374
295 msgid ""
296 "To see which files have changed in a specific revision, or between\n"
297 "two revisions, pass a revision range to the revision argument.\n"
298@@ -167,132 +252,132 @@
299 msgstr ""
300
301 # help of 'short' option of 'status' command
302-#: breezy/builtins.py:375
303+#: breezy/builtins.py:383
304 msgid "Use short status indicators."
305 msgstr ""
306
307 # help of 'versioned' option of 'status' command
308-#: breezy/builtins.py:377
309+#: breezy/builtins.py:385
310 msgid "Only show versioned files."
311 msgstr ""
312
313 # help of 'no-pending' option of 'status' command
314-#: breezy/builtins.py:379
315+#: breezy/builtins.py:387
316 msgid "Don't show pending merges."
317 msgstr ""
318
319 # help of 'no-classify' option of 'status' command
320-#: breezy/builtins.py:382
321+#: breezy/builtins.py:389
322 msgid "Do not mark object type using indicator."
323 msgstr ""
324
325-#: breezy/builtins.py:397
326+#: breezy/builtins.py:404
327 msgid "brz status --revision takes exactly one or two revision specifiers"
328 msgstr ""
329
330-#: breezy/builtins.py:441 breezy/builtins.py:5229
331+#: breezy/builtins.py:448 breezy/builtins.py:5298
332 msgid "You can only supply one of revision_id or --revision"
333 msgstr ""
334
335-#: breezy/builtins.py:444 breezy/builtins.py:5231
336+#: breezy/builtins.py:452 breezy/builtins.py:5301
337 msgid "You must supply either --revision or a revision_id"
338 msgstr ""
339
340-#: breezy/builtins.py:451
341+#: breezy/builtins.py:459
342 #, python-format
343 msgid "Repository %r does not support access to raw revision texts"
344 msgstr ""
345
346-#: breezy/builtins.py:462
347+#: breezy/builtins.py:470
348 #, python-brace-format
349 msgid "The repository {0} contains no revision {1}."
350 msgstr ""
351
352-#: breezy/builtins.py:469
353+#: breezy/builtins.py:477
354 msgid "You cannot specify a NULL revision."
355 msgstr ""
356
357-#: breezy/builtins.py:561
358+#: breezy/builtins.py:483
359 msgid "Remove the working tree from a given branch/checkout."
360 msgstr ""
361
362-#: breezy/builtins.py:563
363+#: breezy/builtins.py:485
364 msgid ""
365 "Since a lightweight checkout is little more than a working tree\n"
366 "this will refuse to run against one."
367 msgstr ""
368
369-#: breezy/builtins.py:566
370+#: breezy/builtins.py:488
371 msgid "To re-create the working tree, use \"brz checkout\"."
372 msgstr ""
373
374 # help of 'force' option of 'remove-tree' command
375-#: breezy/builtins.py:572
376+#: breezy/builtins.py:494
377 msgid "Remove the working tree even if it has uncommitted or shelved changes."
378 msgstr ""
379
380-#: breezy/builtins.py:586
381+#: breezy/builtins.py:509
382 msgid "No working tree to remove"
383 msgstr ""
384
385-#: breezy/builtins.py:588
386+#: breezy/builtins.py:512
387 msgid "You cannot remove the working tree of a remote path"
388 msgstr ""
389
390-#: breezy/builtins.py:597
391+#: breezy/builtins.py:522
392 msgid "You cannot remove the working tree from a lightweight checkout"
393 msgstr ""
394
395-#: breezy/builtins.py:637
396+#: breezy/builtins.py:563
397 msgid ""
398 "The tree does not appear to be corrupt. You probably want \"brz revert\" "
399 "instead. Use \"--force\" if you are sure you want to reset the working tree."
400 msgstr ""
401
402-#: breezy/builtins.py:648
403+#: breezy/builtins.py:574
404 msgid ""
405 ", the header appears corrupt, try passing -r -1 to set the state to the last "
406 "commit"
407 msgstr ""
408
409-#: breezy/builtins.py:652
410+#: breezy/builtins.py:579
411 #, python-brace-format
412 msgid "failed to reset the tree state{0}"
413 msgstr ""
414
415-#: breezy/builtins.py:656
416+#: breezy/builtins.py:583
417 msgid "Show current revision number."
418 msgstr ""
419
420-#: breezy/builtins.py:658
421+#: breezy/builtins.py:585
422 msgid "This is equal to the number of revisions on this branch."
423 msgstr ""
424
425-#: breezy/builtins.py:671
426+#: breezy/builtins.py:599
427 msgid "--tree and --revision can not be used together"
428 msgstr ""
429
430-#: breezy/builtins.py:688
431+#: breezy/builtins.py:615
432 msgid "Revision numbers only make sense for single revisions, not ranges"
433 msgstr ""
434
435 # help of 'tree' option of 'revno' command
436-#: breezy/builtins.py:712
437+#: breezy/builtins.py:638
438 msgid "Show revno of working tree."
439 msgstr ""
440
441-#: breezy/builtins.py:760
442+#: breezy/builtins.py:687
443 msgid "Add specified files or directories."
444 msgstr ""
445
446-#: breezy/builtins.py:762
447+#: breezy/builtins.py:689
448 msgid ""
449 "In non-recursive mode, all the named items are added, regardless\n"
450 "of whether they were previously ignored. A warning is given if\n"
451 "any of the named files are already versioned."
452 msgstr ""
453
454-#: breezy/builtins.py:766
455+#: breezy/builtins.py:693
456 msgid ""
457 "In recursive mode (the default), files are treated the same way\n"
458 "but the behaviour for directories is different. Directories that\n"
459@@ -303,19 +388,19 @@
460 "directories. If no names are given '.' is assumed."
461 msgstr ""
462
463-#: breezy/builtins.py:774
464+#: breezy/builtins.py:701
465 msgid ""
466 "A warning will be printed when nested trees are encountered,\n"
467 "unless they are explicitly ignored."
468 msgstr ""
469
470-#: breezy/builtins.py:777
471+#: breezy/builtins.py:704
472 msgid ""
473 "Therefore simply saying 'brz add' will version all files that\n"
474 "are currently unknown."
475 msgstr ""
476
477-#: breezy/builtins.py:780
478+#: breezy/builtins.py:707
479 msgid ""
480 "Adding a file whose parent directory is not versioned will\n"
481 "implicitly add the parent, and so on up to the root. This means\n"
482@@ -323,13 +408,13 @@
483 "get added when you add a file in the directory."
484 msgstr ""
485
486-#: breezy/builtins.py:785
487+#: breezy/builtins.py:712
488 msgid ""
489 "--dry-run will show which files would be added, but not actually\n"
490 "add them."
491 msgstr ""
492
493-#: breezy/builtins.py:788
494+#: breezy/builtins.py:715
495 msgid ""
496 "--file-ids-from will try to use the file ids from the supplied path.\n"
497 "It looks up ids trying to find a matching parent directory with the\n"
498@@ -340,73 +425,126 @@
499 "into a subdirectory of this one."
500 msgstr ""
501
502-#: breezy/builtins.py:796
503+#: breezy/builtins.py:723
504 msgid ""
505 "Any files matching patterns in the ignore list will not be added\n"
506 "unless they are explicitly mentioned."
507 msgstr ""
508
509-#: breezy/builtins.py:799
510+#: breezy/builtins.py:726
511 msgid ""
512-"In recursive mode, files larger than the configuration option \n"
513+"In recursive mode, files larger than the configuration option\n"
514 "add.maximum_file_size will be skipped. Named items are never skipped due\n"
515 "to file size."
516 msgstr ""
517
518 # help of 'no-recurse' option of 'add' command
519-#: breezy/builtins.py:806
520+#: breezy/builtins.py:733
521 msgid "Don't recursively add the contents of directories."
522 msgstr ""
523
524 # help of 'file-ids-from' option of 'add' command
525-#: breezy/builtins.py:813
526+#: breezy/builtins.py:741
527 msgid "Lookup file ids from this tree."
528 msgstr ""
529
530-#: breezy/builtins.py:849
531+#: breezy/builtins.py:778
532 #, python-brace-format
533 msgid "ignored {0} matching \"{1}\"\n"
534 msgstr ""
535
536-#: breezy/builtins.py:854
537+#: breezy/builtins.py:783
538 msgid "Create a new versioned directory."
539 msgstr ""
540
541-#: breezy/builtins.py:856
542+#: breezy/builtins.py:785
543 msgid "This is equivalent to creating the directory and then adding it."
544 msgstr ""
545
546 # help of 'parents' option of 'mkdir' command
547-#: breezy/builtins.py:863
548+#: breezy/builtins.py:792
549 msgid "No error if existing, make parent directories as needed."
550 msgstr ""
551
552-#: breezy/builtins.py:897
553+#: breezy/builtins.py:826
554 #, python-format
555 msgid "added %s\n"
556 msgstr ""
557
558-#: breezy/builtins.py:939
559+#: breezy/builtins.py:870
560 #, python-format
561 msgid "invalid kind %r specified"
562 msgstr ""
563
564-#: breezy/builtins.py:976
565+#: breezy/builtins.py:908
566+msgid "Copy a file."
567+msgstr ""
568+
569+#: breezy/builtins.py:910
570+msgid " brz cp SOURCE... DESTINATION"
571+msgstr ""
572+
573+#: breezy/builtins.py:912
574+msgid ""
575+"If the last argument is a versioned directory, all the other names\n"
576+"are copied into it. Otherwise, there must be exactly two arguments\n"
577+"and the file is copied to a new name."
578+msgstr ""
579+
580+#: breezy/builtins.py:916
581+msgid ""
582+"Files cannot be copied between branches. Only files can be copied\n"
583+"at the moment."
584+msgstr ""
585+
586+#: breezy/builtins.py:932 breezy/builtins.py:1025
587+msgid "missing file argument"
588+msgstr ""
589+
590+#: breezy/builtins.py:938
591+msgid "can not copy root of branch"
592+msgstr ""
593+
594+#: breezy/builtins.py:946
595+msgid "to copy multiple files the destination must be a versioned directory"
596+msgstr ""
597+
598+#: breezy/builtins.py:960 breezy/builtins.py:976
599+#, python-format
600+msgid "Could not copy %s => %s: %s is not versioned."
601+msgstr ""
602+
603+#: breezy/builtins.py:964
604+#, python-format
605+msgid "Could not copy %s => %s . %s is not versioned\\."
606+msgstr ""
607+
608+#: breezy/builtins.py:968
609+#, python-format
610+msgid "Could not copy %s => %s . %s is a directory."
611+msgstr ""
612+
613+#: breezy/builtins.py:980
614+#, python-format
615+msgid "Could not copy to %s: %s is not a directory."
616+msgstr ""
617+
618+#: breezy/builtins.py:987
619 msgid "Move or rename a file."
620 msgstr ""
621
622-#: breezy/builtins.py:978
623+#: breezy/builtins.py:989
624 msgid " brz mv SOURCE... DESTINATION"
625 msgstr ""
626
627-#: breezy/builtins.py:980
628+#: breezy/builtins.py:991
629 msgid ""
630 "If the last argument is a versioned directory, all the other names\n"
631 "are moved into it. Otherwise, there must be exactly two arguments\n"
632 "and the file is changed to a new name."
633 msgstr ""
634
635-#: breezy/builtins.py:984
636+#: breezy/builtins.py:995
637 msgid ""
638 "If OLDNAME does not exist on the filesystem but is versioned and\n"
639 "NEWNAME does exist on the filesystem but is not versioned, mv\n"
640@@ -415,78 +553,74 @@
641 "The same is valid when moving many SOURCE files to a DESTINATION."
642 msgstr ""
643
644-#: breezy/builtins.py:990
645+#: breezy/builtins.py:1001
646 msgid "Files cannot be moved between branches."
647 msgstr ""
648
649 # help of 'after' option of 'mv' command
650-#: breezy/builtins.py:997
651+#: breezy/builtins.py:1008
652 msgid ""
653 "Move only the brz identifier of the file, because the file has already been "
654 "moved."
655 msgstr ""
656
657 # help of 'auto' option of 'mv' command
658-#: breezy/builtins.py:999
659+#: breezy/builtins.py:1010
660 msgid "Automatically guess renames."
661 msgstr ""
662
663 # help of 'dry-run' option of 'mv' command
664-#: breezy/builtins.py:1000
665+#: breezy/builtins.py:1012
666 msgid "Avoid making changes when guessing renames."
667 msgstr ""
668
669-#: breezy/builtins.py:1009
670+#: breezy/builtins.py:1021
671 msgid "--dry-run requires --auto."
672 msgstr ""
673
674-#: breezy/builtins.py:1013
675-msgid "missing file argument"
676-msgstr ""
677-
678-#: breezy/builtins.py:1017
679+#: breezy/builtins.py:1031
680 msgid "can not move root of branch"
681 msgstr ""
682
683-#: breezy/builtins.py:1023
684+#: breezy/builtins.py:1038
685 msgid "Only one path may be specified to --auto."
686 msgstr ""
687
688-#: breezy/builtins.py:1026
689+#: breezy/builtins.py:1041
690 msgid "--after cannot be specified with --auto."
691 msgstr ""
692
693-#: breezy/builtins.py:1062
694+#: breezy/builtins.py:1077
695 msgid "to mv multiple files the destination must be a versioned directory"
696 msgstr ""
697
698-#: breezy/builtins.py:1114
699+#: breezy/builtins.py:1130
700 msgid "Turn this branch into a mirror of another branch."
701 msgstr ""
702
703-#: breezy/builtins.py:1116
704+#: breezy/builtins.py:1132
705 msgid ""
706 "By default, this command only works on branches that have not diverged.\n"
707-"Branches are considered diverged if the destination branch's most recent \n"
708-"commit is one that has not been merged (directly or indirectly) into the \n"
709+"Branches are considered diverged if the destination branch's most recent\n"
710+"commit is one that has not been merged (directly or indirectly) into the\n"
711 "parent."
712 msgstr ""
713
714-#: breezy/builtins.py:1121
715+#: breezy/builtins.py:1137
716 msgid ""
717 "If branches have diverged, you can use 'brz merge' to integrate the changes\n"
718 "from one into the other. Once one branch has merged, the other should\n"
719 "be able to pull it again."
720 msgstr ""
721
722-#: breezy/builtins.py:1125
723+#: breezy/builtins.py:1141
724 msgid ""
725 "If you want to replace your local changes and just want your branch to\n"
726 "match the remote one, use pull --overwrite. This will work even if the two\n"
727 "branches have diverged."
728 msgstr ""
729
730-#: breezy/builtins.py:1129
731+#: breezy/builtins.py:1145
732 msgid ""
733 "If there is no default location set, the first pull will set it (use\n"
734 "--no-remember to avoid setting it). After that, you can omit the\n"
735@@ -494,14 +628,14 @@
736 "value will only be saved if the remote location can be accessed."
737 msgstr ""
738
739-#: breezy/builtins.py:1134
740+#: breezy/builtins.py:1150
741 msgid ""
742 "The --verbose option will display the revisions pulled using the log_format\n"
743 "configuration option. You can use a different format by overriding it with\n"
744 "-Olog_format=<other_format>."
745 msgstr ""
746
747-#: breezy/builtins.py:1138
748+#: breezy/builtins.py:1154
749 msgid ""
750 "Note: The location can be specified either in the form of a branch,\n"
751 "or in the form of a path to a file containing a merge directive generated\n"
752@@ -509,77 +643,77 @@
753 msgstr ""
754
755 # help of 'verbose' option of 'pull' command
756-#: breezy/builtins.py:1146
757+#: breezy/builtins.py:1162
758 msgid "Show logs of pulled revisions."
759 msgstr ""
760
761 # help of 'directory' option of 'pull' command
762-#: breezy/builtins.py:1148
763+#: breezy/builtins.py:1164
764 msgid ""
765 "Branch to pull into, rather than the one containing the working directory."
766 msgstr ""
767
768 # help of 'local' option of 'pull' command
769-#: breezy/builtins.py:1151
770+#: breezy/builtins.py:1167
771 msgid ""
772 "Perform a local pull in a bound branch. Local pulls are not applied to the "
773 "master branch."
774 msgstr ""
775
776-#: breezy/builtins.py:1188
777+#: breezy/builtins.py:1204
778 msgid "No working tree, ignoring --show-base"
779 msgstr ""
780
781-#: breezy/builtins.py:1204
782+#: breezy/builtins.py:1220
783 msgid "No pull location known or specified."
784 msgstr ""
785
786-#: breezy/builtins.py:1210
787+#: breezy/builtins.py:1227
788 #, python-format
789 msgid "Using saved parent location: %s\n"
790 msgstr ""
791
792-#: breezy/builtins.py:1217 breezy/builtins.py:4423
793+#: breezy/builtins.py:1234 breezy/builtins.py:4494
794 msgid "Cannot use -r with merge directives or bundles"
795 msgstr ""
796
797-#: breezy/builtins.py:1260
798+#: breezy/builtins.py:1277
799 msgid "Update a mirror of this branch."
800 msgstr ""
801
802-#: breezy/builtins.py:1262
803+#: breezy/builtins.py:1279
804 msgid ""
805 "The target branch will not have its working tree populated because this\n"
806 "is both expensive, and is not supported on remote file systems."
807 msgstr ""
808
809-#: breezy/builtins.py:1265
810+#: breezy/builtins.py:1282
811 msgid ""
812 "Some smart servers or protocols *may* put the working tree in place in\n"
813 "the future."
814 msgstr ""
815
816-#: breezy/builtins.py:1268
817+#: breezy/builtins.py:1285
818 msgid ""
819 "This command only works on branches that have not diverged. Branches are\n"
820 "considered diverged if the destination branch's most recent commit is one\n"
821 "that has not been merged (directly or indirectly) by the source branch."
822 msgstr ""
823
824-#: breezy/builtins.py:1272
825+#: breezy/builtins.py:1289
826 msgid ""
827 "If branches have diverged, you can use 'brz push --overwrite' to replace\n"
828 "the other branch completely, discarding its unmerged changes."
829 msgstr ""
830
831-#: breezy/builtins.py:1275
832+#: breezy/builtins.py:1292
833 msgid ""
834 "If you want to ensure you have the different changes in the other branch,\n"
835 "do a merge (see brz help merge) from the other branch, and commit that.\n"
836 "After that you will be able to do a push without '--overwrite'."
837 msgstr ""
838
839-#: breezy/builtins.py:1279
840+#: breezy/builtins.py:1296
841 msgid ""
842 "If there is no default push location set, the first push will set it (use\n"
843 "--no-remember to avoid setting it). After that, you can omit the\n"
844@@ -587,86 +721,91 @@
845 "value will only be saved if the remote location can be accessed."
846 msgstr ""
847
848-#: breezy/builtins.py:1284
849+#: breezy/builtins.py:1301
850 msgid ""
851 "The --verbose option will display the revisions pushed using the log_format\n"
852 "configuration option. You can use a different format by overriding it with\n"
853 "-Olog_format=<other_format>."
854 msgstr ""
855
856-# help of 'directory' option of 'dpush' command
857 # help of 'directory' option of 'push' command
858-#: breezy/builtins.py:1295 breezy/foreign.py:272
859+#: breezy/builtins.py:1312
860 msgid ""
861 "Branch to push from, rather than the one containing the working directory."
862 msgstr ""
863
864 # help of 'use-existing-dir' option of 'push' command
865-#: breezy/builtins.py:1298
866+#: breezy/builtins.py:1315
867 msgid ""
868 "By default push will fail if the target directory exists, but does not "
869 "already have a control directory. This flag will allow push to proceed."
870 msgstr ""
871
872 # help of 'stacked' option of 'push' command
873-#: breezy/builtins.py:1303
874+#: breezy/builtins.py:1320
875 msgid ""
876 "Create a stacked branch that references the public location of the parent "
877 "branch."
878 msgstr ""
879
880 # help of 'stacked-on' option of 'push' command
881-#: breezy/builtins.py:1306
882+#: breezy/builtins.py:1323
883 msgid ""
884 "Create a stacked branch that refers to another branch for the commit "
885 "history. Only the work not present in the referenced branch is included in "
886 "the branch created."
887 msgstr ""
888
889-# help of 'strict' option of 'dpush' command
890 # help of 'strict' option of 'push' command
891-#: breezy/builtins.py:1311 breezy/foreign.py:279
892+#: breezy/builtins.py:1328
893 msgid ""
894 "Refuse to push if there are uncommitted changes in the working tree, --no-"
895 "strict disables the check."
896 msgstr ""
897
898 # help of 'no-tree' option of 'push' command
899-#: breezy/builtins.py:1314
900+#: breezy/builtins.py:1331
901 msgid "Don't populate the working tree, even for protocols that support it."
902 msgstr ""
903
904 # help of 'overwrite-tags' option of 'pull' command
905 # help of 'overwrite-tags' option of 'push' command
906-#: breezy/builtins.py:1317
907+#: breezy/builtins.py:1334
908 msgid "Overwrite tags only."
909 msgstr ""
910
911-#: breezy/builtins.py:1368
912+# help of 'lossy' option of 'push' command
913+#: breezy/builtins.py:1335
914+msgid ""
915+"Allow lossy push, i.e. dropping metadata that can't be represented in the "
916+"target."
917+msgstr ""
918+
919+#: breezy/builtins.py:1387
920 msgid "Could not determine branch to refer to."
921 msgstr ""
922
923-#: breezy/builtins.py:1377
924+#: breezy/builtins.py:1396
925 #, python-format
926 msgid ""
927 "No push location known or specified. To push to the parent branch (at %s), "
928 "use 'brz push :parent'."
929 msgstr ""
930
931-#: breezy/builtins.py:1383 breezy/foreign.py:306
932+#: breezy/builtins.py:1402
933 msgid "No push location known or specified."
934 msgstr ""
935
936-#: breezy/builtins.py:1387
937+#: breezy/builtins.py:1406
938 #, python-format
939 msgid "Using saved push location: %s"
940 msgstr ""
941
942-#: breezy/builtins.py:1397
943+#: breezy/builtins.py:1417
944 msgid "Create a new branch that is a copy of an existing branch."
945 msgstr ""
946
947-#: breezy/builtins.py:1399
948+#: breezy/builtins.py:1419
949 msgid ""
950 "If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
951 "be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
952@@ -677,146 +816,142 @@
953 "create ./foo-bar."
954 msgstr ""
955
956-#: breezy/builtins.py:1406
957+#: breezy/builtins.py:1426
958 msgid ""
959 "To retrieve the branch as of a particular revision, supply the --revision\n"
960 "parameter, as in \"branch foo/bar -r 5\"."
961 msgstr ""
962
963-#: breezy/builtins.py:1409
964-msgid "The synonyms 'clone' and 'get' for this command are deprecated."
965-msgstr ""
966-
967 # help of 'no-tree' option of 'branch' command
968-#: breezy/builtins.py:1419
969+#: breezy/builtins.py:1438
970 msgid "Create a branch without a working-tree."
971 msgstr ""
972
973 # help of 'switch' option of 'branch' command
974-#: breezy/builtins.py:1421
975+#: breezy/builtins.py:1440
976 msgid "Switch the checkout in the current directory to the new branch."
977 msgstr ""
978
979 # help of 'stacked' option of 'branch' command
980-#: breezy/builtins.py:1424
981+#: breezy/builtins.py:1443
982 msgid ""
983 "Create a stacked branch referring to the source branch. The new branch will "
984 "depend on the availability of the source branch for all operations."
985 msgstr ""
986
987 # help of 'standalone' option of 'branch' command
988-#: breezy/builtins.py:1428
989+#: breezy/builtins.py:1447
990 msgid "Do not use a shared repository, even if available."
991 msgstr ""
992
993 # help of 'use-existing-dir' option of 'branch' command
994-#: breezy/builtins.py:1430
995+#: breezy/builtins.py:1449
996 msgid ""
997 "By default branch will fail if the target directory exists, but does not "
998 "already have a control directory. This flag will allow branch to proceed."
999 msgstr ""
1000
1001 # help of 'bind' option of 'branch' command
1002-#: breezy/builtins.py:1435
1003+#: breezy/builtins.py:1454
1004 msgid "Bind new branch to from location."
1005 msgstr ""
1006
1007-#: breezy/builtins.py:1482
1008+#: breezy/builtins.py:1491
1009 #, python-format
1010 msgid "Target directory \"%s\" already exists."
1011 msgstr ""
1012
1013-#: breezy/builtins.py:1494
1014+#: breezy/builtins.py:1503
1015 #, python-format
1016 msgid "Parent of \"%s\" does not exist."
1017 msgstr ""
1018
1019-#: breezy/builtins.py:1513
1020+#: breezy/builtins.py:1521
1021 #, python-brace-format
1022 msgid "The branch {0} has no revision {1}."
1023 msgstr ""
1024
1025-#: breezy/builtins.py:1528 breezy/push.py:53
1026+#: breezy/builtins.py:1537 breezy/push.py:54
1027 #, python-format
1028 msgid "Created new stacked branch referring to %s."
1029 msgstr ""
1030
1031-#: breezy/builtins.py:1532
1032+#: breezy/builtins.py:1543
1033 #, python-format
1034 msgid "Branched %d revision."
1035 msgid_plural "Branched %d revisions."
1036 msgstr[0] ""
1037 msgstr[1] ""
1038
1039-#: breezy/builtins.py:1537
1040+#: breezy/builtins.py:1547 breezy/push.py:57
1041+msgid "Created new branch."
1042+msgstr ""
1043+
1044+#: breezy/builtins.py:1552
1045 #, python-format
1046 msgid "New branch bound to %s"
1047 msgstr ""
1048
1049-#: breezy/builtins.py:1542 breezy/builtins.py:6283
1050+#: breezy/builtins.py:1557 breezy/builtins.py:6368
1051 #, python-format
1052 msgid "Switched to branch: %s"
1053 msgstr ""
1054
1055-#: breezy/builtins.py:1547
1056+#: breezy/builtins.py:1562
1057 msgid "List the branches available at the current location."
1058 msgstr ""
1059
1060-#: breezy/builtins.py:1549
1061+#: breezy/builtins.py:1564
1062 msgid ""
1063 "This command will print the names of all the branches at the current\n"
1064 "location."
1065 msgstr ""
1066
1067 # help of 'recursive' option of 'branches' command
1068-#: breezy/builtins.py:1556
1069+#: breezy/builtins.py:1571
1070 msgid ""
1071 "Recursively scan for branches rather than just looking in the specified "
1072 "location."
1073 msgstr ""
1074
1075-#: breezy/builtins.py:1585
1076+#: breezy/builtins.py:1600
1077 msgid "(default)"
1078 msgstr ""
1079
1080-#: breezy/builtins.py:1597
1081+#: breezy/builtins.py:1612
1082 msgid "Create a new checkout of an existing branch."
1083 msgstr ""
1084
1085-#: breezy/builtins.py:1599
1086+#: breezy/builtins.py:1614
1087 msgid ""
1088-"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
1089-"for\n"
1090-"the branch found in '.'. This is useful if you have removed the working "
1091-"tree\n"
1092-"or if it was never created - i.e. if you pushed the branch to its current\n"
1093-"location using SFTP."
1094+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree\n"
1095+"for the branch found in '.'. This is useful if you have removed the working\n"
1096+"tree or if it was never created - i.e. if you pushed the branch to its\n"
1097+"current location using SFTP."
1098 msgstr ""
1099
1100-#: breezy/builtins.py:1604
1101+#: breezy/builtins.py:1619
1102 msgid ""
1103-"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
1104+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION\n"
1105+"will be used. In other words, \"checkout ../foo/bar\" will attempt to "
1106+"create\n"
1107+"./bar. If the BRANCH_LOCATION has no / or path separator embedded, the\n"
1108+"TO_LOCATION is derived from the BRANCH_LOCATION by stripping a leading\n"
1109+"scheme or drive identifier, if any. For example, \"checkout lp:foo-bar\" "
1110 "will\n"
1111-"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./"
1112-"bar.\n"
1113-"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
1114-"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
1115-"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
1116-"create ./foo-bar."
1117+"attempt to create ./foo-bar."
1118 msgstr ""
1119
1120-#: breezy/builtins.py:1611
1121+#: breezy/builtins.py:1626
1122 msgid ""
1123 "To retrieve the branch as of a particular revision, supply the --revision\n"
1124-"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
1125-"immediately\n"
1126-"out of date [so you cannot commit] but it may be useful (i.e. to examine "
1127-"old\n"
1128-"code.)"
1129+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be\n"
1130+"immediately out of date [so you cannot commit] but it may be useful (i.e.\n"
1131+"to examine old code.)"
1132 msgstr ""
1133
1134 # help of 'lightweight' option of 'checkout' command
1135-#: breezy/builtins.py:1621
1136+#: breezy/builtins.py:1636
1137 msgid ""
1138 "Perform a lightweight checkout. Lightweight checkouts depend on access to "
1139 "the branch for every operation. Normal checkouts can perform common "
1140@@ -826,40 +961,40 @@
1141
1142 # help of 'files-from' option of 'branch' command
1143 # help of 'files-from' option of 'checkout' command
1144-#: breezy/builtins.py:1628
1145+#: breezy/builtins.py:1643
1146 msgid "Get file contents from this tree."
1147 msgstr ""
1148
1149 # help of 'hardlink' option of 'branch' command
1150 # help of 'hardlink' option of 'checkout' command
1151-#: breezy/builtins.py:1630
1152+#: breezy/builtins.py:1645
1153 msgid "Hard-link working tree files where possible."
1154 msgstr ""
1155
1156-#: breezy/builtins.py:1671
1157+#: breezy/builtins.py:1685
1158 msgid ""
1159 "Show list of renamed files.\n"
1160 " "
1161 msgstr ""
1162
1163-#: breezy/builtins.py:1699
1164+#: breezy/builtins.py:1713
1165 msgid "Update a working tree to a new revision."
1166 msgstr ""
1167
1168-#: breezy/builtins.py:1701
1169+#: breezy/builtins.py:1715
1170 msgid ""
1171 "This will perform a merge of the destination revision (the tip of the\n"
1172 "branch, or the specified revision) into the working tree, and then make\n"
1173-"that revision the basis revision for the working tree. "
1174+"that revision the basis revision for the working tree."
1175 msgstr ""
1176
1177-#: breezy/builtins.py:1705
1178+#: breezy/builtins.py:1719
1179 msgid ""
1180 "You can use this to visit an older revision, or to update a working tree\n"
1181 "that is out of date from its branch."
1182 msgstr ""
1183
1184-#: breezy/builtins.py:1708
1185+#: breezy/builtins.py:1722
1186 msgid ""
1187 "If there are any uncommitted changes in the tree, they will be carried\n"
1188 "across and remain as uncommitted changes after the update. To discard\n"
1189@@ -867,13 +1002,13 @@
1190 "with the changes brought in by the change in basis revision."
1191 msgstr ""
1192
1193-#: breezy/builtins.py:1713
1194+#: breezy/builtins.py:1727
1195 msgid ""
1196 "If the tree's branch is bound to a master branch, brz will also update\n"
1197 "the branch from the master."
1198 msgstr ""
1199
1200-#: breezy/builtins.py:1716
1201+#: breezy/builtins.py:1730
1202 msgid ""
1203 "You cannot update just a single file or directory, because each Bazaar\n"
1204 "working tree has just a single basis revision. If you want to restore a\n"
1205@@ -883,102 +1018,103 @@
1206 "out the old content of that file to a new location."
1207 msgstr ""
1208
1209-#: breezy/builtins.py:1723
1210+#: breezy/builtins.py:1737
1211 msgid ""
1212 "The 'dir' argument, if given, must be the location of the root of a\n"
1213-"working tree to update. By default, the working tree that contains the \n"
1214+"working tree to update. By default, the working tree that contains the\n"
1215 "current working directory is used."
1216 msgstr ""
1217
1218-#: breezy/builtins.py:1739
1219+#: breezy/builtins.py:1753
1220 msgid "brz update --revision takes exactly one revision"
1221 msgstr ""
1222
1223-#: breezy/builtins.py:1747
1224+#: breezy/builtins.py:1761
1225 msgid "brz update can only update a whole tree, not a file or subdirectory"
1226 msgstr ""
1227
1228-#: breezy/builtins.py:1778
1229+#: breezy/builtins.py:1792
1230 #, python-brace-format
1231 msgid "Tree is up to date at revision {0} of branch {1}"
1232 msgstr ""
1233
1234-#: breezy/builtins.py:1794
1235+#: breezy/builtins.py:1808
1236 #, python-format
1237 msgid ""
1238 "branch has no revision %s\n"
1239 "brz update --revision only works for a revision in the branch history"
1240 msgstr ""
1241
1242-#: breezy/builtins.py:1800
1243+#: breezy/builtins.py:1814
1244 #, python-brace-format
1245 msgid "Updated to revision {0} of branch {1}"
1246 msgstr ""
1247
1248-#: breezy/builtins.py:1804
1249+#: breezy/builtins.py:1818
1250 msgid ""
1251 "Your local commits will now show as pending merges with 'brz status', and "
1252 "can be committed with 'brz commit'."
1253 msgstr ""
1254
1255-#: breezy/builtins.py:1813
1256+#: breezy/builtins.py:1827
1257 msgid "Show information about a working tree, branch or repository."
1258 msgstr ""
1259
1260-#: breezy/builtins.py:1815
1261+#: breezy/builtins.py:1829
1262 msgid ""
1263 "This command will show all known locations and formats associated to the\n"
1264 "tree, branch or repository."
1265 msgstr ""
1266
1267-#: breezy/builtins.py:1818
1268+#: breezy/builtins.py:1832
1269 msgid ""
1270 "In verbose mode, statistical information is included with each report.\n"
1271 "To see extended statistic information, use a verbosity level of 2 or\n"
1272 "higher by specifying the verbose option multiple times, e.g. -vv."
1273 msgstr ""
1274
1275-#: breezy/builtins.py:1822
1276+#: breezy/builtins.py:1836
1277 msgid "Branches and working trees will also report any missing revisions."
1278 msgstr ""
1279
1280-#: breezy/builtins.py:1824 breezy/builtins.py:3742 breezy/builtins.py:4883
1281-#: breezy/builtins.py:6469
1282+#: breezy/builtins.py:1838 breezy/builtins.py:3795 breezy/builtins.py:4962
1283+#: breezy/builtins.py:6559 breezy/plugins/fastimport/cmds.py:211
1284+#: breezy/plugins/fastimport/cmds.py:417
1285 msgid ":Examples:"
1286 msgstr ""
1287
1288-#: breezy/builtins.py:1826
1289+#: breezy/builtins.py:1840
1290 msgid " Display information on the format and related locations:"
1291 msgstr ""
1292
1293-#: breezy/builtins.py:1828
1294+#: breezy/builtins.py:1842
1295 msgid " brz info"
1296 msgstr ""
1297
1298-#: breezy/builtins.py:1830
1299+#: breezy/builtins.py:1844
1300 msgid ""
1301 " Display the above together with extended format information and\n"
1302 " basic statistics (like the number of files in the working tree and\n"
1303 " number of revisions in the branch and repository):"
1304 msgstr ""
1305
1306-#: breezy/builtins.py:1834
1307+#: breezy/builtins.py:1848
1308 msgid " brz info -v"
1309 msgstr ""
1310
1311-#: breezy/builtins.py:1836
1312+#: breezy/builtins.py:1850
1313 msgid " Display the above together with number of committers to the branch:"
1314 msgstr ""
1315
1316-#: breezy/builtins.py:1838
1317+#: breezy/builtins.py:1852
1318 msgid " brz info -vv"
1319 msgstr ""
1320
1321-#: breezy/builtins.py:1857
1322+#: breezy/builtins.py:1871
1323 msgid "Remove files or directories."
1324 msgstr ""
1325
1326-#: breezy/builtins.py:1859
1327+#: breezy/builtins.py:1873
1328 msgid ""
1329 "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1330 "delete them if they can easily be recovered using revert otherwise they\n"
1331@@ -988,44 +1124,44 @@
1332 msgstr ""
1333
1334 # help of 'new' option of 'remove' command
1335-#: breezy/builtins.py:1867
1336+#: breezy/builtins.py:1882
1337 msgid "Only remove files that have never been committed."
1338 msgstr ""
1339
1340 # help of 'file-deletion-strategy' option of 'remove' command
1341-#: breezy/builtins.py:1869
1342+#: breezy/builtins.py:1884
1343 msgid "The file deletion mode to be used."
1344 msgstr ""
1345
1346 # title of 'file-deletion-strategy' option of 'remove' command
1347-#: breezy/builtins.py:1870
1348+#: breezy/builtins.py:1885
1349 msgid "Deletion Strategy"
1350 msgstr ""
1351
1352 # help of 'file-deletion-strategy=safe' option of 'remove' command
1353-#: breezy/builtins.py:1871
1354+#: breezy/builtins.py:1886
1355 msgid "Backup changed files (default)."
1356 msgstr ""
1357
1358 # help of 'file-deletion-strategy=keep' option of 'remove' command
1359-#: breezy/builtins.py:1872
1360+#: breezy/builtins.py:1887
1361 msgid "Delete from brz but leave the working copy."
1362 msgstr ""
1363
1364 # help of 'file-deletion-strategy=no-backup' option of 'remove' command
1365-#: breezy/builtins.py:1873
1366+#: breezy/builtins.py:1888
1367 msgid "Don't backup changed files."
1368 msgstr ""
1369
1370-#: breezy/builtins.py:1894
1371+#: breezy/builtins.py:1909
1372 msgid "No matching files."
1373 msgstr ""
1374
1375-#: breezy/builtins.py:1955
1376+#: breezy/builtins.py:1970
1377 msgid "Reconcile brz metadata in a branch."
1378 msgstr ""
1379
1380-#: breezy/builtins.py:1957
1381+#: breezy/builtins.py:1972
1382 msgid ""
1383 "This can correct data mismatches that may have been caused by\n"
1384 "previous ghost operations or brz upgrades. You should only\n"
1385@@ -1033,7 +1169,7 @@
1386 "advises you to run it."
1387 msgstr ""
1388
1389-#: breezy/builtins.py:1962
1390+#: breezy/builtins.py:1977
1391 msgid ""
1392 "If a second branch is provided, cross-branch reconciliation is\n"
1393 "also attempted, which will check that data like the tree root\n"
1394@@ -1041,56 +1177,54 @@
1395 "correctly in both branches."
1396 msgstr ""
1397
1398-#: breezy/builtins.py:1967
1399+#: breezy/builtins.py:1982
1400 msgid ""
1401 "At the same time it is run it may recompress data resulting in\n"
1402 "a potential saving in disk space or performance gain."
1403 msgstr ""
1404
1405-#: breezy/builtins.py:1970
1406+#: breezy/builtins.py:1985
1407 msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1408 msgstr ""
1409
1410+# help of 'format=git-bare' option of 'init' command
1411+# help of 'format=git-bare' option of 'init-repository' command
1412+# help of 'format=git-bare' option of 'upgrade' command
1413+#: breezy/builtins.py:2052 breezy/builtins.py:2173 breezy/builtins.py:3830
1414+msgid "Bare GIT repository (no working tree)."
1415+msgstr ""
1416+
1417 # help of 'format=2a' option of 'init' command
1418+# help of 'format=bzr' option of 'init' command
1419 # help of 'format=default' option of 'init' command
1420 # help of 'format=2a' option of 'init-repository' command
1421+# help of 'format=bzr' option of 'init-repository' command
1422 # help of 'format=default' option of 'init-repository' command
1423 # help of 'format=2a' option of 'upgrade' command
1424+# help of 'format=bzr' option of 'upgrade' command
1425 # help of 'format=default' option of 'upgrade' command
1426-#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
1427-msgid ""
1428-"Format for the bzr 2.0 series.\n"
1429-"Uses group-compress storage.\n"
1430-"Provides rich roots which are a one-way transition.\n"
1431-msgstr ""
1432-
1433-# help of 'format=pack-0.92' option of 'init' command
1434-# help of 'format=pack-0.92' option of 'init-repository' command
1435-# help of 'format=pack-0.92' option of 'upgrade' command
1436-#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
1437-msgid ""
1438-"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1439-"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1440-msgstr ""
1441-
1442-# help of 'format=development-colo' option of 'init' command
1443-# help of 'format=development-colo' option of 'init-repository' command
1444-# help of 'format=development-colo' option of 'upgrade' command
1445-#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
1446-msgid "The 2a format with experimental support for colocated branches.\n"
1447-msgstr ""
1448-
1449-#: breezy/builtins.py:2038
1450+#: breezy/builtins.py:2052 breezy/builtins.py:2173 breezy/builtins.py:3830
1451+msgid "Format for the bzr 2.0 series.\n"
1452+msgstr ""
1453+
1454+# help of 'format=git' option of 'init' command
1455+# help of 'format=git' option of 'init-repository' command
1456+# help of 'format=git' option of 'upgrade' command
1457+#: breezy/builtins.py:2052 breezy/builtins.py:2173 breezy/builtins.py:3830
1458+msgid "GIT repository."
1459+msgstr ""
1460+
1461+#: breezy/builtins.py:2053
1462 msgid "Make a directory into a versioned branch."
1463 msgstr ""
1464
1465-#: breezy/builtins.py:2040
1466+#: breezy/builtins.py:2055
1467 msgid ""
1468 "Use this to create an empty branch, or before importing an\n"
1469 "existing project."
1470 msgstr ""
1471
1472-#: breezy/builtins.py:2043
1473+#: breezy/builtins.py:2058
1474 msgid ""
1475 "If there is a repository in a parent directory of the location, then\n"
1476 "the history of the branch will be stored in the repository. Otherwise\n"
1477@@ -1098,17 +1232,17 @@
1478 "in the .bzr directory."
1479 msgstr ""
1480
1481-#: breezy/builtins.py:2048
1482+#: breezy/builtins.py:2063
1483 msgid ""
1484 "If there is already a branch at the location but it has no working tree,\n"
1485 "the tree can be populated with 'brz checkout'."
1486 msgstr ""
1487
1488-#: breezy/builtins.py:2051
1489+#: breezy/builtins.py:2066
1490 msgid "Recipe for importing a tree of files::"
1491 msgstr ""
1492
1493-#: breezy/builtins.py:2053
1494+#: breezy/builtins.py:2068
1495 msgid ""
1496 " cd ~/project\n"
1497 " brz init\n"
1498@@ -1119,86 +1253,86 @@
1499
1500 # help of 'create-prefix' option of 'init' command
1501 # help of 'create-prefix' option of 'push' command
1502-#: breezy/builtins.py:2064
1503+#: breezy/builtins.py:2079
1504 msgid "Create the path leading up to the branch if it does not already exist."
1505 msgstr ""
1506
1507 # help of 'format' option of 'init' command
1508-#: breezy/builtins.py:2067
1509-msgid "Specify a format for this branch. See \"help formats\"."
1510+#: breezy/builtins.py:2082
1511+msgid "Specify a format for this branch. See \"help formats\" for a full list."
1512 msgstr ""
1513
1514 # help of 'append-revisions-only' option of 'init' command
1515-#: breezy/builtins.py:2075
1516+#: breezy/builtins.py:2091
1517 msgid "Never change revnos or the existing log. Append revisions to it only."
1518 msgstr ""
1519
1520 # help of 'no-tree' option of 'init' command
1521-#: breezy/builtins.py:2078
1522+#: breezy/builtins.py:2094
1523 msgid "Create a branch without a working tree."
1524 msgstr ""
1525
1526-#: breezy/builtins.py:2098 breezy/push.py:110
1527+#: breezy/builtins.py:2115 breezy/push.py:112
1528 #, python-format
1529 msgid ""
1530 "Parent directory of %s does not exist.\n"
1531 "You may supply --create-prefix to create all leading parent directories."
1532 msgstr ""
1533
1534-#: breezy/builtins.py:2132
1535+#: breezy/builtins.py:2150
1536 msgid ""
1537 "This branch format cannot be set to append-revisions-only. Try --default."
1538 msgstr ""
1539
1540-#: breezy/builtins.py:2143
1541+#: breezy/builtins.py:2161
1542 #, python-brace-format
1543 msgid "Created a {0} (format: {1})\n"
1544 msgstr ""
1545
1546-#: breezy/builtins.py:2152
1547+#: breezy/builtins.py:2170
1548 #, python-format
1549 msgid "Using shared repository: %s\n"
1550 msgstr ""
1551
1552-#: breezy/builtins.py:2156
1553+#: breezy/builtins.py:2174
1554 msgid "Create a shared repository for branches to share storage space."
1555 msgstr ""
1556
1557-#: breezy/builtins.py:2158
1558+#: breezy/builtins.py:2176
1559 msgid ""
1560 "New branches created under the repository directory will store their\n"
1561 "revisions in the repository, not in the branch directory. For branches\n"
1562-"with shared history, this reduces the amount of storage needed and \n"
1563+"with shared history, this reduces the amount of storage needed and\n"
1564 "speeds up the creation of new branches."
1565 msgstr ""
1566
1567-#: breezy/builtins.py:2163
1568+#: breezy/builtins.py:2181
1569 msgid ""
1570 "If the --no-trees option is given then the branches in the repository\n"
1571-"will not have working trees by default. They will still exist as \n"
1572-"directories on disk, but they will not have separate copies of the \n"
1573+"will not have working trees by default. They will still exist as\n"
1574+"directories on disk, but they will not have separate copies of the\n"
1575 "files at a certain revision. This can be useful for repositories that\n"
1576 "store branches which are interacted with through checkouts or remote\n"
1577 "branches, such as on a server."
1578 msgstr ""
1579
1580-#: breezy/builtins.py:2170
1581+#: breezy/builtins.py:2188
1582 msgid ""
1583 ":Examples:\n"
1584 " Create a shared repository holding just branches::"
1585 msgstr ""
1586
1587-#: breezy/builtins.py:2173
1588+#: breezy/builtins.py:2191
1589 msgid ""
1590 " brz init-repo --no-trees repo\n"
1591 " brz init repo/trunk"
1592 msgstr ""
1593
1594-#: breezy/builtins.py:2176
1595+#: breezy/builtins.py:2194
1596 msgid " Make a lightweight checkout elsewhere::"
1597 msgstr ""
1598
1599-#: breezy/builtins.py:2178
1600+#: breezy/builtins.py:2196
1601 msgid ""
1602 " brz checkout --lightweight repo/trunk trunk-checkout\n"
1603 " cd trunk-checkout\n"
1604@@ -1206,26 +1340,27 @@
1605 msgstr ""
1606
1607 # help of 'format' option of 'init-repository' command
1608-#: breezy/builtins.py:2186
1609+#: breezy/builtins.py:2204
1610 msgid ""
1611 "Specify a format for this repository. See \"brz help formats\" for details."
1612 msgstr ""
1613
1614 # title of 'format' option of 'init-repository' command
1615-#: breezy/builtins.py:2190
1616+# title of 'format' option of 'fast-import' command
1617+#: breezy/builtins.py:2210 breezy/plugins/fastimport/cmds.py:287
1618 msgid "Repository format"
1619 msgstr ""
1620
1621 # help of 'no-trees' option of 'init-repository' command
1622-#: breezy/builtins.py:2192
1623+#: breezy/builtins.py:2212
1624 msgid "Branches in the repository will default to not having a working tree."
1625 msgstr ""
1626
1627-#: breezy/builtins.py:2218
1628+#: breezy/builtins.py:2243
1629 msgid "Show differences in the working tree, between revisions or branches."
1630 msgstr ""
1631
1632-#: breezy/builtins.py:2220
1633+#: breezy/builtins.py:2245
1634 msgid ""
1635 "If no arguments are given, all changes for the current tree are listed.\n"
1636 "If files are given, only the changes in those files are listed.\n"
1637@@ -1235,23 +1370,23 @@
1638 "given."
1639 msgstr ""
1640
1641-#: breezy/builtins.py:2227
1642+#: breezy/builtins.py:2252
1643 msgid ""
1644 "\"brz diff -p1\" is equivalent to \"brz diff --prefix old/:new/\", and\n"
1645 "produces patches suitable for \"patch -p1\"."
1646 msgstr ""
1647
1648-#: breezy/builtins.py:2230
1649+#: breezy/builtins.py:2255
1650 msgid ""
1651 "Note that when using the -r argument with a range of revisions, the\n"
1652 "differences are computed between the two specified revisions. That\n"
1653-"is, the command does not show the changes introduced by the first \n"
1654-"revision in the range. This differs from the interpretation of \n"
1655+"is, the command does not show the changes introduced by the first\n"
1656+"revision in the range. This differs from the interpretation of\n"
1657 "revision ranges used by \"brz log\" which includes the first revision\n"
1658 "in the range."
1659 msgstr ""
1660
1661-#: breezy/builtins.py:2237
1662+#: breezy/builtins.py:2262
1663 msgid ""
1664 ":Exit values:\n"
1665 " 1 - changed\n"
1666@@ -1260,206 +1395,209 @@
1667 " 0 - no change"
1668 msgstr ""
1669
1670-#: breezy/builtins.py:2243
1671+#: breezy/builtins.py:2268
1672 msgid ""
1673 ":Examples:\n"
1674 " Shows the difference in the working tree versus the last commit::"
1675 msgstr ""
1676
1677-#: breezy/builtins.py:2246
1678+#: breezy/builtins.py:2271
1679 msgid " brz diff"
1680 msgstr ""
1681
1682-#: breezy/builtins.py:2248
1683+#: breezy/builtins.py:2273
1684 msgid " Difference between the working tree and revision 1::"
1685 msgstr ""
1686
1687-#: breezy/builtins.py:2250
1688+#: breezy/builtins.py:2275
1689 msgid " brz diff -r1"
1690 msgstr ""
1691
1692-#: breezy/builtins.py:2252
1693+#: breezy/builtins.py:2277
1694 msgid " Difference between revision 3 and revision 1::"
1695 msgstr ""
1696
1697-#: breezy/builtins.py:2254
1698+#: breezy/builtins.py:2279
1699 msgid " brz diff -r1..3"
1700 msgstr ""
1701
1702-#: breezy/builtins.py:2256
1703+#: breezy/builtins.py:2281
1704 msgid " Difference between revision 3 and revision 1 for branch xxx::"
1705 msgstr ""
1706
1707-#: breezy/builtins.py:2258
1708+#: breezy/builtins.py:2283
1709 msgid " brz diff -r1..3 xxx"
1710 msgstr ""
1711
1712-#: breezy/builtins.py:2260
1713+#: breezy/builtins.py:2285
1714 msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1715 msgstr ""
1716
1717-#: breezy/builtins.py:2262
1718+#: breezy/builtins.py:2287
1719 msgid " brz diff -c2"
1720 msgstr ""
1721
1722-#: breezy/builtins.py:2264
1723-msgid ""
1724-" To see the changes introduced by revision X::\n"
1725-" \n"
1726-" brz diff -cX"
1727-msgstr ""
1728-
1729-#: breezy/builtins.py:2268
1730+#: breezy/builtins.py:2289
1731+msgid " To see the changes introduced by revision X::"
1732+msgstr ""
1733+
1734+#: breezy/builtins.py:2291
1735+msgid " brz diff -cX"
1736+msgstr ""
1737+
1738+#: breezy/builtins.py:2293
1739 msgid ""
1740 " Note that in the case of a merge, the -c option shows the changes\n"
1741 " compared to the left hand parent. To see the changes against\n"
1742 " another parent, use::"
1743 msgstr ""
1744
1745-#: breezy/builtins.py:2272
1746+#: breezy/builtins.py:2297
1747 msgid " brz diff -r<chosen_parent>..X"
1748 msgstr ""
1749
1750-#: breezy/builtins.py:2274
1751+#: breezy/builtins.py:2299
1752 msgid ""
1753 " The changes between the current revision and the previous revision\n"
1754 " (equivalent to -c-1 and -r-2..-1)"
1755 msgstr ""
1756
1757-#: breezy/builtins.py:2277
1758+#: breezy/builtins.py:2302
1759 msgid " brz diff -r-2.."
1760 msgstr ""
1761
1762-#: breezy/builtins.py:2279
1763+#: breezy/builtins.py:2304
1764 msgid " Show just the differences for file NEWS::"
1765 msgstr ""
1766
1767-#: breezy/builtins.py:2281
1768+#: breezy/builtins.py:2306
1769 msgid " brz diff NEWS"
1770 msgstr ""
1771
1772-#: breezy/builtins.py:2283
1773+#: breezy/builtins.py:2308
1774 msgid " Show the differences in working tree xxx for file NEWS::"
1775 msgstr ""
1776
1777-#: breezy/builtins.py:2285
1778+#: breezy/builtins.py:2310
1779 msgid " brz diff xxx/NEWS"
1780 msgstr ""
1781
1782-#: breezy/builtins.py:2287
1783+#: breezy/builtins.py:2312
1784 msgid " Show the differences from branch xxx to this working tree:"
1785 msgstr ""
1786
1787-#: breezy/builtins.py:2289
1788+#: breezy/builtins.py:2314
1789 msgid " brz diff --old xxx"
1790 msgstr ""
1791
1792-#: breezy/builtins.py:2291
1793+#: breezy/builtins.py:2316
1794 msgid " Show the differences between two branches for file NEWS::"
1795 msgstr ""
1796
1797-#: breezy/builtins.py:2293
1798+#: breezy/builtins.py:2318
1799 msgid " brz diff --old xxx --new yyy NEWS"
1800 msgstr ""
1801
1802-#: breezy/builtins.py:2295
1803+#: breezy/builtins.py:2320
1804 msgid " Same as 'brz diff' but prefix paths with old/ and new/::"
1805 msgstr ""
1806
1807-#: breezy/builtins.py:2297
1808-msgid ""
1809-" brz diff --prefix old/:new/\n"
1810-" \n"
1811-" Show the differences using a custom diff program with options::\n"
1812-" \n"
1813-" brz diff --using /usr/bin/diff --diff-options -wu"
1814+#: breezy/builtins.py:2322
1815+msgid " brz diff --prefix old/:new/"
1816+msgstr ""
1817+
1818+#: breezy/builtins.py:2324
1819+msgid " Show the differences using a custom diff program with options::"
1820+msgstr ""
1821+
1822+#: breezy/builtins.py:2326
1823+msgid " brz diff --using /usr/bin/diff --diff-options -wu"
1824 msgstr ""
1825
1826 # help of 'diff-options' option of 'diff' command
1827-#: breezy/builtins.py:2307
1828+#: breezy/builtins.py:2332
1829 msgid "Pass these options to the external diff program."
1830 msgstr ""
1831
1832 # help of 'prefix' option of 'diff' command
1833-#: breezy/builtins.py:2310
1834+#: breezy/builtins.py:2335
1835 msgid ""
1836 "Set prefixes added to old and new filenames, as two values separated by a "
1837 "colon. (eg \"old/:new/\")."
1838 msgstr ""
1839
1840 # help of 'old' option of 'diff' command
1841-#: breezy/builtins.py:2313
1842+#: breezy/builtins.py:2338
1843 msgid "Branch/tree to compare from."
1844 msgstr ""
1845
1846 # help of 'new' option of 'diff' command
1847-#: breezy/builtins.py:2317
1848+#: breezy/builtins.py:2342
1849 msgid "Branch/tree to compare to."
1850 msgstr ""
1851
1852 # help of 'using' option of 'diff' command
1853-#: breezy/builtins.py:2323
1854+#: breezy/builtins.py:2348
1855 msgid "Use this command to compare files."
1856 msgstr ""
1857
1858 # help of 'format' option of 'diff' command
1859-#: breezy/builtins.py:2328
1860+#: breezy/builtins.py:2353
1861 msgid "Diff format to use."
1862 msgstr ""
1863
1864 # title of 'format' option of 'diff' command
1865-#: breezy/builtins.py:2330
1866+#: breezy/builtins.py:2355
1867 msgid "Diff format"
1868 msgstr ""
1869
1870 # help of 'context' option of 'diff' command
1871-#: breezy/builtins.py:2332
1872+#: breezy/builtins.py:2357
1873 msgid "How many lines of context to show."
1874 msgstr ""
1875
1876-#: breezy/builtins.py:2357
1877+#: breezy/builtins.py:2382
1878 msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1879 msgstr ""
1880
1881-#: breezy/builtins.py:2361
1882+#: breezy/builtins.py:2386
1883 msgid "brz diff --revision takes exactly one or two revision specifiers"
1884 msgstr ""
1885
1886-#: breezy/builtins.py:2366 breezy/builtins.py:2763 breezy/builtins.py:2776
1887-#: breezy/builtins.py:2784 breezy/builtins.py:4957
1888+#: breezy/builtins.py:2391 breezy/builtins.py:2787 breezy/builtins.py:2795
1889 #, python-brace-format
1890 msgid "{0} and {1} are mutually exclusive"
1891 msgstr ""
1892
1893-#: breezy/builtins.py:2386
1894+#: breezy/builtins.py:2411
1895 msgid ""
1896 "List files deleted in the working tree.\n"
1897 " "
1898 msgstr ""
1899
1900-#: breezy/builtins.py:2463
1901+#: breezy/builtins.py:2486
1902 msgid "Show the tree root directory."
1903 msgstr ""
1904
1905-#: breezy/builtins.py:2465
1906+#: breezy/builtins.py:2488
1907 msgid ""
1908 "The root is the nearest enclosing directory with a .bzr control\n"
1909 "directory."
1910 msgstr ""
1911
1912-#: breezy/builtins.py:2480
1913+#: breezy/builtins.py:2504
1914 msgid "The limit argument must be an integer."
1915 msgstr ""
1916
1917-#: breezy/builtins.py:2488
1918+#: breezy/builtins.py:2512
1919 msgid "The levels argument must be an integer."
1920 msgstr ""
1921
1922-#: breezy/builtins.py:2493
1923+#: breezy/builtins.py:2517
1924 msgid "Show historical log for a branch or subset of a branch."
1925 msgstr ""
1926
1927-#: breezy/builtins.py:2495
1928+#: breezy/builtins.py:2519
1929 msgid ""
1930 "log is brz's default tool for exploring the history of a branch.\n"
1931 "The branch to use is taken from the first parameter. If no parameters\n"
1932@@ -1467,14 +1605,14 @@
1933 "Here are some simple examples::"
1934 msgstr ""
1935
1936-#: breezy/builtins.py:2500
1937+#: breezy/builtins.py:2524
1938 msgid ""
1939 " brz log log the current branch\n"
1940 " brz log foo.py log a file in its branch\n"
1941 " brz log http://server/branch log a branch on a server"
1942 msgstr ""
1943
1944-#: breezy/builtins.py:2504
1945+#: breezy/builtins.py:2528
1946 msgid ""
1947 "The filtering, ordering and information shown for each revision can\n"
1948 "be controlled as explained below. By default, all revisions are\n"
1949@@ -1484,11 +1622,11 @@
1950 "were merged."
1951 msgstr ""
1952
1953-#: breezy/builtins.py:2511
1954+#: breezy/builtins.py:2535
1955 msgid ":Output control:"
1956 msgstr ""
1957
1958-#: breezy/builtins.py:2513
1959+#: breezy/builtins.py:2537
1960 msgid ""
1961 " The log format controls how information about each revision is\n"
1962 " displayed. The standard log formats are called ``long``, ``short``\n"
1963@@ -1496,13 +1634,13 @@
1964 " for more details on log formats."
1965 msgstr ""
1966
1967-#: breezy/builtins.py:2518
1968+#: breezy/builtins.py:2542
1969 msgid ""
1970 " The following options can be used to control what information is\n"
1971 " displayed::"
1972 msgstr ""
1973
1974-#: breezy/builtins.py:2521
1975+#: breezy/builtins.py:2545
1976 msgid ""
1977 " -l N display a maximum of N revisions\n"
1978 " -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1979@@ -1511,25 +1649,25 @@
1980 " --show-ids display revision-ids (and file-ids), not just revnos"
1981 msgstr ""
1982
1983-#: breezy/builtins.py:2527
1984+#: breezy/builtins.py:2551
1985 msgid ""
1986 " Note that the default number of levels to display is a function of the\n"
1987 " log format. If the -n option is not used, the standard log formats show\n"
1988 " just the top level (mainline)."
1989 msgstr ""
1990
1991-#: breezy/builtins.py:2531
1992+#: breezy/builtins.py:2555
1993 msgid ""
1994 " Status summaries are shown using status flags like A, M, etc. To see\n"
1995 " the changes explained using words like ``added`` and ``modified``\n"
1996 " instead, use the -vv option."
1997 msgstr ""
1998
1999-#: breezy/builtins.py:2535
2000+#: breezy/builtins.py:2559
2001 msgid ":Ordering control:"
2002 msgstr ""
2003
2004-#: breezy/builtins.py:2537
2005+#: breezy/builtins.py:2561
2006 msgid ""
2007 " To display revisions from oldest to newest, use the --forward option.\n"
2008 " In most cases, using this option will have little impact on the total\n"
2009@@ -1537,17 +1675,17 @@
2010 " display revisions like --reverse does when it can."
2011 msgstr ""
2012
2013-#: breezy/builtins.py:2542
2014+#: breezy/builtins.py:2566
2015 msgid ":Revision filtering:"
2016 msgstr ""
2017
2018-#: breezy/builtins.py:2544
2019+#: breezy/builtins.py:2568
2020 msgid ""
2021 " The -r option can be used to specify what revision or range of revisions\n"
2022 " to filter against. The various forms are shown below::"
2023 msgstr ""
2024
2025-#: breezy/builtins.py:2547
2026+#: breezy/builtins.py:2571
2027 msgid ""
2028 " -rX display revision X\n"
2029 " -rX.. display revision X and later\n"
2030@@ -1555,13 +1693,13 @@
2031 " -rX..Y display from X to Y inclusive"
2032 msgstr ""
2033
2034-#: breezy/builtins.py:2552
2035+#: breezy/builtins.py:2576
2036 msgid ""
2037 " See ``brz help revisionspec`` for details on how to specify X and Y.\n"
2038 " Some common examples are given below::"
2039 msgstr ""
2040
2041-#: breezy/builtins.py:2555
2042+#: breezy/builtins.py:2579
2043 msgid ""
2044 " -r-1 show just the tip\n"
2045 " -r-10.. show the last 10 mainline revisions\n"
2046@@ -1571,7 +1709,7 @@
2047 " -rdate:yesterday.. show changes since yesterday"
2048 msgstr ""
2049
2050-#: breezy/builtins.py:2562
2051+#: breezy/builtins.py:2586
2052 msgid ""
2053 " When logging a range of revisions using -rX..Y, log starts at\n"
2054 " revision Y and searches back in history through the primary\n"
2055@@ -1581,73 +1719,73 @@
2056 " a nested merge revision and the log will be truncated accordingly."
2057 msgstr ""
2058
2059-#: breezy/builtins.py:2569
2060+#: breezy/builtins.py:2593
2061 msgid ":Path filtering:"
2062 msgstr ""
2063
2064-#: breezy/builtins.py:2571
2065+#: breezy/builtins.py:2595
2066 msgid ""
2067 " If parameters are given and the first one is not a branch, the log\n"
2068 " will be filtered to show only those revisions that changed the\n"
2069 " nominated files or directories."
2070 msgstr ""
2071
2072-#: breezy/builtins.py:2575
2073+#: breezy/builtins.py:2599
2074 msgid ""
2075 " Filenames are interpreted within their historical context. To log a\n"
2076 " deleted file, specify a revision range so that the file existed at\n"
2077 " the end or start of the range."
2078 msgstr ""
2079
2080-#: breezy/builtins.py:2579
2081+#: breezy/builtins.py:2603
2082 msgid ""
2083 " Historical context is also important when interpreting pathnames of\n"
2084 " renamed files/directories. Consider the following example:"
2085 msgstr ""
2086
2087-#: breezy/builtins.py:2582
2088+#: breezy/builtins.py:2606
2089 msgid ""
2090 " * revision 1: add tutorial.txt\n"
2091 " * revision 2: modify tutorial.txt\n"
2092 " * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
2093 msgstr ""
2094
2095-#: breezy/builtins.py:2586
2096+#: breezy/builtins.py:2610
2097 msgid " In this case:"
2098 msgstr ""
2099
2100-#: breezy/builtins.py:2588
2101+#: breezy/builtins.py:2612
2102 msgid " * ``brz log guide.txt`` will log the file added in revision 1"
2103 msgstr ""
2104
2105-#: breezy/builtins.py:2590
2106+#: breezy/builtins.py:2614
2107 msgid " * ``brz log tutorial.txt`` will log the new file added in revision 3"
2108 msgstr ""
2109
2110-#: breezy/builtins.py:2592
2111+#: breezy/builtins.py:2616
2112 msgid ""
2113 " * ``brz log -r2 -p tutorial.txt`` will show the changes made to\n"
2114 " the original file in revision 2."
2115 msgstr ""
2116
2117-#: breezy/builtins.py:2595
2118+#: breezy/builtins.py:2619
2119 msgid ""
2120 " * ``brz log -r2 -p guide.txt`` will display an error message as there\n"
2121 " was no file called guide.txt in revision 2."
2122 msgstr ""
2123
2124-#: breezy/builtins.py:2598
2125+#: breezy/builtins.py:2622
2126 msgid ""
2127 " Renames are always followed by log. By design, there is no need to\n"
2128 " explicitly ask for this (and no way to stop logging a file back\n"
2129 " until it was last renamed)."
2130 msgstr ""
2131
2132-#: breezy/builtins.py:2602
2133+#: breezy/builtins.py:2626
2134 msgid ":Other filtering:"
2135 msgstr ""
2136
2137-#: breezy/builtins.py:2604
2138+#: breezy/builtins.py:2628
2139 msgid ""
2140 " The --match option can be used for finding revisions that match a\n"
2141 " regular expression in a commit message, committer, author or bug.\n"
2142@@ -1656,24 +1794,24 @@
2143 " --match-message can be used to only match a specific field."
2144 msgstr ""
2145
2146-#: breezy/builtins.py:2610
2147+#: breezy/builtins.py:2634
2148 msgid ":Tips & tricks:"
2149 msgstr ""
2150
2151-#: breezy/builtins.py:2612
2152+#: breezy/builtins.py:2636
2153 msgid ""
2154 " GUI tools and IDEs are often better at exploring history than command\n"
2155 " line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
2156 " bzr-explorer shell, or the Loggerhead web interface. See the Bazaar\n"
2157 " Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
2158-" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
2159-msgstr ""
2160-
2161-#: breezy/builtins.py:2618
2162-msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
2163-msgstr ""
2164-
2165-#: breezy/builtins.py:2620
2166+" <http://wiki.bazaar.canonical.com/IDEIntegration>."
2167+msgstr ""
2168+
2169+#: breezy/builtins.py:2642
2170+msgid " You may find it useful to add the aliases below to ``breezy.conf``::"
2171+msgstr ""
2172+
2173+#: breezy/builtins.py:2644
2174 msgid ""
2175 " [ALIASES]\n"
2176 " tip = log -r-1\n"
2177@@ -1681,20 +1819,20 @@
2178 " show = log -v -p"
2179 msgstr ""
2180
2181-#: breezy/builtins.py:2625
2182+#: breezy/builtins.py:2649
2183 msgid ""
2184 " ``brz tip`` will then show the latest revision while ``brz top``\n"
2185 " will show the last 10 mainline revisions. To see the details of a\n"
2186 " particular revision X, ``brz show -rX``."
2187 msgstr ""
2188
2189-#: breezy/builtins.py:2629
2190+#: breezy/builtins.py:2653
2191 msgid ""
2192 " If you are interested in looking deeper into a particular merge X,\n"
2193 " use ``brz log -n0 -rX``."
2194 msgstr ""
2195
2196-#: breezy/builtins.py:2632
2197+#: breezy/builtins.py:2656
2198 msgid ""
2199 " ``brz log -v`` on a branch with lots of history is currently\n"
2200 " very slow. A fix for this issue is currently under development.\n"
2201@@ -1702,7 +1840,7 @@
2202 " be given when using the -v option."
2203 msgstr ""
2204
2205-#: breezy/builtins.py:2637
2206+#: breezy/builtins.py:2661
2207 msgid ""
2208 " brz has a generic full-text matching plugin, brz-search, that can be\n"
2209 " used to find revisions matching user names, commit messages, etc.\n"
2210@@ -1710,7 +1848,7 @@
2211 " a list of words but not others."
2212 msgstr ""
2213
2214-#: breezy/builtins.py:2642
2215+#: breezy/builtins.py:2666
2216 msgid ""
2217 " When exploring non-mainline history on large projects with deep\n"
2218 " history, the performance of log can be greatly improved by installing\n"
2219@@ -1719,177 +1857,178 @@
2220 msgstr ""
2221
2222 # help of 'forward' option of 'log' command
2223-#: breezy/builtins.py:2651
2224+#: breezy/builtins.py:2675
2225 msgid "Show from oldest to newest."
2226 msgstr ""
2227
2228 # help of 'verbose' option of 'log' command
2229-#: breezy/builtins.py:2654
2230+#: breezy/builtins.py:2678
2231 msgid "Show files changed in each revision."
2232 msgstr ""
2233
2234 # help of 'change' option of 'log' command
2235-#: breezy/builtins.py:2660
2236+#: breezy/builtins.py:2684
2237 msgid "Show just the specified revision. See also \"help revisionspec\"."
2238 msgstr ""
2239
2240 # help of 'authors' option of 'log' command
2241-#: breezy/builtins.py:2664
2242+#: breezy/builtins.py:2688
2243 msgid "What names to list as authors - first, all or committer."
2244 msgstr ""
2245
2246 # title of 'authors' option of 'log' command
2247-#: breezy/builtins.py:2665
2248+#: breezy/builtins.py:2689
2249 msgid "Authors"
2250 msgstr ""
2251
2252 # help of 'levels' option of 'log' command
2253-#: breezy/builtins.py:2670
2254+#: breezy/builtins.py:2695
2255 msgid "Number of levels to display - 0 for all, 1 for flat."
2256 msgstr ""
2257
2258 # help of 'limit' option of 'log' command
2259-#: breezy/builtins.py:2680
2260+#: breezy/builtins.py:2705
2261 msgid "Limit the output to the first N revisions."
2262 msgstr ""
2263
2264 # help of 'show-diff' option of 'log' command
2265-#: breezy/builtins.py:2685
2266+#: breezy/builtins.py:2710
2267 msgid "Show changes made in each revision as a patch."
2268 msgstr ""
2269
2270 # help of 'include-merged' option of 'log' command
2271-#: breezy/builtins.py:2687
2272+#: breezy/builtins.py:2712
2273 msgid "Show merged revisions like --levels 0 does."
2274 msgstr ""
2275
2276 # help of 'omit-merges' option of 'log' command
2277-#: breezy/builtins.py:2691
2278+#: breezy/builtins.py:2716
2279 msgid "Do not report commits with more than one parent."
2280 msgstr ""
2281
2282 # help of 'exclude-common-ancestry' option of 'log' command
2283-#: breezy/builtins.py:2693
2284+#: breezy/builtins.py:2718
2285 msgid ""
2286 "Display only the revisions that are not part of both ancestries (require -"
2287 "rX..Y)."
2288 msgstr ""
2289
2290 # help of 'signatures' option of 'log' command
2291-#: breezy/builtins.py:2697
2292+#: breezy/builtins.py:2722
2293 msgid "Show digital signature validity."
2294 msgstr ""
2295
2296 # help of 'match' option of 'log' command
2297-#: breezy/builtins.py:2700
2298+#: breezy/builtins.py:2725
2299 msgid "Show revisions whose properties match this expression."
2300 msgstr ""
2301
2302 # help of 'match-message' option of 'log' command
2303-#: breezy/builtins.py:2704
2304+#: breezy/builtins.py:2729
2305 msgid "Show revisions whose message matches this expression."
2306 msgstr ""
2307
2308 # help of 'match-committer' option of 'log' command
2309-#: breezy/builtins.py:2708
2310+#: breezy/builtins.py:2733
2311 msgid "Show revisions whose committer matches this expression."
2312 msgstr ""
2313
2314 # help of 'match-author' option of 'log' command
2315-#: breezy/builtins.py:2712
2316+#: breezy/builtins.py:2737
2317 msgid "Show revisions whose authors match this expression."
2318 msgstr ""
2319
2320 # help of 'match-bugs' option of 'log' command
2321-#: breezy/builtins.py:2716
2322+#: breezy/builtins.py:2741
2323 msgid "Show revisions whose bugs match this expression."
2324 msgstr ""
2325
2326-#: breezy/builtins.py:2770
2327+#: breezy/builtins.py:2781
2328 msgid "--exclude-common-ancestry requires -r with two revisions"
2329 msgstr ""
2330
2331-#: breezy/builtins.py:2798
2332+#: breezy/builtins.py:2809
2333 #, python-format
2334 msgid "Path unknown at end or start of revision range: %s"
2335 msgstr ""
2336
2337-#: breezy/builtins.py:2915
2338+#: breezy/builtins.py:2927
2339 #, python-format
2340 msgid "brz %s doesn't accept two revisions in different branches."
2341 msgstr ""
2342
2343-#: breezy/builtins.py:2931
2344+#: breezy/builtins.py:2943
2345 #, python-format
2346 msgid "brz %s --revision takes one or two values."
2347 msgstr ""
2348
2349-#: breezy/builtins.py:2976
2350+#: breezy/builtins.py:2988
2351 msgid ""
2352 "List files in a tree.\n"
2353 " "
2354 msgstr ""
2355
2356 # help of 'recursive' option of 'ls' command
2357-#: breezy/builtins.py:2985
2358+#: breezy/builtins.py:2997
2359 msgid "Recurse into subdirectories."
2360 msgstr ""
2361
2362 # help of 'from-root' option of 'ls' command
2363-#: breezy/builtins.py:2987
2364+#: breezy/builtins.py:2999
2365 msgid "Print paths relative to the root of the branch."
2366 msgstr ""
2367
2368 # help of 'unknown' option of 'ls' command
2369-#: breezy/builtins.py:2989
2370+#: breezy/builtins.py:3001
2371 msgid "Print unknown files."
2372 msgstr ""
2373
2374 # help of 'versioned' option of 'ls' command
2375-#: breezy/builtins.py:2990
2376+#: breezy/builtins.py:3002
2377 msgid "Print versioned files."
2378 msgstr ""
2379
2380 # help of 'ignored' option of 'ls' command
2381-#: breezy/builtins.py:2993
2382+#: breezy/builtins.py:3005
2383 msgid "Print ignored files."
2384 msgstr ""
2385
2386 # help of 'kind' option of 'ls' command
2387-#: breezy/builtins.py:2995
2388-msgid "List entries of a particular kind: file, directory, symlink."
2389+#: breezy/builtins.py:3007
2390+msgid ""
2391+"List entries of a particular kind: file, directory, symlink, tree-reference."
2392 msgstr ""
2393
2394-#: breezy/builtins.py:3008
2395+#: breezy/builtins.py:3022
2396 msgid "invalid kind specified"
2397 msgstr ""
2398
2399-#: breezy/builtins.py:3011
2400+#: breezy/builtins.py:3026
2401 msgid "Cannot set both --verbose and --null"
2402 msgstr ""
2403
2404-#: breezy/builtins.py:3020
2405+#: breezy/builtins.py:3035
2406 msgid "cannot specify both --from-root and PATH"
2407 msgstr ""
2408
2409-#: breezy/builtins.py:3107
2410+#: breezy/builtins.py:3122
2411 msgid "Ignore specified files or patterns."
2412 msgstr ""
2413
2414-#: breezy/builtins.py:3109
2415+#: breezy/builtins.py:3124
2416 msgid "See ``brz help patterns`` for details on the syntax of patterns."
2417 msgstr ""
2418
2419-#: breezy/builtins.py:3111
2420+#: breezy/builtins.py:3126
2421 msgid ""
2422 "If a .bzrignore file does not exist, the ignore command\n"
2423 "will create one and add the specified files or patterns to the newly\n"
2424-"created file. The ignore command will also automatically add the \n"
2425+"created file. The ignore command will also automatically add the\n"
2426 ".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2427 "the use of the ignore command will require an explicit add command."
2428 msgstr ""
2429
2430-#: breezy/builtins.py:3117
2431+#: breezy/builtins.py:3132
2432 msgid ""
2433 "To remove patterns from the ignore list, edit the .bzrignore file.\n"
2434 "After adding, editing or deleting that file either indirectly by\n"
2435@@ -1897,7 +2036,7 @@
2436 "it."
2437 msgstr ""
2438
2439-#: breezy/builtins.py:3122
2440+#: breezy/builtins.py:3137
2441 msgid ""
2442 "Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2443 "the global ignore file can be found in the application data directory as\n"
2444@@ -1906,116 +2045,123 @@
2445 "can be edited directly using an editor."
2446 msgstr ""
2447
2448-#: breezy/builtins.py:3128
2449+#: breezy/builtins.py:3143
2450 msgid ""
2451 "Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2452 "precedence over regular ignores. Such exceptions are used to specify\n"
2453 "files that should be versioned which would otherwise be ignored."
2454 msgstr ""
2455
2456-#: breezy/builtins.py:3132
2457+#: breezy/builtins.py:3147
2458 msgid ""
2459 "Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2460 "precedence over the '!' exception patterns."
2461 msgstr ""
2462
2463-#: breezy/builtins.py:3135
2464+#: breezy/builtins.py:3150
2465+msgid ":Notes:"
2466+msgstr ""
2467+
2468+#: breezy/builtins.py:3152
2469 msgid ""
2470-":Notes: \n"
2471-" \n"
2472 "* Ignore patterns containing shell wildcards must be quoted from\n"
2473 " the shell on Unix."
2474 msgstr ""
2475
2476-#: breezy/builtins.py:3140
2477+#: breezy/builtins.py:3155
2478 msgid ""
2479 "* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2480 " To ignore patterns that begin with that character, use the \"RE:\" prefix."
2481 msgstr ""
2482
2483-#: breezy/builtins.py:3143
2484+#: breezy/builtins.py:3158
2485 msgid ""
2486 ":Examples:\n"
2487 " Ignore the top level Makefile::"
2488 msgstr ""
2489
2490-#: breezy/builtins.py:3146
2491+#: breezy/builtins.py:3161
2492 msgid " brz ignore ./Makefile"
2493 msgstr ""
2494
2495-#: breezy/builtins.py:3148
2496+#: breezy/builtins.py:3163
2497 msgid " Ignore .class files in all directories...::"
2498 msgstr ""
2499
2500-#: breezy/builtins.py:3150
2501+#: breezy/builtins.py:3165
2502 msgid " brz ignore \"*.class\""
2503 msgstr ""
2504
2505-#: breezy/builtins.py:3152
2506+#: breezy/builtins.py:3167
2507 msgid " ...but do not ignore \"special.class\"::"
2508 msgstr ""
2509
2510-#: breezy/builtins.py:3154
2511+#: breezy/builtins.py:3169
2512 msgid " brz ignore \"!special.class\""
2513 msgstr ""
2514
2515-#: breezy/builtins.py:3156
2516+#: breezy/builtins.py:3171
2517 msgid " Ignore files whose name begins with the \"#\" character::"
2518 msgstr ""
2519
2520-#: breezy/builtins.py:3158
2521+#: breezy/builtins.py:3173
2522 msgid " brz ignore \"RE:^#\""
2523 msgstr ""
2524
2525-#: breezy/builtins.py:3160 breezy/builtins.py:3164
2526+#: breezy/builtins.py:3175 breezy/builtins.py:3179
2527 msgid " Ignore .o files under the lib directory::"
2528 msgstr ""
2529
2530-#: breezy/builtins.py:3162
2531+#: breezy/builtins.py:3177
2532 msgid " brz ignore \"lib/**/*.o\""
2533 msgstr ""
2534
2535-#: breezy/builtins.py:3166
2536+#: breezy/builtins.py:3181
2537 msgid " brz ignore \"RE:lib/.*\\.o\""
2538 msgstr ""
2539
2540-#: breezy/builtins.py:3168
2541+#: breezy/builtins.py:3183
2542 msgid " Ignore everything but the \"debian\" toplevel directory::"
2543 msgstr ""
2544
2545-#: breezy/builtins.py:3170
2546+#: breezy/builtins.py:3185
2547+msgid " brz ignore \"RE:(?!debian/).*\""
2548+msgstr ""
2549+
2550+#: breezy/builtins.py:3187
2551 msgid ""
2552-" brz ignore \"RE:(?!debian/).*\"\n"
2553-" \n"
2554 " Ignore everything except the \"local\" toplevel directory,\n"
2555-" but always ignore autosave files ending in ~, even under local/::\n"
2556-" \n"
2557+" but always ignore autosave files ending in ~, even under local/::"
2558+msgstr ""
2559+
2560+#: breezy/builtins.py:3190
2561+msgid ""
2562 " brz ignore \"*\"\n"
2563 " brz ignore \"!./local\"\n"
2564 " brz ignore \"!!*~\""
2565 msgstr ""
2566
2567 # help of 'default-rules' option of 'ignore' command
2568-#: breezy/builtins.py:3184
2569+#: breezy/builtins.py:3199
2570 msgid "Display the default ignore rules that brz uses."
2571 msgstr ""
2572
2573-#: breezy/builtins.py:3196
2574+#: breezy/builtins.py:3211
2575 msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2576 msgstr ""
2577
2578-#: breezy/builtins.py:3207
2579+#: breezy/builtins.py:3222
2580 #, python-format
2581 msgid "Invalid ignore pattern found. %s"
2582 msgid_plural "Invalid ignore patterns found. %s"
2583 msgstr[0] ""
2584 msgstr[1] ""
2585
2586-#: breezy/builtins.py:3216
2587+#: breezy/builtins.py:3231
2588 msgid "NAME_PATTERN should not be an absolute path"
2589 msgstr ""
2590
2591-#: breezy/builtins.py:3229
2592+#: breezy/builtins.py:3244
2593 #, python-format
2594 msgid ""
2595 "Warning: the following files are version controlled and match your ignore "
2596@@ -2025,62 +2171,62 @@
2597 "them.\n"
2598 msgstr ""
2599
2600-#: breezy/builtins.py:3236
2601+#: breezy/builtins.py:3251
2602 msgid "List ignored files and the patterns that matched them."
2603 msgstr ""
2604
2605-#: breezy/builtins.py:3238
2606+#: breezy/builtins.py:3253
2607 msgid ""
2608 "List all the ignored files and the ignore pattern that caused the file to\n"
2609 "be ignored."
2610 msgstr ""
2611
2612-#: breezy/builtins.py:3241
2613+#: breezy/builtins.py:3256
2614 msgid "Alternatively, to list just the files::"
2615 msgstr ""
2616
2617-#: breezy/builtins.py:3243
2618+#: breezy/builtins.py:3258
2619 msgid " brz ls --ignored"
2620 msgstr ""
2621
2622-#: breezy/builtins.py:3277
2623+#: breezy/builtins.py:3292
2624 #, python-format
2625 msgid "not a valid revision-number: %r"
2626 msgstr ""
2627
2628-#: breezy/builtins.py:3284
2629+#: breezy/builtins.py:3300
2630 msgid "Export current or past revision to a destination directory or archive."
2631 msgstr ""
2632
2633-#: breezy/builtins.py:3286
2634+#: breezy/builtins.py:3302
2635 msgid "If no revision is specified this exports the last committed revision."
2636 msgstr ""
2637
2638-#: breezy/builtins.py:3288
2639+#: breezy/builtins.py:3304
2640 msgid ""
2641 "Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2642 "given, try to find the format with the extension. If no extension\n"
2643 "is found exports to a directory (equivalent to --format=dir)."
2644 msgstr ""
2645
2646-#: breezy/builtins.py:3292
2647+#: breezy/builtins.py:3308
2648 msgid ""
2649 "If root is supplied, it will be used as the root directory inside\n"
2650 "container formats (tar, zip, etc). If it is not supplied it will default\n"
2651 "to the exported filename. The root option has no effect for 'dir' format."
2652 msgstr ""
2653
2654-#: breezy/builtins.py:3296
2655+#: breezy/builtins.py:3312
2656 msgid ""
2657 "If branch is omitted then the branch containing the current working\n"
2658 "directory will be used."
2659 msgstr ""
2660
2661-#: breezy/builtins.py:3299
2662+#: breezy/builtins.py:3315
2663 msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2664 msgstr ""
2665
2666-#: breezy/builtins.py:3301
2667+#: breezy/builtins.py:3317
2668 msgid ""
2669 " ================= =========================\n"
2670 " Supported formats Autodetected by extension\n"
2671@@ -2094,78 +2240,78 @@
2672 msgstr ""
2673
2674 # help of 'format' option of 'export' command
2675-#: breezy/builtins.py:3315
2676+#: breezy/builtins.py:3332
2677 msgid "Type of file to export to."
2678 msgstr ""
2679
2680 # help of 'filters' option of 'export' command
2681-#: breezy/builtins.py:3318
2682+#: breezy/builtins.py:3335
2683 msgid "Apply content filters to export the convenient form."
2684 msgstr ""
2685
2686 # help of 'root' option of 'export' command
2687-#: breezy/builtins.py:3322
2688+#: breezy/builtins.py:3339
2689 msgid "Name of the root directory inside the exported file."
2690 msgstr ""
2691
2692 # help of 'per-file-timestamps' option of 'export' command
2693-#: breezy/builtins.py:3324
2694+#: breezy/builtins.py:3341
2695 msgid ""
2696 "Set modification time of files to that of the last revision in which it was "
2697 "changed."
2698 msgstr ""
2699
2700 # help of 'uncommitted' option of 'export' command
2701-#: breezy/builtins.py:3327
2702+#: breezy/builtins.py:3344
2703 msgid "Export the working tree contents rather than that of the last revision."
2704 msgstr ""
2705
2706-#: breezy/builtins.py:3346
2707+#: breezy/builtins.py:3364
2708 msgid "--uncommitted requires a working tree"
2709 msgstr ""
2710
2711-#: breezy/builtins.py:3355
2712+#: breezy/builtins.py:3392
2713 #, python-format
2714 msgid "Unsupported export format: %s"
2715 msgstr ""
2716
2717-#: breezy/builtins.py:3359
2718+#: breezy/builtins.py:3396
2719 msgid "Write the contents of a file as of a given revision to standard output."
2720 msgstr ""
2721
2722-#: breezy/builtins.py:3361
2723+#: breezy/builtins.py:3398
2724 msgid "If no revision is nominated, the last revision is used."
2725 msgstr ""
2726
2727-#: breezy/builtins.py:3363
2728+#: breezy/builtins.py:3400
2729 msgid ""
2730 "Note: Take care to redirect standard output when using this command on a\n"
2731 "binary file."
2732 msgstr ""
2733
2734 # help of 'name-from-revision' option of 'cat' command
2735-#: breezy/builtins.py:3369
2736+#: breezy/builtins.py:3407
2737 msgid "The path name in the old tree."
2738 msgstr ""
2739
2740 # help of 'filters' option of 'cat' command
2741-#: breezy/builtins.py:3370
2742+#: breezy/builtins.py:3408
2743 msgid "Apply content filters to display the convenience form."
2744 msgstr ""
2745
2746-#: breezy/builtins.py:3381
2747+#: breezy/builtins.py:3419
2748 msgid "brz cat --revision takes exactly one revision specifier"
2749 msgstr ""
2750
2751-#: breezy/builtins.py:3406 breezy/builtins.py:3418
2752+#: breezy/builtins.py:3445 breezy/builtins.py:3457
2753 msgid "{0!r} is not present in revision {1}"
2754 msgstr ""
2755
2756-#: breezy/builtins.py:3441
2757+#: breezy/builtins.py:3481
2758 msgid "Commit changes into a new revision."
2759 msgstr ""
2760
2761-#: breezy/builtins.py:3443
2762+#: breezy/builtins.py:3483
2763 msgid ""
2764 "An explanatory message needs to be given for each commit. This is\n"
2765 "often done by using the --message option (getting the message from the\n"
2766@@ -2175,44 +2321,44 @@
2767 "boilerplate text loaded into the editor, use the --show-diff option."
2768 msgstr ""
2769
2770-#: breezy/builtins.py:3450
2771+#: breezy/builtins.py:3490
2772 msgid ""
2773 "By default, the entire tree is committed and the person doing the\n"
2774 "commit is assumed to be the author. These defaults can be overridden\n"
2775 "as explained below."
2776 msgstr ""
2777
2778-#: breezy/builtins.py:3454
2779+#: breezy/builtins.py:3494
2780 msgid ":Selective commits:"
2781 msgstr ""
2782
2783-#: breezy/builtins.py:3456
2784+#: breezy/builtins.py:3496
2785 msgid ""
2786 " If selected files are specified, only changes to those files are\n"
2787 " committed. If a directory is specified then the directory and\n"
2788 " everything within it is committed."
2789 msgstr ""
2790
2791-#: breezy/builtins.py:3460
2792+#: breezy/builtins.py:3500
2793 msgid ""
2794 " When excludes are given, they take precedence over selected files.\n"
2795 " For example, to commit only changes within foo, but not changes\n"
2796 " within foo/bar::"
2797 msgstr ""
2798
2799-#: breezy/builtins.py:3464
2800+#: breezy/builtins.py:3504
2801 msgid " brz commit foo -x foo/bar"
2802 msgstr ""
2803
2804-#: breezy/builtins.py:3466
2805+#: breezy/builtins.py:3506
2806 msgid " A selective commit after a merge is not yet supported."
2807 msgstr ""
2808
2809-#: breezy/builtins.py:3468
2810+#: breezy/builtins.py:3508
2811 msgid ":Custom authors:"
2812 msgstr ""
2813
2814-#: breezy/builtins.py:3470
2815+#: breezy/builtins.py:3510
2816 msgid ""
2817 " If the author of the change is not the same person as the committer,\n"
2818 " you can specify the author's name using the --author option. The\n"
2819@@ -2222,11 +2368,11 @@
2820 " author."
2821 msgstr ""
2822
2823-#: breezy/builtins.py:3477
2824+#: breezy/builtins.py:3517
2825 msgid ":Checks:"
2826 msgstr ""
2827
2828-#: breezy/builtins.py:3479
2829+#: breezy/builtins.py:3519
2830 msgid ""
2831 " A common mistake is to forget to add a new file or directory before\n"
2832 " running the commit command. The --strict option checks for unknown\n"
2833@@ -2235,18 +2381,18 @@
2834 " for details."
2835 msgstr ""
2836
2837-#: breezy/builtins.py:3485
2838+#: breezy/builtins.py:3525
2839 msgid ":Things to note:"
2840 msgstr ""
2841
2842-#: breezy/builtins.py:3487
2843+#: breezy/builtins.py:3527
2844 msgid ""
2845 " If you accidentially commit the wrong changes or make a spelling\n"
2846 " mistake in the commit message say, you can use the uncommit command\n"
2847 " to undo it. See ``brz help uncommit`` for details."
2848 msgstr ""
2849
2850-#: breezy/builtins.py:3491
2851+#: breezy/builtins.py:3531
2852 msgid ""
2853 " Hooks can also be configured to run after a commit. This allows you\n"
2854 " to trigger updates to external systems like bug trackers. The --fixes\n"
2855@@ -2255,69 +2401,74 @@
2856 msgstr ""
2857
2858 # help of 'exclude' option of 'commit' command
2859-#: breezy/builtins.py:3501
2860+#: breezy/builtins.py:3542
2861 msgid "Do not consider changes made to a given path."
2862 msgstr ""
2863
2864 # help of 'message' option of 'commit' command
2865-#: breezy/builtins.py:3504
2866+#: breezy/builtins.py:3545
2867 msgid "Description of the new revision."
2868 msgstr ""
2869
2870 # help of 'unchanged' option of 'commit' command
2871-#: breezy/builtins.py:3507
2872+#: breezy/builtins.py:3548
2873 msgid "Commit even if nothing has changed."
2874 msgstr ""
2875
2876 # help of 'file' option of 'commit' command
2877-#: breezy/builtins.py:3511
2878+#: breezy/builtins.py:3552
2879 msgid "Take commit message from this file."
2880 msgstr ""
2881
2882 # help of 'strict' option of 'commit' command
2883-#: breezy/builtins.py:3513
2884+#: breezy/builtins.py:3554
2885 msgid "Refuse to commit if there are unknown files in the working tree."
2886 msgstr ""
2887
2888 # help of 'commit-time' option of 'commit' command
2889-#: breezy/builtins.py:3516
2890+#: breezy/builtins.py:3557
2891 msgid ""
2892 "Manually set a commit time using commit date format, e.g. '2009-10-10 "
2893 "08:00:00 +0100'."
2894 msgstr ""
2895
2896+# help of 'bugs' option of 'commit' command
2897+#: breezy/builtins.py:3561
2898+msgid "Link to a related bug. (see \"brz help bugs\")."
2899+msgstr ""
2900+
2901 # help of 'fixes' option of 'commit' command
2902-#: breezy/builtins.py:3519
2903+#: breezy/builtins.py:3564
2904 msgid "Mark a bug as being fixed by this revision (see \"brz help bugs\")."
2905 msgstr ""
2906
2907 # help of 'author' option of 'commit' command
2908-#: breezy/builtins.py:3522
2909+#: breezy/builtins.py:3568
2910 msgid "Set the author's name, if it's different from the committer."
2911 msgstr ""
2912
2913 # help of 'local' option of 'commit' command
2914-#: breezy/builtins.py:3525
2915+#: breezy/builtins.py:3571
2916 msgid ""
2917 "Perform a local commit in a bound branch. Local commits are not pushed to "
2918 "the master branch until a normal commit is performed."
2919 msgstr ""
2920
2921 # help of 'show-diff' option of 'commit' command
2922-#: breezy/builtins.py:3531
2923+#: breezy/builtins.py:3577
2924 msgid ""
2925 "When no message is supplied, show the diff along with the status summary in "
2926 "the message editor."
2927 msgstr ""
2928
2929 # help of 'lossy' option of 'commit' command
2930-#: breezy/builtins.py:3534
2931+#: breezy/builtins.py:3580
2932 msgid ""
2933 "When committing to a foreign version control system do not push data that "
2934 "can not be natively represented."
2935 msgstr ""
2936
2937-#: breezy/builtins.py:3552
2938+#: breezy/builtins.py:3597
2939 #, python-format
2940 msgid ""
2941 "No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2942@@ -2325,7 +2476,7 @@
2943 "See \"brz help bugs\" for more information on this feature. Commit refused."
2944 msgstr ""
2945
2946-#: breezy/builtins.py:3561
2947+#: breezy/builtins.py:3606
2948 #, python-format
2949 msgid ""
2950 "Invalid bug %s. Must be in the form of 'tracker:id'. See \"brz help bugs\" "
2951@@ -2333,91 +2484,91 @@
2952 "Commit refused."
2953 msgstr ""
2954
2955-#: breezy/builtins.py:3570
2956+#: breezy/builtins.py:3615
2957 #, python-format
2958 msgid "Unrecognized bug %s. Commit refused."
2959 msgstr ""
2960
2961-#: breezy/builtins.py:3573
2962+#: breezy/builtins.py:3618
2963 #, python-format
2964 msgid ""
2965 "%s\n"
2966 "Commit refused."
2967 msgstr ""
2968
2969-#: breezy/builtins.py:3597
2970+#: breezy/builtins.py:3645
2971 msgid "Could not parse --commit-time: "
2972 msgstr ""
2973
2974-#: breezy/builtins.py:3637
2975+#: breezy/builtins.py:3689
2976 msgid "please specify either --message or --file"
2977 msgstr ""
2978
2979-#: breezy/builtins.py:3666
2980+#: breezy/builtins.py:3719
2981 msgid "please specify a commit message with either --message or --file"
2982 msgstr ""
2983
2984-#: breezy/builtins.py:3669
2985+#: breezy/builtins.py:3722
2986 msgid ""
2987 "Empty commit message specified. Please specify a commit message with either "
2988 "--message or --file or leave a blank message with --message \"\"."
2989 msgstr ""
2990
2991-#: breezy/builtins.py:3689
2992+#: breezy/builtins.py:3742
2993 msgid ""
2994 "No changes to commit. Please 'brz add' the files you want to commit, or use "
2995 "--unchanged to force an empty commit."
2996 msgstr ""
2997
2998-#: breezy/builtins.py:3693
2999+#: breezy/builtins.py:3746
3000 msgid ""
3001 "Conflicts detected in working tree. Use \"brz conflicts\" to list, \"brz "
3002 "resolve FILE\" to resolve."
3003 msgstr ""
3004
3005-#: breezy/builtins.py:3697
3006+#: breezy/builtins.py:3750
3007 msgid "Commit refused because there are unknown files in the working tree."
3008 msgstr ""
3009
3010-#: breezy/builtins.py:3700
3011+#: breezy/builtins.py:3753
3012 msgid ""
3013 "\n"
3014 "To commit to master branch, run update and then commit.\n"
3015 "You can also pass --local to commit to continue working disconnected."
3016 msgstr ""
3017
3018-#: breezy/builtins.py:3708
3019+#: breezy/builtins.py:3761
3020 msgid ""
3021 "Validate working tree structure, branch consistency and repository history."
3022 msgstr ""
3023
3024-#: breezy/builtins.py:3710
3025+#: breezy/builtins.py:3763
3026 msgid ""
3027 "This command checks various invariants about branch and repository storage\n"
3028 "to detect data corruption or brz bugs."
3029 msgstr ""
3030
3031-#: breezy/builtins.py:3713
3032+#: breezy/builtins.py:3766
3033 msgid ""
3034 "The working tree and branch checks will only give output if a problem is\n"
3035 "detected. The output fields of the repository check are:"
3036 msgstr ""
3037
3038-#: breezy/builtins.py:3716
3039+#: breezy/builtins.py:3769
3040 msgid ""
3041 "revisions\n"
3042 " This is just the number of revisions checked. It doesn't\n"
3043 " indicate a problem."
3044 msgstr ""
3045
3046-#: breezy/builtins.py:3720
3047+#: breezy/builtins.py:3773
3048 msgid ""
3049 "versionedfiles\n"
3050 " This is just the number of versionedfiles checked. It\n"
3051 " doesn't indicate a problem."
3052 msgstr ""
3053
3054-#: breezy/builtins.py:3724
3055+#: breezy/builtins.py:3777
3056 msgid ""
3057 "unreferenced ancestors\n"
3058 " Texts that are ancestors of other texts, but\n"
3059@@ -2425,14 +2576,14 @@
3060 " subtle problem that Bazaar can work around."
3061 msgstr ""
3062
3063-#: breezy/builtins.py:3729
3064+#: breezy/builtins.py:3782
3065 msgid ""
3066 "unique file texts\n"
3067 " This is the total number of unique file contents\n"
3068 " seen in the checked revisions. It does not indicate a problem."
3069 msgstr ""
3070
3071-#: breezy/builtins.py:3733
3072+#: breezy/builtins.py:3786
3073 msgid ""
3074 "repeated file texts\n"
3075 " This is the total number of repeated texts seen\n"
3076@@ -2441,57 +2592,57 @@
3077 " indicate a problem."
3078 msgstr ""
3079
3080-#: breezy/builtins.py:3739
3081+#: breezy/builtins.py:3792
3082 msgid ""
3083 "If no restrictions are specified, all Bazaar data that is found at the "
3084 "given\n"
3085 "location will be checked."
3086 msgstr ""
3087
3088-#: breezy/builtins.py:3744
3089+#: breezy/builtins.py:3797
3090 msgid " Check the tree and branch at 'foo'::"
3091 msgstr ""
3092
3093-#: breezy/builtins.py:3746
3094+#: breezy/builtins.py:3799
3095 msgid " brz check --tree --branch foo"
3096 msgstr ""
3097
3098-#: breezy/builtins.py:3748
3099+#: breezy/builtins.py:3801
3100 msgid " Check only the repository at 'bar'::"
3101 msgstr ""
3102
3103-#: breezy/builtins.py:3750
3104+#: breezy/builtins.py:3803
3105 msgid " brz check --repo bar"
3106 msgstr ""
3107
3108-#: breezy/builtins.py:3752
3109+#: breezy/builtins.py:3805
3110 msgid " Check everything at 'baz'::"
3111 msgstr ""
3112
3113-#: breezy/builtins.py:3754
3114+#: breezy/builtins.py:3807
3115 msgid " brz check baz"
3116 msgstr ""
3117
3118 # help of 'branch' option of 'check' command
3119-#: breezy/builtins.py:3760
3120+#: breezy/builtins.py:3813
3121 msgid "Check the branch related to the current directory."
3122 msgstr ""
3123
3124 # help of 'repo' option of 'check' command
3125-#: breezy/builtins.py:3762
3126+#: breezy/builtins.py:3815
3127 msgid "Check the repository related to the current directory."
3128 msgstr ""
3129
3130 # help of 'tree' option of 'check' command
3131-#: breezy/builtins.py:3764
3132+#: breezy/builtins.py:3817
3133 msgid "Check the working tree related to the current directory."
3134 msgstr ""
3135
3136-#: breezy/builtins.py:3778
3137+#: breezy/builtins.py:3831
3138 msgid "Upgrade a repository, branch or working tree to a newer format."
3139 msgstr ""
3140
3141-#: breezy/builtins.py:3780
3142+#: breezy/builtins.py:3833
3143 msgid ""
3144 "When the default format has changed after a major new release of\n"
3145 "Bazaar, you may be informed during certain operations that you\n"
3146@@ -2500,7 +2651,7 @@
3147 "with older repositories or with older versions of Bazaar."
3148 msgstr ""
3149
3150-#: breezy/builtins.py:3786
3151+#: breezy/builtins.py:3839
3152 msgid ""
3153 "If you wish to upgrade to a particular format rather than the\n"
3154 "current default, that can be specified using the --format option.\n"
3155@@ -2510,7 +2661,7 @@
3156 "2.x default) so downgrading is not always possible."
3157 msgstr ""
3158
3159-#: breezy/builtins.py:3793
3160+#: breezy/builtins.py:3846
3161 msgid ""
3162 "A backup.bzr.~#~ directory is created at the start of the conversion\n"
3163 "process (where # is a number). By default, this is left there on\n"
3164@@ -2521,7 +2672,7 @@
3165 "afterwards."
3166 msgstr ""
3167
3168-#: breezy/builtins.py:3801
3169+#: breezy/builtins.py:3854
3170 msgid ""
3171 "If the location given is a shared repository, dependent branches\n"
3172 "are also converted provided the repository converts successfully.\n"
3173@@ -2529,166 +2680,170 @@
3174 "tried."
3175 msgstr ""
3176
3177-#: breezy/builtins.py:3806
3178+#: breezy/builtins.py:3859
3179 msgid ""
3180 "For more information on upgrades, see the Bazaar Upgrade Guide,\n"
3181 "http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
3182 msgstr ""
3183
3184 # help of 'format' option of 'upgrade' command
3185-#: breezy/builtins.py:3814
3186+#: breezy/builtins.py:3867
3187 msgid "Upgrade to a specific format. See \"brz help formats\" for details."
3188 msgstr ""
3189
3190 # title of 'format' option of 'init' command
3191 # title of 'format' option of 'upgrade' command
3192-#: breezy/builtins.py:3818
3193+#: breezy/builtins.py:3872
3194 msgid "Branch format"
3195 msgstr ""
3196
3197 # help of 'clean' option of 'upgrade' command
3198-#: breezy/builtins.py:3820
3199+#: breezy/builtins.py:3874
3200 msgid "Remove the backup.bzr directory if successful."
3201 msgstr ""
3202
3203 # help of 'dry-run' option of 'add' command
3204 # help of 'dry-run' option of 'upgrade' command
3205-#: breezy/builtins.py:3822
3206+#: breezy/builtins.py:3876
3207 msgid "Show what would be done, but don't actually do anything."
3208 msgstr ""
3209
3210-#: breezy/builtins.py:3837
3211+#: breezy/builtins.py:3891
3212 msgid "Show or set brz user id."
3213 msgstr ""
3214
3215-#: breezy/builtins.py:3839
3216+#: breezy/builtins.py:3893
3217 msgid ""
3218 ":Examples:\n"
3219 " Show the email of the current user::"
3220 msgstr ""
3221
3222-#: breezy/builtins.py:3842
3223+#: breezy/builtins.py:3896
3224 msgid " brz whoami --email"
3225 msgstr ""
3226
3227-#: breezy/builtins.py:3844
3228+#: breezy/builtins.py:3898
3229 msgid " Set the current user::"
3230 msgstr ""
3231
3232-#: breezy/builtins.py:3846
3233+#: breezy/builtins.py:3900
3234 msgid " brz whoami \"Frank Chu <fchu@example.com>\""
3235 msgstr ""
3236
3237 # help of 'email' option of 'whoami' command
3238-#: breezy/builtins.py:3850
3239+#: breezy/builtins.py:3904
3240 msgid "Display email address only."
3241 msgstr ""
3242
3243 # help of 'branch' option of 'whoami' command
3244-#: breezy/builtins.py:3852
3245+#: breezy/builtins.py:3906
3246 msgid "Set identity for the current branch instead of globally."
3247 msgstr ""
3248
3249-#: breezy/builtins.py:3878
3250+#: breezy/builtins.py:3932
3251 msgid "--email can only be used to display existing identity"
3252 msgstr ""
3253
3254-#: breezy/builtins.py:3902
3255+#: breezy/builtins.py:3956
3256 msgid "Print or set the branch nickname."
3257 msgstr ""
3258
3259-#: breezy/builtins.py:3904
3260+#: breezy/builtins.py:3958
3261 msgid ""
3262 "If unset, the colocated branch name is used for colocated branches, and\n"
3263 "the branch directory name is used for other branches. To print the\n"
3264 "current nickname, execute with no argument."
3265 msgstr ""
3266
3267-#: breezy/builtins.py:3908
3268+#: breezy/builtins.py:3962
3269 msgid ""
3270 "Bound branches use the nickname of its master branch unless it is set\n"
3271 "locally."
3272 msgstr ""
3273
3274-#: breezy/builtins.py:3928
3275+#: breezy/builtins.py:3983
3276 msgid "Set/unset and display aliases."
3277 msgstr ""
3278
3279-#: breezy/builtins.py:3930
3280+#: breezy/builtins.py:3985
3281 msgid ""
3282 ":Examples:\n"
3283 " Show the current aliases::"
3284 msgstr ""
3285
3286-#: breezy/builtins.py:3933
3287+#: breezy/builtins.py:3988
3288 msgid " brz alias"
3289 msgstr ""
3290
3291-#: breezy/builtins.py:3935
3292+#: breezy/builtins.py:3990
3293 msgid " Show the alias specified for 'll'::"
3294 msgstr ""
3295
3296-#: breezy/builtins.py:3937
3297+#: breezy/builtins.py:3992
3298 msgid " brz alias ll"
3299 msgstr ""
3300
3301-#: breezy/builtins.py:3939
3302+#: breezy/builtins.py:3994
3303 msgid " Set an alias for 'll'::"
3304 msgstr ""
3305
3306-#: breezy/builtins.py:3941
3307+#: breezy/builtins.py:3996
3308 msgid " brz alias ll=\"log --line -r-10..-1\""
3309 msgstr ""
3310
3311-#: breezy/builtins.py:3943
3312+#: breezy/builtins.py:3998
3313 msgid " To remove an alias for 'll'::"
3314 msgstr ""
3315
3316-#: breezy/builtins.py:3945
3317+#: breezy/builtins.py:4000
3318 msgid " brz alias --remove ll"
3319 msgstr ""
3320
3321 # help of 'remove' option of 'alias' command
3322-#: breezy/builtins.py:3950
3323+#: breezy/builtins.py:4005
3324 msgid "Remove the alias."
3325 msgstr ""
3326
3327-#: breezy/builtins.py:3968
3328+#: breezy/builtins.py:4023
3329 msgid "brz alias --remove expects an alias to remove."
3330 msgstr ""
3331
3332-#: breezy/builtins.py:4149
3333+#: breezy/builtins.py:4214
3334 msgid "subunit not available. subunit needs to be installed to use --subunit."
3335 msgstr ""
3336
3337-#: breezy/builtins.py:4166
3338+#: breezy/builtins.py:4231
3339+msgid "subunit not available. subunit needs to be installed to use --subunit2."
3340+msgstr ""
3341+
3342+#: breezy/builtins.py:4240
3343 msgid ""
3344 "--benchmark is no longer supported from brz 2.2; use bzr-usertest instead"
3345 msgstr ""
3346
3347-#: breezy/builtins.py:4213
3348+#: breezy/builtins.py:4287
3349 msgid "Show version of brz."
3350 msgstr ""
3351
3352 # help of 'short' option of 'version' command
3353-#: breezy/builtins.py:4217
3354+#: breezy/builtins.py:4291
3355 msgid "Print just the version number."
3356 msgstr ""
3357
3358-#: breezy/builtins.py:4236
3359+#: breezy/builtins.py:4310
3360 msgid "It sure does!\n"
3361 msgstr ""
3362
3363-#: breezy/builtins.py:4260
3364+#: breezy/builtins.py:4334
3365 #, python-format
3366 msgid "merge base is revision %s\n"
3367 msgstr ""
3368
3369-#: breezy/builtins.py:4264
3370+#: breezy/builtins.py:4339
3371 msgid "Perform a three-way merge."
3372 msgstr ""
3373
3374-#: breezy/builtins.py:4266
3375+#: breezy/builtins.py:4341
3376 msgid ""
3377 "The source of the merge can be specified either in the form of a branch,\n"
3378 "or in the form of a path to a file containing a merge directive generated\n"
3379@@ -2699,20 +2854,20 @@
3380 "the current working tree."
3381 msgstr ""
3382
3383-#: breezy/builtins.py:4274
3384+#: breezy/builtins.py:4349
3385 msgid ""
3386 "When merging from a branch, by default brz will try to merge in all new\n"
3387 "work from the other branch, automatically determining an appropriate base\n"
3388 "revision. If this fails, you may need to give an explicit base."
3389 msgstr ""
3390
3391-#: breezy/builtins.py:4278
3392+#: breezy/builtins.py:4353
3393 msgid ""
3394 "To pick a different ending revision, pass \"--revision OTHER\". brz will\n"
3395 "try to merge in all new work up to and including revision OTHER."
3396 msgstr ""
3397
3398-#: breezy/builtins.py:4281
3399+#: breezy/builtins.py:4356
3400 msgid ""
3401 "If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3402 "through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3403@@ -2723,11 +2878,11 @@
3404 "changes from the other branch is not stored in the commit."
3405 msgstr ""
3406
3407-#: breezy/builtins.py:4289
3408+#: breezy/builtins.py:4364
3409 msgid "Revision numbers are always relative to the source branch."
3410 msgstr ""
3411
3412-#: breezy/builtins.py:4291 breezy/conflicts.py:52 breezy/conflicts.py:106
3413+#: breezy/builtins.py:4366 breezy/conflicts.py:54 breezy/conflicts.py:109
3414 msgid ""
3415 "Merge will do its best to combine the changes in two branches, but there\n"
3416 "are some kinds of problems only a human can fix. When it encounters those,\n"
3417@@ -2735,11 +2890,11 @@
3418 "before you can commit."
3419 msgstr ""
3420
3421-#: breezy/builtins.py:4296
3422+#: breezy/builtins.py:4371
3423 msgid "Use brz resolve when you have fixed a problem. See also brz conflicts."
3424 msgstr ""
3425
3426-#: breezy/builtins.py:4298
3427+#: breezy/builtins.py:4373
3428 msgid ""
3429 "If there is no default branch set, the first merge will set it (use\n"
3430 "--no-remember to avoid setting it). After that, you can omit the branch\n"
3431@@ -2747,76 +2902,76 @@
3432 "only be saved if the remote location can be accessed."
3433 msgstr ""
3434
3435-#: breezy/builtins.py:4303
3436+#: breezy/builtins.py:4378
3437 msgid ""
3438 "The results of the merge are placed into the destination working\n"
3439 "directory, where they can be reviewed (with brz diff), tested, and then\n"
3440 "committed to record the result of the merge."
3441 msgstr ""
3442
3443-#: breezy/builtins.py:4307
3444+#: breezy/builtins.py:4382
3445 msgid ""
3446 "merge refuses to run if there are any uncommitted changes, unless\n"
3447-"--force is given. If --force is given, then the changes from the source \n"
3448+"--force is given. If --force is given, then the changes from the source\n"
3449 "will be merged with the current working tree, including any uncommitted\n"
3450 "changes in the tree. The --force option can also be used to create a\n"
3451 "merge revision which has more than two parents."
3452 msgstr ""
3453
3454-#: breezy/builtins.py:4313
3455+#: breezy/builtins.py:4388
3456 msgid ""
3457 "If one would like to merge changes from the working tree of the other\n"
3458 "branch without merging any committed revisions, the --uncommitted option\n"
3459 "can be given."
3460 msgstr ""
3461
3462-#: breezy/builtins.py:4317
3463+#: breezy/builtins.py:4392
3464 msgid ""
3465 "To select only some changes to merge, use \"merge -i\", which will prompt\n"
3466 "you to apply each diff hunk and file change, similar to \"shelve\"."
3467 msgstr ""
3468
3469-#: breezy/builtins.py:4320
3470+#: breezy/builtins.py:4395
3471 msgid ""
3472 ":Examples:\n"
3473 " To merge all new revisions from brz.dev::"
3474 msgstr ""
3475
3476-#: breezy/builtins.py:4323
3477+#: breezy/builtins.py:4398
3478 msgid " brz merge ../brz.dev"
3479 msgstr ""
3480
3481-#: breezy/builtins.py:4325
3482+#: breezy/builtins.py:4400
3483 msgid " To merge changes up to and including revision 82 from brz.dev::"
3484 msgstr ""
3485
3486-#: breezy/builtins.py:4327
3487+#: breezy/builtins.py:4402
3488 msgid " brz merge -r 82 ../brz.dev"
3489 msgstr ""
3490
3491-#: breezy/builtins.py:4329
3492+#: breezy/builtins.py:4404
3493 msgid " To merge the changes introduced by 82, without previous changes::"
3494 msgstr ""
3495
3496-#: breezy/builtins.py:4331
3497+#: breezy/builtins.py:4406
3498 msgid " brz merge -r 81..82 ../brz.dev"
3499 msgstr ""
3500
3501-#: breezy/builtins.py:4333
3502+#: breezy/builtins.py:4408
3503 msgid " To apply a merge directive contained in /tmp/merge::"
3504 msgstr ""
3505
3506-#: breezy/builtins.py:4335
3507+#: breezy/builtins.py:4410
3508 msgid " brz merge /tmp/merge"
3509 msgstr ""
3510
3511-#: breezy/builtins.py:4337
3512+#: breezy/builtins.py:4412
3513 msgid ""
3514 " To create a merge revision with three parents from two branches\n"
3515 " feature1a and feature1b:"
3516 msgstr ""
3517
3518-#: breezy/builtins.py:4340
3519+#: breezy/builtins.py:4415
3520 msgid ""
3521 " brz merge ../feature1a\n"
3522 " brz merge ../feature1b --force\n"
3523@@ -2824,18 +2979,18 @@
3524 msgstr ""
3525
3526 # help of 'force' option of 'merge' command
3527-#: breezy/builtins.py:4352
3528+#: breezy/builtins.py:4427
3529 msgid "Merge even if the destination tree has uncommitted changes."
3530 msgstr ""
3531
3532 # help of 'uncommitted' option of 'merge' command
3533-#: breezy/builtins.py:4358
3534+#: breezy/builtins.py:4433
3535 msgid ""
3536 "Apply uncommitted changes from a working copy, instead of branch changes."
3537 msgstr ""
3538
3539 # help of 'pull' option of 'merge' command
3540-#: breezy/builtins.py:4360
3541+#: breezy/builtins.py:4435
3542 msgid ""
3543 "If the destination is already completely merged into the source, pull from "
3544 "the source rather than merging. When this happens, you do not need to "
3545@@ -2843,110 +2998,114 @@
3546 msgstr ""
3547
3548 # help of 'directory' option of 'merge' command
3549-#: breezy/builtins.py:4365
3550+#: breezy/builtins.py:4440
3551 msgid ""
3552 "Branch to merge into, rather than the one containing the working directory."
3553 msgstr ""
3554
3555 # help of 'preview' option of 'merge' command
3556-#: breezy/builtins.py:4367
3557+#: breezy/builtins.py:4442
3558 msgid "Instead of merging, show a diff of the merge."
3559 msgstr ""
3560
3561 # help of 'interactive' option of 'merge' command
3562-#: breezy/builtins.py:4369
3563+#: breezy/builtins.py:4444
3564 msgid "Select changes interactively."
3565 msgstr ""
3566
3567-#: breezy/builtins.py:4391
3568+#: breezy/builtins.py:4467
3569 msgid ""
3570 "Merging into empty branches not currently supported, https://bugs.launchpad."
3571-"net/brz/+bug/308562"
3572+"net/bzr/+bug/308562"
3573 msgstr ""
3574
3575-#: breezy/builtins.py:4418
3576+#: breezy/builtins.py:4489
3577 msgid "Cannot use --uncommitted with bundles or merge directives."
3578 msgstr ""
3579
3580-#: breezy/builtins.py:4429
3581+#: breezy/builtins.py:4500
3582 msgid "Cannot use --uncommitted and --revision at the same time."
3583 msgstr ""
3584
3585-#: breezy/builtins.py:4449
3586+#: breezy/builtins.py:4520
3587 msgid "merger: "
3588 msgstr ""
3589
3590-#: breezy/builtins.py:4451 breezy/bundle/apply_bundle.py:71
3591+#: breezy/builtins.py:4522 breezy/bundle/apply_bundle.py:65
3592 msgid "Nothing to do."
3593 msgstr ""
3594
3595-#: breezy/builtins.py:4455
3596+#: breezy/builtins.py:4527
3597 msgid "Cannot pull individual files"
3598 msgstr ""
3599
3600-#: breezy/builtins.py:4463
3601+#: breezy/builtins.py:4535
3602 msgid "This branch has no commits. (perhaps you would prefer 'brz pull')"
3603 msgstr ""
3604
3605-#: breezy/builtins.py:4521
3606+#: breezy/builtins.py:4593
3607 #, python-format
3608 msgid "Show-base is not supported for this merge type. %s"
3609 msgstr ""
3610
3611-#: breezy/builtins.py:4530
3612+#: breezy/builtins.py:4602
3613 #, python-format
3614 msgid "Conflict reduction is not supported for merge type %s."
3615 msgstr ""
3616
3617-#: breezy/builtins.py:4534
3618+#: breezy/builtins.py:4606
3619 msgid "Cannot do conflict reduction and show base."
3620 msgstr ""
3621
3622-#: breezy/builtins.py:4645
3623+#: breezy/builtins.py:4615
3624+msgid "Plan file merge unsupported: Merge type incompatible with tree formats."
3625+msgstr ""
3626+
3627+#: breezy/builtins.py:4726
3628 msgid "No location specified or remembered"
3629 msgstr ""
3630
3631-#: breezy/builtins.py:4647
3632+#: breezy/builtins.py:4728
3633 #, python-brace-format
3634 msgid "{0} remembered {1} location {2}"
3635 msgstr ""
3636
3637-#: breezy/builtins.py:4653
3638+#: breezy/builtins.py:4734
3639 msgid "Redo a merge."
3640 msgstr ""
3641
3642-#: breezy/builtins.py:4655
3643+#: breezy/builtins.py:4736
3644 msgid ""
3645 "Use this if you want to try a different merge technique while resolving\n"
3646 "conflicts. Some merge techniques are better than others, and remerge\n"
3647 "lets you try different ones on different files."
3648 msgstr ""
3649
3650-#: breezy/builtins.py:4659
3651+#: breezy/builtins.py:4740
3652 msgid ""
3653 "The options for remerge have the same meaning and defaults as the ones for\n"
3654 "merge. The difference is that remerge can (only) be run when there is a\n"
3655 "pending merge, and it lets you specify particular files."
3656 msgstr ""
3657
3658-#: breezy/builtins.py:4663
3659+#: breezy/builtins.py:4744
3660 msgid ""
3661 ":Examples:\n"
3662 " Re-do the merge of all conflicted files, and show the base text in\n"
3663 " conflict regions, in addition to the usual THIS and OTHER texts::"
3664 msgstr ""
3665
3666-#: breezy/builtins.py:4667
3667+#: breezy/builtins.py:4748
3668 msgid " brz remerge --show-base"
3669 msgstr ""
3670
3671-#: breezy/builtins.py:4669
3672+#: breezy/builtins.py:4750
3673 msgid ""
3674 " Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3675 " additional processing to reduce the size of conflict regions::"
3676 msgstr ""
3677
3678-#: breezy/builtins.py:4672
3679+#: breezy/builtins.py:4753
3680 msgid " brz remerge --merge-type weave --reprocess foobar"
3681 msgstr ""
3682
3683@@ -2954,22 +3113,22 @@
3684 # help of 'show-base' option of 'pull' command
3685 # help of 'show-base' option of 'remerge' command
3686 # help of 'show-base' option of 'update' command
3687-#: breezy/builtins.py:4679
3688+#: breezy/builtins.py:4760
3689 msgid "Show base revision text in conflicts."
3690 msgstr ""
3691
3692-#: breezy/builtins.py:4691
3693+#: breezy/builtins.py:4773
3694 msgid ""
3695 "Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3696 "merges."
3697 msgstr ""
3698
3699-#: breezy/builtins.py:4749
3700+#: breezy/builtins.py:4828
3701 msgid ""
3702 "Set files in the working tree back to the contents of a previous revision."
3703 msgstr ""
3704
3705-#: breezy/builtins.py:4751
3706+#: breezy/builtins.py:4830
3707 msgid ""
3708 "Giving a list of files will revert only those files. Otherwise, all files\n"
3709 "will be reverted. If the revision is not specified with '--revision', the\n"
3710@@ -2978,7 +3137,7 @@
3711 "the working tree basis revision."
3712 msgstr ""
3713
3714-#: breezy/builtins.py:4757
3715+#: breezy/builtins.py:4836
3716 msgid ""
3717 "To remove only some changes, without reverting to a prior version, use\n"
3718 "merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3719@@ -2990,7 +3149,7 @@
3720 "update command."
3721 msgstr ""
3722
3723-#: breezy/builtins.py:4766
3724+#: breezy/builtins.py:4845
3725 msgid ""
3726 "Uncommitted changes to files that are reverted will be discarded.\n"
3727 "Howver, by default, any files that have been manually changed will be\n"
3728@@ -2998,7 +3157,7 @@
3729 "files have '.~#~' appended to their name, where # is a number."
3730 msgstr ""
3731
3732-#: breezy/builtins.py:4771
3733+#: breezy/builtins.py:4850
3734 msgid ""
3735 "When you provide files, you can use their current pathname or the pathname\n"
3736 "from the target revision. So you can use revert to \"undelete\" a file by\n"
3737@@ -3006,7 +3165,7 @@
3738 "reverted."
3739 msgstr ""
3740
3741-#: breezy/builtins.py:4776
3742+#: breezy/builtins.py:4855
3743 msgid ""
3744 "If you have newly added files since the target revision, they will be\n"
3745 "removed. If the files to be removed have been changed, backups will be\n"
3746@@ -3014,7 +3173,7 @@
3747 "deleted."
3748 msgstr ""
3749
3750-#: breezy/builtins.py:4781
3751+#: breezy/builtins.py:4860
3752 msgid ""
3753 "The working tree contains a list of revisions that have been merged but\n"
3754 "not yet committed. These revisions will be included as additional parents\n"
3755@@ -3026,7 +3185,7 @@
3756 "reverting any files."
3757 msgstr ""
3758
3759-#: breezy/builtins.py:4790
3760+#: breezy/builtins.py:4869
3761 msgid ""
3762 "Using \"brz revert --forget-merges\", it is possible to apply all of the\n"
3763 "changes from a branch in a single revision. To do this, perform the merge\n"
3764@@ -3041,174 +3200,177 @@
3765 msgstr ""
3766
3767 # help of 'no-backup' option of 'revert' command
3768-#: breezy/builtins.py:4804
3769+#: breezy/builtins.py:4883
3770 msgid "Do not save backups of reverted files."
3771 msgstr ""
3772
3773 # help of 'forget-merges' option of 'revert' command
3774-#: breezy/builtins.py:4806
3775+#: breezy/builtins.py:4885
3776 msgid "Remove pending merge marker, without changing any files."
3777 msgstr ""
3778
3779-#: breezy/builtins.py:4837
3780+#: breezy/builtins.py:4916
3781 msgid ""
3782 "Show help on a command or other topic.\n"
3783 " "
3784 msgstr ""
3785
3786 # help of 'long' option of 'help' command
3787-#: breezy/builtins.py:4842
3788+#: breezy/builtins.py:4921
3789 msgid "Show help on all commands."
3790 msgstr ""
3791
3792-#: breezy/builtins.py:4871
3793+#: breezy/builtins.py:4950
3794 msgid "Show unmerged/unpulled revisions between two branches."
3795 msgstr ""
3796
3797-#: breezy/builtins.py:4873
3798+#: breezy/builtins.py:4952
3799 msgid "OTHER_BRANCH may be local or remote."
3800 msgstr ""
3801
3802-#: breezy/builtins.py:4875
3803+#: breezy/builtins.py:4954
3804 msgid ""
3805 "To filter on a range of revisions, you can use the command -r begin..end\n"
3806 "-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3807-"also valid.\n"
3808-" \n"
3809+"also valid."
3810+msgstr ""
3811+
3812+#: breezy/builtins.py:4958
3813+msgid ""
3814 ":Exit values:\n"
3815 " 1 - some missing revisions\n"
3816 " 0 - no missing revisions"
3817 msgstr ""
3818
3819-#: breezy/builtins.py:4885
3820+#: breezy/builtins.py:4964
3821 msgid ""
3822 " Determine the missing revisions between this and the branch at the\n"
3823 " remembered pull location::"
3824 msgstr ""
3825
3826-#: breezy/builtins.py:4888
3827+#: breezy/builtins.py:4967
3828 msgid " brz missing"
3829 msgstr ""
3830
3831-#: breezy/builtins.py:4890
3832+#: breezy/builtins.py:4969
3833 msgid " Determine the missing revisions between this and another branch::"
3834 msgstr ""
3835
3836-#: breezy/builtins.py:4892
3837+#: breezy/builtins.py:4971
3838 msgid " brz missing http://server/branch"
3839 msgstr ""
3840
3841-#: breezy/builtins.py:4894
3842+#: breezy/builtins.py:4973
3843 msgid ""
3844 " Determine the missing revisions up to a specific revision on the other\n"
3845 " branch::"
3846 msgstr ""
3847
3848-#: breezy/builtins.py:4897
3849+#: breezy/builtins.py:4976
3850 msgid " brz missing -r ..-10"
3851 msgstr ""
3852
3853-#: breezy/builtins.py:4899
3854+#: breezy/builtins.py:4978
3855 msgid ""
3856 " Determine the missing revisions up to a specific revision on this\n"
3857 " branch::"
3858 msgstr ""
3859
3860-#: breezy/builtins.py:4902
3861+#: breezy/builtins.py:4981
3862 msgid " brz missing --my-revision ..-10"
3863 msgstr ""
3864
3865 # help of 'reverse' option of 'missing' command
3866-#: breezy/builtins.py:4909
3867+#: breezy/builtins.py:4988
3868 msgid "Reverse the order of revisions."
3869 msgstr ""
3870
3871 # help of 'mine-only' option of 'missing' command
3872-#: breezy/builtins.py:4911
3873+#: breezy/builtins.py:4990
3874 msgid "Display changes in the local branch only."
3875 msgstr ""
3876
3877 # help of 'this' option of 'missing' command
3878-#: breezy/builtins.py:4912
3879+#: breezy/builtins.py:4991
3880 msgid "Same as --mine-only."
3881 msgstr ""
3882
3883 # help of 'theirs-only' option of 'missing' command
3884-#: breezy/builtins.py:4914
3885+#: breezy/builtins.py:4993
3886 msgid "Display changes in the remote branch only."
3887 msgstr ""
3888
3889 # help of 'other' option of 'missing' command
3890-#: breezy/builtins.py:4915
3891+#: breezy/builtins.py:4994
3892 msgid "Same as --theirs-only."
3893 msgstr ""
3894
3895 # help of 'revision' option of 'missing' command
3896-#: breezy/builtins.py:4920
3897+#: breezy/builtins.py:4999
3898 msgid ""
3899 "Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3900 "details."
3901 msgstr ""
3902
3903 # help of 'my-revision' option of 'missing' command
3904-#: breezy/builtins.py:4924
3905+#: breezy/builtins.py:5003
3906 msgid ""
3907 "Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3908 "details."
3909 msgstr ""
3910
3911 # help of 'include-merged' option of 'missing' command
3912-#: breezy/builtins.py:4927
3913+#: breezy/builtins.py:5006
3914 msgid "Show all revisions in addition to the mainline ones."
3915 msgstr ""
3916
3917-#: breezy/builtins.py:4981
3918+#: breezy/builtins.py:5047
3919 msgid "No peer location known or specified."
3920 msgstr ""
3921
3922-#: breezy/builtins.py:4985
3923+#: breezy/builtins.py:5051
3924 #, python-brace-format
3925 msgid "Using saved parent location: {0}\n"
3926 msgstr ""
3927
3928-#: breezy/builtins.py:5018
3929+#: breezy/builtins.py:5084
3930 #, python-format
3931 msgid "You have %d extra revision:\n"
3932 msgid_plural "You have %d extra revisions:\n"
3933 msgstr[0] ""
3934 msgstr[1] ""
3935
3936-#: breezy/builtins.py:5038
3937+#: breezy/builtins.py:5104
3938 #, python-format
3939 msgid "You are missing %d revision:\n"
3940 msgid_plural "You are missing %d revisions:\n"
3941 msgstr[0] ""
3942 msgstr[1] ""
3943
3944-#: breezy/builtins.py:5053
3945+#: breezy/builtins.py:5119
3946 msgid "This branch has no new revisions.\n"
3947 msgstr ""
3948
3949-#: breezy/builtins.py:5056
3950+#: breezy/builtins.py:5122
3951 msgid "Other branch has no new revisions.\n"
3952 msgstr ""
3953
3954-#: breezy/builtins.py:5061
3955+#: breezy/builtins.py:5127
3956 msgid "Branches are up to date.\n"
3957 msgstr ""
3958
3959-#: breezy/builtins.py:5072
3960+#: breezy/builtins.py:5138
3961 msgid "Compress the data within a repository."
3962 msgstr ""
3963
3964-#: breezy/builtins.py:5074
3965+#: breezy/builtins.py:5140
3966 msgid ""
3967 "This operation compresses the data within a bazaar repository. As\n"
3968 "bazaar supports automatic packing of repository, this operation is\n"
3969 "normally not required to be done manually."
3970 msgstr ""
3971
3972-#: breezy/builtins.py:5078
3973+#: breezy/builtins.py:5144
3974 msgid ""
3975 "During the pack operation, bazaar takes a backup of existing repository\n"
3976 "data, i.e. pack files. This backup is eventually removed by bazaar\n"
3977@@ -3217,7 +3379,7 @@
3978 "used."
3979 msgstr ""
3980
3981-#: breezy/builtins.py:5084
3982+#: breezy/builtins.py:5150
3983 msgid ""
3984 "Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3985 "during or immediately after repacking, you may be left with a state\n"
3986@@ -3226,25 +3388,25 @@
3987 msgstr ""
3988
3989 # help of 'clean-obsolete-packs' option of 'pack' command
3990-#: breezy/builtins.py:5093
3991+#: breezy/builtins.py:5160
3992 msgid "Delete obsolete packs to save disk space."
3993 msgstr ""
3994
3995-#: breezy/builtins.py:5107
3996+#: breezy/builtins.py:5174
3997 msgid "List the installed plugins."
3998 msgstr ""
3999
4000-#: breezy/builtins.py:5109
4001+#: breezy/builtins.py:5176
4002 msgid ""
4003 "This command displays the list of installed plugins including\n"
4004 "version of plugin and a short description of each."
4005 msgstr ""
4006
4007-#: breezy/builtins.py:5112
4008+#: breezy/builtins.py:5179
4009 msgid "--verbose shows the path where each plugin is located."
4010 msgstr ""
4011
4012-#: breezy/builtins.py:5114
4013+#: breezy/builtins.py:5181
4014 msgid ""
4015 "A plugin is an external component for Bazaar that extends the\n"
4016 "revision control system, by adding or replacing code in Bazaar.\n"
4017@@ -3253,7 +3415,7 @@
4018 "customizing log output."
4019 msgstr ""
4020
4021-#: breezy/builtins.py:5120
4022+#: breezy/builtins.py:5187
4023 msgid ""
4024 "See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
4025 "for further information on plugins including where to find them and how to\n"
4026@@ -3261,122 +3423,122 @@
4027 "plugins using the Python programming language."
4028 msgstr ""
4029
4030-#: breezy/builtins.py:5136
4031+#: breezy/builtins.py:5203
4032 msgid "Show testament (signing-form) of a revision."
4033 msgstr ""
4034
4035 # help of 'long' option of 'testament' command
4036-#: breezy/builtins.py:5139
4037+#: breezy/builtins.py:5206
4038 msgid "Produce long-format testament."
4039 msgstr ""
4040
4041 # help of 'strict' option of 'testament' command
4042-#: breezy/builtins.py:5141
4043+#: breezy/builtins.py:5208
4044 msgid "Produce a strict-format testament."
4045 msgstr ""
4046
4047-#: breezy/builtins.py:5168
4048+#: breezy/builtins.py:5236
4049 msgid "Show the origin of each line in a file."
4050 msgstr ""
4051
4052-#: breezy/builtins.py:5170
4053+#: breezy/builtins.py:5238
4054 msgid ""
4055 "This prints out the given file with an annotation on the left side\n"
4056 "indicating which revision, author and date introduced the change."
4057 msgstr ""
4058
4059-#: breezy/builtins.py:5173
4060+#: breezy/builtins.py:5241
4061 msgid ""
4062 "If the origin is the same for a run of consecutive lines, it is\n"
4063 "shown only at the top, unless the --all option is given."
4064 msgstr ""
4065
4066 # help of 'all' option of 'annotate' command
4067-#: breezy/builtins.py:5181
4068+#: breezy/builtins.py:5249
4069 msgid "Show annotations on all lines."
4070 msgstr ""
4071
4072 # help of 'long' option of 'annotate' command
4073-#: breezy/builtins.py:5182
4074+#: breezy/builtins.py:5250
4075 msgid "Show commit date in annotations."
4076 msgstr ""
4077
4078-#: breezy/builtins.py:5269
4079+#: breezy/builtins.py:5340
4080 msgid "Cannot sign a range of non-revision-history revisions"
4081 msgstr ""
4082
4083-#: breezy/builtins.py:5281
4084+#: breezy/builtins.py:5353
4085 msgid "Please supply either one revision, or a range."
4086 msgstr ""
4087
4088-#: breezy/builtins.py:5285
4089+#: breezy/builtins.py:5357
4090 msgid ""
4091 "Convert the current branch into a checkout of the supplied branch.\n"
4092 "If no branch is supplied, rebind to the last bound location."
4093 msgstr ""
4094
4095-#: breezy/builtins.py:5288
4096+#: breezy/builtins.py:5360
4097 msgid ""
4098 "Once converted into a checkout, commits must succeed on the master branch\n"
4099 "before they will be applied to the local branch."
4100 msgstr ""
4101
4102-#: breezy/builtins.py:5291
4103+#: breezy/builtins.py:5363
4104 msgid ""
4105 "Bound branches use the nickname of its master branch unless it is set\n"
4106 "locally, in which case binding will update the local nickname to be\n"
4107 "that of the master."
4108 msgstr ""
4109
4110-#: breezy/builtins.py:5306
4111+#: breezy/builtins.py:5379
4112 msgid "No location supplied. This format does not remember old locations."
4113 msgstr ""
4114
4115-#: breezy/builtins.py:5312
4116+#: breezy/builtins.py:5385
4117 msgid "Branch is already bound"
4118 msgstr ""
4119
4120-#: breezy/builtins.py:5315
4121+#: breezy/builtins.py:5388
4122 msgid "No location supplied and no previous location known"
4123 msgstr ""
4124
4125-#: breezy/builtins.py:5321
4126+#: breezy/builtins.py:5395
4127 msgid "These branches have diverged. Try merging, and then bind again."
4128 msgstr ""
4129
4130-#: breezy/builtins.py:5328
4131+#: breezy/builtins.py:5402
4132 msgid "Convert the current checkout into a regular branch."
4133 msgstr ""
4134
4135-#: breezy/builtins.py:5330
4136+#: breezy/builtins.py:5404
4137 msgid ""
4138 "After unbinding, the local branch is considered independent and subsequent\n"
4139 "commits will be local only."
4140 msgstr ""
4141
4142-#: breezy/builtins.py:5341
4143+#: breezy/builtins.py:5415
4144 msgid "Local branch is not bound"
4145 msgstr ""
4146
4147-#: breezy/builtins.py:5345
4148+#: breezy/builtins.py:5419
4149 msgid "Remove the last committed revision."
4150 msgstr ""
4151
4152-#: breezy/builtins.py:5347
4153+#: breezy/builtins.py:5421
4154 msgid ""
4155 "--verbose will print out what is being removed.\n"
4156 "--dry-run will go through all the motions, but not actually\n"
4157 "remove anything."
4158 msgstr ""
4159
4160-#: breezy/builtins.py:5351
4161+#: breezy/builtins.py:5425
4162 msgid ""
4163 "If --revision is specified, uncommit revisions to leave the branch at the\n"
4164 "specified revision. For example, \"brz uncommit -r 15\" will leave the\n"
4165 "branch at revision 15."
4166 msgstr ""
4167
4168-#: breezy/builtins.py:5355
4169+#: breezy/builtins.py:5429
4170 msgid ""
4171 "Uncommit leaves the working tree ready for a new commit. The only change\n"
4172 "it may make is to restore any pending merges that were present before\n"
4173@@ -3384,75 +3546,75 @@
4174 msgstr ""
4175
4176 # help of 'dry-run' option of 'uncommit' command
4177-#: breezy/builtins.py:5366
4178+#: breezy/builtins.py:5440
4179 msgid "Don't actually make changes."
4180 msgstr ""
4181
4182 # help of 'force' option of 'uncommit' command
4183-#: breezy/builtins.py:5367
4184+#: breezy/builtins.py:5441
4185 msgid "Say yes to all questions."
4186 msgstr ""
4187
4188 # help of 'keep-tags' option of 'uncommit' command
4189-#: breezy/builtins.py:5369
4190+#: breezy/builtins.py:5443
4191 msgid "Keep tags that point to removed revisions."
4192 msgstr ""
4193
4194 # help of 'local' option of 'uncommit' command
4195-#: breezy/builtins.py:5371
4196+#: breezy/builtins.py:5445
4197 msgid "Only remove the commits from the local branch when in a checkout."
4198 msgstr ""
4199
4200-#: breezy/builtins.py:5420
4201+#: breezy/builtins.py:5494
4202 msgid "No revisions to uncommit.\n"
4203 msgstr ""
4204
4205-#: breezy/builtins.py:5435
4206+#: breezy/builtins.py:5509
4207 msgid "Dry-run, pretending to remove the above revisions.\n"
4208 msgstr ""
4209
4210-#: breezy/builtins.py:5438
4211+#: breezy/builtins.py:5513
4212 msgid "The above revision(s) will be removed.\n"
4213 msgstr ""
4214
4215-#: breezy/builtins.py:5442
4216+#: breezy/builtins.py:5517
4217 msgid "Uncommit these revisions"
4218 msgstr ""
4219
4220-#: breezy/builtins.py:5445
4221+#: breezy/builtins.py:5520
4222 msgid "Canceled\n"
4223 msgstr ""
4224
4225-#: breezy/builtins.py:5452
4226+#: breezy/builtins.py:5528
4227 #, python-format
4228 msgid ""
4229 "You can restore the old tip by running:\n"
4230 " brz pull . -r revid:%s\n"
4231 msgstr ""
4232
4233-#: breezy/builtins.py:5457
4234+#: breezy/builtins.py:5534
4235 msgid "Break a dead lock."
4236 msgstr ""
4237
4238-#: breezy/builtins.py:5459
4239+#: breezy/builtins.py:5536
4240 msgid ""
4241 "This command breaks a lock on a repository, branch, working directory or\n"
4242 "config file."
4243 msgstr ""
4244
4245-#: breezy/builtins.py:5462
4246+#: breezy/builtins.py:5539
4247 msgid ""
4248 "CAUTION: Locks should only be broken when you are sure that the process\n"
4249 "holding the lock has been stopped."
4250 msgstr ""
4251
4252-#: breezy/builtins.py:5465
4253+#: breezy/builtins.py:5542
4254 msgid ""
4255 "You can get information on what locks are open via the 'brz info\n"
4256 "[location]' command."
4257 msgstr ""
4258
4259-#: breezy/builtins.py:5468
4260+#: breezy/builtins.py:5545
4261 msgid ""
4262 ":Examples:\n"
4263 " brz break-lock\n"
4264@@ -3461,46 +3623,61 @@
4265 msgstr ""
4266
4267 # help of 'config' option of 'break-lock' command
4268-#: breezy/builtins.py:5477
4269+#: breezy/builtins.py:5554
4270 msgid "LOCATION is the directory where the config lock is."
4271 msgstr ""
4272
4273 # help of 'force' option of 'break-lock' command
4274-#: breezy/builtins.py:5479
4275+#: breezy/builtins.py:5556
4276 msgid "Do not ask for confirmation before breaking the lock."
4277 msgstr ""
4278
4279+# help of 'protocol=git' option of 'serve' command
4280+#: breezy/builtins.py:5591
4281+msgid "Git Smart server protocol over TCP. (default port: 9418)"
4282+msgstr ""
4283+
4284+# help of 'protocol=git-receive-pack' option of 'serve' command
4285+#: breezy/builtins.py:5591
4286+msgid "Git Smart server receive pack command. (inetd mode only)"
4287+msgstr ""
4288+
4289+# help of 'protocol=git-upload-pack' option of 'serve' command
4290+#: breezy/builtins.py:5591
4291+msgid "Git Smart server upload pack command. (inetd mode only)"
4292+msgstr ""
4293+
4294 # help of 'protocol=bzr' option of 'serve' command
4295-#: breezy/builtins.py:5514
4296+#: breezy/builtins.py:5591
4297 msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
4298 msgstr ""
4299
4300-#: breezy/builtins.py:5515
4301+#: breezy/builtins.py:5592
4302 msgid "Run the brz server."
4303 msgstr ""
4304
4305 # help of 'inet' option of 'serve' command
4306-#: breezy/builtins.py:5521
4307+#: breezy/builtins.py:5598
4308 msgid "Serve on stdin/out for use from inetd or sshd."
4309 msgstr ""
4310
4311 # title of 'protocol' option of 'serve' command
4312-#: breezy/builtins.py:5522
4313+#: breezy/builtins.py:5599
4314 msgid "protocol"
4315 msgstr ""
4316
4317 # help of 'protocol' option of 'serve' command
4318-#: breezy/builtins.py:5523
4319+#: breezy/builtins.py:5600
4320 msgid "Protocol to serve."
4321 msgstr ""
4322
4323 # help of 'listen' option of 'serve' command
4324-#: breezy/builtins.py:5527
4325+#: breezy/builtins.py:5605
4326 msgid "Listen for connections on nominated address."
4327 msgstr ""
4328
4329 # help of 'port' option of 'serve' command
4330-#: breezy/builtins.py:5529
4331+#: breezy/builtins.py:5608
4332 msgid ""
4333 "Listen for connections on nominated port. Passing 0 as the port number will "
4334 "result in a dynamically allocated port. The default port depends on the "
4335@@ -3508,12 +3685,12 @@
4336 msgstr ""
4337
4338 # help of 'directory' option of 'serve' command
4339-#: breezy/builtins.py:5534
4340+#: breezy/builtins.py:5613
4341 msgid "Serve contents of this directory."
4342 msgstr ""
4343
4344 # help of 'allow-writes' option of 'serve' command
4345-#: breezy/builtins.py:5536
4346+#: breezy/builtins.py:5615
4347 msgid ""
4348 "By default the server is a readonly server. Supplying --allow-writes "
4349 "enables write access to the contents of the served directory and below. "
4350@@ -3523,115 +3700,115 @@
4351 msgstr ""
4352
4353 # help of 'client-timeout' option of 'serve' command
4354-#: breezy/builtins.py:5545
4355+#: breezy/builtins.py:5624
4356 msgid "Override the default idle client timeout (5min)."
4357 msgstr ""
4358
4359-#: breezy/builtins.py:5563
4360+#: breezy/builtins.py:5642
4361 msgid "Combine a tree into its containing tree."
4362 msgstr ""
4363
4364-#: breezy/builtins.py:5565
4365+#: breezy/builtins.py:5644
4366 msgid "This command requires the target tree to be in a rich-root format."
4367 msgstr ""
4368
4369-#: breezy/builtins.py:5567
4370+#: breezy/builtins.py:5646
4371 msgid ""
4372 "The TREE argument should be an independent tree, inside another tree, but\n"
4373 "not part of it. (Such trees can be produced by \"brz split\", but also by\n"
4374 "running \"brz branch\" with the target inside a tree.)"
4375 msgstr ""
4376
4377-#: breezy/builtins.py:5571
4378+#: breezy/builtins.py:5650
4379 msgid ""
4380 "The result is a combined tree, with the subtree no longer an independent\n"
4381 "part. This is marked as a merge of the subtree into the containing tree,\n"
4382 "and all history is preserved."
4383 msgstr ""
4384
4385-#: breezy/builtins.py:5589
4386+#: breezy/builtins.py:5669
4387 #, python-format
4388 msgid ""
4389 "Can't join trees because %s doesn't support rich root data.\n"
4390 "You can use brz upgrade on the repository."
4391 msgstr ""
4392
4393-#: breezy/builtins.py:5599 breezy/builtins.py:5605
4394+#: breezy/builtins.py:5679 breezy/builtins.py:5685
4395 #, python-brace-format
4396 msgid "Cannot join {0}. {1}"
4397 msgstr ""
4398
4399-#: breezy/builtins.py:5609
4400+#: breezy/builtins.py:5689
4401 msgid "Split a subdirectory of a tree into a separate tree."
4402 msgstr ""
4403
4404-#: breezy/builtins.py:5611
4405+#: breezy/builtins.py:5691
4406 msgid ""
4407 "This command will produce a target tree in a format that supports\n"
4408 "rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
4409 "converted into earlier formats like 'dirstate-tags'."
4410 msgstr ""
4411
4412-#: breezy/builtins.py:5615
4413+#: breezy/builtins.py:5695
4414 msgid ""
4415 "The TREE argument should be a subdirectory of a working tree. That\n"
4416 "subdirectory will be converted into an independent tree, with its own\n"
4417 "branch. Commits in the top-level tree will not apply to the new subtree."
4418 msgstr ""
4419
4420-#: breezy/builtins.py:5695
4421+#: breezy/builtins.py:5777
4422 msgid "No submit branch specified or known"
4423 msgstr ""
4424
4425-#: breezy/builtins.py:5704 breezy/send.py:109
4426+#: breezy/builtins.py:5787 breezy/send.py:109
4427 msgid "No public branch specified or known"
4428 msgstr ""
4429
4430-#: breezy/builtins.py:5709
4431+#: breezy/builtins.py:5792
4432 msgid "brz merge-directive takes at most two one revision identifiers"
4433 msgstr ""
4434
4435-#: breezy/builtins.py:5718
4436+#: breezy/builtins.py:5801
4437 msgid "No revisions to bundle."
4438 msgstr ""
4439
4440-#: breezy/builtins.py:5737
4441+#: breezy/builtins.py:5820
4442 msgid "Mail or create a merge-directive for submitting changes."
4443 msgstr ""
4444
4445-#: breezy/builtins.py:5739
4446+#: breezy/builtins.py:5822
4447 msgid "A merge directive provides many things needed for requesting merges:"
4448 msgstr ""
4449
4450-#: breezy/builtins.py:5741
4451+#: breezy/builtins.py:5824
4452 msgid "* A machine-readable description of the merge to perform"
4453 msgstr ""
4454
4455-#: breezy/builtins.py:5743
4456+#: breezy/builtins.py:5826
4457 msgid "* An optional patch that is a preview of the changes requested"
4458 msgstr ""
4459
4460-#: breezy/builtins.py:5745
4461+#: breezy/builtins.py:5828
4462 msgid ""
4463 "* An optional bundle of revision data, so that the changes can be applied\n"
4464 " directly from the merge directive, without retrieving data from a\n"
4465 " branch."
4466 msgstr ""
4467
4468-#: breezy/builtins.py:5749
4469+#: breezy/builtins.py:5832
4470 msgid ""
4471 "`brz send` creates a compact data set that, when applied using brz\n"
4472-"merge, has the same effect as merging from the source branch. "
4473+"merge, has the same effect as merging from the source branch."
4474 msgstr ""
4475
4476-#: breezy/builtins.py:5752
4477+#: breezy/builtins.py:5835
4478 msgid ""
4479 "By default the merge directive is self-contained and can be applied to any\n"
4480 "branch containing submit_branch in its ancestory without needing access to\n"
4481 "the source branch."
4482 msgstr ""
4483
4484-#: breezy/builtins.py:5756
4485+#: breezy/builtins.py:5839
4486 msgid ""
4487 "If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4488 "revisions, but only a structured request to merge from the\n"
4489@@ -3640,7 +3817,7 @@
4490 "included if known, so that people can check it later."
4491 msgstr ""
4492
4493-#: breezy/builtins.py:5762
4494+#: breezy/builtins.py:5845
4495 msgid ""
4496 "The submit branch defaults to the parent of the source branch, but can be\n"
4497 "overridden. Both submit branch and public branch will be remembered in\n"
4498@@ -3649,7 +3826,7 @@
4499 "be changed using --from."
4500 msgstr ""
4501
4502-#: breezy/builtins.py:5768
4503+#: breezy/builtins.py:5851
4504 msgid ""
4505 "Both the submit branch and the public branch follow the usual behavior with\n"
4506 "respect to --remember: If there is no default location set, the first send\n"
4507@@ -3658,7 +3835,7 @@
4508 "--remember. The value will only be saved if the location can be accessed."
4509 msgstr ""
4510
4511-#: breezy/builtins.py:5774
4512+#: breezy/builtins.py:5857
4513 msgid ""
4514 "In order to calculate those changes, brz must analyse the submit branch.\n"
4515 "Therefore it is most efficient for the submit branch to be a local mirror.\n"
4516@@ -3666,32 +3843,32 @@
4517 "in the merge directive."
4518 msgstr ""
4519
4520-#: breezy/builtins.py:5779
4521+#: breezy/builtins.py:5862
4522 msgid ""
4523 "The default behaviour is to send the merge directive by mail, unless -o is\n"
4524 "given, in which case it is sent to a file."
4525 msgstr ""
4526
4527-#: breezy/builtins.py:5782
4528+#: breezy/builtins.py:5865
4529 msgid ""
4530 "Mail is sent using your preferred mail program. This should be transparent\n"
4531 "on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4532 "If the preferred client can't be found (or used), your editor will be used."
4533 msgstr ""
4534
4535-#: breezy/builtins.py:5786
4536+#: breezy/builtins.py:5869
4537 msgid ""
4538 "To use a specific mail program, set the mail_client configuration option.\n"
4539-"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4540-"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
4541-"\" (MacOS X's\n"
4542-"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
4543-"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
4544-"add\n"
4545-"supported clients."
4546+"Supported values for specific clients are \"claws\", \"evolution\", \"kmail"
4547+"\",\n"
4548+"\"mail.app\" (MacOS X's Mail.app), \"mutt\", and \"thunderbird\"; generic "
4549+"options\n"
4550+"are \"default\", \"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". "
4551+"Plugins\n"
4552+"may also add supported clients."
4553 msgstr ""
4554
4555-#: breezy/builtins.py:5793
4556+#: breezy/builtins.py:5875
4557 msgid ""
4558 "If mail is being sent, a to address is required. This can be supplied\n"
4559 "either on the commandline, by setting the submit_to configuration\n"
4560@@ -3699,23 +3876,13 @@
4561 "in the submit branch."
4562 msgstr ""
4563
4564-#: breezy/builtins.py:5798
4565-msgid ""
4566-"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4567-"and\n"
4568-"merge directive format 2. It is significantly faster and smaller than\n"
4569-"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
4570-"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
4571-"format 1. It is compatible with Bazaar 0.12 - 0.18."
4572-msgstr ""
4573-
4574-#: breezy/builtins.py:5804
4575+#: breezy/builtins.py:5880
4576 msgid ""
4577 "The merge directives created by brz send may be applied using brz merge or\n"
4578 "brz pull by specifying a file containing a merge directive as the location."
4579 msgstr ""
4580
4581-#: breezy/builtins.py:5807
4582+#: breezy/builtins.py:5883
4583 msgid ""
4584 "brz send makes extensive use of public locations to map local locations "
4585 "into\n"
4586@@ -3724,44 +3891,44 @@
4587 msgstr ""
4588
4589 # help of 'output' option of 'send' command
4590-#: breezy/builtins.py:5831
4591+#: breezy/builtins.py:5907
4592 msgid "Write merge directive to this file or directory; use - for stdout."
4593 msgstr ""
4594
4595 # help of 'strict' option of 'send' command
4596-#: breezy/builtins.py:5835
4597+#: breezy/builtins.py:5911
4598 msgid ""
4599 "Refuse to send if there are uncommitted changes in the working tree, --no-"
4600 "strict disables the check."
4601 msgstr ""
4602
4603 # help of 'mail-to' option of 'send' command
4604-#: breezy/builtins.py:5837
4605+#: breezy/builtins.py:5913
4606 msgid "Mail the request to this address."
4607 msgstr ""
4608
4609 # help of 'body' option of 'send' command
4610-#: breezy/builtins.py:5841
4611+#: breezy/builtins.py:5917
4612 msgid "Body for the email."
4613 msgstr ""
4614
4615 # help of 'no-bundle' option of 'send' command
4616-#: breezy/builtins.py:5894
4617+#: breezy/builtins.py:5964
4618 msgid "Do not include a bundle in the merge directive."
4619 msgstr ""
4620
4621 # help of 'no-patch' option of 'send' command
4622-#: breezy/builtins.py:5895
4623+#: breezy/builtins.py:5965
4624 msgid "Do not include a preview patch in the merge directive."
4625 msgstr ""
4626
4627 # help of 'remember' option of 'send' command
4628-#: breezy/builtins.py:5898
4629+#: breezy/builtins.py:5968
4630 msgid "Remember submit and public branch."
4631 msgstr ""
4632
4633 # help of 'from' option of 'send' command
4634-#: breezy/builtins.py:5900
4635+#: breezy/builtins.py:5970
4636 msgid ""
4637 "Branch to generate the submission from, rather than the one containing the "
4638 "working directory."
4639@@ -3769,133 +3936,133 @@
4640
4641 # title of 'format' option of 'send' command
4642 # title of 'format' option of 'version-info' command
4643-#: breezy/builtins.py:5910 breezy/cmd_version_info.py:76
4644+#: breezy/builtins.py:5980 breezy/cmd_version_info.py:77
4645 msgid "format"
4646 msgstr ""
4647
4648 # help of 'format' option of 'send' command
4649-#: breezy/builtins.py:5911
4650+#: breezy/builtins.py:5981
4651 msgid "Use the specified output format."
4652 msgstr ""
4653
4654-#: breezy/builtins.py:5933
4655+#: breezy/builtins.py:6003
4656 msgid "Create, remove or modify a tag naming a revision."
4657 msgstr ""
4658
4659-#: breezy/builtins.py:5935
4660+#: breezy/builtins.py:6005
4661 msgid ""
4662 "Tags give human-meaningful names to revisions. Commands that take a -r\n"
4663 "(--revision) option can be given -rtag:X, where X is any previously\n"
4664 "created tag."
4665 msgstr ""
4666
4667-#: breezy/builtins.py:5939
4668+#: breezy/builtins.py:6009
4669 msgid ""
4670 "Tags are stored in the branch. Tags are copied from one branch to another\n"
4671 "along when you branch, push, pull or merge."
4672 msgstr ""
4673
4674-#: breezy/builtins.py:5942
4675+#: breezy/builtins.py:6012
4676 msgid ""
4677 "It is an error to give a tag name that already exists unless you pass\n"
4678 "--force, in which case the tag is moved to point to the new revision."
4679 msgstr ""
4680
4681-#: breezy/builtins.py:5945
4682+#: breezy/builtins.py:6015
4683 msgid ""
4684 "To rename a tag (change the name but keep it on the same revsion), run "
4685 "``brz\n"
4686 "tag new-name -r tag:old-name`` and then ``brz tag --delete oldname``."
4687 msgstr ""
4688
4689-#: breezy/builtins.py:5948
4690+#: breezy/builtins.py:6018
4691 msgid ""
4692-"If no tag name is specified it will be determined through the \n"
4693+"If no tag name is specified it will be determined through the\n"
4694 "'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4695 "upstream releases by reading configure.ac. See ``brz help hooks`` for\n"
4696 "details."
4697 msgstr ""
4698
4699 # help of 'delete' option of 'tag' command
4700-#: breezy/builtins.py:5958
4701+#: breezy/builtins.py:6028
4702 msgid "Delete this tag rather than placing it."
4703 msgstr ""
4704
4705 # help of 'directory' option of 'tag' command
4706-#: breezy/builtins.py:5961
4707+#: breezy/builtins.py:6031
4708 msgid "Branch in which to place the tag."
4709 msgstr ""
4710
4711 # help of 'force' option of 'tag' command
4712-#: breezy/builtins.py:5963
4713+#: breezy/builtins.py:6033
4714 msgid "Replace existing tags."
4715 msgstr ""
4716
4717-#: breezy/builtins.py:5978
4718+#: breezy/builtins.py:6049
4719 msgid "No tag specified to delete."
4720 msgstr ""
4721
4722-#: breezy/builtins.py:5980
4723+#: breezy/builtins.py:6051
4724 #, python-format
4725 msgid "Deleted tag %s."
4726 msgstr ""
4727
4728-#: breezy/builtins.py:5985
4729+#: breezy/builtins.py:6056
4730 msgid "Tags can only be placed on a single revision, not on a range"
4731 msgstr ""
4732
4733-#: breezy/builtins.py:5994
4734+#: breezy/builtins.py:6065
4735 msgid "Please specify a tag name."
4736 msgstr ""
4737
4738-#: breezy/builtins.py:6002
4739+#: breezy/builtins.py:6073
4740 #, python-format
4741 msgid "Tag %s already exists for that revision."
4742 msgstr ""
4743
4744-#: breezy/builtins.py:6006
4745+#: breezy/builtins.py:6077
4746 #, python-format
4747 msgid "Created tag %s."
4748 msgstr ""
4749
4750-#: breezy/builtins.py:6008
4751+#: breezy/builtins.py:6079
4752 #, python-format
4753 msgid "Updated tag %s."
4754 msgstr ""
4755
4756-#: breezy/builtins.py:6012
4757+#: breezy/builtins.py:6083
4758 msgid "List tags."
4759 msgstr ""
4760
4761-#: breezy/builtins.py:6014
4762+#: breezy/builtins.py:6085
4763 msgid ""
4764 "This command shows a table of tag names and the revisions they reference."
4765 msgstr ""
4766
4767 # help of 'directory' option of 'tags' command
4768-#: breezy/builtins.py:6020
4769+#: breezy/builtins.py:6091
4770 msgid "Branch whose tags should be displayed."
4771 msgstr ""
4772
4773 # help of 'sort' option of 'tags' command
4774-#: breezy/builtins.py:6022
4775+#: breezy/builtins.py:6093
4776 msgid "Sort tags by different criteria."
4777 msgstr ""
4778
4779 # title of 'sort' option of 'tags' command
4780-#: breezy/builtins.py:6022
4781+#: breezy/builtins.py:6093
4782 msgid "Sorting"
4783 msgstr ""
4784
4785-#: breezy/builtins.py:6091
4786+#: breezy/builtins.py:6163
4787 msgid "Reconfigure the type of a brz directory."
4788 msgstr ""
4789
4790-#: breezy/builtins.py:6093
4791+#: breezy/builtins.py:6165
4792 msgid "A target configuration must be specified."
4793 msgstr ""
4794
4795-#: breezy/builtins.py:6095
4796+#: breezy/builtins.py:6167
4797 msgid ""
4798 "For checkouts, the bind-to location will be auto-detected if not specified.\n"
4799 "The order of preference is\n"
4800@@ -3907,112 +4074,112 @@
4801 msgstr ""
4802
4803 # title of 'tree_type' option of 'reconfigure' command
4804-#: breezy/builtins.py:6109
4805+#: breezy/builtins.py:6181
4806 msgid "Tree type"
4807 msgstr ""
4808
4809 # help of 'tree_type' option of 'reconfigure' command
4810-#: breezy/builtins.py:6110
4811+#: breezy/builtins.py:6182
4812 msgid "The relation between branch and tree."
4813 msgstr ""
4814
4815 # help of 'tree_type=branch' option of 'reconfigure' command
4816-#: breezy/builtins.py:6112
4817+#: breezy/builtins.py:6184
4818 msgid "Reconfigure to be an unbound branch with no working tree."
4819 msgstr ""
4820
4821 # help of 'tree_type=tree' option of 'reconfigure' command
4822-#: breezy/builtins.py:6113
4823+#: breezy/builtins.py:6185
4824 msgid "Reconfigure to be an unbound branch with a working tree."
4825 msgstr ""
4826
4827 # help of 'tree_type=checkout' option of 'reconfigure' command
4828-#: breezy/builtins.py:6114
4829+#: breezy/builtins.py:6186
4830 msgid "Reconfigure to be a bound branch with a working tree."
4831 msgstr ""
4832
4833 # help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
4834-#: breezy/builtins.py:6115
4835+#: breezy/builtins.py:6187
4836 msgid "Reconfigure to be a lightweight checkout (with no local history)."
4837 msgstr ""
4838
4839 # title of 'repository_type' option of 'reconfigure' command
4840-#: breezy/builtins.py:6120
4841+#: breezy/builtins.py:6192
4842 msgid "Repository type"
4843 msgstr ""
4844
4845 # help of 'repository_type' option of 'reconfigure' command
4846-#: breezy/builtins.py:6121
4847+#: breezy/builtins.py:6193
4848 msgid "Location fo the repository."
4849 msgstr ""
4850
4851 # help of 'repository_type=standalone' option of 'reconfigure' command
4852-#: breezy/builtins.py:6123
4853+#: breezy/builtins.py:6195
4854 msgid ""
4855 "Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4856 msgstr ""
4857
4858 # help of 'repository_type=use-shared' option of 'reconfigure' command
4859-#: breezy/builtins.py:6125
4860+#: breezy/builtins.py:6197
4861 msgid "Reconfigure to use a shared repository."
4862 msgstr ""
4863
4864 # title of 'repository_trees' option of 'reconfigure' command
4865-#: breezy/builtins.py:6129
4866+#: breezy/builtins.py:6201
4867 msgid "Trees in Repository"
4868 msgstr ""
4869
4870 # help of 'repository_trees' option of 'reconfigure' command
4871-#: breezy/builtins.py:6130
4872+#: breezy/builtins.py:6202
4873 msgid "Whether new branches in the repository have trees."
4874 msgstr ""
4875
4876 # help of 'repository_trees=with-trees' option of 'reconfigure' command
4877-#: breezy/builtins.py:6132
4878+#: breezy/builtins.py:6204
4879 msgid "Reconfigure repository to create working trees on branches by default."
4880 msgstr ""
4881
4882 # help of 'repository_trees=with-no-trees' option of 'reconfigure' command
4883-#: breezy/builtins.py:6134
4884+#: breezy/builtins.py:6206
4885 msgid ""
4886 "Reconfigure repository to not create working trees on branches by default."
4887 msgstr ""
4888
4889 # help of 'bind-to' option of 'reconfigure' command
4890-#: breezy/builtins.py:6137
4891+#: breezy/builtins.py:6209
4892 msgid "Branch to bind checkout to."
4893 msgstr ""
4894
4895 # help of 'force' option of 'reconfigure' command
4896-#: breezy/builtins.py:6139
4897+#: breezy/builtins.py:6211
4898 msgid "Perform reconfiguration even if local changes will be lost."
4899 msgstr ""
4900
4901 # help of 'stacked-on' option of 'reconfigure' command
4902-#: breezy/builtins.py:6142
4903+#: breezy/builtins.py:6214
4904 msgid "Reconfigure a branch to be stacked on another branch."
4905 msgstr ""
4906
4907 # help of 'unstacked' option of 'reconfigure' command
4908-#: breezy/builtins.py:6146
4909+#: breezy/builtins.py:6218
4910 msgid ""
4911 "Reconfigure a branch to be unstacked. This may require copying substantial "
4912 "data into it."
4913 msgstr ""
4914
4915-#: breezy/builtins.py:6156
4916+#: breezy/builtins.py:6229
4917 msgid "Can't use both --stacked-on and --unstacked"
4918 msgstr ""
4919
4920-#: breezy/builtins.py:6170
4921+#: breezy/builtins.py:6243
4922 msgid "No target configuration specified"
4923 msgstr ""
4924
4925-#: breezy/builtins.py:6205
4926+#: breezy/builtins.py:6278
4927 msgid "Set the branch of a checkout and update."
4928 msgstr ""
4929
4930-#: breezy/builtins.py:6207
4931+#: breezy/builtins.py:6280
4932 msgid ""
4933 "For lightweight checkouts, this changes the branch being referenced.\n"
4934 "For heavyweight checkouts, this checks that there are no local commits\n"
4935@@ -4020,17 +4187,17 @@
4936 "of the new location and binds to it."
4937 msgstr ""
4938
4939-#: breezy/builtins.py:6212
4940+#: breezy/builtins.py:6285
4941 msgid ""
4942 "In both cases, the working tree is updated and uncommitted changes\n"
4943 "are merged. The user can commit or revert these as they desire."
4944 msgstr ""
4945
4946-#: breezy/builtins.py:6215
4947+#: breezy/builtins.py:6288
4948 msgid "Pending merges need to be committed or reverted before using switch."
4949 msgstr ""
4950
4951-#: breezy/builtins.py:6217
4952+#: breezy/builtins.py:6290
4953 msgid ""
4954 "The path to the branch to switch to can be specified relative to the parent\n"
4955 "directory of the current branch. For example, if you are currently in a\n"
4956@@ -4038,7 +4205,7 @@
4957 "/path/to/newbranch."
4958 msgstr ""
4959
4960-#: breezy/builtins.py:6222
4961+#: breezy/builtins.py:6295
4962 msgid ""
4963 "Bound branches use the nickname of its master branch unless it is set\n"
4964 "locally, in which case switching will update the local nickname to be\n"
4965@@ -4046,33 +4213,39 @@
4966 msgstr ""
4967
4968 # help of 'force' option of 'switch' command
4969-#: breezy/builtins.py:6230
4970+#: breezy/builtins.py:6303
4971 msgid "Switch even if local commits will be lost."
4972 msgstr ""
4973
4974 # help of 'create-branch' option of 'switch' command
4975-#: breezy/builtins.py:6233
4976+#: breezy/builtins.py:6306
4977 msgid "Create the target branch from this one before switching to it."
4978 msgstr ""
4979
4980 # help of 'store' option of 'switch' command
4981-#: breezy/builtins.py:6236
4982+#: breezy/builtins.py:6309
4983 msgid "Store and restore uncommitted changes in the branch."
4984 msgstr ""
4985
4986-#: breezy/builtins.py:6250
4987+#: breezy/builtins.py:6323
4988 msgid "You must supply either a revision or a location"
4989 msgstr ""
4990
4991-#: breezy/builtins.py:6263
4992+#: breezy/builtins.py:6336
4993 msgid "cannot create branch without source branch"
4994 msgstr ""
4995
4996-#: breezy/builtins.py:6289
4997+#: breezy/builtins.py:6362
4998+msgid ""
4999+"switching would create a branch reference loop. Use the \"bzr up\" command "
5000+"to switch to a different revision."
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches