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