« back to all changes in this revision
Viewing changes to po/nb.po
- browse files at revision 6481
- compare with another revision
- download diff
- download tarball
- view history from revision 6481
- Committer: Patch Queue Manager
- Date: 2012-03-06 16:45:45 UTC
- mfrom: (6437.40.2 rmbranch-colo)
- Revision ID: pqm@pqm.ubuntu.com-20120306164545-6i5cyyfxctiwq11p
(jelmer) Support removing colocated branches in 'bzr rmbranch'. (Jelmer
Vernooij)
Vernooij)
- files removed:
- po/cs.po
- files modified:
- bzrlib/builtins.py
added
removed
po/nb.po
1
# Norwegian Bokmal translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2012-04-03 17:49+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: Norwegian Bokmal <nb@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-07-11 04:32+0000\n"
19
"X-Generator: Launchpad (build 15593)\n"
20
21
#: bzrlib/add.py:93
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:854
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:2955
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:2957
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:2960
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:2962
46
msgid "No new revisions to push."
47
msgstr ""
48
49
#: bzrlib/branch.py:2982
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:2985
54
#, python-format
55
msgid "found error:%s"
56
msgstr ""
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:260
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:315
69
msgid "Display status summary."
70
msgstr ""
71
72
#: bzrlib/builtins.py:317
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
78
#: bzrlib/builtins.py:320
79
msgid ""
80
"added\n"
81
" Versioned in the working copy but not in the previous revision."
82
msgstr ""
83
84
#: bzrlib/builtins.py:323
85
msgid ""
86
"removed\n"
87
" Versioned in the previous revision but removed or deleted\n"
88
" in the working copy."
89
msgstr ""
90
91
#: bzrlib/builtins.py:327
92
msgid ""
93
"renamed\n"
94
" Path of this file changed from the previous revision;\n"
95
" the text may also have changed. This includes files whose\n"
96
" parent directory was renamed."
97
msgstr ""
98
99
#: bzrlib/builtins.py:332
100
msgid ""
101
"modified\n"
102
" Text has changed since the previous revision."
103
msgstr ""
104
105
#: bzrlib/builtins.py:335
106
msgid ""
107
"kind changed\n"
108
" File kind has been changed (e.g. from file to directory)."
109
msgstr ""
110
111
#: bzrlib/builtins.py:338
112
msgid ""
113
"unknown\n"
114
" Not versioned and not matching an ignore pattern."
115
msgstr ""
116
117
#: bzrlib/builtins.py:341
118
msgid ""
119
"Additionally for directories, symlinks and files with a changed\n"
120
"executable bit, Bazaar indicates their type using a trailing\n"
121
"character: '/', '@' or '*' respectively. These decorations can be\n"
122
"disabled using the '--no-classify' option."
123
msgstr ""
124
125
#: bzrlib/builtins.py:346
126
msgid ""
127
"To see ignored files use 'bzr ignored'. For details on the\n"
128
"changes to file texts, use 'bzr diff'."
129
msgstr ""
130
131
#: bzrlib/builtins.py:349
132
msgid ""
133
"Note that --short or -S gives status flags for each item, similar\n"
134
"to Subversion's status command. To get output similar to svn -q,\n"
135
"use bzr status -SV."
136
msgstr ""
137
138
#: bzrlib/builtins.py:353
139
msgid ""
140
"If no arguments are specified, the status of the entire working\n"
141
"directory is shown. Otherwise, only the status of the specified\n"
142
"files or directories is reported. If a directory is given, status\n"
143
"is reported for everything inside that directory."
144
msgstr ""
145
146
#: bzrlib/builtins.py:358
147
msgid ""
148
"Before merges are committed, the pending merge tip revisions are\n"
149
"shown. To see all pending merge revisions, use the -v option.\n"
150
"To skip the display of pending merge information altogether, use\n"
151
"the no-pending option or specify a file/directory."
152
msgstr ""
153
154
#: bzrlib/builtins.py:363
155
msgid ""
156
"To compare the working directory to a specific revision, pass a\n"
157
"single revision to the revision argument."
158
msgstr ""
159
160
#: bzrlib/builtins.py:366
161
msgid ""
162
"To see which files have changed in a specific revision, or between\n"
163
"two revisions, pass a revision range to the revision argument.\n"
164
"This will produce the same results as calling 'bzr diff --summarize'."
165
msgstr ""
166
167
#: bzrlib/builtins.py:375
168
msgid "Use short status indicators."
169
msgstr ""
170
171
#: bzrlib/builtins.py:377
172
msgid "Only show versioned files."
173
msgstr ""
174
175
#: bzrlib/builtins.py:379
176
msgid "Don't show pending merges."
177
msgstr ""
178
179
#: bzrlib/builtins.py:382
180
msgid "Do not mark object type using indicator."
181
msgstr ""
182
183
#: bzrlib/builtins.py:397
184
msgid "bzr status --revision takes exactly one or two revision specifiers"
185
msgstr ""
186
187
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
188
msgid "You can only supply one of revision_id or --revision"
189
msgstr ""
190
191
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
192
msgid "You must supply either --revision or a revision_id"
193
msgstr ""
194
195
#: bzrlib/builtins.py:451
196
#, python-format
197
msgid "Repository %r does not support access to raw revision texts"
198
msgstr ""
199
200
#: bzrlib/builtins.py:462
201
msgid "The repository {0} contains no revision {1}."
202
msgstr ""
203
204
#: bzrlib/builtins.py:469
205
msgid "You cannot specify a NULL revision."
206
msgstr ""
207
208
#: bzrlib/builtins.py:561
209
msgid "Remove the working tree from a given branch/checkout."
210
msgstr ""
211
212
#: bzrlib/builtins.py:563
213
msgid ""
214
"Since a lightweight checkout is little more than a working tree\n"
215
"this will refuse to run against one."
216
msgstr ""
217
218
#: bzrlib/builtins.py:566
219
msgid "To re-create the working tree, use \"bzr checkout\"."
220
msgstr ""
221
222
#: bzrlib/builtins.py:572
223
msgid ""
224
"Remove the working tree even if it has uncommitted or shelved changes."
225
msgstr ""
226
227
#: bzrlib/builtins.py:586
228
msgid "No working tree to remove"
229
msgstr ""
230
231
#: bzrlib/builtins.py:588
232
msgid "You cannot remove the working tree of a remote path"
233
msgstr ""
234
235
#: bzrlib/builtins.py:597
236
msgid "You cannot remove the working tree from a lightweight checkout"
237
msgstr ""
238
239
#: bzrlib/builtins.py:637
240
msgid ""
241
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
242
"instead. Use \"--force\" if you are sure you want to reset the working tree."
243
msgstr ""
244
245
#: bzrlib/builtins.py:648
246
msgid ""
247
", the header appears corrupt, try passing -r -1 to set the state to the last "
248
"commit"
249
msgstr ""
250
251
#: bzrlib/builtins.py:652
252
msgid "failed to reset the tree state{0}"
253
msgstr ""
254
255
#: bzrlib/builtins.py:656
256
msgid "Show current revision number."
257
msgstr ""
258
259
#: bzrlib/builtins.py:658
260
msgid "This is equal to the number of revisions on this branch."
261
msgstr ""
262
263
#: bzrlib/builtins.py:671
264
msgid "--tree and --revision can not be used together"
265
msgstr ""
266
267
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
268
msgid "Tags can only be placed on a single revision, not on a range"
269
msgstr ""
270
271
#: bzrlib/builtins.py:712
272
msgid "Show revno of working tree."
273
msgstr ""
274
275
#: bzrlib/builtins.py:760
276
msgid "Add specified files or directories."
277
msgstr ""
278
279
#: bzrlib/builtins.py:762
280
msgid ""
281
"In non-recursive mode, all the named items are added, regardless\n"
282
"of whether they were previously ignored. A warning is given if\n"
283
"any of the named files are already versioned."
284
msgstr ""
285
286
#: bzrlib/builtins.py:766
287
msgid ""
288
"In recursive mode (the default), files are treated the same way\n"
289
"but the behaviour for directories is different. Directories that\n"
290
"are already versioned do not give a warning. All directories,\n"
291
"whether already versioned or not, are searched for files or\n"
292
"subdirectories that are neither versioned or ignored, and these\n"
293
"are added. This search proceeds recursively into versioned\n"
294
"directories. If no names are given '.' is assumed."
295
msgstr ""
296
297
#: bzrlib/builtins.py:774
298
msgid ""
299
"A warning will be printed when nested trees are encountered,\n"
300
"unless they are explicitly ignored."
301
msgstr ""
302
303
#: bzrlib/builtins.py:777
304
msgid ""
305
"Therefore simply saying 'bzr add' will version all files that\n"
306
"are currently unknown."
307
msgstr ""
308
309
#: bzrlib/builtins.py:780
310
msgid ""
311
"Adding a file whose parent directory is not versioned will\n"
312
"implicitly add the parent, and so on up to the root. This means\n"
313
"you should never need to explicitly add a directory, they'll just\n"
314
"get added when you add a file in the directory."
315
msgstr ""
316
317
#: bzrlib/builtins.py:785
318
msgid ""
319
"--dry-run will show which files would be added, but not actually\n"
320
"add them."
321
msgstr ""
322
323
#: bzrlib/builtins.py:788
324
msgid ""
325
"--file-ids-from will try to use the file ids from the supplied path.\n"
326
"It looks up ids trying to find a matching parent directory with the\n"
327
"same filename, and then by pure path. This option is rarely needed\n"
328
"but can be useful when adding the same logical file into two\n"
329
"branches that will be merged later (without showing the two different\n"
330
"adds as a conflict). It is also useful when merging another project\n"
331
"into a subdirectory of this one."
332
msgstr ""
333
334
#: bzrlib/builtins.py:796
335
msgid ""
336
"Any files matching patterns in the ignore list will not be added\n"
337
"unless they are explicitly mentioned."
338
msgstr ""
339
340
#: bzrlib/builtins.py:799
341
msgid ""
342
"In recursive mode, files larger than the configuration option \n"
343
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
344
"to file size."
345
msgstr ""
346
347
#: bzrlib/builtins.py:806
348
msgid "Don't recursively add the contents of directories."
349
msgstr ""
350
351
#: bzrlib/builtins.py:813
352
msgid "Lookup file ids from this tree."
353
msgstr ""
354
355
#: bzrlib/builtins.py:849
356
msgid "ignored {0} matching \"{1}\"\n"
357
msgstr ""
358
359
#: bzrlib/builtins.py:854
360
msgid "Create a new versioned directory."
361
msgstr ""
362
363
#: bzrlib/builtins.py:856
364
msgid "This is equivalent to creating the directory and then adding it."
365
msgstr ""
366
367
#: bzrlib/builtins.py:863
368
msgid "No error if existing, make parent directories as needed."
369
msgstr ""
370
371
#: bzrlib/builtins.py:897
372
#, python-format
373
msgid "added %s\n"
374
msgstr ""
375
376
#: bzrlib/builtins.py:939
377
#, python-format
378
msgid "invalid kind %r specified"
379
msgstr ""
380
381
#: bzrlib/builtins.py:976
382
msgid "Move or rename a file."
383
msgstr ""
384
385
#: bzrlib/builtins.py:978
386
msgid " bzr mv SOURCE... DESTINATION"
387
msgstr ""
388
389
#: bzrlib/builtins.py:980
390
msgid ""
391
"If the last argument is a versioned directory, all the other names\n"
392
"are moved into it. Otherwise, there must be exactly two arguments\n"
393
"and the file is changed to a new name."
394
msgstr ""
395
396
#: bzrlib/builtins.py:984
397
msgid ""
398
"If OLDNAME does not exist on the filesystem but is versioned and\n"
399
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
400
"assumes that the file has been manually moved and only updates\n"
401
"its internal inventory to reflect that change.\n"
402
"The same is valid when moving many SOURCE files to a DESTINATION."
403
msgstr ""
404
405
#: bzrlib/builtins.py:990
406
msgid "Files cannot be moved between branches."
407
msgstr ""
408
409
#: bzrlib/builtins.py:997
410
msgid ""
411
"Move only the bzr identifier of the file, because the file has already been "
412
"moved."
413
msgstr ""
414
415
#: bzrlib/builtins.py:999
416
msgid "Automatically guess renames."
417
msgstr ""
418
419
#: bzrlib/builtins.py:1000
420
msgid "Avoid making changes when guessing renames."
421
msgstr ""
422
423
#: bzrlib/builtins.py:1009
424
msgid "--dry-run requires --auto."
425
msgstr ""
426
427
#: bzrlib/builtins.py:1013
428
msgid "missing file argument"
429
msgstr ""
430
431
#: bzrlib/builtins.py:1017
432
msgid "can not move root of branch"
433
msgstr ""
434
435
#: bzrlib/builtins.py:1023
436
msgid "Only one path may be specified to --auto."
437
msgstr ""
438
439
#: bzrlib/builtins.py:1026
440
msgid "--after cannot be specified with --auto."
441
msgstr ""
442
443
#: bzrlib/builtins.py:1062
444
msgid "to mv multiple files the destination must be a versioned directory"
445
msgstr ""
446
447
#: bzrlib/builtins.py:1114
448
msgid "Turn this branch into a mirror of another branch."
449
msgstr ""
450
451
#: bzrlib/builtins.py:1116
452
msgid ""
453
"By default, this command only works on branches that have not diverged.\n"
454
"Branches are considered diverged if the destination branch's most recent \n"
455
"commit is one that has not been merged (directly or indirectly) into the \n"
456
"parent."
457
msgstr ""
458
459
#: bzrlib/builtins.py:1121
460
msgid ""
461
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
462
"from one into the other. Once one branch has merged, the other should\n"
463
"be able to pull it again."
464
msgstr ""
465
466
#: bzrlib/builtins.py:1125
467
msgid ""
468
"If you want to replace your local changes and just want your branch to\n"
469
"match the remote one, use pull --overwrite. This will work even if the two\n"
470
"branches have diverged."
471
msgstr ""
472
473
#: bzrlib/builtins.py:1129
474
msgid ""
475
"If there is no default location set, the first pull will set it (use\n"
476
"--no-remember to avoid setting it). After that, you can omit the\n"
477
"location to use the default. To change the default, use --remember. The\n"
478
"value will only be saved if the remote location can be accessed."
479
msgstr ""
480
481
#: bzrlib/builtins.py:1134
482
msgid ""
483
"The --verbose option will display the revisions pulled using the log_format\n"
484
"configuration option. You can use a different format by overriding it with\n"
485
"-Olog_format=<other_format>."
486
msgstr ""
487
488
#: bzrlib/builtins.py:1138
489
msgid ""
490
"Note: The location can be specified either in the form of a branch,\n"
491
"or in the form of a path to a file containing a merge directive generated\n"
492
"with bzr send."
493
msgstr ""
494
495
#: bzrlib/builtins.py:1146
496
msgid "Show logs of pulled revisions."
497
msgstr ""
498
499
#: bzrlib/builtins.py:1148
500
msgid ""
501
"Branch to pull into, rather than the one containing the working directory."
502
msgstr ""
503
504
#: bzrlib/builtins.py:1151
505
msgid ""
506
"Perform a local pull in a bound branch. Local pulls are not applied to the "
507
"master branch."
508
msgstr ""
509
510
#: bzrlib/builtins.py:1189
511
msgid "Need working tree for --show-base."
512
msgstr ""
513
514
#: bzrlib/builtins.py:1205
515
msgid "No pull location known or specified."
516
msgstr ""
517
518
#: bzrlib/builtins.py:1211
519
#, python-format
520
msgid "Using saved parent location: %s\n"
521
msgstr ""
522
523
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
524
msgid "Cannot use -r with merge directives or bundles"
525
msgstr ""
526
527
#: bzrlib/builtins.py:1261
528
msgid "Update a mirror of this branch."
529
msgstr ""
530
531
#: bzrlib/builtins.py:1263
532
msgid ""
533
"The target branch will not have its working tree populated because this\n"
534
"is both expensive, and is not supported on remote file systems."
535
msgstr ""
536
537
#: bzrlib/builtins.py:1266
538
msgid ""
539
"Some smart servers or protocols *may* put the working tree in place in\n"
540
"the future."
541
msgstr ""
542
543
#: bzrlib/builtins.py:1269
544
msgid ""
545
"This command only works on branches that have not diverged. Branches are\n"
546
"considered diverged if the destination branch's most recent commit is one\n"
547
"that has not been merged (directly or indirectly) by the source branch."
548
msgstr ""
549
550
#: bzrlib/builtins.py:1273
551
msgid ""
552
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
553
"the other branch completely, discarding its unmerged changes."
554
msgstr ""
555
556
#: bzrlib/builtins.py:1276
557
msgid ""
558
"If you want to ensure you have the different changes in the other branch,\n"
559
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
560
"After that you will be able to do a push without '--overwrite'."
561
msgstr ""
562
563
#: bzrlib/builtins.py:1280
564
msgid ""
565
"If there is no default push location set, the first push will set it (use\n"
566
"--no-remember to avoid setting it). After that, you can omit the\n"
567
"location to use the default. To change the default, use --remember. The\n"
568
"value will only be saved if the remote location can be accessed."
569
msgstr ""
570
571
#: bzrlib/builtins.py:1285
572
msgid ""
573
"The --verbose option will display the revisions pushed using the log_format\n"
574
"configuration option. You can use a different format by overriding it with\n"
575
"-Olog_format=<other_format>."
576
msgstr ""
577
578
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
579
msgid ""
580
"Branch to push from, rather than the one containing the working directory."
581
msgstr ""
582
583
#: bzrlib/builtins.py:1299
584
msgid ""
585
"By default push will fail if the target directory exists, but does not "
586
"already have a control directory. This flag will allow push to proceed."
587
msgstr ""
588
589
#: bzrlib/builtins.py:1304
590
msgid ""
591
"Create a stacked branch that references the public location of the parent "
592
"branch."
593
msgstr ""
594
595
#: bzrlib/builtins.py:1307
596
msgid ""
597
"Create a stacked branch that refers to another branch for the commit "
598
"history. Only the work not present in the referenced branch is included in "
599
"the branch created."
600
msgstr ""
601
602
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
603
msgid ""
604
"Refuse to push if there are uncommitted changes in the working tree, --no-"
605
"strict disables the check."
606
msgstr ""
607
608
#: bzrlib/builtins.py:1315
609
msgid "Don't populate the working tree, even for protocols that support it."
610
msgstr ""
611
612
#: bzrlib/builtins.py:1318
613
msgid "Overwrite tags only."
614
msgstr ""
615
616
#: bzrlib/builtins.py:1369
617
msgid "Could not determine branch to refer to."
618
msgstr ""
619
620
#: bzrlib/builtins.py:1378
621
#, python-format
622
msgid ""
623
"No push location known or specified. To push to the parent branch (at %s), "
624
"use 'bzr push :parent'."
625
msgstr ""
626
627
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
628
msgid "No push location known or specified."
629
msgstr ""
630
631
#: bzrlib/builtins.py:1388
632
#, python-format
633
msgid "Using saved push location: %s"
634
msgstr ""
635
636
#: bzrlib/builtins.py:1398
637
msgid "Create a new branch that is a copy of an existing branch."
638
msgstr ""
639
640
#: bzrlib/builtins.py:1400
641
msgid ""
642
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
643
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
644
"./bar.\n"
645
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
646
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
647
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
648
"create ./foo-bar."
649
msgstr ""
650
651
#: bzrlib/builtins.py:1407
652
msgid ""
653
"To retrieve the branch as of a particular revision, supply the --revision\n"
654
"parameter, as in \"branch foo/bar -r 5\"."
655
msgstr ""
656
657
#: bzrlib/builtins.py:1410
658
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
659
msgstr ""
660
661
#: bzrlib/builtins.py:1420
662
msgid "Create a branch without a working-tree."
663
msgstr ""
664
665
#: bzrlib/builtins.py:1422
666
msgid "Switch the checkout in the current directory to the new branch."
667
msgstr ""
668
669
#: bzrlib/builtins.py:1425
670
msgid ""
671
"Create a stacked branch referring to the source branch. The new branch will "
672
"depend on the availability of the source branch for all operations."
673
msgstr ""
674
675
#: bzrlib/builtins.py:1429
676
msgid "Do not use a shared repository, even if available."
677
msgstr ""
678
679
#: bzrlib/builtins.py:1431
680
msgid ""
681
"By default branch will fail if the target directory exists, but does not "
682
"already have a control directory. This flag will allow branch to proceed."
683
msgstr ""
684
685
#: bzrlib/builtins.py:1436
686
msgid "Bind new branch to from location."
687
msgstr ""
688
689
#: bzrlib/builtins.py:1483
690
#, python-format
691
msgid "Target directory \"%s\" already exists."
692
msgstr ""
693
694
#: bzrlib/builtins.py:1495
695
#, python-format
696
msgid "Parent of \"%s\" does not exist."
697
msgstr ""
698
699
#: bzrlib/builtins.py:1514
700
msgid "The branch {0} has no revision {1}."
701
msgstr ""
702
703
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
704
#, python-format
705
msgid "Created new stacked branch referring to %s."
706
msgstr ""
707
708
#: bzrlib/builtins.py:1533
709
#, python-format
710
msgid "Branched %d revision."
711
msgid_plural "Branched %d revisions."
712
msgstr[0] ""
713
msgstr[1] ""
714
715
#: bzrlib/builtins.py:1538
716
#, python-format
717
msgid "New branch bound to %s"
718
msgstr ""
719
720
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
721
#, python-format
722
msgid "Switched to branch: %s"
723
msgstr ""
724
725
#: bzrlib/builtins.py:1548
726
msgid "List the branches available at the current location."
727
msgstr ""
728
729
#: bzrlib/builtins.py:1550
730
msgid ""
731
"This command will print the names of all the branches at the current\n"
732
"location."
733
msgstr ""
734
735
#: bzrlib/builtins.py:1557
736
msgid ""
737
"Recursively scan for branches rather than just looking in the specified "
738
"location."
739
msgstr ""
740
741
#: bzrlib/builtins.py:1586
742
msgid "(default)"
743
msgstr ""
744
745
#: bzrlib/builtins.py:1598
746
msgid "Create a new checkout of an existing branch."
747
msgstr ""
748
749
#: bzrlib/builtins.py:1600
750
msgid ""
751
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
752
"for\n"
753
"the branch found in '.'. This is useful if you have removed the working "
754
"tree\n"
755
"or if it was never created - i.e. if you pushed the branch to its current\n"
756
"location using SFTP."
757
msgstr ""
758
759
#: bzrlib/builtins.py:1605
760
msgid ""
761
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
762
"will\n"
763
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
764
"./bar.\n"
765
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
766
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
767
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
768
"create ./foo-bar."
769
msgstr ""
770
771
#: bzrlib/builtins.py:1612
772
msgid ""
773
"To retrieve the branch as of a particular revision, supply the --revision\n"
774
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
775
"immediately\n"
776
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
777
"old\n"
778
"code.)"
779
msgstr ""
780
781
#: bzrlib/builtins.py:1622
782
msgid ""
783
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
784
"the branch for every operation. Normal checkouts can perform common "
785
"operations like diff and status without such access, and also support local "
786
"commits."
787
msgstr ""
788
789
#: bzrlib/builtins.py:1629
790
msgid "Get file contents from this tree."
791
msgstr ""
792
793
#: bzrlib/builtins.py:1631
794
msgid "Hard-link working tree files where possible."
795
msgstr ""
796
797
#: bzrlib/builtins.py:1672
798
msgid ""
799
"Show list of renamed files.\n"
800
" "
801
msgstr ""
802
803
#: bzrlib/builtins.py:1700
804
msgid "Update a working tree to a new revision."
805
msgstr ""
806
807
#: bzrlib/builtins.py:1702
808
msgid ""
809
"This will perform a merge of the destination revision (the tip of the\n"
810
"branch, or the specified revision) into the working tree, and then make\n"
811
"that revision the basis revision for the working tree. "
812
msgstr ""
813
814
#: bzrlib/builtins.py:1706
815
msgid ""
816
"You can use this to visit an older revision, or to update a working tree\n"
817
"that is out of date from its branch."
818
msgstr ""
819
820
#: bzrlib/builtins.py:1709
821
msgid ""
822
"If there are any uncommitted changes in the tree, they will be carried\n"
823
"across and remain as uncommitted changes after the update. To discard\n"
824
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
825
"with the changes brought in by the change in basis revision."
826
msgstr ""
827
828
#: bzrlib/builtins.py:1714
829
msgid ""
830
"If the tree's branch is bound to a master branch, bzr will also update\n"
831
"the branch from the master."
832
msgstr ""
833
834
#: bzrlib/builtins.py:1717
835
msgid ""
836
"You cannot update just a single file or directory, because each Bazaar\n"
837
"working tree has just a single basis revision. If you want to restore a\n"
838
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
839
"update'. If you want to restore a file to its state in a previous\n"
840
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
841
"out the old content of that file to a new location."
842
msgstr ""
843
844
#: bzrlib/builtins.py:1724
845
msgid ""
846
"The 'dir' argument, if given, must be the location of the root of a\n"
847
"working tree to update. By default, the working tree that contains the \n"
848
"current working directory is used."
849
msgstr ""
850
851
#: bzrlib/builtins.py:1740
852
msgid "bzr update --revision takes exactly one revision"
853
msgstr ""
854
855
#: bzrlib/builtins.py:1748
856
msgid "bzr update can only update a whole tree, not a file or subdirectory"
857
msgstr ""
858
859
#: bzrlib/builtins.py:1779
860
msgid "Tree is up to date at revision {0} of branch {1}"
861
msgstr ""
862
863
#: bzrlib/builtins.py:1795
864
#, python-format
865
msgid ""
866
"branch has no revision %s\n"
867
"bzr update --revision only works for a revision in the branch history"
868
msgstr ""
869
870
#: bzrlib/builtins.py:1801
871
msgid "Updated to revision {0} of branch {1}"
872
msgstr ""
873
874
#: bzrlib/builtins.py:1805
875
msgid ""
876
"Your local commits will now show as pending merges with 'bzr status', and "
877
"can be committed with 'bzr commit'."
878
msgstr ""
879
880
#: bzrlib/builtins.py:1814
881
msgid "Show information about a working tree, branch or repository."
882
msgstr ""
883
884
#: bzrlib/builtins.py:1816
885
msgid ""
886
"This command will show all known locations and formats associated to the\n"
887
"tree, branch or repository."
888
msgstr ""
889
890
#: bzrlib/builtins.py:1819
891
msgid ""
892
"In verbose mode, statistical information is included with each report.\n"
893
"To see extended statistic information, use a verbosity level of 2 or\n"
894
"higher by specifying the verbose option multiple times, e.g. -vv."
895
msgstr ""
896
897
#: bzrlib/builtins.py:1823
898
msgid "Branches and working trees will also report any missing revisions."
899
msgstr ""
900
901
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
902
#: bzrlib/builtins.py:6466
903
msgid ":Examples:"
904
msgstr ""
905
906
#: bzrlib/builtins.py:1827
907
msgid " Display information on the format and related locations:"
908
msgstr ""
909
910
#: bzrlib/builtins.py:1829
911
msgid " bzr info"
912
msgstr ""
913
914
#: bzrlib/builtins.py:1831
915
msgid ""
916
" Display the above together with extended format information and\n"
917
" basic statistics (like the number of files in the working tree and\n"
918
" number of revisions in the branch and repository):"
919
msgstr ""
920
921
#: bzrlib/builtins.py:1835
922
msgid " bzr info -v"
923
msgstr ""
924
925
#: bzrlib/builtins.py:1837
926
msgid " Display the above together with number of committers to the branch:"
927
msgstr ""
928
929
#: bzrlib/builtins.py:1839
930
msgid " bzr info -vv"
931
msgstr ""
932
933
#: bzrlib/builtins.py:1858
934
msgid "Remove files or directories."
935
msgstr ""
936
937
#: bzrlib/builtins.py:1860
938
msgid ""
939
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
940
"delete them if they can easily be recovered using revert otherwise they\n"
941
"will be backed up (adding an extension of the form .~#~). If no options or\n"
942
"parameters are given Bazaar will scan for files that are being tracked by\n"
943
"Bazaar but missing in your tree and stop tracking them for you."
944
msgstr ""
945
946
#: bzrlib/builtins.py:1868
947
msgid "Only remove files that have never been committed."
948
msgstr ""
949
950
#: bzrlib/builtins.py:1870
951
msgid "The file deletion mode to be used."
952
msgstr ""
953
954
#: bzrlib/builtins.py:1871
955
msgid "Deletion Strategy"
956
msgstr ""
957
958
#: bzrlib/builtins.py:1872
959
msgid "Backup changed files (default)."
960
msgstr ""
961
962
#: bzrlib/builtins.py:1873
963
msgid "Delete from bzr but leave the working copy."
964
msgstr ""
965
966
#: bzrlib/builtins.py:1874
967
msgid "Don't backup changed files."
968
msgstr ""
969
970
#: bzrlib/builtins.py:1875
971
msgid ""
972
"Delete all the specified files, even if they can not be recovered and even "
973
"if they are non-empty directories. (deprecated, use no-backup)"
974
msgstr ""
975
976
#: bzrlib/builtins.py:1884
977
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
978
msgstr ""
979
980
#: bzrlib/builtins.py:1901
981
msgid "No matching files."
982
msgstr ""
983
984
#: bzrlib/builtins.py:1962
985
msgid "Reconcile bzr metadata in a branch."
986
msgstr ""
987
988
#: bzrlib/builtins.py:1964
989
msgid ""
990
"This can correct data mismatches that may have been caused by\n"
991
"previous ghost operations or bzr upgrades. You should only\n"
992
"need to run this command if 'bzr check' or a bzr developer\n"
993
"advises you to run it."
994
msgstr ""
995
996
#: bzrlib/builtins.py:1969
997
msgid ""
998
"If a second branch is provided, cross-branch reconciliation is\n"
999
"also attempted, which will check that data like the tree root\n"
1000
"id which was not present in very early bzr versions is represented\n"
1001
"correctly in both branches."
1002
msgstr ""
1003
1004
#: bzrlib/builtins.py:1974
1005
msgid ""
1006
"At the same time it is run it may recompress data resulting in\n"
1007
"a potential saving in disk space or performance gain."
1008
msgstr ""
1009
1010
#: bzrlib/builtins.py:1977
1011
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1012
msgstr ""
1013
1014
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1015
msgid ""
1016
"Format for the bzr 2.0 series.\n"
1017
"Uses group-compress storage.\n"
1018
"Provides rich roots which are a one-way transition.\n"
1019
msgstr ""
1020
1021
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1022
msgid ""
1023
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1024
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1025
msgstr ""
1026
1027
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1028
msgid "The 2a format with experimental support for colocated branches.\n"
1029
msgstr ""
1030
1031
#: bzrlib/builtins.py:2045
1032
msgid "Make a directory into a versioned branch."
1033
msgstr ""
1034
1035
#: bzrlib/builtins.py:2047
1036
msgid ""
1037
"Use this to create an empty branch, or before importing an\n"
1038
"existing project."
1039
msgstr ""
1040
1041
#: bzrlib/builtins.py:2050
1042
msgid ""
1043
"If there is a repository in a parent directory of the location, then\n"
1044
"the history of the branch will be stored in the repository. Otherwise\n"
1045
"init creates a standalone branch which carries its own history\n"
1046
"in the .bzr directory."
1047
msgstr ""
1048
1049
#: bzrlib/builtins.py:2055
1050
msgid ""
1051
"If there is already a branch at the location but it has no working tree,\n"
1052
"the tree can be populated with 'bzr checkout'."
1053
msgstr ""
1054
1055
#: bzrlib/builtins.py:2058
1056
msgid "Recipe for importing a tree of files::"
1057
msgstr ""
1058
1059
#: bzrlib/builtins.py:2060
1060
msgid ""
1061
" cd ~/project\n"
1062
" bzr init\n"
1063
" bzr add .\n"
1064
" bzr status\n"
1065
" bzr commit -m \"imported project\""
1066
msgstr ""
1067
1068
#: bzrlib/builtins.py:2071
1069
msgid ""
1070
"Create the path leading up to the branch if it does not already exist."
1071
msgstr ""
1072
1073
#: bzrlib/builtins.py:2074
1074
msgid "Specify a format for this branch. See \"help formats\"."
1075
msgstr ""
1076
1077
#: bzrlib/builtins.py:2082
1078
msgid ""
1079
"Never change revnos or the existing log. Append revisions to it only."
1080
msgstr ""
1081
1082
#: bzrlib/builtins.py:2085
1083
msgid "Create a branch without a working tree."
1084
msgstr ""
1085
1086
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1087
#, python-format
1088
msgid ""
1089
"Parent directory of %s does not exist.\n"
1090
"You may supply --create-prefix to create all leading parent directories."
1091
msgstr ""
1092
1093
#: bzrlib/builtins.py:2139
1094
msgid ""
1095
"This branch format cannot be set to append-revisions-only. Try --default."
1096
msgstr ""
1097
1098
#: bzrlib/builtins.py:2150
1099
msgid "Created a {0} (format: {1})\n"
1100
msgstr ""
1101
1102
#: bzrlib/builtins.py:2159
1103
#, python-format
1104
msgid "Using shared repository: %s\n"
1105
msgstr ""
1106
1107
#: bzrlib/builtins.py:2163
1108
msgid "Create a shared repository for branches to share storage space."
1109
msgstr ""
1110
1111
#: bzrlib/builtins.py:2165
1112
msgid ""
1113
"New branches created under the repository directory will store their\n"
1114
"revisions in the repository, not in the branch directory. For branches\n"
1115
"with shared history, this reduces the amount of storage needed and \n"
1116
"speeds up the creation of new branches."
1117
msgstr ""
1118
1119
#: bzrlib/builtins.py:2170
1120
msgid ""
1121
"If the --no-trees option is given then the branches in the repository\n"
1122
"will not have working trees by default. They will still exist as \n"
1123
"directories on disk, but they will not have separate copies of the \n"
1124
"files at a certain revision. This can be useful for repositories that\n"
1125
"store branches which are interacted with through checkouts or remote\n"
1126
"branches, such as on a server."
1127
msgstr ""
1128
1129
#: bzrlib/builtins.py:2177
1130
msgid ""
1131
":Examples:\n"
1132
" Create a shared repository holding just branches::"
1133
msgstr ""
1134
1135
#: bzrlib/builtins.py:2180
1136
msgid ""
1137
" bzr init-repo --no-trees repo\n"
1138
" bzr init repo/trunk"
1139
msgstr ""
1140
1141
#: bzrlib/builtins.py:2183
1142
msgid " Make a lightweight checkout elsewhere::"
1143
msgstr ""
1144
1145
#: bzrlib/builtins.py:2185
1146
msgid ""
1147
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1148
" cd trunk-checkout\n"
1149
" (add files here)"
1150
msgstr ""
1151
1152
#: bzrlib/builtins.py:2193
1153
msgid ""
1154
"Specify a format for this repository. See \"bzr help formats\" for details."
1155
msgstr ""
1156
1157
#: bzrlib/builtins.py:2197
1158
msgid "Repository format"
1159
msgstr ""
1160
1161
#: bzrlib/builtins.py:2199
1162
msgid "Branches in the repository will default to not having a working tree."
1163
msgstr ""
1164
1165
#: bzrlib/builtins.py:2225
1166
msgid "Show differences in the working tree, between revisions or branches."
1167
msgstr ""
1168
1169
#: bzrlib/builtins.py:2227
1170
msgid ""
1171
"If no arguments are given, all changes for the current tree are listed.\n"
1172
"If files are given, only the changes in those files are listed.\n"
1173
"Remote and multiple branches can be compared by using the --old and\n"
1174
"--new options. If not provided, the default for both is derived from\n"
1175
"the first argument, if any, or the current tree if no arguments are\n"
1176
"given."
1177
msgstr ""
1178
1179
#: bzrlib/builtins.py:2234
1180
msgid ""
1181
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1182
"produces patches suitable for \"patch -p1\"."
1183
msgstr ""
1184
1185
#: bzrlib/builtins.py:2237
1186
msgid ""
1187
"Note that when using the -r argument with a range of revisions, the\n"
1188
"differences are computed between the two specified revisions. That\n"
1189
"is, the command does not show the changes introduced by the first \n"
1190
"revision in the range. This differs from the interpretation of \n"
1191
"revision ranges used by \"bzr log\" which includes the first revision\n"
1192
"in the range."
1193
msgstr ""
1194
1195
#: bzrlib/builtins.py:2244
1196
msgid ""
1197
":Exit values:\n"
1198
" 1 - changed\n"
1199
" 2 - unrepresentable changes\n"
1200
" 3 - error\n"
1201
" 0 - no change"
1202
msgstr ""
1203
1204
#: bzrlib/builtins.py:2250
1205
msgid ""
1206
":Examples:\n"
1207
" Shows the difference in the working tree versus the last commit::"
1208
msgstr ""
1209
1210
#: bzrlib/builtins.py:2253
1211
msgid " bzr diff"
1212
msgstr ""
1213
1214
#: bzrlib/builtins.py:2255
1215
msgid " Difference between the working tree and revision 1::"
1216
msgstr ""
1217
1218
#: bzrlib/builtins.py:2257
1219
msgid " bzr diff -r1"
1220
msgstr ""
1221
1222
#: bzrlib/builtins.py:2259
1223
msgid " Difference between revision 3 and revision 1::"
1224
msgstr ""
1225
1226
#: bzrlib/builtins.py:2261
1227
msgid " bzr diff -r1..3"
1228
msgstr ""
1229
1230
#: bzrlib/builtins.py:2263
1231
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1232
msgstr ""
1233
1234
#: bzrlib/builtins.py:2265
1235
msgid " bzr diff -r1..3 xxx"
1236
msgstr ""
1237
1238
#: bzrlib/builtins.py:2267
1239
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1240
msgstr ""
1241
1242
#: bzrlib/builtins.py:2269
1243
msgid " bzr diff -c2"
1244
msgstr ""
1245
1246
#: bzrlib/builtins.py:2271
1247
msgid ""
1248
" To see the changes introduced by revision X::\n"
1249
" \n"
1250
" bzr diff -cX"
1251
msgstr ""
1252
1253
#: bzrlib/builtins.py:2275
1254
msgid ""
1255
" Note that in the case of a merge, the -c option shows the changes\n"
1256
" compared to the left hand parent. To see the changes against\n"
1257
" another parent, use::"
1258
msgstr ""
1259
1260
#: bzrlib/builtins.py:2279
1261
msgid " bzr diff -r<chosen_parent>..X"
1262
msgstr ""
1263
1264
#: bzrlib/builtins.py:2281
1265
msgid ""
1266
" The changes between the current revision and the previous revision\n"
1267
" (equivalent to -c-1 and -r-2..-1)"
1268
msgstr ""
1269
1270
#: bzrlib/builtins.py:2284
1271
msgid " bzr diff -r-2.."
1272
msgstr ""
1273
1274
#: bzrlib/builtins.py:2286
1275
msgid " Show just the differences for file NEWS::"
1276
msgstr ""
1277
1278
#: bzrlib/builtins.py:2288
1279
msgid " bzr diff NEWS"
1280
msgstr ""
1281
1282
#: bzrlib/builtins.py:2290
1283
msgid " Show the differences in working tree xxx for file NEWS::"
1284
msgstr ""
1285
1286
#: bzrlib/builtins.py:2292
1287
msgid " bzr diff xxx/NEWS"
1288
msgstr ""
1289
1290
#: bzrlib/builtins.py:2294
1291
msgid " Show the differences from branch xxx to this working tree:"
1292
msgstr ""
1293
1294
#: bzrlib/builtins.py:2296
1295
msgid " bzr diff --old xxx"
1296
msgstr ""
1297
1298
#: bzrlib/builtins.py:2298
1299
msgid " Show the differences between two branches for file NEWS::"
1300
msgstr ""
1301
1302
#: bzrlib/builtins.py:2300
1303
msgid " bzr diff --old xxx --new yyy NEWS"
1304
msgstr ""
1305
1306
#: bzrlib/builtins.py:2302
1307
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1308
msgstr ""
1309
1310
#: bzrlib/builtins.py:2304
1311
msgid ""
1312
" bzr diff --prefix old/:new/\n"
1313
" \n"
1314
" Show the differences using a custom diff program with options::\n"
1315
" \n"
1316
" bzr diff --using /usr/bin/diff --diff-options -wu"
1317
msgstr ""
1318
1319
#: bzrlib/builtins.py:2314
1320
msgid "Pass these options to the external diff program."
1321
msgstr ""
1322
1323
#: bzrlib/builtins.py:2317
1324
msgid ""
1325
"Set prefixes added to old and new filenames, as two values separated by a "
1326
"colon. (eg \"old/:new/\")."
1327
msgstr ""
1328
1329
#: bzrlib/builtins.py:2320
1330
msgid "Branch/tree to compare from."
1331
msgstr ""
1332
1333
#: bzrlib/builtins.py:2324
1334
msgid "Branch/tree to compare to."
1335
msgstr ""
1336
1337
#: bzrlib/builtins.py:2330
1338
msgid "Use this command to compare files."
1339
msgstr ""
1340
1341
#: bzrlib/builtins.py:2335
1342
msgid "Diff format to use."
1343
msgstr ""
1344
1345
#: bzrlib/builtins.py:2337
1346
msgid "Diff format"
1347
msgstr ""
1348
1349
#: bzrlib/builtins.py:2359
1350
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1351
msgstr ""
1352
1353
#: bzrlib/builtins.py:2363
1354
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1355
msgstr ""
1356
1357
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1358
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1359
msgid "{0} and {1} are mutually exclusive"
1360
msgstr ""
1361
1362
#: bzrlib/builtins.py:2388
1363
msgid ""
1364
"List files deleted in the working tree.\n"
1365
" "
1366
msgstr ""
1367
1368
#: bzrlib/builtins.py:2465
1369
msgid "Show the tree root directory."
1370
msgstr ""
1371
1372
#: bzrlib/builtins.py:2467
1373
msgid ""
1374
"The root is the nearest enclosing directory with a .bzr control\n"
1375
"directory."
1376
msgstr ""
1377
1378
#: bzrlib/builtins.py:2482
1379
msgid "The limit argument must be an integer."
1380
msgstr ""
1381
1382
#: bzrlib/builtins.py:2490
1383
msgid "The levels argument must be an integer."
1384
msgstr ""
1385
1386
#: bzrlib/builtins.py:2495
1387
msgid "Show historical log for a branch or subset of a branch."
1388
msgstr ""
1389
1390
#: bzrlib/builtins.py:2497
1391
msgid ""
1392
"log is bzr's default tool for exploring the history of a branch.\n"
1393
"The branch to use is taken from the first parameter. If no parameters\n"
1394
"are given, the branch containing the working directory is logged.\n"
1395
"Here are some simple examples::"
1396
msgstr ""
1397
1398
#: bzrlib/builtins.py:2502
1399
msgid ""
1400
" bzr log log the current branch\n"
1401
" bzr log foo.py log a file in its branch\n"
1402
" bzr log http://server/branch log a branch on a server"
1403
msgstr ""
1404
1405
#: bzrlib/builtins.py:2506
1406
msgid ""
1407
"The filtering, ordering and information shown for each revision can\n"
1408
"be controlled as explained below. By default, all revisions are\n"
1409
"shown sorted (topologically) so that newer revisions appear before\n"
1410
"older ones and descendants always appear before ancestors. If displayed,\n"
1411
"merged revisions are shown indented under the revision in which they\n"
1412
"were merged."
1413
msgstr ""
1414
1415
#: bzrlib/builtins.py:2513
1416
msgid ":Output control:"
1417
msgstr ""
1418
1419
#: bzrlib/builtins.py:2515
1420
msgid ""
1421
" The log format controls how information about each revision is\n"
1422
" displayed. The standard log formats are called ``long``, ``short``\n"
1423
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1424
" for more details on log formats."
1425
msgstr ""
1426
1427
#: bzrlib/builtins.py:2520
1428
msgid ""
1429
" The following options can be used to control what information is\n"
1430
" displayed::"
1431
msgstr ""
1432
1433
#: bzrlib/builtins.py:2523
1434
msgid ""
1435
" -l N display a maximum of N revisions\n"
1436
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1437
" -v display a status summary (delta) for each revision\n"
1438
" -p display a diff (patch) for each revision\n"
1439
" --show-ids display revision-ids (and file-ids), not just revnos"
1440
msgstr ""
1441
1442
#: bzrlib/builtins.py:2529
1443
msgid ""
1444
" Note that the default number of levels to display is a function of the\n"
1445
" log format. If the -n option is not used, the standard log formats show\n"
1446
" just the top level (mainline)."
1447
msgstr ""
1448
1449
#: bzrlib/builtins.py:2533
1450
msgid ""
1451
" Status summaries are shown using status flags like A, M, etc. To see\n"
1452
" the changes explained using words like ``added`` and ``modified``\n"
1453
" instead, use the -vv option."
1454
msgstr ""
1455
1456
#: bzrlib/builtins.py:2537
1457
msgid ":Ordering control:"
1458
msgstr ""
1459
1460
#: bzrlib/builtins.py:2539
1461
msgid ""
1462
" To display revisions from oldest to newest, use the --forward option.\n"
1463
" In most cases, using this option will have little impact on the total\n"
1464
" time taken to produce a log, though --forward does not incrementally\n"
1465
" display revisions like --reverse does when it can."
1466
msgstr ""
1467
1468
#: bzrlib/builtins.py:2544
1469
msgid ":Revision filtering:"
1470
msgstr ""
1471
1472
#: bzrlib/builtins.py:2546
1473
msgid ""
1474
" The -r option can be used to specify what revision or range of revisions\n"
1475
" to filter against. The various forms are shown below::"
1476
msgstr ""
1477
1478
#: bzrlib/builtins.py:2549
1479
msgid ""
1480
" -rX display revision X\n"
1481
" -rX.. display revision X and later\n"
1482
" -r..Y display up to and including revision Y\n"
1483
" -rX..Y display from X to Y inclusive"
1484
msgstr ""
1485
1486
#: bzrlib/builtins.py:2554
1487
msgid ""
1488
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1489
" Some common examples are given below::"
1490
msgstr ""
1491
1492
#: bzrlib/builtins.py:2557
1493
msgid ""
1494
" -r-1 show just the tip\n"
1495
" -r-10.. show the last 10 mainline revisions\n"
1496
" -rsubmit:.. show what's new on this branch\n"
1497
" -rancestor:path.. show changes since the common ancestor of this\n"
1498
" branch and the one at location path\n"
1499
" -rdate:yesterday.. show changes since yesterday"
1500
msgstr ""
1501
1502
#: bzrlib/builtins.py:2564
1503
msgid ""
1504
" When logging a range of revisions using -rX..Y, log starts at\n"
1505
" revision Y and searches back in history through the primary\n"
1506
" (\"left-hand\") parents until it finds X. When logging just the\n"
1507
" top level (using -n1), an error is reported if X is not found\n"
1508
" along the way. If multi-level logging is used (-n0), X may be\n"
1509
" a nested merge revision and the log will be truncated accordingly."
1510
msgstr ""
1511
1512
#: bzrlib/builtins.py:2571
1513
msgid ":Path filtering:"
1514
msgstr ""
1515
1516
#: bzrlib/builtins.py:2573
1517
msgid ""
1518
" If parameters are given and the first one is not a branch, the log\n"
1519
" will be filtered to show only those revisions that changed the\n"
1520
" nominated files or directories."
1521
msgstr ""
1522
1523
#: bzrlib/builtins.py:2577
1524
msgid ""
1525
" Filenames are interpreted within their historical context. To log a\n"
1526
" deleted file, specify a revision range so that the file existed at\n"
1527
" the end or start of the range."
1528
msgstr ""
1529
1530
#: bzrlib/builtins.py:2581
1531
msgid ""
1532
" Historical context is also important when interpreting pathnames of\n"
1533
" renamed files/directories. Consider the following example:"
1534
msgstr ""
1535
1536
#: bzrlib/builtins.py:2584
1537
msgid ""
1538
" * revision 1: add tutorial.txt\n"
1539
" * revision 2: modify tutorial.txt\n"
1540
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1541
msgstr ""
1542
1543
#: bzrlib/builtins.py:2588
1544
msgid " In this case:"
1545
msgstr ""
1546
1547
#: bzrlib/builtins.py:2590
1548
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1549
msgstr ""
1550
1551
#: bzrlib/builtins.py:2592
1552
msgid ""
1553
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1554
msgstr ""
1555
1556
#: bzrlib/builtins.py:2594
1557
msgid ""
1558
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1559
" the original file in revision 2."
1560
msgstr ""
1561
1562
#: bzrlib/builtins.py:2597
1563
msgid ""
1564
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1565
" was no file called guide.txt in revision 2."
1566
msgstr ""
1567
1568
#: bzrlib/builtins.py:2600
1569
msgid ""
1570
" Renames are always followed by log. By design, there is no need to\n"
1571
" explicitly ask for this (and no way to stop logging a file back\n"
1572
" until it was last renamed)."
1573
msgstr ""
1574
1575
#: bzrlib/builtins.py:2604
1576
msgid ":Other filtering:"
1577
msgstr ""
1578
1579
#: bzrlib/builtins.py:2606
1580
msgid ""
1581
" The --match option can be used for finding revisions that match a\n"
1582
" regular expression in a commit message, committer, author or bug.\n"
1583
" Specifying the option several times will match any of the supplied\n"
1584
" expressions. --match-author, --match-bugs, --match-committer and\n"
1585
" --match-message can be used to only match a specific field."
1586
msgstr ""
1587
1588
#: bzrlib/builtins.py:2612
1589
msgid ":Tips & tricks:"
1590
msgstr ""
1591
1592
#: bzrlib/builtins.py:2614
1593
msgid ""
1594
" GUI tools and IDEs are often better at exploring history than command\n"
1595
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1596
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1597
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1598
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1599
msgstr ""
1600
1601
#: bzrlib/builtins.py:2620
1602
msgid ""
1603
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1604
msgstr ""
1605
1606
#: bzrlib/builtins.py:2622
1607
msgid ""
1608
" [ALIASES]\n"
1609
" tip = log -r-1\n"
1610
" top = log -l10 --line\n"
1611
" show = log -v -p"
1612
msgstr ""
1613
1614
#: bzrlib/builtins.py:2627
1615
msgid ""
1616
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1617
" will show the last 10 mainline revisions. To see the details of a\n"
1618
" particular revision X, ``bzr show -rX``."
1619
msgstr ""
1620
1621
#: bzrlib/builtins.py:2631
1622
msgid ""
1623
" If you are interested in looking deeper into a particular merge X,\n"
1624
" use ``bzr log -n0 -rX``."
1625
msgstr ""
1626
1627
#: bzrlib/builtins.py:2634
1628
msgid ""
1629
" ``bzr log -v`` on a branch with lots of history is currently\n"
1630
" very slow. A fix for this issue is currently under development.\n"
1631
" With or without that fix, it is recommended that a revision range\n"
1632
" be given when using the -v option."
1633
msgstr ""
1634
1635
#: bzrlib/builtins.py:2639
1636
msgid ""
1637
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1638
" used to find revisions matching user names, commit messages, etc.\n"
1639
" Among other features, this plugin can find all revisions containing\n"
1640
" a list of words but not others."
1641
msgstr ""
1642
1643
#: bzrlib/builtins.py:2644
1644
msgid ""
1645
" When exploring non-mainline history on large projects with deep\n"
1646
" history, the performance of log can be greatly improved by installing\n"
1647
" the historycache plugin. This plugin buffers historical information\n"
1648
" trading disk space for faster speed."
1649
msgstr ""
1650
1651
#: bzrlib/builtins.py:2653
1652
msgid "Show from oldest to newest."
1653
msgstr ""
1654
1655
#: bzrlib/builtins.py:2656
1656
msgid "Show files changed in each revision."
1657
msgstr ""
1658
1659
#: bzrlib/builtins.py:2662
1660
msgid "Show just the specified revision. See also \"help revisionspec\"."
1661
msgstr ""
1662
1663
#: bzrlib/builtins.py:2666
1664
msgid "What names to list as authors - first, all or committer."
1665
msgstr ""
1666
1667
#: bzrlib/builtins.py:2667
1668
msgid "Authors"
1669
msgstr ""
1670
1671
#: bzrlib/builtins.py:2672
1672
msgid "Number of levels to display - 0 for all, 1 for flat."
1673
msgstr ""
1674
1675
#: bzrlib/builtins.py:2682
1676
msgid "Limit the output to the first N revisions."
1677
msgstr ""
1678
1679
#: bzrlib/builtins.py:2687
1680
msgid "Show changes made in each revision as a patch."
1681
msgstr ""
1682
1683
#: bzrlib/builtins.py:2689
1684
msgid "Show merged revisions like --levels 0 does."
1685
msgstr ""
1686
1687
#: bzrlib/builtins.py:2693
1688
msgid "Do not report commits with more than one parent."
1689
msgstr ""
1690
1691
#: bzrlib/builtins.py:2695
1692
msgid ""
1693
"Display only the revisions that are not part of both ancestries (require -"
1694
"rX..Y)."
1695
msgstr ""
1696
1697
#: bzrlib/builtins.py:2699
1698
msgid "Show digital signature validity."
1699
msgstr ""
1700
1701
#: bzrlib/builtins.py:2702
1702
msgid "Show revisions whose properties match this expression."
1703
msgstr ""
1704
1705
#: bzrlib/builtins.py:2706
1706
msgid "Show revisions whose message matches this expression."
1707
msgstr ""
1708
1709
#: bzrlib/builtins.py:2710
1710
msgid "Show revisions whose committer matches this expression."
1711
msgstr ""
1712
1713
#: bzrlib/builtins.py:2714
1714
msgid "Show revisions whose authors match this expression."
1715
msgstr ""
1716
1717
#: bzrlib/builtins.py:2718
1718
msgid "Show revisions whose bugs match this expression."
1719
msgstr ""
1720
1721
#: bzrlib/builtins.py:2772
1722
msgid "--exclude-common-ancestry requires -r with two revisions"
1723
msgstr ""
1724
1725
#: bzrlib/builtins.py:2800
1726
#, python-format
1727
msgid "Path unknown at end or start of revision range: %s"
1728
msgstr ""
1729
1730
#: bzrlib/builtins.py:2917
1731
#, python-format
1732
msgid "bzr %s doesn't accept two revisions in different branches."
1733
msgstr ""
1734
1735
#: bzrlib/builtins.py:2933
1736
#, python-format
1737
msgid "bzr %s --revision takes one or two values."
1738
msgstr ""
1739
1740
#: bzrlib/builtins.py:2978
1741
msgid ""
1742
"List files in a tree.\n"
1743
" "
1744
msgstr ""
1745
1746
#: bzrlib/builtins.py:2987
1747
msgid "Recurse into subdirectories."
1748
msgstr ""
1749
1750
#: bzrlib/builtins.py:2989
1751
msgid "Print paths relative to the root of the branch."
1752
msgstr ""
1753
1754
#: bzrlib/builtins.py:2991
1755
msgid "Print unknown files."
1756
msgstr ""
1757
1758
#: bzrlib/builtins.py:2992
1759
msgid "Print versioned files."
1760
msgstr ""
1761
1762
#: bzrlib/builtins.py:2995
1763
msgid "Print ignored files."
1764
msgstr ""
1765
1766
#: bzrlib/builtins.py:2997
1767
msgid "List entries of a particular kind: file, directory, symlink."
1768
msgstr ""
1769
1770
#: bzrlib/builtins.py:3010
1771
msgid "invalid kind specified"
1772
msgstr ""
1773
1774
#: bzrlib/builtins.py:3013
1775
msgid "Cannot set both --verbose and --null"
1776
msgstr ""
1777
1778
#: bzrlib/builtins.py:3022
1779
msgid "cannot specify both --from-root and PATH"
1780
msgstr ""
1781
1782
#: bzrlib/builtins.py:3109
1783
msgid "Ignore specified files or patterns."
1784
msgstr ""
1785
1786
#: bzrlib/builtins.py:3111
1787
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1788
msgstr ""
1789
1790
#: bzrlib/builtins.py:3113
1791
msgid ""
1792
"If a .bzrignore file does not exist, the ignore command\n"
1793
"will create one and add the specified files or patterns to the newly\n"
1794
"created file. The ignore command will also automatically add the \n"
1795
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1796
"the use of the ignore command will require an explicit add command."
1797
msgstr ""
1798
1799
#: bzrlib/builtins.py:3119
1800
msgid ""
1801
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1802
"After adding, editing or deleting that file either indirectly by\n"
1803
"using this command or directly by using an editor, be sure to commit\n"
1804
"it."
1805
msgstr ""
1806
1807
#: bzrlib/builtins.py:3124
1808
msgid ""
1809
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1810
"the global ignore file can be found in the application data directory as\n"
1811
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1812
"Global ignores are not touched by this command. The global ignore file\n"
1813
"can be edited directly using an editor."
1814
msgstr ""
1815
1816
#: bzrlib/builtins.py:3130
1817
msgid ""
1818
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1819
"precedence over regular ignores. Such exceptions are used to specify\n"
1820
"files that should be versioned which would otherwise be ignored."
1821
msgstr ""
1822
1823
#: bzrlib/builtins.py:3134
1824
msgid ""
1825
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1826
"precedence over the '!' exception patterns."
1827
msgstr ""
1828
1829
#: bzrlib/builtins.py:3137
1830
msgid ""
1831
":Notes: \n"
1832
" \n"
1833
"* Ignore patterns containing shell wildcards must be quoted from\n"
1834
" the shell on Unix."
1835
msgstr ""
1836
1837
#: bzrlib/builtins.py:3142
1838
msgid ""
1839
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1840
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1841
msgstr ""
1842
1843
#: bzrlib/builtins.py:3145
1844
msgid ""
1845
":Examples:\n"
1846
" Ignore the top level Makefile::"
1847
msgstr ""
1848
1849
#: bzrlib/builtins.py:3148
1850
msgid " bzr ignore ./Makefile"
1851
msgstr ""
1852
1853
#: bzrlib/builtins.py:3150
1854
msgid " Ignore .class files in all directories...::"
1855
msgstr ""
1856
1857
#: bzrlib/builtins.py:3152
1858
msgid " bzr ignore \"*.class\""
1859
msgstr ""
1860
1861
#: bzrlib/builtins.py:3154
1862
msgid " ...but do not ignore \"special.class\"::"
1863
msgstr ""
1864
1865
#: bzrlib/builtins.py:3156
1866
msgid " bzr ignore \"!special.class\""
1867
msgstr ""
1868
1869
#: bzrlib/builtins.py:3158
1870
msgid " Ignore files whose name begins with the \"#\" character::"
1871
msgstr ""
1872
1873
#: bzrlib/builtins.py:3160
1874
msgid " bzr ignore \"RE:^#\""
1875
msgstr ""
1876
1877
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1878
msgid " Ignore .o files under the lib directory::"
1879
msgstr ""
1880
1881
#: bzrlib/builtins.py:3164
1882
msgid " bzr ignore \"lib/**/*.o\""
1883
msgstr ""
1884
1885
#: bzrlib/builtins.py:3168
1886
msgid " bzr ignore \"RE:lib/.*\\.o\""
1887
msgstr ""
1888
1889
#: bzrlib/builtins.py:3170
1890
msgid " Ignore everything but the \"debian\" toplevel directory::"
1891
msgstr ""
1892
1893
#: bzrlib/builtins.py:3172
1894
msgid ""
1895
" bzr ignore \"RE:(?!debian/).*\"\n"
1896
" \n"
1897
" Ignore everything except the \"local\" toplevel directory,\n"
1898
" but always ignore autosave files ending in ~, even under local/::\n"
1899
" \n"
1900
" bzr ignore \"*\"\n"
1901
" bzr ignore \"!./local\"\n"
1902
" bzr ignore \"!!*~\""
1903
msgstr ""
1904
1905
#: bzrlib/builtins.py:3186
1906
msgid "Display the default ignore rules that bzr uses."
1907
msgstr ""
1908
1909
#: bzrlib/builtins.py:3198
1910
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1911
msgstr ""
1912
1913
#: bzrlib/builtins.py:3209
1914
#, python-format
1915
msgid "Invalid ignore pattern found. %s"
1916
msgid_plural "Invalid ignore patterns found. %s"
1917
msgstr[0] ""
1918
msgstr[1] ""
1919
1920
#: bzrlib/builtins.py:3218
1921
msgid "NAME_PATTERN should not be an absolute path"
1922
msgstr ""
1923
1924
#: bzrlib/builtins.py:3231
1925
#, python-format
1926
msgid ""
1927
"Warning: the following files are version controlled and match your ignore "
1928
"pattern:\n"
1929
"%s\n"
1930
"These files will continue to be version controlled unless you 'bzr remove' "
1931
"them.\n"
1932
msgstr ""
1933
1934
#: bzrlib/builtins.py:3238
1935
msgid "List ignored files and the patterns that matched them."
1936
msgstr ""
1937
1938
#: bzrlib/builtins.py:3240
1939
msgid ""
1940
"List all the ignored files and the ignore pattern that caused the file to\n"
1941
"be ignored."
1942
msgstr ""
1943
1944
#: bzrlib/builtins.py:3243
1945
msgid "Alternatively, to list just the files::"
1946
msgstr ""
1947
1948
#: bzrlib/builtins.py:3245
1949
msgid " bzr ls --ignored"
1950
msgstr ""
1951
1952
#: bzrlib/builtins.py:3279
1953
#, python-format
1954
msgid "not a valid revision-number: %r"
1955
msgstr ""
1956
1957
#: bzrlib/builtins.py:3286
1958
msgid ""
1959
"Export current or past revision to a destination directory or archive."
1960
msgstr ""
1961
1962
#: bzrlib/builtins.py:3288
1963
msgid "If no revision is specified this exports the last committed revision."
1964
msgstr ""
1965
1966
#: bzrlib/builtins.py:3290
1967
msgid ""
1968
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1969
"given, try to find the format with the extension. If no extension\n"
1970
"is found exports to a directory (equivalent to --format=dir)."
1971
msgstr ""
1972
1973
#: bzrlib/builtins.py:3294
1974
msgid ""
1975
"If root is supplied, it will be used as the root directory inside\n"
1976
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1977
"to the exported filename. The root option has no effect for 'dir' format."
1978
msgstr ""
1979
1980
#: bzrlib/builtins.py:3298
1981
msgid ""
1982
"If branch is omitted then the branch containing the current working\n"
1983
"directory will be used."
1984
msgstr ""
1985
1986
#: bzrlib/builtins.py:3301
1987
msgid ""
1988
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1989
msgstr ""
1990
1991
#: bzrlib/builtins.py:3303
1992
msgid ""
1993
" ================= =========================\n"
1994
" Supported formats Autodetected by extension\n"
1995
" ================= =========================\n"
1996
" dir (none)\n"
1997
" tar .tar\n"
1998
" tbz2 .tar.bz2, .tbz2\n"
1999
" tgz .tar.gz, .tgz\n"
2000
" zip .zip\n"
2001
" ================= ========================="
2002
msgstr ""
2003
2004
#: bzrlib/builtins.py:3317
2005
msgid "Type of file to export to."
2006
msgstr ""
2007
2008
#: bzrlib/builtins.py:3320
2009
msgid "Apply content filters to export the convenient form."
2010
msgstr ""
2011
2012
#: bzrlib/builtins.py:3324
2013
msgid "Name of the root directory inside the exported file."
2014
msgstr ""
2015
2016
#: bzrlib/builtins.py:3326
2017
msgid ""
2018
"Set modification time of files to that of the last revision in which it was "
2019
"changed."
2020
msgstr ""
2021
2022
#: bzrlib/builtins.py:3329
2023
msgid ""
2024
"Export the working tree contents rather than that of the last revision."
2025
msgstr ""
2026
2027
#: bzrlib/builtins.py:3348
2028
msgid "--uncommitted requires a working tree"
2029
msgstr ""
2030
2031
#: bzrlib/builtins.py:3357
2032
#, python-format
2033
msgid "Unsupported export format: %s"
2034
msgstr ""
2035
2036
#: bzrlib/builtins.py:3361
2037
msgid ""
2038
"Write the contents of a file as of a given revision to standard output."
2039
msgstr ""
2040
2041
#: bzrlib/builtins.py:3363
2042
msgid "If no revision is nominated, the last revision is used."
2043
msgstr ""
2044
2045
#: bzrlib/builtins.py:3365
2046
msgid ""
2047
"Note: Take care to redirect standard output when using this command on a\n"
2048
"binary file."
2049
msgstr ""
2050
2051
#: bzrlib/builtins.py:3371
2052
msgid "The path name in the old tree."
2053
msgstr ""
2054
2055
#: bzrlib/builtins.py:3372
2056
msgid "Apply content filters to display the convenience form."
2057
msgstr ""
2058
2059
#: bzrlib/builtins.py:3383
2060
msgid "bzr cat --revision takes exactly one revision specifier"
2061
msgstr ""
2062
2063
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2064
msgid "{0!r} is not present in revision {1}"
2065
msgstr ""
2066
2067
#: bzrlib/builtins.py:3443
2068
msgid "Commit changes into a new revision."
2069
msgstr ""
2070
2071
#: bzrlib/builtins.py:3445
2072
msgid ""
2073
"An explanatory message needs to be given for each commit. This is\n"
2074
"often done by using the --message option (getting the message from the\n"
2075
"command line) or by using the --file option (getting the message from\n"
2076
"a file). If neither of these options is given, an editor is opened for\n"
2077
"the user to enter the message. To see the changed files in the\n"
2078
"boilerplate text loaded into the editor, use the --show-diff option."
2079
msgstr ""
2080
2081
#: bzrlib/builtins.py:3452
2082
msgid ""
2083
"By default, the entire tree is committed and the person doing the\n"
2084
"commit is assumed to be the author. These defaults can be overridden\n"
2085
"as explained below."
2086
msgstr ""
2087
2088
#: bzrlib/builtins.py:3456
2089
msgid ":Selective commits:"
2090
msgstr ""
2091
2092
#: bzrlib/builtins.py:3458
2093
msgid ""
2094
" If selected files are specified, only changes to those files are\n"
2095
" committed. If a directory is specified then the directory and\n"
2096
" everything within it is committed."
2097
msgstr ""
2098
2099
#: bzrlib/builtins.py:3462
2100
msgid ""
2101
" When excludes are given, they take precedence over selected files.\n"
2102
" For example, to commit only changes within foo, but not changes\n"
2103
" within foo/bar::"
2104
msgstr ""
2105
2106
#: bzrlib/builtins.py:3466
2107
msgid " bzr commit foo -x foo/bar"
2108
msgstr ""
2109
2110
#: bzrlib/builtins.py:3468
2111
msgid " A selective commit after a merge is not yet supported."
2112
msgstr ""
2113
2114
#: bzrlib/builtins.py:3470
2115
msgid ":Custom authors:"
2116
msgstr ""
2117
2118
#: bzrlib/builtins.py:3472
2119
msgid ""
2120
" If the author of the change is not the same person as the committer,\n"
2121
" you can specify the author's name using the --author option. The\n"
2122
" name should be in the same format as a committer-id, e.g.\n"
2123
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2124
" the change you can specify the option multiple times, once for each\n"
2125
" author."
2126
msgstr ""
2127
2128
#: bzrlib/builtins.py:3479
2129
msgid ":Checks:"
2130
msgstr ""
2131
2132
#: bzrlib/builtins.py:3481
2133
msgid ""
2134
" A common mistake is to forget to add a new file or directory before\n"
2135
" running the commit command. The --strict option checks for unknown\n"
2136
" files and aborts the commit if any are found. More advanced pre-commit\n"
2137
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2138
" for details."
2139
msgstr ""
2140
2141
#: bzrlib/builtins.py:3487
2142
msgid ":Things to note:"
2143
msgstr ""
2144
2145
#: bzrlib/builtins.py:3489
2146
msgid ""
2147
" If you accidentially commit the wrong changes or make a spelling\n"
2148
" mistake in the commit message say, you can use the uncommit command\n"
2149
" to undo it. See ``bzr help uncommit`` for details."
2150
msgstr ""
2151
2152
#: bzrlib/builtins.py:3493
2153
msgid ""
2154
" Hooks can also be configured to run after a commit. This allows you\n"
2155
" to trigger updates to external systems like bug trackers. The --fixes\n"
2156
" option can be used to record the association between a revision and\n"
2157
" one or more bugs. See ``bzr help bugs`` for details."
2158
msgstr ""
2159
2160
#: bzrlib/builtins.py:3503
2161
msgid "Do not consider changes made to a given path."
2162
msgstr ""
2163
2164
#: bzrlib/builtins.py:3506
2165
msgid "Description of the new revision."
2166
msgstr ""
2167
2168
#: bzrlib/builtins.py:3509
2169
msgid "Commit even if nothing has changed."
2170
msgstr ""
2171
2172
#: bzrlib/builtins.py:3513
2173
msgid "Take commit message from this file."
2174
msgstr ""
2175
2176
#: bzrlib/builtins.py:3515
2177
msgid "Refuse to commit if there are unknown files in the working tree."
2178
msgstr ""
2179
2180
#: bzrlib/builtins.py:3518
2181
msgid ""
2182
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2183
"08:00:00 +0100'."
2184
msgstr ""
2185
2186
#: bzrlib/builtins.py:3521
2187
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2188
msgstr ""
2189
2190
#: bzrlib/builtins.py:3524
2191
msgid "Set the author's name, if it's different from the committer."
2192
msgstr ""
2193
2194
#: bzrlib/builtins.py:3527
2195
msgid ""
2196
"Perform a local commit in a bound branch. Local commits are not pushed to "
2197
"the master branch until a normal commit is performed."
2198
msgstr ""
2199
2200
#: bzrlib/builtins.py:3533
2201
msgid ""
2202
"When no message is supplied, show the diff along with the status summary in "
2203
"the message editor."
2204
msgstr ""
2205
2206
#: bzrlib/builtins.py:3536
2207
msgid ""
2208
"When committing to a foreign version control system do not push data that "
2209
"can not be natively represented."
2210
msgstr ""
2211
2212
#: bzrlib/builtins.py:3554
2213
#, python-format
2214
msgid ""
2215
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2216
"default bug tracker using the `bugtracker` option.\n"
2217
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2218
msgstr ""
2219
2220
#: bzrlib/builtins.py:3563
2221
#, python-format
2222
msgid ""
2223
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2224
"for more information on this feature.\n"
2225
"Commit refused."
2226
msgstr ""
2227
2228
#: bzrlib/builtins.py:3572
2229
#, python-format
2230
msgid "Unrecognized bug %s. Commit refused."
2231
msgstr ""
2232
2233
#: bzrlib/builtins.py:3575
2234
#, python-format
2235
msgid ""
2236
"%s\n"
2237
"Commit refused."
2238
msgstr ""
2239
2240
#: bzrlib/builtins.py:3599
2241
msgid "Could not parse --commit-time: "
2242
msgstr ""
2243
2244
#: bzrlib/builtins.py:3639
2245
msgid "please specify either --message or --file"
2246
msgstr ""
2247
2248
#: bzrlib/builtins.py:3668
2249
msgid "please specify a commit message with either --message or --file"
2250
msgstr ""
2251
2252
#: bzrlib/builtins.py:3671
2253
msgid ""
2254
"Empty commit message specified. Please specify a commit message with either -"
2255
"-message or --file or leave a blank message with --message \"\"."
2256
msgstr ""
2257
2258
#: bzrlib/builtins.py:3691
2259
msgid ""
2260
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2261
"-unchanged to force an empty commit."
2262
msgstr ""
2263
2264
#: bzrlib/builtins.py:3695
2265
msgid ""
2266
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2267
"resolve FILE\" to resolve."
2268
msgstr ""
2269
2270
#: bzrlib/builtins.py:3699
2271
msgid "Commit refused because there are unknown files in the working tree."
2272
msgstr ""
2273
2274
#: bzrlib/builtins.py:3702
2275
msgid ""
2276
"\n"
2277
"To commit to master branch, run update and then commit.\n"
2278
"You can also pass --local to commit to continue working disconnected."
2279
msgstr ""
2280
2281
#: bzrlib/builtins.py:3710
2282
msgid ""
2283
"Validate working tree structure, branch consistency and repository history."
2284
msgstr ""
2285
2286
#: bzrlib/builtins.py:3712
2287
msgid ""
2288
"This command checks various invariants about branch and repository storage\n"
2289
"to detect data corruption or bzr bugs."
2290
msgstr ""
2291
2292
#: bzrlib/builtins.py:3715
2293
msgid ""
2294
"The working tree and branch checks will only give output if a problem is\n"
2295
"detected. The output fields of the repository check are:"
2296
msgstr ""
2297
2298
#: bzrlib/builtins.py:3718
2299
msgid ""
2300
"revisions\n"
2301
" This is just the number of revisions checked. It doesn't\n"
2302
" indicate a problem."
2303
msgstr ""
2304
2305
#: bzrlib/builtins.py:3722
2306
msgid ""
2307
"versionedfiles\n"
2308
" This is just the number of versionedfiles checked. It\n"
2309
" doesn't indicate a problem."
2310
msgstr ""
2311
2312
#: bzrlib/builtins.py:3726
2313
msgid ""
2314
"unreferenced ancestors\n"
2315
" Texts that are ancestors of other texts, but\n"
2316
" are not properly referenced by the revision ancestry. This is a\n"
2317
" subtle problem that Bazaar can work around."
2318
msgstr ""
2319
2320
#: bzrlib/builtins.py:3731
2321
msgid ""
2322
"unique file texts\n"
2323
" This is the total number of unique file contents\n"
2324
" seen in the checked revisions. It does not indicate a problem."
2325
msgstr ""
2326
2327
#: bzrlib/builtins.py:3735
2328
msgid ""
2329
"repeated file texts\n"
2330
" This is the total number of repeated texts seen\n"
2331
" in the checked revisions. Texts can be repeated when their file\n"
2332
" entries are modified, but the file contents are not. It does not\n"
2333
" indicate a problem."
2334
msgstr ""
2335
2336
#: bzrlib/builtins.py:3741
2337
msgid ""
2338
"If no restrictions are specified, all Bazaar data that is found at the "
2339
"given\n"
2340
"location will be checked."
2341
msgstr ""
2342
2343
#: bzrlib/builtins.py:3746
2344
msgid " Check the tree and branch at 'foo'::"
2345
msgstr ""
2346
2347
#: bzrlib/builtins.py:3748
2348
msgid " bzr check --tree --branch foo"
2349
msgstr ""
2350
2351
#: bzrlib/builtins.py:3750
2352
msgid " Check only the repository at 'bar'::"
2353
msgstr ""
2354
2355
#: bzrlib/builtins.py:3752
2356
msgid " bzr check --repo bar"
2357
msgstr ""
2358
2359
#: bzrlib/builtins.py:3754
2360
msgid " Check everything at 'baz'::"
2361
msgstr ""
2362
2363
#: bzrlib/builtins.py:3756
2364
msgid " bzr check baz"
2365
msgstr ""
2366
2367
#: bzrlib/builtins.py:3762
2368
msgid "Check the branch related to the current directory."
2369
msgstr ""
2370
2371
#: bzrlib/builtins.py:3764
2372
msgid "Check the repository related to the current directory."
2373
msgstr ""
2374
2375
#: bzrlib/builtins.py:3766
2376
msgid "Check the working tree related to the current directory."
2377
msgstr ""
2378
2379
#: bzrlib/builtins.py:3780
2380
msgid "Upgrade a repository, branch or working tree to a newer format."
2381
msgstr ""
2382
2383
#: bzrlib/builtins.py:3782
2384
msgid ""
2385
"When the default format has changed after a major new release of\n"
2386
"Bazaar, you may be informed during certain operations that you\n"
2387
"should upgrade. Upgrading to a newer format may improve performance\n"
2388
"or make new features available. It may however limit interoperability\n"
2389
"with older repositories or with older versions of Bazaar."
2390
msgstr ""
2391
2392
#: bzrlib/builtins.py:3788
2393
msgid ""
2394
"If you wish to upgrade to a particular format rather than the\n"
2395
"current default, that can be specified using the --format option.\n"
2396
"As a consequence, you can use the upgrade command this way to\n"
2397
"\"downgrade\" to an earlier format, though some conversions are\n"
2398
"a one way process (e.g. changing from the 1.x default to the\n"
2399
"2.x default) so downgrading is not always possible."
2400
msgstr ""
2401
2402
#: bzrlib/builtins.py:3795
2403
msgid ""
2404
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2405
"process (where # is a number). By default, this is left there on\n"
2406
"completion. If the conversion fails, delete the new .bzr directory\n"
2407
"and rename this one back in its place. Use the --clean option to ask\n"
2408
"for the backup.bzr directory to be removed on successful conversion.\n"
2409
"Alternatively, you can delete it by hand if everything looks good\n"
2410
"afterwards."
2411
msgstr ""
2412
2413
#: bzrlib/builtins.py:3803
2414
msgid ""
2415
"If the location given is a shared repository, dependent branches\n"
2416
"are also converted provided the repository converts successfully.\n"
2417
"If the conversion of a branch fails, remaining branches are still\n"
2418
"tried."
2419
msgstr ""
2420
2421
#: bzrlib/builtins.py:3808
2422
msgid ""
2423
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2424
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2425
msgstr ""
2426
2427
#: bzrlib/builtins.py:3816
2428
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2429
msgstr ""
2430
2431
#: bzrlib/builtins.py:3820
2432
msgid "Branch format"
2433
msgstr ""
2434
2435
#: bzrlib/builtins.py:3822
2436
msgid "Remove the backup.bzr directory if successful."
2437
msgstr ""
2438
2439
#: bzrlib/builtins.py:3824
2440
msgid "Show what would be done, but don't actually do anything."
2441
msgstr ""
2442
2443
#: bzrlib/builtins.py:3839
2444
msgid "Show or set bzr user id."
2445
msgstr ""
2446
2447
#: bzrlib/builtins.py:3841
2448
msgid ""
2449
":Examples:\n"
2450
" Show the email of the current user::"
2451
msgstr ""
2452
2453
#: bzrlib/builtins.py:3844
2454
msgid " bzr whoami --email"
2455
msgstr ""
2456
2457
#: bzrlib/builtins.py:3846
2458
msgid " Set the current user::"
2459
msgstr ""
2460
2461
#: bzrlib/builtins.py:3848
2462
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2463
msgstr ""
2464
2465
#: bzrlib/builtins.py:3852
2466
msgid "Display email address only."
2467
msgstr ""
2468
2469
#: bzrlib/builtins.py:3854
2470
msgid "Set identity for the current branch instead of globally."
2471
msgstr ""
2472
2473
#: bzrlib/builtins.py:3880
2474
msgid "--email can only be used to display existing identity"
2475
msgstr ""
2476
2477
#: bzrlib/builtins.py:3904
2478
msgid "Print or set the branch nickname."
2479
msgstr ""
2480
2481
#: bzrlib/builtins.py:3906
2482
msgid ""
2483
"If unset, the colocated branch name is used for colocated branches, and\n"
2484
"the branch directory name is used for other branches. To print the\n"
2485
"current nickname, execute with no argument."
2486
msgstr ""
2487
2488
#: bzrlib/builtins.py:3910
2489
msgid ""
2490
"Bound branches use the nickname of its master branch unless it is set\n"
2491
"locally."
2492
msgstr ""
2493
2494
#: bzrlib/builtins.py:3930
2495
msgid "Set/unset and display aliases."
2496
msgstr ""
2497
2498
#: bzrlib/builtins.py:3932
2499
msgid ""
2500
":Examples:\n"
2501
" Show the current aliases::"
2502
msgstr ""
2503
2504
#: bzrlib/builtins.py:3935
2505
msgid " bzr alias"
2506
msgstr ""
2507
2508
#: bzrlib/builtins.py:3937
2509
msgid " Show the alias specified for 'll'::"
2510
msgstr ""
2511
2512
#: bzrlib/builtins.py:3939
2513
msgid " bzr alias ll"
2514
msgstr ""
2515
2516
#: bzrlib/builtins.py:3941
2517
msgid " Set an alias for 'll'::"
2518
msgstr ""
2519
2520
#: bzrlib/builtins.py:3943
2521
msgid " bzr alias ll=\"log --line -r-10..-1\""
2522
msgstr ""
2523
2524
#: bzrlib/builtins.py:3945
2525
msgid " To remove an alias for 'll'::"
2526
msgstr ""
2527
2528
#: bzrlib/builtins.py:3947
2529
msgid " bzr alias --remove ll"
2530
msgstr ""
2531
2532
#: bzrlib/builtins.py:3952
2533
msgid "Remove the alias."
2534
msgstr ""
2535
2536
#: bzrlib/builtins.py:3970
2537
msgid "bzr alias --remove expects an alias to remove."
2538
msgstr ""
2539
2540
#: bzrlib/builtins.py:4151
2541
msgid ""
2542
"subunit not available. subunit needs to be installed to use --subunit."
2543
msgstr ""
2544
2545
#: bzrlib/builtins.py:4168
2546
msgid ""
2547
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:4215
2551
msgid "Show version of bzr."
2552
msgstr ""
2553
2554
#: bzrlib/builtins.py:4219
2555
msgid "Print just the version number."
2556
msgstr ""
2557
2558
#: bzrlib/builtins.py:4238
2559
msgid "It sure does!\n"
2560
msgstr ""
2561
2562
#: bzrlib/builtins.py:4262
2563
#, python-format
2564
msgid "merge base is revision %s\n"
2565
msgstr ""
2566
2567
#: bzrlib/builtins.py:4266
2568
msgid "Perform a three-way merge."
2569
msgstr ""
2570
2571
#: bzrlib/builtins.py:4268
2572
msgid ""
2573
"The source of the merge can be specified either in the form of a branch,\n"
2574
"or in the form of a path to a file containing a merge directive generated\n"
2575
"with bzr send. If neither is specified, the default is the upstream branch\n"
2576
"or the branch most recently merged using --remember. The source of the\n"
2577
"merge may also be specified in the form of a path to a file in another\n"
2578
"branch: in this case, only the modifications to that file are merged into\n"
2579
"the current working tree."
2580
msgstr ""
2581
2582
#: bzrlib/builtins.py:4276
2583
msgid ""
2584
"When merging from a branch, by default bzr will try to merge in all new\n"
2585
"work from the other branch, automatically determining an appropriate base\n"
2586
"revision. If this fails, you may need to give an explicit base."
2587
msgstr ""
2588
2589
#: bzrlib/builtins.py:4280
2590
msgid ""
2591
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2592
"try to merge in all new work up to and including revision OTHER."
2593
msgstr ""
2594
2595
#: bzrlib/builtins.py:4283
2596
msgid ""
2597
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2598
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2599
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2600
"not already contain revision BASE, such a merge is commonly referred to as\n"
2601
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2602
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2603
"changes from the other branch is not stored in the commit."
2604
msgstr ""
2605
2606
#: bzrlib/builtins.py:4291
2607
msgid "Revision numbers are always relative to the source branch."
2608
msgstr ""
2609
2610
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2611
msgid ""
2612
"Merge will do its best to combine the changes in two branches, but there\n"
2613
"are some kinds of problems only a human can fix. When it encounters those,\n"
2614
"it will mark a conflict. A conflict means that you need to fix something,\n"
2615
"before you can commit."
2616
msgstr ""
2617
2618
#: bzrlib/builtins.py:4298
2619
msgid ""
2620
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2621
msgstr ""
2622
2623
#: bzrlib/builtins.py:4300
2624
msgid ""
2625
"If there is no default branch set, the first merge will set it (use\n"
2626
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2627
"to use the default. To change the default, use --remember. The value will\n"
2628
"only be saved if the remote location can be accessed."
2629
msgstr ""
2630
2631
#: bzrlib/builtins.py:4305
2632
msgid ""
2633
"The results of the merge are placed into the destination working\n"
2634
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2635
"committed to record the result of the merge."
2636
msgstr ""
2637
2638
#: bzrlib/builtins.py:4309
2639
msgid ""
2640
"merge refuses to run if there are any uncommitted changes, unless\n"
2641
"--force is given. If --force is given, then the changes from the source \n"
2642
"will be merged with the current working tree, including any uncommitted\n"
2643
"changes in the tree. The --force option can also be used to create a\n"
2644
"merge revision which has more than two parents."
2645
msgstr ""
2646
2647
#: bzrlib/builtins.py:4315
2648
msgid ""
2649
"If one would like to merge changes from the working tree of the other\n"
2650
"branch without merging any committed revisions, the --uncommitted option\n"
2651
"can be given."
2652
msgstr ""
2653
2654
#: bzrlib/builtins.py:4319
2655
msgid ""
2656
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2657
"you to apply each diff hunk and file change, similar to \"shelve\"."
2658
msgstr ""
2659
2660
#: bzrlib/builtins.py:4322
2661
msgid ""
2662
":Examples:\n"
2663
" To merge all new revisions from bzr.dev::"
2664
msgstr ""
2665
2666
#: bzrlib/builtins.py:4325
2667
msgid " bzr merge ../bzr.dev"
2668
msgstr ""
2669
2670
#: bzrlib/builtins.py:4327
2671
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2672
msgstr ""
2673
2674
#: bzrlib/builtins.py:4329
2675
msgid " bzr merge -r 82 ../bzr.dev"
2676
msgstr ""
2677
2678
#: bzrlib/builtins.py:4331
2679
msgid " To merge the changes introduced by 82, without previous changes::"
2680
msgstr ""
2681
2682
#: bzrlib/builtins.py:4333
2683
msgid " bzr merge -r 81..82 ../bzr.dev"
2684
msgstr ""
2685
2686
#: bzrlib/builtins.py:4335
2687
msgid " To apply a merge directive contained in /tmp/merge::"
2688
msgstr ""
2689
2690
#: bzrlib/builtins.py:4337
2691
msgid " bzr merge /tmp/merge"
2692
msgstr ""
2693
2694
#: bzrlib/builtins.py:4339
2695
msgid ""
2696
" To create a merge revision with three parents from two branches\n"
2697
" feature1a and feature1b:"
2698
msgstr ""
2699
2700
#: bzrlib/builtins.py:4342
2701
msgid ""
2702
" bzr merge ../feature1a\n"
2703
" bzr merge ../feature1b --force\n"
2704
" bzr commit -m 'revision with three parents'"
2705
msgstr ""
2706
2707
#: bzrlib/builtins.py:4354
2708
msgid "Merge even if the destination tree has uncommitted changes."
2709
msgstr ""
2710
2711
#: bzrlib/builtins.py:4360
2712
msgid ""
2713
"Apply uncommitted changes from a working copy, instead of branch changes."
2714
msgstr ""
2715
2716
#: bzrlib/builtins.py:4362
2717
msgid ""
2718
"If the destination is already completely merged into the source, pull from "
2719
"the source rather than merging. When this happens, you do not need to "
2720
"commit the result."
2721
msgstr ""
2722
2723
#: bzrlib/builtins.py:4367
2724
msgid ""
2725
"Branch to merge into, rather than the one containing the working directory."
2726
msgstr ""
2727
2728
#: bzrlib/builtins.py:4369
2729
msgid "Instead of merging, show a diff of the merge."
2730
msgstr ""
2731
2732
#: bzrlib/builtins.py:4371
2733
msgid "Select changes interactively."
2734
msgstr ""
2735
2736
#: bzrlib/builtins.py:4393
2737
msgid ""
2738
"Merging into empty branches not currently supported, "
2739
"https://bugs.launchpad.net/bzr/+bug/308562"
2740
msgstr ""
2741
2742
#: bzrlib/builtins.py:4420
2743
msgid "Cannot use --uncommitted with bundles or merge directives."
2744
msgstr ""
2745
2746
#: bzrlib/builtins.py:4431
2747
msgid "Cannot use --uncommitted and --revision at the same time."
2748
msgstr ""
2749
2750
#: bzrlib/builtins.py:4451
2751
msgid "merger: "
2752
msgstr ""
2753
2754
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2755
msgid "Nothing to do."
2756
msgstr ""
2757
2758
#: bzrlib/builtins.py:4457
2759
msgid "Cannot pull individual files"
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4465
2763
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2764
msgstr ""
2765
2766
#: bzrlib/builtins.py:4523
2767
#, python-format
2768
msgid "Show-base is not supported for this merge type. %s"
2769
msgstr ""
2770
2771
#: bzrlib/builtins.py:4532
2772
#, python-format
2773
msgid "Conflict reduction is not supported for merge type %s."
2774
msgstr ""
2775
2776
#: bzrlib/builtins.py:4536
2777
msgid "Cannot do conflict reduction and show base."
2778
msgstr ""
2779
2780
#: bzrlib/builtins.py:4647
2781
msgid "No location specified or remembered"
2782
msgstr ""
2783
2784
#: bzrlib/builtins.py:4649
2785
msgid "{0} remembered {1} location {2}"
2786
msgstr ""
2787
2788
#: bzrlib/builtins.py:4655
2789
msgid "Redo a merge."
2790
msgstr ""
2791
2792
#: bzrlib/builtins.py:4657
2793
msgid ""
2794
"Use this if you want to try a different merge technique while resolving\n"
2795
"conflicts. Some merge techniques are better than others, and remerge\n"
2796
"lets you try different ones on different files."
2797
msgstr ""
2798
2799
#: bzrlib/builtins.py:4661
2800
msgid ""
2801
"The options for remerge have the same meaning and defaults as the ones for\n"
2802
"merge. The difference is that remerge can (only) be run when there is a\n"
2803
"pending merge, and it lets you specify particular files."
2804
msgstr ""
2805
2806
#: bzrlib/builtins.py:4665
2807
msgid ""
2808
":Examples:\n"
2809
" Re-do the merge of all conflicted files, and show the base text in\n"
2810
" conflict regions, in addition to the usual THIS and OTHER texts::"
2811
msgstr ""
2812
2813
#: bzrlib/builtins.py:4669
2814
msgid " bzr remerge --show-base"
2815
msgstr ""
2816
2817
#: bzrlib/builtins.py:4671
2818
msgid ""
2819
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2820
" additional processing to reduce the size of conflict regions::"
2821
msgstr ""
2822
2823
#: bzrlib/builtins.py:4674
2824
msgid " bzr remerge --merge-type weave --reprocess foobar"
2825
msgstr ""
2826
2827
#: bzrlib/builtins.py:4681
2828
msgid "Show base revision text in conflicts."
2829
msgstr ""
2830
2831
#: bzrlib/builtins.py:4693
2832
msgid ""
2833
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2834
"merges."
2835
msgstr ""
2836
2837
#: bzrlib/builtins.py:4751
2838
msgid ""
2839
"Set files in the working tree back to the contents of a previous revision."
2840
msgstr ""
2841
2842
#: bzrlib/builtins.py:4753
2843
msgid ""
2844
"Giving a list of files will revert only those files. Otherwise, all files\n"
2845
"will be reverted. If the revision is not specified with '--revision', the\n"
2846
"working tree basis revision is used. A revert operation affects only the\n"
2847
"working tree, not any revision history like the branch and repository or\n"
2848
"the working tree basis revision."
2849
msgstr ""
2850
2851
#: bzrlib/builtins.py:4759
2852
msgid ""
2853
"To remove only some changes, without reverting to a prior version, use\n"
2854
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2855
"will remove the changes introduced by the second last commit (-2), without\n"
2856
"affecting the changes introduced by the last commit (-1). To remove\n"
2857
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2858
"To update the branch to a specific revision or the latest revision and\n"
2859
"update the working tree accordingly while preserving local changes, see the\n"
2860
"update command."
2861
msgstr ""
2862
2863
#: bzrlib/builtins.py:4768
2864
msgid ""
2865
"Uncommitted changes to files that are reverted will be discarded.\n"
2866
"Howver, by default, any files that have been manually changed will be\n"
2867
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2868
"files have '.~#~' appended to their name, where # is a number."
2869
msgstr ""
2870
2871
#: bzrlib/builtins.py:4773
2872
msgid ""
2873
"When you provide files, you can use their current pathname or the pathname\n"
2874
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2875
"name. If you name a directory, all the contents of that directory will be\n"
2876
"reverted."
2877
msgstr ""
2878
2879
#: bzrlib/builtins.py:4778
2880
msgid ""
2881
"If you have newly added files since the target revision, they will be\n"
2882
"removed. If the files to be removed have been changed, backups will be\n"
2883
"created as above. Directories containing unknown files will not be\n"
2884
"deleted."
2885
msgstr ""
2886
2887
#: bzrlib/builtins.py:4783
2888
msgid ""
2889
"The working tree contains a list of revisions that have been merged but\n"
2890
"not yet committed. These revisions will be included as additional parents\n"
2891
"of the next commit. Normally, using revert clears that list as well as\n"
2892
"reverting the files. If any files are specified, revert leaves the list\n"
2893
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2894
".`` in the tree root to revert all files but keep the recorded merges,\n"
2895
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2896
"reverting any files."
2897
msgstr ""
2898
2899
#: bzrlib/builtins.py:4792
2900
msgid ""
2901
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2902
"changes from a branch in a single revision. To do this, perform the merge\n"
2903
"as desired. Then doing revert with the \"--forget-merges\" option will "
2904
"keep\n"
2905
"the content of the tree as it was, but it will clear the list of pending\n"
2906
"merges. The next commit will then contain all of the changes that are\n"
2907
"present in the other branch, but without any other parent revisions.\n"
2908
"Because this technique forgets where these changes originated, it may\n"
2909
"cause additional conflicts on later merges involving the same source and\n"
2910
"target branches."
2911
msgstr ""
2912
2913
#: bzrlib/builtins.py:4806
2914
msgid "Do not save backups of reverted files."
2915
msgstr ""
2916
2917
#: bzrlib/builtins.py:4808
2918
msgid "Remove pending merge marker, without changing any files."
2919
msgstr ""
2920
2921
#: bzrlib/builtins.py:4839
2922
msgid ""
2923
"Show help on a command or other topic.\n"
2924
" "
2925
msgstr ""
2926
2927
#: bzrlib/builtins.py:4844
2928
msgid "Show help on all commands."
2929
msgstr ""
2930
2931
#: bzrlib/builtins.py:4873
2932
msgid "Show unmerged/unpulled revisions between two branches."
2933
msgstr ""
2934
2935
#: bzrlib/builtins.py:4875
2936
msgid "OTHER_BRANCH may be local or remote."
2937
msgstr ""
2938
2939
#: bzrlib/builtins.py:4877
2940
msgid ""
2941
"To filter on a range of revisions, you can use the command -r begin..end\n"
2942
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2943
"also valid.\n"
2944
" \n"
2945
":Exit values:\n"
2946
" 1 - some missing revisions\n"
2947
" 0 - no missing revisions"
2948
msgstr ""
2949
2950
#: bzrlib/builtins.py:4887
2951
msgid ""
2952
" Determine the missing revisions between this and the branch at the\n"
2953
" remembered pull location::"
2954
msgstr ""
2955
2956
#: bzrlib/builtins.py:4890
2957
msgid " bzr missing"
2958
msgstr ""
2959
2960
#: bzrlib/builtins.py:4892
2961
msgid " Determine the missing revisions between this and another branch::"
2962
msgstr ""
2963
2964
#: bzrlib/builtins.py:4894
2965
msgid " bzr missing http://server/branch"
2966
msgstr ""
2967
2968
#: bzrlib/builtins.py:4896
2969
msgid ""
2970
" Determine the missing revisions up to a specific revision on the other\n"
2971
" branch::"
2972
msgstr ""
2973
2974
#: bzrlib/builtins.py:4899
2975
msgid " bzr missing -r ..-10"
2976
msgstr ""
2977
2978
#: bzrlib/builtins.py:4901
2979
msgid ""
2980
" Determine the missing revisions up to a specific revision on this\n"
2981
" branch::"
2982
msgstr ""
2983
2984
#: bzrlib/builtins.py:4904
2985
msgid " bzr missing --my-revision ..-10"
2986
msgstr ""
2987
2988
#: bzrlib/builtins.py:4911
2989
msgid "Reverse the order of revisions."
2990
msgstr ""
2991
2992
#: bzrlib/builtins.py:4913
2993
msgid "Display changes in the local branch only."
2994
msgstr ""
2995
2996
#: bzrlib/builtins.py:4914
2997
msgid "Same as --mine-only."
2998
msgstr ""
2999
3000
#: bzrlib/builtins.py:4916
3001
msgid "Display changes in the remote branch only."
3002
msgstr ""
3003
3004
#: bzrlib/builtins.py:4917
3005
msgid "Same as --theirs-only."
3006
msgstr ""
3007
3008
#: bzrlib/builtins.py:4922
3009
msgid ""
3010
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3011
"details."
3012
msgstr ""
3013
3014
#: bzrlib/builtins.py:4926
3015
msgid ""
3016
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3017
"details."
3018
msgstr ""
3019
3020
#: bzrlib/builtins.py:4929
3021
msgid "Show all revisions in addition to the mainline ones."
3022
msgstr ""
3023
3024
#: bzrlib/builtins.py:4983
3025
msgid "No peer location known or specified."
3026
msgstr ""
3027
3028
#: bzrlib/builtins.py:4987
3029
msgid "Using saved parent location: {0}\n"
3030
msgstr ""
3031
3032
#: bzrlib/builtins.py:5020
3033
#, python-format
3034
msgid "You have %d extra revision:\n"
3035
msgid_plural "You have %d extra revisions:\n"
3036
msgstr[0] ""
3037
msgstr[1] ""
3038
3039
#: bzrlib/builtins.py:5040
3040
#, python-format
3041
msgid "You are missing %d revision:\n"
3042
msgid_plural "You are missing %d revisions:\n"
3043
msgstr[0] ""
3044
msgstr[1] ""
3045
3046
#: bzrlib/builtins.py:5055
3047
msgid "This branch has no new revisions.\n"
3048
msgstr ""
3049
3050
#: bzrlib/builtins.py:5058
3051
msgid "Other branch has no new revisions.\n"
3052
msgstr ""
3053
3054
#: bzrlib/builtins.py:5063
3055
msgid "Branches are up to date.\n"
3056
msgstr ""
3057
3058
#: bzrlib/builtins.py:5074
3059
msgid "Compress the data within a repository."
3060
msgstr ""
3061
3062
#: bzrlib/builtins.py:5076
3063
msgid ""
3064
"This operation compresses the data within a bazaar repository. As\n"
3065
"bazaar supports automatic packing of repository, this operation is\n"
3066
"normally not required to be done manually."
3067
msgstr ""
3068
3069
#: bzrlib/builtins.py:5080
3070
msgid ""
3071
"During the pack operation, bazaar takes a backup of existing repository\n"
3072
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3073
"automatically when it is safe to do so. To save disk space by removing\n"
3074
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3075
"used."
3076
msgstr ""
3077
3078
#: bzrlib/builtins.py:5086
3079
msgid ""
3080
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3081
"during or immediately after repacking, you may be left with a state\n"
3082
"where the deletion has been written to disk but the new packs have not\n"
3083
"been. In this case the repository may be unusable."
3084
msgstr ""
3085
3086
#: bzrlib/builtins.py:5095
3087
msgid "Delete obsolete packs to save disk space."
3088
msgstr ""
3089
3090
#: bzrlib/builtins.py:5109
3091
msgid "List the installed plugins."
3092
msgstr ""
3093
3094
#: bzrlib/builtins.py:5111
3095
msgid ""
3096
"This command displays the list of installed plugins including\n"
3097
"version of plugin and a short description of each."
3098
msgstr ""
3099
3100
#: bzrlib/builtins.py:5114
3101
msgid "--verbose shows the path where each plugin is located."
3102
msgstr ""
3103
3104
#: bzrlib/builtins.py:5116
3105
msgid ""
3106
"A plugin is an external component for Bazaar that extends the\n"
3107
"revision control system, by adding or replacing code in Bazaar.\n"
3108
"Plugins can do a variety of things, including overriding commands,\n"
3109
"adding new commands, providing additional network transports and\n"
3110
"customizing log output."
3111
msgstr ""
3112
3113
#: bzrlib/builtins.py:5122
3114
msgid ""
3115
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3116
"for further information on plugins including where to find them and how to\n"
3117
"install them. Instructions are also provided there on how to write new\n"
3118
"plugins using the Python programming language."
3119
msgstr ""
3120
3121
#: bzrlib/builtins.py:5138
3122
msgid "Show testament (signing-form) of a revision."
3123
msgstr ""
3124
3125
#: bzrlib/builtins.py:5141
3126
msgid "Produce long-format testament."
3127
msgstr ""
3128
3129
#: bzrlib/builtins.py:5143
3130
msgid "Produce a strict-format testament."
3131
msgstr ""
3132
3133
#: bzrlib/builtins.py:5169
3134
msgid "Show the origin of each line in a file."
3135
msgstr ""
3136
3137
#: bzrlib/builtins.py:5171
3138
msgid ""
3139
"This prints out the given file with an annotation on the left side\n"
3140
"indicating which revision, author and date introduced the change."
3141
msgstr ""
3142
3143
#: bzrlib/builtins.py:5174
3144
msgid ""
3145
"If the origin is the same for a run of consecutive lines, it is\n"
3146
"shown only at the top, unless the --all option is given."
3147
msgstr ""
3148
3149
#: bzrlib/builtins.py:5182
3150
msgid "Show annotations on all lines."
3151
msgstr ""
3152
3153
#: bzrlib/builtins.py:5183
3154
msgid "Show commit date in annotations."
3155
msgstr ""
3156
3157
#: bzrlib/builtins.py:5270
3158
msgid "Cannot sign a range of non-revision-history revisions"
3159
msgstr ""
3160
3161
#: bzrlib/builtins.py:5282
3162
msgid "Please supply either one revision, or a range."
3163
msgstr ""
3164
3165
#: bzrlib/builtins.py:5286
3166
msgid ""
3167
"Convert the current branch into a checkout of the supplied branch.\n"
3168
"If no branch is supplied, rebind to the last bound location."
3169
msgstr ""
3170
3171
#: bzrlib/builtins.py:5289
3172
msgid ""
3173
"Once converted into a checkout, commits must succeed on the master branch\n"
3174
"before they will be applied to the local branch."
3175
msgstr ""
3176
3177
#: bzrlib/builtins.py:5292
3178
msgid ""
3179
"Bound branches use the nickname of its master branch unless it is set\n"
3180
"locally, in which case binding will update the local nickname to be\n"
3181
"that of the master."
3182
msgstr ""
3183
3184
#: bzrlib/builtins.py:5307
3185
msgid "No location supplied. This format does not remember old locations."
3186
msgstr ""
3187
3188
#: bzrlib/builtins.py:5313
3189
msgid "Branch is already bound"
3190
msgstr ""
3191
3192
#: bzrlib/builtins.py:5316
3193
msgid "No location supplied and no previous location known"
3194
msgstr ""
3195
3196
#: bzrlib/builtins.py:5322
3197
msgid "These branches have diverged. Try merging, and then bind again."
3198
msgstr ""
3199
3200
#: bzrlib/builtins.py:5329
3201
msgid "Convert the current checkout into a regular branch."
3202
msgstr ""
3203
3204
#: bzrlib/builtins.py:5331
3205
msgid ""
3206
"After unbinding, the local branch is considered independent and subsequent\n"
3207
"commits will be local only."
3208
msgstr ""
3209
3210
#: bzrlib/builtins.py:5342
3211
msgid "Local branch is not bound"
3212
msgstr ""
3213
3214
#: bzrlib/builtins.py:5346
3215
msgid "Remove the last committed revision."
3216
msgstr ""
3217
3218
#: bzrlib/builtins.py:5348
3219
msgid ""
3220
"--verbose will print out what is being removed.\n"
3221
"--dry-run will go through all the motions, but not actually\n"
3222
"remove anything."
3223
msgstr ""
3224
3225
#: bzrlib/builtins.py:5352
3226
msgid ""
3227
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3228
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3229
"branch at revision 15."
3230
msgstr ""
3231
3232
#: bzrlib/builtins.py:5356
3233
msgid ""
3234
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3235
"it may make is to restore any pending merges that were present before\n"
3236
"the commit."
3237
msgstr ""
3238
3239
#: bzrlib/builtins.py:5367
3240
msgid "Don't actually make changes."
3241
msgstr ""
3242
3243
#: bzrlib/builtins.py:5368
3244
msgid "Say yes to all questions."
3245
msgstr ""
3246
3247
#: bzrlib/builtins.py:5370
3248
msgid "Keep tags that point to removed revisions."
3249
msgstr ""
3250
3251
#: bzrlib/builtins.py:5372
3252
msgid "Only remove the commits from the local branch when in a checkout."
3253
msgstr ""
3254
3255
#: bzrlib/builtins.py:5421
3256
msgid "No revisions to uncommit.\n"
3257
msgstr ""
3258
3259
#: bzrlib/builtins.py:5436
3260
msgid "Dry-run, pretending to remove the above revisions.\n"
3261
msgstr ""
3262
3263
#: bzrlib/builtins.py:5439
3264
msgid "The above revision(s) will be removed.\n"
3265
msgstr ""
3266
3267
#: bzrlib/builtins.py:5443
3268
msgid "Uncommit these revisions"
3269
msgstr ""
3270
3271
#: bzrlib/builtins.py:5446
3272
msgid "Canceled\n"
3273
msgstr ""
3274
3275
#: bzrlib/builtins.py:5453
3276
#, python-format
3277
msgid ""
3278
"You can restore the old tip by running:\n"
3279
" bzr pull . -r revid:%s\n"
3280
msgstr ""
3281
3282
#: bzrlib/builtins.py:5458
3283
msgid "Break a dead lock."
3284
msgstr ""
3285
3286
#: bzrlib/builtins.py:5460
3287
msgid ""
3288
"This command breaks a lock on a repository, branch, working directory or\n"
3289
"config file."
3290
msgstr ""
3291
3292
#: bzrlib/builtins.py:5463
3293
msgid ""
3294
"CAUTION: Locks should only be broken when you are sure that the process\n"
3295
"holding the lock has been stopped."
3296
msgstr ""
3297
3298
#: bzrlib/builtins.py:5466
3299
msgid ""
3300
"You can get information on what locks are open via the 'bzr info\n"
3301
"[location]' command."
3302
msgstr ""
3303
3304
#: bzrlib/builtins.py:5469
3305
msgid ""
3306
":Examples:\n"
3307
" bzr break-lock\n"
3308
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3309
" bzr break-lock --conf ~/.bazaar"
3310
msgstr ""
3311
3312
#: bzrlib/builtins.py:5478
3313
msgid "LOCATION is the directory where the config lock is."
3314
msgstr ""
3315
3316
#: bzrlib/builtins.py:5480
3317
msgid "Do not ask for confirmation before breaking the lock."
3318
msgstr ""
3319
3320
#: bzrlib/builtins.py:5515
3321
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3322
msgstr ""
3323
3324
#: bzrlib/builtins.py:5516
3325
msgid "Run the bzr server."
3326
msgstr ""
3327
3328
#: bzrlib/builtins.py:5522
3329
msgid "Serve on stdin/out for use from inetd or sshd."
3330
msgstr ""
3331
3332
#: bzrlib/builtins.py:5523
3333
msgid "protocol"
3334
msgstr ""
3335
3336
#: bzrlib/builtins.py:5524
3337
msgid "Protocol to serve."
3338
msgstr ""
3339
3340
#: bzrlib/builtins.py:5528
3341
msgid "Listen for connections on nominated address."
3342
msgstr ""
3343
3344
#: bzrlib/builtins.py:5530
3345
msgid ""
3346
"Listen for connections on nominated port. Passing 0 as the port number will "
3347
"result in a dynamically allocated port. The default port depends on the "
3348
"protocol."
3349
msgstr ""
3350
3351
#: bzrlib/builtins.py:5535
3352
msgid "Serve contents of this directory."
3353
msgstr ""
3354
3355
#: bzrlib/builtins.py:5537
3356
msgid ""
3357
"By default the server is a readonly server. Supplying --allow-writes "
3358
"enables write access to the contents of the served directory and below. "
3359
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3360
"of external authentication is arranged supplying this option leads to global "
3361
"uncontrolled write access to your file system."
3362
msgstr ""
3363
3364
#: bzrlib/builtins.py:5546
3365
msgid "Override the default idle client timeout (5min)."
3366
msgstr ""
3367
3368
#: bzrlib/builtins.py:5564
3369
msgid "Combine a tree into its containing tree."
3370
msgstr ""
3371
3372
#: bzrlib/builtins.py:5566
3373
msgid "This command requires the target tree to be in a rich-root format."
3374
msgstr ""
3375
3376
#: bzrlib/builtins.py:5568
3377
msgid ""
3378
"The TREE argument should be an independent tree, inside another tree, but\n"
3379
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3380
"running \"bzr branch\" with the target inside a tree.)"
3381
msgstr ""
3382
3383
#: bzrlib/builtins.py:5572
3384
msgid ""
3385
"The result is a combined tree, with the subtree no longer an independent\n"
3386
"part. This is marked as a merge of the subtree into the containing tree,\n"
3387
"and all history is preserved."
3388
msgstr ""
3389
3390
#: bzrlib/builtins.py:5590
3391
#, python-format
3392
msgid ""
3393
"Can't join trees because %s doesn't support rich root data.\n"
3394
"You can use bzr upgrade on the repository."
3395
msgstr ""
3396
3397
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3398
msgid "Cannot join {0}. {1}"
3399
msgstr ""
3400
3401
#: bzrlib/builtins.py:5610
3402
msgid "Split a subdirectory of a tree into a separate tree."
3403
msgstr ""
3404
3405
#: bzrlib/builtins.py:5612
3406
msgid ""
3407
"This command will produce a target tree in a format that supports\n"
3408
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3409
"converted into earlier formats like 'dirstate-tags'."
3410
msgstr ""
3411
3412
#: bzrlib/builtins.py:5616
3413
msgid ""
3414
"The TREE argument should be a subdirectory of a working tree. That\n"
3415
"subdirectory will be converted into an independent tree, with its own\n"
3416
"branch. Commits in the top-level tree will not apply to the new subtree."
3417
msgstr ""
3418
3419
#: bzrlib/builtins.py:5696
3420
msgid "No submit branch specified or known"
3421
msgstr ""
3422
3423
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3424
msgid "No public branch specified or known"
3425
msgstr ""
3426
3427
#: bzrlib/builtins.py:5710
3428
msgid "bzr merge-directive takes at most two one revision identifiers"
3429
msgstr ""
3430
3431
#: bzrlib/builtins.py:5719
3432
msgid "No revisions to bundle."
3433
msgstr ""
3434
3435
#: bzrlib/builtins.py:5738
3436
msgid "Mail or create a merge-directive for submitting changes."
3437
msgstr ""
3438
3439
#: bzrlib/builtins.py:5740
3440
msgid "A merge directive provides many things needed for requesting merges:"
3441
msgstr ""
3442
3443
#: bzrlib/builtins.py:5742
3444
msgid "* A machine-readable description of the merge to perform"
3445
msgstr ""
3446
3447
#: bzrlib/builtins.py:5744
3448
msgid "* An optional patch that is a preview of the changes requested"
3449
msgstr ""
3450
3451
#: bzrlib/builtins.py:5746
3452
msgid ""
3453
"* An optional bundle of revision data, so that the changes can be applied\n"
3454
" directly from the merge directive, without retrieving data from a\n"
3455
" branch."
3456
msgstr ""
3457
3458
#: bzrlib/builtins.py:5750
3459
msgid ""
3460
"`bzr send` creates a compact data set that, when applied using bzr\n"
3461
"merge, has the same effect as merging from the source branch. "
3462
msgstr ""
3463
3464
#: bzrlib/builtins.py:5753
3465
msgid ""
3466
"By default the merge directive is self-contained and can be applied to any\n"
3467
"branch containing submit_branch in its ancestory without needing access to\n"
3468
"the source branch."
3469
msgstr ""
3470
3471
#: bzrlib/builtins.py:5757
3472
msgid ""
3473
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3474
"revisions, but only a structured request to merge from the\n"
3475
"public_location. In that case the public_branch is needed and it must be\n"
3476
"up-to-date and accessible to the recipient. The public_branch is always\n"
3477
"included if known, so that people can check it later."
3478
msgstr ""
3479
3480
#: bzrlib/builtins.py:5763
3481
msgid ""
3482
"The submit branch defaults to the parent of the source branch, but can be\n"
3483
"overridden. Both submit branch and public branch will be remembered in\n"
3484
"branch.conf the first time they are used for a particular branch. The\n"
3485
"source branch defaults to that containing the working directory, but can\n"
3486
"be changed using --from."
3487
msgstr ""
3488
3489
#: bzrlib/builtins.py:5769
3490
msgid ""
3491
"Both the submit branch and the public branch follow the usual behavior with\n"
3492
"respect to --remember: If there is no default location set, the first send\n"
3493
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3494
"omit the location to use the default. To change the default, use\n"
3495
"--remember. The value will only be saved if the location can be accessed."
3496
msgstr ""
3497
3498
#: bzrlib/builtins.py:5775
3499
msgid ""
3500
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3501
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3502
"If a public location is known for the submit_branch, that location is used\n"
3503
"in the merge directive."
3504
msgstr ""
3505
3506
#: bzrlib/builtins.py:5780
3507
msgid ""
3508
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3509
"given, in which case it is sent to a file."
3510
msgstr ""
3511
3512
#: bzrlib/builtins.py:5783
3513
msgid ""
3514
"Mail is sent using your preferred mail program. This should be transparent\n"
3515
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3516
"If the preferred client can't be found (or used), your editor will be used."
3517
msgstr ""
3518
3519
#: bzrlib/builtins.py:5787
3520
msgid ""
3521
"To use a specific mail program, set the mail_client configuration option.\n"
3522
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3523
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3524
"(MacOS X's\n"
3525
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3526
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3527
"add\n"
3528
"supported clients."
3529
msgstr ""
3530
3531
#: bzrlib/builtins.py:5794
3532
msgid ""
3533
"If mail is being sent, a to address is required. This can be supplied\n"
3534
"either on the commandline, by setting the submit_to configuration\n"
3535
"option in the branch itself or the child_submit_to configuration option\n"
3536
"in the submit branch."
3537
msgstr ""
3538
3539
#: bzrlib/builtins.py:5799
3540
msgid ""
3541
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3542
"and\n"
3543
"merge directive format 2. It is significantly faster and smaller than\n"
3544
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3545
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3546
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3547
msgstr ""
3548
3549
#: bzrlib/builtins.py:5805
3550
msgid ""
3551
"The merge directives created by bzr send may be applied using bzr merge or\n"
3552
"bzr pull by specifying a file containing a merge directive as the location."
3553
msgstr ""
3554
3555
#: bzrlib/builtins.py:5808
3556
msgid ""
3557
"bzr send makes extensive use of public locations to map local locations "
3558
"into\n"
3559
"URLs that can be used by other people. See `bzr help configuration` to\n"
3560
"set them, and use `bzr info` to display them."
3561
msgstr ""
3562
3563
#: bzrlib/builtins.py:5832
3564
msgid "Write merge directive to this file or directory; use - for stdout."
3565
msgstr ""
3566
3567
#: bzrlib/builtins.py:5836
3568
msgid ""
3569
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3570
"strict disables the check."
3571
msgstr ""
3572
3573
#: bzrlib/builtins.py:5838
3574
msgid "Mail the request to this address."
3575
msgstr ""
3576
3577
#: bzrlib/builtins.py:5842
3578
msgid "Body for the email."
3579
msgstr ""
3580
3581
#: bzrlib/builtins.py:5895
3582
msgid "Do not include a bundle in the merge directive."
3583
msgstr ""
3584
3585
#: bzrlib/builtins.py:5896
3586
msgid "Do not include a preview patch in the merge directive."
3587
msgstr ""
3588
3589
#: bzrlib/builtins.py:5899
3590
msgid "Remember submit and public branch."
3591
msgstr ""
3592
3593
#: bzrlib/builtins.py:5901
3594
msgid ""
3595
"Branch to generate the submission from, rather than the one containing the "
3596
"working directory."
3597
msgstr ""
3598
3599
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3600
msgid "format"
3601
msgstr ""
3602
3603
#: bzrlib/builtins.py:5912
3604
msgid "Use the specified output format."
3605
msgstr ""
3606
3607
#: bzrlib/builtins.py:5934
3608
msgid "Create, remove or modify a tag naming a revision."
3609
msgstr ""
3610
3611
#: bzrlib/builtins.py:5936
3612
msgid ""
3613
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3614
"(--revision) option can be given -rtag:X, where X is any previously\n"
3615
"created tag."
3616
msgstr ""
3617
3618
#: bzrlib/builtins.py:5940
3619
msgid ""
3620
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3621
"along when you branch, push, pull or merge."
3622
msgstr ""
3623
3624
#: bzrlib/builtins.py:5943
3625
msgid ""
3626
"It is an error to give a tag name that already exists unless you pass\n"
3627
"--force, in which case the tag is moved to point to the new revision."
3628
msgstr ""
3629
3630
#: bzrlib/builtins.py:5946
3631
msgid ""
3632
"To rename a tag (change the name but keep it on the same revsion), run "
3633
"``bzr\n"
3634
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3635
msgstr ""
3636
3637
#: bzrlib/builtins.py:5949
3638
msgid ""
3639
"If no tag name is specified it will be determined through the \n"
3640
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3641
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3642
"details."
3643
msgstr ""
3644
3645
#: bzrlib/builtins.py:5959
3646
msgid "Delete this tag rather than placing it."
3647
msgstr ""
3648
3649
#: bzrlib/builtins.py:5962
3650
msgid "Branch in which to place the tag."
3651
msgstr ""
3652
3653
#: bzrlib/builtins.py:5964
3654
msgid "Replace existing tags."
3655
msgstr ""
3656
3657
#: bzrlib/builtins.py:5979
3658
msgid "No tag specified to delete."
3659
msgstr ""
3660
3661
#: bzrlib/builtins.py:5981
3662
#, python-format
3663
msgid "Deleted tag %s."
3664
msgstr ""
3665
3666
#: bzrlib/builtins.py:5995
3667
msgid "Please specify a tag name."
3668
msgstr ""
3669
3670
#: bzrlib/builtins.py:6003
3671
#, python-format
3672
msgid "Tag %s already exists for that revision."
3673
msgstr ""
3674
3675
#: bzrlib/builtins.py:6007
3676
#, python-format
3677
msgid "Created tag %s."
3678
msgstr ""
3679
3680
#: bzrlib/builtins.py:6009
3681
#, python-format
3682
msgid "Updated tag %s."
3683
msgstr ""
3684
3685
#: bzrlib/builtins.py:6013
3686
msgid "List tags."
3687
msgstr ""
3688
3689
#: bzrlib/builtins.py:6015
3690
msgid ""
3691
"This command shows a table of tag names and the revisions they reference."
3692
msgstr ""
3693
3694
#: bzrlib/builtins.py:6021
3695
msgid "Branch whose tags should be displayed."
3696
msgstr ""
3697
3698
#: bzrlib/builtins.py:6023
3699
msgid "Sort tags by different criteria."
3700
msgstr ""
3701
3702
#: bzrlib/builtins.py:6023
3703
msgid "Sorting"
3704
msgstr ""
3705
3706
#: bzrlib/builtins.py:6092
3707
msgid "Reconfigure the type of a bzr directory."
3708
msgstr ""
3709
3710
#: bzrlib/builtins.py:6094
3711
msgid "A target configuration must be specified."
3712
msgstr ""
3713
3714
#: bzrlib/builtins.py:6096
3715
msgid ""
3716
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3717
"The order of preference is\n"
3718
"1. For a lightweight checkout, the current bound location.\n"
3719
"2. For branches that used to be checkouts, the previously-bound location.\n"
3720
"3. The push location.\n"
3721
"4. The parent location.\n"
3722
"If none of these is available, --bind-to must be specified."
3723
msgstr ""
3724
3725
#: bzrlib/builtins.py:6110
3726
msgid "Tree type"
3727
msgstr ""
3728
3729
#: bzrlib/builtins.py:6111
3730
msgid "The relation between branch and tree."
3731
msgstr ""
3732
3733
#: bzrlib/builtins.py:6113
3734
msgid "Reconfigure to be an unbound branch with no working tree."
3735
msgstr ""
3736
3737
#: bzrlib/builtins.py:6114
3738
msgid "Reconfigure to be an unbound branch with a working tree."
3739
msgstr ""
3740
3741
#: bzrlib/builtins.py:6115
3742
msgid "Reconfigure to be a bound branch with a working tree."
3743
msgstr ""
3744
3745
#: bzrlib/builtins.py:6116
3746
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3747
msgstr ""
3748
3749
#: bzrlib/builtins.py:6121
3750
msgid "Repository type"
3751
msgstr ""
3752
3753
#: bzrlib/builtins.py:6122
3754
msgid "Location fo the repository."
3755
msgstr ""
3756
3757
#: bzrlib/builtins.py:6124
3758
msgid ""
3759
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3760
msgstr ""
3761
3762
#: bzrlib/builtins.py:6126
3763
msgid "Reconfigure to use a shared repository."
3764
msgstr ""
3765
3766
#: bzrlib/builtins.py:6130
3767
msgid "Trees in Repository"
3768
msgstr ""
3769
3770
#: bzrlib/builtins.py:6131
3771
msgid "Whether new branches in the repository have trees."
3772
msgstr ""
3773
3774
#: bzrlib/builtins.py:6133
3775
msgid ""
3776
"Reconfigure repository to create working trees on branches by default."
3777
msgstr ""
3778
3779
#: bzrlib/builtins.py:6135
3780
msgid ""
3781
"Reconfigure repository to not create working trees on branches by default."
3782
msgstr ""
3783
3784
#: bzrlib/builtins.py:6138
3785
msgid "Branch to bind checkout to."
3786
msgstr ""
3787
3788
#: bzrlib/builtins.py:6140
3789
msgid "Perform reconfiguration even if local changes will be lost."
3790
msgstr ""
3791
3792
#: bzrlib/builtins.py:6143
3793
msgid "Reconfigure a branch to be stacked on another branch."
3794
msgstr ""
3795
3796
#: bzrlib/builtins.py:6147
3797
msgid ""
3798
"Reconfigure a branch to be unstacked. This may require copying substantial "
3799
"data into it."
3800
msgstr ""
3801
3802
#: bzrlib/builtins.py:6157
3803
msgid "Can't use both --stacked-on and --unstacked"
3804
msgstr ""
3805
3806
#: bzrlib/builtins.py:6171
3807
msgid "No target configuration specified"
3808
msgstr ""
3809
3810
#: bzrlib/builtins.py:6206
3811
msgid "Set the branch of a checkout and update."
3812
msgstr ""
3813
3814
#: bzrlib/builtins.py:6208
3815
msgid ""
3816
"For lightweight checkouts, this changes the branch being referenced.\n"
3817
"For heavyweight checkouts, this checks that there are no local commits\n"
3818
"versus the current bound branch, then it makes the local branch a mirror\n"
3819
"of the new location and binds to it."
3820
msgstr ""
3821
3822
#: bzrlib/builtins.py:6213
3823
msgid ""
3824
"In both cases, the working tree is updated and uncommitted changes\n"
3825
"are merged. The user can commit or revert these as they desire."
3826
msgstr ""
3827
3828
#: bzrlib/builtins.py:6216
3829
msgid "Pending merges need to be committed or reverted before using switch."
3830
msgstr ""
3831
3832
#: bzrlib/builtins.py:6218
3833
msgid ""
3834
"The path to the branch to switch to can be specified relative to the parent\n"
3835
"directory of the current branch. For example, if you are currently in a\n"
3836
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3837
"/path/to/newbranch."
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:6223
3841
msgid ""
3842
"Bound branches use the nickname of its master branch unless it is set\n"
3843
"locally, in which case switching will update the local nickname to be\n"
3844
"that of the master."
3845
msgstr ""
3846
3847
#: bzrlib/builtins.py:6231
3848
msgid "Switch even if local commits will be lost."
3849
msgstr ""
3850
3851
#: bzrlib/builtins.py:6234
3852
msgid "Create the target branch from this one before switching to it."
3853
msgstr ""
3854
3855
#: bzrlib/builtins.py:6248
3856
msgid "You must supply either a revision or a location"
3857
msgstr ""
3858
3859
#: bzrlib/builtins.py:6261
3860
msgid "cannot create branch without source branch"
3861
msgstr ""
3862
3863
#: bzrlib/builtins.py:6286
3864
msgid "Manage filtered views."
3865
msgstr ""
3866
3867
#: bzrlib/builtins.py:6288
3868
msgid ""
3869
"Views provide a mask over the tree so that users can focus on\n"
3870
"a subset of a tree when doing their work. After creating a view,\n"
3871
"commands that support a list of files - status, diff, commit, etc -\n"
3872
"effectively have that list of files implicitly given each time.\n"
3873
"An explicit list of files can still be given but those files\n"
3874
"must be within the current view."
3875
msgstr ""
3876
3877
#: bzrlib/builtins.py:6295
3878
msgid ""
3879
"In most cases, a view has a short life-span: it is created to make\n"
3880
"a selected change and is deleted once that change is committed.\n"
3881
"At other times, you may wish to create one or more named views\n"
3882
"and switch between them."
3883
msgstr ""
3884
3885
#: bzrlib/builtins.py:6300
3886
msgid ""
3887
"To disable the current view without deleting it, you can switch to\n"
3888
"the pseudo view called ``off``. This can be useful when you need\n"
3889
"to see the whole tree for an operation or two (e.g. merge) but\n"
3890
"want to switch back to your view after that."
3891
msgstr ""
3892
3893
#: bzrlib/builtins.py:6305
3894
msgid ""
3895
":Examples:\n"
3896
" To define the current view::"
3897
msgstr ""
3898
3899
#: bzrlib/builtins.py:6308
3900
msgid " bzr view file1 dir1 ..."
3901
msgstr ""
3902
3903
#: bzrlib/builtins.py:6310
3904
msgid " To list the current view::"
3905
msgstr ""
3906
3907
#: bzrlib/builtins.py:6312
3908
msgid " bzr view"
3909
msgstr ""
3910
3911
#: bzrlib/builtins.py:6314
3912
msgid " To delete the current view::"
3913
msgstr ""
3914
3915
#: bzrlib/builtins.py:6316
3916
msgid " bzr view --delete"
3917
msgstr ""
3918
3919
#: bzrlib/builtins.py:6318
3920
msgid " To disable the current view without deleting it::"
3921
msgstr ""
3922
3923
#: bzrlib/builtins.py:6320
3924
msgid " bzr view --switch off"
3925
msgstr ""
3926
3927
#: bzrlib/builtins.py:6322
3928
msgid " To define a named view and switch to it::"
3929
msgstr ""
3930
3931
#: bzrlib/builtins.py:6324
3932
msgid " bzr view --name view-name file1 dir1 ..."
3933
msgstr ""
3934
3935
#: bzrlib/builtins.py:6326
3936
msgid " To list a named view::"
3937
msgstr ""
3938
3939
#: bzrlib/builtins.py:6328
3940
msgid " bzr view --name view-name"
3941
msgstr ""
3942
3943
#: bzrlib/builtins.py:6330
3944
msgid " To delete a named view::"
3945
msgstr ""
3946
3947
#: bzrlib/builtins.py:6332
3948
msgid " bzr view --name view-name --delete"
3949
msgstr ""
3950
3951
#: bzrlib/builtins.py:6334
3952
msgid " To switch to a named view::"
3953
msgstr ""
3954
3955
#: bzrlib/builtins.py:6336
3956
msgid " bzr view --switch view-name"
3957
msgstr ""
3958
3959
#: bzrlib/builtins.py:6338
3960
msgid " To list all views defined::"
3961
msgstr ""
3962
3963
#: bzrlib/builtins.py:6340
3964
msgid " bzr view --all"
3965
msgstr ""
3966
3967
#: bzrlib/builtins.py:6342
3968
msgid " To delete all views::"
3969
msgstr ""
3970
3971
#: bzrlib/builtins.py:6344
3972
msgid " bzr view --delete --all"
3973
msgstr ""
3974
3975
#: bzrlib/builtins.py:6351
3976
msgid "Apply list or delete action to all views."
3977
msgstr ""
3978
3979
#: bzrlib/builtins.py:6354
3980
msgid "Delete the view."
3981
msgstr ""
3982
3983
#: bzrlib/builtins.py:6357
3984
msgid "Name of the view to define, list or delete."
3985
msgstr ""
3986
3987
#: bzrlib/builtins.py:6361
3988
msgid "Name of the view to switch to."
3989
msgstr ""
3990
3991
#: bzrlib/builtins.py:6380
3992
msgid "Both --delete and a file list specified"
3993
msgstr ""
3994
3995
#: bzrlib/builtins.py:6383
3996
msgid "Both --delete and --switch specified"
3997
msgstr ""
3998
3999
#: bzrlib/builtins.py:6386
4000
msgid "Deleted all views.\n"
4001
msgstr ""
4002
4003
#: bzrlib/builtins.py:6388
4004
msgid "No current view to delete"
4005
msgstr ""
4006
4007
#: bzrlib/builtins.py:6391
4008
#, python-format
4009
msgid "Deleted '%s' view.\n"
4010
msgstr ""
4011
4012
#: bzrlib/builtins.py:6395
4013
msgid "Both --switch and a file list specified"
4014
msgstr ""
4015
4016
#: bzrlib/builtins.py:6398
4017
msgid "Both --switch and --all specified"
4018
msgstr ""
4019
4020
#: bzrlib/builtins.py:6401
4021
msgid "No current view to disable"
4022
msgstr ""
4023
4024
#: bzrlib/builtins.py:6403
4025
#, python-format
4026
msgid "Disabled '%s' view.\n"
4027
msgstr ""
4028
4029
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4030
msgid "Using '{0}' view: {1}\n"
4031
msgstr ""
4032
4033
#: bzrlib/builtins.py:6410
4034
msgid "Views defined:\n"
4035
msgstr ""
4036
4037
#: bzrlib/builtins.py:6419
4038
msgid "No views defined.\n"
4039
msgstr ""
4040
4041
#: bzrlib/builtins.py:6426
4042
msgid "Cannot change the 'off' pseudo view"
4043
msgstr ""
4044
4045
#: bzrlib/builtins.py:6434
4046
msgid "No current view.\n"
4047
msgstr ""
4048
4049
#: bzrlib/builtins.py:6437
4050
msgid "'{0}' view is: {1}\n"
4051
msgstr ""
4052
4053
#: bzrlib/builtins.py:6457
4054
msgid " <no hooks installed>\n"
4055
msgstr ""
4056
4057
#: bzrlib/builtins.py:6461
4058
msgid "Remove a branch."
4059
msgstr ""
4060
4061
#: bzrlib/builtins.py:6463
4062
msgid ""
4063
"This will remove the branch from the specified location but \n"
4064
"will keep any working tree or repository in place."
4065
msgstr ""
4066
4067
#: bzrlib/builtins.py:6468
4068
msgid " Remove the branch at repo/trunk::"
4069
msgstr ""
4070
4071
#: bzrlib/builtins.py:6470
4072
msgid " bzr remove-branch repo/trunk"
4073
msgstr ""
4074
4075
#: bzrlib/builtins.py:6477
4076
msgid "Remove branch even if it is the active branch."
4077
msgstr ""
4078
4079
#: bzrlib/builtins.py:6491
4080
msgid "Branch is active. Use --force to remove it."
4081
msgstr ""
4082
4083
#: bzrlib/builtins.py:6495
4084
msgid "Plaintext diff output."
4085
msgstr ""
4086
4087
#: bzrlib/builtins.py:6496
4088
msgid "Temporarily set aside some changes from the current tree."
4089
msgstr ""
4090
4091
#: bzrlib/builtins.py:6498
4092
msgid ""
4093
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4094
"ie. out of the way, until a later time when you can bring them back from\n"
4095
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4096
"your working tree, and so they aren't propagated along with your branch nor\n"
4097
"will they survive its deletion."
4098
msgstr ""
4099
4100
#: bzrlib/builtins.py:6504
4101
msgid "If shelve --list is specified, previously-shelved changes are listed."
4102
msgstr ""
4103
4104
#: bzrlib/builtins.py:6506
4105
msgid ""
4106
"Shelve is intended to help separate several sets of changes that have\n"
4107
"been inappropriately mingled. If you just want to get rid of all changes\n"
4108
"and you don't need to restore them later, use revert. If you want to\n"
4109
"shelve all text changes at once, use shelve --all."
4110
msgstr ""
4111
4112
#: bzrlib/builtins.py:6511
4113
msgid ""
4114
"If filenames are specified, only the changes to those files will be\n"
4115
"shelved. Other files will be left untouched."
4116
msgstr ""
4117
4118
#: bzrlib/builtins.py:6514
4119
msgid ""
4120
"If a revision is specified, changes since that revision will be shelved."
4121
msgstr ""
4122
4123
#: bzrlib/builtins.py:6516
4124
msgid ""
4125
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4126
"restore the most recently shelved changes."
4127
msgstr ""
4128
4129
#: bzrlib/builtins.py:6519
4130
msgid ""
4131
"For complicated changes, it is possible to edit the changes in a separate\n"
4132
"editor program to decide what the file remaining in the working copy\n"
4133
"should look like. To do this, add the configuration option"
4134
msgstr ""
4135
4136
#: bzrlib/builtins.py:6523
4137
msgid " change_editor = PROGRAM @new_path @old_path"
4138
msgstr ""
4139
4140
#: bzrlib/builtins.py:6525
4141
msgid ""
4142
"where @new_path is replaced with the path of the new version of the \n"
4143
"file and @old_path is replaced with the path of the old version of \n"
4144
"the file. The PROGRAM should save the new file with the desired \n"
4145
"contents of the file in the working tree.\n"
4146
" "
4147
msgstr ""
4148
4149
#: bzrlib/builtins.py:6537
4150
msgid "Shelve all changes."
4151
msgstr ""
4152
4153
#: bzrlib/builtins.py:6539
4154
msgid "Method to use for writing diffs."
4155
msgstr ""
4156
4157
#: bzrlib/builtins.py:6539
4158
msgid "writer"
4159
msgstr ""
4160
4161
#: bzrlib/builtins.py:6543
4162
msgid "List shelved changes."
4163
msgstr ""
4164
4165
#: bzrlib/builtins.py:6545
4166
msgid "Destroy removed changes instead of shelving them."
4167
msgstr ""
4168
4169
#: bzrlib/builtins.py:6574
4170
msgid "No shelved changes."
4171
msgstr ""
4172
4173
#: bzrlib/builtins.py:6585
4174
msgid "Restore shelved changes."
4175
msgstr ""
4176
4177
#: bzrlib/builtins.py:6587
4178
msgid ""
4179
"By default, the most recently shelved changes are restored. However if you\n"
4180
"specify a shelf by id those changes will be restored instead. This works\n"
4181
"best when the changes don't depend on each other."
4182
msgstr ""
4183
4184
#: bzrlib/builtins.py:6596
4185
msgid "The action to perform."
4186
msgstr ""
4187
4188
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4189
msgid "action"
4190
msgstr ""
4191
4192
#: bzrlib/builtins.py:6598
4193
msgid "Apply changes and remove from the shelf."
4194
msgstr ""
4195
4196
#: bzrlib/builtins.py:6599
4197
msgid "Show changes, but do not apply or remove them."
4198
msgstr ""
4199
4200
#: bzrlib/builtins.py:6600
4201
msgid ""
4202
"Instead of unshelving the changes, show the diff that would result from "
4203
"unshelving."
4204
msgstr ""
4205
4206
#: bzrlib/builtins.py:6602
4207
msgid "Delete changes without applying them."
4208
msgstr ""
4209
4210
#: bzrlib/builtins.py:6603
4211
msgid "Apply changes but don't delete them."
4212
msgstr ""
4213
4214
#: bzrlib/builtins.py:6618
4215
msgid "Remove unwanted files from working tree."
4216
msgstr ""
4217
4218
#: bzrlib/builtins.py:6620
4219
msgid ""
4220
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4221
"files are never deleted."
4222
msgstr ""
4223
4224
#: bzrlib/builtins.py:6623
4225
msgid ""
4226
"Another class is 'detritus', which includes files emitted by bzr during\n"
4227
"normal operations and selftests. (The value of these files decreases with\n"
4228
"time.)"
4229
msgstr ""
4230
4231
#: bzrlib/builtins.py:6627
4232
msgid ""
4233
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4234
"flags are respected, and may be combined."
4235
msgstr ""
4236
4237
#: bzrlib/builtins.py:6630
4238
msgid "To check what clean-tree will do, use --dry-run."
4239
msgstr ""
4240
4241
#: bzrlib/builtins.py:6633
4242
msgid "Delete all ignored files."
4243
msgstr ""
4244
4245
#: bzrlib/builtins.py:6634
4246
msgid ""
4247
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4248
msgstr ""
4249
4250
#: bzrlib/builtins.py:6637
4251
msgid "Delete files unknown to bzr (default)."
4252
msgstr ""
4253
4254
#: bzrlib/builtins.py:6638
4255
msgid "Show files to delete instead of deleting them."
4256
msgstr ""
4257
4258
#: bzrlib/builtins.py:6640
4259
msgid "Do not prompt before deleting."
4260
msgstr ""
4261
4262
#: bzrlib/bundle/__init__.py:59
4263
msgid "A directory cannot be a bundle"
4264
msgstr ""
4265
4266
#: bzrlib/bundle/apply_bundle.py:40
4267
msgid "Install revisions"
4268
msgstr ""
4269
4270
#: bzrlib/bundle/commands.py:64
4271
msgid "--verbose requires a merge directive"
4272
msgstr ""
4273
4274
#: bzrlib/bundle/commands.py:67
4275
msgid "Bundle format not supported"
4276
msgstr ""
4277
4278
#: bzrlib/bundle/commands.py:77
4279
msgid "Records\n"
4280
msgstr ""
4281
4282
#: bzrlib/bundle/commands.py:81
4283
msgid "{0}: {1} ({2} multiparent)\n"
4284
msgstr ""
4285
4286
#: bzrlib/bundle/commands.py:83
4287
#, python-format
4288
msgid "unique files: %d\n"
4289
msgstr ""
4290
4291
#: bzrlib/bundle/commands.py:92
4292
msgid "Revisions\n"
4293
msgstr ""
4294
4295
#: bzrlib/bundle/commands.py:93
4296
#, python-format
4297
msgid "nicks: %s\n"
4298
msgstr ""
4299
4300
#: bzrlib/bundle/commands.py:95
4301
#, python-format
4302
msgid ""
4303
"committers: \n"
4304
"%s\n"
4305
msgstr ""
4306
4307
#: bzrlib/bundle/commands.py:103
4308
msgid "Decoded contents\n"
4309
msgstr ""
4310
4311
#: bzrlib/bundle/serializer/v4.py:327
4312
#, python-format
4313
msgid "Bundling %d revision."
4314
msgid_plural "Bundling %d revisions."
4315
msgstr[0] ""
4316
msgstr[1] ""
4317
4318
#: bzrlib/bzrdir.py:487
4319
msgid ""
4320
"making backup of {0}\n"
4321
" to {1}"
4322
msgstr ""
4323
4324
#: bzrlib/bzrdir.py:510
4325
msgid "renamed {0} to {1}"
4326
msgstr ""
4327
4328
#: bzrlib/bzrdir.py:1639
4329
#, python-format
4330
msgid ""
4331
"Source repository format does not support stacking, using format:\n"
4332
" %s"
4333
msgstr ""
4334
4335
#: bzrlib/bzrdir.py:1659
4336
#, python-format
4337
msgid ""
4338
"Source branch format does not support stacking, using format:\n"
4339
" %s"
4340
msgstr ""
4341
4342
#: bzrlib/bzrdir.py:1805
4343
msgid "starting repository conversion"
4344
msgstr ""
4345
4346
#: bzrlib/bzrdir.py:2026
4347
msgid "Using default stacking branch {0} at {1}"
4348
msgstr ""
4349
4350
#: bzrlib/check.py:108
4351
msgid "check"
4352
msgstr ""
4353
4354
#: bzrlib/check.py:110
4355
msgid "checking revisions"
4356
msgstr ""
4357
4358
#: bzrlib/check.py:112
4359
msgid "checking commit contents"
4360
msgstr ""
4361
4362
#: bzrlib/check.py:114
4363
msgid "checking file graphs"
4364
msgstr ""
4365
4366
#: bzrlib/check.py:118
4367
msgid "checking branches and trees"
4368
msgstr ""
4369
4370
#: bzrlib/check.py:205
4371
msgid "checked repository {0} format {1}"
4372
msgstr ""
4373
4374
#: bzrlib/check.py:208
4375
#, python-format
4376
msgid "%6d revisions"
4377
msgstr ""
4378
4379
#: bzrlib/check.py:209
4380
#, python-format
4381
msgid "%6d file-ids"
4382
msgstr ""
4383
4384
#: bzrlib/check.py:211
4385
#, python-format
4386
msgid "%6d unreferenced text versions"
4387
msgstr ""
4388
4389
#: bzrlib/check.py:215
4390
msgid "unreferenced version: {{{0}}} in {1}"
4391
msgstr ""
4392
4393
#: bzrlib/check.py:218
4394
#, python-format
4395
msgid "%6d revisions are missing inventory_sha1"
4396
msgstr ""
4397
4398
#: bzrlib/check.py:221
4399
#, python-format
4400
msgid "%6d revisions are mentioned but not present"
4401
msgstr ""
4402
4403
#: bzrlib/check.py:224
4404
#, python-format
4405
msgid "%6d ghost revisions"
4406
msgstr ""
4407
4408
#: bzrlib/check.py:229
4409
#, python-format
4410
msgid "%6d revisions missing parents in ancestry"
4411
msgstr ""
4412
4413
#: bzrlib/check.py:233
4414
#, python-format
4415
msgid " %s should be in the ancestry for:"
4416
msgstr ""
4417
4418
#: bzrlib/check.py:237
4419
#, python-format
4420
msgid "%6d inconsistent parents"
4421
msgstr ""
4422
4423
#: bzrlib/check.py:241
4424
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4425
msgstr ""
4426
4427
#: bzrlib/check.py:247
4428
#, python-format
4429
msgid "%6d revisions have incorrect parents in the revision index"
4430
msgstr ""
4431
4432
#: bzrlib/check.py:253
4433
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4434
msgstr ""
4435
4436
#: bzrlib/check.py:267
4437
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4438
msgstr ""
4439
4440
#: bzrlib/check.py:296
4441
msgid ""
4442
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4443
"{{{4}}}"
4444
msgstr ""
4445
4446
#: bzrlib/check.py:354
4447
#, python-format
4448
msgid "Checking branch at '%s'."
4449
msgstr ""
4450
4451
#: bzrlib/check.py:374
4452
#, python-format
4453
msgid "Checking working tree at '%s'."
4454
msgstr ""
4455
4456
#: bzrlib/check.py:427 bzrlib/check.py:441
4457
msgid "No branch found at specified location."
4458
msgstr ""
4459
4460
#: bzrlib/check.py:429 bzrlib/check.py:439
4461
msgid "No working tree found at specified location."
4462
msgstr ""
4463
4464
#: bzrlib/check.py:432
4465
#, python-format
4466
msgid "Checking repository at '%s'."
4467
msgstr ""
4468
4469
#: bzrlib/check.py:443
4470
msgid "No repository found at specified location."
4471
msgstr ""
4472
4473
#: bzrlib/clean_tree.py:63
4474
msgid "Nothing to delete."
4475
msgstr ""
4476
4477
#: bzrlib/clean_tree.py:68
4478
msgid "Are you sure you wish to delete these"
4479
msgstr ""
4480
4481
#: bzrlib/clean_tree.py:70
4482
msgid "Canceled"
4483
msgstr ""
4484
4485
#: bzrlib/clean_tree.py:107
4486
#, python-format
4487
msgid "unable to remove %s"
4488
msgstr ""
4489
4490
#: bzrlib/clean_tree.py:111
4491
msgid "deleting paths:"
4492
msgstr ""
4493
4494
#: bzrlib/clean_tree.py:125
4495
msgid "unable to remove \"{0}\": {1}."
4496
msgstr ""
4497
4498
#: bzrlib/clean_tree.py:130
4499
msgid "No files deleted."
4500
msgstr ""
4501
4502
#: bzrlib/cmd_version_info.py:47
4503
msgid "No known version info format {0}. Supported types are: {1}"
4504
msgstr ""
4505
4506
#: bzrlib/cmd_version_info.py:52
4507
msgid "Version info in Custom template-based format."
4508
msgstr ""
4509
4510
#: bzrlib/cmd_version_info.py:52
4511
msgid "Version info in Python format."
4512
msgstr ""
4513
4514
#: bzrlib/cmd_version_info.py:52
4515
msgid "Version info in RIO (simple text) format (default)."
4516
msgstr ""
4517
4518
#: bzrlib/cmd_version_info.py:53
4519
msgid "Show version information about this tree."
4520
msgstr ""
4521
4522
#: bzrlib/cmd_version_info.py:55
4523
msgid ""
4524
"You can use this command to add information about version into\n"
4525
"source code of an application. The output can be in one of the\n"
4526
"supported formats or in a custom format based on a template."
4527
msgstr ""
4528
4529
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4530
#: en/help_topics/configuration.txt:722
4531
msgid "For example::"
4532
msgstr ""
4533
4534
#: bzrlib/cmd_version_info.py:61
4535
msgid ""
4536
" bzr version-info --custom \\\n"
4537
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4538
msgstr ""
4539
4540
#: bzrlib/cmd_version_info.py:64
4541
msgid ""
4542
"will produce a C header file with formatted string containing the\n"
4543
"current revision number. Other supported variables in templates are:"
4544
msgstr ""
4545
4546
#: bzrlib/cmd_version_info.py:67
4547
msgid ""
4548
" * {date} - date of the last revision\n"
4549
" * {build_date} - current date\n"
4550
" * {revno} - revision number\n"
4551
" * {revision_id} - revision id\n"
4552
" * {branch_nick} - branch nickname\n"
4553
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4554
" otherwise 1"
4555
msgstr ""
4556
4557
#: bzrlib/cmd_version_info.py:77
4558
msgid "Select the output format."
4559
msgstr ""
4560
4561
#: bzrlib/cmd_version_info.py:81
4562
msgid "Include all possible information."
4563
msgstr ""
4564
4565
#: bzrlib/cmd_version_info.py:82
4566
msgid "Check if tree is clean."
4567
msgstr ""
4568
4569
#: bzrlib/cmd_version_info.py:84
4570
msgid "Include the revision-history."
4571
msgstr ""
4572
4573
#: bzrlib/cmd_version_info.py:86
4574
msgid "Include the last revision for each file."
4575
msgstr ""
4576
4577
#: bzrlib/cmd_version_info.py:87
4578
msgid "Template for the output."
4579
msgstr ""
4580
4581
#: bzrlib/cmd_version_info.py:101
4582
msgid "bzr version-info --revision takes exactly one revision specifier"
4583
msgstr ""
4584
4585
#: bzrlib/commands.py:229
4586
#, python-format
4587
msgid "unknown command \"%s\""
4588
msgstr ""
4589
4590
#: bzrlib/commands.py:476
4591
msgid "No help for this command."
4592
msgstr ""
4593
4594
#: bzrlib/commands.py:489
4595
#, python-format
4596
msgid ":Purpose: %s\n"
4597
msgstr ""
4598
4599
#: bzrlib/commands.py:491
4600
#, python-format
4601
msgid ""
4602
":Usage:\n"
4603
"%s\n"
4604
msgstr ""
4605
4606
#: bzrlib/commands.py:493
4607
#, python-format
4608
msgid ":Usage: %s\n"
4609
msgstr ""
4610
4611
#: bzrlib/commands.py:512
4612
#, python-format
4613
msgid ":Options:%s"
4614
msgstr ""
4615
4616
#: bzrlib/commands.py:523
4617
#, python-format
4618
msgid ""
4619
":Description:\n"
4620
" %s\n"
4621
"\n"
4622
msgstr ""
4623
4624
#: bzrlib/commands.py:533
4625
#, python-format
4626
msgid ""
4627
"See bzr help %s for more details and examples.\n"
4628
"\n"
4629
msgstr ""
4630
4631
#: bzrlib/commands.py:538
4632
msgid ":Aliases: "
4633
msgstr ""
4634
4635
#: bzrlib/commands.py:542
4636
#, python-format
4637
msgid ":From: plugin \"%s\"\n"
4638
msgstr ""
4639
4640
#: bzrlib/commands.py:554
4641
msgid ":doc:`{0} <{1}-help>`"
4642
msgstr ""
4643
4644
#: bzrlib/commands.py:558
4645
#, python-format
4646
msgid ":See also: %s"
4647
msgstr ""
4648
4649
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4650
msgid "Only ASCII permitted in option names"
4651
msgstr ""
4652
4653
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4654
msgid "command {0!r} needs one or more {1}"
4655
msgstr ""
4656
4657
#: bzrlib/commands.py:868
4658
msgid "command {0!r} requires argument {1}"
4659
msgstr ""
4660
4661
#: bzrlib/commands.py:875
4662
msgid "extra argument to command {0}: {1}"
4663
msgstr ""
4664
4665
#: bzrlib/commands.py:972
4666
#, python-format
4667
msgid "Profile data written to \"%s\"."
4668
msgstr ""
4669
4670
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4671
msgid "added"
4672
msgstr ""
4673
4674
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4675
msgid "modified"
4676
msgstr ""
4677
4678
#: bzrlib/commit.py:131
4679
#, python-format
4680
msgid "Committing%s"
4681
msgstr ""
4682
4683
#: bzrlib/commit.py:134
4684
#, python-format
4685
msgid "Committed revision %d."
4686
msgstr ""
4687
4688
#: bzrlib/commit.py:143
4689
#, python-format
4690
msgid "deleted %s"
4691
msgstr ""
4692
4693
#: bzrlib/commit.py:146
4694
#, python-format
4695
msgid "missing %s"
4696
msgstr ""
4697
4698
#: bzrlib/commit.py:511
4699
msgid ""
4700
"Conflicting tags in bound branch:\n"
4701
"{0}"
4702
msgstr ""
4703
4704
#: bzrlib/commit.py:742
4705
msgid "renamed"
4706
msgstr ""
4707
4708
#: bzrlib/commit.py:976
4709
msgid "unchanged"
4710
msgstr ""
4711
4712
#: bzrlib/commit.py:998
4713
msgid "{0} [{1}] - Stage"
4714
msgstr ""
4715
4716
#: bzrlib/commit.py:1001
4717
#, python-format
4718
msgid "%s - Stage"
4719
msgstr ""
4720
4721
#: bzrlib/commit_signature_commands.py:34
4722
msgid "Sign all commits by a given committer."
4723
msgstr ""
4724
4725
#: bzrlib/commit_signature_commands.py:36
4726
msgid ""
4727
"If location is not specified the local tree is used.\n"
4728
"If committer is not specified the default committer is used."
4729
msgstr ""
4730
4731
#: bzrlib/commit_signature_commands.py:39
4732
msgid "This does not sign commits that already have signatures."
4733
msgstr ""
4734
4735
#: bzrlib/commit_signature_commands.py:47
4736
msgid ""
4737
"Don't actually sign anything, just print the revisions that would be signed."
4738
msgstr ""
4739
4740
#: bzrlib/commit_signature_commands.py:98
4741
#, python-format
4742
msgid "Signed %d revision.\n"
4743
msgid_plural "Signed %d revisions.\n"
4744
msgstr[0] ""
4745
msgstr[1] ""
4746
4747
#: bzrlib/commit_signature_commands.py:103
4748
msgid "Verify all commit signatures."
4749
msgstr ""
4750
4751
#: bzrlib/commit_signature_commands.py:105
4752
msgid ""
4753
"Verifies that all commits in the branch are signed by known GnuPG keys."
4754
msgstr ""
4755
4756
#: bzrlib/commit_signature_commands.py:110
4757
msgid ""
4758
"Comma separated list of GPG key patterns which are acceptable for "
4759
"verification."
4760
msgstr ""
4761
4762
#: bzrlib/commit_signature_commands.py:148
4763
msgid "Cannot verify a range of non-revision-history revisions"
4764
msgstr ""
4765
4766
#: bzrlib/commit_signature_commands.py:166
4767
msgid "All commits signed with verifiable keys"
4768
msgstr ""
4769
4770
#: bzrlib/config.py:436
4771
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4772
msgstr ""
4773
4774
#: bzrlib/config.py:2452
4775
msgid "{0} is not an SI unit."
4776
msgstr ""
4777
4778
#: bzrlib/config.py:2971
4779
msgid ""
4780
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4781
"will be saved."
4782
msgstr ""
4783
4784
#: bzrlib/config.py:3116
4785
#, python-format
4786
msgid "Invalid '%s', should be of the form 'name=value'"
4787
msgstr ""
4788
4789
#: bzrlib/config.py:4018
4790
msgid "Display, set or remove a configuration option."
4791
msgstr ""
4792
4793
#: bzrlib/config.py:4020
4794
msgid "Display the active value for a given option."
4795
msgstr ""
4796
4797
#: bzrlib/config.py:4022
4798
msgid ""
4799
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4800
"matching options are displayed mentioning their scope. The active value\n"
4801
"that bzr will take into account is the first one displayed for each option."
4802
msgstr ""
4803
4804
#: bzrlib/config.py:4026
4805
msgid "If no NAME is given, --all .* is implied."
4806
msgstr ""
4807
4808
#: bzrlib/config.py:4028
4809
msgid ""
4810
"Setting a value is achieved by using name=value without spaces. The value\n"
4811
"is set in the most relevant scope and can be checked by displaying the\n"
4812
"option again."
4813
msgstr ""
4814
4815
#: bzrlib/config.py:4040
4816
msgid "Reduce the scope to the specified configuration file."
4817
msgstr ""
4818
4819
#: bzrlib/config.py:4044
4820
msgid "Display all the defined values for the matching options."
4821
msgstr ""
4822
4823
#: bzrlib/config.py:4046
4824
msgid "Remove the option from the configuration file."
4825
msgstr ""
4826
4827
#: bzrlib/conflicts.py:50
4828
msgid "List files with conflicts."
4829
msgstr ""
4830
4831
#: bzrlib/conflicts.py:57
4832
msgid ""
4833
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4834
"is supplied, the pathnames of files with text conflicts are listed,\n"
4835
"instead. (This is useful for editing all files with text conflicts.)"
4836
msgstr ""
4837
4838
#: bzrlib/conflicts.py:61
4839
msgid "Use bzr resolve when you have fixed a problem."
4840
msgstr ""
4841
4842
#: bzrlib/conflicts.py:66
4843
msgid "List paths of files with text conflicts."
4844
msgstr ""
4845
4846
#: bzrlib/conflicts.py:85
4847
msgid "Marks the conflict as resolved."
4848
msgstr ""
4849
4850
#: bzrlib/conflicts.py:88
4851
msgid "Resolve the conflict preserving the version in the working tree."
4852
msgstr ""
4853
4854
#: bzrlib/conflicts.py:91
4855
msgid "Resolve the conflict taking the merged version into account."
4856
msgstr ""
4857
4858
#: bzrlib/conflicts.py:98
4859
msgid "How to resolve the conflict."
4860
msgstr ""
4861
4862
#: bzrlib/conflicts.py:104
4863
msgid "Mark a conflict as resolved."
4864
msgstr ""
4865
4866
#: bzrlib/conflicts.py:111
4867
msgid ""
4868
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4869
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4870
"as\n"
4871
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4872
msgstr ""
4873
4874
#: bzrlib/conflicts.py:119
4875
msgid "Resolve all conflicts in this tree."
4876
msgstr ""
4877
4878
#: bzrlib/conflicts.py:126
4879
msgid "If --all is specified, no FILE may be provided"
4880
msgstr ""
4881
4882
#: bzrlib/conflicts.py:151
4883
#, python-format
4884
msgid "%d conflict auto-resolved."
4885
msgid_plural "%d conflicts auto-resolved."
4886
msgstr[0] ""
4887
msgstr[1] ""
4888
4889
#: bzrlib/conflicts.py:154
4890
msgid "Remaining conflicts:"
4891
msgstr ""
4892
4893
#: bzrlib/conflicts.py:159
4894
msgid "All conflicts resolved."
4895
msgstr ""
4896
4897
#: bzrlib/conflicts.py:168
4898
msgid "{0} conflict resolved, {1} remaining"
4899
msgid_plural "{0} conflicts resolved, {1} remaining"
4900
msgstr[0] ""
4901
msgstr[1] ""
4902
4903
#: bzrlib/controldir.py:712
4904
msgid "{0} is{1} redirected to {2}"
4905
msgstr ""
4906
4907
#: bzrlib/diff.py:399
4908
#, python-format
4909
msgid "*** Ignoring files outside view. View is %s"
4910
msgstr ""
4911
4912
#: bzrlib/errors.py:157
4913
msgid "The tree builder is already building a tree."
4914
msgstr ""
4915
4916
#: bzrlib/errors.py:178
4917
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4918
msgstr ""
4919
4920
#: bzrlib/errors.py:197
4921
msgid ""
4922
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4923
"versions \"%(minimum)s\" to \"%(current)s\"."
4924
msgstr ""
4925
4926
#: bzrlib/errors.py:209
4927
msgid "The transport '%(transport)s' is only accessible within this process."
4928
msgstr ""
4929
4930
#: bzrlib/errors.py:227
4931
msgid "Invalid revision number %(revno)s"
4932
msgstr ""
4933
4934
#: bzrlib/errors.py:236
4935
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4936
msgstr ""
4937
4938
#: bzrlib/errors.py:247
4939
msgid "Reserved revision-id {%(revision_id)s}"
4940
msgstr ""
4941
4942
#: bzrlib/errors.py:261
4943
msgid "There is no public branch set for \"%(branch_url)s\"."
4944
msgstr ""
4945
4946
#: bzrlib/errors.py:271
4947
msgid ""
4948
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4949
"obtain a list of topics."
4950
msgstr ""
4951
4952
#: bzrlib/errors.py:280
4953
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4954
msgstr ""
4955
4956
#: bzrlib/errors.py:290
4957
msgid ""
4958
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4959
msgstr ""
4960
4961
#: bzrlib/errors.py:299
4962
msgid "The branch '%(branch)s' is not stacked."
4963
msgstr ""
4964
4965
#: bzrlib/errors.py:313
4966
msgid "No WorkingTree exists for \"%(base)s\"."
4967
msgstr ""
4968
4969
#: bzrlib/errors.py:322
4970
msgid "Not currently building a tree."
4971
msgstr ""
4972
4973
#: bzrlib/errors.py:327
4974
msgid "%(url)s is not a local path."
4975
msgstr ""
4976
4977
#: bzrlib/errors.py:355
4978
msgid "%(not_locked)r is not write locked but needs to be."
4979
msgstr ""
4980
4981
#: bzrlib/errors.py:363
4982
msgid "Error in command line options"
4983
msgstr ""
4984
4985
#: bzrlib/errors.py:368
4986
msgid "%(value)s is not an index of type %(_type)s."
4987
msgstr ""
4988
4989
#: bzrlib/errors.py:378
4990
msgid "Error in data for index %(value)s."
4991
msgstr ""
4992
4993
#: bzrlib/errors.py:387
4994
msgid "The key '%(key)s' is already in index '%(index)s'."
4995
msgstr ""
4996
4997
#: bzrlib/errors.py:397
4998
msgid "The key '%(key)s' is not a valid key."
4999
msgstr ""
5000
5001
#: bzrlib/errors.py:406
5002
msgid "Could not parse options for index %(value)s."
5003
msgstr ""
5004
5005
#: bzrlib/errors.py:415
5006
msgid "The value '%(value)s' is not a valid value."
5007
msgstr ""
5008
5009
#: bzrlib/errors.py:424
5010
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5011
msgstr ""
5012
5013
#: bzrlib/errors.py:443
5014
msgid "Generic path error: %(path)r%(extra)s)"
5015
msgstr ""
5016
5017
#: bzrlib/errors.py:456
5018
msgid "No such file: %(path)r%(extra)s"
5019
msgstr ""
5020
5021
#: bzrlib/errors.py:461
5022
msgid "File exists: %(path)r%(extra)s"
5023
msgstr ""
5024
5025
#: bzrlib/errors.py:467
5026
msgid ""
5027
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5028
"after to tell bzr about a rename that has already happened)%(extra)s"
5029
msgstr ""
5030
5031
#: bzrlib/errors.py:483
5032
msgid "\"%(path)s\" is not a directory %(extra)s"
5033
msgstr ""
5034
5035
#: bzrlib/errors.py:488
5036
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5037
msgstr ""
5038
5039
#: bzrlib/errors.py:493
5040
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5041
msgstr ""
5042
5043
#: bzrlib/errors.py:498
5044
msgid "Hard-linking \"%(path)s\" is not supported"
5045
msgstr ""
5046
5047
#: bzrlib/errors.py:513
5048
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5049
msgstr ""
5050
5051
#: bzrlib/errors.py:518
5052
msgid "Permission denied: \"%(path)s\"%(extra)s"
5053
msgstr ""
5054
5055
#: bzrlib/errors.py:523
5056
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5057
msgstr ""
5058
5059
#: bzrlib/errors.py:528
5060
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5061
msgstr ""
5062
5063
#: bzrlib/errors.py:539
5064
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5065
msgstr ""
5066
5067
#: bzrlib/errors.py:561
5068
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5069
msgstr ""
5070
5071
#: bzrlib/errors.py:571
5072
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5073
msgstr ""
5074
5075
#: bzrlib/errors.py:579
5076
msgid ""
5077
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5078
"upgrade the branch to permit branch stacking."
5079
msgstr ""
5080
5081
#: bzrlib/errors.py:590
5082
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5083
msgstr ""
5084
5085
#: bzrlib/errors.py:600
5086
msgid ""
5087
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5088
"need to upgrade the repository to permit branch stacking."
5089
msgstr ""
5090
5091
#: bzrlib/errors.py:611
5092
msgid "Error reading from %(path)r."
5093
msgstr ""
5094
5095
#: bzrlib/errors.py:630
5096
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5097
msgstr ""
5098
5099
#: bzrlib/errors.py:646
5100
msgid "Path \"%(path)s\" is not unicode normalized"
5101
msgstr ""
5102
5103
#: bzrlib/errors.py:654
5104
msgid "Not a branch: \"%(path)s\"%(detail)s."
5105
msgstr ""
5106
5107
#: bzrlib/errors.py:696
5108
msgid "No submit branch available for branch \"%(path)s\""
5109
msgstr ""
5110
5111
#: bzrlib/errors.py:705
5112
msgid "A control directory already exists: \"%(path)s\"."
5113
msgstr ""
5114
5115
#: bzrlib/errors.py:710
5116
msgid "Already a branch: \"%(path)s\"."
5117
msgstr ""
5118
5119
#: bzrlib/errors.py:715
5120
msgid "Invalid branch name: %(name)s"
5121
msgstr ""
5122
5123
#: bzrlib/errors.py:724
5124
msgid "Parent branch already exists: \"%(path)s\"."
5125
msgstr ""
5126
5127
#: bzrlib/errors.py:730
5128
msgid ""
5129
"Directory contains a branch, but no working tree (use bzr checkout if you "
5130
"wish to build a working tree): \"%(path)s\""
5131
msgstr ""
5132
5133
#: bzrlib/errors.py:735
5134
msgid ""
5135
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5136
msgstr ""
5137
5138
#: bzrlib/errors.py:745
5139
msgid ""
5140
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5141
msgstr ""
5142
5143
#: bzrlib/errors.py:755
5144
msgid "No repository present: \"%(path)s\""
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:762
5148
msgid ""
5149
"Unsupported branch format: %(format)s\n"
5150
"Please run 'bzr upgrade'"
5151
msgstr ""
5152
5153
#: bzrlib/errors.py:768
5154
msgid "Unknown %(kind)s format: %(format)r"
5155
msgstr ""
5156
5157
#: bzrlib/errors.py:777
5158
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5159
msgstr ""
5160
5161
#: bzrlib/errors.py:787
5162
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5163
msgstr ""
5164
5165
#: bzrlib/errors.py:802
5166
msgid ""
5167
"%(target)s\n"
5168
"is not compatible with\n"
5169
"%(source)s\n"
5170
"%(details)s"
5171
msgstr ""
5172
5173
#: bzrlib/errors.py:818
5174
msgid "Revision is not compatible with %(repo_format)s"
5175
msgstr ""
5176
5177
#: bzrlib/errors.py:828
5178
msgid "%(context_info)s%(path)s is already versioned."
5179
msgstr ""
5180
5181
#: bzrlib/errors.py:849
5182
msgid "%(context_info)s%(path)s is not versioned."
5183
msgstr ""
5184
5185
#: bzrlib/errors.py:870
5186
msgid "Path(s) are not versioned: %(paths_as_string)s"
5187
msgstr ""
5188
5189
#: bzrlib/errors.py:881
5190
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5191
msgstr ""
5192
5193
#: bzrlib/errors.py:900
5194
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5195
msgstr ""
5196
5197
#: bzrlib/errors.py:908
5198
msgid ""
5199
"Filename %(filename)r is not valid in your current filesystem encoding "
5200
"%(fs_encoding)s"
5201
msgstr ""
5202
5203
#: bzrlib/errors.py:919
5204
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5205
msgstr ""
5206
5207
#: bzrlib/errors.py:937
5208
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5209
msgstr ""
5210
5211
#: bzrlib/errors.py:976
5212
msgid "Cannot lock %(lock)s: %(why)s"
5213
msgstr ""
5214
5215
#: bzrlib/errors.py:986
5216
msgid ""
5217
"A transaction related operation was attempted after the transaction finished."
5218
msgstr ""
5219
5220
#: bzrlib/errors.py:1013
5221
msgid "Cannot lock: transport is read only: %(transport)s"
5222
msgstr ""
5223
5224
#: bzrlib/errors.py:1021
5225
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5226
msgstr ""
5227
5228
#: bzrlib/errors.py:1032
5229
msgid ""
5230
"Lock was broken while still open: %(lock)s - check storage consistency!"
5231
msgstr ""
5232
5233
#: bzrlib/errors.py:1043
5234
msgid ""
5235
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5236
"%(holder)r, wanted to break %(target)r"
5237
msgstr ""
5238
5239
#: bzrlib/errors.py:1055
5240
msgid ""
5241
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5242
"Use 'bzr break-lock' to clear it"
5243
msgstr ""
5244
5245
#: bzrlib/errors.py:1068
5246
msgid "Lock not held: %(lock)s"
5247
msgstr ""
5248
5249
#: bzrlib/errors.py:1097
5250
msgid "No changes to commit"
5251
msgstr ""
5252
5253
#: bzrlib/errors.py:1102
5254
msgid ""
5255
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5256
msgstr ""
5257
5258
#: bzrlib/errors.py:1112
5259
msgid ""
5260
"Excluding paths during commit is not supported by repository at "
5261
"%(repository)r."
5262
msgstr ""
5263
5264
#: bzrlib/errors.py:1121
5265
msgid ""
5266
"The specified commit message contains characters unsupported by the current "
5267
"encoding."
5268
msgstr ""
5269
5270
#: bzrlib/errors.py:1127
5271
msgid "Upgrade URL cannot work with readonly URLs."
5272
msgstr ""
5273
5274
#: bzrlib/errors.py:1132
5275
msgid "The branch format %(format)s is already at the most recent format."
5276
msgstr ""
5277
5278
#: bzrlib/errors.py:1155
5279
msgid "Option --change does not accept revision ranges"
5280
msgstr ""
5281
5282
#: bzrlib/errors.py:1160
5283
msgid "No namespace registered for string: %(spec)r"
5284
msgstr ""
5285
5286
#: bzrlib/errors.py:1179
5287
msgid ""
5288
"Requested revision: '%(spec)s' does not exist in branch: "
5289
"%(branch_url)s%(extra)s"
5290
msgstr ""
5291
5292
#: bzrlib/errors.py:1193
5293
msgid ""
5294
"Operation denied because it would change the main history, which is not "
5295
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5296
msgstr ""
5297
5298
#: bzrlib/errors.py:1204
5299
msgid ""
5300
"These branches have diverged. Use the missing command to see how.\n"
5301
"Use the merge command to reconcile them."
5302
msgstr ""
5303
5304
#: bzrlib/errors.py:1224
5305
msgid ""
5306
"Branches have no common ancestor, and no merge base revision was specified."
5307
msgstr ""
5308
5309
#: bzrlib/errors.py:1230
5310
msgid ""
5311
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5312
msgstr ""
5313
5314
#: bzrlib/errors.py:1236
5315
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5316
msgstr ""
5317
5318
#: bzrlib/errors.py:1245
5319
msgid ""
5320
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5321
msgstr ""
5322
5323
#: bzrlib/errors.py:1254
5324
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5325
msgstr ""
5326
5327
#: bzrlib/errors.py:1263
5328
msgid "Branch %(branch)s has no commits."
5329
msgstr ""
5330
5331
#: bzrlib/errors.py:1281
5332
msgid ""
5333
"Bound branch %(branch)s is out of date with master branch "
5334
"%(master)s.%(extra_help)s"
5335
msgstr ""
5336
5337
#: bzrlib/errors.py:1293
5338
msgid ""
5339
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5340
"bound to %(remote)s."
5341
msgstr ""
5342
5343
#: bzrlib/errors.py:1305
5344
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5345
msgstr ""
5346
5347
#: bzrlib/errors.py:1314
5348
msgid ""
5349
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5350
"%(error)s"
5351
msgstr ""
5352
5353
#: bzrlib/errors.py:1326
5354
msgid "Error in processing weave: %(msg)s"
5355
msgstr ""
5356
5357
#: bzrlib/errors.py:1335
5358
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5359
msgstr ""
5360
5361
#: bzrlib/errors.py:1346
5362
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5363
msgstr ""
5364
5365
#: bzrlib/errors.py:1356
5366
msgid "Weave invariant violated: %(what)s"
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:1365
5370
msgid "Parents are mismatched between two revisions. %(msg)s"
5371
msgstr ""
5372
5373
#: bzrlib/errors.py:1387
5374
msgid ""
5375
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5376
"%(weave_b)s"
5377
msgstr ""
5378
5379
#: bzrlib/errors.py:1399
5380
msgid "Versioned file error"
5381
msgstr ""
5382
5383
#: bzrlib/errors.py:1404
5384
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5385
msgstr ""
5386
5387
#: bzrlib/errors.py:1414
5388
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5389
msgstr ""
5390
5391
#: bzrlib/errors.py:1424
5392
msgid "Text did not match its checksum: %(msg)s"
5393
msgstr ""
5394
5395
#: bzrlib/errors.py:1550
5396
msgid "Export format %(format)r not supported"
5397
msgstr ""
5398
5399
#: bzrlib/errors.py:1559
5400
msgid "Transport error: %(msg)s %(orig_error)s"
5401
msgstr ""
5402
5403
#: bzrlib/errors.py:1585
5404
msgid "Generic bzr smart protocol error: %(details)s"
5405
msgstr ""
5406
5407
#: bzrlib/errors.py:1593
5408
msgid "Received bad protocol version marker: %(marker)r"
5409
msgstr ""
5410
5411
#: bzrlib/errors.py:1625
5412
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5413
msgstr ""
5414
5415
#: bzrlib/errors.py:1630
5416
msgid "Connection error: %(msg)s %(orig_error)s"
5417
msgstr ""
5418
5419
#: bzrlib/errors.py:1635
5420
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5421
msgstr ""
5422
5423
#: bzrlib/errors.py:1656
5424
msgid "Connection closed: %(msg)s %(orig_error)s"
5425
msgstr ""
5426
5427
#: bzrlib/errors.py:1661
5428
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5429
msgstr ""
5430
5431
#: bzrlib/errors.py:1666
5432
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5433
msgstr ""
5434
5435
#: bzrlib/errors.py:1676
5436
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5437
msgstr ""
5438
5439
#: bzrlib/errors.py:1691
5440
msgid "Certificate error: %(error)s"
5441
msgstr ""
5442
5443
#: bzrlib/errors.py:1699
5444
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5445
msgstr ""
5446
5447
#: bzrlib/errors.py:1713
5448
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5449
msgstr ""
5450
5451
#: bzrlib/errors.py:1721
5452
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5453
msgstr ""
5454
5455
#: bzrlib/errors.py:1730
5456
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5457
msgstr ""
5458
5459
#: bzrlib/errors.py:1744
5460
msgid "Too many redirections"
5461
msgstr ""
5462
5463
#: bzrlib/errors.py:1749
5464
msgid "Working tree has conflicts."
5465
msgstr ""
5466
5467
#: bzrlib/errors.py:1753
5468
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5469
msgstr ""
5470
5471
#: bzrlib/errors.py:1762
5472
msgid ""
5473
"Error(s) parsing config file %(filename)s:\n"
5474
"%(errors)s"
5475
msgstr ""
5476
5477
#: bzrlib/errors.py:1772
5478
msgid ""
5479
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5480
"See ``bzr help %(name)s``"
5481
msgstr ""
5482
5483
#: bzrlib/errors.py:1782
5484
msgid "%(username)r does not seem to contain a reasonable email address"
5485
msgstr ""
5486
5487
#: bzrlib/errors.py:1791
5488
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5489
msgstr ""
5490
5491
#: bzrlib/errors.py:1799
5492
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:1807
5496
msgid "Unable to import library \"%(library)s\": %(error)s"
5497
msgstr ""
5498
5499
#: bzrlib/errors.py:1815
5500
msgid "python-gpgme is not installed, it is needed to verify signatures"
5501
msgstr ""
5502
5503
#: bzrlib/errors.py:1823
5504
msgid ""
5505
"The working tree for %(basedir)s has changed since the last commit, but "
5506
"weave merge requires that it be unchanged"
5507
msgstr ""
5508
5509
#: bzrlib/errors.py:1833
5510
msgid ""
5511
"Can't reprocess and show base, because reprocessing obscures the "
5512
"relationship of conflicting lines to the base"
5513
msgstr ""
5514
5515
#: bzrlib/errors.py:1839
5516
msgid "Cycle in graph %(graph)r"
5517
msgstr ""
5518
5519
#: bzrlib/errors.py:1867
5520
msgid "File %(filename)s is not conflicted."
5521
msgstr ""
5522
5523
#: bzrlib/errors.py:1889
5524
msgid "No bundle was found in \"%(filename)s\"."
5525
msgstr ""
5526
5527
#: bzrlib/errors.py:1898
5528
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5529
msgstr ""
5530
5531
#: bzrlib/errors.py:1908
5532
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5533
msgstr ""
5534
5535
#: bzrlib/errors.py:1921
5536
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5537
msgstr ""
5538
5539
#: bzrlib/errors.py:1931
5540
msgid "Key %(key)s is already present in map"
5541
msgstr ""
5542
5543
#: bzrlib/errors.py:1936
5544
msgid "The prefix %(prefix)s is in the help search path twice."
5545
msgstr ""
5546
5547
#: bzrlib/errors.py:1946
5548
msgid ""
5549
"No final name for trans_id %(trans_id)r\n"
5550
"file-id: %(file_id)r\n"
5551
"root trans-id: %(root_trans_id)r\n"
5552
msgstr ""
5553
5554
#: bzrlib/errors.py:1978
5555
msgid "Attempt to reuse a transform that has already been applied."
5556
msgstr ""
5557
5558
#: bzrlib/errors.py:1983
5559
msgid "Moving the root directory is not supported at this time"
5560
msgstr ""
5561
5562
#: bzrlib/errors.py:1988
5563
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5564
msgstr ""
5565
5566
#: bzrlib/errors.py:1999
5567
msgid ""
5568
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5569
msgstr ""
5570
5571
#: bzrlib/errors.py:2035
5572
msgid ""
5573
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5574
msgstr ""
5575
5576
#: bzrlib/errors.py:2065
5577
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5578
msgstr ""
5579
5580
#: bzrlib/errors.py:2073
5581
msgid "Nothing to merge."
5582
msgstr ""
5583
5584
#: bzrlib/errors.py:2078
5585
msgid "Format %(format)s cannot be initialised by this version of bzr."
5586
msgstr ""
5587
5588
#: bzrlib/errors.py:2087
5589
msgid ""
5590
"Cannot convert from format %(from_format)s to format %(format)s. "
5591
"%(problem)s"
5592
msgstr ""
5593
5594
#: bzrlib/errors.py:2099
5595
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5596
msgstr ""
5597
5598
#: bzrlib/errors.py:2107
5599
msgid "%(exe_name)s could not be found on this machine"
5600
msgstr ""
5601
5602
#: bzrlib/errors.py:2115
5603
msgid "Diff is not installed on this machine: %(msg)s"
5604
msgstr ""
5605
5606
#: bzrlib/errors.py:2123
5607
msgid "Diff3 is not installed on this machine."
5608
msgstr ""
5609
5610
#: bzrlib/errors.py:2129
5611
msgid "The content being inserted is already present."
5612
msgstr ""
5613
5614
#: bzrlib/errors.py:2134
5615
msgid ""
5616
"This tree contains left-over files from a failed operation.\n"
5617
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5618
"to\n"
5619
" keep, and delete it when you are done."
5620
msgstr ""
5621
5622
#: bzrlib/errors.py:2145
5623
msgid ""
5624
"This tree contains left-over files from a failed operation.\n"
5625
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5626
" wish to keep, and delete it when you are done."
5627
msgstr ""
5628
5629
#: bzrlib/errors.py:2155
5630
msgid ""
5631
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5632
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5633
"to\n"
5634
" keep, and delete it when you are done."
5635
msgstr ""
5636
5637
#: bzrlib/errors.py:2166
5638
msgid ""
5639
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5640
"examine %(pending_deletion)s to see if it contains any files you wish to "
5641
"keep, and delete it when you are done."
5642
msgstr ""
5643
5644
#: bzrlib/errors.py:2176
5645
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5646
msgstr ""
5647
5648
#: bzrlib/errors.py:2190
5649
msgid ""
5650
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5651
msgstr ""
5652
5653
#: bzrlib/errors.py:2203
5654
msgid "Error in merge modified format"
5655
msgstr ""
5656
5657
#: bzrlib/errors.py:2208
5658
msgid "Format error in conflict listings"
5659
msgstr ""
5660
5661
#: bzrlib/errors.py:2212
5662
msgid ""
5663
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5664
"Error: %(description)s"
5665
msgstr ""
5666
5667
#: bzrlib/errors.py:2223
5668
msgid ""
5669
"An error has been detected in the repository %(repo_path)s.\n"
5670
"Please run bzr reconcile on this repository."
5671
msgstr ""
5672
5673
#: bzrlib/errors.py:2234
5674
msgid ""
5675
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5676
"reason: %(reason)s"
5677
msgstr ""
5678
5679
#: bzrlib/errors.py:2247
5680
msgid ""
5681
"An inconsistent delta was supplied: %(delta)r\n"
5682
"reason: %(reason)s"
5683
msgstr ""
5684
5685
#: bzrlib/errors.py:2259
5686
msgid "To use this feature you must upgrade your branch at %(path)s."
5687
msgstr ""
5688
5689
#: bzrlib/errors.py:2268
5690
msgid "To use this feature you must upgrade your repository at %(path)s."
5691
msgstr ""
5692
5693
#: bzrlib/errors.py:2273
5694
msgid ""
5695
"To use this feature you must upgrade your branch at %(path)s to a format "
5696
"which supports rich roots."
5697
msgstr ""
5698
5699
#: bzrlib/errors.py:2279
5700
msgid "Cannot perform local-only commits on unbound branches."
5701
msgstr ""
5702
5703
#: bzrlib/errors.py:2284
5704
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5705
msgstr ""
5706
5707
#: bzrlib/errors.py:2305
5708
msgid "Ghost tags not supported by format %(format)r."
5709
msgstr ""
5710
5711
#: bzrlib/errors.py:2313
5712
msgid "File is binary but should be text."
5713
msgstr ""
5714
5715
#: bzrlib/errors.py:2318
5716
msgid "The path %(path)s is not permitted on this platform"
5717
msgstr ""
5718
5719
#: bzrlib/errors.py:2327
5720
msgid ""
5721
"Testament did not match expected value.\n"
5722
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5723
" {%(measured)s}"
5724
msgstr ""
5725
5726
#: bzrlib/errors.py:2339
5727
msgid "Not a bzr revision-bundle: %(text)r"
5728
msgstr ""
5729
5730
#: bzrlib/errors.py:2348
5731
msgid "Bad bzr revision-bundle: %(text)r"
5732
msgstr ""
5733
5734
#: bzrlib/errors.py:2357
5735
msgid "Malformed bzr revision-bundle header: %(text)r"
5736
msgstr ""
5737
5738
#: bzrlib/errors.py:2362
5739
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5740
msgstr ""
5741
5742
#: bzrlib/errors.py:2367
5743
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5744
msgstr ""
5745
5746
#: bzrlib/errors.py:2372
5747
msgid "End of line marker was not \\n in bzr revision-bundle"
5748
msgstr ""
5749
5750
#: bzrlib/errors.py:2382
5751
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5752
msgstr ""
5753
5754
#: bzrlib/errors.py:2392
5755
msgid "Root class for inventory serialization errors"
5756
msgstr ""
5757
5758
#: bzrlib/errors.py:2396
5759
msgid ""
5760
"The inventory was not in the expected format:\n"
5761
" %(msg)s"
5762
msgstr ""
5763
5764
#: bzrlib/errors.py:2405
5765
msgid "This operation requires rich root data storage"
5766
msgstr ""
5767
5768
#: bzrlib/errors.py:2418
5769
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5770
msgstr ""
5771
5772
#: bzrlib/errors.py:2427
5773
msgid ""
5774
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5775
"variable."
5776
msgstr ""
5777
5778
#: bzrlib/errors.py:2434
5779
msgid ""
5780
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5781
"ghost at {%(ghost_revision_id)s}"
5782
msgstr ""
5783
5784
#: bzrlib/errors.py:2444
5785
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5786
msgstr ""
5787
5788
#: bzrlib/errors.py:2495
5789
msgid ""
5790
"A merge directive must provide either a bundle or a public branch location."
5791
msgstr ""
5792
5793
#: bzrlib/errors.py:2502
5794
msgid "Bad merge directive payload %(start)r"
5795
msgstr ""
5796
5797
#: bzrlib/errors.py:2512
5798
msgid "Preview patch does not match requested changes."
5799
msgstr ""
5800
5801
#: bzrlib/errors.py:2518
5802
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5803
msgstr ""
5804
5805
#: bzrlib/errors.py:2528
5806
msgid ""
5807
"Your branch does not have all of the revisions required in order to merge "
5808
"this merge directive and the target location specified in the merge "
5809
"directive is not a branch: %(location)s."
5810
msgstr ""
5811
5812
#: bzrlib/errors.py:2540
5813
msgid "Unsupported entry kind %(kind)s"
5814
msgstr ""
5815
5816
#: bzrlib/errors.py:2548
5817
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5818
msgstr ""
5819
5820
#: bzrlib/errors.py:2558
5821
msgid "Subsume target %(other_tree)s needs to be upgraded."
5822
msgstr ""
5823
5824
#: bzrlib/errors.py:2577
5825
msgid "No such tag: %(tag_name)s"
5826
msgstr ""
5827
5828
#: bzrlib/errors.py:2585
5829
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5830
msgstr ""
5831
5832
#: bzrlib/errors.py:2594
5833
msgid "Tag %(tag_name)s already exists."
5834
msgstr ""
5835
5836
#: bzrlib/errors.py:2602
5837
msgid ""
5838
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5839
"bugs\" for more information on this feature."
5840
msgstr ""
5841
5842
#: bzrlib/errors.py:2612
5843
msgid ""
5844
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5845
msgstr ""
5846
5847
#: bzrlib/errors.py:2622
5848
msgid ""
5849
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5850
msgstr ""
5851
5852
#: bzrlib/errors.py:2632
5853
msgid "Invalid line in bugs property: '%(line)s'"
5854
msgstr ""
5855
5856
#: bzrlib/errors.py:2640
5857
msgid "Invalid bug status: '%(status)s'"
5858
msgstr ""
5859
5860
#: bzrlib/errors.py:2648
5861
msgid "Could not understand response from smart server: %(response_tuple)r"
5862
msgstr ""
5863
5864
#: bzrlib/errors.py:2687
5865
msgid "Server sent an unexpected error: %(error_tuple)r"
5866
msgstr ""
5867
5868
#: bzrlib/errors.py:2706
5869
msgid "Unrecognised container format: %(container_format)r"
5870
msgstr ""
5871
5872
#: bzrlib/errors.py:2714
5873
msgid "Unexpected end of container stream"
5874
msgstr ""
5875
5876
#: bzrlib/errors.py:2719
5877
msgid "Unknown record type: %(record_type)r"
5878
msgstr ""
5879
5880
#: bzrlib/errors.py:2727
5881
msgid "Invalid record: %(reason)s"
5882
msgstr ""
5883
5884
#: bzrlib/errors.py:2735
5885
msgid "Container has data after end marker: %(excess)r"
5886
msgstr ""
5887
5888
#: bzrlib/errors.py:2743
5889
msgid "Container has multiple records with the same name: %(name)s"
5890
msgstr ""
5891
5892
#: bzrlib/errors.py:2756
5893
msgid "Corrupt or incompatible data stream: %(reason)s"
5894
msgstr ""
5895
5896
#: bzrlib/errors.py:2764
5897
msgid "SMTP error: %(error)s"
5898
msgstr ""
5899
5900
#: bzrlib/errors.py:2772
5901
msgid "No message supplied."
5902
msgstr ""
5903
5904
#: bzrlib/errors.py:2777
5905
msgid "No mail-to address (--mail-to) or output (-o) specified."
5906
msgstr ""
5907
5908
#: bzrlib/errors.py:2782
5909
msgid ""
5910
"Unable to find mail client with the following names: "
5911
"%(mail_command_list_string)s"
5912
msgstr ""
5913
5914
#: bzrlib/errors.py:2792
5915
msgid "SMTP connection to %(host)s refused"
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:2801
5919
msgid "Please specify smtp_server. No server at default %(host)s."
5920
msgstr ""
5921
5922
#: bzrlib/errors.py:2815
5923
msgid ""
5924
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5925
"reconfigure."
5926
msgstr ""
5927
5928
#: bzrlib/errors.py:2827
5929
msgid "'%(display_url)s' is already a branch."
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:2832
5933
msgid "'%(display_url)s' is already a tree."
5934
msgstr ""
5935
5936
#: bzrlib/errors.py:2837
5937
msgid "'%(display_url)s' is already a checkout."
5938
msgstr ""
5939
5940
#: bzrlib/errors.py:2842
5941
msgid "'%(display_url)s' is already a lightweight checkout."
5942
msgstr ""
5943
5944
#: bzrlib/errors.py:2847
5945
msgid "'%(display_url)s' is already using a shared repository."
5946
msgstr ""
5947
5948
#: bzrlib/errors.py:2852
5949
msgid "'%(display_url)s' is already standalone."
5950
msgstr ""
5951
5952
#: bzrlib/errors.py:2857
5953
msgid "Shared repository '%(display_url)s' already creates working trees."
5954
msgstr ""
5955
5956
#: bzrlib/errors.py:2863
5957
msgid ""
5958
"Shared repository '%(display_url)s' already doesn't create working trees."
5959
msgstr ""
5960
5961
#: bzrlib/errors.py:2869
5962
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5963
msgstr ""
5964
5965
#: bzrlib/errors.py:2874
5966
msgid "No location could be found to bind to at %(display_url)s."
5967
msgstr ""
5968
5969
#: bzrlib/errors.py:2879
5970
msgid ""
5971
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5972
"status).%(more)s"
5973
msgstr ""
5974
5975
#: bzrlib/errors.py:2898
5976
msgid ""
5977
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5978
"list).%(more)s"
5979
msgstr ""
5980
5981
#: bzrlib/errors.py:2904
5982
msgid "Variable {%(name)s} is not available."
5983
msgstr ""
5984
5985
#: bzrlib/errors.py:2912
5986
msgid "No template specified."
5987
msgstr ""
5988
5989
#: bzrlib/errors.py:2917
5990
msgid "Unable to create symlink %(path_str)son this platform"
5991
msgstr ""
5992
5993
#: bzrlib/errors.py:2932
5994
msgid ""
5995
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5996
"\"original\", \"local\"."
5997
msgstr ""
5998
5999
#: bzrlib/errors.py:2966
6000
msgid ""
6001
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6002
msgstr ""
6003
6004
#: bzrlib/errors.py:2978
6005
msgid "The \"%(config_id)s\" configuration does not exist."
6006
msgstr ""
6007
6008
#: bzrlib/errors.py:2986
6009
msgid "The \"%(option_name)s\" configuration option does not exist."
6010
msgstr ""
6011
6012
#: bzrlib/errors.py:2994
6013
msgid "The alias \"%(alias_name)s\" does not exist."
6014
msgstr ""
6015
6016
#: bzrlib/errors.py:3008
6017
msgid "\"%(alias_name)s\" is not a valid location alias."
6018
msgstr ""
6019
6020
#: bzrlib/errors.py:3016
6021
msgid "No %(alias_name)s location assigned."
6022
msgstr ""
6023
6024
#: bzrlib/errors.py:3024
6025
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6026
msgstr ""
6027
6028
#: bzrlib/errors.py:3034
6029
msgid "Unknown rules detected: %(unknowns_str)s."
6030
msgstr ""
6031
6032
#: bzrlib/errors.py:3045
6033
msgid "Tip change rejected: %(msg)s"
6034
msgstr ""
6035
6036
#: bzrlib/errors.py:3053
6037
msgid "Shelf corrupt."
6038
msgstr ""
6039
6040
#: bzrlib/errors.py:3058
6041
msgid "Corruption while decompressing repository file%(orig_error)s"
6042
msgstr ""
6043
6044
#: bzrlib/errors.py:3070
6045
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6046
msgstr ""
6047
6048
#: bzrlib/errors.py:3078
6049
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6050
msgstr ""
6051
6052
#: bzrlib/errors.py:3086
6053
msgid ""
6054
"An attempt to access a url outside the server jail was made: '%(url)s'."
6055
msgstr ""
6056
6057
#: bzrlib/errors.py:3094
6058
msgid "The user aborted the operation."
6059
msgstr ""
6060
6061
#: bzrlib/errors.py:3099
6062
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6063
msgstr ""
6064
6065
#: bzrlib/errors.py:3109
6066
msgid "No such view: %(view_name)s."
6067
msgstr ""
6068
6069
#: bzrlib/errors.py:3119
6070
msgid ""
6071
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6072
"to a later format."
6073
msgstr ""
6074
6075
#: bzrlib/errors.py:3128
6076
msgid ""
6077
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6078
msgstr ""
6079
6080
#: bzrlib/errors.py:3195
6081
msgid "%(bzrdir)r does not support co-located branches."
6082
msgstr ""
6083
6084
#: bzrlib/errors.py:3201
6085
msgid ""
6086
"Unable to determine your name.\n"
6087
"Please, set your name with the 'whoami' command.\n"
6088
"E.g. bzr whoami \"Your Name <name@example.com>\""
6089
msgstr ""
6090
6091
#: bzrlib/errors.py:3210
6092
msgid "Invalid pattern(s) found. %(msg)s"
6093
msgstr ""
6094
6095
#: bzrlib/errors.py:3218
6096
msgid ""
6097
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6098
"unbind` to fix."
6099
msgstr ""
6100
6101
#: bzrlib/errors.py:3229
6102
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6103
msgstr ""
6104
6105
#: bzrlib/errors.py:3238
6106
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6107
msgstr ""
6108
6109
#: bzrlib/errors.py:3247
6110
msgid ""
6111
"No compatible object available for operations from %(source)r to %(target)r."
6112
msgstr ""
6113
6114
#: bzrlib/errors.py:3257
6115
msgid ""
6116
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6117
"%(arguments)s."
6118
msgstr ""
6119
6120
#: bzrlib/errors.py:3267
6121
msgid ""
6122
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6123
"format %(format)r"
6124
msgstr ""
6125
6126
#: bzrlib/errors.py:3279
6127
msgid ""
6128
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6129
"plugin."
6130
msgstr ""
6131
6132
#: bzrlib/errors.py:3292
6133
msgid "Binary files section encountered."
6134
msgstr ""
6135
6136
#: bzrlib/errors.py:3300
6137
msgid ""
6138
"Malformed patch header. %(desc)s\n"
6139
"%(line)r"
6140
msgstr ""
6141
6142
#: bzrlib/errors.py:3309
6143
msgid ""
6144
"Malformed hunk header. %(desc)s\n"
6145
"%(line)r"
6146
msgstr ""
6147
6148
#: bzrlib/errors.py:3318
6149
msgid ""
6150
"Malformed line. %(desc)s\n"
6151
"%(line)r"
6152
msgstr ""
6153
6154
#: bzrlib/errors.py:3328
6155
msgid ""
6156
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6157
"but patch says it should be \"%(patch_line)s\""
6158
msgstr ""
6159
6160
#: bzrlib/errors.py:3339
6161
msgid "The feature %(feature)s has already been registered."
6162
msgstr ""
6163
6164
#: bzrlib/export_pot.py:252
6165
#, python-format
6166
msgid "Exporting messages from builtin command: %s"
6167
msgstr ""
6168
6169
#: bzrlib/export_pot.py:271
6170
msgid "Exporting messages from plugin command: {0} in {1}"
6171
msgstr ""
6172
6173
#: bzrlib/export_pot.py:292
6174
#, python-format
6175
msgid "Exporting message from error: %s"
6176
msgstr ""
6177
6178
#: bzrlib/fetch.py:98
6179
msgid "Finding revisions"
6180
msgstr ""
6181
6182
#: bzrlib/fetch.py:103
6183
msgid "Fetching revisions"
6184
msgstr ""
6185
6186
#: bzrlib/foreign.py:262
6187
msgid "Push into a different VCS without any custom bzr metadata."
6188
msgstr ""
6189
6190
#: bzrlib/foreign.py:264
6191
msgid ""
6192
"This will afterwards rebase the local branch on the remote\n"
6193
"branch unless the --no-rebase option is used, in which case \n"
6194
"the two branches will be out of sync after the push. "
6195
msgstr ""
6196
6197
#: bzrlib/foreign.py:277
6198
msgid "Do not rebase after push."
6199
msgstr ""
6200
6201
#: bzrlib/foreign.py:311
6202
#, python-format
6203
msgid "Using saved location: %s\n"
6204
msgstr ""
6205
6206
#: bzrlib/foreign.py:321
6207
msgid ""
6208
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6209
"regular push."
6210
msgstr ""
6211
6212
#: bzrlib/gpg.py:366
6213
msgid "No GnuPG key results for pattern: {0}"
6214
msgstr ""
6215
6216
#: bzrlib/gpg.py:439
6217
msgid "{0} commits with valid signatures"
6218
msgstr ""
6219
6220
#: bzrlib/gpg.py:445
6221
msgid "{0} commit with unknown key"
6222
msgid_plural "{0} commits with unknown keys"
6223
msgstr[0] ""
6224
msgstr[1] ""
6225
6226
#: bzrlib/gpg.py:453
6227
msgid "{0} commit not valid"
6228
msgid_plural "{0} commits not valid"
6229
msgstr[0] ""
6230
msgstr[1] ""
6231
6232
#: bzrlib/gpg.py:461
6233
msgid "{0} commit not signed"
6234
msgid_plural "{0} commits not signed"
6235
msgstr[0] ""
6236
msgstr[1] ""
6237
6238
#: bzrlib/gpg.py:469
6239
msgid "{0} commit with key now expired"
6240
msgid_plural "{0} commits with key now expired"
6241
msgstr[0] ""
6242
msgstr[1] ""
6243
6244
#: bzrlib/gpg.py:489
6245
msgid "{0} commit by author {1} with key {2} now expired"
6246
msgid_plural "{0} commits by author {1} with key {2} now expired"
6247
msgstr[0] ""
6248
msgstr[1] ""
6249
6250
#: bzrlib/gpg.py:505
6251
msgid "{0} signed {1} commit"
6252
msgid_plural "{0} signed {1} commits"
6253
msgstr[0] ""
6254
msgstr[1] ""
6255
6256
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6257
msgid "{0} commit by author {1}"
6258
msgid_plural "{0} commits by author {1}"
6259
msgstr[0] ""
6260
msgstr[1] ""
6261
6262
#: bzrlib/gpg.py:554
6263
msgid "Unknown key {0} signed {1} commit"
6264
msgid_plural "Unknown key {0} signed {1} commits"
6265
msgstr[0] ""
6266
msgstr[1] ""
6267
6268
#: bzrlib/groupcompress.py:1739
6269
#, python-format
6270
msgid "Insert claimed random_id=True, but then inserted %r two times"
6271
msgstr ""
6272
6273
#: bzrlib/hooks.py:313
6274
#, python-format
6275
msgid "Introduced in: %s"
6276
msgstr ""
6277
6278
#: bzrlib/hooks.py:316
6279
#, python-format
6280
msgid "Deprecated in: %s"
6281
msgstr ""
6282
6283
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6284
msgid "Walking content"
6285
msgstr ""
6286
6287
#: bzrlib/knit.py:3330
6288
msgid "annotating"
6289
msgstr ""
6290
6291
#: bzrlib/lock.py:548
6292
msgid "{0!r} was {1} locked again"
6293
msgstr ""
6294
6295
#: bzrlib/lockdir.py:321
6296
#, python-format
6297
msgid "error removing pending lock: %s"
6298
msgstr ""
6299
6300
#: bzrlib/lockdir.py:616
6301
msgid "Unable to obtain"
6302
msgstr ""
6303
6304
#: bzrlib/lockdir.py:618
6305
msgid "Lock owner changed for"
6306
msgstr ""
6307
6308
#: bzrlib/lockdir.py:620
6309
msgid "{0} lock {1} {2}."
6310
msgstr ""
6311
6312
#: bzrlib/lockdir.py:627
6313
#, python-format
6314
msgid "Will continue to try until %s, unless you press Ctrl-C."
6315
msgstr ""
6316
6317
#: bzrlib/lockdir.py:629
6318
msgid "See \"bzr help break-lock\" for more."
6319
msgstr ""
6320
6321
#: bzrlib/lockdir.py:739
6322
#, python-format
6323
msgid ""
6324
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6325
msgstr ""
6326
6327
#: bzrlib/log.py:563
6328
msgid "--exclude-common-ancestry requires two different revisions"
6329
msgstr ""
6330
6331
#: bzrlib/log.py:565
6332
#, python-format
6333
msgid "invalid direction %r"
6334
msgstr ""
6335
6336
#: bzrlib/log.py:653
6337
msgid "Start revision not found in history of end revision."
6338
msgstr ""
6339
6340
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6341
msgid "Logging revision 0 is invalid."
6342
msgstr ""
6343
6344
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6345
msgid "Start revision must be older than the end revision."
6346
msgstr ""
6347
6348
#: bzrlib/log.py:1818
6349
#, python-format
6350
msgid "unknown log formatter: %r"
6351
msgstr ""
6352
6353
#: bzrlib/log.py:2114
6354
msgid "fixes bug"
6355
msgid_plural "fixes bugs"
6356
msgstr[0] ""
6357
msgstr[1] ""
6358
6359
#: bzrlib/merge.py:689
6360
msgid "All changes applied successfully."
6361
msgstr ""
6362
6363
#: bzrlib/merge.py:691
6364
#, python-format
6365
msgid "%d conflicts encountered."
6366
msgstr ""
6367
6368
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6369
msgid "Preparing file merge"
6370
msgstr ""
6371
6372
#: bzrlib/multiparent.py:426
6373
msgid "Importing revisions"
6374
msgstr ""
6375
6376
#: bzrlib/option.py:526
6377
msgid "Show help message."
6378
msgstr ""
6379
6380
#: bzrlib/option.py:528
6381
msgid "Only display errors and warnings."
6382
msgstr ""
6383
6384
#: bzrlib/option.py:531
6385
msgid "Show usage message and options."
6386
msgstr ""
6387
6388
#: bzrlib/option.py:533
6389
msgid "Display more information."
6390
msgstr ""
6391
6392
#: bzrlib/option.py:541
6393
msgid ""
6394
"Select changes introduced by the specified revision. See also \"help "
6395
"revisionspec\"."
6396
msgstr ""
6397
6398
#: bzrlib/option.py:543
6399
msgid "Branch to operate on, instead of working directory."
6400
msgstr ""
6401
6402
#: bzrlib/option.py:545
6403
msgid "Detailed log format."
6404
msgstr ""
6405
6406
#: bzrlib/option.py:545
6407
msgid "Format used by GNU ChangeLog files."
6408
msgstr ""
6409
6410
#: bzrlib/option.py:545
6411
msgid "Log format with one line per revision."
6412
msgstr ""
6413
6414
#: bzrlib/option.py:545
6415
msgid "Moderately short log format."
6416
msgstr ""
6417
6418
#: bzrlib/option.py:545
6419
msgid "Use specified log format."
6420
msgstr ""
6421
6422
#: bzrlib/option.py:547
6423
msgid "Log format"
6424
msgstr ""
6425
6426
#: bzrlib/option.py:549
6427
msgid "LCA-newness merge."
6428
msgstr ""
6429
6430
#: bzrlib/option.py:549
6431
msgid "Merge using external diff3."
6432
msgstr ""
6433
6434
#: bzrlib/option.py:549
6435
msgid "Native diff3-style merge."
6436
msgstr ""
6437
6438
#: bzrlib/option.py:549
6439
msgid "Select a particular merge algorithm."
6440
msgstr ""
6441
6442
#: bzrlib/option.py:549
6443
msgid "Weave-based merge."
6444
msgstr ""
6445
6446
#: bzrlib/option.py:551
6447
msgid "Merge algorithm"
6448
msgstr ""
6449
6450
#: bzrlib/option.py:554
6451
msgid "Message string."
6452
msgstr ""
6453
6454
#: bzrlib/option.py:556
6455
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6456
msgstr ""
6457
6458
#: bzrlib/option.py:558
6459
msgid "Ignore differences between branches and overwrite unconditionally."
6460
msgstr ""
6461
6462
#: bzrlib/option.py:560
6463
msgid "Remember the specified location as a default."
6464
msgstr ""
6465
6466
#: bzrlib/option.py:562
6467
msgid "Reprocess to reduce spurious conflicts."
6468
msgstr ""
6469
6470
#: bzrlib/option.py:566
6471
msgid "See \"help revisionspec\" for details."
6472
msgstr ""
6473
6474
#: bzrlib/option.py:568
6475
msgid "Show internal object ids."
6476
msgstr ""
6477
6478
#: bzrlib/option.py:571
6479
msgid "Display timezone as local, original, or utc."
6480
msgstr ""
6481
6482
#: bzrlib/osutils.py:100
6483
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6484
msgstr ""
6485
6486
#: bzrlib/osutils.py:220
6487
msgid "lstat/stat of ({0!r}): {1!r}"
6488
msgstr ""
6489
6490
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6491
#, python-format
6492
msgid "sorry, %r not allowed in path"
6493
msgstr ""
6494
6495
#: bzrlib/osutils.py:1259
6496
#, python-format
6497
msgid "%r is too short to calculate a relative path"
6498
msgstr ""
6499
6500
#: bzrlib/plugin.py:143
6501
#, python-format
6502
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6503
msgstr ""
6504
6505
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6506
msgid "Enable completions for the selected plugin (default: all plugins)"
6507
msgstr ""
6508
6509
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6510
msgid "Generate a shell function for bash command line completion."
6511
msgstr ""
6512
6513
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6514
msgid ""
6515
"This command generates a shell function which can be used by bash to\n"
6516
"automatically complete the currently typed command when the user presses\n"
6517
"the completion key (usually tab)."
6518
msgstr ""
6519
6520
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6521
msgid ""
6522
"Commonly used like this:\n"
6523
" eval \"`bzr bash-completion`\""
6524
msgstr ""
6525
6526
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6527
msgid "Name of the generated function (default: _bzr)"
6528
msgstr ""
6529
6530
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6531
msgid "Generate only the shell function, don't enable it"
6532
msgstr ""
6533
6534
#: bzrlib/plugins/launchpad/account.py:66
6535
msgid "Setting ssh/sftp usernames for launchpad.net."
6536
msgstr ""
6537
6538
#: bzrlib/plugins/launchpad/cmds.py:44
6539
msgid "Register a branch with launchpad.net."
6540
msgstr ""
6541
6542
#: bzrlib/plugins/launchpad/cmds.py:46
6543
msgid ""
6544
"This command lists a bzr branch in the directory of branches on\n"
6545
"launchpad.net. Registration allows the branch to be associated with\n"
6546
"bugs or specifications."
6547
msgstr ""
6548
6549
#: bzrlib/plugins/launchpad/cmds.py:50
6550
msgid ""
6551
"Before using this command you must register the project to which the\n"
6552
"branch belongs, and create an account for yourself on launchpad.net."
6553
msgstr ""
6554
6555
#: bzrlib/plugins/launchpad/cmds.py:53
6556
msgid ""
6557
"arguments:\n"
6558
" public_url: The publicly visible url for the branch to register.\n"
6559
" This must be an http or https url (which Launchpad can read\n"
6560
" from to access the branch). Local file urls, SFTP urls, and\n"
6561
" bzr+ssh urls will not work.\n"
6562
" If no public_url is provided, bzr will use the configured\n"
6563
" public_url if there is one for the current branch, and\n"
6564
" otherwise error."
6565
msgstr ""
6566
6567
#: bzrlib/plugins/launchpad/cmds.py:62
6568
msgid ""
6569
"example:\n"
6570
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6571
" --project fooproject"
6572
msgstr ""
6573
6574
#: bzrlib/plugins/launchpad/cmds.py:69
6575
msgid "Launchpad project short name to associate with the branch."
6576
msgstr ""
6577
6578
#: bzrlib/plugins/launchpad/cmds.py:76
6579
msgid ""
6580
"Short name for the branch; by default taken from the last component of the "
6581
"url."
6582
msgstr ""
6583
6584
#: bzrlib/plugins/launchpad/cmds.py:80
6585
msgid "One-sentence description of the branch."
6586
msgstr ""
6587
6588
#: bzrlib/plugins/launchpad/cmds.py:83
6589
msgid "Longer description of the purpose or contents of the branch."
6590
msgstr ""
6591
6592
#: bzrlib/plugins/launchpad/cmds.py:86
6593
msgid "Branch author's email address, if not yourself."
6594
msgstr ""
6595
6596
#: bzrlib/plugins/launchpad/cmds.py:89
6597
msgid "The bug this branch fixes."
6598
msgstr ""
6599
6600
#: bzrlib/plugins/launchpad/cmds.py:92
6601
msgid "Prepare the request but don't actually send it."
6602
msgstr ""
6603
6604
#: bzrlib/plugins/launchpad/cmds.py:114
6605
msgid ""
6606
"register-branch requires a public branch url - see bzr help register-branch."
6607
msgstr ""
6608
6609
#: bzrlib/plugins/launchpad/cmds.py:122
6610
msgid "--product is deprecated; please use --project."
6611
msgstr ""
6612
6613
#: bzrlib/plugins/launchpad/cmds.py:152
6614
msgid "Open a Launchpad branch page in your web browser."
6615
msgstr ""
6616
6617
#: bzrlib/plugins/launchpad/cmds.py:157
6618
msgid "Do not actually open the browser. Just say the URL we would use."
6619
msgstr ""
6620
6621
#: bzrlib/plugins/launchpad/cmds.py:192
6622
#, python-format
6623
msgid "Opening %s in web browser"
6624
msgstr ""
6625
6626
#: bzrlib/plugins/launchpad/cmds.py:200
6627
msgid "Show or set the Launchpad user ID."
6628
msgstr ""
6629
6630
#: bzrlib/plugins/launchpad/cmds.py:202
6631
msgid ""
6632
"When communicating with Launchpad, some commands need to know your\n"
6633
"Launchpad user ID. This command can be used to set or show the\n"
6634
"user ID that Bazaar will use for such communication."
6635
msgstr ""
6636
6637
#: bzrlib/plugins/launchpad/cmds.py:206
6638
msgid ""
6639
":Examples:\n"
6640
" Show the Launchpad ID of the current user::"
6641
msgstr ""
6642
6643
#: bzrlib/plugins/launchpad/cmds.py:209
6644
msgid " bzr launchpad-login"
6645
msgstr ""
6646
6647
#: bzrlib/plugins/launchpad/cmds.py:211
6648
msgid " Set the Launchpad ID of the current user to 'bob'::"
6649
msgstr ""
6650
6651
#: bzrlib/plugins/launchpad/cmds.py:213
6652
msgid " bzr launchpad-login bob"
6653
msgstr ""
6654
6655
#: bzrlib/plugins/launchpad/cmds.py:220
6656
msgid "Don't check that the user name is valid."
6657
msgstr ""
6658
6659
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6660
msgid "Launchpad user ID exists and has SSH keys.\n"
6661
msgstr ""
6662
6663
#: bzrlib/plugins/launchpad/cmds.py:238
6664
msgid "No Launchpad user ID configured.\n"
6665
msgstr ""
6666
6667
#: bzrlib/plugins/launchpad/cmds.py:249
6668
#, python-format
6669
msgid "Launchpad user ID set to '%s'.\n"
6670
msgstr ""
6671
6672
#: bzrlib/plugins/launchpad/cmds.py:255
6673
msgid "Ask Launchpad to mirror a branch now."
6674
msgstr ""
6675
6676
#: bzrlib/plugins/launchpad/cmds.py:272
6677
msgid "Propose merging a branch on Launchpad."
6678
msgstr ""
6679
6680
#: bzrlib/plugins/launchpad/cmds.py:274
6681
msgid ""
6682
"This will open your usual editor to provide the initial comment. When it\n"
6683
"has created the proposal, it will open it in your default web browser."
6684
msgstr ""
6685
6686
#: bzrlib/plugins/launchpad/cmds.py:277
6687
msgid ""
6688
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6689
"is not supplied, the remembered submit branch will be used. If no submit\n"
6690
"branch is remembered, the development focus will be used."
6691
msgstr ""
6692
6693
#: bzrlib/plugins/launchpad/cmds.py:281
6694
msgid ""
6695
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6696
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6697
"The parameter the launchpad account name of the desired reviewer. This\n"
6698
"may optionally be followed by '=' and the review type. For example:"
6699
msgstr ""
6700
6701
#: bzrlib/plugins/launchpad/cmds.py:286
6702
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6703
msgstr ""
6704
6705
#: bzrlib/plugins/launchpad/cmds.py:288
6706
msgid ""
6707
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6708
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6709
msgstr ""
6710
6711
#: bzrlib/plugins/launchpad/cmds.py:293
6712
msgid "Propose the merge on staging."
6713
msgstr ""
6714
6715
#: bzrlib/plugins/launchpad/cmds.py:295
6716
msgid "Commit message."
6717
msgstr ""
6718
6719
#: bzrlib/plugins/launchpad/cmds.py:297
6720
msgid "Mark the proposal as approved immediately."
6721
msgstr ""
6722
6723
#: bzrlib/plugins/launchpad/cmds.py:298
6724
msgid "The bug this proposal fixes."
6725
msgstr ""
6726
6727
#: bzrlib/plugins/launchpad/cmds.py:300
6728
msgid "Requested reviewer and optional type."
6729
msgstr ""
6730
6731
#: bzrlib/plugins/launchpad/cmds.py:335
6732
msgid "Find the proposal to merge this revision."
6733
msgstr ""
6734
6735
#: bzrlib/plugins/launchpad/cmds.py:337
6736
msgid ""
6737
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6738
"This works only if the selected branch was the merge proposal target, and\n"
6739
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6740
"are opened in a web browser."
6741
msgstr ""
6742
6743
#: bzrlib/plugins/launchpad/cmds.py:342
6744
msgid ""
6745
"Any revision involved in the merge may be specified-- the revision in\n"
6746
"which the merge was performed, or one of the revisions that was merged."
6747
msgstr ""
6748
6749
#: bzrlib/plugins/launchpad/cmds.py:345
6750
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6751
msgstr ""
6752
6753
#: bzrlib/plugins/launchpad/cmds.py:347
6754
msgid " bzr lp-find-proposal -r annotate:README:1"
6755
msgstr ""
6756
6757
#: bzrlib/plugins/launchpad/cmds.py:363
6758
msgid "No review found."
6759
msgstr ""
6760
6761
#: bzrlib/plugins/launchpad/cmds.py:364
6762
#, python-format
6763
msgid "%d proposals(s) found."
6764
msgstr ""
6765
6766
#: bzrlib/plugins/launchpad/cmds.py:374
6767
msgid "Finding revision-id"
6768
msgstr ""
6769
6770
#: bzrlib/plugins/launchpad/cmds.py:381
6771
msgid "Finding merge"
6772
msgstr ""
6773
6774
#: bzrlib/plugins/launchpad/cmds.py:386
6775
msgid "Finding revno"
6776
msgstr ""
6777
6778
#: bzrlib/plugins/launchpad/cmds.py:392
6779
msgid "Finding Launchpad branch"
6780
msgstr ""
6781
6782
#: bzrlib/plugins/launchpad/cmds.py:395
6783
msgid "Finding proposals"
6784
msgstr ""
6785
6786
#: bzrlib/plugins/launchpad/lp_api.py:241
6787
#: bzrlib/plugins/launchpad/lp_api.py:246
6788
#, python-format
6789
msgid "%s is not registered on Launchpad"
6790
msgstr ""
6791
6792
#: bzrlib/plugins/launchpad/lp_api.py:256
6793
#, python-format
6794
msgid "%s has no development focus."
6795
msgstr ""
6796
6797
#: bzrlib/plugins/launchpad/lp_api.py:261
6798
#, python-format
6799
msgid "development focus %s has no branch."
6800
msgstr ""
6801
6802
#: bzrlib/plugins/launchpad/lp_api.py:266
6803
#, python-format
6804
msgid "source package %s has no branch."
6805
msgstr ""
6806
6807
#: bzrlib/plugins/launchpad/lp_api.py:270
6808
#, python-format
6809
msgid "%s has no associated product or source package."
6810
msgstr ""
6811
6812
#: bzrlib/plugins/launchpad/lp_api.py:282
6813
#, python-format
6814
msgid "%s is already up-to-date."
6815
msgstr ""
6816
6817
#: bzrlib/plugins/launchpad/lp_api.py:289
6818
#, python-format
6819
msgid "Pushing to %s"
6820
msgstr ""
6821
6822
#: bzrlib/plugins/launchpad/lp_directory.py:170
6823
msgid ""
6824
"resolution for {0}\n"
6825
" local: {1}\n"
6826
" remote: {2}"
6827
msgstr ""
6828
6829
#: bzrlib/plugins/launchpad/lp_propose.py:150
6830
#, python-format
6831
msgid "There is already a branch merge proposal: %s"
6832
msgstr ""
6833
6834
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6835
msgid "pb parameter to convert() is deprecated"
6836
msgstr ""
6837
6838
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6839
msgid "starting upgrade from format 4 to 5"
6840
msgstr ""
6841
6842
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6843
msgid "note: upgrade may be faster if all store files are ungzipped first"
6844
msgstr ""
6845
6846
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6847
msgid "converting revision"
6848
msgstr ""
6849
6850
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6851
msgid "upgraded to weaves:"
6852
msgstr ""
6853
6854
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6855
#, python-format
6856
msgid "%6d revisions and inventories"
6857
msgstr ""
6858
6859
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6860
#, python-format
6861
msgid "%6d revisions not present"
6862
msgstr ""
6863
6864
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6865
#, python-format
6866
msgid "%6d texts"
6867
msgstr ""
6868
6869
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6870
msgid "writing weave"
6871
msgstr ""
6872
6873
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6874
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6875
msgid "inventory"
6876
msgstr ""
6877
6878
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6879
msgid "write revision"
6880
msgstr ""
6881
6882
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6883
msgid "loading revision"
6884
msgstr ""
6885
6886
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6887
#, python-format
6888
msgid "revision {%s} not present in branch; will be converted as a ghost"
6889
msgstr ""
6890
6891
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6892
msgid "starting upgrade from format 5 to 6"
6893
msgstr ""
6894
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6896
#, python-format
6897
msgid "adding prefixes to %s"
6898
msgstr ""
6899
6900
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6901
msgid "starting upgrade from format 6 to metadir"
6902
msgstr ""
6903
6904
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6905
msgid "Removing ancestry.weave"
6906
msgstr ""
6907
6908
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6909
msgid "Finding branch files"
6910
msgstr ""
6911
6912
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6913
msgid "Upgrading repository"
6914
msgstr ""
6915
6916
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6917
msgid "Upgrading branch"
6918
msgstr ""
6919
6920
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6921
msgid "No working tree."
6922
msgstr ""
6923
6924
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6925
msgid "Upgrading working tree"
6926
msgstr ""
6927
6928
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6929
#, python-format
6930
msgid "Make %s lock"
6931
msgstr ""
6932
6933
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6934
#, python-format
6935
msgid "Moving %s"
6936
msgstr ""
6937
6938
#: bzrlib/push.py:56
6939
msgid "Created new branch."
6940
msgstr ""
6941
6942
#: bzrlib/push.py:97
6943
#, python-format
6944
msgid ""
6945
"Target directory %s already contains a .bzr directory, but it is not valid."
6946
msgstr ""
6947
6948
#: bzrlib/push.py:101
6949
#, python-format
6950
msgid ""
6951
"Target directory %s already exists, but does not have a .bzr directory. "
6952
"Supply --use-existing-dir to push there anyway."
6953
msgstr ""
6954
6955
#: bzrlib/push.py:122
6956
#, python-format
6957
msgid "Too many redirections trying to make %s."
6958
msgstr ""
6959
6960
#: bzrlib/push.py:148
6961
msgid ""
6962
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6963
"information."
6964
msgstr ""
6965
6966
#: bzrlib/push.py:152
6967
#, python-format
6968
msgid ""
6969
"It is not possible to losslessly push to %s. You may want to use dpush "
6970
"instead."
6971
msgstr ""
6972
6973
#: bzrlib/push.py:158
6974
#, python-format
6975
msgid ""
6976
"At %s you have a valid .bzr control directory, but not a branch or "
6977
"repository. This is an unsupported configuration. Please move the target "
6978
"directory out of the way and try again."
6979
msgstr ""
6980
6981
#: bzrlib/reconcile.py:97
6982
#, python-format
6983
msgid "Reconciling branch %s"
6984
msgstr ""
6985
6986
#: bzrlib/reconcile.py:103
6987
#, python-format
6988
msgid "Reconciling repository %s"
6989
msgstr ""
6990
6991
#: bzrlib/reconcile.py:105
6992
msgid "Reconciling repository"
6993
msgstr ""
6994
6995
#: bzrlib/reconcile.py:111
6996
#, python-format
6997
msgid "%s cannot canonicalize CHKs."
6998
msgstr ""
6999
7000
#: bzrlib/reconcile.py:119
7001
msgid "Reconcile aborted: revision index has inconsistent parents."
7002
msgstr ""
7003
7004
#: bzrlib/reconcile.py:121
7005
msgid "Run \"bzr check\" for more details."
7006
msgstr ""
7007
7008
#: bzrlib/reconcile.py:123
7009
msgid "Reconciliation complete."
7010
msgstr ""
7011
7012
#: bzrlib/reconcile.py:166
7013
msgid "Fixing last revision info {0} => {1}"
7014
msgstr ""
7015
7016
#: bzrlib/reconcile.py:173
7017
msgid "revision_history ok."
7018
msgstr ""
7019
7020
#: bzrlib/reconcile.py:234
7021
msgid "Reading inventory data"
7022
msgstr ""
7023
7024
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7025
msgid "Inventory ok."
7026
msgstr ""
7027
7028
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7029
msgid "Backing up inventory"
7030
msgstr ""
7031
7032
#: bzrlib/reconcile.py:258
7033
msgid "Backup inventory created."
7034
msgstr ""
7035
7036
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7037
msgid "Writing weave"
7038
msgstr ""
7039
7040
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7041
msgid "Inventory regenerated."
7042
msgstr ""
7043
7044
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7045
msgid "Reading indexes"
7046
msgstr ""
7047
7048
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7049
msgid "Checking unused inventories"
7050
msgstr ""
7051
7052
#: bzrlib/reconcile.py:388
7053
msgid "Backup Inventory created"
7054
msgstr ""
7055
7056
#: bzrlib/reconcile.py:446
7057
msgid "Fixing text parents"
7058
msgstr ""
7059
7060
#: bzrlib/reconfigure.py:54
7061
msgid "{0} is now stacked on {1}\n"
7062
msgstr ""
7063
7064
#: bzrlib/reconfigure.py:69
7065
#, python-format
7066
msgid "%s is now not stacked\n"
7067
msgstr ""
7068
7069
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7070
#, python-format
7071
msgid "bzr: ERROR (ignored): %s"
7072
msgstr ""
7073
7074
#: bzrlib/remote.py:2534
7075
msgid "Copying repository content as tarball..."
7076
msgstr ""
7077
7078
#: bzrlib/rename_map.py:69
7079
msgid "Calculating hashes"
7080
msgstr ""
7081
7082
#: bzrlib/rename_map.py:107
7083
msgid "Determining hash hits"
7084
msgstr ""
7085
7086
#: bzrlib/rename_map.py:242
7087
msgid "{0} => {1}"
7088
msgstr ""
7089
7090
#: bzrlib/repository.py:1738
7091
msgid "Moving repository to repository.backup"
7092
msgstr ""
7093
7094
#: bzrlib/repository.py:1745
7095
msgid "Creating new repository"
7096
msgstr ""
7097
7098
#: bzrlib/repository.py:1750
7099
msgid "Copying content"
7100
msgstr ""
7101
7102
#: bzrlib/repository.py:1754
7103
msgid "Deleting old repository content"
7104
msgstr ""
7105
7106
#: bzrlib/repository.py:1756
7107
msgid "repository converted"
7108
msgstr ""
7109
7110
#: bzrlib/revisionspec.py:903
7111
msgid "Using {0} {1}"
7112
msgstr ""
7113
7114
#: bzrlib/send.py:59
7115
#, python-format
7116
msgid "Mail client \"%s\" does not support specifying body"
7117
msgstr ""
7118
7119
#: bzrlib/send.py:63
7120
msgid "--remember requires a branch to be specified."
7121
msgstr ""
7122
7123
#: bzrlib/send.py:78
7124
msgid "No submit branch known or specified"
7125
msgstr ""
7126
7127
#: bzrlib/send.py:81
7128
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7129
msgstr ""
7130
7131
#: bzrlib/send.py:99
7132
#, python-format
7133
msgid "No such send format '%s'."
7134
msgstr ""
7135
7136
#: bzrlib/send.py:115
7137
msgid "bzr send takes at most two one revision identifiers"
7138
msgstr ""
7139
7140
#: bzrlib/send.py:128
7141
msgid "No revisions to submit."
7142
msgstr ""
7143
7144
#: bzrlib/send.py:140
7145
msgid ""
7146
"- not supported for merge directives that use more than one output file."
7147
msgstr ""
7148
7149
#: bzrlib/send.py:186
7150
msgid "Format 0.9 does not permit bundle with no patch"
7151
msgstr ""
7152
7153
#: bzrlib/shelf_ui.py:46
7154
#, python-format
7155
msgid "Shelve adding file \"%(path)s\"?"
7156
msgstr ""
7157
7158
#: bzrlib/shelf_ui.py:47
7159
msgid "Shelve binary changes?"
7160
msgstr ""
7161
7162
#: bzrlib/shelf_ui.py:48
7163
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7164
msgstr ""
7165
7166
#: bzrlib/shelf_ui.py:50
7167
#, python-format
7168
msgid "Shelve removing file \"%(path)s\"?"
7169
msgstr ""
7170
7171
#: bzrlib/shelf_ui.py:51
7172
#, python-format
7173
msgid "Shelve %d change(s)?"
7174
msgstr ""
7175
7176
#: bzrlib/shelf_ui.py:52
7177
msgid "Shelve?"
7178
msgstr ""
7179
7180
#: bzrlib/shelf_ui.py:53
7181
#, python-format
7182
msgid ""
7183
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7184
msgstr ""
7185
7186
#: bzrlib/shelf_ui.py:55
7187
#, python-format
7188
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7189
msgstr ""
7190
7191
#: bzrlib/shelf_ui.py:70
7192
#, python-format
7193
msgid "Changes shelved with id \"%d\"."
7194
msgstr ""
7195
7196
#: bzrlib/shelf_ui.py:74
7197
msgid "Selected changes destroyed."
7198
msgstr ""
7199
7200
#: bzrlib/shelf_ui.py:78
7201
msgid "Selected changes:"
7202
msgstr ""
7203
7204
#: bzrlib/shelf_ui.py:98
7205
#, python-format
7206
msgid "Delete file \"%(path)s\"?"
7207
msgstr ""
7208
7209
#: bzrlib/shelf_ui.py:99
7210
msgid "Apply binary changes?"
7211
msgstr ""
7212
7213
#: bzrlib/shelf_ui.py:100
7214
#, python-format
7215
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7216
msgstr ""
7217
7218
#: bzrlib/shelf_ui.py:102
7219
#, python-format
7220
msgid "Add file \"%(path)s\"?"
7221
msgstr ""
7222
7223
#: bzrlib/shelf_ui.py:103
7224
#, python-format
7225
msgid "Apply %d change(s)?"
7226
msgstr ""
7227
7228
#: bzrlib/shelf_ui.py:104
7229
msgid "Apply change?"
7230
msgstr ""
7231
7232
#: bzrlib/shelf_ui.py:105
7233
#, python-format
7234
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7235
msgstr ""
7236
7237
#: bzrlib/shelf_ui.py:107
7238
#, python-format
7239
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7240
msgstr ""
7241
7242
#: bzrlib/shelf_ui.py:402
7243
msgid "No changes are shelved."
7244
msgstr ""
7245
7246
#: bzrlib/shelf_ui.py:460
7247
#, python-format
7248
msgid "Using changes with id \"%d\"."
7249
msgstr ""
7250
7251
#: bzrlib/shelf_ui.py:464
7252
#, python-format
7253
msgid "Message: %s"
7254
msgstr ""
7255
7256
#: bzrlib/shelf_ui.py:476
7257
#, python-format
7258
msgid "Deleted changes with id \"%d\"."
7259
msgstr ""
7260
7261
#: bzrlib/smart/medium.py:714
7262
msgid "HPSS calls: {0} ({1} vfs) {2}"
7263
msgstr ""
7264
7265
#: bzrlib/smart/server.py:169
7266
msgid "Requested to stop gracefully"
7267
msgstr ""
7268
7269
#: bzrlib/smart/server.py:179
7270
#, python-format
7271
msgid "Waiting for %d client(s) to finish"
7272
msgstr ""
7273
7274
#: bzrlib/smart/server.py:185
7275
#, python-format
7276
msgid "Still waiting for %d client(s) to finish"
7277
msgstr ""
7278
7279
#: bzrlib/smart/server.py:219
7280
#, python-format
7281
msgid "listening socket error: %s"
7282
msgstr ""
7283
7284
#: bzrlib/smart/server.py:452
7285
#, python-format
7286
msgid "listening on port: %s"
7287
msgstr ""
7288
7289
#: bzrlib/switch.py:73
7290
msgid "Pending merges must be committed or reverted before using switch."
7291
msgstr ""
7292
7293
#: bzrlib/switch.py:100
7294
msgid ""
7295
"Cannot switch as local commits found in the checkout. Commit these to the "
7296
"bound branch or use --force to throw them away."
7297
msgstr ""
7298
7299
#: bzrlib/switch.py:105
7300
#, python-format
7301
msgid ""
7302
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7303
"anyway, use --force."
7304
msgstr ""
7305
7306
#: bzrlib/switch.py:129
7307
msgid "Cannot switch a branch, only a checkout."
7308
msgstr ""
7309
7310
#: bzrlib/switch.py:167
7311
#, python-format
7312
msgid "Tree is up to date at revision %d."
7313
msgstr ""
7314
7315
#: bzrlib/switch.py:173
7316
#, python-format
7317
msgid "Updated to revision %d."
7318
msgstr ""
7319
7320
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7321
msgid "Apply phase"
7322
msgstr ""
7323
7324
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7325
msgid "removing file"
7326
msgstr ""
7327
7328
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7329
msgid "adding file"
7330
msgstr ""
7331
7332
#: bzrlib/transform.py:2598
7333
msgid "Building tree"
7334
msgstr ""
7335
7336
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7337
msgid "Adding file contents"
7338
msgstr ""
7339
7340
#: bzrlib/transform.py:3017
7341
msgid "Resolution pass"
7342
msgstr ""
7343
7344
#: bzrlib/transport/ftp/_gssapi.py:88
7345
#, python-format
7346
msgid "Authenticated as %s"
7347
msgstr ""
7348
7349
#: bzrlib/tree.py:647
7350
msgid "*** {0} content-filter: {1} => {2!r}"
7351
msgstr ""
7352
7353
#: bzrlib/upgrade.py:77
7354
#, python-format
7355
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7356
msgstr ""
7357
7358
#: bzrlib/upgrade.py:100
7359
#, python-format
7360
msgid "cannot upgrade from bzrdir format %s"
7361
msgstr ""
7362
7363
#: bzrlib/upgrade.py:103
7364
#, python-format
7365
msgid "starting upgrade of %s"
7366
msgstr ""
7367
7368
#: bzrlib/upgrade.py:110
7369
msgid "finished"
7370
msgstr ""
7371
7372
#: bzrlib/upgrade.py:120
7373
msgid "Deleting backup.bzr"
7374
msgstr ""
7375
7376
#: bzrlib/upgrade.py:151
7377
msgid ""
7378
"\n"
7379
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7380
msgstr ""
7381
7382
#: bzrlib/upgrade.py:208
7383
#, python-format
7384
msgid "Found %d dependent branches - upgrading ..."
7385
msgstr ""
7386
7387
#: bzrlib/upgrade.py:276
7388
msgid "Upgrading bzrdirs"
7389
msgstr ""
7390
7391
#: bzrlib/upgrade.py:282
7392
#, python-format
7393
msgid "Upgrading %s"
7394
msgstr ""
7395
7396
#: bzrlib/upgrade.py:283
7397
msgid "Upgrading {0} {1} ..."
7398
msgstr ""
7399
7400
#: bzrlib/upgrade.py:301
7401
msgid "Removing backup ..."
7402
msgstr ""
7403
7404
#: bzrlib/upgrade.py:305
7405
msgid "failed to clean-up {0}: {1}"
7406
msgstr ""
7407
7408
#: bzrlib/vf_repository.py:1091
7409
msgid "inventories"
7410
msgstr ""
7411
7412
#: bzrlib/vf_repository.py:1117
7413
msgid "texts"
7414
msgstr ""
7415
7416
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7417
msgid "Calculating text parents"
7418
msgstr ""
7419
7420
#: bzrlib/vf_repository.py:1707
7421
msgid "Fetch texts"
7422
msgstr ""
7423
7424
#: bzrlib/vf_repository.py:2536
7425
msgid "loading text store"
7426
msgstr ""
7427
7428
#: bzrlib/vf_repository.py:2542
7429
msgid "checking text graph"
7430
msgstr ""
7431
7432
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7433
#: bzrlib/vf_repository.py:3127
7434
msgid "Transferring revisions"
7435
msgstr ""
7436
7437
#: bzrlib/win32utils.py:146
7438
msgid "Failed to GetProcessMemoryInfo()"
7439
msgstr ""
7440
7441
#: bzrlib/win32utils.py:167
7442
msgid "Cannot debug memory on win32 without ctypes or win32process"
7443
msgstr ""
7444
7445
#: bzrlib/win32utils.py:172
7446
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7447
msgstr ""
7448
7449
#: bzrlib/win32utils.py:180
7450
#, python-format
7451
msgid "WorkingSize %8d KiB"
7452
msgstr ""
7453
7454
#: bzrlib/win32utils.py:181
7455
#, python-format
7456
msgid "PeakWorking %8d KiB"
7457
msgstr ""
7458
7459
#: bzrlib/win32utils.py:182
7460
#, python-format
7461
msgid "PagefileUsage %8d KiB"
7462
msgstr ""
7463
7464
#: bzrlib/win32utils.py:183
7465
#, python-format
7466
msgid "PeakPagefileUsage %8d KiB"
7467
msgstr ""
7468
7469
#: bzrlib/win32utils.py:185
7470
#, python-format
7471
msgid "PrivateUsage %8d KiB"
7472
msgstr ""
7473
7474
#: bzrlib/win32utils.py:186
7475
#, python-format
7476
msgid "PageFaultCount %8d"
7477
msgstr ""
7478
7479
#: bzrlib/workingtree.py:1482
7480
msgid "Rerun update after fixing the conflicts."
7481
msgstr ""
7482
7483
#: dummy/help_topics/authentication/summary.txt:1
7484
msgid "Information on configuring authentication"
7485
msgstr ""
7486
7487
#: dummy/help_topics/basic/detail.txt:1
7488
msgid ""
7489
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7490
"http://bazaar.canonical.com/"
7491
msgstr ""
7492
7493
#: dummy/help_topics/basic/detail.txt:4
7494
msgid ""
7495
"Basic commands:\n"
7496
" bzr init makes this directory a versioned branch\n"
7497
" bzr branch make a copy of another branch"
7498
msgstr ""
7499
7500
#: dummy/help_topics/basic/detail.txt:8
7501
msgid ""
7502
" bzr add make files or directories versioned\n"
7503
" bzr ignore ignore a file or pattern\n"
7504
" bzr mv move or rename a versioned file"
7505
msgstr ""
7506
7507
#: dummy/help_topics/basic/detail.txt:12
7508
msgid ""
7509
" bzr status summarize changes in working copy\n"
7510
" bzr diff show detailed diffs"
7511
msgstr ""
7512
7513
#: dummy/help_topics/basic/detail.txt:15
7514
msgid ""
7515
" bzr merge pull in changes from another branch\n"
7516
" bzr commit save some or all changes\n"
7517
" bzr send send changes via email"
7518
msgstr ""
7519
7520
#: dummy/help_topics/basic/detail.txt:19
7521
msgid ""
7522
" bzr log show history of changes\n"
7523
" bzr check validate storage"
7524
msgstr ""
7525
7526
#: dummy/help_topics/basic/detail.txt:22
7527
msgid ""
7528
" bzr help init more help on e.g. init command\n"
7529
" bzr help commands list all commands\n"
7530
" bzr help topics list all help topics\n"
7531
msgstr ""
7532
7533
#: dummy/help_topics/basic/summary.txt:1
7534
msgid "Basic commands"
7535
msgstr ""
7536
7537
#: dummy/help_topics/branches/detail.txt:1
7538
msgid "Branches"
7539
msgstr ""
7540
7541
#: dummy/help_topics/branches/detail.txt:3
7542
msgid ""
7543
"A branch consists of the state of a project, including all of its\n"
7544
"history. All branches have a repository associated (which is where the\n"
7545
"branch history is stored), but multiple branches may share the same\n"
7546
"repository (a shared repository). Branches can be copied and merged."
7547
msgstr ""
7548
7549
#: dummy/help_topics/branches/detail.txt:8
7550
msgid ""
7551
"In addition, one branch may be bound to another one. Binding to another\n"
7552
"branch indicates that commits which happen in this branch must also \n"
7553
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7554
"commits when the two branches are out of date. In order for a commit \n"
7555
"to succeed, it may be necessary to update the current branch using \n"
7556
"``bzr update``."
7557
msgstr ""
7558
7559
#: dummy/help_topics/branches/detail.txt:15
7560
#: dummy/help_topics/checkouts/detail.txt:66
7561
#: dummy/help_topics/repositories/detail.txt:36
7562
msgid "Related commands::"
7563
msgstr ""
7564
7565
#: dummy/help_topics/branches/detail.txt:17
7566
msgid ""
7567
" init Change a directory into a versioned branch.\n"
7568
" branch Create a new branch that is a copy of an existing branch.\n"
7569
" merge Perform a three-way merge.\n"
7570
" bind Bind a branch to another one.\n"
7571
msgstr ""
7572
7573
#: dummy/help_topics/branches/summary.txt:1
7574
msgid "Information on what a branch is"
7575
msgstr ""
7576
7577
#: dummy/help_topics/bugs/summary.txt:1
7578
msgid "Bug tracker settings"
7579
msgstr ""
7580
7581
#: dummy/help_topics/checkouts/detail.txt:1
7582
msgid "Checkouts"
7583
msgstr ""
7584
7585
#: dummy/help_topics/checkouts/detail.txt:3
7586
msgid ""
7587
"Checkouts are source trees that are connected to a branch, so that when\n"
7588
"you commit in the source tree, the commit goes into that branch. They\n"
7589
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7590
"Bazaar's decentralized features until you want them. Using checkouts\n"
7591
"with shared repositories is very similar to working with SVN or CVS, but\n"
7592
"doesn't have the same restrictions. And using checkouts still allows\n"
7593
"others working on the project to use whatever workflow they like."
7594
msgstr ""
7595
7596
#: dummy/help_topics/checkouts/detail.txt:11
7597
msgid ""
7598
"A checkout is created with the bzr checkout command (see \"help "
7599
"checkout\").\n"
7600
"You pass it a reference to another branch, and it will create a local copy\n"
7601
"for you that still contains a reference to the branch you created the\n"
7602
"checkout from (the master branch). Then if you make any commits they will "
7603
"be\n"
7604
"made on the other branch first. This creates an instant mirror of your work, "
7605
"or\n"
7606
"facilitates lockstep development, where each developer is working together,\n"
7607
"continuously integrating the changes of others."
7608
msgstr ""
7609
7610
#: dummy/help_topics/checkouts/detail.txt:19
7611
msgid ""
7612
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7613
"you have the full history locally. As you have a first class branch you "
7614
"can\n"
7615
"also commit locally if you want, for instance due to the temporary loss af "
7616
"a\n"
7617
"network connection. Use the --local option to commit to do this. All the "
7618
"local\n"
7619
"commits will then be made on the master branch the next time you do a non-"
7620
"local\n"
7621
"commit."
7622
msgstr ""
7623
7624
#: dummy/help_topics/checkouts/detail.txt:26
7625
msgid ""
7626
"If you are using a checkout from a shared branch you will periodically want "
7627
"to\n"
7628
"pull in all the changes made by others. This is done using the \"update\"\n"
7629
"command. The changes need to be applied before any non-local commit, but\n"
7630
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7631
"command when needed."
7632
msgstr ""
7633
7634
#: dummy/help_topics/checkouts/detail.txt:32
7635
msgid ""
7636
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7637
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7638
"SVN checkout in that it is not a first class branch, it mainly consists of "
7639
"the\n"
7640
"working tree. This means that any history operations must query the master\n"
7641
"branch, which could be slow if a network connection is involved. Also, as "
7642
"you\n"
7643
"don't have a local branch, then you cannot commit locally."
7644
msgstr ""
7645
7646
#: dummy/help_topics/checkouts/detail.txt:39
7647
msgid ""
7648
"Lightweight checkouts work best when you have fast reliable access to the\n"
7649
"master branch. This means that if the master branch is on the same disk or "
7650
"LAN\n"
7651
"a lightweight checkout will be faster than a heavyweight one for any "
7652
"commands\n"
7653
"that modify the revision history (as only one copy of the branch needs to\n"
7654
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7655
"that uses the history but does not change it, but if the master branch is "
7656
"on\n"
7657
"the same disk then there won't be a noticeable difference."
7658
msgstr ""
7659
7660
#: dummy/help_topics/checkouts/detail.txt:47
7661
msgid ""
7662
"Another possible use for a checkout is to use it with a treeless repository\n"
7663
"containing your branches, where you maintain only one working tree by\n"
7664
"switching the master branch that the checkout points to when you want to\n"
7665
"work on a different branch."
7666
msgstr ""
7667
7668
#: dummy/help_topics/checkouts/detail.txt:52
7669
msgid ""
7670
"Obviously to commit on a checkout you need to be able to write to the "
7671
"master\n"
7672
"branch. This means that the master branch must be accessible over a "
7673
"writeable\n"
7674
"protocol , such as sftp://, and that you have write permissions at the "
7675
"other\n"
7676
"end. Checkouts also work on the local file system, so that all that matters "
7677
"is\n"
7678
"file permissions."
7679
msgstr ""
7680
7681
#: dummy/help_topics/checkouts/detail.txt:58
7682
msgid ""
7683
"You can change the master of a checkout by using the \"switch\" command "
7684
"(see\n"
7685
"\"help switch\"). This will change the location that the commits are sent "
7686
"to.\n"
7687
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7688
"checkout. If you would like to convert your heavy checkout into a normal\n"
7689
"branch so that every commit is local, you can use the \"unbind\" command. To "
7690
"see\n"
7691
"whether or not a branch is bound or not you can use the \"info\" command. If "
7692
"the\n"
7693
"branch is bound it will tell you the location of the bound branch."
7694
msgstr ""
7695
7696
#: dummy/help_topics/checkouts/detail.txt:68
7697
msgid ""
7698
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7699
" checkout\n"
7700
" update Pull any changes in the master branch in to your checkout\n"
7701
" commit Make a commit that is sent to the master branch. If you have\n"
7702
" a heavy checkout then the --local option will commit to the\n"
7703
" checkout without sending the commit to the master\n"
7704
" switch Change the master branch that the commits in the checkout "
7705
"will\n"
7706
" be sent to\n"
7707
" bind Turn a standalone branch into a heavy checkout so that any\n"
7708
" commits will be sent to the master branch\n"
7709
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7710
" commits are only made locally\n"
7711
" info Displays whether a branch is bound or unbound. If the branch "
7712
"is\n"
7713
" bound, then it will also display the location of the bound "
7714
"branch\n"
7715
msgstr ""
7716
7717
#: dummy/help_topics/checkouts/summary.txt:1
7718
msgid "Information on what a checkout is"
7719
msgstr ""
7720
7721
#: dummy/help_topics/commands/summary.txt:1
7722
msgid "Basic help for all commands"
7723
msgstr ""
7724
7725
#: dummy/help_topics/configuration/summary.txt:1
7726
msgid "Details on the configuration settings available"
7727
msgstr ""
7728
7729
#: dummy/help_topics/conflict-types/summary.txt:1
7730
msgid "Types of conflicts and what to do about them"
7731
msgstr ""
7732
7733
#: dummy/help_topics/content-filters/summary.txt:1
7734
msgid "Conversion of content into/from working trees"
7735
msgstr ""
7736
7737
#: dummy/help_topics/criss-cross/detail.txt:1
7738
msgid "Criss-Cross"
7739
msgstr ""
7740
7741
#: dummy/help_topics/criss-cross/detail.txt:3
7742
msgid ""
7743
"A criss-cross in the branch history can cause the default merge technique\n"
7744
"to emit more conflicts than would normally be expected."
7745
msgstr ""
7746
7747
#: dummy/help_topics/criss-cross/detail.txt:6
7748
msgid ""
7749
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7750
"give\n"
7751
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7752
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7753
msgstr ""
7754
7755
#: dummy/help_topics/criss-cross/detail.txt:10
7756
msgid ""
7757
"Criss-crosses occur in a branch's history if two branches merge the same "
7758
"thing\n"
7759
"and then merge one another, or if two branches merge one another at the "
7760
"same\n"
7761
"time. They can be avoided by having each branch only merge from or into a\n"
7762
"designated central branch (a \"star topology\")."
7763
msgstr ""
7764
7765
#: dummy/help_topics/criss-cross/detail.txt:15
7766
msgid ""
7767
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7768
"default\n"
7769
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7770
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7771
"differences between THIS and OTHER are due to one side adding lines, or\n"
7772
"from another side removing lines."
7773
msgstr ""
7774
7775
#: dummy/help_topics/criss-cross/detail.txt:21
7776
msgid ""
7777
"Criss-crosses mean there is no good choice for a base. Selecting the "
7778
"recent\n"
7779
"merge points could cause one side's changes to be silently discarded.\n"
7780
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7781
"are emitted."
7782
msgstr ""
7783
7784
#: dummy/help_topics/criss-cross/detail.txt:26
7785
msgid ""
7786
"The ``weave`` merge type is not affected by this problem because it uses\n"
7787
"line-origin detection instead of a basis revision to determine the cause of\n"
7788
"differences.\n"
7789
msgstr ""
7790
7791
#: dummy/help_topics/criss-cross/summary.txt:1
7792
msgid "Information on criss-cross merging"
7793
msgstr ""
7794
7795
#: dummy/help_topics/current-formats/summary.txt:1
7796
msgid "Current storage formats"
7797
msgstr ""
7798
7799
#: dummy/help_topics/debug-flags/summary.txt:1
7800
msgid "Options to show or record debug information"
7801
msgstr ""
7802
7803
#: dummy/help_topics/diverged-branches/summary.txt:1
7804
msgid "How to fix diverged branches"
7805
msgstr ""
7806
7807
#: dummy/help_topics/env-variables/summary.txt:1
7808
msgid "Environment variable names and values"
7809
msgstr ""
7810
7811
#: dummy/help_topics/eol/summary.txt:1
7812
msgid "Information on end-of-line handling"
7813
msgstr ""
7814
7815
#: dummy/help_topics/files/detail.txt:1
7816
msgid "Files"
7817
msgstr ""
7818
7819
#: dummy/help_topics/files/detail.txt:3
7820
msgid ""
7821
":On Unix: ~/.bazaar/bazaar.conf\n"
7822
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7823
"bazaar\\\\2.0\\\\bazaar.conf"
7824
msgstr ""
7825
7826
#: dummy/help_topics/files/detail.txt:6
7827
msgid ""
7828
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7829
"used to define general configuration that will be applied everywhere.\n"
7830
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7831
"commonly used options."
7832
msgstr ""
7833
7834
#: dummy/help_topics/files/detail.txt:11
7835
msgid "A typical config file might look something like::"
7836
msgstr ""
7837
7838
#: dummy/help_topics/files/detail.txt:13
7839
msgid ""
7840
" [DEFAULT]\n"
7841
" email=John Doe <jdoe@isp.com>"
7842
msgstr ""
7843
7844
#: dummy/help_topics/files/detail.txt:16
7845
msgid ""
7846
" [ALIASES]\n"
7847
" commit = commit --strict\n"
7848
" log10 = log --short -r -10..-1\n"
7849
msgstr ""
7850
7851
#: dummy/help_topics/files/summary.txt:1
7852
msgid "Information on configuration and log files"
7853
msgstr ""
7854
7855
#: dummy/help_topics/formats/detail.txt:1
7856
msgid "Storage Formats"
7857
msgstr ""
7858
7859
#: dummy/help_topics/formats/detail.txt:3
7860
msgid ""
7861
"To ensure that older clients do not access data incorrectly,\n"
7862
"Bazaar's policy is to introduce a new storage format whenever\n"
7863
"new features requiring new metadata are added. New storage\n"
7864
"formats may also be introduced to improve performance and\n"
7865
"scalability."
7866
msgstr ""
7867
7868
#: dummy/help_topics/formats/detail.txt:9
7869
msgid ""
7870
"The newest format, 2a, is highly recommended. If your\n"
7871
"project is not using 2a, then you should suggest to the\n"
7872
"project owner to upgrade."
7873
msgstr ""
7874
7875
#: dummy/help_topics/formats/detail.txt:13
7876
msgid ""
7877
"\n"
7878
".. note::"
7879
msgstr ""
7880
7881
#: dummy/help_topics/formats/detail.txt:16
7882
msgid ""
7883
" Some of the older formats have two variants:\n"
7884
" a plain one and a rich-root one. The latter include an additional\n"
7885
" field about the root of the tree. There is no performance cost\n"
7886
" for using a rich-root format but you cannot easily merge changes\n"
7887
" from a rich-root format into a plain format. As a consequence,\n"
7888
" moving a project to a rich-root format takes some co-ordination\n"
7889
" in that all contributors need to upgrade their repositories\n"
7890
" around the same time. 2a and all future formats will be\n"
7891
" implicitly rich-root."
7892
msgstr ""
7893
7894
#: dummy/help_topics/formats/detail.txt:26
7895
msgid ""
7896
"See :doc:`current-formats-help` for the complete list of\n"
7897
"currently supported formats. See :doc:`other-formats-help` for\n"
7898
"descriptions of any available experimental and deprecated formats.\n"
7899
msgstr ""
7900
7901
#: dummy/help_topics/formats/summary.txt:1
7902
msgid "Information on choosing a storage format"
7903
msgstr ""
7904
7905
#: dummy/help_topics/global-options/detail.txt:1
7906
msgid "Global Options"
7907
msgstr ""
7908
7909
#: dummy/help_topics/global-options/detail.txt:3
7910
msgid ""
7911
"These options may be used with any command, and may appear in front of any\n"
7912
"command. (e.g. ``bzr --profile help``)."
7913
msgstr ""
7914
7915
#: dummy/help_topics/global-options/detail.txt:6
7916
msgid ""
7917
"--version Print the version number. Must be supplied before the "
7918
"command.\n"
7919
"--no-aliases Do not process command aliases when running this command.\n"
7920
"--builtin Use the built-in version of a command, not the plugin "
7921
"version.\n"
7922
" This does not suppress other plugin effects.\n"
7923
"--no-plugins Do not process any plugins.\n"
7924
"--no-l10n Do not translate messages.\n"
7925
"--concurrency Number of processes that can be run concurrently (selftest)."
7926
msgstr ""
7927
7928
#: dummy/help_topics/global-options/detail.txt:14
7929
msgid ""
7930
"--profile Profile execution using the hotshot profiler.\n"
7931
"--lsprof Profile execution using the lsprof profiler.\n"
7932
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7933
" results to a specified file. If the filename ends with "
7934
"\".txt\",\n"
7935
" text format will be used. If the filename either starts "
7936
"with\n"
7937
" \"callgrind.out\" or end with \".callgrind\", the output will "
7938
"be\n"
7939
" formatted for use with KCacheGrind. Otherwise, the output\n"
7940
" will be a pickle.\n"
7941
"--coverage Generate line coverage report in the specified directory."
7942
msgstr ""
7943
7944
#: dummy/help_topics/global-options/detail.txt:24
7945
msgid ""
7946
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7947
"for\n"
7948
" the duration of the command. This can be used multiple times "
7949
"if\n"
7950
" several options need to be overridden."
7951
msgstr ""
7952
7953
#: dummy/help_topics/global-options/detail.txt:28
7954
msgid ""
7955
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7956
"information on profiling."
7957
msgstr ""
7958
7959
#: dummy/help_topics/global-options/detail.txt:31
7960
msgid ""
7961
"A number of debug flags are also available to assist troubleshooting and\n"
7962
"development. See :doc:`debug-flags-help`.\n"
7963
msgstr ""
7964
7965
#: dummy/help_topics/global-options/summary.txt:1
7966
msgid "Options that control how Bazaar runs"
7967
msgstr ""
7968
7969
#: dummy/help_topics/hidden-commands/summary.txt:1
7970
msgid "All hidden commands"
7971
msgstr ""
7972
7973
#: dummy/help_topics/hooks/summary.txt:1
7974
msgid "Points at which custom processing can be added"
7975
msgstr ""
7976
7977
#: dummy/help_topics/launchpad/detail.txt:1
7978
msgid "Integration with Launchpad.net"
7979
msgstr ""
7980
7981
#: dummy/help_topics/launchpad/detail.txt:3
7982
msgid ""
7983
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
7984
"specification tracking."
7985
msgstr ""
7986
7987
#: dummy/help_topics/launchpad/detail.txt:6
7988
msgid ""
7989
"The bzr client (through the plugin called 'launchpad') has special\n"
7990
"features to communicate with Launchpad:"
7991
msgstr ""
7992
7993
#: dummy/help_topics/launchpad/detail.txt:9
7994
msgid ""
7995
" * The launchpad-login command tells Bazaar your Launchpad user name. "
7996
"This\n"
7997
" is then used by the 'lp:' transport to download your branches using\n"
7998
" bzr+ssh://."
7999
msgstr ""
8000
8001
#: dummy/help_topics/launchpad/detail.txt:13
8002
msgid ""
8003
" * The 'lp:' transport uses Launchpad as a directory service: for "
8004
"example\n"
8005
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8006
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8007
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8008
msgstr ""
8009
8010
#: dummy/help_topics/launchpad/detail.txt:18
8011
msgid ""
8012
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8013
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8014
"lp:12345'\n"
8015
" will record a revision property that marks that revision as fixing\n"
8016
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8017
" automatically be linked to the bug report."
8018
msgstr ""
8019
8020
#: dummy/help_topics/launchpad/detail.txt:24
8021
msgid ""
8022
" * The register-branch command tells Launchpad about the url of a\n"
8023
" public branch. Launchpad will then mirror the branch, display\n"
8024
" its contents and allow it to be attached to bugs and other\n"
8025
" objects."
8026
msgstr ""
8027
8028
#: dummy/help_topics/launchpad/detail.txt:29
8029
msgid "For more information see http://help.launchpad.net/\n"
8030
msgstr ""
8031
8032
#: dummy/help_topics/launchpad/summary.txt:1
8033
msgid "Using Bazaar with Launchpad.net"
8034
msgstr ""
8035
8036
#: dummy/help_topics/location-alias/summary.txt:1
8037
msgid "Aliases for remembered locations"
8038
msgstr ""
8039
8040
#: dummy/help_topics/log-formats/summary.txt:1
8041
msgid "Details on the logging formats available"
8042
msgstr ""
8043
8044
#: dummy/help_topics/other-formats/summary.txt:1
8045
msgid "Experimental and deprecated storage formats"
8046
msgstr ""
8047
8048
#: dummy/help_topics/patterns/summary.txt:1
8049
msgid "Information on the pattern syntax"
8050
msgstr ""
8051
8052
#: dummy/help_topics/repositories/detail.txt:1
8053
msgid "Repositories"
8054
msgstr ""
8055
8056
#: dummy/help_topics/repositories/detail.txt:3
8057
msgid ""
8058
"Repositories in Bazaar are where committed information is stored. There is\n"
8059
"a repository associated with every branch."
8060
msgstr ""
8061
8062
#: dummy/help_topics/repositories/detail.txt:6
8063
msgid ""
8064
"Repositories are a form of database. Bzr will usually maintain this for\n"
8065
"good performance automatically, but in some situations (e.g. when doing\n"
8066
"very many commits in a short time period) you may want to ask bzr to\n"
8067
"optimise the database indices. This can be done by the 'bzr pack' command."
8068
msgstr ""
8069
8070
#: dummy/help_topics/repositories/detail.txt:11
8071
msgid ""
8072
"By default just running 'bzr init' will create a repository within the new\n"
8073
"branch but it is possible to create a shared repository which allows "
8074
"multiple\n"
8075
"branches to share their information in the same location. When a new branch "
8076
"is\n"
8077
"created it will first look to see if there is a containing shared repository "
8078
"it\n"
8079
"can use."
8080
msgstr ""
8081
8082
#: dummy/help_topics/repositories/detail.txt:17
8083
msgid ""
8084
"When two branches of the same project share a repository, there is\n"
8085
"generally a large space saving. For some operations (e.g. branching\n"
8086
"within the repository) this translates in to a large time saving."
8087
msgstr ""
8088
8089
#: dummy/help_topics/repositories/detail.txt:21
8090
msgid ""
8091
"To create a shared repository use the init-repository command (or the alias\n"
8092
"init-repo). This command takes the location of the repository to create. "
8093
"This\n"
8094
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8095
"which contains a shared repository. Any new branches that are created in "
8096
"this\n"
8097
"directory will then use it for storage."
8098
msgstr ""
8099
8100
#: dummy/help_topics/repositories/detail.txt:27
8101
msgid ""
8102
"It is a good idea to create a repository whenever you might create more\n"
8103
"than one branch of a project. This is true for both working areas where you\n"
8104
"are doing the development, and any server areas that you use for hosting\n"
8105
"projects. In the latter case, it is common to want branches without working\n"
8106
"trees. Since the files in the branch will not be edited directly there is "
8107
"no\n"
8108
"need to use up disk space for a working tree. To create a repository in "
8109
"which\n"
8110
"the branches will not have working trees pass the '--no-trees' option to\n"
8111
"'init-repository'."
8112
msgstr ""
8113
8114
#: dummy/help_topics/repositories/detail.txt:38
8115
msgid ""
8116
" init-repository Create a shared repository. Use --no-trees to create "
8117
"one\n"
8118
" in which new branches won't get a working tree.\n"
8119
msgstr ""
8120
8121
#: dummy/help_topics/repositories/summary.txt:1
8122
msgid "Basic information on shared repositories."
8123
msgstr ""
8124
8125
#: dummy/help_topics/revisionspec/summary.txt:1
8126
msgid "Explain how to use --revision"
8127
msgstr ""
8128
8129
#: dummy/help_topics/rules/summary.txt:1
8130
msgid "Information on defining rule-based preferences"
8131
msgstr ""
8132
8133
#: dummy/help_topics/standalone-trees/detail.txt:1
8134
msgid "Standalone Trees"
8135
msgstr ""
8136
8137
#: dummy/help_topics/standalone-trees/detail.txt:3
8138
msgid ""
8139
"A standalone tree is a working tree with an associated repository. It\n"
8140
"is an independently usable branch, with no dependencies on any other.\n"
8141
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8142
"an existing project under version control."
8143
msgstr ""
8144
8145
#: dummy/help_topics/standalone-trees/detail.txt:8
8146
msgid "Related Commands::"
8147
msgstr ""
8148
8149
#: dummy/help_topics/standalone-trees/detail.txt:10
8150
msgid " init Make a directory into a versioned branch.\n"
8151
msgstr ""
8152
8153
#: dummy/help_topics/standalone-trees/summary.txt:1
8154
msgid "Information on what a standalone tree is"
8155
msgstr ""
8156
8157
#: dummy/help_topics/standard-options/detail.txt:1
8158
msgid "Standard Options"
8159
msgstr ""
8160
8161
#: dummy/help_topics/standard-options/detail.txt:3
8162
msgid "Standard options are legal for all commands."
8163
msgstr ""
8164
8165
#: dummy/help_topics/standard-options/detail.txt:5
8166
msgid ""
8167
"--help, -h Show help message.\n"
8168
"--verbose, -v Display more information.\n"
8169
"--quiet, -q Only display errors and warnings."
8170
msgstr ""
8171
8172
#: dummy/help_topics/standard-options/detail.txt:9
8173
msgid "Unlike global options, standard options can be used in aliases.\n"
8174
msgstr ""
8175
8176
#: dummy/help_topics/standard-options/summary.txt:1
8177
msgid "Options that can be used with any command"
8178
msgstr ""
8179
8180
#: dummy/help_topics/status-flags/detail.txt:1
8181
msgid "Status Flags"
8182
msgstr ""
8183
8184
#: dummy/help_topics/status-flags/detail.txt:3
8185
msgid ""
8186
"Status flags are used to summarise changes to the working tree in a concise\n"
8187
"manner. They are in the form::"
8188
msgstr ""
8189
8190
#: dummy/help_topics/status-flags/detail.txt:6
8191
msgid " xxx <filename>"
8192
msgstr ""
8193
8194
#: dummy/help_topics/status-flags/detail.txt:8
8195
msgid "where the columns' meanings are as follows."
8196
msgstr ""
8197
8198
#: dummy/help_topics/status-flags/detail.txt:10
8199
msgid "Column 1 - versioning/renames::"
8200
msgstr ""
8201
8202
#: dummy/help_topics/status-flags/detail.txt:12
8203
msgid ""
8204
" + File versioned\n"
8205
" - File unversioned\n"
8206
" R File renamed\n"
8207
" ? File unknown\n"
8208
" X File nonexistent (and unknown to bzr)\n"
8209
" C File has conflicts\n"
8210
" P Entry for a pending merge (not a file)"
8211
msgstr ""
8212
8213
#: dummy/help_topics/status-flags/detail.txt:20
8214
msgid "Column 2 - contents::"
8215
msgstr ""
8216
8217
#: dummy/help_topics/status-flags/detail.txt:22
8218
msgid ""
8219
" N File created\n"
8220
" D File deleted\n"
8221
" K File kind changed\n"
8222
" M File modified"
8223
msgstr ""
8224
8225
#: dummy/help_topics/status-flags/detail.txt:27
8226
msgid "Column 3 - execute::"
8227
msgstr ""
8228
8229
#: dummy/help_topics/status-flags/detail.txt:29
8230
msgid " * The execute bit was changed\n"
8231
msgstr ""
8232
8233
#: dummy/help_topics/status-flags/summary.txt:1
8234
msgid "Help on status flags"
8235
msgstr ""
8236
8237
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8238
msgid "Branches Out of Sync"
8239
msgstr ""
8240
8241
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8242
msgid ""
8243
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8244
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8245
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8246
"have the same last revision as the new reference branch for the lightweight\n"
8247
"checkout, data could be lost, so Bazaar refuses."
8248
msgstr ""
8249
8250
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8251
msgid "How you deal with this depends on *why* the branches are out of sync."
8252
msgstr ""
8253
8254
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8255
msgid ""
8256
"If you have a checkout and have done local commits, you can get back in "
8257
"sync\n"
8258
"by running \"bzr update\" (and possibly \"bzr commit\")."
8259
msgstr ""
8260
8261
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8262
msgid ""
8263
"If you have a branch and the remote branch is out-of-date, you can push\n"
8264
"the local changes using \"bzr push\". If the local branch is out of date, "
8265
"you\n"
8266
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8267
"commit\n"
8268
"and then push your changes. If you decide that some of the changes aren't\n"
8269
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8270
msgstr ""
8271
8272
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8273
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8274
msgstr ""
8275
8276
#: dummy/help_topics/topics/summary.txt:1
8277
msgid "Topics list"
8278
msgstr ""
8279
8280
#: dummy/help_topics/url-special-chars/summary.txt:1
8281
msgid "Special character handling in URLs"
8282
msgstr ""
8283
8284
#: dummy/help_topics/urlspec/summary.txt:1
8285
msgid "Supported transport protocols"
8286
msgstr ""
8287
8288
#: dummy/help_topics/working-trees/detail.txt:1
8289
msgid "Working Trees"
8290
msgstr ""
8291
8292
#: dummy/help_topics/working-trees/detail.txt:3
8293
msgid ""
8294
"A working tree is the contents of a branch placed on disk so that you can\n"
8295
"see the files and edit them. The working tree is where you make changes to "
8296
"a\n"
8297
"branch, and when you commit the current state of the working tree is the\n"
8298
"snapshot that is recorded in the commit."
8299
msgstr ""
8300
8301
#: dummy/help_topics/working-trees/detail.txt:8
8302
msgid ""
8303
"When you push a branch to a remote system, a working tree will not be\n"
8304
"created. If one is already present the files will not be updated. The\n"
8305
"branch information will be updated and the working tree will be marked\n"
8306
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8307
"may be uncommitted changes or the update may cause content conflicts that "
8308
"are\n"
8309
"difficult to deal with remotely."
8310
msgstr ""
8311
8312
#: dummy/help_topics/working-trees/detail.txt:15
8313
msgid ""
8314
"If you have a branch with no working tree you can use the 'checkout' "
8315
"command\n"
8316
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8317
"will\n"
8318
"create the working tree. If the branch is updated remotely, you can update "
8319
"the\n"
8320
"working tree by running 'bzr update' in that directory."
8321
msgstr ""
8322
8323
#: dummy/help_topics/working-trees/detail.txt:20
8324
msgid ""
8325
"If you have a branch with a working tree that you do not want the 'remove-"
8326
"tree'\n"
8327
"command will remove the tree if it is safe. This can be done to avoid the\n"
8328
"warning about the remote working tree not being updated when pushing to the\n"
8329
"branch. It can also be useful when working with a '--no-trees' repository\n"
8330
"(see 'bzr help repositories')."
8331
msgstr ""
8332
8333
#: dummy/help_topics/working-trees/detail.txt:26
8334
msgid ""
8335
"If you want to have a working tree on a remote machine that you push to you\n"
8336
"can either run 'bzr update' in the remote branch after each push, or use "
8337
"some\n"
8338
"other method to update the tree during the push. There is an 'rspush' "
8339
"plugin\n"
8340
"that will update the working tree using rsync as well as doing a push. "
8341
"There\n"
8342
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8343
"SSH\n"
8344
"after each push."
8345
msgstr ""
8346
8347
#: dummy/help_topics/working-trees/detail.txt:33
8348
msgid "Useful commands::"
8349
msgstr ""
8350
8351
#: dummy/help_topics/working-trees/detail.txt:35
8352
msgid ""
8353
" checkout Create a working tree when a branch does not have one.\n"
8354
" remove-tree Removes the working tree from a branch when it is safe to do "
8355
"so.\n"
8356
" update When a working tree is out of sync with its associated "
8357
"branch\n"
8358
" this will update the tree to match the branch.\n"
8359
msgstr ""
8360
8361
#: dummy/help_topics/working-trees/summary.txt:1
8362
msgid "Information on working trees"
8363
msgstr ""
8364
8365
#: en/help_topics/authentication.txt:1
8366
msgid ""
8367
"Authentication Settings\n"
8368
"======================="
8369
msgstr ""
8370
8371
#: en/help_topics/authentication.txt:4
8372
msgid ""
8373
"\n"
8374
"Intent\n"
8375
"------"
8376
msgstr ""
8377
8378
#: en/help_topics/authentication.txt:8
8379
msgid ""
8380
"Many different authentication policies can be described in the\n"
8381
"``authentication.conf`` file but a particular user should need only a few\n"
8382
"definitions to cover his needs without having to specify a user and a "
8383
"password\n"
8384
"for every branch he uses."
8385
msgstr ""
8386
8387
#: en/help_topics/authentication.txt:13
8388
msgid ""
8389
"The definitions found in this file are used to find the credentials to use "
8390
"for\n"
8391
"a given url. The same credentials can generally be used for as many branches "
8392
"as\n"
8393
"possible by grouping their declaration around the remote servers that need\n"
8394
"them. It's even possible to declare credentials that will be used by "
8395
"different\n"
8396
"servers."
8397
msgstr ""
8398
8399
#: en/help_topics/authentication.txt:19
8400
msgid ""
8401
"The intent is to make this file as small as possible to minimize maintenance."
8402
msgstr ""
8403
8404
#: en/help_topics/authentication.txt:21
8405
msgid ""
8406
"Once the relevant credentials are declared in this file you may use branch "
8407
"urls\n"
8408
"without embedding passwords (security hazard) or even users (enabling "
8409
"sharing\n"
8410
"of your urls with others)."
8411
msgstr ""
8412
8413
#: en/help_topics/authentication.txt:25
8414
msgid "Instead of using::"
8415
msgstr ""
8416
8417
#: en/help_topics/authentication.txt:27
8418
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8419
msgstr ""
8420
8421
#: en/help_topics/authentication.txt:29
8422
msgid "you simply use::"
8423
msgstr ""
8424
8425
#: en/help_topics/authentication.txt:31
8426
msgid " bzr branch ftp://host.com/path/to/my/branch"
8427
msgstr ""
8428
8429
#: en/help_topics/authentication.txt:33
8430
msgid ""
8431
"provided you have created the following ``authentication.conf`` file::"
8432
msgstr ""
8433
8434
#: en/help_topics/authentication.txt:35
8435
msgid ""
8436
" [myprojects]\n"
8437
" scheme=ftp\n"
8438
" host=host.com\n"
8439
" user=joe\n"
8440
" password=secret\n"
8441
" "
8442
msgstr ""
8443
8444
#: en/help_topics/authentication.txt:42
8445
msgid ""
8446
"Authentication definitions\n"
8447
"--------------------------"
8448
msgstr ""
8449
8450
#: en/help_topics/authentication.txt:45
8451
msgid ""
8452
"There are two kinds of authentication used by the various schemes supported "
8453
"by\n"
8454
"bzr:"
8455
msgstr ""
8456
8457
#: en/help_topics/authentication.txt:48
8458
msgid "1. user and password"
8459
msgstr ""
8460
8461
#: en/help_topics/authentication.txt:50
8462
msgid ""
8463
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8464
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8465
"ssh agents are a better, more secure solution. So we have chosen to not "
8466
"provide\n"
8467
"our own less secure method."
8468
msgstr ""
8469
8470
#: en/help_topics/authentication.txt:55
8471
msgid "2. user, realm and password"
8472
msgstr ""
8473
8474
#: en/help_topics/authentication.txt:57
8475
msgid ""
8476
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8477
"against a host. But, by using ``.htaccess`` files, for example, it is "
8478
"possible\n"
8479
"to define several (``user, realm, password``) for a given ``host``. So what "
8480
"is\n"
8481
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8482
"is\n"
8483
"not taken into account in the definitions, but will displayed if bzr "
8484
"prompts\n"
8485
"you for a password."
8486
msgstr ""
8487
8488
#: en/help_topics/authentication.txt:64
8489
msgid ""
8490
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8491
"specifying the appropriate port."
8492
msgstr ""
8493
8494
#: en/help_topics/authentication.txt:67
8495
msgid ""
8496
"To take all schemes into account, the password will be deduced from a set "
8497
"of\n"
8498
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8499
"``user``,\n"
8500
"``password``)."
8501
msgstr ""
8502
8503
#: en/help_topics/authentication.txt:71
8504
msgid ""
8505
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8506
"used\n"
8507
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8508
"``ssh``\n"
8509
" should be used instead since this is the real scheme regarding\n"
8510
" authentication,"
8511
msgstr ""
8512
8513
#: en/help_topics/authentication.txt:76
8514
msgid " * ``host``: can be empty (to act as a default for any host),"
8515
msgstr ""
8516
8517
#: en/help_topics/authentication.txt:78
8518
msgid ""
8519
" * ``port`` can be empty (useful when an host provides several servers for "
8520
"the\n"
8521
" same scheme), only numerical values are allowed, this should be used "
8522
"only\n"
8523
" when the server uses a port different than the scheme standard port,"
8524
msgstr ""
8525
8526
#: en/help_topics/authentication.txt:82
8527
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8528
msgstr ""
8529
8530
#: en/help_topics/authentication.txt:84
8531
msgid ""
8532
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8533
" ``getpass.get_user()``),"
8534
msgstr ""
8535
8536
#: en/help_topics/authentication.txt:87
8537
msgid ""
8538
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8539
" password."
8540
msgstr ""
8541
8542
#: en/help_topics/authentication.txt:90
8543
msgid ""
8544
"Multiple definitions can be provided and, for a given URL, bzr will select "
8545
"a\n"
8546
"(``user`` [, ``password``]) based on the following rules :"
8547
msgstr ""
8548
8549
#: en/help_topics/authentication.txt:93
8550
msgid " 1. the first match wins,"
8551
msgstr ""
8552
8553
#: en/help_topics/authentication.txt:95
8554
msgid " 2. empty fields match everything,"
8555
msgstr ""
8556
8557
#: en/help_topics/authentication.txt:97
8558
msgid ""
8559
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8560
msgstr ""
8561
8562
#: en/help_topics/authentication.txt:99
8563
msgid ""
8564
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8565
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8566
"``projectbzr.sf.net``\n"
8567
" will not match ``bzr.sf.net``)."
8568
msgstr ""
8569
8570
#: en/help_topics/authentication.txt:103
8571
msgid ""
8572
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8573
msgstr ""
8574
8575
#: en/help_topics/authentication.txt:105
8576
msgid ""
8577
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8578
"above,\n"
8579
" empty paths will match any provided path)."
8580
msgstr ""
8581
8582
#: en/help_topics/authentication.txt:110
8583
msgid ""
8584
"File format\n"
8585
"-----------"
8586
msgstr ""
8587
8588
#: en/help_topics/authentication.txt:113
8589
msgid ""
8590
"The general rules for :doc:`configuration files <configuration-help>`\n"
8591
"apply except for the variable policies."
8592
msgstr ""
8593
8594
#: en/help_topics/authentication.txt:116
8595
msgid "Each section describes an authentication definition."
8596
msgstr ""
8597
8598
#: en/help_topics/authentication.txt:118
8599
msgid ""
8600
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8601
"reserved\n"
8602
"and should appear as the *last* section."
8603
msgstr ""
8604
8605
#: en/help_topics/authentication.txt:121
8606
msgid "Each section should define:"
8607
msgstr ""
8608
8609
#: en/help_topics/authentication.txt:123
8610
msgid "* ``user``: the login to be used,"
8611
msgstr ""
8612
8613
#: en/help_topics/authentication.txt:125
8614
msgid "Each section could define:"
8615
msgstr ""
8616
8617
#: en/help_topics/authentication.txt:127
8618
msgid "* ``host``: the remote server,"
8619
msgstr ""
8620
8621
#: en/help_topics/authentication.txt:129
8622
msgid "* ``port``: the port the server is listening,"
8623
msgstr ""
8624
8625
#: en/help_topics/authentication.txt:131
8626
msgid "* ``path``: the branch location,"
8627
msgstr ""
8628
8629
#: en/help_topics/authentication.txt:133
8630
msgid "* ``password``: the password."
8631
msgstr ""
8632
8633
#: en/help_topics/authentication.txt:135
8634
msgid ""
8635
"\n"
8636
"Examples\n"
8637
"--------"
8638
msgstr ""
8639
8640
#: en/help_topics/authentication.txt:139
8641
msgid ""
8642
"\n"
8643
"Personal projects hosted outside\n"
8644
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8645
msgstr ""
8646
8647
#: en/help_topics/authentication.txt:143
8648
msgid ""
8649
"All connections are done with the same ``user`` (the remote one for which "
8650
"the\n"
8651
"default bzr one is not appropriate) and the password is always prompted "
8652
"with\n"
8653
"some exceptions::"
8654
msgstr ""
8655
8656
#: en/help_topics/authentication.txt:147
8657
msgid ""
8658
" # Pet projects on hobby.net\n"
8659
" [hobby]\n"
8660
" host=r.hobby.net\n"
8661
" user=jim\n"
8662
" password=obvious1234\n"
8663
" \n"
8664
" # Home server\n"
8665
" [home]\n"
8666
" scheme=https\n"
8667
" host=home.net\n"
8668
" user=joe\n"
8669
" password=1essobV10us\n"
8670
" \n"
8671
" [DEFAULT]\n"
8672
" # Our local user is barbaz, on all remote sites we're known as "
8673
"foobar\n"
8674
" user=foobar"
8675
msgstr ""
8676
8677
#: en/help_topics/authentication.txt:164
8678
msgid ""
8679
"\n"
8680
"Source hosting provider\n"
8681
"~~~~~~~~~~~~~~~~~~~~~~~"
8682
msgstr ""
8683
8684
#: en/help_topics/authentication.txt:168
8685
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8686
msgstr ""
8687
8688
#: en/help_topics/authentication.txt:170
8689
msgid ""
8690
" [shpnet domain]\n"
8691
" # we use sftp, but ssh is the scheme used for authentication\n"
8692
" scheme=ssh\n"
8693
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8694
" host=.shp.net\n"
8695
" user=joe\n"
8696
" # bzr don't support supplying a password for sftp,\n"
8697
" # consider using an ssh agent if you don't want to supply\n"
8698
" # a password interactively. (pageant, ssh-agent, etc)"
8699
msgstr ""
8700
8701
#: en/help_topics/authentication.txt:180
8702
msgid ""
8703
"HTTPS, SFTP servers and their proxy\n"
8704
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8705
msgstr ""
8706
8707
#: en/help_topics/authentication.txt:183
8708
msgid ""
8709
"At company.com, the server hosting release and integration branches is "
8710
"behind a\n"
8711
"proxy, and the two branches use different authentication policies::"
8712
msgstr ""
8713
8714
#: en/help_topics/authentication.txt:186
8715
msgid ""
8716
" [reference code]\n"
8717
" scheme=https\n"
8718
" host=dev.company.com\n"
8719
" path=/dev\n"
8720
" user=user1\n"
8721
" password=pass1"
8722
msgstr ""
8723
8724
#: en/help_topics/authentication.txt:193
8725
msgid ""
8726
" # development branches on dev server\n"
8727
" [dev]\n"
8728
" scheme=ssh # bzr+ssh and sftp are available here\n"
8729
" host=dev.company.com\n"
8730
" path=/dev/integration\n"
8731
" user=user2\n"
8732
" \n"
8733
" # proxy\n"
8734
" [proxy]\n"
8735
" scheme=http\n"
8736
" host=proxy.company.com\n"
8737
" port=3128\n"
8738
" user=proxyuser1\n"
8739
" password=proxypass1"
8740
msgstr ""
8741
8742
#: en/help_topics/authentication.txt:208
8743
msgid ""
8744
"\n"
8745
"Planned enhancements\n"
8746
"--------------------"
8747
msgstr ""
8748
8749
#: en/help_topics/authentication.txt:212
8750
msgid ""
8751
"The following are not yet implemented but planned as parts of a work in\n"
8752
"progress:"
8753
msgstr ""
8754
8755
#: en/help_topics/authentication.txt:215
8756
msgid "* add a ``password_encoding`` field allowing:"
8757
msgstr ""
8758
8759
#: en/help_topics/authentication.txt:217
8760
msgid ""
8761
" - storing the passwords in various obfuscating encodings (base64 for one),"
8762
msgstr ""
8763
8764
#: en/help_topics/authentication.txt:219
8765
msgid " - delegate password storage to plugins (.netrc for example)."
8766
msgstr ""
8767
8768
#: en/help_topics/authentication.txt:221
8769
msgid ""
8770
"* update the credentials when the user is prompted for user or password,"
8771
msgstr ""
8772
8773
#: en/help_topics/authentication.txt:223
8774
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8775
msgstr ""
8776
8777
#: en/help_topics/authentication.txt:225
8778
msgid ""
8779
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8780
"but\n"
8781
"ignored in the actual implementation.\n"
8782
msgstr ""
8783
8784
#: en/help_topics/bugs.txt:1
8785
msgid "Bug Tracker Settings"
8786
msgstr ""
8787
8788
#: en/help_topics/bugs.txt:3
8789
msgid ""
8790
"When making a commit, metadata about bugs fixed by that change can be\n"
8791
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8792
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8793
"(The only ``status`` value currently supported is ``fixed.``)"
8794
msgstr ""
8795
8796
#: en/help_topics/bugs.txt:8
8797
msgid ""
8798
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8799
"identifier\n"
8800
"rather than a full URL. This looks like::"
8801
msgstr ""
8802
8803
#: en/help_topics/bugs.txt:11
8804
msgid " bzr commit --fixes <tracker>:<id>"
8805
msgstr ""
8806
8807
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8808
msgid "or::"
8809
msgstr ""
8810
8811
#: en/help_topics/bugs.txt:15
8812
msgid " bzr commit --fixes <id>"
8813
msgstr ""
8814
8815
#: en/help_topics/bugs.txt:17
8816
msgid ""
8817
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8818
"the\n"
8819
"identifier for that bug within the bugtracker, usually the bug number.\n"
8820
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8821
"or global configuration is used."
8822
msgstr ""
8823
8824
#: en/help_topics/bugs.txt:22
8825
msgid ""
8826
"Bazaar knows about a few bug trackers that have many users. If\n"
8827
"you use one of these bug trackers then there is no setup required to\n"
8828
"use this feature, you just need to know the tracker identifier to use.\n"
8829
"These are the bugtrackers that are built in:"
8830
msgstr ""
8831
8832
#: en/help_topics/bugs.txt:27
8833
msgid ""
8834
" ============================ ============ ============\n"
8835
" URL Abbreviation Example\n"
8836
" ============================ ============ ============\n"
8837
" https://bugs.launchpad.net/ lp lp:12345\n"
8838
" http://bugs.debian.org/ deb deb:12345\n"
8839
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8840
" ============================ ============ ============"
8841
msgstr ""
8842
8843
#: en/help_topics/bugs.txt:35
8844
msgid ""
8845
"For the bug trackers not listed above configuration is required.\n"
8846
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8847
"is built in, along with a template mechanism for other bugtrackers with\n"
8848
"simple URL schemes. If your bug tracker can't be described by one\n"
8849
"of the schemes described below then you can write a plugin to support\n"
8850
"it."
8851
msgstr ""
8852
8853
#: en/help_topics/bugs.txt:42
8854
msgid ""
8855
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8856
"variable which contains the base URL of the bug tracker. These options\n"
8857
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8858
"configuration section in ``locations.conf``. You can set up these values\n"
8859
"for each of the projects you work on."
8860
msgstr ""
8861
8862
#: en/help_topics/bugs.txt:48
8863
msgid ""
8864
"Note: As you provide a short name for each tracker, you can specify one or\n"
8865
"more bugs in one or more trackers at commit time if you wish."
8866
msgstr ""
8867
8868
#: en/help_topics/bugs.txt:51
8869
msgid ""
8870
"Launchpad\n"
8871
"---------"
8872
msgstr ""
8873
8874
#: en/help_topics/bugs.txt:54
8875
msgid ""
8876
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8877
msgstr ""
8878
8879
#: en/help_topics/bugs.txt:56
8880
msgid ""
8881
"bugzilla_<tracker>_url\n"
8882
"----------------------"
8883
msgstr ""
8884
8885
#: en/help_topics/bugs.txt:59
8886
msgid ""
8887
"If present, the location of the Bugzilla bug tracker referred to by\n"
8888
"<tracker>. This option can then be used together with ``bzr commit\n"
8889
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8890
"example::"
8891
msgstr ""
8892
8893
#: en/help_topics/bugs.txt:64
8894
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8895
msgstr ""
8896
8897
#: en/help_topics/bugs.txt:66
8898
msgid ""
8899
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8900
"fixed."
8901
msgstr ""
8902
8903
#: en/help_topics/bugs.txt:69
8904
msgid ""
8905
"trac_<tracker>_url\n"
8906
"------------------"
8907
msgstr ""
8908
8909
#: en/help_topics/bugs.txt:72
8910
msgid ""
8911
"If present, the location of the Trac instance referred to by\n"
8912
"<tracker>. This option can then be used together with ``bzr commit\n"
8913
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8914
"example::"
8915
msgstr ""
8916
8917
#: en/help_topics/bugs.txt:77
8918
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8919
msgstr ""
8920
8921
#: en/help_topics/bugs.txt:79
8922
msgid ""
8923
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8924
"as\n"
8925
"fixed."
8926
msgstr ""
8927
8928
#: en/help_topics/bugs.txt:82
8929
msgid ""
8930
"bugtracker_<tracker>_url\n"
8931
"------------------------"
8932
msgstr ""
8933
8934
#: en/help_topics/bugs.txt:85
8935
msgid ""
8936
"If present, the location of a generic bug tracker instance referred to by\n"
8937
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8938
"which will be replaced by a specific bug ID. This option can then be used\n"
8939
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8940
"fixed by that commit. For example::"
8941
msgstr ""
8942
8943
#: en/help_topics/bugs.txt:91
8944
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8945
msgstr ""
8946
8947
#: en/help_topics/bugs.txt:93
8948
msgid ""
8949
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8950
"Roundup bug tracker as fixed, or::"
8951
msgstr ""
8952
8953
#: en/help_topics/bugs.txt:96
8954
msgid ""
8955
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8956
msgstr ""
8957
8958
#: en/help_topics/bugs.txt:98
8959
msgid ""
8960
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8961
"RT bug tracker as fixed, or::"
8962
msgstr ""
8963
8964
#: en/help_topics/bugs.txt:101
8965
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8966
msgstr ""
8967
8968
#: en/help_topics/bugs.txt:103
8969
msgid ""
8970
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8971
"1234\n"
8972
"in Hudson's JIRA bug tracker as fixed.\n"
8973
msgstr ""
8974
8975
#: en/help_topics/commands.txt:1
8976
msgid ""
8977
"add Add specified files or directories.\n"
8978
"alias Set/unset and display aliases.\n"
8979
"annotate Show the origin of each line in a file.\n"
8980
"bash-completion Generate a shell function for bash command line "
8981
"completion.\n"
8982
" [bash_completion]\n"
8983
"bind Convert the current branch into a checkout of the "
8984
"supplied\n"
8985
" branch.\n"
8986
"branch Create a new branch that is a copy of an existing branch.\n"
8987
"branches List the branches available at the current location.\n"
8988
"break-lock Break a dead lock.\n"
8989
"cat Write the contents of a file as of a given revision to\n"
8990
" standard output.\n"
8991
"check Validate working tree structure, branch consistency and\n"
8992
" repository history.\n"
8993
"checkout Create a new checkout of an existing branch.\n"
8994
"clean-tree Remove unwanted files from working tree.\n"
8995
"commit Commit changes into a new revision.\n"
8996
"config Display, set or remove a configuration option.\n"
8997
"conflicts List files with conflicts.\n"
8998
"deleted List files deleted in the working tree.\n"
8999
"diff Show differences in the working tree, between revisions "
9000
"or\n"
9001
" branches.\n"
9002
"dpush Push into a different VCS without any custom bzr "
9003
"metadata.\n"
9004
"export Export current or past revision to a destination directory "
9005
"or\n"
9006
" archive.\n"
9007
"help Show help on a command or other topic.\n"
9008
"ignore Ignore specified files or patterns.\n"
9009
"ignored List ignored files and the patterns that matched them.\n"
9010
"info Show information about a working tree, branch or "
9011
"repository.\n"
9012
"init Make a directory into a versioned branch.\n"
9013
"init-repository Create a shared repository for branches to share storage\n"
9014
" space.\n"
9015
"join Combine a tree into its containing tree.\n"
9016
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9017
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9018
"launchpad-open Open a Launchpad branch page in your web browser. "
9019
"[launchpad]\n"
9020
"log Show historical log for a branch or subset of a branch.\n"
9021
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9022
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9023
"ls List files in a tree.\n"
9024
"merge Perform a three-way merge.\n"
9025
"missing Show unmerged/unpulled revisions between two branches.\n"
9026
"mkdir Create a new versioned directory.\n"
9027
"mv Move or rename a file.\n"
9028
"nick Print or set the branch nickname.\n"
9029
"pack Compress the data within a repository.\n"
9030
"plugins List the installed plugins.\n"
9031
"pull Turn this branch into a mirror of another branch.\n"
9032
"push Update a mirror of this branch.\n"
9033
"reconcile Reconcile bzr metadata in a branch.\n"
9034
"reconfigure Reconfigure the type of a bzr directory.\n"
9035
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9036
"remerge Redo a merge.\n"
9037
"remove Remove files or directories.\n"
9038
"remove-branch Remove a branch.\n"
9039
"remove-tree Remove the working tree from a given branch/checkout.\n"
9040
"renames Show list of renamed files.\n"
9041
"resolve Mark a conflict as resolved.\n"
9042
"revert Set files in the working tree back to the contents of a\n"
9043
" previous revision.\n"
9044
"revno Show current revision number.\n"
9045
"root Show the tree root directory.\n"
9046
"send Mail or create a merge-directive for submitting changes.\n"
9047
"serve Run the bzr server.\n"
9048
"shelve Temporarily set aside some changes from the current tree.\n"
9049
"sign-my-commits Sign all commits by a given committer.\n"
9050
"split Split a subdirectory of a tree into a separate tree.\n"
9051
"status Display status summary.\n"
9052
"switch Set the branch of a checkout and update.\n"
9053
"tag Create, remove or modify a tag naming a revision.\n"
9054
"tags List tags.\n"
9055
"testament Show testament (signing-form) of a revision.\n"
9056
"unbind Convert the current checkout into a regular branch.\n"
9057
"uncommit Remove the last committed revision.\n"
9058
"unshelve Restore shelved changes.\n"
9059
"update Update a working tree to a new revision.\n"
9060
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9061
" format.\n"
9062
"verify-signatures Verify all commit signatures.\n"
9063
"version Show version of bzr.\n"
9064
"version-info Show version information about this tree.\n"
9065
"view Manage filtered views.\n"
9066
"whoami Show or set bzr user id.\n"
9067
msgstr ""
9068
9069
#: en/help_topics/configuration.txt:1
9070
msgid ""
9071
"Configuration Settings\n"
9072
"======================="
9073
msgstr ""
9074
9075
#: en/help_topics/configuration.txt:4
9076
msgid ""
9077
"Environment settings\n"
9078
"---------------------"
9079
msgstr ""
9080
9081
#: en/help_topics/configuration.txt:7
9082
msgid ""
9083
"While most configuration is handled by configuration files, some options\n"
9084
"which may be semi-permanent can also be controlled through the environment."
9085
msgstr ""
9086
9087
#: en/help_topics/configuration.txt:10
9088
msgid ""
9089
"BZR_EMAIL\n"
9090
"~~~~~~~~~"
9091
msgstr ""
9092
9093
#: en/help_topics/configuration.txt:13
9094
msgid "Override the email id used by Bazaar. Typical format::"
9095
msgstr ""
9096
9097
#: en/help_topics/configuration.txt:15
9098
msgid " \"John Doe <jdoe@example.com>\""
9099
msgstr ""
9100
9101
#: en/help_topics/configuration.txt:17
9102
msgid "See also the ``email`` configuration option."
9103
msgstr ""
9104
9105
#: en/help_topics/configuration.txt:19
9106
msgid ""
9107
"BZR_PROGRESS_BAR\n"
9108
"~~~~~~~~~~~~~~~~"
9109
msgstr ""
9110
9111
#: en/help_topics/configuration.txt:22
9112
msgid ""
9113
"Override the progress display. Possible values are \"none\" or \"text\". "
9114
"If\n"
9115
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9116
"draws\n"
9117
"the ordinary command line progress bar."
9118
msgstr ""
9119
9120
#: en/help_topics/configuration.txt:26
9121
msgid ""
9122
"BZR_SIGQUIT_PDB\n"
9123
"~~~~~~~~~~~~~~~"
9124
msgstr ""
9125
9126
#: en/help_topics/configuration.txt:29
9127
msgid ""
9128
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9129
msgstr ""
9130
9131
#: en/help_topics/configuration.txt:31
9132
msgid ""
9133
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9134
"* 1 = Invoke breakin debugger (default)"
9135
msgstr ""
9136
9137
#: en/help_topics/configuration.txt:34
9138
msgid ""
9139
"BZR_HOME\n"
9140
"~~~~~~~~"
9141
msgstr ""
9142
9143
#: en/help_topics/configuration.txt:37
9144
msgid "Override the home directory used by Bazaar."
9145
msgstr ""
9146
9147
#: en/help_topics/configuration.txt:39
9148
msgid ""
9149
"BZR_SSH\n"
9150
"~~~~~~~"
9151
msgstr ""
9152
9153
#: en/help_topics/configuration.txt:42
9154
msgid "Select a different SSH implementation."
9155
msgstr ""
9156
9157
#: en/help_topics/configuration.txt:44
9158
msgid ""
9159
"BZR_PDB\n"
9160
"~~~~~~~"
9161
msgstr ""
9162
9163
#: en/help_topics/configuration.txt:47
9164
msgid "Control whether to launch a debugger on error."
9165
msgstr ""
9166
9167
#: en/help_topics/configuration.txt:49
9168
msgid ""
9169
"* 0 = Standard behavior\n"
9170
"* 1 = Launch debugger"
9171
msgstr ""
9172
9173
#: en/help_topics/configuration.txt:52
9174
msgid ""
9175
"BZR_REMOTE_PATH\n"
9176
"~~~~~~~~~~~~~~~"
9177
msgstr ""
9178
9179
#: en/help_topics/configuration.txt:55
9180
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9181
msgstr ""
9182
9183
#: en/help_topics/configuration.txt:57
9184
msgid "See also the ``bzr_remote_path`` configuration option."
9185
msgstr ""
9186
9187
#: en/help_topics/configuration.txt:59
9188
msgid ""
9189
"BZR_EDITOR\n"
9190
"~~~~~~~~~~"
9191
msgstr ""
9192
9193
#: en/help_topics/configuration.txt:62
9194
msgid "Path to the editor Bazaar should use for commit messages, etc."
9195
msgstr ""
9196
9197
#: en/help_topics/configuration.txt:64
9198
msgid ""
9199
"BZR_LOG\n"
9200
"~~~~~~~"
9201
msgstr ""
9202
9203
#: en/help_topics/configuration.txt:67
9204
msgid ""
9205
"Location of the Bazaar log file. You can check the current location by\n"
9206
"running ``bzr version``."
9207
msgstr ""
9208
9209
#: en/help_topics/configuration.txt:70
9210
msgid ""
9211
"The log file contains debug information that is useful for diagnosing or\n"
9212
"reporting problems with Bazaar."
9213
msgstr ""
9214
9215
#: en/help_topics/configuration.txt:73
9216
msgid ""
9217
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9218
"will disable logging."
9219
msgstr ""
9220
9221
#: en/help_topics/configuration.txt:76
9222
msgid ""
9223
"\n"
9224
"BZR_PLUGIN_PATH\n"
9225
"~~~~~~~~~~~~~~~"
9226
msgstr ""
9227
9228
#: en/help_topics/configuration.txt:80
9229
msgid ""
9230
"The path to the plugins directory that Bazaar should use.\n"
9231
"If not set, Bazaar will search for plugins in:"
9232
msgstr ""
9233
9234
#: en/help_topics/configuration.txt:83
9235
msgid ""
9236
"* the user specific plugin directory (containing the ``user`` plugins),"
9237
msgstr ""
9238
9239
#: en/help_topics/configuration.txt:85
9240
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9241
msgstr ""
9242
9243
#: en/help_topics/configuration.txt:87
9244
msgid ""
9245
"* the site specific plugin directory if applicable (containing\n"
9246
" the ``site`` plugins)."
9247
msgstr ""
9248
9249
#: en/help_topics/configuration.txt:90
9250
msgid ""
9251
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9252
"the way the plugin are searched. "
9253
msgstr ""
9254
9255
#: en/help_topics/configuration.txt:93
9256
msgid ""
9257
"As for the ``PATH`` variables, if multiple directories are\n"
9258
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9259
"platform specific appropriate character (':' on Unix,\n"
9260
"';' on windows)"
9261
msgstr ""
9262
9263
#: en/help_topics/configuration.txt:98
9264
msgid ""
9265
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9266
"in ``user``. However it will continue to search in ``core`` and\n"
9267
"``site`` unless they are explicitly removed."
9268
msgstr ""
9269
9270
#: en/help_topics/configuration.txt:102
9271
msgid ""
9272
"If you need to change the order or remove one of these\n"
9273
"directories, you should use special values:"
9274
msgstr ""
9275
9276
#: en/help_topics/configuration.txt:105
9277
msgid ""
9278
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9279
" path from the default values,"
9280
msgstr ""
9281
9282
#: en/help_topics/configuration.txt:108
9283
msgid ""
9284
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9285
" before the remaining default values (and also remove it from\n"
9286
" the default values)."
9287
msgstr ""
9288
9289
#: en/help_topics/configuration.txt:112
9290
msgid ""
9291
"Note that the special values 'user', 'core' and 'site' should be\n"
9292
"used literally, they will be substituted by the corresponding,\n"
9293
"platform specific, values."
9294
msgstr ""
9295
9296
#: en/help_topics/configuration.txt:116
9297
msgid ""
9298
"The examples below use ':' as the separator, windows users\n"
9299
"should use ';'."
9300
msgstr ""
9301
9302
#: en/help_topics/configuration.txt:119
9303
msgid "Overriding the default user plugin directory::"
9304
msgstr ""
9305
9306
#: en/help_topics/configuration.txt:121
9307
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9308
msgstr ""
9309
9310
#: en/help_topics/configuration.txt:123
9311
msgid "Disabling the site directory while retaining the user directory::"
9312
msgstr ""
9313
9314
#: en/help_topics/configuration.txt:125
9315
msgid " BZR_PLUGIN_PATH='-site:+user'"
9316
msgstr ""
9317
9318
#: en/help_topics/configuration.txt:127
9319
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9320
msgstr ""
9321
9322
#: en/help_topics/configuration.txt:129
9323
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9324
msgstr ""
9325
9326
#: en/help_topics/configuration.txt:131
9327
msgid "Overriding the default site plugin directory::"
9328
msgstr ""
9329
9330
#: en/help_topics/configuration.txt:133
9331
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9332
msgstr ""
9333
9334
#: en/help_topics/configuration.txt:135
9335
msgid ""
9336
"BZR_DISABLE_PLUGINS\n"
9337
"~~~~~~~~~~~~~~~~~~~"
9338
msgstr ""
9339
9340
#: en/help_topics/configuration.txt:138
9341
msgid ""
9342
"Under special circumstances (mostly when trying to diagnose a\n"
9343
"bug), it's better to disable a plugin (or several) rather than\n"
9344
"uninstalling them completely. Such plugins can be specified in\n"
9345
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9346
msgstr ""
9347
9348
#: en/help_topics/configuration.txt:143
9349
msgid ""
9350
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9351
"will raise an import error if they are explicitly imported (by\n"
9352
"another plugin that depends on them for example)."
9353
msgstr ""
9354
9355
#: en/help_topics/configuration.txt:147
9356
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9357
msgstr ""
9358
9359
#: en/help_topics/configuration.txt:149
9360
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9361
msgstr ""
9362
9363
#: en/help_topics/configuration.txt:151
9364
msgid ""
9365
"BZR_PLUGINS_AT\n"
9366
"~~~~~~~~~~~~~~"
9367
msgstr ""
9368
9369
#: en/help_topics/configuration.txt:154
9370
msgid ""
9371
"When adding a new feature or working on a bug in a plugin,\n"
9372
"developers often need to use a specific version of a given\n"
9373
"plugin. Since python requires that the directory containing the\n"
9374
"code is named like the plugin itself this make it impossible to\n"
9375
"use arbitrary directory names (using a two-level directory scheme\n"
9376
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9377
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9378
msgstr ""
9379
9380
#: en/help_topics/configuration.txt:162
9381
msgid ""
9382
"Plugins specified in this environment variable takes precedence\n"
9383
"over the ones in ``BZR_PLUGIN_PATH``."
9384
msgstr ""
9385
9386
#: en/help_topics/configuration.txt:165
9387
msgid ""
9388
"The variable specified a list of ``plugin_name@plugin path``,\n"
9389
"``plugin_name`` being the name of the plugin as it appears in\n"
9390
"python module paths, ``plugin_path`` being the path to the\n"
9391
"directory containing the plugin code itself\n"
9392
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9393
"separator, use ';' on windows."
9394
msgstr ""
9395
9396
#: en/help_topics/configuration.txt:172
9397
msgid ""
9398
"Example:\n"
9399
"~~~~~~~~"
9400
msgstr ""
9401
9402
#: en/help_topics/configuration.txt:175
9403
msgid ""
9404
"Using a specific version of ``myplugin``:\n"
9405
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9406
msgstr ""
9407
9408
#: en/help_topics/configuration.txt:178
9409
msgid ""
9410
"BZRPATH\n"
9411
"~~~~~~~"
9412
msgstr ""
9413
9414
#: en/help_topics/configuration.txt:181
9415
msgid "The path where Bazaar should look for shell plugin external commands."
9416
msgstr ""
9417
9418
#: en/help_topics/configuration.txt:183
9419
msgid ""
9420
"\n"
9421
"http_proxy, https_proxy\n"
9422
"~~~~~~~~~~~~~~~~~~~~~~~"
9423
msgstr ""
9424
9425
#: en/help_topics/configuration.txt:187
9426
msgid "Specifies the network proxy for outgoing connections, for example::"
9427
msgstr ""
9428
9429
#: en/help_topics/configuration.txt:189
9430
msgid ""
9431
" http_proxy=http://proxy.example.com:3128/ \n"
9432
" https_proxy=http://proxy.example.com:3128/"
9433
msgstr ""
9434
9435
#: en/help_topics/configuration.txt:192
9436
msgid ""
9437
"\n"
9438
"Configuration files\n"
9439
"-------------------"
9440
msgstr ""
9441
9442
#: en/help_topics/configuration.txt:196
9443
msgid ""
9444
"Location\n"
9445
"~~~~~~~~"
9446
msgstr ""
9447
9448
#: en/help_topics/configuration.txt:199
9449
msgid ""
9450
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9451
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9452
"on\n"
9453
"Windows. (You can check the location for your system by using\n"
9454
"``bzr version``.)"
9455
msgstr ""
9456
9457
#: en/help_topics/configuration.txt:204
9458
msgid "There are three primary configuration files in this location:"
9459
msgstr ""
9460
9461
#: en/help_topics/configuration.txt:206
9462
msgid "* ``bazaar.conf`` describes default configuration options,"
9463
msgstr ""
9464
9465
#: en/help_topics/configuration.txt:208
9466
msgid ""
9467
"* ``locations.conf`` describes configuration information for\n"
9468
" specific branch locations,"
9469
msgstr ""
9470
9471
#: en/help_topics/configuration.txt:211
9472
msgid ""
9473
"* ``authentication.conf`` describes credential information for\n"
9474
" remote servers."
9475
msgstr ""
9476
9477
#: en/help_topics/configuration.txt:214
9478
msgid ""
9479
"Each branch can also contain a configuration file that sets values specific\n"
9480
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9481
"the\n"
9482
"branch. This file is visible to all users of a branch, if you wish to "
9483
"override\n"
9484
"one of the values for a branch with a setting that is specific to you then "
9485
"you\n"
9486
"can do so in ``locations.conf``."
9487
msgstr ""
9488
9489
#: en/help_topics/configuration.txt:220
9490
msgid ""
9491
"General format\n"
9492
"~~~~~~~~~~~~~~"
9493
msgstr ""
9494
9495
#: en/help_topics/configuration.txt:223
9496
msgid ""
9497
"An ini file has three types of contructs: section headers, section\n"
9498
"options and comments."
9499
msgstr ""
9500
9501
#: en/help_topics/configuration.txt:226
9502
msgid ""
9503
"Comments\n"
9504
"^^^^^^^^"
9505
msgstr ""
9506
9507
#: en/help_topics/configuration.txt:229
9508
msgid ""
9509
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9510
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9511
"Bazaar when parsing ini files."
9512
msgstr ""
9513
9514
#: en/help_topics/configuration.txt:233
9515
msgid ""
9516
"Section headers\n"
9517
"^^^^^^^^^^^^^^^"
9518
msgstr ""
9519
9520
#: en/help_topics/configuration.txt:236
9521
msgid ""
9522
"A section header is a word enclosed in brackets that starts at the begining\n"
9523
"of a line. A typical section header looks like this::"
9524
msgstr ""
9525
9526
#: en/help_topics/configuration.txt:239
9527
msgid " [DEFAULT]"
9528
msgstr ""
9529
9530
#: en/help_topics/configuration.txt:241
9531
msgid ""
9532
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9533
"[ALIASES]. Section headers are case sensitive. The default section provides "
9534
"for\n"
9535
"setting options which can be overridden with the branch config file."
9536
msgstr ""
9537
9538
#: en/help_topics/configuration.txt:245
9539
msgid ""
9540
"For ``locations.conf``, the options from the section with the\n"
9541
"longest matching section header are used to the exclusion of other\n"
9542
"potentially valid section headers. A section header uses the path for\n"
9543
"the branch as the section header. Some examples include::"
9544
msgstr ""
9545
9546
#: en/help_topics/configuration.txt:250
9547
msgid ""
9548
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9549
" [/home/jdoe/branches/]"
9550
msgstr ""
9551
9552
#: en/help_topics/configuration.txt:253
9553
msgid ""
9554
"\n"
9555
"Section options\n"
9556
"^^^^^^^^^^^^^^^"
9557
msgstr ""
9558
9559
#: en/help_topics/configuration.txt:257
9560
msgid ""
9561
"A section option resides within a section. A section option contains an\n"
9562
"option name, an equals sign and a value. For example::"
9563
msgstr ""
9564
9565
#: en/help_topics/configuration.txt:260
9566
msgid ""
9567
" email = John Doe <jdoe@isp.com>\n"
9568
" gpg_signing_key = Amy Pond <amy@example.com>"
9569
msgstr ""
9570
9571
#: en/help_topics/configuration.txt:263
9572
msgid ""
9573
"A option can reference other options by enclosing them in curly brackets::"
9574
msgstr ""
9575
9576
#: en/help_topics/configuration.txt:265
9577
msgid ""
9578
" my_branch_name = feature_x\n"
9579
" my_server = bzr+ssh://example.com\n"
9580
" push_location = {my_server}/project/{my_branch_name}"
9581
msgstr ""
9582
9583
#: en/help_topics/configuration.txt:269
9584
msgid ""
9585
"Option policies\n"
9586
"^^^^^^^^^^^^^^^"
9587
msgstr ""
9588
9589
#: en/help_topics/configuration.txt:272
9590
msgid ""
9591
"Options defined in a section affect the named directory or URL plus\n"
9592
"any locations they contain. Policies can be used to change how an\n"
9593
"option value is interpreted for contained locations. Currently\n"
9594
"there are three policies available:"
9595
msgstr ""
9596
9597
#: en/help_topics/configuration.txt:277
9598
msgid ""
9599
" none:\n"
9600
" the value is interpreted the same for contained locations. This is\n"
9601
" the default behaviour.\n"
9602
" norecurse:\n"
9603
" the value is only used for the exact location specified by the\n"
9604
" section name.\n"
9605
" appendpath:\n"
9606
" for contained locations, any additional path components are\n"
9607
" appended to the value."
9608
msgstr ""
9609
9610
#: en/help_topics/configuration.txt:287
9611
msgid ""
9612
"Policies are specified by keys with names of the form "
9613
"\"<option_name>:policy\".\n"
9614
"For example, to define the push location for a tree of branches, the\n"
9615
"following could be used::"
9616
msgstr ""
9617
9618
#: en/help_topics/configuration.txt:291
9619
msgid ""
9620
" [/top/location]\n"
9621
" push_location = sftp://example.com/location\n"
9622
" push_location:policy = appendpath"
9623
msgstr ""
9624
9625
#: en/help_topics/configuration.txt:295
9626
msgid ""
9627
"With this configuration, the push location for ``/top/location/branch1``\n"
9628
"would be ``sftp://example.com/location/branch1``."
9629
msgstr ""
9630
9631
#: en/help_topics/configuration.txt:298
9632
msgid ""
9633
"Section local options\n"
9634
"^^^^^^^^^^^^^^^^^^^^^"
9635
msgstr ""
9636
9637
#: en/help_topics/configuration.txt:301
9638
msgid ""
9639
"Some options are defined automatically inside a given section and can be\n"
9640
"refered to in this section only. "
9641
msgstr ""
9642
9643
#: en/help_topics/configuration.txt:304
9644
msgid "For example, the ``appendpath`` policy can be used like this::"
9645
msgstr ""
9646
9647
#: en/help_topics/configuration.txt:306
9648
msgid ""
9649
" [/home/vila/src/bzr/bugs]\n"
9650
" mypush = lp:~vila/bzr\n"
9651
" mypush:policy=appendpath"
9652
msgstr ""
9653
9654
#: en/help_topics/configuration.txt:310
9655
msgid "Using ``relpath`` to achieve the same result is done like this::"
9656
msgstr ""
9657
9658
#: en/help_topics/configuration.txt:312
9659
msgid ""
9660
" [/home/vila/src/bzr/bugs]\n"
9661
" mypush = lp:~vila/bzr/{relpath}"
9662
msgstr ""
9663
9664
#: en/help_topics/configuration.txt:315
9665
msgid ""
9666
"In both cases, when used in a directory like\n"
9667
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9668
msgstr ""
9669
9670
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9671
msgid ""
9672
" $ bzr config mypush\n"
9673
" lp:~vila/bzr/832013-expand-in-stack"
9674
msgstr ""
9675
9676
#: en/help_topics/configuration.txt:321
9677
msgid "Another such option is ``basename`` which can be used like this::"
9678
msgstr ""
9679
9680
#: en/help_topics/configuration.txt:323
9681
msgid ""
9682
" [/home/vila/src/bzr]\n"
9683
" mypush = lp:~vila/bzr/{basename}"
9684
msgstr ""
9685
9686
#: en/help_topics/configuration.txt:326
9687
msgid ""
9688
"When used in a directory like\n"
9689
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9690
msgstr ""
9691
9692
#: en/help_topics/configuration.txt:332
9693
msgid ""
9694
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9695
"itself is defined as the relative path between the section name and the\n"
9696
"location it matches."
9697
msgstr ""
9698
9699
#: en/help_topics/configuration.txt:336
9700
msgid ""
9701
"Another such option is ``branchname``, which refers to the name of a "
9702
"colocated\n"
9703
"branch. For non-colocated branches, it behaves like basename. It can be "
9704
"used\n"
9705
"like this::"
9706
msgstr ""
9707
9708
#: en/help_topics/configuration.txt:340
9709
msgid ""
9710
" [/home/vila/src/bzr/bugs]\n"
9711
" mypush = lp:~vila/bzr/{branchname}"
9712
msgstr ""
9713
9714
#: en/help_topics/configuration.txt:343
9715
msgid ""
9716
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9717
"get::"
9718
msgstr ""
9719
9720
#: en/help_topics/configuration.txt:345
9721
msgid ""
9722
" bzr config mypush\n"
9723
" lp:~vila/bzr/832013-expand-in-stack"
9724
msgstr ""
9725
9726
#: en/help_topics/configuration.txt:348
9727
msgid ""
9728
"When an option is local to a Section, it cannot be referred to from option\n"
9729
"values in any other section from the same ``Store`` nor from any other\n"
9730
"``Store``."
9731
msgstr ""
9732
9733
#: en/help_topics/configuration.txt:352
9734
msgid ""
9735
"\n"
9736
"The main configuration file, bazaar.conf\n"
9737
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9738
msgstr ""
9739
9740
#: en/help_topics/configuration.txt:356
9741
msgid ""
9742
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9743
"The default section contains the default\n"
9744
"configuration options for all branches. The default section can be\n"
9745
"overriden by providing a branch-specific section in ``locations.conf``."
9746
msgstr ""
9747
9748
#: en/help_topics/configuration.txt:361
9749
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9750
msgstr ""
9751
9752
#: en/help_topics/configuration.txt:363
9753
msgid ""
9754
" [DEFAULT]\n"
9755
" email = John Doe <jdoe@isp.com>\n"
9756
" editor = /usr/bin/vim\n"
9757
" create_signatures = when-required"
9758
msgstr ""
9759
9760
#: en/help_topics/configuration.txt:368
9761
msgid ""
9762
"\n"
9763
"The branch location configuration file, locations.conf\n"
9764
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9765
msgstr ""
9766
9767
#: en/help_topics/configuration.txt:372
9768
msgid ""
9769
"``locations.conf`` allows one to specify overriding settings for\n"
9770
"a specific branch. The format is almost identical to the default section in\n"
9771
"bazaar.conf with one significant change: The section header, instead of "
9772
"saying\n"
9773
"default, will be the path to a branch that you wish to override a value\n"
9774
"for. The '?' and '*' wildcards are supported::"
9775
msgstr ""
9776
9777
#: en/help_topics/configuration.txt:378
9778
msgid ""
9779
" [/home/jdoe/branches/nethack]\n"
9780
" email = Nethack Admin <nethack@nethack.com>"
9781
msgstr ""
9782
9783
#: en/help_topics/configuration.txt:381
9784
msgid ""
9785
" [http://hypothetical.site.com/branches/devel-branch]\n"
9786
" create_signatures = always"
9787
msgstr ""
9788
9789
#: en/help_topics/configuration.txt:384
9790
msgid ""
9791
"The authentication configuration file, authentication.conf\n"
9792
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9793
msgstr ""
9794
9795
#: en/help_topics/configuration.txt:387
9796
msgid ""
9797
"``authentication.conf`` allows one to specify credentials for\n"
9798
"remote servers. This can be used for all the supported transports and any "
9799
"part\n"
9800
"of bzr that requires authentication (smtp for example)."
9801
msgstr ""
9802
9803
#: en/help_topics/configuration.txt:391
9804
msgid ""
9805
"The syntax of the file obeys the same rules as the others except for the\n"
9806
"option policies which don't apply."
9807
msgstr ""
9808
9809
#: en/help_topics/configuration.txt:394
9810
msgid ""
9811
"For more information on the possible uses of the authentication "
9812
"configuration\n"
9813
"file see :doc:`authentication-help`."
9814
msgstr ""
9815
9816
#: en/help_topics/configuration.txt:397
9817
msgid ""
9818
"\n"
9819
"Common options\n"
9820
"--------------"
9821
msgstr ""
9822
9823
#: en/help_topics/configuration.txt:401
9824
msgid ""
9825
"debug_flags\n"
9826
"~~~~~~~~~~~"
9827
msgstr ""
9828
9829
#: en/help_topics/configuration.txt:404
9830
msgid ""
9831
"A comma-separated list of debugging options to turn on. The same values\n"
9832
"can be used as with the -D command-line option (see `help global-options`).\n"
9833
"For example::"
9834
msgstr ""
9835
9836
#: en/help_topics/configuration.txt:408
9837
msgid " debug_flags = hpss"
9838
msgstr ""
9839
9840
#: en/help_topics/configuration.txt:412
9841
msgid " debug_flags = hpss,evil"
9842
msgstr ""
9843
9844
#: en/help_topics/configuration.txt:414
9845
msgid ""
9846
"email\n"
9847
"~~~~~"
9848
msgstr ""
9849
9850
#: en/help_topics/configuration.txt:417
9851
msgid ""
9852
"The email address to use when committing a branch. Typically takes the form\n"
9853
"of::"
9854
msgstr ""
9855
9856
#: en/help_topics/configuration.txt:420
9857
msgid " email = Full Name <account@hostname.tld>"
9858
msgstr ""
9859
9860
#: en/help_topics/configuration.txt:422
9861
msgid ""
9862
"editor\n"
9863
"~~~~~~"
9864
msgstr ""
9865
9866
#: en/help_topics/configuration.txt:425
9867
msgid ""
9868
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9869
"a commit message. This setting is trumped by the environment variable\n"
9870
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9871
"variables."
9872
msgstr ""
9873
9874
#: en/help_topics/configuration.txt:430
9875
msgid ""
9876
"log_format\n"
9877
"~~~~~~~~~~"
9878
msgstr ""
9879
9880
#: en/help_topics/configuration.txt:433
9881
msgid ""
9882
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9883
"and ``line``. Additional formats may be provided by plugins. The default\n"
9884
"value is ``long``."
9885
msgstr ""
9886
9887
#: en/help_topics/configuration.txt:437
9888
msgid ""
9889
"check_signatures\n"
9890
"~~~~~~~~~~~~~~~~"
9891
msgstr ""
9892
9893
#: en/help_topics/configuration.txt:440
9894
msgid ""
9895
"Reserved for future use. These options will allow a policy for branches to\n"
9896
"require signatures."
9897
msgstr ""
9898
9899
#: en/help_topics/configuration.txt:443
9900
msgid ""
9901
"require\n"
9902
" The gnupg signature for revisions must be present and must be valid."
9903
msgstr ""
9904
9905
#: en/help_topics/configuration.txt:446
9906
msgid ""
9907
"ignore\n"
9908
" Do not check gnupg signatures of revisions."
9909
msgstr ""
9910
9911
#: en/help_topics/configuration.txt:449
9912
msgid ""
9913
"check-available\n"
9914
" (default) If gnupg signatures for revisions are present, check them.\n"
9915
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9916
" no signature is present."
9917
msgstr ""
9918
9919
#: en/help_topics/configuration.txt:454
9920
msgid ""
9921
"create_signatures\n"
9922
"~~~~~~~~~~~~~~~~~"
9923
msgstr ""
9924
9925
#: en/help_topics/configuration.txt:457
9926
msgid ""
9927
"Defines the behaviour of signing revisions on commits. By default bzr will "
9928
"not\n"
9929
"sign new commits."
9930
msgstr ""
9931
9932
#: en/help_topics/configuration.txt:460
9933
msgid ""
9934
"always\n"
9935
" Sign every new revision that is committed. If the signing fails then "
9936
"the\n"
9937
" commit will not be made."
9938
msgstr ""
9939
9940
#: en/help_topics/configuration.txt:464
9941
msgid ""
9942
"when-required\n"
9943
" Reserved for future use."
9944
msgstr ""
9945
9946
#: en/help_topics/configuration.txt:467
9947
msgid ""
9948
"never\n"
9949
" Reserved for future use."
9950
msgstr ""
9951
9952
#: en/help_topics/configuration.txt:470
9953
msgid ""
9954
"In future it is planned that ``when-required`` will sign newly\n"
9955
"committed revisions only when the branch requires them. ``never`` will "
9956
"refuse\n"
9957
"to sign newly committed revisions, even if the branch requires signatures."
9958
msgstr ""
9959
9960
#: en/help_topics/configuration.txt:474
9961
msgid ""
9962
"dirstate.fdatasync\n"
9963
"~~~~~~~~~~~~~~~~~~"
9964
msgstr ""
9965
9966
#: en/help_topics/configuration.txt:477
9967
msgid ""
9968
"If true (default), working tree metadata changes are flushed through the\n"
9969
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9970
"should not be lost if the machine crashes. See also repository.fdatasync."
9971
msgstr ""
9972
9973
#: en/help_topics/configuration.txt:481
9974
msgid ""
9975
"gpg_signing_key\n"
9976
"~~~~~~~~~~~~~~~"
9977
msgstr ""
9978
9979
#: en/help_topics/configuration.txt:484
9980
msgid ""
9981
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9982
"address, key fingerprint or full key ID. When unset or when set to\n"
9983
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9984
msgstr ""
9985
9986
#: en/help_topics/configuration.txt:488
9987
msgid ""
9988
"recurse\n"
9989
"~~~~~~~"
9990
msgstr ""
9991
9992
#: en/help_topics/configuration.txt:491
9993
msgid ""
9994
"Only useful in ``locations.conf``. Defines whether or not the\n"
9995
"configuration for this section applies to subdirectories:"
9996
msgstr ""
9997
9998
#: en/help_topics/configuration.txt:494
9999
msgid ""
10000
"true\n"
10001
" (default) This section applies to subdirectories as well."
10002
msgstr ""
10003
10004
#: en/help_topics/configuration.txt:497
10005
msgid ""
10006
"false\n"
10007
" This section only applies to the branch at this directory and not\n"
10008
" branches below it."
10009
msgstr ""
10010
10011
#: en/help_topics/configuration.txt:501
10012
msgid ""
10013
"gpg_signing_command\n"
10014
"~~~~~~~~~~~~~~~~~~~"
10015
msgstr ""
10016
10017
#: en/help_topics/configuration.txt:504
10018
msgid ""
10019
"(Default: \"gpg\"). Which program should be used to sign and check "
10020
"revisions.\n"
10021
"For example::"
10022
msgstr ""
10023
10024
#: en/help_topics/configuration.txt:507
10025
msgid " gpg_signing_command = /usr/bin/gnpg"
10026
msgstr ""
10027
10028
#: en/help_topics/configuration.txt:509
10029
msgid ""
10030
"The specified command must accept the options \"--clearsign\" and \"-u "
10031
"<email>\"."
10032
msgstr ""
10033
10034
#: en/help_topics/configuration.txt:511
10035
msgid ""
10036
"bzr_remote_path\n"
10037
"~~~~~~~~~~~~~~~"
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:514
10041
msgid ""
10042
"(Default: \"bzr\"). The path to the command that should be used to run the "
10043
"smart\n"
10044
"server for bzr. This value may only be specified in locations.conf, because:"
10045
msgstr ""
10046
10047
#: en/help_topics/configuration.txt:517
10048
msgid ""
10049
"- it's needed before branch.conf is accessible\n"
10050
"- allowing remote branch.conf files to specify commands would be a security\n"
10051
" risk"
10052
msgstr ""
10053
10054
#: en/help_topics/configuration.txt:521
10055
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10056
msgstr ""
10057
10058
#: en/help_topics/configuration.txt:523
10059
msgid ""
10060
"smtp_server\n"
10061
"~~~~~~~~~~~"
10062
msgstr ""
10063
10064
#: en/help_topics/configuration.txt:526
10065
msgid ""
10066
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10067
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10068
msgstr ""
10069
10070
#: en/help_topics/configuration.txt:529
10071
msgid ""
10072
"smtp_username, smtp_password\n"
10073
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10074
msgstr ""
10075
10076
#: en/help_topics/configuration.txt:532
10077
msgid ""
10078
"User and password to authenticate to the SMTP server. If smtp_username\n"
10079
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10080
"These settings are only needed if the SMTP server requires authentication\n"
10081
"to send mail."
10082
msgstr ""
10083
10084
#: en/help_topics/configuration.txt:537
10085
msgid ""
10086
"locks.steal_dead\n"
10087
"~~~~~~~~~~~~~~~~"
10088
msgstr ""
10089
10090
#: en/help_topics/configuration.txt:540
10091
msgid ""
10092
"If set to true, bzr will automatically break locks held by processes from\n"
10093
"the same machine and user that are no longer alive. Otherwise, it will\n"
10094
"print a message and you can break the lock manually, if you are satisfied\n"
10095
"the object is no longer in use."
10096
msgstr ""
10097
10098
#: en/help_topics/configuration.txt:545
10099
msgid ""
10100
"mail_client\n"
10101
"~~~~~~~~~~~"
10102
msgstr ""
10103
10104
#: en/help_topics/configuration.txt:548
10105
msgid ""
10106
"A mail client to use for sending merge requests.\n"
10107
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10108
"it\n"
10109
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10110
"``editor``."
10111
msgstr ""
10112
10113
#: en/help_topics/configuration.txt:553
10114
msgid "Supported values for specific clients:"
10115
msgstr ""
10116
10117
#: en/help_topics/configuration.txt:555
10118
msgid ""
10119
":claws: Use Claws. This skips a dialog for attaching files.\n"
10120
":evolution: Use Evolution.\n"
10121
":kmail: Use KMail.\n"
10122
":mutt: Use Mutt.\n"
10123
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10124
"1.5,\n"
10125
" this works around some bugs that xdg-email doesn't handle."
10126
msgstr ""
10127
10128
#: en/help_topics/configuration.txt:562
10129
msgid "Supported generic values are:"
10130
msgstr ""
10131
10132
#: en/help_topics/configuration.txt:564
10133
msgid ""
10134
":default: See above.\n"
10135
":editor: Use your editor to compose the merge request. This also uses\n"
10136
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10137
" smtp_username and smtp_password.\n"
10138
":mapi: Use your preferred e-mail client on Windows.\n"
10139
":xdg-email: Use xdg-email to run your preferred mail program"
10140
msgstr ""
10141
10142
#: en/help_topics/configuration.txt:571
10143
msgid ""
10144
"repository.fdatasync\n"
10145
"~~~~~~~~~~~~~~~~~~~~"
10146
msgstr ""
10147
10148
#: en/help_topics/configuration.txt:574
10149
msgid ""
10150
"If true (default), repository changes are flushed through the OS buffers\n"
10151
"to physical disk. This is somewhat slower, but means data should not be\n"
10152
"lost if the machine crashes. See also dirstate.fdatasync."
10153
msgstr ""
10154
10155
#: en/help_topics/configuration.txt:578
10156
msgid ""
10157
"submit_branch\n"
10158
"~~~~~~~~~~~~~"
10159
msgstr ""
10160
10161
#: en/help_topics/configuration.txt:581
10162
msgid ""
10163
"The branch you intend to submit your current work to. This is "
10164
"automatically\n"
10165
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10166
"This\n"
10167
"should usually be set on a per-branch or per-location basis."
10168
msgstr ""
10169
10170
#: en/help_topics/configuration.txt:585
10171
msgid ""
10172
"public_branch\n"
10173
"~~~~~~~~~~~~~"
10174
msgstr ""
10175
10176
#: en/help_topics/configuration.txt:588
10177
msgid ""
10178
"A publically-accessible version of this branch (implying that this version "
10179
"is\n"
10180
"not publically-accessible). Used (and set) by ``bzr send``."
10181
msgstr ""
10182
10183
#: en/help_topics/configuration.txt:591
10184
msgid ""
10185
"suppress_warnings\n"
10186
"~~~~~~~~~~~~~~~~~"
10187
msgstr ""
10188
10189
#: en/help_topics/configuration.txt:594
10190
msgid ""
10191
"A list of strings, each string represent a warning that can be emitted by\n"
10192
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10193
msgstr ""
10194
10195
#: en/help_topics/configuration.txt:597
10196
msgid "Valid values:"
10197
msgstr ""
10198
10199
#: en/help_topics/configuration.txt:599
10200
msgid ""
10201
"* ``format_deprecation``:\n"
10202
" whether the format deprecation warning is shown on repositories that "
10203
"are\n"
10204
" using deprecated formats."
10205
msgstr ""
10206
10207
#: en/help_topics/configuration.txt:603
10208
msgid ""
10209
"default_format\n"
10210
"~~~~~~~~~~~~~~"
10211
msgstr ""
10212
10213
#: en/help_topics/configuration.txt:606
10214
msgid ""
10215
"A format name for the default format used when creating branches. See "
10216
"``bzr\n"
10217
"help formats`` for possible values."
10218
msgstr ""
10219
10220
#: en/help_topics/configuration.txt:609
10221
msgid ""
10222
"\n"
10223
"Unicode options\n"
10224
"---------------"
10225
msgstr ""
10226
10227
#: en/help_topics/configuration.txt:613
10228
msgid ""
10229
"output_encoding\n"
10230
"~~~~~~~~~~~~~~~"
10231
msgstr ""
10232
10233
#: en/help_topics/configuration.txt:616
10234
msgid ""
10235
"A Python unicode encoding name for text output from bzr, such as log\n"
10236
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10237
"is the terminal encoding prefered by the operating system."
10238
msgstr ""
10239
10240
#: en/help_topics/configuration.txt:620
10241
msgid ""
10242
"\n"
10243
"Branch type specific options\n"
10244
"----------------------------"
10245
msgstr ""
10246
10247
#: en/help_topics/configuration.txt:624
10248
msgid ""
10249
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10250
"later format. They\n"
10251
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10252
"manually set in ``locations.conf`` or ``bazaar.conf``."
10253
msgstr ""
10254
10255
#: en/help_topics/configuration.txt:629
10256
msgid ""
10257
"append_revisions_only\n"
10258
"~~~~~~~~~~~~~~~~~~~~~"
10259
msgstr ""
10260
10261
#: en/help_topics/configuration.txt:632
10262
msgid ""
10263
"If set to \"True\" then revisions can only be appended to the log, not\n"
10264
"removed. A branch with this setting enabled can only pull from another\n"
10265
"branch if the other branch's log is a longer version of its own. This is\n"
10266
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10267
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10268
"compatibility with previous bzr versions (older than 2.2)."
10269
msgstr ""
10270
10271
#: en/help_topics/configuration.txt:639
10272
msgid ""
10273
"parent_location\n"
10274
"~~~~~~~~~~~~~~~"
10275
msgstr ""
10276
10277
#: en/help_topics/configuration.txt:642
10278
msgid ""
10279
"If present, the location of the default branch for pull or merge. This "
10280
"option\n"
10281
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10282
"--remember``."
10283
msgstr ""
10284
10285
#: en/help_topics/configuration.txt:646
10286
msgid ""
10287
"push_location\n"
10288
"~~~~~~~~~~~~~"
10289
msgstr ""
10290
10291
#: en/help_topics/configuration.txt:649
10292
msgid ""
10293
"If present, the location of the default branch for push. This option\n"
10294
"is normally set by the first ``push`` or ``push --remember``."
10295
msgstr ""
10296
10297
#: en/help_topics/configuration.txt:652
10298
msgid ""
10299
"push_strict\n"
10300
"~~~~~~~~~~~"
10301
msgstr ""
10302
10303
#: en/help_topics/configuration.txt:655
10304
msgid ""
10305
"If present, defines the ``--strict`` option default value for checking\n"
10306
"uncommitted changes before pushing."
10307
msgstr ""
10308
10309
#: en/help_topics/configuration.txt:658
10310
msgid ""
10311
"dpush_strict\n"
10312
"~~~~~~~~~~~~"
10313
msgstr ""
10314
10315
#: en/help_topics/configuration.txt:661
10316
msgid ""
10317
"If present, defines the ``--strict`` option default value for checking\n"
10318
"uncommitted changes before pushing into a different VCS without any\n"
10319
"custom bzr metadata."
10320
msgstr ""
10321
10322
#: en/help_topics/configuration.txt:665
10323
msgid ""
10324
"bound_location\n"
10325
"~~~~~~~~~~~~~~"
10326
msgstr ""
10327
10328
#: en/help_topics/configuration.txt:668
10329
msgid ""
10330
"The location that commits should go to when acting as a checkout.\n"
10331
"This option is normally set by ``bind``."
10332
msgstr ""
10333
10334
#: en/help_topics/configuration.txt:671
10335
msgid ""
10336
"bound\n"
10337
"~~~~~"
10338
msgstr ""
10339
10340
#: en/help_topics/configuration.txt:674
10341
msgid ""
10342
"If set to \"True\", the branch should act as a checkout, and push each "
10343
"commit to\n"
10344
"the bound_location. This option is normally set by ``bind``/``unbind``."
10345
msgstr ""
10346
10347
#: en/help_topics/configuration.txt:677
10348
msgid ""
10349
"send_strict\n"
10350
"~~~~~~~~~~~"
10351
msgstr ""
10352
10353
#: en/help_topics/configuration.txt:680
10354
msgid ""
10355
"If present, defines the ``--strict`` option default value for checking\n"
10356
"uncommitted changes before sending a merge directive."
10357
msgstr ""
10358
10359
#: en/help_topics/configuration.txt:683
10360
msgid ""
10361
"add.maximum_file_size\n"
10362
"~~~~~~~~~~~~~~~~~~~~~"
10363
msgstr ""
10364
10365
#: en/help_topics/configuration.txt:686
10366
msgid ""
10367
"Defines the maximum file size the command line \"add\" operation will allow\n"
10368
"in recursive mode, with files larger than this value being skipped. You may "
10369
"\n"
10370
"specify this value as an integer (in which case it is interpreted as bytes), "
10371
"\n"
10372
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10373
"0 \n"
10374
"will disable skipping."
10375
msgstr ""
10376
10377
#: en/help_topics/configuration.txt:692
10378
msgid ""
10379
"External Merge Tools\n"
10380
"--------------------"
10381
msgstr ""
10382
10383
#: en/help_topics/configuration.txt:695
10384
msgid ""
10385
"bzr.mergetool.<name>\n"
10386
"~~~~~~~~~~~~~~~~~~~~"
10387
msgstr ""
10388
10389
#: en/help_topics/configuration.txt:698
10390
msgid ""
10391
"Defines an external merge tool called <name> with the given command-line.\n"
10392
"Arguments containing spaces should be quoted using single or double quotes. "
10393
"The\n"
10394
"executable may omit its path if it can be found on the PATH."
10395
msgstr ""
10396
10397
#: en/help_topics/configuration.txt:702
10398
msgid ""
10399
"The following markers can be used in the command-line to substitute "
10400
"filenames\n"
10401
"involved in the merge conflict::"
10402
msgstr ""
10403
10404
#: en/help_topics/configuration.txt:705
10405
msgid ""
10406
" {base} file.BASE\n"
10407
" {this} file.THIS\n"
10408
" {other} file.OTHER\n"
10409
" {result} output file\n"
10410
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10411
"merge\n"
10412
" succeeds."
10413
msgstr ""
10414
10415
#: en/help_topics/configuration.txt:714
10416
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10417
msgstr ""
10418
10419
#: en/help_topics/configuration.txt:716
10420
msgid ""
10421
"bzr.default_mergetool\n"
10422
"~~~~~~~~~~~~~~~~~~~~~"
10423
msgstr ""
10424
10425
#: en/help_topics/configuration.txt:719
10426
msgid ""
10427
"Specifies which external merge tool (as defined above) should be selected "
10428
"by\n"
10429
"default in tools such as ``bzr qconflicts``."
10430
msgstr ""
10431
10432
#: en/help_topics/configuration.txt:724
10433
msgid " bzr.default_mergetool = kdiff3\n"
10434
msgstr ""
10435
10436
#: en/help_topics/conflict-types.txt:1
10437
msgid ""
10438
"Conflict Types\n"
10439
"=============="
10440
msgstr ""
10441
10442
#: en/help_topics/conflict-types.txt:4
10443
msgid ""
10444
"Some operations, like merge, revert and pull, modify the contents of your\n"
10445
"working tree. These modifications are programmatically generated, and so "
10446
"they\n"
10447
"may conflict with the current state of your working tree. "
10448
msgstr ""
10449
10450
#: en/help_topics/conflict-types.txt:8
10451
msgid ""
10452
"When conflicts are present in your working tree (as shown by ``bzr\n"
10453
"conflicts``), you should resolve them and then inform bzr that the "
10454
"conflicts\n"
10455
"have been resolved."
10456
msgstr ""
10457
10458
#: en/help_topics/conflict-types.txt:12
10459
msgid ""
10460
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10461
"should resolve them is not the one responsible for their occurrence, as is "
10462
"the\n"
10463
"case when merging other people's work or because some conflicts are "
10464
"presented\n"
10465
"in a way that is not easy to understand."
10466
msgstr ""
10467
10468
#: en/help_topics/conflict-types.txt:17
10469
msgid ""
10470
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10471
"conflict if and only if there's an actual conceptual conflict in the source\n"
10472
"tree. Because Bazaar doesn't understand the real meaning of the files "
10473
"being\n"
10474
"versioned, it can, when faced with ambiguities, fall short in either "
10475
"direction\n"
10476
"trying to resolve the conflict itself. Many kinds of changes can be "
10477
"combined\n"
10478
"programmatically, but sometimes only a human can determine the right thing "
10479
"to\n"
10480
"do."
10481
msgstr ""
10482
10483
#: en/help_topics/conflict-types.txt:25
10484
msgid ""
10485
"When Bazaar generates a conflict, it adds information into the working tree "
10486
"to\n"
10487
"present the conflicting versions, and it's up to you to find the correct\n"
10488
"resolution."
10489
msgstr ""
10490
10491
#: en/help_topics/conflict-types.txt:29
10492
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10493
msgstr ""
10494
10495
#: en/help_topics/conflict-types.txt:31
10496
msgid ""
10497
"1. Modify the working tree content so that the conflicted item is now in "
10498
"the\n"
10499
" state you want to keep, then"
10500
msgstr ""
10501
10502
#: en/help_topics/conflict-types.txt:34
10503
msgid ""
10504
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10505
" remaining generated information (``bzr resolve <item>``)."
10506
msgstr ""
10507
10508
#: en/help_topics/conflict-types.txt:37
10509
msgid ""
10510
"For most conflict types, there are some obvious ways to modify the working\n"
10511
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10512
"itself already made a choice, when possible."
10513
msgstr ""
10514
10515
#: en/help_topics/conflict-types.txt:41
10516
msgid ""
10517
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10518
"different ways to resolve the conflict."
10519
msgstr ""
10520
10521
#: en/help_topics/conflict-types.txt:44
10522
msgid ""
10523
"Each type of conflict is explained below, and the action which must be done "
10524
"to\n"
10525
"resolve the conflict is outlined."
10526
msgstr ""
10527
10528
#: en/help_topics/conflict-types.txt:47
10529
msgid ""
10530
"Various actions are available depending on the kind of conflict, for some "
10531
"of\n"
10532
"these actions, Bazaar can provide some help. In the end you should at least\n"
10533
"inform Bazaar that you're done with the conflict with::"
10534
msgstr ""
10535
10536
#: en/help_topics/conflict-types.txt:51
10537
msgid " ``bzr resolve FILE --action=done'"
10538
msgstr ""
10539
10540
#: en/help_topics/conflict-types.txt:53
10541
msgid ""
10542
"Note that this is the default action when a single file is involved so you "
10543
"can\n"
10544
"simply use::"
10545
msgstr ""
10546
10547
#: en/help_topics/conflict-types.txt:56
10548
msgid " ``bzr resolve FILE``"
10549
msgstr ""
10550
10551
#: en/help_topics/conflict-types.txt:58
10552
msgid "See ``bzr help resolve`` for more details."
10553
msgstr ""
10554
10555
#: en/help_topics/conflict-types.txt:60
10556
msgid ""
10557
"Text conflicts\n"
10558
"--------------"
10559
msgstr ""
10560
10561
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10562
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10563
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10564
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10565
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10566
msgid "Typical message::"
10567
msgstr ""
10568
10569
#: en/help_topics/conflict-types.txt:65
10570
msgid " Text conflict in FILE"
10571
msgstr ""
10572
10573
#: en/help_topics/conflict-types.txt:67
10574
msgid ""
10575
"These are produced when a text merge cannot completely reconcile two sets "
10576
"of\n"
10577
"text changes. Bazaar will emit files for each version with the extensions\n"
10578
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10579
"tree,\n"
10580
"i.e. the tree that you are merging changes into. OTHER is the version that "
10581
"you\n"
10582
"are merging into the target. BASE is an older version that is used as a "
10583
"basis\n"
10584
"for comparison."
10585
msgstr ""
10586
10587
#: en/help_topics/conflict-types.txt:74
10588
msgid ""
10589
"In the main copy of the file, Bazaar will include all the changes that it\n"
10590
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10591
"\"herringbone\" markers like ``<<<<<<<``."
10592
msgstr ""
10593
10594
#: en/help_topics/conflict-types.txt:78
10595
msgid ""
10596
"Say the initial text is \"The project leader released it.\", and THIS "
10597
"modifies it\n"
10598
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10599
"leader\n"
10600
"released Bazaar.\" A conflict would look like this::"
10601
msgstr ""
10602
10603
#: en/help_topics/conflict-types.txt:82
10604
msgid ""
10605
" <<<<<<< TREE\n"
10606
" Martin Pool released it.\n"
10607
" =======\n"
10608
" The project leader released Bazaar.\n"
10609
" >>>>>>> MERGE-SOURCE"
10610
msgstr ""
10611
10612
#: en/help_topics/conflict-types.txt:88
10613
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10614
msgstr ""
10615
10616
#: en/help_topics/conflict-types.txt:90
10617
msgid ""
10618
"You can handle text conflicts either by editing the main copy of the file,\n"
10619
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10620
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10621
"set of changes over the other (but see below when you encounter these\n"
10622
"cases). More often, the two sets of changes must be intelligently combined."
10623
msgstr ""
10624
10625
#: en/help_topics/conflict-types.txt:96
10626
msgid ""
10627
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10628
"you are done editing, the file should look like it never had a conflict, and "
10629
"be\n"
10630
"ready to commit."
10631
msgstr ""
10632
10633
#: en/help_topics/conflict-types.txt:100
10634
msgid ""
10635
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10636
"Bazaar will auto-detect which conflicts you have resolved."
10637
msgstr ""
10638
10639
#: en/help_topics/conflict-types.txt:103
10640
msgid ""
10641
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10642
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10643
"working tree."
10644
msgstr ""
10645
10646
#: en/help_topics/conflict-types.txt:107
10647
msgid ""
10648
"\n"
10649
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10650
"resolve`` with one of the following actions:"
10651
msgstr ""
10652
10653
#: en/help_topics/conflict-types.txt:111
10654
msgid ""
10655
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10656
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10657
msgstr ""
10658
10659
#: en/help_topics/conflict-types.txt:114
10660
msgid ""
10661
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10662
"modifications will be taken into account."
10663
msgstr ""
10664
10665
#: en/help_topics/conflict-types.txt:117
10666
msgid ""
10667
"Content conflicts\n"
10668
"-----------------"
10669
msgstr ""
10670
10671
#: en/help_topics/conflict-types.txt:122
10672
msgid " Contents conflict in FILE"
10673
msgstr ""
10674
10675
#: en/help_topics/conflict-types.txt:124
10676
msgid ""
10677
"This conflict happens when there are conflicting changes in the working "
10678
"tree\n"
10679
"and the merge source, but the conflicted items are not text files. They "
10680
"may\n"
10681
"be binary files, or symlinks, or directories. It can even happen with "
10682
"files\n"
10683
"that are deleted on one side, and modified on the other."
10684
msgstr ""
10685
10686
#: en/help_topics/conflict-types.txt:129
10687
msgid ""
10688
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10689
"be\n"
10690
"regular files, symlinks or directories). But it will not include a \"main "
10691
"copy\"\n"
10692
"of the file with herringbone conflict markers. It will appear that the "
10693
"\"main\n"
10694
"copy\" has been renamed to THIS or OTHER."
10695
msgstr ""
10696
10697
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10698
msgid ""
10699
"To resolve that kind of conflict, you should rebuild FILE from either "
10700
"version\n"
10701
"or a combination of both."
10702
msgstr ""
10703
10704
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10705
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10706
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10707
#: en/help_topics/conflict-types.txt:361
10708
msgid "``bzr resolve`` recognizes the following actions:"
10709
msgstr ""
10710
10711
#: en/help_topics/conflict-types.txt:139
10712
msgid ""
10713
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10714
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10715
"* ``--action=done`` will just mark the conflict as resolved."
10716
msgstr ""
10717
10718
#: en/help_topics/conflict-types.txt:143
10719
msgid ""
10720
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10721
"and\n"
10722
"``.OTHER`` files if they are still present in the working tree."
10723
msgstr ""
10724
10725
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10726
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10727
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10728
#: en/help_topics/conflict-types.txt:369
10729
msgid ""
10730
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10731
msgstr ""
10732
10733
#: en/help_topics/conflict-types.txt:148
10734
msgid ""
10735
"Tag conflicts\n"
10736
"-------------"
10737
msgstr ""
10738
10739
#: en/help_topics/conflict-types.txt:153
10740
msgid ""
10741
" Conflicting tags:\n"
10742
" version-0.1"
10743
msgstr ""
10744
10745
#: en/help_topics/conflict-types.txt:156
10746
msgid ""
10747
"When pulling from or pushing to another branch, Bazaar informs you about "
10748
"tags\n"
10749
"that conflict between the two branches; that is the same tag points to two\n"
10750
"different revisions. You need not resolve these conflicts, but subsequent\n"
10751
"uses of pull or push will result in the same message."
10752
msgstr ""
10753
10754
#: en/help_topics/conflict-types.txt:161
10755
msgid ""
10756
"To resolve the conflict, you must apply the correct tags to either the "
10757
"target\n"
10758
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10759
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10760
"target branch's tags match the source branch, then in the target branch do\n"
10761
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10762
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10763
"source\n"
10764
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10765
"favor of the target branch, you need to similarly use ``tag --force`` in "
10766
"the\n"
10767
"source branch. (Note that pulling or pushing using --overwrite will "
10768
"overwrite\n"
10769
"all tags as well.)"
10770
msgstr ""
10771
10772
#: en/help_topics/conflict-types.txt:172
10773
msgid ""
10774
"Duplicate paths\n"
10775
"---------------"
10776
msgstr ""
10777
10778
#: en/help_topics/conflict-types.txt:177
10779
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10780
msgstr ""
10781
10782
#: en/help_topics/conflict-types.txt:179
10783
msgid ""
10784
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10785
"already been used. The existing file will be renamed to \"FILE.moved\". "
10786
msgstr ""
10787
10788
#: en/help_topics/conflict-types.txt:187
10789
msgid ""
10790
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10791
"FILE``,\n"
10792
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10793
"* ``--action=done`` will just mark the conflict as resolved."
10794
msgstr ""
10795
10796
#: en/help_topics/conflict-types.txt:191
10797
msgid ""
10798
"Note that you must get rid of FILE.moved before using ``--action=done``."
10799
msgstr ""
10800
10801
#: en/help_topics/conflict-types.txt:195
10802
msgid ""
10803
"Unversioned parent\n"
10804
"------------------"
10805
msgstr ""
10806
10807
#: en/help_topics/conflict-types.txt:200
10808
msgid ""
10809
" Conflict because FILE is not versioned, but has versioned children."
10810
msgstr ""
10811
10812
#: en/help_topics/conflict-types.txt:202
10813
msgid ""
10814
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10815
"not\n"
10816
"versioned. This happens when the directory has been deleted in the target,\n"
10817
"but has a new child in the source, or vice versa. In this situation, "
10818
"Bazaar\n"
10819
"will version the parent directory as well. Resolving this issue depends\n"
10820
"very much on the particular scenario. You may wish to rename or delete "
10821
"either\n"
10822
"the file or the directory. When you are satisfied, you can run \"bzr "
10823
"resolve\n"
10824
"FILE\" to mark the conflict as resolved."
10825
msgstr ""
10826
10827
#: en/help_topics/conflict-types.txt:210
10828
msgid ""
10829
"Missing parent\n"
10830
"--------------"
10831
msgstr ""
10832
10833
#: en/help_topics/conflict-types.txt:215
10834
msgid " Conflict adding files to FILE. Created directory."
10835
msgstr ""
10836
10837
#: en/help_topics/conflict-types.txt:217
10838
msgid ""
10839
"This happens when a directory has been deleted in the target, but has new\n"
10840
"children in the source. This is similar to the \"unversioned parent\" "
10841
"conflict,\n"
10842
"except that the parent directory does not *exist*, instead of just being\n"
10843
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10844
"Resolving this issue depends very much on the particular scenario."
10845
msgstr ""
10846
10847
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10848
msgid ""
10849
"To resolve that kind of conflict, you should either remove or rename the\n"
10850
"children or the directory or a combination of both."
10851
msgstr ""
10852
10853
#: en/help_topics/conflict-types.txt:228
10854
msgid ""
10855
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10856
" children,\n"
10857
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10858
"children\n"
10859
" and restoring the directory,\n"
10860
"* ``--action=done`` will just mark the conflict as resolved."
10861
msgstr ""
10862
10863
#: en/help_topics/conflict-types.txt:236
10864
msgid ""
10865
"Deleting parent\n"
10866
"---------------"
10867
msgstr ""
10868
10869
#: en/help_topics/conflict-types.txt:241
10870
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10871
msgstr ""
10872
10873
#: en/help_topics/conflict-types.txt:243
10874
msgid ""
10875
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10876
"source, but has new children in the target (either because a directory\n"
10877
"deletion is merged or because the merge introduce new children). Bazaar\n"
10878
"will retain the directory. Resolving this issue depends very much on the\n"
10879
"particular scenario."
10880
msgstr ""
10881
10882
#: en/help_topics/conflict-types.txt:254
10883
msgid ""
10884
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10885
"directory,"
10886
msgstr ""
10887
10888
#: en/help_topics/conflict-types.txt:256
10889
msgid ""
10890
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10891
" children,"
10892
msgstr ""
10893
10894
#: en/help_topics/conflict-types.txt:259
10895
msgid "* ``--action=done`` will just mark the conflict as resolved."
10896
msgstr ""
10897
10898
#: en/help_topics/conflict-types.txt:261
10899
msgid ""
10900
"Note that when merging a directory deletion, if unversioned files are\n"
10901
"present, they become potential orphans has they don't have a directory\n"
10902
"parent anymore."
10903
msgstr ""
10904
10905
#: en/help_topics/conflict-types.txt:265
10906
msgid ""
10907
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10908
"setting the ``bzr.transform.orphan_policy`` configuration option."
10909
msgstr ""
10910
10911
#: en/help_topics/conflict-types.txt:268
10912
msgid "There are two possible values for this option:"
10913
msgstr ""
10914
10915
#: en/help_topics/conflict-types.txt:270
10916
msgid ""
10917
"* ``conflict`` (the default): will leave the orphans in place and\n"
10918
" generate a conflicts,"
10919
msgstr ""
10920
10921
#: en/help_topics/conflict-types.txt:273
10922
msgid ""
10923
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10924
"root\n"
10925
" of the working tree with names like ``<file>.~#~``."
10926
msgstr ""
10927
10928
#: en/help_topics/conflict-types.txt:278
10929
msgid ""
10930
"Path conflict\n"
10931
"-------------"
10932
msgstr ""
10933
10934
#: en/help_topics/conflict-types.txt:283
10935
msgid " Path conflict: PATH1 / PATH2"
10936
msgstr ""
10937
10938
#: en/help_topics/conflict-types.txt:285
10939
msgid ""
10940
"This happens when the source and target have each modified the name or "
10941
"parent\n"
10942
"directory of a file. Bazaar will use the path elements from the source."
10943
msgstr ""
10944
10945
#: en/help_topics/conflict-types.txt:288
10946
msgid ""
10947
"To resolve that kind of conflict, you just have to decide what name should "
10948
"be\n"
10949
"retained for the file involved."
10950
msgstr ""
10951
10952
#: en/help_topics/conflict-types.txt:293
10953
msgid ""
10954
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10955
" issuing ``bzr mv PATH2 PATH1``,\n"
10956
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10957
"``PATH2``,\n"
10958
"* ``--action=done`` will just mark the conflict as resolved."
10959
msgstr ""
10960
10961
#: en/help_topics/conflict-types.txt:300
10962
msgid ""
10963
"Parent loop\n"
10964
"-----------"
10965
msgstr ""
10966
10967
#: en/help_topics/conflict-types.txt:305
10968
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10969
msgstr ""
10970
10971
#: en/help_topics/conflict-types.txt:307
10972
msgid ""
10973
"This happens when the source and the target have each moved directories, so\n"
10974
"that, if the change could be applied, a directory would be contained by "
10975
"itself.\n"
10976
"For example::"
10977
msgstr ""
10978
10979
#: en/help_topics/conflict-types.txt:311
10980
msgid ""
10981
" $ bzr init\n"
10982
" $ bzr mkdir white\n"
10983
" $ bzr mkdir black\n"
10984
" $ bzr commit -m \"BASE\"\n"
10985
" $ bzr branch . ../other\n"
10986
" $ bzr mv white black\n"
10987
" $ bzr commit -m \"THIS\"\n"
10988
" $ bzr mv ../other/black ../other/white\n"
10989
" $ bzr commit ../other -m \"OTHER\"\n"
10990
" $ bzr merge ../other"
10991
msgstr ""
10992
10993
#: en/help_topics/conflict-types.txt:322
10994
msgid ""
10995
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
10996
"``black``. To resolve that kind of conflict, you just have to decide what\n"
10997
"name should be retained for the directories involved."
10998
msgstr ""
10999
11000
#: en/help_topics/conflict-types.txt:328
11001
msgid ""
11002
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11003
"\n"
11004
" in ``black``,\n"
11005
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11006
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11007
"* ``--action=done`` will just mark the conflict as resolved."
11008
msgstr ""
11009
11010
#: en/help_topics/conflict-types.txt:336
11011
msgid ""
11012
"Non-directory parent\n"
11013
"--------------------"
11014
msgstr ""
11015
11016
#: en/help_topics/conflict-types.txt:341
11017
msgid ""
11018
" Conflict: foo.new is not a directory, but has files in it.\n"
11019
" Created directory."
11020
msgstr ""
11021
11022
#: en/help_topics/conflict-types.txt:344
11023
msgid ""
11024
"This happens when one side has added files to a directory, and the other "
11025
"side\n"
11026
"has changed the directory into a file or symlink. For example::"
11027
msgstr ""
11028
11029
#: en/help_topics/conflict-types.txt:347
11030
msgid ""
11031
" $ bzr init\n"
11032
" $ bzr mkdir foo\n"
11033
" $ bzr commit -m \"BASE\"\n"
11034
" $ bzr branch . ../other\n"
11035
" $ rmdir foo\n"
11036
" $ touch foo\n"
11037
" $ bzr commit -m \"THIS\"\n"
11038
" $ bzr mkdir ../other/foo/bar\n"
11039
" $ bzr commit ../other -m \"OTHER\"\n"
11040
" $ bzr merge ../other"
11041
msgstr ""
11042
11043
#: en/help_topics/conflict-types.txt:358
11044
msgid ""
11045
"To resolve that kind of conflict, you have to decide what name should be\n"
11046
"retained for the file, directory or symlink involved."
11047
msgstr ""
11048
11049
#: en/help_topics/conflict-types.txt:363
11050
msgid ""
11051
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11052
" ``bzr add foo``,\n"
11053
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11054
" ``bzr mv foo.new foo``,\n"
11055
"* ``--action=done`` will just mark the conflict as resolved."
11056
msgstr ""
11057
11058
#: en/help_topics/conflict-types.txt:371
11059
msgid ""
11060
"MalformedTransform\n"
11061
"------------------"
11062
msgstr ""
11063
11064
#: en/help_topics/conflict-types.txt:374
11065
msgid ""
11066
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11067
"exception. This means that Bazaar encountered a filesystem conflict that it "
11068
"was\n"
11069
"unable to resolve. This usually indicates a bug. Please let us know if "
11070
"you\n"
11071
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11072
msgstr ""
11073
11074
#: en/help_topics/content-filters.txt:1
11075
msgid ""
11076
"Content Filters\n"
11077
"==============="
11078
msgstr ""
11079
11080
#: en/help_topics/content-filters.txt:4
11081
msgid ""
11082
"Content formats\n"
11083
"---------------"
11084
msgstr ""
11085
11086
#: en/help_topics/content-filters.txt:7
11087
msgid ""
11088
"Bazaar's content filtering allows you to store files in a different\n"
11089
"format from the copy in your working tree. This lets you, or your\n"
11090
"co-developers, use Windows development tools that expect CRLF files\n"
11091
"on projects that use other line-ending conventions. Among other things,\n"
11092
"content filters also let Unix developers more easily work on projects\n"
11093
"using Windows line-ending conventions, keyword expansion/compression,\n"
11094
"and trailing spaces on lines in text files to be implicitly stripped\n"
11095
"when committed."
11096
msgstr ""
11097
11098
#: en/help_topics/content-filters.txt:16
11099
msgid "To generalize, there are two content formats supported by Bazaar:"
11100
msgstr ""
11101
11102
#: en/help_topics/content-filters.txt:18
11103
msgid ""
11104
"* a canonical format - how files are stored internally\n"
11105
"* a convenience format - how files are created in a working tree."
11106
msgstr ""
11107
11108
#: en/help_topics/content-filters.txt:21
11109
msgid ""
11110
"\n"
11111
"Format conversion\n"
11112
"-----------------"
11113
msgstr ""
11114
11115
#: en/help_topics/content-filters.txt:25
11116
msgid ""
11117
"The conversion between these formats is done by content filters.\n"
11118
"A content filter has two parts:"
11119
msgstr ""
11120
11121
#: en/help_topics/content-filters.txt:28
11122
msgid ""
11123
"* a read converter - converts from convenience to canonical format\n"
11124
"* a write converter - converts from canonical to convenience format."
11125
msgstr ""
11126
11127
#: en/help_topics/content-filters.txt:31
11128
msgid ""
11129
"Many of these converters will provide *round-trip* conversion,\n"
11130
"i.e. applying the read converter followed by the write converter\n"
11131
"gives back the original content. However, others may provide an\n"
11132
"asymmetric conversion. For example, a read converter might strip\n"
11133
"trailing whitespace off lines in source code while the matching\n"
11134
"write converter might pass content through unchanged."
11135
msgstr ""
11136
11137
#: en/help_topics/content-filters.txt:38
11138
msgid ""
11139
"\n"
11140
"Enabling content filters\n"
11141
"------------------------"
11142
msgstr ""
11143
11144
#: en/help_topics/content-filters.txt:42
11145
msgid ""
11146
"Content filters are typically provided by plugins, so the first step\n"
11147
"in using them is to install the relevant plugins and read their\n"
11148
"documentation. Some plugins may be very specific about which files\n"
11149
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11150
"In other cases, the plugin may leave it in the user's hands to\n"
11151
"define which files are to be filtered. This is typically done\n"
11152
"using rule-based preferences. See ``bzr help rules`` for general\n"
11153
"information about defining these."
11154
msgstr ""
11155
11156
#: en/help_topics/content-filters.txt:51
11157
msgid ""
11158
"\n"
11159
"Impact on commands\n"
11160
"------------------"
11161
msgstr ""
11162
11163
#: en/help_topics/content-filters.txt:55
11164
msgid ""
11165
"Read converters are only applied to commands that read content from\n"
11166
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11167
"will apply read converters to files in the working tree, then compare\n"
11168
"the results to the content last committed."
11169
msgstr ""
11170
11171
#: en/help_topics/content-filters.txt:60
11172
msgid ""
11173
"Write converters are only applied by commands that **create files in a\n"
11174
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11175
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11176
"respectively."
11177
msgstr ""
11178
11179
#: en/help_topics/content-filters.txt:65
11180
msgid ""
11181
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11182
"comitting files. If this makes sense for a given plugin providing\n"
11183
"a content filter, the plugin can usually achieve this effect by using a\n"
11184
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11185
"for more information on hooks."
11186
msgstr ""
11187
11188
#: en/help_topics/content-filters.txt:71
11189
msgid ""
11190
"\n"
11191
"Refreshing your working tree\n"
11192
"----------------------------"
11193
msgstr ""
11194
11195
#: en/help_topics/content-filters.txt:75
11196
msgid ""
11197
"For performance reasons, Bazaar caches the timestamps of files in\n"
11198
"a working tree, and assumes files are unchanged if their timestamps\n"
11199
"match the cached values. As a consequence, there are times when\n"
11200
"you may need to explicitly ask for content filtering to be reapplied\n"
11201
"in one or both directions, e.g. after installing or reconfiguring\n"
11202
"plugins providing it."
11203
msgstr ""
11204
11205
#: en/help_topics/content-filters.txt:82
11206
msgid "Here are some general guidelines for doing this:"
11207
msgstr ""
11208
11209
#: en/help_topics/content-filters.txt:84
11210
msgid ""
11211
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11212
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11213
" relevant read converters and compare the end result with the\n"
11214
" canonical format."
11215
msgstr ""
11216
11217
#: en/help_topics/content-filters.txt:89
11218
msgid ""
11219
" * To reapply write converters, ensure there are no local changes,\n"
11220
" delete the relevant files and run ``bzr revert`` on those files."
11221
msgstr ""
11222
11223
#: en/help_topics/content-filters.txt:92
11224
msgid ""
11225
"Note: In the future, it is likely that additional options will be added\n"
11226
"to commands to make this refreshing process faster and safer.\n"
11227
msgstr ""
11228
11229
#: en/help_topics/current-formats.txt:1
11230
msgid "Current Storage Formats"
11231
msgstr ""
11232
11233
#: en/help_topics/current-formats.txt:3
11234
msgid ""
11235
":2a:\n"
11236
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11237
" compress storage. Provides rich roots which are a one-way\n"
11238
" transition."
11239
msgstr ""
11240
11241
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11242
msgid ""
11243
"\n"
11244
"See :doc:`formats-help` for more about storage formats."
11245
msgstr ""
11246
11247
#: en/help_topics/debug-flags.txt:1
11248
msgid ""
11249
"Debug Flags\n"
11250
"==========="
11251
msgstr ""
11252
11253
#: en/help_topics/debug-flags.txt:4
11254
msgid ""
11255
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11256
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11257
msgstr ""
11258
11259
#: en/help_topics/debug-flags.txt:7
11260
msgid ""
11261
"-Dauth Trace authentication sections used.\n"
11262
"-Dbytes Print out how many bytes were transferred\n"
11263
"-Ddirstate Trace dirstate activity (verbose!)\n"
11264
"-Derror Instead of normal error handling, always print a "
11265
"traceback\n"
11266
" on error.\n"
11267
"-Devil Capture call sites that do expensive or badly-scaling\n"
11268
" operations.\n"
11269
"-Dfetch Trace history copying between repositories.\n"
11270
"-Dfilters Emit information for debugging content filtering.\n"
11271
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11272
"fetch.\n"
11273
"-Dgraph Trace graph traversal.\n"
11274
"-Dhashcache Log every time a working file is read to determine its "
11275
"hash.\n"
11276
"-Dhooks Trace hook execution.\n"
11277
"-Dhpss Trace smart protocol requests and responses.\n"
11278
"-Dhpssdetail More hpss details.\n"
11279
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11280
"-Dhttp Trace http connections, requests and responses.\n"
11281
"-Dindex Trace major index operations.\n"
11282
"-Dknit Trace knit operations.\n"
11283
"-Dlock Trace when lockdir locks are taken or released.\n"
11284
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11285
" retrying the request.\n"
11286
"-Dprogress Trace progress bar operations.\n"
11287
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11288
"-Dmerge Emit information for debugging merges.\n"
11289
"-Dno_apport Don't use apport to report crashes.\n"
11290
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11291
"-Dpack Emit information about pack operations.\n"
11292
"-Drelock Emit a message every time a branch or repository object "
11293
"is\n"
11294
" unlocked then relocked the same way.\n"
11295
"-Dsftp Trace SFTP internals.\n"
11296
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11297
"expected\n"
11298
"-Dstream Trace fetch streams.\n"
11299
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11300
"portable\n"
11301
" manner.\n"
11302
"-Dunlock Some errors during unlock are treated as warnings.\n"
11303
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11304
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11305
"appropriate\n"
11306
" for the format, even for non-local fetches.\n"
11307
msgstr ""
11308
11309
#: en/help_topics/diverged-branches.txt:1
11310
msgid ""
11311
"Diverged Branches\n"
11312
"================="
11313
msgstr ""
11314
11315
#: en/help_topics/diverged-branches.txt:4
11316
msgid ""
11317
"When Bazaar tries to push one branch onto another, it requires that the\n"
11318
"destination branch must be ready to receive the source branch. If this "
11319
"isn't\n"
11320
"the case, then we say that the branches have ``diverged``. Branches are\n"
11321
"considered diverged if the destination branch's most recent commit is one "
11322
"that\n"
11323
"has not been merged (directly or indirectly) by the source branch. To "
11324
"recover\n"
11325
"from diverged branches, one must merge the missing revisions into the "
11326
"source\n"
11327
"branch."
11328
msgstr ""
11329
11330
#: en/help_topics/diverged-branches.txt:12
11331
msgid ""
11332
"This situation commonly arises when using a centralized workflow with local\n"
11333
"commits. If someone else has committed new work to the mainline since your\n"
11334
"last pull and you have local commits that have not yet been pushed to the\n"
11335
"mainline, then your local branch and the mainline have diverged."
11336
msgstr ""
11337
11338
#: en/help_topics/diverged-branches.txt:17
11339
msgid ""
11340
"Discovering What Has Diverged\n"
11341
"-----------------------------"
11342
msgstr ""
11343
11344
#: en/help_topics/diverged-branches.txt:20
11345
msgid ""
11346
"The ``bzr missing`` command is used to find out what revisions are in "
11347
"another\n"
11348
"branch that are not present in the current branch, and vice-versa. It shows "
11349
"a\n"
11350
"summary of which extra revisions exist in each branch. If you want to see "
11351
"the\n"
11352
"precise effects of those revisions, you can use ``bzr diff --"
11353
"old=other_branch``\n"
11354
"to show the differences between other_branch and your current branch."
11355
msgstr ""
11356
11357
#: en/help_topics/diverged-branches.txt:26
11358
msgid ""
11359
"A Solution\n"
11360
"----------"
11361
msgstr ""
11362
11363
#: en/help_topics/diverged-branches.txt:29
11364
msgid ""
11365
"The solution is to merge the revisions from the mainline into your local\n"
11366
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11367
"mainline. This merge may result in conflicts if the other developer's "
11368
"changes\n"
11369
"overlap with your changes. These conflicts should be resolved before\n"
11370
"continuing. After any conflicts have been resolved, or even if there were "
11371
"no\n"
11372
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11373
"to your local branch. This requirement gives you an opportunity to test "
11374
"the\n"
11375
"resulting working tree for correctness, since the merged revisions could "
11376
"have\n"
11377
"made arbitrary changes. After testing, you should commit the merge using\n"
11378
"``bzr commit``. This clears up the diverged branches situation. Your "
11379
"local\n"
11380
"branch can now be pushed to the mainline.\n"
11381
msgstr ""
11382
11383
#: en/help_topics/env-variables.txt:1
11384
msgid "Environment Variables"
11385
msgstr ""
11386
11387
#: en/help_topics/env-variables.txt:3
11388
msgid ""
11389
"=================== "
11390
"===========================================================\n"
11391
"BZRPATH Path where bzr is to look for shell plugin external\n"
11392
" commands.\n"
11393
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11394
"EMAIL E-Mail address of the user.\n"
11395
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11396
"EDITOR Editor for editing commit messages.\n"
11397
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11398
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11399
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11400
"BZR_PLUGIN_PATH.\n"
11401
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11402
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11403
"and\n"
11404
" HOME.\n"
11405
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11406
"URLs).\n"
11407
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11408
"sshcorp,\n"
11409
" plink or lsh.\n"
11410
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11411
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11412
"BZR_COLUMNS Override implicit terminal width.\n"
11413
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11414
"(selftest)\n"
11415
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11416
"'text'.\n"
11417
"BZR_PDB Control whether to launch a debugger on error.\n"
11418
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11419
" breakin debugger.\n"
11420
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11421
"(instead\n"
11422
" of char-based).\n"
11423
"=================== "
11424
"===========================================================\n"
11425
msgstr ""
11426
11427
#: en/help_topics/eol.txt:1
11428
msgid ""
11429
"End of Line Conversion\n"
11430
"======================"
11431
msgstr ""
11432
11433
#: en/help_topics/eol.txt:4
11434
msgid ""
11435
"EOL conversion is provided as a content filter where Bazaar internally\n"
11436
"stores a canonical format but outputs a convenience format. See\n"
11437
"``bzr help content-filters`` for general information about using these."
11438
msgstr ""
11439
11440
#: en/help_topics/eol.txt:8
11441
msgid ""
11442
"Note: Content filtering is only supported in recently added formats,\n"
11443
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11444
"in a recent format. (Just setting the format on the repository\n"
11445
"is not enough.) If content filtering does not appear to be working, use\n"
11446
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11447
"or later."
11448
msgstr ""
11449
11450
#: en/help_topics/eol.txt:15
11451
msgid ""
11452
"EOL conversion needs to be enabled for selected file patterns using\n"
11453
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11454
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11455
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11456
"supported in a future verison of Bazaar."
11457
msgstr ""
11458
11459
#: en/help_topics/eol.txt:21
11460
msgid ""
11461
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11462
"(If a value is not set, ``exact`` is the default.)"
11463
msgstr ""
11464
11465
#: en/help_topics/eol.txt:24
11466
msgid ""
11467
" ========== ===================================== ======================\n"
11468
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11469
" ========== ===================================== ======================\n"
11470
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11471
" ---------- ------------------------------------- ----------------------\n"
11472
" ``lf`` ``lf`` ``lf``\n"
11473
" ---------- ------------------------------------- ----------------------\n"
11474
" ``crlf`` ``crlf`` ``lf``\n"
11475
" ---------- ------------------------------------- ----------------------\n"
11476
" ``exact`` No conversion Exactly as in file\n"
11477
" ========== ===================================== ======================"
11478
msgstr ""
11479
11480
#: en/help_topics/eol.txt:36
11481
msgid ""
11482
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11483
"byte is detected in the file."
11484
msgstr ""
11485
11486
#: en/help_topics/eol.txt:39
11487
msgid ""
11488
"For users working on a cross-platform project, here is a suggested rule\n"
11489
"to use as a starting point::"
11490
msgstr ""
11491
11492
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11493
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11494
msgid ""
11495
" [name *]\n"
11496
" eol = native"
11497
msgstr ""
11498
11499
#: en/help_topics/eol.txt:45
11500
msgid ""
11501
"If you have binary files that do not contain a null byte though, be\n"
11502
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11503
"by giving more explicit patterns earlier in the rules file. For example::"
11504
msgstr ""
11505
11506
#: en/help_topics/eol.txt:49
11507
msgid ""
11508
" [name *.png]\n"
11509
" eol = exact"
11510
msgstr ""
11511
11512
#: en/help_topics/eol.txt:55
11513
msgid ""
11514
"If your working tree is on a network drive shared by users on different\n"
11515
"operating systems, you typically want to force certain conventions for\n"
11516
"certain files. In that way, if a file is created with the wrong line\n"
11517
"endings or line endings get mixed during editing, it gets committed\n"
11518
"correctly and gets checked out correctly. For example::"
11519
msgstr ""
11520
11521
#: en/help_topics/eol.txt:61
11522
msgid ""
11523
" [name *.bat]\n"
11524
" eol = crlf"
11525
msgstr ""
11526
11527
#: en/help_topics/eol.txt:64
11528
msgid ""
11529
" [name *.sh]\n"
11530
" eol = lf"
11531
msgstr ""
11532
11533
#: en/help_topics/eol.txt:70
11534
msgid ""
11535
"If you take the care to create files with their required endings, you can\n"
11536
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11537
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11538
"introducing mixed line endings will be corrected during commit for files\n"
11539
"with those settings."
11540
msgstr ""
11541
11542
#: en/help_topics/eol.txt:76
11543
msgid ""
11544
"If you have sample test data that deliberately has text files with mixed\n"
11545
"newline conventions, you can ask for those to be left alone like this::"
11546
msgstr ""
11547
11548
#: en/help_topics/eol.txt:79
11549
msgid ""
11550
" [name test_data/]\n"
11551
" eol = exact"
11552
msgstr ""
11553
11554
#: en/help_topics/eol.txt:85
11555
msgid ""
11556
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11557
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11558
"of content analysis to detect binary files for commands like ``diff``.\n"
11559
"In the future, a ``binary = true`` rule may be added but it is not\n"
11560
"supported yet.)"
11561
msgstr ""
11562
11563
#: en/help_topics/eol.txt:91
11564
msgid ""
11565
"If you have an existing repository with text files already stored using\n"
11566
"Windows newline conventions (``crlf``), then you may want to keep using "
11567
"that\n"
11568
"convention in the repository. Forcing certain files to this convention\n"
11569
"may also help users who do not have rules configured. To do this, set\n"
11570
"``eol`` to one of the values below."
11571
msgstr ""
11572
11573
#: en/help_topics/eol.txt:97
11574
msgid ""
11575
" ============================ ======================== "
11576
"======================\n"
11577
" Value Checkout end-of-lines as Commit end-of-lines "
11578
"as\n"
11579
" ============================ ======================== "
11580
"======================\n"
11581
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11582
" ``lf`` otherwise\n"
11583
" ---------------------------- ------------------------ ----------------------"
11584
"\n"
11585
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11586
" ---------------------------- ------------------------ ----------------------"
11587
"\n"
11588
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11589
" ============================ ======================== ======================"
11590
msgstr ""
11591
11592
#: en/help_topics/eol.txt:108
11593
msgid ""
11594
"For users working on an existing project that uses Windows newline\n"
11595
"conventions in their Bazaar repository, this rule is suggested as a\n"
11596
"starting point::"
11597
msgstr ""
11598
11599
#: en/help_topics/eol.txt:112
11600
msgid ""
11601
" [name *]\n"
11602
" eol = native-with-crlf-in-repo"
11603
msgstr ""
11604
11605
#: en/help_topics/eol.txt:115
11606
msgid ""
11607
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11608
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11609
"``crlf`` and ``exact``."
11610
msgstr ""
11611
11612
#: en/help_topics/eol.txt:119
11613
msgid ""
11614
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11615
"never reject files because a given line ending or mixed line endings\n"
11616
"are found. A precommit hook should be used if you wish to validate\n"
11617
"(and not just convert) content before committing.\n"
11618
msgstr ""
11619
11620
#: en/help_topics/hidden-commands.txt:1
11621
msgid ""
11622
"added List files added in working tree.\n"
11623
"ancestry List all revisions merged into this branch.\n"
11624
"assert-fail Test reporting of assertion failures\n"
11625
"bundle-info Output interesting stats about a bundle\n"
11626
"bundle-revisions Create a merge-directive for submitting changes.\n"
11627
"cat-revision Write out metadata for a revision.\n"
11628
"dump-btree Dump the contents of a btree index file to stdout.\n"
11629
"export-pot Export command helps and error messages in po format.\n"
11630
"file-id Print file_id of a particular file or directory.\n"
11631
"file-path Print path of file_ids to a file or directory.\n"
11632
"find-merge-base Find and print a base revision for merging two "
11633
"branches.\n"
11634
"hooks Show hooks.\n"
11635
"inventory Show inventory of the current working copy or a "
11636
"revision.\n"
11637
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11638
"lookup-revision Lookup the revision-id from a revision-number\n"
11639
"merge-directive Generate a merge directive for auto-merge tools.\n"
11640
"modified List files modified in working tree.\n"
11641
"re-sign Create a digital signature for an existing revision.\n"
11642
"reference list, view and set branch locations for nested trees.\n"
11643
"relpath Show path of a file relative to root\n"
11644
"repair-workingtree Reset the working tree state file.\n"
11645
"revision-history Display the list of revision ids on a branch.\n"
11646
"revision-info Show revision number and revision id for a given "
11647
"revision\n"
11648
" identifier.\n"
11649
"rocks Statement of optimism.\n"
11650
"selftest Run internal test suite.\n"
11651
"shell-complete Show appropriate completions for context.\n"
11652
"test-script Run a shell-like test from a file.\n"
11653
"touching-revisions Return revision-ids which affected a particular file.\n"
11654
"unknowns List unknown files.\n"
11655
"wait-until-signalled Test helper for\n"
11656
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11657
msgstr ""
11658
11659
#: en/help_topics/hooks.txt:1
11660
msgid ""
11661
"\n"
11662
"Hooks\n"
11663
"====="
11664
msgstr ""
11665
11666
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11667
msgid ""
11668
"Introduction\n"
11669
"------------"
11670
msgstr ""
11671
11672
#: en/help_topics/hooks.txt:8
11673
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11674
msgstr ""
11675
11676
#: en/help_topics/hooks.txt:10
11677
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11678
msgstr ""
11679
11680
#: en/help_topics/hooks.txt:12
11681
msgid ""
11682
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11683
msgstr ""
11684
11685
#: en/help_topics/hooks.txt:14
11686
msgid ""
11687
"The class that contains each hook is given before the hooks it supplies. "
11688
"For\n"
11689
"instance, BranchHooks as the class is the hooks class for\n"
11690
"`bzrlib.branch.Branch.hooks`."
11691
msgstr ""
11692
11693
#: en/help_topics/hooks.txt:18
11694
msgid ""
11695
"Each description also indicates whether the hook runs on the client (the\n"
11696
"machine where bzr was invoked) or the server (the machine addressed by\n"
11697
"the branch URL). These may be, but are not necessarily, the same machine."
11698
msgstr ""
11699
11700
#: en/help_topics/hooks.txt:22
11701
msgid ""
11702
"Plugins (including hooks) are run on the server if all of these is true:"
11703
msgstr ""
11704
11705
#: en/help_topics/hooks.txt:24
11706
msgid ""
11707
" * The connection is via a smart server (accessed with a URL starting with\n"
11708
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11709
"\"http://\"\n"
11710
" URL when a smart server is available via HTTP)."
11711
msgstr ""
11712
11713
#: en/help_topics/hooks.txt:28
11714
msgid ""
11715
" * The hook is either server specific or part of general infrastructure "
11716
"rather\n"
11717
" than client specific code (such as commit)."
11718
msgstr ""
11719
11720
#: en/help_topics/hooks.txt:31
11721
msgid ""
11722
"\n"
11723
"BranchHooks\n"
11724
"-----------"
11725
msgstr ""
11726
11727
#: en/help_topics/hooks.txt:35
11728
msgid ""
11729
"automatic_tag_name\n"
11730
"~~~~~~~~~~~~~~~~~~"
11731
msgstr ""
11732
11733
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11734
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11735
msgid "Introduced in: 2.2"
11736
msgstr ""
11737
11738
#: en/help_topics/hooks.txt:40
11739
msgid ""
11740
"Called to determine an automatic tag name for a revision.\n"
11741
"automatic_tag_name is called with (branch, revision_id) and should\n"
11742
"return a tag name or None if no tag name could be determined. The\n"
11743
"first non-None tag name returned will be used."
11744
msgstr ""
11745
11746
#: en/help_topics/hooks.txt:45
11747
msgid ""
11748
"open\n"
11749
"~~~~"
11750
msgstr ""
11751
11752
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11753
#: en/help_topics/hooks.txt:307
11754
msgid "Introduced in: 1.8"
11755
msgstr ""
11756
11757
#: en/help_topics/hooks.txt:50
11758
msgid ""
11759
"Called with the Branch object that has been opened after a branch is\n"
11760
"opened."
11761
msgstr ""
11762
11763
#: en/help_topics/hooks.txt:53
11764
msgid ""
11765
"post_branch_init\n"
11766
"~~~~~~~~~~~~~~~~"
11767
msgstr ""
11768
11769
#: en/help_topics/hooks.txt:58
11770
msgid ""
11771
"Called after new branch initialization completes. post_branch_init is\n"
11772
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11773
"branch and checkout (both heavyweight and lightweight) will all\n"
11774
"trigger this hook."
11775
msgstr ""
11776
11777
#: en/help_topics/hooks.txt:63
11778
msgid ""
11779
"post_change_branch_tip\n"
11780
"~~~~~~~~~~~~~~~~~~~~~~"
11781
msgstr ""
11782
11783
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11784
msgid "Introduced in: 1.4"
11785
msgstr ""
11786
11787
#: en/help_topics/hooks.txt:68
11788
msgid ""
11789
"Called in bzr client and server after a change to the tip of a branch\n"
11790
"is made. post_change_branch_tip is called with a\n"
11791
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11792
"uncommit will all trigger this hook."
11793
msgstr ""
11794
11795
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11796
msgid ""
11797
"post_commit\n"
11798
"~~~~~~~~~~~"
11799
msgstr ""
11800
11801
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11802
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11803
msgid "Introduced in: 0.15"
11804
msgstr ""
11805
11806
#: en/help_topics/hooks.txt:78
11807
msgid ""
11808
"Called in the bzr client after a commit has completed. post_commit is\n"
11809
"called with (local, master, old_revno, old_revid, new_revno,\n"
11810
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11811
"branch."
11812
msgstr ""
11813
11814
#: en/help_topics/hooks.txt:83
11815
msgid ""
11816
"post_pull\n"
11817
"~~~~~~~~~"
11818
msgstr ""
11819
11820
#: en/help_topics/hooks.txt:88
11821
msgid ""
11822
"Called after a pull operation completes. post_pull is called with a\n"
11823
"bzrlib.branch.PullResult object and only runs in the bzr client."
11824
msgstr ""
11825
11826
#: en/help_topics/hooks.txt:91
11827
msgid ""
11828
"post_push\n"
11829
"~~~~~~~~~"
11830
msgstr ""
11831
11832
#: en/help_topics/hooks.txt:96
11833
msgid ""
11834
"Called after a push operation completes. post_push is called with a\n"
11835
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11836
msgstr ""
11837
11838
#: en/help_topics/hooks.txt:99
11839
msgid ""
11840
"post_switch\n"
11841
"~~~~~~~~~~~"
11842
msgstr ""
11843
11844
#: en/help_topics/hooks.txt:104
11845
msgid ""
11846
"Called after a checkout switches branch. post_switch is called with a\n"
11847
"bzrlib.branch.SwitchHookParams."
11848
msgstr ""
11849
11850
#: en/help_topics/hooks.txt:107
11851
msgid ""
11852
"post_uncommit\n"
11853
"~~~~~~~~~~~~~"
11854
msgstr ""
11855
11856
#: en/help_topics/hooks.txt:112
11857
msgid ""
11858
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11859
"called with (local, master, old_revno, old_revid, new_revno,\n"
11860
"new_revid) where local is the local branch or None, master is the\n"
11861
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11862
"of None."
11863
msgstr ""
11864
11865
#: en/help_topics/hooks.txt:118
11866
msgid ""
11867
"pre_change_branch_tip\n"
11868
"~~~~~~~~~~~~~~~~~~~~~"
11869
msgstr ""
11870
11871
#: en/help_topics/hooks.txt:121
11872
msgid "Introduced in: 1.6"
11873
msgstr ""
11874
11875
#: en/help_topics/hooks.txt:123
11876
msgid ""
11877
"Called in bzr client and server before a change to the tip of a branch\n"
11878
"is made. pre_change_branch_tip is called with a\n"
11879
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11880
"uncommit will all trigger this hook."
11881
msgstr ""
11882
11883
#: en/help_topics/hooks.txt:128
11884
msgid ""
11885
"pre_commit\n"
11886
"~~~~~~~~~~"
11887
msgstr ""
11888
11889
#: en/help_topics/hooks.txt:131
11890
msgid "Introduced in: 0.91"
11891
msgstr ""
11892
11893
#: en/help_topics/hooks.txt:133
11894
msgid ""
11895
"Called after a commit is calculated but before it is completed.\n"
11896
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11897
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11898
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11899
"TreeDelta object describing changes from the basis revision. hooks\n"
11900
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11901
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11902
"tree."
11903
msgstr ""
11904
11905
#: en/help_topics/hooks.txt:142
11906
msgid ""
11907
"transform_fallback_location\n"
11908
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11909
msgstr ""
11910
11911
#: en/help_topics/hooks.txt:145
11912
msgid "Introduced in: 1.9"
11913
msgstr ""
11914
11915
#: en/help_topics/hooks.txt:147
11916
msgid ""
11917
"Called when a stacked branch is activating its fallback locations.\n"
11918
"transform_fallback_location is called with (branch, url), and should\n"
11919
"return a new url. Returning the same url allows it to be used as-is,\n"
11920
"returning a different one can be used to cause the branch to stack on\n"
11921
"a closer copy of that fallback_location. Note that the branch cannot\n"
11922
"have history accessing methods called on it during this hook because\n"
11923
"the fallback locations have not been activated. When there are\n"
11924
"multiple hooks installed for transform_fallback_location, all are\n"
11925
"called with the url returned from the previous hook.The order is\n"
11926
"however undefined."
11927
msgstr ""
11928
11929
#: en/help_topics/hooks.txt:158
11930
msgid ""
11931
"CommandHooks\n"
11932
"------------"
11933
msgstr ""
11934
11935
#: en/help_topics/hooks.txt:161
11936
msgid ""
11937
"extend_command\n"
11938
"~~~~~~~~~~~~~~"
11939
msgstr ""
11940
11941
#: en/help_topics/hooks.txt:164
11942
msgid "Introduced in: 1.13"
11943
msgstr ""
11944
11945
#: en/help_topics/hooks.txt:166
11946
msgid ""
11947
"Called after creating a command object to allow modifications such as\n"
11948
"adding or removing options, docs etc. Called with the new\n"
11949
"bzrlib.commands.Command object."
11950
msgstr ""
11951
11952
#: en/help_topics/hooks.txt:170
11953
msgid ""
11954
"get_command\n"
11955
"~~~~~~~~~~~"
11956
msgstr ""
11957
11958
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
11959
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
11960
msgid "Introduced in: 1.17"
11961
msgstr ""
11962
11963
#: en/help_topics/hooks.txt:175
11964
msgid ""
11965
"Called when creating a single command. Called with (cmd_or_None,\n"
11966
"command_name). get_command should either return the cmd_or_None\n"
11967
"parameter, or a replacement Command object that should be used for the\n"
11968
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11969
"Many users will prefer to use bzrlib.commands.register_command or\n"
11970
"plugin_cmds.register_lazy."
11971
msgstr ""
11972
11973
#: en/help_topics/hooks.txt:182
11974
msgid ""
11975
"get_missing_command\n"
11976
"~~~~~~~~~~~~~~~~~~~"
11977
msgstr ""
11978
11979
#: en/help_topics/hooks.txt:187
11980
msgid ""
11981
"Called when creating a single command if no command could be found.\n"
11982
"Called with (command_name). get_missing_command should either return\n"
11983
"None, or a Command object to be used for the command."
11984
msgstr ""
11985
11986
#: en/help_topics/hooks.txt:191
11987
msgid ""
11988
"list_commands\n"
11989
"~~~~~~~~~~~~~"
11990
msgstr ""
11991
11992
#: en/help_topics/hooks.txt:196
11993
msgid ""
11994
"Called when enumerating commands. Called with a set of cmd_name\n"
11995
"strings for all the commands found so far. This set is safe to mutate\n"
11996
"- e.g. to remove a command. list_commands should return the updated\n"
11997
"set of command names."
11998
msgstr ""
11999
12000
#: en/help_topics/hooks.txt:201
12001
msgid ""
12002
"post_command\n"
12003
"~~~~~~~~~~~~"
12004
msgstr ""
12005
12006
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12007
msgid "Introduced in: 2.6"
12008
msgstr ""
12009
12010
#: en/help_topics/hooks.txt:206
12011
msgid "Called after executing a command. Called with the command object."
12012
msgstr ""
12013
12014
#: en/help_topics/hooks.txt:208
12015
msgid ""
12016
"pre_command\n"
12017
"~~~~~~~~~~~"
12018
msgstr ""
12019
12020
#: en/help_topics/hooks.txt:213
12021
msgid "Called prior to executing a command. Called with the command object."
12022
msgstr ""
12023
12024
#: en/help_topics/hooks.txt:215
12025
msgid ""
12026
"_ConfigHooks\n"
12027
"------------"
12028
msgstr ""
12029
12030
#: en/help_topics/hooks.txt:218
12031
msgid ""
12032
"get\n"
12033
"~~~"
12034
msgstr ""
12035
12036
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12037
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12038
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12039
#: en/help_topics/hooks.txt:446
12040
msgid "Introduced in: 2.4"
12041
msgstr ""
12042
12043
#: en/help_topics/hooks.txt:223
12044
msgid ""
12045
"Invoked when a config option is read. The signature is (stack, name,\n"
12046
"value)."
12047
msgstr ""
12048
12049
#: en/help_topics/hooks.txt:226
12050
msgid ""
12051
"load\n"
12052
"~~~~"
12053
msgstr ""
12054
12055
#: en/help_topics/hooks.txt:231
12056
msgid "Invoked when a config store is loaded. The signature is (store)."
12057
msgstr ""
12058
12059
#: en/help_topics/hooks.txt:233
12060
msgid ""
12061
"remove\n"
12062
"~~~~~~"
12063
msgstr ""
12064
12065
#: en/help_topics/hooks.txt:238
12066
msgid ""
12067
"Invoked when a config option is removed. The signature is (stack,\n"
12068
"name)."
12069
msgstr ""
12070
12071
#: en/help_topics/hooks.txt:241
12072
msgid ""
12073
"save\n"
12074
"~~~~"
12075
msgstr ""
12076
12077
#: en/help_topics/hooks.txt:246
12078
msgid "Invoked when a config store is saved. The signature is (store)."
12079
msgstr ""
12080
12081
#: en/help_topics/hooks.txt:248
12082
msgid ""
12083
"set\n"
12084
"~~~"
12085
msgstr ""
12086
12087
#: en/help_topics/hooks.txt:253
12088
msgid ""
12089
"Invoked when a config option is set. The signature is (stack, name,\n"
12090
"value)."
12091
msgstr ""
12092
12093
#: en/help_topics/hooks.txt:256
12094
msgid ""
12095
"ControlDirHooks\n"
12096
"---------------"
12097
msgstr ""
12098
12099
#: en/help_topics/hooks.txt:259
12100
msgid ""
12101
"post_repo_init\n"
12102
"~~~~~~~~~~~~~~"
12103
msgstr ""
12104
12105
#: en/help_topics/hooks.txt:264
12106
msgid ""
12107
"Invoked after a repository has been initialized. post_repo_init is\n"
12108
"called with a bzrlib.controldir.RepoInitHookParams."
12109
msgstr ""
12110
12111
#: en/help_topics/hooks.txt:267
12112
msgid ""
12113
"pre_open\n"
12114
"~~~~~~~~"
12115
msgstr ""
12116
12117
#: en/help_topics/hooks.txt:270
12118
msgid "Introduced in: 1.14"
12119
msgstr ""
12120
12121
#: en/help_topics/hooks.txt:272
12122
msgid ""
12123
"Invoked before attempting to open a ControlDir with the transport that\n"
12124
"the open will use."
12125
msgstr ""
12126
12127
#: en/help_topics/hooks.txt:275
12128
msgid ""
12129
"InfoHooks\n"
12130
"---------"
12131
msgstr ""
12132
12133
#: en/help_topics/hooks.txt:278
12134
msgid ""
12135
"repository\n"
12136
"~~~~~~~~~~"
12137
msgstr ""
12138
12139
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12140
#: en/help_topics/hooks.txt:524
12141
msgid "Introduced in: 1.15"
12142
msgstr ""
12143
12144
#: en/help_topics/hooks.txt:283
12145
msgid ""
12146
"Invoked when displaying the statistics for a repository. repository is\n"
12147
"called with a statistics dictionary as returned by the repository and\n"
12148
"a file-like object to write to."
12149
msgstr ""
12150
12151
#: en/help_topics/hooks.txt:287
12152
msgid ""
12153
"LockHooks\n"
12154
"---------"
12155
msgstr ""
12156
12157
#: en/help_topics/hooks.txt:290
12158
msgid ""
12159
"lock_acquired\n"
12160
"~~~~~~~~~~~~~"
12161
msgstr ""
12162
12163
#: en/help_topics/hooks.txt:295
12164
msgid ""
12165
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12166
msgstr ""
12167
12168
#: en/help_topics/hooks.txt:297
12169
msgid ""
12170
"lock_broken\n"
12171
"~~~~~~~~~~~"
12172
msgstr ""
12173
12174
#: en/help_topics/hooks.txt:302
12175
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12176
msgstr ""
12177
12178
#: en/help_topics/hooks.txt:304
12179
msgid ""
12180
"lock_released\n"
12181
"~~~~~~~~~~~~~"
12182
msgstr ""
12183
12184
#: en/help_topics/hooks.txt:309
12185
msgid ""
12186
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12187
msgstr ""
12188
12189
#: en/help_topics/hooks.txt:311
12190
msgid ""
12191
"MergeHooks\n"
12192
"----------"
12193
msgstr ""
12194
12195
#: en/help_topics/hooks.txt:314
12196
msgid ""
12197
"merge_file_content\n"
12198
"~~~~~~~~~~~~~~~~~~"
12199
msgstr ""
12200
12201
#: en/help_topics/hooks.txt:317
12202
msgid "Introduced in: 2.1"
12203
msgstr ""
12204
12205
#: en/help_topics/hooks.txt:319
12206
msgid ""
12207
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12208
"object when starting a merge. Should return either None or a subclass\n"
12209
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12210
"called per file that needs to be merged (including when one side has\n"
12211
"deleted the file and the other has changed it). See the\n"
12212
"AbstractPerFileMerger API docs for details on how it is used by merge."
12213
msgstr ""
12214
12215
#: en/help_topics/hooks.txt:326
12216
msgid ""
12217
"post_merge\n"
12218
"~~~~~~~~~~"
12219
msgstr ""
12220
12221
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12222
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12223
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12224
msgid "Introduced in: 2.5"
12225
msgstr ""
12226
12227
#: en/help_topics/hooks.txt:331
12228
msgid ""
12229
"Called after a merge. Receives a Merger object as the single argument.\n"
12230
"The return value is ignored."
12231
msgstr ""
12232
12233
#: en/help_topics/hooks.txt:334
12234
msgid ""
12235
"pre_merge\n"
12236
"~~~~~~~~~"
12237
msgstr ""
12238
12239
#: en/help_topics/hooks.txt:339
12240
msgid ""
12241
"Called before a merge. Receives a Merger object as the single\n"
12242
"argument."
12243
msgstr ""
12244
12245
#: en/help_topics/hooks.txt:342
12246
msgid ""
12247
"MergeDirectiveHooks\n"
12248
"-------------------"
12249
msgstr ""
12250
12251
#: en/help_topics/hooks.txt:345
12252
msgid ""
12253
"merge_request_body\n"
12254
"~~~~~~~~~~~~~~~~~~"
12255
msgstr ""
12256
12257
#: en/help_topics/hooks.txt:348
12258
msgid "Introduced in: 1.15.0"
12259
msgstr ""
12260
12261
#: en/help_topics/hooks.txt:350
12262
msgid ""
12263
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12264
"request. Callbacks must return a body. If more than one callback is\n"
12265
"registered, the output of one callback is provided to the next."
12266
msgstr ""
12267
12268
#: en/help_topics/hooks.txt:354
12269
msgid ""
12270
"MessageEditorHooks\n"
12271
"------------------"
12272
msgstr ""
12273
12274
#: en/help_topics/hooks.txt:357
12275
msgid ""
12276
"commit_message_template\n"
12277
"~~~~~~~~~~~~~~~~~~~~~~~"
12278
msgstr ""
12279
12280
#: en/help_topics/hooks.txt:360
12281
msgid "Introduced in: 1.10"
12282
msgstr ""
12283
12284
#: en/help_topics/hooks.txt:362
12285
msgid ""
12286
"Called when a commit message is being generated.\n"
12287
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12288
"and the message that is known so far. commit_message_template must\n"
12289
"return a new message to use (which could be the same as it was given).\n"
12290
"When there are multiple hooks registered for commit_message_template,\n"
12291
"they are chained with the result from the first passed into the\n"
12292
"second, and so on."
12293
msgstr ""
12294
12295
#: en/help_topics/hooks.txt:370
12296
msgid ""
12297
"set_commit_message\n"
12298
"~~~~~~~~~~~~~~~~~~"
12299
msgstr ""
12300
12301
#: en/help_topics/hooks.txt:375
12302
msgid ""
12303
"Set a fixed commit message. set_commit_message is called with the\n"
12304
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12305
"properties by editing commit.builder._revprops) and the message so\n"
12306
"far. set_commit_message must return the message to use or None if it\n"
12307
"should use the message editor as normal."
12308
msgstr ""
12309
12310
#: en/help_topics/hooks.txt:381
12311
msgid ""
12312
"MutableTreeHooks\n"
12313
"----------------"
12314
msgstr ""
12315
12316
#: en/help_topics/hooks.txt:384
12317
msgid ""
12318
"post_build_tree\n"
12319
"~~~~~~~~~~~~~~~"
12320
msgstr ""
12321
12322
#: en/help_topics/hooks.txt:389
12323
msgid ""
12324
"Called after a completely new tree is built. The hook is called with\n"
12325
"the tree as its only argument."
12326
msgstr ""
12327
12328
#: en/help_topics/hooks.txt:395
12329
msgid "Introduced in: 2.0"
12330
msgstr ""
12331
12332
#: en/help_topics/hooks.txt:397
12333
msgid ""
12334
"Called after a commit is performed on a tree. The hook is called with\n"
12335
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12336
"commit was performed on is available via the mutable_tree attribute of\n"
12337
"that object."
12338
msgstr ""
12339
12340
#: en/help_topics/hooks.txt:402
12341
msgid ""
12342
"post_transform\n"
12343
"~~~~~~~~~~~~~~"
12344
msgstr ""
12345
12346
#: en/help_topics/hooks.txt:407
12347
msgid ""
12348
"Called after a tree transform has been performed on a tree. The hook\n"
12349
"is called with the tree that is being transformed and the transform."
12350
msgstr ""
12351
12352
#: en/help_topics/hooks.txt:410
12353
msgid ""
12354
"pre_transform\n"
12355
"~~~~~~~~~~~~~"
12356
msgstr ""
12357
12358
#: en/help_topics/hooks.txt:415
12359
msgid ""
12360
"Called before a tree transform on this tree. The hook is called with\n"
12361
"the tree that is being transformed and the transform."
12362
msgstr ""
12363
12364
#: en/help_topics/hooks.txt:418
12365
msgid ""
12366
"start_commit\n"
12367
"~~~~~~~~~~~~"
12368
msgstr ""
12369
12370
#: en/help_topics/hooks.txt:423
12371
msgid ""
12372
"Called before a commit is performed on a tree. The start commit hook\n"
12373
"is able to change the tree before the commit takes place. start_commit\n"
12374
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12375
"being performed on."
12376
msgstr ""
12377
12378
#: en/help_topics/hooks.txt:428
12379
msgid ""
12380
"SmartClientHooks\n"
12381
"----------------"
12382
msgstr ""
12383
12384
#: en/help_topics/hooks.txt:431
12385
msgid ""
12386
"call\n"
12387
"~~~~"
12388
msgstr ""
12389
12390
#: en/help_topics/hooks.txt:434
12391
msgid "Introduced in: unknown"
12392
msgstr ""
12393
12394
#: en/help_topics/hooks.txt:436
12395
msgid ""
12396
"Called when the smart client is submitting a request to the smart\n"
12397
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12398
"Streaming request bodies, and responses, are not accessible."
12399
msgstr ""
12400
12401
#: en/help_topics/hooks.txt:440
12402
msgid ""
12403
"SmartServerHooks\n"
12404
"----------------"
12405
msgstr ""
12406
12407
#: en/help_topics/hooks.txt:443
12408
msgid ""
12409
"server_exception\n"
12410
"~~~~~~~~~~~~~~~~"
12411
msgstr ""
12412
12413
#: en/help_topics/hooks.txt:448
12414
msgid ""
12415
"Called by the bzr server when an exception occurs. server_exception is\n"
12416
"called with the sys.exc_info() tuple return true for the hook if the\n"
12417
"exception has been handled, in which case the server will exit\n"
12418
"normally."
12419
msgstr ""
12420
12421
#: en/help_topics/hooks.txt:453
12422
msgid ""
12423
"server_started\n"
12424
"~~~~~~~~~~~~~~"
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12428
msgid "Introduced in: 0.16"
12429
msgstr ""
12430
12431
#: en/help_topics/hooks.txt:458
12432
msgid ""
12433
"Called by the bzr server when it starts serving a directory.\n"
12434
"server_started is called with (backing urls, public url), where\n"
12435
"backing_url is a list of URLs giving the server-specific directory\n"
12436
"locations, and public_url is the public URL for the directory being\n"
12437
"served."
12438
msgstr ""
12439
12440
#: en/help_topics/hooks.txt:464
12441
msgid ""
12442
"server_started_ex\n"
12443
"~~~~~~~~~~~~~~~~~"
12444
msgstr ""
12445
12446
#: en/help_topics/hooks.txt:469
12447
msgid ""
12448
"Called by the bzr server when it starts serving a directory.\n"
12449
"server_started is called with (backing_urls, server_obj)."
12450
msgstr ""
12451
12452
#: en/help_topics/hooks.txt:472
12453
msgid ""
12454
"server_stopped\n"
12455
"~~~~~~~~~~~~~~"
12456
msgstr ""
12457
12458
#: en/help_topics/hooks.txt:477
12459
msgid ""
12460
"Called by the bzr server when it stops serving a directory.\n"
12461
"server_stopped is called with the same parameters as the\n"
12462
"server_started hook: (backing_urls, public_url)."
12463
msgstr ""
12464
12465
#: en/help_topics/hooks.txt:481
12466
msgid ""
12467
"StatusHooks\n"
12468
"-----------"
12469
msgstr ""
12470
12471
#: en/help_topics/hooks.txt:484
12472
msgid ""
12473
"post_status\n"
12474
"~~~~~~~~~~~"
12475
msgstr ""
12476
12477
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12478
msgid "Introduced in: 2.3"
12479
msgstr ""
12480
12481
#: en/help_topics/hooks.txt:489
12482
msgid ""
12483
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12484
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12485
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12486
"correspond to the command line options specified by the user for the\n"
12487
"status command. to_file is the output stream for writing."
12488
msgstr ""
12489
12490
#: en/help_topics/hooks.txt:495
12491
msgid ""
12492
"pre_status\n"
12493
"~~~~~~~~~~"
12494
msgstr ""
12495
12496
#: en/help_topics/hooks.txt:500
12497
msgid ""
12498
"Called with argument StatusHookParams before Bazaar displays the\n"
12499
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12500
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12501
"correspond to the command line options specified by the user for the\n"
12502
"status command. to_file is the output stream for writing."
12503
msgstr ""
12504
12505
#: en/help_topics/hooks.txt:506
12506
msgid ""
12507
"TransportHooks\n"
12508
"--------------"
12509
msgstr ""
12510
12511
#: en/help_topics/hooks.txt:509
12512
msgid ""
12513
"post_connect\n"
12514
"~~~~~~~~~~~~"
12515
msgstr ""
12516
12517
#: en/help_topics/hooks.txt:514
12518
msgid ""
12519
"Called after a new connection is established or a reconnect occurs.\n"
12520
"The sole argument passed is either the connected transport or smart\n"
12521
"medium instance."
12522
msgstr ""
12523
12524
#: en/help_topics/hooks.txt:518
12525
msgid ""
12526
"RioVersionInfoBuilderHooks\n"
12527
"--------------------------"
12528
msgstr ""
12529
12530
#: en/help_topics/hooks.txt:521
12531
msgid ""
12532
"revision\n"
12533
"~~~~~~~~"
12534
msgstr ""
12535
12536
#: en/help_topics/hooks.txt:526
12537
msgid ""
12538
"Invoked when adding information about a revision to the RIO stanza\n"
12539
"that is printed. revision is called with a revision object and a RIO\n"
12540
"stanza.\n"
12541
msgstr ""
12542
12543
#: en/help_topics/location-alias.txt:1
12544
msgid ""
12545
"Location aliases\n"
12546
"================"
12547
msgstr ""
12548
12549
#: en/help_topics/location-alias.txt:4
12550
msgid ""
12551
"Bazaar defines several aliases for locations associated with a branch. "
12552
"These\n"
12553
"can be used with most commands that expect a location, such as `bzr push`."
12554
msgstr ""
12555
12556
#: en/help_topics/location-alias.txt:7
12557
msgid "The aliases are::"
12558
msgstr ""
12559
12560
#: en/help_topics/location-alias.txt:9
12561
msgid ""
12562
" :bound The branch this branch is bound to, for bound branches.\n"
12563
" :parent The parent of this branch.\n"
12564
" :public The public location of this branch.\n"
12565
" :push The saved location used for `bzr push` with no arguments.\n"
12566
" :submit The submit branch for this branch.\n"
12567
" :this This branch."
12568
msgstr ""
12569
12570
#: en/help_topics/location-alias.txt:16
12571
msgid "For example, to push to the parent location::"
12572
msgstr ""
12573
12574
#: en/help_topics/location-alias.txt:18
12575
msgid " bzr push :parent\n"
12576
msgstr ""
12577
12578
#: en/help_topics/log-formats.txt:1
12579
msgid ""
12580
"Log Formats\n"
12581
"==========="
12582
msgstr ""
12583
12584
#: en/help_topics/log-formats.txt:4
12585
msgid ""
12586
"A log format controls how information about each revision is displayed.\n"
12587
"The standard log formats are compared below::"
12588
msgstr ""
12589
12590
#: en/help_topics/log-formats.txt:7
12591
msgid ""
12592
" Feature long short line\n"
12593
" ---------------------- ------------- ------------ -------------------\n"
12594
" design goal detailed view concise view 1 revision per line\n"
12595
" committer name+email name only name only\n"
12596
" author name+email - -\n"
12597
" date-time format full date only date only\n"
12598
" commit message full full top line\n"
12599
" tags yes yes yes\n"
12600
" merges indicator - yes -\n"
12601
" status/delta optional optional -\n"
12602
" diff/patch optional optional -\n"
12603
" revision-id optional optional -\n"
12604
" branch nick yes - -\n"
12605
" foreign vcs properties yes yes -\n"
12606
" preferred levels all 1 1\n"
12607
" digital signature optional - -"
12608
msgstr ""
12609
12610
#: en/help_topics/log-formats.txt:24
12611
msgid ""
12612
"The default format is ``long``. To change this, define the ``log_format``\n"
12613
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12614
msgstr ""
12615
12616
#: en/help_topics/log-formats.txt:27
12617
msgid ""
12618
" [DEFAULT]\n"
12619
" log_format = short"
12620
msgstr ""
12621
12622
#: en/help_topics/log-formats.txt:30
12623
msgid ""
12624
"Alternatively, to change the log format used for a given query, use the\n"
12625
"--long, --short or --line options."
12626
msgstr ""
12627
12628
#: en/help_topics/log-formats.txt:33
12629
msgid ""
12630
"If one of the standard log formats does not meet your needs, additional\n"
12631
"formats can be provided by plugins.\n"
12632
msgstr ""
12633
12634
#: en/help_topics/other-formats.txt:1
12635
msgid "Other Storage Formats"
12636
msgstr ""
12637
12638
#: en/help_topics/other-formats.txt:3
12639
msgid "Experimental formats are shown below."
12640
msgstr ""
12641
12642
#: en/help_topics/other-formats.txt:5
12643
msgid ""
12644
":development-colo:\n"
12645
" (native) The 2a format with experimental support for colocated\n"
12646
" branches."
12647
msgstr ""
12648
12649
#: en/help_topics/other-formats.txt:9
12650
msgid ""
12651
"\n"
12652
"Deprecated formats are shown below."
12653
msgstr ""
12654
12655
#: en/help_topics/other-formats.txt:12
12656
msgid ""
12657
":pack-0.92:\n"
12658
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12659
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12660
" by bzr < 0.92."
12661
msgstr ""
12662
12663
#: en/help_topics/patterns.txt:1
12664
msgid ""
12665
"Patterns\n"
12666
"========"
12667
msgstr ""
12668
12669
#: en/help_topics/patterns.txt:4
12670
msgid ""
12671
"Bazaar uses patterns to match files at various times. For example,\n"
12672
"the ``add`` command skips over files that match ignore patterns\n"
12673
"and preferences can be associated with files using rule patterns.\n"
12674
"The pattern syntax is described below."
12675
msgstr ""
12676
12677
#: en/help_topics/patterns.txt:9
12678
msgid ""
12679
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12680
"slash or is a regular expression, it is compared to the whole path\n"
12681
"from the branch root. Otherwise, it is compared to only the last\n"
12682
"component of the path. To match a file only in the root directory,\n"
12683
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12684
msgstr ""
12685
12686
#: en/help_topics/patterns.txt:15
12687
msgid "Patterns may include globbing wildcards such as::"
12688
msgstr ""
12689
12690
#: en/help_topics/patterns.txt:17
12691
msgid ""
12692
" ? - Matches any single character except '/'\n"
12693
" * - Matches 0 or more characters except '/'\n"
12694
" /**/ - Matches 0 or more directories in a path\n"
12695
" [a-z] - Matches a single character from within a group of characters"
12696
msgstr ""
12697
12698
#: en/help_topics/patterns.txt:22
12699
msgid ""
12700
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12701
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12702
"expression. Regular expression patterns may not include named or\n"
12703
"numbered groups."
12704
msgstr ""
12705
12706
#: en/help_topics/patterns.txt:27
12707
msgid ""
12708
"Case insensitive ignore patterns can be specified with regular expressions\n"
12709
"by using the ``i`` (for ignore case) flag in the pattern."
12710
msgstr ""
12711
12712
#: en/help_topics/patterns.txt:30
12713
msgid ""
12714
"For example, a case insensitive match for ``foo`` may be specified as::"
12715
msgstr ""
12716
12717
#: en/help_topics/patterns.txt:32
12718
msgid " RE:(?i)foo"
12719
msgstr ""
12720
12721
#: en/help_topics/patterns.txt:34
12722
msgid ""
12723
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12724
"matched by that pattern will not be ignored."
12725
msgstr ""
12726
12727
#: en/help_topics/patterns.txt:37
12728
msgid ""
12729
".. _Python regular expressions: http://docs.python.org/library/re.html"
12730
msgstr ""
12731
12732
#: en/help_topics/revisionspec.txt:1
12733
msgid "Revision Identifiers"
12734
msgstr ""
12735
12736
#: en/help_topics/revisionspec.txt:3
12737
msgid ""
12738
"A revision identifier refers to a specific state of a branch's history. It\n"
12739
"can be expressed in several ways. It can begin with a keyword to\n"
12740
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12741
"'before:yesterday' and 'submit:'."
12742
msgstr ""
12743
12744
#: en/help_topics/revisionspec.txt:8
12745
msgid ""
12746
"Alternately, it can be given without a keyword, in which case it will be\n"
12747
"checked as a revision number, a tag, a revision id, a date specification, or "
12748
"a\n"
12749
"branch specification, in that order. For example, 'date:today' could be\n"
12750
"written as simply 'today', though if you have a tag called 'today' that "
12751
"will\n"
12752
"be found first."
12753
msgstr ""
12754
12755
#: en/help_topics/revisionspec.txt:14
12756
msgid ""
12757
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12758
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12759
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12760
"or\n"
12761
"spaces around the '..')."
12762
msgstr ""
12763
12764
#: en/help_topics/revisionspec.txt:19
12765
msgid ""
12766
"Ranges are interpreted differently by different commands. To the \"log\" "
12767
"command,\n"
12768
"a range is a sequence of log messages, but to the \"diff\" command, the "
12769
"range\n"
12770
"denotes a change between revisions (and not a sequence of changes). In\n"
12771
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12772
"consider it\n"
12773
"to be open-ended, that is, they include one end but not the other. For "
12774
"example:\n"
12775
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12776
"3649,\n"
12777
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12778
"and\n"
12779
"3649, but not 3647."
12780
msgstr ""
12781
12782
#: en/help_topics/revisionspec.txt:28
12783
msgid "The keywords used as revision selection methods are the following:"
12784
msgstr ""
12785
12786
#: en/help_topics/revisionspec.txt:30
12787
msgid ""
12788
":revid:\n"
12789
"\tSelects a revision using the revision id.\n"
12790
":submit:\n"
12791
"\tSelects a common ancestor with the submit branch.\n"
12792
":ancestor:\n"
12793
"\tSelects a common ancestor with a second branch.\n"
12794
":date:\n"
12795
"\tSelects a revision on the basis of a datestamp.\n"
12796
":branch:\n"
12797
"\tSelects the last revision of a specified branch.\n"
12798
":tag:\n"
12799
"\tSelects a revision identified by a tag name.\n"
12800
":revno:\n"
12801
"\tSelects a revision using a number.\n"
12802
":before:\n"
12803
"\tSelects the parent of the revision specified.\n"
12804
":annotate:\n"
12805
"\tSelect the revision that last modified the specified line.\n"
12806
":mainline:\n"
12807
"\tSelect mainline revision that merged the specified revision.\n"
12808
":last:\n"
12809
"\tSelects the nth revision from the end."
12810
msgstr ""
12811
12812
#: en/help_topics/revisionspec.txt:53
12813
msgid "In addition, plugins can provide other keywords."
12814
msgstr ""
12815
12816
#: en/help_topics/revisionspec.txt:55
12817
msgid "A detailed description of each keyword is given below."
12818
msgstr ""
12819
12820
#: en/help_topics/revisionspec.txt:57
12821
msgid ":revid:"
12822
msgstr ""
12823
12824
#: en/help_topics/revisionspec.txt:59
12825
msgid ""
12826
" Supply a specific revision id, that can be used to specify any\n"
12827
" revision id in the ancestry of the branch.\n"
12828
" Including merges, and pending merges.\n"
12829
" Examples::"
12830
msgstr ""
12831
12832
#: en/help_topics/revisionspec.txt:64
12833
msgid ""
12834
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12835
msgstr ""
12836
12837
#: en/help_topics/revisionspec.txt:66
12838
msgid ":submit:"
12839
msgstr ""
12840
12841
#: en/help_topics/revisionspec.txt:68
12842
msgid ""
12843
" Diffing against this shows all the changes that were made in this "
12844
"branch,\n"
12845
" and is a good predictor of what merge will do. The submit branch is\n"
12846
" used by the bundle and merge directive commands. If no submit branch\n"
12847
" is specified, the parent branch is used instead."
12848
msgstr ""
12849
12850
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12851
msgid ""
12852
" The common ancestor is the last revision that existed in both\n"
12853
" branches. Usually this is the branch point, but it could also be\n"
12854
" a revision that was merged."
12855
msgstr ""
12856
12857
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12858
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12859
#: en/help_topics/revisionspec.txt:153
12860
msgid " Examples::"
12861
msgstr ""
12862
12863
#: en/help_topics/revisionspec.txt:79
12864
msgid " $ bzr diff -r submit:"
12865
msgstr ""
12866
12867
#: en/help_topics/revisionspec.txt:81
12868
msgid ":ancestor:"
12869
msgstr ""
12870
12871
#: en/help_topics/revisionspec.txt:83
12872
msgid " Supply the path to a branch to select the common ancestor."
12873
msgstr ""
12874
12875
#: en/help_topics/revisionspec.txt:89
12876
msgid ""
12877
" This is frequently used with 'diff' to return all of the changes\n"
12878
" that your branch introduces, while excluding the changes that you\n"
12879
" have not merged from the remote branch."
12880
msgstr ""
12881
12882
#: en/help_topics/revisionspec.txt:95
12883
msgid ""
12884
" ancestor:/path/to/branch\n"
12885
" $ bzr diff -r ancestor:../../mainline/branch"
12886
msgstr ""
12887
12888
#: en/help_topics/revisionspec.txt:98
12889
msgid ":date:"
12890
msgstr ""
12891
12892
#: en/help_topics/revisionspec.txt:100
12893
msgid ""
12894
" Supply a datestamp to select the first revision that matches the date.\n"
12895
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12896
" Matches the first entry after a given date (either at midnight or\n"
12897
" at a specified time)."
12898
msgstr ""
12899
12900
#: en/help_topics/revisionspec.txt:105
12901
msgid " One way to display all the changes since yesterday would be::"
12902
msgstr ""
12903
12904
#: en/help_topics/revisionspec.txt:107
12905
msgid " bzr log -r date:yesterday.."
12906
msgstr ""
12907
12908
#: en/help_topics/revisionspec.txt:111
12909
msgid ""
12910
" date:yesterday -> select the first revision since "
12911
"yesterday\n"
12912
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12913
" August 14th, 2006 at 5:10pm."
12914
msgstr ""
12915
12916
#: en/help_topics/revisionspec.txt:115
12917
msgid ":branch:"
12918
msgstr ""
12919
12920
#: en/help_topics/revisionspec.txt:117
12921
msgid " Supply the path to a branch to select its last revision."
12922
msgstr ""
12923
12924
#: en/help_topics/revisionspec.txt:121
12925
msgid " branch:/path/to/branch"
12926
msgstr ""
12927
12928
#: en/help_topics/revisionspec.txt:123
12929
msgid ":tag:"
12930
msgstr ""
12931
12932
#: en/help_topics/revisionspec.txt:125
12933
msgid " Tags are stored in the branch and created by the 'tag' command."
12934
msgstr ""
12935
12936
#: en/help_topics/revisionspec.txt:127
12937
msgid ":revno:"
12938
msgstr ""
12939
12940
#: en/help_topics/revisionspec.txt:129
12941
msgid ""
12942
" Use an integer to specify a revision in the history of the branch.\n"
12943
" Optionally a branch can be specified. A negative number will count\n"
12944
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12945
" one). If the negative number is larger than the branch's history, the\n"
12946
" first revision is returned.\n"
12947
" Examples::"
12948
msgstr ""
12949
12950
#: en/help_topics/revisionspec.txt:136
12951
msgid ""
12952
" revno:1 -> return the first revision of this branch\n"
12953
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12954
" the branch '/path/to/branch'\n"
12955
" revno:-1 -> The last revision in a branch.\n"
12956
" -2:http://other/branch -> The second to last revision in the\n"
12957
" remote branch.\n"
12958
" -1000000 -> Most likely the first revision, unless\n"
12959
" your history is very long."
12960
msgstr ""
12961
12962
#: en/help_topics/revisionspec.txt:145
12963
msgid ":before:"
12964
msgstr ""
12965
12966
#: en/help_topics/revisionspec.txt:147
12967
msgid ""
12968
" Supply any revision spec to return the parent of that revision. This "
12969
"is\n"
12970
" mostly useful when inspecting revisions that are not in the revision "
12971
"history\n"
12972
" of a branch."
12973
msgstr ""
12974
12975
#: en/help_topics/revisionspec.txt:151
12976
msgid ""
12977
" It is an error to request the parent of the null revision (before:0)."
12978
msgstr ""
12979
12980
#: en/help_topics/revisionspec.txt:155
12981
msgid ""
12982
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12983
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12984
" aaaa@bbbb-1234567890\n"
12985
" bzr diff -r before:1913..1913\n"
12986
" -> Find the changes between revision 1913 and its parent "
12987
"(1912).\n"
12988
" (What changes did revision 1913 introduce).\n"
12989
" This is equivalent to: bzr diff -c 1913"
12990
msgstr ""
12991
12992
#: en/help_topics/revisionspec.txt:163
12993
msgid ":annotate:"
12994
msgstr ""
12995
12996
#: en/help_topics/revisionspec.txt:165
12997
msgid ""
12998
" Select the revision that last modified the specified line. Line is\n"
12999
" specified as path:number. Path is a relative path to the file. "
13000
"Numbers\n"
13001
" start at 1, and are relative to the current version, not the last-\n"
13002
" committed version of the file."
13003
msgstr ""
13004
13005
#: en/help_topics/revisionspec.txt:170
13006
msgid ":mainline:"
13007
msgstr ""
13008
13009
#: en/help_topics/revisionspec.txt:172
13010
msgid ""
13011
" Select the revision that merged the specified revision into mainline."
13012
msgstr ""
13013
13014
#: en/help_topics/revisionspec.txt:174
13015
msgid ":last:"
13016
msgstr ""
13017
13018
#: en/help_topics/revisionspec.txt:176
13019
msgid ""
13020
" Supply a positive number to get the nth revision from the end.\n"
13021
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13022
" Examples::"
13023
msgstr ""
13024
13025
#: en/help_topics/revisionspec.txt:180
13026
msgid ""
13027
" last:1 -> return the last revision\n"
13028
" last:3 -> return the revision 2 before the end.\n"
13029
msgstr ""
13030
13031
#: en/help_topics/rules.txt:1
13032
msgid ""
13033
"Rules\n"
13034
"====="
13035
msgstr ""
13036
13037
#: en/help_topics/rules.txt:7
13038
msgid ""
13039
"Rules are defined in ini file format where the sections are file glob\n"
13040
"patterns and the contents of each section are the preferences for files\n"
13041
"matching that pattern(s). For example::"
13042
msgstr ""
13043
13044
#: en/help_topics/rules.txt:11
13045
msgid ""
13046
" [name *.bat]\n"
13047
" eol = native"
13048
msgstr ""
13049
13050
#: en/help_topics/rules.txt:14
13051
msgid ""
13052
" [name *.html *.xml]\n"
13053
" keywords = xml_escape"
13054
msgstr ""
13055
13056
#: en/help_topics/rules.txt:17
13057
msgid ""
13058
"Preferences like these are useful for commands and plugins wishing to\n"
13059
"provide custom behaviour for selected files. For more information on \n"
13060
"end of line conversion see :doc:`eol-help`.\n"
13061
"Keyword support is provided by the `keywords plugin\n"
13062
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13063
msgstr ""
13064
13065
#: en/help_topics/rules.txt:23
13066
msgid ""
13067
"Files\n"
13068
"-----"
13069
msgstr ""
13070
13071
#: en/help_topics/rules.txt:26
13072
msgid ""
13073
"Default rules for all branches are defined in the optional file\n"
13074
"``BZR_HOME/rules``. "
13075
msgstr ""
13076
13077
#: en/help_topics/rules.txt:29
13078
msgid ""
13079
"Rule Patterns\n"
13080
"-------------"
13081
msgstr ""
13082
13083
#: en/help_topics/rules.txt:32
13084
msgid ""
13085
"Patterns are ordered and searching stops as soon as one matches.\n"
13086
"As a consequence, more explicit patterns should be placed towards\n"
13087
"the top of the file. Rule patterns use exactly the same conventions\n"
13088
"as ignore patterns. See :doc:`patterns-help` for details."
13089
msgstr ""
13090
13091
#: en/help_topics/rules.txt:37
13092
msgid ".. note::"
13093
msgstr ""
13094
13095
#: en/help_topics/rules.txt:39
13096
msgid ""
13097
" Patterns containing square brackets or spaces should be\n"
13098
" surrounded in quotes to ensure they are correctly parsed.\n"
13099
msgstr ""
13100
13101
#: en/help_topics/topics.txt:1
13102
msgid ""
13103
"authentication Information on configuring authentication\n"
13104
"basic Basic commands\n"
13105
"branches Information on what a branch is\n"
13106
"bugs Bug tracker settings\n"
13107
"checkouts Information on what a checkout is\n"
13108
"commands Basic help for all commands\n"
13109
"configuration Details on the configuration settings available\n"
13110
"conflict-types Types of conflicts and what to do about them\n"
13111
"content-filters Conversion of content into/from working trees\n"
13112
"criss-cross Information on criss-cross merging\n"
13113
"current-formats Current storage formats\n"
13114
"debug-flags Options to show or record debug information\n"
13115
"diverged-branches How to fix diverged branches\n"
13116
"env-variables Environment variable names and values\n"
13117
"eol Information on end-of-line handling\n"
13118
"files Information on configuration and log files\n"
13119
"formats Information on choosing a storage format\n"
13120
"global-options Options that control how Bazaar runs\n"
13121
"hidden-commands All hidden commands\n"
13122
"hooks Points at which custom processing can be added\n"
13123
"launchpad Using Bazaar with Launchpad.net\n"
13124
"location-alias Aliases for remembered locations\n"
13125
"log-formats Details on the logging formats available\n"
13126
"other-formats Experimental and deprecated storage formats\n"
13127
"patterns Information on the pattern syntax\n"
13128
"repositories Basic information on shared repositories.\n"
13129
"revisionspec Explain how to use --revision\n"
13130
"rules Information on defining rule-based preferences\n"
13131
"standalone-trees Information on what a standalone tree is\n"
13132
"standard-options Options that can be used with any command\n"
13133
"status-flags Help on status flags\n"
13134
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13135
"topics Topics list\n"
13136
"url-special-chars Special character handling in URLs\n"
13137
"urlspec Supported transport protocols\n"
13138
"working-trees Information on working trees\n"
13139
msgstr ""
13140
13141
#: en/help_topics/url-special-chars.txt:1
13142
msgid ""
13143
"Special character handling in URLs\n"
13144
"=================================="
13145
msgstr ""
13146
13147
#: en/help_topics/url-special-chars.txt:4
13148
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13149
msgstr ""
13150
13151
#: en/help_topics/url-special-chars.txt:6
13152
msgid " * Fully qualified URLs"
13153
msgstr ""
13154
13155
#: en/help_topics/url-special-chars.txt:8
13156
msgid " * File system paths, relative or absolute"
13157
msgstr ""
13158
13159
#: en/help_topics/url-special-chars.txt:10
13160
msgid ""
13161
"Internally bzr treats all locations as URLs. For any file system paths\n"
13162
"that are specified it will automatically determine the appropriate URL\n"
13163
"representation, and escape special characters where necessary."
13164
msgstr ""
13165
13166
#: en/help_topics/url-special-chars.txt:14
13167
msgid ""
13168
"There are a few characters which have special meaning in URLs and need "
13169
"careful\n"
13170
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13171
"value in URLs. Any non-ASCII characters in a file path will automatically "
13172
"be\n"
13173
"urlencoded when the path is converted to a URL."
13174
msgstr ""
13175
13176
#: en/help_topics/url-special-chars.txt:19
13177
msgid ""
13178
"URLs represent non-ASCII characters in an encoding defined by the server, "
13179
"but\n"
13180
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13181
"be\n"
13182
"generous in what it accepts as a URL and to print them in a way that\n"
13183
"will be readable."
13184
msgstr ""
13185
13186
#: en/help_topics/url-special-chars.txt:24
13187
msgid ""
13188
"For example, if you have a directory named '/tmp/%2False' these are all "
13189
"valid\n"
13190
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13191
"slash)::"
13192
msgstr ""
13193
13194
#: en/help_topics/url-special-chars.txt:27
13195
msgid ""
13196
" cd /tmp\n"
13197
" bzr log /tmp/%2False\n"
13198
" bzr log %2False\n"
13199
" bzr log file:///tmp/%252False\n"
13200
" bzr log file://localhost/tmp/%252False\n"
13201
" bzr log file:%252False"
13202
msgstr ""
13203
13204
#: en/help_topics/url-special-chars.txt:34
13205
msgid "These are valid but do not refer to the same file::"
13206
msgstr ""
13207
13208
#: en/help_topics/url-special-chars.txt:36
13209
msgid ""
13210
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13211
" bzr log %252False (refers to a file called /tmp/%252False)"
13212
msgstr ""
13213
13214
#: en/help_topics/url-special-chars.txt:39
13215
msgid ""
13216
"Comma also has special meaning in URLs, because it denotes `segment "
13217
"parameters`_"
13218
msgstr ""
13219
13220
#: en/help_topics/url-special-chars.txt:41
13221
msgid ""
13222
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13223
msgstr ""
13224
13225
#: en/help_topics/url-special-chars.txt:43
13226
msgid ""
13227
"Comma is also special in any file system paths that are specified. To use a "
13228
"literal\n"
13229
"comma in a file system path, specify a URL and URL encode the comma::"
13230
msgstr ""
13231
13232
#: en/help_topics/url-special-chars.txt:46
13233
msgid ""
13234
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13235
"\"branch\" set to \"bla\"\n"
13236
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13237
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13238
"\"branch\" set to \"bla\"\n"
13239
msgstr ""
13240
13241
#: en/help_topics/urlspec.txt:1
13242
msgid "URL Identifiers"
13243
msgstr ""
13244
13245
#: en/help_topics/urlspec.txt:3
13246
msgid "Supported URL prefixes::"
13247
msgstr ""
13248
13249
#: en/help_topics/urlspec.txt:5
13250
msgid ""
13251
" aftp:// Access using active FTP.\n"
13252
" bzr:// Fast access using the Bazaar smart server.\n"
13253
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13254
" file:// Access using the standard filesystem (default)\n"
13255
" ftp:// Access using passive FTP.\n"
13256
" http:// Read-only access of branches exported on the web.\n"
13257
" https:// Read-only access of branches exported on the web using "
13258
"SSL.\n"
13259
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13260
msgstr ""
13261
13262
#: en/help_topics/urlspec.txt:14
13263
msgid "Supported modifiers::"
13264
msgstr ""
13265
13266
#: en/help_topics/urlspec.txt:16
13267
msgid " gio+ Access using any GIO supported protocols."
13268
msgstr ""
13269
13270
#: en/help_topics/urlspec.txt:18
13271
msgid "Bazaar supports all of the standard parts within the URL::"
13272
msgstr ""
13273
13274
#: en/help_topics/urlspec.txt:20
13275
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13276
msgstr ""
13277
13278
#: en/help_topics/urlspec.txt:22
13279
msgid "allowing URLs such as::"
13280
msgstr ""
13281
13282
#: en/help_topics/urlspec.txt:24
13283
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13284
msgstr ""
13285
13286
#: en/help_topics/urlspec.txt:26
13287
msgid ""
13288
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13289
"with '~' as meaning that the rest of the path should be interpreted\n"
13290
"relative to the remote user's home directory. For example if the user\n"
13291
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13292
"shell.example.com, then::"
13293
msgstr ""
13294
13295
#: en/help_topics/urlspec.txt:32
13296
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13297
msgstr ""
13298
13299
#: en/help_topics/urlspec.txt:34
13300
msgid "would refer to ``/home/remote/myproject/trunk``."
13301
msgstr ""
13302
13303
#: en/help_topics/urlspec.txt:36
13304
msgid ""
13305
"Many commands that accept URLs also accept location aliases too.\n"
13306
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13307
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1