« back to all changes in this revision
Viewing changes to po/fo.po
- browse files at revision 6472.2.1
- compare with another revision
- download diff
- download tarball
- view history from revision 6472.2.1
- Committer: Jelmer Vernooij
- Date: 2012-02-23 19:45:15 UTC
- mto: This revision was merged to the branch mainline in revision 6486.
- Revision ID: jelmer@samba.org-20120223194515-1ctgfzj362m0tu0k
Use bzrdir.controldir for generic access to control directories.
- files added:
- doc/en/release-notes/bzr-2.6.txt
- files modified:
- bzr
added
removed
po/fo.po
1
# Faroese 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-01-16 15:18+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: Faroese <fo@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-01-17 05:15+0000\n"
19
"X-Generator: Launchpad (build 14676)\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:3183
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:3185
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:3188
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:3190
46
msgid "No new revisions to push."
47
msgstr ""
48
49
#: bzrlib/branch.py:3210
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3213
54
#, python-format
55
msgid "found error:%s"
56
msgstr ""
57
58
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:130
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:215
69
msgid "Display status summary."
70
msgstr ""
71
72
#: bzrlib/builtins.py:217
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:220
79
msgid ""
80
"added\n"
81
" Versioned in the working copy but not in the previous revision."
82
msgstr ""
83
84
#: bzrlib/builtins.py:223
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:227
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:232
100
msgid ""
101
"modified\n"
102
" Text has changed since the previous revision."
103
msgstr ""
104
105
#: bzrlib/builtins.py:235
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:238
112
msgid ""
113
"unknown\n"
114
" Not versioned and not matching an ignore pattern."
115
msgstr ""
116
117
#: bzrlib/builtins.py:241
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:246
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:249
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:253
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:258
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:263
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:266
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:275
168
msgid "Use short status indicators."
169
msgstr ""
170
171
#: bzrlib/builtins.py:277
172
msgid "Only show versioned files."
173
msgstr ""
174
175
#: bzrlib/builtins.py:279
176
msgid "Don't show pending merges."
177
msgstr ""
178
179
#: bzrlib/builtins.py:282
180
msgid "Do not mark object type using indicator."
181
msgstr ""
182
183
#: bzrlib/builtins.py:297
184
msgid "bzr status --revision takes exactly one or two revision specifiers"
185
msgstr ""
186
187
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
188
msgid "You can only supply one of revision_id or --revision"
189
msgstr ""
190
191
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
192
msgid "You must supply either --revision or a revision_id"
193
msgstr ""
194
195
#: bzrlib/builtins.py:351
196
#, python-format
197
msgid "Repository %r does not support access to raw revision texts"
198
msgstr ""
199
200
#: bzrlib/builtins.py:362
201
msgid "The repository {0} contains no revision {1}."
202
msgstr ""
203
204
#: bzrlib/builtins.py:369
205
msgid "You cannot specify a NULL revision."
206
msgstr ""
207
208
#: bzrlib/builtins.py:461
209
msgid "Remove the working tree from a given branch/checkout."
210
msgstr ""
211
212
#: bzrlib/builtins.py:463
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:466
219
msgid "To re-create the working tree, use \"bzr checkout\"."
220
msgstr ""
221
222
#: bzrlib/builtins.py:472
223
msgid ""
224
"Remove the working tree even if it has uncommitted or shelved changes."
225
msgstr ""
226
227
#: bzrlib/builtins.py:486
228
msgid "No working tree to remove"
229
msgstr ""
230
231
#: bzrlib/builtins.py:488
232
msgid "You cannot remove the working tree of a remote path"
233
msgstr ""
234
235
#: bzrlib/builtins.py:497
236
msgid "You cannot remove the working tree from a lightweight checkout"
237
msgstr ""
238
239
#: bzrlib/builtins.py:537
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:548
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:552
252
msgid "failed to reset the tree state{0}"
253
msgstr ""
254
255
#: bzrlib/builtins.py:556
256
msgid "Show current revision number."
257
msgstr ""
258
259
#: bzrlib/builtins.py:558
260
msgid "This is equal to the number of revisions on this branch."
261
msgstr ""
262
263
#: bzrlib/builtins.py:571
264
msgid "--tree and --revision can not be used together"
265
msgstr ""
266
267
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
268
msgid "Tags can only be placed on a single revision, not on a range"
269
msgstr ""
270
271
#: bzrlib/builtins.py:612
272
msgid "Show revno of working tree."
273
msgstr ""
274
275
#: bzrlib/builtins.py:660
276
msgid "Add specified files or directories."
277
msgstr ""
278
279
#: bzrlib/builtins.py:662
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:666
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:674
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:677
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:680
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:685
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:688
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:696
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:699
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:706
348
msgid "Don't recursively add the contents of directories."
349
msgstr ""
350
351
#: bzrlib/builtins.py:712
352
msgid "Lookup file ids from this tree."
353
msgstr ""
354
355
#: bzrlib/builtins.py:748
356
msgid "ignored {0} matching \"{1}\"\n"
357
msgstr ""
358
359
#: bzrlib/builtins.py:753
360
msgid "Create a new versioned directory."
361
msgstr ""
362
363
#: bzrlib/builtins.py:755
364
msgid "This is equivalent to creating the directory and then adding it."
365
msgstr ""
366
367
#: bzrlib/builtins.py:762
368
msgid "No error if existing, make parent directories as needed."
369
msgstr ""
370
371
#: bzrlib/builtins.py:796
372
#, python-format
373
msgid "added %s\n"
374
msgstr ""
375
376
#: bzrlib/builtins.py:838
377
#, python-format
378
msgid "invalid kind %r specified"
379
msgstr ""
380
381
#: bzrlib/builtins.py:875
382
msgid "Move or rename a file."
383
msgstr ""
384
385
#: bzrlib/builtins.py:877
386
msgid " bzr mv SOURCE... DESTINATION"
387
msgstr ""
388
389
#: bzrlib/builtins.py:879
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:883
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:889
406
msgid "Files cannot be moved between branches."
407
msgstr ""
408
409
#: bzrlib/builtins.py:896
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:898
416
msgid "Automatically guess renames."
417
msgstr ""
418
419
#: bzrlib/builtins.py:899
420
msgid "Avoid making changes when guessing renames."
421
msgstr ""
422
423
#: bzrlib/builtins.py:908
424
msgid "--dry-run requires --auto."
425
msgstr ""
426
427
#: bzrlib/builtins.py:912
428
msgid "missing file argument"
429
msgstr ""
430
431
#: bzrlib/builtins.py:916
432
msgid "can not move root of branch"
433
msgstr ""
434
435
#: bzrlib/builtins.py:922
436
msgid "Only one path may be specified to --auto."
437
msgstr ""
438
439
#: bzrlib/builtins.py:925
440
msgid "--after cannot be specified with --auto."
441
msgstr ""
442
443
#: bzrlib/builtins.py:962
444
msgid "to mv multiple files the destination must be a versioned directory"
445
msgstr ""
446
447
#: bzrlib/builtins.py:1014
448
msgid "Turn this branch into a mirror of another branch."
449
msgstr ""
450
451
#: bzrlib/builtins.py:1016
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:1021
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:1025
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:1029
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:1034
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:1038
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:1046
496
msgid "Show logs of pulled revisions."
497
msgstr ""
498
499
#: bzrlib/builtins.py:1048
500
msgid ""
501
"Branch to pull into, rather than the one containing the working directory."
502
msgstr ""
503
504
#: bzrlib/builtins.py:1051
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:1080
511
msgid "Need working tree for --show-base."
512
msgstr ""
513
514
#: bzrlib/builtins.py:1096
515
msgid "No pull location known or specified."
516
msgstr ""
517
518
#: bzrlib/builtins.py:1102
519
#, python-format
520
msgid "Using saved parent location: %s\n"
521
msgstr ""
522
523
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
524
msgid "Cannot use -r with merge directives or bundles"
525
msgstr ""
526
527
#: bzrlib/builtins.py:1150
528
msgid "Update a mirror of this branch."
529
msgstr ""
530
531
#: bzrlib/builtins.py:1152
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:1155
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:1158
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:1162
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:1165
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:1169
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:1174
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:1185 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:1188
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:1193
590
msgid ""
591
"Create a stacked branch that references the public location of the parent "
592
"branch."
593
msgstr ""
594
595
#: bzrlib/builtins.py:1196
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:1201 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:1204
609
msgid "Don't populate the working tree, even for protocols that support it."
610
msgstr ""
611
612
#: bzrlib/builtins.py:1248
613
msgid "Could not determine branch to refer to."
614
msgstr ""
615
616
#: bzrlib/builtins.py:1257
617
#, python-format
618
msgid ""
619
"No push location known or specified. To push to the parent branch (at %s), "
620
"use 'bzr push :parent'."
621
msgstr ""
622
623
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
624
msgid "No push location known or specified."
625
msgstr ""
626
627
#: bzrlib/builtins.py:1267
628
#, python-format
629
msgid "Using saved push location: %s"
630
msgstr ""
631
632
#: bzrlib/builtins.py:1277
633
msgid "Create a new branch that is a copy of an existing branch."
634
msgstr ""
635
636
#: bzrlib/builtins.py:1279
637
msgid ""
638
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
639
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
640
"./bar.\n"
641
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
642
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
643
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
644
"create ./foo-bar."
645
msgstr ""
646
647
#: bzrlib/builtins.py:1286
648
msgid ""
649
"To retrieve the branch as of a particular revision, supply the --revision\n"
650
"parameter, as in \"branch foo/bar -r 5\"."
651
msgstr ""
652
653
#: bzrlib/builtins.py:1289
654
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
655
msgstr ""
656
657
#: bzrlib/builtins.py:1299
658
msgid "Create a branch without a working-tree."
659
msgstr ""
660
661
#: bzrlib/builtins.py:1301
662
msgid "Switch the checkout in the current directory to the new branch."
663
msgstr ""
664
665
#: bzrlib/builtins.py:1304
666
msgid ""
667
"Create a stacked branch referring to the source branch. The new branch will "
668
"depend on the availability of the source branch for all operations."
669
msgstr ""
670
671
#: bzrlib/builtins.py:1308
672
msgid "Do not use a shared repository, even if available."
673
msgstr ""
674
675
#: bzrlib/builtins.py:1310
676
msgid ""
677
"By default branch will fail if the target directory exists, but does not "
678
"already have a control directory. This flag will allow branch to proceed."
679
msgstr ""
680
681
#: bzrlib/builtins.py:1315
682
msgid "Bind new branch to from location."
683
msgstr ""
684
685
#: bzrlib/builtins.py:1362
686
#, python-format
687
msgid "Target directory \"%s\" already exists."
688
msgstr ""
689
690
#: bzrlib/builtins.py:1374
691
#, python-format
692
msgid "Parent of \"%s\" does not exist."
693
msgstr ""
694
695
#: bzrlib/builtins.py:1393
696
msgid "The branch {0} has no revision {1}."
697
msgstr ""
698
699
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
700
#, python-format
701
msgid "Created new stacked branch referring to %s."
702
msgstr ""
703
704
#: bzrlib/builtins.py:1407
705
#, python-format
706
msgid "Branched %d revision."
707
msgid_plural "Branched %d revisions."
708
msgstr[0] ""
709
msgstr[1] ""
710
711
#: bzrlib/builtins.py:1412
712
#, python-format
713
msgid "New branch bound to %s"
714
msgstr ""
715
716
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
717
#, python-format
718
msgid "Switched to branch: %s"
719
msgstr ""
720
721
#: bzrlib/builtins.py:1422
722
msgid "List the branches available at the current location."
723
msgstr ""
724
725
#: bzrlib/builtins.py:1424
726
msgid ""
727
"This command will print the names of all the branches at the current\n"
728
"location."
729
msgstr ""
730
731
#: bzrlib/builtins.py:1431
732
msgid ""
733
"Recursively scan for branches rather than just looking in the specified "
734
"location."
735
msgstr ""
736
737
#: bzrlib/builtins.py:1461
738
msgid "(default)"
739
msgstr ""
740
741
#: bzrlib/builtins.py:1473
742
msgid "Create a new checkout of an existing branch."
743
msgstr ""
744
745
#: bzrlib/builtins.py:1475
746
msgid ""
747
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
748
"for\n"
749
"the branch found in '.'. This is useful if you have removed the working "
750
"tree\n"
751
"or if it was never created - i.e. if you pushed the branch to its current\n"
752
"location using SFTP."
753
msgstr ""
754
755
#: bzrlib/builtins.py:1480
756
msgid ""
757
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
758
"will\n"
759
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
760
"./bar.\n"
761
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
762
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
763
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
764
"create ./foo-bar."
765
msgstr ""
766
767
#: bzrlib/builtins.py:1487
768
msgid ""
769
"To retrieve the branch as of a particular revision, supply the --revision\n"
770
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
771
"immediately\n"
772
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
773
"old\n"
774
"code.)"
775
msgstr ""
776
777
#: bzrlib/builtins.py:1497
778
msgid ""
779
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
780
"the branch for every operation. Normal checkouts can perform common "
781
"operations like diff and status without such access, and also support local "
782
"commits."
783
msgstr ""
784
785
#: bzrlib/builtins.py:1504
786
msgid "Get file contents from this tree."
787
msgstr ""
788
789
#: bzrlib/builtins.py:1506
790
msgid "Hard-link working tree files where possible."
791
msgstr ""
792
793
#: bzrlib/builtins.py:1547
794
msgid ""
795
"Show list of renamed files.\n"
796
" "
797
msgstr ""
798
799
#: bzrlib/builtins.py:1577
800
msgid "Update a working tree to a new revision."
801
msgstr ""
802
803
#: bzrlib/builtins.py:1579
804
msgid ""
805
"This will perform a merge of the destination revision (the tip of the\n"
806
"branch, or the specified revision) into the working tree, and then make\n"
807
"that revision the basis revision for the working tree. "
808
msgstr ""
809
810
#: bzrlib/builtins.py:1583
811
msgid ""
812
"You can use this to visit an older revision, or to update a working tree\n"
813
"that is out of date from its branch."
814
msgstr ""
815
816
#: bzrlib/builtins.py:1586
817
msgid ""
818
"If there are any uncommitted changes in the tree, they will be carried\n"
819
"across and remain as uncommitted changes after the update. To discard\n"
820
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
821
"with the changes brought in by the change in basis revision."
822
msgstr ""
823
824
#: bzrlib/builtins.py:1591
825
msgid ""
826
"If the tree's branch is bound to a master branch, bzr will also update\n"
827
"the branch from the master."
828
msgstr ""
829
830
#: bzrlib/builtins.py:1594
831
msgid ""
832
"You cannot update just a single file or directory, because each Bazaar\n"
833
"working tree has just a single basis revision. If you want to restore a\n"
834
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
835
"update'. If you want to restore a file to its state in a previous\n"
836
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
837
"out the old content of that file to a new location."
838
msgstr ""
839
840
#: bzrlib/builtins.py:1601
841
msgid ""
842
"The 'dir' argument, if given, must be the location of the root of a\n"
843
"working tree to update. By default, the working tree that contains the \n"
844
"current working directory is used."
845
msgstr ""
846
847
#: bzrlib/builtins.py:1617
848
msgid "bzr update --revision takes exactly one revision"
849
msgstr ""
850
851
#: bzrlib/builtins.py:1625
852
msgid "bzr update can only update a whole tree, not a file or subdirectory"
853
msgstr ""
854
855
#: bzrlib/builtins.py:1656
856
msgid "Tree is up to date at revision {0} of branch {1}"
857
msgstr ""
858
859
#: bzrlib/builtins.py:1672
860
#, python-format
861
msgid ""
862
"branch has no revision %s\n"
863
"bzr update --revision only works for a revision in the branch history"
864
msgstr ""
865
866
#: bzrlib/builtins.py:1678
867
msgid "Updated to revision {0} of branch {1}"
868
msgstr ""
869
870
#: bzrlib/builtins.py:1682
871
msgid ""
872
"Your local commits will now show as pending merges with 'bzr status', and "
873
"can be committed with 'bzr commit'."
874
msgstr ""
875
876
#: bzrlib/builtins.py:1691
877
msgid "Show information about a working tree, branch or repository."
878
msgstr ""
879
880
#: bzrlib/builtins.py:1693
881
msgid ""
882
"This command will show all known locations and formats associated to the\n"
883
"tree, branch or repository."
884
msgstr ""
885
886
#: bzrlib/builtins.py:1696
887
msgid ""
888
"In verbose mode, statistical information is included with each report.\n"
889
"To see extended statistic information, use a verbosity level of 2 or\n"
890
"higher by specifying the verbose option multiple times, e.g. -vv."
891
msgstr ""
892
893
#: bzrlib/builtins.py:1700
894
msgid "Branches and working trees will also report any missing revisions."
895
msgstr ""
896
897
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
898
#: bzrlib/builtins.py:6389
899
msgid ":Examples:"
900
msgstr ""
901
902
#: bzrlib/builtins.py:1704
903
msgid " Display information on the format and related locations:"
904
msgstr ""
905
906
#: bzrlib/builtins.py:1706
907
msgid " bzr info"
908
msgstr ""
909
910
#: bzrlib/builtins.py:1708
911
msgid ""
912
" Display the above together with extended format information and\n"
913
" basic statistics (like the number of files in the working tree and\n"
914
" number of revisions in the branch and repository):"
915
msgstr ""
916
917
#: bzrlib/builtins.py:1712
918
msgid " bzr info -v"
919
msgstr ""
920
921
#: bzrlib/builtins.py:1714
922
msgid " Display the above together with number of committers to the branch:"
923
msgstr ""
924
925
#: bzrlib/builtins.py:1716
926
msgid " bzr info -vv"
927
msgstr ""
928
929
#: bzrlib/builtins.py:1735
930
msgid "Remove files or directories."
931
msgstr ""
932
933
#: bzrlib/builtins.py:1737
934
msgid ""
935
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
936
"delete them if they can easily be recovered using revert otherwise they\n"
937
"will be backed up (adding an extention of the form .~#~). If no options or\n"
938
"parameters are given Bazaar will scan for files that are being tracked by\n"
939
"Bazaar but missing in your tree and stop tracking them for you."
940
msgstr ""
941
942
#: bzrlib/builtins.py:1745
943
msgid "Only remove files that have never been committed."
944
msgstr ""
945
946
#: bzrlib/builtins.py:1747
947
msgid "The file deletion mode to be used."
948
msgstr ""
949
950
#: bzrlib/builtins.py:1748
951
msgid "Deletion Strategy"
952
msgstr ""
953
954
#: bzrlib/builtins.py:1749
955
msgid "Backup changed files (default)."
956
msgstr ""
957
958
#: bzrlib/builtins.py:1750
959
msgid "Delete from bzr but leave the working copy."
960
msgstr ""
961
962
#: bzrlib/builtins.py:1751
963
msgid "Don't backup changed files."
964
msgstr ""
965
966
#: bzrlib/builtins.py:1752
967
msgid ""
968
"Delete all the specified files, even if they can not be recovered and even "
969
"if they are non-empty directories. (deprecated, use no-backup)"
970
msgstr ""
971
972
#: bzrlib/builtins.py:1761
973
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
974
msgstr ""
975
976
#: bzrlib/builtins.py:1778
977
msgid "No matching files."
978
msgstr ""
979
980
#: bzrlib/builtins.py:1839
981
msgid "Reconcile bzr metadata in a branch."
982
msgstr ""
983
984
#: bzrlib/builtins.py:1841
985
msgid ""
986
"This can correct data mismatches that may have been caused by\n"
987
"previous ghost operations or bzr upgrades. You should only\n"
988
"need to run this command if 'bzr check' or a bzr developer\n"
989
"advises you to run it."
990
msgstr ""
991
992
#: bzrlib/builtins.py:1846
993
msgid ""
994
"If a second branch is provided, cross-branch reconciliation is\n"
995
"also attempted, which will check that data like the tree root\n"
996
"id which was not present in very early bzr versions is represented\n"
997
"correctly in both branches."
998
msgstr ""
999
1000
#: bzrlib/builtins.py:1851
1001
msgid ""
1002
"At the same time it is run it may recompress data resulting in\n"
1003
"a potential saving in disk space or performance gain."
1004
msgstr ""
1005
1006
#: bzrlib/builtins.py:1854
1007
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1008
msgstr ""
1009
1010
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1011
msgid ""
1012
"Format for the bzr 2.0 series.\n"
1013
"Uses group-compress storage.\n"
1014
"Provides rich roots which are a one-way transition.\n"
1015
msgstr ""
1016
1017
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1018
msgid ""
1019
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1020
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1021
msgstr ""
1022
1023
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1024
msgid "The 2a format with experimental support for colocated branches.\n"
1025
msgstr ""
1026
1027
#: bzrlib/builtins.py:1922
1028
msgid "Make a directory into a versioned branch."
1029
msgstr ""
1030
1031
#: bzrlib/builtins.py:1924
1032
msgid ""
1033
"Use this to create an empty branch, or before importing an\n"
1034
"existing project."
1035
msgstr ""
1036
1037
#: bzrlib/builtins.py:1927
1038
msgid ""
1039
"If there is a repository in a parent directory of the location, then\n"
1040
"the history of the branch will be stored in the repository. Otherwise\n"
1041
"init creates a standalone branch which carries its own history\n"
1042
"in the .bzr directory."
1043
msgstr ""
1044
1045
#: bzrlib/builtins.py:1932
1046
msgid ""
1047
"If there is already a branch at the location but it has no working tree,\n"
1048
"the tree can be populated with 'bzr checkout'."
1049
msgstr ""
1050
1051
#: bzrlib/builtins.py:1935
1052
msgid "Recipe for importing a tree of files::"
1053
msgstr ""
1054
1055
#: bzrlib/builtins.py:1937
1056
msgid ""
1057
" cd ~/project\n"
1058
" bzr init\n"
1059
" bzr add .\n"
1060
" bzr status\n"
1061
" bzr commit -m \"imported project\""
1062
msgstr ""
1063
1064
#: bzrlib/builtins.py:1948
1065
msgid ""
1066
"Create the path leading up to the branch if it does not already exist."
1067
msgstr ""
1068
1069
#: bzrlib/builtins.py:1951
1070
msgid "Specify a format for this branch. See \"help formats\"."
1071
msgstr ""
1072
1073
#: bzrlib/builtins.py:1959
1074
msgid ""
1075
"Never change revnos or the existing log. Append revisions to it only."
1076
msgstr ""
1077
1078
#: bzrlib/builtins.py:1962
1079
msgid "Create a branch without a working tree."
1080
msgstr ""
1081
1082
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1083
#, python-format
1084
msgid ""
1085
"Parent directory of %s does not exist.\n"
1086
"You may supply --create-prefix to create all leading parent directories."
1087
msgstr ""
1088
1089
#: bzrlib/builtins.py:2016
1090
msgid ""
1091
"This branch format cannot be set to append-revisions-only. Try --default."
1092
msgstr ""
1093
1094
#: bzrlib/builtins.py:2027
1095
msgid "Created a {0} (format: {1})\n"
1096
msgstr ""
1097
1098
#: bzrlib/builtins.py:2036
1099
#, python-format
1100
msgid "Using shared repository: %s\n"
1101
msgstr ""
1102
1103
#: bzrlib/builtins.py:2040
1104
msgid "Create a shared repository for branches to share storage space."
1105
msgstr ""
1106
1107
#: bzrlib/builtins.py:2042
1108
msgid ""
1109
"New branches created under the repository directory will store their\n"
1110
"revisions in the repository, not in the branch directory. For branches\n"
1111
"with shared history, this reduces the amount of storage needed and \n"
1112
"speeds up the creation of new branches."
1113
msgstr ""
1114
1115
#: bzrlib/builtins.py:2047
1116
msgid ""
1117
"If the --no-trees option is given then the branches in the repository\n"
1118
"will not have working trees by default. They will still exist as \n"
1119
"directories on disk, but they will not have separate copies of the \n"
1120
"files at a certain revision. This can be useful for repositories that\n"
1121
"store branches which are interacted with through checkouts or remote\n"
1122
"branches, such as on a server."
1123
msgstr ""
1124
1125
#: bzrlib/builtins.py:2054
1126
msgid ""
1127
":Examples:\n"
1128
" Create a shared repository holding just branches::"
1129
msgstr ""
1130
1131
#: bzrlib/builtins.py:2057
1132
msgid ""
1133
" bzr init-repo --no-trees repo\n"
1134
" bzr init repo/trunk"
1135
msgstr ""
1136
1137
#: bzrlib/builtins.py:2060
1138
msgid " Make a lightweight checkout elsewhere::"
1139
msgstr ""
1140
1141
#: bzrlib/builtins.py:2062
1142
msgid ""
1143
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1144
" cd trunk-checkout\n"
1145
" (add files here)"
1146
msgstr ""
1147
1148
#: bzrlib/builtins.py:2070
1149
msgid ""
1150
"Specify a format for this repository. See \"bzr help formats\" for details."
1151
msgstr ""
1152
1153
#: bzrlib/builtins.py:2074
1154
msgid "Repository format"
1155
msgstr ""
1156
1157
#: bzrlib/builtins.py:2076
1158
msgid "Branches in the repository will default to not having a working tree."
1159
msgstr ""
1160
1161
#: bzrlib/builtins.py:2102
1162
msgid "Show differences in the working tree, between revisions or branches."
1163
msgstr ""
1164
1165
#: bzrlib/builtins.py:2104
1166
msgid ""
1167
"If no arguments are given, all changes for the current tree are listed.\n"
1168
"If files are given, only the changes in those files are listed.\n"
1169
"Remote and multiple branches can be compared by using the --old and\n"
1170
"--new options. If not provided, the default for both is derived from\n"
1171
"the first argument, if any, or the current tree if no arguments are\n"
1172
"given."
1173
msgstr ""
1174
1175
#: bzrlib/builtins.py:2111
1176
msgid ""
1177
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1178
"produces patches suitable for \"patch -p1\"."
1179
msgstr ""
1180
1181
#: bzrlib/builtins.py:2114
1182
msgid ""
1183
"Note that when using the -r argument with a range of revisions, the\n"
1184
"differences are computed between the two specified revisions. That\n"
1185
"is, the command does not show the changes introduced by the first \n"
1186
"revision in the range. This differs from the interpretation of \n"
1187
"revision ranges used by \"bzr log\" which includes the first revision\n"
1188
"in the range."
1189
msgstr ""
1190
1191
#: bzrlib/builtins.py:2121
1192
msgid ""
1193
":Exit values:\n"
1194
" 1 - changed\n"
1195
" 2 - unrepresentable changes\n"
1196
" 3 - error\n"
1197
" 0 - no change"
1198
msgstr ""
1199
1200
#: bzrlib/builtins.py:2127
1201
msgid ""
1202
":Examples:\n"
1203
" Shows the difference in the working tree versus the last commit::"
1204
msgstr ""
1205
1206
#: bzrlib/builtins.py:2130
1207
msgid " bzr diff"
1208
msgstr ""
1209
1210
#: bzrlib/builtins.py:2132
1211
msgid " Difference between the working tree and revision 1::"
1212
msgstr ""
1213
1214
#: bzrlib/builtins.py:2134
1215
msgid " bzr diff -r1"
1216
msgstr ""
1217
1218
#: bzrlib/builtins.py:2136
1219
msgid " Difference between revision 3 and revision 1::"
1220
msgstr ""
1221
1222
#: bzrlib/builtins.py:2138
1223
msgid " bzr diff -r1..3"
1224
msgstr ""
1225
1226
#: bzrlib/builtins.py:2140
1227
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1228
msgstr ""
1229
1230
#: bzrlib/builtins.py:2142
1231
msgid " bzr diff -r1..3 xxx"
1232
msgstr ""
1233
1234
#: bzrlib/builtins.py:2144
1235
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1236
msgstr ""
1237
1238
#: bzrlib/builtins.py:2146
1239
msgid " bzr diff -c2"
1240
msgstr ""
1241
1242
#: bzrlib/builtins.py:2148
1243
msgid ""
1244
" To see the changes introduced by revision X::\n"
1245
" \n"
1246
" bzr diff -cX"
1247
msgstr ""
1248
1249
#: bzrlib/builtins.py:2152
1250
msgid ""
1251
" Note that in the case of a merge, the -c option shows the changes\n"
1252
" compared to the left hand parent. To see the changes against\n"
1253
" another parent, use::"
1254
msgstr ""
1255
1256
#: bzrlib/builtins.py:2156
1257
msgid " bzr diff -r<chosen_parent>..X"
1258
msgstr ""
1259
1260
#: bzrlib/builtins.py:2158
1261
msgid ""
1262
" The changes between the current revision and the previous revision\n"
1263
" (equivalent to -c-1 and -r-2..-1)"
1264
msgstr ""
1265
1266
#: bzrlib/builtins.py:2161
1267
msgid " bzr diff -r-2.."
1268
msgstr ""
1269
1270
#: bzrlib/builtins.py:2163
1271
msgid " Show just the differences for file NEWS::"
1272
msgstr ""
1273
1274
#: bzrlib/builtins.py:2165
1275
msgid " bzr diff NEWS"
1276
msgstr ""
1277
1278
#: bzrlib/builtins.py:2167
1279
msgid " Show the differences in working tree xxx for file NEWS::"
1280
msgstr ""
1281
1282
#: bzrlib/builtins.py:2169
1283
msgid " bzr diff xxx/NEWS"
1284
msgstr ""
1285
1286
#: bzrlib/builtins.py:2171
1287
msgid " Show the differences from branch xxx to this working tree:"
1288
msgstr ""
1289
1290
#: bzrlib/builtins.py:2173
1291
msgid " bzr diff --old xxx"
1292
msgstr ""
1293
1294
#: bzrlib/builtins.py:2175
1295
msgid " Show the differences between two branches for file NEWS::"
1296
msgstr ""
1297
1298
#: bzrlib/builtins.py:2177
1299
msgid " bzr diff --old xxx --new yyy NEWS"
1300
msgstr ""
1301
1302
#: bzrlib/builtins.py:2179
1303
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1304
msgstr ""
1305
1306
#: bzrlib/builtins.py:2181
1307
msgid ""
1308
" bzr diff --prefix old/:new/\n"
1309
" \n"
1310
" Show the differences using a custom diff program with options::\n"
1311
" \n"
1312
" bzr diff --using /usr/bin/diff --diff-options -wu"
1313
msgstr ""
1314
1315
#: bzrlib/builtins.py:2191
1316
msgid "Pass these options to the external diff program."
1317
msgstr ""
1318
1319
#: bzrlib/builtins.py:2194
1320
msgid ""
1321
"Set prefixes added to old and new filenames, as two values separated by a "
1322
"colon. (eg \"old/:new/\")."
1323
msgstr ""
1324
1325
#: bzrlib/builtins.py:2197
1326
msgid "Branch/tree to compare from."
1327
msgstr ""
1328
1329
#: bzrlib/builtins.py:2201
1330
msgid "Branch/tree to compare to."
1331
msgstr ""
1332
1333
#: bzrlib/builtins.py:2207
1334
msgid "Use this command to compare files."
1335
msgstr ""
1336
1337
#: bzrlib/builtins.py:2212
1338
msgid "Diff format to use."
1339
msgstr ""
1340
1341
#: bzrlib/builtins.py:2214
1342
msgid "Diff format"
1343
msgstr ""
1344
1345
#: bzrlib/builtins.py:2236
1346
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1347
msgstr ""
1348
1349
#: bzrlib/builtins.py:2240
1350
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1351
msgstr ""
1352
1353
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1354
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1355
msgid "{0} and {1} are mutually exclusive"
1356
msgstr ""
1357
1358
#: bzrlib/builtins.py:2265
1359
msgid ""
1360
"List files deleted in the working tree.\n"
1361
" "
1362
msgstr ""
1363
1364
#: bzrlib/builtins.py:2343
1365
msgid "Show the tree root directory."
1366
msgstr ""
1367
1368
#: bzrlib/builtins.py:2345
1369
msgid ""
1370
"The root is the nearest enclosing directory with a .bzr control\n"
1371
"directory."
1372
msgstr ""
1373
1374
#: bzrlib/builtins.py:2360
1375
msgid "The limit argument must be an integer."
1376
msgstr ""
1377
1378
#: bzrlib/builtins.py:2368
1379
msgid "The levels argument must be an integer."
1380
msgstr ""
1381
1382
#: bzrlib/builtins.py:2373
1383
msgid "Show historical log for a branch or subset of a branch."
1384
msgstr ""
1385
1386
#: bzrlib/builtins.py:2375
1387
msgid ""
1388
"log is bzr's default tool for exploring the history of a branch.\n"
1389
"The branch to use is taken from the first parameter. If no parameters\n"
1390
"are given, the branch containing the working directory is logged.\n"
1391
"Here are some simple examples::"
1392
msgstr ""
1393
1394
#: bzrlib/builtins.py:2380
1395
msgid ""
1396
" bzr log log the current branch\n"
1397
" bzr log foo.py log a file in its branch\n"
1398
" bzr log http://server/branch log a branch on a server"
1399
msgstr ""
1400
1401
#: bzrlib/builtins.py:2384
1402
msgid ""
1403
"The filtering, ordering and information shown for each revision can\n"
1404
"be controlled as explained below. By default, all revisions are\n"
1405
"shown sorted (topologically) so that newer revisions appear before\n"
1406
"older ones and descendants always appear before ancestors. If displayed,\n"
1407
"merged revisions are shown indented under the revision in which they\n"
1408
"were merged."
1409
msgstr ""
1410
1411
#: bzrlib/builtins.py:2391
1412
msgid ":Output control:"
1413
msgstr ""
1414
1415
#: bzrlib/builtins.py:2393
1416
msgid ""
1417
" The log format controls how information about each revision is\n"
1418
" displayed. The standard log formats are called ``long``, ``short``\n"
1419
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1420
" for more details on log formats."
1421
msgstr ""
1422
1423
#: bzrlib/builtins.py:2398
1424
msgid ""
1425
" The following options can be used to control what information is\n"
1426
" displayed::"
1427
msgstr ""
1428
1429
#: bzrlib/builtins.py:2401
1430
msgid ""
1431
" -l N display a maximum of N revisions\n"
1432
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1433
" -v display a status summary (delta) for each revision\n"
1434
" -p display a diff (patch) for each revision\n"
1435
" --show-ids display revision-ids (and file-ids), not just revnos"
1436
msgstr ""
1437
1438
#: bzrlib/builtins.py:2407
1439
msgid ""
1440
" Note that the default number of levels to display is a function of the\n"
1441
" log format. If the -n option is not used, the standard log formats show\n"
1442
" just the top level (mainline)."
1443
msgstr ""
1444
1445
#: bzrlib/builtins.py:2411
1446
msgid ""
1447
" Status summaries are shown using status flags like A, M, etc. To see\n"
1448
" the changes explained using words like ``added`` and ``modified``\n"
1449
" instead, use the -vv option."
1450
msgstr ""
1451
1452
#: bzrlib/builtins.py:2415
1453
msgid ":Ordering control:"
1454
msgstr ""
1455
1456
#: bzrlib/builtins.py:2417
1457
msgid ""
1458
" To display revisions from oldest to newest, use the --forward option.\n"
1459
" In most cases, using this option will have little impact on the total\n"
1460
" time taken to produce a log, though --forward does not incrementally\n"
1461
" display revisions like --reverse does when it can."
1462
msgstr ""
1463
1464
#: bzrlib/builtins.py:2422
1465
msgid ":Revision filtering:"
1466
msgstr ""
1467
1468
#: bzrlib/builtins.py:2424
1469
msgid ""
1470
" The -r option can be used to specify what revision or range of revisions\n"
1471
" to filter against. The various forms are shown below::"
1472
msgstr ""
1473
1474
#: bzrlib/builtins.py:2427
1475
msgid ""
1476
" -rX display revision X\n"
1477
" -rX.. display revision X and later\n"
1478
" -r..Y display up to and including revision Y\n"
1479
" -rX..Y display from X to Y inclusive"
1480
msgstr ""
1481
1482
#: bzrlib/builtins.py:2432
1483
msgid ""
1484
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1485
" Some common examples are given below::"
1486
msgstr ""
1487
1488
#: bzrlib/builtins.py:2435
1489
msgid ""
1490
" -r-1 show just the tip\n"
1491
" -r-10.. show the last 10 mainline revisions\n"
1492
" -rsubmit:.. show what's new on this branch\n"
1493
" -rancestor:path.. show changes since the common ancestor of this\n"
1494
" branch and the one at location path\n"
1495
" -rdate:yesterday.. show changes since yesterday"
1496
msgstr ""
1497
1498
#: bzrlib/builtins.py:2442
1499
msgid ""
1500
" When logging a range of revisions using -rX..Y, log starts at\n"
1501
" revision Y and searches back in history through the primary\n"
1502
" (\"left-hand\") parents until it finds X. When logging just the\n"
1503
" top level (using -n1), an error is reported if X is not found\n"
1504
" along the way. If multi-level logging is used (-n0), X may be\n"
1505
" a nested merge revision and the log will be truncated accordingly."
1506
msgstr ""
1507
1508
#: bzrlib/builtins.py:2449
1509
msgid ":Path filtering:"
1510
msgstr ""
1511
1512
#: bzrlib/builtins.py:2451
1513
msgid ""
1514
" If parameters are given and the first one is not a branch, the log\n"
1515
" will be filtered to show only those revisions that changed the\n"
1516
" nominated files or directories."
1517
msgstr ""
1518
1519
#: bzrlib/builtins.py:2455
1520
msgid ""
1521
" Filenames are interpreted within their historical context. To log a\n"
1522
" deleted file, specify a revision range so that the file existed at\n"
1523
" the end or start of the range."
1524
msgstr ""
1525
1526
#: bzrlib/builtins.py:2459
1527
msgid ""
1528
" Historical context is also important when interpreting pathnames of\n"
1529
" renamed files/directories. Consider the following example:"
1530
msgstr ""
1531
1532
#: bzrlib/builtins.py:2462
1533
msgid ""
1534
" * revision 1: add tutorial.txt\n"
1535
" * revision 2: modify tutorial.txt\n"
1536
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1537
msgstr ""
1538
1539
#: bzrlib/builtins.py:2466
1540
msgid " In this case:"
1541
msgstr ""
1542
1543
#: bzrlib/builtins.py:2468
1544
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1545
msgstr ""
1546
1547
#: bzrlib/builtins.py:2470
1548
msgid ""
1549
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1550
msgstr ""
1551
1552
#: bzrlib/builtins.py:2472
1553
msgid ""
1554
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1555
" the original file in revision 2."
1556
msgstr ""
1557
1558
#: bzrlib/builtins.py:2475
1559
msgid ""
1560
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1561
" was no file called guide.txt in revision 2."
1562
msgstr ""
1563
1564
#: bzrlib/builtins.py:2478
1565
msgid ""
1566
" Renames are always followed by log. By design, there is no need to\n"
1567
" explicitly ask for this (and no way to stop logging a file back\n"
1568
" until it was last renamed)."
1569
msgstr ""
1570
1571
#: bzrlib/builtins.py:2482
1572
msgid ":Other filtering:"
1573
msgstr ""
1574
1575
#: bzrlib/builtins.py:2484
1576
msgid ""
1577
" The --match option can be used for finding revisions that match a\n"
1578
" regular expression in a commit message, committer, author or bug.\n"
1579
" Specifying the option several times will match any of the supplied\n"
1580
" expressions. --match-author, --match-bugs, --match-committer and\n"
1581
" --match-message can be used to only match a specific field."
1582
msgstr ""
1583
1584
#: bzrlib/builtins.py:2490
1585
msgid ":Tips & tricks:"
1586
msgstr ""
1587
1588
#: bzrlib/builtins.py:2492
1589
msgid ""
1590
" GUI tools and IDEs are often better at exploring history than command\n"
1591
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1592
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1593
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1594
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1595
msgstr ""
1596
1597
#: bzrlib/builtins.py:2498
1598
msgid ""
1599
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1600
msgstr ""
1601
1602
#: bzrlib/builtins.py:2500
1603
msgid ""
1604
" [ALIASES]\n"
1605
" tip = log -r-1\n"
1606
" top = log -l10 --line\n"
1607
" show = log -v -p"
1608
msgstr ""
1609
1610
#: bzrlib/builtins.py:2505
1611
msgid ""
1612
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1613
" will show the last 10 mainline revisions. To see the details of a\n"
1614
" particular revision X, ``bzr show -rX``."
1615
msgstr ""
1616
1617
#: bzrlib/builtins.py:2509
1618
msgid ""
1619
" If you are interested in looking deeper into a particular merge X,\n"
1620
" use ``bzr log -n0 -rX``."
1621
msgstr ""
1622
1623
#: bzrlib/builtins.py:2512
1624
msgid ""
1625
" ``bzr log -v`` on a branch with lots of history is currently\n"
1626
" very slow. A fix for this issue is currently under development.\n"
1627
" With or without that fix, it is recommended that a revision range\n"
1628
" be given when using the -v option."
1629
msgstr ""
1630
1631
#: bzrlib/builtins.py:2517
1632
msgid ""
1633
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1634
" used to find revisions matching user names, commit messages, etc.\n"
1635
" Among other features, this plugin can find all revisions containing\n"
1636
" a list of words but not others."
1637
msgstr ""
1638
1639
#: bzrlib/builtins.py:2522
1640
msgid ""
1641
" When exploring non-mainline history on large projects with deep\n"
1642
" history, the performance of log can be greatly improved by installing\n"
1643
" the historycache plugin. This plugin buffers historical information\n"
1644
" trading disk space for faster speed."
1645
msgstr ""
1646
1647
#: bzrlib/builtins.py:2531
1648
msgid "Show from oldest to newest."
1649
msgstr ""
1650
1651
#: bzrlib/builtins.py:2534
1652
msgid "Show files changed in each revision."
1653
msgstr ""
1654
1655
#: bzrlib/builtins.py:2540
1656
msgid "Show just the specified revision. See also \"help revisionspec\"."
1657
msgstr ""
1658
1659
#: bzrlib/builtins.py:2544
1660
msgid "What names to list as authors - first, all or committer."
1661
msgstr ""
1662
1663
#: bzrlib/builtins.py:2545
1664
msgid "Authors"
1665
msgstr ""
1666
1667
#: bzrlib/builtins.py:2550
1668
msgid "Number of levels to display - 0 for all, 1 for flat."
1669
msgstr ""
1670
1671
#: bzrlib/builtins.py:2560
1672
msgid "Limit the output to the first N revisions."
1673
msgstr ""
1674
1675
#: bzrlib/builtins.py:2565
1676
msgid "Show changes made in each revision as a patch."
1677
msgstr ""
1678
1679
#: bzrlib/builtins.py:2567
1680
msgid "Show merged revisions like --levels 0 does."
1681
msgstr ""
1682
1683
#: bzrlib/builtins.py:2571
1684
msgid "Do not report commits with more than one parent."
1685
msgstr ""
1686
1687
#: bzrlib/builtins.py:2573
1688
msgid ""
1689
"Display only the revisions that are not part of both ancestries (require -"
1690
"rX..Y)."
1691
msgstr ""
1692
1693
#: bzrlib/builtins.py:2577
1694
msgid "Show digital signature validity."
1695
msgstr ""
1696
1697
#: bzrlib/builtins.py:2580
1698
msgid "Show revisions whose properties match this expression."
1699
msgstr ""
1700
1701
#: bzrlib/builtins.py:2584
1702
msgid "Show revisions whose message matches this expression."
1703
msgstr ""
1704
1705
#: bzrlib/builtins.py:2588
1706
msgid "Show revisions whose committer matches this expression."
1707
msgstr ""
1708
1709
#: bzrlib/builtins.py:2592
1710
msgid "Show revisions whose authors match this expression."
1711
msgstr ""
1712
1713
#: bzrlib/builtins.py:2596
1714
msgid "Show revisions whose bugs match this expression."
1715
msgstr ""
1716
1717
#: bzrlib/builtins.py:2650
1718
msgid "--exclude-common-ancestry requires -r with two revisions"
1719
msgstr ""
1720
1721
#: bzrlib/builtins.py:2678
1722
#, python-format
1723
msgid "Path unknown at end or start of revision range: %s"
1724
msgstr ""
1725
1726
#: bzrlib/builtins.py:2795
1727
#, python-format
1728
msgid "bzr %s doesn't accept two revisions in different branches."
1729
msgstr ""
1730
1731
#: bzrlib/builtins.py:2811
1732
#, python-format
1733
msgid "bzr %s --revision takes one or two values."
1734
msgstr ""
1735
1736
#: bzrlib/builtins.py:2856
1737
msgid ""
1738
"List files in a tree.\n"
1739
" "
1740
msgstr ""
1741
1742
#: bzrlib/builtins.py:2865
1743
msgid "Recurse into subdirectories."
1744
msgstr ""
1745
1746
#: bzrlib/builtins.py:2867
1747
msgid "Print paths relative to the root of the branch."
1748
msgstr ""
1749
1750
#: bzrlib/builtins.py:2869
1751
msgid "Print unknown files."
1752
msgstr ""
1753
1754
#: bzrlib/builtins.py:2870
1755
msgid "Print versioned files."
1756
msgstr ""
1757
1758
#: bzrlib/builtins.py:2873
1759
msgid "Print ignored files."
1760
msgstr ""
1761
1762
#: bzrlib/builtins.py:2875
1763
msgid "List entries of a particular kind: file, directory, symlink."
1764
msgstr ""
1765
1766
#: bzrlib/builtins.py:2888
1767
msgid "invalid kind specified"
1768
msgstr ""
1769
1770
#: bzrlib/builtins.py:2891
1771
msgid "Cannot set both --verbose and --null"
1772
msgstr ""
1773
1774
#: bzrlib/builtins.py:2900
1775
msgid "cannot specify both --from-root and PATH"
1776
msgstr ""
1777
1778
#: bzrlib/builtins.py:2987
1779
msgid "Ignore specified files or patterns."
1780
msgstr ""
1781
1782
#: bzrlib/builtins.py:2989
1783
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1784
msgstr ""
1785
1786
#: bzrlib/builtins.py:2991
1787
msgid ""
1788
"If a .bzrignore file does not exist, the ignore command\n"
1789
"will create one and add the specified files or patterns to the newly\n"
1790
"created file. The ignore command will also automatically add the \n"
1791
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1792
"the use of the ignore command will require an explicit add command."
1793
msgstr ""
1794
1795
#: bzrlib/builtins.py:2997
1796
msgid ""
1797
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1798
"After adding, editing or deleting that file either indirectly by\n"
1799
"using this command or directly by using an editor, be sure to commit\n"
1800
"it."
1801
msgstr ""
1802
1803
#: bzrlib/builtins.py:3002
1804
msgid ""
1805
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1806
"the global ignore file can be found in the application data directory as\n"
1807
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1808
"Global ignores are not touched by this command. The global ignore file\n"
1809
"can be edited directly using an editor."
1810
msgstr ""
1811
1812
#: bzrlib/builtins.py:3008
1813
msgid ""
1814
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1815
"precedence over regular ignores. Such exceptions are used to specify\n"
1816
"files that should be versioned which would otherwise be ignored."
1817
msgstr ""
1818
1819
#: bzrlib/builtins.py:3012
1820
msgid ""
1821
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1822
"precedence over the '!' exception patterns."
1823
msgstr ""
1824
1825
#: bzrlib/builtins.py:3015
1826
msgid ""
1827
":Notes: \n"
1828
" \n"
1829
"* Ignore patterns containing shell wildcards must be quoted from\n"
1830
" the shell on Unix."
1831
msgstr ""
1832
1833
#: bzrlib/builtins.py:3020
1834
msgid ""
1835
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1836
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1837
msgstr ""
1838
1839
#: bzrlib/builtins.py:3023
1840
msgid ""
1841
":Examples:\n"
1842
" Ignore the top level Makefile::"
1843
msgstr ""
1844
1845
#: bzrlib/builtins.py:3026
1846
msgid " bzr ignore ./Makefile"
1847
msgstr ""
1848
1849
#: bzrlib/builtins.py:3028
1850
msgid " Ignore .class files in all directories...::"
1851
msgstr ""
1852
1853
#: bzrlib/builtins.py:3030
1854
msgid " bzr ignore \"*.class\""
1855
msgstr ""
1856
1857
#: bzrlib/builtins.py:3032
1858
msgid " ...but do not ignore \"special.class\"::"
1859
msgstr ""
1860
1861
#: bzrlib/builtins.py:3034
1862
msgid " bzr ignore \"!special.class\""
1863
msgstr ""
1864
1865
#: bzrlib/builtins.py:3036
1866
msgid " Ignore files whose name begins with the \"#\" character::"
1867
msgstr ""
1868
1869
#: bzrlib/builtins.py:3038
1870
msgid " bzr ignore \"RE:^#\""
1871
msgstr ""
1872
1873
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
1874
msgid " Ignore .o files under the lib directory::"
1875
msgstr ""
1876
1877
#: bzrlib/builtins.py:3042
1878
msgid " bzr ignore \"lib/**/*.o\""
1879
msgstr ""
1880
1881
#: bzrlib/builtins.py:3046
1882
msgid " bzr ignore \"RE:lib/.*\\.o\""
1883
msgstr ""
1884
1885
#: bzrlib/builtins.py:3048
1886
msgid " Ignore everything but the \"debian\" toplevel directory::"
1887
msgstr ""
1888
1889
#: bzrlib/builtins.py:3050
1890
msgid ""
1891
" bzr ignore \"RE:(?!debian/).*\"\n"
1892
" \n"
1893
" Ignore everything except the \"local\" toplevel directory,\n"
1894
" but always ignore autosave files ending in ~, even under local/::\n"
1895
" \n"
1896
" bzr ignore \"*\"\n"
1897
" bzr ignore \"!./local\"\n"
1898
" bzr ignore \"!!*~\""
1899
msgstr ""
1900
1901
#: bzrlib/builtins.py:3064
1902
msgid "Display the default ignore rules that bzr uses."
1903
msgstr ""
1904
1905
#: bzrlib/builtins.py:3076
1906
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1907
msgstr ""
1908
1909
#: bzrlib/builtins.py:3087
1910
#, python-format
1911
msgid "Invalid ignore pattern found. %s"
1912
msgid_plural "Invalid ignore patterns found. %s"
1913
msgstr[0] ""
1914
msgstr[1] ""
1915
1916
#: bzrlib/builtins.py:3096
1917
msgid "NAME_PATTERN should not be an absolute path"
1918
msgstr ""
1919
1920
#: bzrlib/builtins.py:3109
1921
#, python-format
1922
msgid ""
1923
"Warning: the following files are version controlled and match your ignore "
1924
"pattern:\n"
1925
"%s\n"
1926
"These files will continue to be version controlled unless you 'bzr remove' "
1927
"them.\n"
1928
msgstr ""
1929
1930
#: bzrlib/builtins.py:3116
1931
msgid "List ignored files and the patterns that matched them."
1932
msgstr ""
1933
1934
#: bzrlib/builtins.py:3118
1935
msgid ""
1936
"List all the ignored files and the ignore pattern that caused the file to\n"
1937
"be ignored."
1938
msgstr ""
1939
1940
#: bzrlib/builtins.py:3121
1941
msgid "Alternatively, to list just the files::"
1942
msgstr ""
1943
1944
#: bzrlib/builtins.py:3123
1945
msgid " bzr ls --ignored"
1946
msgstr ""
1947
1948
#: bzrlib/builtins.py:3157
1949
#, python-format
1950
msgid "not a valid revision-number: %r"
1951
msgstr ""
1952
1953
#: bzrlib/builtins.py:3164
1954
msgid ""
1955
"Export current or past revision to a destination directory or archive."
1956
msgstr ""
1957
1958
#: bzrlib/builtins.py:3166
1959
msgid "If no revision is specified this exports the last committed revision."
1960
msgstr ""
1961
1962
#: bzrlib/builtins.py:3168
1963
msgid ""
1964
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1965
"given, try to find the format with the extension. If no extension\n"
1966
"is found exports to a directory (equivalent to --format=dir)."
1967
msgstr ""
1968
1969
#: bzrlib/builtins.py:3172
1970
msgid ""
1971
"If root is supplied, it will be used as the root directory inside\n"
1972
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1973
"to the exported filename. The root option has no effect for 'dir' format."
1974
msgstr ""
1975
1976
#: bzrlib/builtins.py:3176
1977
msgid ""
1978
"If branch is omitted then the branch containing the current working\n"
1979
"directory will be used."
1980
msgstr ""
1981
1982
#: bzrlib/builtins.py:3179
1983
msgid ""
1984
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1985
msgstr ""
1986
1987
#: bzrlib/builtins.py:3181
1988
msgid ""
1989
" ================= =========================\n"
1990
" Supported formats Autodetected by extension\n"
1991
" ================= =========================\n"
1992
" dir (none)\n"
1993
" tar .tar\n"
1994
" tbz2 .tar.bz2, .tbz2\n"
1995
" tgz .tar.gz, .tgz\n"
1996
" zip .zip\n"
1997
" ================= ========================="
1998
msgstr ""
1999
2000
#: bzrlib/builtins.py:3195
2001
msgid "Type of file to export to."
2002
msgstr ""
2003
2004
#: bzrlib/builtins.py:3198
2005
msgid "Apply content filters to export the convenient form."
2006
msgstr ""
2007
2008
#: bzrlib/builtins.py:3202
2009
msgid "Name of the root directory inside the exported file."
2010
msgstr ""
2011
2012
#: bzrlib/builtins.py:3204
2013
msgid ""
2014
"Set modification time of files to that of the last revision in which it was "
2015
"changed."
2016
msgstr ""
2017
2018
#: bzrlib/builtins.py:3207
2019
msgid ""
2020
"Export the working tree contents rather than that of the last revision."
2021
msgstr ""
2022
2023
#: bzrlib/builtins.py:3226
2024
msgid "--uncommitted requires a working tree"
2025
msgstr ""
2026
2027
#: bzrlib/builtins.py:3235
2028
#, python-format
2029
msgid "Unsupported export format: %s"
2030
msgstr ""
2031
2032
#: bzrlib/builtins.py:3239
2033
msgid ""
2034
"Write the contents of a file as of a given revision to standard output."
2035
msgstr ""
2036
2037
#: bzrlib/builtins.py:3241
2038
msgid "If no revision is nominated, the last revision is used."
2039
msgstr ""
2040
2041
#: bzrlib/builtins.py:3243
2042
msgid ""
2043
"Note: Take care to redirect standard output when using this command on a\n"
2044
"binary file."
2045
msgstr ""
2046
2047
#: bzrlib/builtins.py:3249
2048
msgid "The path name in the old tree."
2049
msgstr ""
2050
2051
#: bzrlib/builtins.py:3250
2052
msgid "Apply content filters to display the convenience form."
2053
msgstr ""
2054
2055
#: bzrlib/builtins.py:3261
2056
msgid "bzr cat --revision takes exactly one revision specifier"
2057
msgstr ""
2058
2059
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2060
msgid "{0!r} is not present in revision {1}"
2061
msgstr ""
2062
2063
#: bzrlib/builtins.py:3321
2064
msgid "Commit changes into a new revision."
2065
msgstr ""
2066
2067
#: bzrlib/builtins.py:3323
2068
msgid ""
2069
"An explanatory message needs to be given for each commit. This is\n"
2070
"often done by using the --message option (getting the message from the\n"
2071
"command line) or by using the --file option (getting the message from\n"
2072
"a file). If neither of these options is given, an editor is opened for\n"
2073
"the user to enter the message. To see the changed files in the\n"
2074
"boilerplate text loaded into the editor, use the --show-diff option."
2075
msgstr ""
2076
2077
#: bzrlib/builtins.py:3330
2078
msgid ""
2079
"By default, the entire tree is committed and the person doing the\n"
2080
"commit is assumed to be the author. These defaults can be overridden\n"
2081
"as explained below."
2082
msgstr ""
2083
2084
#: bzrlib/builtins.py:3334
2085
msgid ":Selective commits:"
2086
msgstr ""
2087
2088
#: bzrlib/builtins.py:3336
2089
msgid ""
2090
" If selected files are specified, only changes to those files are\n"
2091
" committed. If a directory is specified then the directory and\n"
2092
" everything within it is committed."
2093
msgstr ""
2094
2095
#: bzrlib/builtins.py:3340
2096
msgid ""
2097
" When excludes are given, they take precedence over selected files.\n"
2098
" For example, to commit only changes within foo, but not changes\n"
2099
" within foo/bar::"
2100
msgstr ""
2101
2102
#: bzrlib/builtins.py:3344
2103
msgid " bzr commit foo -x foo/bar"
2104
msgstr ""
2105
2106
#: bzrlib/builtins.py:3346
2107
msgid " A selective commit after a merge is not yet supported."
2108
msgstr ""
2109
2110
#: bzrlib/builtins.py:3348
2111
msgid ":Custom authors:"
2112
msgstr ""
2113
2114
#: bzrlib/builtins.py:3350
2115
msgid ""
2116
" If the author of the change is not the same person as the committer,\n"
2117
" you can specify the author's name using the --author option. The\n"
2118
" name should be in the same format as a committer-id, e.g.\n"
2119
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2120
" the change you can specify the option multiple times, once for each\n"
2121
" author."
2122
msgstr ""
2123
2124
#: bzrlib/builtins.py:3357
2125
msgid ":Checks:"
2126
msgstr ""
2127
2128
#: bzrlib/builtins.py:3359
2129
msgid ""
2130
" A common mistake is to forget to add a new file or directory before\n"
2131
" running the commit command. The --strict option checks for unknown\n"
2132
" files and aborts the commit if any are found. More advanced pre-commit\n"
2133
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2134
" for details."
2135
msgstr ""
2136
2137
#: bzrlib/builtins.py:3365
2138
msgid ":Things to note:"
2139
msgstr ""
2140
2141
#: bzrlib/builtins.py:3367
2142
msgid ""
2143
" If you accidentially commit the wrong changes or make a spelling\n"
2144
" mistake in the commit message say, you can use the uncommit command\n"
2145
" to undo it. See ``bzr help uncommit`` for details."
2146
msgstr ""
2147
2148
#: bzrlib/builtins.py:3371
2149
msgid ""
2150
" Hooks can also be configured to run after a commit. This allows you\n"
2151
" to trigger updates to external systems like bug trackers. The --fixes\n"
2152
" option can be used to record the association between a revision and\n"
2153
" one or more bugs. See ``bzr help bugs`` for details."
2154
msgstr ""
2155
2156
#: bzrlib/builtins.py:3381
2157
msgid "Do not consider changes made to a given path."
2158
msgstr ""
2159
2160
#: bzrlib/builtins.py:3384
2161
msgid "Description of the new revision."
2162
msgstr ""
2163
2164
#: bzrlib/builtins.py:3387
2165
msgid "Commit even if nothing has changed."
2166
msgstr ""
2167
2168
#: bzrlib/builtins.py:3391
2169
msgid "Take commit message from this file."
2170
msgstr ""
2171
2172
#: bzrlib/builtins.py:3393
2173
msgid "Refuse to commit if there are unknown files in the working tree."
2174
msgstr ""
2175
2176
#: bzrlib/builtins.py:3396
2177
msgid ""
2178
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2179
"08:00:00 +0100'."
2180
msgstr ""
2181
2182
#: bzrlib/builtins.py:3399
2183
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2184
msgstr ""
2185
2186
#: bzrlib/builtins.py:3402
2187
msgid "Set the author's name, if it's different from the committer."
2188
msgstr ""
2189
2190
#: bzrlib/builtins.py:3405
2191
msgid ""
2192
"Perform a local commit in a bound branch. Local commits are not pushed to "
2193
"the master branch until a normal commit is performed."
2194
msgstr ""
2195
2196
#: bzrlib/builtins.py:3411
2197
msgid ""
2198
"When no message is supplied, show the diff along with the status summary in "
2199
"the message editor."
2200
msgstr ""
2201
2202
#: bzrlib/builtins.py:3414
2203
msgid ""
2204
"When committing to a foreign version control system do not push data that "
2205
"can not be natively represented."
2206
msgstr ""
2207
2208
#: bzrlib/builtins.py:3432
2209
#, python-format
2210
msgid ""
2211
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2212
"default bug tracker using the `bugtracker` option.\n"
2213
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2214
msgstr ""
2215
2216
#: bzrlib/builtins.py:3441
2217
#, python-format
2218
msgid ""
2219
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2220
"for more information on this feature.\n"
2221
"Commit refused."
2222
msgstr ""
2223
2224
#: bzrlib/builtins.py:3450
2225
#, python-format
2226
msgid "Unrecognized bug %s. Commit refused."
2227
msgstr ""
2228
2229
#: bzrlib/builtins.py:3453
2230
#, python-format
2231
msgid ""
2232
"%s\n"
2233
"Commit refused."
2234
msgstr ""
2235
2236
#: bzrlib/builtins.py:3477
2237
msgid "Could not parse --commit-time: "
2238
msgstr ""
2239
2240
#: bzrlib/builtins.py:3517
2241
msgid "please specify either --message or --file"
2242
msgstr ""
2243
2244
#: bzrlib/builtins.py:3546
2245
msgid "please specify a commit message with either --message or --file"
2246
msgstr ""
2247
2248
#: bzrlib/builtins.py:3549
2249
msgid ""
2250
"Empty commit message specified. Please specify a commit message with either -"
2251
"-message or --file or leave a blank message with --message \"\"."
2252
msgstr ""
2253
2254
#: bzrlib/builtins.py:3569
2255
msgid ""
2256
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2257
"-unchanged to force an empty commit."
2258
msgstr ""
2259
2260
#: bzrlib/builtins.py:3573
2261
msgid ""
2262
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2263
"resolve FILE\" to resolve."
2264
msgstr ""
2265
2266
#: bzrlib/builtins.py:3577
2267
msgid "Commit refused because there are unknown files in the working tree."
2268
msgstr ""
2269
2270
#: bzrlib/builtins.py:3580
2271
msgid ""
2272
"\n"
2273
"To commit to master branch, run update and then commit.\n"
2274
"You can also pass --local to commit to continue working disconnected."
2275
msgstr ""
2276
2277
#: bzrlib/builtins.py:3588
2278
msgid ""
2279
"Validate working tree structure, branch consistency and repository history."
2280
msgstr ""
2281
2282
#: bzrlib/builtins.py:3590
2283
msgid ""
2284
"This command checks various invariants about branch and repository storage\n"
2285
"to detect data corruption or bzr bugs."
2286
msgstr ""
2287
2288
#: bzrlib/builtins.py:3593
2289
msgid ""
2290
"The working tree and branch checks will only give output if a problem is\n"
2291
"detected. The output fields of the repository check are:"
2292
msgstr ""
2293
2294
#: bzrlib/builtins.py:3596
2295
msgid ""
2296
"revisions\n"
2297
" This is just the number of revisions checked. It doesn't\n"
2298
" indicate a problem."
2299
msgstr ""
2300
2301
#: bzrlib/builtins.py:3600
2302
msgid ""
2303
"versionedfiles\n"
2304
" This is just the number of versionedfiles checked. It\n"
2305
" doesn't indicate a problem."
2306
msgstr ""
2307
2308
#: bzrlib/builtins.py:3604
2309
msgid ""
2310
"unreferenced ancestors\n"
2311
" Texts that are ancestors of other texts, but\n"
2312
" are not properly referenced by the revision ancestry. This is a\n"
2313
" subtle problem that Bazaar can work around."
2314
msgstr ""
2315
2316
#: bzrlib/builtins.py:3609
2317
msgid ""
2318
"unique file texts\n"
2319
" This is the total number of unique file contents\n"
2320
" seen in the checked revisions. It does not indicate a problem."
2321
msgstr ""
2322
2323
#: bzrlib/builtins.py:3613
2324
msgid ""
2325
"repeated file texts\n"
2326
" This is the total number of repeated texts seen\n"
2327
" in the checked revisions. Texts can be repeated when their file\n"
2328
" entries are modified, but the file contents are not. It does not\n"
2329
" indicate a problem."
2330
msgstr ""
2331
2332
#: bzrlib/builtins.py:3619
2333
msgid ""
2334
"If no restrictions are specified, all Bazaar data that is found at the "
2335
"given\n"
2336
"location will be checked."
2337
msgstr ""
2338
2339
#: bzrlib/builtins.py:3624
2340
msgid " Check the tree and branch at 'foo'::"
2341
msgstr ""
2342
2343
#: bzrlib/builtins.py:3626
2344
msgid " bzr check --tree --branch foo"
2345
msgstr ""
2346
2347
#: bzrlib/builtins.py:3628
2348
msgid " Check only the repository at 'bar'::"
2349
msgstr ""
2350
2351
#: bzrlib/builtins.py:3630
2352
msgid " bzr check --repo bar"
2353
msgstr ""
2354
2355
#: bzrlib/builtins.py:3632
2356
msgid " Check everything at 'baz'::"
2357
msgstr ""
2358
2359
#: bzrlib/builtins.py:3634
2360
msgid " bzr check baz"
2361
msgstr ""
2362
2363
#: bzrlib/builtins.py:3640
2364
msgid "Check the branch related to the current directory."
2365
msgstr ""
2366
2367
#: bzrlib/builtins.py:3642
2368
msgid "Check the repository related to the current directory."
2369
msgstr ""
2370
2371
#: bzrlib/builtins.py:3644
2372
msgid "Check the working tree related to the current directory."
2373
msgstr ""
2374
2375
#: bzrlib/builtins.py:3658
2376
msgid "Upgrade a repository, branch or working tree to a newer format."
2377
msgstr ""
2378
2379
#: bzrlib/builtins.py:3660
2380
msgid ""
2381
"When the default format has changed after a major new release of\n"
2382
"Bazaar, you may be informed during certain operations that you\n"
2383
"should upgrade. Upgrading to a newer format may improve performance\n"
2384
"or make new features available. It may however limit interoperability\n"
2385
"with older repositories or with older versions of Bazaar."
2386
msgstr ""
2387
2388
#: bzrlib/builtins.py:3666
2389
msgid ""
2390
"If you wish to upgrade to a particular format rather than the\n"
2391
"current default, that can be specified using the --format option.\n"
2392
"As a consequence, you can use the upgrade command this way to\n"
2393
"\"downgrade\" to an earlier format, though some conversions are\n"
2394
"a one way process (e.g. changing from the 1.x default to the\n"
2395
"2.x default) so downgrading is not always possible."
2396
msgstr ""
2397
2398
#: bzrlib/builtins.py:3673
2399
msgid ""
2400
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2401
"process (where # is a number). By default, this is left there on\n"
2402
"completion. If the conversion fails, delete the new .bzr directory\n"
2403
"and rename this one back in its place. Use the --clean option to ask\n"
2404
"for the backup.bzr directory to be removed on successful conversion.\n"
2405
"Alternatively, you can delete it by hand if everything looks good\n"
2406
"afterwards."
2407
msgstr ""
2408
2409
#: bzrlib/builtins.py:3681
2410
msgid ""
2411
"If the location given is a shared repository, dependent branches\n"
2412
"are also converted provided the repository converts successfully.\n"
2413
"If the conversion of a branch fails, remaining branches are still\n"
2414
"tried."
2415
msgstr ""
2416
2417
#: bzrlib/builtins.py:3686
2418
msgid ""
2419
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2420
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2421
msgstr ""
2422
2423
#: bzrlib/builtins.py:3694
2424
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2425
msgstr ""
2426
2427
#: bzrlib/builtins.py:3698
2428
msgid "Branch format"
2429
msgstr ""
2430
2431
#: bzrlib/builtins.py:3700
2432
msgid "Remove the backup.bzr directory if successful."
2433
msgstr ""
2434
2435
#: bzrlib/builtins.py:3702
2436
msgid "Show what would be done, but don't actually do anything."
2437
msgstr ""
2438
2439
#: bzrlib/builtins.py:3717
2440
msgid "Show or set bzr user id."
2441
msgstr ""
2442
2443
#: bzrlib/builtins.py:3719
2444
msgid ""
2445
":Examples:\n"
2446
" Show the email of the current user::"
2447
msgstr ""
2448
2449
#: bzrlib/builtins.py:3722
2450
msgid " bzr whoami --email"
2451
msgstr ""
2452
2453
#: bzrlib/builtins.py:3724
2454
msgid " Set the current user::"
2455
msgstr ""
2456
2457
#: bzrlib/builtins.py:3726
2458
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2459
msgstr ""
2460
2461
#: bzrlib/builtins.py:3730
2462
msgid "Display email address only."
2463
msgstr ""
2464
2465
#: bzrlib/builtins.py:3732
2466
msgid "Set identity for the current branch instead of globally."
2467
msgstr ""
2468
2469
#: bzrlib/builtins.py:3758
2470
msgid "--email can only be used to display existing identity"
2471
msgstr ""
2472
2473
#: bzrlib/builtins.py:3780
2474
msgid "Print or set the branch nickname."
2475
msgstr ""
2476
2477
#: bzrlib/builtins.py:3782
2478
msgid ""
2479
"If unset, the tree root directory name is used as the nickname.\n"
2480
"To print the current nickname, execute with no argument."
2481
msgstr ""
2482
2483
#: bzrlib/builtins.py:3785
2484
msgid ""
2485
"Bound branches use the nickname of its master branch unless it is set\n"
2486
"locally."
2487
msgstr ""
2488
2489
#: bzrlib/builtins.py:3805
2490
msgid "Set/unset and display aliases."
2491
msgstr ""
2492
2493
#: bzrlib/builtins.py:3807
2494
msgid ""
2495
":Examples:\n"
2496
" Show the current aliases::"
2497
msgstr ""
2498
2499
#: bzrlib/builtins.py:3810
2500
msgid " bzr alias"
2501
msgstr ""
2502
2503
#: bzrlib/builtins.py:3812
2504
msgid " Show the alias specified for 'll'::"
2505
msgstr ""
2506
2507
#: bzrlib/builtins.py:3814
2508
msgid " bzr alias ll"
2509
msgstr ""
2510
2511
#: bzrlib/builtins.py:3816
2512
msgid " Set an alias for 'll'::"
2513
msgstr ""
2514
2515
#: bzrlib/builtins.py:3818
2516
msgid " bzr alias ll=\"log --line -r-10..-1\""
2517
msgstr ""
2518
2519
#: bzrlib/builtins.py:3820
2520
msgid " To remove an alias for 'll'::"
2521
msgstr ""
2522
2523
#: bzrlib/builtins.py:3822
2524
msgid " bzr alias --remove ll"
2525
msgstr ""
2526
2527
#: bzrlib/builtins.py:3827
2528
msgid "Remove the alias."
2529
msgstr ""
2530
2531
#: bzrlib/builtins.py:3845
2532
msgid "bzr alias --remove expects an alias to remove."
2533
msgstr ""
2534
2535
#: bzrlib/builtins.py:4026
2536
msgid ""
2537
"subunit not available. subunit needs to be installed to use --subunit."
2538
msgstr ""
2539
2540
#: bzrlib/builtins.py:4043
2541
msgid ""
2542
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2543
msgstr ""
2544
2545
#: bzrlib/builtins.py:4090
2546
msgid "Show version of bzr."
2547
msgstr ""
2548
2549
#: bzrlib/builtins.py:4094
2550
msgid "Print just the version number."
2551
msgstr ""
2552
2553
#: bzrlib/builtins.py:4113
2554
msgid "It sure does!\n"
2555
msgstr ""
2556
2557
#: bzrlib/builtins.py:4137
2558
#, python-format
2559
msgid "merge base is revision %s\n"
2560
msgstr ""
2561
2562
#: bzrlib/builtins.py:4141
2563
msgid "Perform a three-way merge."
2564
msgstr ""
2565
2566
#: bzrlib/builtins.py:4143
2567
msgid ""
2568
"The source of the merge can be specified either in the form of a branch,\n"
2569
"or in the form of a path to a file containing a merge directive generated\n"
2570
"with bzr send. If neither is specified, the default is the upstream branch\n"
2571
"or the branch most recently merged using --remember. The source of the\n"
2572
"merge may also be specified in the form of a path to a file in another\n"
2573
"branch: in this case, only the modifications to that file are merged into\n"
2574
"the current working tree."
2575
msgstr ""
2576
2577
#: bzrlib/builtins.py:4151
2578
msgid ""
2579
"When merging from a branch, by default bzr will try to merge in all new\n"
2580
"work from the other branch, automatically determining an appropriate base\n"
2581
"revision. If this fails, you may need to give an explicit base."
2582
msgstr ""
2583
2584
#: bzrlib/builtins.py:4155
2585
msgid ""
2586
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2587
"try to merge in all new work up to and including revision OTHER."
2588
msgstr ""
2589
2590
#: bzrlib/builtins.py:4158
2591
msgid ""
2592
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2593
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2594
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2595
"not already contain revision BASE, such a merge is commonly referred to as\n"
2596
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2597
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2598
"changes from the other branch is not stored in the commit."
2599
msgstr ""
2600
2601
#: bzrlib/builtins.py:4166
2602
msgid "Revision numbers are always relative to the source branch."
2603
msgstr ""
2604
2605
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2606
msgid ""
2607
"Merge will do its best to combine the changes in two branches, but there\n"
2608
"are some kinds of problems only a human can fix. When it encounters those,\n"
2609
"it will mark a conflict. A conflict means that you need to fix something,\n"
2610
"before you should commit."
2611
msgstr ""
2612
2613
#: bzrlib/builtins.py:4173
2614
msgid ""
2615
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2616
msgstr ""
2617
2618
#: bzrlib/builtins.py:4175
2619
msgid ""
2620
"If there is no default branch set, the first merge will set it (use\n"
2621
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2622
"to use the default. To change the default, use --remember. The value will\n"
2623
"only be saved if the remote location can be accessed."
2624
msgstr ""
2625
2626
#: bzrlib/builtins.py:4180
2627
msgid ""
2628
"The results of the merge are placed into the destination working\n"
2629
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2630
"committed to record the result of the merge."
2631
msgstr ""
2632
2633
#: bzrlib/builtins.py:4184
2634
msgid ""
2635
"merge refuses to run if there are any uncommitted changes, unless\n"
2636
"--force is given. If --force is given, then the changes from the source \n"
2637
"will be merged with the current working tree, including any uncommitted\n"
2638
"changes in the tree. The --force option can also be used to create a\n"
2639
"merge revision which has more than two parents."
2640
msgstr ""
2641
2642
#: bzrlib/builtins.py:4190
2643
msgid ""
2644
"If one would like to merge changes from the working tree of the other\n"
2645
"branch without merging any committed revisions, the --uncommitted option\n"
2646
"can be given."
2647
msgstr ""
2648
2649
#: bzrlib/builtins.py:4194
2650
msgid ""
2651
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2652
"you to apply each diff hunk and file change, similar to \"shelve\"."
2653
msgstr ""
2654
2655
#: bzrlib/builtins.py:4197
2656
msgid ""
2657
":Examples:\n"
2658
" To merge all new revisions from bzr.dev::"
2659
msgstr ""
2660
2661
#: bzrlib/builtins.py:4200
2662
msgid " bzr merge ../bzr.dev"
2663
msgstr ""
2664
2665
#: bzrlib/builtins.py:4202
2666
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2667
msgstr ""
2668
2669
#: bzrlib/builtins.py:4204
2670
msgid " bzr merge -r 82 ../bzr.dev"
2671
msgstr ""
2672
2673
#: bzrlib/builtins.py:4206
2674
msgid " To merge the changes introduced by 82, without previous changes::"
2675
msgstr ""
2676
2677
#: bzrlib/builtins.py:4208
2678
msgid " bzr merge -r 81..82 ../bzr.dev"
2679
msgstr ""
2680
2681
#: bzrlib/builtins.py:4210
2682
msgid " To apply a merge directive contained in /tmp/merge::"
2683
msgstr ""
2684
2685
#: bzrlib/builtins.py:4212
2686
msgid " bzr merge /tmp/merge"
2687
msgstr ""
2688
2689
#: bzrlib/builtins.py:4214
2690
msgid ""
2691
" To create a merge revision with three parents from two branches\n"
2692
" feature1a and feature1b:"
2693
msgstr ""
2694
2695
#: bzrlib/builtins.py:4217
2696
msgid ""
2697
" bzr merge ../feature1a\n"
2698
" bzr merge ../feature1b --force\n"
2699
" bzr commit -m 'revision with three parents'"
2700
msgstr ""
2701
2702
#: bzrlib/builtins.py:4229
2703
msgid "Merge even if the destination tree has uncommitted changes."
2704
msgstr ""
2705
2706
#: bzrlib/builtins.py:4235
2707
msgid ""
2708
"Apply uncommitted changes from a working copy, instead of branch changes."
2709
msgstr ""
2710
2711
#: bzrlib/builtins.py:4237
2712
msgid ""
2713
"If the destination is already completely merged into the source, pull from "
2714
"the source rather than merging. When this happens, you do not need to "
2715
"commit the result."
2716
msgstr ""
2717
2718
#: bzrlib/builtins.py:4242
2719
msgid ""
2720
"Branch to merge into, rather than the one containing the working directory."
2721
msgstr ""
2722
2723
#: bzrlib/builtins.py:4244
2724
msgid "Instead of merging, show a diff of the merge."
2725
msgstr ""
2726
2727
#: bzrlib/builtins.py:4246
2728
msgid "Select changes interactively."
2729
msgstr ""
2730
2731
#: bzrlib/builtins.py:4268
2732
msgid ""
2733
"Merging into empty branches not currently supported, "
2734
"https://bugs.launchpad.net/bzr/+bug/308562"
2735
msgstr ""
2736
2737
#: bzrlib/builtins.py:4295
2738
msgid "Cannot use --uncommitted with bundles or merge directives."
2739
msgstr ""
2740
2741
#: bzrlib/builtins.py:4306
2742
msgid "Cannot use --uncommitted and --revision at the same time."
2743
msgstr ""
2744
2745
#: bzrlib/builtins.py:4326
2746
msgid "merger: "
2747
msgstr ""
2748
2749
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2750
msgid "Nothing to do."
2751
msgstr ""
2752
2753
#: bzrlib/builtins.py:4332
2754
msgid "Cannot pull individual files"
2755
msgstr ""
2756
2757
#: bzrlib/builtins.py:4340
2758
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2759
msgstr ""
2760
2761
#: bzrlib/builtins.py:4398
2762
#, python-format
2763
msgid "Show-base is not supported for this merge type. %s"
2764
msgstr ""
2765
2766
#: bzrlib/builtins.py:4407
2767
#, python-format
2768
msgid "Conflict reduction is not supported for merge type %s."
2769
msgstr ""
2770
2771
#: bzrlib/builtins.py:4411
2772
msgid "Cannot do conflict reduction and show base."
2773
msgstr ""
2774
2775
#: bzrlib/builtins.py:4522
2776
msgid "No location specified or remembered"
2777
msgstr ""
2778
2779
#: bzrlib/builtins.py:4524
2780
msgid "{0} remembered {1} location {2}"
2781
msgstr ""
2782
2783
#: bzrlib/builtins.py:4530
2784
msgid "Redo a merge."
2785
msgstr ""
2786
2787
#: bzrlib/builtins.py:4532
2788
msgid ""
2789
"Use this if you want to try a different merge technique while resolving\n"
2790
"conflicts. Some merge techniques are better than others, and remerge\n"
2791
"lets you try different ones on different files."
2792
msgstr ""
2793
2794
#: bzrlib/builtins.py:4536
2795
msgid ""
2796
"The options for remerge have the same meaning and defaults as the ones for\n"
2797
"merge. The difference is that remerge can (only) be run when there is a\n"
2798
"pending merge, and it lets you specify particular files."
2799
msgstr ""
2800
2801
#: bzrlib/builtins.py:4540
2802
msgid ""
2803
":Examples:\n"
2804
" Re-do the merge of all conflicted files, and show the base text in\n"
2805
" conflict regions, in addition to the usual THIS and OTHER texts::"
2806
msgstr ""
2807
2808
#: bzrlib/builtins.py:4544
2809
msgid " bzr remerge --show-base"
2810
msgstr ""
2811
2812
#: bzrlib/builtins.py:4546
2813
msgid ""
2814
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2815
" additional processing to reduce the size of conflict regions::"
2816
msgstr ""
2817
2818
#: bzrlib/builtins.py:4549
2819
msgid " bzr remerge --merge-type weave --reprocess foobar"
2820
msgstr ""
2821
2822
#: bzrlib/builtins.py:4556
2823
msgid "Show base revision text in conflicts."
2824
msgstr ""
2825
2826
#: bzrlib/builtins.py:4568
2827
msgid ""
2828
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2829
"merges."
2830
msgstr ""
2831
2832
#: bzrlib/builtins.py:4624
2833
msgid "Revert files to a previous revision."
2834
msgstr ""
2835
2836
#: bzrlib/builtins.py:4626
2837
msgid ""
2838
"Giving a list of files will revert only those files. Otherwise, all files\n"
2839
"will be reverted. If the revision is not specified with '--revision', the\n"
2840
"last committed revision is used."
2841
msgstr ""
2842
2843
#: bzrlib/builtins.py:4630
2844
msgid ""
2845
"To remove only some changes, without reverting to a prior version, use\n"
2846
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2847
"will remove the changes introduced by the second last commit (-2), without\n"
2848
"affecting the changes introduced by the last commit (-1). To remove\n"
2849
"certain changes on a hunk-by-hunk basis, see the shelve command."
2850
msgstr ""
2851
2852
#: bzrlib/builtins.py:4636
2853
msgid ""
2854
"By default, any files that have been manually changed will be backed up\n"
2855
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2856
"'.~#~' appended to their name, where # is a number."
2857
msgstr ""
2858
2859
#: bzrlib/builtins.py:4640
2860
msgid ""
2861
"When you provide files, you can use their current pathname or the pathname\n"
2862
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2863
"name. If you name a directory, all the contents of that directory will be\n"
2864
"reverted."
2865
msgstr ""
2866
2867
#: bzrlib/builtins.py:4645
2868
msgid ""
2869
"If you have newly added files since the target revision, they will be\n"
2870
"removed. If the files to be removed have been changed, backups will be\n"
2871
"created as above. Directories containing unknown files will not be\n"
2872
"deleted."
2873
msgstr ""
2874
2875
#: bzrlib/builtins.py:4650
2876
msgid ""
2877
"The working tree contains a list of revisions that have been merged but\n"
2878
"not yet committed. These revisions will be included as additional parents\n"
2879
"of the next commit. Normally, using revert clears that list as well as\n"
2880
"reverting the files. If any files are specified, revert leaves the list\n"
2881
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2882
".`` in the tree root to revert all files but keep the recorded merges,\n"
2883
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2884
"reverting any files."
2885
msgstr ""
2886
2887
#: bzrlib/builtins.py:4659
2888
msgid ""
2889
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2890
"changes from a branch in a single revision. To do this, perform the merge\n"
2891
"as desired. Then doing revert with the \"--forget-merges\" option will "
2892
"keep\n"
2893
"the content of the tree as it was, but it will clear the list of pending\n"
2894
"merges. The next commit will then contain all of the changes that are\n"
2895
"present in the other branch, but without any other parent revisions.\n"
2896
"Because this technique forgets where these changes originated, it may\n"
2897
"cause additional conflicts on later merges involving the same source and\n"
2898
"target branches."
2899
msgstr ""
2900
2901
#: bzrlib/builtins.py:4673
2902
msgid "Do not save backups of reverted files."
2903
msgstr ""
2904
2905
#: bzrlib/builtins.py:4675
2906
msgid "Remove pending merge marker, without changing any files."
2907
msgstr ""
2908
2909
#: bzrlib/builtins.py:4706
2910
msgid ""
2911
"Show help on a command or other topic.\n"
2912
" "
2913
msgstr ""
2914
2915
#: bzrlib/builtins.py:4711
2916
msgid "Show help on all commands."
2917
msgstr ""
2918
2919
#: bzrlib/builtins.py:4740
2920
msgid "Show unmerged/unpulled revisions between two branches."
2921
msgstr ""
2922
2923
#: bzrlib/builtins.py:4742
2924
msgid "OTHER_BRANCH may be local or remote."
2925
msgstr ""
2926
2927
#: bzrlib/builtins.py:4744
2928
msgid ""
2929
"To filter on a range of revisions, you can use the command -r begin..end\n"
2930
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2931
"also valid.\n"
2932
" \n"
2933
":Exit values:\n"
2934
" 1 - some missing revisions\n"
2935
" 0 - no missing revisions"
2936
msgstr ""
2937
2938
#: bzrlib/builtins.py:4754
2939
msgid ""
2940
" Determine the missing revisions between this and the branch at the\n"
2941
" remembered pull location::"
2942
msgstr ""
2943
2944
#: bzrlib/builtins.py:4757
2945
msgid " bzr missing"
2946
msgstr ""
2947
2948
#: bzrlib/builtins.py:4759
2949
msgid " Determine the missing revisions between this and another branch::"
2950
msgstr ""
2951
2952
#: bzrlib/builtins.py:4761
2953
msgid " bzr missing http://server/branch"
2954
msgstr ""
2955
2956
#: bzrlib/builtins.py:4763
2957
msgid ""
2958
" Determine the missing revisions up to a specific revision on the other\n"
2959
" branch::"
2960
msgstr ""
2961
2962
#: bzrlib/builtins.py:4766
2963
msgid " bzr missing -r ..-10"
2964
msgstr ""
2965
2966
#: bzrlib/builtins.py:4768
2967
msgid ""
2968
" Determine the missing revisions up to a specific revision on this\n"
2969
" branch::"
2970
msgstr ""
2971
2972
#: bzrlib/builtins.py:4771
2973
msgid " bzr missing --my-revision ..-10"
2974
msgstr ""
2975
2976
#: bzrlib/builtins.py:4778
2977
msgid "Reverse the order of revisions."
2978
msgstr ""
2979
2980
#: bzrlib/builtins.py:4780
2981
msgid "Display changes in the local branch only."
2982
msgstr ""
2983
2984
#: bzrlib/builtins.py:4781
2985
msgid "Same as --mine-only."
2986
msgstr ""
2987
2988
#: bzrlib/builtins.py:4783
2989
msgid "Display changes in the remote branch only."
2990
msgstr ""
2991
2992
#: bzrlib/builtins.py:4784
2993
msgid "Same as --theirs-only."
2994
msgstr ""
2995
2996
#: bzrlib/builtins.py:4789
2997
msgid ""
2998
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
2999
"details."
3000
msgstr ""
3001
3002
#: bzrlib/builtins.py:4793
3003
msgid ""
3004
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3005
"details."
3006
msgstr ""
3007
3008
#: bzrlib/builtins.py:4796
3009
msgid "Show all revisions in addition to the mainline ones."
3010
msgstr ""
3011
3012
#: bzrlib/builtins.py:4850
3013
msgid "No peer location known or specified."
3014
msgstr ""
3015
3016
#: bzrlib/builtins.py:4854
3017
msgid "Using saved parent location: {0}\n"
3018
msgstr ""
3019
3020
#: bzrlib/builtins.py:4887
3021
#, python-format
3022
msgid "You have %d extra revision:\n"
3023
msgid_plural "You have %d extra revisions:\n"
3024
msgstr[0] ""
3025
msgstr[1] ""
3026
3027
#: bzrlib/builtins.py:4903
3028
#, python-format
3029
msgid "You are missing %d revision:\n"
3030
msgid_plural "You are missing %d revisions:\n"
3031
msgstr[0] ""
3032
msgstr[1] ""
3033
3034
#: bzrlib/builtins.py:4915
3035
msgid "This branch has no new revisions.\n"
3036
msgstr ""
3037
3038
#: bzrlib/builtins.py:4918
3039
msgid "Other branch has no new revisions.\n"
3040
msgstr ""
3041
3042
#: bzrlib/builtins.py:4923
3043
msgid "Branches are up to date.\n"
3044
msgstr ""
3045
3046
#: bzrlib/builtins.py:4934
3047
msgid "Compress the data within a repository."
3048
msgstr ""
3049
3050
#: bzrlib/builtins.py:4936
3051
msgid ""
3052
"This operation compresses the data within a bazaar repository. As\n"
3053
"bazaar supports automatic packing of repository, this operation is\n"
3054
"normally not required to be done manually."
3055
msgstr ""
3056
3057
#: bzrlib/builtins.py:4940
3058
msgid ""
3059
"During the pack operation, bazaar takes a backup of existing repository\n"
3060
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3061
"automatically when it is safe to do so. To save disk space by removing\n"
3062
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3063
"used."
3064
msgstr ""
3065
3066
#: bzrlib/builtins.py:4946
3067
msgid ""
3068
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3069
"during or immediately after repacking, you may be left with a state\n"
3070
"where the deletion has been written to disk but the new packs have not\n"
3071
"been. In this case the repository may be unusable."
3072
msgstr ""
3073
3074
#: bzrlib/builtins.py:4955
3075
msgid "Delete obsolete packs to save disk space."
3076
msgstr ""
3077
3078
#: bzrlib/builtins.py:4969
3079
msgid "List the installed plugins."
3080
msgstr ""
3081
3082
#: bzrlib/builtins.py:4971
3083
msgid ""
3084
"This command displays the list of installed plugins including\n"
3085
"version of plugin and a short description of each."
3086
msgstr ""
3087
3088
#: bzrlib/builtins.py:4974
3089
msgid "--verbose shows the path where each plugin is located."
3090
msgstr ""
3091
3092
#: bzrlib/builtins.py:4976
3093
msgid ""
3094
"A plugin is an external component for Bazaar that extends the\n"
3095
"revision control system, by adding or replacing code in Bazaar.\n"
3096
"Plugins can do a variety of things, including overriding commands,\n"
3097
"adding new commands, providing additional network transports and\n"
3098
"customizing log output."
3099
msgstr ""
3100
3101
#: bzrlib/builtins.py:4982
3102
msgid ""
3103
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3104
"for further information on plugins including where to find them and how to\n"
3105
"install them. Instructions are also provided there on how to write new\n"
3106
"plugins using the Python programming language."
3107
msgstr ""
3108
3109
#: bzrlib/builtins.py:4998
3110
msgid "Show testament (signing-form) of a revision."
3111
msgstr ""
3112
3113
#: bzrlib/builtins.py:5001
3114
msgid "Produce long-format testament."
3115
msgstr ""
3116
3117
#: bzrlib/builtins.py:5003
3118
msgid "Produce a strict-format testament."
3119
msgstr ""
3120
3121
#: bzrlib/builtins.py:5029
3122
msgid "Show the origin of each line in a file."
3123
msgstr ""
3124
3125
#: bzrlib/builtins.py:5031
3126
msgid ""
3127
"This prints out the given file with an annotation on the left side\n"
3128
"indicating which revision, author and date introduced the change."
3129
msgstr ""
3130
3131
#: bzrlib/builtins.py:5034
3132
msgid ""
3133
"If the origin is the same for a run of consecutive lines, it is\n"
3134
"shown only at the top, unless the --all option is given."
3135
msgstr ""
3136
3137
#: bzrlib/builtins.py:5042
3138
msgid "Show annotations on all lines."
3139
msgstr ""
3140
3141
#: bzrlib/builtins.py:5043
3142
msgid "Show commit date in annotations."
3143
msgstr ""
3144
3145
#: bzrlib/builtins.py:5130
3146
msgid "Cannot sign a range of non-revision-history revisions"
3147
msgstr ""
3148
3149
#: bzrlib/builtins.py:5142
3150
msgid "Please supply either one revision, or a range."
3151
msgstr ""
3152
3153
#: bzrlib/builtins.py:5146
3154
msgid ""
3155
"Convert the current branch into a checkout of the supplied branch.\n"
3156
"If no branch is supplied, rebind to the last bound location."
3157
msgstr ""
3158
3159
#: bzrlib/builtins.py:5149
3160
msgid ""
3161
"Once converted into a checkout, commits must succeed on the master branch\n"
3162
"before they will be applied to the local branch."
3163
msgstr ""
3164
3165
#: bzrlib/builtins.py:5152
3166
msgid ""
3167
"Bound branches use the nickname of its master branch unless it is set\n"
3168
"locally, in which case binding will update the local nickname to be\n"
3169
"that of the master."
3170
msgstr ""
3171
3172
#: bzrlib/builtins.py:5167
3173
msgid "No location supplied. This format does not remember old locations."
3174
msgstr ""
3175
3176
#: bzrlib/builtins.py:5172
3177
msgid "Branch is already bound"
3178
msgstr ""
3179
3180
#: bzrlib/builtins.py:5174
3181
msgid "No location supplied and no previous location known"
3182
msgstr ""
3183
3184
#: bzrlib/builtins.py:5180
3185
msgid "These branches have diverged. Try merging, and then bind again."
3186
msgstr ""
3187
3188
#: bzrlib/builtins.py:5187
3189
msgid "Convert the current checkout into a regular branch."
3190
msgstr ""
3191
3192
#: bzrlib/builtins.py:5189
3193
msgid ""
3194
"After unbinding, the local branch is considered independent and subsequent\n"
3195
"commits will be local only."
3196
msgstr ""
3197
3198
#: bzrlib/builtins.py:5200
3199
msgid "Local branch is not bound"
3200
msgstr ""
3201
3202
#: bzrlib/builtins.py:5204
3203
msgid "Remove the last committed revision."
3204
msgstr ""
3205
3206
#: bzrlib/builtins.py:5206
3207
msgid ""
3208
"--verbose will print out what is being removed.\n"
3209
"--dry-run will go through all the motions, but not actually\n"
3210
"remove anything."
3211
msgstr ""
3212
3213
#: bzrlib/builtins.py:5210
3214
msgid ""
3215
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3216
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3217
"branch at revision 15."
3218
msgstr ""
3219
3220
#: bzrlib/builtins.py:5214
3221
msgid ""
3222
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3223
"it may make is to restore any pending merges that were present before\n"
3224
"the commit."
3225
msgstr ""
3226
3227
#: bzrlib/builtins.py:5225
3228
msgid "Don't actually make changes."
3229
msgstr ""
3230
3231
#: bzrlib/builtins.py:5226
3232
msgid "Say yes to all questions."
3233
msgstr ""
3234
3235
#: bzrlib/builtins.py:5228
3236
msgid "Keep tags that point to removed revisions."
3237
msgstr ""
3238
3239
#: bzrlib/builtins.py:5230
3240
msgid "Only remove the commits from the local branch when in a checkout."
3241
msgstr ""
3242
3243
#: bzrlib/builtins.py:5279
3244
msgid "No revisions to uncommit.\n"
3245
msgstr ""
3246
3247
#: bzrlib/builtins.py:5294
3248
msgid "Dry-run, pretending to remove the above revisions.\n"
3249
msgstr ""
3250
3251
#: bzrlib/builtins.py:5297
3252
msgid "The above revision(s) will be removed.\n"
3253
msgstr ""
3254
3255
#: bzrlib/builtins.py:5301
3256
msgid "Uncommit these revisions"
3257
msgstr ""
3258
3259
#: bzrlib/builtins.py:5304
3260
msgid "Canceled\n"
3261
msgstr ""
3262
3263
#: bzrlib/builtins.py:5311
3264
#, python-format
3265
msgid ""
3266
"You can restore the old tip by running:\n"
3267
" bzr pull . -r revid:%s\n"
3268
msgstr ""
3269
3270
#: bzrlib/builtins.py:5316
3271
msgid "Break a dead lock."
3272
msgstr ""
3273
3274
#: bzrlib/builtins.py:5318
3275
msgid ""
3276
"This command breaks a lock on a repository, branch, working directory or\n"
3277
"config file."
3278
msgstr ""
3279
3280
#: bzrlib/builtins.py:5321
3281
msgid ""
3282
"CAUTION: Locks should only be broken when you are sure that the process\n"
3283
"holding the lock has been stopped."
3284
msgstr ""
3285
3286
#: bzrlib/builtins.py:5324
3287
msgid ""
3288
"You can get information on what locks are open via the 'bzr info\n"
3289
"[location]' command."
3290
msgstr ""
3291
3292
#: bzrlib/builtins.py:5327
3293
msgid ""
3294
":Examples:\n"
3295
" bzr break-lock\n"
3296
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3297
" bzr break-lock --conf ~/.bazaar"
3298
msgstr ""
3299
3300
#: bzrlib/builtins.py:5336
3301
msgid "LOCATION is the directory where the config lock is."
3302
msgstr ""
3303
3304
#: bzrlib/builtins.py:5338
3305
msgid "Do not ask for confirmation before breaking the lock."
3306
msgstr ""
3307
3308
#: bzrlib/builtins.py:5373
3309
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3310
msgstr ""
3311
3312
#: bzrlib/builtins.py:5374
3313
msgid "Run the bzr server."
3314
msgstr ""
3315
3316
#: bzrlib/builtins.py:5380
3317
msgid "Serve on stdin/out for use from inetd or sshd."
3318
msgstr ""
3319
3320
#: bzrlib/builtins.py:5381
3321
msgid "protocol"
3322
msgstr ""
3323
3324
#: bzrlib/builtins.py:5382
3325
msgid "Protocol to serve."
3326
msgstr ""
3327
3328
#: bzrlib/builtins.py:5386
3329
msgid ""
3330
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3331
"Passing 0 as the port number will result in a dynamically allocated port. "
3332
"The default port depends on the protocol."
3333
msgstr ""
3334
3335
#: bzrlib/builtins.py:5392
3336
msgid "Serve contents of this directory."
3337
msgstr ""
3338
3339
#: bzrlib/builtins.py:5394
3340
msgid ""
3341
"By default the server is a readonly server. Supplying --allow-writes "
3342
"enables write access to the contents of the served directory and below. "
3343
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3344
"of external authentication is arranged supplying this option leads to global "
3345
"uncontrolled write access to your file system."
3346
msgstr ""
3347
3348
#: bzrlib/builtins.py:5403
3349
msgid "Override the default idle client timeout (5min)."
3350
msgstr ""
3351
3352
#: bzrlib/builtins.py:5453
3353
msgid "Combine a tree into its containing tree."
3354
msgstr ""
3355
3356
#: bzrlib/builtins.py:5455
3357
msgid "This command requires the target tree to be in a rich-root format."
3358
msgstr ""
3359
3360
#: bzrlib/builtins.py:5457
3361
msgid ""
3362
"The TREE argument should be an independent tree, inside another tree, but\n"
3363
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3364
"running \"bzr branch\" with the target inside a tree.)"
3365
msgstr ""
3366
3367
#: bzrlib/builtins.py:5461
3368
msgid ""
3369
"The result is a combined tree, with the subtree no longer an independent\n"
3370
"part. This is marked as a merge of the subtree into the containing tree,\n"
3371
"and all history is preserved."
3372
msgstr ""
3373
3374
#: bzrlib/builtins.py:5479
3375
#, python-format
3376
msgid ""
3377
"Can't join trees because %s doesn't support rich root data.\n"
3378
"You can use bzr upgrade on the repository."
3379
msgstr ""
3380
3381
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3382
msgid "Cannot join {0}. {1}"
3383
msgstr ""
3384
3385
#: bzrlib/builtins.py:5499
3386
msgid "Split a subdirectory of a tree into a separate tree."
3387
msgstr ""
3388
3389
#: bzrlib/builtins.py:5501
3390
msgid ""
3391
"This command will produce a target tree in a format that supports\n"
3392
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3393
"converted into earlier formats like 'dirstate-tags'."
3394
msgstr ""
3395
3396
#: bzrlib/builtins.py:5505
3397
msgid ""
3398
"The TREE argument should be a subdirectory of a working tree. That\n"
3399
"subdirectory will be converted into an independent tree, with its own\n"
3400
"branch. Commits in the top-level tree will not apply to the new subtree."
3401
msgstr ""
3402
3403
#: bzrlib/builtins.py:5585
3404
msgid "No submit branch specified or known"
3405
msgstr ""
3406
3407
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3408
msgid "No public branch specified or known"
3409
msgstr ""
3410
3411
#: bzrlib/builtins.py:5598
3412
msgid "bzr merge-directive takes at most two one revision identifiers"
3413
msgstr ""
3414
3415
#: bzrlib/builtins.py:5607
3416
msgid "No revisions to bundle."
3417
msgstr ""
3418
3419
#: bzrlib/builtins.py:5626
3420
msgid "Mail or create a merge-directive for submitting changes."
3421
msgstr ""
3422
3423
#: bzrlib/builtins.py:5628
3424
msgid "A merge directive provides many things needed for requesting merges:"
3425
msgstr ""
3426
3427
#: bzrlib/builtins.py:5630
3428
msgid "* A machine-readable description of the merge to perform"
3429
msgstr ""
3430
3431
#: bzrlib/builtins.py:5632
3432
msgid "* An optional patch that is a preview of the changes requested"
3433
msgstr ""
3434
3435
#: bzrlib/builtins.py:5634
3436
msgid ""
3437
"* An optional bundle of revision data, so that the changes can be applied\n"
3438
" directly from the merge directive, without retrieving data from a\n"
3439
" branch."
3440
msgstr ""
3441
3442
#: bzrlib/builtins.py:5638
3443
msgid ""
3444
"`bzr send` creates a compact data set that, when applied using bzr\n"
3445
"merge, has the same effect as merging from the source branch. "
3446
msgstr ""
3447
3448
#: bzrlib/builtins.py:5641
3449
msgid ""
3450
"By default the merge directive is self-contained and can be applied to any\n"
3451
"branch containing submit_branch in its ancestory without needing access to\n"
3452
"the source branch."
3453
msgstr ""
3454
3455
#: bzrlib/builtins.py:5645
3456
msgid ""
3457
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3458
"revisions, but only a structured request to merge from the\n"
3459
"public_location. In that case the public_branch is needed and it must be\n"
3460
"up-to-date and accessible to the recipient. The public_branch is always\n"
3461
"included if known, so that people can check it later."
3462
msgstr ""
3463
3464
#: bzrlib/builtins.py:5651
3465
msgid ""
3466
"The submit branch defaults to the parent of the source branch, but can be\n"
3467
"overridden. Both submit branch and public branch will be remembered in\n"
3468
"branch.conf the first time they are used for a particular branch. The\n"
3469
"source branch defaults to that containing the working directory, but can\n"
3470
"be changed using --from."
3471
msgstr ""
3472
3473
#: bzrlib/builtins.py:5657
3474
msgid ""
3475
"Both the submit branch and the public branch follow the usual behavior with\n"
3476
"respect to --remember: If there is no default location set, the first send\n"
3477
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3478
"omit the location to use the default. To change the default, use\n"
3479
"--remember. The value will only be saved if the location can be accessed."
3480
msgstr ""
3481
3482
#: bzrlib/builtins.py:5663
3483
msgid ""
3484
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3485
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3486
"If a public location is known for the submit_branch, that location is used\n"
3487
"in the merge directive."
3488
msgstr ""
3489
3490
#: bzrlib/builtins.py:5668
3491
msgid ""
3492
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3493
"given, in which case it is sent to a file."
3494
msgstr ""
3495
3496
#: bzrlib/builtins.py:5671
3497
msgid ""
3498
"Mail is sent using your preferred mail program. This should be transparent\n"
3499
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3500
"If the preferred client can't be found (or used), your editor will be used."
3501
msgstr ""
3502
3503
#: bzrlib/builtins.py:5675
3504
msgid ""
3505
"To use a specific mail program, set the mail_client configuration option.\n"
3506
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3507
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3508
"(MacOS X's\n"
3509
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3510
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3511
"add\n"
3512
"supported clients."
3513
msgstr ""
3514
3515
#: bzrlib/builtins.py:5682
3516
msgid ""
3517
"If mail is being sent, a to address is required. This can be supplied\n"
3518
"either on the commandline, by setting the submit_to configuration\n"
3519
"option in the branch itself or the child_submit_to configuration option\n"
3520
"in the submit branch."
3521
msgstr ""
3522
3523
#: bzrlib/builtins.py:5687
3524
msgid ""
3525
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3526
"and\n"
3527
"merge directive format 2. It is significantly faster and smaller than\n"
3528
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3529
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3530
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3531
msgstr ""
3532
3533
#: bzrlib/builtins.py:5693
3534
msgid ""
3535
"The merge directives created by bzr send may be applied using bzr merge or\n"
3536
"bzr pull by specifying a file containing a merge directive as the location."
3537
msgstr ""
3538
3539
#: bzrlib/builtins.py:5696
3540
msgid ""
3541
"bzr send makes extensive use of public locations to map local locations "
3542
"into\n"
3543
"URLs that can be used by other people. See `bzr help configuration` to\n"
3544
"set them, and use `bzr info` to display them."
3545
msgstr ""
3546
3547
#: bzrlib/builtins.py:5720
3548
msgid "Write merge directive to this file or directory; use - for stdout."
3549
msgstr ""
3550
3551
#: bzrlib/builtins.py:5724
3552
msgid ""
3553
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3554
"strict disables the check."
3555
msgstr ""
3556
3557
#: bzrlib/builtins.py:5726
3558
msgid "Mail the request to this address."
3559
msgstr ""
3560
3561
#: bzrlib/builtins.py:5730
3562
msgid "Body for the email."
3563
msgstr ""
3564
3565
#: bzrlib/builtins.py:5783
3566
msgid "Do not include a bundle in the merge directive."
3567
msgstr ""
3568
3569
#: bzrlib/builtins.py:5784
3570
msgid "Do not include a preview patch in the merge directive."
3571
msgstr ""
3572
3573
#: bzrlib/builtins.py:5787
3574
msgid "Remember submit and public branch."
3575
msgstr ""
3576
3577
#: bzrlib/builtins.py:5789
3578
msgid ""
3579
"Branch to generate the submission from, rather than the one containing the "
3580
"working directory."
3581
msgstr ""
3582
3583
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3584
msgid "format"
3585
msgstr ""
3586
3587
#: bzrlib/builtins.py:5800
3588
msgid "Use the specified output format."
3589
msgstr ""
3590
3591
#: bzrlib/builtins.py:5822
3592
msgid "Create, remove or modify a tag naming a revision."
3593
msgstr ""
3594
3595
#: bzrlib/builtins.py:5824
3596
msgid ""
3597
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3598
"(--revision) option can be given -rtag:X, where X is any previously\n"
3599
"created tag."
3600
msgstr ""
3601
3602
#: bzrlib/builtins.py:5828
3603
msgid ""
3604
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3605
"along when you branch, push, pull or merge."
3606
msgstr ""
3607
3608
#: bzrlib/builtins.py:5831
3609
msgid ""
3610
"It is an error to give a tag name that already exists unless you pass\n"
3611
"--force, in which case the tag is moved to point to the new revision."
3612
msgstr ""
3613
3614
#: bzrlib/builtins.py:5834
3615
msgid ""
3616
"To rename a tag (change the name but keep it on the same revsion), run "
3617
"``bzr\n"
3618
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3619
msgstr ""
3620
3621
#: bzrlib/builtins.py:5837
3622
msgid ""
3623
"If no tag name is specified it will be determined through the \n"
3624
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3625
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3626
"details."
3627
msgstr ""
3628
3629
#: bzrlib/builtins.py:5847
3630
msgid "Delete this tag rather than placing it."
3631
msgstr ""
3632
3633
#: bzrlib/builtins.py:5850
3634
msgid "Branch in which to place the tag."
3635
msgstr ""
3636
3637
#: bzrlib/builtins.py:5852
3638
msgid "Replace existing tags."
3639
msgstr ""
3640
3641
#: bzrlib/builtins.py:5867
3642
msgid "No tag specified to delete."
3643
msgstr ""
3644
3645
#: bzrlib/builtins.py:5869
3646
#, python-format
3647
msgid "Deleted tag %s."
3648
msgstr ""
3649
3650
#: bzrlib/builtins.py:5883
3651
msgid "Please specify a tag name."
3652
msgstr ""
3653
3654
#: bzrlib/builtins.py:5891
3655
#, python-format
3656
msgid "Tag %s already exists for that revision."
3657
msgstr ""
3658
3659
#: bzrlib/builtins.py:5895
3660
#, python-format
3661
msgid "Created tag %s."
3662
msgstr ""
3663
3664
#: bzrlib/builtins.py:5897
3665
#, python-format
3666
msgid "Updated tag %s."
3667
msgstr ""
3668
3669
#: bzrlib/builtins.py:5901
3670
msgid "List tags."
3671
msgstr ""
3672
3673
#: bzrlib/builtins.py:5903
3674
msgid ""
3675
"This command shows a table of tag names and the revisions they reference."
3676
msgstr ""
3677
3678
#: bzrlib/builtins.py:5909
3679
msgid "Branch whose tags should be displayed."
3680
msgstr ""
3681
3682
#: bzrlib/builtins.py:5911
3683
msgid "Sort tags by different criteria."
3684
msgstr ""
3685
3686
#: bzrlib/builtins.py:5911
3687
msgid "Sorting"
3688
msgstr ""
3689
3690
#: bzrlib/builtins.py:5980
3691
msgid "Reconfigure the type of a bzr directory."
3692
msgstr ""
3693
3694
#: bzrlib/builtins.py:5982
3695
msgid "A target configuration must be specified."
3696
msgstr ""
3697
3698
#: bzrlib/builtins.py:5984
3699
msgid ""
3700
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3701
"The order of preference is\n"
3702
"1. For a lightweight checkout, the current bound location.\n"
3703
"2. For branches that used to be checkouts, the previously-bound location.\n"
3704
"3. The push location.\n"
3705
"4. The parent location.\n"
3706
"If none of these is available, --bind-to must be specified."
3707
msgstr ""
3708
3709
#: bzrlib/builtins.py:5998
3710
msgid "Tree type"
3711
msgstr ""
3712
3713
#: bzrlib/builtins.py:5999
3714
msgid "The relation between branch and tree."
3715
msgstr ""
3716
3717
#: bzrlib/builtins.py:6001
3718
msgid "Reconfigure to be an unbound branch with no working tree."
3719
msgstr ""
3720
3721
#: bzrlib/builtins.py:6002
3722
msgid "Reconfigure to be an unbound branch with a working tree."
3723
msgstr ""
3724
3725
#: bzrlib/builtins.py:6003
3726
msgid "Reconfigure to be a bound branch with a working tree."
3727
msgstr ""
3728
3729
#: bzrlib/builtins.py:6004
3730
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3731
msgstr ""
3732
3733
#: bzrlib/builtins.py:6009
3734
msgid "Repository type"
3735
msgstr ""
3736
3737
#: bzrlib/builtins.py:6010
3738
msgid "Location fo the repository."
3739
msgstr ""
3740
3741
#: bzrlib/builtins.py:6012
3742
msgid ""
3743
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3744
msgstr ""
3745
3746
#: bzrlib/builtins.py:6014
3747
msgid "Reconfigure to use a shared repository."
3748
msgstr ""
3749
3750
#: bzrlib/builtins.py:6018
3751
msgid "Trees in Repository"
3752
msgstr ""
3753
3754
#: bzrlib/builtins.py:6019
3755
msgid "Whether new branches in the repository have trees."
3756
msgstr ""
3757
3758
#: bzrlib/builtins.py:6021
3759
msgid ""
3760
"Reconfigure repository to create working trees on branches by default."
3761
msgstr ""
3762
3763
#: bzrlib/builtins.py:6023
3764
msgid ""
3765
"Reconfigure repository to not create working trees on branches by default."
3766
msgstr ""
3767
3768
#: bzrlib/builtins.py:6026
3769
msgid "Branch to bind checkout to."
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:6028
3773
msgid "Perform reconfiguration even if local changes will be lost."
3774
msgstr ""
3775
3776
#: bzrlib/builtins.py:6031
3777
msgid "Reconfigure a branch to be stacked on another branch."
3778
msgstr ""
3779
3780
#: bzrlib/builtins.py:6035
3781
msgid ""
3782
"Reconfigure a branch to be unstacked. This may require copying substantial "
3783
"data into it."
3784
msgstr ""
3785
3786
#: bzrlib/builtins.py:6045
3787
msgid "Can't use both --stacked-on and --unstacked"
3788
msgstr ""
3789
3790
#: bzrlib/builtins.py:6059
3791
msgid "No target configuration specified"
3792
msgstr ""
3793
3794
#: bzrlib/builtins.py:6094
3795
msgid "Set the branch of a checkout and update."
3796
msgstr ""
3797
3798
#: bzrlib/builtins.py:6096
3799
msgid ""
3800
"For lightweight checkouts, this changes the branch being referenced.\n"
3801
"For heavyweight checkouts, this checks that there are no local commits\n"
3802
"versus the current bound branch, then it makes the local branch a mirror\n"
3803
"of the new location and binds to it."
3804
msgstr ""
3805
3806
#: bzrlib/builtins.py:6101
3807
msgid ""
3808
"In both cases, the working tree is updated and uncommitted changes\n"
3809
"are merged. The user can commit or revert these as they desire."
3810
msgstr ""
3811
3812
#: bzrlib/builtins.py:6104
3813
msgid "Pending merges need to be committed or reverted before using switch."
3814
msgstr ""
3815
3816
#: bzrlib/builtins.py:6106
3817
msgid ""
3818
"The path to the branch to switch to can be specified relative to the parent\n"
3819
"directory of the current branch. For example, if you are currently in a\n"
3820
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3821
"/path/to/newbranch."
3822
msgstr ""
3823
3824
#: bzrlib/builtins.py:6111
3825
msgid ""
3826
"Bound branches use the nickname of its master branch unless it is set\n"
3827
"locally, in which case switching will update the local nickname to be\n"
3828
"that of the master."
3829
msgstr ""
3830
3831
#: bzrlib/builtins.py:6119
3832
msgid "Switch even if local commits will be lost."
3833
msgstr ""
3834
3835
#: bzrlib/builtins.py:6122
3836
msgid "Create the target branch from this one before switching to it."
3837
msgstr ""
3838
3839
#: bzrlib/builtins.py:6134
3840
msgid "You must supply either a revision or a location"
3841
msgstr ""
3842
3843
#: bzrlib/builtins.py:6145
3844
msgid "cannot create branch without source branch"
3845
msgstr ""
3846
3847
#: bzrlib/builtins.py:6209
3848
msgid "Manage filtered views."
3849
msgstr ""
3850
3851
#: bzrlib/builtins.py:6211
3852
msgid ""
3853
"Views provide a mask over the tree so that users can focus on\n"
3854
"a subset of a tree when doing their work. After creating a view,\n"
3855
"commands that support a list of files - status, diff, commit, etc -\n"
3856
"effectively have that list of files implicitly given each time.\n"
3857
"An explicit list of files can still be given but those files\n"
3858
"must be within the current view."
3859
msgstr ""
3860
3861
#: bzrlib/builtins.py:6218
3862
msgid ""
3863
"In most cases, a view has a short life-span: it is created to make\n"
3864
"a selected change and is deleted once that change is committed.\n"
3865
"At other times, you may wish to create one or more named views\n"
3866
"and switch between them."
3867
msgstr ""
3868
3869
#: bzrlib/builtins.py:6223
3870
msgid ""
3871
"To disable the current view without deleting it, you can switch to\n"
3872
"the pseudo view called ``off``. This can be useful when you need\n"
3873
"to see the whole tree for an operation or two (e.g. merge) but\n"
3874
"want to switch back to your view after that."
3875
msgstr ""
3876
3877
#: bzrlib/builtins.py:6228
3878
msgid ""
3879
":Examples:\n"
3880
" To define the current view::"
3881
msgstr ""
3882
3883
#: bzrlib/builtins.py:6231
3884
msgid " bzr view file1 dir1 ..."
3885
msgstr ""
3886
3887
#: bzrlib/builtins.py:6233
3888
msgid " To list the current view::"
3889
msgstr ""
3890
3891
#: bzrlib/builtins.py:6235
3892
msgid " bzr view"
3893
msgstr ""
3894
3895
#: bzrlib/builtins.py:6237
3896
msgid " To delete the current view::"
3897
msgstr ""
3898
3899
#: bzrlib/builtins.py:6239
3900
msgid " bzr view --delete"
3901
msgstr ""
3902
3903
#: bzrlib/builtins.py:6241
3904
msgid " To disable the current view without deleting it::"
3905
msgstr ""
3906
3907
#: bzrlib/builtins.py:6243
3908
msgid " bzr view --switch off"
3909
msgstr ""
3910
3911
#: bzrlib/builtins.py:6245
3912
msgid " To define a named view and switch to it::"
3913
msgstr ""
3914
3915
#: bzrlib/builtins.py:6247
3916
msgid " bzr view --name view-name file1 dir1 ..."
3917
msgstr ""
3918
3919
#: bzrlib/builtins.py:6249
3920
msgid " To list a named view::"
3921
msgstr ""
3922
3923
#: bzrlib/builtins.py:6251
3924
msgid " bzr view --name view-name"
3925
msgstr ""
3926
3927
#: bzrlib/builtins.py:6253
3928
msgid " To delete a named view::"
3929
msgstr ""
3930
3931
#: bzrlib/builtins.py:6255
3932
msgid " bzr view --name view-name --delete"
3933
msgstr ""
3934
3935
#: bzrlib/builtins.py:6257
3936
msgid " To switch to a named view::"
3937
msgstr ""
3938
3939
#: bzrlib/builtins.py:6259
3940
msgid " bzr view --switch view-name"
3941
msgstr ""
3942
3943
#: bzrlib/builtins.py:6261
3944
msgid " To list all views defined::"
3945
msgstr ""
3946
3947
#: bzrlib/builtins.py:6263
3948
msgid " bzr view --all"
3949
msgstr ""
3950
3951
#: bzrlib/builtins.py:6265
3952
msgid " To delete all views::"
3953
msgstr ""
3954
3955
#: bzrlib/builtins.py:6267
3956
msgid " bzr view --delete --all"
3957
msgstr ""
3958
3959
#: bzrlib/builtins.py:6274
3960
msgid "Apply list or delete action to all views."
3961
msgstr ""
3962
3963
#: bzrlib/builtins.py:6277
3964
msgid "Delete the view."
3965
msgstr ""
3966
3967
#: bzrlib/builtins.py:6280
3968
msgid "Name of the view to define, list or delete."
3969
msgstr ""
3970
3971
#: bzrlib/builtins.py:6284
3972
msgid "Name of the view to switch to."
3973
msgstr ""
3974
3975
#: bzrlib/builtins.py:6303
3976
msgid "Both --delete and a file list specified"
3977
msgstr ""
3978
3979
#: bzrlib/builtins.py:6306
3980
msgid "Both --delete and --switch specified"
3981
msgstr ""
3982
3983
#: bzrlib/builtins.py:6309
3984
msgid "Deleted all views.\n"
3985
msgstr ""
3986
3987
#: bzrlib/builtins.py:6311
3988
msgid "No current view to delete"
3989
msgstr ""
3990
3991
#: bzrlib/builtins.py:6314
3992
#, python-format
3993
msgid "Deleted '%s' view.\n"
3994
msgstr ""
3995
3996
#: bzrlib/builtins.py:6318
3997
msgid "Both --switch and a file list specified"
3998
msgstr ""
3999
4000
#: bzrlib/builtins.py:6321
4001
msgid "Both --switch and --all specified"
4002
msgstr ""
4003
4004
#: bzrlib/builtins.py:6324
4005
msgid "No current view to disable"
4006
msgstr ""
4007
4008
#: bzrlib/builtins.py:6326
4009
#, python-format
4010
msgid "Disabled '%s' view.\n"
4011
msgstr ""
4012
4013
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4014
msgid "Using '{0}' view: {1}\n"
4015
msgstr ""
4016
4017
#: bzrlib/builtins.py:6333
4018
msgid "Views defined:\n"
4019
msgstr ""
4020
4021
#: bzrlib/builtins.py:6342
4022
msgid "No views defined.\n"
4023
msgstr ""
4024
4025
#: bzrlib/builtins.py:6349
4026
msgid "Cannot change the 'off' pseudo view"
4027
msgstr ""
4028
4029
#: bzrlib/builtins.py:6357
4030
msgid "No current view.\n"
4031
msgstr ""
4032
4033
#: bzrlib/builtins.py:6360
4034
msgid "'{0}' view is: {1}\n"
4035
msgstr ""
4036
4037
#: bzrlib/builtins.py:6380
4038
msgid " <no hooks installed>\n"
4039
msgstr ""
4040
4041
#: bzrlib/builtins.py:6384
4042
msgid "Remove a branch."
4043
msgstr ""
4044
4045
#: bzrlib/builtins.py:6386
4046
msgid ""
4047
"This will remove the branch from the specified location but \n"
4048
"will keep any working tree or repository in place."
4049
msgstr ""
4050
4051
#: bzrlib/builtins.py:6391
4052
msgid " Remove the branch at repo/trunk::"
4053
msgstr ""
4054
4055
#: bzrlib/builtins.py:6393
4056
msgid " bzr remove-branch repo/trunk"
4057
msgstr ""
4058
4059
#: bzrlib/builtins.py:6408
4060
msgid "Plaintext diff output."
4061
msgstr ""
4062
4063
#: bzrlib/builtins.py:6409
4064
msgid "Temporarily set aside some changes from the current tree."
4065
msgstr ""
4066
4067
#: bzrlib/builtins.py:6411
4068
msgid ""
4069
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4070
"ie. out of the way, until a later time when you can bring them back from\n"
4071
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4072
"your working tree, and so they aren't propagated along with your branch nor\n"
4073
"will they survive its deletion."
4074
msgstr ""
4075
4076
#: bzrlib/builtins.py:6417
4077
msgid "If shelve --list is specified, previously-shelved changes are listed."
4078
msgstr ""
4079
4080
#: bzrlib/builtins.py:6419
4081
msgid ""
4082
"Shelve is intended to help separate several sets of changes that have\n"
4083
"been inappropriately mingled. If you just want to get rid of all changes\n"
4084
"and you don't need to restore them later, use revert. If you want to\n"
4085
"shelve all text changes at once, use shelve --all."
4086
msgstr ""
4087
4088
#: bzrlib/builtins.py:6424
4089
msgid ""
4090
"If filenames are specified, only the changes to those files will be\n"
4091
"shelved. Other files will be left untouched."
4092
msgstr ""
4093
4094
#: bzrlib/builtins.py:6427
4095
msgid ""
4096
"If a revision is specified, changes since that revision will be shelved."
4097
msgstr ""
4098
4099
#: bzrlib/builtins.py:6429
4100
msgid ""
4101
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4102
"restore the most recently shelved changes."
4103
msgstr ""
4104
4105
#: bzrlib/builtins.py:6432
4106
msgid ""
4107
"For complicated changes, it is possible to edit the changes in a separate\n"
4108
"editor program to decide what the file remaining in the working copy\n"
4109
"should look like. To do this, add the configuration option"
4110
msgstr ""
4111
4112
#: bzrlib/builtins.py:6436
4113
msgid " change_editor = PROGRAM @new_path @old_path"
4114
msgstr ""
4115
4116
#: bzrlib/builtins.py:6438
4117
msgid ""
4118
"where @new_path is replaced with the path of the new version of the \n"
4119
"file and @old_path is replaced with the path of the old version of \n"
4120
"the file. The PROGRAM should save the new file with the desired \n"
4121
"contents of the file in the working tree.\n"
4122
" "
4123
msgstr ""
4124
4125
#: bzrlib/builtins.py:6450
4126
msgid "Shelve all changes."
4127
msgstr ""
4128
4129
#: bzrlib/builtins.py:6452
4130
msgid "Method to use for writing diffs."
4131
msgstr ""
4132
4133
#: bzrlib/builtins.py:6452
4134
msgid "writer"
4135
msgstr ""
4136
4137
#: bzrlib/builtins.py:6456
4138
msgid "List shelved changes."
4139
msgstr ""
4140
4141
#: bzrlib/builtins.py:6458
4142
msgid "Destroy removed changes instead of shelving them."
4143
msgstr ""
4144
4145
#: bzrlib/builtins.py:6487
4146
msgid "No shelved changes."
4147
msgstr ""
4148
4149
#: bzrlib/builtins.py:6498
4150
msgid "Restore shelved changes."
4151
msgstr ""
4152
4153
#: bzrlib/builtins.py:6500
4154
msgid ""
4155
"By default, the most recently shelved changes are restored. However if you\n"
4156
"specify a shelf by id those changes will be restored instead. This works\n"
4157
"best when the changes don't depend on each other."
4158
msgstr ""
4159
4160
#: bzrlib/builtins.py:6509
4161
msgid "The action to perform."
4162
msgstr ""
4163
4164
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4165
msgid "action"
4166
msgstr ""
4167
4168
#: bzrlib/builtins.py:6511
4169
msgid "Apply changes and remove from the shelf."
4170
msgstr ""
4171
4172
#: bzrlib/builtins.py:6512
4173
msgid "Show changes, but do not apply or remove them."
4174
msgstr ""
4175
4176
#: bzrlib/builtins.py:6513
4177
msgid ""
4178
"Instead of unshelving the changes, show the diff that would result from "
4179
"unshelving."
4180
msgstr ""
4181
4182
#: bzrlib/builtins.py:6515
4183
msgid "Delete changes without applying them."
4184
msgstr ""
4185
4186
#: bzrlib/builtins.py:6516
4187
msgid "Apply changes but don't delete them."
4188
msgstr ""
4189
4190
#: bzrlib/builtins.py:6531
4191
msgid "Remove unwanted files from working tree."
4192
msgstr ""
4193
4194
#: bzrlib/builtins.py:6533
4195
msgid ""
4196
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4197
"files are never deleted."
4198
msgstr ""
4199
4200
#: bzrlib/builtins.py:6536
4201
msgid ""
4202
"Another class is 'detritus', which includes files emitted by bzr during\n"
4203
"normal operations and selftests. (The value of these files decreases with\n"
4204
"time.)"
4205
msgstr ""
4206
4207
#: bzrlib/builtins.py:6540
4208
msgid ""
4209
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4210
"flags are respected, and may be combined."
4211
msgstr ""
4212
4213
#: bzrlib/builtins.py:6543
4214
msgid "To check what clean-tree will do, use --dry-run."
4215
msgstr ""
4216
4217
#: bzrlib/builtins.py:6546
4218
msgid "Delete all ignored files."
4219
msgstr ""
4220
4221
#: bzrlib/builtins.py:6547
4222
msgid ""
4223
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4224
msgstr ""
4225
4226
#: bzrlib/builtins.py:6550
4227
msgid "Delete files unknown to bzr (default)."
4228
msgstr ""
4229
4230
#: bzrlib/builtins.py:6551
4231
msgid "Show files to delete instead of deleting them."
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:6553
4235
msgid "Do not prompt before deleting."
4236
msgstr ""
4237
4238
#: bzrlib/bundle/__init__.py:59
4239
msgid "A directory cannot be a bundle"
4240
msgstr ""
4241
4242
#: bzrlib/bundle/apply_bundle.py:40
4243
msgid "Install revisions"
4244
msgstr ""
4245
4246
#: bzrlib/bundle/commands.py:64
4247
msgid "--verbose requires a merge directive"
4248
msgstr ""
4249
4250
#: bzrlib/bundle/commands.py:67
4251
msgid "Bundle format not supported"
4252
msgstr ""
4253
4254
#: bzrlib/bundle/commands.py:77
4255
msgid "Records\n"
4256
msgstr ""
4257
4258
#: bzrlib/bundle/commands.py:81
4259
msgid "{0}: {1} ({2} multiparent)\n"
4260
msgstr ""
4261
4262
#: bzrlib/bundle/commands.py:83
4263
#, python-format
4264
msgid "unique files: %d\n"
4265
msgstr ""
4266
4267
#: bzrlib/bundle/commands.py:92
4268
msgid "Revisions\n"
4269
msgstr ""
4270
4271
#: bzrlib/bundle/commands.py:93
4272
#, python-format
4273
msgid "nicks: %s\n"
4274
msgstr ""
4275
4276
#: bzrlib/bundle/commands.py:95
4277
#, python-format
4278
msgid ""
4279
"committers: \n"
4280
"%s\n"
4281
msgstr ""
4282
4283
#: bzrlib/bundle/commands.py:103
4284
msgid "Decoded contents\n"
4285
msgstr ""
4286
4287
#: bzrlib/bundle/serializer/v4.py:327
4288
#, python-format
4289
msgid "Bundling %d revision."
4290
msgid_plural "Bundling %d revisions."
4291
msgstr[0] ""
4292
msgstr[1] ""
4293
4294
#: bzrlib/bzrdir.py:489
4295
msgid ""
4296
"making backup of {0}\n"
4297
" to {1}"
4298
msgstr ""
4299
4300
#: bzrlib/bzrdir.py:512
4301
msgid "renamed {0} to {1}"
4302
msgstr ""
4303
4304
#: bzrlib/bzrdir.py:1663
4305
#, python-format
4306
msgid ""
4307
"Source repository format does not support stacking, using format:\n"
4308
" %s"
4309
msgstr ""
4310
4311
#: bzrlib/bzrdir.py:1683
4312
#, python-format
4313
msgid ""
4314
"Source branch format does not support stacking, using format:\n"
4315
" %s"
4316
msgstr ""
4317
4318
#: bzrlib/bzrdir.py:1829
4319
msgid "starting repository conversion"
4320
msgstr ""
4321
4322
#: bzrlib/bzrdir.py:2058
4323
msgid "Using default stacking branch {0} at {1}"
4324
msgstr ""
4325
4326
#: bzrlib/check.py:108
4327
msgid "check"
4328
msgstr ""
4329
4330
#: bzrlib/check.py:110
4331
msgid "checking revisions"
4332
msgstr ""
4333
4334
#: bzrlib/check.py:112
4335
msgid "checking commit contents"
4336
msgstr ""
4337
4338
#: bzrlib/check.py:114
4339
msgid "checking file graphs"
4340
msgstr ""
4341
4342
#: bzrlib/check.py:118
4343
msgid "checking branches and trees"
4344
msgstr ""
4345
4346
#: bzrlib/check.py:205
4347
msgid "checked repository {0} format {1}"
4348
msgstr ""
4349
4350
#: bzrlib/check.py:208
4351
#, python-format
4352
msgid "%6d revisions"
4353
msgstr ""
4354
4355
#: bzrlib/check.py:209
4356
#, python-format
4357
msgid "%6d file-ids"
4358
msgstr ""
4359
4360
#: bzrlib/check.py:211
4361
#, python-format
4362
msgid "%6d unreferenced text versions"
4363
msgstr ""
4364
4365
#: bzrlib/check.py:215
4366
msgid "unreferenced version: {{{0}}} in {1}"
4367
msgstr ""
4368
4369
#: bzrlib/check.py:218
4370
#, python-format
4371
msgid "%6d revisions are missing inventory_sha1"
4372
msgstr ""
4373
4374
#: bzrlib/check.py:221
4375
#, python-format
4376
msgid "%6d revisions are mentioned but not present"
4377
msgstr ""
4378
4379
#: bzrlib/check.py:224
4380
#, python-format
4381
msgid "%6d ghost revisions"
4382
msgstr ""
4383
4384
#: bzrlib/check.py:229
4385
#, python-format
4386
msgid "%6d revisions missing parents in ancestry"
4387
msgstr ""
4388
4389
#: bzrlib/check.py:233
4390
#, python-format
4391
msgid " %s should be in the ancestry for:"
4392
msgstr ""
4393
4394
#: bzrlib/check.py:237
4395
#, python-format
4396
msgid "%6d inconsistent parents"
4397
msgstr ""
4398
4399
#: bzrlib/check.py:241
4400
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4401
msgstr ""
4402
4403
#: bzrlib/check.py:247
4404
#, python-format
4405
msgid "%6d revisions have incorrect parents in the revision index"
4406
msgstr ""
4407
4408
#: bzrlib/check.py:253
4409
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4410
msgstr ""
4411
4412
#: bzrlib/check.py:267
4413
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4414
msgstr ""
4415
4416
#: bzrlib/check.py:296
4417
msgid ""
4418
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4419
"{{{4}}}"
4420
msgstr ""
4421
4422
#: bzrlib/check.py:354
4423
#, python-format
4424
msgid "Checking branch at '%s'."
4425
msgstr ""
4426
4427
#: bzrlib/check.py:374
4428
#, python-format
4429
msgid "Checking working tree at '%s'."
4430
msgstr ""
4431
4432
#: bzrlib/check.py:427 bzrlib/check.py:441
4433
msgid "No branch found at specified location."
4434
msgstr ""
4435
4436
#: bzrlib/check.py:429 bzrlib/check.py:439
4437
msgid "No working tree found at specified location."
4438
msgstr ""
4439
4440
#: bzrlib/check.py:432
4441
#, python-format
4442
msgid "Checking repository at '%s'."
4443
msgstr ""
4444
4445
#: bzrlib/check.py:443
4446
msgid "No repository found at specified location."
4447
msgstr ""
4448
4449
#: bzrlib/clean_tree.py:63
4450
msgid "Nothing to delete."
4451
msgstr ""
4452
4453
#: bzrlib/clean_tree.py:68
4454
msgid "Are you sure you wish to delete these"
4455
msgstr ""
4456
4457
#: bzrlib/clean_tree.py:70
4458
msgid "Canceled"
4459
msgstr ""
4460
4461
#: bzrlib/clean_tree.py:107
4462
#, python-format
4463
msgid "unable to remove %s"
4464
msgstr ""
4465
4466
#: bzrlib/clean_tree.py:111
4467
msgid "deleting paths:"
4468
msgstr ""
4469
4470
#: bzrlib/clean_tree.py:125
4471
msgid "unable to remove \"{0}\": {1}."
4472
msgstr ""
4473
4474
#: bzrlib/clean_tree.py:130
4475
msgid "No files deleted."
4476
msgstr ""
4477
4478
#: bzrlib/cmd_version_info.py:47
4479
msgid "No known version info format {0}. Supported types are: {1}"
4480
msgstr ""
4481
4482
#: bzrlib/cmd_version_info.py:52
4483
msgid "Version info in Custom template-based format."
4484
msgstr ""
4485
4486
#: bzrlib/cmd_version_info.py:52
4487
msgid "Version info in Python format."
4488
msgstr ""
4489
4490
#: bzrlib/cmd_version_info.py:52
4491
msgid "Version info in RIO (simple text) format (default)."
4492
msgstr ""
4493
4494
#: bzrlib/cmd_version_info.py:53
4495
msgid "Show version information about this tree."
4496
msgstr ""
4497
4498
#: bzrlib/cmd_version_info.py:55
4499
msgid ""
4500
"You can use this command to add information about version into\n"
4501
"source code of an application. The output can be in one of the\n"
4502
"supported formats or in a custom format based on a template."
4503
msgstr ""
4504
4505
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4506
#: en/help_topics/configuration.txt:710
4507
msgid "For example::"
4508
msgstr ""
4509
4510
#: bzrlib/cmd_version_info.py:61
4511
msgid ""
4512
" bzr version-info --custom \\\n"
4513
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4514
msgstr ""
4515
4516
#: bzrlib/cmd_version_info.py:64
4517
msgid ""
4518
"will produce a C header file with formatted string containing the\n"
4519
"current revision number. Other supported variables in templates are:"
4520
msgstr ""
4521
4522
#: bzrlib/cmd_version_info.py:67
4523
msgid ""
4524
" * {date} - date of the last revision\n"
4525
" * {build_date} - current date\n"
4526
" * {revno} - revision number\n"
4527
" * {revision_id} - revision id\n"
4528
" * {branch_nick} - branch nickname\n"
4529
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4530
" otherwise 1"
4531
msgstr ""
4532
4533
#: bzrlib/cmd_version_info.py:77
4534
msgid "Select the output format."
4535
msgstr ""
4536
4537
#: bzrlib/cmd_version_info.py:81
4538
msgid "Include all possible information."
4539
msgstr ""
4540
4541
#: bzrlib/cmd_version_info.py:82
4542
msgid "Check if tree is clean."
4543
msgstr ""
4544
4545
#: bzrlib/cmd_version_info.py:84
4546
msgid "Include the revision-history."
4547
msgstr ""
4548
4549
#: bzrlib/cmd_version_info.py:86
4550
msgid "Include the last revision for each file."
4551
msgstr ""
4552
4553
#: bzrlib/cmd_version_info.py:87
4554
msgid "Template for the output."
4555
msgstr ""
4556
4557
#: bzrlib/cmd_version_info.py:101
4558
msgid "bzr version-info --revision takes exactly one revision specifier"
4559
msgstr ""
4560
4561
#: bzrlib/commands.py:228
4562
#, python-format
4563
msgid "unknown command \"%s\""
4564
msgstr ""
4565
4566
#: bzrlib/commands.py:475
4567
msgid "No help for this command."
4568
msgstr ""
4569
4570
#: bzrlib/commands.py:488
4571
#, python-format
4572
msgid ":Purpose: %s\n"
4573
msgstr ""
4574
4575
#: bzrlib/commands.py:490
4576
#, python-format
4577
msgid ""
4578
":Usage:\n"
4579
"%s\n"
4580
msgstr ""
4581
4582
#: bzrlib/commands.py:492
4583
#, python-format
4584
msgid ":Usage: %s\n"
4585
msgstr ""
4586
4587
#: bzrlib/commands.py:511
4588
#, python-format
4589
msgid ":Options:%s"
4590
msgstr ""
4591
4592
#: bzrlib/commands.py:522
4593
#, python-format
4594
msgid ""
4595
":Description:\n"
4596
" %s\n"
4597
"\n"
4598
msgstr ""
4599
4600
#: bzrlib/commands.py:532
4601
#, python-format
4602
msgid ""
4603
"See bzr help %s for more details and examples.\n"
4604
"\n"
4605
msgstr ""
4606
4607
#: bzrlib/commands.py:537
4608
msgid ":Aliases: "
4609
msgstr ""
4610
4611
#: bzrlib/commands.py:541
4612
#, python-format
4613
msgid ":From: plugin \"%s\"\n"
4614
msgstr ""
4615
4616
#: bzrlib/commands.py:553
4617
msgid ":doc:`{0} <{1}-help>`"
4618
msgstr ""
4619
4620
#: bzrlib/commands.py:557
4621
#, python-format
4622
msgid ":See also: %s"
4623
msgstr ""
4624
4625
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4626
msgid "Only ASCII permitted in option names"
4627
msgstr ""
4628
4629
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4630
msgid "command {0!r} needs one or more {1}"
4631
msgstr ""
4632
4633
#: bzrlib/commands.py:857
4634
msgid "command {0!r} requires argument {1}"
4635
msgstr ""
4636
4637
#: bzrlib/commands.py:864
4638
msgid "extra argument to command {0}: {1}"
4639
msgstr ""
4640
4641
#: bzrlib/commands.py:961
4642
#, python-format
4643
msgid "Profile data written to \"%s\"."
4644
msgstr ""
4645
4646
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4647
msgid "added"
4648
msgstr ""
4649
4650
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4651
msgid "modified"
4652
msgstr ""
4653
4654
#: bzrlib/commit.py:131
4655
#, python-format
4656
msgid "Committing%s"
4657
msgstr ""
4658
4659
#: bzrlib/commit.py:134
4660
#, python-format
4661
msgid "Committed revision %d."
4662
msgstr ""
4663
4664
#: bzrlib/commit.py:143
4665
#, python-format
4666
msgid "deleted %s"
4667
msgstr ""
4668
4669
#: bzrlib/commit.py:146
4670
#, python-format
4671
msgid "missing %s"
4672
msgstr ""
4673
4674
#: bzrlib/commit.py:511
4675
msgid ""
4676
"Conflicting tags in bound branch:\n"
4677
"{0}"
4678
msgstr ""
4679
4680
#: bzrlib/commit.py:742
4681
msgid "renamed"
4682
msgstr ""
4683
4684
#: bzrlib/commit.py:977
4685
msgid "unchanged"
4686
msgstr ""
4687
4688
#: bzrlib/commit.py:999
4689
msgid "{0} [{1}] - Stage"
4690
msgstr ""
4691
4692
#: bzrlib/commit.py:1002
4693
#, python-format
4694
msgid "%s - Stage"
4695
msgstr ""
4696
4697
#: bzrlib/commit_signature_commands.py:36
4698
msgid "Sign all commits by a given committer."
4699
msgstr ""
4700
4701
#: bzrlib/commit_signature_commands.py:38
4702
msgid ""
4703
"If location is not specified the local tree is used.\n"
4704
"If committer is not specified the default committer is used."
4705
msgstr ""
4706
4707
#: bzrlib/commit_signature_commands.py:41
4708
msgid "This does not sign commits that already have signatures."
4709
msgstr ""
4710
4711
#: bzrlib/commit_signature_commands.py:49
4712
msgid ""
4713
"Don't actually sign anything, just print the revisions that would be signed."
4714
msgstr ""
4715
4716
#: bzrlib/commit_signature_commands.py:103
4717
msgid "Verify all commit signatures."
4718
msgstr ""
4719
4720
#: bzrlib/commit_signature_commands.py:105
4721
msgid ""
4722
"Verifies that all commits in the branch are signed by known GnuPG keys."
4723
msgstr ""
4724
4725
#: bzrlib/commit_signature_commands.py:110
4726
msgid ""
4727
"Comma separated list of GPG key patterns which are acceptable for "
4728
"verification."
4729
msgstr ""
4730
4731
#: bzrlib/commit_signature_commands.py:147
4732
msgid "Cannot verify a range of non-revision-history revisions"
4733
msgstr ""
4734
4735
#: bzrlib/commit_signature_commands.py:168
4736
msgid "All commits signed with verifiable keys"
4737
msgstr ""
4738
4739
#: bzrlib/config.py:475
4740
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4741
msgstr ""
4742
4743
#: bzrlib/config.py:2499
4744
msgid "{0} is not an SI unit."
4745
msgstr ""
4746
4747
#: bzrlib/config.py:2956
4748
msgid ""
4749
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4750
"will be saved."
4751
msgstr ""
4752
4753
#: bzrlib/config.py:3100
4754
#, python-format
4755
msgid "Invalid '%s', should be of the form 'name=value'"
4756
msgstr ""
4757
4758
#: bzrlib/config.py:3969
4759
msgid "Display, set or remove a configuration option."
4760
msgstr ""
4761
4762
#: bzrlib/config.py:3971
4763
msgid "Display the active value for a given option."
4764
msgstr ""
4765
4766
#: bzrlib/config.py:3973
4767
msgid ""
4768
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4769
"matching options are displayed mentioning their scope. The active value\n"
4770
"that bzr will take into account is the first one displayed for each option."
4771
msgstr ""
4772
4773
#: bzrlib/config.py:3977
4774
msgid "If no NAME is given, --all .* is implied."
4775
msgstr ""
4776
4777
#: bzrlib/config.py:3979
4778
msgid ""
4779
"Setting a value is achieved by using name=value without spaces. The value\n"
4780
"is set in the most relevant scope and can be checked by displaying the\n"
4781
"option again."
4782
msgstr ""
4783
4784
#: bzrlib/config.py:3991
4785
msgid "Reduce the scope to the specified configuration file."
4786
msgstr ""
4787
4788
#: bzrlib/config.py:3995
4789
msgid "Display all the defined values for the matching options."
4790
msgstr ""
4791
4792
#: bzrlib/config.py:3997
4793
msgid "Remove the option from the configuration file."
4794
msgstr ""
4795
4796
#: bzrlib/conflicts.py:50
4797
msgid "List files with conflicts."
4798
msgstr ""
4799
4800
#: bzrlib/conflicts.py:57
4801
msgid ""
4802
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4803
"is supplied, the pathnames of files with text conflicts are listed,\n"
4804
"instead. (This is useful for editing all files with text conflicts.)"
4805
msgstr ""
4806
4807
#: bzrlib/conflicts.py:61
4808
msgid "Use bzr resolve when you have fixed a problem."
4809
msgstr ""
4810
4811
#: bzrlib/conflicts.py:66
4812
msgid "List paths of files with text conflicts."
4813
msgstr ""
4814
4815
#: bzrlib/conflicts.py:85
4816
msgid "Marks the conflict as resolved."
4817
msgstr ""
4818
4819
#: bzrlib/conflicts.py:88
4820
msgid "Resolve the conflict preserving the version in the working tree."
4821
msgstr ""
4822
4823
#: bzrlib/conflicts.py:91
4824
msgid "Resolve the conflict taking the merged version into account."
4825
msgstr ""
4826
4827
#: bzrlib/conflicts.py:98
4828
msgid "How to resolve the conflict."
4829
msgstr ""
4830
4831
#: bzrlib/conflicts.py:104
4832
msgid "Mark a conflict as resolved."
4833
msgstr ""
4834
4835
#: bzrlib/conflicts.py:111
4836
msgid ""
4837
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4838
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4839
"as\n"
4840
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4841
msgstr ""
4842
4843
#: bzrlib/conflicts.py:119
4844
msgid "Resolve all conflicts in this tree."
4845
msgstr ""
4846
4847
#: bzrlib/conflicts.py:126
4848
msgid "If --all is specified, no FILE may be provided"
4849
msgstr ""
4850
4851
#: bzrlib/conflicts.py:151
4852
#, python-format
4853
msgid "%d conflict auto-resolved."
4854
msgid_plural "%d conflicts auto-resolved."
4855
msgstr[0] ""
4856
msgstr[1] ""
4857
4858
#: bzrlib/conflicts.py:154
4859
msgid "Remaining conflicts:"
4860
msgstr ""
4861
4862
#: bzrlib/conflicts.py:159
4863
msgid "All conflicts resolved."
4864
msgstr ""
4865
4866
#: bzrlib/conflicts.py:168
4867
msgid "{0} conflict resolved, {1} remaining"
4868
msgid_plural "{0} conflicts resolved, {1} remaining"
4869
msgstr[0] ""
4870
msgstr[1] ""
4871
4872
#: bzrlib/controldir.py:698
4873
msgid "{0} is{1} redirected to {2}"
4874
msgstr ""
4875
4876
#: bzrlib/diff.py:399
4877
#, python-format
4878
msgid "*** Ignoring files outside view. View is %s"
4879
msgstr ""
4880
4881
#: bzrlib/errors.py:157
4882
msgid "The tree builder is already building a tree."
4883
msgstr ""
4884
4885
#: bzrlib/errors.py:178
4886
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4887
msgstr ""
4888
4889
#: bzrlib/errors.py:197
4890
msgid ""
4891
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4892
"versions \"%(minimum)s\" to \"%(current)s\"."
4893
msgstr ""
4894
4895
#: bzrlib/errors.py:209
4896
msgid "The transport '%(transport)s' is only accessible within this process."
4897
msgstr ""
4898
4899
#: bzrlib/errors.py:227
4900
msgid "Invalid revision number %(revno)s"
4901
msgstr ""
4902
4903
#: bzrlib/errors.py:236
4904
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4905
msgstr ""
4906
4907
#: bzrlib/errors.py:247
4908
msgid "Reserved revision-id {%(revision_id)s}"
4909
msgstr ""
4910
4911
#: bzrlib/errors.py:261
4912
msgid "There is no public branch set for \"%(branch_url)s\"."
4913
msgstr ""
4914
4915
#: bzrlib/errors.py:271
4916
msgid ""
4917
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4918
"obtain a list of topics."
4919
msgstr ""
4920
4921
#: bzrlib/errors.py:280
4922
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4923
msgstr ""
4924
4925
#: bzrlib/errors.py:290
4926
msgid ""
4927
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4928
msgstr ""
4929
4930
#: bzrlib/errors.py:299
4931
msgid "The branch '%(branch)s' is not stacked."
4932
msgstr ""
4933
4934
#: bzrlib/errors.py:313
4935
msgid "No WorkingTree exists for \"%(base)s\"."
4936
msgstr ""
4937
4938
#: bzrlib/errors.py:322
4939
msgid "Not currently building a tree."
4940
msgstr ""
4941
4942
#: bzrlib/errors.py:327
4943
msgid "%(url)s is not a local path."
4944
msgstr ""
4945
4946
#: bzrlib/errors.py:355
4947
msgid "%(not_locked)r is not write locked but needs to be."
4948
msgstr ""
4949
4950
#: bzrlib/errors.py:363
4951
msgid "Error in command line options"
4952
msgstr ""
4953
4954
#: bzrlib/errors.py:368
4955
msgid "%(value)s is not an index of type %(_type)s."
4956
msgstr ""
4957
4958
#: bzrlib/errors.py:378
4959
msgid "Error in data for index %(value)s."
4960
msgstr ""
4961
4962
#: bzrlib/errors.py:387
4963
msgid "The key '%(key)s' is already in index '%(index)s'."
4964
msgstr ""
4965
4966
#: bzrlib/errors.py:397
4967
msgid "The key '%(key)s' is not a valid key."
4968
msgstr ""
4969
4970
#: bzrlib/errors.py:406
4971
msgid "Could not parse options for index %(value)s."
4972
msgstr ""
4973
4974
#: bzrlib/errors.py:415
4975
msgid "The value '%(value)s' is not a valid value."
4976
msgstr ""
4977
4978
#: bzrlib/errors.py:443
4979
msgid "Generic path error: %(path)r%(extra)s)"
4980
msgstr ""
4981
4982
#: bzrlib/errors.py:456
4983
msgid "No such file: %(path)r%(extra)s"
4984
msgstr ""
4985
4986
#: bzrlib/errors.py:461
4987
msgid "File exists: %(path)r%(extra)s"
4988
msgstr ""
4989
4990
#: bzrlib/errors.py:467
4991
msgid ""
4992
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
4993
"after to tell bzr about a rename that has already happened)%(extra)s"
4994
msgstr ""
4995
4996
#: bzrlib/errors.py:483
4997
msgid "\"%(path)s\" is not a directory %(extra)s"
4998
msgstr ""
4999
5000
#: bzrlib/errors.py:488
5001
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5002
msgstr ""
5003
5004
#: bzrlib/errors.py:493
5005
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5006
msgstr ""
5007
5008
#: bzrlib/errors.py:498
5009
msgid "Hard-linking \"%(path)s\" is not supported"
5010
msgstr ""
5011
5012
#: bzrlib/errors.py:513
5013
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5014
msgstr ""
5015
5016
#: bzrlib/errors.py:518
5017
msgid "Permission denied: \"%(path)s\"%(extra)s"
5018
msgstr ""
5019
5020
#: bzrlib/errors.py:523
5021
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5022
msgstr ""
5023
5024
#: bzrlib/errors.py:528
5025
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5026
msgstr ""
5027
5028
#: bzrlib/errors.py:539
5029
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5030
msgstr ""
5031
5032
#: bzrlib/errors.py:561
5033
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5034
msgstr ""
5035
5036
#: bzrlib/errors.py:571
5037
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5038
msgstr ""
5039
5040
#: bzrlib/errors.py:579
5041
msgid ""
5042
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5043
"upgrade the branch to permit branch stacking."
5044
msgstr ""
5045
5046
#: bzrlib/errors.py:590
5047
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5048
msgstr ""
5049
5050
#: bzrlib/errors.py:600
5051
msgid ""
5052
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5053
"need to upgrade the repository to permit branch stacking."
5054
msgstr ""
5055
5056
#: bzrlib/errors.py:611
5057
msgid "Error reading from %(path)r."
5058
msgstr ""
5059
5060
#: bzrlib/errors.py:630
5061
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5062
msgstr ""
5063
5064
#: bzrlib/errors.py:646
5065
msgid "Path \"%(path)s\" is not unicode normalized"
5066
msgstr ""
5067
5068
#: bzrlib/errors.py:654
5069
msgid "Not a branch: \"%(path)s\"%(detail)s."
5070
msgstr ""
5071
5072
#: bzrlib/errors.py:696
5073
msgid "No submit branch available for branch \"%(path)s\""
5074
msgstr ""
5075
5076
#: bzrlib/errors.py:705
5077
msgid "Already a branch: \"%(path)s\"."
5078
msgstr ""
5079
5080
#: bzrlib/errors.py:711
5081
msgid ""
5082
"Directory contains a branch, but no working tree (use bzr checkout if you "
5083
"wish to build a working tree): \"%(path)s\""
5084
msgstr ""
5085
5086
#: bzrlib/errors.py:716
5087
msgid ""
5088
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5089
msgstr ""
5090
5091
#: bzrlib/errors.py:726
5092
msgid ""
5093
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5094
msgstr ""
5095
5096
#: bzrlib/errors.py:736
5097
msgid "No repository present: \"%(path)s\""
5098
msgstr ""
5099
5100
#: bzrlib/errors.py:743
5101
msgid ""
5102
"Unsupported branch format: %(format)s\n"
5103
"Please run 'bzr upgrade'"
5104
msgstr ""
5105
5106
#: bzrlib/errors.py:749
5107
msgid "Unknown %(kind)s format: %(format)r"
5108
msgstr ""
5109
5110
#: bzrlib/errors.py:758
5111
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5112
msgstr ""
5113
5114
#: bzrlib/errors.py:768
5115
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5116
msgstr ""
5117
5118
#: bzrlib/errors.py:783
5119
msgid ""
5120
"%(target)s\n"
5121
"is not compatible with\n"
5122
"%(source)s\n"
5123
"%(details)s"
5124
msgstr ""
5125
5126
#: bzrlib/errors.py:799
5127
msgid "Revision is not compatible with %(repo_format)s"
5128
msgstr ""
5129
5130
#: bzrlib/errors.py:809
5131
msgid "%(context_info)s%(path)s is already versioned."
5132
msgstr ""
5133
5134
#: bzrlib/errors.py:830
5135
msgid "%(context_info)s%(path)s is not versioned."
5136
msgstr ""
5137
5138
#: bzrlib/errors.py:851
5139
msgid "Path(s) are not versioned: %(paths_as_string)s"
5140
msgstr ""
5141
5142
#: bzrlib/errors.py:862
5143
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5144
msgstr ""
5145
5146
#: bzrlib/errors.py:881
5147
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5148
msgstr ""
5149
5150
#: bzrlib/errors.py:889
5151
msgid ""
5152
"Filename %(filename)r is not valid in your current filesystem encoding "
5153
"%(fs_encoding)s"
5154
msgstr ""
5155
5156
#: bzrlib/errors.py:900
5157
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5158
msgstr ""
5159
5160
#: bzrlib/errors.py:918
5161
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5162
msgstr ""
5163
5164
#: bzrlib/errors.py:957
5165
msgid "Cannot lock %(lock)s: %(why)s"
5166
msgstr ""
5167
5168
#: bzrlib/errors.py:967
5169
msgid ""
5170
"A transaction related operation was attempted after the transaction finished."
5171
msgstr ""
5172
5173
#: bzrlib/errors.py:994
5174
msgid "Cannot lock: transport is read only: %(transport)s"
5175
msgstr ""
5176
5177
#: bzrlib/errors.py:1002
5178
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5179
msgstr ""
5180
5181
#: bzrlib/errors.py:1013
5182
msgid ""
5183
"Lock was broken while still open: %(lock)s - check storage consistency!"
5184
msgstr ""
5185
5186
#: bzrlib/errors.py:1024
5187
msgid ""
5188
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5189
"%(holder)r, wanted to break %(target)r"
5190
msgstr ""
5191
5192
#: bzrlib/errors.py:1036
5193
msgid ""
5194
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5195
"Use 'bzr break-lock' to clear it"
5196
msgstr ""
5197
5198
#: bzrlib/errors.py:1049
5199
msgid "Lock not held: %(lock)s"
5200
msgstr ""
5201
5202
#: bzrlib/errors.py:1078
5203
msgid "No changes to commit"
5204
msgstr ""
5205
5206
#: bzrlib/errors.py:1083
5207
msgid ""
5208
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5209
msgstr ""
5210
5211
#: bzrlib/errors.py:1093
5212
msgid ""
5213
"Excluding paths during commit is not supported by repository at "
5214
"%(repository)r."
5215
msgstr ""
5216
5217
#: bzrlib/errors.py:1102
5218
msgid ""
5219
"The specified commit message contains characters unsupported by the current "
5220
"encoding."
5221
msgstr ""
5222
5223
#: bzrlib/errors.py:1108
5224
msgid "Upgrade URL cannot work with readonly URLs."
5225
msgstr ""
5226
5227
#: bzrlib/errors.py:1113
5228
msgid "The branch format %(format)s is already at the most recent format."
5229
msgstr ""
5230
5231
#: bzrlib/errors.py:1136
5232
msgid "Option --change does not accept revision ranges"
5233
msgstr ""
5234
5235
#: bzrlib/errors.py:1141
5236
msgid "No namespace registered for string: %(spec)r"
5237
msgstr ""
5238
5239
#: bzrlib/errors.py:1160
5240
msgid ""
5241
"Requested revision: '%(spec)s' does not exist in branch: "
5242
"%(branch_url)s%(extra)s"
5243
msgstr ""
5244
5245
#: bzrlib/errors.py:1174
5246
msgid ""
5247
"Operation denied because it would change the main history, which is not "
5248
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5249
msgstr ""
5250
5251
#: bzrlib/errors.py:1185
5252
msgid ""
5253
"These branches have diverged. Use the missing command to see how.\n"
5254
"Use the merge command to reconcile them."
5255
msgstr ""
5256
5257
#: bzrlib/errors.py:1205
5258
msgid ""
5259
"Branches have no common ancestor, and no merge base revision was specified."
5260
msgstr ""
5261
5262
#: bzrlib/errors.py:1211
5263
msgid ""
5264
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5265
msgstr ""
5266
5267
#: bzrlib/errors.py:1217
5268
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5269
msgstr ""
5270
5271
#: bzrlib/errors.py:1226
5272
msgid ""
5273
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5274
msgstr ""
5275
5276
#: bzrlib/errors.py:1235
5277
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5278
msgstr ""
5279
5280
#: bzrlib/errors.py:1244
5281
msgid "Branch %(branch)s has no commits."
5282
msgstr ""
5283
5284
#: bzrlib/errors.py:1262
5285
msgid ""
5286
"Bound branch %(branch)s is out of date with master branch "
5287
"%(master)s.%(extra_help)s"
5288
msgstr ""
5289
5290
#: bzrlib/errors.py:1274
5291
msgid ""
5292
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5293
"bound to %(remote)s."
5294
msgstr ""
5295
5296
#: bzrlib/errors.py:1286
5297
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5298
msgstr ""
5299
5300
#: bzrlib/errors.py:1295
5301
msgid ""
5302
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5303
"%(error)s"
5304
msgstr ""
5305
5306
#: bzrlib/errors.py:1307
5307
msgid "Error in processing weave: %(msg)s"
5308
msgstr ""
5309
5310
#: bzrlib/errors.py:1316
5311
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5312
msgstr ""
5313
5314
#: bzrlib/errors.py:1327
5315
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5316
msgstr ""
5317
5318
#: bzrlib/errors.py:1337
5319
msgid "Weave invariant violated: %(what)s"
5320
msgstr ""
5321
5322
#: bzrlib/errors.py:1346
5323
msgid "Parents are mismatched between two revisions. %(msg)s"
5324
msgstr ""
5325
5326
#: bzrlib/errors.py:1368
5327
msgid ""
5328
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5329
"%(weave_b)s"
5330
msgstr ""
5331
5332
#: bzrlib/errors.py:1380
5333
msgid "Versioned file error"
5334
msgstr ""
5335
5336
#: bzrlib/errors.py:1385
5337
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5338
msgstr ""
5339
5340
#: bzrlib/errors.py:1395
5341
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5342
msgstr ""
5343
5344
#: bzrlib/errors.py:1405
5345
msgid "Text did not match its checksum: %(msg)s"
5346
msgstr ""
5347
5348
#: bzrlib/errors.py:1531
5349
msgid "Export format %(format)r not supported"
5350
msgstr ""
5351
5352
#: bzrlib/errors.py:1540
5353
msgid "Transport error: %(msg)s %(orig_error)s"
5354
msgstr ""
5355
5356
#: bzrlib/errors.py:1566
5357
msgid "Generic bzr smart protocol error: %(details)s"
5358
msgstr ""
5359
5360
#: bzrlib/errors.py:1574
5361
msgid "Received bad protocol version marker: %(marker)r"
5362
msgstr ""
5363
5364
#: bzrlib/errors.py:1606
5365
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5366
msgstr ""
5367
5368
#: bzrlib/errors.py:1611
5369
msgid "Connection error: %(msg)s %(orig_error)s"
5370
msgstr ""
5371
5372
#: bzrlib/errors.py:1616
5373
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5374
msgstr ""
5375
5376
#: bzrlib/errors.py:1637
5377
msgid "Connection closed: %(msg)s %(orig_error)s"
5378
msgstr ""
5379
5380
#: bzrlib/errors.py:1642
5381
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5382
msgstr ""
5383
5384
#: bzrlib/errors.py:1647
5385
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5386
msgstr ""
5387
5388
#: bzrlib/errors.py:1657
5389
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5390
msgstr ""
5391
5392
#: bzrlib/errors.py:1672
5393
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5394
msgstr ""
5395
5396
#: bzrlib/errors.py:1686
5397
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5398
msgstr ""
5399
5400
#: bzrlib/errors.py:1694
5401
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5402
msgstr ""
5403
5404
#: bzrlib/errors.py:1703
5405
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5406
msgstr ""
5407
5408
#: bzrlib/errors.py:1717
5409
msgid "Too many redirections"
5410
msgstr ""
5411
5412
#: bzrlib/errors.py:1722
5413
msgid "Working tree has conflicts."
5414
msgstr ""
5415
5416
#: bzrlib/errors.py:1726
5417
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5418
msgstr ""
5419
5420
#: bzrlib/errors.py:1735
5421
msgid ""
5422
"Error(s) parsing config file %(filename)s:\n"
5423
"%(errors)s"
5424
msgstr ""
5425
5426
#: bzrlib/errors.py:1746
5427
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5428
msgstr ""
5429
5430
#: bzrlib/errors.py:1754
5431
msgid "%(username)r does not seem to contain a reasonable email address"
5432
msgstr ""
5433
5434
#: bzrlib/errors.py:1763
5435
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5436
msgstr ""
5437
5438
#: bzrlib/errors.py:1771
5439
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5440
msgstr ""
5441
5442
#: bzrlib/errors.py:1779
5443
msgid "Unable to import library \"%(library)s\": %(error)s"
5444
msgstr ""
5445
5446
#: bzrlib/errors.py:1787
5447
msgid "python-gpgme is not installed, it is needed to verify signatures"
5448
msgstr ""
5449
5450
#: bzrlib/errors.py:1795
5451
msgid ""
5452
"The working tree for %(basedir)s has changed since the last commit, but "
5453
"weave merge requires that it be unchanged"
5454
msgstr ""
5455
5456
#: bzrlib/errors.py:1805
5457
msgid ""
5458
"Can't reprocess and show base, because reprocessing obscures the "
5459
"relationship of conflicting lines to the base"
5460
msgstr ""
5461
5462
#: bzrlib/errors.py:1811
5463
msgid "Cycle in graph %(graph)r"
5464
msgstr ""
5465
5466
#: bzrlib/errors.py:1839
5467
msgid "File %(filename)s is not conflicted."
5468
msgstr ""
5469
5470
#: bzrlib/errors.py:1861
5471
msgid "No bundle was found in \"%(filename)s\"."
5472
msgstr ""
5473
5474
#: bzrlib/errors.py:1870
5475
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5476
msgstr ""
5477
5478
#: bzrlib/errors.py:1880
5479
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5480
msgstr ""
5481
5482
#: bzrlib/errors.py:1893
5483
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5484
msgstr ""
5485
5486
#: bzrlib/errors.py:1903
5487
msgid "Key %(key)s is already present in map"
5488
msgstr ""
5489
5490
#: bzrlib/errors.py:1908
5491
msgid "The prefix %(prefix)s is in the help search path twice."
5492
msgstr ""
5493
5494
#: bzrlib/errors.py:1918
5495
msgid ""
5496
"No final name for trans_id %(trans_id)r\n"
5497
"file-id: %(file_id)r\n"
5498
"root trans-id: %(root_trans_id)r\n"
5499
msgstr ""
5500
5501
#: bzrlib/errors.py:1950
5502
msgid "Attempt to reuse a transform that has already been applied."
5503
msgstr ""
5504
5505
#: bzrlib/errors.py:1955
5506
msgid "Moving the root directory is not supported at this time"
5507
msgstr ""
5508
5509
#: bzrlib/errors.py:1960
5510
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5511
msgstr ""
5512
5513
#: bzrlib/errors.py:1971
5514
msgid ""
5515
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5516
msgstr ""
5517
5518
#: bzrlib/errors.py:2007
5519
msgid ""
5520
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5521
msgstr ""
5522
5523
#: bzrlib/errors.py:2037
5524
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5525
msgstr ""
5526
5527
#: bzrlib/errors.py:2045
5528
msgid "Nothing to merge."
5529
msgstr ""
5530
5531
#: bzrlib/errors.py:2050
5532
msgid "Format %(format)s cannot be initialised by this version of bzr."
5533
msgstr ""
5534
5535
#: bzrlib/errors.py:2059
5536
msgid ""
5537
"Cannot convert from format %(from_format)s to format %(format)s. "
5538
"%(problem)s"
5539
msgstr ""
5540
5541
#: bzrlib/errors.py:2071
5542
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5543
msgstr ""
5544
5545
#: bzrlib/errors.py:2079
5546
msgid "%(exe_name)s could not be found on this machine"
5547
msgstr ""
5548
5549
#: bzrlib/errors.py:2087
5550
msgid "Diff is not installed on this machine: %(msg)s"
5551
msgstr ""
5552
5553
#: bzrlib/errors.py:2095
5554
msgid "Diff3 is not installed on this machine."
5555
msgstr ""
5556
5557
#: bzrlib/errors.py:2101
5558
msgid "The content being inserted is already present."
5559
msgstr ""
5560
5561
#: bzrlib/errors.py:2106
5562
msgid ""
5563
"This tree contains left-over files from a failed operation.\n"
5564
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5565
"to\n"
5566
" keep, and delete it when you are done."
5567
msgstr ""
5568
5569
#: bzrlib/errors.py:2117
5570
msgid ""
5571
"This tree contains left-over files from a failed operation.\n"
5572
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5573
" wish to keep, and delete it when you are done."
5574
msgstr ""
5575
5576
#: bzrlib/errors.py:2127
5577
msgid ""
5578
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5579
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5580
"to\n"
5581
" keep, and delete it when you are done."
5582
msgstr ""
5583
5584
#: bzrlib/errors.py:2138
5585
msgid ""
5586
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5587
"examine %(pending_deletion)s to see if it contains any files you wish to "
5588
"keep, and delete it when you are done."
5589
msgstr ""
5590
5591
#: bzrlib/errors.py:2148
5592
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5593
msgstr ""
5594
5595
#: bzrlib/errors.py:2162
5596
msgid ""
5597
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5598
msgstr ""
5599
5600
#: bzrlib/errors.py:2175
5601
msgid "Error in merge modified format"
5602
msgstr ""
5603
5604
#: bzrlib/errors.py:2180
5605
msgid "Format error in conflict listings"
5606
msgstr ""
5607
5608
#: bzrlib/errors.py:2184
5609
msgid ""
5610
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5611
"Error: %(description)s"
5612
msgstr ""
5613
5614
#: bzrlib/errors.py:2195
5615
msgid ""
5616
"An error has been detected in the repository %(repo_path)s.\n"
5617
"Please run bzr reconcile on this repository."
5618
msgstr ""
5619
5620
#: bzrlib/errors.py:2206
5621
msgid ""
5622
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5623
"reason: %(reason)s"
5624
msgstr ""
5625
5626
#: bzrlib/errors.py:2219
5627
msgid ""
5628
"An inconsistent delta was supplied: %(delta)r\n"
5629
"reason: %(reason)s"
5630
msgstr ""
5631
5632
#: bzrlib/errors.py:2231
5633
msgid "To use this feature you must upgrade your branch at %(path)s."
5634
msgstr ""
5635
5636
#: bzrlib/errors.py:2240
5637
msgid "To use this feature you must upgrade your repository at %(path)s."
5638
msgstr ""
5639
5640
#: bzrlib/errors.py:2245
5641
msgid ""
5642
"To use this feature you must upgrade your branch at %(path)s to a format "
5643
"which supports rich roots."
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:2251
5647
msgid "Cannot perform local-only commits on unbound branches."
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:2256
5651
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5652
msgstr ""
5653
5654
#: bzrlib/errors.py:2277
5655
msgid "Ghost tags not supported by format %(format)r."
5656
msgstr ""
5657
5658
#: bzrlib/errors.py:2285
5659
msgid "File is binary but should be text."
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:2290
5663
msgid "The path %(path)s is not permitted on this platform"
5664
msgstr ""
5665
5666
#: bzrlib/errors.py:2299
5667
msgid ""
5668
"Testament did not match expected value.\n"
5669
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5670
" {%(measured)s}"
5671
msgstr ""
5672
5673
#: bzrlib/errors.py:2311
5674
msgid "Not a bzr revision-bundle: %(text)r"
5675
msgstr ""
5676
5677
#: bzrlib/errors.py:2320
5678
msgid "Bad bzr revision-bundle: %(text)r"
5679
msgstr ""
5680
5681
#: bzrlib/errors.py:2329
5682
msgid "Malformed bzr revision-bundle header: %(text)r"
5683
msgstr ""
5684
5685
#: bzrlib/errors.py:2334
5686
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5687
msgstr ""
5688
5689
#: bzrlib/errors.py:2339
5690
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5691
msgstr ""
5692
5693
#: bzrlib/errors.py:2344
5694
msgid "End of line marker was not \\n in bzr revision-bundle"
5695
msgstr ""
5696
5697
#: bzrlib/errors.py:2354
5698
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5699
msgstr ""
5700
5701
#: bzrlib/errors.py:2364
5702
msgid "Root class for inventory serialization errors"
5703
msgstr ""
5704
5705
#: bzrlib/errors.py:2368
5706
msgid ""
5707
"The inventory was not in the expected format:\n"
5708
" %(msg)s"
5709
msgstr ""
5710
5711
#: bzrlib/errors.py:2377
5712
msgid "This operation requires rich root data storage"
5713
msgstr ""
5714
5715
#: bzrlib/errors.py:2390
5716
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5717
msgstr ""
5718
5719
#: bzrlib/errors.py:2399
5720
msgid ""
5721
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5722
"variable."
5723
msgstr ""
5724
5725
#: bzrlib/errors.py:2406
5726
msgid ""
5727
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5728
"ghost at {%(ghost_revision_id)s}"
5729
msgstr ""
5730
5731
#: bzrlib/errors.py:2416
5732
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5733
msgstr ""
5734
5735
#: bzrlib/errors.py:2467
5736
msgid ""
5737
"A merge directive must provide either a bundle or a public branch location."
5738
msgstr ""
5739
5740
#: bzrlib/errors.py:2474
5741
msgid "Bad merge directive payload %(start)r"
5742
msgstr ""
5743
5744
#: bzrlib/errors.py:2484
5745
msgid "Preview patch does not match requested changes."
5746
msgstr ""
5747
5748
#: bzrlib/errors.py:2490
5749
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5750
msgstr ""
5751
5752
#: bzrlib/errors.py:2500
5753
msgid ""
5754
"Your branch does not have all of the revisions required in order to merge "
5755
"this merge directive and the target location specified in the merge "
5756
"directive is not a branch: %(location)s."
5757
msgstr ""
5758
5759
#: bzrlib/errors.py:2512
5760
msgid "Unsupported entry kind %(kind)s"
5761
msgstr ""
5762
5763
#: bzrlib/errors.py:2520
5764
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:2530
5768
msgid "Subsume target %(other_tree)s needs to be upgraded."
5769
msgstr ""
5770
5771
#: bzrlib/errors.py:2549
5772
msgid "No such tag: %(tag_name)s"
5773
msgstr ""
5774
5775
#: bzrlib/errors.py:2557
5776
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5777
msgstr ""
5778
5779
#: bzrlib/errors.py:2566
5780
msgid "Tag %(tag_name)s already exists."
5781
msgstr ""
5782
5783
#: bzrlib/errors.py:2574
5784
msgid ""
5785
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5786
"bugs\" for more information on this feature."
5787
msgstr ""
5788
5789
#: bzrlib/errors.py:2584
5790
msgid ""
5791
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5792
msgstr ""
5793
5794
#: bzrlib/errors.py:2594
5795
msgid ""
5796
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:2604
5800
msgid "Invalid line in bugs property: '%(line)s'"
5801
msgstr ""
5802
5803
#: bzrlib/errors.py:2612
5804
msgid "Invalid bug status: '%(status)s'"
5805
msgstr ""
5806
5807
#: bzrlib/errors.py:2620
5808
msgid "Could not understand response from smart server: %(response_tuple)r"
5809
msgstr ""
5810
5811
#: bzrlib/errors.py:2659
5812
msgid "Server sent an unexpected error: %(error_tuple)r"
5813
msgstr ""
5814
5815
#: bzrlib/errors.py:2678
5816
msgid "Unrecognised container format: %(container_format)r"
5817
msgstr ""
5818
5819
#: bzrlib/errors.py:2686
5820
msgid "Unexpected end of container stream"
5821
msgstr ""
5822
5823
#: bzrlib/errors.py:2691
5824
msgid "Unknown record type: %(record_type)r"
5825
msgstr ""
5826
5827
#: bzrlib/errors.py:2699
5828
msgid "Invalid record: %(reason)s"
5829
msgstr ""
5830
5831
#: bzrlib/errors.py:2707
5832
msgid "Container has data after end marker: %(excess)r"
5833
msgstr ""
5834
5835
#: bzrlib/errors.py:2715
5836
msgid "Container has multiple records with the same name: %(name)s"
5837
msgstr ""
5838
5839
#: bzrlib/errors.py:2728
5840
msgid "Corrupt or incompatible data stream: %(reason)s"
5841
msgstr ""
5842
5843
#: bzrlib/errors.py:2736
5844
msgid "SMTP error: %(error)s"
5845
msgstr ""
5846
5847
#: bzrlib/errors.py:2744
5848
msgid "No message supplied."
5849
msgstr ""
5850
5851
#: bzrlib/errors.py:2749
5852
msgid "No mail-to address (--mail-to) or output (-o) specified."
5853
msgstr ""
5854
5855
#: bzrlib/errors.py:2754
5856
msgid "Unknown mail client: %(mail_client)s"
5857
msgstr ""
5858
5859
#: bzrlib/errors.py:2762
5860
msgid ""
5861
"Unable to find mail client with the following names: "
5862
"%(mail_command_list_string)s"
5863
msgstr ""
5864
5865
#: bzrlib/errors.py:2772
5866
msgid "SMTP connection to %(host)s refused"
5867
msgstr ""
5868
5869
#: bzrlib/errors.py:2781
5870
msgid "Please specify smtp_server. No server at default %(host)s."
5871
msgstr ""
5872
5873
#: bzrlib/errors.py:2795
5874
msgid ""
5875
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5876
"reconfigure."
5877
msgstr ""
5878
5879
#: bzrlib/errors.py:2807
5880
msgid "'%(display_url)s' is already a branch."
5881
msgstr ""
5882
5883
#: bzrlib/errors.py:2812
5884
msgid "'%(display_url)s' is already a tree."
5885
msgstr ""
5886
5887
#: bzrlib/errors.py:2817
5888
msgid "'%(display_url)s' is already a checkout."
5889
msgstr ""
5890
5891
#: bzrlib/errors.py:2822
5892
msgid "'%(display_url)s' is already a lightweight checkout."
5893
msgstr ""
5894
5895
#: bzrlib/errors.py:2827
5896
msgid "'%(display_url)s' is already using a shared repository."
5897
msgstr ""
5898
5899
#: bzrlib/errors.py:2832
5900
msgid "'%(display_url)s' is already standalone."
5901
msgstr ""
5902
5903
#: bzrlib/errors.py:2837
5904
msgid "Shared repository '%(display_url)s' already creates working trees."
5905
msgstr ""
5906
5907
#: bzrlib/errors.py:2843
5908
msgid ""
5909
"Shared repository '%(display_url)s' already doesn't create working trees."
5910
msgstr ""
5911
5912
#: bzrlib/errors.py:2849
5913
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5914
msgstr ""
5915
5916
#: bzrlib/errors.py:2854
5917
msgid "No location could be found to bind to at %(display_url)s."
5918
msgstr ""
5919
5920
#: bzrlib/errors.py:2859
5921
msgid ""
5922
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5923
"status).%(more)s"
5924
msgstr ""
5925
5926
#: bzrlib/errors.py:2878
5927
msgid ""
5928
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5929
"list).%(more)s"
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:2884
5933
msgid "Variable {%(name)s} is not available."
5934
msgstr ""
5935
5936
#: bzrlib/errors.py:2892
5937
msgid "No template specified."
5938
msgstr ""
5939
5940
#: bzrlib/errors.py:2897
5941
msgid "Unable to create symlink %(path_str)son this platform"
5942
msgstr ""
5943
5944
#: bzrlib/errors.py:2912
5945
msgid ""
5946
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5947
"\"original\", \"local\"."
5948
msgstr ""
5949
5950
#: bzrlib/errors.py:2946
5951
msgid ""
5952
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5953
msgstr ""
5954
5955
#: bzrlib/errors.py:2958
5956
msgid "The \"%(config_id)s\" configuration does not exist."
5957
msgstr ""
5958
5959
#: bzrlib/errors.py:2966
5960
msgid "The \"%(option_name)s\" configuration option does not exist."
5961
msgstr ""
5962
5963
#: bzrlib/errors.py:2974
5964
msgid "The alias \"%(alias_name)s\" does not exist."
5965
msgstr ""
5966
5967
#: bzrlib/errors.py:2988
5968
msgid "\"%(alias_name)s\" is not a valid location alias."
5969
msgstr ""
5970
5971
#: bzrlib/errors.py:2996
5972
msgid "No %(alias_name)s location assigned."
5973
msgstr ""
5974
5975
#: bzrlib/errors.py:3004
5976
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
5977
msgstr ""
5978
5979
#: bzrlib/errors.py:3014
5980
msgid "Unknown rules detected: %(unknowns_str)s."
5981
msgstr ""
5982
5983
#: bzrlib/errors.py:3025
5984
msgid "Tip change rejected: %(msg)s"
5985
msgstr ""
5986
5987
#: bzrlib/errors.py:3033
5988
msgid "Shelf corrupt."
5989
msgstr ""
5990
5991
#: bzrlib/errors.py:3038
5992
msgid "Corruption while decompressing repository file%(orig_error)s"
5993
msgstr ""
5994
5995
#: bzrlib/errors.py:3050
5996
msgid "No changes are shelved with id \"%(shelf_id)d\"."
5997
msgstr ""
5998
5999
#: bzrlib/errors.py:3058
6000
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6001
msgstr ""
6002
6003
#: bzrlib/errors.py:3066
6004
msgid ""
6005
"An attempt to access a url outside the server jail was made: '%(url)s'."
6006
msgstr ""
6007
6008
#: bzrlib/errors.py:3074
6009
msgid "The user aborted the operation."
6010
msgstr ""
6011
6012
#: bzrlib/errors.py:3079
6013
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6014
msgstr ""
6015
6016
#: bzrlib/errors.py:3089
6017
msgid "No such view: %(view_name)s."
6018
msgstr ""
6019
6020
#: bzrlib/errors.py:3099
6021
msgid ""
6022
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6023
"to a later format."
6024
msgstr ""
6025
6026
#: bzrlib/errors.py:3108
6027
msgid ""
6028
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6029
msgstr ""
6030
6031
#: bzrlib/errors.py:3175
6032
msgid "%(bzrdir)r does not support co-located branches."
6033
msgstr ""
6034
6035
#: bzrlib/errors.py:3181
6036
msgid ""
6037
"Unable to determine your name.\n"
6038
"Please, set your name with the 'whoami' command.\n"
6039
"E.g. bzr whoami \"Your Name <name@example.com>\""
6040
msgstr ""
6041
6042
#: bzrlib/errors.py:3190
6043
msgid "Invalid pattern(s) found. %(msg)s"
6044
msgstr ""
6045
6046
#: bzrlib/errors.py:3198
6047
msgid ""
6048
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6049
"unbind` to fix."
6050
msgstr ""
6051
6052
#: bzrlib/errors.py:3209
6053
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6054
msgstr ""
6055
6056
#: bzrlib/errors.py:3218
6057
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6058
msgstr ""
6059
6060
#: bzrlib/errors.py:3227
6061
msgid ""
6062
"No compatible object available for operations from %(source)r to %(target)r."
6063
msgstr ""
6064
6065
#: bzrlib/errors.py:3237
6066
msgid ""
6067
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6068
"%(arguments)s."
6069
msgstr ""
6070
6071
#: bzrlib/errors.py:3247
6072
msgid ""
6073
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6074
"format %(format)r"
6075
msgstr ""
6076
6077
#: bzrlib/errors.py:3259
6078
msgid ""
6079
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6080
"plugin."
6081
msgstr ""
6082
6083
#: bzrlib/errors.py:3272
6084
msgid "Binary files section encountered."
6085
msgstr ""
6086
6087
#: bzrlib/errors.py:3280
6088
msgid ""
6089
"Malformed patch header. %(desc)s\n"
6090
"%(line)r"
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:3289
6094
msgid ""
6095
"Malformed hunk header. %(desc)s\n"
6096
"%(line)r"
6097
msgstr ""
6098
6099
#: bzrlib/errors.py:3298
6100
msgid ""
6101
"Malformed line. %(desc)s\n"
6102
"%(line)r"
6103
msgstr ""
6104
6105
#: bzrlib/errors.py:3308
6106
msgid ""
6107
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6108
"but patch says it should be \"%(patch_line)s\""
6109
msgstr ""
6110
6111
#: bzrlib/errors.py:3319
6112
msgid "The feature %(feature)s has already been registered."
6113
msgstr ""
6114
6115
#: bzrlib/export_pot.py:252
6116
#, python-format
6117
msgid "Exporting messages from builtin command: %s"
6118
msgstr ""
6119
6120
#: bzrlib/export_pot.py:271
6121
msgid "Exporting messages from plugin command: {0} in {1}"
6122
msgstr ""
6123
6124
#: bzrlib/export_pot.py:292
6125
#, python-format
6126
msgid "Exporting message from error: %s"
6127
msgstr ""
6128
6129
#: bzrlib/fetch.py:98
6130
msgid "Finding revisions"
6131
msgstr ""
6132
6133
#: bzrlib/fetch.py:103
6134
msgid "Fetching revisions"
6135
msgstr ""
6136
6137
#: bzrlib/foreign.py:262
6138
msgid "Push into a different VCS without any custom bzr metadata."
6139
msgstr ""
6140
6141
#: bzrlib/foreign.py:264
6142
msgid ""
6143
"This will afterwards rebase the local branch on the remote\n"
6144
"branch unless the --no-rebase option is used, in which case \n"
6145
"the two branches will be out of sync after the push. "
6146
msgstr ""
6147
6148
#: bzrlib/foreign.py:277
6149
msgid "Do not rebase after push."
6150
msgstr ""
6151
6152
#: bzrlib/foreign.py:311
6153
#, python-format
6154
msgid "Using saved location: %s\n"
6155
msgstr ""
6156
6157
#: bzrlib/foreign.py:321
6158
msgid ""
6159
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6160
"regular push."
6161
msgstr ""
6162
6163
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6164
msgid "{0} commits with valid signatures"
6165
msgstr ""
6166
6167
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6168
msgid "{0} commit with unknown key"
6169
msgid_plural "{0} commits with unknown keys"
6170
msgstr[0] ""
6171
msgstr[1] ""
6172
6173
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6174
msgid "{0} commit not valid"
6175
msgid_plural "{0} commits not valid"
6176
msgstr[0] ""
6177
msgstr[1] ""
6178
6179
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6180
msgid "{0} commit not signed"
6181
msgid_plural "{0} commits not signed"
6182
msgstr[0] ""
6183
msgstr[1] ""
6184
6185
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6186
msgid "{0} commit with key now expired"
6187
msgid_plural "{0} commits with key now expired"
6188
msgstr[0] ""
6189
msgstr[1] ""
6190
6191
#: bzrlib/gpg.py:343
6192
msgid "No GnuPG key results for pattern: {0}"
6193
msgstr ""
6194
6195
#: bzrlib/gpg.py:386
6196
msgid "{0} signed {1} commit"
6197
msgid_plural "{0} signed {1} commits"
6198
msgstr[0] ""
6199
msgstr[1] ""
6200
6201
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6202
msgid "{0} commit by author {1}"
6203
msgid_plural "{0} commits by author {1}"
6204
msgstr[0] ""
6205
msgstr[1] ""
6206
6207
#: bzrlib/gpg.py:433
6208
msgid "Unknown key {0} signed {1} commit"
6209
msgid_plural "Unknown key {0} signed {1} commits"
6210
msgstr[0] ""
6211
msgstr[1] ""
6212
6213
#: bzrlib/gpg.py:452
6214
msgid "{0} commit by author {1} with key {2} now expired"
6215
msgid_plural "{0} commits by author {1} with key {2} now expired"
6216
msgstr[0] ""
6217
msgstr[1] ""
6218
6219
#: bzrlib/groupcompress.py:1739
6220
#, python-format
6221
msgid "Insert claimed random_id=True, but then inserted %r two times"
6222
msgstr ""
6223
6224
#: bzrlib/hooks.py:331
6225
#, python-format
6226
msgid "Introduced in: %s"
6227
msgstr ""
6228
6229
#: bzrlib/hooks.py:334
6230
#, python-format
6231
msgid "Deprecated in: %s"
6232
msgstr ""
6233
6234
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6235
msgid "Walking content"
6236
msgstr ""
6237
6238
#: bzrlib/knit.py:3330
6239
msgid "annotating"
6240
msgstr ""
6241
6242
#: bzrlib/lock.py:548
6243
msgid "{0!r} was {1} locked again"
6244
msgstr ""
6245
6246
#: bzrlib/lockdir.py:321
6247
#, python-format
6248
msgid "error removing pending lock: %s"
6249
msgstr ""
6250
6251
#: bzrlib/lockdir.py:616
6252
msgid "Unable to obtain"
6253
msgstr ""
6254
6255
#: bzrlib/lockdir.py:618
6256
msgid "Lock owner changed for"
6257
msgstr ""
6258
6259
#: bzrlib/lockdir.py:620
6260
msgid "{0} lock {1} {2}."
6261
msgstr ""
6262
6263
#: bzrlib/lockdir.py:627
6264
#, python-format
6265
msgid "Will continue to try until %s, unless you press Ctrl-C."
6266
msgstr ""
6267
6268
#: bzrlib/lockdir.py:629
6269
msgid "See \"bzr help break-lock\" for more."
6270
msgstr ""
6271
6272
#: bzrlib/lockdir.py:739
6273
#, python-format
6274
msgid ""
6275
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6276
msgstr ""
6277
6278
#: bzrlib/log.py:572
6279
msgid "--exclude-common-ancestry requires two different revisions"
6280
msgstr ""
6281
6282
#: bzrlib/log.py:574
6283
#, python-format
6284
msgid "invalid direction %r"
6285
msgstr ""
6286
6287
#: bzrlib/log.py:662
6288
msgid "Start revision not found in history of end revision."
6289
msgstr ""
6290
6291
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6292
msgid "Logging revision 0 is invalid."
6293
msgstr ""
6294
6295
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6296
msgid "Start revision must be older than the end revision."
6297
msgstr ""
6298
6299
#: bzrlib/log.py:1827
6300
#, python-format
6301
msgid "unknown log formatter: %r"
6302
msgstr ""
6303
6304
#: bzrlib/log.py:2123
6305
msgid "fixes bug"
6306
msgid_plural "fixes bugs"
6307
msgstr[0] ""
6308
msgstr[1] ""
6309
6310
#: bzrlib/merge.py:689
6311
msgid "All changes applied successfully."
6312
msgstr ""
6313
6314
#: bzrlib/merge.py:691
6315
#, python-format
6316
msgid "%d conflicts encountered."
6317
msgstr ""
6318
6319
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6320
msgid "Preparing file merge"
6321
msgstr ""
6322
6323
#: bzrlib/multiparent.py:426
6324
msgid "Importing revisions"
6325
msgstr ""
6326
6327
#: bzrlib/option.py:526
6328
msgid "Show help message."
6329
msgstr ""
6330
6331
#: bzrlib/option.py:528
6332
msgid "Only display errors and warnings."
6333
msgstr ""
6334
6335
#: bzrlib/option.py:531
6336
msgid "Show usage message and options."
6337
msgstr ""
6338
6339
#: bzrlib/option.py:533
6340
msgid "Display more information."
6341
msgstr ""
6342
6343
#: bzrlib/option.py:541
6344
msgid ""
6345
"Select changes introduced by the specified revision. See also \"help "
6346
"revisionspec\"."
6347
msgstr ""
6348
6349
#: bzrlib/option.py:543
6350
msgid "Branch to operate on, instead of working directory."
6351
msgstr ""
6352
6353
#: bzrlib/option.py:545
6354
msgid "Detailed log format."
6355
msgstr ""
6356
6357
#: bzrlib/option.py:545
6358
msgid "Format used by GNU ChangeLog files."
6359
msgstr ""
6360
6361
#: bzrlib/option.py:545
6362
msgid "Log format with one line per revision."
6363
msgstr ""
6364
6365
#: bzrlib/option.py:545
6366
msgid "Moderately short log format."
6367
msgstr ""
6368
6369
#: bzrlib/option.py:545
6370
msgid "Use specified log format."
6371
msgstr ""
6372
6373
#: bzrlib/option.py:547
6374
msgid "Log format"
6375
msgstr ""
6376
6377
#: bzrlib/option.py:549
6378
msgid "LCA-newness merge."
6379
msgstr ""
6380
6381
#: bzrlib/option.py:549
6382
msgid "Merge using external diff3."
6383
msgstr ""
6384
6385
#: bzrlib/option.py:549
6386
msgid "Native diff3-style merge."
6387
msgstr ""
6388
6389
#: bzrlib/option.py:549
6390
msgid "Select a particular merge algorithm."
6391
msgstr ""
6392
6393
#: bzrlib/option.py:549
6394
msgid "Weave-based merge."
6395
msgstr ""
6396
6397
#: bzrlib/option.py:551
6398
msgid "Merge algorithm"
6399
msgstr ""
6400
6401
#: bzrlib/option.py:554
6402
msgid "Message string."
6403
msgstr ""
6404
6405
#: bzrlib/option.py:556
6406
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6407
msgstr ""
6408
6409
#: bzrlib/option.py:558
6410
msgid "Ignore differences between branches and overwrite unconditionally."
6411
msgstr ""
6412
6413
#: bzrlib/option.py:560
6414
msgid "Remember the specified location as a default."
6415
msgstr ""
6416
6417
#: bzrlib/option.py:562
6418
msgid "Reprocess to reduce spurious conflicts."
6419
msgstr ""
6420
6421
#: bzrlib/option.py:566
6422
msgid "See \"help revisionspec\" for details."
6423
msgstr ""
6424
6425
#: bzrlib/option.py:568
6426
msgid "Show internal object ids."
6427
msgstr ""
6428
6429
#: bzrlib/option.py:571
6430
msgid "Display timezone as local, original, or utc."
6431
msgstr ""
6432
6433
#: bzrlib/osutils.py:100
6434
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6435
msgstr ""
6436
6437
#: bzrlib/osutils.py:220
6438
msgid "lstat/stat of ({0!r}): {1!r}"
6439
msgstr ""
6440
6441
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6442
#, python-format
6443
msgid "sorry, %r not allowed in path"
6444
msgstr ""
6445
6446
#: bzrlib/osutils.py:1226
6447
#, python-format
6448
msgid "%r is too short to calculate a relative path"
6449
msgstr ""
6450
6451
#: bzrlib/plugin.py:143
6452
#, python-format
6453
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6454
msgstr ""
6455
6456
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6457
msgid "Enable completions for the selected plugin (default: all plugins)"
6458
msgstr ""
6459
6460
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6461
msgid "Generate a shell function for bash command line completion."
6462
msgstr ""
6463
6464
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6465
msgid ""
6466
"This command generates a shell function which can be used by bash to\n"
6467
"automatically complete the currently typed command when the user presses\n"
6468
"the completion key (usually tab)."
6469
msgstr ""
6470
6471
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6472
msgid ""
6473
"Commonly used like this:\n"
6474
" eval \"`bzr bash-completion`\""
6475
msgstr ""
6476
6477
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6478
msgid "Name of the generated function (default: _bzr)"
6479
msgstr ""
6480
6481
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6482
msgid "Generate only the shell function, don't enable it"
6483
msgstr ""
6484
6485
#: bzrlib/plugins/launchpad/__init__.py:81
6486
msgid "Register a branch with launchpad.net."
6487
msgstr ""
6488
6489
#: bzrlib/plugins/launchpad/__init__.py:83
6490
msgid ""
6491
"This command lists a bzr branch in the directory of branches on\n"
6492
"launchpad.net. Registration allows the branch to be associated with\n"
6493
"bugs or specifications."
6494
msgstr ""
6495
6496
#: bzrlib/plugins/launchpad/__init__.py:87
6497
msgid ""
6498
"Before using this command you must register the project to which the\n"
6499
"branch belongs, and create an account for yourself on launchpad.net."
6500
msgstr ""
6501
6502
#: bzrlib/plugins/launchpad/__init__.py:90
6503
msgid ""
6504
"arguments:\n"
6505
" public_url: The publicly visible url for the branch to register.\n"
6506
" This must be an http or https url (which Launchpad can read\n"
6507
" from to access the branch). Local file urls, SFTP urls, and\n"
6508
" bzr+ssh urls will not work.\n"
6509
" If no public_url is provided, bzr will use the configured\n"
6510
" public_url if there is one for the current branch, and\n"
6511
" otherwise error."
6512
msgstr ""
6513
6514
#: bzrlib/plugins/launchpad/__init__.py:99
6515
msgid ""
6516
"example:\n"
6517
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6518
" --project fooproject"
6519
msgstr ""
6520
6521
#: bzrlib/plugins/launchpad/__init__.py:106
6522
msgid "Launchpad project short name to associate with the branch."
6523
msgstr ""
6524
6525
#: bzrlib/plugins/launchpad/__init__.py:113
6526
msgid ""
6527
"Short name for the branch; by default taken from the last component of the "
6528
"url."
6529
msgstr ""
6530
6531
#: bzrlib/plugins/launchpad/__init__.py:117
6532
msgid "One-sentence description of the branch."
6533
msgstr ""
6534
6535
#: bzrlib/plugins/launchpad/__init__.py:120
6536
msgid "Longer description of the purpose or contents of the branch."
6537
msgstr ""
6538
6539
#: bzrlib/plugins/launchpad/__init__.py:123
6540
msgid "Branch author's email address, if not yourself."
6541
msgstr ""
6542
6543
#: bzrlib/plugins/launchpad/__init__.py:126
6544
msgid "The bug this branch fixes."
6545
msgstr ""
6546
6547
#: bzrlib/plugins/launchpad/__init__.py:129
6548
msgid "Prepare the request but don't actually send it."
6549
msgstr ""
6550
6551
#: bzrlib/plugins/launchpad/__init__.py:151
6552
msgid ""
6553
"register-branch requires a public branch url - see bzr help register-branch."
6554
msgstr ""
6555
6556
#: bzrlib/plugins/launchpad/__init__.py:159
6557
msgid "--product is deprecated; please use --project."
6558
msgstr ""
6559
6560
#: bzrlib/plugins/launchpad/__init__.py:191
6561
msgid "Open a Launchpad branch page in your web browser."
6562
msgstr ""
6563
6564
#: bzrlib/plugins/launchpad/__init__.py:196
6565
msgid "Do not actually open the browser. Just say the URL we would use."
6566
msgstr ""
6567
6568
#: bzrlib/plugins/launchpad/__init__.py:231
6569
#, python-format
6570
msgid "Opening %s in web browser"
6571
msgstr ""
6572
6573
#: bzrlib/plugins/launchpad/__init__.py:241
6574
msgid "Show or set the Launchpad user ID."
6575
msgstr ""
6576
6577
#: bzrlib/plugins/launchpad/__init__.py:243
6578
msgid ""
6579
"When communicating with Launchpad, some commands need to know your\n"
6580
"Launchpad user ID. This command can be used to set or show the\n"
6581
"user ID that Bazaar will use for such communication."
6582
msgstr ""
6583
6584
#: bzrlib/plugins/launchpad/__init__.py:247
6585
msgid ""
6586
":Examples:\n"
6587
" Show the Launchpad ID of the current user::"
6588
msgstr ""
6589
6590
#: bzrlib/plugins/launchpad/__init__.py:250
6591
msgid " bzr launchpad-login"
6592
msgstr ""
6593
6594
#: bzrlib/plugins/launchpad/__init__.py:252
6595
msgid " Set the Launchpad ID of the current user to 'bob'::"
6596
msgstr ""
6597
6598
#: bzrlib/plugins/launchpad/__init__.py:254
6599
msgid " bzr launchpad-login bob"
6600
msgstr ""
6601
6602
#: bzrlib/plugins/launchpad/__init__.py:261
6603
msgid "Don't check that the user name is valid."
6604
msgstr ""
6605
6606
#: bzrlib/plugins/launchpad/__init__.py:276
6607
#: bzrlib/plugins/launchpad/__init__.py:287
6608
msgid "Launchpad user ID exists and has SSH keys.\n"
6609
msgstr ""
6610
6611
#: bzrlib/plugins/launchpad/__init__.py:279
6612
msgid "No Launchpad user ID configured.\n"
6613
msgstr ""
6614
6615
#: bzrlib/plugins/launchpad/__init__.py:290
6616
#, python-format
6617
msgid "Launchpad user ID set to '%s'.\n"
6618
msgstr ""
6619
6620
#: bzrlib/plugins/launchpad/__init__.py:298
6621
msgid "Ask Launchpad to mirror a branch now."
6622
msgstr ""
6623
6624
#: bzrlib/plugins/launchpad/__init__.py:318
6625
msgid "Propose merging a branch on Launchpad."
6626
msgstr ""
6627
6628
#: bzrlib/plugins/launchpad/__init__.py:320
6629
msgid ""
6630
"This will open your usual editor to provide the initial comment. When it\n"
6631
"has created the proposal, it will open it in your default web browser."
6632
msgstr ""
6633
6634
#: bzrlib/plugins/launchpad/__init__.py:323
6635
msgid ""
6636
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6637
"is not supplied, the remembered submit branch will be used. If no submit\n"
6638
"branch is remembered, the development focus will be used."
6639
msgstr ""
6640
6641
#: bzrlib/plugins/launchpad/__init__.py:327
6642
msgid ""
6643
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6644
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6645
"The parameter the launchpad account name of the desired reviewer. This\n"
6646
"may optionally be followed by '=' and the review type. For example:"
6647
msgstr ""
6648
6649
#: bzrlib/plugins/launchpad/__init__.py:332
6650
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6651
msgstr ""
6652
6653
#: bzrlib/plugins/launchpad/__init__.py:334
6654
msgid ""
6655
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6656
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6657
msgstr ""
6658
6659
#: bzrlib/plugins/launchpad/__init__.py:339
6660
msgid "Propose the merge on staging."
6661
msgstr ""
6662
6663
#: bzrlib/plugins/launchpad/__init__.py:341
6664
msgid "Commit message."
6665
msgstr ""
6666
6667
#: bzrlib/plugins/launchpad/__init__.py:343
6668
msgid "Mark the proposal as approved immediately."
6669
msgstr ""
6670
6671
#: bzrlib/plugins/launchpad/__init__.py:345
6672
msgid "Requested reviewer and optional type."
6673
msgstr ""
6674
6675
#: bzrlib/plugins/launchpad/__init__.py:382
6676
msgid "Find the proposal to merge this revision."
6677
msgstr ""
6678
6679
#: bzrlib/plugins/launchpad/__init__.py:384
6680
msgid ""
6681
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6682
"This works only if the selected branch was the merge proposal target, and\n"
6683
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6684
"are opened in a web browser."
6685
msgstr ""
6686
6687
#: bzrlib/plugins/launchpad/__init__.py:389
6688
msgid ""
6689
"Any revision involved in the merge may be specified-- the revision in\n"
6690
"which the merge was performed, or one of the revisions that was merged."
6691
msgstr ""
6692
6693
#: bzrlib/plugins/launchpad/__init__.py:392
6694
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6695
msgstr ""
6696
6697
#: bzrlib/plugins/launchpad/__init__.py:394
6698
msgid " bzr lp-find-proposal -r annotate:README:1"
6699
msgstr ""
6700
6701
#: bzrlib/plugins/launchpad/__init__.py:409
6702
msgid "No review found."
6703
msgstr ""
6704
6705
#: bzrlib/plugins/launchpad/__init__.py:410
6706
#, python-format
6707
msgid "%d proposals(s) found."
6708
msgstr ""
6709
6710
#: bzrlib/plugins/launchpad/__init__.py:420
6711
msgid "Finding revision-id"
6712
msgstr ""
6713
6714
#: bzrlib/plugins/launchpad/__init__.py:427
6715
msgid "Finding merge"
6716
msgstr ""
6717
6718
#: bzrlib/plugins/launchpad/__init__.py:432
6719
msgid "Finding revno"
6720
msgstr ""
6721
6722
#: bzrlib/plugins/launchpad/__init__.py:437
6723
msgid "Finding Launchpad branch"
6724
msgstr ""
6725
6726
#: bzrlib/plugins/launchpad/__init__.py:440
6727
msgid "Finding proposals"
6728
msgstr ""
6729
6730
#: bzrlib/plugins/launchpad/account.py:66
6731
msgid "Setting ssh/sftp usernames for launchpad.net."
6732
msgstr ""
6733
6734
#: bzrlib/plugins/launchpad/lp_api.py:241
6735
#: bzrlib/plugins/launchpad/lp_api.py:246
6736
#, python-format
6737
msgid "%s is not registered on Launchpad"
6738
msgstr ""
6739
6740
#: bzrlib/plugins/launchpad/lp_api.py:256
6741
#, python-format
6742
msgid "%s has no development focus."
6743
msgstr ""
6744
6745
#: bzrlib/plugins/launchpad/lp_api.py:261
6746
#, python-format
6747
msgid "development focus %s has no branch."
6748
msgstr ""
6749
6750
#: bzrlib/plugins/launchpad/lp_api.py:266
6751
#, python-format
6752
msgid "source package %s has no branch."
6753
msgstr ""
6754
6755
#: bzrlib/plugins/launchpad/lp_api.py:270
6756
#, python-format
6757
msgid "%s has no associated product or source package."
6758
msgstr ""
6759
6760
#: bzrlib/plugins/launchpad/lp_api.py:282
6761
#, python-format
6762
msgid "%s is already up-to-date."
6763
msgstr ""
6764
6765
#: bzrlib/plugins/launchpad/lp_api.py:289
6766
#, python-format
6767
msgid "Pushing to %s"
6768
msgstr ""
6769
6770
#: bzrlib/plugins/launchpad/lp_directory.py:170
6771
msgid ""
6772
"resolution for {0}\n"
6773
" local: {1}\n"
6774
" remote: {2}"
6775
msgstr ""
6776
6777
#: bzrlib/plugins/launchpad/lp_propose.py:149
6778
#, python-format
6779
msgid "There is already a branch merge proposal: %s"
6780
msgstr ""
6781
6782
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6783
msgid "pb parameter to convert() is deprecated"
6784
msgstr ""
6785
6786
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6787
msgid "starting upgrade from format 4 to 5"
6788
msgstr ""
6789
6790
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6791
msgid "note: upgrade may be faster if all store files are ungzipped first"
6792
msgstr ""
6793
6794
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6795
msgid "converting revision"
6796
msgstr ""
6797
6798
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6799
msgid "upgraded to weaves:"
6800
msgstr ""
6801
6802
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6803
#, python-format
6804
msgid "%6d revisions and inventories"
6805
msgstr ""
6806
6807
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6808
#, python-format
6809
msgid "%6d revisions not present"
6810
msgstr ""
6811
6812
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6813
#, python-format
6814
msgid "%6d texts"
6815
msgstr ""
6816
6817
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6818
msgid "writing weave"
6819
msgstr ""
6820
6821
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6822
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6823
msgid "inventory"
6824
msgstr ""
6825
6826
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6827
msgid "write revision"
6828
msgstr ""
6829
6830
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6831
msgid "loading revision"
6832
msgstr ""
6833
6834
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6835
#, python-format
6836
msgid "revision {%s} not present in branch; will be converted as a ghost"
6837
msgstr ""
6838
6839
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6840
msgid "starting upgrade from format 5 to 6"
6841
msgstr ""
6842
6843
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6844
#, python-format
6845
msgid "adding prefixes to %s"
6846
msgstr ""
6847
6848
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6849
msgid "starting upgrade from format 6 to metadir"
6850
msgstr ""
6851
6852
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6853
msgid "Removing ancestry.weave"
6854
msgstr ""
6855
6856
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6857
msgid "Finding branch files"
6858
msgstr ""
6859
6860
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6861
msgid "Upgrading repository"
6862
msgstr ""
6863
6864
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6865
msgid "Upgrading branch"
6866
msgstr ""
6867
6868
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6869
msgid "No working tree."
6870
msgstr ""
6871
6872
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6873
msgid "Upgrading working tree"
6874
msgstr ""
6875
6876
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6877
#, python-format
6878
msgid "Make %s lock"
6879
msgstr ""
6880
6881
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6882
#, python-format
6883
msgid "Moving %s"
6884
msgstr ""
6885
6886
#: bzrlib/push.py:56
6887
msgid "Created new branch."
6888
msgstr ""
6889
6890
#: bzrlib/push.py:98
6891
#, python-format
6892
msgid ""
6893
"Target directory %s already contains a .bzr directory, but it is not valid."
6894
msgstr ""
6895
6896
#: bzrlib/push.py:101
6897
#, python-format
6898
msgid ""
6899
"Target directory %s already exists, but does not have a .bzr directory. "
6900
"Supply --use-existing-dir to push there anyway."
6901
msgstr ""
6902
6903
#: bzrlib/push.py:122
6904
#, python-format
6905
msgid "Too many redirections trying to make %s."
6906
msgstr ""
6907
6908
#: bzrlib/push.py:147
6909
msgid ""
6910
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6911
"information."
6912
msgstr ""
6913
6914
#: bzrlib/push.py:151
6915
#, python-format
6916
msgid ""
6917
"It is not possible to losslessly push to %s. You may want to use dpush "
6918
"instead."
6919
msgstr ""
6920
6921
#: bzrlib/push.py:157
6922
#, python-format
6923
msgid ""
6924
"At %s you have a valid .bzr control directory, but not a branch or "
6925
"repository. This is an unsupported configuration. Please move the target "
6926
"directory out of the way and try again."
6927
msgstr ""
6928
6929
#: bzrlib/reconcile.py:97
6930
#, python-format
6931
msgid "Reconciling branch %s"
6932
msgstr ""
6933
6934
#: bzrlib/reconcile.py:103
6935
#, python-format
6936
msgid "Reconciling repository %s"
6937
msgstr ""
6938
6939
#: bzrlib/reconcile.py:105
6940
msgid "Reconciling repository"
6941
msgstr ""
6942
6943
#: bzrlib/reconcile.py:111
6944
#, python-format
6945
msgid "%s cannot canonicalize CHKs."
6946
msgstr ""
6947
6948
#: bzrlib/reconcile.py:119
6949
msgid "Reconcile aborted: revision index has inconsistent parents."
6950
msgstr ""
6951
6952
#: bzrlib/reconcile.py:121
6953
msgid "Run \"bzr check\" for more details."
6954
msgstr ""
6955
6956
#: bzrlib/reconcile.py:123
6957
msgid "Reconciliation complete."
6958
msgstr ""
6959
6960
#: bzrlib/reconcile.py:166
6961
msgid "Fixing last revision info {0} => {1}"
6962
msgstr ""
6963
6964
#: bzrlib/reconcile.py:173
6965
msgid "revision_history ok."
6966
msgstr ""
6967
6968
#: bzrlib/reconcile.py:234
6969
msgid "Reading inventory data"
6970
msgstr ""
6971
6972
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
6973
msgid "Inventory ok."
6974
msgstr ""
6975
6976
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
6977
msgid "Backing up inventory"
6978
msgstr ""
6979
6980
#: bzrlib/reconcile.py:258
6981
msgid "Backup inventory created."
6982
msgstr ""
6983
6984
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
6985
msgid "Writing weave"
6986
msgstr ""
6987
6988
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
6989
msgid "Inventory regenerated."
6990
msgstr ""
6991
6992
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
6993
msgid "Reading indexes"
6994
msgstr ""
6995
6996
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
6997
msgid "Checking unused inventories"
6998
msgstr ""
6999
7000
#: bzrlib/reconcile.py:388
7001
msgid "Backup Inventory created"
7002
msgstr ""
7003
7004
#: bzrlib/reconcile.py:446
7005
msgid "Fixing text parents"
7006
msgstr ""
7007
7008
#: bzrlib/reconfigure.py:54
7009
msgid "{0} is now stacked on {1}\n"
7010
msgstr ""
7011
7012
#: bzrlib/reconfigure.py:69
7013
#, python-format
7014
msgid "%s is now not stacked\n"
7015
msgstr ""
7016
7017
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7018
#, python-format
7019
msgid "bzr: ERROR (ignored): %s"
7020
msgstr ""
7021
7022
#: bzrlib/remote.py:2493
7023
msgid "Copying repository content as tarball..."
7024
msgstr ""
7025
7026
#: bzrlib/rename_map.py:69
7027
msgid "Calculating hashes"
7028
msgstr ""
7029
7030
#: bzrlib/rename_map.py:107
7031
msgid "Determining hash hits"
7032
msgstr ""
7033
7034
#: bzrlib/rename_map.py:242
7035
msgid "{0} => {1}"
7036
msgstr ""
7037
7038
#: bzrlib/repository.py:1787
7039
msgid "Moving repository to repository.backup"
7040
msgstr ""
7041
7042
#: bzrlib/repository.py:1794
7043
msgid "Creating new repository"
7044
msgstr ""
7045
7046
#: bzrlib/repository.py:1799
7047
msgid "Copying content"
7048
msgstr ""
7049
7050
#: bzrlib/repository.py:1803
7051
msgid "Deleting old repository content"
7052
msgstr ""
7053
7054
#: bzrlib/repository.py:1805
7055
msgid "repository converted"
7056
msgstr ""
7057
7058
#: bzrlib/revisionspec.py:903
7059
msgid "Using {0} {1}"
7060
msgstr ""
7061
7062
#: bzrlib/send.py:58
7063
#, python-format
7064
msgid "Mail client \"%s\" does not support specifying body"
7065
msgstr ""
7066
7067
#: bzrlib/send.py:62
7068
msgid "--remember requires a branch to be specified."
7069
msgstr ""
7070
7071
#: bzrlib/send.py:77
7072
msgid "No submit branch known or specified"
7073
msgstr ""
7074
7075
#: bzrlib/send.py:80
7076
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7077
msgstr ""
7078
7079
#: bzrlib/send.py:98
7080
#, python-format
7081
msgid "No such send format '%s'."
7082
msgstr ""
7083
7084
#: bzrlib/send.py:114
7085
msgid "bzr send takes at most two one revision identifiers"
7086
msgstr ""
7087
7088
#: bzrlib/send.py:127
7089
msgid "No revisions to submit."
7090
msgstr ""
7091
7092
#: bzrlib/send.py:139
7093
msgid ""
7094
"- not supported for merge directives that use more than one output file."
7095
msgstr ""
7096
7097
#: bzrlib/send.py:185
7098
msgid "Format 0.9 does not permit bundle with no patch"
7099
msgstr ""
7100
7101
#: bzrlib/shelf_ui.py:46
7102
#, python-format
7103
msgid "Shelve adding file \"%(path)s\"?"
7104
msgstr ""
7105
7106
#: bzrlib/shelf_ui.py:47
7107
msgid "Shelve binary changes?"
7108
msgstr ""
7109
7110
#: bzrlib/shelf_ui.py:48
7111
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7112
msgstr ""
7113
7114
#: bzrlib/shelf_ui.py:50
7115
#, python-format
7116
msgid "Shelve removing file \"%(path)s\"?"
7117
msgstr ""
7118
7119
#: bzrlib/shelf_ui.py:51
7120
#, python-format
7121
msgid "Shelve %d change(s)?"
7122
msgstr ""
7123
7124
#: bzrlib/shelf_ui.py:52
7125
msgid "Shelve?"
7126
msgstr ""
7127
7128
#: bzrlib/shelf_ui.py:53
7129
#, python-format
7130
msgid ""
7131
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7132
msgstr ""
7133
7134
#: bzrlib/shelf_ui.py:55
7135
#, python-format
7136
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7137
msgstr ""
7138
7139
#: bzrlib/shelf_ui.py:70
7140
#, python-format
7141
msgid "Changes shelved with id \"%d\"."
7142
msgstr ""
7143
7144
#: bzrlib/shelf_ui.py:74
7145
msgid "Selected changes destroyed."
7146
msgstr ""
7147
7148
#: bzrlib/shelf_ui.py:78
7149
msgid "Selected changes:"
7150
msgstr ""
7151
7152
#: bzrlib/shelf_ui.py:98
7153
#, python-format
7154
msgid "Delete file \"%(path)s\"?"
7155
msgstr ""
7156
7157
#: bzrlib/shelf_ui.py:99
7158
msgid "Apply binary changes?"
7159
msgstr ""
7160
7161
#: bzrlib/shelf_ui.py:100
7162
#, python-format
7163
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7164
msgstr ""
7165
7166
#: bzrlib/shelf_ui.py:102
7167
#, python-format
7168
msgid "Add file \"%(path)s\"?"
7169
msgstr ""
7170
7171
#: bzrlib/shelf_ui.py:103
7172
#, python-format
7173
msgid "Apply %d change(s)?"
7174
msgstr ""
7175
7176
#: bzrlib/shelf_ui.py:104
7177
msgid "Apply change?"
7178
msgstr ""
7179
7180
#: bzrlib/shelf_ui.py:105
7181
#, python-format
7182
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7183
msgstr ""
7184
7185
#: bzrlib/shelf_ui.py:107
7186
#, python-format
7187
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7188
msgstr ""
7189
7190
#: bzrlib/shelf_ui.py:402
7191
msgid "No changes are shelved."
7192
msgstr ""
7193
7194
#: bzrlib/shelf_ui.py:460
7195
#, python-format
7196
msgid "Using changes with id \"%d\"."
7197
msgstr ""
7198
7199
#: bzrlib/shelf_ui.py:464
7200
#, python-format
7201
msgid "Message: %s"
7202
msgstr ""
7203
7204
#: bzrlib/shelf_ui.py:476
7205
#, python-format
7206
msgid "Deleted changes with id \"%d\"."
7207
msgstr ""
7208
7209
#: bzrlib/smart/medium.py:714
7210
msgid "HPSS calls: {0} ({1} vfs) {2}"
7211
msgstr ""
7212
7213
#: bzrlib/smart/server.py:169
7214
msgid "Requested to stop gracefully"
7215
msgstr ""
7216
7217
#: bzrlib/smart/server.py:179
7218
#, python-format
7219
msgid "Waiting for %d client(s) to finish"
7220
msgstr ""
7221
7222
#: bzrlib/smart/server.py:185
7223
#, python-format
7224
msgid "Still waiting for %d client(s) to finish"
7225
msgstr ""
7226
7227
#: bzrlib/smart/server.py:219
7228
#, python-format
7229
msgid "listening socket error: %s"
7230
msgstr ""
7231
7232
#: bzrlib/smart/server.py:452
7233
#, python-format
7234
msgid "listening on port: %s"
7235
msgstr ""
7236
7237
#: bzrlib/switch.py:69
7238
msgid "Pending merges must be committed or reverted before using switch."
7239
msgstr ""
7240
7241
#: bzrlib/switch.py:96
7242
msgid ""
7243
"Cannot switch as local commits found in the checkout. Commit these to the "
7244
"bound branch or use --force to throw them away."
7245
msgstr ""
7246
7247
#: bzrlib/switch.py:101
7248
#, python-format
7249
msgid ""
7250
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7251
"anyway, use --force."
7252
msgstr ""
7253
7254
#: bzrlib/switch.py:110
7255
msgid "Cannot switch a branch, only a checkout."
7256
msgstr ""
7257
7258
#: bzrlib/switch.py:146
7259
#, python-format
7260
msgid "Tree is up to date at revision %d."
7261
msgstr ""
7262
7263
#: bzrlib/switch.py:152
7264
#, python-format
7265
msgid "Updated to revision %d."
7266
msgstr ""
7267
7268
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7269
msgid "Apply phase"
7270
msgstr ""
7271
7272
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7273
msgid "removing file"
7274
msgstr ""
7275
7276
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7277
msgid "adding file"
7278
msgstr ""
7279
7280
#: bzrlib/transform.py:2587
7281
msgid "Building tree"
7282
msgstr ""
7283
7284
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7285
msgid "Adding file contents"
7286
msgstr ""
7287
7288
#: bzrlib/transform.py:3024
7289
msgid "Resolution pass"
7290
msgstr ""
7291
7292
#: bzrlib/transport/ftp/_gssapi.py:88
7293
#, python-format
7294
msgid "Authenticated as %s"
7295
msgstr ""
7296
7297
#: bzrlib/tree.py:634
7298
msgid "*** {0} content-filter: {1} => {2!r}"
7299
msgstr ""
7300
7301
#: bzrlib/upgrade.py:77
7302
#, python-format
7303
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7304
msgstr ""
7305
7306
#: bzrlib/upgrade.py:100
7307
#, python-format
7308
msgid "cannot upgrade from bzrdir format %s"
7309
msgstr ""
7310
7311
#: bzrlib/upgrade.py:103
7312
#, python-format
7313
msgid "starting upgrade of %s"
7314
msgstr ""
7315
7316
#: bzrlib/upgrade.py:110
7317
msgid "finished"
7318
msgstr ""
7319
7320
#: bzrlib/upgrade.py:120
7321
msgid "Deleting backup.bzr"
7322
msgstr ""
7323
7324
#: bzrlib/upgrade.py:151
7325
msgid ""
7326
"\n"
7327
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7328
msgstr ""
7329
7330
#: bzrlib/upgrade.py:208
7331
#, python-format
7332
msgid "Found %d dependent branches - upgrading ..."
7333
msgstr ""
7334
7335
#: bzrlib/upgrade.py:276
7336
msgid "Upgrading bzrdirs"
7337
msgstr ""
7338
7339
#: bzrlib/upgrade.py:282
7340
#, python-format
7341
msgid "Upgrading %s"
7342
msgstr ""
7343
7344
#: bzrlib/upgrade.py:283
7345
msgid "Upgrading {0} {1} ..."
7346
msgstr ""
7347
7348
#: bzrlib/upgrade.py:301
7349
msgid "Removing backup ..."
7350
msgstr ""
7351
7352
#: bzrlib/upgrade.py:305
7353
msgid "failed to clean-up {0}: {1}"
7354
msgstr ""
7355
7356
#: bzrlib/vf_repository.py:1090
7357
msgid "inventories"
7358
msgstr ""
7359
7360
#: bzrlib/vf_repository.py:1116
7361
msgid "texts"
7362
msgstr ""
7363
7364
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7365
msgid "Calculating text parents"
7366
msgstr ""
7367
7368
#: bzrlib/vf_repository.py:1706
7369
msgid "Fetch texts"
7370
msgstr ""
7371
7372
#: bzrlib/vf_repository.py:2535
7373
msgid "loading text store"
7374
msgstr ""
7375
7376
#: bzrlib/vf_repository.py:2541
7377
msgid "checking text graph"
7378
msgstr ""
7379
7380
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7381
#: bzrlib/vf_repository.py:3124
7382
msgid "Transferring revisions"
7383
msgstr ""
7384
7385
#: bzrlib/win32utils.py:146
7386
msgid "Failed to GetProcessMemoryInfo()"
7387
msgstr ""
7388
7389
#: bzrlib/win32utils.py:167
7390
msgid "Cannot debug memory on win32 without ctypes or win32process"
7391
msgstr ""
7392
7393
#: bzrlib/win32utils.py:172
7394
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7395
msgstr ""
7396
7397
#: bzrlib/win32utils.py:180
7398
#, python-format
7399
msgid "WorkingSize %8d KiB"
7400
msgstr ""
7401
7402
#: bzrlib/win32utils.py:181
7403
#, python-format
7404
msgid "PeakWorking %8d KiB"
7405
msgstr ""
7406
7407
#: bzrlib/win32utils.py:182
7408
#, python-format
7409
msgid "PagefileUsage %8d KiB"
7410
msgstr ""
7411
7412
#: bzrlib/win32utils.py:183
7413
#, python-format
7414
msgid "PeakPagefileUsage %8d KiB"
7415
msgstr ""
7416
7417
#: bzrlib/win32utils.py:185
7418
#, python-format
7419
msgid "PrivateUsage %8d KiB"
7420
msgstr ""
7421
7422
#: bzrlib/win32utils.py:186
7423
#, python-format
7424
msgid "PageFaultCount %8d"
7425
msgstr ""
7426
7427
#: bzrlib/workingtree.py:1478
7428
msgid "Rerun update after fixing the conflicts."
7429
msgstr ""
7430
7431
#: dummy/help_topics/authentication/summary.txt:1
7432
msgid "Information on configuring authentication"
7433
msgstr ""
7434
7435
#: dummy/help_topics/basic/detail.txt:1
7436
msgid ""
7437
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7438
"http://bazaar.canonical.com/"
7439
msgstr ""
7440
7441
#: dummy/help_topics/basic/detail.txt:4
7442
msgid ""
7443
"Basic commands:\n"
7444
" bzr init makes this directory a versioned branch\n"
7445
" bzr branch make a copy of another branch"
7446
msgstr ""
7447
7448
#: dummy/help_topics/basic/detail.txt:8
7449
msgid ""
7450
" bzr add make files or directories versioned\n"
7451
" bzr ignore ignore a file or pattern\n"
7452
" bzr mv move or rename a versioned file"
7453
msgstr ""
7454
7455
#: dummy/help_topics/basic/detail.txt:12
7456
msgid ""
7457
" bzr status summarize changes in working copy\n"
7458
" bzr diff show detailed diffs"
7459
msgstr ""
7460
7461
#: dummy/help_topics/basic/detail.txt:15
7462
msgid ""
7463
" bzr merge pull in changes from another branch\n"
7464
" bzr commit save some or all changes\n"
7465
" bzr send send changes via email"
7466
msgstr ""
7467
7468
#: dummy/help_topics/basic/detail.txt:19
7469
msgid ""
7470
" bzr log show history of changes\n"
7471
" bzr check validate storage"
7472
msgstr ""
7473
7474
#: dummy/help_topics/basic/detail.txt:22
7475
msgid ""
7476
" bzr help init more help on e.g. init command\n"
7477
" bzr help commands list all commands\n"
7478
" bzr help topics list all help topics\n"
7479
msgstr ""
7480
7481
#: dummy/help_topics/basic/summary.txt:1
7482
msgid "Basic commands"
7483
msgstr ""
7484
7485
#: dummy/help_topics/branches/detail.txt:1
7486
msgid "Branches"
7487
msgstr ""
7488
7489
#: dummy/help_topics/branches/detail.txt:3
7490
msgid ""
7491
"A branch consists of the state of a project, including all of its\n"
7492
"history. All branches have a repository associated (which is where the\n"
7493
"branch history is stored), but multiple branches may share the same\n"
7494
"repository (a shared repository). Branches can be copied and merged."
7495
msgstr ""
7496
7497
#: dummy/help_topics/branches/detail.txt:8
7498
msgid ""
7499
"In addition, one branch may be bound to another one. Binding to another\n"
7500
"branch indicates that commits which happen in this branch must also \n"
7501
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7502
"commits when the two branches are out of date. In order for a commit \n"
7503
"to succeed, it may be necessary to update the current branch using \n"
7504
"``bzr update``."
7505
msgstr ""
7506
7507
#: dummy/help_topics/branches/detail.txt:15
7508
#: dummy/help_topics/checkouts/detail.txt:66
7509
#: dummy/help_topics/repositories/detail.txt:36
7510
msgid "Related commands::"
7511
msgstr ""
7512
7513
#: dummy/help_topics/branches/detail.txt:17
7514
msgid ""
7515
" init Change a directory into a versioned branch.\n"
7516
" branch Create a new branch that is a copy of an existing branch.\n"
7517
" merge Perform a three-way merge.\n"
7518
" bind Bind a branch to another one.\n"
7519
msgstr ""
7520
7521
#: dummy/help_topics/branches/summary.txt:1
7522
msgid "Information on what a branch is"
7523
msgstr ""
7524
7525
#: dummy/help_topics/bugs/summary.txt:1
7526
msgid "Bug tracker settings"
7527
msgstr ""
7528
7529
#: dummy/help_topics/checkouts/detail.txt:1
7530
msgid "Checkouts"
7531
msgstr ""
7532
7533
#: dummy/help_topics/checkouts/detail.txt:3
7534
msgid ""
7535
"Checkouts are source trees that are connected to a branch, so that when\n"
7536
"you commit in the source tree, the commit goes into that branch. They\n"
7537
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7538
"Bazaar's decentralized features until you want them. Using checkouts\n"
7539
"with shared repositories is very similar to working with SVN or CVS, but\n"
7540
"doesn't have the same restrictions. And using checkouts still allows\n"
7541
"others working on the project to use whatever workflow they like."
7542
msgstr ""
7543
7544
#: dummy/help_topics/checkouts/detail.txt:11
7545
msgid ""
7546
"A checkout is created with the bzr checkout command (see \"help "
7547
"checkout\").\n"
7548
"You pass it a reference to another branch, and it will create a local copy\n"
7549
"for you that still contains a reference to the branch you created the\n"
7550
"checkout from (the master branch). Then if you make any commits they will "
7551
"be\n"
7552
"made on the other branch first. This creates an instant mirror of your work, "
7553
"or\n"
7554
"facilitates lockstep development, where each developer is working together,\n"
7555
"continuously integrating the changes of others."
7556
msgstr ""
7557
7558
#: dummy/help_topics/checkouts/detail.txt:19
7559
msgid ""
7560
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7561
"you have the full history locally. As you have a first class branch you "
7562
"can\n"
7563
"also commit locally if you want, for instance due to the temporary loss af "
7564
"a\n"
7565
"network connection. Use the --local option to commit to do this. All the "
7566
"local\n"
7567
"commits will then be made on the master branch the next time you do a non-"
7568
"local\n"
7569
"commit."
7570
msgstr ""
7571
7572
#: dummy/help_topics/checkouts/detail.txt:26
7573
msgid ""
7574
"If you are using a checkout from a shared branch you will periodically want "
7575
"to\n"
7576
"pull in all the changes made by others. This is done using the \"update\"\n"
7577
"command. The changes need to be applied before any non-local commit, but\n"
7578
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7579
"command when needed."
7580
msgstr ""
7581
7582
#: dummy/help_topics/checkouts/detail.txt:32
7583
msgid ""
7584
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7585
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7586
"SVN checkout in that it is not a first class branch, it mainly consists of "
7587
"the\n"
7588
"working tree. This means that any history operations must query the master\n"
7589
"branch, which could be slow if a network connection is involved. Also, as "
7590
"you\n"
7591
"don't have a local branch, then you cannot commit locally."
7592
msgstr ""
7593
7594
#: dummy/help_topics/checkouts/detail.txt:39
7595
msgid ""
7596
"Lightweight checkouts work best when you have fast reliable access to the\n"
7597
"master branch. This means that if the master branch is on the same disk or "
7598
"LAN\n"
7599
"a lightweight checkout will be faster than a heavyweight one for any "
7600
"commands\n"
7601
"that modify the revision history (as only one copy of the branch needs to\n"
7602
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7603
"that uses the history but does not change it, but if the master branch is "
7604
"on\n"
7605
"the same disk then there won't be a noticeable difference."
7606
msgstr ""
7607
7608
#: dummy/help_topics/checkouts/detail.txt:47
7609
msgid ""
7610
"Another possible use for a checkout is to use it with a treeless repository\n"
7611
"containing your branches, where you maintain only one working tree by\n"
7612
"switching the master branch that the checkout points to when you want to\n"
7613
"work on a different branch."
7614
msgstr ""
7615
7616
#: dummy/help_topics/checkouts/detail.txt:52
7617
msgid ""
7618
"Obviously to commit on a checkout you need to be able to write to the "
7619
"master\n"
7620
"branch. This means that the master branch must be accessible over a "
7621
"writeable\n"
7622
"protocol , such as sftp://, and that you have write permissions at the "
7623
"other\n"
7624
"end. Checkouts also work on the local file system, so that all that matters "
7625
"is\n"
7626
"file permissions."
7627
msgstr ""
7628
7629
#: dummy/help_topics/checkouts/detail.txt:58
7630
msgid ""
7631
"You can change the master of a checkout by using the \"switch\" command "
7632
"(see\n"
7633
"\"help switch\"). This will change the location that the commits are sent "
7634
"to.\n"
7635
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7636
"checkout. If you would like to convert your heavy checkout into a normal\n"
7637
"branch so that every commit is local, you can use the \"unbind\" command. To "
7638
"see\n"
7639
"whether or not a branch is bound or not you can use the \"info\" command. If "
7640
"the\n"
7641
"branch is bound it will tell you the location of the bound branch."
7642
msgstr ""
7643
7644
#: dummy/help_topics/checkouts/detail.txt:68
7645
msgid ""
7646
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7647
" checkout\n"
7648
" update Pull any changes in the master branch in to your checkout\n"
7649
" commit Make a commit that is sent to the master branch. If you have\n"
7650
" a heavy checkout then the --local option will commit to the\n"
7651
" checkout without sending the commit to the master\n"
7652
" switch Change the master branch that the commits in the checkout "
7653
"will\n"
7654
" be sent to\n"
7655
" bind Turn a standalone branch into a heavy checkout so that any\n"
7656
" commits will be sent to the master branch\n"
7657
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7658
" commits are only made locally\n"
7659
" info Displays whether a branch is bound or unbound. If the branch "
7660
"is\n"
7661
" bound, then it will also display the location of the bound "
7662
"branch\n"
7663
msgstr ""
7664
7665
#: dummy/help_topics/checkouts/summary.txt:1
7666
msgid "Information on what a checkout is"
7667
msgstr ""
7668
7669
#: dummy/help_topics/commands/summary.txt:1
7670
msgid "Basic help for all commands"
7671
msgstr ""
7672
7673
#: dummy/help_topics/configuration/summary.txt:1
7674
msgid "Details on the configuration settings available"
7675
msgstr ""
7676
7677
#: dummy/help_topics/conflict-types/summary.txt:1
7678
msgid "Types of conflicts and what to do about them"
7679
msgstr ""
7680
7681
#: dummy/help_topics/content-filters/summary.txt:1
7682
msgid "Conversion of content into/from working trees"
7683
msgstr ""
7684
7685
#: dummy/help_topics/criss-cross/detail.txt:1
7686
msgid "Criss-Cross"
7687
msgstr ""
7688
7689
#: dummy/help_topics/criss-cross/detail.txt:3
7690
msgid ""
7691
"A criss-cross in the branch history can cause the default merge technique\n"
7692
"to emit more conflicts than would normally be expected."
7693
msgstr ""
7694
7695
#: dummy/help_topics/criss-cross/detail.txt:6
7696
msgid ""
7697
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7698
"give\n"
7699
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7700
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7701
msgstr ""
7702
7703
#: dummy/help_topics/criss-cross/detail.txt:10
7704
msgid ""
7705
"Criss-crosses occur in a branch's history if two branches merge the same "
7706
"thing\n"
7707
"and then merge one another, or if two branches merge one another at the "
7708
"same\n"
7709
"time. They can be avoided by having each branch only merge from or into a\n"
7710
"designated central branch (a \"star topology\")."
7711
msgstr ""
7712
7713
#: dummy/help_topics/criss-cross/detail.txt:15
7714
msgid ""
7715
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7716
"default\n"
7717
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7718
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7719
"differences between THIS and OTHER are due to one side adding lines, or\n"
7720
"from another side removing lines."
7721
msgstr ""
7722
7723
#: dummy/help_topics/criss-cross/detail.txt:21
7724
msgid ""
7725
"Criss-crosses mean there is no good choice for a base. Selecting the "
7726
"recent\n"
7727
"merge points could cause one side's changes to be silently discarded.\n"
7728
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7729
"are emitted."
7730
msgstr ""
7731
7732
#: dummy/help_topics/criss-cross/detail.txt:26
7733
msgid ""
7734
"The ``weave`` merge type is not affected by this problem because it uses\n"
7735
"line-origin detection instead of a basis revision to determine the cause of\n"
7736
"differences.\n"
7737
msgstr ""
7738
7739
#: dummy/help_topics/criss-cross/summary.txt:1
7740
msgid "Information on criss-cross merging"
7741
msgstr ""
7742
7743
#: dummy/help_topics/current-formats/summary.txt:1
7744
msgid "Current storage formats"
7745
msgstr ""
7746
7747
#: dummy/help_topics/debug-flags/summary.txt:1
7748
msgid "Options to show or record debug information"
7749
msgstr ""
7750
7751
#: dummy/help_topics/diverged-branches/summary.txt:1
7752
msgid "How to fix diverged branches"
7753
msgstr ""
7754
7755
#: dummy/help_topics/env-variables/detail.txt:1
7756
msgid "Environment Variables"
7757
msgstr ""
7758
7759
#: dummy/help_topics/env-variables/detail.txt:3
7760
msgid ""
7761
"=================== "
7762
"===========================================================\n"
7763
"BZRPATH Path where bzr is to look for shell plugin external\n"
7764
" commands.\n"
7765
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7766
"EMAIL E-Mail address of the user.\n"
7767
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7768
"EDITOR Editor for editing commit messages.\n"
7769
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7770
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7771
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7772
"BZR_PLUGIN_PATH.\n"
7773
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7774
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7775
"and\n"
7776
" HOME.\n"
7777
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7778
"URLs).\n"
7779
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7780
"sshcorp,\n"
7781
" plink or lsh.\n"
7782
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7783
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7784
"BZR_COLUMNS Override implicit terminal width.\n"
7785
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7786
"(selftest)\n"
7787
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7788
"'text'.\n"
7789
"BZR_PDB Control whether to launch a debugger on error.\n"
7790
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7791
" breakin debugger.\n"
7792
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7793
"(instead\n"
7794
" of char-based).\n"
7795
"=================== "
7796
"===========================================================\n"
7797
msgstr ""
7798
7799
#: dummy/help_topics/env-variables/summary.txt:1
7800
msgid "Environment variable names and values"
7801
msgstr ""
7802
7803
#: dummy/help_topics/eol/summary.txt:1
7804
msgid "Information on end-of-line handling"
7805
msgstr ""
7806
7807
#: dummy/help_topics/files/detail.txt:1
7808
msgid "Files"
7809
msgstr ""
7810
7811
#: dummy/help_topics/files/detail.txt:3
7812
msgid ""
7813
":On Unix: ~/.bazaar/bazaar.conf\n"
7814
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7815
"bazaar\\\\2.0\\\\bazaar.conf"
7816
msgstr ""
7817
7818
#: dummy/help_topics/files/detail.txt:6
7819
msgid ""
7820
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7821
"used to define general configuration that will be applied everywhere.\n"
7822
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7823
"commonly used options."
7824
msgstr ""
7825
7826
#: dummy/help_topics/files/detail.txt:11
7827
msgid "A typical config file might look something like::"
7828
msgstr ""
7829
7830
#: dummy/help_topics/files/detail.txt:13
7831
msgid ""
7832
" [DEFAULT]\n"
7833
" email=John Doe <jdoe@isp.com>"
7834
msgstr ""
7835
7836
#: dummy/help_topics/files/detail.txt:16
7837
msgid ""
7838
" [ALIASES]\n"
7839
" commit = commit --strict\n"
7840
" log10 = log --short -r -10..-1\n"
7841
msgstr ""
7842
7843
#: dummy/help_topics/files/summary.txt:1
7844
msgid "Information on configuration and log files"
7845
msgstr ""
7846
7847
#: dummy/help_topics/formats/detail.txt:1
7848
msgid "Storage Formats"
7849
msgstr ""
7850
7851
#: dummy/help_topics/formats/detail.txt:3
7852
msgid ""
7853
"To ensure that older clients do not access data incorrectly,\n"
7854
"Bazaar's policy is to introduce a new storage format whenever\n"
7855
"new features requiring new metadata are added. New storage\n"
7856
"formats may also be introduced to improve performance and\n"
7857
"scalability."
7858
msgstr ""
7859
7860
#: dummy/help_topics/formats/detail.txt:9
7861
msgid ""
7862
"The newest format, 2a, is highly recommended. If your\n"
7863
"project is not using 2a, then you should suggest to the\n"
7864
"project owner to upgrade."
7865
msgstr ""
7866
7867
#: dummy/help_topics/formats/detail.txt:13
7868
msgid ""
7869
"\n"
7870
".. note::"
7871
msgstr ""
7872
7873
#: dummy/help_topics/formats/detail.txt:16
7874
msgid ""
7875
" Some of the older formats have two variants:\n"
7876
" a plain one and a rich-root one. The latter include an additional\n"
7877
" field about the root of the tree. There is no performance cost\n"
7878
" for using a rich-root format but you cannot easily merge changes\n"
7879
" from a rich-root format into a plain format. As a consequence,\n"
7880
" moving a project to a rich-root format takes some co-ordination\n"
7881
" in that all contributors need to upgrade their repositories\n"
7882
" around the same time. 2a and all future formats will be\n"
7883
" implicitly rich-root."
7884
msgstr ""
7885
7886
#: dummy/help_topics/formats/detail.txt:26
7887
msgid ""
7888
"See :doc:`current-formats-help` for the complete list of\n"
7889
"currently supported formats. See :doc:`other-formats-help` for\n"
7890
"descriptions of any available experimental and deprecated formats.\n"
7891
msgstr ""
7892
7893
#: dummy/help_topics/formats/summary.txt:1
7894
msgid "Information on choosing a storage format"
7895
msgstr ""
7896
7897
#: dummy/help_topics/global-options/detail.txt:1
7898
msgid "Global Options"
7899
msgstr ""
7900
7901
#: dummy/help_topics/global-options/detail.txt:3
7902
msgid ""
7903
"These options may be used with any command, and may appear in front of any\n"
7904
"command. (e.g. ``bzr --profile help``)."
7905
msgstr ""
7906
7907
#: dummy/help_topics/global-options/detail.txt:6
7908
msgid ""
7909
"--version Print the version number. Must be supplied before the "
7910
"command.\n"
7911
"--no-aliases Do not process command aliases when running this command.\n"
7912
"--builtin Use the built-in version of a command, not the plugin "
7913
"version.\n"
7914
" This does not suppress other plugin effects.\n"
7915
"--no-plugins Do not process any plugins.\n"
7916
"--no-l10n Do not translate messages.\n"
7917
"--concurrency Number of processes that can be run concurrently (selftest)."
7918
msgstr ""
7919
7920
#: dummy/help_topics/global-options/detail.txt:14
7921
msgid ""
7922
"--profile Profile execution using the hotshot profiler.\n"
7923
"--lsprof Profile execution using the lsprof profiler.\n"
7924
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7925
" results to a specified file. If the filename ends with "
7926
"\".txt\",\n"
7927
" text format will be used. If the filename either starts "
7928
"with\n"
7929
" \"callgrind.out\" or end with \".callgrind\", the output will "
7930
"be\n"
7931
" formatted for use with KCacheGrind. Otherwise, the output\n"
7932
" will be a pickle.\n"
7933
"--coverage Generate line coverage report in the specified directory."
7934
msgstr ""
7935
7936
#: dummy/help_topics/global-options/detail.txt:24
7937
msgid ""
7938
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7939
"for\n"
7940
" the duration of the command. This can be used multiple times "
7941
"if\n"
7942
" several options need to be overridden."
7943
msgstr ""
7944
7945
#: dummy/help_topics/global-options/detail.txt:28
7946
msgid ""
7947
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7948
"information on profiling."
7949
msgstr ""
7950
7951
#: dummy/help_topics/global-options/detail.txt:31
7952
msgid ""
7953
"A number of debug flags are also available to assist troubleshooting and\n"
7954
"development. See :doc:`debug-flags-help`.\n"
7955
msgstr ""
7956
7957
#: dummy/help_topics/global-options/summary.txt:1
7958
msgid "Options that control how Bazaar runs"
7959
msgstr ""
7960
7961
#: dummy/help_topics/hidden-commands/summary.txt:1
7962
msgid "All hidden commands"
7963
msgstr ""
7964
7965
#: dummy/help_topics/hooks/summary.txt:1
7966
msgid "Points at which custom processing can be added"
7967
msgstr ""
7968
7969
#: dummy/help_topics/launchpad/detail.txt:1
7970
msgid "Integration with Launchpad.net"
7971
msgstr ""
7972
7973
#: dummy/help_topics/launchpad/detail.txt:3
7974
msgid ""
7975
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
7976
"specification tracking."
7977
msgstr ""
7978
7979
#: dummy/help_topics/launchpad/detail.txt:6
7980
msgid ""
7981
"The bzr client (through the plugin called 'launchpad') has special\n"
7982
"features to communicate with Launchpad:"
7983
msgstr ""
7984
7985
#: dummy/help_topics/launchpad/detail.txt:9
7986
msgid ""
7987
" * The launchpad-login command tells Bazaar your Launchpad user name. "
7988
"This\n"
7989
" is then used by the 'lp:' transport to download your branches using\n"
7990
" bzr+ssh://."
7991
msgstr ""
7992
7993
#: dummy/help_topics/launchpad/detail.txt:13
7994
msgid ""
7995
" * The 'lp:' transport uses Launchpad as a directory service: for "
7996
"example\n"
7997
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
7998
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
7999
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8000
msgstr ""
8001
8002
#: dummy/help_topics/launchpad/detail.txt:18
8003
msgid ""
8004
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8005
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8006
"lp:12345'\n"
8007
" will record a revision property that marks that revision as fixing\n"
8008
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8009
" automatically be linked to the bug report."
8010
msgstr ""
8011
8012
#: dummy/help_topics/launchpad/detail.txt:24
8013
msgid ""
8014
" * The register-branch command tells Launchpad about the url of a\n"
8015
" public branch. Launchpad will then mirror the branch, display\n"
8016
" its contents and allow it to be attached to bugs and other\n"
8017
" objects."
8018
msgstr ""
8019
8020
#: dummy/help_topics/launchpad/detail.txt:29
8021
msgid "For more information see http://help.launchpad.net/\n"
8022
msgstr ""
8023
8024
#: dummy/help_topics/launchpad/summary.txt:1
8025
msgid "Using Bazaar with Launchpad.net"
8026
msgstr ""
8027
8028
#: dummy/help_topics/location-alias/summary.txt:1
8029
msgid "Aliases for remembered locations"
8030
msgstr ""
8031
8032
#: dummy/help_topics/log-formats/summary.txt:1
8033
msgid "Details on the logging formats available"
8034
msgstr ""
8035
8036
#: dummy/help_topics/other-formats/summary.txt:1
8037
msgid "Experimental and deprecated storage formats"
8038
msgstr ""
8039
8040
#: dummy/help_topics/patterns/summary.txt:1
8041
msgid "Information on the pattern syntax"
8042
msgstr ""
8043
8044
#: dummy/help_topics/repositories/detail.txt:1
8045
msgid "Repositories"
8046
msgstr ""
8047
8048
#: dummy/help_topics/repositories/detail.txt:3
8049
msgid ""
8050
"Repositories in Bazaar are where committed information is stored. There is\n"
8051
"a repository associated with every branch."
8052
msgstr ""
8053
8054
#: dummy/help_topics/repositories/detail.txt:6
8055
msgid ""
8056
"Repositories are a form of database. Bzr will usually maintain this for\n"
8057
"good performance automatically, but in some situations (e.g. when doing\n"
8058
"very many commits in a short time period) you may want to ask bzr to\n"
8059
"optimise the database indices. This can be done by the 'bzr pack' command."
8060
msgstr ""
8061
8062
#: dummy/help_topics/repositories/detail.txt:11
8063
msgid ""
8064
"By default just running 'bzr init' will create a repository within the new\n"
8065
"branch but it is possible to create a shared repository which allows "
8066
"multiple\n"
8067
"branches to share their information in the same location. When a new branch "
8068
"is\n"
8069
"created it will first look to see if there is a containing shared repository "
8070
"it\n"
8071
"can use."
8072
msgstr ""
8073
8074
#: dummy/help_topics/repositories/detail.txt:17
8075
msgid ""
8076
"When two branches of the same project share a repository, there is\n"
8077
"generally a large space saving. For some operations (e.g. branching\n"
8078
"within the repository) this translates in to a large time saving."
8079
msgstr ""
8080
8081
#: dummy/help_topics/repositories/detail.txt:21
8082
msgid ""
8083
"To create a shared repository use the init-repository command (or the alias\n"
8084
"init-repo). This command takes the location of the repository to create. "
8085
"This\n"
8086
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8087
"which contains a shared repository. Any new branches that are created in "
8088
"this\n"
8089
"directory will then use it for storage."
8090
msgstr ""
8091
8092
#: dummy/help_topics/repositories/detail.txt:27
8093
msgid ""
8094
"It is a good idea to create a repository whenever you might create more\n"
8095
"than one branch of a project. This is true for both working areas where you\n"
8096
"are doing the development, and any server areas that you use for hosting\n"
8097
"projects. In the latter case, it is common to want branches without working\n"
8098
"trees. Since the files in the branch will not be edited directly there is "
8099
"no\n"
8100
"need to use up disk space for a working tree. To create a repository in "
8101
"which\n"
8102
"the branches will not have working trees pass the '--no-trees' option to\n"
8103
"'init-repository'."
8104
msgstr ""
8105
8106
#: dummy/help_topics/repositories/detail.txt:38
8107
msgid ""
8108
" init-repository Create a shared repository. Use --no-trees to create "
8109
"one\n"
8110
" in which new branches won't get a working tree.\n"
8111
msgstr ""
8112
8113
#: dummy/help_topics/repositories/summary.txt:1
8114
msgid "Basic information on shared repositories."
8115
msgstr ""
8116
8117
#: dummy/help_topics/revisionspec/summary.txt:1
8118
msgid "Explain how to use --revision"
8119
msgstr ""
8120
8121
#: dummy/help_topics/rules/summary.txt:1
8122
msgid "Information on defining rule-based preferences"
8123
msgstr ""
8124
8125
#: dummy/help_topics/standalone-trees/detail.txt:1
8126
msgid "Standalone Trees"
8127
msgstr ""
8128
8129
#: dummy/help_topics/standalone-trees/detail.txt:3
8130
msgid ""
8131
"A standalone tree is a working tree with an associated repository. It\n"
8132
"is an independently usable branch, with no dependencies on any other.\n"
8133
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8134
"an existing project under version control."
8135
msgstr ""
8136
8137
#: dummy/help_topics/standalone-trees/detail.txt:8
8138
msgid "Related Commands::"
8139
msgstr ""
8140
8141
#: dummy/help_topics/standalone-trees/detail.txt:10
8142
msgid " init Make a directory into a versioned branch.\n"
8143
msgstr ""
8144
8145
#: dummy/help_topics/standalone-trees/summary.txt:1
8146
msgid "Information on what a standalone tree is"
8147
msgstr ""
8148
8149
#: dummy/help_topics/standard-options/detail.txt:1
8150
msgid "Standard Options"
8151
msgstr ""
8152
8153
#: dummy/help_topics/standard-options/detail.txt:3
8154
msgid "Standard options are legal for all commands."
8155
msgstr ""
8156
8157
#: dummy/help_topics/standard-options/detail.txt:5
8158
msgid ""
8159
"--help, -h Show help message.\n"
8160
"--verbose, -v Display more information.\n"
8161
"--quiet, -q Only display errors and warnings."
8162
msgstr ""
8163
8164
#: dummy/help_topics/standard-options/detail.txt:9
8165
msgid "Unlike global options, standard options can be used in aliases.\n"
8166
msgstr ""
8167
8168
#: dummy/help_topics/standard-options/summary.txt:1
8169
msgid "Options that can be used with any command"
8170
msgstr ""
8171
8172
#: dummy/help_topics/status-flags/detail.txt:1
8173
msgid "Status Flags"
8174
msgstr ""
8175
8176
#: dummy/help_topics/status-flags/detail.txt:3
8177
msgid ""
8178
"Status flags are used to summarise changes to the working tree in a concise\n"
8179
"manner. They are in the form::"
8180
msgstr ""
8181
8182
#: dummy/help_topics/status-flags/detail.txt:6
8183
msgid " xxx <filename>"
8184
msgstr ""
8185
8186
#: dummy/help_topics/status-flags/detail.txt:8
8187
msgid "where the columns' meanings are as follows."
8188
msgstr ""
8189
8190
#: dummy/help_topics/status-flags/detail.txt:10
8191
msgid "Column 1 - versioning/renames::"
8192
msgstr ""
8193
8194
#: dummy/help_topics/status-flags/detail.txt:12
8195
msgid ""
8196
" + File versioned\n"
8197
" - File unversioned\n"
8198
" R File renamed\n"
8199
" ? File unknown\n"
8200
" X File nonexistent (and unknown to bzr)\n"
8201
" C File has conflicts\n"
8202
" P Entry for a pending merge (not a file)"
8203
msgstr ""
8204
8205
#: dummy/help_topics/status-flags/detail.txt:20
8206
msgid "Column 2 - contents::"
8207
msgstr ""
8208
8209
#: dummy/help_topics/status-flags/detail.txt:22
8210
msgid ""
8211
" N File created\n"
8212
" D File deleted\n"
8213
" K File kind changed\n"
8214
" M File modified"
8215
msgstr ""
8216
8217
#: dummy/help_topics/status-flags/detail.txt:27
8218
msgid "Column 3 - execute::"
8219
msgstr ""
8220
8221
#: dummy/help_topics/status-flags/detail.txt:29
8222
msgid " * The execute bit was changed\n"
8223
msgstr ""
8224
8225
#: dummy/help_topics/status-flags/summary.txt:1
8226
msgid "Help on status flags"
8227
msgstr ""
8228
8229
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8230
msgid "Branches Out of Sync"
8231
msgstr ""
8232
8233
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8234
msgid ""
8235
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8236
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8237
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8238
"have the same last revision as the new reference branch for the lightweight\n"
8239
"checkout, data could be lost, so Bazaar refuses."
8240
msgstr ""
8241
8242
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8243
msgid "How you deal with this depends on *why* the branches are out of sync."
8244
msgstr ""
8245
8246
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8247
msgid ""
8248
"If you have a checkout and have done local commits, you can get back in "
8249
"sync\n"
8250
"by running \"bzr update\" (and possibly \"bzr commit\")."
8251
msgstr ""
8252
8253
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8254
msgid ""
8255
"If you have a branch and the remote branch is out-of-date, you can push\n"
8256
"the local changes using \"bzr push\". If the local branch is out of date, "
8257
"you\n"
8258
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8259
"commit\n"
8260
"and then push your changes. If you decide that some of the changes aren't\n"
8261
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8262
msgstr ""
8263
8264
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8265
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8266
msgstr ""
8267
8268
#: dummy/help_topics/topics/summary.txt:1
8269
msgid "Topics list"
8270
msgstr ""
8271
8272
#: dummy/help_topics/url-special-chars/summary.txt:1
8273
msgid "Special character handling in URLs"
8274
msgstr ""
8275
8276
#: dummy/help_topics/urlspec/summary.txt:1
8277
msgid "Supported transport protocols"
8278
msgstr ""
8279
8280
#: dummy/help_topics/working-trees/detail.txt:1
8281
msgid "Working Trees"
8282
msgstr ""
8283
8284
#: dummy/help_topics/working-trees/detail.txt:3
8285
msgid ""
8286
"A working tree is the contents of a branch placed on disk so that you can\n"
8287
"see the files and edit them. The working tree is where you make changes to "
8288
"a\n"
8289
"branch, and when you commit the current state of the working tree is the\n"
8290
"snapshot that is recorded in the commit."
8291
msgstr ""
8292
8293
#: dummy/help_topics/working-trees/detail.txt:8
8294
msgid ""
8295
"When you push a branch to a remote system, a working tree will not be\n"
8296
"created. If one is already present the files will not be updated. The\n"
8297
"branch information will be updated and the working tree will be marked\n"
8298
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8299
"may be uncommitted changes or the update may cause content conflicts that "
8300
"are\n"
8301
"difficult to deal with remotely."
8302
msgstr ""
8303
8304
#: dummy/help_topics/working-trees/detail.txt:15
8305
msgid ""
8306
"If you have a branch with no working tree you can use the 'checkout' "
8307
"command\n"
8308
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8309
"will\n"
8310
"create the working tree. If the branch is updated remotely, you can update "
8311
"the\n"
8312
"working tree by running 'bzr update' in that directory."
8313
msgstr ""
8314
8315
#: dummy/help_topics/working-trees/detail.txt:20
8316
msgid ""
8317
"If you have a branch with a working tree that you do not want the 'remove-"
8318
"tree'\n"
8319
"command will remove the tree if it is safe. This can be done to avoid the\n"
8320
"warning about the remote working tree not being updated when pushing to the\n"
8321
"branch. It can also be useful when working with a '--no-trees' repository\n"
8322
"(see 'bzr help repositories')."
8323
msgstr ""
8324
8325
#: dummy/help_topics/working-trees/detail.txt:26
8326
msgid ""
8327
"If you want to have a working tree on a remote machine that you push to you\n"
8328
"can either run 'bzr update' in the remote branch after each push, or use "
8329
"some\n"
8330
"other method to update the tree during the push. There is an 'rspush' "
8331
"plugin\n"
8332
"that will update the working tree using rsync as well as doing a push. "
8333
"There\n"
8334
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8335
"SSH\n"
8336
"after each push."
8337
msgstr ""
8338
8339
#: dummy/help_topics/working-trees/detail.txt:33
8340
msgid "Useful commands::"
8341
msgstr ""
8342
8343
#: dummy/help_topics/working-trees/detail.txt:35
8344
msgid ""
8345
" checkout Create a working tree when a branch does not have one.\n"
8346
" remove-tree Removes the working tree from a branch when it is safe to do "
8347
"so.\n"
8348
" update When a working tree is out of sync with its associated "
8349
"branch\n"
8350
" this will update the tree to match the branch.\n"
8351
msgstr ""
8352
8353
#: dummy/help_topics/working-trees/summary.txt:1
8354
msgid "Information on working trees"
8355
msgstr ""
8356
8357
#: en/help_topics/authentication.txt:1
8358
msgid ""
8359
"Authentication Settings\n"
8360
"======================="
8361
msgstr ""
8362
8363
#: en/help_topics/authentication.txt:4
8364
msgid ""
8365
"\n"
8366
"Intent\n"
8367
"------"
8368
msgstr ""
8369
8370
#: en/help_topics/authentication.txt:8
8371
msgid ""
8372
"Many different authentication policies can be described in the\n"
8373
"``authentication.conf`` file but a particular user should need only a few\n"
8374
"definitions to cover his needs without having to specify a user and a "
8375
"password\n"
8376
"for every branch he uses."
8377
msgstr ""
8378
8379
#: en/help_topics/authentication.txt:13
8380
msgid ""
8381
"The definitions found in this file are used to find the credentials to use "
8382
"for\n"
8383
"a given url. The same credentials can generally be used for as many branches "
8384
"as\n"
8385
"possible by grouping their declaration around the remote servers that need\n"
8386
"them. It's even possible to declare credentials that will be used by "
8387
"different\n"
8388
"servers."
8389
msgstr ""
8390
8391
#: en/help_topics/authentication.txt:19
8392
msgid ""
8393
"The intent is to make this file as small as possible to minimize maintenance."
8394
msgstr ""
8395
8396
#: en/help_topics/authentication.txt:21
8397
msgid ""
8398
"Once the relevant credentials are declared in this file you may use branch "
8399
"urls\n"
8400
"without embedding passwords (security hazard) or even users (enabling "
8401
"sharing\n"
8402
"of your urls with others)."
8403
msgstr ""
8404
8405
#: en/help_topics/authentication.txt:25
8406
msgid "Instead of using::"
8407
msgstr ""
8408
8409
#: en/help_topics/authentication.txt:27
8410
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8411
msgstr ""
8412
8413
#: en/help_topics/authentication.txt:29
8414
msgid "you simply use::"
8415
msgstr ""
8416
8417
#: en/help_topics/authentication.txt:31
8418
msgid " bzr branch ftp://host.com/path/to/my/branch"
8419
msgstr ""
8420
8421
#: en/help_topics/authentication.txt:33
8422
msgid ""
8423
"provided you have created the following ``authentication.conf`` file::"
8424
msgstr ""
8425
8426
#: en/help_topics/authentication.txt:35
8427
msgid ""
8428
" [myprojects]\n"
8429
" scheme=ftp\n"
8430
" host=host.com\n"
8431
" user=joe\n"
8432
" password=secret\n"
8433
" "
8434
msgstr ""
8435
8436
#: en/help_topics/authentication.txt:42
8437
msgid ""
8438
"Authentication definitions\n"
8439
"--------------------------"
8440
msgstr ""
8441
8442
#: en/help_topics/authentication.txt:45
8443
msgid ""
8444
"There are two kinds of authentication used by the various schemes supported "
8445
"by\n"
8446
"bzr:"
8447
msgstr ""
8448
8449
#: en/help_topics/authentication.txt:48
8450
msgid "1. user and password"
8451
msgstr ""
8452
8453
#: en/help_topics/authentication.txt:50
8454
msgid ""
8455
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8456
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8457
"ssh agents are a better, more secure solution. So we have chosen to not "
8458
"provide\n"
8459
"our own less secure method."
8460
msgstr ""
8461
8462
#: en/help_topics/authentication.txt:55
8463
msgid "2. user, realm and password"
8464
msgstr ""
8465
8466
#: en/help_topics/authentication.txt:57
8467
msgid ""
8468
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8469
"against a host. But, by using ``.htaccess`` files, for example, it is "
8470
"possible\n"
8471
"to define several (``user, realm, password``) for a given ``host``. So what "
8472
"is\n"
8473
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8474
"is\n"
8475
"not taken into account in the definitions, but will displayed if bzr "
8476
"prompts\n"
8477
"you for a password."
8478
msgstr ""
8479
8480
#: en/help_topics/authentication.txt:64
8481
msgid ""
8482
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8483
"specifying the appropriate port."
8484
msgstr ""
8485
8486
#: en/help_topics/authentication.txt:67
8487
msgid ""
8488
"To take all schemes into account, the password will be deduced from a set "
8489
"of\n"
8490
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8491
"``user``,\n"
8492
"``password``)."
8493
msgstr ""
8494
8495
#: en/help_topics/authentication.txt:71
8496
msgid ""
8497
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8498
"used\n"
8499
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8500
"``ssh``\n"
8501
" should be used instead since this is the real scheme regarding\n"
8502
" authentication,"
8503
msgstr ""
8504
8505
#: en/help_topics/authentication.txt:76
8506
msgid " * ``host``: can be empty (to act as a default for any host),"
8507
msgstr ""
8508
8509
#: en/help_topics/authentication.txt:78
8510
msgid ""
8511
" * ``port`` can be empty (useful when an host provides several servers for "
8512
"the\n"
8513
" same scheme), only numerical values are allowed, this should be used "
8514
"only\n"
8515
" when the server uses a port different than the scheme standard port,"
8516
msgstr ""
8517
8518
#: en/help_topics/authentication.txt:82
8519
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8520
msgstr ""
8521
8522
#: en/help_topics/authentication.txt:84
8523
msgid ""
8524
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8525
" ``getpass.get_user()``),"
8526
msgstr ""
8527
8528
#: en/help_topics/authentication.txt:87
8529
msgid ""
8530
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8531
" password."
8532
msgstr ""
8533
8534
#: en/help_topics/authentication.txt:90
8535
msgid ""
8536
"Multiple definitions can be provided and, for a given URL, bzr will select "
8537
"a\n"
8538
"(``user`` [, ``password``]) based on the following rules :"
8539
msgstr ""
8540
8541
#: en/help_topics/authentication.txt:93
8542
msgid " 1. the first match wins,"
8543
msgstr ""
8544
8545
#: en/help_topics/authentication.txt:95
8546
msgid " 2. empty fields match everything,"
8547
msgstr ""
8548
8549
#: en/help_topics/authentication.txt:97
8550
msgid ""
8551
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8552
msgstr ""
8553
8554
#: en/help_topics/authentication.txt:99
8555
msgid ""
8556
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8557
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8558
"``projectbzr.sf.net``\n"
8559
" will not match ``bzr.sf.net``)."
8560
msgstr ""
8561
8562
#: en/help_topics/authentication.txt:103
8563
msgid ""
8564
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8565
msgstr ""
8566
8567
#: en/help_topics/authentication.txt:105
8568
msgid ""
8569
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8570
"above,\n"
8571
" empty paths will match any provided path)."
8572
msgstr ""
8573
8574
#: en/help_topics/authentication.txt:110
8575
msgid ""
8576
"File format\n"
8577
"-----------"
8578
msgstr ""
8579
8580
#: en/help_topics/authentication.txt:113
8581
msgid ""
8582
"The general rules for :doc:`configuration files <configuration-help>`\n"
8583
"apply except for the variable policies."
8584
msgstr ""
8585
8586
#: en/help_topics/authentication.txt:116
8587
msgid "Each section describes an authentication definition."
8588
msgstr ""
8589
8590
#: en/help_topics/authentication.txt:118
8591
msgid ""
8592
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8593
"reserved\n"
8594
"and should appear as the *last* section."
8595
msgstr ""
8596
8597
#: en/help_topics/authentication.txt:121
8598
msgid "Each section should define:"
8599
msgstr ""
8600
8601
#: en/help_topics/authentication.txt:123
8602
msgid "* ``user``: the login to be used,"
8603
msgstr ""
8604
8605
#: en/help_topics/authentication.txt:125
8606
msgid "Each section could define:"
8607
msgstr ""
8608
8609
#: en/help_topics/authentication.txt:127
8610
msgid "* ``host``: the remote server,"
8611
msgstr ""
8612
8613
#: en/help_topics/authentication.txt:129
8614
msgid "* ``port``: the port the server is listening,"
8615
msgstr ""
8616
8617
#: en/help_topics/authentication.txt:131
8618
msgid "* ``path``: the branch location,"
8619
msgstr ""
8620
8621
#: en/help_topics/authentication.txt:133
8622
msgid "* ``password``: the password."
8623
msgstr ""
8624
8625
#: en/help_topics/authentication.txt:135
8626
msgid ""
8627
"\n"
8628
"Examples\n"
8629
"--------"
8630
msgstr ""
8631
8632
#: en/help_topics/authentication.txt:139
8633
msgid ""
8634
"\n"
8635
"Personal projects hosted outside\n"
8636
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8637
msgstr ""
8638
8639
#: en/help_topics/authentication.txt:143
8640
msgid ""
8641
"All connections are done with the same ``user`` (the remote one for which "
8642
"the\n"
8643
"default bzr one is not appropriate) and the password is always prompted "
8644
"with\n"
8645
"some exceptions::"
8646
msgstr ""
8647
8648
#: en/help_topics/authentication.txt:147
8649
msgid ""
8650
" # Pet projects on hobby.net\n"
8651
" [hobby]\n"
8652
" host=r.hobby.net\n"
8653
" user=jim\n"
8654
" password=obvious1234\n"
8655
" \n"
8656
" # Home server\n"
8657
" [home]\n"
8658
" scheme=https\n"
8659
" host=home.net\n"
8660
" user=joe\n"
8661
" password=1essobV10us\n"
8662
" \n"
8663
" [DEFAULT]\n"
8664
" # Our local user is barbaz, on all remote sites we're known as "
8665
"foobar\n"
8666
" user=foobar"
8667
msgstr ""
8668
8669
#: en/help_topics/authentication.txt:164
8670
msgid ""
8671
"\n"
8672
"Source hosting provider\n"
8673
"~~~~~~~~~~~~~~~~~~~~~~~"
8674
msgstr ""
8675
8676
#: en/help_topics/authentication.txt:168
8677
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8678
msgstr ""
8679
8680
#: en/help_topics/authentication.txt:170
8681
msgid ""
8682
" [shpnet domain]\n"
8683
" # we use sftp, but ssh is the scheme used for authentication\n"
8684
" scheme=ssh\n"
8685
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8686
" host=.shp.net\n"
8687
" user=joe\n"
8688
" # bzr don't support supplying a password for sftp,\n"
8689
" # consider using an ssh agent if you don't want to supply\n"
8690
" # a password interactively. (pageant, ssh-agent, etc)"
8691
msgstr ""
8692
8693
#: en/help_topics/authentication.txt:180
8694
msgid ""
8695
"HTTPS, SFTP servers and their proxy\n"
8696
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8697
msgstr ""
8698
8699
#: en/help_topics/authentication.txt:183
8700
msgid ""
8701
"At company.com, the server hosting release and integration branches is "
8702
"behind a\n"
8703
"proxy, and the two branches use different authentication policies::"
8704
msgstr ""
8705
8706
#: en/help_topics/authentication.txt:186
8707
msgid ""
8708
" [reference code]\n"
8709
" scheme=https\n"
8710
" host=dev.company.com\n"
8711
" path=/dev\n"
8712
" user=user1\n"
8713
" password=pass1"
8714
msgstr ""
8715
8716
#: en/help_topics/authentication.txt:193
8717
msgid ""
8718
" # development branches on dev server\n"
8719
" [dev]\n"
8720
" scheme=ssh # bzr+ssh and sftp are available here\n"
8721
" host=dev.company.com\n"
8722
" path=/dev/integration\n"
8723
" user=user2\n"
8724
" \n"
8725
" # proxy\n"
8726
" [proxy]\n"
8727
" scheme=http\n"
8728
" host=proxy.company.com\n"
8729
" port=3128\n"
8730
" user=proxyuser1\n"
8731
" password=proxypass1"
8732
msgstr ""
8733
8734
#: en/help_topics/authentication.txt:208
8735
msgid ""
8736
"\n"
8737
"Planned enhancements\n"
8738
"--------------------"
8739
msgstr ""
8740
8741
#: en/help_topics/authentication.txt:212
8742
msgid ""
8743
"The following are not yet implemented but planned as parts of a work in\n"
8744
"progress:"
8745
msgstr ""
8746
8747
#: en/help_topics/authentication.txt:215
8748
msgid "* add a ``password_encoding`` field allowing:"
8749
msgstr ""
8750
8751
#: en/help_topics/authentication.txt:217
8752
msgid ""
8753
" - storing the passwords in various obfuscating encodings (base64 for one),"
8754
msgstr ""
8755
8756
#: en/help_topics/authentication.txt:219
8757
msgid " - delegate password storage to plugins (.netrc for example)."
8758
msgstr ""
8759
8760
#: en/help_topics/authentication.txt:221
8761
msgid ""
8762
"* update the credentials when the user is prompted for user or password,"
8763
msgstr ""
8764
8765
#: en/help_topics/authentication.txt:223
8766
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8767
msgstr ""
8768
8769
#: en/help_topics/authentication.txt:225
8770
msgid ""
8771
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8772
"but\n"
8773
"ignored in the actual implementation.\n"
8774
msgstr ""
8775
8776
#: en/help_topics/bugs.txt:1
8777
msgid "Bug Tracker Settings"
8778
msgstr ""
8779
8780
#: en/help_topics/bugs.txt:3
8781
msgid ""
8782
"When making a commit, metadata about bugs fixed by that change can be\n"
8783
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8784
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8785
"(The only ``status`` value currently supported is ``fixed.``)"
8786
msgstr ""
8787
8788
#: en/help_topics/bugs.txt:8
8789
msgid ""
8790
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8791
"identifier\n"
8792
"rather than a full URL. This looks like::"
8793
msgstr ""
8794
8795
#: en/help_topics/bugs.txt:11
8796
msgid " bzr commit --fixes <tracker>:<id>"
8797
msgstr ""
8798
8799
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8800
msgid "or::"
8801
msgstr ""
8802
8803
#: en/help_topics/bugs.txt:15
8804
msgid " bzr commit --fixes <id>"
8805
msgstr ""
8806
8807
#: en/help_topics/bugs.txt:17
8808
msgid ""
8809
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8810
"the\n"
8811
"identifier for that bug within the bugtracker, usually the bug number.\n"
8812
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8813
"or global configuration is used."
8814
msgstr ""
8815
8816
#: en/help_topics/bugs.txt:22
8817
msgid ""
8818
"Bazaar knows about a few bug trackers that have many users. If\n"
8819
"you use one of these bug trackers then there is no setup required to\n"
8820
"use this feature, you just need to know the tracker identifier to use.\n"
8821
"These are the bugtrackers that are built in:"
8822
msgstr ""
8823
8824
#: en/help_topics/bugs.txt:27
8825
msgid ""
8826
" ============================ ============ ============\n"
8827
" URL Abbreviation Example\n"
8828
" ============================ ============ ============\n"
8829
" https://bugs.launchpad.net/ lp lp:12345\n"
8830
" http://bugs.debian.org/ deb deb:12345\n"
8831
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8832
" ============================ ============ ============"
8833
msgstr ""
8834
8835
#: en/help_topics/bugs.txt:35
8836
msgid ""
8837
"For the bug trackers not listed above configuration is required.\n"
8838
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8839
"is built in, along with a template mechanism for other bugtrackers with\n"
8840
"simple URL schemes. If your bug tracker can't be described by one\n"
8841
"of the schemes described below then you can write a plugin to support\n"
8842
"it."
8843
msgstr ""
8844
8845
#: en/help_topics/bugs.txt:42
8846
msgid ""
8847
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8848
"variable which contains the base URL of the bug tracker. These options\n"
8849
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8850
"configuration section in ``locations.conf``. You can set up these values\n"
8851
"for each of the projects you work on."
8852
msgstr ""
8853
8854
#: en/help_topics/bugs.txt:48
8855
msgid ""
8856
"Note: As you provide a short name for each tracker, you can specify one or\n"
8857
"more bugs in one or more trackers at commit time if you wish."
8858
msgstr ""
8859
8860
#: en/help_topics/bugs.txt:51
8861
msgid ""
8862
"Launchpad\n"
8863
"---------"
8864
msgstr ""
8865
8866
#: en/help_topics/bugs.txt:54
8867
msgid ""
8868
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8869
msgstr ""
8870
8871
#: en/help_topics/bugs.txt:56
8872
msgid ""
8873
"bugzilla_<tracker>_url\n"
8874
"----------------------"
8875
msgstr ""
8876
8877
#: en/help_topics/bugs.txt:59
8878
msgid ""
8879
"If present, the location of the Bugzilla bug tracker referred to by\n"
8880
"<tracker>. This option can then be used together with ``bzr commit\n"
8881
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8882
"example::"
8883
msgstr ""
8884
8885
#: en/help_topics/bugs.txt:64
8886
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8887
msgstr ""
8888
8889
#: en/help_topics/bugs.txt:66
8890
msgid ""
8891
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8892
"fixed."
8893
msgstr ""
8894
8895
#: en/help_topics/bugs.txt:69
8896
msgid ""
8897
"trac_<tracker>_url\n"
8898
"------------------"
8899
msgstr ""
8900
8901
#: en/help_topics/bugs.txt:72
8902
msgid ""
8903
"If present, the location of the Trac instance referred to by\n"
8904
"<tracker>. This option can then be used together with ``bzr commit\n"
8905
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8906
"example::"
8907
msgstr ""
8908
8909
#: en/help_topics/bugs.txt:77
8910
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8911
msgstr ""
8912
8913
#: en/help_topics/bugs.txt:79
8914
msgid ""
8915
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8916
"as\n"
8917
"fixed."
8918
msgstr ""
8919
8920
#: en/help_topics/bugs.txt:82
8921
msgid ""
8922
"bugtracker_<tracker>_url\n"
8923
"------------------------"
8924
msgstr ""
8925
8926
#: en/help_topics/bugs.txt:85
8927
msgid ""
8928
"If present, the location of a generic bug tracker instance referred to by\n"
8929
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8930
"which will be replaced by a specific bug ID. This option can then be used\n"
8931
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8932
"fixed by that commit. For example::"
8933
msgstr ""
8934
8935
#: en/help_topics/bugs.txt:91
8936
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8937
msgstr ""
8938
8939
#: en/help_topics/bugs.txt:93
8940
msgid ""
8941
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8942
"Roundup bug tracker as fixed, or::"
8943
msgstr ""
8944
8945
#: en/help_topics/bugs.txt:96
8946
msgid ""
8947
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8948
msgstr ""
8949
8950
#: en/help_topics/bugs.txt:98
8951
msgid ""
8952
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8953
"RT bug tracker as fixed, or::"
8954
msgstr ""
8955
8956
#: en/help_topics/bugs.txt:101
8957
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8958
msgstr ""
8959
8960
#: en/help_topics/bugs.txt:103
8961
msgid ""
8962
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8963
"1234\n"
8964
"in Hudson's JIRA bug tracker as fixed.\n"
8965
msgstr ""
8966
8967
#: en/help_topics/commands.txt:1
8968
msgid ""
8969
"add Add specified files or directories.\n"
8970
"alias Set/unset and display aliases.\n"
8971
"annotate Show the origin of each line in a file.\n"
8972
"bash-completion Generate a shell function for bash command line "
8973
"completion.\n"
8974
" [bash_completion]\n"
8975
"bind Convert the current branch into a checkout of the "
8976
"supplied\n"
8977
" branch.\n"
8978
"branch Create a new branch that is a copy of an existing branch.\n"
8979
"branches List the branches available at the current location.\n"
8980
"break-lock Break a dead lock.\n"
8981
"cat Write the contents of a file as of a given revision to\n"
8982
" standard output.\n"
8983
"check Validate working tree structure, branch consistency and\n"
8984
" repository history.\n"
8985
"checkout Create a new checkout of an existing branch.\n"
8986
"clean-tree Remove unwanted files from working tree.\n"
8987
"commit Commit changes into a new revision.\n"
8988
"config Display, set or remove a configuration option.\n"
8989
"conflicts List files with conflicts.\n"
8990
"deleted List files deleted in the working tree.\n"
8991
"diff Show differences in the working tree, between revisions "
8992
"or\n"
8993
" branches.\n"
8994
"dpush Push into a different VCS without any custom bzr "
8995
"metadata.\n"
8996
"export Export current or past revision to a destination directory "
8997
"or\n"
8998
" archive.\n"
8999
"help Show help on a command or other topic.\n"
9000
"ignore Ignore specified files or patterns.\n"
9001
"ignored List ignored files and the patterns that matched them.\n"
9002
"info Show information about a working tree, branch or "
9003
"repository.\n"
9004
"init Make a directory into a versioned branch.\n"
9005
"init-repository Create a shared repository for branches to share storage\n"
9006
" space.\n"
9007
"join Combine a tree into its containing tree.\n"
9008
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9009
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9010
"launchpad-open Open a Launchpad branch page in your web browser. "
9011
"[launchpad]\n"
9012
"log Show historical log for a branch or subset of a branch.\n"
9013
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9014
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9015
"ls List files in a tree.\n"
9016
"merge Perform a three-way merge.\n"
9017
"missing Show unmerged/unpulled revisions between two branches.\n"
9018
"mkdir Create a new versioned directory.\n"
9019
"mv Move or rename a file.\n"
9020
"nick Print or set the branch nickname.\n"
9021
"pack Compress the data within a repository.\n"
9022
"plugins List the installed plugins.\n"
9023
"pull Turn this branch into a mirror of another branch.\n"
9024
"push Update a mirror of this branch.\n"
9025
"reconcile Reconcile bzr metadata in a branch.\n"
9026
"reconfigure Reconfigure the type of a bzr directory.\n"
9027
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9028
"remerge Redo a merge.\n"
9029
"remove Remove files or directories.\n"
9030
"remove-branch Remove a branch.\n"
9031
"remove-tree Remove the working tree from a given branch/checkout.\n"
9032
"renames Show list of renamed files.\n"
9033
"resolve Mark a conflict as resolved.\n"
9034
"revert Revert files to a previous revision.\n"
9035
"revno Show current revision number.\n"
9036
"root Show the tree root directory.\n"
9037
"send Mail or create a merge-directive for submitting changes.\n"
9038
"serve Run the bzr server.\n"
9039
"shelve Temporarily set aside some changes from the current tree.\n"
9040
"sign-my-commits Sign all commits by a given committer.\n"
9041
"split Split a subdirectory of a tree into a separate tree.\n"
9042
"status Display status summary.\n"
9043
"switch Set the branch of a checkout and update.\n"
9044
"tag Create, remove or modify a tag naming a revision.\n"
9045
"tags List tags.\n"
9046
"testament Show testament (signing-form) of a revision.\n"
9047
"unbind Convert the current checkout into a regular branch.\n"
9048
"uncommit Remove the last committed revision.\n"
9049
"unshelve Restore shelved changes.\n"
9050
"update Update a working tree to a new revision.\n"
9051
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9052
" format.\n"
9053
"verify-signatures Verify all commit signatures.\n"
9054
"version Show version of bzr.\n"
9055
"version-info Show version information about this tree.\n"
9056
"view Manage filtered views.\n"
9057
"whoami Show or set bzr user id.\n"
9058
msgstr ""
9059
9060
#: en/help_topics/configuration.txt:1
9061
msgid ""
9062
"Configuration Settings\n"
9063
"======================="
9064
msgstr ""
9065
9066
#: en/help_topics/configuration.txt:4
9067
msgid ""
9068
"Environment settings\n"
9069
"---------------------"
9070
msgstr ""
9071
9072
#: en/help_topics/configuration.txt:7
9073
msgid ""
9074
"While most configuration is handled by configuration files, some options\n"
9075
"which may be semi-permanent can also be controlled through the environment."
9076
msgstr ""
9077
9078
#: en/help_topics/configuration.txt:10
9079
msgid ""
9080
"BZR_EMAIL\n"
9081
"~~~~~~~~~"
9082
msgstr ""
9083
9084
#: en/help_topics/configuration.txt:13
9085
msgid "Override the email id used by Bazaar. Typical format::"
9086
msgstr ""
9087
9088
#: en/help_topics/configuration.txt:15
9089
msgid " \"John Doe <jdoe@example.com>\""
9090
msgstr ""
9091
9092
#: en/help_topics/configuration.txt:17
9093
msgid "See also the ``email`` configuration option."
9094
msgstr ""
9095
9096
#: en/help_topics/configuration.txt:19
9097
msgid ""
9098
"BZR_PROGRESS_BAR\n"
9099
"~~~~~~~~~~~~~~~~"
9100
msgstr ""
9101
9102
#: en/help_topics/configuration.txt:22
9103
msgid ""
9104
"Override the progress display. Possible values are \"none\" or \"text\". "
9105
"If\n"
9106
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9107
"draws\n"
9108
"the ordinary command line progress bar."
9109
msgstr ""
9110
9111
#: en/help_topics/configuration.txt:26
9112
msgid ""
9113
"BZR_SIGQUIT_PDB\n"
9114
"~~~~~~~~~~~~~~~"
9115
msgstr ""
9116
9117
#: en/help_topics/configuration.txt:29
9118
msgid ""
9119
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9120
msgstr ""
9121
9122
#: en/help_topics/configuration.txt:31
9123
msgid ""
9124
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9125
"* 1 = Invoke breakin debugger (default)"
9126
msgstr ""
9127
9128
#: en/help_topics/configuration.txt:34
9129
msgid ""
9130
"BZR_HOME\n"
9131
"~~~~~~~~"
9132
msgstr ""
9133
9134
#: en/help_topics/configuration.txt:37
9135
msgid "Override the home directory used by Bazaar."
9136
msgstr ""
9137
9138
#: en/help_topics/configuration.txt:39
9139
msgid ""
9140
"BZR_SSH\n"
9141
"~~~~~~~"
9142
msgstr ""
9143
9144
#: en/help_topics/configuration.txt:42
9145
msgid "Select a different SSH implementation."
9146
msgstr ""
9147
9148
#: en/help_topics/configuration.txt:44
9149
msgid ""
9150
"BZR_PDB\n"
9151
"~~~~~~~"
9152
msgstr ""
9153
9154
#: en/help_topics/configuration.txt:47
9155
msgid "Control whether to launch a debugger on error."
9156
msgstr ""
9157
9158
#: en/help_topics/configuration.txt:49
9159
msgid ""
9160
"* 0 = Standard behavior\n"
9161
"* 1 = Launch debugger"
9162
msgstr ""
9163
9164
#: en/help_topics/configuration.txt:52
9165
msgid ""
9166
"BZR_REMOTE_PATH\n"
9167
"~~~~~~~~~~~~~~~"
9168
msgstr ""
9169
9170
#: en/help_topics/configuration.txt:55
9171
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9172
msgstr ""
9173
9174
#: en/help_topics/configuration.txt:57
9175
msgid "See also the ``bzr_remote_path`` configuration option."
9176
msgstr ""
9177
9178
#: en/help_topics/configuration.txt:59
9179
msgid ""
9180
"BZR_EDITOR\n"
9181
"~~~~~~~~~~"
9182
msgstr ""
9183
9184
#: en/help_topics/configuration.txt:62
9185
msgid "Path to the editor Bazaar should use for commit messages, etc."
9186
msgstr ""
9187
9188
#: en/help_topics/configuration.txt:64
9189
msgid ""
9190
"BZR_LOG\n"
9191
"~~~~~~~"
9192
msgstr ""
9193
9194
#: en/help_topics/configuration.txt:67
9195
msgid ""
9196
"Location of the Bazaar log file. You can check the current location by\n"
9197
"running ``bzr version``."
9198
msgstr ""
9199
9200
#: en/help_topics/configuration.txt:70
9201
msgid ""
9202
"The log file contains debug information that is useful for diagnosing or\n"
9203
"reporting problems with Bazaar."
9204
msgstr ""
9205
9206
#: en/help_topics/configuration.txt:73
9207
msgid ""
9208
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9209
"will disable logging."
9210
msgstr ""
9211
9212
#: en/help_topics/configuration.txt:76
9213
msgid ""
9214
"\n"
9215
"BZR_PLUGIN_PATH\n"
9216
"~~~~~~~~~~~~~~~"
9217
msgstr ""
9218
9219
#: en/help_topics/configuration.txt:80
9220
msgid ""
9221
"The path to the plugins directory that Bazaar should use.\n"
9222
"If not set, Bazaar will search for plugins in:"
9223
msgstr ""
9224
9225
#: en/help_topics/configuration.txt:83
9226
msgid ""
9227
"* the user specific plugin directory (containing the ``user`` plugins),"
9228
msgstr ""
9229
9230
#: en/help_topics/configuration.txt:85
9231
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9232
msgstr ""
9233
9234
#: en/help_topics/configuration.txt:87
9235
msgid ""
9236
"* the site specific plugin directory if applicable (containing\n"
9237
" the ``site`` plugins)."
9238
msgstr ""
9239
9240
#: en/help_topics/configuration.txt:90
9241
msgid ""
9242
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9243
"the way the plugin are searched. "
9244
msgstr ""
9245
9246
#: en/help_topics/configuration.txt:93
9247
msgid ""
9248
"As for the ``PATH`` variables, if multiple directories are\n"
9249
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9250
"platform specific appropriate character (':' on Unix,\n"
9251
"';' on windows)"
9252
msgstr ""
9253
9254
#: en/help_topics/configuration.txt:98
9255
msgid ""
9256
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9257
"in ``user``. However it will continue to search in ``core`` and\n"
9258
"``site`` unless they are explicitly removed."
9259
msgstr ""
9260
9261
#: en/help_topics/configuration.txt:102
9262
msgid ""
9263
"If you need to change the order or remove one of these\n"
9264
"directories, you should use special values:"
9265
msgstr ""
9266
9267
#: en/help_topics/configuration.txt:105
9268
msgid ""
9269
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9270
" path from the default values,"
9271
msgstr ""
9272
9273
#: en/help_topics/configuration.txt:108
9274
msgid ""
9275
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9276
" before the remaining default values (and also remove it from\n"
9277
" the default values)."
9278
msgstr ""
9279
9280
#: en/help_topics/configuration.txt:112
9281
msgid ""
9282
"Note that the special values 'user', 'core' and 'site' should be\n"
9283
"used literally, they will be substituted by the corresponding,\n"
9284
"platform specific, values."
9285
msgstr ""
9286
9287
#: en/help_topics/configuration.txt:116
9288
msgid ""
9289
"The examples below use ':' as the separator, windows users\n"
9290
"should use ';'."
9291
msgstr ""
9292
9293
#: en/help_topics/configuration.txt:119
9294
msgid "Overriding the default user plugin directory::"
9295
msgstr ""
9296
9297
#: en/help_topics/configuration.txt:121
9298
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9299
msgstr ""
9300
9301
#: en/help_topics/configuration.txt:123
9302
msgid "Disabling the site directory while retaining the user directory::"
9303
msgstr ""
9304
9305
#: en/help_topics/configuration.txt:125
9306
msgid " BZR_PLUGIN_PATH='-site:+user'"
9307
msgstr ""
9308
9309
#: en/help_topics/configuration.txt:127
9310
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9311
msgstr ""
9312
9313
#: en/help_topics/configuration.txt:129
9314
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9315
msgstr ""
9316
9317
#: en/help_topics/configuration.txt:131
9318
msgid "Overriding the default site plugin directory::"
9319
msgstr ""
9320
9321
#: en/help_topics/configuration.txt:133
9322
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9323
msgstr ""
9324
9325
#: en/help_topics/configuration.txt:135
9326
msgid ""
9327
"BZR_DISABLE_PLUGINS\n"
9328
"~~~~~~~~~~~~~~~~~~~"
9329
msgstr ""
9330
9331
#: en/help_topics/configuration.txt:138
9332
msgid ""
9333
"Under special circumstances (mostly when trying to diagnose a\n"
9334
"bug), it's better to disable a plugin (or several) rather than\n"
9335
"uninstalling them completely. Such plugins can be specified in\n"
9336
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9337
msgstr ""
9338
9339
#: en/help_topics/configuration.txt:143
9340
msgid ""
9341
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9342
"will raise an import error if they are explicitly imported (by\n"
9343
"another plugin that depends on them for example)."
9344
msgstr ""
9345
9346
#: en/help_topics/configuration.txt:147
9347
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9348
msgstr ""
9349
9350
#: en/help_topics/configuration.txt:149
9351
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9352
msgstr ""
9353
9354
#: en/help_topics/configuration.txt:151
9355
msgid ""
9356
"BZR_PLUGINS_AT\n"
9357
"~~~~~~~~~~~~~~"
9358
msgstr ""
9359
9360
#: en/help_topics/configuration.txt:154
9361
msgid ""
9362
"When adding a new feature or working on a bug in a plugin,\n"
9363
"developers often need to use a specific version of a given\n"
9364
"plugin. Since python requires that the directory containing the\n"
9365
"code is named like the plugin itself this make it impossible to\n"
9366
"use arbitrary directory names (using a two-level directory scheme\n"
9367
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9368
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9369
msgstr ""
9370
9371
#: en/help_topics/configuration.txt:162
9372
msgid ""
9373
"Plugins specified in this environment variable takes precedence\n"
9374
"over the ones in ``BZR_PLUGIN_PATH``."
9375
msgstr ""
9376
9377
#: en/help_topics/configuration.txt:165
9378
msgid ""
9379
"The variable specified a list of ``plugin_name@plugin path``,\n"
9380
"``plugin_name`` being the name of the plugin as it appears in\n"
9381
"python module paths, ``plugin_path`` being the path to the\n"
9382
"directory containing the plugin code itself\n"
9383
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9384
"separator, use ';' on windows."
9385
msgstr ""
9386
9387
#: en/help_topics/configuration.txt:172
9388
msgid ""
9389
"Example:\n"
9390
"~~~~~~~~"
9391
msgstr ""
9392
9393
#: en/help_topics/configuration.txt:175
9394
msgid ""
9395
"Using a specific version of ``myplugin``:\n"
9396
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9397
msgstr ""
9398
9399
#: en/help_topics/configuration.txt:178
9400
msgid ""
9401
"BZRPATH\n"
9402
"~~~~~~~"
9403
msgstr ""
9404
9405
#: en/help_topics/configuration.txt:181
9406
msgid "The path where Bazaar should look for shell plugin external commands."
9407
msgstr ""
9408
9409
#: en/help_topics/configuration.txt:183
9410
msgid ""
9411
"\n"
9412
"http_proxy, https_proxy\n"
9413
"~~~~~~~~~~~~~~~~~~~~~~~"
9414
msgstr ""
9415
9416
#: en/help_topics/configuration.txt:187
9417
msgid "Specifies the network proxy for outgoing connections, for example::"
9418
msgstr ""
9419
9420
#: en/help_topics/configuration.txt:189
9421
msgid ""
9422
" http_proxy=http://proxy.example.com:3128/ \n"
9423
" https_proxy=http://proxy.example.com:3128/"
9424
msgstr ""
9425
9426
#: en/help_topics/configuration.txt:192
9427
msgid ""
9428
"\n"
9429
"Configuration files\n"
9430
"-------------------"
9431
msgstr ""
9432
9433
#: en/help_topics/configuration.txt:196
9434
msgid ""
9435
"Location\n"
9436
"~~~~~~~~"
9437
msgstr ""
9438
9439
#: en/help_topics/configuration.txt:199
9440
msgid ""
9441
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9442
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9443
"on\n"
9444
"Windows. (You can check the location for your system by using\n"
9445
"``bzr version``.)"
9446
msgstr ""
9447
9448
#: en/help_topics/configuration.txt:204
9449
msgid "There are three primary configuration files in this location:"
9450
msgstr ""
9451
9452
#: en/help_topics/configuration.txt:206
9453
msgid "* ``bazaar.conf`` describes default configuration options,"
9454
msgstr ""
9455
9456
#: en/help_topics/configuration.txt:208
9457
msgid ""
9458
"* ``locations.conf`` describes configuration information for\n"
9459
" specific branch locations,"
9460
msgstr ""
9461
9462
#: en/help_topics/configuration.txt:211
9463
msgid ""
9464
"* ``authentication.conf`` describes credential information for\n"
9465
" remote servers."
9466
msgstr ""
9467
9468
#: en/help_topics/configuration.txt:214
9469
msgid ""
9470
"Each branch can also contain a configuration file that sets values specific\n"
9471
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9472
"the\n"
9473
"branch. This file is visible to all users of a branch, if you wish to "
9474
"override\n"
9475
"one of the values for a branch with a setting that is specific to you then "
9476
"you\n"
9477
"can do so in ``locations.conf``."
9478
msgstr ""
9479
9480
#: en/help_topics/configuration.txt:220
9481
msgid ""
9482
"General format\n"
9483
"~~~~~~~~~~~~~~"
9484
msgstr ""
9485
9486
#: en/help_topics/configuration.txt:223
9487
msgid ""
9488
"An ini file has three types of contructs: section headers, section\n"
9489
"options and comments."
9490
msgstr ""
9491
9492
#: en/help_topics/configuration.txt:226
9493
msgid ""
9494
"Comments\n"
9495
"^^^^^^^^"
9496
msgstr ""
9497
9498
#: en/help_topics/configuration.txt:229
9499
msgid ""
9500
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9501
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9502
"Bazaar when parsing ini files."
9503
msgstr ""
9504
9505
#: en/help_topics/configuration.txt:233
9506
msgid ""
9507
"Section headers\n"
9508
"^^^^^^^^^^^^^^^"
9509
msgstr ""
9510
9511
#: en/help_topics/configuration.txt:236
9512
msgid ""
9513
"A section header is a word enclosed in brackets that starts at the begining\n"
9514
"of a line. A typical section header looks like this::"
9515
msgstr ""
9516
9517
#: en/help_topics/configuration.txt:239
9518
msgid " [DEFAULT]"
9519
msgstr ""
9520
9521
#: en/help_topics/configuration.txt:241
9522
msgid ""
9523
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9524
"[ALIASES]. Section headers are case sensitive. The default section provides "
9525
"for\n"
9526
"setting options which can be overridden with the branch config file."
9527
msgstr ""
9528
9529
#: en/help_topics/configuration.txt:245
9530
msgid ""
9531
"For ``locations.conf``, the options from the section with the\n"
9532
"longest matching section header are used to the exclusion of other\n"
9533
"potentially valid section headers. A section header uses the path for\n"
9534
"the branch as the section header. Some examples include::"
9535
msgstr ""
9536
9537
#: en/help_topics/configuration.txt:250
9538
msgid ""
9539
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9540
" [/home/jdoe/branches/]"
9541
msgstr ""
9542
9543
#: en/help_topics/configuration.txt:253
9544
msgid ""
9545
"\n"
9546
"Section options\n"
9547
"^^^^^^^^^^^^^^^"
9548
msgstr ""
9549
9550
#: en/help_topics/configuration.txt:257
9551
msgid ""
9552
"A section option resides within a section. A section option contains an\n"
9553
"option name, an equals sign and a value. For example::"
9554
msgstr ""
9555
9556
#: en/help_topics/configuration.txt:260
9557
msgid ""
9558
" email = John Doe <jdoe@isp.com>\n"
9559
" gpg_signing_key = Amy Pond <amy@example.com>"
9560
msgstr ""
9561
9562
#: en/help_topics/configuration.txt:263
9563
msgid ""
9564
"A option can reference other options by enclosing them in curly brackets::"
9565
msgstr ""
9566
9567
#: en/help_topics/configuration.txt:265
9568
msgid ""
9569
" my_branch_name = feature_x\n"
9570
" my_server = bzr+ssh://example.com\n"
9571
" push_location = {my_server}/project/{my_branch_name}"
9572
msgstr ""
9573
9574
#: en/help_topics/configuration.txt:269
9575
msgid ""
9576
"Option policies\n"
9577
"^^^^^^^^^^^^^^^"
9578
msgstr ""
9579
9580
#: en/help_topics/configuration.txt:272
9581
msgid ""
9582
"Options defined in a section affect the named directory or URL plus\n"
9583
"any locations they contain. Policies can be used to change how an\n"
9584
"option value is interpreted for contained locations. Currently\n"
9585
"there are three policies available:"
9586
msgstr ""
9587
9588
#: en/help_topics/configuration.txt:277
9589
msgid ""
9590
" none:\n"
9591
" the value is interpreted the same for contained locations. This is\n"
9592
" the default behaviour.\n"
9593
" norecurse:\n"
9594
" the value is only used for the exact location specified by the\n"
9595
" section name.\n"
9596
" appendpath:\n"
9597
" for contained locations, any additional path components are\n"
9598
" appended to the value."
9599
msgstr ""
9600
9601
#: en/help_topics/configuration.txt:287
9602
msgid ""
9603
"Policies are specified by keys with names of the form "
9604
"\"<option_name>:policy\".\n"
9605
"For example, to define the push location for a tree of branches, the\n"
9606
"following could be used::"
9607
msgstr ""
9608
9609
#: en/help_topics/configuration.txt:291
9610
msgid ""
9611
" [/top/location]\n"
9612
" push_location = sftp://example.com/location\n"
9613
" push_location:policy = appendpath"
9614
msgstr ""
9615
9616
#: en/help_topics/configuration.txt:295
9617
msgid ""
9618
"With this configuration, the push location for ``/top/location/branch1``\n"
9619
"would be ``sftp://example.com/location/branch1``."
9620
msgstr ""
9621
9622
#: en/help_topics/configuration.txt:298
9623
msgid ""
9624
"Section local options\n"
9625
"^^^^^^^^^^^^^^^^^^^^^"
9626
msgstr ""
9627
9628
#: en/help_topics/configuration.txt:301
9629
msgid ""
9630
"Some options are defined automatically inside a given section and can be\n"
9631
"refered to in this section only. "
9632
msgstr ""
9633
9634
#: en/help_topics/configuration.txt:304
9635
msgid "For example, the ``appendpath`` policy can be used like this::"
9636
msgstr ""
9637
9638
#: en/help_topics/configuration.txt:306
9639
msgid ""
9640
" [/home/vila/src/bzr/bugs]\n"
9641
" mypush = lp:~vila/bzr\n"
9642
" mypush:policy=appendpath"
9643
msgstr ""
9644
9645
#: en/help_topics/configuration.txt:310
9646
msgid "Using ``relpath`` to achieve the same result is done like this::"
9647
msgstr ""
9648
9649
#: en/help_topics/configuration.txt:312
9650
msgid ""
9651
" [/home/vila/src/bzr/bugs]\n"
9652
" mypush = lp:~vila/bzr/{relpath}"
9653
msgstr ""
9654
9655
#: en/help_topics/configuration.txt:315
9656
msgid ""
9657
"In both cases, when used in a directory like\n"
9658
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9659
msgstr ""
9660
9661
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9662
msgid ""
9663
" $ bzr config mypush\n"
9664
" lp:~vila/bzr/832013-expand-in-stack"
9665
msgstr ""
9666
9667
#: en/help_topics/configuration.txt:321
9668
msgid "Another such option is ``basename`` which can be used like this::"
9669
msgstr ""
9670
9671
#: en/help_topics/configuration.txt:323
9672
msgid ""
9673
" [/home/vila/src/bzr]\n"
9674
" mypush = lp:~vila/bzr/{basename}"
9675
msgstr ""
9676
9677
#: en/help_topics/configuration.txt:326
9678
msgid ""
9679
"When used in a directory like\n"
9680
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9681
msgstr ""
9682
9683
#: en/help_topics/configuration.txt:332
9684
msgid ""
9685
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9686
"itself is defined as the relative path between the section name and the\n"
9687
"location it matches."
9688
msgstr ""
9689
9690
#: en/help_topics/configuration.txt:336
9691
msgid ""
9692
"When an option is local to a Section, it cannot be referred to from option\n"
9693
"values in any other section from the same ``Store`` nor from any other\n"
9694
"``Store``."
9695
msgstr ""
9696
9697
#: en/help_topics/configuration.txt:340
9698
msgid ""
9699
"\n"
9700
"The main configuration file, bazaar.conf\n"
9701
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9702
msgstr ""
9703
9704
#: en/help_topics/configuration.txt:344
9705
msgid ""
9706
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9707
"The default section contains the default\n"
9708
"configuration options for all branches. The default section can be\n"
9709
"overriden by providing a branch-specific section in ``locations.conf``."
9710
msgstr ""
9711
9712
#: en/help_topics/configuration.txt:349
9713
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9714
msgstr ""
9715
9716
#: en/help_topics/configuration.txt:351
9717
msgid ""
9718
" [DEFAULT]\n"
9719
" email = John Doe <jdoe@isp.com>\n"
9720
" editor = /usr/bin/vim\n"
9721
" create_signatures = when-required"
9722
msgstr ""
9723
9724
#: en/help_topics/configuration.txt:356
9725
msgid ""
9726
"\n"
9727
"The branch location configuration file, locations.conf\n"
9728
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9729
msgstr ""
9730
9731
#: en/help_topics/configuration.txt:360
9732
msgid ""
9733
"``locations.conf`` allows one to specify overriding settings for\n"
9734
"a specific branch. The format is almost identical to the default section in\n"
9735
"bazaar.conf with one significant change: The section header, instead of "
9736
"saying\n"
9737
"default, will be the path to a branch that you wish to override a value\n"
9738
"for. The '?' and '*' wildcards are supported::"
9739
msgstr ""
9740
9741
#: en/help_topics/configuration.txt:366
9742
msgid ""
9743
" [/home/jdoe/branches/nethack]\n"
9744
" email = Nethack Admin <nethack@nethack.com>"
9745
msgstr ""
9746
9747
#: en/help_topics/configuration.txt:369
9748
msgid ""
9749
" [http://hypothetical.site.com/branches/devel-branch]\n"
9750
" create_signatures = always"
9751
msgstr ""
9752
9753
#: en/help_topics/configuration.txt:372
9754
msgid ""
9755
"The authentication configuration file, authentication.conf\n"
9756
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9757
msgstr ""
9758
9759
#: en/help_topics/configuration.txt:375
9760
msgid ""
9761
"``authentication.conf`` allows one to specify credentials for\n"
9762
"remote servers. This can be used for all the supported transports and any "
9763
"part\n"
9764
"of bzr that requires authentication (smtp for example)."
9765
msgstr ""
9766
9767
#: en/help_topics/configuration.txt:379
9768
msgid ""
9769
"The syntax of the file obeys the same rules as the others except for the\n"
9770
"option policies which don't apply."
9771
msgstr ""
9772
9773
#: en/help_topics/configuration.txt:382
9774
msgid ""
9775
"For more information on the possible uses of the authentication "
9776
"configuration\n"
9777
"file see :doc:`authentication-help`."
9778
msgstr ""
9779
9780
#: en/help_topics/configuration.txt:385
9781
msgid ""
9782
"\n"
9783
"Common options\n"
9784
"--------------"
9785
msgstr ""
9786
9787
#: en/help_topics/configuration.txt:389
9788
msgid ""
9789
"debug_flags\n"
9790
"~~~~~~~~~~~"
9791
msgstr ""
9792
9793
#: en/help_topics/configuration.txt:392
9794
msgid ""
9795
"A comma-separated list of debugging options to turn on. The same values\n"
9796
"can be used as with the -D command-line option (see `help global-options`).\n"
9797
"For example::"
9798
msgstr ""
9799
9800
#: en/help_topics/configuration.txt:396
9801
msgid " debug_flags = hpss"
9802
msgstr ""
9803
9804
#: en/help_topics/configuration.txt:400
9805
msgid " debug_flags = hpss,evil"
9806
msgstr ""
9807
9808
#: en/help_topics/configuration.txt:402
9809
msgid ""
9810
"email\n"
9811
"~~~~~"
9812
msgstr ""
9813
9814
#: en/help_topics/configuration.txt:405
9815
msgid ""
9816
"The email address to use when committing a branch. Typically takes the form\n"
9817
"of::"
9818
msgstr ""
9819
9820
#: en/help_topics/configuration.txt:408
9821
msgid " email = Full Name <account@hostname.tld>"
9822
msgstr ""
9823
9824
#: en/help_topics/configuration.txt:410
9825
msgid ""
9826
"editor\n"
9827
"~~~~~~"
9828
msgstr ""
9829
9830
#: en/help_topics/configuration.txt:413
9831
msgid ""
9832
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9833
"a commit message. This setting is trumped by the environment variable\n"
9834
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9835
"variables."
9836
msgstr ""
9837
9838
#: en/help_topics/configuration.txt:418
9839
msgid ""
9840
"log_format\n"
9841
"~~~~~~~~~~"
9842
msgstr ""
9843
9844
#: en/help_topics/configuration.txt:421
9845
msgid ""
9846
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9847
"and ``line``. Additional formats may be provided by plugins. The default\n"
9848
"value is ``long``."
9849
msgstr ""
9850
9851
#: en/help_topics/configuration.txt:425
9852
msgid ""
9853
"check_signatures\n"
9854
"~~~~~~~~~~~~~~~~"
9855
msgstr ""
9856
9857
#: en/help_topics/configuration.txt:428
9858
msgid ""
9859
"Reserved for future use. These options will allow a policy for branches to\n"
9860
"require signatures."
9861
msgstr ""
9862
9863
#: en/help_topics/configuration.txt:431
9864
msgid ""
9865
"require\n"
9866
" The gnupg signature for revisions must be present and must be valid."
9867
msgstr ""
9868
9869
#: en/help_topics/configuration.txt:434
9870
msgid ""
9871
"ignore\n"
9872
" Do not check gnupg signatures of revisions."
9873
msgstr ""
9874
9875
#: en/help_topics/configuration.txt:437
9876
msgid ""
9877
"check-available\n"
9878
" (default) If gnupg signatures for revisions are present, check them.\n"
9879
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9880
" no signature is present."
9881
msgstr ""
9882
9883
#: en/help_topics/configuration.txt:442
9884
msgid ""
9885
"create_signatures\n"
9886
"~~~~~~~~~~~~~~~~~"
9887
msgstr ""
9888
9889
#: en/help_topics/configuration.txt:445
9890
msgid ""
9891
"Defines the behaviour of signing revisions on commits. By default bzr will "
9892
"not\n"
9893
"sign new commits."
9894
msgstr ""
9895
9896
#: en/help_topics/configuration.txt:448
9897
msgid ""
9898
"always\n"
9899
" Sign every new revision that is committed. If the signing fails then "
9900
"the\n"
9901
" commit will not be made."
9902
msgstr ""
9903
9904
#: en/help_topics/configuration.txt:452
9905
msgid ""
9906
"when-required\n"
9907
" Reserved for future use."
9908
msgstr ""
9909
9910
#: en/help_topics/configuration.txt:455
9911
msgid ""
9912
"never\n"
9913
" Reserved for future use."
9914
msgstr ""
9915
9916
#: en/help_topics/configuration.txt:458
9917
msgid ""
9918
"In future it is planned that ``when-required`` will sign newly\n"
9919
"committed revisions only when the branch requires them. ``never`` will "
9920
"refuse\n"
9921
"to sign newly committed revisions, even if the branch requires signatures."
9922
msgstr ""
9923
9924
#: en/help_topics/configuration.txt:462
9925
msgid ""
9926
"dirstate.fdatasync\n"
9927
"~~~~~~~~~~~~~~~~~~"
9928
msgstr ""
9929
9930
#: en/help_topics/configuration.txt:465
9931
msgid ""
9932
"If true (default), working tree metadata changes are flushed through the\n"
9933
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9934
"should not be lost if the machine crashes. See also repository.fdatasync."
9935
msgstr ""
9936
9937
#: en/help_topics/configuration.txt:469
9938
msgid ""
9939
"gpg_signing_key\n"
9940
"~~~~~~~~~~~~~~~"
9941
msgstr ""
9942
9943
#: en/help_topics/configuration.txt:472
9944
msgid ""
9945
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9946
"address, key fingerprint or full key ID. When unset or when set to\n"
9947
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9948
msgstr ""
9949
9950
#: en/help_topics/configuration.txt:476
9951
msgid ""
9952
"recurse\n"
9953
"~~~~~~~"
9954
msgstr ""
9955
9956
#: en/help_topics/configuration.txt:479
9957
msgid ""
9958
"Only useful in ``locations.conf``. Defines whether or not the\n"
9959
"configuration for this section applies to subdirectories:"
9960
msgstr ""
9961
9962
#: en/help_topics/configuration.txt:482
9963
msgid ""
9964
"true\n"
9965
" (default) This section applies to subdirectories as well."
9966
msgstr ""
9967
9968
#: en/help_topics/configuration.txt:485
9969
msgid ""
9970
"false\n"
9971
" This section only applies to the branch at this directory and not\n"
9972
" branches below it."
9973
msgstr ""
9974
9975
#: en/help_topics/configuration.txt:489
9976
msgid ""
9977
"gpg_signing_command\n"
9978
"~~~~~~~~~~~~~~~~~~~"
9979
msgstr ""
9980
9981
#: en/help_topics/configuration.txt:492
9982
msgid ""
9983
"(Default: \"gpg\"). Which program should be used to sign and check "
9984
"revisions.\n"
9985
"For example::"
9986
msgstr ""
9987
9988
#: en/help_topics/configuration.txt:495
9989
msgid " gpg_signing_command = /usr/bin/gnpg"
9990
msgstr ""
9991
9992
#: en/help_topics/configuration.txt:497
9993
msgid ""
9994
"The specified command must accept the options \"--clearsign\" and \"-u "
9995
"<email>\"."
9996
msgstr ""
9997
9998
#: en/help_topics/configuration.txt:499
9999
msgid ""
10000
"bzr_remote_path\n"
10001
"~~~~~~~~~~~~~~~"
10002
msgstr ""
10003
10004
#: en/help_topics/configuration.txt:502
10005
msgid ""
10006
"(Default: \"bzr\"). The path to the command that should be used to run the "
10007
"smart\n"
10008
"server for bzr. This value may only be specified in locations.conf, because:"
10009
msgstr ""
10010
10011
#: en/help_topics/configuration.txt:505
10012
msgid ""
10013
"- it's needed before branch.conf is accessible\n"
10014
"- allowing remote branch.conf files to specify commands would be a security\n"
10015
" risk"
10016
msgstr ""
10017
10018
#: en/help_topics/configuration.txt:509
10019
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10020
msgstr ""
10021
10022
#: en/help_topics/configuration.txt:511
10023
msgid ""
10024
"smtp_server\n"
10025
"~~~~~~~~~~~"
10026
msgstr ""
10027
10028
#: en/help_topics/configuration.txt:514
10029
msgid ""
10030
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10031
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10032
msgstr ""
10033
10034
#: en/help_topics/configuration.txt:517
10035
msgid ""
10036
"smtp_username, smtp_password\n"
10037
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:520
10041
msgid ""
10042
"User and password to authenticate to the SMTP server. If smtp_username\n"
10043
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10044
"These settings are only needed if the SMTP server requires authentication\n"
10045
"to send mail."
10046
msgstr ""
10047
10048
#: en/help_topics/configuration.txt:525
10049
msgid ""
10050
"locks.steal_dead\n"
10051
"~~~~~~~~~~~~~~~~"
10052
msgstr ""
10053
10054
#: en/help_topics/configuration.txt:528
10055
msgid ""
10056
"If set to true, bzr will automatically break locks held by processes from\n"
10057
"the same machine and user that are no longer alive. Otherwise, it will\n"
10058
"print a message and you can break the lock manually, if you are satisfied\n"
10059
"the object is no longer in use."
10060
msgstr ""
10061
10062
#: en/help_topics/configuration.txt:533
10063
msgid ""
10064
"mail_client\n"
10065
"~~~~~~~~~~~"
10066
msgstr ""
10067
10068
#: en/help_topics/configuration.txt:536
10069
msgid ""
10070
"A mail client to use for sending merge requests.\n"
10071
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10072
"it\n"
10073
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10074
"``editor``."
10075
msgstr ""
10076
10077
#: en/help_topics/configuration.txt:541
10078
msgid "Supported values for specific clients:"
10079
msgstr ""
10080
10081
#: en/help_topics/configuration.txt:543
10082
msgid ""
10083
":claws: Use Claws. This skips a dialog for attaching files.\n"
10084
":evolution: Use Evolution.\n"
10085
":kmail: Use KMail.\n"
10086
":mutt: Use Mutt.\n"
10087
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10088
"1.5,\n"
10089
" this works around some bugs that xdg-email doesn't handle."
10090
msgstr ""
10091
10092
#: en/help_topics/configuration.txt:550
10093
msgid "Supported generic values are:"
10094
msgstr ""
10095
10096
#: en/help_topics/configuration.txt:552
10097
msgid ""
10098
":default: See above.\n"
10099
":editor: Use your editor to compose the merge request. This also uses\n"
10100
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10101
" smtp_username and smtp_password.\n"
10102
":mapi: Use your preferred e-mail client on Windows.\n"
10103
":xdg-email: Use xdg-email to run your preferred mail program"
10104
msgstr ""
10105
10106
#: en/help_topics/configuration.txt:559
10107
msgid ""
10108
"repository.fdatasync\n"
10109
"~~~~~~~~~~~~~~~~~~~~"
10110
msgstr ""
10111
10112
#: en/help_topics/configuration.txt:562
10113
msgid ""
10114
"If true (default), repository changes are flushed through the OS buffers\n"
10115
"to physical disk. This is somewhat slower, but means data should not be\n"
10116
"lost if the machine crashes. See also dirstate.fdatasync."
10117
msgstr ""
10118
10119
#: en/help_topics/configuration.txt:566
10120
msgid ""
10121
"submit_branch\n"
10122
"~~~~~~~~~~~~~"
10123
msgstr ""
10124
10125
#: en/help_topics/configuration.txt:569
10126
msgid ""
10127
"The branch you intend to submit your current work to. This is "
10128
"automatically\n"
10129
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10130
"This\n"
10131
"should usually be set on a per-branch or per-location basis."
10132
msgstr ""
10133
10134
#: en/help_topics/configuration.txt:573
10135
msgid ""
10136
"public_branch\n"
10137
"~~~~~~~~~~~~~"
10138
msgstr ""
10139
10140
#: en/help_topics/configuration.txt:576
10141
msgid ""
10142
"A publically-accessible version of this branch (implying that this version "
10143
"is\n"
10144
"not publically-accessible). Used (and set) by ``bzr send``."
10145
msgstr ""
10146
10147
#: en/help_topics/configuration.txt:579
10148
msgid ""
10149
"suppress_warnings\n"
10150
"~~~~~~~~~~~~~~~~~"
10151
msgstr ""
10152
10153
#: en/help_topics/configuration.txt:582
10154
msgid ""
10155
"A list of strings, each string represent a warning that can be emitted by\n"
10156
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10157
msgstr ""
10158
10159
#: en/help_topics/configuration.txt:585
10160
msgid "Valid values:"
10161
msgstr ""
10162
10163
#: en/help_topics/configuration.txt:587
10164
msgid ""
10165
"* ``format_deprecation``:\n"
10166
" whether the format deprecation warning is shown on repositories that "
10167
"are\n"
10168
" using deprecated formats."
10169
msgstr ""
10170
10171
#: en/help_topics/configuration.txt:591
10172
msgid ""
10173
"default_format\n"
10174
"~~~~~~~~~~~~~~"
10175
msgstr ""
10176
10177
#: en/help_topics/configuration.txt:594
10178
msgid ""
10179
"A format name for the default format used when creating branches. See "
10180
"``bzr\n"
10181
"help formats`` for possible values."
10182
msgstr ""
10183
10184
#: en/help_topics/configuration.txt:597
10185
msgid ""
10186
"\n"
10187
"Unicode options\n"
10188
"---------------"
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:601
10192
msgid ""
10193
"output_encoding\n"
10194
"~~~~~~~~~~~~~~~"
10195
msgstr ""
10196
10197
#: en/help_topics/configuration.txt:604
10198
msgid ""
10199
"A Python unicode encoding name for text output from bzr, such as log\n"
10200
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10201
"is the terminal encoding prefered by the operating system."
10202
msgstr ""
10203
10204
#: en/help_topics/configuration.txt:608
10205
msgid ""
10206
"\n"
10207
"Branch type specific options\n"
10208
"----------------------------"
10209
msgstr ""
10210
10211
#: en/help_topics/configuration.txt:612
10212
msgid ""
10213
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10214
"later format. They\n"
10215
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10216
"manually set in ``locations.conf`` or ``bazaar.conf``."
10217
msgstr ""
10218
10219
#: en/help_topics/configuration.txt:617
10220
msgid ""
10221
"append_revisions_only\n"
10222
"~~~~~~~~~~~~~~~~~~~~~"
10223
msgstr ""
10224
10225
#: en/help_topics/configuration.txt:620
10226
msgid ""
10227
"If set to \"True\" then revisions can only be appended to the log, not\n"
10228
"removed. A branch with this setting enabled can only pull from another\n"
10229
"branch if the other branch's log is a longer version of its own. This is\n"
10230
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10231
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10232
"compatibility with previous bzr versions (older than 2.2)."
10233
msgstr ""
10234
10235
#: en/help_topics/configuration.txt:627
10236
msgid ""
10237
"parent_location\n"
10238
"~~~~~~~~~~~~~~~"
10239
msgstr ""
10240
10241
#: en/help_topics/configuration.txt:630
10242
msgid ""
10243
"If present, the location of the default branch for pull or merge. This "
10244
"option\n"
10245
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10246
"--remember``."
10247
msgstr ""
10248
10249
#: en/help_topics/configuration.txt:634
10250
msgid ""
10251
"push_location\n"
10252
"~~~~~~~~~~~~~"
10253
msgstr ""
10254
10255
#: en/help_topics/configuration.txt:637
10256
msgid ""
10257
"If present, the location of the default branch for push. This option\n"
10258
"is normally set by the first ``push`` or ``push --remember``."
10259
msgstr ""
10260
10261
#: en/help_topics/configuration.txt:640
10262
msgid ""
10263
"push_strict\n"
10264
"~~~~~~~~~~~"
10265
msgstr ""
10266
10267
#: en/help_topics/configuration.txt:643
10268
msgid ""
10269
"If present, defines the ``--strict`` option default value for checking\n"
10270
"uncommitted changes before pushing."
10271
msgstr ""
10272
10273
#: en/help_topics/configuration.txt:646
10274
msgid ""
10275
"dpush_strict\n"
10276
"~~~~~~~~~~~~"
10277
msgstr ""
10278
10279
#: en/help_topics/configuration.txt:649
10280
msgid ""
10281
"If present, defines the ``--strict`` option default value for checking\n"
10282
"uncommitted changes before pushing into a different VCS without any\n"
10283
"custom bzr metadata."
10284
msgstr ""
10285
10286
#: en/help_topics/configuration.txt:653
10287
msgid ""
10288
"bound_location\n"
10289
"~~~~~~~~~~~~~~"
10290
msgstr ""
10291
10292
#: en/help_topics/configuration.txt:656
10293
msgid ""
10294
"The location that commits should go to when acting as a checkout.\n"
10295
"This option is normally set by ``bind``."
10296
msgstr ""
10297
10298
#: en/help_topics/configuration.txt:659
10299
msgid ""
10300
"bound\n"
10301
"~~~~~"
10302
msgstr ""
10303
10304
#: en/help_topics/configuration.txt:662
10305
msgid ""
10306
"If set to \"True\", the branch should act as a checkout, and push each "
10307
"commit to\n"
10308
"the bound_location. This option is normally set by ``bind``/``unbind``."
10309
msgstr ""
10310
10311
#: en/help_topics/configuration.txt:665
10312
msgid ""
10313
"send_strict\n"
10314
"~~~~~~~~~~~"
10315
msgstr ""
10316
10317
#: en/help_topics/configuration.txt:668
10318
msgid ""
10319
"If present, defines the ``--strict`` option default value for checking\n"
10320
"uncommitted changes before sending a merge directive."
10321
msgstr ""
10322
10323
#: en/help_topics/configuration.txt:671
10324
msgid ""
10325
"add.maximum_file_size\n"
10326
"~~~~~~~~~~~~~~~~~~~~~"
10327
msgstr ""
10328
10329
#: en/help_topics/configuration.txt:674
10330
msgid ""
10331
"Defines the maximum file size the command line \"add\" operation will allow\n"
10332
"in recursive mode, with files larger than this value being skipped. You may "
10333
"\n"
10334
"specify this value as an integer (in which case it is interpreted as bytes), "
10335
"\n"
10336
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10337
"0 \n"
10338
"will disable skipping."
10339
msgstr ""
10340
10341
#: en/help_topics/configuration.txt:680
10342
msgid ""
10343
"External Merge Tools\n"
10344
"--------------------"
10345
msgstr ""
10346
10347
#: en/help_topics/configuration.txt:683
10348
msgid ""
10349
"bzr.mergetool.<name>\n"
10350
"~~~~~~~~~~~~~~~~~~~~"
10351
msgstr ""
10352
10353
#: en/help_topics/configuration.txt:686
10354
msgid ""
10355
"Defines an external merge tool called <name> with the given command-line.\n"
10356
"Arguments containing spaces should be quoted using single or double quotes. "
10357
"The\n"
10358
"executable may omit its path if it can be found on the PATH."
10359
msgstr ""
10360
10361
#: en/help_topics/configuration.txt:690
10362
msgid ""
10363
"The following markers can be used in the command-line to substitute "
10364
"filenames\n"
10365
"involved in the merge conflict::"
10366
msgstr ""
10367
10368
#: en/help_topics/configuration.txt:693
10369
msgid ""
10370
" {base} file.BASE\n"
10371
" {this} file.THIS\n"
10372
" {other} file.OTHER\n"
10373
" {result} output file\n"
10374
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10375
"merge\n"
10376
" succeeds."
10377
msgstr ""
10378
10379
#: en/help_topics/configuration.txt:702
10380
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10381
msgstr ""
10382
10383
#: en/help_topics/configuration.txt:704
10384
msgid ""
10385
"bzr.default_mergetool\n"
10386
"~~~~~~~~~~~~~~~~~~~~~"
10387
msgstr ""
10388
10389
#: en/help_topics/configuration.txt:707
10390
msgid ""
10391
"Specifies which external merge tool (as defined above) should be selected "
10392
"by\n"
10393
"default in tools such as ``bzr qconflicts``."
10394
msgstr ""
10395
10396
#: en/help_topics/configuration.txt:712
10397
msgid " bzr.default_mergetool = kdiff3\n"
10398
msgstr ""
10399
10400
#: en/help_topics/conflict-types.txt:1
10401
msgid ""
10402
"Conflict Types\n"
10403
"=============="
10404
msgstr ""
10405
10406
#: en/help_topics/conflict-types.txt:4
10407
msgid ""
10408
"Some operations, like merge, revert and pull, modify the contents of your\n"
10409
"working tree. These modifications are programmatically generated, and so "
10410
"they\n"
10411
"may conflict with the current state of your working tree. "
10412
msgstr ""
10413
10414
#: en/help_topics/conflict-types.txt:8
10415
msgid ""
10416
"When conflicts are present in your working tree (as shown by ``bzr\n"
10417
"conflicts``), you should resolve them and then inform bzr that the "
10418
"conflicts\n"
10419
"have been resolved."
10420
msgstr ""
10421
10422
#: en/help_topics/conflict-types.txt:12
10423
msgid ""
10424
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10425
"should resolve them is not the one responsible for their occurrence, as is "
10426
"the\n"
10427
"case when merging other people's work or because some conflicts are "
10428
"presented\n"
10429
"in a way that is not easy to understand."
10430
msgstr ""
10431
10432
#: en/help_topics/conflict-types.txt:17
10433
msgid ""
10434
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10435
"conflict if and only if there's an actual conceptual conflict in the source\n"
10436
"tree. Because Bazaar doesn't understand the real meaning of the files "
10437
"being\n"
10438
"versioned, it can, when faced with ambiguities, fall short in either "
10439
"direction\n"
10440
"trying to resolve the conflict itself. Many kinds of changes can be "
10441
"combined\n"
10442
"programmatically, but sometimes only a human can determine the right thing "
10443
"to\n"
10444
"do."
10445
msgstr ""
10446
10447
#: en/help_topics/conflict-types.txt:25
10448
msgid ""
10449
"When Bazaar generates a conflict, it adds information into the working tree "
10450
"to\n"
10451
"present the conflicting versions, and it's up to you to find the correct\n"
10452
"resolution."
10453
msgstr ""
10454
10455
#: en/help_topics/conflict-types.txt:29
10456
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10457
msgstr ""
10458
10459
#: en/help_topics/conflict-types.txt:31
10460
msgid ""
10461
"1. Modify the working tree content so that the conflicted item is now in "
10462
"the\n"
10463
" state you want to keep, then"
10464
msgstr ""
10465
10466
#: en/help_topics/conflict-types.txt:34
10467
msgid ""
10468
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10469
" remaining generated information (``bzr resolve <item>``)."
10470
msgstr ""
10471
10472
#: en/help_topics/conflict-types.txt:37
10473
msgid ""
10474
"For most conflict types, there are some obvious ways to modify the working\n"
10475
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10476
"itself already made a choice, when possible."
10477
msgstr ""
10478
10479
#: en/help_topics/conflict-types.txt:41
10480
msgid ""
10481
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10482
"different ways to resolve the conflict."
10483
msgstr ""
10484
10485
#: en/help_topics/conflict-types.txt:44
10486
msgid ""
10487
"Each type of conflict is explained below, and the action which must be done "
10488
"to\n"
10489
"resolve the conflict is outlined."
10490
msgstr ""
10491
10492
#: en/help_topics/conflict-types.txt:47
10493
msgid ""
10494
"Various actions are available depending on the kind of conflict, for some "
10495
"of\n"
10496
"these actions, Bazaar can provide some help. In the end you should at least\n"
10497
"inform Bazaar that you're done with the conflict with::"
10498
msgstr ""
10499
10500
#: en/help_topics/conflict-types.txt:51
10501
msgid " ``bzr resolve FILE --action=done'"
10502
msgstr ""
10503
10504
#: en/help_topics/conflict-types.txt:53
10505
msgid ""
10506
"Note that this is the default action when a single file is involved so you "
10507
"can\n"
10508
"simply use::"
10509
msgstr ""
10510
10511
#: en/help_topics/conflict-types.txt:56
10512
msgid " ``bzr resolve FILE``"
10513
msgstr ""
10514
10515
#: en/help_topics/conflict-types.txt:58
10516
msgid "See ``bzr help resolve`` for more details."
10517
msgstr ""
10518
10519
#: en/help_topics/conflict-types.txt:60
10520
msgid ""
10521
"Text conflicts\n"
10522
"--------------"
10523
msgstr ""
10524
10525
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10526
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10527
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10528
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10529
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10530
msgid "Typical message::"
10531
msgstr ""
10532
10533
#: en/help_topics/conflict-types.txt:65
10534
msgid " Text conflict in FILE"
10535
msgstr ""
10536
10537
#: en/help_topics/conflict-types.txt:67
10538
msgid ""
10539
"These are produced when a text merge cannot completely reconcile two sets "
10540
"of\n"
10541
"text changes. Bazaar will emit files for each version with the extensions\n"
10542
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10543
"tree,\n"
10544
"i.e. the tree that you are merging changes into. OTHER is the version that "
10545
"you\n"
10546
"are merging into the target. BASE is an older version that is used as a "
10547
"basis\n"
10548
"for comparison."
10549
msgstr ""
10550
10551
#: en/help_topics/conflict-types.txt:74
10552
msgid ""
10553
"In the main copy of the file, Bazaar will include all the changes that it\n"
10554
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10555
"\"herringbone\" markers like ``<<<<<<<``."
10556
msgstr ""
10557
10558
#: en/help_topics/conflict-types.txt:78
10559
msgid ""
10560
"Say the initial text is \"The project leader released it.\", and THIS "
10561
"modifies it\n"
10562
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10563
"leader\n"
10564
"released Bazaar.\" A conflict would look like this::"
10565
msgstr ""
10566
10567
#: en/help_topics/conflict-types.txt:82
10568
msgid ""
10569
" <<<<<<< TREE\n"
10570
" Martin Pool released it.\n"
10571
" =======\n"
10572
" The project leader released Bazaar.\n"
10573
" >>>>>>> MERGE-SOURCE"
10574
msgstr ""
10575
10576
#: en/help_topics/conflict-types.txt:88
10577
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10578
msgstr ""
10579
10580
#: en/help_topics/conflict-types.txt:90
10581
msgid ""
10582
"You can handle text conflicts either by editing the main copy of the file,\n"
10583
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10584
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10585
"set of changes over the other (but see below when you encounter these\n"
10586
"cases). More often, the two sets of changes must be intelligently combined."
10587
msgstr ""
10588
10589
#: en/help_topics/conflict-types.txt:96
10590
msgid ""
10591
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10592
"you are done editing, the file should look like it never had a conflict, and "
10593
"be\n"
10594
"ready to commit."
10595
msgstr ""
10596
10597
#: en/help_topics/conflict-types.txt:100
10598
msgid ""
10599
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10600
"Bazaar will auto-detect which conflicts you have resolved."
10601
msgstr ""
10602
10603
#: en/help_topics/conflict-types.txt:103
10604
msgid ""
10605
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10606
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10607
"working tree."
10608
msgstr ""
10609
10610
#: en/help_topics/conflict-types.txt:107
10611
msgid ""
10612
"\n"
10613
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10614
"resolve`` with one of the following actions:"
10615
msgstr ""
10616
10617
#: en/help_topics/conflict-types.txt:111
10618
msgid ""
10619
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10620
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10621
msgstr ""
10622
10623
#: en/help_topics/conflict-types.txt:114
10624
msgid ""
10625
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10626
"modifications will be taken into account."
10627
msgstr ""
10628
10629
#: en/help_topics/conflict-types.txt:117
10630
msgid ""
10631
"Content conflicts\n"
10632
"-----------------"
10633
msgstr ""
10634
10635
#: en/help_topics/conflict-types.txt:122
10636
msgid " Contents conflict in FILE"
10637
msgstr ""
10638
10639
#: en/help_topics/conflict-types.txt:124
10640
msgid ""
10641
"This conflict happens when there are conflicting changes in the working "
10642
"tree\n"
10643
"and the merge source, but the conflicted items are not text files. They "
10644
"may\n"
10645
"be binary files, or symlinks, or directories. It can even happen with "
10646
"files\n"
10647
"that are deleted on one side, and modified on the other."
10648
msgstr ""
10649
10650
#: en/help_topics/conflict-types.txt:129
10651
msgid ""
10652
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10653
"be\n"
10654
"regular files, symlinks or directories). But it will not include a \"main "
10655
"copy\"\n"
10656
"of the file with herringbone conflict markers. It will appear that the "
10657
"\"main\n"
10658
"copy\" has been renamed to THIS or OTHER."
10659
msgstr ""
10660
10661
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10662
msgid ""
10663
"To resolve that kind of conflict, you should rebuild FILE from either "
10664
"version\n"
10665
"or a combination of both."
10666
msgstr ""
10667
10668
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10669
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10670
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10671
#: en/help_topics/conflict-types.txt:361
10672
msgid "``bzr resolve`` recognizes the following actions:"
10673
msgstr ""
10674
10675
#: en/help_topics/conflict-types.txt:139
10676
msgid ""
10677
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10678
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10679
"* ``--action=done`` will just mark the conflict as resolved."
10680
msgstr ""
10681
10682
#: en/help_topics/conflict-types.txt:143
10683
msgid ""
10684
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10685
"and\n"
10686
"``.OTHER`` files if they are still present in the working tree."
10687
msgstr ""
10688
10689
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10690
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10691
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10692
#: en/help_topics/conflict-types.txt:369
10693
msgid ""
10694
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10695
msgstr ""
10696
10697
#: en/help_topics/conflict-types.txt:148
10698
msgid ""
10699
"Tag conflicts\n"
10700
"-------------"
10701
msgstr ""
10702
10703
#: en/help_topics/conflict-types.txt:153
10704
msgid ""
10705
" Conflicting tags:\n"
10706
" version-0.1"
10707
msgstr ""
10708
10709
#: en/help_topics/conflict-types.txt:156
10710
msgid ""
10711
"When pulling from or pushing to another branch, Bazaar informs you about "
10712
"tags\n"
10713
"that conflict between the two branches; that is the same tag points to two\n"
10714
"different revisions. You need not resolve these conflicts, but subsequent\n"
10715
"uses of pull or push will result in the same message."
10716
msgstr ""
10717
10718
#: en/help_topics/conflict-types.txt:161
10719
msgid ""
10720
"To resolve the conflict, you must apply the correct tags to either the "
10721
"target\n"
10722
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10723
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10724
"target branch's tags match the source branch, then in the target branch do\n"
10725
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10726
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10727
"source\n"
10728
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10729
"favor of the target branch, you need to similarly use ``tag --force`` in "
10730
"the\n"
10731
"source branch. (Note that pulling or pushing using --overwrite will "
10732
"overwrite\n"
10733
"all tags as well.)"
10734
msgstr ""
10735
10736
#: en/help_topics/conflict-types.txt:172
10737
msgid ""
10738
"Duplicate paths\n"
10739
"---------------"
10740
msgstr ""
10741
10742
#: en/help_topics/conflict-types.txt:177
10743
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10744
msgstr ""
10745
10746
#: en/help_topics/conflict-types.txt:179
10747
msgid ""
10748
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10749
"already been used. The existing file will be renamed to \"FILE.moved\". "
10750
msgstr ""
10751
10752
#: en/help_topics/conflict-types.txt:187
10753
msgid ""
10754
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10755
"FILE``,\n"
10756
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10757
"* ``--action=done`` will just mark the conflict as resolved."
10758
msgstr ""
10759
10760
#: en/help_topics/conflict-types.txt:191
10761
msgid ""
10762
"Note that you must get rid of FILE.moved before using ``--action=done``."
10763
msgstr ""
10764
10765
#: en/help_topics/conflict-types.txt:195
10766
msgid ""
10767
"Unversioned parent\n"
10768
"------------------"
10769
msgstr ""
10770
10771
#: en/help_topics/conflict-types.txt:200
10772
msgid ""
10773
" Conflict because FILE is not versioned, but has versioned children."
10774
msgstr ""
10775
10776
#: en/help_topics/conflict-types.txt:202
10777
msgid ""
10778
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10779
"not\n"
10780
"versioned. This happens when the directory has been deleted in the target,\n"
10781
"but has a new child in the source, or vice versa. In this situation, "
10782
"Bazaar\n"
10783
"will version the parent directory as well. Resolving this issue depends\n"
10784
"very much on the particular scenario. You may wish to rename or delete "
10785
"either\n"
10786
"the file or the directory. When you are satisfied, you can run \"bzr "
10787
"resolve\n"
10788
"FILE\" to mark the conflict as resolved."
10789
msgstr ""
10790
10791
#: en/help_topics/conflict-types.txt:210
10792
msgid ""
10793
"Missing parent\n"
10794
"--------------"
10795
msgstr ""
10796
10797
#: en/help_topics/conflict-types.txt:215
10798
msgid " Conflict adding files to FILE. Created directory."
10799
msgstr ""
10800
10801
#: en/help_topics/conflict-types.txt:217
10802
msgid ""
10803
"This happens when a directory has been deleted in the target, but has new\n"
10804
"children in the source. This is similar to the \"unversioned parent\" "
10805
"conflict,\n"
10806
"except that the parent directory does not *exist*, instead of just being\n"
10807
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10808
"Resolving this issue depends very much on the particular scenario."
10809
msgstr ""
10810
10811
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10812
msgid ""
10813
"To resolve that kind of conflict, you should either remove or rename the\n"
10814
"children or the directory or a combination of both."
10815
msgstr ""
10816
10817
#: en/help_topics/conflict-types.txt:228
10818
msgid ""
10819
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10820
" children,\n"
10821
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10822
"children\n"
10823
" and restoring the directory,\n"
10824
"* ``--action=done`` will just mark the conflict as resolved."
10825
msgstr ""
10826
10827
#: en/help_topics/conflict-types.txt:236
10828
msgid ""
10829
"Deleting parent\n"
10830
"---------------"
10831
msgstr ""
10832
10833
#: en/help_topics/conflict-types.txt:241
10834
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10835
msgstr ""
10836
10837
#: en/help_topics/conflict-types.txt:243
10838
msgid ""
10839
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10840
"source, but has new children in the target (either because a directory\n"
10841
"deletion is merged or because the merge introduce new children). Bazaar\n"
10842
"will retain the directory. Resolving this issue depends very much on the\n"
10843
"particular scenario."
10844
msgstr ""
10845
10846
#: en/help_topics/conflict-types.txt:254
10847
msgid ""
10848
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10849
"directory,"
10850
msgstr ""
10851
10852
#: en/help_topics/conflict-types.txt:256
10853
msgid ""
10854
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10855
" children,"
10856
msgstr ""
10857
10858
#: en/help_topics/conflict-types.txt:259
10859
msgid "* ``--action=done`` will just mark the conflict as resolved."
10860
msgstr ""
10861
10862
#: en/help_topics/conflict-types.txt:261
10863
msgid ""
10864
"Note that when merging a directory deletion, if unversioned files are\n"
10865
"present, they become potential orphans has they don't have a directory\n"
10866
"parent anymore."
10867
msgstr ""
10868
10869
#: en/help_topics/conflict-types.txt:265
10870
msgid ""
10871
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10872
"setting the ``bzr.transform.orphan_policy`` configuration option."
10873
msgstr ""
10874
10875
#: en/help_topics/conflict-types.txt:268
10876
msgid "There are two possible values for this option:"
10877
msgstr ""
10878
10879
#: en/help_topics/conflict-types.txt:270
10880
msgid ""
10881
"* ``conflict`` (the default): will leave the orphans in place and\n"
10882
" generate a conflicts,"
10883
msgstr ""
10884
10885
#: en/help_topics/conflict-types.txt:273
10886
msgid ""
10887
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10888
"root\n"
10889
" of the working tree with names like ``<file>.~#~``."
10890
msgstr ""
10891
10892
#: en/help_topics/conflict-types.txt:278
10893
msgid ""
10894
"Path conflict\n"
10895
"-------------"
10896
msgstr ""
10897
10898
#: en/help_topics/conflict-types.txt:283
10899
msgid " Path conflict: PATH1 / PATH2"
10900
msgstr ""
10901
10902
#: en/help_topics/conflict-types.txt:285
10903
msgid ""
10904
"This happens when the source and target have each modified the name or "
10905
"parent\n"
10906
"directory of a file. Bazaar will use the path elements from the source."
10907
msgstr ""
10908
10909
#: en/help_topics/conflict-types.txt:288
10910
msgid ""
10911
"To resolve that kind of conflict, you just have to decide what name should "
10912
"be\n"
10913
"retained for the file involved."
10914
msgstr ""
10915
10916
#: en/help_topics/conflict-types.txt:293
10917
msgid ""
10918
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10919
" issuing ``bzr mv PATH2 PATH1``,\n"
10920
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10921
"``PATH2``,\n"
10922
"* ``--action=done`` will just mark the conflict as resolved."
10923
msgstr ""
10924
10925
#: en/help_topics/conflict-types.txt:300
10926
msgid ""
10927
"Parent loop\n"
10928
"-----------"
10929
msgstr ""
10930
10931
#: en/help_topics/conflict-types.txt:305
10932
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10933
msgstr ""
10934
10935
#: en/help_topics/conflict-types.txt:307
10936
msgid ""
10937
"This happens when the source and the target have each moved directories, so\n"
10938
"that, if the change could be applied, a directory would be contained by "
10939
"itself.\n"
10940
"For example::"
10941
msgstr ""
10942
10943
#: en/help_topics/conflict-types.txt:311
10944
msgid ""
10945
" $ bzr init\n"
10946
" $ bzr mkdir white\n"
10947
" $ bzr mkdir black\n"
10948
" $ bzr commit -m \"BASE\"\n"
10949
" $ bzr branch . ../other\n"
10950
" $ bzr mv white black\n"
10951
" $ bzr commit -m \"THIS\"\n"
10952
" $ bzr mv ../other/black ../other/white\n"
10953
" $ bzr commit ../other -m \"OTHER\"\n"
10954
" $ bzr merge ../other"
10955
msgstr ""
10956
10957
#: en/help_topics/conflict-types.txt:322
10958
msgid ""
10959
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
10960
"``black``. To resolve that kind of conflict, you just have to decide what\n"
10961
"name should be retained for the directories involved."
10962
msgstr ""
10963
10964
#: en/help_topics/conflict-types.txt:328
10965
msgid ""
10966
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
10967
"\n"
10968
" in ``black``,\n"
10969
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
10970
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
10971
"* ``--action=done`` will just mark the conflict as resolved."
10972
msgstr ""
10973
10974
#: en/help_topics/conflict-types.txt:336
10975
msgid ""
10976
"Non-directory parent\n"
10977
"--------------------"
10978
msgstr ""
10979
10980
#: en/help_topics/conflict-types.txt:341
10981
msgid ""
10982
" Conflict: foo.new is not a directory, but has files in it.\n"
10983
" Created directory."
10984
msgstr ""
10985
10986
#: en/help_topics/conflict-types.txt:344
10987
msgid ""
10988
"This happens when one side has added files to a directory, and the other "
10989
"side\n"
10990
"has changed the directory into a file or symlink. For example::"
10991
msgstr ""
10992
10993
#: en/help_topics/conflict-types.txt:347
10994
msgid ""
10995
" $ bzr init\n"
10996
" $ bzr mkdir foo\n"
10997
" $ bzr commit -m \"BASE\"\n"
10998
" $ bzr branch . ../other\n"
10999
" $ rmdir foo\n"
11000
" $ touch foo\n"
11001
" $ bzr commit -m \"THIS\"\n"
11002
" $ bzr mkdir ../other/foo/bar\n"
11003
" $ bzr commit ../other -m \"OTHER\"\n"
11004
" $ bzr merge ../other"
11005
msgstr ""
11006
11007
#: en/help_topics/conflict-types.txt:358
11008
msgid ""
11009
"To resolve that kind of conflict, you have to decide what name should be\n"
11010
"retained for the file, directory or symlink involved."
11011
msgstr ""
11012
11013
#: en/help_topics/conflict-types.txt:363
11014
msgid ""
11015
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11016
" ``bzr add foo``,\n"
11017
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11018
" ``bzr mv foo.new foo``,\n"
11019
"* ``--action=done`` will just mark the conflict as resolved."
11020
msgstr ""
11021
11022
#: en/help_topics/conflict-types.txt:371
11023
msgid ""
11024
"MalformedTransform\n"
11025
"------------------"
11026
msgstr ""
11027
11028
#: en/help_topics/conflict-types.txt:374
11029
msgid ""
11030
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11031
"exception. This means that Bazaar encountered a filesystem conflict that it "
11032
"was\n"
11033
"unable to resolve. This usually indicates a bug. Please let us know if "
11034
"you\n"
11035
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11036
msgstr ""
11037
11038
#: en/help_topics/content-filters.txt:1
11039
msgid ""
11040
"Content Filters\n"
11041
"==============="
11042
msgstr ""
11043
11044
#: en/help_topics/content-filters.txt:4
11045
msgid ""
11046
"Content formats\n"
11047
"---------------"
11048
msgstr ""
11049
11050
#: en/help_topics/content-filters.txt:7
11051
msgid ""
11052
"Bazaar's content filtering allows you to store files in a different\n"
11053
"format from the copy in your working tree. This lets you, or your\n"
11054
"co-developers, use Windows development tools that expect CRLF files\n"
11055
"on projects that use other line-ending conventions. Among other things,\n"
11056
"content filters also let Unix developers more easily work on projects\n"
11057
"using Windows line-ending conventions, keyword expansion/compression,\n"
11058
"and trailing spaces on lines in text files to be implicitly stripped\n"
11059
"when committed."
11060
msgstr ""
11061
11062
#: en/help_topics/content-filters.txt:16
11063
msgid "To generalize, there are two content formats supported by Bazaar:"
11064
msgstr ""
11065
11066
#: en/help_topics/content-filters.txt:18
11067
msgid ""
11068
"* a canonical format - how files are stored internally\n"
11069
"* a convenience format - how files are created in a working tree."
11070
msgstr ""
11071
11072
#: en/help_topics/content-filters.txt:21
11073
msgid ""
11074
"\n"
11075
"Format conversion\n"
11076
"-----------------"
11077
msgstr ""
11078
11079
#: en/help_topics/content-filters.txt:25
11080
msgid ""
11081
"The conversion between these formats is done by content filters.\n"
11082
"A content filter has two parts:"
11083
msgstr ""
11084
11085
#: en/help_topics/content-filters.txt:28
11086
msgid ""
11087
"* a read converter - converts from convenience to canonical format\n"
11088
"* a write converter - converts from canonical to convenience format."
11089
msgstr ""
11090
11091
#: en/help_topics/content-filters.txt:31
11092
msgid ""
11093
"Many of these converters will provide *round-trip* conversion,\n"
11094
"i.e. applying the read converter followed by the write converter\n"
11095
"gives back the original content. However, others may provide an\n"
11096
"asymmetric conversion. For example, a read converter might strip\n"
11097
"trailing whitespace off lines in source code while the matching\n"
11098
"write converter might pass content through unchanged."
11099
msgstr ""
11100
11101
#: en/help_topics/content-filters.txt:38
11102
msgid ""
11103
"\n"
11104
"Enabling content filters\n"
11105
"------------------------"
11106
msgstr ""
11107
11108
#: en/help_topics/content-filters.txt:42
11109
msgid ""
11110
"Content filters are typically provided by plugins, so the first step\n"
11111
"in using them is to install the relevant plugins and read their\n"
11112
"documentation. Some plugins may be very specific about which files\n"
11113
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11114
"In other cases, the plugin may leave it in the user's hands to\n"
11115
"define which files are to be filtered. This is typically done\n"
11116
"using rule-based preferences. See ``bzr help rules`` for general\n"
11117
"information about defining these."
11118
msgstr ""
11119
11120
#: en/help_topics/content-filters.txt:51
11121
msgid ""
11122
"\n"
11123
"Impact on commands\n"
11124
"------------------"
11125
msgstr ""
11126
11127
#: en/help_topics/content-filters.txt:55
11128
msgid ""
11129
"Read converters are only applied to commands that read content from\n"
11130
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11131
"will apply read converters to files in the working tree, then compare\n"
11132
"the results to the content last committed."
11133
msgstr ""
11134
11135
#: en/help_topics/content-filters.txt:60
11136
msgid ""
11137
"Write converters are only applied by commands that **create files in a\n"
11138
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11139
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11140
"respectively."
11141
msgstr ""
11142
11143
#: en/help_topics/content-filters.txt:65
11144
msgid ""
11145
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11146
"comitting files. If this makes sense for a given plugin providing\n"
11147
"a content filter, the plugin can usually achieve this effect by using a\n"
11148
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11149
"for more information on hooks."
11150
msgstr ""
11151
11152
#: en/help_topics/content-filters.txt:71
11153
msgid ""
11154
"\n"
11155
"Refreshing your working tree\n"
11156
"----------------------------"
11157
msgstr ""
11158
11159
#: en/help_topics/content-filters.txt:75
11160
msgid ""
11161
"For performance reasons, Bazaar caches the timestamps of files in\n"
11162
"a working tree, and assumes files are unchanged if their timestamps\n"
11163
"match the cached values. As a consequence, there are times when\n"
11164
"you may need to explicitly ask for content filtering to be reapplied\n"
11165
"in one or both directions, e.g. after installing or reconfiguring\n"
11166
"plugins providing it."
11167
msgstr ""
11168
11169
#: en/help_topics/content-filters.txt:82
11170
msgid "Here are some general guidelines for doing this:"
11171
msgstr ""
11172
11173
#: en/help_topics/content-filters.txt:84
11174
msgid ""
11175
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11176
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11177
" relevant read converters and compare the end result with the\n"
11178
" canonical format."
11179
msgstr ""
11180
11181
#: en/help_topics/content-filters.txt:89
11182
msgid ""
11183
" * To reapply write converters, ensure there are no local changes,\n"
11184
" delete the relevant files and run ``bzr revert`` on those files."
11185
msgstr ""
11186
11187
#: en/help_topics/content-filters.txt:92
11188
msgid ""
11189
"Note: In the future, it is likely that additional options will be added\n"
11190
"to commands to make this refreshing process faster and safer.\n"
11191
msgstr ""
11192
11193
#: en/help_topics/current-formats.txt:1
11194
msgid "Current Storage Formats"
11195
msgstr ""
11196
11197
#: en/help_topics/current-formats.txt:3
11198
msgid ""
11199
":2a:\n"
11200
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11201
" compress storage. Provides rich roots which are a one-way\n"
11202
" transition."
11203
msgstr ""
11204
11205
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11206
msgid ""
11207
"\n"
11208
"See :doc:`formats-help` for more about storage formats."
11209
msgstr ""
11210
11211
#: en/help_topics/debug-flags.txt:1
11212
msgid ""
11213
"Debug Flags\n"
11214
"==========="
11215
msgstr ""
11216
11217
#: en/help_topics/debug-flags.txt:4
11218
msgid ""
11219
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11220
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11221
msgstr ""
11222
11223
#: en/help_topics/debug-flags.txt:7
11224
msgid ""
11225
"-Dauth Trace authentication sections used.\n"
11226
"-Dbytes Print out how many bytes were transferred\n"
11227
"-Ddirstate Trace dirstate activity (verbose!)\n"
11228
"-Derror Instead of normal error handling, always print a "
11229
"traceback\n"
11230
" on error.\n"
11231
"-Devil Capture call sites that do expensive or badly-scaling\n"
11232
" operations.\n"
11233
"-Dfetch Trace history copying between repositories.\n"
11234
"-Dfilters Emit information for debugging content filtering.\n"
11235
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11236
"fetch.\n"
11237
"-Dgraph Trace graph traversal.\n"
11238
"-Dhashcache Log every time a working file is read to determine its "
11239
"hash.\n"
11240
"-Dhooks Trace hook execution.\n"
11241
"-Dhpss Trace smart protocol requests and responses.\n"
11242
"-Dhpssdetail More hpss details.\n"
11243
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11244
"-Dhttp Trace http connections, requests and responses.\n"
11245
"-Dindex Trace major index operations.\n"
11246
"-Dknit Trace knit operations.\n"
11247
"-Dlock Trace when lockdir locks are taken or released.\n"
11248
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11249
" retrying the request.\n"
11250
"-Dprogress Trace progress bar operations.\n"
11251
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11252
"-Dmerge Emit information for debugging merges.\n"
11253
"-Dno_apport Don't use apport to report crashes.\n"
11254
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11255
"-Dpack Emit information about pack operations.\n"
11256
"-Drelock Emit a message every time a branch or repository object "
11257
"is\n"
11258
" unlocked then relocked the same way.\n"
11259
"-Dsftp Trace SFTP internals.\n"
11260
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11261
"expected\n"
11262
"-Dstream Trace fetch streams.\n"
11263
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11264
"portable\n"
11265
" manner.\n"
11266
"-Dunlock Some errors during unlock are treated as warnings.\n"
11267
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11268
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11269
"appropriate\n"
11270
" for the format, even for non-local fetches.\n"
11271
msgstr ""
11272
11273
#: en/help_topics/diverged-branches.txt:1
11274
msgid ""
11275
"Diverged Branches\n"
11276
"================="
11277
msgstr ""
11278
11279
#: en/help_topics/diverged-branches.txt:4
11280
msgid ""
11281
"When Bazaar tries to push one branch onto another, it requires that the\n"
11282
"destination branch must be ready to receive the source branch. If this "
11283
"isn't\n"
11284
"the case, then we say that the branches have ``diverged``. Branches are\n"
11285
"considered diverged if the destination branch's most recent commit is one "
11286
"that\n"
11287
"has not been merged (directly or indirectly) by the source branch. To "
11288
"recover\n"
11289
"from diverged branches, one must merge the missing revisions into the "
11290
"source\n"
11291
"branch."
11292
msgstr ""
11293
11294
#: en/help_topics/diverged-branches.txt:12
11295
msgid ""
11296
"This situation commonly arises when using a centralized workflow with local\n"
11297
"commits. If someone else has committed new work to the mainline since your\n"
11298
"last pull and you have local commits that have not yet been pushed to the\n"
11299
"mainline, then your local branch and the mainline have diverged."
11300
msgstr ""
11301
11302
#: en/help_topics/diverged-branches.txt:17
11303
msgid ""
11304
"Discovering What Has Diverged\n"
11305
"-----------------------------"
11306
msgstr ""
11307
11308
#: en/help_topics/diverged-branches.txt:20
11309
msgid ""
11310
"The ``bzr missing`` command is used to find out what revisions are in "
11311
"another\n"
11312
"branch that are not present in the current branch, and vice-versa. It shows "
11313
"a\n"
11314
"summary of which extra revisions exist in each branch. If you want to see "
11315
"the\n"
11316
"precise effects of those revisions, you can use ``bzr diff --"
11317
"old=other_branch``\n"
11318
"to show the differences between other_branch and your current branch."
11319
msgstr ""
11320
11321
#: en/help_topics/diverged-branches.txt:26
11322
msgid ""
11323
"A Solution\n"
11324
"----------"
11325
msgstr ""
11326
11327
#: en/help_topics/diverged-branches.txt:29
11328
msgid ""
11329
"The solution is to merge the revisions from the mainline into your local\n"
11330
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11331
"mainline. This merge may result in conflicts if the other developer's "
11332
"changes\n"
11333
"overlap with your changes. These conflicts should be resolved before\n"
11334
"continuing. After any conflicts have been resolved, or even if there were "
11335
"no\n"
11336
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11337
"to your local branch. This requirement gives you an opportunity to test "
11338
"the\n"
11339
"resulting working tree for correctness, since the merged revisions could "
11340
"have\n"
11341
"made arbitrary changes. After testing, you should commit the merge using\n"
11342
"``bzr commit``. This clears up the diverged branches situation. Your "
11343
"local\n"
11344
"branch can now be pushed to the mainline.\n"
11345
msgstr ""
11346
11347
#: en/help_topics/eol.txt:1
11348
msgid ""
11349
"End of Line Conversion\n"
11350
"======================"
11351
msgstr ""
11352
11353
#: en/help_topics/eol.txt:4
11354
msgid ""
11355
"EOL conversion is provided as a content filter where Bazaar internally\n"
11356
"stores a canonical format but outputs a convenience format. See\n"
11357
"``bzr help content-filters`` for general information about using these."
11358
msgstr ""
11359
11360
#: en/help_topics/eol.txt:8
11361
msgid ""
11362
"Note: Content filtering is only supported in recently added formats,\n"
11363
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11364
"in a recent format. (Just setting the format on the repository\n"
11365
"is not enough.) If content filtering does not appear to be working, use\n"
11366
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11367
"or later."
11368
msgstr ""
11369
11370
#: en/help_topics/eol.txt:15
11371
msgid ""
11372
"EOL conversion needs to be enabled for selected file patterns using\n"
11373
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11374
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11375
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11376
"supported in a future verison of Bazaar."
11377
msgstr ""
11378
11379
#: en/help_topics/eol.txt:21
11380
msgid ""
11381
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11382
"(If a value is not set, ``exact`` is the default.)"
11383
msgstr ""
11384
11385
#: en/help_topics/eol.txt:24
11386
msgid ""
11387
" ========== ===================================== ======================\n"
11388
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11389
" ========== ===================================== ======================\n"
11390
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11391
" ---------- ------------------------------------- ----------------------\n"
11392
" ``lf`` ``lf`` ``lf``\n"
11393
" ---------- ------------------------------------- ----------------------\n"
11394
" ``crlf`` ``crlf`` ``lf``\n"
11395
" ---------- ------------------------------------- ----------------------\n"
11396
" ``exact`` No conversion Exactly as in file\n"
11397
" ========== ===================================== ======================"
11398
msgstr ""
11399
11400
#: en/help_topics/eol.txt:36
11401
msgid ""
11402
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11403
"byte is detected in the file."
11404
msgstr ""
11405
11406
#: en/help_topics/eol.txt:39
11407
msgid ""
11408
"For users working on a cross-platform project, here is a suggested rule\n"
11409
"to use as a starting point::"
11410
msgstr ""
11411
11412
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11413
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11414
msgid ""
11415
" [name *]\n"
11416
" eol = native"
11417
msgstr ""
11418
11419
#: en/help_topics/eol.txt:45
11420
msgid ""
11421
"If you have binary files that do not contain a null byte though, be\n"
11422
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11423
"by giving more explicit patterns earlier in the rules file. For example::"
11424
msgstr ""
11425
11426
#: en/help_topics/eol.txt:49
11427
msgid ""
11428
" [name *.png]\n"
11429
" eol = exact"
11430
msgstr ""
11431
11432
#: en/help_topics/eol.txt:55
11433
msgid ""
11434
"If your working tree is on a network drive shared by users on different\n"
11435
"operating systems, you typically want to force certain conventions for\n"
11436
"certain files. In that way, if a file is created with the wrong line\n"
11437
"endings or line endings get mixed during editing, it gets committed\n"
11438
"correctly and gets checked out correctly. For example::"
11439
msgstr ""
11440
11441
#: en/help_topics/eol.txt:61
11442
msgid ""
11443
" [name *.bat]\n"
11444
" eol = crlf"
11445
msgstr ""
11446
11447
#: en/help_topics/eol.txt:64
11448
msgid ""
11449
" [name *.sh]\n"
11450
" eol = lf"
11451
msgstr ""
11452
11453
#: en/help_topics/eol.txt:70
11454
msgid ""
11455
"If you take the care to create files with their required endings, you can\n"
11456
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11457
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11458
"introducing mixed line endings will be corrected during commit for files\n"
11459
"with those settings."
11460
msgstr ""
11461
11462
#: en/help_topics/eol.txt:76
11463
msgid ""
11464
"If you have sample test data that deliberately has text files with mixed\n"
11465
"newline conventions, you can ask for those to be left alone like this::"
11466
msgstr ""
11467
11468
#: en/help_topics/eol.txt:79
11469
msgid ""
11470
" [name test_data/]\n"
11471
" eol = exact"
11472
msgstr ""
11473
11474
#: en/help_topics/eol.txt:85
11475
msgid ""
11476
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11477
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11478
"of content analysis to detect binary files for commands like ``diff``.\n"
11479
"In the future, a ``binary = true`` rule may be added but it is not\n"
11480
"supported yet.)"
11481
msgstr ""
11482
11483
#: en/help_topics/eol.txt:91
11484
msgid ""
11485
"If you have an existing repository with text files already stored using\n"
11486
"Windows newline conventions (``crlf``), then you may want to keep using "
11487
"that\n"
11488
"convention in the repository. Forcing certain files to this convention\n"
11489
"may also help users who do not have rules configured. To do this, set\n"
11490
"``eol`` to one of the values below."
11491
msgstr ""
11492
11493
#: en/help_topics/eol.txt:97
11494
msgid ""
11495
" ============================ ======================== "
11496
"======================\n"
11497
" Value Checkout end-of-lines as Commit end-of-lines "
11498
"as\n"
11499
" ============================ ======================== "
11500
"======================\n"
11501
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11502
" ``lf`` otherwise\n"
11503
" ---------------------------- ------------------------ ----------------------"
11504
"\n"
11505
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11506
" ---------------------------- ------------------------ ----------------------"
11507
"\n"
11508
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11509
" ============================ ======================== ======================"
11510
msgstr ""
11511
11512
#: en/help_topics/eol.txt:108
11513
msgid ""
11514
"For users working on an existing project that uses Windows newline\n"
11515
"conventions in their Bazaar repository, this rule is suggested as a\n"
11516
"starting point::"
11517
msgstr ""
11518
11519
#: en/help_topics/eol.txt:112
11520
msgid ""
11521
" [name *]\n"
11522
" eol = native-with-crlf-in-repo"
11523
msgstr ""
11524
11525
#: en/help_topics/eol.txt:115
11526
msgid ""
11527
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11528
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11529
"``crlf`` and ``exact``."
11530
msgstr ""
11531
11532
#: en/help_topics/eol.txt:119
11533
msgid ""
11534
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11535
"never reject files because a given line ending or mixed line endings\n"
11536
"are found. A precommit hook should be used if you wish to validate\n"
11537
"(and not just convert) content before committing.\n"
11538
msgstr ""
11539
11540
#: en/help_topics/hidden-commands.txt:1
11541
msgid ""
11542
"added List files added in working tree.\n"
11543
"ancestry List all revisions merged into this branch.\n"
11544
"assert-fail Test reporting of assertion failures\n"
11545
"bundle-info Output interesting stats about a bundle\n"
11546
"bundle-revisions Create a merge-directive for submitting changes.\n"
11547
"cat-revision Write out metadata for a revision.\n"
11548
"dump-btree Dump the contents of a btree index file to stdout.\n"
11549
"export-pot Export command helps and error messages in po format.\n"
11550
"file-id Print file_id of a particular file or directory.\n"
11551
"file-path Print path of file_ids to a file or directory.\n"
11552
"find-merge-base Find and print a base revision for merging two "
11553
"branches.\n"
11554
"hooks Show hooks.\n"
11555
"inventory Show inventory of the current working copy or a "
11556
"revision.\n"
11557
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11558
"lookup-revision Lookup the revision-id from a revision-number\n"
11559
"merge-directive Generate a merge directive for auto-merge tools.\n"
11560
"modified List files modified in working tree.\n"
11561
"re-sign Create a digital signature for an existing revision.\n"
11562
"reference list, view and set branch locations for nested trees.\n"
11563
"relpath Show path of a file relative to root\n"
11564
"repair-workingtree Reset the working tree state file.\n"
11565
"revision-history Display the list of revision ids on a branch.\n"
11566
"revision-info Show revision number and revision id for a given "
11567
"revision\n"
11568
" identifier.\n"
11569
"rocks Statement of optimism.\n"
11570
"selftest Run internal test suite.\n"
11571
"shell-complete Show appropriate completions for context.\n"
11572
"test-script Run a shell-like test from a file.\n"
11573
"touching-revisions Return revision-ids which affected a particular file.\n"
11574
"unknowns List unknown files.\n"
11575
"wait-until-signalled Test helper for\n"
11576
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11577
msgstr ""
11578
11579
#: en/help_topics/hooks.txt:1
11580
msgid ""
11581
"\n"
11582
"Hooks\n"
11583
"====="
11584
msgstr ""
11585
11586
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11587
msgid ""
11588
"Introduction\n"
11589
"------------"
11590
msgstr ""
11591
11592
#: en/help_topics/hooks.txt:8
11593
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11594
msgstr ""
11595
11596
#: en/help_topics/hooks.txt:10
11597
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11598
msgstr ""
11599
11600
#: en/help_topics/hooks.txt:12
11601
msgid ""
11602
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11603
msgstr ""
11604
11605
#: en/help_topics/hooks.txt:14
11606
msgid ""
11607
"The class that contains each hook is given before the hooks it supplies. "
11608
"For\n"
11609
"instance, BranchHooks as the class is the hooks class for\n"
11610
"`bzrlib.branch.Branch.hooks`."
11611
msgstr ""
11612
11613
#: en/help_topics/hooks.txt:18
11614
msgid ""
11615
"Each description also indicates whether the hook runs on the client (the\n"
11616
"machine where bzr was invoked) or the server (the machine addressed by\n"
11617
"the branch URL). These may be, but are not necessarily, the same machine."
11618
msgstr ""
11619
11620
#: en/help_topics/hooks.txt:22
11621
msgid ""
11622
"Plugins (including hooks) are run on the server if all of these is true:"
11623
msgstr ""
11624
11625
#: en/help_topics/hooks.txt:24
11626
msgid ""
11627
" * The connection is via a smart server (accessed with a URL starting with\n"
11628
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11629
"\"http://\"\n"
11630
" URL when a smart server is available via HTTP)."
11631
msgstr ""
11632
11633
#: en/help_topics/hooks.txt:28
11634
msgid ""
11635
" * The hook is either server specific or part of general infrastructure "
11636
"rather\n"
11637
" than client specific code (such as commit)."
11638
msgstr ""
11639
11640
#: en/help_topics/hooks.txt:31
11641
msgid ""
11642
"\n"
11643
"BranchHooks\n"
11644
"-----------"
11645
msgstr ""
11646
11647
#: en/help_topics/hooks.txt:35
11648
msgid ""
11649
"automatic_tag_name\n"
11650
"~~~~~~~~~~~~~~~~~~"
11651
msgstr ""
11652
11653
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11654
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11655
msgid "Introduced in: 2.2"
11656
msgstr ""
11657
11658
#: en/help_topics/hooks.txt:40
11659
msgid ""
11660
"Called to determine an automatic tag name for a revision.\n"
11661
"automatic_tag_name is called with (branch, revision_id) and should\n"
11662
"return a tag name or None if no tag name could be determined. The\n"
11663
"first non-None tag name returned will be used."
11664
msgstr ""
11665
11666
#: en/help_topics/hooks.txt:45
11667
msgid ""
11668
"open\n"
11669
"~~~~"
11670
msgstr ""
11671
11672
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11673
#: en/help_topics/hooks.txt:304
11674
msgid "Introduced in: 1.8"
11675
msgstr ""
11676
11677
#: en/help_topics/hooks.txt:50
11678
msgid ""
11679
"Called with the Branch object that has been opened after a branch is\n"
11680
"opened."
11681
msgstr ""
11682
11683
#: en/help_topics/hooks.txt:53
11684
msgid ""
11685
"post_branch_init\n"
11686
"~~~~~~~~~~~~~~~~"
11687
msgstr ""
11688
11689
#: en/help_topics/hooks.txt:58
11690
msgid ""
11691
"Called after new branch initialization completes. post_branch_init is\n"
11692
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11693
"branch and checkout (both heavyweight and lightweight) will all\n"
11694
"trigger this hook."
11695
msgstr ""
11696
11697
#: en/help_topics/hooks.txt:63
11698
msgid ""
11699
"post_change_branch_tip\n"
11700
"~~~~~~~~~~~~~~~~~~~~~~"
11701
msgstr ""
11702
11703
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
11704
msgid "Introduced in: 1.4"
11705
msgstr ""
11706
11707
#: en/help_topics/hooks.txt:68
11708
msgid ""
11709
"Called in bzr client and server after a change to the tip of a branch\n"
11710
"is made. post_change_branch_tip is called with a\n"
11711
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11712
"uncommit will all trigger this hook."
11713
msgstr ""
11714
11715
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11716
msgid ""
11717
"post_commit\n"
11718
"~~~~~~~~~~~"
11719
msgstr ""
11720
11721
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11722
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11723
#: en/help_topics/hooks.txt:145
11724
msgid "Introduced in: 0.15"
11725
msgstr ""
11726
11727
#: en/help_topics/hooks.txt:78
11728
msgid ""
11729
"Called in the bzr client after a commit has completed. post_commit is\n"
11730
"called with (local, master, old_revno, old_revid, new_revno,\n"
11731
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11732
"branch."
11733
msgstr ""
11734
11735
#: en/help_topics/hooks.txt:83
11736
msgid ""
11737
"post_pull\n"
11738
"~~~~~~~~~"
11739
msgstr ""
11740
11741
#: en/help_topics/hooks.txt:88
11742
msgid ""
11743
"Called after a pull operation completes. post_pull is called with a\n"
11744
"bzrlib.branch.PullResult object and only runs in the bzr client."
11745
msgstr ""
11746
11747
#: en/help_topics/hooks.txt:91
11748
msgid ""
11749
"post_push\n"
11750
"~~~~~~~~~"
11751
msgstr ""
11752
11753
#: en/help_topics/hooks.txt:96
11754
msgid ""
11755
"Called after a push operation completes. post_push is called with a\n"
11756
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11757
msgstr ""
11758
11759
#: en/help_topics/hooks.txt:99
11760
msgid ""
11761
"post_switch\n"
11762
"~~~~~~~~~~~"
11763
msgstr ""
11764
11765
#: en/help_topics/hooks.txt:104
11766
msgid ""
11767
"Called after a checkout switches branch. post_switch is called with a\n"
11768
"bzrlib.branch.SwitchHookParams."
11769
msgstr ""
11770
11771
#: en/help_topics/hooks.txt:107
11772
msgid ""
11773
"post_uncommit\n"
11774
"~~~~~~~~~~~~~"
11775
msgstr ""
11776
11777
#: en/help_topics/hooks.txt:112
11778
msgid ""
11779
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11780
"called with (local, master, old_revno, old_revid, new_revno,\n"
11781
"new_revid) where local is the local branch or None, master is the\n"
11782
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11783
"of None."
11784
msgstr ""
11785
11786
#: en/help_topics/hooks.txt:118
11787
msgid ""
11788
"pre_change_branch_tip\n"
11789
"~~~~~~~~~~~~~~~~~~~~~"
11790
msgstr ""
11791
11792
#: en/help_topics/hooks.txt:121
11793
msgid "Introduced in: 1.6"
11794
msgstr ""
11795
11796
#: en/help_topics/hooks.txt:123
11797
msgid ""
11798
"Called in bzr client and server before a change to the tip of a branch\n"
11799
"is made. pre_change_branch_tip is called with a\n"
11800
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11801
"uncommit will all trigger this hook."
11802
msgstr ""
11803
11804
#: en/help_topics/hooks.txt:128
11805
msgid ""
11806
"pre_commit\n"
11807
"~~~~~~~~~~"
11808
msgstr ""
11809
11810
#: en/help_topics/hooks.txt:131
11811
msgid "Introduced in: 0.91"
11812
msgstr ""
11813
11814
#: en/help_topics/hooks.txt:133
11815
msgid ""
11816
"Called after a commit is calculated but before it is completed.\n"
11817
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11818
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11819
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11820
"TreeDelta object describing changes from the basis revision. hooks\n"
11821
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11822
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11823
"tree."
11824
msgstr ""
11825
11826
#: en/help_topics/hooks.txt:142
11827
msgid ""
11828
"set_rh\n"
11829
"~~~~~~"
11830
msgstr ""
11831
11832
#: en/help_topics/hooks.txt:147
11833
msgid ""
11834
"Invoked whenever the revision history has been set via\n"
11835
"set_revision_history. The api signature is (branch, revision_history),\n"
11836
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11837
"for bzr to trigger, a better hook to use is\n"
11838
"Branch.post_change_branch_tip."
11839
msgstr ""
11840
11841
#: en/help_topics/hooks.txt:153
11842
msgid ""
11843
"transform_fallback_location\n"
11844
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11845
msgstr ""
11846
11847
#: en/help_topics/hooks.txt:156
11848
msgid "Introduced in: 1.9"
11849
msgstr ""
11850
11851
#: en/help_topics/hooks.txt:158
11852
msgid ""
11853
"Called when a stacked branch is activating its fallback locations.\n"
11854
"transform_fallback_location is called with (branch, url), and should\n"
11855
"return a new url. Returning the same url allows it to be used as-is,\n"
11856
"returning a different one can be used to cause the branch to stack on\n"
11857
"a closer copy of that fallback_location. Note that the branch cannot\n"
11858
"have history accessing methods called on it during this hook because\n"
11859
"the fallback locations have not been activated. When there are\n"
11860
"multiple hooks installed for transform_fallback_location, all are\n"
11861
"called with the url returned from the previous hook.The order is\n"
11862
"however undefined."
11863
msgstr ""
11864
11865
#: en/help_topics/hooks.txt:169
11866
msgid ""
11867
"CommandHooks\n"
11868
"------------"
11869
msgstr ""
11870
11871
#: en/help_topics/hooks.txt:172
11872
msgid ""
11873
"extend_command\n"
11874
"~~~~~~~~~~~~~~"
11875
msgstr ""
11876
11877
#: en/help_topics/hooks.txt:175
11878
msgid "Introduced in: 1.13"
11879
msgstr ""
11880
11881
#: en/help_topics/hooks.txt:177
11882
msgid ""
11883
"Called after creating a command object to allow modifications such as\n"
11884
"adding or removing options, docs etc. Called with the new\n"
11885
"bzrlib.commands.Command object."
11886
msgstr ""
11887
11888
#: en/help_topics/hooks.txt:181
11889
msgid ""
11890
"get_command\n"
11891
"~~~~~~~~~~~"
11892
msgstr ""
11893
11894
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11895
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
11896
msgid "Introduced in: 1.17"
11897
msgstr ""
11898
11899
#: en/help_topics/hooks.txt:186
11900
msgid ""
11901
"Called when creating a single command. Called with (cmd_or_None,\n"
11902
"command_name). get_command should either return the cmd_or_None\n"
11903
"parameter, or a replacement Command object that should be used for the\n"
11904
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11905
"Many users will prefer to use bzrlib.commands.register_command or\n"
11906
"plugin_cmds.register_lazy."
11907
msgstr ""
11908
11909
#: en/help_topics/hooks.txt:193
11910
msgid ""
11911
"get_missing_command\n"
11912
"~~~~~~~~~~~~~~~~~~~"
11913
msgstr ""
11914
11915
#: en/help_topics/hooks.txt:198
11916
msgid ""
11917
"Called when creating a single command if no command could be found.\n"
11918
"Called with (command_name). get_missing_command should either return\n"
11919
"None, or a Command object to be used for the command."
11920
msgstr ""
11921
11922
#: en/help_topics/hooks.txt:202
11923
msgid ""
11924
"list_commands\n"
11925
"~~~~~~~~~~~~~"
11926
msgstr ""
11927
11928
#: en/help_topics/hooks.txt:207
11929
msgid ""
11930
"Called when enumerating commands. Called with a set of cmd_name\n"
11931
"strings for all the commands found so far. This set is safe to mutate\n"
11932
"- e.g. to remove a command. list_commands should return the updated\n"
11933
"set of command names."
11934
msgstr ""
11935
11936
#: en/help_topics/hooks.txt:212
11937
msgid ""
11938
"_ConfigHooks\n"
11939
"------------"
11940
msgstr ""
11941
11942
#: en/help_topics/hooks.txt:215
11943
msgid ""
11944
"get\n"
11945
"~~~"
11946
msgstr ""
11947
11948
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11949
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11950
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11951
#: en/help_topics/hooks.txt:427
11952
msgid "Introduced in: 2.4"
11953
msgstr ""
11954
11955
#: en/help_topics/hooks.txt:220
11956
msgid ""
11957
"Invoked when a config option is read. The signature is (stack, name,\n"
11958
"value)."
11959
msgstr ""
11960
11961
#: en/help_topics/hooks.txt:223
11962
msgid ""
11963
"load\n"
11964
"~~~~"
11965
msgstr ""
11966
11967
#: en/help_topics/hooks.txt:228
11968
msgid "Invoked when a config store is loaded. The signature is (store)."
11969
msgstr ""
11970
11971
#: en/help_topics/hooks.txt:230
11972
msgid ""
11973
"remove\n"
11974
"~~~~~~"
11975
msgstr ""
11976
11977
#: en/help_topics/hooks.txt:235
11978
msgid ""
11979
"Invoked when a config option is removed. The signature is (stack,\n"
11980
"name)."
11981
msgstr ""
11982
11983
#: en/help_topics/hooks.txt:238
11984
msgid ""
11985
"save\n"
11986
"~~~~"
11987
msgstr ""
11988
11989
#: en/help_topics/hooks.txt:243
11990
msgid "Invoked when a config store is saved. The signature is (store)."
11991
msgstr ""
11992
11993
#: en/help_topics/hooks.txt:245
11994
msgid ""
11995
"set\n"
11996
"~~~"
11997
msgstr ""
11998
11999
#: en/help_topics/hooks.txt:250
12000
msgid ""
12001
"Invoked when a config option is set. The signature is (stack, name,\n"
12002
"value)."
12003
msgstr ""
12004
12005
#: en/help_topics/hooks.txt:253
12006
msgid ""
12007
"ControlDirHooks\n"
12008
"---------------"
12009
msgstr ""
12010
12011
#: en/help_topics/hooks.txt:256
12012
msgid ""
12013
"post_repo_init\n"
12014
"~~~~~~~~~~~~~~"
12015
msgstr ""
12016
12017
#: en/help_topics/hooks.txt:261
12018
msgid ""
12019
"Invoked after a repository has been initialized. post_repo_init is\n"
12020
"called with a bzrlib.controldir.RepoInitHookParams."
12021
msgstr ""
12022
12023
#: en/help_topics/hooks.txt:264
12024
msgid ""
12025
"pre_open\n"
12026
"~~~~~~~~"
12027
msgstr ""
12028
12029
#: en/help_topics/hooks.txt:267
12030
msgid "Introduced in: 1.14"
12031
msgstr ""
12032
12033
#: en/help_topics/hooks.txt:269
12034
msgid ""
12035
"Invoked before attempting to open a ControlDir with the transport that\n"
12036
"the open will use."
12037
msgstr ""
12038
12039
#: en/help_topics/hooks.txt:272
12040
msgid ""
12041
"InfoHooks\n"
12042
"---------"
12043
msgstr ""
12044
12045
#: en/help_topics/hooks.txt:275
12046
msgid ""
12047
"repository\n"
12048
"~~~~~~~~~~"
12049
msgstr ""
12050
12051
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12052
#: en/help_topics/hooks.txt:505
12053
msgid "Introduced in: 1.15"
12054
msgstr ""
12055
12056
#: en/help_topics/hooks.txt:280
12057
msgid ""
12058
"Invoked when displaying the statistics for a repository. repository is\n"
12059
"called with a statistics dictionary as returned by the repository and\n"
12060
"a file-like object to write to."
12061
msgstr ""
12062
12063
#: en/help_topics/hooks.txt:284
12064
msgid ""
12065
"LockHooks\n"
12066
"---------"
12067
msgstr ""
12068
12069
#: en/help_topics/hooks.txt:287
12070
msgid ""
12071
"lock_acquired\n"
12072
"~~~~~~~~~~~~~"
12073
msgstr ""
12074
12075
#: en/help_topics/hooks.txt:292
12076
msgid ""
12077
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12078
msgstr ""
12079
12080
#: en/help_topics/hooks.txt:294
12081
msgid ""
12082
"lock_broken\n"
12083
"~~~~~~~~~~~"
12084
msgstr ""
12085
12086
#: en/help_topics/hooks.txt:299
12087
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12088
msgstr ""
12089
12090
#: en/help_topics/hooks.txt:301
12091
msgid ""
12092
"lock_released\n"
12093
"~~~~~~~~~~~~~"
12094
msgstr ""
12095
12096
#: en/help_topics/hooks.txt:306
12097
msgid ""
12098
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12099
msgstr ""
12100
12101
#: en/help_topics/hooks.txt:308
12102
msgid ""
12103
"MergeHooks\n"
12104
"----------"
12105
msgstr ""
12106
12107
#: en/help_topics/hooks.txt:311
12108
msgid ""
12109
"merge_file_content\n"
12110
"~~~~~~~~~~~~~~~~~~"
12111
msgstr ""
12112
12113
#: en/help_topics/hooks.txt:314
12114
msgid "Introduced in: 2.1"
12115
msgstr ""
12116
12117
#: en/help_topics/hooks.txt:316
12118
msgid ""
12119
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12120
"object when starting a merge. Should return either None or a subclass\n"
12121
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12122
"called per file that needs to be merged (including when one side has\n"
12123
"deleted the file and the other has changed it). See the\n"
12124
"AbstractPerFileMerger API docs for details on how it is used by merge."
12125
msgstr ""
12126
12127
#: en/help_topics/hooks.txt:323
12128
msgid ""
12129
"post_merge\n"
12130
"~~~~~~~~~~"
12131
msgstr ""
12132
12133
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12134
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
12135
msgid "Introduced in: 2.5"
12136
msgstr ""
12137
12138
#: en/help_topics/hooks.txt:328
12139
msgid ""
12140
"Called after a merge. Receives a Merger object as the single argument.\n"
12141
"The return value is ignored."
12142
msgstr ""
12143
12144
#: en/help_topics/hooks.txt:331
12145
msgid ""
12146
"pre_merge\n"
12147
"~~~~~~~~~"
12148
msgstr ""
12149
12150
#: en/help_topics/hooks.txt:336
12151
msgid ""
12152
"Called before a merge. Receives a Merger object as the single\n"
12153
"argument."
12154
msgstr ""
12155
12156
#: en/help_topics/hooks.txt:339
12157
msgid ""
12158
"MergeDirectiveHooks\n"
12159
"-------------------"
12160
msgstr ""
12161
12162
#: en/help_topics/hooks.txt:342
12163
msgid ""
12164
"merge_request_body\n"
12165
"~~~~~~~~~~~~~~~~~~"
12166
msgstr ""
12167
12168
#: en/help_topics/hooks.txt:345
12169
msgid "Introduced in: 1.15.0"
12170
msgstr ""
12171
12172
#: en/help_topics/hooks.txt:347
12173
msgid ""
12174
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12175
"request. Callbacks must return a body. If more than one callback is\n"
12176
"registered, the output of one callback is provided to the next."
12177
msgstr ""
12178
12179
#: en/help_topics/hooks.txt:351
12180
msgid ""
12181
"MessageEditorHooks\n"
12182
"------------------"
12183
msgstr ""
12184
12185
#: en/help_topics/hooks.txt:354
12186
msgid ""
12187
"commit_message_template\n"
12188
"~~~~~~~~~~~~~~~~~~~~~~~"
12189
msgstr ""
12190
12191
#: en/help_topics/hooks.txt:357
12192
msgid "Introduced in: 1.10"
12193
msgstr ""
12194
12195
#: en/help_topics/hooks.txt:359
12196
msgid ""
12197
"Called when a commit message is being generated.\n"
12198
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12199
"and the message that is known so far. commit_message_template must\n"
12200
"return a new message to use (which could be the same as it was given).\n"
12201
"When there are multiple hooks registered for commit_message_template,\n"
12202
"they are chained with the result from the first passed into the\n"
12203
"second, and so on."
12204
msgstr ""
12205
12206
#: en/help_topics/hooks.txt:367
12207
msgid ""
12208
"set_commit_message\n"
12209
"~~~~~~~~~~~~~~~~~~"
12210
msgstr ""
12211
12212
#: en/help_topics/hooks.txt:372
12213
msgid ""
12214
"Set a fixed commit message. set_commit_message is called with the\n"
12215
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12216
"properties by editing commit.builder._revprops) and the message so\n"
12217
"far. set_commit_message must return the message to use or None if it\n"
12218
"should use the message editor as normal."
12219
msgstr ""
12220
12221
#: en/help_topics/hooks.txt:378
12222
msgid ""
12223
"MutableTreeHooks\n"
12224
"----------------"
12225
msgstr ""
12226
12227
#: en/help_topics/hooks.txt:381
12228
msgid ""
12229
"post_build_tree\n"
12230
"~~~~~~~~~~~~~~~"
12231
msgstr ""
12232
12233
#: en/help_topics/hooks.txt:386
12234
msgid ""
12235
"Called after a completely new tree is built. The hook is called with\n"
12236
"the tree as its only argument."
12237
msgstr ""
12238
12239
#: en/help_topics/hooks.txt:392
12240
msgid "Introduced in: 2.0"
12241
msgstr ""
12242
12243
#: en/help_topics/hooks.txt:394
12244
msgid ""
12245
"Called after a commit is performed on a tree. The hook is called with\n"
12246
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12247
"commit was performed on is available via the mutable_tree attribute of\n"
12248
"that object."
12249
msgstr ""
12250
12251
#: en/help_topics/hooks.txt:399
12252
msgid ""
12253
"start_commit\n"
12254
"~~~~~~~~~~~~"
12255
msgstr ""
12256
12257
#: en/help_topics/hooks.txt:404
12258
msgid ""
12259
"Called before a commit is performed on a tree. The start commit hook\n"
12260
"is able to change the tree before the commit takes place. start_commit\n"
12261
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12262
"being performed on."
12263
msgstr ""
12264
12265
#: en/help_topics/hooks.txt:409
12266
msgid ""
12267
"SmartClientHooks\n"
12268
"----------------"
12269
msgstr ""
12270
12271
#: en/help_topics/hooks.txt:412
12272
msgid ""
12273
"call\n"
12274
"~~~~"
12275
msgstr ""
12276
12277
#: en/help_topics/hooks.txt:415
12278
msgid "Introduced in: unknown"
12279
msgstr ""
12280
12281
#: en/help_topics/hooks.txt:417
12282
msgid ""
12283
"Called when the smart client is submitting a request to the smart\n"
12284
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12285
"Streaming request bodies, and responses, are not accessible."
12286
msgstr ""
12287
12288
#: en/help_topics/hooks.txt:421
12289
msgid ""
12290
"SmartServerHooks\n"
12291
"----------------"
12292
msgstr ""
12293
12294
#: en/help_topics/hooks.txt:424
12295
msgid ""
12296
"server_exception\n"
12297
"~~~~~~~~~~~~~~~~"
12298
msgstr ""
12299
12300
#: en/help_topics/hooks.txt:429
12301
msgid ""
12302
"Called by the bzr server when an exception occurs. server_exception is\n"
12303
"called with the sys.exc_info() tuple return true for the hook if the\n"
12304
"exception has been handled, in which case the server will exit\n"
12305
"normally."
12306
msgstr ""
12307
12308
#: en/help_topics/hooks.txt:434
12309
msgid ""
12310
"server_started\n"
12311
"~~~~~~~~~~~~~~"
12312
msgstr ""
12313
12314
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12315
msgid "Introduced in: 0.16"
12316
msgstr ""
12317
12318
#: en/help_topics/hooks.txt:439
12319
msgid ""
12320
"Called by the bzr server when it starts serving a directory.\n"
12321
"server_started is called with (backing urls, public url), where\n"
12322
"backing_url is a list of URLs giving the server-specific directory\n"
12323
"locations, and public_url is the public URL for the directory being\n"
12324
"served."
12325
msgstr ""
12326
12327
#: en/help_topics/hooks.txt:445
12328
msgid ""
12329
"server_started_ex\n"
12330
"~~~~~~~~~~~~~~~~~"
12331
msgstr ""
12332
12333
#: en/help_topics/hooks.txt:450
12334
msgid ""
12335
"Called by the bzr server when it starts serving a directory.\n"
12336
"server_started is called with (backing_urls, server_obj)."
12337
msgstr ""
12338
12339
#: en/help_topics/hooks.txt:453
12340
msgid ""
12341
"server_stopped\n"
12342
"~~~~~~~~~~~~~~"
12343
msgstr ""
12344
12345
#: en/help_topics/hooks.txt:458
12346
msgid ""
12347
"Called by the bzr server when it stops serving a directory.\n"
12348
"server_stopped is called with the same parameters as the\n"
12349
"server_started hook: (backing_urls, public_url)."
12350
msgstr ""
12351
12352
#: en/help_topics/hooks.txt:462
12353
msgid ""
12354
"StatusHooks\n"
12355
"-----------"
12356
msgstr ""
12357
12358
#: en/help_topics/hooks.txt:465
12359
msgid ""
12360
"post_status\n"
12361
"~~~~~~~~~~~"
12362
msgstr ""
12363
12364
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
12365
msgid "Introduced in: 2.3"
12366
msgstr ""
12367
12368
#: en/help_topics/hooks.txt:470
12369
msgid ""
12370
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12371
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12372
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12373
"correspond to the command line options specified by the user for the\n"
12374
"status command. to_file is the output stream for writing."
12375
msgstr ""
12376
12377
#: en/help_topics/hooks.txt:476
12378
msgid ""
12379
"pre_status\n"
12380
"~~~~~~~~~~"
12381
msgstr ""
12382
12383
#: en/help_topics/hooks.txt:481
12384
msgid ""
12385
"Called with argument StatusHookParams before Bazaar displays the\n"
12386
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12387
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12388
"correspond to the command line options specified by the user for the\n"
12389
"status command. to_file is the output stream for writing."
12390
msgstr ""
12391
12392
#: en/help_topics/hooks.txt:487
12393
msgid ""
12394
"TransportHooks\n"
12395
"--------------"
12396
msgstr ""
12397
12398
#: en/help_topics/hooks.txt:490
12399
msgid ""
12400
"post_connect\n"
12401
"~~~~~~~~~~~~"
12402
msgstr ""
12403
12404
#: en/help_topics/hooks.txt:495
12405
msgid ""
12406
"Called after a new connection is established or a reconnect occurs.\n"
12407
"The sole argument passed is either the connected transport or smart\n"
12408
"medium instance."
12409
msgstr ""
12410
12411
#: en/help_topics/hooks.txt:499
12412
msgid ""
12413
"RioVersionInfoBuilderHooks\n"
12414
"--------------------------"
12415
msgstr ""
12416
12417
#: en/help_topics/hooks.txt:502
12418
msgid ""
12419
"revision\n"
12420
"~~~~~~~~"
12421
msgstr ""
12422
12423
#: en/help_topics/hooks.txt:507
12424
msgid ""
12425
"Invoked when adding information about a revision to the RIO stanza\n"
12426
"that is printed. revision is called with a revision object and a RIO\n"
12427
"stanza.\n"
12428
msgstr ""
12429
12430
#: en/help_topics/location-alias.txt:1
12431
msgid ""
12432
"Location aliases\n"
12433
"================"
12434
msgstr ""
12435
12436
#: en/help_topics/location-alias.txt:4
12437
msgid ""
12438
"Bazaar defines several aliases for locations associated with a branch. "
12439
"These\n"
12440
"can be used with most commands that expect a location, such as `bzr push`."
12441
msgstr ""
12442
12443
#: en/help_topics/location-alias.txt:7
12444
msgid "The aliases are::"
12445
msgstr ""
12446
12447
#: en/help_topics/location-alias.txt:9
12448
msgid ""
12449
" :bound The branch this branch is bound to, for bound branches.\n"
12450
" :parent The parent of this branch.\n"
12451
" :public The public location of this branch.\n"
12452
" :push The saved location used for `bzr push` with no arguments.\n"
12453
" :submit The submit branch for this branch.\n"
12454
" :this This branch."
12455
msgstr ""
12456
12457
#: en/help_topics/location-alias.txt:16
12458
msgid "For example, to push to the parent location::"
12459
msgstr ""
12460
12461
#: en/help_topics/location-alias.txt:18
12462
msgid " bzr push :parent\n"
12463
msgstr ""
12464
12465
#: en/help_topics/log-formats.txt:1
12466
msgid ""
12467
"Log Formats\n"
12468
"==========="
12469
msgstr ""
12470
12471
#: en/help_topics/log-formats.txt:4
12472
msgid ""
12473
"A log format controls how information about each revision is displayed.\n"
12474
"The standard log formats are compared below::"
12475
msgstr ""
12476
12477
#: en/help_topics/log-formats.txt:7
12478
msgid ""
12479
" Feature long short line\n"
12480
" ---------------------- ------------- ------------ -------------------\n"
12481
" design goal detailed view concise view 1 revision per line\n"
12482
" committer name+email name only name only\n"
12483
" author name+email - -\n"
12484
" date-time format full date only date only\n"
12485
" commit message full full top line\n"
12486
" tags yes yes yes\n"
12487
" merges indicator - yes -\n"
12488
" status/delta optional optional -\n"
12489
" diff/patch optional optional -\n"
12490
" revision-id optional optional -\n"
12491
" branch nick yes - -\n"
12492
" foreign vcs properties yes yes -\n"
12493
" preferred levels all 1 1\n"
12494
" digital signature optional - -"
12495
msgstr ""
12496
12497
#: en/help_topics/log-formats.txt:24
12498
msgid ""
12499
"The default format is ``long``. To change this, define the ``log_format``\n"
12500
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12501
msgstr ""
12502
12503
#: en/help_topics/log-formats.txt:27
12504
msgid ""
12505
" [DEFAULT]\n"
12506
" log_format = short"
12507
msgstr ""
12508
12509
#: en/help_topics/log-formats.txt:30
12510
msgid ""
12511
"Alternatively, to change the log format used for a given query, use the\n"
12512
"--long, --short or --line options."
12513
msgstr ""
12514
12515
#: en/help_topics/log-formats.txt:33
12516
msgid ""
12517
"If one of the standard log formats does not meet your needs, additional\n"
12518
"formats can be provided by plugins.\n"
12519
msgstr ""
12520
12521
#: en/help_topics/other-formats.txt:1
12522
msgid "Other Storage Formats"
12523
msgstr ""
12524
12525
#: en/help_topics/other-formats.txt:3
12526
msgid "Experimental formats are shown below."
12527
msgstr ""
12528
12529
#: en/help_topics/other-formats.txt:5
12530
msgid ""
12531
":development-colo:\n"
12532
" (native) The 2a format with experimental support for colocated\n"
12533
" branches."
12534
msgstr ""
12535
12536
#: en/help_topics/other-formats.txt:9
12537
msgid ""
12538
"\n"
12539
"Deprecated formats are shown below."
12540
msgstr ""
12541
12542
#: en/help_topics/other-formats.txt:12
12543
msgid ""
12544
":pack-0.92:\n"
12545
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12546
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12547
" by bzr < 0.92."
12548
msgstr ""
12549
12550
#: en/help_topics/patterns.txt:1
12551
msgid ""
12552
"Patterns\n"
12553
"========"
12554
msgstr ""
12555
12556
#: en/help_topics/patterns.txt:4
12557
msgid ""
12558
"Bazaar uses patterns to match files at various times. For example,\n"
12559
"the ``add`` command skips over files that match ignore patterns\n"
12560
"and preferences can be associated with files using rule patterns.\n"
12561
"The pattern syntax is described below."
12562
msgstr ""
12563
12564
#: en/help_topics/patterns.txt:9
12565
msgid ""
12566
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12567
"slash or is a regular expression, it is compared to the whole path\n"
12568
"from the branch root. Otherwise, it is compared to only the last\n"
12569
"component of the path. To match a file only in the root directory,\n"
12570
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12571
msgstr ""
12572
12573
#: en/help_topics/patterns.txt:15
12574
msgid "Patterns may include globbing wildcards such as::"
12575
msgstr ""
12576
12577
#: en/help_topics/patterns.txt:17
12578
msgid ""
12579
" ? - Matches any single character except '/'\n"
12580
" * - Matches 0 or more characters except '/'\n"
12581
" /**/ - Matches 0 or more directories in a path\n"
12582
" [a-z] - Matches a single character from within a group of characters"
12583
msgstr ""
12584
12585
#: en/help_topics/patterns.txt:22
12586
msgid ""
12587
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12588
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12589
"expression. Regular expression patterns may not include named or\n"
12590
"numbered groups."
12591
msgstr ""
12592
12593
#: en/help_topics/patterns.txt:27
12594
msgid ""
12595
"Case insensitive ignore patterns can be specified with regular expressions\n"
12596
"by using the ``i`` (for ignore case) flag in the pattern."
12597
msgstr ""
12598
12599
#: en/help_topics/patterns.txt:30
12600
msgid ""
12601
"For example, a case insensitive match for ``foo`` may be specified as::"
12602
msgstr ""
12603
12604
#: en/help_topics/patterns.txt:32
12605
msgid " RE:(?i)foo"
12606
msgstr ""
12607
12608
#: en/help_topics/patterns.txt:34
12609
msgid ""
12610
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12611
"matched by that pattern will not be ignored."
12612
msgstr ""
12613
12614
#: en/help_topics/patterns.txt:37
12615
msgid ""
12616
".. _Python regular expressions: http://docs.python.org/library/re.html"
12617
msgstr ""
12618
12619
#: en/help_topics/revisionspec.txt:1
12620
msgid "Revision Identifiers"
12621
msgstr ""
12622
12623
#: en/help_topics/revisionspec.txt:3
12624
msgid ""
12625
"A revision identifier refers to a specific state of a branch's history. It\n"
12626
"can be expressed in several ways. It can begin with a keyword to\n"
12627
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12628
"'before:yesterday' and 'submit:'."
12629
msgstr ""
12630
12631
#: en/help_topics/revisionspec.txt:8
12632
msgid ""
12633
"Alternately, it can be given without a keyword, in which case it will be\n"
12634
"checked as a revision number, a tag, a revision id, a date specification, or "
12635
"a\n"
12636
"branch specification, in that order. For example, 'date:today' could be\n"
12637
"written as simply 'today', though if you have a tag called 'today' that "
12638
"will\n"
12639
"be found first."
12640
msgstr ""
12641
12642
#: en/help_topics/revisionspec.txt:14
12643
msgid ""
12644
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12645
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12646
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12647
"or\n"
12648
"spaces around the '..')."
12649
msgstr ""
12650
12651
#: en/help_topics/revisionspec.txt:19
12652
msgid ""
12653
"Ranges are interpreted differently by different commands. To the \"log\" "
12654
"command,\n"
12655
"a range is a sequence of log messages, but to the \"diff\" command, the "
12656
"range\n"
12657
"denotes a change between revisions (and not a sequence of changes). In\n"
12658
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12659
"consider it\n"
12660
"to be open-ended, that is, they include one end but not the other. For "
12661
"example:\n"
12662
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12663
"3649,\n"
12664
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12665
"and\n"
12666
"3649, but not 3647."
12667
msgstr ""
12668
12669
#: en/help_topics/revisionspec.txt:28
12670
msgid "The keywords used as revision selection methods are the following:"
12671
msgstr ""
12672
12673
#: en/help_topics/revisionspec.txt:30
12674
msgid ""
12675
":revid:\n"
12676
"\tSelects a revision using the revision id.\n"
12677
":submit:\n"
12678
"\tSelects a common ancestor with the submit branch.\n"
12679
":ancestor:\n"
12680
"\tSelects a common ancestor with a second branch.\n"
12681
":date:\n"
12682
"\tSelects a revision on the basis of a datestamp.\n"
12683
":branch:\n"
12684
"\tSelects the last revision of a specified branch.\n"
12685
":tag:\n"
12686
"\tSelects a revision identified by a tag name.\n"
12687
":revno:\n"
12688
"\tSelects a revision using a number.\n"
12689
":before:\n"
12690
"\tSelects the parent of the revision specified.\n"
12691
":annotate:\n"
12692
"\tSelect the revision that last modified the specified line.\n"
12693
":mainline:\n"
12694
"\tSelect mainline revision that merged the specified revision.\n"
12695
":last:\n"
12696
"\tSelects the nth revision from the end."
12697
msgstr ""
12698
12699
#: en/help_topics/revisionspec.txt:53
12700
msgid "In addition, plugins can provide other keywords."
12701
msgstr ""
12702
12703
#: en/help_topics/revisionspec.txt:55
12704
msgid "A detailed description of each keyword is given below."
12705
msgstr ""
12706
12707
#: en/help_topics/revisionspec.txt:57
12708
msgid ":revid:"
12709
msgstr ""
12710
12711
#: en/help_topics/revisionspec.txt:59
12712
msgid ""
12713
" Supply a specific revision id, that can be used to specify any\n"
12714
" revision id in the ancestry of the branch.\n"
12715
" Including merges, and pending merges.\n"
12716
" Examples::"
12717
msgstr ""
12718
12719
#: en/help_topics/revisionspec.txt:64
12720
msgid ""
12721
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12722
msgstr ""
12723
12724
#: en/help_topics/revisionspec.txt:66
12725
msgid ":submit:"
12726
msgstr ""
12727
12728
#: en/help_topics/revisionspec.txt:68
12729
msgid ""
12730
" Diffing against this shows all the changes that were made in this "
12731
"branch,\n"
12732
" and is a good predictor of what merge will do. The submit branch is\n"
12733
" used by the bundle and merge directive commands. If no submit branch\n"
12734
" is specified, the parent branch is used instead."
12735
msgstr ""
12736
12737
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12738
msgid ""
12739
" The common ancestor is the last revision that existed in both\n"
12740
" branches. Usually this is the branch point, but it could also be\n"
12741
" a revision that was merged."
12742
msgstr ""
12743
12744
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12745
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12746
#: en/help_topics/revisionspec.txt:153
12747
msgid " Examples::"
12748
msgstr ""
12749
12750
#: en/help_topics/revisionspec.txt:79
12751
msgid " $ bzr diff -r submit:"
12752
msgstr ""
12753
12754
#: en/help_topics/revisionspec.txt:81
12755
msgid ":ancestor:"
12756
msgstr ""
12757
12758
#: en/help_topics/revisionspec.txt:83
12759
msgid " Supply the path to a branch to select the common ancestor."
12760
msgstr ""
12761
12762
#: en/help_topics/revisionspec.txt:89
12763
msgid ""
12764
" This is frequently used with 'diff' to return all of the changes\n"
12765
" that your branch introduces, while excluding the changes that you\n"
12766
" have not merged from the remote branch."
12767
msgstr ""
12768
12769
#: en/help_topics/revisionspec.txt:95
12770
msgid ""
12771
" ancestor:/path/to/branch\n"
12772
" $ bzr diff -r ancestor:../../mainline/branch"
12773
msgstr ""
12774
12775
#: en/help_topics/revisionspec.txt:98
12776
msgid ":date:"
12777
msgstr ""
12778
12779
#: en/help_topics/revisionspec.txt:100
12780
msgid ""
12781
" Supply a datestamp to select the first revision that matches the date.\n"
12782
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12783
" Matches the first entry after a given date (either at midnight or\n"
12784
" at a specified time)."
12785
msgstr ""
12786
12787
#: en/help_topics/revisionspec.txt:105
12788
msgid " One way to display all the changes since yesterday would be::"
12789
msgstr ""
12790
12791
#: en/help_topics/revisionspec.txt:107
12792
msgid " bzr log -r date:yesterday.."
12793
msgstr ""
12794
12795
#: en/help_topics/revisionspec.txt:111
12796
msgid ""
12797
" date:yesterday -> select the first revision since "
12798
"yesterday\n"
12799
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12800
" August 14th, 2006 at 5:10pm."
12801
msgstr ""
12802
12803
#: en/help_topics/revisionspec.txt:115
12804
msgid ":branch:"
12805
msgstr ""
12806
12807
#: en/help_topics/revisionspec.txt:117
12808
msgid " Supply the path to a branch to select its last revision."
12809
msgstr ""
12810
12811
#: en/help_topics/revisionspec.txt:121
12812
msgid " branch:/path/to/branch"
12813
msgstr ""
12814
12815
#: en/help_topics/revisionspec.txt:123
12816
msgid ":tag:"
12817
msgstr ""
12818
12819
#: en/help_topics/revisionspec.txt:125
12820
msgid " Tags are stored in the branch and created by the 'tag' command."
12821
msgstr ""
12822
12823
#: en/help_topics/revisionspec.txt:127
12824
msgid ":revno:"
12825
msgstr ""
12826
12827
#: en/help_topics/revisionspec.txt:129
12828
msgid ""
12829
" Use an integer to specify a revision in the history of the branch.\n"
12830
" Optionally a branch can be specified. A negative number will count\n"
12831
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12832
" one). If the negative number is larger than the branch's history, the\n"
12833
" first revision is returned.\n"
12834
" Examples::"
12835
msgstr ""
12836
12837
#: en/help_topics/revisionspec.txt:136
12838
msgid ""
12839
" revno:1 -> return the first revision of this branch\n"
12840
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12841
" the branch '/path/to/branch'\n"
12842
" revno:-1 -> The last revision in a branch.\n"
12843
" -2:http://other/branch -> The second to last revision in the\n"
12844
" remote branch.\n"
12845
" -1000000 -> Most likely the first revision, unless\n"
12846
" your history is very long."
12847
msgstr ""
12848
12849
#: en/help_topics/revisionspec.txt:145
12850
msgid ":before:"
12851
msgstr ""
12852
12853
#: en/help_topics/revisionspec.txt:147
12854
msgid ""
12855
" Supply any revision spec to return the parent of that revision. This "
12856
"is\n"
12857
" mostly useful when inspecting revisions that are not in the revision "
12858
"history\n"
12859
" of a branch."
12860
msgstr ""
12861
12862
#: en/help_topics/revisionspec.txt:151
12863
msgid ""
12864
" It is an error to request the parent of the null revision (before:0)."
12865
msgstr ""
12866
12867
#: en/help_topics/revisionspec.txt:155
12868
msgid ""
12869
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12870
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12871
" aaaa@bbbb-1234567890\n"
12872
" bzr diff -r before:1913..1913\n"
12873
" -> Find the changes between revision 1913 and its parent "
12874
"(1912).\n"
12875
" (What changes did revision 1913 introduce).\n"
12876
" This is equivalent to: bzr diff -c 1913"
12877
msgstr ""
12878
12879
#: en/help_topics/revisionspec.txt:163
12880
msgid ":annotate:"
12881
msgstr ""
12882
12883
#: en/help_topics/revisionspec.txt:165
12884
msgid ""
12885
" Select the revision that last modified the specified line. Line is\n"
12886
" specified as path:number. Path is a relative path to the file. "
12887
"Numbers\n"
12888
" start at 1, and are relative to the current version, not the last-\n"
12889
" committed version of the file."
12890
msgstr ""
12891
12892
#: en/help_topics/revisionspec.txt:170
12893
msgid ":mainline:"
12894
msgstr ""
12895
12896
#: en/help_topics/revisionspec.txt:172
12897
msgid ""
12898
" Select the revision that merged the specified revision into mainline."
12899
msgstr ""
12900
12901
#: en/help_topics/revisionspec.txt:174
12902
msgid ":last:"
12903
msgstr ""
12904
12905
#: en/help_topics/revisionspec.txt:176
12906
msgid ""
12907
" Supply a positive number to get the nth revision from the end.\n"
12908
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12909
" Examples::"
12910
msgstr ""
12911
12912
#: en/help_topics/revisionspec.txt:180
12913
msgid ""
12914
" last:1 -> return the last revision\n"
12915
" last:3 -> return the revision 2 before the end.\n"
12916
msgstr ""
12917
12918
#: en/help_topics/rules.txt:1
12919
msgid ""
12920
"Rules\n"
12921
"====="
12922
msgstr ""
12923
12924
#: en/help_topics/rules.txt:7
12925
msgid ""
12926
"Rules are defined in ini file format where the sections are file glob\n"
12927
"patterns and the contents of each section are the preferences for files\n"
12928
"matching that pattern(s). For example::"
12929
msgstr ""
12930
12931
#: en/help_topics/rules.txt:11
12932
msgid ""
12933
" [name *.bat]\n"
12934
" eol = native"
12935
msgstr ""
12936
12937
#: en/help_topics/rules.txt:14
12938
msgid ""
12939
" [name *.html *.xml]\n"
12940
" keywords = xml_escape"
12941
msgstr ""
12942
12943
#: en/help_topics/rules.txt:17
12944
msgid ""
12945
"Preferences like these are useful for commands and plugins wishing to\n"
12946
"provide custom behaviour for selected files. For more information on \n"
12947
"end of line conversion see :doc:`eol-help`.\n"
12948
"Keyword support is provided by the `keywords plugin\n"
12949
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
12950
msgstr ""
12951
12952
#: en/help_topics/rules.txt:23
12953
msgid ""
12954
"Files\n"
12955
"-----"
12956
msgstr ""
12957
12958
#: en/help_topics/rules.txt:26
12959
msgid ""
12960
"Default rules for all branches are defined in the optional file\n"
12961
"``BZR_HOME/rules``. "
12962
msgstr ""
12963
12964
#: en/help_topics/rules.txt:29
12965
msgid ""
12966
"Rule Patterns\n"
12967
"-------------"
12968
msgstr ""
12969
12970
#: en/help_topics/rules.txt:32
12971
msgid ""
12972
"Patterns are ordered and searching stops as soon as one matches.\n"
12973
"As a consequence, more explicit patterns should be placed towards\n"
12974
"the top of the file. Rule patterns use exactly the same conventions\n"
12975
"as ignore patterns. See :doc:`patterns-help` for details."
12976
msgstr ""
12977
12978
#: en/help_topics/rules.txt:37
12979
msgid ".. note::"
12980
msgstr ""
12981
12982
#: en/help_topics/rules.txt:39
12983
msgid ""
12984
" Patterns containing square brackets or spaces should be\n"
12985
" surrounded in quotes to ensure they are correctly parsed.\n"
12986
msgstr ""
12987
12988
#: en/help_topics/topics.txt:1
12989
msgid ""
12990
"authentication Information on configuring authentication\n"
12991
"basic Basic commands\n"
12992
"branches Information on what a branch is\n"
12993
"bugs Bug tracker settings\n"
12994
"checkouts Information on what a checkout is\n"
12995
"commands Basic help for all commands\n"
12996
"configuration Details on the configuration settings available\n"
12997
"conflict-types Types of conflicts and what to do about them\n"
12998
"content-filters Conversion of content into/from working trees\n"
12999
"criss-cross Information on criss-cross merging\n"
13000
"current-formats Current storage formats\n"
13001
"debug-flags Options to show or record debug information\n"
13002
"diverged-branches How to fix diverged branches\n"
13003
"env-variables Environment variable names and values\n"
13004
"eol Information on end-of-line handling\n"
13005
"files Information on configuration and log files\n"
13006
"formats Information on choosing a storage format\n"
13007
"global-options Options that control how Bazaar runs\n"
13008
"hidden-commands All hidden commands\n"
13009
"hooks Points at which custom processing can be added\n"
13010
"launchpad Using Bazaar with Launchpad.net\n"
13011
"location-alias Aliases for remembered locations\n"
13012
"log-formats Details on the logging formats available\n"
13013
"other-formats Experimental and deprecated storage formats\n"
13014
"patterns Information on the pattern syntax\n"
13015
"repositories Basic information on shared repositories.\n"
13016
"revisionspec Explain how to use --revision\n"
13017
"rules Information on defining rule-based preferences\n"
13018
"standalone-trees Information on what a standalone tree is\n"
13019
"standard-options Options that can be used with any command\n"
13020
"status-flags Help on status flags\n"
13021
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13022
"topics Topics list\n"
13023
"url-special-chars Special character handling in URLs\n"
13024
"urlspec Supported transport protocols\n"
13025
"working-trees Information on working trees\n"
13026
msgstr ""
13027
13028
#: en/help_topics/url-special-chars.txt:1
13029
msgid ""
13030
"Special character handling in URLs\n"
13031
"=================================="
13032
msgstr ""
13033
13034
#: en/help_topics/url-special-chars.txt:4
13035
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13036
msgstr ""
13037
13038
#: en/help_topics/url-special-chars.txt:6
13039
msgid " * Fully qualified URLs"
13040
msgstr ""
13041
13042
#: en/help_topics/url-special-chars.txt:8
13043
msgid " * File system paths, relative or absolute"
13044
msgstr ""
13045
13046
#: en/help_topics/url-special-chars.txt:10
13047
msgid ""
13048
"Internally bzr treats all locations as URLs. For any file system paths\n"
13049
"that are specified it will automatically determine the appropriate URL\n"
13050
"representation, and escape special characters where necessary."
13051
msgstr ""
13052
13053
#: en/help_topics/url-special-chars.txt:14
13054
msgid ""
13055
"There are a few characters which have special meaning in URLs and need "
13056
"careful\n"
13057
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13058
"value in URLs. Any non-ASCII characters in a file path will automatically "
13059
"be\n"
13060
"urlencoded when the path is converted to a URL."
13061
msgstr ""
13062
13063
#: en/help_topics/url-special-chars.txt:19
13064
msgid ""
13065
"URLs represent non-ASCII characters in an encoding defined by the server, "
13066
"but\n"
13067
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13068
"be\n"
13069
"generous in what it accepts as a URL and to print them in a way that\n"
13070
"will be readable."
13071
msgstr ""
13072
13073
#: en/help_topics/url-special-chars.txt:24
13074
msgid ""
13075
"For example, if you have a directory named '/tmp/%2False' these are all "
13076
"valid\n"
13077
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13078
"slash)::"
13079
msgstr ""
13080
13081
#: en/help_topics/url-special-chars.txt:27
13082
msgid ""
13083
" cd /tmp\n"
13084
" bzr log /tmp/%2False\n"
13085
" bzr log %2False\n"
13086
" bzr log file:///tmp/%252False\n"
13087
" bzr log file://localhost/tmp/%252False\n"
13088
" bzr log file:%252False"
13089
msgstr ""
13090
13091
#: en/help_topics/url-special-chars.txt:34
13092
msgid "These are valid but do not refer to the same file::"
13093
msgstr ""
13094
13095
#: en/help_topics/url-special-chars.txt:36
13096
msgid ""
13097
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13098
" bzr log %252False (refers to a file called /tmp/%252False)"
13099
msgstr ""
13100
13101
#: en/help_topics/url-special-chars.txt:39
13102
msgid ""
13103
"Comma also has special meaning in URLs, because it denotes `segment "
13104
"parameters`_"
13105
msgstr ""
13106
13107
#: en/help_topics/url-special-chars.txt:41
13108
msgid ""
13109
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13110
msgstr ""
13111
13112
#: en/help_topics/url-special-chars.txt:43
13113
msgid ""
13114
"Comma is also special in any file system paths that are specified. To use a "
13115
"literal\n"
13116
"comma in a file system path, specify a URL and URL encode the comma::"
13117
msgstr ""
13118
13119
#: en/help_topics/url-special-chars.txt:46
13120
msgid ""
13121
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13122
"\"branch\" set to \"bla\"\n"
13123
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13124
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13125
"\"branch\" set to \"bla\"\n"
13126
msgstr ""
13127
13128
#: en/help_topics/urlspec.txt:1
13129
msgid "URL Identifiers"
13130
msgstr ""
13131
13132
#: en/help_topics/urlspec.txt:3
13133
msgid "Supported URL prefixes::"
13134
msgstr ""
13135
13136
#: en/help_topics/urlspec.txt:5
13137
msgid ""
13138
" aftp:// Access using active FTP.\n"
13139
" bzr:// Fast access using the Bazaar smart server.\n"
13140
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13141
" file:// Access using the standard filesystem (default)\n"
13142
" ftp:// Access using passive FTP.\n"
13143
" http:// Read-only access of branches exported on the web.\n"
13144
" https:// Read-only access of branches exported on the web using "
13145
"SSL.\n"
13146
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13147
msgstr ""
13148
13149
#: en/help_topics/urlspec.txt:14
13150
msgid "Supported modifiers::"
13151
msgstr ""
13152
13153
#: en/help_topics/urlspec.txt:16
13154
msgid " gio+ Access using any GIO supported protocols."
13155
msgstr ""
13156
13157
#: en/help_topics/urlspec.txt:18
13158
msgid "Bazaar supports all of the standard parts within the URL::"
13159
msgstr ""
13160
13161
#: en/help_topics/urlspec.txt:20
13162
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13163
msgstr ""
13164
13165
#: en/help_topics/urlspec.txt:22
13166
msgid "allowing URLs such as::"
13167
msgstr ""
13168
13169
#: en/help_topics/urlspec.txt:24
13170
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13171
msgstr ""
13172
13173
#: en/help_topics/urlspec.txt:26
13174
msgid ""
13175
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13176
"with '~' as meaning that the rest of the path should be interpreted\n"
13177
"relative to the remote user's home directory. For example if the user\n"
13178
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13179
"shell.example.com, then::"
13180
msgstr ""
13181
13182
#: en/help_topics/urlspec.txt:32
13183
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13184
msgstr ""
13185
13186
#: en/help_topics/urlspec.txt:34
13187
msgid "would refer to ``/home/remote/myproject/trunk``."
13188
msgstr ""
13189
13190
#: en/help_topics/urlspec.txt:36
13191
msgid ""
13192
"Many commands that accept URLs also accept location aliases too.\n"
13193
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13194
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1