« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6124
- compare with another revision
- download diff
- download tarball
- view history from revision 6124
- Committer: Patch Queue Manager
- Date: 2011-09-08 11:01:15 UTC
- mfrom: (6123.1.16 gpg-typo)
- Revision ID: pqm@cupuasso-20110908110115-gbb9benwkdksvzk5
(jelmer) Fix a typo (invalid format identifier) in an error message in
bzrlib.gpg. (Jelmer Vernooij)
bzrlib.gpg. (Jelmer Vernooij)
- files added:
- bzrlib/tests/per_repository/test_fileid_involved.py
- files removed:
- bzrlib/estimate_compressed_size.py
- files renamed:
- bzrlib/tests/per_repository_vf/test_merge_directive.py => bzrlib/tests/per_repository/test_merge_directive.py
- bzrlib/bzr_distutils.py => tools/build_mo.py
- files modified:
- bzrlib/__init__.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-20 10:41+0100\n"
11
"POT-Creation-Date: 2011-09-07 15:32+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/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:852
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:3138
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:3140
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] ""
39
msgstr[1] ""
40
41
#: bzrlib/branch.py:3143
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:3145
46
msgid "No new revisions to push."
47
msgstr ""
48
49
#: bzrlib/branch.py:3165
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3168
54
#, python-format
55
msgid "found error:%s"
56
msgstr ""
57
58
#: bzrlib/builtins.py:116 bzrlib/builtins.py:2782 bzrlib/workingtree.py:306
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:125
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:210
21
#: bzrlib/builtins.py:209
69
22
msgid "Display status summary."
70
23
msgstr ""
71
24
72
#: bzrlib/builtins.py:212
25
#: bzrlib/builtins.py:211
73
26
msgid ""
74
27
"This reports on versioned and unknown files, reporting them\n"
75
28
"grouped by state. Possible states are:"
76
29
msgstr ""
77
30
78
#: bzrlib/builtins.py:215
31
#: bzrlib/builtins.py:214
79
32
msgid ""
80
33
"added\n"
81
34
" Versioned in the working copy but not in the previous revision."
82
35
msgstr ""
83
36
84
#: bzrlib/builtins.py:218
37
#: bzrlib/builtins.py:217
85
38
msgid ""
86
39
"removed\n"
87
40
" Versioned in the previous revision but removed or deleted\n"
88
41
" in the working copy."
89
42
msgstr ""
90
43
91
#: bzrlib/builtins.py:222
44
#: bzrlib/builtins.py:221
92
45
msgid ""
93
46
"renamed\n"
94
47
" Path of this file changed from the previous revision;\n"
96
49
" parent directory was renamed."
97
50
msgstr ""
98
51
99
#: bzrlib/builtins.py:227
52
#: bzrlib/builtins.py:226
100
53
msgid ""
101
54
"modified\n"
102
55
" Text has changed since the previous revision."
103
56
msgstr ""
104
57
105
#: bzrlib/builtins.py:230
58
#: bzrlib/builtins.py:229
106
59
msgid ""
107
60
"kind changed\n"
108
61
" File kind has been changed (e.g. from file to directory)."
109
62
msgstr ""
110
63
111
#: bzrlib/builtins.py:233
64
#: bzrlib/builtins.py:232
112
65
msgid ""
113
66
"unknown\n"
114
67
" Not versioned and not matching an ignore pattern."
115
68
msgstr ""
116
69
117
#: bzrlib/builtins.py:236
70
#: bzrlib/builtins.py:235
118
71
msgid ""
119
72
"Additionally for directories, symlinks and files with a changed\n"
120
73
"executable bit, Bazaar indicates their type using a trailing\n"
122
75
"disabled using the '--no-classify' option."
123
76
msgstr ""
124
77
125
#: bzrlib/builtins.py:241
78
#: bzrlib/builtins.py:240
126
79
msgid ""
127
80
"To see ignored files use 'bzr ignored'. For details on the\n"
128
81
"changes to file texts, use 'bzr diff'."
129
82
msgstr ""
130
83
131
#: bzrlib/builtins.py:244
84
#: bzrlib/builtins.py:243
132
85
msgid ""
133
86
"Note that --short or -S gives status flags for each item, similar\n"
134
87
"to Subversion's status command. To get output similar to svn -q,\n"
135
88
"use bzr status -SV."
136
89
msgstr ""
137
90
138
#: bzrlib/builtins.py:248
91
#: bzrlib/builtins.py:247
139
92
msgid ""
140
93
"If no arguments are specified, the status of the entire working\n"
141
94
"directory is shown. Otherwise, only the status of the specified\n"
143
96
"is reported for everything inside that directory."
144
97
msgstr ""
145
98
146
#: bzrlib/builtins.py:253
99
#: bzrlib/builtins.py:252
147
100
msgid ""
148
101
"Before merges are committed, the pending merge tip revisions are\n"
149
102
"shown. To see all pending merge revisions, use the -v option.\n"
151
104
"the no-pending option or specify a file/directory."
152
105
msgstr ""
153
106
154
#: bzrlib/builtins.py:258
107
#: bzrlib/builtins.py:257
155
108
msgid ""
156
109
"To compare the working directory to a specific revision, pass a\n"
157
110
"single revision to the revision argument."
158
111
msgstr ""
159
112
160
#: bzrlib/builtins.py:261
113
#: bzrlib/builtins.py:260
161
114
msgid ""
162
115
"To see which files have changed in a specific revision, or between\n"
163
116
"two revisions, pass a revision range to the revision argument.\n"
165
118
msgstr ""
166
119
167
120
# help of 'short' option of 'status' command
168
#: bzrlib/builtins.py:270
121
#: bzrlib/builtins.py:269
169
122
msgid "Use short status indicators."
170
123
msgstr ""
171
124
172
125
# help of 'versioned' option of 'status' command
173
#: bzrlib/builtins.py:272
126
#: bzrlib/builtins.py:271
174
127
msgid "Only show versioned files."
175
128
msgstr ""
176
129
177
130
# help of 'no-pending' option of 'status' command
178
#: bzrlib/builtins.py:274
131
#: bzrlib/builtins.py:273
179
132
msgid "Don't show pending merges."
180
133
msgstr ""
181
134
182
135
# help of 'no-classify' option of 'status' command
183
#: bzrlib/builtins.py:277
136
#: bzrlib/builtins.py:276
184
137
msgid "Do not mark object type using indicator."
185
138
msgstr ""
186
139
187
#: bzrlib/builtins.py:292
188
msgid "bzr status --revision takes exactly one or two revision specifiers"
189
msgstr ""
190
191
#: bzrlib/builtins.py:336 bzrlib/builtins.py:4927
192
msgid "You can only supply one of revision_id or --revision"
193
msgstr ""
194
195
#: bzrlib/builtins.py:339 bzrlib/builtins.py:4929
196
msgid "You must supply either --revision or a revision_id"
197
msgstr ""
198
199
#: bzrlib/builtins.py:346
200
#, python-format
201
msgid "Repository %r does not support access to raw revision texts"
202
msgstr ""
203
204
#: bzrlib/builtins.py:357
205
msgid "The repository {0} contains no revision {1}."
206
msgstr ""
207
208
#: bzrlib/builtins.py:364
209
msgid "You cannot specify a NULL revision."
210
msgstr ""
211
212
#: bzrlib/builtins.py:456
140
#: bzrlib/builtins.py:455
213
141
msgid "Remove the working tree from a given branch/checkout."
214
142
msgstr ""
215
143
216
#: bzrlib/builtins.py:458
144
#: bzrlib/builtins.py:457
217
145
msgid ""
218
146
"Since a lightweight checkout is little more than a working tree\n"
219
147
"this will refuse to run against one."
220
148
msgstr ""
221
149
222
#: bzrlib/builtins.py:461
150
#: bzrlib/builtins.py:460
223
151
msgid "To re-create the working tree, use \"bzr checkout\"."
224
152
msgstr ""
225
153
226
154
# help of 'force' option of 'remove-tree' command
227
#: bzrlib/builtins.py:467
155
#: bzrlib/builtins.py:466
228
156
msgid "Remove the working tree even if it has uncommitted or shelved changes."
229
157
msgstr ""
230
158
231
#: bzrlib/builtins.py:481
232
msgid "No working tree to remove"
233
msgstr ""
234
235
#: bzrlib/builtins.py:483
236
msgid "You cannot remove the working tree of a remote path"
237
msgstr ""
238
239
#: bzrlib/builtins.py:492
240
msgid "You cannot remove the working tree from a lightweight checkout"
241
msgstr ""
242
243
#: bzrlib/builtins.py:532
244
msgid ""
245
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
246
"instead. Use \"--force\" if you are sure you want to reset the working tree."
247
msgstr ""
248
249
#: bzrlib/builtins.py:543
250
msgid ""
251
", the header appears corrupt, try passing -r -1 to set the state to the last "
252
"commit"
253
msgstr ""
254
255
#: bzrlib/builtins.py:547
256
msgid "failed to reset the tree state{0}"
257
msgstr ""
258
259
159
#: bzrlib/builtins.py:551
260
160
msgid "Show current revision number."
261
161
msgstr ""
345
245
msgid "Lookup file ids from this tree."
346
246
msgstr ""
347
247
348
#: bzrlib/builtins.py:727
349
msgid "ignored {0} matching \"{1}\"\n"
350
msgstr ""
351
352
#: bzrlib/builtins.py:732
248
#: bzrlib/builtins.py:731
353
249
msgid "Create a new versioned directory."
354
250
msgstr ""
355
251
356
#: bzrlib/builtins.py:734
252
#: bzrlib/builtins.py:733
357
253
msgid "This is equivalent to creating the directory and then adding it."
358
254
msgstr ""
359
255
360
#: bzrlib/builtins.py:748
361
#, python-format
362
msgid "added %s\n"
363
msgstr ""
364
365
#: bzrlib/builtins.py:792
366
#, python-format
367
msgid "invalid kind %r specified"
368
msgstr ""
369
370
#: bzrlib/builtins.py:829
256
#: bzrlib/builtins.py:828
371
257
msgid "Move or rename a file."
372
258
msgstr ""
373
259
374
#: bzrlib/builtins.py:831
260
#: bzrlib/builtins.py:830
375
261
msgid " bzr mv SOURCE... DESTINATION"
376
262
msgstr ""
377
263
378
#: bzrlib/builtins.py:833
264
#: bzrlib/builtins.py:832
379
265
msgid ""
380
266
"If the last argument is a versioned directory, all the other names\n"
381
267
"are moved into it. Otherwise, there must be exactly two arguments\n"
382
268
"and the file is changed to a new name."
383
269
msgstr ""
384
270
385
#: bzrlib/builtins.py:837
271
#: bzrlib/builtins.py:836
386
272
msgid ""
387
273
"If OLDNAME does not exist on the filesystem but is versioned and\n"
388
274
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
391
277
"The same is valid when moving many SOURCE files to a DESTINATION."
392
278
msgstr ""
393
279
394
#: bzrlib/builtins.py:843
280
#: bzrlib/builtins.py:842
395
281
msgid "Files cannot be moved between branches."
396
282
msgstr ""
397
283
398
284
# help of 'after' option of 'mv' command
399
#: bzrlib/builtins.py:850
285
#: bzrlib/builtins.py:849
400
286
msgid ""
401
287
"Move only the bzr identifier of the file, because the file has already been "
402
288
"moved."
403
289
msgstr ""
404
290
405
291
# help of 'auto' option of 'mv' command
406
#: bzrlib/builtins.py:852
292
#: bzrlib/builtins.py:851
407
293
msgid "Automatically guess renames."
408
294
msgstr ""
409
295
410
296
# help of 'dry-run' option of 'mv' command
411
#: bzrlib/builtins.py:853
297
#: bzrlib/builtins.py:852
412
298
msgid "Avoid making changes when guessing renames."
413
299
msgstr ""
414
300
415
#: bzrlib/builtins.py:862
416
msgid "--dry-run requires --auto."
417
msgstr ""
418
419
#: bzrlib/builtins.py:866
420
msgid "missing file argument"
421
msgstr ""
422
423
#: bzrlib/builtins.py:873
424
msgid "Only one path may be specified to --auto."
425
msgstr ""
426
427
#: bzrlib/builtins.py:876
428
msgid "--after cannot be specified with --auto."
429
msgstr ""
430
431
#: bzrlib/builtins.py:913
432
msgid "to mv multiple files the destination must be a versioned directory"
433
msgstr ""
434
435
#: bzrlib/builtins.py:965
301
#: bzrlib/builtins.py:964
436
302
msgid "Turn this branch into a mirror of another branch."
437
303
msgstr ""
438
304
439
#: bzrlib/builtins.py:967
305
#: bzrlib/builtins.py:966
440
306
msgid ""
441
307
"By default, this command only works on branches that have not diverged.\n"
442
308
"Branches are considered diverged if the destination branch's most recent \n"
444
310
"parent."
445
311
msgstr ""
446
312
447
#: bzrlib/builtins.py:972
313
#: bzrlib/builtins.py:971
448
314
msgid ""
449
315
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
450
316
"from one into the other. Once one branch has merged, the other should\n"
451
317
"be able to pull it again."
452
318
msgstr ""
453
319
454
#: bzrlib/builtins.py:976
320
#: bzrlib/builtins.py:975
455
321
msgid ""
456
322
"If you want to replace your local changes and just want your branch to\n"
457
323
"match the remote one, use pull --overwrite. This will work even if the two\n"
458
324
"branches have diverged."
459
325
msgstr ""
460
326
461
#: bzrlib/builtins.py:980
327
#: bzrlib/builtins.py:979
462
328
msgid ""
463
329
"If there is no default location set, the first pull will set it (use\n"
464
330
"--no-remember to avoid setting it). After that, you can omit the\n"
466
332
"value will only be saved if the remote location can be accessed."
467
333
msgstr ""
468
334
469
#: bzrlib/builtins.py:985
335
#: bzrlib/builtins.py:984
470
336
msgid ""
471
337
"Note: The location can be specified either in the form of a branch,\n"
472
338
"or in the form of a path to a file containing a merge directive generated\n"
474
340
msgstr ""
475
341
476
342
# help of 'verbose' option of 'pull' command
477
#: bzrlib/builtins.py:993
343
#: bzrlib/builtins.py:992
478
344
msgid "Show logs of pulled revisions."
479
345
msgstr ""
480
346
481
347
# help of 'directory' option of 'pull' command
482
#: bzrlib/builtins.py:995
348
#: bzrlib/builtins.py:994
483
349
msgid ""
484
350
"Branch to pull into, rather than the one containing the working directory."
485
351
msgstr ""
486
352
487
353
# help of 'local' option of 'pull' command
488
#: bzrlib/builtins.py:998
354
#: bzrlib/builtins.py:997
489
355
msgid ""
490
356
"Perform a local pull in a bound branch. Local pulls are not applied to the "
491
357
"master branch."
492
358
msgstr ""
493
359
494
#: bzrlib/builtins.py:1027
495
msgid "Need working tree for --show-base."
496
msgstr ""
497
498
#: bzrlib/builtins.py:1043
499
msgid "No pull location known or specified."
500
msgstr ""
501
502
#: bzrlib/builtins.py:1049
503
#, python-format
504
msgid "Using saved parent location: %s\n"
505
msgstr ""
506
507
#: bzrlib/builtins.py:1056 bzrlib/builtins.py:4137
508
msgid "Cannot use -r with merge directives or bundles"
509
msgstr ""
510
511
#: bzrlib/builtins.py:1097
360
#: bzrlib/builtins.py:1096
512
361
msgid "Update a mirror of this branch."
513
362
msgstr ""
514
363
515
#: bzrlib/builtins.py:1099
364
#: bzrlib/builtins.py:1098
516
365
msgid ""
517
366
"The target branch will not have its working tree populated because this\n"
518
367
"is both expensive, and is not supported on remote file systems."
519
368
msgstr ""
520
369
521
#: bzrlib/builtins.py:1102
370
#: bzrlib/builtins.py:1101
522
371
msgid ""
523
372
"Some smart servers or protocols *may* put the working tree in place in\n"
524
373
"the future."
525
374
msgstr ""
526
375
527
#: bzrlib/builtins.py:1105
376
#: bzrlib/builtins.py:1104
528
377
msgid ""
529
378
"This command only works on branches that have not diverged. Branches are\n"
530
379
"considered diverged if the destination branch's most recent commit is one\n"
531
380
"that has not been merged (directly or indirectly) by the source branch."
532
381
msgstr ""
533
382
534
#: bzrlib/builtins.py:1109
383
#: bzrlib/builtins.py:1108
535
384
msgid ""
536
385
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
537
386
"the other branch completely, discarding its unmerged changes."
538
387
msgstr ""
539
388
540
#: bzrlib/builtins.py:1112
389
#: bzrlib/builtins.py:1111
541
390
msgid ""
542
391
"If you want to ensure you have the different changes in the other branch,\n"
543
392
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
544
393
"After that you will be able to do a push without '--overwrite'."
545
394
msgstr ""
546
395
547
#: bzrlib/builtins.py:1116
396
#: bzrlib/builtins.py:1115
548
397
msgid ""
549
398
"If there is no default push location set, the first push will set it (use\n"
550
399
"--no-remember to avoid setting it). After that, you can omit the\n"
553
402
msgstr ""
554
403
555
404
# help of 'directory' option of 'push' command
556
#: bzrlib/builtins.py:1128
405
#: bzrlib/builtins.py:1127
557
406
msgid ""
558
407
"Branch to push from, rather than the one containing the working directory."
559
408
msgstr ""
560
409
561
410
# help of 'use-existing-dir' option of 'push' command
562
#: bzrlib/builtins.py:1131
411
#: bzrlib/builtins.py:1130
563
412
msgid ""
564
413
"By default push will fail if the target directory exists, but does not "
565
414
"already have a control directory. This flag will allow push to proceed."
566
415
msgstr ""
567
416
568
417
# help of 'stacked' option of 'push' command
569
#: bzrlib/builtins.py:1136
418
#: bzrlib/builtins.py:1135
570
419
msgid ""
571
420
"Create a stacked branch that references the public location of the parent "
572
421
"branch."
573
422
msgstr ""
574
423
575
424
# help of 'stacked-on' option of 'push' command
576
#: bzrlib/builtins.py:1139
425
#: bzrlib/builtins.py:1138
577
426
msgid ""
578
427
"Create a stacked branch that refers to another branch for the commit "
579
428
"history. Only the work not present in the referenced branch is included in "
581
430
msgstr ""
582
431
583
432
# help of 'strict' option of 'push' command
584
#: bzrlib/builtins.py:1144
433
#: bzrlib/builtins.py:1143
585
434
msgid ""
586
435
"Refuse to push if there are uncommitted changes in the working tree, --no-"
587
436
"strict disables the check."
588
437
msgstr ""
589
438
590
439
# help of 'no-tree' option of 'push' command
591
#: bzrlib/builtins.py:1147
440
#: bzrlib/builtins.py:1146
592
441
msgid "Don't populate the working tree, even for protocols that support it."
593
442
msgstr ""
594
443
595
#: bzrlib/builtins.py:1191
596
msgid "Could not determine branch to refer to."
597
msgstr ""
598
599
#: bzrlib/builtins.py:1198 bzrlib/foreign.py:306
600
msgid "No push location known or specified."
601
msgstr ""
602
603
#: bzrlib/builtins.py:1202
604
#, python-format
605
msgid "Using saved push location: %s"
606
msgstr ""
607
608
#: bzrlib/builtins.py:1212
444
#: bzrlib/builtins.py:1211
609
445
msgid "Create a new branch that is a copy of an existing branch."
610
446
msgstr ""
611
447
612
#: bzrlib/builtins.py:1214
448
#: bzrlib/builtins.py:1213
613
449
msgid ""
614
450
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
615
451
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
620
456
"create ./foo-bar."
621
457
msgstr ""
622
458
623
#: bzrlib/builtins.py:1221
459
#: bzrlib/builtins.py:1220
624
460
msgid ""
625
461
"To retrieve the branch as of a particular revision, supply the --revision\n"
626
462
"parameter, as in \"branch foo/bar -r 5\"."
627
463
msgstr ""
628
464
629
#: bzrlib/builtins.py:1224
465
#: bzrlib/builtins.py:1223
630
466
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
631
467
msgstr ""
632
468
633
469
# help of 'no-tree' option of 'branch' command
634
#: bzrlib/builtins.py:1234
470
#: bzrlib/builtins.py:1233
635
471
msgid "Create a branch without a working-tree."
636
472
msgstr ""
637
473
638
474
# help of 'switch' option of 'branch' command
639
#: bzrlib/builtins.py:1236
475
#: bzrlib/builtins.py:1235
640
476
msgid "Switch the checkout in the current directory to the new branch."
641
477
msgstr ""
642
478
643
479
# help of 'stacked' option of 'branch' command
644
#: bzrlib/builtins.py:1239
480
#: bzrlib/builtins.py:1238
645
481
msgid ""
646
482
"Create a stacked branch referring to the source branch. The new branch will "
647
483
"depend on the availability of the source branch for all operations."
648
484
msgstr ""
649
485
650
486
# help of 'standalone' option of 'branch' command
651
#: bzrlib/builtins.py:1243
487
#: bzrlib/builtins.py:1242
652
488
msgid "Do not use a shared repository, even if available."
653
489
msgstr ""
654
490
655
491
# help of 'use-existing-dir' option of 'branch' command
656
#: bzrlib/builtins.py:1245
492
#: bzrlib/builtins.py:1244
657
493
msgid ""
658
494
"By default branch will fail if the target directory exists, but does not "
659
495
"already have a control directory. This flag will allow branch to proceed."
660
496
msgstr ""
661
497
662
498
# help of 'bind' option of 'branch' command
663
#: bzrlib/builtins.py:1250
499
#: bzrlib/builtins.py:1249
664
500
msgid "Bind new branch to from location."
665
501
msgstr ""
666
502
667
#: bzrlib/builtins.py:1291
668
#, python-format
669
msgid "Target directory \"%s\" already exists."
670
msgstr ""
671
672
#: bzrlib/builtins.py:1301
673
#, python-format
674
msgid "Parent of \"%s\" does not exist."
675
msgstr ""
676
677
#: bzrlib/builtins.py:1315
678
msgid "The branch {0} has no revision {1}."
679
msgstr ""
680
681
#: bzrlib/builtins.py:1323 bzrlib/push.py:51
682
#, python-format
683
msgid "Created new stacked branch referring to %s."
684
msgstr ""
685
686
#: bzrlib/builtins.py:1327
687
#, python-format
688
msgid "Branched %d revision."
689
msgid_plural "Branched %d revisions."
690
msgstr[0] ""
691
msgstr[1] ""
692
693
#: bzrlib/builtins.py:1332
694
#, python-format
695
msgid "New branch bound to %s"
696
msgstr ""
697
698
#: bzrlib/builtins.py:1337 bzrlib/builtins.py:5968
699
#, python-format
700
msgid "Switched to branch: %s"
701
msgstr ""
702
703
#: bzrlib/builtins.py:1342
503
#: bzrlib/builtins.py:1341
704
504
msgid "List the branches available at the current location."
705
505
msgstr ""
706
506
707
#: bzrlib/builtins.py:1344
507
#: bzrlib/builtins.py:1343
708
508
msgid ""
709
509
"This command will print the names of all the branches at the current "
710
510
"location."
711
511
msgstr ""
712
512
713
#: bzrlib/builtins.py:1353
714
msgid " (default)\n"
715
msgstr ""
716
717
#: bzrlib/builtins.py:1359
513
#: bzrlib/builtins.py:1358
718
514
msgid "Create a new checkout of an existing branch."
719
515
msgstr ""
720
516
721
#: bzrlib/builtins.py:1361
517
#: bzrlib/builtins.py:1360
722
518
msgid ""
723
519
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
724
520
"for\n"
728
524
"location using SFTP."
729
525
msgstr ""
730
526
731
#: bzrlib/builtins.py:1366
527
#: bzrlib/builtins.py:1365
732
528
msgid ""
733
529
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
734
530
"will\n"
740
536
"create ./foo-bar."
741
537
msgstr ""
742
538
743
#: bzrlib/builtins.py:1373
539
#: bzrlib/builtins.py:1372
744
540
msgid ""
745
541
"To retrieve the branch as of a particular revision, supply the --revision\n"
746
542
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
751
547
msgstr ""
752
548
753
549
# help of 'lightweight' option of 'checkout' command
754
#: bzrlib/builtins.py:1383
550
#: bzrlib/builtins.py:1382
755
551
msgid ""
756
552
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
757
553
"the branch for every operation. Normal checkouts can perform common "
760
556
msgstr ""
761
557
762
558
# help of 'files-from' option of 'branch' command
763
#: bzrlib/builtins.py:1390
559
#: bzrlib/builtins.py:1389
764
560
msgid "Get file contents from this tree."
765
561
msgstr ""
766
562
767
563
# help of 'hardlink' option of 'branch' command
768
#: bzrlib/builtins.py:1392
564
#: bzrlib/builtins.py:1391
769
565
msgid "Hard-link working tree files where possible."
770
566
msgstr ""
771
567
772
#: bzrlib/builtins.py:1433
568
#: bzrlib/builtins.py:1432
773
569
msgid ""
774
570
"Show list of renamed files.\n"
775
571
" "
776
572
msgstr ""
777
573
778
#: bzrlib/builtins.py:1463
574
#: bzrlib/builtins.py:1462
779
575
msgid "Update a tree to have the latest code committed to its branch."
780
576
msgstr ""
781
577
782
#: bzrlib/builtins.py:1465
578
#: bzrlib/builtins.py:1464
783
579
msgid ""
784
580
"This will perform a merge into the working tree, and may generate\n"
785
581
"conflicts. If you have any local changes, you will still\n"
786
582
"need to commit them after the update for the update to be complete."
787
583
msgstr ""
788
584
789
#: bzrlib/builtins.py:1469
585
#: bzrlib/builtins.py:1468
790
586
msgid ""
791
587
"If you want to discard your local changes, you can just do a\n"
792
588
"'bzr revert' instead of 'bzr commit' after the update."
793
589
msgstr ""
794
590
795
#: bzrlib/builtins.py:1472
591
#: bzrlib/builtins.py:1471
796
592
msgid ""
797
593
"If you want to restore a file that has been removed locally, use\n"
798
594
"'bzr revert' instead of 'bzr update'."
799
595
msgstr ""
800
596
801
#: bzrlib/builtins.py:1475
597
#: bzrlib/builtins.py:1474
802
598
msgid ""
803
599
"If the tree's branch is bound to a master branch, it will also update\n"
804
600
"the branch from the master."
805
601
msgstr ""
806
602
807
#: bzrlib/builtins.py:1490
808
msgid "bzr update --revision takes exactly one revision"
809
msgstr ""
810
811
#: bzrlib/builtins.py:1521
812
msgid "Tree is up to date at revision {0} of branch {1}"
813
msgstr ""
814
815
#: bzrlib/builtins.py:1537
816
#, python-format
817
msgid ""
818
"branch has no revision %s\n"
819
"bzr update --revision only works for a revision in the branch history"
820
msgstr ""
821
822
#: bzrlib/builtins.py:1543
823
msgid "Updated to revision {0} of branch {1}"
824
msgstr ""
825
826
#: bzrlib/builtins.py:1547
827
msgid ""
828
"Your local commits will now show as pending merges with 'bzr status', and "
829
"can be committed with 'bzr commit'."
830
msgstr ""
831
832
#: bzrlib/builtins.py:1556
603
#: bzrlib/builtins.py:1555
833
604
msgid "Show information about a working tree, branch or repository."
834
605
msgstr ""
835
606
836
#: bzrlib/builtins.py:1558
607
#: bzrlib/builtins.py:1557
837
608
msgid ""
838
609
"This command will show all known locations and formats associated to the\n"
839
610
"tree, branch or repository."
840
611
msgstr ""
841
612
842
#: bzrlib/builtins.py:1561
613
#: bzrlib/builtins.py:1560
843
614
msgid ""
844
615
"In verbose mode, statistical information is included with each report.\n"
845
616
"To see extended statistic information, use a verbosity level of 2 or\n"
846
617
"higher by specifying the verbose option multiple times, e.g. -vv."
847
618
msgstr ""
848
619
849
#: bzrlib/builtins.py:1565
620
#: bzrlib/builtins.py:1564
850
621
msgid "Branches and working trees will also report any missing revisions."
851
622
msgstr ""
852
623
853
#: bzrlib/builtins.py:1569
624
#: bzrlib/builtins.py:1568
854
625
msgid " Display information on the format and related locations:"
855
626
msgstr ""
856
627
857
#: bzrlib/builtins.py:1571
628
#: bzrlib/builtins.py:1570
858
629
msgid " bzr info"
859
630
msgstr ""
860
631
861
#: bzrlib/builtins.py:1573
632
#: bzrlib/builtins.py:1572
862
633
msgid ""
863
634
" Display the above together with extended format information and\n"
864
635
" basic statistics (like the number of files in the working tree and\n"
865
636
" number of revisions in the branch and repository):"
866
637
msgstr ""
867
638
868
#: bzrlib/builtins.py:1577
639
#: bzrlib/builtins.py:1576
869
640
msgid " bzr info -v"
870
641
msgstr ""
871
642
872
#: bzrlib/builtins.py:1579
643
#: bzrlib/builtins.py:1578
873
644
msgid " Display the above together with number of committers to the branch:"
874
645
msgstr ""
875
646
876
#: bzrlib/builtins.py:1581
647
#: bzrlib/builtins.py:1580
877
648
msgid " bzr info -vv"
878
649
msgstr ""
879
650
880
#: bzrlib/builtins.py:1600
651
#: bzrlib/builtins.py:1599
881
652
msgid "Remove files or directories."
882
653
msgstr ""
883
654
884
#: bzrlib/builtins.py:1602
655
#: bzrlib/builtins.py:1601
885
656
msgid ""
886
657
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
887
658
"delete them if they can easily be recovered using revert otherwise they\n"
891
662
msgstr ""
892
663
893
664
# help of 'new' option of 'remove' command
894
#: bzrlib/builtins.py:1610
665
#: bzrlib/builtins.py:1609
895
666
msgid "Only remove files that have never been committed."
896
667
msgstr ""
897
668
898
669
# help of 'file-deletion-strategy' option of 'remove' command
899
#: bzrlib/builtins.py:1612
670
#: bzrlib/builtins.py:1611
900
671
msgid "The file deletion mode to be used."
901
672
msgstr ""
902
673
903
674
# title of 'file-deletion-strategy' option of 'remove' command
904
#: bzrlib/builtins.py:1613
675
#: bzrlib/builtins.py:1612
905
676
msgid "Deletion Strategy"
906
677
msgstr ""
907
678
908
#: bzrlib/builtins.py:1626
909
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
910
msgstr ""
911
912
#: bzrlib/builtins.py:1643
913
msgid "No matching files."
914
msgstr ""
915
916
#: bzrlib/builtins.py:1704
679
#: bzrlib/builtins.py:1703
917
680
msgid "Reconcile bzr metadata in a branch."
918
681
msgstr ""
919
682
920
#: bzrlib/builtins.py:1706
683
#: bzrlib/builtins.py:1705
921
684
msgid ""
922
685
"This can correct data mismatches that may have been caused by\n"
923
686
"previous ghost operations or bzr upgrades. You should only\n"
925
688
"advises you to run it."
926
689
msgstr ""
927
690
928
#: bzrlib/builtins.py:1711
691
#: bzrlib/builtins.py:1710
929
692
msgid ""
930
693
"If a second branch is provided, cross-branch reconciliation is\n"
931
694
"also attempted, which will check that data like the tree root\n"
933
696
"correctly in both branches."
934
697
msgstr ""
935
698
936
#: bzrlib/builtins.py:1716
699
#: bzrlib/builtins.py:1715
937
700
msgid ""
938
701
"At the same time it is run it may recompress data resulting in\n"
939
702
"a potential saving in disk space or performance gain."
940
703
msgstr ""
941
704
942
#: bzrlib/builtins.py:1719
705
#: bzrlib/builtins.py:1718
943
706
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
944
707
msgstr ""
945
708
946
#: bzrlib/builtins.py:1783
709
#: bzrlib/builtins.py:1782
947
710
msgid "Make a directory into a versioned branch."
948
711
msgstr ""
949
712
950
#: bzrlib/builtins.py:1785
713
#: bzrlib/builtins.py:1784
951
714
msgid ""
952
715
"Use this to create an empty branch, or before importing an\n"
953
716
"existing project."
954
717
msgstr ""
955
718
956
#: bzrlib/builtins.py:1788
719
#: bzrlib/builtins.py:1787
957
720
msgid ""
958
721
"If there is a repository in a parent directory of the location, then\n"
959
722
"the history of the branch will be stored in the repository. Otherwise\n"
961
724
"in the .bzr directory."
962
725
msgstr ""
963
726
964
#: bzrlib/builtins.py:1793
727
#: bzrlib/builtins.py:1792
965
728
msgid ""
966
729
"If there is already a branch at the location but it has no working tree,\n"
967
730
"the tree can be populated with 'bzr checkout'."
968
731
msgstr ""
969
732
970
#: bzrlib/builtins.py:1796
733
#: bzrlib/builtins.py:1795
971
734
msgid "Recipe for importing a tree of files::"
972
735
msgstr ""
973
736
974
#: bzrlib/builtins.py:1798
737
#: bzrlib/builtins.py:1797
975
738
msgid ""
976
739
" cd ~/project\n"
977
740
" bzr init\n"
981
744
msgstr ""
982
745
983
746
# help of 'create-prefix' option of 'init' command
984
#: bzrlib/builtins.py:1809
747
#: bzrlib/builtins.py:1808
985
748
msgid "Create the path leading up to the branch if it does not already exist."
986
749
msgstr ""
987
750
988
751
# help of 'format' option of 'init' command
989
#: bzrlib/builtins.py:1812
752
#: bzrlib/builtins.py:1811
990
753
msgid "Specify a format for this branch. See \"help formats\"."
991
754
msgstr ""
992
755
993
756
# help of 'append-revisions-only' option of 'init' command
994
#: bzrlib/builtins.py:1820
757
#: bzrlib/builtins.py:1819
995
758
msgid "Never change revnos or the existing log. Append revisions to it only."
996
759
msgstr ""
997
760
998
761
# help of 'no-tree' option of 'init' command
999
#: bzrlib/builtins.py:1823
762
#: bzrlib/builtins.py:1822
1000
763
msgid "Create a branch without a working tree."
1001
764
msgstr ""
1002
765
1003
#: bzrlib/builtins.py:1843 bzrlib/push.py:108
1004
#, python-format
1005
msgid ""
1006
"Parent directory of %s does not exist.\n"
1007
"You may supply --create-prefix to create all leading parent directories."
1008
msgstr ""
1009
1010
#: bzrlib/builtins.py:1877
1011
msgid ""
1012
"This branch format cannot be set to append-revisions-only. Try --default."
1013
msgstr ""
1014
1015
#: bzrlib/builtins.py:1888
1016
msgid "Created a {0} (format: {1})\n"
1017
msgstr ""
1018
1019
#: bzrlib/builtins.py:1897
1020
#, python-format
1021
msgid "Using shared repository: %s\n"
766
#: bzrlib/builtins.py:1899
767
msgid "Create a shared repository for branches to share storage space."
1022
768
msgstr ""
1023
769
1024
770
#: bzrlib/builtins.py:1901
1025
msgid "Create a shared repository for branches to share storage space."
1026
msgstr ""
1027
1028
#: bzrlib/builtins.py:1903
1029
771
msgid ""
1030
772
"New branches created under the repository directory will store their\n"
1031
773
"revisions in the repository, not in the branch directory. For branches\n"
1033
775
"speeds up the creation of new branches."
1034
776
msgstr ""
1035
777
1036
#: bzrlib/builtins.py:1908
778
#: bzrlib/builtins.py:1906
1037
779
msgid ""
1038
780
"If the --no-trees option is given then the branches in the repository\n"
1039
781
"will not have working trees by default. They will still exist as \n"
1043
785
"branches, such as on a server."
1044
786
msgstr ""
1045
787
1046
#: bzrlib/builtins.py:1915
788
#: bzrlib/builtins.py:1913
1047
789
msgid ""
1048
790
":Examples:\n"
1049
791
" Create a shared repository holding just branches::"
1050
792
msgstr ""
1051
793
1052
#: bzrlib/builtins.py:1918
794
#: bzrlib/builtins.py:1916
1053
795
msgid ""
1054
796
" bzr init-repo --no-trees repo\n"
1055
797
" bzr init repo/trunk"
1056
798
msgstr ""
1057
799
800
#: bzrlib/builtins.py:1919
801
msgid " Make a lightweight checkout elsewhere::"
802
msgstr ""
803
1058
804
#: bzrlib/builtins.py:1921
1059
msgid " Make a lightweight checkout elsewhere::"
1060
msgstr ""
1061
1062
#: bzrlib/builtins.py:1923
1063
805
msgid ""
1064
806
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1065
807
" cd trunk-checkout\n"
1067
809
msgstr ""
1068
810
1069
811
# help of 'format' option of 'init-repository' command
1070
#: bzrlib/builtins.py:1931
812
#: bzrlib/builtins.py:1929
1071
813
msgid ""
1072
814
"Specify a format for this repository. See \"bzr help formats\" for details."
1073
815
msgstr ""
1074
816
1075
817
# title of 'format' option of 'init-repository' command
1076
#: bzrlib/builtins.py:1935
818
#: bzrlib/builtins.py:1933
1077
819
msgid "Repository format"
1078
820
msgstr ""
1079
821
1080
822
# help of 'no-trees' option of 'init-repository' command
1081
#: bzrlib/builtins.py:1937
823
#: bzrlib/builtins.py:1935
1082
824
msgid "Branches in the repository will default to not having a working tree."
1083
825
msgstr ""
1084
826
827
#: bzrlib/builtins.py:1959
828
msgid "Show differences in the working tree, between revisions or branches."
829
msgstr ""
830
1085
831
#: bzrlib/builtins.py:1961
1086
msgid "Show differences in the working tree, between revisions or branches."
1087
msgstr ""
1088
1089
#: bzrlib/builtins.py:1963
1090
832
msgid ""
1091
833
"If no arguments are given, all changes for the current tree are listed.\n"
1092
834
"If files are given, only the changes in those files are listed.\n"
1096
838
"given."
1097
839
msgstr ""
1098
840
1099
#: bzrlib/builtins.py:1970
841
#: bzrlib/builtins.py:1968
1100
842
msgid ""
1101
843
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1102
844
"produces patches suitable for \"patch -p1\"."
1103
845
msgstr ""
1104
846
1105
#: bzrlib/builtins.py:1973
847
#: bzrlib/builtins.py:1971
1106
848
msgid ""
1107
849
"Note that when using the -r argument with a range of revisions, the\n"
1108
850
"differences are computed between the two specified revisions. That\n"
1112
854
"in the range."
1113
855
msgstr ""
1114
856
1115
#: bzrlib/builtins.py:1980
857
#: bzrlib/builtins.py:1978
1116
858
msgid ""
1117
859
":Exit values:\n"
1118
860
" 1 - changed\n"
1121
863
" 0 - no change"
1122
864
msgstr ""
1123
865
1124
#: bzrlib/builtins.py:1986
866
#: bzrlib/builtins.py:1984
1125
867
msgid ""
1126
868
":Examples:\n"
1127
869
" Shows the difference in the working tree versus the last commit::"
1128
870
msgstr ""
1129
871
872
#: bzrlib/builtins.py:1987
873
msgid " bzr diff"
874
msgstr ""
875
1130
876
#: bzrlib/builtins.py:1989
1131
msgid " bzr diff"
877
msgid " Difference between the working tree and revision 1::"
1132
878
msgstr ""
1133
879
1134
880
#: bzrlib/builtins.py:1991
1135
msgid " Difference between the working tree and revision 1::"
881
msgid " bzr diff -r1"
1136
882
msgstr ""
1137
883
1138
884
#: bzrlib/builtins.py:1993
1139
msgid " bzr diff -r1"
885
msgid " Difference between revision 3 and revision 1::"
1140
886
msgstr ""
1141
887
1142
888
#: bzrlib/builtins.py:1995
1143
msgid " Difference between revision 3 and revision 1::"
889
msgid " bzr diff -r1..3"
1144
890
msgstr ""
1145
891
1146
892
#: bzrlib/builtins.py:1997
1147
msgid " bzr diff -r1..3"
893
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1148
894
msgstr ""
1149
895
1150
896
#: bzrlib/builtins.py:1999
1151
msgid " Difference between revision 3 and revision 1 for branch xxx::"
897
msgid " bzr diff -r1..3 xxx"
1152
898
msgstr ""
1153
899
1154
900
#: bzrlib/builtins.py:2001
1155
msgid " bzr diff -r1..3 xxx"
901
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1156
902
msgstr ""
1157
903
1158
904
#: bzrlib/builtins.py:2003
1159
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
905
msgid " bzr diff -c2"
1160
906
msgstr ""
1161
907
1162
908
#: bzrlib/builtins.py:2005
1163
msgid " bzr diff -c2"
1164
msgstr ""
1165
1166
#: bzrlib/builtins.py:2007
1167
909
msgid ""
1168
910
" To see the changes introduced by revision X::\n"
1169
911
" \n"
1170
912
" bzr diff -cX"
1171
913
msgstr ""
1172
914
1173
#: bzrlib/builtins.py:2011
915
#: bzrlib/builtins.py:2009
1174
916
msgid ""
1175
917
" Note that in the case of a merge, the -c option shows the changes\n"
1176
918
" compared to the left hand parent. To see the changes against\n"
1177
919
" another parent, use::"
1178
920
msgstr ""
1179
921
922
#: bzrlib/builtins.py:2013
923
msgid " bzr diff -r<chosen_parent>..X"
924
msgstr ""
925
1180
926
#: bzrlib/builtins.py:2015
1181
msgid " bzr diff -r<chosen_parent>..X"
1182
msgstr ""
1183
1184
#: bzrlib/builtins.py:2017
1185
927
msgid ""
1186
928
" The changes between the current revision and the previous revision\n"
1187
929
" (equivalent to -c-1 and -r-2..-1)"
1188
930
msgstr ""
1189
931
932
#: bzrlib/builtins.py:2018
933
msgid " bzr diff -r-2.."
934
msgstr ""
935
1190
936
#: bzrlib/builtins.py:2020
1191
msgid " bzr diff -r-2.."
937
msgid " Show just the differences for file NEWS::"
1192
938
msgstr ""
1193
939
1194
940
#: bzrlib/builtins.py:2022
1195
msgid " Show just the differences for file NEWS::"
941
msgid " bzr diff NEWS"
1196
942
msgstr ""
1197
943
1198
944
#: bzrlib/builtins.py:2024
1199
msgid " bzr diff NEWS"
945
msgid " Show the differences in working tree xxx for file NEWS::"
1200
946
msgstr ""
1201
947
1202
948
#: bzrlib/builtins.py:2026
1203
msgid " Show the differences in working tree xxx for file NEWS::"
949
msgid " bzr diff xxx/NEWS"
1204
950
msgstr ""
1205
951
1206
952
#: bzrlib/builtins.py:2028
1207
msgid " bzr diff xxx/NEWS"
953
msgid " Show the differences from branch xxx to this working tree:"
1208
954
msgstr ""
1209
955
1210
956
#: bzrlib/builtins.py:2030
1211
msgid " Show the differences from branch xxx to this working tree:"
957
msgid " bzr diff --old xxx"
1212
958
msgstr ""
1213
959
1214
960
#: bzrlib/builtins.py:2032
1215
msgid " bzr diff --old xxx"
961
msgid " Show the differences between two branches for file NEWS::"
1216
962
msgstr ""
1217
963
1218
964
#: bzrlib/builtins.py:2034
1219
msgid " Show the differences between two branches for file NEWS::"
965
msgid " bzr diff --old xxx --new yyy NEWS"
1220
966
msgstr ""
1221
967
1222
968
#: bzrlib/builtins.py:2036
1223
msgid " bzr diff --old xxx --new yyy NEWS"
969
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1224
970
msgstr ""
1225
971
1226
972
#: bzrlib/builtins.py:2038
1227
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1228
msgstr ""
1229
1230
#: bzrlib/builtins.py:2040
1231
973
msgid ""
1232
974
" bzr diff --prefix old/:new/\n"
1233
975
" \n"
1237
979
msgstr ""
1238
980
1239
981
# help of 'diff-options' option of 'diff' command
1240
#: bzrlib/builtins.py:2050
982
#: bzrlib/builtins.py:2048
1241
983
msgid "Pass these options to the external diff program."
1242
984
msgstr ""
1243
985
1244
986
# help of 'prefix' option of 'diff' command
1245
#: bzrlib/builtins.py:2053
987
#: bzrlib/builtins.py:2051
1246
988
msgid ""
1247
989
"Set prefixes added to old and new filenames, as two values separated by a "
1248
990
"colon. (eg \"old/:new/\")."
1249
991
msgstr ""
1250
992
1251
993
# help of 'old' option of 'diff' command
1252
#: bzrlib/builtins.py:2056
994
#: bzrlib/builtins.py:2054
1253
995
msgid "Branch/tree to compare from."
1254
996
msgstr ""
1255
997
1256
998
# help of 'new' option of 'diff' command
1257
#: bzrlib/builtins.py:2060
999
#: bzrlib/builtins.py:2058
1258
1000
msgid "Branch/tree to compare to."
1259
1001
msgstr ""
1260
1002
1261
1003
# help of 'using' option of 'diff' command
1262
#: bzrlib/builtins.py:2066
1004
#: bzrlib/builtins.py:2064
1263
1005
msgid "Use this command to compare files."
1264
1006
msgstr ""
1265
1007
1266
1008
# help of 'format' option of 'diff' command
1267
#: bzrlib/builtins.py:2071
1009
#: bzrlib/builtins.py:2069
1268
1010
msgid "Diff format to use."
1269
1011
msgstr ""
1270
1012
1271
1013
# title of 'format' option of 'diff' command
1272
#: bzrlib/builtins.py:2073
1014
#: bzrlib/builtins.py:2071
1273
1015
msgid "Diff format"
1274
1016
msgstr ""
1275
1017
1276
#: bzrlib/builtins.py:2095
1277
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1278
msgstr ""
1279
1280
#: bzrlib/builtins.py:2099
1281
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1282
msgstr ""
1283
1284
#: bzrlib/builtins.py:2104 bzrlib/builtins.py:2502 bzrlib/builtins.py:2515
1285
#: bzrlib/builtins.py:2523 bzrlib/builtins.py:4663
1286
msgid "{0} and {1} are mutually exclusive"
1287
msgstr ""
1288
1289
#: bzrlib/builtins.py:2124
1018
#: bzrlib/builtins.py:2121
1290
1019
msgid ""
1291
1020
"List files deleted in the working tree.\n"
1292
1021
" "
1293
1022
msgstr ""
1294
1023
1295
#: bzrlib/builtins.py:2202
1024
#: bzrlib/builtins.py:2199
1296
1025
msgid "Show the tree root directory."
1297
1026
msgstr ""
1298
1027
1299
#: bzrlib/builtins.py:2204
1028
#: bzrlib/builtins.py:2201
1300
1029
msgid ""
1301
1030
"The root is the nearest enclosing directory with a .bzr control\n"
1302
1031
"directory."
1303
1032
msgstr ""
1304
1033
1305
#: bzrlib/builtins.py:2219
1306
msgid "The limit argument must be an integer."
1307
msgstr ""
1308
1309
#: bzrlib/builtins.py:2227
1310
msgid "The levels argument must be an integer."
1311
msgstr ""
1312
1313
#: bzrlib/builtins.py:2232
1034
#: bzrlib/builtins.py:2229
1314
1035
msgid "Show historical log for a branch or subset of a branch."
1315
1036
msgstr ""
1316
1037
1317
#: bzrlib/builtins.py:2234
1038
#: bzrlib/builtins.py:2231
1318
1039
msgid ""
1319
1040
"log is bzr's default tool for exploring the history of a branch.\n"
1320
1041
"The branch to use is taken from the first parameter. If no parameters\n"
1322
1043
"Here are some simple examples::"
1323
1044
msgstr ""
1324
1045
1325
#: bzrlib/builtins.py:2239
1046
#: bzrlib/builtins.py:2236
1326
1047
msgid ""
1327
1048
" bzr log log the current branch\n"
1328
1049
" bzr log foo.py log a file in its branch\n"
1329
1050
" bzr log http://server/branch log a branch on a server"
1330
1051
msgstr ""
1331
1052
1332
#: bzrlib/builtins.py:2243
1053
#: bzrlib/builtins.py:2240
1333
1054
msgid ""
1334
1055
"The filtering, ordering and information shown for each revision can\n"
1335
1056
"be controlled as explained below. By default, all revisions are\n"
1339
1060
"were merged."
1340
1061
msgstr ""
1341
1062
1342
#: bzrlib/builtins.py:2250
1063
#: bzrlib/builtins.py:2247
1343
1064
msgid ":Output control:"
1344
1065
msgstr ""
1345
1066
1346
#: bzrlib/builtins.py:2252
1067
#: bzrlib/builtins.py:2249
1347
1068
msgid ""
1348
1069
" The log format controls how information about each revision is\n"
1349
1070
" displayed. The standard log formats are called ``long``, ``short``\n"
1351
1072
" for more details on log formats."
1352
1073
msgstr ""
1353
1074
1354
#: bzrlib/builtins.py:2257
1075
#: bzrlib/builtins.py:2254
1355
1076
msgid ""
1356
1077
" The following options can be used to control what information is\n"
1357
1078
" displayed::"
1358
1079
msgstr ""
1359
1080
1360
#: bzrlib/builtins.py:2260
1081
#: bzrlib/builtins.py:2257
1361
1082
msgid ""
1362
1083
" -l N display a maximum of N revisions\n"
1363
1084
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1366
1087
" --show-ids display revision-ids (and file-ids), not just revnos"
1367
1088
msgstr ""
1368
1089
1369
#: bzrlib/builtins.py:2266
1090
#: bzrlib/builtins.py:2263
1370
1091
msgid ""
1371
1092
" Note that the default number of levels to display is a function of the\n"
1372
1093
" log format. If the -n option is not used, the standard log formats show\n"
1373
1094
" just the top level (mainline)."
1374
1095
msgstr ""
1375
1096
1376
#: bzrlib/builtins.py:2270
1097
#: bzrlib/builtins.py:2267
1377
1098
msgid ""
1378
1099
" Status summaries are shown using status flags like A, M, etc. To see\n"
1379
1100
" the changes explained using words like ``added`` and ``modified``\n"
1380
1101
" instead, use the -vv option."
1381
1102
msgstr ""
1382
1103
1383
#: bzrlib/builtins.py:2274
1104
#: bzrlib/builtins.py:2271
1384
1105
msgid ":Ordering control:"
1385
1106
msgstr ""
1386
1107
1387
#: bzrlib/builtins.py:2276
1108
#: bzrlib/builtins.py:2273
1388
1109
msgid ""
1389
1110
" To display revisions from oldest to newest, use the --forward option.\n"
1390
1111
" In most cases, using this option will have little impact on the total\n"
1392
1113
" display revisions like --reverse does when it can."
1393
1114
msgstr ""
1394
1115
1395
#: bzrlib/builtins.py:2281
1116
#: bzrlib/builtins.py:2278
1396
1117
msgid ":Revision filtering:"
1397
1118
msgstr ""
1398
1119
1399
#: bzrlib/builtins.py:2283
1120
#: bzrlib/builtins.py:2280
1400
1121
msgid ""
1401
1122
" The -r option can be used to specify what revision or range of revisions\n"
1402
1123
" to filter against. The various forms are shown below::"
1403
1124
msgstr ""
1404
1125
1405
#: bzrlib/builtins.py:2286
1126
#: bzrlib/builtins.py:2283
1406
1127
msgid ""
1407
1128
" -rX display revision X\n"
1408
1129
" -rX.. display revision X and later\n"
1410
1131
" -rX..Y display from X to Y inclusive"
1411
1132
msgstr ""
1412
1133
1413
#: bzrlib/builtins.py:2291
1134
#: bzrlib/builtins.py:2288
1414
1135
msgid ""
1415
1136
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1416
1137
" Some common examples are given below::"
1417
1138
msgstr ""
1418
1139
1419
#: bzrlib/builtins.py:2294
1140
#: bzrlib/builtins.py:2291
1420
1141
msgid ""
1421
1142
" -r-1 show just the tip\n"
1422
1143
" -r-10.. show the last 10 mainline revisions\n"
1426
1147
" -rdate:yesterday.. show changes since yesterday"
1427
1148
msgstr ""
1428
1149
1429
#: bzrlib/builtins.py:2301
1150
#: bzrlib/builtins.py:2298
1430
1151
msgid ""
1431
1152
" When logging a range of revisions using -rX..Y, log starts at\n"
1432
1153
" revision Y and searches back in history through the primary\n"
1436
1157
" a nested merge revision and the log will be truncated accordingly."
1437
1158
msgstr ""
1438
1159
1439
#: bzrlib/builtins.py:2308
1160
#: bzrlib/builtins.py:2305
1440
1161
msgid ":Path filtering:"
1441
1162
msgstr ""
1442
1163
1443
#: bzrlib/builtins.py:2310
1164
#: bzrlib/builtins.py:2307
1444
1165
msgid ""
1445
1166
" If parameters are given and the first one is not a branch, the log\n"
1446
1167
" will be filtered to show only those revisions that changed the\n"
1447
1168
" nominated files or directories."
1448
1169
msgstr ""
1449
1170
1450
#: bzrlib/builtins.py:2314
1171
#: bzrlib/builtins.py:2311
1451
1172
msgid ""
1452
1173
" Filenames are interpreted within their historical context. To log a\n"
1453
1174
" deleted file, specify a revision range so that the file existed at\n"
1454
1175
" the end or start of the range."
1455
1176
msgstr ""
1456
1177
1457
#: bzrlib/builtins.py:2318
1178
#: bzrlib/builtins.py:2315
1458
1179
msgid ""
1459
1180
" Historical context is also important when interpreting pathnames of\n"
1460
1181
" renamed files/directories. Consider the following example:"
1461
1182
msgstr ""
1462
1183
1463
#: bzrlib/builtins.py:2321
1184
#: bzrlib/builtins.py:2318
1464
1185
msgid ""
1465
1186
" * revision 1: add tutorial.txt\n"
1466
1187
" * revision 2: modify tutorial.txt\n"
1467
1188
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1468
1189
msgstr ""
1469
1190
1470
#: bzrlib/builtins.py:2325
1191
#: bzrlib/builtins.py:2322
1471
1192
msgid " In this case:"
1472
1193
msgstr ""
1473
1194
1474
#: bzrlib/builtins.py:2327
1195
#: bzrlib/builtins.py:2324
1475
1196
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1476
1197
msgstr ""
1477
1198
1478
#: bzrlib/builtins.py:2329
1199
#: bzrlib/builtins.py:2326
1479
1200
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1480
1201
msgstr ""
1481
1202
1482
#: bzrlib/builtins.py:2331
1203
#: bzrlib/builtins.py:2328
1483
1204
msgid ""
1484
1205
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1485
1206
" the original file in revision 2."
1486
1207
msgstr ""
1487
1208
1488
#: bzrlib/builtins.py:2334
1209
#: bzrlib/builtins.py:2331
1489
1210
msgid ""
1490
1211
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1491
1212
" was no file called guide.txt in revision 2."
1492
1213
msgstr ""
1493
1214
1494
#: bzrlib/builtins.py:2337
1215
#: bzrlib/builtins.py:2334
1495
1216
msgid ""
1496
1217
" Renames are always followed by log. By design, there is no need to\n"
1497
1218
" explicitly ask for this (and no way to stop logging a file back\n"
1498
1219
" until it was last renamed)."
1499
1220
msgstr ""
1500
1221
1501
#: bzrlib/builtins.py:2341
1222
#: bzrlib/builtins.py:2338
1502
1223
msgid ":Other filtering:"
1503
1224
msgstr ""
1504
1225
1505
#: bzrlib/builtins.py:2343
1226
#: bzrlib/builtins.py:2340
1506
1227
msgid ""
1507
1228
" The --match option can be used for finding revisions that match a\n"
1508
1229
" regular expression in a commit message, committer, author or bug.\n"
1511
1232
" --match-message can be used to only match a specific field."
1512
1233
msgstr ""
1513
1234
1514
#: bzrlib/builtins.py:2349
1235
#: bzrlib/builtins.py:2346
1515
1236
msgid ":Tips & tricks:"
1516
1237
msgstr ""
1517
1238
1518
#: bzrlib/builtins.py:2351
1239
#: bzrlib/builtins.py:2348
1519
1240
msgid ""
1520
1241
" GUI tools and IDEs are often better at exploring history than command\n"
1521
1242
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1524
1245
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1525
1246
msgstr ""
1526
1247
1527
#: bzrlib/builtins.py:2357
1248
#: bzrlib/builtins.py:2354
1528
1249
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1529
1250
msgstr ""
1530
1251
1531
#: bzrlib/builtins.py:2359
1252
#: bzrlib/builtins.py:2356
1532
1253
msgid ""
1533
1254
" [ALIASES]\n"
1534
1255
" tip = log -r-1\n"
1536
1257
" show = log -v -p"
1537
1258
msgstr ""
1538
1259
1539
#: bzrlib/builtins.py:2364
1260
#: bzrlib/builtins.py:2361
1540
1261
msgid ""
1541
1262
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1542
1263
" will show the last 10 mainline revisions. To see the details of a\n"
1543
1264
" particular revision X, ``bzr show -rX``."
1544
1265
msgstr ""
1545
1266
1546
#: bzrlib/builtins.py:2368
1267
#: bzrlib/builtins.py:2365
1547
1268
msgid ""
1548
1269
" If you are interested in looking deeper into a particular merge X,\n"
1549
1270
" use ``bzr log -n0 -rX``."
1550
1271
msgstr ""
1551
1272
1552
#: bzrlib/builtins.py:2371
1273
#: bzrlib/builtins.py:2368
1553
1274
msgid ""
1554
1275
" ``bzr log -v`` on a branch with lots of history is currently\n"
1555
1276
" very slow. A fix for this issue is currently under development.\n"
1557
1278
" be given when using the -v option."
1558
1279
msgstr ""
1559
1280
1560
#: bzrlib/builtins.py:2376
1281
#: bzrlib/builtins.py:2373
1561
1282
msgid ""
1562
1283
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1563
1284
" used to find revisions matching user names, commit messages, etc.\n"
1565
1286
" a list of words but not others."
1566
1287
msgstr ""
1567
1288
1568
#: bzrlib/builtins.py:2381
1289
#: bzrlib/builtins.py:2378
1569
1290
msgid ""
1570
1291
" When exploring non-mainline history on large projects with deep\n"
1571
1292
" history, the performance of log can be greatly improved by installing\n"
1574
1295
msgstr ""
1575
1296
1576
1297
# help of 'forward' option of 'log' command
1577
#: bzrlib/builtins.py:2390
1298
#: bzrlib/builtins.py:2387
1578
1299
msgid "Show from oldest to newest."
1579
1300
msgstr ""
1580
1301
1581
1302
# help of 'verbose' option of 'log' command
1582
#: bzrlib/builtins.py:2393
1303
#: bzrlib/builtins.py:2390
1583
1304
msgid "Show files changed in each revision."
1584
1305
msgstr ""
1585
1306
1586
1307
# help of 'change' option of 'log' command
1587
#: bzrlib/builtins.py:2399
1308
#: bzrlib/builtins.py:2396
1588
1309
msgid "Show just the specified revision. See also \"help revisionspec\"."
1589
1310
msgstr ""
1590
1311
1591
1312
# help of 'authors' option of 'log' command
1592
#: bzrlib/builtins.py:2403
1313
#: bzrlib/builtins.py:2400
1593
1314
msgid "What names to list as authors - first, all or committer."
1594
1315
msgstr ""
1595
1316
1596
1317
# title of 'authors' option of 'log' command
1597
#: bzrlib/builtins.py:2404
1318
#: bzrlib/builtins.py:2401
1598
1319
msgid "Authors"
1599
1320
msgstr ""
1600
1321
1601
1322
# help of 'levels' option of 'log' command
1602
#: bzrlib/builtins.py:2409
1323
#: bzrlib/builtins.py:2406
1603
1324
msgid "Number of levels to display - 0 for all, 1 for flat."
1604
1325
msgstr ""
1605
1326
1606
1327
# help of 'limit' option of 'log' command
1607
#: bzrlib/builtins.py:2419
1328
#: bzrlib/builtins.py:2416
1608
1329
msgid "Limit the output to the first N revisions."
1609
1330
msgstr ""
1610
1331
1611
1332
# help of 'show-diff' option of 'log' command
1612
#: bzrlib/builtins.py:2424
1333
#: bzrlib/builtins.py:2421
1613
1334
msgid "Show changes made in each revision as a patch."
1614
1335
msgstr ""
1615
1336
1616
# help of 'include-merged' option of 'log' command
1617
#: bzrlib/builtins.py:2426
1337
# help of 'include-merges' option of 'log' command
1338
#: bzrlib/builtins.py:2423
1618
1339
msgid "Show merged revisions like --levels 0 does."
1619
1340
msgstr ""
1620
1341
1621
# help of 'omit-merges' option of 'log' command
1622
#: bzrlib/builtins.py:2430
1623
msgid "Do not report commits with more than one parent."
1624
msgstr ""
1625
1626
1342
# help of 'exclude-common-ancestry' option of 'log' command
1627
#: bzrlib/builtins.py:2432
1343
#: bzrlib/builtins.py:2425
1628
1344
msgid ""
1629
1345
"Display only the revisions that are not part of both ancestries (require -"
1630
1346
"rX..Y)"
1631
1347
msgstr ""
1632
1348
1633
1349
# help of 'signatures' option of 'log' command
1634
#: bzrlib/builtins.py:2436
1350
#: bzrlib/builtins.py:2429
1635
1351
msgid "Show digital signature validity"
1636
1352
msgstr ""
1637
1353
1638
1354
# help of 'match' option of 'log' command
1639
#: bzrlib/builtins.py:2439
1355
#: bzrlib/builtins.py:2432
1640
1356
msgid "Show revisions whose properties match this expression."
1641
1357
msgstr ""
1642
1358
1643
1359
# help of 'match-message' option of 'log' command
1644
#: bzrlib/builtins.py:2443
1360
#: bzrlib/builtins.py:2436
1645
1361
msgid "Show revisions whose message matches this expression."
1646
1362
msgstr ""
1647
1363
1648
1364
# help of 'match-committer' option of 'log' command
1649
#: bzrlib/builtins.py:2447
1365
#: bzrlib/builtins.py:2440
1650
1366
msgid "Show revisions whose committer matches this expression."
1651
1367
msgstr ""
1652
1368
1653
1369
# help of 'match-author' option of 'log' command
1654
#: bzrlib/builtins.py:2451
1370
#: bzrlib/builtins.py:2444
1655
1371
msgid "Show revisions whose authors match this expression."
1656
1372
msgstr ""
1657
1373
1658
1374
# help of 'match-bugs' option of 'log' command
1659
#: bzrlib/builtins.py:2455
1375
#: bzrlib/builtins.py:2448
1660
1376
msgid "Show revisions whose bugs match this expression."
1661
1377
msgstr ""
1662
1378
1663
#: bzrlib/builtins.py:2509
1664
msgid "--exclude-common-ancestry requires -r with two revisions"
1665
msgstr ""
1666
1667
#: bzrlib/builtins.py:2537
1668
#, python-format
1669
msgid "Path unknown at end or start of revision range: %s"
1670
msgstr ""
1671
1672
#: bzrlib/builtins.py:2654
1673
#, python-format
1674
msgid "bzr %s doesn't accept two revisions in different branches."
1675
msgstr ""
1676
1677
#: bzrlib/builtins.py:2670
1678
#, python-format
1679
msgid "bzr %s --revision takes one or two values."
1680
msgstr ""
1681
1682
#: bzrlib/builtins.py:2715
1379
#: bzrlib/builtins.py:2689
1683
1380
msgid ""
1684
1381
"List files in a tree.\n"
1685
1382
" "
1686
1383
msgstr ""
1687
1384
1688
1385
# help of 'recursive' option of 'ls' command
1689
#: bzrlib/builtins.py:2724
1386
#: bzrlib/builtins.py:2698
1690
1387
msgid "Recurse into subdirectories."
1691
1388
msgstr ""
1692
1389
1693
1390
# help of 'from-root' option of 'ls' command
1694
#: bzrlib/builtins.py:2726
1391
#: bzrlib/builtins.py:2700
1695
1392
msgid "Print paths relative to the root of the branch."
1696
1393
msgstr ""
1697
1394
1698
1395
# help of 'unknown' option of 'ls' command
1699
#: bzrlib/builtins.py:2728
1396
#: bzrlib/builtins.py:2702
1700
1397
msgid "Print unknown files."
1701
1398
msgstr ""
1702
1399
1703
1400
# help of 'versioned' option of 'ls' command
1704
#: bzrlib/builtins.py:2729
1401
#: bzrlib/builtins.py:2703
1705
1402
msgid "Print versioned files."
1706
1403
msgstr ""
1707
1404
1708
1405
# help of 'ignored' option of 'ls' command
1709
#: bzrlib/builtins.py:2732
1406
#: bzrlib/builtins.py:2706
1710
1407
msgid "Print ignored files."
1711
1408
msgstr ""
1712
1409
1713
1410
# help of 'kind' option of 'ls' command
1714
#: bzrlib/builtins.py:2734
1411
#: bzrlib/builtins.py:2708
1715
1412
msgid "List entries of a particular kind: file, directory, symlink."
1716
1413
msgstr ""
1717
1414
1718
#: bzrlib/builtins.py:2747
1719
msgid "invalid kind specified"
1720
msgstr ""
1721
1722
#: bzrlib/builtins.py:2750
1723
msgid "Cannot set both --verbose and --null"
1724
msgstr ""
1725
1726
#: bzrlib/builtins.py:2759
1727
msgid "cannot specify both --from-root and PATH"
1728
msgstr ""
1729
1730
#: bzrlib/builtins.py:2846
1415
#: bzrlib/builtins.py:2820
1731
1416
msgid "Ignore specified files or patterns."
1732
1417
msgstr ""
1733
1418
1734
#: bzrlib/builtins.py:2848
1419
#: bzrlib/builtins.py:2822
1735
1420
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1736
1421
msgstr ""
1737
1422
1738
#: bzrlib/builtins.py:2850
1423
#: bzrlib/builtins.py:2824
1739
1424
msgid ""
1740
1425
"If a .bzrignore file does not exist, the ignore command\n"
1741
1426
"will create one and add the specified files or patterns to the newly\n"
1744
1429
"the use of the ignore command will require an explicit add command."
1745
1430
msgstr ""
1746
1431
1747
#: bzrlib/builtins.py:2856
1432
#: bzrlib/builtins.py:2830
1748
1433
msgid ""
1749
1434
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1750
1435
"After adding, editing or deleting that file either indirectly by\n"
1752
1437
"it."
1753
1438
msgstr ""
1754
1439
1755
#: bzrlib/builtins.py:2861
1440
#: bzrlib/builtins.py:2835
1756
1441
msgid ""
1757
1442
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1758
1443
"the global ignore file can be found in the application data directory as\n"
1761
1446
"can be edited directly using an editor."
1762
1447
msgstr ""
1763
1448
1764
#: bzrlib/builtins.py:2867
1449
#: bzrlib/builtins.py:2841
1765
1450
msgid ""
1766
1451
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1767
1452
"precedence over regular ignores. Such exceptions are used to specify\n"
1768
1453
"files that should be versioned which would otherwise be ignored."
1769
1454
msgstr ""
1770
1455
1771
#: bzrlib/builtins.py:2871
1456
#: bzrlib/builtins.py:2845
1772
1457
msgid ""
1773
1458
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1774
1459
"precedence over the '!' exception patterns."
1775
1460
msgstr ""
1776
1461
1777
#: bzrlib/builtins.py:2874
1462
#: bzrlib/builtins.py:2848
1778
1463
msgid ""
1779
1464
":Notes: \n"
1780
1465
" \n"
1782
1467
" the shell on Unix."
1783
1468
msgstr ""
1784
1469
1785
#: bzrlib/builtins.py:2879
1470
#: bzrlib/builtins.py:2853
1786
1471
msgid ""
1787
1472
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1788
1473
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1789
1474
msgstr ""
1790
1475
1791
#: bzrlib/builtins.py:2882
1476
#: bzrlib/builtins.py:2856
1792
1477
msgid ""
1793
1478
":Examples:\n"
1794
1479
" Ignore the top level Makefile::"
1795
1480
msgstr ""
1796
1481
1797
#: bzrlib/builtins.py:2885
1482
#: bzrlib/builtins.py:2859
1798
1483
msgid " bzr ignore ./Makefile"
1799
1484
msgstr ""
1800
1485
1801
#: bzrlib/builtins.py:2887
1486
#: bzrlib/builtins.py:2861
1802
1487
msgid " Ignore .class files in all directories...::"
1803
1488
msgstr ""
1804
1489
1805
#: bzrlib/builtins.py:2889
1490
#: bzrlib/builtins.py:2863
1806
1491
msgid " bzr ignore \"*.class\""
1807
1492
msgstr ""
1808
1493
1809
#: bzrlib/builtins.py:2891
1494
#: bzrlib/builtins.py:2865
1810
1495
msgid " ...but do not ignore \"special.class\"::"
1811
1496
msgstr ""
1812
1497
1813
#: bzrlib/builtins.py:2893
1498
#: bzrlib/builtins.py:2867
1814
1499
msgid " bzr ignore \"!special.class\""
1815
1500
msgstr ""
1816
1501
1817
#: bzrlib/builtins.py:2895
1502
#: bzrlib/builtins.py:2869
1818
1503
msgid " Ignore files whose name begins with the \"#\" character::"
1819
1504
msgstr ""
1820
1505
1821
#: bzrlib/builtins.py:2897
1506
#: bzrlib/builtins.py:2871
1822
1507
msgid " bzr ignore \"RE:^#\""
1823
1508
msgstr ""
1824
1509
1825
#: bzrlib/builtins.py:2899
1510
#: bzrlib/builtins.py:2873
1826
1511
msgid " Ignore .o files under the lib directory::"
1827
1512
msgstr ""
1828
1513
1829
#: bzrlib/builtins.py:2901
1514
#: bzrlib/builtins.py:2875
1830
1515
msgid " bzr ignore \"lib/**/*.o\""
1831
1516
msgstr ""
1832
1517
1833
#: bzrlib/builtins.py:2905
1518
#: bzrlib/builtins.py:2879
1834
1519
msgid " bzr ignore \"RE:lib/.*\\.o\""
1835
1520
msgstr ""
1836
1521
1837
#: bzrlib/builtins.py:2907
1522
#: bzrlib/builtins.py:2881
1838
1523
msgid " Ignore everything but the \"debian\" toplevel directory::"
1839
1524
msgstr ""
1840
1525
1841
#: bzrlib/builtins.py:2909
1526
#: bzrlib/builtins.py:2883
1842
1527
msgid ""
1843
1528
" bzr ignore \"RE:(?!debian/).*\"\n"
1844
1529
" \n"
1851
1536
msgstr ""
1852
1537
1853
1538
# help of 'default-rules' option of 'ignore' command
1854
#: bzrlib/builtins.py:2923
1539
#: bzrlib/builtins.py:2897
1855
1540
msgid "Display the default ignore rules that bzr uses."
1856
1541
msgstr ""
1857
1542
1858
#: bzrlib/builtins.py:2935
1859
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1860
msgstr ""
1861
1862
#: bzrlib/builtins.py:2946
1863
#, python-format
1864
msgid "Invalid ignore pattern found. %s"
1865
msgid_plural "Invalid ignore patterns found. %s"
1866
msgstr[0] ""
1867
msgstr[1] ""
1868
1869
#: bzrlib/builtins.py:2955
1870
msgid "NAME_PATTERN should not be an absolute path"
1871
msgstr ""
1872
1873
#: bzrlib/builtins.py:2968
1874
#, python-format
1875
msgid ""
1876
"Warning: the following files are version controlled and match your ignore "
1877
"pattern:\n"
1878
"%s\n"
1879
"These files will continue to be version controlled unless you 'bzr remove' "
1880
"them.\n"
1881
msgstr ""
1882
1883
#: bzrlib/builtins.py:2975
1543
#: bzrlib/builtins.py:2945
1884
1544
msgid "List ignored files and the patterns that matched them."
1885
1545
msgstr ""
1886
1546
1887
#: bzrlib/builtins.py:2977
1547
#: bzrlib/builtins.py:2947
1888
1548
msgid ""
1889
1549
"List all the ignored files and the ignore pattern that caused the file to\n"
1890
1550
"be ignored."
1891
1551
msgstr ""
1892
1552
1893
#: bzrlib/builtins.py:2980
1553
#: bzrlib/builtins.py:2950
1894
1554
msgid "Alternatively, to list just the files::"
1895
1555
msgstr ""
1896
1556
1897
#: bzrlib/builtins.py:2982
1557
#: bzrlib/builtins.py:2952
1898
1558
msgid " bzr ls --ignored"
1899
1559
msgstr ""
1900
1560
1901
#: bzrlib/builtins.py:3016
1902
#, python-format
1903
msgid "not a valid revision-number: %r"
1904
msgstr ""
1905
1906
#: bzrlib/builtins.py:3023
1561
#: bzrlib/builtins.py:2993
1907
1562
msgid "Export current or past revision to a destination directory or archive."
1908
1563
msgstr ""
1909
1564
1910
#: bzrlib/builtins.py:3025
1565
#: bzrlib/builtins.py:2995
1911
1566
msgid "If no revision is specified this exports the last committed revision."
1912
1567
msgstr ""
1913
1568
1914
#: bzrlib/builtins.py:3027
1569
#: bzrlib/builtins.py:2997
1915
1570
msgid ""
1916
1571
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1917
1572
"given, try to find the format with the extension. If no extension\n"
1918
1573
"is found exports to a directory (equivalent to --format=dir)."
1919
1574
msgstr ""
1920
1575
1921
#: bzrlib/builtins.py:3031
1576
#: bzrlib/builtins.py:3001
1922
1577
msgid ""
1923
1578
"If root is supplied, it will be used as the root directory inside\n"
1924
1579
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1925
1580
"to the exported filename. The root option has no effect for 'dir' format."
1926
1581
msgstr ""
1927
1582
1928
#: bzrlib/builtins.py:3035
1583
#: bzrlib/builtins.py:3005
1929
1584
msgid ""
1930
1585
"If branch is omitted then the branch containing the current working\n"
1931
1586
"directory will be used."
1932
1587
msgstr ""
1933
1588
1934
#: bzrlib/builtins.py:3038
1589
#: bzrlib/builtins.py:3008
1935
1590
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
1936
1591
msgstr ""
1937
1592
1938
#: bzrlib/builtins.py:3040
1593
#: bzrlib/builtins.py:3010
1939
1594
msgid ""
1940
1595
" ================= =========================\n"
1941
1596
" Supported formats Autodetected by extension\n"
1949
1604
msgstr ""
1950
1605
1951
1606
# help of 'format' option of 'export' command
1952
#: bzrlib/builtins.py:3054
1607
#: bzrlib/builtins.py:3024
1953
1608
msgid "Type of file to export to."
1954
1609
msgstr ""
1955
1610
1956
1611
# help of 'filters' option of 'export' command
1957
#: bzrlib/builtins.py:3057
1612
#: bzrlib/builtins.py:3027
1958
1613
msgid "Apply content filters to export the convenient form."
1959
1614
msgstr ""
1960
1615
1961
1616
# help of 'root' option of 'export' command
1962
#: bzrlib/builtins.py:3061
1617
#: bzrlib/builtins.py:3031
1963
1618
msgid "Name of the root directory inside the exported file."
1964
1619
msgstr ""
1965
1620
1966
1621
# help of 'per-file-timestamps' option of 'export' command
1967
#: bzrlib/builtins.py:3063
1622
#: bzrlib/builtins.py:3033
1968
1623
msgid ""
1969
1624
"Set modification time of files to that of the last revision in which it was "
1970
1625
"changed."
1971
1626
msgstr ""
1972
1627
1973
#: bzrlib/builtins.py:3083
1974
#, python-format
1975
msgid "Unsupported export format: %s"
1976
msgstr ""
1977
1978
#: bzrlib/builtins.py:3087
1628
#: bzrlib/builtins.py:3057
1979
1629
msgid "Write the contents of a file as of a given revision to standard output."
1980
1630
msgstr ""
1981
1631
1982
#: bzrlib/builtins.py:3089
1632
#: bzrlib/builtins.py:3059
1983
1633
msgid "If no revision is nominated, the last revision is used."
1984
1634
msgstr ""
1985
1635
1986
#: bzrlib/builtins.py:3091
1636
#: bzrlib/builtins.py:3061
1987
1637
msgid ""
1988
1638
"Note: Take care to redirect standard output when using this command on a\n"
1989
1639
"binary file."
1990
1640
msgstr ""
1991
1641
1992
1642
# help of 'filters' option of 'cat' command
1993
#: bzrlib/builtins.py:3098
1643
#: bzrlib/builtins.py:3068
1994
1644
msgid "Apply content filters to display the convenience form."
1995
1645
msgstr ""
1996
1646
1997
#: bzrlib/builtins.py:3109
1998
msgid "bzr cat --revision takes exactly one revision specifier"
1999
msgstr ""
2000
2001
#: bzrlib/builtins.py:3134 bzrlib/builtins.py:3146
2002
msgid "{0!r} is not present in revision {1}"
2003
msgstr ""
2004
2005
#: bzrlib/builtins.py:3169
1647
#: bzrlib/builtins.py:3139
2006
1648
msgid "Commit changes into a new revision."
2007
1649
msgstr ""
2008
1650
2009
#: bzrlib/builtins.py:3171
1651
#: bzrlib/builtins.py:3141
2010
1652
msgid ""
2011
1653
"An explanatory message needs to be given for each commit. This is\n"
2012
1654
"often done by using the --message option (getting the message from the\n"
2016
1658
"boilerplate text loaded into the editor, use the --show-diff option."
2017
1659
msgstr ""
2018
1660
2019
#: bzrlib/builtins.py:3178
1661
#: bzrlib/builtins.py:3148
2020
1662
msgid ""
2021
1663
"By default, the entire tree is committed and the person doing the\n"
2022
1664
"commit is assumed to be the author. These defaults can be overridden\n"
2023
1665
"as explained below."
2024
1666
msgstr ""
2025
1667
2026
#: bzrlib/builtins.py:3182
1668
#: bzrlib/builtins.py:3152
2027
1669
msgid ":Selective commits:"
2028
1670
msgstr ""
2029
1671
2030
#: bzrlib/builtins.py:3184
1672
#: bzrlib/builtins.py:3154
2031
1673
msgid ""
2032
1674
" If selected files are specified, only changes to those files are\n"
2033
1675
" committed. If a directory is specified then the directory and\n"
2034
1676
" everything within it is committed."
2035
1677
msgstr ""
2036
1678
2037
#: bzrlib/builtins.py:3188
1679
#: bzrlib/builtins.py:3158
2038
1680
msgid ""
2039
1681
" When excludes are given, they take precedence over selected files.\n"
2040
1682
" For example, to commit only changes within foo, but not changes\n"
2041
1683
" within foo/bar::"
2042
1684
msgstr ""
2043
1685
2044
#: bzrlib/builtins.py:3192
1686
#: bzrlib/builtins.py:3162
2045
1687
msgid " bzr commit foo -x foo/bar"
2046
1688
msgstr ""
2047
1689
2048
#: bzrlib/builtins.py:3194
1690
#: bzrlib/builtins.py:3164
2049
1691
msgid " A selective commit after a merge is not yet supported."
2050
1692
msgstr ""
2051
1693
2052
#: bzrlib/builtins.py:3196
1694
#: bzrlib/builtins.py:3166
2053
1695
msgid ":Custom authors:"
2054
1696
msgstr ""
2055
1697
2056
#: bzrlib/builtins.py:3198
1698
#: bzrlib/builtins.py:3168
2057
1699
msgid ""
2058
1700
" If the author of the change is not the same person as the committer,\n"
2059
1701
" you can specify the author's name using the --author option. The\n"
2063
1705
" author."
2064
1706
msgstr ""
2065
1707
2066
#: bzrlib/builtins.py:3205
1708
#: bzrlib/builtins.py:3175
2067
1709
msgid ":Checks:"
2068
1710
msgstr ""
2069
1711
2070
#: bzrlib/builtins.py:3207
1712
#: bzrlib/builtins.py:3177
2071
1713
msgid ""
2072
1714
" A common mistake is to forget to add a new file or directory before\n"
2073
1715
" running the commit command. The --strict option checks for unknown\n"
2076
1718
" for details."
2077
1719
msgstr ""
2078
1720
2079
#: bzrlib/builtins.py:3213
1721
#: bzrlib/builtins.py:3183
2080
1722
msgid ":Things to note:"
2081
1723
msgstr ""
2082
1724
2083
#: bzrlib/builtins.py:3215
1725
#: bzrlib/builtins.py:3185
2084
1726
msgid ""
2085
1727
" If you accidentially commit the wrong changes or make a spelling\n"
2086
1728
" mistake in the commit message say, you can use the uncommit command\n"
2087
1729
" to undo it. See ``bzr help uncommit`` for details."
2088
1730
msgstr ""
2089
1731
2090
#: bzrlib/builtins.py:3219
1732
#: bzrlib/builtins.py:3189
2091
1733
msgid ""
2092
1734
" Hooks can also be configured to run after a commit. This allows you\n"
2093
1735
" to trigger updates to external systems like bug trackers. The --fixes\n"
2096
1738
msgstr ""
2097
1739
2098
1740
# help of 'exclude' option of 'commit' command
2099
#: bzrlib/builtins.py:3229
1741
#: bzrlib/builtins.py:3199
2100
1742
msgid "Do not consider changes made to a given path."
2101
1743
msgstr ""
2102
1744
2103
1745
# help of 'message' option of 'commit' command
2104
#: bzrlib/builtins.py:3232
1746
#: bzrlib/builtins.py:3202
2105
1747
msgid "Description of the new revision."
2106
1748
msgstr ""
2107
1749
2108
1750
# help of 'unchanged' option of 'commit' command
2109
#: bzrlib/builtins.py:3235
1751
#: bzrlib/builtins.py:3205
2110
1752
msgid "Commit even if nothing has changed."
2111
1753
msgstr ""
2112
1754
2113
1755
# help of 'file' option of 'commit' command
2114
#: bzrlib/builtins.py:3239
1756
#: bzrlib/builtins.py:3209
2115
1757
msgid "Take commit message from this file."
2116
1758
msgstr ""
2117
1759
2118
1760
# help of 'strict' option of 'commit' command
2119
#: bzrlib/builtins.py:3241
1761
#: bzrlib/builtins.py:3211
2120
1762
msgid "Refuse to commit if there are unknown files in the working tree."
2121
1763
msgstr ""
2122
1764
2123
1765
# help of 'commit-time' option of 'commit' command
2124
#: bzrlib/builtins.py:3244
1766
#: bzrlib/builtins.py:3214
2125
1767
msgid ""
2126
1768
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2127
1769
"08:00:00 +0100'."
2128
1770
msgstr ""
2129
1771
2130
1772
# help of 'fixes' option of 'commit' command
2131
#: bzrlib/builtins.py:3247
1773
#: bzrlib/builtins.py:3217
2132
1774
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2133
1775
msgstr ""
2134
1776
2135
1777
# help of 'author' option of 'commit' command
2136
#: bzrlib/builtins.py:3250
1778
#: bzrlib/builtins.py:3220
2137
1779
msgid "Set the author's name, if it's different from the committer."
2138
1780
msgstr ""
2139
1781
2140
1782
# help of 'local' option of 'commit' command
2141
#: bzrlib/builtins.py:3253
1783
#: bzrlib/builtins.py:3223
2142
1784
msgid ""
2143
1785
"Perform a local commit in a bound branch. Local commits are not pushed to "
2144
1786
"the master branch until a normal commit is performed."
2145
1787
msgstr ""
2146
1788
2147
1789
# help of 'show-diff' option of 'commit' command
2148
#: bzrlib/builtins.py:3259
1790
#: bzrlib/builtins.py:3229
2149
1791
msgid ""
2150
1792
"When no message is supplied, show the diff along with the status summary in "
2151
1793
"the message editor."
2152
1794
msgstr ""
2153
1795
2154
1796
# help of 'lossy' option of 'commit' command
2155
#: bzrlib/builtins.py:3262
1797
#: bzrlib/builtins.py:3232
2156
1798
msgid ""
2157
1799
"When committing to a foreign version control system do not push data that "
2158
1800
"can not be natively represented."
2159
1801
msgstr ""
2160
1802
2161
#: bzrlib/builtins.py:3280
2162
#, python-format
2163
msgid ""
2164
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2165
"default bug tracker using the `bugtracker` option.\n"
2166
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2167
msgstr ""
2168
2169
#: bzrlib/builtins.py:3289
2170
#, python-format
2171
msgid ""
2172
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2173
"for more information on this feature.\n"
2174
"Commit refused."
2175
msgstr ""
2176
2177
#: bzrlib/builtins.py:3298
2178
#, python-format
2179
msgid "Unrecognized bug %s. Commit refused."
2180
msgstr ""
2181
2182
#: bzrlib/builtins.py:3301
2183
#, python-format
2184
msgid ""
2185
"%s\n"
2186
"Commit refused."
2187
msgstr ""
2188
2189
#: bzrlib/builtins.py:3325
2190
msgid "Could not parse --commit-time: "
2191
msgstr ""
2192
2193
#: bzrlib/builtins.py:3365
2194
msgid "please specify either --message or --file"
2195
msgstr ""
2196
2197
#: bzrlib/builtins.py:3394
2198
msgid "please specify a commit message with either --message or --file"
2199
msgstr ""
2200
2201
#: bzrlib/builtins.py:3397
2202
msgid ""
2203
"Empty commit message specified. Please specify a commit message with either "
2204
"--message or --file or leave a blank message with --message \"\"."
2205
msgstr ""
2206
2207
#: bzrlib/builtins.py:3417
2208
msgid ""
2209
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2210
"--unchanged to force an empty commit."
2211
msgstr ""
2212
2213
#: bzrlib/builtins.py:3421
2214
msgid ""
2215
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2216
"resolve FILE\" to resolve."
2217
msgstr ""
2218
2219
#: bzrlib/builtins.py:3425
2220
msgid "Commit refused because there are unknown files in the working tree."
2221
msgstr ""
2222
2223
#: bzrlib/builtins.py:3428
2224
msgid ""
2225
"\n"
2226
"To commit to master branch, run update and then commit.\n"
2227
"You can also pass --local to commit to continue working disconnected."
2228
msgstr ""
2229
2230
#: bzrlib/builtins.py:3436
1803
#: bzrlib/builtins.py:3406
2231
1804
msgid ""
2232
1805
"Validate working tree structure, branch consistency and repository history."
2233
1806
msgstr ""
2234
1807
2235
#: bzrlib/builtins.py:3438
1808
#: bzrlib/builtins.py:3408
2236
1809
msgid ""
2237
1810
"This command checks various invariants about branch and repository storage\n"
2238
1811
"to detect data corruption or bzr bugs."
2239
1812
msgstr ""
2240
1813
2241
#: bzrlib/builtins.py:3441
1814
#: bzrlib/builtins.py:3411
2242
1815
msgid ""
2243
1816
"The working tree and branch checks will only give output if a problem is\n"
2244
1817
"detected. The output fields of the repository check are:"
2245
1818
msgstr ""
2246
1819
2247
#: bzrlib/builtins.py:3444
1820
#: bzrlib/builtins.py:3414
2248
1821
msgid ""
2249
1822
"revisions\n"
2250
1823
" This is just the number of revisions checked. It doesn't\n"
2251
1824
" indicate a problem."
2252
1825
msgstr ""
2253
1826
2254
#: bzrlib/builtins.py:3448
1827
#: bzrlib/builtins.py:3418
2255
1828
msgid ""
2256
1829
"versionedfiles\n"
2257
1830
" This is just the number of versionedfiles checked. It\n"
2258
1831
" doesn't indicate a problem."
2259
1832
msgstr ""
2260
1833
2261
#: bzrlib/builtins.py:3452
1834
#: bzrlib/builtins.py:3422
2262
1835
msgid ""
2263
1836
"unreferenced ancestors\n"
2264
1837
" Texts that are ancestors of other texts, but\n"
2266
1839
" subtle problem that Bazaar can work around."
2267
1840
msgstr ""
2268
1841
2269
#: bzrlib/builtins.py:3457
1842
#: bzrlib/builtins.py:3427
2270
1843
msgid ""
2271
1844
"unique file texts\n"
2272
1845
" This is the total number of unique file contents\n"
2273
1846
" seen in the checked revisions. It does not indicate a problem."
2274
1847
msgstr ""
2275
1848
2276
#: bzrlib/builtins.py:3461
1849
#: bzrlib/builtins.py:3431
2277
1850
msgid ""
2278
1851
"repeated file texts\n"
2279
1852
" This is the total number of repeated texts seen\n"
2282
1855
" indicate a problem."
2283
1856
msgstr ""
2284
1857
2285
#: bzrlib/builtins.py:3467
1858
#: bzrlib/builtins.py:3437
2286
1859
msgid ""
2287
1860
"If no restrictions are specified, all Bazaar data that is found at the "
2288
1861
"given\n"
2289
1862
"location will be checked."
2290
1863
msgstr ""
2291
1864
2292
#: bzrlib/builtins.py:3470
1865
#: bzrlib/builtins.py:3440
2293
1866
msgid ":Examples:"
2294
1867
msgstr ""
2295
1868
2296
#: bzrlib/builtins.py:3472
1869
#: bzrlib/builtins.py:3442
2297
1870
msgid " Check the tree and branch at 'foo'::"
2298
1871
msgstr ""
2299
1872
2300
#: bzrlib/builtins.py:3474
1873
#: bzrlib/builtins.py:3444
2301
1874
msgid " bzr check --tree --branch foo"
2302
1875
msgstr ""
2303
1876
2304
#: bzrlib/builtins.py:3476
1877
#: bzrlib/builtins.py:3446
2305
1878
msgid " Check only the repository at 'bar'::"
2306
1879
msgstr ""
2307
1880
2308
#: bzrlib/builtins.py:3478
1881
#: bzrlib/builtins.py:3448
2309
1882
msgid " bzr check --repo bar"
2310
1883
msgstr ""
2311
1884
2312
#: bzrlib/builtins.py:3480
1885
#: bzrlib/builtins.py:3450
2313
1886
msgid " Check everything at 'baz'::"
2314
1887
msgstr ""
2315
1888
2316
#: bzrlib/builtins.py:3482
1889
#: bzrlib/builtins.py:3452
2317
1890
msgid " bzr check baz"
2318
1891
msgstr ""
2319
1892
2320
1893
# help of 'branch' option of 'check' command
2321
#: bzrlib/builtins.py:3488
1894
#: bzrlib/builtins.py:3458
2322
1895
msgid "Check the branch related to the current directory."
2323
1896
msgstr ""
2324
1897
2325
1898
# help of 'repo' option of 'check' command
2326
#: bzrlib/builtins.py:3490
1899
#: bzrlib/builtins.py:3460
2327
1900
msgid "Check the repository related to the current directory."
2328
1901
msgstr ""
2329
1902
2330
1903
# help of 'tree' option of 'check' command
2331
#: bzrlib/builtins.py:3492
1904
#: bzrlib/builtins.py:3462
2332
1905
msgid "Check the working tree related to the current directory."
2333
1906
msgstr ""
2334
1907
2335
#: bzrlib/builtins.py:3506
1908
#: bzrlib/builtins.py:3476
2336
1909
msgid "Upgrade a repository, branch or working tree to a newer format."
2337
1910
msgstr ""
2338
1911
2339
#: bzrlib/builtins.py:3508
1912
#: bzrlib/builtins.py:3478
2340
1913
msgid ""
2341
1914
"When the default format has changed after a major new release of\n"
2342
1915
"Bazaar, you may be informed during certain operations that you\n"
2345
1918
"with older repositories or with older versions of Bazaar."
2346
1919
msgstr ""
2347
1920
2348
#: bzrlib/builtins.py:3514
1921
#: bzrlib/builtins.py:3484
2349
1922
msgid ""
2350
1923
"If you wish to upgrade to a particular format rather than the\n"
2351
1924
"current default, that can be specified using the --format option.\n"
2355
1928
"2.x default) so downgrading is not always possible."
2356
1929
msgstr ""
2357
1930
2358
#: bzrlib/builtins.py:3521
1931
#: bzrlib/builtins.py:3491
2359
1932
msgid ""
2360
1933
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2361
1934
"process (where # is a number). By default, this is left there on\n"
2366
1939
"afterwards."
2367
1940
msgstr ""
2368
1941
2369
#: bzrlib/builtins.py:3529
1942
#: bzrlib/builtins.py:3499
2370
1943
msgid ""
2371
1944
"If the location given is a shared repository, dependent branches\n"
2372
1945
"are also converted provided the repository converts successfully.\n"
2374
1947
"tried."
2375
1948
msgstr ""
2376
1949
2377
#: bzrlib/builtins.py:3534
1950
#: bzrlib/builtins.py:3504
2378
1951
msgid ""
2379
1952
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2380
1953
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2381
1954
msgstr ""
2382
1955
2383
1956
# help of 'format' option of 'upgrade' command
2384
#: bzrlib/builtins.py:3542
1957
#: bzrlib/builtins.py:3512
2385
1958
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2386
1959
msgstr ""
2387
1960
2388
1961
# title of 'format' option of 'init' command
2389
#: bzrlib/builtins.py:3546
1962
#: bzrlib/builtins.py:3516
2390
1963
msgid "Branch format"
2391
1964
msgstr ""
2392
1965
2393
1966
# help of 'clean' option of 'upgrade' command
2394
#: bzrlib/builtins.py:3548
1967
#: bzrlib/builtins.py:3518
2395
1968
msgid "Remove the backup.bzr directory if successful."
2396
1969
msgstr ""
2397
1970
2398
#: bzrlib/builtins.py:3565
1971
#: bzrlib/builtins.py:3535
2399
1972
msgid "Show or set bzr user id."
2400
1973
msgstr ""
2401
1974
2402
#: bzrlib/builtins.py:3567
1975
#: bzrlib/builtins.py:3537
2403
1976
msgid ""
2404
1977
":Examples:\n"
2405
1978
" Show the email of the current user::"
2406
1979
msgstr ""
2407
1980
2408
#: bzrlib/builtins.py:3570
1981
#: bzrlib/builtins.py:3540
2409
1982
msgid " bzr whoami --email"
2410
1983
msgstr ""
2411
1984
2412
#: bzrlib/builtins.py:3572
1985
#: bzrlib/builtins.py:3542
2413
1986
msgid " Set the current user::"
2414
1987
msgstr ""
2415
1988
2416
#: bzrlib/builtins.py:3574
1989
#: bzrlib/builtins.py:3544
2417
1990
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2418
1991
msgstr ""
2419
1992
2420
1993
# help of 'email' option of 'whoami' command
2421
#: bzrlib/builtins.py:3578
1994
#: bzrlib/builtins.py:3548
2422
1995
msgid "Display email address only."
2423
1996
msgstr ""
2424
1997
2425
1998
# help of 'branch' option of 'whoami' command
2426
#: bzrlib/builtins.py:3580
1999
#: bzrlib/builtins.py:3550
2427
2000
msgid "Set identity for the current branch instead of globally."
2428
2001
msgstr ""
2429
2002
2430
#: bzrlib/builtins.py:3604
2431
msgid "--email can only be used to display existing identity"
2432
msgstr ""
2433
2434
#: bzrlib/builtins.py:3626
2003
#: bzrlib/builtins.py:3596
2435
2004
msgid "Print or set the branch nickname."
2436
2005
msgstr ""
2437
2006
2438
#: bzrlib/builtins.py:3628
2007
#: bzrlib/builtins.py:3598
2439
2008
msgid ""
2440
2009
"If unset, the tree root directory name is used as the nickname.\n"
2441
2010
"To print the current nickname, execute with no argument."
2442
2011
msgstr ""
2443
2012
2444
#: bzrlib/builtins.py:3631
2013
#: bzrlib/builtins.py:3601
2445
2014
msgid ""
2446
2015
"Bound branches use the nickname of its master branch unless it is set\n"
2447
2016
"locally."
2448
2017
msgstr ""
2449
2018
2450
#: bzrlib/builtins.py:3651
2019
#: bzrlib/builtins.py:3621
2451
2020
msgid "Set/unset and display aliases."
2452
2021
msgstr ""
2453
2022
2454
#: bzrlib/builtins.py:3653
2023
#: bzrlib/builtins.py:3623
2455
2024
msgid ""
2456
2025
":Examples:\n"
2457
2026
" Show the current aliases::"
2458
2027
msgstr ""
2459
2028
2460
#: bzrlib/builtins.py:3656
2029
#: bzrlib/builtins.py:3626
2461
2030
msgid " bzr alias"
2462
2031
msgstr ""
2463
2032
2464
#: bzrlib/builtins.py:3658
2033
#: bzrlib/builtins.py:3628
2465
2034
msgid " Show the alias specified for 'll'::"
2466
2035
msgstr ""
2467
2036
2468
#: bzrlib/builtins.py:3660
2037
#: bzrlib/builtins.py:3630
2469
2038
msgid " bzr alias ll"
2470
2039
msgstr ""
2471
2040
2472
#: bzrlib/builtins.py:3662
2041
#: bzrlib/builtins.py:3632
2473
2042
msgid " Set an alias for 'll'::"
2474
2043
msgstr ""
2475
2044
2476
#: bzrlib/builtins.py:3664
2045
#: bzrlib/builtins.py:3634
2477
2046
msgid " bzr alias ll=\"log --line -r-10..-1\""
2478
2047
msgstr ""
2479
2048
2480
#: bzrlib/builtins.py:3666
2049
#: bzrlib/builtins.py:3636
2481
2050
msgid " To remove an alias for 'll'::"
2482
2051
msgstr ""
2483
2052
2484
#: bzrlib/builtins.py:3668
2053
#: bzrlib/builtins.py:3638
2485
2054
msgid " bzr alias --remove ll"
2486
2055
msgstr ""
2487
2056
2488
2057
# help of 'remove' option of 'alias' command
2489
#: bzrlib/builtins.py:3673
2058
#: bzrlib/builtins.py:3643
2490
2059
msgid "Remove the alias."
2491
2060
msgstr ""
2492
2061
2493
#: bzrlib/builtins.py:3691
2494
msgid "bzr alias --remove expects an alias to remove."
2495
msgstr ""
2496
2497
#: bzrlib/builtins.py:3863
2498
msgid "subunit not available. subunit needs to be installed to use --subunit."
2499
msgstr ""
2500
2501
#: bzrlib/builtins.py:3880
2502
msgid ""
2503
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2504
msgstr ""
2505
2506
#: bzrlib/builtins.py:3927
2062
#: bzrlib/builtins.py:3897
2507
2063
msgid "Show version of bzr."
2508
2064
msgstr ""
2509
2065
2510
2066
# help of 'short' option of 'version' command
2511
#: bzrlib/builtins.py:3931
2067
#: bzrlib/builtins.py:3901
2512
2068
msgid "Print just the version number."
2513
2069
msgstr ""
2514
2070
2071
#: bzrlib/builtins.py:3948
2072
msgid "Perform a three-way merge."
2073
msgstr ""
2074
2515
2075
#: bzrlib/builtins.py:3950
2516
msgid "It sure does!\n"
2517
msgstr ""
2518
2519
#: bzrlib/builtins.py:3974
2520
#, python-format
2521
msgid "merge base is revision %s\n"
2522
msgstr ""
2523
2524
#: bzrlib/builtins.py:3978
2525
msgid "Perform a three-way merge."
2526
msgstr ""
2527
2528
#: bzrlib/builtins.py:3980
2529
2076
msgid ""
2530
2077
"The source of the merge can be specified either in the form of a branch,\n"
2531
2078
"or in the form of a path to a file containing a merge directive generated\n"
2536
2083
"the current working tree."
2537
2084
msgstr ""
2538
2085
2539
#: bzrlib/builtins.py:3988
2086
#: bzrlib/builtins.py:3958
2540
2087
msgid ""
2541
2088
"When merging from a branch, by default bzr will try to merge in all new\n"
2542
2089
"work from the other branch, automatically determining an appropriate base\n"
2543
2090
"revision. If this fails, you may need to give an explicit base."
2544
2091
msgstr ""
2545
2092
2546
#: bzrlib/builtins.py:3992
2093
#: bzrlib/builtins.py:3962
2547
2094
msgid ""
2548
2095
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2549
2096
"try to merge in all new work up to and including revision OTHER."
2550
2097
msgstr ""
2551
2098
2552
#: bzrlib/builtins.py:3995
2099
#: bzrlib/builtins.py:3965
2553
2100
msgid ""
2554
2101
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2555
2102
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2560
2107
"changes from the other branch is not stored in the commit."
2561
2108
msgstr ""
2562
2109
2563
#: bzrlib/builtins.py:4003
2110
#: bzrlib/builtins.py:3973
2564
2111
msgid "Revision numbers are always relative to the source branch."
2565
2112
msgstr ""
2566
2113
2567
#: bzrlib/builtins.py:4010
2114
#: bzrlib/builtins.py:3980
2568
2115
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2569
2116
msgstr ""
2570
2117
2571
#: bzrlib/builtins.py:4012
2118
#: bzrlib/builtins.py:3982
2572
2119
msgid ""
2573
2120
"If there is no default branch set, the first merge will set it (use\n"
2574
2121
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2576
2123
"only be saved if the remote location can be accessed."
2577
2124
msgstr ""
2578
2125
2579
#: bzrlib/builtins.py:4017
2126
#: bzrlib/builtins.py:3987
2580
2127
msgid ""
2581
2128
"The results of the merge are placed into the destination working\n"
2582
2129
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2583
2130
"committed to record the result of the merge."
2584
2131
msgstr ""
2585
2132
2586
#: bzrlib/builtins.py:4021
2133
#: bzrlib/builtins.py:3991
2587
2134
msgid ""
2588
2135
"merge refuses to run if there are any uncommitted changes, unless\n"
2589
2136
"--force is given. If --force is given, then the changes from the source \n"
2592
2139
"merge revision which has more than two parents."
2593
2140
msgstr ""
2594
2141
2595
#: bzrlib/builtins.py:4027
2142
#: bzrlib/builtins.py:3997
2596
2143
msgid ""
2597
2144
"If one would like to merge changes from the working tree of the other\n"
2598
2145
"branch without merging any committed revisions, the --uncommitted option\n"
2599
2146
"can be given."
2600
2147
msgstr ""
2601
2148
2602
#: bzrlib/builtins.py:4031
2149
#: bzrlib/builtins.py:4001
2603
2150
msgid ""
2604
2151
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2605
2152
"you to apply each diff hunk and file change, similar to \"shelve\"."
2606
2153
msgstr ""
2607
2154
2608
#: bzrlib/builtins.py:4034
2155
#: bzrlib/builtins.py:4004
2609
2156
msgid ""
2610
2157
":Examples:\n"
2611
2158
" To merge all new revisions from bzr.dev::"
2612
2159
msgstr ""
2613
2160
2614
#: bzrlib/builtins.py:4037
2161
#: bzrlib/builtins.py:4007
2615
2162
msgid " bzr merge ../bzr.dev"
2616
2163
msgstr ""
2617
2164
2618
#: bzrlib/builtins.py:4039
2165
#: bzrlib/builtins.py:4009
2619
2166
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2620
2167
msgstr ""
2621
2168
2622
#: bzrlib/builtins.py:4041
2169
#: bzrlib/builtins.py:4011
2623
2170
msgid " bzr merge -r 82 ../bzr.dev"
2624
2171
msgstr ""
2625
2172
2626
#: bzrlib/builtins.py:4043
2173
#: bzrlib/builtins.py:4013
2627
2174
msgid " To merge the changes introduced by 82, without previous changes::"
2628
2175
msgstr ""
2629
2176
2630
#: bzrlib/builtins.py:4045
2177
#: bzrlib/builtins.py:4015
2631
2178
msgid " bzr merge -r 81..82 ../bzr.dev"
2632
2179
msgstr ""
2633
2180
2634
#: bzrlib/builtins.py:4047
2181
#: bzrlib/builtins.py:4017
2635
2182
msgid " To apply a merge directive contained in /tmp/merge::"
2636
2183
msgstr ""
2637
2184
2638
#: bzrlib/builtins.py:4049
2185
#: bzrlib/builtins.py:4019
2639
2186
msgid " bzr merge /tmp/merge"
2640
2187
msgstr ""
2641
2188
2642
#: bzrlib/builtins.py:4051
2189
#: bzrlib/builtins.py:4021
2643
2190
msgid ""
2644
2191
" To create a merge revision with three parents from two branches\n"
2645
2192
" feature1a and feature1b:"
2646
2193
msgstr ""
2647
2194
2648
#: bzrlib/builtins.py:4054
2195
#: bzrlib/builtins.py:4024
2649
2196
msgid ""
2650
2197
" bzr merge ../feature1a\n"
2651
2198
" bzr merge ../feature1b --force\n"
2653
2200
msgstr ""
2654
2201
2655
2202
# help of 'force' option of 'merge' command
2656
#: bzrlib/builtins.py:4066
2203
#: bzrlib/builtins.py:4036
2657
2204
msgid "Merge even if the destination tree has uncommitted changes."
2658
2205
msgstr ""
2659
2206
2660
2207
# help of 'uncommitted' option of 'merge' command
2661
#: bzrlib/builtins.py:4072
2208
#: bzrlib/builtins.py:4042
2662
2209
msgid ""
2663
2210
"Apply uncommitted changes from a working copy, instead of branch changes."
2664
2211
msgstr ""
2665
2212
2666
2213
# help of 'pull' option of 'merge' command
2667
#: bzrlib/builtins.py:4074
2214
#: bzrlib/builtins.py:4044
2668
2215
msgid ""
2669
2216
"If the destination is already completely merged into the source, pull from "
2670
2217
"the source rather than merging. When this happens, you do not need to "
2672
2219
msgstr ""
2673
2220
2674
2221
# help of 'directory' option of 'merge' command
2675
#: bzrlib/builtins.py:4079
2222
#: bzrlib/builtins.py:4049
2676
2223
msgid ""
2677
2224
"Branch to merge into, rather than the one containing the working directory."
2678
2225
msgstr ""
2679
2226
2680
2227
# help of 'preview' option of 'merge' command
2681
#: bzrlib/builtins.py:4081
2228
#: bzrlib/builtins.py:4051
2682
2229
msgid "Instead of merging, show a diff of the merge."
2683
2230
msgstr ""
2684
2231
2685
2232
# help of 'interactive' option of 'merge' command
2686
#: bzrlib/builtins.py:4083
2233
#: bzrlib/builtins.py:4053
2687
2234
msgid "Select changes interactively."
2688
2235
msgstr ""
2689
2236
2690
#: bzrlib/builtins.py:4105
2691
msgid ""
2692
"Merging into empty branches not currently supported, https://bugs.launchpad."
2693
"net/bzr/+bug/308562"
2694
msgstr ""
2695
2696
#: bzrlib/builtins.py:4132
2697
msgid "Cannot use --uncommitted with bundles or merge directives."
2698
msgstr ""
2699
2700
#: bzrlib/builtins.py:4143
2701
msgid "Cannot use --uncommitted and --revision at the same time."
2702
msgstr ""
2703
2704
#: bzrlib/builtins.py:4163
2705
msgid "merger: "
2706
msgstr ""
2707
2708
#: bzrlib/builtins.py:4165 bzrlib/bundle/apply_bundle.py:67
2709
msgid "Nothing to do."
2710
msgstr ""
2711
2712
#: bzrlib/builtins.py:4169
2713
msgid "Cannot pull individual files"
2714
msgstr ""
2715
2716
#: bzrlib/builtins.py:4177
2717
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2718
msgstr ""
2719
2720
#: bzrlib/builtins.py:4235
2721
#, python-format
2722
msgid "Show-base is not supported for this merge type. %s"
2723
msgstr ""
2724
2725
#: bzrlib/builtins.py:4244
2726
#, python-format
2727
msgid "Conflict reduction is not supported for merge type %s."
2728
msgstr ""
2729
2730
#: bzrlib/builtins.py:4248
2731
msgid "Cannot do conflict reduction and show base."
2732
msgstr ""
2733
2734
#: bzrlib/builtins.py:4359
2735
msgid "No location specified or remembered"
2736
msgstr ""
2737
2738
#: bzrlib/builtins.py:4361
2739
msgid "{0} remembered {1} location {2}"
2740
msgstr ""
2741
2742
#: bzrlib/builtins.py:4367
2237
#: bzrlib/builtins.py:4337
2743
2238
msgid "Redo a merge."
2744
2239
msgstr ""
2745
2240
2746
#: bzrlib/builtins.py:4369
2241
#: bzrlib/builtins.py:4339
2747
2242
msgid ""
2748
2243
"Use this if you want to try a different merge technique while resolving\n"
2749
2244
"conflicts. Some merge techniques are better than others, and remerge\n"
2750
2245
"lets you try different ones on different files."
2751
2246
msgstr ""
2752
2247
2753
#: bzrlib/builtins.py:4373
2248
#: bzrlib/builtins.py:4343
2754
2249
msgid ""
2755
2250
"The options for remerge have the same meaning and defaults as the ones for\n"
2756
2251
"merge. The difference is that remerge can (only) be run when there is a\n"
2757
2252
"pending merge, and it lets you specify particular files."
2758
2253
msgstr ""
2759
2254
2760
#: bzrlib/builtins.py:4377
2255
#: bzrlib/builtins.py:4347
2761
2256
msgid ""
2762
2257
":Examples:\n"
2763
2258
" Re-do the merge of all conflicted files, and show the base text in\n"
2764
2259
" conflict regions, in addition to the usual THIS and OTHER texts::"
2765
2260
msgstr ""
2766
2261
2767
#: bzrlib/builtins.py:4381
2262
#: bzrlib/builtins.py:4351
2768
2263
msgid " bzr remerge --show-base"
2769
2264
msgstr ""
2770
2265
2771
#: bzrlib/builtins.py:4383
2266
#: bzrlib/builtins.py:4353
2772
2267
msgid ""
2773
2268
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2774
2269
" additional processing to reduce the size of conflict regions::"
2775
2270
msgstr ""
2776
2271
2777
#: bzrlib/builtins.py:4386
2272
#: bzrlib/builtins.py:4356
2778
2273
msgid " bzr remerge --merge-type weave --reprocess foobar"
2779
2274
msgstr ""
2780
2275
2781
2276
# help of 'show-base' option of 'merge' command
2782
#: bzrlib/builtins.py:4393
2277
#: bzrlib/builtins.py:4363
2783
2278
msgid "Show base revision text in conflicts."
2784
2279
msgstr ""
2785
2280
2786
#: bzrlib/builtins.py:4405
2787
msgid ""
2788
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2789
"merges."
2790
msgstr ""
2791
2792
#: bzrlib/builtins.py:4461
2281
#: bzrlib/builtins.py:4431
2793
2282
msgid "Revert files to a previous revision."
2794
2283
msgstr ""
2795
2284
2796
#: bzrlib/builtins.py:4463
2285
#: bzrlib/builtins.py:4433
2797
2286
msgid ""
2798
2287
"Giving a list of files will revert only those files. Otherwise, all files\n"
2799
2288
"will be reverted. If the revision is not specified with '--revision', the\n"
2800
2289
"last committed revision is used."
2801
2290
msgstr ""
2802
2291
2803
#: bzrlib/builtins.py:4467
2292
#: bzrlib/builtins.py:4437
2804
2293
msgid ""
2805
2294
"To remove only some changes, without reverting to a prior version, use\n"
2806
2295
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2809
2298
"certain changes on a hunk-by-hunk basis, see the shelve command."
2810
2299
msgstr ""
2811
2300
2812
#: bzrlib/builtins.py:4473
2301
#: bzrlib/builtins.py:4443
2813
2302
msgid ""
2814
2303
"By default, any files that have been manually changed will be backed up\n"
2815
2304
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2816
2305
"'.~#~' appended to their name, where # is a number."
2817
2306
msgstr ""
2818
2307
2819
#: bzrlib/builtins.py:4477
2308
#: bzrlib/builtins.py:4447
2820
2309
msgid ""
2821
2310
"When you provide files, you can use their current pathname or the pathname\n"
2822
2311
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2824
2313
"reverted."
2825
2314
msgstr ""
2826
2315
2827
#: bzrlib/builtins.py:4482
2316
#: bzrlib/builtins.py:4452
2828
2317
msgid ""
2829
2318
"If you have newly added files since the target revision, they will be\n"
2830
2319
"removed. If the files to be removed have been changed, backups will be\n"
2832
2321
"deleted."
2833
2322
msgstr ""
2834
2323
2835
#: bzrlib/builtins.py:4487
2324
#: bzrlib/builtins.py:4457
2836
2325
msgid ""
2837
2326
"The working tree contains a list of revisions that have been merged but\n"
2838
2327
"not yet committed. These revisions will be included as additional parents\n"
2844
2333
"reverting any files."
2845
2334
msgstr ""
2846
2335
2847
#: bzrlib/builtins.py:4496
2336
#: bzrlib/builtins.py:4466
2848
2337
msgid ""
2849
2338
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2850
2339
"changes from a branch in a single revision. To do this, perform the merge\n"
2859
2348
msgstr ""
2860
2349
2861
2350
# help of 'no-backup' option of 'revert' command
2862
#: bzrlib/builtins.py:4510
2351
#: bzrlib/builtins.py:4480
2863
2352
msgid "Do not save backups of reverted files."
2864
2353
msgstr ""
2865
2354
2866
2355
# help of 'forget-merges' option of 'revert' command
2867
#: bzrlib/builtins.py:4512
2356
#: bzrlib/builtins.py:4482
2868
2357
msgid "Remove pending merge marker, without changing any files."
2869
2358
msgstr ""
2870
2359
2871
#: bzrlib/builtins.py:4543
2360
#: bzrlib/builtins.py:4513
2872
2361
msgid ""
2873
2362
"Show help on a command or other topic.\n"
2874
2363
" "
2875
2364
msgstr ""
2876
2365
2877
2366
# help of 'long' option of 'help' command
2878
#: bzrlib/builtins.py:4548
2367
#: bzrlib/builtins.py:4518
2879
2368
msgid "Show help on all commands."
2880
2369
msgstr ""
2881
2370
2882
#: bzrlib/builtins.py:4577
2371
#: bzrlib/builtins.py:4547
2883
2372
msgid "Show unmerged/unpulled revisions between two branches."
2884
2373
msgstr ""
2885
2374
2886
#: bzrlib/builtins.py:4579
2375
#: bzrlib/builtins.py:4549
2887
2376
msgid "OTHER_BRANCH may be local or remote."
2888
2377
msgstr ""
2889
2378
2890
#: bzrlib/builtins.py:4581
2379
#: bzrlib/builtins.py:4551
2891
2380
msgid ""
2892
2381
"To filter on a range of revisions, you can use the command -r begin..end\n"
2893
2382
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2898
2387
" 0 - no missing revisions"
2899
2388
msgstr ""
2900
2389
2901
#: bzrlib/builtins.py:4591
2390
#: bzrlib/builtins.py:4561
2902
2391
msgid ""
2903
2392
" Determine the missing revisions between this and the branch at the\n"
2904
2393
" remembered pull location::"
2905
2394
msgstr ""
2906
2395
2907
#: bzrlib/builtins.py:4594
2396
#: bzrlib/builtins.py:4564
2908
2397
msgid " bzr missing"
2909
2398
msgstr ""
2910
2399
2911
#: bzrlib/builtins.py:4596
2400
#: bzrlib/builtins.py:4566
2912
2401
msgid " Determine the missing revisions between this and another branch::"
2913
2402
msgstr ""
2914
2403
2915
#: bzrlib/builtins.py:4598
2404
#: bzrlib/builtins.py:4568
2916
2405
msgid " bzr missing http://server/branch"
2917
2406
msgstr ""
2918
2407
2919
#: bzrlib/builtins.py:4600
2408
#: bzrlib/builtins.py:4570
2920
2409
msgid ""
2921
2410
" Determine the missing revisions up to a specific revision on the other\n"
2922
2411
" branch::"
2923
2412
msgstr ""
2924
2413
2925
#: bzrlib/builtins.py:4603
2414
#: bzrlib/builtins.py:4573
2926
2415
msgid " bzr missing -r ..-10"
2927
2416
msgstr ""
2928
2417
2929
#: bzrlib/builtins.py:4605
2418
#: bzrlib/builtins.py:4575
2930
2419
msgid ""
2931
2420
" Determine the missing revisions up to a specific revision on this\n"
2932
2421
" branch::"
2933
2422
msgstr ""
2934
2423
2935
#: bzrlib/builtins.py:4608
2424
#: bzrlib/builtins.py:4578
2936
2425
msgid " bzr missing --my-revision ..-10"
2937
2426
msgstr ""
2938
2427
2939
2428
# help of 'reverse' option of 'missing' command
2940
#: bzrlib/builtins.py:4615
2429
#: bzrlib/builtins.py:4585
2941
2430
msgid "Reverse the order of revisions."
2942
2431
msgstr ""
2943
2432
2944
2433
# help of 'mine-only' option of 'missing' command
2945
#: bzrlib/builtins.py:4617
2434
#: bzrlib/builtins.py:4587
2946
2435
msgid "Display changes in the local branch only."
2947
2436
msgstr ""
2948
2437
2949
2438
# help of 'this' option of 'missing' command
2950
#: bzrlib/builtins.py:4618
2439
#: bzrlib/builtins.py:4588
2951
2440
msgid "Same as --mine-only."
2952
2441
msgstr ""
2953
2442
2954
2443
# help of 'theirs-only' option of 'missing' command
2955
#: bzrlib/builtins.py:4620
2444
#: bzrlib/builtins.py:4590
2956
2445
msgid "Display changes in the remote branch only."
2957
2446
msgstr ""
2958
2447
2959
2448
# help of 'other' option of 'missing' command
2960
#: bzrlib/builtins.py:4621
2449
#: bzrlib/builtins.py:4591
2961
2450
msgid "Same as --theirs-only."
2962
2451
msgstr ""
2963
2452
2964
2453
# help of 'revision' option of 'missing' command
2965
#: bzrlib/builtins.py:4626
2454
#: bzrlib/builtins.py:4596
2966
2455
msgid ""
2967
2456
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
2968
2457
"details."
2969
2458
msgstr ""
2970
2459
2971
2460
# help of 'my-revision' option of 'missing' command
2972
#: bzrlib/builtins.py:4630
2461
#: bzrlib/builtins.py:4600
2973
2462
msgid ""
2974
2463
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
2975
2464
"details."
2976
2465
msgstr ""
2977
2466
2978
# help of 'include-merged' option of 'missing' command
2979
#: bzrlib/builtins.py:4633
2467
# help of 'include-merges' option of 'missing' command
2468
#: bzrlib/builtins.py:4603
2980
2469
msgid "Show all revisions in addition to the mainline ones."
2981
2470
msgstr ""
2982
2471
2983
#: bzrlib/builtins.py:4687
2984
msgid "No peer location known or specified."
2985
msgstr ""
2986
2987
#: bzrlib/builtins.py:4691
2988
msgid "Using saved parent location: {0}\n"
2989
msgstr ""
2990
2991
#: bzrlib/builtins.py:4724
2992
#, python-format
2993
msgid "You have %d extra revision:\n"
2994
msgid_plural "You have %d extra revisions:\n"
2995
msgstr[0] ""
2996
msgstr[1] ""
2997
2998
#: bzrlib/builtins.py:4740
2999
#, python-format
3000
msgid "You are missing %d revision:\n"
3001
msgid_plural "You are missing %d revisions:\n"
3002
msgstr[0] ""
3003
msgstr[1] ""
3004
3005
#: bzrlib/builtins.py:4752
3006
msgid "This branch has no new revisions.\n"
3007
msgstr ""
3008
3009
#: bzrlib/builtins.py:4755
3010
msgid "Other branch has no new revisions.\n"
3011
msgstr ""
3012
3013
#: bzrlib/builtins.py:4760
3014
msgid "Branches are up to date.\n"
3015
msgstr ""
3016
3017
#: bzrlib/builtins.py:4771
2472
#: bzrlib/builtins.py:4719
3018
2473
msgid "Compress the data within a repository."
3019
2474
msgstr ""
3020
2475
3021
#: bzrlib/builtins.py:4773
2476
#: bzrlib/builtins.py:4721
3022
2477
msgid ""
3023
2478
"This operation compresses the data within a bazaar repository. As\n"
3024
2479
"bazaar supports automatic packing of repository, this operation is\n"
3025
2480
"normally not required to be done manually."
3026
2481
msgstr ""
3027
2482
3028
#: bzrlib/builtins.py:4777
2483
#: bzrlib/builtins.py:4725
3029
2484
msgid ""
3030
2485
"During the pack operation, bazaar takes a backup of existing repository\n"
3031
2486
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3034
2489
"used."
3035
2490
msgstr ""
3036
2491
3037
#: bzrlib/builtins.py:4783
2492
#: bzrlib/builtins.py:4731
3038
2493
msgid ""
3039
2494
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3040
2495
"during or immediately after repacking, you may be left with a state\n"
3043
2498
msgstr ""
3044
2499
3045
2500
# help of 'clean-obsolete-packs' option of 'pack' command
3046
#: bzrlib/builtins.py:4792
2501
#: bzrlib/builtins.py:4740
3047
2502
msgid "Delete obsolete packs to save disk space."
3048
2503
msgstr ""
3049
2504
3050
#: bzrlib/builtins.py:4806
2505
#: bzrlib/builtins.py:4754
3051
2506
msgid "List the installed plugins."
3052
2507
msgstr ""
3053
2508
3054
#: bzrlib/builtins.py:4808
2509
#: bzrlib/builtins.py:4756
3055
2510
msgid ""
3056
2511
"This command displays the list of installed plugins including\n"
3057
2512
"version of plugin and a short description of each."
3058
2513
msgstr ""
3059
2514
3060
#: bzrlib/builtins.py:4811
2515
#: bzrlib/builtins.py:4759
3061
2516
msgid "--verbose shows the path where each plugin is located."
3062
2517
msgstr ""
3063
2518
3064
#: bzrlib/builtins.py:4813
2519
#: bzrlib/builtins.py:4761
3065
2520
msgid ""
3066
2521
"A plugin is an external component for Bazaar that extends the\n"
3067
2522
"revision control system, by adding or replacing code in Bazaar.\n"
3070
2525
"customizing log output."
3071
2526
msgstr ""
3072
2527
3073
#: bzrlib/builtins.py:4819
2528
#: bzrlib/builtins.py:4767
3074
2529
msgid ""
3075
2530
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3076
2531
"for further information on plugins including where to find them and how to\n"
3078
2533
"plugins using the Python programming language."
3079
2534
msgstr ""
3080
2535
3081
#: bzrlib/builtins.py:4835
2536
#: bzrlib/builtins.py:4783
3082
2537
msgid "Show testament (signing-form) of a revision."
3083
2538
msgstr ""
3084
2539
3085
2540
# help of 'long' option of 'testament' command
3086
#: bzrlib/builtins.py:4838
2541
#: bzrlib/builtins.py:4786
3087
2542
msgid "Produce long-format testament."
3088
2543
msgstr ""
3089
2544
3090
2545
# help of 'strict' option of 'testament' command
3091
#: bzrlib/builtins.py:4840
2546
#: bzrlib/builtins.py:4788
3092
2547
msgid "Produce a strict-format testament."
3093
2548
msgstr ""
3094
2549
3095
#: bzrlib/builtins.py:4866
2550
#: bzrlib/builtins.py:4814
3096
2551
msgid "Show the origin of each line in a file."
3097
2552
msgstr ""
3098
2553
3099
#: bzrlib/builtins.py:4868
2554
#: bzrlib/builtins.py:4816
3100
2555
msgid ""
3101
2556
"This prints out the given file with an annotation on the left side\n"
3102
2557
"indicating which revision, author and date introduced the change."
3103
2558
msgstr ""
3104
2559
3105
#: bzrlib/builtins.py:4871
2560
#: bzrlib/builtins.py:4819
3106
2561
msgid ""
3107
2562
"If the origin is the same for a run of consecutive lines, it is\n"
3108
2563
"shown only at the top, unless the --all option is given."
3109
2564
msgstr ""
3110
2565
3111
2566
# help of 'all' option of 'annotate' command
3112
#: bzrlib/builtins.py:4879
2567
#: bzrlib/builtins.py:4827
3113
2568
msgid "Show annotations on all lines."
3114
2569
msgstr ""
3115
2570
3116
2571
# help of 'long' option of 'annotate' command
3117
#: bzrlib/builtins.py:4880
2572
#: bzrlib/builtins.py:4828
3118
2573
msgid "Show commit date in annotations."
3119
2574
msgstr ""
3120
2575
3121
#: bzrlib/builtins.py:4967
3122
msgid "Cannot sign a range of non-revision-history revisions"
3123
msgstr ""
3124
3125
#: bzrlib/builtins.py:4979
3126
msgid "Please supply either one revision, or a range."
3127
msgstr ""
3128
3129
#: bzrlib/builtins.py:4983
2576
#: bzrlib/builtins.py:4931
3130
2577
msgid ""
3131
2578
"Convert the current branch into a checkout of the supplied branch.\n"
3132
2579
"If no branch is supplied, rebind to the last bound location."
3133
2580
msgstr ""
3134
2581
3135
#: bzrlib/builtins.py:4986
2582
#: bzrlib/builtins.py:4934
3136
2583
msgid ""
3137
2584
"Once converted into a checkout, commits must succeed on the master branch\n"
3138
2585
"before they will be applied to the local branch."
3139
2586
msgstr ""
3140
2587
3141
#: bzrlib/builtins.py:4989
2588
#: bzrlib/builtins.py:4937
3142
2589
msgid ""
3143
2590
"Bound branches use the nickname of its master branch unless it is set\n"
3144
2591
"locally, in which case binding will update the local nickname to be\n"
3145
2592
"that of the master."
3146
2593
msgstr ""
3147
2594
3148
#: bzrlib/builtins.py:5004
3149
msgid "No location supplied. This format does not remember old locations."
3150
msgstr ""
3151
3152
#: bzrlib/builtins.py:5009
3153
msgid "Branch is already bound"
3154
msgstr ""
3155
3156
#: bzrlib/builtins.py:5011
3157
msgid "No location supplied and no previous location known"
3158
msgstr ""
3159
3160
#: bzrlib/builtins.py:5017
3161
msgid "These branches have diverged. Try merging, and then bind again."
3162
msgstr ""
3163
3164
#: bzrlib/builtins.py:5024
2595
#: bzrlib/builtins.py:4972
3165
2596
msgid "Convert the current checkout into a regular branch."
3166
2597
msgstr ""
3167
2598
3168
#: bzrlib/builtins.py:5026
2599
#: bzrlib/builtins.py:4974
3169
2600
msgid ""
3170
2601
"After unbinding, the local branch is considered independent and subsequent\n"
3171
2602
"commits will be local only."
3172
2603
msgstr ""
3173
2604
3174
#: bzrlib/builtins.py:5037
3175
msgid "Local branch is not bound"
3176
msgstr ""
3177
3178
#: bzrlib/builtins.py:5041
2605
#: bzrlib/builtins.py:4989
3179
2606
msgid "Remove the last committed revision."
3180
2607
msgstr ""
3181
2608
3182
#: bzrlib/builtins.py:5043
2609
#: bzrlib/builtins.py:4991
3183
2610
msgid ""
3184
2611
"--verbose will print out what is being removed.\n"
3185
2612
"--dry-run will go through all the motions, but not actually\n"
3186
2613
"remove anything."
3187
2614
msgstr ""
3188
2615
3189
#: bzrlib/builtins.py:5047
2616
#: bzrlib/builtins.py:4995
3190
2617
msgid ""
3191
2618
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3192
2619
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3193
2620
"branch at revision 15."
3194
2621
msgstr ""
3195
2622
3196
#: bzrlib/builtins.py:5051
2623
#: bzrlib/builtins.py:4999
3197
2624
msgid ""
3198
2625
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3199
2626
"it may make is to restore any pending merges that were present before\n"
3201
2628
msgstr ""
3202
2629
3203
2630
# help of 'dry-run' option of 'uncommit' command
3204
#: bzrlib/builtins.py:5062
2631
#: bzrlib/builtins.py:5010
3205
2632
msgid "Don't actually make changes."
3206
2633
msgstr ""
3207
2634
3208
2635
# help of 'force' option of 'uncommit' command
3209
#: bzrlib/builtins.py:5063
2636
#: bzrlib/builtins.py:5011
3210
2637
msgid "Say yes to all questions."
3211
2638
msgstr ""
3212
2639
3213
2640
# help of 'keep-tags' option of 'uncommit' command
3214
#: bzrlib/builtins.py:5065
2641
#: bzrlib/builtins.py:5013
3215
2642
msgid "Keep tags that point to removed revisions."
3216
2643
msgstr ""
3217
2644
3218
2645
# help of 'local' option of 'uncommit' command
3219
#: bzrlib/builtins.py:5067
2646
#: bzrlib/builtins.py:5015
3220
2647
msgid "Only remove the commits from the local branch when in a checkout."
3221
2648
msgstr ""
3222
2649
3223
#: bzrlib/builtins.py:5116
3224
msgid "No revisions to uncommit.\n"
3225
msgstr ""
3226
3227
#: bzrlib/builtins.py:5131
3228
msgid "Dry-run, pretending to remove the above revisions.\n"
3229
msgstr ""
3230
3231
#: bzrlib/builtins.py:5134
3232
msgid "The above revision(s) will be removed.\n"
3233
msgstr ""
3234
3235
#: bzrlib/builtins.py:5138
3236
msgid "Uncommit these revisions"
3237
msgstr ""
3238
3239
#: bzrlib/builtins.py:5141
3240
msgid "Canceled\n"
3241
msgstr ""
3242
3243
#: bzrlib/builtins.py:5148
3244
#, python-format
3245
msgid ""
3246
"You can restore the old tip by running:\n"
3247
" bzr pull . -r revid:%s\n"
3248
msgstr ""
3249
3250
#: bzrlib/builtins.py:5153
2650
#: bzrlib/builtins.py:5101
3251
2651
msgid "Break a dead lock."
3252
2652
msgstr ""
3253
2653
3254
#: bzrlib/builtins.py:5155
2654
#: bzrlib/builtins.py:5103
3255
2655
msgid ""
3256
2656
"This command breaks a lock on a repository, branch, working directory or\n"
3257
2657
"config file."
3258
2658
msgstr ""
3259
2659
3260
#: bzrlib/builtins.py:5158
2660
#: bzrlib/builtins.py:5106
3261
2661
msgid ""
3262
2662
"CAUTION: Locks should only be broken when you are sure that the process\n"
3263
2663
"holding the lock has been stopped."
3264
2664
msgstr ""
3265
2665
3266
#: bzrlib/builtins.py:5161
2666
#: bzrlib/builtins.py:5109
3267
2667
msgid ""
3268
2668
"You can get information on what locks are open via the 'bzr info\n"
3269
2669
"[location]' command."
3270
2670
msgstr ""
3271
2671
3272
#: bzrlib/builtins.py:5164
2672
#: bzrlib/builtins.py:5112
3273
2673
msgid ""
3274
2674
":Examples:\n"
3275
2675
" bzr break-lock\n"
3278
2678
msgstr ""
3279
2679
3280
2680
# help of 'config' option of 'break-lock' command
3281
#: bzrlib/builtins.py:5173
2681
#: bzrlib/builtins.py:5121
3282
2682
msgid "LOCATION is the directory where the config lock is."
3283
2683
msgstr ""
3284
2684
3285
2685
# help of 'force' option of 'break-lock' command
3286
#: bzrlib/builtins.py:5175
2686
#: bzrlib/builtins.py:5123
3287
2687
msgid "Do not ask for confirmation before breaking the lock."
3288
2688
msgstr ""
3289
2689
3290
#: bzrlib/builtins.py:5211
2690
#: bzrlib/builtins.py:5159
3291
2691
msgid "Run the bzr server."
3292
2692
msgstr ""
3293
2693
3294
2694
# help of 'inet' option of 'serve' command
3295
#: bzrlib/builtins.py:5217
2695
#: bzrlib/builtins.py:5165
3296
2696
msgid "Serve on stdin/out for use from inetd or sshd."
3297
2697
msgstr ""
3298
2698
3299
2699
# title of 'protocol' option of 'serve' command
3300
#: bzrlib/builtins.py:5218
2700
#: bzrlib/builtins.py:5166
3301
2701
msgid "protocol"
3302
2702
msgstr ""
3303
2703
3304
2704
# help of 'protocol' option of 'serve' command
3305
#: bzrlib/builtins.py:5219
2705
#: bzrlib/builtins.py:5167
3306
2706
msgid "Protocol to serve."
3307
2707
msgstr ""
3308
2708
3309
2709
# help of 'port' option of 'serve' command
3310
#: bzrlib/builtins.py:5223
2710
#: bzrlib/builtins.py:5171
3311
2711
msgid ""
3312
2712
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3313
2713
"Passing 0 as the port number will result in a dynamically allocated port. "
3315
2715
msgstr ""
3316
2716
3317
2717
# help of 'directory' option of 'serve' command
3318
#: bzrlib/builtins.py:5229
2718
#: bzrlib/builtins.py:5177
3319
2719
msgid "Serve contents of this directory."
3320
2720
msgstr ""
3321
2721
3322
2722
# help of 'allow-writes' option of 'serve' command
3323
#: bzrlib/builtins.py:5231
2723
#: bzrlib/builtins.py:5179
3324
2724
msgid ""
3325
2725
"By default the server is a readonly server. Supplying --allow-writes "
3326
2726
"enables write access to the contents of the served directory and below. "
3329
2729
"uncontrolled write access to your file system."
3330
2730
msgstr ""
3331
2731
3332
#: bzrlib/builtins.py:5276
2732
#: bzrlib/builtins.py:5224
3333
2733
msgid "Combine a tree into its containing tree."
3334
2734
msgstr ""
3335
2735
3336
#: bzrlib/builtins.py:5278
2736
#: bzrlib/builtins.py:5226
3337
2737
msgid "This command requires the target tree to be in a rich-root format."
3338
2738
msgstr ""
3339
2739
3340
#: bzrlib/builtins.py:5280
2740
#: bzrlib/builtins.py:5228
3341
2741
msgid ""
3342
2742
"The TREE argument should be an independent tree, inside another tree, but\n"
3343
2743
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3344
2744
"running \"bzr branch\" with the target inside a tree.)"
3345
2745
msgstr ""
3346
2746
3347
#: bzrlib/builtins.py:5284
2747
#: bzrlib/builtins.py:5232
3348
2748
msgid ""
3349
2749
"The result is a combined tree, with the subtree no longer an independent\n"
3350
2750
"part. This is marked as a merge of the subtree into the containing tree,\n"
3351
2751
"and all history is preserved."
3352
2752
msgstr ""
3353
2753
3354
#: bzrlib/builtins.py:5302
3355
#, python-format
3356
msgid ""
3357
"Can't join trees because %s doesn't support rich root data.\n"
3358
"You can use bzr upgrade on the repository."
3359
msgstr ""
3360
3361
#: bzrlib/builtins.py:5312 bzrlib/builtins.py:5318
3362
msgid "Cannot join {0}. {1}"
3363
msgstr ""
3364
3365
#: bzrlib/builtins.py:5322
2754
#: bzrlib/builtins.py:5270
3366
2755
msgid "Split a subdirectory of a tree into a separate tree."
3367
2756
msgstr ""
3368
2757
3369
#: bzrlib/builtins.py:5324
2758
#: bzrlib/builtins.py:5272
3370
2759
msgid ""
3371
2760
"This command will produce a target tree in a format that supports\n"
3372
2761
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3373
2762
"converted into earlier formats like 'dirstate-tags'."
3374
2763
msgstr ""
3375
2764
3376
#: bzrlib/builtins.py:5328
2765
#: bzrlib/builtins.py:5276
3377
2766
msgid ""
3378
2767
"The TREE argument should be a subdirectory of a working tree. That\n"
3379
2768
"subdirectory will be converted into an independent tree, with its own\n"
3380
2769
"branch. Commits in the top-level tree will not apply to the new subtree."
3381
2770
msgstr ""
3382
2771
3383
#: bzrlib/builtins.py:5408
3384
msgid "No submit branch specified or known"
3385
msgstr ""
3386
3387
#: bzrlib/builtins.py:5416 bzrlib/send.py:105
3388
msgid "No public branch specified or known"
3389
msgstr ""
3390
3391
#: bzrlib/builtins.py:5421
3392
msgid "bzr merge-directive takes at most two one revision identifiers"
3393
msgstr ""
3394
3395
#: bzrlib/builtins.py:5430
3396
msgid "No revisions to bundle."
3397
msgstr ""
3398
3399
#: bzrlib/builtins.py:5449
2772
#: bzrlib/builtins.py:5397
3400
2773
msgid "Mail or create a merge-directive for submitting changes."
3401
2774
msgstr ""
3402
2775
3403
#: bzrlib/builtins.py:5451
2776
#: bzrlib/builtins.py:5399
3404
2777
msgid "A merge directive provides many things needed for requesting merges:"
3405
2778
msgstr ""
3406
2779
3407
#: bzrlib/builtins.py:5453
2780
#: bzrlib/builtins.py:5401
3408
2781
msgid "* A machine-readable description of the merge to perform"
3409
2782
msgstr ""
3410
2783
3411
#: bzrlib/builtins.py:5455
2784
#: bzrlib/builtins.py:5403
3412
2785
msgid "* An optional patch that is a preview of the changes requested"
3413
2786
msgstr ""
3414
2787
3415
#: bzrlib/builtins.py:5457
2788
#: bzrlib/builtins.py:5405
3416
2789
msgid ""
3417
2790
"* An optional bundle of revision data, so that the changes can be applied\n"
3418
2791
" directly from the merge directive, without retrieving data from a\n"
3419
2792
" branch."
3420
2793
msgstr ""
3421
2794
3422
#: bzrlib/builtins.py:5461
2795
#: bzrlib/builtins.py:5409
3423
2796
msgid ""
3424
2797
"`bzr send` creates a compact data set that, when applied using bzr\n"
3425
2798
"merge, has the same effect as merging from the source branch. "
3426
2799
msgstr ""
3427
2800
3428
#: bzrlib/builtins.py:5464
2801
#: bzrlib/builtins.py:5412
3429
2802
msgid ""
3430
2803
"By default the merge directive is self-contained and can be applied to any\n"
3431
2804
"branch containing submit_branch in its ancestory without needing access to\n"
3432
2805
"the source branch."
3433
2806
msgstr ""
3434
2807
3435
#: bzrlib/builtins.py:5468
2808
#: bzrlib/builtins.py:5416
3436
2809
msgid ""
3437
2810
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3438
2811
"revisions, but only a structured request to merge from the\n"
3441
2814
"included if known, so that people can check it later."
3442
2815
msgstr ""
3443
2816
3444
#: bzrlib/builtins.py:5474
2817
#: bzrlib/builtins.py:5422
3445
2818
msgid ""
3446
2819
"The submit branch defaults to the parent of the source branch, but can be\n"
3447
2820
"overridden. Both submit branch and public branch will be remembered in\n"
3450
2823
"be changed using --from."
3451
2824
msgstr ""
3452
2825
3453
#: bzrlib/builtins.py:5480
2826
#: bzrlib/builtins.py:5428
3454
2827
msgid ""
3455
2828
"Both the submit branch and the public branch follow the usual behavior with\n"
3456
2829
"respect to --remember: If there is no default location set, the first send\n"
3459
2832
"--remember. The value will only be saved if the location can be accessed."
3460
2833
msgstr ""
3461
2834
3462
#: bzrlib/builtins.py:5486
2835
#: bzrlib/builtins.py:5434
3463
2836
msgid ""
3464
2837
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3465
2838
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3467
2840
"in the merge directive."
3468
2841
msgstr ""
3469
2842
3470
#: bzrlib/builtins.py:5491
2843
#: bzrlib/builtins.py:5439
3471
2844
msgid ""
3472
2845
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3473
2846
"given, in which case it is sent to a file."
3474
2847
msgstr ""
3475
2848
3476
#: bzrlib/builtins.py:5494
2849
#: bzrlib/builtins.py:5442
3477
2850
msgid ""
3478
2851
"Mail is sent using your preferred mail program. This should be transparent\n"
3479
2852
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3480
2853
"If the preferred client can't be found (or used), your editor will be used."
3481
2854
msgstr ""
3482
2855
3483
#: bzrlib/builtins.py:5498
2856
#: bzrlib/builtins.py:5446
3484
2857
msgid ""
3485
2858
"To use a specific mail program, set the mail_client configuration option.\n"
3486
2859
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3492
2865
"supported clients."
3493
2866
msgstr ""
3494
2867
3495
#: bzrlib/builtins.py:5505
2868
#: bzrlib/builtins.py:5453
3496
2869
msgid ""
3497
2870
"If mail is being sent, a to address is required. This can be supplied\n"
3498
2871
"either on the commandline, by setting the submit_to configuration\n"
3500
2873
"in the submit branch."
3501
2874
msgstr ""
3502
2875
3503
#: bzrlib/builtins.py:5510
2876
#: bzrlib/builtins.py:5458
3504
2877
msgid ""
3505
2878
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3506
2879
"and\n"
3510
2883
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3511
2884
msgstr ""
3512
2885
3513
#: bzrlib/builtins.py:5516
2886
#: bzrlib/builtins.py:5464
3514
2887
msgid ""
3515
2888
"The merge directives created by bzr send may be applied using bzr merge or\n"
3516
2889
"bzr pull by specifying a file containing a merge directive as the location."
3517
2890
msgstr ""
3518
2891
3519
#: bzrlib/builtins.py:5519
2892
#: bzrlib/builtins.py:5467
3520
2893
msgid ""
3521
2894
"bzr send makes extensive use of public locations to map local locations "
3522
2895
"into\n"
3525
2898
msgstr ""
3526
2899
3527
2900
# help of 'output' option of 'send' command
3528
#: bzrlib/builtins.py:5543
2901
#: bzrlib/builtins.py:5491
3529
2902
msgid "Write merge directive to this file or directory; use - for stdout."
3530
2903
msgstr ""
3531
2904
3532
2905
# help of 'strict' option of 'send' command
3533
#: bzrlib/builtins.py:5547
2906
#: bzrlib/builtins.py:5495
3534
2907
msgid ""
3535
2908
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3536
2909
"strict disables the check."
3537
2910
msgstr ""
3538
2911
3539
2912
# help of 'mail-to' option of 'send' command
3540
#: bzrlib/builtins.py:5549
2913
#: bzrlib/builtins.py:5497
3541
2914
msgid "Mail the request to this address."
3542
2915
msgstr ""
3543
2916
3544
2917
# help of 'body' option of 'send' command
3545
#: bzrlib/builtins.py:5553
2918
#: bzrlib/builtins.py:5501
3546
2919
msgid "Body for the email."
3547
2920
msgstr ""
3548
2921
3549
2922
# help of 'no-bundle' option of 'send' command
3550
#: bzrlib/builtins.py:5606
2923
#: bzrlib/builtins.py:5554
3551
2924
msgid "Do not include a bundle in the merge directive."
3552
2925
msgstr ""
3553
2926
3554
2927
# help of 'no-patch' option of 'send' command
3555
#: bzrlib/builtins.py:5607
2928
#: bzrlib/builtins.py:5555
3556
2929
msgid "Do not include a preview patch in the merge directive."
3557
2930
msgstr ""
3558
2931
3559
2932
# help of 'remember' option of 'send' command
3560
#: bzrlib/builtins.py:5610
2933
#: bzrlib/builtins.py:5558
3561
2934
msgid "Remember submit and public branch."
3562
2935
msgstr ""
3563
2936
3564
2937
# help of 'from' option of 'send' command
3565
#: bzrlib/builtins.py:5612
2938
#: bzrlib/builtins.py:5560
3566
2939
msgid ""
3567
2940
"Branch to generate the submission from, rather than the one containing the "
3568
2941
"working directory."
3569
2942
msgstr ""
3570
2943
3571
2944
# title of 'format' option of 'send' command
3572
#: bzrlib/builtins.py:5622
2945
#: bzrlib/builtins.py:5570
3573
2946
msgid "format"
3574
2947
msgstr ""
3575
2948
3576
2949
# help of 'format' option of 'send' command
3577
#: bzrlib/builtins.py:5623
2950
#: bzrlib/builtins.py:5571
3578
2951
msgid "Use the specified output format."
3579
2952
msgstr ""
3580
2953
3581
#: bzrlib/builtins.py:5645
2954
#: bzrlib/builtins.py:5593
3582
2955
msgid "Create, remove or modify a tag naming a revision."
3583
2956
msgstr ""
3584
2957
3585
#: bzrlib/builtins.py:5647
2958
#: bzrlib/builtins.py:5595
3586
2959
msgid ""
3587
2960
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3588
2961
"(--revision) option can be given -rtag:X, where X is any previously\n"
3589
2962
"created tag."
3590
2963
msgstr ""
3591
2964
3592
#: bzrlib/builtins.py:5651
2965
#: bzrlib/builtins.py:5599
3593
2966
msgid ""
3594
2967
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3595
2968
"along when you branch, push, pull or merge."
3596
2969
msgstr ""
3597
2970
3598
#: bzrlib/builtins.py:5654
2971
#: bzrlib/builtins.py:5602
3599
2972
msgid ""
3600
2973
"It is an error to give a tag name that already exists unless you pass\n"
3601
2974
"--force, in which case the tag is moved to point to the new revision."
3602
2975
msgstr ""
3603
2976
3604
#: bzrlib/builtins.py:5657
2977
#: bzrlib/builtins.py:5605
3605
2978
msgid ""
3606
2979
"To rename a tag (change the name but keep it on the same revsion), run "
3607
2980
"``bzr\n"
3608
2981
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3609
2982
msgstr ""
3610
2983
3611
#: bzrlib/builtins.py:5660
2984
#: bzrlib/builtins.py:5608
3612
2985
msgid ""
3613
2986
"If no tag name is specified it will be determined through the \n"
3614
2987
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3617
2990
msgstr ""
3618
2991
3619
2992
# help of 'delete' option of 'tag' command
3620
#: bzrlib/builtins.py:5670
2993
#: bzrlib/builtins.py:5618
3621
2994
msgid "Delete this tag rather than placing it."
3622
2995
msgstr ""
3623
2996
3624
2997
# help of 'directory' option of 'tag' command
3625
#: bzrlib/builtins.py:5673
2998
#: bzrlib/builtins.py:5621
3626
2999
msgid "Branch in which to place the tag."
3627
3000
msgstr ""
3628
3001
3629
3002
# help of 'force' option of 'tag' command
3630
#: bzrlib/builtins.py:5675
3003
#: bzrlib/builtins.py:5623
3631
3004
msgid "Replace existing tags."
3632
3005
msgstr ""
3633
3006
3634
#: bzrlib/builtins.py:5690
3635
msgid "No tag specified to delete."
3636
msgstr ""
3637
3638
#: bzrlib/builtins.py:5692
3639
#, python-format
3640
msgid "Deleted tag %s."
3641
msgstr ""
3642
3643
#: bzrlib/builtins.py:5697
3644
msgid "Tags can only be placed on a single revision, not on a range"
3645
msgstr ""
3646
3647
#: bzrlib/builtins.py:5706
3648
msgid "Please specify a tag name."
3649
msgstr ""
3650
3651
#: bzrlib/builtins.py:5714
3652
#, python-format
3653
msgid "Tag %s already exists for that revision."
3654
msgstr ""
3655
3656
#: bzrlib/builtins.py:5718
3657
#, python-format
3658
msgid "Created tag %s."
3659
msgstr ""
3660
3661
#: bzrlib/builtins.py:5720
3662
#, python-format
3663
msgid "Updated tag %s."
3664
msgstr ""
3665
3666
#: bzrlib/builtins.py:5724
3007
#: bzrlib/builtins.py:5672
3667
3008
msgid "List tags."
3668
3009
msgstr ""
3669
3010
3670
#: bzrlib/builtins.py:5726
3011
#: bzrlib/builtins.py:5674
3671
3012
msgid ""
3672
3013
"This command shows a table of tag names and the revisions they reference."
3673
3014
msgstr ""
3674
3015
3675
3016
# help of 'directory' option of 'tags' command
3676
#: bzrlib/builtins.py:5732
3017
#: bzrlib/builtins.py:5680
3677
3018
msgid "Branch whose tags should be displayed."
3678
3019
msgstr ""
3679
3020
3680
3021
# help of 'sort' option of 'tags' command
3681
#: bzrlib/builtins.py:5734
3022
#: bzrlib/builtins.py:5682
3682
3023
msgid "Sort tags by different criteria."
3683
3024
msgstr ""
3684
3025
3685
3026
# title of 'sort' option of 'tags' command
3686
#: bzrlib/builtins.py:5734
3027
#: bzrlib/builtins.py:5682
3687
3028
msgid "Sorting"
3688
3029
msgstr ""
3689
3030
3690
#: bzrlib/builtins.py:5779
3031
#: bzrlib/builtins.py:5727
3691
3032
msgid "Reconfigure the type of a bzr directory."
3692
3033
msgstr ""
3693
3034
3694
#: bzrlib/builtins.py:5781
3035
#: bzrlib/builtins.py:5729
3695
3036
msgid "A target configuration must be specified."
3696
3037
msgstr ""
3697
3038
3698
#: bzrlib/builtins.py:5783
3039
#: bzrlib/builtins.py:5731
3699
3040
msgid ""
3700
3041
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3701
3042
"The order of preference is\n"
3706
3047
"If none of these is available, --bind-to must be specified."
3707
3048
msgstr ""
3708
3049
3709
# title of 'tree_type' option of 'reconfigure' command
3710
#: bzrlib/builtins.py:5797
3711
msgid "Tree type"
3712
msgstr ""
3713
3714
# help of 'tree_type' option of 'reconfigure' command
3715
#: bzrlib/builtins.py:5798
3716
msgid "The relation between branch and tree."
3717
msgstr ""
3718
3719
# title of 'repository_type' option of 'reconfigure' command
3720
#: bzrlib/builtins.py:5808
3721
msgid "Repository type"
3722
msgstr ""
3723
3724
# help of 'repository_type' option of 'reconfigure' command
3725
#: bzrlib/builtins.py:5809
3726
msgid "Location fo the repository."
3727
msgstr ""
3728
3729
# title of 'repository_trees' option of 'reconfigure' command
3730
#: bzrlib/builtins.py:5817
3731
msgid "Trees in Repository"
3732
msgstr ""
3733
3734
# help of 'repository_trees' option of 'reconfigure' command
3735
#: bzrlib/builtins.py:5818
3736
msgid "Whether new branches in the repository have trees."
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."
3737
3058
msgstr ""
3738
3059
3739
3060
# help of 'bind-to' option of 'reconfigure' command
3740
#: bzrlib/builtins.py:5825
3061
#: bzrlib/builtins.py:5761
3741
3062
msgid "Branch to bind checkout to."
3742
3063
msgstr ""
3743
3064
3744
3065
# help of 'force' option of 'reconfigure' command
3745
#: bzrlib/builtins.py:5827
3066
#: bzrlib/builtins.py:5763
3746
3067
msgid "Perform reconfiguration even if local changes will be lost."
3747
3068
msgstr ""
3748
3069
3749
3070
# help of 'stacked-on' option of 'reconfigure' command
3750
#: bzrlib/builtins.py:5830
3071
#: bzrlib/builtins.py:5766
3751
3072
msgid "Reconfigure a branch to be stacked on another branch."
3752
3073
msgstr ""
3753
3074
3754
3075
# help of 'unstacked' option of 'reconfigure' command
3755
#: bzrlib/builtins.py:5834
3076
#: bzrlib/builtins.py:5770
3756
3077
msgid ""
3757
3078
"Reconfigure a branch to be unstacked. This may require copying substantial "
3758
3079
"data into it."
3759
3080
msgstr ""
3760
3081
3761
#: bzrlib/builtins.py:5844
3762
msgid "Can't use both --stacked-on and --unstacked"
3763
msgstr ""
3764
3765
#: bzrlib/builtins.py:5858
3766
msgid "No target configuration specified"
3767
msgstr ""
3768
3769
#: bzrlib/builtins.py:5893
3082
#: bzrlib/builtins.py:5818
3770
3083
msgid "Set the branch of a checkout and update."
3771
3084
msgstr ""
3772
3085
3773
#: bzrlib/builtins.py:5895
3086
#: bzrlib/builtins.py:5820
3774
3087
msgid ""
3775
3088
"For lightweight checkouts, this changes the branch being referenced.\n"
3776
3089
"For heavyweight checkouts, this checks that there are no local commits\n"
3778
3091
"of the new location and binds to it."
3779
3092
msgstr ""
3780
3093
3781
#: bzrlib/builtins.py:5900
3094
#: bzrlib/builtins.py:5825
3782
3095
msgid ""
3783
3096
"In both cases, the working tree is updated and uncommitted changes\n"
3784
3097
"are merged. The user can commit or revert these as they desire."
3785
3098
msgstr ""
3786
3099
3787
#: bzrlib/builtins.py:5903
3100
#: bzrlib/builtins.py:5828
3788
3101
msgid "Pending merges need to be committed or reverted before using switch."
3789
3102
msgstr ""
3790
3103
3791
#: bzrlib/builtins.py:5905
3104
#: bzrlib/builtins.py:5830
3792
3105
msgid ""
3793
3106
"The path to the branch to switch to can be specified relative to the parent\n"
3794
3107
"directory of the current branch. For example, if you are currently in a\n"
3796
3109
"/path/to/newbranch."
3797
3110
msgstr ""
3798
3111
3799
#: bzrlib/builtins.py:5910
3112
#: bzrlib/builtins.py:5835
3800
3113
msgid ""
3801
3114
"Bound branches use the nickname of its master branch unless it is set\n"
3802
3115
"locally, in which case switching will update the local nickname to be\n"
3804
3117
msgstr ""
3805
3118
3806
3119
# help of 'force' option of 'switch' command
3807
#: bzrlib/builtins.py:5918
3120
#: bzrlib/builtins.py:5843
3808
3121
msgid "Switch even if local commits will be lost."
3809
3122
msgstr ""
3810
3123
3811
3124
# help of 'create-branch' option of 'switch' command
3812
#: bzrlib/builtins.py:5921
3125
#: bzrlib/builtins.py:5846
3813
3126
msgid "Create the target branch from this one before switching to it."
3814
3127
msgstr ""
3815
3128
3816
#: bzrlib/builtins.py:5933
3817
msgid "You must supply either a revision or a location"
3818
msgstr ""
3819
3820
#: bzrlib/builtins.py:5944
3821
msgid "cannot create branch without source branch"
3822
msgstr ""
3823
3824
#: bzrlib/builtins.py:5990
3129
#: bzrlib/builtins.py:5915
3825
3130
msgid "Manage filtered views."
3826
3131
msgstr ""
3827
3132
3828
#: bzrlib/builtins.py:5992
3133
#: bzrlib/builtins.py:5917
3829
3134
msgid ""
3830
3135
"Views provide a mask over the tree so that users can focus on\n"
3831
3136
"a subset of a tree when doing their work. After creating a view,\n"
3835
3140
"must be within the current view."
3836
3141
msgstr ""
3837
3142
3838
#: bzrlib/builtins.py:5999
3143
#: bzrlib/builtins.py:5924
3839
3144
msgid ""
3840
3145
"In most cases, a view has a short life-span: it is created to make\n"
3841
3146
"a selected change and is deleted once that change is committed.\n"
3843
3148
"and switch between them."
3844
3149
msgstr ""
3845
3150
3846
#: bzrlib/builtins.py:6004
3151
#: bzrlib/builtins.py:5929
3847
3152
msgid ""
3848
3153
"To disable the current view without deleting it, you can switch to\n"
3849
3154
"the pseudo view called ``off``. This can be useful when you need\n"
3851
3156
"want to switch back to your view after that."
3852
3157
msgstr ""
3853
3158
3854
#: bzrlib/builtins.py:6009
3159
#: bzrlib/builtins.py:5934
3855
3160
msgid ""
3856
3161
":Examples:\n"
3857
3162
" To define the current view::"
3858
3163
msgstr ""
3859
3164
3860
#: bzrlib/builtins.py:6012
3165
#: bzrlib/builtins.py:5937
3861
3166
msgid " bzr view file1 dir1 ..."
3862
3167
msgstr ""
3863
3168
3864
#: bzrlib/builtins.py:6014
3169
#: bzrlib/builtins.py:5939
3865
3170
msgid " To list the current view::"
3866
3171
msgstr ""
3867
3172
3868
#: bzrlib/builtins.py:6016
3173
#: bzrlib/builtins.py:5941
3869
3174
msgid " bzr view"
3870
3175
msgstr ""
3871
3176
3872
#: bzrlib/builtins.py:6018
3177
#: bzrlib/builtins.py:5943
3873
3178
msgid " To delete the current view::"
3874
3179
msgstr ""
3875
3180
3876
#: bzrlib/builtins.py:6020
3181
#: bzrlib/builtins.py:5945
3877
3182
msgid " bzr view --delete"
3878
3183
msgstr ""
3879
3184
3880
#: bzrlib/builtins.py:6022
3185
#: bzrlib/builtins.py:5947
3881
3186
msgid " To disable the current view without deleting it::"
3882
3187
msgstr ""
3883
3188
3884
#: bzrlib/builtins.py:6024
3189
#: bzrlib/builtins.py:5949
3885
3190
msgid " bzr view --switch off"
3886
3191
msgstr ""
3887
3192
3888
#: bzrlib/builtins.py:6026
3193
#: bzrlib/builtins.py:5951
3889
3194
msgid " To define a named view and switch to it::"
3890
3195
msgstr ""
3891
3196
3892
#: bzrlib/builtins.py:6028
3197
#: bzrlib/builtins.py:5953
3893
3198
msgid " bzr view --name view-name file1 dir1 ..."
3894
3199
msgstr ""
3895
3200
3896
#: bzrlib/builtins.py:6030
3201
#: bzrlib/builtins.py:5955
3897
3202
msgid " To list a named view::"
3898
3203
msgstr ""
3899
3204
3900
#: bzrlib/builtins.py:6032
3205
#: bzrlib/builtins.py:5957
3901
3206
msgid " bzr view --name view-name"
3902
3207
msgstr ""
3903
3208
3904
#: bzrlib/builtins.py:6034
3209
#: bzrlib/builtins.py:5959
3905
3210
msgid " To delete a named view::"
3906
3211
msgstr ""
3907
3212
3908
#: bzrlib/builtins.py:6036
3213
#: bzrlib/builtins.py:5961
3909
3214
msgid " bzr view --name view-name --delete"
3910
3215
msgstr ""
3911
3216
3912
#: bzrlib/builtins.py:6038
3217
#: bzrlib/builtins.py:5963
3913
3218
msgid " To switch to a named view::"
3914
3219
msgstr ""
3915
3220
3916
#: bzrlib/builtins.py:6040
3221
#: bzrlib/builtins.py:5965
3917
3222
msgid " bzr view --switch view-name"
3918
3223
msgstr ""
3919
3224
3920
#: bzrlib/builtins.py:6042
3225
#: bzrlib/builtins.py:5967
3921
3226
msgid " To list all views defined::"
3922
3227
msgstr ""
3923
3228
3924
#: bzrlib/builtins.py:6044
3229
#: bzrlib/builtins.py:5969
3925
3230
msgid " bzr view --all"
3926
3231
msgstr ""
3927
3232
3928
#: bzrlib/builtins.py:6046
3233
#: bzrlib/builtins.py:5971
3929
3234
msgid " To delete all views::"
3930
3235
msgstr ""
3931
3236
3932
#: bzrlib/builtins.py:6048
3237
#: bzrlib/builtins.py:5973
3933
3238
msgid " bzr view --delete --all"
3934
3239
msgstr ""
3935
3240
3936
3241
# help of 'all' option of 'view' command
3937
#: bzrlib/builtins.py:6055
3242
#: bzrlib/builtins.py:5980
3938
3243
msgid "Apply list or delete action to all views."
3939
3244
msgstr ""
3940
3245
3941
3246
# help of 'delete' option of 'view' command
3942
#: bzrlib/builtins.py:6058
3247
#: bzrlib/builtins.py:5983
3943
3248
msgid "Delete the view."
3944
3249
msgstr ""
3945
3250
3946
3251
# help of 'name' option of 'view' command
3947
#: bzrlib/builtins.py:6061
3252
#: bzrlib/builtins.py:5986
3948
3253
msgid "Name of the view to define, list or delete."
3949
3254
msgstr ""
3950
3255
3951
3256
# help of 'switch' option of 'view' command
3952
#: bzrlib/builtins.py:6065
3257
#: bzrlib/builtins.py:5990
3953
3258
msgid "Name of the view to switch to."
3954
3259
msgstr ""
3955
3260
3956
#: bzrlib/builtins.py:6084
3957
msgid "Both --delete and a file list specified"
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:6087
3961
msgid "Both --delete and --switch specified"
3962
msgstr ""
3963
3964
3261
#: bzrlib/builtins.py:6090
3965
msgid "Deleted all views.\n"
3262
msgid "Remove a branch."
3966
3263
msgstr ""
3967
3264
3968
3265
#: bzrlib/builtins.py:6092
3969
msgid "No current view to delete"
3970
msgstr ""
3971
3972
#: bzrlib/builtins.py:6095
3973
#, python-format
3974
msgid "Deleted '%s' view.\n"
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:6099
3978
msgid "Both --switch and a file list specified"
3979
msgstr ""
3980
3981
#: bzrlib/builtins.py:6102
3982
msgid "Both --switch and --all specified"
3983
msgstr ""
3984
3985
#: bzrlib/builtins.py:6105
3986
msgid "No current view to disable"
3987
msgstr ""
3988
3989
#: bzrlib/builtins.py:6107
3990
#, python-format
3991
msgid "Disabled '%s' view.\n"
3992
msgstr ""
3993
3994
#: bzrlib/builtins.py:6111 bzrlib/builtins.py:6133
3995
msgid "Using '{0}' view: {1}\n"
3996
msgstr ""
3997
3998
#: bzrlib/builtins.py:6114
3999
msgid "Views defined:\n"
4000
msgstr ""
4001
4002
#: bzrlib/builtins.py:6123
4003
msgid "No views defined.\n"
4004
msgstr ""
4005
4006
#: bzrlib/builtins.py:6130
4007
msgid "Cannot change the 'off' pseudo view"
4008
msgstr ""
4009
4010
#: bzrlib/builtins.py:6138
4011
msgid "No current view.\n"
4012
msgstr ""
4013
4014
#: bzrlib/builtins.py:6141
4015
msgid "'{0}' view is: {1}\n"
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:6161
4019
msgid " <no hooks installed>\n"
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:6165
4023
msgid "Remove a branch."
4024
msgstr ""
4025
4026
#: bzrlib/builtins.py:6167
4027
3266
msgid ""
4028
3267
"This will remove the branch from the specified location but \n"
4029
3268
"will keep any working tree or repository in place."
4030
3269
msgstr ""
4031
3270
4032
#: bzrlib/builtins.py:6172
3271
#: bzrlib/builtins.py:6097
4033
3272
msgid " Remove the branch at repo/trunk::"
4034
3273
msgstr ""
4035
3274
4036
#: bzrlib/builtins.py:6174
3275
#: bzrlib/builtins.py:6099
4037
3276
msgid " bzr remove-branch repo/trunk"
4038
3277
msgstr ""
4039
3278
4040
#: bzrlib/builtins.py:6190
3279
#: bzrlib/builtins.py:6115
4041
3280
msgid "Temporarily set aside some changes from the current tree."
4042
3281
msgstr ""
4043
3282
4044
#: bzrlib/builtins.py:6192
3283
#: bzrlib/builtins.py:6117
4045
3284
msgid ""
4046
3285
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4047
3286
"ie. out of the way, until a later time when you can bring them back from\n"
4050
3289
"will they survive its deletion."
4051
3290
msgstr ""
4052
3291
4053
#: bzrlib/builtins.py:6198
3292
#: bzrlib/builtins.py:6123
4054
3293
msgid "If shelve --list is specified, previously-shelved changes are listed."
4055
3294
msgstr ""
4056
3295
4057
#: bzrlib/builtins.py:6200
3296
#: bzrlib/builtins.py:6125
4058
3297
msgid ""
4059
3298
"Shelve is intended to help separate several sets of changes that have\n"
4060
3299
"been inappropriately mingled. If you just want to get rid of all changes\n"
4062
3301
"shelve all text changes at once, use shelve --all."
4063
3302
msgstr ""
4064
3303
4065
#: bzrlib/builtins.py:6205
3304
#: bzrlib/builtins.py:6130
4066
3305
msgid ""
4067
3306
"If filenames are specified, only the changes to those files will be\n"
4068
3307
"shelved. Other files will be left untouched."
4069
3308
msgstr ""
4070
3309
4071
#: bzrlib/builtins.py:6208
3310
#: bzrlib/builtins.py:6133
4072
3311
msgid ""
4073
3312
"If a revision is specified, changes since that revision will be shelved."
4074
3313
msgstr ""
4075
3314
4076
#: bzrlib/builtins.py:6210
3315
#: bzrlib/builtins.py:6135
4077
3316
msgid ""
4078
3317
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4079
3318
"restore the most recently shelved changes."
4080
3319
msgstr ""
4081
3320
4082
#: bzrlib/builtins.py:6213
3321
#: bzrlib/builtins.py:6138
4083
3322
msgid ""
4084
3323
"For complicated changes, it is possible to edit the changes in a separate\n"
4085
3324
"editor program to decide what the file remaining in the working copy\n"
4086
3325
"should look like. To do this, add the configuration option"
4087
3326
msgstr ""
4088
3327
4089
#: bzrlib/builtins.py:6217
3328
#: bzrlib/builtins.py:6142
4090
3329
msgid " change_editor = PROGRAM @new_path @old_path"
4091
3330
msgstr ""
4092
3331
4093
#: bzrlib/builtins.py:6219
3332
#: bzrlib/builtins.py:6144
4094
3333
msgid ""
4095
3334
"where @new_path is replaced with the path of the new version of the \n"
4096
3335
"file and @old_path is replaced with the path of the old version of \n"
4100
3339
msgstr ""
4101
3340
4102
3341
# help of 'all' option of 'shelve' command
4103
#: bzrlib/builtins.py:6231
3342
#: bzrlib/builtins.py:6156
4104
3343
msgid "Shelve all changes."
4105
3344
msgstr ""
4106
3345
4107
3346
# help of 'writer' option of 'shelve' command
4108
#: bzrlib/builtins.py:6233
3347
#: bzrlib/builtins.py:6158
4109
3348
msgid "Method to use for writing diffs."
4110
3349
msgstr ""
4111
3350
4112
3351
# title of 'writer' option of 'shelve' command
4113
#: bzrlib/builtins.py:6233
3352
#: bzrlib/builtins.py:6158
4114
3353
msgid "writer"
4115
3354
msgstr ""
4116
3355
4117
3356
# help of 'list' option of 'shelve' command
4118
#: bzrlib/builtins.py:6237
3357
#: bzrlib/builtins.py:6162
4119
3358
msgid "List shelved changes."
4120
3359
msgstr ""
4121
3360
4122
3361
# help of 'destroy' option of 'shelve' command
4123
#: bzrlib/builtins.py:6239
3362
#: bzrlib/builtins.py:6164
4124
3363
msgid "Destroy removed changes instead of shelving them."
4125
3364
msgstr ""
4126
3365
4127
#: bzrlib/builtins.py:6268
4128
msgid "No shelved changes."
4129
msgstr ""
4130
4131
#: bzrlib/builtins.py:6279
3366
#: bzrlib/builtins.py:6204
4132
3367
msgid "Restore shelved changes."
4133
3368
msgstr ""
4134
3369
4135
#: bzrlib/builtins.py:6281
3370
#: bzrlib/builtins.py:6206
4136
3371
msgid ""
4137
3372
"By default, the most recently shelved changes are restored. However if you\n"
4138
3373
"specify a shelf by id those changes will be restored instead. This works\n"
4140
3375
msgstr ""
4141
3376
4142
3377
# help of 'action' option of 'unshelve' command
4143
#: bzrlib/builtins.py:6290
3378
#: bzrlib/builtins.py:6215
4144
3379
msgid "The action to perform."
4145
3380
msgstr ""
4146
3381
4147
#: bzrlib/builtins.py:6312
3382
#: bzrlib/builtins.py:6237
4148
3383
msgid "Remove unwanted files from working tree."
4149
3384
msgstr ""
4150
3385
4151
#: bzrlib/builtins.py:6314
3386
#: bzrlib/builtins.py:6239
4152
3387
msgid ""
4153
3388
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4154
3389
"files are never deleted."
4155
3390
msgstr ""
4156
3391
4157
#: bzrlib/builtins.py:6317
3392
#: bzrlib/builtins.py:6242
4158
3393
msgid ""
4159
3394
"Another class is 'detritus', which includes files emitted by bzr during\n"
4160
3395
"normal operations and selftests. (The value of these files decreases with\n"
4161
3396
"time.)"
4162
3397
msgstr ""
4163
3398
4164
#: bzrlib/builtins.py:6321
3399
#: bzrlib/builtins.py:6246
4165
3400
msgid ""
4166
3401
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4167
3402
"flags are respected, and may be combined."
4168
3403
msgstr ""
4169
3404
4170
#: bzrlib/builtins.py:6324
3405
#: bzrlib/builtins.py:6249
4171
3406
msgid "To check what clean-tree will do, use --dry-run."
4172
3407
msgstr ""
4173
3408
4174
3409
# help of 'ignored' option of 'clean-tree' command
4175
#: bzrlib/builtins.py:6327
3410
#: bzrlib/builtins.py:6252
4176
3411
msgid "Delete all ignored files."
4177
3412
msgstr ""
4178
3413
4179
3414
# help of 'detritus' option of 'clean-tree' command
4180
#: bzrlib/builtins.py:6328
3415
#: bzrlib/builtins.py:6253
4181
3416
msgid ""
4182
3417
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4183
3418
msgstr ""
4184
3419
4185
3420
# help of 'unknown' option of 'clean-tree' command
4186
#: bzrlib/builtins.py:6331
3421
#: bzrlib/builtins.py:6256
4187
3422
msgid "Delete files unknown to bzr (default)."
4188
3423
msgstr ""
4189
3424
4190
3425
# help of 'dry-run' option of 'clean-tree' command
4191
#: bzrlib/builtins.py:6332
3426
#: bzrlib/builtins.py:6257
4192
3427
msgid "Show files to delete instead of deleting them."
4193
3428
msgstr ""
4194
3429
4195
3430
# help of 'force' option of 'clean-tree' command
4196
#: bzrlib/builtins.py:6334
3431
#: bzrlib/builtins.py:6259
4197
3432
msgid "Do not prompt before deleting."
4198
3433
msgstr ""
4199
3434
4200
#: bzrlib/bundle/__init__.py:57
4201
msgid "A directory cannot be a bundle"
4202
msgstr ""
4203
4204
#: bzrlib/bundle/serializer/v4.py:326
4205
#, python-format
4206
msgid "Bundling %d revision."
4207
msgid_plural "Bundling %d revisions."
4208
msgstr[0] ""
4209
msgstr[1] ""
4210
4211
#: bzrlib/bzrdir.py:636
4212
msgid ""
4213
"making backup of {0}\n"
4214
" to {1}"
4215
msgstr ""
4216
4217
#: bzrlib/bzrdir.py:659
4218
msgid "renamed {0} to {1}"
4219
msgstr ""
4220
4221
#: bzrlib/bzrdir.py:851
4222
msgid "{0} is{1} redirected to {2}"
4223
msgstr ""
4224
4225
#: bzrlib/bzrdir.py:1727
4226
#, python-format
4227
msgid ""
4228
"Source repository format does not support stacking, using format:\n"
4229
" %s"
4230
msgstr ""
4231
4232
#: bzrlib/bzrdir.py:1747
4233
#, python-format
4234
msgid ""
4235
"Source branch format does not support stacking, using format:\n"
4236
" %s"
4237
msgstr ""
4238
4239
#: bzrlib/bzrdir.py:1858
4240
msgid "starting repository conversion"
4241
msgstr ""
4242
4243
#: bzrlib/check.py:106
4244
msgid "check"
4245
msgstr ""
4246
4247
#: bzrlib/check.py:108
4248
msgid "checking revisions"
4249
msgstr ""
4250
4251
#: bzrlib/check.py:110
4252
msgid "checking commit contents"
4253
msgstr ""
4254
4255
#: bzrlib/check.py:112
4256
msgid "checking file graphs"
4257
msgstr ""
4258
4259
#: bzrlib/check.py:116
4260
msgid "checking branches and trees"
4261
msgstr ""
4262
4263
#: bzrlib/check.py:203
4264
msgid "checked repository {0} format {1}"
4265
msgstr ""
4266
4267
#: bzrlib/check.py:206
4268
#, python-format
4269
msgid "%6d revisions"
4270
msgstr ""
4271
4272
#: bzrlib/check.py:207
4273
#, python-format
4274
msgid "%6d file-ids"
4275
msgstr ""
4276
4277
#: bzrlib/check.py:209
4278
#, python-format
4279
msgid "%6d unreferenced text versions"
4280
msgstr ""
4281
4282
#: bzrlib/check.py:213
4283
msgid "unreferenced version: {{{0}}} in {1}"
4284
msgstr ""
4285
4286
#: bzrlib/check.py:216
4287
#, python-format
4288
msgid "%6d revisions are missing inventory_sha1"
4289
msgstr ""
4290
4291
#: bzrlib/check.py:219
4292
#, python-format
4293
msgid "%6d revisions are mentioned but not present"
4294
msgstr ""
4295
4296
#: bzrlib/check.py:222
4297
#, python-format
4298
msgid "%6d ghost revisions"
4299
msgstr ""
4300
4301
#: bzrlib/check.py:227
4302
#, python-format
4303
msgid "%6d revisions missing parents in ancestry"
4304
msgstr ""
4305
4306
#: bzrlib/check.py:231
4307
#, python-format
4308
msgid " %s should be in the ancestry for:"
4309
msgstr ""
4310
4311
#: bzrlib/check.py:235
4312
#, python-format
4313
msgid "%6d inconsistent parents"
4314
msgstr ""
4315
4316
#: bzrlib/check.py:239
4317
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4318
msgstr ""
4319
4320
#: bzrlib/check.py:245
4321
#, python-format
4322
msgid "%6d revisions have incorrect parents in the revision index"
4323
msgstr ""
4324
4325
#: bzrlib/check.py:251
4326
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4327
msgstr ""
4328
4329
#: bzrlib/check.py:265
4330
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4331
msgstr ""
4332
4333
#: bzrlib/check.py:294
4334
msgid ""
4335
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4336
"{{{4}}}"
4337
msgstr ""
4338
4339
#: bzrlib/check.py:352
4340
#, python-format
4341
msgid "Checking branch at '%s'."
4342
msgstr ""
4343
4344
#: bzrlib/check.py:372
4345
#, python-format
4346
msgid "Checking working tree at '%s'."
4347
msgstr ""
4348
4349
#: bzrlib/check.py:425 bzrlib/check.py:439
4350
msgid "No branch found at specified location."
4351
msgstr ""
4352
4353
#: bzrlib/check.py:427 bzrlib/check.py:437
4354
msgid "No working tree found at specified location."
4355
msgstr ""
4356
4357
#: bzrlib/check.py:430
4358
#, python-format
4359
msgid "Checking repository at '%s'."
4360
msgstr ""
4361
4362
#: bzrlib/check.py:441
4363
msgid "No repository found at specified location."
4364
msgstr ""
4365
4366
#: bzrlib/clean_tree.py:62
4367
msgid "Nothing to delete."
4368
msgstr ""
4369
4370
#: bzrlib/clean_tree.py:108
4371
#, python-format
4372
msgid "unable to remove %s"
4373
msgstr ""
4374
4375
#: bzrlib/clean_tree.py:112
4376
msgid "deleting paths:"
4377
msgstr ""
4378
4379
#: bzrlib/clean_tree.py:126
4380
msgid "unable to remove \"{0}\": {1}."
4381
msgstr ""
4382
4383
#: bzrlib/clean_tree.py:131
4384
msgid "No files deleted."
4385
msgstr ""
4386
4387
#: bzrlib/cmd_version_info.py:45
4388
msgid "No known version info format {0}. Supported types are: {1}"
4389
msgstr ""
4390
4391
#: bzrlib/cmd_version_info.py:51
3435
#: bzrlib/cmd_version_info.py:50
4392
3436
msgid "Show version information about this tree."
4393
3437
msgstr ""
4394
3438
4395
#: bzrlib/cmd_version_info.py:53
3439
#: bzrlib/cmd_version_info.py:52
4396
3440
msgid ""
4397
3441
"You can use this command to add information about version into\n"
4398
3442
"source code of an application. The output can be in one of the\n"
4399
3443
"supported formats or in a custom format based on a template."
4400
3444
msgstr ""
4401
3445
4402
#: bzrlib/cmd_version_info.py:57
3446
#: bzrlib/cmd_version_info.py:56
4403
3447
msgid "For example::"
4404
3448
msgstr ""
4405
3449
4406
#: bzrlib/cmd_version_info.py:59
3450
#: bzrlib/cmd_version_info.py:58
4407
3451
msgid ""
4408
3452
" bzr version-info --custom \\\n"
4409
3453
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4410
3454
msgstr ""
4411
3455
4412
#: bzrlib/cmd_version_info.py:62
3456
#: bzrlib/cmd_version_info.py:61
4413
3457
msgid ""
4414
3458
"will produce a C header file with formatted string containing the\n"
4415
3459
"current revision number. Other supported variables in templates are:"
4416
3460
msgstr ""
4417
3461
4418
#: bzrlib/cmd_version_info.py:65
3462
#: bzrlib/cmd_version_info.py:64
4419
3463
msgid ""
4420
3464
" * {date} - date of the last revision\n"
4421
3465
" * {build_date} - current date\n"
4427
3471
msgstr ""
4428
3472
4429
3473
# help of 'format' option of 'version-info' command
4430
#: bzrlib/cmd_version_info.py:75
3474
#: bzrlib/cmd_version_info.py:74
4431
3475
msgid "Select the output format."
4432
3476
msgstr ""
4433
3477
4434
3478
# help of 'all' option of 'version-info' command
4435
#: bzrlib/cmd_version_info.py:79
3479
#: bzrlib/cmd_version_info.py:78
4436
3480
msgid "Include all possible information."
4437
3481
msgstr ""
4438
3482
4439
3483
# help of 'check-clean' option of 'version-info' command
4440
#: bzrlib/cmd_version_info.py:80
3484
#: bzrlib/cmd_version_info.py:79
4441
3485
msgid "Check if tree is clean."
4442
3486
msgstr ""
4443
3487
4444
3488
# help of 'include-history' option of 'version-info' command
4445
#: bzrlib/cmd_version_info.py:82
3489
#: bzrlib/cmd_version_info.py:81
4446
3490
msgid "Include the revision-history."
4447
3491
msgstr ""
4448
3492
4449
3493
# help of 'include-file-revisions' option of 'version-info' command
4450
#: bzrlib/cmd_version_info.py:84
3494
#: bzrlib/cmd_version_info.py:83
4451
3495
msgid "Include the last revision for each file."
4452
3496
msgstr ""
4453
3497
4454
3498
# help of 'template' option of 'version-info' command
4455
#: bzrlib/cmd_version_info.py:85
3499
#: bzrlib/cmd_version_info.py:84
4456
3500
msgid "Template for the output."
4457
3501
msgstr ""
4458
3502
4459
#: bzrlib/commands.py:232
4460
#, python-format
4461
msgid "unknown command \"%s\""
4462
msgstr ""
4463
4464
3503
#: bzrlib/commands.py:479
4465
3504
msgid "No help for this command."
4466
3505
msgstr ""
4512
3551
msgstr ""
4513
3552
4514
3553
#: bzrlib/commands.py:557
4515
msgid ":doc:`{0} <{1}-help>`"
3554
#, python-format
3555
msgid ":doc:`%s <%s-help>`"
4516
3556
msgstr ""
4517
3557
4518
#: bzrlib/commands.py:561
3558
#: bzrlib/commands.py:560
4519
3559
#, python-format
4520
3560
msgid ":See also: %s"
4521
3561
msgstr ""
4522
3562
4523
#: bzrlib/commands.py:819 bzrlib/gpg.py:317
4524
msgid "Only ASCII permitted in option names"
4525
msgstr ""
4526
4527
#: bzrlib/commands.py:844 bzrlib/commands.py:852
4528
msgid "command {0!r} needs one or more {1}"
4529
msgstr ""
4530
4531
#: bzrlib/commands.py:861
4532
msgid "command {0!r} requires argument {1}"
4533
msgstr ""
4534
4535
#: bzrlib/commands.py:868
4536
msgid "extra argument to command {0}: {1}"
4537
msgstr ""
4538
4539
#: bzrlib/commands.py:965
4540
#, python-format
4541
msgid "Profile data written to \"%s\"."
4542
msgstr ""
4543
4544
#: bzrlib/commit.py:116 bzrlib/commit.py:709
4545
msgid "added"
4546
msgstr ""
4547
4548
#: bzrlib/commit.py:116 bzrlib/commit.py:717
4549
msgid "modified"
4550
msgstr ""
4551
4552
#: bzrlib/commit.py:130
4553
#, python-format
4554
msgid "Committing%s"
4555
msgstr ""
4556
4557
#: bzrlib/commit.py:133
4558
#, python-format
4559
msgid "Committed revision %d."
4560
msgstr ""
4561
4562
#: bzrlib/commit.py:142
4563
#, python-format
4564
msgid "deleted %s"
4565
msgstr ""
4566
4567
#: bzrlib/commit.py:145
4568
#, python-format
4569
msgid "missing %s"
4570
msgstr ""
4571
4572
#: bzrlib/commit.py:471
4573
msgid ""
4574
"Conflicting tags in bound branch:\n"
4575
"{0}"
4576
msgstr ""
4577
4578
#: bzrlib/commit.py:711
4579
msgid "renamed"
4580
msgstr ""
4581
4582
#: bzrlib/commit.py:946
4583
msgid "unchanged"
4584
msgstr ""
4585
4586
#: bzrlib/commit.py:968
4587
msgid "{0} [{1}] - Stage"
4588
msgstr ""
4589
4590
#: bzrlib/commit.py:971
4591
#, python-format
4592
msgid "%s - Stage"
4593
msgstr ""
4594
4595
3563
#: bzrlib/commit_signature_commands.py:34
4596
3564
msgid "Sign all commits by a given committer."
4597
3565
msgstr ""
4627
3595
"verification."
4628
3596
msgstr ""
4629
3597
4630
#: bzrlib/commit_signature_commands.py:145
4631
msgid "Cannot verify a range of non-revision-history revisions"
4632
msgstr ""
4633
4634
3598
#: bzrlib/commit_signature_commands.py:166
4635
3599
msgid "All commits signed with verifiable keys"
4636
3600
msgstr ""
4637
3601
4638
#: bzrlib/config.py:448
4639
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4640
msgstr ""
4641
4642
#: bzrlib/config.py:3293
3602
#: bzrlib/config.py:3277
4643
3603
msgid "Display, set or remove a configuration option."
4644
3604
msgstr ""
4645
3605
4646
#: bzrlib/config.py:3295
3606
#: bzrlib/config.py:3279
4647
3607
msgid "Display the active value for a given option."
4648
3608
msgstr ""
4649
3609
4650
#: bzrlib/config.py:3297
3610
#: bzrlib/config.py:3281
4651
3611
msgid ""
4652
3612
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4653
3613
"matching options are displayed mentioning their scope. The active value\n"
4654
3614
"that bzr will take into account is the first one displayed for each option."
4655
3615
msgstr ""
4656
3616
4657
#: bzrlib/config.py:3301
3617
#: bzrlib/config.py:3285
4658
3618
msgid "If no NAME is given, --all .* is implied."
4659
3619
msgstr ""
4660
3620
4661
#: bzrlib/config.py:3303
3621
#: bzrlib/config.py:3287
4662
3622
msgid ""
4663
3623
"Setting a value is achieved by using name=value without spaces. The value\n"
4664
3624
"is set in the most relevant scope and can be checked by displaying the\n"
4666
3626
msgstr ""
4667
3627
4668
3628
# help of 'scope' option of 'config' command
4669
#: bzrlib/config.py:3314
3629
#: bzrlib/config.py:3298
4670
3630
msgid "Reduce the scope to the specified configuration file"
4671
3631
msgstr ""
4672
3632
4673
3633
# help of 'all' option of 'config' command
4674
#: bzrlib/config.py:3318
3634
#: bzrlib/config.py:3302
4675
3635
msgid "Display all the defined values for the matching options."
4676
3636
msgstr ""
4677
3637
4678
3638
# help of 'remove' option of 'config' command
4679
#: bzrlib/config.py:3320
3639
#: bzrlib/config.py:3304
4680
3640
msgid "Remove the option from the configuration file"
4681
3641
msgstr ""
4682
3642
4683
#: bzrlib/conflicts.py:48
3643
#: bzrlib/conflicts.py:47
4684
3644
msgid "List files with conflicts."
4685
3645
msgstr ""
4686
3646
4687
#: bzrlib/conflicts.py:50
3647
#: bzrlib/conflicts.py:49
4688
3648
msgid ""
4689
3649
"Merge will do its best to combine the changes in two branches, but there\n"
4690
3650
"are some kinds of problems only a human can fix. When it encounters those,\n"
4692
3652
"before you should commit."
4693
3653
msgstr ""
4694
3654
4695
#: bzrlib/conflicts.py:55
3655
#: bzrlib/conflicts.py:54
4696
3656
msgid ""
4697
3657
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4698
3658
"is supplied, the pathnames of files with text conflicts are listed,\n"
4699
3659
"instead. (This is useful for editing all files with text conflicts.)"
4700
3660
msgstr ""
4701
3661
4702
#: bzrlib/conflicts.py:59
3662
#: bzrlib/conflicts.py:58
4703
3663
msgid "Use bzr resolve when you have fixed a problem."
4704
3664
msgstr ""
4705
3665
4706
3666
# help of 'text' option of 'conflicts' command
4707
#: bzrlib/conflicts.py:64
3667
#: bzrlib/conflicts.py:63
4708
3668
msgid "List paths of files with text conflicts."
4709
3669
msgstr ""
4710
3670
4711
3671
# help of 'action' option of 'resolve' command
4712
#: bzrlib/conflicts.py:96
3672
#: bzrlib/conflicts.py:95
4713
3673
msgid "How to resolve the conflict."
4714
3674
msgstr ""
4715
3675
4716
#: bzrlib/conflicts.py:102
3676
#: bzrlib/conflicts.py:101
4717
3677
msgid "Mark a conflict as resolved."
4718
3678
msgstr ""
4719
3679
4720
#: bzrlib/conflicts.py:109
3680
#: bzrlib/conflicts.py:108
4721
3681
msgid ""
4722
3682
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4723
3683
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4726
3686
msgstr ""
4727
3687
4728
3688
# help of 'all' option of 'resolve' command
4729
#: bzrlib/conflicts.py:117
3689
#: bzrlib/conflicts.py:116
4730
3690
msgid "Resolve all conflicts in this tree."
4731
3691
msgstr ""
4732
3692
4733
#: bzrlib/conflicts.py:124
4734
msgid "If --all is specified, no FILE may be provided"
4735
msgstr ""
4736
4737
#: bzrlib/conflicts.py:149
4738
#, python-format
4739
msgid "%d conflict auto-resolved."
4740
msgid_plural "%d conflicts auto-resolved."
4741
msgstr[0] ""
4742
msgstr[1] ""
4743
4744
#: bzrlib/conflicts.py:152
4745
msgid "Remaining conflicts:"
4746
msgstr ""
4747
4748
#: bzrlib/conflicts.py:157
4749
msgid "All conflicts resolved."
4750
msgstr ""
4751
4752
#: bzrlib/conflicts.py:166
4753
msgid "{0} conflict resolved, {1} remaining"
4754
msgid_plural "{0} conflicts resolved, {1} remaining"
4755
msgstr[0] ""
4756
msgstr[1] ""
4757
4758
3693
# title of 'action' option of 'resolve' command
4759
#: bzrlib/conflicts.py:692
3694
#: bzrlib/conflicts.py:688
4760
3695
msgid "action"
4761
3696
msgstr ""
4762
3697
4763
#: bzrlib/diff.py:397
4764
#, python-format
4765
msgid "*** Ignoring files outside view. View is %s"
4766
msgstr ""
4767
4768
3698
#: bzrlib/errors.py:215
4769
3699
msgid "The tree builder is already building a tree."
4770
3700
msgstr ""
5969
4899
"%(arguments)s."
5970
4900
msgstr ""
5971
4901
5972
#: bzrlib/export_pot.py:123 bzrlib/export_pot.py:129
5973
#, python-format
5974
msgid "%r is not found in bzrlib/option.py"
5975
msgstr ""
5976
5977
#: bzrlib/export_pot.py:185
5978
#, python-format
5979
msgid "Exporting messages from builtin command: %s"
5980
msgstr ""
5981
5982
#: bzrlib/export_pot.py:201
5983
msgid "Exporting messages from plugin command: {0} in {1}"
5984
msgstr ""
5985
5986
#: bzrlib/export_pot.py:226
5987
#, python-format
5988
msgid "Exporting message from error: %s"
5989
msgstr ""
5990
5991
#: bzrlib/fetch.py:97
5992
msgid "Finding revisions"
5993
msgstr ""
5994
5995
#: bzrlib/fetch.py:102
5996
msgid "Fetching revisions"
5997
msgstr ""
5998
5999
#: bzrlib/foreign.py:311
6000
#, python-format
6001
msgid "Using saved location: %s\n"
6002
msgstr ""
6003
6004
#: bzrlib/foreign.py:321
6005
msgid ""
6006
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6007
"regular push."
6008
msgstr ""
6009
6010
#: bzrlib/gpg.py:116 bzrlib/gpg.py:454
4902
#: bzrlib/gpg.py:126 bzrlib/gpg.py:464
6011
4903
msgid "{0} commits with valid signatures"
6012
4904
msgstr ""
6013
4905
6014
#: bzrlib/gpg.py:120 bzrlib/gpg.py:459
4906
#: bzrlib/gpg.py:130 bzrlib/gpg.py:469
6015
4907
msgid "{0} commit with unknown key"
6016
4908
msgid_plural "{0} commits with unknown keys"
6017
4909
msgstr[0] ""
6018
4910
msgstr[1] ""
6019
4911
6020
#: bzrlib/gpg.py:126 bzrlib/gpg.py:466
4912
#: bzrlib/gpg.py:136 bzrlib/gpg.py:476
6021
4913
msgid "{0} commit not valid"
6022
4914
msgid_plural "{0} commits not valid"
6023
4915
msgstr[0] ""
6024
4916
msgstr[1] ""
6025
4917
6026
#: bzrlib/gpg.py:132 bzrlib/gpg.py:473
4918
#: bzrlib/gpg.py:142 bzrlib/gpg.py:483
6027
4919
msgid "{0} commit not signed"
6028
4920
msgid_plural "{0} commits not signed"
6029
4921
msgstr[0] ""
6030
4922
msgstr[1] ""
6031
4923
6032
#: bzrlib/gpg.py:138 bzrlib/gpg.py:480
4924
#: bzrlib/gpg.py:148 bzrlib/gpg.py:490
6033
4925
msgid "{0} commit with key now expired"
6034
4926
msgid_plural "{0} commits with key now expired"
6035
4927
msgstr[0] ""
6036
4928
msgstr[1] ""
6037
4929
6038
#: bzrlib/gpg.py:336
6039
msgid "No GnuPG key results for pattern: {0}"
4930
#: bzrlib/gpg.py:346
4931
msgid "No GnuPG key results for pattern: {}"
6040
4932
msgstr ""
6041
4933
6042
#: bzrlib/gpg.py:379
4934
#: bzrlib/gpg.py:389
6043
4935
msgid "{0} signed {1} commit"
6044
4936
msgid_plural "{0} signed {1} commits"
6045
4937
msgstr[0] ""
6046
4938
msgstr[1] ""
6047
4939
6048
#: bzrlib/gpg.py:396 bzrlib/gpg.py:412
4940
#: bzrlib/gpg.py:406 bzrlib/gpg.py:422
6049
4941
msgid "{0} commit by author {1}"
6050
4942
msgid_plural "{0} commits by author {1}"
6051
4943
msgstr[0] ""
6052
4944
msgstr[1] ""
6053
4945
6054
#: bzrlib/gpg.py:426
4946
#: bzrlib/gpg.py:436
6055
4947
msgid "Unknown key {0} signed {1} commit"
6056
4948
msgid_plural "Unknown key {0} signed {1} commits"
6057
4949
msgstr[0] ""
6058
4950
msgstr[1] ""
6059
4951
6060
#: bzrlib/gpg.py:444
4952
#: bzrlib/gpg.py:454
6061
4953
msgid "{0} commit by author {1} with key {2} now expired"
6062
4954
msgid_plural "{0} commits by author {1} with key {2} now expired"
6063
4955
msgstr[0] ""
6064
4956
msgstr[1] ""
6065
4957
6066
#: bzrlib/groupcompress.py:1758
6067
#, python-format
6068
msgid "Insert claimed random_id=True, but then inserted %r two times"
6069
msgstr ""
6070
6071
#: bzrlib/knit.py:1764 bzrlib/knit.py:1800
6072
msgid "Walking content"
6073
msgstr ""
6074
6075
#: bzrlib/knit.py:3467
6076
msgid "annotating"
6077
msgstr ""
6078
6079
#: bzrlib/lock.py:547
6080
msgid "{0!r} was {1} locked again"
6081
msgstr ""
6082
6083
#: bzrlib/log.py:569
6084
msgid "--exclude-common-ancestry requires two different revisions"
6085
msgstr ""
6086
6087
#: bzrlib/log.py:571
6088
#, python-format
6089
msgid "invalid direction %r"
6090
msgstr ""
6091
6092
#: bzrlib/log.py:618
6093
msgid "Start revision not found in left-hand history of end revision."
6094
msgstr ""
6095
6096
#: bzrlib/log.py:664
6097
msgid "Start revision not found in history of end revision."
6098
msgstr ""
6099
6100
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6101
msgid "Logging revision 0 is invalid."
6102
msgstr ""
6103
6104
#: bzrlib/log.py:1084 bzrlib/log.py:1142
6105
msgid "Start revision must be older than the end revision."
6106
msgstr ""
6107
6108
#: bzrlib/log.py:1828
6109
#, python-format
6110
msgid "unknown log formatter: %r"
6111
msgstr ""
6112
6113
#: bzrlib/log.py:2123
6114
msgid "fixes bug"
6115
msgid_plural "fixes bugs"
6116
msgstr[0] ""
6117
msgstr[1] ""
6118
6119
#: bzrlib/merge.py:715
6120
msgid "All changes applied successfully."
6121
msgstr ""
6122
6123
#: bzrlib/merge.py:717
6124
#, python-format
6125
msgid "%d conflicts encountered."
6126
msgstr ""
6127
6128
#: bzrlib/merge.py:862 bzrlib/merge.py:1910
6129
msgid "Preparing file merge"
6130
msgstr ""
6131
6132
#: bzrlib/multiparent.py:424
6133
msgid "Importing revisions"
6134
msgstr ""
6135
6136
4958
# help of 'help' option
6137
#: bzrlib/option.py:530
4959
#: bzrlib/option.py:515
6138
4960
msgid "Show help message."
6139
4961
msgstr ""
6140
4962
6141
4963
# help of 'usage' option
6142
#: bzrlib/option.py:532
4964
#: bzrlib/option.py:517
6143
4965
msgid "Show usage message and options."
6144
4966
msgstr ""
6145
4967
6146
4968
# help of 'verbose' option
6147
#: bzrlib/option.py:534
4969
#: bzrlib/option.py:519
6148
4970
msgid "Display more information."
6149
4971
msgstr ""
6150
4972
6151
4973
# help of 'quiet' option
6152
#: bzrlib/option.py:537
4974
#: bzrlib/option.py:522
6153
4975
msgid "Only display errors and warnings."
6154
4976
msgstr ""
6155
4977
6156
4978
# help of 'overwrite' option
6157
#: bzrlib/option.py:542
4979
#: bzrlib/option.py:527
6158
4980
msgid "Ignore differences between branches and overwrite unconditionally."
6159
4981
msgstr ""
6160
4982
6161
4983
# help of 'message' option
6162
#: bzrlib/option.py:553
4984
#: bzrlib/option.py:538
6163
4985
msgid "Message string."
6164
4986
msgstr ""
6165
4987
6166
4988
# help of 'null' option
6167
#: bzrlib/option.py:556
4989
#: bzrlib/option.py:541
6168
4990
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6169
4991
msgstr ""
6170
4992
6171
4993
# help of 'profile' option
6172
#: bzrlib/option.py:559
4994
#: bzrlib/option.py:544
6173
4995
msgid "Show performance profiling information."
6174
4996
msgstr ""
6175
4997
6176
4998
# help of 'revision' option
6177
#: bzrlib/option.py:563
4999
#: bzrlib/option.py:548
6178
5000
msgid "See \"help revisionspec\" for details."
6179
5001
msgstr ""
6180
5002
6181
5003
# help of 'change' option
6182
#: bzrlib/option.py:568
5004
#: bzrlib/option.py:553
6183
5005
msgid ""
6184
5006
"Select changes introduced by the specified revision. See also \"help "
6185
5007
"revisionspec\"."
6186
5008
msgstr ""
6187
5009
6188
5010
# help of 'show-ids' option
6189
#: bzrlib/option.py:570
5011
#: bzrlib/option.py:555
6190
5012
msgid "Show internal object ids."
6191
5013
msgstr ""
6192
5014
6193
5015
# help of 'timezone' option
6194
#: bzrlib/option.py:573
5016
#: bzrlib/option.py:558
6195
5017
msgid "Display timezone as local, original, or utc."
6196
5018
msgstr ""
6197
5019
6198
5020
# help of 'log-format' option
6199
#: bzrlib/option.py:578
5021
#: bzrlib/option.py:563
6200
5022
msgid "Use specified log format."
6201
5023
msgstr ""
6202
5024
6203
5025
# title of 'log-format' option
6204
#: bzrlib/option.py:580
5026
#: bzrlib/option.py:565
6205
5027
msgid "Log format"
6206
5028
msgstr ""
6207
5029
6208
5030
# help of 'long' option
6209
#: bzrlib/option.py:582
5031
#: bzrlib/option.py:567
6210
5032
msgid "Use detailed log format. Same as --log-format long"
6211
5033
msgstr ""
6212
5034
6213
5035
# help of 'short' option
6214
#: bzrlib/option.py:584
5036
#: bzrlib/option.py:569
6215
5037
msgid "Use moderately short log format. Same as --log-format short"
6216
5038
msgstr ""
6217
5039
6218
5040
# help of 'line' option
6219
#: bzrlib/option.py:585
5041
#: bzrlib/option.py:570
6220
5042
msgid "Use log format with one line per revision. Same as --log-format line"
6221
5043
msgstr ""
6222
5044
6223
5045
# help of 'merge-type' option
6224
#: bzrlib/option.py:588
5046
#: bzrlib/option.py:573
6225
5047
msgid "Select a particular merge algorithm."
6226
5048
msgstr ""
6227
5049
6228
5050
# title of 'merge-type' option
6229
#: bzrlib/option.py:590
5051
#: bzrlib/option.py:575
6230
5052
msgid "Merge algorithm"
6231
5053
msgstr ""
6232
5054
6233
5055
# help of 'remember' option
6234
#: bzrlib/option.py:592
5056
#: bzrlib/option.py:577
6235
5057
msgid "Remember the specified location as a default."
6236
5058
msgstr ""
6237
5059
6238
5060
# help of 'reprocess' option
6239
#: bzrlib/option.py:594
5061
#: bzrlib/option.py:579
6240
5062
msgid "Reprocess to reduce spurious conflicts."
6241
5063
msgstr ""
6242
5064
6243
5065
# help of 'dry-run' option
6244
#: bzrlib/option.py:597
5066
#: bzrlib/option.py:582
6245
5067
msgid "Show what would be done, but don't actually do anything."
6246
5068
msgstr ""
6247
5069
6248
5070
# help of 'name-from-revision' option
6249
#: bzrlib/option.py:598
5071
#: bzrlib/option.py:583
6250
5072
msgid "The path name in the old tree."
6251
5073
msgstr ""
6252
5074
6253
5075
# help of 'directory' option
6254
#: bzrlib/option.py:600
5076
#: bzrlib/option.py:585
6255
5077
msgid "Branch to operate on, instead of working directory"
6256
5078
msgstr ""
6257
5079
6258
#: bzrlib/osutils.py:93
6259
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6260
msgstr ""
6261
6262
#: bzrlib/osutils.py:194
6263
msgid "lstat/stat of ({0!r}): {1!r}"
6264
msgstr ""
6265
6266
#: bzrlib/osutils.py:929 bzrlib/osutils.py:940
6267
#, python-format
6268
msgid "sorry, %r not allowed in path"
6269
msgstr ""
6270
6271
#: bzrlib/osutils.py:1158
6272
#, python-format
6273
msgid "%r is too short to calculate a relative path"
6274
msgstr ""
6275
6276
5080
# help of 'plugin' option of 'bash-completion' command
6277
5081
#: bzrlib/plugins/bash_completion/bashcomp.py:407
6278
5082
msgid "Enable completions for the selected plugin (default: all plugins)"
6506
5310
msgid " bzr lp-find-proposal -r annotate:README:1"
6507
5311
msgstr ""
6508
5312
6509
#: bzrlib/push.py:54
6510
msgid "Created new branch."
6511
msgstr ""
6512
6513
#: bzrlib/push.py:96
6514
#, python-format
6515
msgid ""
6516
"Target directory %s already contains a .bzr directory, but it is not valid."
6517
msgstr ""
6518
6519
#: bzrlib/push.py:99
6520
#, python-format
6521
msgid ""
6522
"Target directory %s already exists, but does not have a .bzr directory. "
6523
"Supply --use-existing-dir to push there anyway."
6524
msgstr ""
6525
6526
#: bzrlib/push.py:120
6527
#, python-format
6528
msgid "Too many redirections trying to make %s."
6529
msgstr ""
6530
6531
#: bzrlib/push.py:145
6532
msgid ""
6533
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6534
"information."
6535
msgstr ""
6536
6537
#: bzrlib/push.py:149
6538
#, python-format
6539
msgid ""
6540
"It is not possible to losslessly push to %s. You may want to use dpush "
6541
"instead."
6542
msgstr ""
6543
6544
#: bzrlib/push.py:155
6545
#, python-format
6546
msgid ""
6547
"At %s you have a valid .bzr control directory, but not a branch or "
6548
"repository. This is an unsupported configuration. Please move the target "
6549
"directory out of the way and try again."
6550
msgstr ""
6551
6552
#: bzrlib/reconcile.py:96
6553
#, python-format
6554
msgid "Reconciling branch %s"
6555
msgstr ""
6556
6557
#: bzrlib/reconcile.py:102
6558
#, python-format
6559
msgid "Reconciling repository %s"
6560
msgstr ""
6561
6562
#: bzrlib/reconcile.py:104
6563
msgid "Reconciling repository"
6564
msgstr ""
6565
6566
#: bzrlib/reconcile.py:110
6567
#, python-format
6568
msgid "%s cannot canonicalize CHKs."
6569
msgstr ""
6570
6571
#: bzrlib/reconcile.py:118
6572
msgid "Reconcile aborted: revision index has inconsistent parents."
6573
msgstr ""
6574
6575
#: bzrlib/reconcile.py:120
6576
msgid "Run \"bzr check\" for more details."
6577
msgstr ""
6578
6579
#: bzrlib/reconcile.py:122
6580
msgid "Reconciliation complete."
6581
msgstr ""
6582
6583
#: bzrlib/reconcile.py:165
6584
msgid "Fixing last revision info {0} => {1}"
6585
msgstr ""
6586
6587
#: bzrlib/reconcile.py:172
6588
msgid "revision_history ok."
6589
msgstr ""
6590
6591
#: bzrlib/reconcile.py:233
6592
msgid "Reading inventory data"
6593
msgstr ""
6594
6595
#: bzrlib/reconcile.py:253 bzrlib/reconcile.py:383
6596
msgid "Inventory ok."
6597
msgstr ""
6598
6599
#: bzrlib/reconcile.py:255 bzrlib/reconcile.py:385
6600
msgid "Backing up inventory"
6601
msgstr ""
6602
6603
#: bzrlib/reconcile.py:257
6604
msgid "Backup inventory created."
6605
msgstr ""
6606
6607
#: bzrlib/reconcile.py:273 bzrlib/reconcile.py:404
6608
msgid "Writing weave"
6609
msgstr ""
6610
6611
#: bzrlib/reconcile.py:276 bzrlib/reconcile.py:407
6612
msgid "Inventory regenerated."
6613
msgstr ""
6614
6615
#: bzrlib/reconcile.py:370 bzrlib/reconcile.py:372 bzrlib/reconcile.py:375
6616
msgid "Reading indexes"
6617
msgstr ""
6618
6619
#: bzrlib/reconcile.py:379 bzrlib/reconcile.py:381
6620
msgid "Checking unused inventories"
6621
msgstr ""
6622
6623
#: bzrlib/reconcile.py:387
6624
msgid "Backup Inventory created"
6625
msgstr ""
6626
6627
#: bzrlib/reconcile.py:445
6628
msgid "Fixing text parents"
6629
msgstr ""
6630
6631
#: bzrlib/reconfigure.py:52
6632
msgid "{0} is now stacked on {1}\n"
6633
msgstr ""
6634
6635
#: bzrlib/reconfigure.py:67
6636
#, python-format
6637
msgid "%s is now not stacked\n"
6638
msgstr ""
6639
6640
#: bzrlib/remote.py:1886
6641
msgid "Copying repository content as tarball..."
6642
msgstr ""
6643
6644
#: bzrlib/rename_map.py:68
6645
msgid "Calculating hashes"
6646
msgstr ""
6647
6648
#: bzrlib/rename_map.py:106
6649
msgid "Determining hash hits"
6650
msgstr ""
6651
6652
#: bzrlib/rename_map.py:241
6653
msgid "{0} => {1}"
6654
msgstr ""
6655
6656
#: bzrlib/repository.py:284
6657
#, python-format
6658
msgid "bzr: ERROR (ignored): %s"
6659
msgstr ""
6660
6661
#: bzrlib/repository.py:1806
6662
msgid "Moving repository to repository.backup"
6663
msgstr ""
6664
6665
#: bzrlib/repository.py:1813
6666
msgid "Creating new repository"
6667
msgstr ""
6668
6669
#: bzrlib/repository.py:1818
6670
msgid "Copying content"
6671
msgstr ""
6672
6673
#: bzrlib/repository.py:1822
6674
msgid "Deleting old repository content"
6675
msgstr ""
6676
6677
#: bzrlib/repository.py:1824
6678
msgid "repository converted"
6679
msgstr ""
6680
6681
#: bzrlib/revisionspec.py:914
6682
msgid "Using {0} {1}"
6683
msgstr ""
6684
6685
#: bzrlib/send.py:56
6686
#, python-format
6687
msgid "Mail client \"%s\" does not support specifying body"
6688
msgstr ""
6689
6690
#: bzrlib/send.py:60
6691
msgid "--remember requires a branch to be specified."
6692
msgstr ""
6693
6694
#: bzrlib/send.py:74
6695
msgid "No submit branch known or specified"
6696
msgstr ""
6697
6698
#: bzrlib/send.py:77
6699
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
6700
msgstr ""
6701
6702
#: bzrlib/send.py:94
6703
#, python-format
6704
msgid "No such send format '%s'."
6705
msgstr ""
6706
6707
#: bzrlib/send.py:111
6708
msgid "bzr send takes at most two one revision identifiers"
6709
msgstr ""
6710
6711
#: bzrlib/send.py:124
6712
msgid "No revisions to submit."
6713
msgstr ""
6714
6715
#: bzrlib/send.py:135
6716
msgid ""
6717
"- not supported for merge directives that use more than one output file."
6718
msgstr ""
6719
6720
#: bzrlib/send.py:177
6721
msgid "Format 0.9 does not permit bundle with no patch"
6722
msgstr ""
6723
6724
#: bzrlib/shelf_ui.py:45
6725
#, python-format
6726
msgid "Shelve adding file \"%(path)s\"?"
6727
msgstr ""
6728
6729
#: bzrlib/shelf_ui.py:46
6730
msgid "Shelve binary changes?"
6731
msgstr ""
6732
6733
#: bzrlib/shelf_ui.py:47
6734
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
6735
msgstr ""
6736
6737
#: bzrlib/shelf_ui.py:49
6738
#, python-format
6739
msgid "Shelve removing file \"%(path)s\"?"
6740
msgstr ""
6741
6742
#: bzrlib/shelf_ui.py:50
6743
#, python-format
6744
msgid "Shelve %d change(s)?"
6745
msgstr ""
6746
6747
#: bzrlib/shelf_ui.py:51
6748
msgid "Shelve?"
6749
msgstr ""
6750
6751
#: bzrlib/shelf_ui.py:52
6752
#, python-format
6753
msgid ""
6754
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
6755
msgstr ""
6756
6757
#: bzrlib/shelf_ui.py:54
6758
#, python-format
6759
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
6760
msgstr ""
6761
6762
#: bzrlib/shelf_ui.py:69
6763
#, python-format
6764
msgid "Changes shelved with id \"%d\"."
6765
msgstr ""
6766
6767
#: bzrlib/shelf_ui.py:73
6768
msgid "Selected changes destroyed."
6769
msgstr ""
6770
6771
#: bzrlib/shelf_ui.py:77
6772
msgid "Selected changes:"
6773
msgstr ""
6774
6775
#: bzrlib/shelf_ui.py:97
6776
#, python-format
6777
msgid "Delete file \"%(path)s\"?"
6778
msgstr ""
6779
6780
#: bzrlib/shelf_ui.py:98
6781
msgid "Apply binary changes?"
6782
msgstr ""
6783
6784
#: bzrlib/shelf_ui.py:99
6785
#, python-format
6786
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
6787
msgstr ""
6788
6789
#: bzrlib/shelf_ui.py:101
6790
#, python-format
6791
msgid "Add file \"%(path)s\"?"
6792
msgstr ""
6793
6794
#: bzrlib/shelf_ui.py:102
6795
#, python-format
6796
msgid "Apply %d change(s)?"
6797
msgstr ""
6798
6799
#: bzrlib/shelf_ui.py:103
6800
msgid "Apply change?"
6801
msgstr ""
6802
6803
#: bzrlib/shelf_ui.py:104
6804
#, python-format
6805
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
6806
msgstr ""
6807
6808
#: bzrlib/shelf_ui.py:106
6809
#, python-format
6810
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
6811
msgstr ""
6812
6813
#: bzrlib/shelf_ui.py:265
6814
msgid "You need a controlling terminal."
6815
msgstr ""
6816
6817
#: bzrlib/shelf_ui.py:415
6818
msgid "No changes are shelved."
6819
msgstr ""
6820
6821
#: bzrlib/shelf_ui.py:473
6822
#, python-format
6823
msgid "Using changes with id \"%d\"."
6824
msgstr ""
6825
6826
#: bzrlib/shelf_ui.py:477
6827
#, python-format
6828
msgid "Message: %s"
6829
msgstr ""
6830
6831
#: bzrlib/shelf_ui.py:489
6832
#, python-format
6833
msgid "Deleted changes with id \"%d\"."
6834
msgstr ""
6835
6836
#: bzrlib/smart/medium.py:565
6837
msgid "HPSS calls: {0} ({1} vfs) {2}"
6838
msgstr ""
6839
6840
#: bzrlib/smart/server.py:355
6841
#, python-format
6842
msgid "listening on port: %s"
6843
msgstr ""
6844
6845
#: bzrlib/switch.py:67
6846
msgid "Pending merges must be committed or reverted before using switch."
6847
msgstr ""
6848
6849
#: bzrlib/switch.py:94
6850
msgid ""
6851
"Cannot switch as local commits found in the checkout. Commit these to the "
6852
"bound branch or use --force to throw them away."
6853
msgstr ""
6854
6855
#: bzrlib/switch.py:99
6856
#, python-format
6857
msgid ""
6858
"Unable to connect to current master branch %(target)s: %(error)s To switch "
6859
"anyway, use --force."
6860
msgstr ""
6861
6862
#: bzrlib/switch.py:108
6863
msgid "Cannot switch a branch, only a checkout."
6864
msgstr ""
6865
6866
#: bzrlib/switch.py:144
6867
#, python-format
6868
msgid "Tree is up to date at revision %d."
6869
msgstr ""
6870
6871
#: bzrlib/switch.py:150
6872
#, python-format
6873
msgid "Updated to revision %d."
6874
msgstr ""
6875
6876
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
6877
msgid "Apply phase"
6878
msgstr ""
6879
6880
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
6881
msgid "removing file"
6882
msgstr ""
6883
6884
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
6885
msgid "adding file"
6886
msgstr ""
6887
6888
#: bzrlib/transform.py:2587
6889
msgid "Building tree"
6890
msgstr ""
6891
6892
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
6893
msgid "Adding file contents"
6894
msgstr ""
6895
6896
#: bzrlib/transform.py:3051
6897
msgid "Resolution pass"
6898
msgstr ""
6899
6900
#: bzrlib/tree.py:635
6901
msgid "*** {0} content-filter: {1} => {2!r}"
6902
msgstr ""
6903
6904
#: bzrlib/upgrade.py:76
6905
#, python-format
6906
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
6907
msgstr ""
6908
6909
#: bzrlib/upgrade.py:99
6910
#, python-format
6911
msgid "cannot upgrade from bzrdir format %s"
6912
msgstr ""
6913
6914
#: bzrlib/upgrade.py:102
6915
#, python-format
6916
msgid "starting upgrade of %s"
6917
msgstr ""
6918
6919
#: bzrlib/upgrade.py:109
6920
msgid "finished"
6921
msgstr ""
6922
6923
#: bzrlib/upgrade.py:119
6924
msgid "Deleting backup.bzr"
6925
msgstr ""
6926
6927
#: bzrlib/upgrade.py:150
6928
msgid ""
6929
"\n"
6930
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
6931
msgstr ""
6932
6933
#: bzrlib/upgrade.py:207
6934
#, python-format
6935
msgid "Found %d dependent branches - upgrading ..."
6936
msgstr ""
6937
6938
#: bzrlib/upgrade.py:275
6939
msgid "Upgrading bzrdirs"
6940
msgstr ""
6941
6942
#: bzrlib/upgrade.py:281
6943
#, python-format
6944
msgid "Upgrading %s"
6945
msgstr ""
6946
6947
#: bzrlib/upgrade.py:282
6948
msgid "Upgrading {0} {1} ..."
6949
msgstr ""
6950
6951
#: bzrlib/upgrade.py:296
6952
msgid "Removing backup ..."
6953
msgstr ""
6954
6955
#: bzrlib/upgrade.py:300
6956
msgid "failed to clean-up {0}: {1}"
6957
msgstr ""
6958
6959
#: bzrlib/vf_repository.py:1091
6960
msgid "inventories"
6961
msgstr ""
6962
6963
#: bzrlib/vf_repository.py:1117
6964
msgid "texts"
6965
msgstr ""
6966
6967
#: bzrlib/vf_repository.py:1572 bzrlib/vf_repository.py:1581
6968
msgid "Calculating text parents"
6969
msgstr ""
6970
6971
#: bzrlib/vf_repository.py:1657
6972
msgid "Fetch texts"
6973
msgstr ""
6974
6975
#: bzrlib/vf_repository.py:2468
6976
msgid "loading text store"
6977
msgstr ""
6978
6979
#: bzrlib/vf_repository.py:2474
6980
msgid "checking text graph"
6981
msgstr ""
6982
6983
#: bzrlib/vf_repository.py:2924 bzrlib/vf_repository.py:2938
6984
#: bzrlib/vf_repository.py:3053
6985
msgid "Transferring revisions"
6986
msgstr ""
6987
6988
#: bzrlib/win32utils.py:132
6989
msgid "Failed to GetProcessMemoryInfo()"
6990
msgstr ""
6991
6992
#: bzrlib/win32utils.py:153
6993
msgid "Cannot debug memory on win32 without ctypes or win32process"
6994
msgstr ""
6995
6996
#: bzrlib/win32utils.py:158
6997
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
6998
msgstr ""
6999
7000
#: bzrlib/win32utils.py:166
7001
#, python-format
7002
msgid "WorkingSize %8d KiB"
7003
msgstr ""
7004
7005
#: bzrlib/win32utils.py:167
7006
#, python-format
7007
msgid "PeakWorking %8d KiB"
7008
msgstr ""
7009
7010
#: bzrlib/win32utils.py:168
7011
#, python-format
7012
msgid "PagefileUsage %8d KiB"
7013
msgstr ""
7014
7015
#: bzrlib/win32utils.py:169
7016
#, python-format
7017
msgid "PeakPagefileUsage %8d KiB"
7018
msgstr ""
7019
7020
#: bzrlib/win32utils.py:171
7021
#, python-format
7022
msgid "PrivateUsage %8d KiB"
7023
msgstr ""
7024
7025
#: bzrlib/win32utils.py:172
7026
#, python-format
7027
msgid "PageFaultCount %8d"
7028
msgstr ""
7029
7030
#: bzrlib/workingtree.py:1502
7031
msgid "Rerun update after fixing the conflicts."
7032
msgstr ""
7033
7034
5313
#: dummy/help_topics/authentication/summary.txt:1
7035
5314
msgid "Information on configuring authentication"
7036
5315
msgstr ""
7037
5316
7038
5317
#: dummy/help_topics/basic/detail.txt:1
7039
5318
msgid ""
7040
"Bazaar 2.5.0dev2 -- a free distributed version-control tool\n"
5319
"Bazaar 2.5.0dev1 -- a free distributed version-control tool\n"
7041
5320
"http://bazaar.canonical.com/"
7042
5321
msgstr ""
7043
5322
8600
6879
"fetch-ghosts Attempt to retrieve ghosts from another branch. "
8601
6880
"[bzrtools]\n"
8602
6881
"graph-ancestry Produce ancestry graphs using dot. [bzrtools]\n"
6882
"grep Print lines matching PATTERN for specified files and\n"
6883
" revisions. [grep]\n"
8603
6884
"heads Show all revisions in a repository not having "
8604
6885
"descendants.\n"
8605
6886
" [bzrtools]\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1