« back to all changes in this revision
Viewing changes to po/sco.po
- browse files at revision 6425
- compare with another revision
- download diff
- download tarball
- view history from revision 6425
- Committer: Patch Queue Manager
- Date: 2012-01-05 10:39:49 UTC
- mfrom: (6404.5.9 store-save-changes)
- Revision ID: pqm@pqm.ubuntu.com-20120105103949-xxe5dkbfiu16q4ch
(vila) Provide Store.save_changes() to allow configuration store to be saved
incrementally. (Vincent Ladeuil)
incrementally. (Vincent Ladeuil)
- files added:
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files removed:
- bzrlib/tests/test_https_urllib.py
- files modified:
- bzr
added
removed
po/sco.po
1
# Scots 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: Scots <sco@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:17+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
"This report on versioned and unkent files, reporting them\n"
78
"grouped by state. Possible states are:"
79
80
#: bzrlib/builtins.py:220
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
86
#: bzrlib/builtins.py:223
87
msgid ""
88
"removed\n"
89
" Versioned in the previous revision but removed or deleted\n"
90
" in the working copy."
91
msgstr ""
92
93
#: bzrlib/builtins.py:227
94
msgid ""
95
"renamed\n"
96
" Path of this file changed from the previous revision;\n"
97
" the text may also have changed. This includes files whose\n"
98
" parent directory was renamed."
99
msgstr ""
100
101
#: bzrlib/builtins.py:232
102
msgid ""
103
"modified\n"
104
" Text has changed since the previous revision."
105
msgstr ""
106
107
#: bzrlib/builtins.py:235
108
msgid ""
109
"kind changed\n"
110
" File kind has been changed (e.g. from file to directory)."
111
msgstr ""
112
113
#: bzrlib/builtins.py:238
114
msgid ""
115
"unknown\n"
116
" Not versioned and not matching an ignore pattern."
117
msgstr ""
118
119
#: bzrlib/builtins.py:241
120
msgid ""
121
"Additionally for directories, symlinks and files with a changed\n"
122
"executable bit, Bazaar indicates their type using a trailing\n"
123
"character: '/', '@' or '*' respectively. These decorations can be\n"
124
"disabled using the '--no-classify' option."
125
msgstr ""
126
127
#: bzrlib/builtins.py:246
128
msgid ""
129
"To see ignored files use 'bzr ignored'. For details on the\n"
130
"changes to file texts, use 'bzr diff'."
131
msgstr ""
132
133
#: bzrlib/builtins.py:249
134
msgid ""
135
"Note that --short or -S gives status flags for each item, similar\n"
136
"to Subversion's status command. To get output similar to svn -q,\n"
137
"use bzr status -SV."
138
msgstr ""
139
140
#: bzrlib/builtins.py:253
141
msgid ""
142
"If no arguments are specified, the status of the entire working\n"
143
"directory is shown. Otherwise, only the status of the specified\n"
144
"files or directories is reported. If a directory is given, status\n"
145
"is reported for everything inside that directory."
146
msgstr ""
147
148
#: bzrlib/builtins.py:258
149
msgid ""
150
"Before merges are committed, the pending merge tip revisions are\n"
151
"shown. To see all pending merge revisions, use the -v option.\n"
152
"To skip the display of pending merge information altogether, use\n"
153
"the no-pending option or specify a file/directory."
154
msgstr ""
155
156
#: bzrlib/builtins.py:263
157
msgid ""
158
"To compare the working directory to a specific revision, pass a\n"
159
"single revision to the revision argument."
160
msgstr ""
161
162
#: bzrlib/builtins.py:266
163
msgid ""
164
"To see which files have changed in a specific revision, or between\n"
165
"two revisions, pass a revision range to the revision argument.\n"
166
"This will produce the same results as calling 'bzr diff --summarize'."
167
msgstr ""
168
169
#: bzrlib/builtins.py:275
170
msgid "Use short status indicators."
171
msgstr ""
172
173
#: bzrlib/builtins.py:277
174
msgid "Only show versioned files."
175
msgstr ""
176
177
#: bzrlib/builtins.py:279
178
msgid "Don't show pending merges."
179
msgstr ""
180
181
#: bzrlib/builtins.py:282
182
msgid "Do not mark object type using indicator."
183
msgstr ""
184
185
#: bzrlib/builtins.py:297
186
msgid "bzr status --revision takes exactly one or two revision specifiers"
187
msgstr ""
188
189
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
190
msgid "You can only supply one of revision_id or --revision"
191
msgstr ""
192
193
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
194
msgid "You must supply either --revision or a revision_id"
195
msgstr ""
196
197
#: bzrlib/builtins.py:351
198
#, python-format
199
msgid "Repository %r does not support access to raw revision texts"
200
msgstr ""
201
202
#: bzrlib/builtins.py:362
203
msgid "The repository {0} contains no revision {1}."
204
msgstr ""
205
206
#: bzrlib/builtins.py:369
207
msgid "You cannot specify a NULL revision."
208
msgstr ""
209
210
#: bzrlib/builtins.py:461
211
msgid "Remove the working tree from a given branch/checkout."
212
msgstr "Remove the working tree frae a gien branch/checkoot."
213
214
#: bzrlib/builtins.py:463
215
msgid ""
216
"Since a lightweight checkout is little more than a working tree\n"
217
"this will refuse to run against one."
218
msgstr ""
219
220
#: bzrlib/builtins.py:466
221
msgid "To re-create the working tree, use \"bzr checkout\"."
222
msgstr ""
223
224
#: bzrlib/builtins.py:472
225
msgid ""
226
"Remove the working tree even if it has uncommitted or shelved changes."
227
msgstr ""
228
229
#: bzrlib/builtins.py:486
230
msgid "No working tree to remove"
231
msgstr ""
232
233
#: bzrlib/builtins.py:488
234
msgid "You cannot remove the working tree of a remote path"
235
msgstr ""
236
237
#: bzrlib/builtins.py:497
238
msgid "You cannot remove the working tree from a lightweight checkout"
239
msgstr ""
240
241
#: bzrlib/builtins.py:537
242
msgid ""
243
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
244
"instead. Use \"--force\" if you are sure you want to reset the working tree."
245
msgstr ""
246
247
#: bzrlib/builtins.py:548
248
msgid ""
249
", the header appears corrupt, try passing -r -1 to set the state to the last "
250
"commit"
251
msgstr ""
252
253
#: bzrlib/builtins.py:552
254
msgid "failed to reset the tree state{0}"
255
msgstr ""
256
257
#: bzrlib/builtins.py:556
258
msgid "Show current revision number."
259
msgstr ""
260
261
#: bzrlib/builtins.py:558
262
msgid "This is equal to the number of revisions on this branch."
263
msgstr ""
264
265
#: bzrlib/builtins.py:571
266
msgid "--tree and --revision can not be used together"
267
msgstr ""
268
269
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
270
msgid "Tags can only be placed on a single revision, not on a range"
271
msgstr ""
272
273
#: bzrlib/builtins.py:612
274
msgid "Show revno of working tree."
275
msgstr ""
276
277
#: bzrlib/builtins.py:660
278
msgid "Add specified files or directories."
279
msgstr ""
280
281
#: bzrlib/builtins.py:662
282
msgid ""
283
"In non-recursive mode, all the named items are added, regardless\n"
284
"of whether they were previously ignored. A warning is given if\n"
285
"any of the named files are already versioned."
286
msgstr ""
287
288
#: bzrlib/builtins.py:666
289
msgid ""
290
"In recursive mode (the default), files are treated the same way\n"
291
"but the behaviour for directories is different. Directories that\n"
292
"are already versioned do not give a warning. All directories,\n"
293
"whether already versioned or not, are searched for files or\n"
294
"subdirectories that are neither versioned or ignored, and these\n"
295
"are added. This search proceeds recursively into versioned\n"
296
"directories. If no names are given '.' is assumed."
297
msgstr ""
298
299
#: bzrlib/builtins.py:674
300
msgid ""
301
"A warning will be printed when nested trees are encountered,\n"
302
"unless they are explicitly ignored."
303
msgstr ""
304
305
#: bzrlib/builtins.py:677
306
msgid ""
307
"Therefore simply saying 'bzr add' will version all files that\n"
308
"are currently unknown."
309
msgstr ""
310
311
#: bzrlib/builtins.py:680
312
msgid ""
313
"Adding a file whose parent directory is not versioned will\n"
314
"implicitly add the parent, and so on up to the root. This means\n"
315
"you should never need to explicitly add a directory, they'll just\n"
316
"get added when you add a file in the directory."
317
msgstr ""
318
319
#: bzrlib/builtins.py:685
320
msgid ""
321
"--dry-run will show which files would be added, but not actually\n"
322
"add them."
323
msgstr ""
324
325
#: bzrlib/builtins.py:688
326
msgid ""
327
"--file-ids-from will try to use the file ids from the supplied path.\n"
328
"It looks up ids trying to find a matching parent directory with the\n"
329
"same filename, and then by pure path. This option is rarely needed\n"
330
"but can be useful when adding the same logical file into two\n"
331
"branches that will be merged later (without showing the two different\n"
332
"adds as a conflict). It is also useful when merging another project\n"
333
"into a subdirectory of this one."
334
msgstr ""
335
336
#: bzrlib/builtins.py:696
337
msgid ""
338
"Any files matching patterns in the ignore list will not be added\n"
339
"unless they are explicitly mentioned."
340
msgstr ""
341
342
#: bzrlib/builtins.py:699
343
msgid ""
344
"In recursive mode, files larger than the configuration option \n"
345
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
346
"to file size."
347
msgstr ""
348
349
#: bzrlib/builtins.py:706
350
msgid "Don't recursively add the contents of directories."
351
msgstr ""
352
353
#: bzrlib/builtins.py:712
354
msgid "Lookup file ids from this tree."
355
msgstr ""
356
357
#: bzrlib/builtins.py:748
358
msgid "ignored {0} matching \"{1}\"\n"
359
msgstr ""
360
361
#: bzrlib/builtins.py:753
362
msgid "Create a new versioned directory."
363
msgstr ""
364
365
#: bzrlib/builtins.py:755
366
msgid "This is equivalent to creating the directory and then adding it."
367
msgstr ""
368
369
#: bzrlib/builtins.py:762
370
msgid "No error if existing, make parent directories as needed."
371
msgstr ""
372
373
#: bzrlib/builtins.py:796
374
#, python-format
375
msgid "added %s\n"
376
msgstr ""
377
378
#: bzrlib/builtins.py:838
379
#, python-format
380
msgid "invalid kind %r specified"
381
msgstr ""
382
383
#: bzrlib/builtins.py:875
384
msgid "Move or rename a file."
385
msgstr ""
386
387
#: bzrlib/builtins.py:877
388
msgid " bzr mv SOURCE... DESTINATION"
389
msgstr ""
390
391
#: bzrlib/builtins.py:879
392
msgid ""
393
"If the last argument is a versioned directory, all the other names\n"
394
"are moved into it. Otherwise, there must be exactly two arguments\n"
395
"and the file is changed to a new name."
396
msgstr ""
397
398
#: bzrlib/builtins.py:883
399
msgid ""
400
"If OLDNAME does not exist on the filesystem but is versioned and\n"
401
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
402
"assumes that the file has been manually moved and only updates\n"
403
"its internal inventory to reflect that change.\n"
404
"The same is valid when moving many SOURCE files to a DESTINATION."
405
msgstr ""
406
407
#: bzrlib/builtins.py:889
408
msgid "Files cannot be moved between branches."
409
msgstr ""
410
411
#: bzrlib/builtins.py:896
412
msgid ""
413
"Move only the bzr identifier of the file, because the file has already been "
414
"moved."
415
msgstr ""
416
417
#: bzrlib/builtins.py:898
418
msgid "Automatically guess renames."
419
msgstr ""
420
421
#: bzrlib/builtins.py:899
422
msgid "Avoid making changes when guessing renames."
423
msgstr ""
424
425
#: bzrlib/builtins.py:908
426
msgid "--dry-run requires --auto."
427
msgstr ""
428
429
#: bzrlib/builtins.py:912
430
msgid "missing file argument"
431
msgstr ""
432
433
#: bzrlib/builtins.py:916
434
msgid "can not move root of branch"
435
msgstr ""
436
437
#: bzrlib/builtins.py:922
438
msgid "Only one path may be specified to --auto."
439
msgstr ""
440
441
#: bzrlib/builtins.py:925
442
msgid "--after cannot be specified with --auto."
443
msgstr ""
444
445
#: bzrlib/builtins.py:962
446
msgid "to mv multiple files the destination must be a versioned directory"
447
msgstr ""
448
449
#: bzrlib/builtins.py:1014
450
msgid "Turn this branch into a mirror of another branch."
451
msgstr ""
452
453
#: bzrlib/builtins.py:1016
454
msgid ""
455
"By default, this command only works on branches that have not diverged.\n"
456
"Branches are considered diverged if the destination branch's most recent \n"
457
"commit is one that has not been merged (directly or indirectly) into the \n"
458
"parent."
459
msgstr ""
460
461
#: bzrlib/builtins.py:1021
462
msgid ""
463
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
464
"from one into the other. Once one branch has merged, the other should\n"
465
"be able to pull it again."
466
msgstr ""
467
468
#: bzrlib/builtins.py:1025
469
msgid ""
470
"If you want to replace your local changes and just want your branch to\n"
471
"match the remote one, use pull --overwrite. This will work even if the two\n"
472
"branches have diverged."
473
msgstr ""
474
475
#: bzrlib/builtins.py:1029
476
msgid ""
477
"If there is no default location set, the first pull will set it (use\n"
478
"--no-remember to avoid setting it). After that, you can omit the\n"
479
"location to use the default. To change the default, use --remember. The\n"
480
"value will only be saved if the remote location can be accessed."
481
msgstr ""
482
483
#: bzrlib/builtins.py:1034
484
msgid ""
485
"The --verbose option will display the revisions pulled using the log_format\n"
486
"configuration option. You can use a different format by overriding it with\n"
487
"-Olog_format=<other_format>."
488
msgstr ""
489
490
#: bzrlib/builtins.py:1038
491
msgid ""
492
"Note: The location can be specified either in the form of a branch,\n"
493
"or in the form of a path to a file containing a merge directive generated\n"
494
"with bzr send."
495
msgstr ""
496
497
#: bzrlib/builtins.py:1046
498
msgid "Show logs of pulled revisions."
499
msgstr ""
500
501
#: bzrlib/builtins.py:1048
502
msgid ""
503
"Branch to pull into, rather than the one containing the working directory."
504
msgstr ""
505
506
#: bzrlib/builtins.py:1051
507
msgid ""
508
"Perform a local pull in a bound branch. Local pulls are not applied to the "
509
"master branch."
510
msgstr ""
511
512
#: bzrlib/builtins.py:1080
513
msgid "Need working tree for --show-base."
514
msgstr ""
515
516
#: bzrlib/builtins.py:1096
517
msgid "No pull location known or specified."
518
msgstr ""
519
520
#: bzrlib/builtins.py:1102
521
#, python-format
522
msgid "Using saved parent location: %s\n"
523
msgstr ""
524
525
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
526
msgid "Cannot use -r with merge directives or bundles"
527
msgstr ""
528
529
#: bzrlib/builtins.py:1150
530
msgid "Update a mirror of this branch."
531
msgstr ""
532
533
#: bzrlib/builtins.py:1152
534
msgid ""
535
"The target branch will not have its working tree populated because this\n"
536
"is both expensive, and is not supported on remote file systems."
537
msgstr ""
538
539
#: bzrlib/builtins.py:1155
540
msgid ""
541
"Some smart servers or protocols *may* put the working tree in place in\n"
542
"the future."
543
msgstr ""
544
545
#: bzrlib/builtins.py:1158
546
msgid ""
547
"This command only works on branches that have not diverged. Branches are\n"
548
"considered diverged if the destination branch's most recent commit is one\n"
549
"that has not been merged (directly or indirectly) by the source branch."
550
msgstr ""
551
552
#: bzrlib/builtins.py:1162
553
msgid ""
554
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
555
"the other branch completely, discarding its unmerged changes."
556
msgstr ""
557
558
#: bzrlib/builtins.py:1165
559
msgid ""
560
"If you want to ensure you have the different changes in the other branch,\n"
561
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
562
"After that you will be able to do a push without '--overwrite'."
563
msgstr ""
564
565
#: bzrlib/builtins.py:1169
566
msgid ""
567
"If there is no default push location set, the first push will set it (use\n"
568
"--no-remember to avoid setting it). After that, you can omit the\n"
569
"location to use the default. To change the default, use --remember. The\n"
570
"value will only be saved if the remote location can be accessed."
571
msgstr ""
572
573
#: bzrlib/builtins.py:1174
574
msgid ""
575
"The --verbose option will display the revisions pushed using the log_format\n"
576
"configuration option. You can use a different format by overriding it with\n"
577
"-Olog_format=<other_format>."
578
msgstr ""
579
580
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
581
msgid ""
582
"Branch to push from, rather than the one containing the working directory."
583
msgstr ""
584
585
#: bzrlib/builtins.py:1188
586
msgid ""
587
"By default push will fail if the target directory exists, but does not "
588
"already have a control directory. This flag will allow push to proceed."
589
msgstr ""
590
591
#: bzrlib/builtins.py:1193
592
msgid ""
593
"Create a stacked branch that references the public location of the parent "
594
"branch."
595
msgstr ""
596
597
#: bzrlib/builtins.py:1196
598
msgid ""
599
"Create a stacked branch that refers to another branch for the commit "
600
"history. Only the work not present in the referenced branch is included in "
601
"the branch created."
602
msgstr ""
603
604
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
605
msgid ""
606
"Refuse to push if there are uncommitted changes in the working tree, --no-"
607
"strict disables the check."
608
msgstr ""
609
610
#: bzrlib/builtins.py:1204
611
msgid "Don't populate the working tree, even for protocols that support it."
612
msgstr ""
613
614
#: bzrlib/builtins.py:1248
615
msgid "Could not determine branch to refer to."
616
msgstr ""
617
618
#: bzrlib/builtins.py:1257
619
#, python-format
620
msgid ""
621
"No push location known or specified. To push to the parent branch (at %s), "
622
"use 'bzr push :parent'."
623
msgstr ""
624
625
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
626
msgid "No push location known or specified."
627
msgstr ""
628
629
#: bzrlib/builtins.py:1267
630
#, python-format
631
msgid "Using saved push location: %s"
632
msgstr ""
633
634
#: bzrlib/builtins.py:1277
635
msgid "Create a new branch that is a copy of an existing branch."
636
msgstr ""
637
638
#: bzrlib/builtins.py:1279
639
msgid ""
640
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
641
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
642
"./bar.\n"
643
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
644
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
645
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
646
"create ./foo-bar."
647
msgstr ""
648
649
#: bzrlib/builtins.py:1286
650
msgid ""
651
"To retrieve the branch as of a particular revision, supply the --revision\n"
652
"parameter, as in \"branch foo/bar -r 5\"."
653
msgstr ""
654
655
#: bzrlib/builtins.py:1289
656
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
657
msgstr ""
658
659
#: bzrlib/builtins.py:1299
660
msgid "Create a branch without a working-tree."
661
msgstr ""
662
663
#: bzrlib/builtins.py:1301
664
msgid "Switch the checkout in the current directory to the new branch."
665
msgstr ""
666
667
#: bzrlib/builtins.py:1304
668
msgid ""
669
"Create a stacked branch referring to the source branch. The new branch will "
670
"depend on the availability of the source branch for all operations."
671
msgstr ""
672
673
#: bzrlib/builtins.py:1308
674
msgid "Do not use a shared repository, even if available."
675
msgstr ""
676
677
#: bzrlib/builtins.py:1310
678
msgid ""
679
"By default branch will fail if the target directory exists, but does not "
680
"already have a control directory. This flag will allow branch to proceed."
681
msgstr ""
682
683
#: bzrlib/builtins.py:1315
684
msgid "Bind new branch to from location."
685
msgstr ""
686
687
#: bzrlib/builtins.py:1362
688
#, python-format
689
msgid "Target directory \"%s\" already exists."
690
msgstr ""
691
692
#: bzrlib/builtins.py:1374
693
#, python-format
694
msgid "Parent of \"%s\" does not exist."
695
msgstr ""
696
697
#: bzrlib/builtins.py:1393
698
msgid "The branch {0} has no revision {1}."
699
msgstr ""
700
701
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
702
#, python-format
703
msgid "Created new stacked branch referring to %s."
704
msgstr ""
705
706
#: bzrlib/builtins.py:1407
707
#, python-format
708
msgid "Branched %d revision."
709
msgid_plural "Branched %d revisions."
710
msgstr[0] ""
711
msgstr[1] ""
712
713
#: bzrlib/builtins.py:1412
714
#, python-format
715
msgid "New branch bound to %s"
716
msgstr ""
717
718
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
719
#, python-format
720
msgid "Switched to branch: %s"
721
msgstr ""
722
723
#: bzrlib/builtins.py:1422
724
msgid "List the branches available at the current location."
725
msgstr ""
726
727
#: bzrlib/builtins.py:1424
728
msgid ""
729
"This command will print the names of all the branches at the current\n"
730
"location."
731
msgstr ""
732
733
#: bzrlib/builtins.py:1431
734
msgid ""
735
"Recursively scan for branches rather than just looking in the specified "
736
"location."
737
msgstr ""
738
739
#: bzrlib/builtins.py:1461
740
msgid "(default)"
741
msgstr ""
742
743
#: bzrlib/builtins.py:1473
744
msgid "Create a new checkout of an existing branch."
745
msgstr ""
746
747
#: bzrlib/builtins.py:1475
748
msgid ""
749
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
750
"for\n"
751
"the branch found in '.'. This is useful if you have removed the working "
752
"tree\n"
753
"or if it was never created - i.e. if you pushed the branch to its current\n"
754
"location using SFTP."
755
msgstr ""
756
757
#: bzrlib/builtins.py:1480
758
msgid ""
759
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
760
"will\n"
761
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
762
"./bar.\n"
763
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
764
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
765
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
766
"create ./foo-bar."
767
msgstr ""
768
769
#: bzrlib/builtins.py:1487
770
msgid ""
771
"To retrieve the branch as of a particular revision, supply the --revision\n"
772
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
773
"immediately\n"
774
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
775
"old\n"
776
"code.)"
777
msgstr ""
778
779
#: bzrlib/builtins.py:1497
780
msgid ""
781
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
782
"the branch for every operation. Normal checkouts can perform common "
783
"operations like diff and status without such access, and also support local "
784
"commits."
785
msgstr ""
786
787
#: bzrlib/builtins.py:1504
788
msgid "Get file contents from this tree."
789
msgstr ""
790
791
#: bzrlib/builtins.py:1506
792
msgid "Hard-link working tree files where possible."
793
msgstr ""
794
795
#: bzrlib/builtins.py:1547
796
msgid ""
797
"Show list of renamed files.\n"
798
" "
799
msgstr ""
800
801
#: bzrlib/builtins.py:1577
802
msgid "Update a working tree to a new revision."
803
msgstr ""
804
805
#: bzrlib/builtins.py:1579
806
msgid ""
807
"This will perform a merge of the destination revision (the tip of the\n"
808
"branch, or the specified revision) into the working tree, and then make\n"
809
"that revision the basis revision for the working tree. "
810
msgstr ""
811
812
#: bzrlib/builtins.py:1583
813
msgid ""
814
"You can use this to visit an older revision, or to update a working tree\n"
815
"that is out of date from its branch."
816
msgstr ""
817
818
#: bzrlib/builtins.py:1586
819
msgid ""
820
"If there are any uncommitted changes in the tree, they will be carried\n"
821
"across and remain as uncommitted changes after the update. To discard\n"
822
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
823
"with the changes brought in by the change in basis revision."
824
msgstr ""
825
826
#: bzrlib/builtins.py:1591
827
msgid ""
828
"If the tree's branch is bound to a master branch, bzr will also update\n"
829
"the branch from the master."
830
msgstr ""
831
832
#: bzrlib/builtins.py:1594
833
msgid ""
834
"You cannot update just a single file or directory, because each Bazaar\n"
835
"working tree has just a single basis revision. If you want to restore a\n"
836
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
837
"update'. If you want to restore a file to its state in a previous\n"
838
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
839
"out the old content of that file to a new location."
840
msgstr ""
841
842
#: bzrlib/builtins.py:1601
843
msgid ""
844
"The 'dir' argument, if given, must be the location of the root of a\n"
845
"working tree to update. By default, the working tree that contains the \n"
846
"current working directory is used."
847
msgstr ""
848
849
#: bzrlib/builtins.py:1617
850
msgid "bzr update --revision takes exactly one revision"
851
msgstr ""
852
853
#: bzrlib/builtins.py:1625
854
msgid "bzr update can only update a whole tree, not a file or subdirectory"
855
msgstr ""
856
857
#: bzrlib/builtins.py:1656
858
msgid "Tree is up to date at revision {0} of branch {1}"
859
msgstr ""
860
861
#: bzrlib/builtins.py:1672
862
#, python-format
863
msgid ""
864
"branch has no revision %s\n"
865
"bzr update --revision only works for a revision in the branch history"
866
msgstr ""
867
868
#: bzrlib/builtins.py:1678
869
msgid "Updated to revision {0} of branch {1}"
870
msgstr ""
871
872
#: bzrlib/builtins.py:1682
873
msgid ""
874
"Your local commits will now show as pending merges with 'bzr status', and "
875
"can be committed with 'bzr commit'."
876
msgstr ""
877
878
#: bzrlib/builtins.py:1691
879
msgid "Show information about a working tree, branch or repository."
880
msgstr ""
881
882
#: bzrlib/builtins.py:1693
883
msgid ""
884
"This command will show all known locations and formats associated to the\n"
885
"tree, branch or repository."
886
msgstr ""
887
888
#: bzrlib/builtins.py:1696
889
msgid ""
890
"In verbose mode, statistical information is included with each report.\n"
891
"To see extended statistic information, use a verbosity level of 2 or\n"
892
"higher by specifying the verbose option multiple times, e.g. -vv."
893
msgstr ""
894
895
#: bzrlib/builtins.py:1700
896
msgid "Branches and working trees will also report any missing revisions."
897
msgstr ""
898
899
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
900
#: bzrlib/builtins.py:6389
901
msgid ":Examples:"
902
msgstr ""
903
904
#: bzrlib/builtins.py:1704
905
msgid " Display information on the format and related locations:"
906
msgstr ""
907
908
#: bzrlib/builtins.py:1706
909
msgid " bzr info"
910
msgstr ""
911
912
#: bzrlib/builtins.py:1708
913
msgid ""
914
" Display the above together with extended format information and\n"
915
" basic statistics (like the number of files in the working tree and\n"
916
" number of revisions in the branch and repository):"
917
msgstr ""
918
919
#: bzrlib/builtins.py:1712
920
msgid " bzr info -v"
921
msgstr ""
922
923
#: bzrlib/builtins.py:1714
924
msgid " Display the above together with number of committers to the branch:"
925
msgstr ""
926
927
#: bzrlib/builtins.py:1716
928
msgid " bzr info -vv"
929
msgstr ""
930
931
#: bzrlib/builtins.py:1735
932
msgid "Remove files or directories."
933
msgstr ""
934
935
#: bzrlib/builtins.py:1737
936
msgid ""
937
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
938
"delete them if they can easily be recovered using revert otherwise they\n"
939
"will be backed up (adding an extention of the form .~#~). If no options or\n"
940
"parameters are given Bazaar will scan for files that are being tracked by\n"
941
"Bazaar but missing in your tree and stop tracking them for you."
942
msgstr ""
943
944
#: bzrlib/builtins.py:1745
945
msgid "Only remove files that have never been committed."
946
msgstr ""
947
948
#: bzrlib/builtins.py:1747
949
msgid "The file deletion mode to be used."
950
msgstr ""
951
952
#: bzrlib/builtins.py:1748
953
msgid "Deletion Strategy"
954
msgstr ""
955
956
#: bzrlib/builtins.py:1749
957
msgid "Backup changed files (default)."
958
msgstr ""
959
960
#: bzrlib/builtins.py:1750
961
msgid "Delete from bzr but leave the working copy."
962
msgstr ""
963
964
#: bzrlib/builtins.py:1751
965
msgid "Don't backup changed files."
966
msgstr ""
967
968
#: bzrlib/builtins.py:1752
969
msgid ""
970
"Delete all the specified files, even if they can not be recovered and even "
971
"if they are non-empty directories. (deprecated, use no-backup)"
972
msgstr ""
973
974
#: bzrlib/builtins.py:1761
975
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
976
msgstr ""
977
978
#: bzrlib/builtins.py:1778
979
msgid "No matching files."
980
msgstr ""
981
982
#: bzrlib/builtins.py:1839
983
msgid "Reconcile bzr metadata in a branch."
984
msgstr ""
985
986
#: bzrlib/builtins.py:1841
987
msgid ""
988
"This can correct data mismatches that may have been caused by\n"
989
"previous ghost operations or bzr upgrades. You should only\n"
990
"need to run this command if 'bzr check' or a bzr developer\n"
991
"advises you to run it."
992
msgstr ""
993
994
#: bzrlib/builtins.py:1846
995
msgid ""
996
"If a second branch is provided, cross-branch reconciliation is\n"
997
"also attempted, which will check that data like the tree root\n"
998
"id which was not present in very early bzr versions is represented\n"
999
"correctly in both branches."
1000
msgstr ""
1001
1002
#: bzrlib/builtins.py:1851
1003
msgid ""
1004
"At the same time it is run it may recompress data resulting in\n"
1005
"a potential saving in disk space or performance gain."
1006
msgstr ""
1007
1008
#: bzrlib/builtins.py:1854
1009
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1010
msgstr ""
1011
1012
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1013
msgid ""
1014
"Format for the bzr 2.0 series.\n"
1015
"Uses group-compress storage.\n"
1016
"Provides rich roots which are a one-way transition.\n"
1017
msgstr ""
1018
1019
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1020
msgid ""
1021
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1022
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1023
msgstr ""
1024
1025
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1026
msgid "The 2a format with experimental support for colocated branches.\n"
1027
msgstr ""
1028
1029
#: bzrlib/builtins.py:1922
1030
msgid "Make a directory into a versioned branch."
1031
msgstr ""
1032
1033
#: bzrlib/builtins.py:1924
1034
msgid ""
1035
"Use this to create an empty branch, or before importing an\n"
1036
"existing project."
1037
msgstr ""
1038
1039
#: bzrlib/builtins.py:1927
1040
msgid ""
1041
"If there is a repository in a parent directory of the location, then\n"
1042
"the history of the branch will be stored in the repository. Otherwise\n"
1043
"init creates a standalone branch which carries its own history\n"
1044
"in the .bzr directory."
1045
msgstr ""
1046
1047
#: bzrlib/builtins.py:1932
1048
msgid ""
1049
"If there is already a branch at the location but it has no working tree,\n"
1050
"the tree can be populated with 'bzr checkout'."
1051
msgstr ""
1052
1053
#: bzrlib/builtins.py:1935
1054
msgid "Recipe for importing a tree of files::"
1055
msgstr ""
1056
1057
#: bzrlib/builtins.py:1937
1058
msgid ""
1059
" cd ~/project\n"
1060
" bzr init\n"
1061
" bzr add .\n"
1062
" bzr status\n"
1063
" bzr commit -m \"imported project\""
1064
msgstr ""
1065
1066
#: bzrlib/builtins.py:1948
1067
msgid ""
1068
"Create the path leading up to the branch if it does not already exist."
1069
msgstr ""
1070
1071
#: bzrlib/builtins.py:1951
1072
msgid "Specify a format for this branch. See \"help formats\"."
1073
msgstr ""
1074
1075
#: bzrlib/builtins.py:1959
1076
msgid ""
1077
"Never change revnos or the existing log. Append revisions to it only."
1078
msgstr ""
1079
1080
#: bzrlib/builtins.py:1962
1081
msgid "Create a branch without a working tree."
1082
msgstr ""
1083
1084
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1085
#, python-format
1086
msgid ""
1087
"Parent directory of %s does not exist.\n"
1088
"You may supply --create-prefix to create all leading parent directories."
1089
msgstr ""
1090
1091
#: bzrlib/builtins.py:2016
1092
msgid ""
1093
"This branch format cannot be set to append-revisions-only. Try --default."
1094
msgstr ""
1095
1096
#: bzrlib/builtins.py:2027
1097
msgid "Created a {0} (format: {1})\n"
1098
msgstr ""
1099
1100
#: bzrlib/builtins.py:2036
1101
#, python-format
1102
msgid "Using shared repository: %s\n"
1103
msgstr ""
1104
1105
#: bzrlib/builtins.py:2040
1106
msgid "Create a shared repository for branches to share storage space."
1107
msgstr ""
1108
1109
#: bzrlib/builtins.py:2042
1110
msgid ""
1111
"New branches created under the repository directory will store their\n"
1112
"revisions in the repository, not in the branch directory. For branches\n"
1113
"with shared history, this reduces the amount of storage needed and \n"
1114
"speeds up the creation of new branches."
1115
msgstr ""
1116
1117
#: bzrlib/builtins.py:2047
1118
msgid ""
1119
"If the --no-trees option is given then the branches in the repository\n"
1120
"will not have working trees by default. They will still exist as \n"
1121
"directories on disk, but they will not have separate copies of the \n"
1122
"files at a certain revision. This can be useful for repositories that\n"
1123
"store branches which are interacted with through checkouts or remote\n"
1124
"branches, such as on a server."
1125
msgstr ""
1126
1127
#: bzrlib/builtins.py:2054
1128
msgid ""
1129
":Examples:\n"
1130
" Create a shared repository holding just branches::"
1131
msgstr ""
1132
1133
#: bzrlib/builtins.py:2057
1134
msgid ""
1135
" bzr init-repo --no-trees repo\n"
1136
" bzr init repo/trunk"
1137
msgstr ""
1138
1139
#: bzrlib/builtins.py:2060
1140
msgid " Make a lightweight checkout elsewhere::"
1141
msgstr ""
1142
1143
#: bzrlib/builtins.py:2062
1144
msgid ""
1145
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1146
" cd trunk-checkout\n"
1147
" (add files here)"
1148
msgstr ""
1149
1150
#: bzrlib/builtins.py:2070
1151
msgid ""
1152
"Specify a format for this repository. See \"bzr help formats\" for details."
1153
msgstr ""
1154
1155
#: bzrlib/builtins.py:2074
1156
msgid "Repository format"
1157
msgstr ""
1158
1159
#: bzrlib/builtins.py:2076
1160
msgid "Branches in the repository will default to not having a working tree."
1161
msgstr ""
1162
1163
#: bzrlib/builtins.py:2102
1164
msgid "Show differences in the working tree, between revisions or branches."
1165
msgstr ""
1166
1167
#: bzrlib/builtins.py:2104
1168
msgid ""
1169
"If no arguments are given, all changes for the current tree are listed.\n"
1170
"If files are given, only the changes in those files are listed.\n"
1171
"Remote and multiple branches can be compared by using the --old and\n"
1172
"--new options. If not provided, the default for both is derived from\n"
1173
"the first argument, if any, or the current tree if no arguments are\n"
1174
"given."
1175
msgstr ""
1176
1177
#: bzrlib/builtins.py:2111
1178
msgid ""
1179
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1180
"produces patches suitable for \"patch -p1\"."
1181
msgstr ""
1182
1183
#: bzrlib/builtins.py:2114
1184
msgid ""
1185
"Note that when using the -r argument with a range of revisions, the\n"
1186
"differences are computed between the two specified revisions. That\n"
1187
"is, the command does not show the changes introduced by the first \n"
1188
"revision in the range. This differs from the interpretation of \n"
1189
"revision ranges used by \"bzr log\" which includes the first revision\n"
1190
"in the range."
1191
msgstr ""
1192
1193
#: bzrlib/builtins.py:2121
1194
msgid ""
1195
":Exit values:\n"
1196
" 1 - changed\n"
1197
" 2 - unrepresentable changes\n"
1198
" 3 - error\n"
1199
" 0 - no change"
1200
msgstr ""
1201
1202
#: bzrlib/builtins.py:2127
1203
msgid ""
1204
":Examples:\n"
1205
" Shows the difference in the working tree versus the last commit::"
1206
msgstr ""
1207
1208
#: bzrlib/builtins.py:2130
1209
msgid " bzr diff"
1210
msgstr ""
1211
1212
#: bzrlib/builtins.py:2132
1213
msgid " Difference between the working tree and revision 1::"
1214
msgstr ""
1215
1216
#: bzrlib/builtins.py:2134
1217
msgid " bzr diff -r1"
1218
msgstr ""
1219
1220
#: bzrlib/builtins.py:2136
1221
msgid " Difference between revision 3 and revision 1::"
1222
msgstr ""
1223
1224
#: bzrlib/builtins.py:2138
1225
msgid " bzr diff -r1..3"
1226
msgstr ""
1227
1228
#: bzrlib/builtins.py:2140
1229
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1230
msgstr ""
1231
1232
#: bzrlib/builtins.py:2142
1233
msgid " bzr diff -r1..3 xxx"
1234
msgstr ""
1235
1236
#: bzrlib/builtins.py:2144
1237
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1238
msgstr ""
1239
1240
#: bzrlib/builtins.py:2146
1241
msgid " bzr diff -c2"
1242
msgstr ""
1243
1244
#: bzrlib/builtins.py:2148
1245
msgid ""
1246
" To see the changes introduced by revision X::\n"
1247
" \n"
1248
" bzr diff -cX"
1249
msgstr ""
1250
1251
#: bzrlib/builtins.py:2152
1252
msgid ""
1253
" Note that in the case of a merge, the -c option shows the changes\n"
1254
" compared to the left hand parent. To see the changes against\n"
1255
" another parent, use::"
1256
msgstr ""
1257
1258
#: bzrlib/builtins.py:2156
1259
msgid " bzr diff -r<chosen_parent>..X"
1260
msgstr ""
1261
1262
#: bzrlib/builtins.py:2158
1263
msgid ""
1264
" The changes between the current revision and the previous revision\n"
1265
" (equivalent to -c-1 and -r-2..-1)"
1266
msgstr ""
1267
1268
#: bzrlib/builtins.py:2161
1269
msgid " bzr diff -r-2.."
1270
msgstr ""
1271
1272
#: bzrlib/builtins.py:2163
1273
msgid " Show just the differences for file NEWS::"
1274
msgstr ""
1275
1276
#: bzrlib/builtins.py:2165
1277
msgid " bzr diff NEWS"
1278
msgstr ""
1279
1280
#: bzrlib/builtins.py:2167
1281
msgid " Show the differences in working tree xxx for file NEWS::"
1282
msgstr ""
1283
1284
#: bzrlib/builtins.py:2169
1285
msgid " bzr diff xxx/NEWS"
1286
msgstr ""
1287
1288
#: bzrlib/builtins.py:2171
1289
msgid " Show the differences from branch xxx to this working tree:"
1290
msgstr ""
1291
1292
#: bzrlib/builtins.py:2173
1293
msgid " bzr diff --old xxx"
1294
msgstr ""
1295
1296
#: bzrlib/builtins.py:2175
1297
msgid " Show the differences between two branches for file NEWS::"
1298
msgstr ""
1299
1300
#: bzrlib/builtins.py:2177
1301
msgid " bzr diff --old xxx --new yyy NEWS"
1302
msgstr ""
1303
1304
#: bzrlib/builtins.py:2179
1305
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1306
msgstr ""
1307
1308
#: bzrlib/builtins.py:2181
1309
msgid ""
1310
" bzr diff --prefix old/:new/\n"
1311
" \n"
1312
" Show the differences using a custom diff program with options::\n"
1313
" \n"
1314
" bzr diff --using /usr/bin/diff --diff-options -wu"
1315
msgstr ""
1316
1317
#: bzrlib/builtins.py:2191
1318
msgid "Pass these options to the external diff program."
1319
msgstr ""
1320
1321
#: bzrlib/builtins.py:2194
1322
msgid ""
1323
"Set prefixes added to old and new filenames, as two values separated by a "
1324
"colon. (eg \"old/:new/\")."
1325
msgstr ""
1326
1327
#: bzrlib/builtins.py:2197
1328
msgid "Branch/tree to compare from."
1329
msgstr ""
1330
1331
#: bzrlib/builtins.py:2201
1332
msgid "Branch/tree to compare to."
1333
msgstr ""
1334
1335
#: bzrlib/builtins.py:2207
1336
msgid "Use this command to compare files."
1337
msgstr ""
1338
1339
#: bzrlib/builtins.py:2212
1340
msgid "Diff format to use."
1341
msgstr ""
1342
1343
#: bzrlib/builtins.py:2214
1344
msgid "Diff format"
1345
msgstr ""
1346
1347
#: bzrlib/builtins.py:2236
1348
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1349
msgstr ""
1350
1351
#: bzrlib/builtins.py:2240
1352
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1353
msgstr ""
1354
1355
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1356
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1357
msgid "{0} and {1} are mutually exclusive"
1358
msgstr ""
1359
1360
#: bzrlib/builtins.py:2265
1361
msgid ""
1362
"List files deleted in the working tree.\n"
1363
" "
1364
msgstr ""
1365
1366
#: bzrlib/builtins.py:2343
1367
msgid "Show the tree root directory."
1368
msgstr ""
1369
1370
#: bzrlib/builtins.py:2345
1371
msgid ""
1372
"The root is the nearest enclosing directory with a .bzr control\n"
1373
"directory."
1374
msgstr ""
1375
1376
#: bzrlib/builtins.py:2360
1377
msgid "The limit argument must be an integer."
1378
msgstr ""
1379
1380
#: bzrlib/builtins.py:2368
1381
msgid "The levels argument must be an integer."
1382
msgstr ""
1383
1384
#: bzrlib/builtins.py:2373
1385
msgid "Show historical log for a branch or subset of a branch."
1386
msgstr ""
1387
1388
#: bzrlib/builtins.py:2375
1389
msgid ""
1390
"log is bzr's default tool for exploring the history of a branch.\n"
1391
"The branch to use is taken from the first parameter. If no parameters\n"
1392
"are given, the branch containing the working directory is logged.\n"
1393
"Here are some simple examples::"
1394
msgstr ""
1395
1396
#: bzrlib/builtins.py:2380
1397
msgid ""
1398
" bzr log log the current branch\n"
1399
" bzr log foo.py log a file in its branch\n"
1400
" bzr log http://server/branch log a branch on a server"
1401
msgstr ""
1402
1403
#: bzrlib/builtins.py:2384
1404
msgid ""
1405
"The filtering, ordering and information shown for each revision can\n"
1406
"be controlled as explained below. By default, all revisions are\n"
1407
"shown sorted (topologically) so that newer revisions appear before\n"
1408
"older ones and descendants always appear before ancestors. If displayed,\n"
1409
"merged revisions are shown indented under the revision in which they\n"
1410
"were merged."
1411
msgstr ""
1412
1413
#: bzrlib/builtins.py:2391
1414
msgid ":Output control:"
1415
msgstr ""
1416
1417
#: bzrlib/builtins.py:2393
1418
msgid ""
1419
" The log format controls how information about each revision is\n"
1420
" displayed. The standard log formats are called ``long``, ``short``\n"
1421
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1422
" for more details on log formats."
1423
msgstr ""
1424
1425
#: bzrlib/builtins.py:2398
1426
msgid ""
1427
" The following options can be used to control what information is\n"
1428
" displayed::"
1429
msgstr ""
1430
1431
#: bzrlib/builtins.py:2401
1432
msgid ""
1433
" -l N display a maximum of N revisions\n"
1434
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1435
" -v display a status summary (delta) for each revision\n"
1436
" -p display a diff (patch) for each revision\n"
1437
" --show-ids display revision-ids (and file-ids), not just revnos"
1438
msgstr ""
1439
1440
#: bzrlib/builtins.py:2407
1441
msgid ""
1442
" Note that the default number of levels to display is a function of the\n"
1443
" log format. If the -n option is not used, the standard log formats show\n"
1444
" just the top level (mainline)."
1445
msgstr ""
1446
1447
#: bzrlib/builtins.py:2411
1448
msgid ""
1449
" Status summaries are shown using status flags like A, M, etc. To see\n"
1450
" the changes explained using words like ``added`` and ``modified``\n"
1451
" instead, use the -vv option."
1452
msgstr ""
1453
1454
#: bzrlib/builtins.py:2415
1455
msgid ":Ordering control:"
1456
msgstr ""
1457
1458
#: bzrlib/builtins.py:2417
1459
msgid ""
1460
" To display revisions from oldest to newest, use the --forward option.\n"
1461
" In most cases, using this option will have little impact on the total\n"
1462
" time taken to produce a log, though --forward does not incrementally\n"
1463
" display revisions like --reverse does when it can."
1464
msgstr ""
1465
1466
#: bzrlib/builtins.py:2422
1467
msgid ":Revision filtering:"
1468
msgstr ""
1469
1470
#: bzrlib/builtins.py:2424
1471
msgid ""
1472
" The -r option can be used to specify what revision or range of revisions\n"
1473
" to filter against. The various forms are shown below::"
1474
msgstr ""
1475
1476
#: bzrlib/builtins.py:2427
1477
msgid ""
1478
" -rX display revision X\n"
1479
" -rX.. display revision X and later\n"
1480
" -r..Y display up to and including revision Y\n"
1481
" -rX..Y display from X to Y inclusive"
1482
msgstr ""
1483
1484
#: bzrlib/builtins.py:2432
1485
msgid ""
1486
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1487
" Some common examples are given below::"
1488
msgstr ""
1489
1490
#: bzrlib/builtins.py:2435
1491
msgid ""
1492
" -r-1 show just the tip\n"
1493
" -r-10.. show the last 10 mainline revisions\n"
1494
" -rsubmit:.. show what's new on this branch\n"
1495
" -rancestor:path.. show changes since the common ancestor of this\n"
1496
" branch and the one at location path\n"
1497
" -rdate:yesterday.. show changes since yesterday"
1498
msgstr ""
1499
1500
#: bzrlib/builtins.py:2442
1501
msgid ""
1502
" When logging a range of revisions using -rX..Y, log starts at\n"
1503
" revision Y and searches back in history through the primary\n"
1504
" (\"left-hand\") parents until it finds X. When logging just the\n"
1505
" top level (using -n1), an error is reported if X is not found\n"
1506
" along the way. If multi-level logging is used (-n0), X may be\n"
1507
" a nested merge revision and the log will be truncated accordingly."
1508
msgstr ""
1509
1510
#: bzrlib/builtins.py:2449
1511
msgid ":Path filtering:"
1512
msgstr ""
1513
1514
#: bzrlib/builtins.py:2451
1515
msgid ""
1516
" If parameters are given and the first one is not a branch, the log\n"
1517
" will be filtered to show only those revisions that changed the\n"
1518
" nominated files or directories."
1519
msgstr ""
1520
1521
#: bzrlib/builtins.py:2455
1522
msgid ""
1523
" Filenames are interpreted within their historical context. To log a\n"
1524
" deleted file, specify a revision range so that the file existed at\n"
1525
" the end or start of the range."
1526
msgstr ""
1527
1528
#: bzrlib/builtins.py:2459
1529
msgid ""
1530
" Historical context is also important when interpreting pathnames of\n"
1531
" renamed files/directories. Consider the following example:"
1532
msgstr ""
1533
1534
#: bzrlib/builtins.py:2462
1535
msgid ""
1536
" * revision 1: add tutorial.txt\n"
1537
" * revision 2: modify tutorial.txt\n"
1538
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1539
msgstr ""
1540
1541
#: bzrlib/builtins.py:2466
1542
msgid " In this case:"
1543
msgstr ""
1544
1545
#: bzrlib/builtins.py:2468
1546
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1547
msgstr ""
1548
1549
#: bzrlib/builtins.py:2470
1550
msgid ""
1551
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1552
msgstr ""
1553
1554
#: bzrlib/builtins.py:2472
1555
msgid ""
1556
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1557
" the original file in revision 2."
1558
msgstr ""
1559
1560
#: bzrlib/builtins.py:2475
1561
msgid ""
1562
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1563
" was no file called guide.txt in revision 2."
1564
msgstr ""
1565
1566
#: bzrlib/builtins.py:2478
1567
msgid ""
1568
" Renames are always followed by log. By design, there is no need to\n"
1569
" explicitly ask for this (and no way to stop logging a file back\n"
1570
" until it was last renamed)."
1571
msgstr ""
1572
1573
#: bzrlib/builtins.py:2482
1574
msgid ":Other filtering:"
1575
msgstr ""
1576
1577
#: bzrlib/builtins.py:2484
1578
msgid ""
1579
" The --match option can be used for finding revisions that match a\n"
1580
" regular expression in a commit message, committer, author or bug.\n"
1581
" Specifying the option several times will match any of the supplied\n"
1582
" expressions. --match-author, --match-bugs, --match-committer and\n"
1583
" --match-message can be used to only match a specific field."
1584
msgstr ""
1585
1586
#: bzrlib/builtins.py:2490
1587
msgid ":Tips & tricks:"
1588
msgstr ""
1589
1590
#: bzrlib/builtins.py:2492
1591
msgid ""
1592
" GUI tools and IDEs are often better at exploring history than command\n"
1593
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1594
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1595
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1596
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1597
msgstr ""
1598
1599
#: bzrlib/builtins.py:2498
1600
msgid ""
1601
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1602
msgstr ""
1603
1604
#: bzrlib/builtins.py:2500
1605
msgid ""
1606
" [ALIASES]\n"
1607
" tip = log -r-1\n"
1608
" top = log -l10 --line\n"
1609
" show = log -v -p"
1610
msgstr ""
1611
1612
#: bzrlib/builtins.py:2505
1613
msgid ""
1614
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1615
" will show the last 10 mainline revisions. To see the details of a\n"
1616
" particular revision X, ``bzr show -rX``."
1617
msgstr ""
1618
1619
#: bzrlib/builtins.py:2509
1620
msgid ""
1621
" If you are interested in looking deeper into a particular merge X,\n"
1622
" use ``bzr log -n0 -rX``."
1623
msgstr ""
1624
1625
#: bzrlib/builtins.py:2512
1626
msgid ""
1627
" ``bzr log -v`` on a branch with lots of history is currently\n"
1628
" very slow. A fix for this issue is currently under development.\n"
1629
" With or without that fix, it is recommended that a revision range\n"
1630
" be given when using the -v option."
1631
msgstr ""
1632
1633
#: bzrlib/builtins.py:2517
1634
msgid ""
1635
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1636
" used to find revisions matching user names, commit messages, etc.\n"
1637
" Among other features, this plugin can find all revisions containing\n"
1638
" a list of words but not others."
1639
msgstr ""
1640
1641
#: bzrlib/builtins.py:2522
1642
msgid ""
1643
" When exploring non-mainline history on large projects with deep\n"
1644
" history, the performance of log can be greatly improved by installing\n"
1645
" the historycache plugin. This plugin buffers historical information\n"
1646
" trading disk space for faster speed."
1647
msgstr ""
1648
1649
#: bzrlib/builtins.py:2531
1650
msgid "Show from oldest to newest."
1651
msgstr ""
1652
1653
#: bzrlib/builtins.py:2534
1654
msgid "Show files changed in each revision."
1655
msgstr ""
1656
1657
#: bzrlib/builtins.py:2540
1658
msgid "Show just the specified revision. See also \"help revisionspec\"."
1659
msgstr ""
1660
1661
#: bzrlib/builtins.py:2544
1662
msgid "What names to list as authors - first, all or committer."
1663
msgstr ""
1664
1665
#: bzrlib/builtins.py:2545
1666
msgid "Authors"
1667
msgstr ""
1668
1669
#: bzrlib/builtins.py:2550
1670
msgid "Number of levels to display - 0 for all, 1 for flat."
1671
msgstr ""
1672
1673
#: bzrlib/builtins.py:2560
1674
msgid "Limit the output to the first N revisions."
1675
msgstr ""
1676
1677
#: bzrlib/builtins.py:2565
1678
msgid "Show changes made in each revision as a patch."
1679
msgstr ""
1680
1681
#: bzrlib/builtins.py:2567
1682
msgid "Show merged revisions like --levels 0 does."
1683
msgstr ""
1684
1685
#: bzrlib/builtins.py:2571
1686
msgid "Do not report commits with more than one parent."
1687
msgstr ""
1688
1689
#: bzrlib/builtins.py:2573
1690
msgid ""
1691
"Display only the revisions that are not part of both ancestries (require -"
1692
"rX..Y)."
1693
msgstr ""
1694
1695
#: bzrlib/builtins.py:2577
1696
msgid "Show digital signature validity."
1697
msgstr ""
1698
1699
#: bzrlib/builtins.py:2580
1700
msgid "Show revisions whose properties match this expression."
1701
msgstr ""
1702
1703
#: bzrlib/builtins.py:2584
1704
msgid "Show revisions whose message matches this expression."
1705
msgstr ""
1706
1707
#: bzrlib/builtins.py:2588
1708
msgid "Show revisions whose committer matches this expression."
1709
msgstr ""
1710
1711
#: bzrlib/builtins.py:2592
1712
msgid "Show revisions whose authors match this expression."
1713
msgstr ""
1714
1715
#: bzrlib/builtins.py:2596
1716
msgid "Show revisions whose bugs match this expression."
1717
msgstr ""
1718
1719
#: bzrlib/builtins.py:2650
1720
msgid "--exclude-common-ancestry requires -r with two revisions"
1721
msgstr ""
1722
1723
#: bzrlib/builtins.py:2678
1724
#, python-format
1725
msgid "Path unknown at end or start of revision range: %s"
1726
msgstr ""
1727
1728
#: bzrlib/builtins.py:2795
1729
#, python-format
1730
msgid "bzr %s doesn't accept two revisions in different branches."
1731
msgstr ""
1732
1733
#: bzrlib/builtins.py:2811
1734
#, python-format
1735
msgid "bzr %s --revision takes one or two values."
1736
msgstr ""
1737
1738
#: bzrlib/builtins.py:2856
1739
msgid ""
1740
"List files in a tree.\n"
1741
" "
1742
msgstr ""
1743
1744
#: bzrlib/builtins.py:2865
1745
msgid "Recurse into subdirectories."
1746
msgstr ""
1747
1748
#: bzrlib/builtins.py:2867
1749
msgid "Print paths relative to the root of the branch."
1750
msgstr ""
1751
1752
#: bzrlib/builtins.py:2869
1753
msgid "Print unknown files."
1754
msgstr ""
1755
1756
#: bzrlib/builtins.py:2870
1757
msgid "Print versioned files."
1758
msgstr ""
1759
1760
#: bzrlib/builtins.py:2873
1761
msgid "Print ignored files."
1762
msgstr ""
1763
1764
#: bzrlib/builtins.py:2875
1765
msgid "List entries of a particular kind: file, directory, symlink."
1766
msgstr ""
1767
1768
#: bzrlib/builtins.py:2888
1769
msgid "invalid kind specified"
1770
msgstr ""
1771
1772
#: bzrlib/builtins.py:2891
1773
msgid "Cannot set both --verbose and --null"
1774
msgstr ""
1775
1776
#: bzrlib/builtins.py:2900
1777
msgid "cannot specify both --from-root and PATH"
1778
msgstr ""
1779
1780
#: bzrlib/builtins.py:2987
1781
msgid "Ignore specified files or patterns."
1782
msgstr ""
1783
1784
#: bzrlib/builtins.py:2989
1785
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1786
msgstr ""
1787
1788
#: bzrlib/builtins.py:2991
1789
msgid ""
1790
"If a .bzrignore file does not exist, the ignore command\n"
1791
"will create one and add the specified files or patterns to the newly\n"
1792
"created file. The ignore command will also automatically add the \n"
1793
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1794
"the use of the ignore command will require an explicit add command."
1795
msgstr ""
1796
1797
#: bzrlib/builtins.py:2997
1798
msgid ""
1799
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1800
"After adding, editing or deleting that file either indirectly by\n"
1801
"using this command or directly by using an editor, be sure to commit\n"
1802
"it."
1803
msgstr ""
1804
1805
#: bzrlib/builtins.py:3002
1806
msgid ""
1807
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1808
"the global ignore file can be found in the application data directory as\n"
1809
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1810
"Global ignores are not touched by this command. The global ignore file\n"
1811
"can be edited directly using an editor."
1812
msgstr ""
1813
1814
#: bzrlib/builtins.py:3008
1815
msgid ""
1816
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1817
"precedence over regular ignores. Such exceptions are used to specify\n"
1818
"files that should be versioned which would otherwise be ignored."
1819
msgstr ""
1820
1821
#: bzrlib/builtins.py:3012
1822
msgid ""
1823
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1824
"precedence over the '!' exception patterns."
1825
msgstr ""
1826
1827
#: bzrlib/builtins.py:3015
1828
msgid ""
1829
":Notes: \n"
1830
" \n"
1831
"* Ignore patterns containing shell wildcards must be quoted from\n"
1832
" the shell on Unix."
1833
msgstr ""
1834
1835
#: bzrlib/builtins.py:3020
1836
msgid ""
1837
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1838
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1839
msgstr ""
1840
1841
#: bzrlib/builtins.py:3023
1842
msgid ""
1843
":Examples:\n"
1844
" Ignore the top level Makefile::"
1845
msgstr ""
1846
1847
#: bzrlib/builtins.py:3026
1848
msgid " bzr ignore ./Makefile"
1849
msgstr ""
1850
1851
#: bzrlib/builtins.py:3028
1852
msgid " Ignore .class files in all directories...::"
1853
msgstr ""
1854
1855
#: bzrlib/builtins.py:3030
1856
msgid " bzr ignore \"*.class\""
1857
msgstr ""
1858
1859
#: bzrlib/builtins.py:3032
1860
msgid " ...but do not ignore \"special.class\"::"
1861
msgstr ""
1862
1863
#: bzrlib/builtins.py:3034
1864
msgid " bzr ignore \"!special.class\""
1865
msgstr ""
1866
1867
#: bzrlib/builtins.py:3036
1868
msgid " Ignore files whose name begins with the \"#\" character::"
1869
msgstr ""
1870
1871
#: bzrlib/builtins.py:3038
1872
msgid " bzr ignore \"RE:^#\""
1873
msgstr ""
1874
1875
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
1876
msgid " Ignore .o files under the lib directory::"
1877
msgstr ""
1878
1879
#: bzrlib/builtins.py:3042
1880
msgid " bzr ignore \"lib/**/*.o\""
1881
msgstr ""
1882
1883
#: bzrlib/builtins.py:3046
1884
msgid " bzr ignore \"RE:lib/.*\\.o\""
1885
msgstr ""
1886
1887
#: bzrlib/builtins.py:3048
1888
msgid " Ignore everything but the \"debian\" toplevel directory::"
1889
msgstr ""
1890
1891
#: bzrlib/builtins.py:3050
1892
msgid ""
1893
" bzr ignore \"RE:(?!debian/).*\"\n"
1894
" \n"
1895
" Ignore everything except the \"local\" toplevel directory,\n"
1896
" but always ignore autosave files ending in ~, even under local/::\n"
1897
" \n"
1898
" bzr ignore \"*\"\n"
1899
" bzr ignore \"!./local\"\n"
1900
" bzr ignore \"!!*~\""
1901
msgstr ""
1902
1903
#: bzrlib/builtins.py:3064
1904
msgid "Display the default ignore rules that bzr uses."
1905
msgstr ""
1906
1907
#: bzrlib/builtins.py:3076
1908
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1909
msgstr ""
1910
1911
#: bzrlib/builtins.py:3087
1912
#, python-format
1913
msgid "Invalid ignore pattern found. %s"
1914
msgid_plural "Invalid ignore patterns found. %s"
1915
msgstr[0] ""
1916
msgstr[1] ""
1917
1918
#: bzrlib/builtins.py:3096
1919
msgid "NAME_PATTERN should not be an absolute path"
1920
msgstr ""
1921
1922
#: bzrlib/builtins.py:3109
1923
#, python-format
1924
msgid ""
1925
"Warning: the following files are version controlled and match your ignore "
1926
"pattern:\n"
1927
"%s\n"
1928
"These files will continue to be version controlled unless you 'bzr remove' "
1929
"them.\n"
1930
msgstr ""
1931
1932
#: bzrlib/builtins.py:3116
1933
msgid "List ignored files and the patterns that matched them."
1934
msgstr ""
1935
1936
#: bzrlib/builtins.py:3118
1937
msgid ""
1938
"List all the ignored files and the ignore pattern that caused the file to\n"
1939
"be ignored."
1940
msgstr ""
1941
1942
#: bzrlib/builtins.py:3121
1943
msgid "Alternatively, to list just the files::"
1944
msgstr ""
1945
1946
#: bzrlib/builtins.py:3123
1947
msgid " bzr ls --ignored"
1948
msgstr ""
1949
1950
#: bzrlib/builtins.py:3157
1951
#, python-format
1952
msgid "not a valid revision-number: %r"
1953
msgstr ""
1954
1955
#: bzrlib/builtins.py:3164
1956
msgid ""
1957
"Export current or past revision to a destination directory or archive."
1958
msgstr ""
1959
1960
#: bzrlib/builtins.py:3166
1961
msgid "If no revision is specified this exports the last committed revision."
1962
msgstr ""
1963
1964
#: bzrlib/builtins.py:3168
1965
msgid ""
1966
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1967
"given, try to find the format with the extension. If no extension\n"
1968
"is found exports to a directory (equivalent to --format=dir)."
1969
msgstr ""
1970
1971
#: bzrlib/builtins.py:3172
1972
msgid ""
1973
"If root is supplied, it will be used as the root directory inside\n"
1974
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1975
"to the exported filename. The root option has no effect for 'dir' format."
1976
msgstr ""
1977
1978
#: bzrlib/builtins.py:3176
1979
msgid ""
1980
"If branch is omitted then the branch containing the current working\n"
1981
"directory will be used."
1982
msgstr ""
1983
1984
#: bzrlib/builtins.py:3179
1985
msgid ""
1986
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1987
msgstr ""
1988
1989
#: bzrlib/builtins.py:3181
1990
msgid ""
1991
" ================= =========================\n"
1992
" Supported formats Autodetected by extension\n"
1993
" ================= =========================\n"
1994
" dir (none)\n"
1995
" tar .tar\n"
1996
" tbz2 .tar.bz2, .tbz2\n"
1997
" tgz .tar.gz, .tgz\n"
1998
" zip .zip\n"
1999
" ================= ========================="
2000
msgstr ""
2001
2002
#: bzrlib/builtins.py:3195
2003
msgid "Type of file to export to."
2004
msgstr ""
2005
2006
#: bzrlib/builtins.py:3198
2007
msgid "Apply content filters to export the convenient form."
2008
msgstr ""
2009
2010
#: bzrlib/builtins.py:3202
2011
msgid "Name of the root directory inside the exported file."
2012
msgstr ""
2013
2014
#: bzrlib/builtins.py:3204
2015
msgid ""
2016
"Set modification time of files to that of the last revision in which it was "
2017
"changed."
2018
msgstr ""
2019
2020
#: bzrlib/builtins.py:3207
2021
msgid ""
2022
"Export the working tree contents rather than that of the last revision."
2023
msgstr ""
2024
2025
#: bzrlib/builtins.py:3226
2026
msgid "--uncommitted requires a working tree"
2027
msgstr ""
2028
2029
#: bzrlib/builtins.py:3235
2030
#, python-format
2031
msgid "Unsupported export format: %s"
2032
msgstr ""
2033
2034
#: bzrlib/builtins.py:3239
2035
msgid ""
2036
"Write the contents of a file as of a given revision to standard output."
2037
msgstr ""
2038
2039
#: bzrlib/builtins.py:3241
2040
msgid "If no revision is nominated, the last revision is used."
2041
msgstr ""
2042
2043
#: bzrlib/builtins.py:3243
2044
msgid ""
2045
"Note: Take care to redirect standard output when using this command on a\n"
2046
"binary file."
2047
msgstr ""
2048
2049
#: bzrlib/builtins.py:3249
2050
msgid "The path name in the old tree."
2051
msgstr ""
2052
2053
#: bzrlib/builtins.py:3250
2054
msgid "Apply content filters to display the convenience form."
2055
msgstr ""
2056
2057
#: bzrlib/builtins.py:3261
2058
msgid "bzr cat --revision takes exactly one revision specifier"
2059
msgstr ""
2060
2061
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2062
msgid "{0!r} is not present in revision {1}"
2063
msgstr ""
2064
2065
#: bzrlib/builtins.py:3321
2066
msgid "Commit changes into a new revision."
2067
msgstr ""
2068
2069
#: bzrlib/builtins.py:3323
2070
msgid ""
2071
"An explanatory message needs to be given for each commit. This is\n"
2072
"often done by using the --message option (getting the message from the\n"
2073
"command line) or by using the --file option (getting the message from\n"
2074
"a file). If neither of these options is given, an editor is opened for\n"
2075
"the user to enter the message. To see the changed files in the\n"
2076
"boilerplate text loaded into the editor, use the --show-diff option."
2077
msgstr ""
2078
2079
#: bzrlib/builtins.py:3330
2080
msgid ""
2081
"By default, the entire tree is committed and the person doing the\n"
2082
"commit is assumed to be the author. These defaults can be overridden\n"
2083
"as explained below."
2084
msgstr ""
2085
2086
#: bzrlib/builtins.py:3334
2087
msgid ":Selective commits:"
2088
msgstr ""
2089
2090
#: bzrlib/builtins.py:3336
2091
msgid ""
2092
" If selected files are specified, only changes to those files are\n"
2093
" committed. If a directory is specified then the directory and\n"
2094
" everything within it is committed."
2095
msgstr ""
2096
2097
#: bzrlib/builtins.py:3340
2098
msgid ""
2099
" When excludes are given, they take precedence over selected files.\n"
2100
" For example, to commit only changes within foo, but not changes\n"
2101
" within foo/bar::"
2102
msgstr ""
2103
2104
#: bzrlib/builtins.py:3344
2105
msgid " bzr commit foo -x foo/bar"
2106
msgstr ""
2107
2108
#: bzrlib/builtins.py:3346
2109
msgid " A selective commit after a merge is not yet supported."
2110
msgstr ""
2111
2112
#: bzrlib/builtins.py:3348
2113
msgid ":Custom authors:"
2114
msgstr ""
2115
2116
#: bzrlib/builtins.py:3350
2117
msgid ""
2118
" If the author of the change is not the same person as the committer,\n"
2119
" you can specify the author's name using the --author option. The\n"
2120
" name should be in the same format as a committer-id, e.g.\n"
2121
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2122
" the change you can specify the option multiple times, once for each\n"
2123
" author."
2124
msgstr ""
2125
2126
#: bzrlib/builtins.py:3357
2127
msgid ":Checks:"
2128
msgstr ""
2129
2130
#: bzrlib/builtins.py:3359
2131
msgid ""
2132
" A common mistake is to forget to add a new file or directory before\n"
2133
" running the commit command. The --strict option checks for unknown\n"
2134
" files and aborts the commit if any are found. More advanced pre-commit\n"
2135
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2136
" for details."
2137
msgstr ""
2138
2139
#: bzrlib/builtins.py:3365
2140
msgid ":Things to note:"
2141
msgstr ""
2142
2143
#: bzrlib/builtins.py:3367
2144
msgid ""
2145
" If you accidentially commit the wrong changes or make a spelling\n"
2146
" mistake in the commit message say, you can use the uncommit command\n"
2147
" to undo it. See ``bzr help uncommit`` for details."
2148
msgstr ""
2149
2150
#: bzrlib/builtins.py:3371
2151
msgid ""
2152
" Hooks can also be configured to run after a commit. This allows you\n"
2153
" to trigger updates to external systems like bug trackers. The --fixes\n"
2154
" option can be used to record the association between a revision and\n"
2155
" one or more bugs. See ``bzr help bugs`` for details."
2156
msgstr ""
2157
2158
#: bzrlib/builtins.py:3381
2159
msgid "Do not consider changes made to a given path."
2160
msgstr ""
2161
2162
#: bzrlib/builtins.py:3384
2163
msgid "Description of the new revision."
2164
msgstr ""
2165
2166
#: bzrlib/builtins.py:3387
2167
msgid "Commit even if nothing has changed."
2168
msgstr ""
2169
2170
#: bzrlib/builtins.py:3391
2171
msgid "Take commit message from this file."
2172
msgstr ""
2173
2174
#: bzrlib/builtins.py:3393
2175
msgid "Refuse to commit if there are unknown files in the working tree."
2176
msgstr ""
2177
2178
#: bzrlib/builtins.py:3396
2179
msgid ""
2180
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2181
"08:00:00 +0100'."
2182
msgstr ""
2183
2184
#: bzrlib/builtins.py:3399
2185
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2186
msgstr ""
2187
2188
#: bzrlib/builtins.py:3402
2189
msgid "Set the author's name, if it's different from the committer."
2190
msgstr ""
2191
2192
#: bzrlib/builtins.py:3405
2193
msgid ""
2194
"Perform a local commit in a bound branch. Local commits are not pushed to "
2195
"the master branch until a normal commit is performed."
2196
msgstr ""
2197
2198
#: bzrlib/builtins.py:3411
2199
msgid ""
2200
"When no message is supplied, show the diff along with the status summary in "
2201
"the message editor."
2202
msgstr ""
2203
2204
#: bzrlib/builtins.py:3414
2205
msgid ""
2206
"When committing to a foreign version control system do not push data that "
2207
"can not be natively represented."
2208
msgstr ""
2209
2210
#: bzrlib/builtins.py:3432
2211
#, python-format
2212
msgid ""
2213
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2214
"default bug tracker using the `bugtracker` option.\n"
2215
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2216
msgstr ""
2217
2218
#: bzrlib/builtins.py:3441
2219
#, python-format
2220
msgid ""
2221
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2222
"for more information on this feature.\n"
2223
"Commit refused."
2224
msgstr ""
2225
2226
#: bzrlib/builtins.py:3450
2227
#, python-format
2228
msgid "Unrecognized bug %s. Commit refused."
2229
msgstr ""
2230
2231
#: bzrlib/builtins.py:3453
2232
#, python-format
2233
msgid ""
2234
"%s\n"
2235
"Commit refused."
2236
msgstr ""
2237
2238
#: bzrlib/builtins.py:3477
2239
msgid "Could not parse --commit-time: "
2240
msgstr ""
2241
2242
#: bzrlib/builtins.py:3517
2243
msgid "please specify either --message or --file"
2244
msgstr ""
2245
2246
#: bzrlib/builtins.py:3546
2247
msgid "please specify a commit message with either --message or --file"
2248
msgstr ""
2249
2250
#: bzrlib/builtins.py:3549
2251
msgid ""
2252
"Empty commit message specified. Please specify a commit message with either -"
2253
"-message or --file or leave a blank message with --message \"\"."
2254
msgstr ""
2255
2256
#: bzrlib/builtins.py:3569
2257
msgid ""
2258
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2259
"-unchanged to force an empty commit."
2260
msgstr ""
2261
2262
#: bzrlib/builtins.py:3573
2263
msgid ""
2264
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2265
"resolve FILE\" to resolve."
2266
msgstr ""
2267
2268
#: bzrlib/builtins.py:3577
2269
msgid "Commit refused because there are unknown files in the working tree."
2270
msgstr ""
2271
2272
#: bzrlib/builtins.py:3580
2273
msgid ""
2274
"\n"
2275
"To commit to master branch, run update and then commit.\n"
2276
"You can also pass --local to commit to continue working disconnected."
2277
msgstr ""
2278
2279
#: bzrlib/builtins.py:3588
2280
msgid ""
2281
"Validate working tree structure, branch consistency and repository history."
2282
msgstr ""
2283
2284
#: bzrlib/builtins.py:3590
2285
msgid ""
2286
"This command checks various invariants about branch and repository storage\n"
2287
"to detect data corruption or bzr bugs."
2288
msgstr ""
2289
2290
#: bzrlib/builtins.py:3593
2291
msgid ""
2292
"The working tree and branch checks will only give output if a problem is\n"
2293
"detected. The output fields of the repository check are:"
2294
msgstr ""
2295
2296
#: bzrlib/builtins.py:3596
2297
msgid ""
2298
"revisions\n"
2299
" This is just the number of revisions checked. It doesn't\n"
2300
" indicate a problem."
2301
msgstr ""
2302
2303
#: bzrlib/builtins.py:3600
2304
msgid ""
2305
"versionedfiles\n"
2306
" This is just the number of versionedfiles checked. It\n"
2307
" doesn't indicate a problem."
2308
msgstr ""
2309
2310
#: bzrlib/builtins.py:3604
2311
msgid ""
2312
"unreferenced ancestors\n"
2313
" Texts that are ancestors of other texts, but\n"
2314
" are not properly referenced by the revision ancestry. This is a\n"
2315
" subtle problem that Bazaar can work around."
2316
msgstr ""
2317
2318
#: bzrlib/builtins.py:3609
2319
msgid ""
2320
"unique file texts\n"
2321
" This is the total number of unique file contents\n"
2322
" seen in the checked revisions. It does not indicate a problem."
2323
msgstr ""
2324
2325
#: bzrlib/builtins.py:3613
2326
msgid ""
2327
"repeated file texts\n"
2328
" This is the total number of repeated texts seen\n"
2329
" in the checked revisions. Texts can be repeated when their file\n"
2330
" entries are modified, but the file contents are not. It does not\n"
2331
" indicate a problem."
2332
msgstr ""
2333
2334
#: bzrlib/builtins.py:3619
2335
msgid ""
2336
"If no restrictions are specified, all Bazaar data that is found at the "
2337
"given\n"
2338
"location will be checked."
2339
msgstr ""
2340
2341
#: bzrlib/builtins.py:3624
2342
msgid " Check the tree and branch at 'foo'::"
2343
msgstr ""
2344
2345
#: bzrlib/builtins.py:3626
2346
msgid " bzr check --tree --branch foo"
2347
msgstr ""
2348
2349
#: bzrlib/builtins.py:3628
2350
msgid " Check only the repository at 'bar'::"
2351
msgstr ""
2352
2353
#: bzrlib/builtins.py:3630
2354
msgid " bzr check --repo bar"
2355
msgstr ""
2356
2357
#: bzrlib/builtins.py:3632
2358
msgid " Check everything at 'baz'::"
2359
msgstr ""
2360
2361
#: bzrlib/builtins.py:3634
2362
msgid " bzr check baz"
2363
msgstr ""
2364
2365
#: bzrlib/builtins.py:3640
2366
msgid "Check the branch related to the current directory."
2367
msgstr ""
2368
2369
#: bzrlib/builtins.py:3642
2370
msgid "Check the repository related to the current directory."
2371
msgstr ""
2372
2373
#: bzrlib/builtins.py:3644
2374
msgid "Check the working tree related to the current directory."
2375
msgstr ""
2376
2377
#: bzrlib/builtins.py:3658
2378
msgid "Upgrade a repository, branch or working tree to a newer format."
2379
msgstr ""
2380
2381
#: bzrlib/builtins.py:3660
2382
msgid ""
2383
"When the default format has changed after a major new release of\n"
2384
"Bazaar, you may be informed during certain operations that you\n"
2385
"should upgrade. Upgrading to a newer format may improve performance\n"
2386
"or make new features available. It may however limit interoperability\n"
2387
"with older repositories or with older versions of Bazaar."
2388
msgstr ""
2389
2390
#: bzrlib/builtins.py:3666
2391
msgid ""
2392
"If you wish to upgrade to a particular format rather than the\n"
2393
"current default, that can be specified using the --format option.\n"
2394
"As a consequence, you can use the upgrade command this way to\n"
2395
"\"downgrade\" to an earlier format, though some conversions are\n"
2396
"a one way process (e.g. changing from the 1.x default to the\n"
2397
"2.x default) so downgrading is not always possible."
2398
msgstr ""
2399
2400
#: bzrlib/builtins.py:3673
2401
msgid ""
2402
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2403
"process (where # is a number). By default, this is left there on\n"
2404
"completion. If the conversion fails, delete the new .bzr directory\n"
2405
"and rename this one back in its place. Use the --clean option to ask\n"
2406
"for the backup.bzr directory to be removed on successful conversion.\n"
2407
"Alternatively, you can delete it by hand if everything looks good\n"
2408
"afterwards."
2409
msgstr ""
2410
2411
#: bzrlib/builtins.py:3681
2412
msgid ""
2413
"If the location given is a shared repository, dependent branches\n"
2414
"are also converted provided the repository converts successfully.\n"
2415
"If the conversion of a branch fails, remaining branches are still\n"
2416
"tried."
2417
msgstr ""
2418
2419
#: bzrlib/builtins.py:3686
2420
msgid ""
2421
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2422
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2423
msgstr ""
2424
2425
#: bzrlib/builtins.py:3694
2426
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2427
msgstr ""
2428
2429
#: bzrlib/builtins.py:3698
2430
msgid "Branch format"
2431
msgstr ""
2432
2433
#: bzrlib/builtins.py:3700
2434
msgid "Remove the backup.bzr directory if successful."
2435
msgstr ""
2436
2437
#: bzrlib/builtins.py:3702
2438
msgid "Show what would be done, but don't actually do anything."
2439
msgstr ""
2440
2441
#: bzrlib/builtins.py:3717
2442
msgid "Show or set bzr user id."
2443
msgstr ""
2444
2445
#: bzrlib/builtins.py:3719
2446
msgid ""
2447
":Examples:\n"
2448
" Show the email of the current user::"
2449
msgstr ""
2450
2451
#: bzrlib/builtins.py:3722
2452
msgid " bzr whoami --email"
2453
msgstr ""
2454
2455
#: bzrlib/builtins.py:3724
2456
msgid " Set the current user::"
2457
msgstr ""
2458
2459
#: bzrlib/builtins.py:3726
2460
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2461
msgstr ""
2462
2463
#: bzrlib/builtins.py:3730
2464
msgid "Display email address only."
2465
msgstr ""
2466
2467
#: bzrlib/builtins.py:3732
2468
msgid "Set identity for the current branch instead of globally."
2469
msgstr ""
2470
2471
#: bzrlib/builtins.py:3758
2472
msgid "--email can only be used to display existing identity"
2473
msgstr ""
2474
2475
#: bzrlib/builtins.py:3780
2476
msgid "Print or set the branch nickname."
2477
msgstr ""
2478
2479
#: bzrlib/builtins.py:3782
2480
msgid ""
2481
"If unset, the tree root directory name is used as the nickname.\n"
2482
"To print the current nickname, execute with no argument."
2483
msgstr ""
2484
2485
#: bzrlib/builtins.py:3785
2486
msgid ""
2487
"Bound branches use the nickname of its master branch unless it is set\n"
2488
"locally."
2489
msgstr ""
2490
2491
#: bzrlib/builtins.py:3805
2492
msgid "Set/unset and display aliases."
2493
msgstr ""
2494
2495
#: bzrlib/builtins.py:3807
2496
msgid ""
2497
":Examples:\n"
2498
" Show the current aliases::"
2499
msgstr ""
2500
2501
#: bzrlib/builtins.py:3810
2502
msgid " bzr alias"
2503
msgstr ""
2504
2505
#: bzrlib/builtins.py:3812
2506
msgid " Show the alias specified for 'll'::"
2507
msgstr ""
2508
2509
#: bzrlib/builtins.py:3814
2510
msgid " bzr alias ll"
2511
msgstr ""
2512
2513
#: bzrlib/builtins.py:3816
2514
msgid " Set an alias for 'll'::"
2515
msgstr ""
2516
2517
#: bzrlib/builtins.py:3818
2518
msgid " bzr alias ll=\"log --line -r-10..-1\""
2519
msgstr ""
2520
2521
#: bzrlib/builtins.py:3820
2522
msgid " To remove an alias for 'll'::"
2523
msgstr ""
2524
2525
#: bzrlib/builtins.py:3822
2526
msgid " bzr alias --remove ll"
2527
msgstr ""
2528
2529
#: bzrlib/builtins.py:3827
2530
msgid "Remove the alias."
2531
msgstr ""
2532
2533
#: bzrlib/builtins.py:3845
2534
msgid "bzr alias --remove expects an alias to remove."
2535
msgstr ""
2536
2537
#: bzrlib/builtins.py:4026
2538
msgid ""
2539
"subunit not available. subunit needs to be installed to use --subunit."
2540
msgstr ""
2541
2542
#: bzrlib/builtins.py:4043
2543
msgid ""
2544
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2545
msgstr ""
2546
2547
#: bzrlib/builtins.py:4090
2548
msgid "Show version of bzr."
2549
msgstr ""
2550
2551
#: bzrlib/builtins.py:4094
2552
msgid "Print just the version number."
2553
msgstr ""
2554
2555
#: bzrlib/builtins.py:4113
2556
msgid "It sure does!\n"
2557
msgstr ""
2558
2559
#: bzrlib/builtins.py:4137
2560
#, python-format
2561
msgid "merge base is revision %s\n"
2562
msgstr ""
2563
2564
#: bzrlib/builtins.py:4141
2565
msgid "Perform a three-way merge."
2566
msgstr ""
2567
2568
#: bzrlib/builtins.py:4143
2569
msgid ""
2570
"The source of the merge can be specified either in the form of a branch,\n"
2571
"or in the form of a path to a file containing a merge directive generated\n"
2572
"with bzr send. If neither is specified, the default is the upstream branch\n"
2573
"or the branch most recently merged using --remember. The source of the\n"
2574
"merge may also be specified in the form of a path to a file in another\n"
2575
"branch: in this case, only the modifications to that file are merged into\n"
2576
"the current working tree."
2577
msgstr ""
2578
2579
#: bzrlib/builtins.py:4151
2580
msgid ""
2581
"When merging from a branch, by default bzr will try to merge in all new\n"
2582
"work from the other branch, automatically determining an appropriate base\n"
2583
"revision. If this fails, you may need to give an explicit base."
2584
msgstr ""
2585
2586
#: bzrlib/builtins.py:4155
2587
msgid ""
2588
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2589
"try to merge in all new work up to and including revision OTHER."
2590
msgstr ""
2591
2592
#: bzrlib/builtins.py:4158
2593
msgid ""
2594
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2595
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2596
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2597
"not already contain revision BASE, such a merge is commonly referred to as\n"
2598
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2599
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2600
"changes from the other branch is not stored in the commit."
2601
msgstr ""
2602
2603
#: bzrlib/builtins.py:4166
2604
msgid "Revision numbers are always relative to the source branch."
2605
msgstr ""
2606
2607
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2608
msgid ""
2609
"Merge will do its best to combine the changes in two branches, but there\n"
2610
"are some kinds of problems only a human can fix. When it encounters those,\n"
2611
"it will mark a conflict. A conflict means that you need to fix something,\n"
2612
"before you should commit."
2613
msgstr ""
2614
2615
#: bzrlib/builtins.py:4173
2616
msgid ""
2617
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2618
msgstr ""
2619
2620
#: bzrlib/builtins.py:4175
2621
msgid ""
2622
"If there is no default branch set, the first merge will set it (use\n"
2623
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2624
"to use the default. To change the default, use --remember. The value will\n"
2625
"only be saved if the remote location can be accessed."
2626
msgstr ""
2627
2628
#: bzrlib/builtins.py:4180
2629
msgid ""
2630
"The results of the merge are placed into the destination working\n"
2631
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2632
"committed to record the result of the merge."
2633
msgstr ""
2634
2635
#: bzrlib/builtins.py:4184
2636
msgid ""
2637
"merge refuses to run if there are any uncommitted changes, unless\n"
2638
"--force is given. If --force is given, then the changes from the source \n"
2639
"will be merged with the current working tree, including any uncommitted\n"
2640
"changes in the tree. The --force option can also be used to create a\n"
2641
"merge revision which has more than two parents."
2642
msgstr ""
2643
2644
#: bzrlib/builtins.py:4190
2645
msgid ""
2646
"If one would like to merge changes from the working tree of the other\n"
2647
"branch without merging any committed revisions, the --uncommitted option\n"
2648
"can be given."
2649
msgstr ""
2650
2651
#: bzrlib/builtins.py:4194
2652
msgid ""
2653
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2654
"you to apply each diff hunk and file change, similar to \"shelve\"."
2655
msgstr ""
2656
2657
#: bzrlib/builtins.py:4197
2658
msgid ""
2659
":Examples:\n"
2660
" To merge all new revisions from bzr.dev::"
2661
msgstr ""
2662
2663
#: bzrlib/builtins.py:4200
2664
msgid " bzr merge ../bzr.dev"
2665
msgstr ""
2666
2667
#: bzrlib/builtins.py:4202
2668
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2669
msgstr ""
2670
2671
#: bzrlib/builtins.py:4204
2672
msgid " bzr merge -r 82 ../bzr.dev"
2673
msgstr ""
2674
2675
#: bzrlib/builtins.py:4206
2676
msgid " To merge the changes introduced by 82, without previous changes::"
2677
msgstr ""
2678
2679
#: bzrlib/builtins.py:4208
2680
msgid " bzr merge -r 81..82 ../bzr.dev"
2681
msgstr ""
2682
2683
#: bzrlib/builtins.py:4210
2684
msgid " To apply a merge directive contained in /tmp/merge::"
2685
msgstr ""
2686
2687
#: bzrlib/builtins.py:4212
2688
msgid " bzr merge /tmp/merge"
2689
msgstr ""
2690
2691
#: bzrlib/builtins.py:4214
2692
msgid ""
2693
" To create a merge revision with three parents from two branches\n"
2694
" feature1a and feature1b:"
2695
msgstr ""
2696
2697
#: bzrlib/builtins.py:4217
2698
msgid ""
2699
" bzr merge ../feature1a\n"
2700
" bzr merge ../feature1b --force\n"
2701
" bzr commit -m 'revision with three parents'"
2702
msgstr ""
2703
2704
#: bzrlib/builtins.py:4229
2705
msgid "Merge even if the destination tree has uncommitted changes."
2706
msgstr ""
2707
2708
#: bzrlib/builtins.py:4235
2709
msgid ""
2710
"Apply uncommitted changes from a working copy, instead of branch changes."
2711
msgstr ""
2712
2713
#: bzrlib/builtins.py:4237
2714
msgid ""
2715
"If the destination is already completely merged into the source, pull from "
2716
"the source rather than merging. When this happens, you do not need to "
2717
"commit the result."
2718
msgstr ""
2719
2720
#: bzrlib/builtins.py:4242
2721
msgid ""
2722
"Branch to merge into, rather than the one containing the working directory."
2723
msgstr ""
2724
2725
#: bzrlib/builtins.py:4244
2726
msgid "Instead of merging, show a diff of the merge."
2727
msgstr ""
2728
2729
#: bzrlib/builtins.py:4246
2730
msgid "Select changes interactively."
2731
msgstr ""
2732
2733
#: bzrlib/builtins.py:4268
2734
msgid ""
2735
"Merging into empty branches not currently supported, "
2736
"https://bugs.launchpad.net/bzr/+bug/308562"
2737
msgstr ""
2738
2739
#: bzrlib/builtins.py:4295
2740
msgid "Cannot use --uncommitted with bundles or merge directives."
2741
msgstr ""
2742
2743
#: bzrlib/builtins.py:4306
2744
msgid "Cannot use --uncommitted and --revision at the same time."
2745
msgstr ""
2746
2747
#: bzrlib/builtins.py:4326
2748
msgid "merger: "
2749
msgstr ""
2750
2751
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2752
msgid "Nothing to do."
2753
msgstr ""
2754
2755
#: bzrlib/builtins.py:4332
2756
msgid "Cannot pull individual files"
2757
msgstr ""
2758
2759
#: bzrlib/builtins.py:4340
2760
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2761
msgstr ""
2762
2763
#: bzrlib/builtins.py:4398
2764
#, python-format
2765
msgid "Show-base is not supported for this merge type. %s"
2766
msgstr ""
2767
2768
#: bzrlib/builtins.py:4407
2769
#, python-format
2770
msgid "Conflict reduction is not supported for merge type %s."
2771
msgstr ""
2772
2773
#: bzrlib/builtins.py:4411
2774
msgid "Cannot do conflict reduction and show base."
2775
msgstr ""
2776
2777
#: bzrlib/builtins.py:4522
2778
msgid "No location specified or remembered"
2779
msgstr ""
2780
2781
#: bzrlib/builtins.py:4524
2782
msgid "{0} remembered {1} location {2}"
2783
msgstr ""
2784
2785
#: bzrlib/builtins.py:4530
2786
msgid "Redo a merge."
2787
msgstr ""
2788
2789
#: bzrlib/builtins.py:4532
2790
msgid ""
2791
"Use this if you want to try a different merge technique while resolving\n"
2792
"conflicts. Some merge techniques are better than others, and remerge\n"
2793
"lets you try different ones on different files."
2794
msgstr ""
2795
2796
#: bzrlib/builtins.py:4536
2797
msgid ""
2798
"The options for remerge have the same meaning and defaults as the ones for\n"
2799
"merge. The difference is that remerge can (only) be run when there is a\n"
2800
"pending merge, and it lets you specify particular files."
2801
msgstr ""
2802
2803
#: bzrlib/builtins.py:4540
2804
msgid ""
2805
":Examples:\n"
2806
" Re-do the merge of all conflicted files, and show the base text in\n"
2807
" conflict regions, in addition to the usual THIS and OTHER texts::"
2808
msgstr ""
2809
2810
#: bzrlib/builtins.py:4544
2811
msgid " bzr remerge --show-base"
2812
msgstr ""
2813
2814
#: bzrlib/builtins.py:4546
2815
msgid ""
2816
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2817
" additional processing to reduce the size of conflict regions::"
2818
msgstr ""
2819
2820
#: bzrlib/builtins.py:4549
2821
msgid " bzr remerge --merge-type weave --reprocess foobar"
2822
msgstr ""
2823
2824
#: bzrlib/builtins.py:4556
2825
msgid "Show base revision text in conflicts."
2826
msgstr ""
2827
2828
#: bzrlib/builtins.py:4568
2829
msgid ""
2830
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2831
"merges."
2832
msgstr ""
2833
2834
#: bzrlib/builtins.py:4624
2835
msgid "Revert files to a previous revision."
2836
msgstr ""
2837
2838
#: bzrlib/builtins.py:4626
2839
msgid ""
2840
"Giving a list of files will revert only those files. Otherwise, all files\n"
2841
"will be reverted. If the revision is not specified with '--revision', the\n"
2842
"last committed revision is used."
2843
msgstr ""
2844
2845
#: bzrlib/builtins.py:4630
2846
msgid ""
2847
"To remove only some changes, without reverting to a prior version, use\n"
2848
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2849
"will remove the changes introduced by the second last commit (-2), without\n"
2850
"affecting the changes introduced by the last commit (-1). To remove\n"
2851
"certain changes on a hunk-by-hunk basis, see the shelve command."
2852
msgstr ""
2853
2854
#: bzrlib/builtins.py:4636
2855
msgid ""
2856
"By default, any files that have been manually changed will be backed up\n"
2857
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2858
"'.~#~' appended to their name, where # is a number."
2859
msgstr ""
2860
2861
#: bzrlib/builtins.py:4640
2862
msgid ""
2863
"When you provide files, you can use their current pathname or the pathname\n"
2864
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2865
"name. If you name a directory, all the contents of that directory will be\n"
2866
"reverted."
2867
msgstr ""
2868
2869
#: bzrlib/builtins.py:4645
2870
msgid ""
2871
"If you have newly added files since the target revision, they will be\n"
2872
"removed. If the files to be removed have been changed, backups will be\n"
2873
"created as above. Directories containing unknown files will not be\n"
2874
"deleted."
2875
msgstr ""
2876
2877
#: bzrlib/builtins.py:4650
2878
msgid ""
2879
"The working tree contains a list of revisions that have been merged but\n"
2880
"not yet committed. These revisions will be included as additional parents\n"
2881
"of the next commit. Normally, using revert clears that list as well as\n"
2882
"reverting the files. If any files are specified, revert leaves the list\n"
2883
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2884
".`` in the tree root to revert all files but keep the recorded merges,\n"
2885
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2886
"reverting any files."
2887
msgstr ""
2888
2889
#: bzrlib/builtins.py:4659
2890
msgid ""
2891
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2892
"changes from a branch in a single revision. To do this, perform the merge\n"
2893
"as desired. Then doing revert with the \"--forget-merges\" option will "
2894
"keep\n"
2895
"the content of the tree as it was, but it will clear the list of pending\n"
2896
"merges. The next commit will then contain all of the changes that are\n"
2897
"present in the other branch, but without any other parent revisions.\n"
2898
"Because this technique forgets where these changes originated, it may\n"
2899
"cause additional conflicts on later merges involving the same source and\n"
2900
"target branches."
2901
msgstr ""
2902
2903
#: bzrlib/builtins.py:4673
2904
msgid "Do not save backups of reverted files."
2905
msgstr ""
2906
2907
#: bzrlib/builtins.py:4675
2908
msgid "Remove pending merge marker, without changing any files."
2909
msgstr ""
2910
2911
#: bzrlib/builtins.py:4706
2912
msgid ""
2913
"Show help on a command or other topic.\n"
2914
" "
2915
msgstr ""
2916
2917
#: bzrlib/builtins.py:4711
2918
msgid "Show help on all commands."
2919
msgstr ""
2920
2921
#: bzrlib/builtins.py:4740
2922
msgid "Show unmerged/unpulled revisions between two branches."
2923
msgstr ""
2924
2925
#: bzrlib/builtins.py:4742
2926
msgid "OTHER_BRANCH may be local or remote."
2927
msgstr ""
2928
2929
#: bzrlib/builtins.py:4744
2930
msgid ""
2931
"To filter on a range of revisions, you can use the command -r begin..end\n"
2932
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2933
"also valid.\n"
2934
" \n"
2935
":Exit values:\n"
2936
" 1 - some missing revisions\n"
2937
" 0 - no missing revisions"
2938
msgstr ""
2939
2940
#: bzrlib/builtins.py:4754
2941
msgid ""
2942
" Determine the missing revisions between this and the branch at the\n"
2943
" remembered pull location::"
2944
msgstr ""
2945
2946
#: bzrlib/builtins.py:4757
2947
msgid " bzr missing"
2948
msgstr ""
2949
2950
#: bzrlib/builtins.py:4759
2951
msgid " Determine the missing revisions between this and another branch::"
2952
msgstr ""
2953
2954
#: bzrlib/builtins.py:4761
2955
msgid " bzr missing http://server/branch"
2956
msgstr ""
2957
2958
#: bzrlib/builtins.py:4763
2959
msgid ""
2960
" Determine the missing revisions up to a specific revision on the other\n"
2961
" branch::"
2962
msgstr ""
2963
2964
#: bzrlib/builtins.py:4766
2965
msgid " bzr missing -r ..-10"
2966
msgstr ""
2967
2968
#: bzrlib/builtins.py:4768
2969
msgid ""
2970
" Determine the missing revisions up to a specific revision on this\n"
2971
" branch::"
2972
msgstr ""
2973
2974
#: bzrlib/builtins.py:4771
2975
msgid " bzr missing --my-revision ..-10"
2976
msgstr ""
2977
2978
#: bzrlib/builtins.py:4778
2979
msgid "Reverse the order of revisions."
2980
msgstr ""
2981
2982
#: bzrlib/builtins.py:4780
2983
msgid "Display changes in the local branch only."
2984
msgstr ""
2985
2986
#: bzrlib/builtins.py:4781
2987
msgid "Same as --mine-only."
2988
msgstr ""
2989
2990
#: bzrlib/builtins.py:4783
2991
msgid "Display changes in the remote branch only."
2992
msgstr ""
2993
2994
#: bzrlib/builtins.py:4784
2995
msgid "Same as --theirs-only."
2996
msgstr ""
2997
2998
#: bzrlib/builtins.py:4789
2999
msgid ""
3000
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3001
"details."
3002
msgstr ""
3003
3004
#: bzrlib/builtins.py:4793
3005
msgid ""
3006
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3007
"details."
3008
msgstr ""
3009
3010
#: bzrlib/builtins.py:4796
3011
msgid "Show all revisions in addition to the mainline ones."
3012
msgstr ""
3013
3014
#: bzrlib/builtins.py:4850
3015
msgid "No peer location known or specified."
3016
msgstr ""
3017
3018
#: bzrlib/builtins.py:4854
3019
msgid "Using saved parent location: {0}\n"
3020
msgstr ""
3021
3022
#: bzrlib/builtins.py:4887
3023
#, python-format
3024
msgid "You have %d extra revision:\n"
3025
msgid_plural "You have %d extra revisions:\n"
3026
msgstr[0] ""
3027
msgstr[1] ""
3028
3029
#: bzrlib/builtins.py:4903
3030
#, python-format
3031
msgid "You are missing %d revision:\n"
3032
msgid_plural "You are missing %d revisions:\n"
3033
msgstr[0] ""
3034
msgstr[1] ""
3035
3036
#: bzrlib/builtins.py:4915
3037
msgid "This branch has no new revisions.\n"
3038
msgstr ""
3039
3040
#: bzrlib/builtins.py:4918
3041
msgid "Other branch has no new revisions.\n"
3042
msgstr ""
3043
3044
#: bzrlib/builtins.py:4923
3045
msgid "Branches are up to date.\n"
3046
msgstr ""
3047
3048
#: bzrlib/builtins.py:4934
3049
msgid "Compress the data within a repository."
3050
msgstr ""
3051
3052
#: bzrlib/builtins.py:4936
3053
msgid ""
3054
"This operation compresses the data within a bazaar repository. As\n"
3055
"bazaar supports automatic packing of repository, this operation is\n"
3056
"normally not required to be done manually."
3057
msgstr ""
3058
3059
#: bzrlib/builtins.py:4940
3060
msgid ""
3061
"During the pack operation, bazaar takes a backup of existing repository\n"
3062
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3063
"automatically when it is safe to do so. To save disk space by removing\n"
3064
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3065
"used."
3066
msgstr ""
3067
3068
#: bzrlib/builtins.py:4946
3069
msgid ""
3070
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3071
"during or immediately after repacking, you may be left with a state\n"
3072
"where the deletion has been written to disk but the new packs have not\n"
3073
"been. In this case the repository may be unusable."
3074
msgstr ""
3075
3076
#: bzrlib/builtins.py:4955
3077
msgid "Delete obsolete packs to save disk space."
3078
msgstr ""
3079
3080
#: bzrlib/builtins.py:4969
3081
msgid "List the installed plugins."
3082
msgstr ""
3083
3084
#: bzrlib/builtins.py:4971
3085
msgid ""
3086
"This command displays the list of installed plugins including\n"
3087
"version of plugin and a short description of each."
3088
msgstr ""
3089
3090
#: bzrlib/builtins.py:4974
3091
msgid "--verbose shows the path where each plugin is located."
3092
msgstr ""
3093
3094
#: bzrlib/builtins.py:4976
3095
msgid ""
3096
"A plugin is an external component for Bazaar that extends the\n"
3097
"revision control system, by adding or replacing code in Bazaar.\n"
3098
"Plugins can do a variety of things, including overriding commands,\n"
3099
"adding new commands, providing additional network transports and\n"
3100
"customizing log output."
3101
msgstr ""
3102
3103
#: bzrlib/builtins.py:4982
3104
msgid ""
3105
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3106
"for further information on plugins including where to find them and how to\n"
3107
"install them. Instructions are also provided there on how to write new\n"
3108
"plugins using the Python programming language."
3109
msgstr ""
3110
3111
#: bzrlib/builtins.py:4998
3112
msgid "Show testament (signing-form) of a revision."
3113
msgstr ""
3114
3115
#: bzrlib/builtins.py:5001
3116
msgid "Produce long-format testament."
3117
msgstr ""
3118
3119
#: bzrlib/builtins.py:5003
3120
msgid "Produce a strict-format testament."
3121
msgstr ""
3122
3123
#: bzrlib/builtins.py:5029
3124
msgid "Show the origin of each line in a file."
3125
msgstr ""
3126
3127
#: bzrlib/builtins.py:5031
3128
msgid ""
3129
"This prints out the given file with an annotation on the left side\n"
3130
"indicating which revision, author and date introduced the change."
3131
msgstr ""
3132
3133
#: bzrlib/builtins.py:5034
3134
msgid ""
3135
"If the origin is the same for a run of consecutive lines, it is\n"
3136
"shown only at the top, unless the --all option is given."
3137
msgstr ""
3138
3139
#: bzrlib/builtins.py:5042
3140
msgid "Show annotations on all lines."
3141
msgstr ""
3142
3143
#: bzrlib/builtins.py:5043
3144
msgid "Show commit date in annotations."
3145
msgstr ""
3146
3147
#: bzrlib/builtins.py:5130
3148
msgid "Cannot sign a range of non-revision-history revisions"
3149
msgstr ""
3150
3151
#: bzrlib/builtins.py:5142
3152
msgid "Please supply either one revision, or a range."
3153
msgstr ""
3154
3155
#: bzrlib/builtins.py:5146
3156
msgid ""
3157
"Convert the current branch into a checkout of the supplied branch.\n"
3158
"If no branch is supplied, rebind to the last bound location."
3159
msgstr ""
3160
3161
#: bzrlib/builtins.py:5149
3162
msgid ""
3163
"Once converted into a checkout, commits must succeed on the master branch\n"
3164
"before they will be applied to the local branch."
3165
msgstr ""
3166
3167
#: bzrlib/builtins.py:5152
3168
msgid ""
3169
"Bound branches use the nickname of its master branch unless it is set\n"
3170
"locally, in which case binding will update the local nickname to be\n"
3171
"that of the master."
3172
msgstr ""
3173
3174
#: bzrlib/builtins.py:5167
3175
msgid "No location supplied. This format does not remember old locations."
3176
msgstr ""
3177
3178
#: bzrlib/builtins.py:5172
3179
msgid "Branch is already bound"
3180
msgstr ""
3181
3182
#: bzrlib/builtins.py:5174
3183
msgid "No location supplied and no previous location known"
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:5180
3187
msgid "These branches have diverged. Try merging, and then bind again."
3188
msgstr ""
3189
3190
#: bzrlib/builtins.py:5187
3191
msgid "Convert the current checkout into a regular branch."
3192
msgstr ""
3193
3194
#: bzrlib/builtins.py:5189
3195
msgid ""
3196
"After unbinding, the local branch is considered independent and subsequent\n"
3197
"commits will be local only."
3198
msgstr ""
3199
3200
#: bzrlib/builtins.py:5200
3201
msgid "Local branch is not bound"
3202
msgstr ""
3203
3204
#: bzrlib/builtins.py:5204
3205
msgid "Remove the last committed revision."
3206
msgstr ""
3207
3208
#: bzrlib/builtins.py:5206
3209
msgid ""
3210
"--verbose will print out what is being removed.\n"
3211
"--dry-run will go through all the motions, but not actually\n"
3212
"remove anything."
3213
msgstr ""
3214
3215
#: bzrlib/builtins.py:5210
3216
msgid ""
3217
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3218
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3219
"branch at revision 15."
3220
msgstr ""
3221
3222
#: bzrlib/builtins.py:5214
3223
msgid ""
3224
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3225
"it may make is to restore any pending merges that were present before\n"
3226
"the commit."
3227
msgstr ""
3228
3229
#: bzrlib/builtins.py:5225
3230
msgid "Don't actually make changes."
3231
msgstr ""
3232
3233
#: bzrlib/builtins.py:5226
3234
msgid "Say yes to all questions."
3235
msgstr ""
3236
3237
#: bzrlib/builtins.py:5228
3238
msgid "Keep tags that point to removed revisions."
3239
msgstr ""
3240
3241
#: bzrlib/builtins.py:5230
3242
msgid "Only remove the commits from the local branch when in a checkout."
3243
msgstr ""
3244
3245
#: bzrlib/builtins.py:5279
3246
msgid "No revisions to uncommit.\n"
3247
msgstr ""
3248
3249
#: bzrlib/builtins.py:5294
3250
msgid "Dry-run, pretending to remove the above revisions.\n"
3251
msgstr ""
3252
3253
#: bzrlib/builtins.py:5297
3254
msgid "The above revision(s) will be removed.\n"
3255
msgstr ""
3256
3257
#: bzrlib/builtins.py:5301
3258
msgid "Uncommit these revisions"
3259
msgstr ""
3260
3261
#: bzrlib/builtins.py:5304
3262
msgid "Canceled\n"
3263
msgstr ""
3264
3265
#: bzrlib/builtins.py:5311
3266
#, python-format
3267
msgid ""
3268
"You can restore the old tip by running:\n"
3269
" bzr pull . -r revid:%s\n"
3270
msgstr ""
3271
3272
#: bzrlib/builtins.py:5316
3273
msgid "Break a dead lock."
3274
msgstr ""
3275
3276
#: bzrlib/builtins.py:5318
3277
msgid ""
3278
"This command breaks a lock on a repository, branch, working directory or\n"
3279
"config file."
3280
msgstr ""
3281
3282
#: bzrlib/builtins.py:5321
3283
msgid ""
3284
"CAUTION: Locks should only be broken when you are sure that the process\n"
3285
"holding the lock has been stopped."
3286
msgstr ""
3287
3288
#: bzrlib/builtins.py:5324
3289
msgid ""
3290
"You can get information on what locks are open via the 'bzr info\n"
3291
"[location]' command."
3292
msgstr ""
3293
3294
#: bzrlib/builtins.py:5327
3295
msgid ""
3296
":Examples:\n"
3297
" bzr break-lock\n"
3298
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3299
" bzr break-lock --conf ~/.bazaar"
3300
msgstr ""
3301
3302
#: bzrlib/builtins.py:5336
3303
msgid "LOCATION is the directory where the config lock is."
3304
msgstr ""
3305
3306
#: bzrlib/builtins.py:5338
3307
msgid "Do not ask for confirmation before breaking the lock."
3308
msgstr ""
3309
3310
#: bzrlib/builtins.py:5373
3311
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3312
msgstr ""
3313
3314
#: bzrlib/builtins.py:5374
3315
msgid "Run the bzr server."
3316
msgstr ""
3317
3318
#: bzrlib/builtins.py:5380
3319
msgid "Serve on stdin/out for use from inetd or sshd."
3320
msgstr ""
3321
3322
#: bzrlib/builtins.py:5381
3323
msgid "protocol"
3324
msgstr ""
3325
3326
#: bzrlib/builtins.py:5382
3327
msgid "Protocol to serve."
3328
msgstr ""
3329
3330
#: bzrlib/builtins.py:5386
3331
msgid ""
3332
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3333
"Passing 0 as the port number will result in a dynamically allocated port. "
3334
"The default port depends on the protocol."
3335
msgstr ""
3336
3337
#: bzrlib/builtins.py:5392
3338
msgid "Serve contents of this directory."
3339
msgstr ""
3340
3341
#: bzrlib/builtins.py:5394
3342
msgid ""
3343
"By default the server is a readonly server. Supplying --allow-writes "
3344
"enables write access to the contents of the served directory and below. "
3345
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3346
"of external authentication is arranged supplying this option leads to global "
3347
"uncontrolled write access to your file system."
3348
msgstr ""
3349
3350
#: bzrlib/builtins.py:5403
3351
msgid "Override the default idle client timeout (5min)."
3352
msgstr ""
3353
3354
#: bzrlib/builtins.py:5453
3355
msgid "Combine a tree into its containing tree."
3356
msgstr ""
3357
3358
#: bzrlib/builtins.py:5455
3359
msgid "This command requires the target tree to be in a rich-root format."
3360
msgstr ""
3361
3362
#: bzrlib/builtins.py:5457
3363
msgid ""
3364
"The TREE argument should be an independent tree, inside another tree, but\n"
3365
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3366
"running \"bzr branch\" with the target inside a tree.)"
3367
msgstr ""
3368
3369
#: bzrlib/builtins.py:5461
3370
msgid ""
3371
"The result is a combined tree, with the subtree no longer an independent\n"
3372
"part. This is marked as a merge of the subtree into the containing tree,\n"
3373
"and all history is preserved."
3374
msgstr ""
3375
3376
#: bzrlib/builtins.py:5479
3377
#, python-format
3378
msgid ""
3379
"Can't join trees because %s doesn't support rich root data.\n"
3380
"You can use bzr upgrade on the repository."
3381
msgstr ""
3382
3383
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3384
msgid "Cannot join {0}. {1}"
3385
msgstr ""
3386
3387
#: bzrlib/builtins.py:5499
3388
msgid "Split a subdirectory of a tree into a separate tree."
3389
msgstr ""
3390
3391
#: bzrlib/builtins.py:5501
3392
msgid ""
3393
"This command will produce a target tree in a format that supports\n"
3394
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3395
"converted into earlier formats like 'dirstate-tags'."
3396
msgstr ""
3397
3398
#: bzrlib/builtins.py:5505
3399
msgid ""
3400
"The TREE argument should be a subdirectory of a working tree. That\n"
3401
"subdirectory will be converted into an independent tree, with its own\n"
3402
"branch. Commits in the top-level tree will not apply to the new subtree."
3403
msgstr ""
3404
3405
#: bzrlib/builtins.py:5585
3406
msgid "No submit branch specified or known"
3407
msgstr ""
3408
3409
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3410
msgid "No public branch specified or known"
3411
msgstr ""
3412
3413
#: bzrlib/builtins.py:5598
3414
msgid "bzr merge-directive takes at most two one revision identifiers"
3415
msgstr ""
3416
3417
#: bzrlib/builtins.py:5607
3418
msgid "No revisions to bundle."
3419
msgstr ""
3420
3421
#: bzrlib/builtins.py:5626
3422
msgid "Mail or create a merge-directive for submitting changes."
3423
msgstr ""
3424
3425
#: bzrlib/builtins.py:5628
3426
msgid "A merge directive provides many things needed for requesting merges:"
3427
msgstr ""
3428
3429
#: bzrlib/builtins.py:5630
3430
msgid "* A machine-readable description of the merge to perform"
3431
msgstr ""
3432
3433
#: bzrlib/builtins.py:5632
3434
msgid "* An optional patch that is a preview of the changes requested"
3435
msgstr ""
3436
3437
#: bzrlib/builtins.py:5634
3438
msgid ""
3439
"* An optional bundle of revision data, so that the changes can be applied\n"
3440
" directly from the merge directive, without retrieving data from a\n"
3441
" branch."
3442
msgstr ""
3443
3444
#: bzrlib/builtins.py:5638
3445
msgid ""
3446
"`bzr send` creates a compact data set that, when applied using bzr\n"
3447
"merge, has the same effect as merging from the source branch. "
3448
msgstr ""
3449
3450
#: bzrlib/builtins.py:5641
3451
msgid ""
3452
"By default the merge directive is self-contained and can be applied to any\n"
3453
"branch containing submit_branch in its ancestory without needing access to\n"
3454
"the source branch."
3455
msgstr ""
3456
3457
#: bzrlib/builtins.py:5645
3458
msgid ""
3459
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3460
"revisions, but only a structured request to merge from the\n"
3461
"public_location. In that case the public_branch is needed and it must be\n"
3462
"up-to-date and accessible to the recipient. The public_branch is always\n"
3463
"included if known, so that people can check it later."
3464
msgstr ""
3465
3466
#: bzrlib/builtins.py:5651
3467
msgid ""
3468
"The submit branch defaults to the parent of the source branch, but can be\n"
3469
"overridden. Both submit branch and public branch will be remembered in\n"
3470
"branch.conf the first time they are used for a particular branch. The\n"
3471
"source branch defaults to that containing the working directory, but can\n"
3472
"be changed using --from."
3473
msgstr ""
3474
3475
#: bzrlib/builtins.py:5657
3476
msgid ""
3477
"Both the submit branch and the public branch follow the usual behavior with\n"
3478
"respect to --remember: If there is no default location set, the first send\n"
3479
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3480
"omit the location to use the default. To change the default, use\n"
3481
"--remember. The value will only be saved if the location can be accessed."
3482
msgstr ""
3483
3484
#: bzrlib/builtins.py:5663
3485
msgid ""
3486
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3487
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3488
"If a public location is known for the submit_branch, that location is used\n"
3489
"in the merge directive."
3490
msgstr ""
3491
3492
#: bzrlib/builtins.py:5668
3493
msgid ""
3494
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3495
"given, in which case it is sent to a file."
3496
msgstr ""
3497
3498
#: bzrlib/builtins.py:5671
3499
msgid ""
3500
"Mail is sent using your preferred mail program. This should be transparent\n"
3501
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3502
"If the preferred client can't be found (or used), your editor will be used."
3503
msgstr ""
3504
3505
#: bzrlib/builtins.py:5675
3506
msgid ""
3507
"To use a specific mail program, set the mail_client configuration option.\n"
3508
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3509
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3510
"(MacOS X's\n"
3511
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3512
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3513
"add\n"
3514
"supported clients."
3515
msgstr ""
3516
3517
#: bzrlib/builtins.py:5682
3518
msgid ""
3519
"If mail is being sent, a to address is required. This can be supplied\n"
3520
"either on the commandline, by setting the submit_to configuration\n"
3521
"option in the branch itself or the child_submit_to configuration option\n"
3522
"in the submit branch."
3523
msgstr ""
3524
3525
#: bzrlib/builtins.py:5687
3526
msgid ""
3527
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3528
"and\n"
3529
"merge directive format 2. It is significantly faster and smaller than\n"
3530
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3531
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3532
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3533
msgstr ""
3534
3535
#: bzrlib/builtins.py:5693
3536
msgid ""
3537
"The merge directives created by bzr send may be applied using bzr merge or\n"
3538
"bzr pull by specifying a file containing a merge directive as the location."
3539
msgstr ""
3540
3541
#: bzrlib/builtins.py:5696
3542
msgid ""
3543
"bzr send makes extensive use of public locations to map local locations "
3544
"into\n"
3545
"URLs that can be used by other people. See `bzr help configuration` to\n"
3546
"set them, and use `bzr info` to display them."
3547
msgstr ""
3548
3549
#: bzrlib/builtins.py:5720
3550
msgid "Write merge directive to this file or directory; use - for stdout."
3551
msgstr ""
3552
3553
#: bzrlib/builtins.py:5724
3554
msgid ""
3555
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3556
"strict disables the check."
3557
msgstr ""
3558
3559
#: bzrlib/builtins.py:5726
3560
msgid "Mail the request to this address."
3561
msgstr ""
3562
3563
#: bzrlib/builtins.py:5730
3564
msgid "Body for the email."
3565
msgstr ""
3566
3567
#: bzrlib/builtins.py:5783
3568
msgid "Do not include a bundle in the merge directive."
3569
msgstr ""
3570
3571
#: bzrlib/builtins.py:5784
3572
msgid "Do not include a preview patch in the merge directive."
3573
msgstr ""
3574
3575
#: bzrlib/builtins.py:5787
3576
msgid "Remember submit and public branch."
3577
msgstr ""
3578
3579
#: bzrlib/builtins.py:5789
3580
msgid ""
3581
"Branch to generate the submission from, rather than the one containing the "
3582
"working directory."
3583
msgstr ""
3584
3585
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3586
msgid "format"
3587
msgstr ""
3588
3589
#: bzrlib/builtins.py:5800
3590
msgid "Use the specified output format."
3591
msgstr ""
3592
3593
#: bzrlib/builtins.py:5822
3594
msgid "Create, remove or modify a tag naming a revision."
3595
msgstr ""
3596
3597
#: bzrlib/builtins.py:5824
3598
msgid ""
3599
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3600
"(--revision) option can be given -rtag:X, where X is any previously\n"
3601
"created tag."
3602
msgstr ""
3603
3604
#: bzrlib/builtins.py:5828
3605
msgid ""
3606
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3607
"along when you branch, push, pull or merge."
3608
msgstr ""
3609
3610
#: bzrlib/builtins.py:5831
3611
msgid ""
3612
"It is an error to give a tag name that already exists unless you pass\n"
3613
"--force, in which case the tag is moved to point to the new revision."
3614
msgstr ""
3615
3616
#: bzrlib/builtins.py:5834
3617
msgid ""
3618
"To rename a tag (change the name but keep it on the same revsion), run "
3619
"``bzr\n"
3620
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3621
msgstr ""
3622
3623
#: bzrlib/builtins.py:5837
3624
msgid ""
3625
"If no tag name is specified it will be determined through the \n"
3626
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3627
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3628
"details."
3629
msgstr ""
3630
3631
#: bzrlib/builtins.py:5847
3632
msgid "Delete this tag rather than placing it."
3633
msgstr ""
3634
3635
#: bzrlib/builtins.py:5850
3636
msgid "Branch in which to place the tag."
3637
msgstr ""
3638
3639
#: bzrlib/builtins.py:5852
3640
msgid "Replace existing tags."
3641
msgstr ""
3642
3643
#: bzrlib/builtins.py:5867
3644
msgid "No tag specified to delete."
3645
msgstr ""
3646
3647
#: bzrlib/builtins.py:5869
3648
#, python-format
3649
msgid "Deleted tag %s."
3650
msgstr ""
3651
3652
#: bzrlib/builtins.py:5883
3653
msgid "Please specify a tag name."
3654
msgstr ""
3655
3656
#: bzrlib/builtins.py:5891
3657
#, python-format
3658
msgid "Tag %s already exists for that revision."
3659
msgstr ""
3660
3661
#: bzrlib/builtins.py:5895
3662
#, python-format
3663
msgid "Created tag %s."
3664
msgstr ""
3665
3666
#: bzrlib/builtins.py:5897
3667
#, python-format
3668
msgid "Updated tag %s."
3669
msgstr ""
3670
3671
#: bzrlib/builtins.py:5901
3672
msgid "List tags."
3673
msgstr ""
3674
3675
#: bzrlib/builtins.py:5903
3676
msgid ""
3677
"This command shows a table of tag names and the revisions they reference."
3678
msgstr ""
3679
3680
#: bzrlib/builtins.py:5909
3681
msgid "Branch whose tags should be displayed."
3682
msgstr ""
3683
3684
#: bzrlib/builtins.py:5911
3685
msgid "Sort tags by different criteria."
3686
msgstr ""
3687
3688
#: bzrlib/builtins.py:5911
3689
msgid "Sorting"
3690
msgstr ""
3691
3692
#: bzrlib/builtins.py:5980
3693
msgid "Reconfigure the type of a bzr directory."
3694
msgstr ""
3695
3696
#: bzrlib/builtins.py:5982
3697
msgid "A target configuration must be specified."
3698
msgstr ""
3699
3700
#: bzrlib/builtins.py:5984
3701
msgid ""
3702
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3703
"The order of preference is\n"
3704
"1. For a lightweight checkout, the current bound location.\n"
3705
"2. For branches that used to be checkouts, the previously-bound location.\n"
3706
"3. The push location.\n"
3707
"4. The parent location.\n"
3708
"If none of these is available, --bind-to must be specified."
3709
msgstr ""
3710
3711
#: bzrlib/builtins.py:5998
3712
msgid "Tree type"
3713
msgstr ""
3714
3715
#: bzrlib/builtins.py:5999
3716
msgid "The relation between branch and tree."
3717
msgstr ""
3718
3719
#: bzrlib/builtins.py:6001
3720
msgid "Reconfigure to be an unbound branch with no working tree."
3721
msgstr ""
3722
3723
#: bzrlib/builtins.py:6002
3724
msgid "Reconfigure to be an unbound branch with a working tree."
3725
msgstr ""
3726
3727
#: bzrlib/builtins.py:6003
3728
msgid "Reconfigure to be a bound branch with a working tree."
3729
msgstr ""
3730
3731
#: bzrlib/builtins.py:6004
3732
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3733
msgstr ""
3734
3735
#: bzrlib/builtins.py:6009
3736
msgid "Repository type"
3737
msgstr ""
3738
3739
#: bzrlib/builtins.py:6010
3740
msgid "Location fo the repository."
3741
msgstr ""
3742
3743
#: bzrlib/builtins.py:6012
3744
msgid ""
3745
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3746
msgstr ""
3747
3748
#: bzrlib/builtins.py:6014
3749
msgid "Reconfigure to use a shared repository."
3750
msgstr ""
3751
3752
#: bzrlib/builtins.py:6018
3753
msgid "Trees in Repository"
3754
msgstr ""
3755
3756
#: bzrlib/builtins.py:6019
3757
msgid "Whether new branches in the repository have trees."
3758
msgstr ""
3759
3760
#: bzrlib/builtins.py:6021
3761
msgid ""
3762
"Reconfigure repository to create working trees on branches by default."
3763
msgstr ""
3764
3765
#: bzrlib/builtins.py:6023
3766
msgid ""
3767
"Reconfigure repository to not create working trees on branches by default."
3768
msgstr ""
3769
3770
#: bzrlib/builtins.py:6026
3771
msgid "Branch to bind checkout to."
3772
msgstr ""
3773
3774
#: bzrlib/builtins.py:6028
3775
msgid "Perform reconfiguration even if local changes will be lost."
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:6031
3779
msgid "Reconfigure a branch to be stacked on another branch."
3780
msgstr ""
3781
3782
#: bzrlib/builtins.py:6035
3783
msgid ""
3784
"Reconfigure a branch to be unstacked. This may require copying substantial "
3785
"data into it."
3786
msgstr ""
3787
3788
#: bzrlib/builtins.py:6045
3789
msgid "Can't use both --stacked-on and --unstacked"
3790
msgstr ""
3791
3792
#: bzrlib/builtins.py:6059
3793
msgid "No target configuration specified"
3794
msgstr ""
3795
3796
#: bzrlib/builtins.py:6094
3797
msgid "Set the branch of a checkout and update."
3798
msgstr ""
3799
3800
#: bzrlib/builtins.py:6096
3801
msgid ""
3802
"For lightweight checkouts, this changes the branch being referenced.\n"
3803
"For heavyweight checkouts, this checks that there are no local commits\n"
3804
"versus the current bound branch, then it makes the local branch a mirror\n"
3805
"of the new location and binds to it."
3806
msgstr ""
3807
3808
#: bzrlib/builtins.py:6101
3809
msgid ""
3810
"In both cases, the working tree is updated and uncommitted changes\n"
3811
"are merged. The user can commit or revert these as they desire."
3812
msgstr ""
3813
3814
#: bzrlib/builtins.py:6104
3815
msgid "Pending merges need to be committed or reverted before using switch."
3816
msgstr ""
3817
3818
#: bzrlib/builtins.py:6106
3819
msgid ""
3820
"The path to the branch to switch to can be specified relative to the parent\n"
3821
"directory of the current branch. For example, if you are currently in a\n"
3822
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3823
"/path/to/newbranch."
3824
msgstr ""
3825
3826
#: bzrlib/builtins.py:6111
3827
msgid ""
3828
"Bound branches use the nickname of its master branch unless it is set\n"
3829
"locally, in which case switching will update the local nickname to be\n"
3830
"that of the master."
3831
msgstr ""
3832
3833
#: bzrlib/builtins.py:6119
3834
msgid "Switch even if local commits will be lost."
3835
msgstr ""
3836
3837
#: bzrlib/builtins.py:6122
3838
msgid "Create the target branch from this one before switching to it."
3839
msgstr ""
3840
3841
#: bzrlib/builtins.py:6134
3842
msgid "You must supply either a revision or a location"
3843
msgstr ""
3844
3845
#: bzrlib/builtins.py:6145
3846
msgid "cannot create branch without source branch"
3847
msgstr ""
3848
3849
#: bzrlib/builtins.py:6209
3850
msgid "Manage filtered views."
3851
msgstr ""
3852
3853
#: bzrlib/builtins.py:6211
3854
msgid ""
3855
"Views provide a mask over the tree so that users can focus on\n"
3856
"a subset of a tree when doing their work. After creating a view,\n"
3857
"commands that support a list of files - status, diff, commit, etc -\n"
3858
"effectively have that list of files implicitly given each time.\n"
3859
"An explicit list of files can still be given but those files\n"
3860
"must be within the current view."
3861
msgstr ""
3862
3863
#: bzrlib/builtins.py:6218
3864
msgid ""
3865
"In most cases, a view has a short life-span: it is created to make\n"
3866
"a selected change and is deleted once that change is committed.\n"
3867
"At other times, you may wish to create one or more named views\n"
3868
"and switch between them."
3869
msgstr ""
3870
3871
#: bzrlib/builtins.py:6223
3872
msgid ""
3873
"To disable the current view without deleting it, you can switch to\n"
3874
"the pseudo view called ``off``. This can be useful when you need\n"
3875
"to see the whole tree for an operation or two (e.g. merge) but\n"
3876
"want to switch back to your view after that."
3877
msgstr ""
3878
3879
#: bzrlib/builtins.py:6228
3880
msgid ""
3881
":Examples:\n"
3882
" To define the current view::"
3883
msgstr ""
3884
3885
#: bzrlib/builtins.py:6231
3886
msgid " bzr view file1 dir1 ..."
3887
msgstr ""
3888
3889
#: bzrlib/builtins.py:6233
3890
msgid " To list the current view::"
3891
msgstr ""
3892
3893
#: bzrlib/builtins.py:6235
3894
msgid " bzr view"
3895
msgstr ""
3896
3897
#: bzrlib/builtins.py:6237
3898
msgid " To delete the current view::"
3899
msgstr ""
3900
3901
#: bzrlib/builtins.py:6239
3902
msgid " bzr view --delete"
3903
msgstr ""
3904
3905
#: bzrlib/builtins.py:6241
3906
msgid " To disable the current view without deleting it::"
3907
msgstr ""
3908
3909
#: bzrlib/builtins.py:6243
3910
msgid " bzr view --switch off"
3911
msgstr ""
3912
3913
#: bzrlib/builtins.py:6245
3914
msgid " To define a named view and switch to it::"
3915
msgstr ""
3916
3917
#: bzrlib/builtins.py:6247
3918
msgid " bzr view --name view-name file1 dir1 ..."
3919
msgstr ""
3920
3921
#: bzrlib/builtins.py:6249
3922
msgid " To list a named view::"
3923
msgstr ""
3924
3925
#: bzrlib/builtins.py:6251
3926
msgid " bzr view --name view-name"
3927
msgstr ""
3928
3929
#: bzrlib/builtins.py:6253
3930
msgid " To delete a named view::"
3931
msgstr ""
3932
3933
#: bzrlib/builtins.py:6255
3934
msgid " bzr view --name view-name --delete"
3935
msgstr ""
3936
3937
#: bzrlib/builtins.py:6257
3938
msgid " To switch to a named view::"
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:6259
3942
msgid " bzr view --switch view-name"
3943
msgstr ""
3944
3945
#: bzrlib/builtins.py:6261
3946
msgid " To list all views defined::"
3947
msgstr ""
3948
3949
#: bzrlib/builtins.py:6263
3950
msgid " bzr view --all"
3951
msgstr ""
3952
3953
#: bzrlib/builtins.py:6265
3954
msgid " To delete all views::"
3955
msgstr ""
3956
3957
#: bzrlib/builtins.py:6267
3958
msgid " bzr view --delete --all"
3959
msgstr ""
3960
3961
#: bzrlib/builtins.py:6274
3962
msgid "Apply list or delete action to all views."
3963
msgstr ""
3964
3965
#: bzrlib/builtins.py:6277
3966
msgid "Delete the view."
3967
msgstr ""
3968
3969
#: bzrlib/builtins.py:6280
3970
msgid "Name of the view to define, list or delete."
3971
msgstr ""
3972
3973
#: bzrlib/builtins.py:6284
3974
msgid "Name of the view to switch to."
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:6303
3978
msgid "Both --delete and a file list specified"
3979
msgstr ""
3980
3981
#: bzrlib/builtins.py:6306
3982
msgid "Both --delete and --switch specified"
3983
msgstr ""
3984
3985
#: bzrlib/builtins.py:6309
3986
msgid "Deleted all views.\n"
3987
msgstr ""
3988
3989
#: bzrlib/builtins.py:6311
3990
msgid "No current view to delete"
3991
msgstr ""
3992
3993
#: bzrlib/builtins.py:6314
3994
#, python-format
3995
msgid "Deleted '%s' view.\n"
3996
msgstr ""
3997
3998
#: bzrlib/builtins.py:6318
3999
msgid "Both --switch and a file list specified"
4000
msgstr ""
4001
4002
#: bzrlib/builtins.py:6321
4003
msgid "Both --switch and --all specified"
4004
msgstr ""
4005
4006
#: bzrlib/builtins.py:6324
4007
msgid "No current view to disable"
4008
msgstr ""
4009
4010
#: bzrlib/builtins.py:6326
4011
#, python-format
4012
msgid "Disabled '%s' view.\n"
4013
msgstr ""
4014
4015
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4016
msgid "Using '{0}' view: {1}\n"
4017
msgstr ""
4018
4019
#: bzrlib/builtins.py:6333
4020
msgid "Views defined:\n"
4021
msgstr ""
4022
4023
#: bzrlib/builtins.py:6342
4024
msgid "No views defined.\n"
4025
msgstr ""
4026
4027
#: bzrlib/builtins.py:6349
4028
msgid "Cannot change the 'off' pseudo view"
4029
msgstr ""
4030
4031
#: bzrlib/builtins.py:6357
4032
msgid "No current view.\n"
4033
msgstr ""
4034
4035
#: bzrlib/builtins.py:6360
4036
msgid "'{0}' view is: {1}\n"
4037
msgstr ""
4038
4039
#: bzrlib/builtins.py:6380
4040
msgid " <no hooks installed>\n"
4041
msgstr ""
4042
4043
#: bzrlib/builtins.py:6384
4044
msgid "Remove a branch."
4045
msgstr ""
4046
4047
#: bzrlib/builtins.py:6386
4048
msgid ""
4049
"This will remove the branch from the specified location but \n"
4050
"will keep any working tree or repository in place."
4051
msgstr ""
4052
4053
#: bzrlib/builtins.py:6391
4054
msgid " Remove the branch at repo/trunk::"
4055
msgstr ""
4056
4057
#: bzrlib/builtins.py:6393
4058
msgid " bzr remove-branch repo/trunk"
4059
msgstr ""
4060
4061
#: bzrlib/builtins.py:6408
4062
msgid "Plaintext diff output."
4063
msgstr ""
4064
4065
#: bzrlib/builtins.py:6409
4066
msgid "Temporarily set aside some changes from the current tree."
4067
msgstr ""
4068
4069
#: bzrlib/builtins.py:6411
4070
msgid ""
4071
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4072
"ie. out of the way, until a later time when you can bring them back from\n"
4073
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4074
"your working tree, and so they aren't propagated along with your branch nor\n"
4075
"will they survive its deletion."
4076
msgstr ""
4077
4078
#: bzrlib/builtins.py:6417
4079
msgid "If shelve --list is specified, previously-shelved changes are listed."
4080
msgstr ""
4081
4082
#: bzrlib/builtins.py:6419
4083
msgid ""
4084
"Shelve is intended to help separate several sets of changes that have\n"
4085
"been inappropriately mingled. If you just want to get rid of all changes\n"
4086
"and you don't need to restore them later, use revert. If you want to\n"
4087
"shelve all text changes at once, use shelve --all."
4088
msgstr ""
4089
4090
#: bzrlib/builtins.py:6424
4091
msgid ""
4092
"If filenames are specified, only the changes to those files will be\n"
4093
"shelved. Other files will be left untouched."
4094
msgstr ""
4095
4096
#: bzrlib/builtins.py:6427
4097
msgid ""
4098
"If a revision is specified, changes since that revision will be shelved."
4099
msgstr ""
4100
4101
#: bzrlib/builtins.py:6429
4102
msgid ""
4103
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4104
"restore the most recently shelved changes."
4105
msgstr ""
4106
4107
#: bzrlib/builtins.py:6432
4108
msgid ""
4109
"For complicated changes, it is possible to edit the changes in a separate\n"
4110
"editor program to decide what the file remaining in the working copy\n"
4111
"should look like. To do this, add the configuration option"
4112
msgstr ""
4113
4114
#: bzrlib/builtins.py:6436
4115
msgid " change_editor = PROGRAM @new_path @old_path"
4116
msgstr ""
4117
4118
#: bzrlib/builtins.py:6438
4119
msgid ""
4120
"where @new_path is replaced with the path of the new version of the \n"
4121
"file and @old_path is replaced with the path of the old version of \n"
4122
"the file. The PROGRAM should save the new file with the desired \n"
4123
"contents of the file in the working tree.\n"
4124
" "
4125
msgstr ""
4126
4127
#: bzrlib/builtins.py:6450
4128
msgid "Shelve all changes."
4129
msgstr ""
4130
4131
#: bzrlib/builtins.py:6452
4132
msgid "Method to use for writing diffs."
4133
msgstr ""
4134
4135
#: bzrlib/builtins.py:6452
4136
msgid "writer"
4137
msgstr ""
4138
4139
#: bzrlib/builtins.py:6456
4140
msgid "List shelved changes."
4141
msgstr ""
4142
4143
#: bzrlib/builtins.py:6458
4144
msgid "Destroy removed changes instead of shelving them."
4145
msgstr ""
4146
4147
#: bzrlib/builtins.py:6487
4148
msgid "No shelved changes."
4149
msgstr ""
4150
4151
#: bzrlib/builtins.py:6498
4152
msgid "Restore shelved changes."
4153
msgstr ""
4154
4155
#: bzrlib/builtins.py:6500
4156
msgid ""
4157
"By default, the most recently shelved changes are restored. However if you\n"
4158
"specify a shelf by id those changes will be restored instead. This works\n"
4159
"best when the changes don't depend on each other."
4160
msgstr ""
4161
4162
#: bzrlib/builtins.py:6509
4163
msgid "The action to perform."
4164
msgstr ""
4165
4166
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4167
msgid "action"
4168
msgstr ""
4169
4170
#: bzrlib/builtins.py:6511
4171
msgid "Apply changes and remove from the shelf."
4172
msgstr ""
4173
4174
#: bzrlib/builtins.py:6512
4175
msgid "Show changes, but do not apply or remove them."
4176
msgstr ""
4177
4178
#: bzrlib/builtins.py:6513
4179
msgid ""
4180
"Instead of unshelving the changes, show the diff that would result from "
4181
"unshelving."
4182
msgstr ""
4183
4184
#: bzrlib/builtins.py:6515
4185
msgid "Delete changes without applying them."
4186
msgstr ""
4187
4188
#: bzrlib/builtins.py:6516
4189
msgid "Apply changes but don't delete them."
4190
msgstr ""
4191
4192
#: bzrlib/builtins.py:6531
4193
msgid "Remove unwanted files from working tree."
4194
msgstr ""
4195
4196
#: bzrlib/builtins.py:6533
4197
msgid ""
4198
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4199
"files are never deleted."
4200
msgstr ""
4201
4202
#: bzrlib/builtins.py:6536
4203
msgid ""
4204
"Another class is 'detritus', which includes files emitted by bzr during\n"
4205
"normal operations and selftests. (The value of these files decreases with\n"
4206
"time.)"
4207
msgstr ""
4208
4209
#: bzrlib/builtins.py:6540
4210
msgid ""
4211
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4212
"flags are respected, and may be combined."
4213
msgstr ""
4214
4215
#: bzrlib/builtins.py:6543
4216
msgid "To check what clean-tree will do, use --dry-run."
4217
msgstr ""
4218
4219
#: bzrlib/builtins.py:6546
4220
msgid "Delete all ignored files."
4221
msgstr ""
4222
4223
#: bzrlib/builtins.py:6547
4224
msgid ""
4225
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4226
msgstr ""
4227
4228
#: bzrlib/builtins.py:6550
4229
msgid "Delete files unknown to bzr (default)."
4230
msgstr ""
4231
4232
#: bzrlib/builtins.py:6551
4233
msgid "Show files to delete instead of deleting them."
4234
msgstr ""
4235
4236
#: bzrlib/builtins.py:6553
4237
msgid "Do not prompt before deleting."
4238
msgstr ""
4239
4240
#: bzrlib/bundle/__init__.py:59
4241
msgid "A directory cannot be a bundle"
4242
msgstr ""
4243
4244
#: bzrlib/bundle/apply_bundle.py:40
4245
msgid "Install revisions"
4246
msgstr ""
4247
4248
#: bzrlib/bundle/commands.py:64
4249
msgid "--verbose requires a merge directive"
4250
msgstr ""
4251
4252
#: bzrlib/bundle/commands.py:67
4253
msgid "Bundle format not supported"
4254
msgstr ""
4255
4256
#: bzrlib/bundle/commands.py:77
4257
msgid "Records\n"
4258
msgstr ""
4259
4260
#: bzrlib/bundle/commands.py:81
4261
msgid "{0}: {1} ({2} multiparent)\n"
4262
msgstr ""
4263
4264
#: bzrlib/bundle/commands.py:83
4265
#, python-format
4266
msgid "unique files: %d\n"
4267
msgstr ""
4268
4269
#: bzrlib/bundle/commands.py:92
4270
msgid "Revisions\n"
4271
msgstr ""
4272
4273
#: bzrlib/bundle/commands.py:93
4274
#, python-format
4275
msgid "nicks: %s\n"
4276
msgstr ""
4277
4278
#: bzrlib/bundle/commands.py:95
4279
#, python-format
4280
msgid ""
4281
"committers: \n"
4282
"%s\n"
4283
msgstr ""
4284
4285
#: bzrlib/bundle/commands.py:103
4286
msgid "Decoded contents\n"
4287
msgstr ""
4288
4289
#: bzrlib/bundle/serializer/v4.py:327
4290
#, python-format
4291
msgid "Bundling %d revision."
4292
msgid_plural "Bundling %d revisions."
4293
msgstr[0] ""
4294
msgstr[1] ""
4295
4296
#: bzrlib/bzrdir.py:489
4297
msgid ""
4298
"making backup of {0}\n"
4299
" to {1}"
4300
msgstr ""
4301
4302
#: bzrlib/bzrdir.py:512
4303
msgid "renamed {0} to {1}"
4304
msgstr ""
4305
4306
#: bzrlib/bzrdir.py:1663
4307
#, python-format
4308
msgid ""
4309
"Source repository format does not support stacking, using format:\n"
4310
" %s"
4311
msgstr ""
4312
4313
#: bzrlib/bzrdir.py:1683
4314
#, python-format
4315
msgid ""
4316
"Source branch format does not support stacking, using format:\n"
4317
" %s"
4318
msgstr ""
4319
4320
#: bzrlib/bzrdir.py:1829
4321
msgid "starting repository conversion"
4322
msgstr ""
4323
4324
#: bzrlib/bzrdir.py:2058
4325
msgid "Using default stacking branch {0} at {1}"
4326
msgstr ""
4327
4328
#: bzrlib/check.py:108
4329
msgid "check"
4330
msgstr ""
4331
4332
#: bzrlib/check.py:110
4333
msgid "checking revisions"
4334
msgstr ""
4335
4336
#: bzrlib/check.py:112
4337
msgid "checking commit contents"
4338
msgstr ""
4339
4340
#: bzrlib/check.py:114
4341
msgid "checking file graphs"
4342
msgstr ""
4343
4344
#: bzrlib/check.py:118
4345
msgid "checking branches and trees"
4346
msgstr ""
4347
4348
#: bzrlib/check.py:205
4349
msgid "checked repository {0} format {1}"
4350
msgstr ""
4351
4352
#: bzrlib/check.py:208
4353
#, python-format
4354
msgid "%6d revisions"
4355
msgstr ""
4356
4357
#: bzrlib/check.py:209
4358
#, python-format
4359
msgid "%6d file-ids"
4360
msgstr ""
4361
4362
#: bzrlib/check.py:211
4363
#, python-format
4364
msgid "%6d unreferenced text versions"
4365
msgstr ""
4366
4367
#: bzrlib/check.py:215
4368
msgid "unreferenced version: {{{0}}} in {1}"
4369
msgstr ""
4370
4371
#: bzrlib/check.py:218
4372
#, python-format
4373
msgid "%6d revisions are missing inventory_sha1"
4374
msgstr ""
4375
4376
#: bzrlib/check.py:221
4377
#, python-format
4378
msgid "%6d revisions are mentioned but not present"
4379
msgstr ""
4380
4381
#: bzrlib/check.py:224
4382
#, python-format
4383
msgid "%6d ghost revisions"
4384
msgstr ""
4385
4386
#: bzrlib/check.py:229
4387
#, python-format
4388
msgid "%6d revisions missing parents in ancestry"
4389
msgstr ""
4390
4391
#: bzrlib/check.py:233
4392
#, python-format
4393
msgid " %s should be in the ancestry for:"
4394
msgstr ""
4395
4396
#: bzrlib/check.py:237
4397
#, python-format
4398
msgid "%6d inconsistent parents"
4399
msgstr ""
4400
4401
#: bzrlib/check.py:241
4402
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4403
msgstr ""
4404
4405
#: bzrlib/check.py:247
4406
#, python-format
4407
msgid "%6d revisions have incorrect parents in the revision index"
4408
msgstr ""
4409
4410
#: bzrlib/check.py:253
4411
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4412
msgstr ""
4413
4414
#: bzrlib/check.py:267
4415
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4416
msgstr ""
4417
4418
#: bzrlib/check.py:296
4419
msgid ""
4420
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4421
"{{{4}}}"
4422
msgstr ""
4423
4424
#: bzrlib/check.py:354
4425
#, python-format
4426
msgid "Checking branch at '%s'."
4427
msgstr ""
4428
4429
#: bzrlib/check.py:374
4430
#, python-format
4431
msgid "Checking working tree at '%s'."
4432
msgstr ""
4433
4434
#: bzrlib/check.py:427 bzrlib/check.py:441
4435
msgid "No branch found at specified location."
4436
msgstr ""
4437
4438
#: bzrlib/check.py:429 bzrlib/check.py:439
4439
msgid "No working tree found at specified location."
4440
msgstr ""
4441
4442
#: bzrlib/check.py:432
4443
#, python-format
4444
msgid "Checking repository at '%s'."
4445
msgstr ""
4446
4447
#: bzrlib/check.py:443
4448
msgid "No repository found at specified location."
4449
msgstr ""
4450
4451
#: bzrlib/clean_tree.py:63
4452
msgid "Nothing to delete."
4453
msgstr ""
4454
4455
#: bzrlib/clean_tree.py:68
4456
msgid "Are you sure you wish to delete these"
4457
msgstr ""
4458
4459
#: bzrlib/clean_tree.py:70
4460
msgid "Canceled"
4461
msgstr ""
4462
4463
#: bzrlib/clean_tree.py:107
4464
#, python-format
4465
msgid "unable to remove %s"
4466
msgstr ""
4467
4468
#: bzrlib/clean_tree.py:111
4469
msgid "deleting paths:"
4470
msgstr ""
4471
4472
#: bzrlib/clean_tree.py:125
4473
msgid "unable to remove \"{0}\": {1}."
4474
msgstr ""
4475
4476
#: bzrlib/clean_tree.py:130
4477
msgid "No files deleted."
4478
msgstr ""
4479
4480
#: bzrlib/cmd_version_info.py:47
4481
msgid "No known version info format {0}. Supported types are: {1}"
4482
msgstr ""
4483
4484
#: bzrlib/cmd_version_info.py:52
4485
msgid "Version info in Custom template-based format."
4486
msgstr ""
4487
4488
#: bzrlib/cmd_version_info.py:52
4489
msgid "Version info in Python format."
4490
msgstr ""
4491
4492
#: bzrlib/cmd_version_info.py:52
4493
msgid "Version info in RIO (simple text) format (default)."
4494
msgstr ""
4495
4496
#: bzrlib/cmd_version_info.py:53
4497
msgid "Show version information about this tree."
4498
msgstr ""
4499
4500
#: bzrlib/cmd_version_info.py:55
4501
msgid ""
4502
"You can use this command to add information about version into\n"
4503
"source code of an application. The output can be in one of the\n"
4504
"supported formats or in a custom format based on a template."
4505
msgstr ""
4506
4507
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4508
#: en/help_topics/configuration.txt:710
4509
msgid "For example::"
4510
msgstr ""
4511
4512
#: bzrlib/cmd_version_info.py:61
4513
msgid ""
4514
" bzr version-info --custom \\\n"
4515
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4516
msgstr ""
4517
4518
#: bzrlib/cmd_version_info.py:64
4519
msgid ""
4520
"will produce a C header file with formatted string containing the\n"
4521
"current revision number. Other supported variables in templates are:"
4522
msgstr ""
4523
4524
#: bzrlib/cmd_version_info.py:67
4525
msgid ""
4526
" * {date} - date of the last revision\n"
4527
" * {build_date} - current date\n"
4528
" * {revno} - revision number\n"
4529
" * {revision_id} - revision id\n"
4530
" * {branch_nick} - branch nickname\n"
4531
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4532
" otherwise 1"
4533
msgstr ""
4534
4535
#: bzrlib/cmd_version_info.py:77
4536
msgid "Select the output format."
4537
msgstr ""
4538
4539
#: bzrlib/cmd_version_info.py:81
4540
msgid "Include all possible information."
4541
msgstr ""
4542
4543
#: bzrlib/cmd_version_info.py:82
4544
msgid "Check if tree is clean."
4545
msgstr ""
4546
4547
#: bzrlib/cmd_version_info.py:84
4548
msgid "Include the revision-history."
4549
msgstr ""
4550
4551
#: bzrlib/cmd_version_info.py:86
4552
msgid "Include the last revision for each file."
4553
msgstr ""
4554
4555
#: bzrlib/cmd_version_info.py:87
4556
msgid "Template for the output."
4557
msgstr ""
4558
4559
#: bzrlib/cmd_version_info.py:101
4560
msgid "bzr version-info --revision takes exactly one revision specifier"
4561
msgstr ""
4562
4563
#: bzrlib/commands.py:228
4564
#, python-format
4565
msgid "unknown command \"%s\""
4566
msgstr ""
4567
4568
#: bzrlib/commands.py:475
4569
msgid "No help for this command."
4570
msgstr ""
4571
4572
#: bzrlib/commands.py:488
4573
#, python-format
4574
msgid ":Purpose: %s\n"
4575
msgstr ""
4576
4577
#: bzrlib/commands.py:490
4578
#, python-format
4579
msgid ""
4580
":Usage:\n"
4581
"%s\n"
4582
msgstr ""
4583
4584
#: bzrlib/commands.py:492
4585
#, python-format
4586
msgid ":Usage: %s\n"
4587
msgstr ""
4588
4589
#: bzrlib/commands.py:511
4590
#, python-format
4591
msgid ":Options:%s"
4592
msgstr ""
4593
4594
#: bzrlib/commands.py:522
4595
#, python-format
4596
msgid ""
4597
":Description:\n"
4598
" %s\n"
4599
"\n"
4600
msgstr ""
4601
4602
#: bzrlib/commands.py:532
4603
#, python-format
4604
msgid ""
4605
"See bzr help %s for more details and examples.\n"
4606
"\n"
4607
msgstr ""
4608
4609
#: bzrlib/commands.py:537
4610
msgid ":Aliases: "
4611
msgstr ""
4612
4613
#: bzrlib/commands.py:541
4614
#, python-format
4615
msgid ":From: plugin \"%s\"\n"
4616
msgstr ""
4617
4618
#: bzrlib/commands.py:553
4619
msgid ":doc:`{0} <{1}-help>`"
4620
msgstr ""
4621
4622
#: bzrlib/commands.py:557
4623
#, python-format
4624
msgid ":See also: %s"
4625
msgstr ""
4626
4627
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4628
msgid "Only ASCII permitted in option names"
4629
msgstr ""
4630
4631
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4632
msgid "command {0!r} needs one or more {1}"
4633
msgstr ""
4634
4635
#: bzrlib/commands.py:857
4636
msgid "command {0!r} requires argument {1}"
4637
msgstr ""
4638
4639
#: bzrlib/commands.py:864
4640
msgid "extra argument to command {0}: {1}"
4641
msgstr ""
4642
4643
#: bzrlib/commands.py:961
4644
#, python-format
4645
msgid "Profile data written to \"%s\"."
4646
msgstr ""
4647
4648
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4649
msgid "added"
4650
msgstr ""
4651
4652
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4653
msgid "modified"
4654
msgstr ""
4655
4656
#: bzrlib/commit.py:131
4657
#, python-format
4658
msgid "Committing%s"
4659
msgstr ""
4660
4661
#: bzrlib/commit.py:134
4662
#, python-format
4663
msgid "Committed revision %d."
4664
msgstr ""
4665
4666
#: bzrlib/commit.py:143
4667
#, python-format
4668
msgid "deleted %s"
4669
msgstr ""
4670
4671
#: bzrlib/commit.py:146
4672
#, python-format
4673
msgid "missing %s"
4674
msgstr ""
4675
4676
#: bzrlib/commit.py:511
4677
msgid ""
4678
"Conflicting tags in bound branch:\n"
4679
"{0}"
4680
msgstr ""
4681
4682
#: bzrlib/commit.py:742
4683
msgid "renamed"
4684
msgstr ""
4685
4686
#: bzrlib/commit.py:977
4687
msgid "unchanged"
4688
msgstr ""
4689
4690
#: bzrlib/commit.py:999
4691
msgid "{0} [{1}] - Stage"
4692
msgstr ""
4693
4694
#: bzrlib/commit.py:1002
4695
#, python-format
4696
msgid "%s - Stage"
4697
msgstr ""
4698
4699
#: bzrlib/commit_signature_commands.py:36
4700
msgid "Sign all commits by a given committer."
4701
msgstr ""
4702
4703
#: bzrlib/commit_signature_commands.py:38
4704
msgid ""
4705
"If location is not specified the local tree is used.\n"
4706
"If committer is not specified the default committer is used."
4707
msgstr ""
4708
4709
#: bzrlib/commit_signature_commands.py:41
4710
msgid "This does not sign commits that already have signatures."
4711
msgstr ""
4712
4713
#: bzrlib/commit_signature_commands.py:49
4714
msgid ""
4715
"Don't actually sign anything, just print the revisions that would be signed."
4716
msgstr ""
4717
4718
#: bzrlib/commit_signature_commands.py:103
4719
msgid "Verify all commit signatures."
4720
msgstr ""
4721
4722
#: bzrlib/commit_signature_commands.py:105
4723
msgid ""
4724
"Verifies that all commits in the branch are signed by known GnuPG keys."
4725
msgstr ""
4726
4727
#: bzrlib/commit_signature_commands.py:110
4728
msgid ""
4729
"Comma separated list of GPG key patterns which are acceptable for "
4730
"verification."
4731
msgstr ""
4732
4733
#: bzrlib/commit_signature_commands.py:147
4734
msgid "Cannot verify a range of non-revision-history revisions"
4735
msgstr ""
4736
4737
#: bzrlib/commit_signature_commands.py:168
4738
msgid "All commits signed with verifiable keys"
4739
msgstr ""
4740
4741
#: bzrlib/config.py:475
4742
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4743
msgstr ""
4744
4745
#: bzrlib/config.py:2499
4746
msgid "{0} is not an SI unit."
4747
msgstr ""
4748
4749
#: bzrlib/config.py:2956
4750
msgid ""
4751
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4752
"will be saved."
4753
msgstr ""
4754
4755
#: bzrlib/config.py:3100
4756
#, python-format
4757
msgid "Invalid '%s', should be of the form 'name=value'"
4758
msgstr ""
4759
4760
#: bzrlib/config.py:3969
4761
msgid "Display, set or remove a configuration option."
4762
msgstr ""
4763
4764
#: bzrlib/config.py:3971
4765
msgid "Display the active value for a given option."
4766
msgstr ""
4767
4768
#: bzrlib/config.py:3973
4769
msgid ""
4770
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4771
"matching options are displayed mentioning their scope. The active value\n"
4772
"that bzr will take into account is the first one displayed for each option."
4773
msgstr ""
4774
4775
#: bzrlib/config.py:3977
4776
msgid "If no NAME is given, --all .* is implied."
4777
msgstr ""
4778
4779
#: bzrlib/config.py:3979
4780
msgid ""
4781
"Setting a value is achieved by using name=value without spaces. The value\n"
4782
"is set in the most relevant scope and can be checked by displaying the\n"
4783
"option again."
4784
msgstr ""
4785
4786
#: bzrlib/config.py:3991
4787
msgid "Reduce the scope to the specified configuration file."
4788
msgstr ""
4789
4790
#: bzrlib/config.py:3995
4791
msgid "Display all the defined values for the matching options."
4792
msgstr ""
4793
4794
#: bzrlib/config.py:3997
4795
msgid "Remove the option from the configuration file."
4796
msgstr ""
4797
4798
#: bzrlib/conflicts.py:50
4799
msgid "List files with conflicts."
4800
msgstr ""
4801
4802
#: bzrlib/conflicts.py:57
4803
msgid ""
4804
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4805
"is supplied, the pathnames of files with text conflicts are listed,\n"
4806
"instead. (This is useful for editing all files with text conflicts.)"
4807
msgstr ""
4808
4809
#: bzrlib/conflicts.py:61
4810
msgid "Use bzr resolve when you have fixed a problem."
4811
msgstr ""
4812
4813
#: bzrlib/conflicts.py:66
4814
msgid "List paths of files with text conflicts."
4815
msgstr ""
4816
4817
#: bzrlib/conflicts.py:85
4818
msgid "Marks the conflict as resolved."
4819
msgstr ""
4820
4821
#: bzrlib/conflicts.py:88
4822
msgid "Resolve the conflict preserving the version in the working tree."
4823
msgstr ""
4824
4825
#: bzrlib/conflicts.py:91
4826
msgid "Resolve the conflict taking the merged version into account."
4827
msgstr ""
4828
4829
#: bzrlib/conflicts.py:98
4830
msgid "How to resolve the conflict."
4831
msgstr ""
4832
4833
#: bzrlib/conflicts.py:104
4834
msgid "Mark a conflict as resolved."
4835
msgstr ""
4836
4837
#: bzrlib/conflicts.py:111
4838
msgid ""
4839
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4840
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4841
"as\n"
4842
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4843
msgstr ""
4844
4845
#: bzrlib/conflicts.py:119
4846
msgid "Resolve all conflicts in this tree."
4847
msgstr ""
4848
4849
#: bzrlib/conflicts.py:126
4850
msgid "If --all is specified, no FILE may be provided"
4851
msgstr ""
4852
4853
#: bzrlib/conflicts.py:151
4854
#, python-format
4855
msgid "%d conflict auto-resolved."
4856
msgid_plural "%d conflicts auto-resolved."
4857
msgstr[0] ""
4858
msgstr[1] ""
4859
4860
#: bzrlib/conflicts.py:154
4861
msgid "Remaining conflicts:"
4862
msgstr ""
4863
4864
#: bzrlib/conflicts.py:159
4865
msgid "All conflicts resolved."
4866
msgstr ""
4867
4868
#: bzrlib/conflicts.py:168
4869
msgid "{0} conflict resolved, {1} remaining"
4870
msgid_plural "{0} conflicts resolved, {1} remaining"
4871
msgstr[0] ""
4872
msgstr[1] ""
4873
4874
#: bzrlib/controldir.py:698
4875
msgid "{0} is{1} redirected to {2}"
4876
msgstr ""
4877
4878
#: bzrlib/diff.py:399
4879
#, python-format
4880
msgid "*** Ignoring files outside view. View is %s"
4881
msgstr ""
4882
4883
#: bzrlib/errors.py:157
4884
msgid "The tree builder is already building a tree."
4885
msgstr ""
4886
4887
#: bzrlib/errors.py:178
4888
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4889
msgstr ""
4890
4891
#: bzrlib/errors.py:197
4892
msgid ""
4893
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4894
"versions \"%(minimum)s\" to \"%(current)s\"."
4895
msgstr ""
4896
4897
#: bzrlib/errors.py:209
4898
msgid "The transport '%(transport)s' is only accessible within this process."
4899
msgstr ""
4900
4901
#: bzrlib/errors.py:227
4902
msgid "Invalid revision number %(revno)s"
4903
msgstr ""
4904
4905
#: bzrlib/errors.py:236
4906
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4907
msgstr ""
4908
4909
#: bzrlib/errors.py:247
4910
msgid "Reserved revision-id {%(revision_id)s}"
4911
msgstr ""
4912
4913
#: bzrlib/errors.py:261
4914
msgid "There is no public branch set for \"%(branch_url)s\"."
4915
msgstr ""
4916
4917
#: bzrlib/errors.py:271
4918
msgid ""
4919
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4920
"obtain a list of topics."
4921
msgstr ""
4922
4923
#: bzrlib/errors.py:280
4924
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4925
msgstr ""
4926
4927
#: bzrlib/errors.py:290
4928
msgid ""
4929
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4930
msgstr ""
4931
4932
#: bzrlib/errors.py:299
4933
msgid "The branch '%(branch)s' is not stacked."
4934
msgstr ""
4935
4936
#: bzrlib/errors.py:313
4937
msgid "No WorkingTree exists for \"%(base)s\"."
4938
msgstr ""
4939
4940
#: bzrlib/errors.py:322
4941
msgid "Not currently building a tree."
4942
msgstr ""
4943
4944
#: bzrlib/errors.py:327
4945
msgid "%(url)s is not a local path."
4946
msgstr ""
4947
4948
#: bzrlib/errors.py:355
4949
msgid "%(not_locked)r is not write locked but needs to be."
4950
msgstr ""
4951
4952
#: bzrlib/errors.py:363
4953
msgid "Error in command line options"
4954
msgstr ""
4955
4956
#: bzrlib/errors.py:368
4957
msgid "%(value)s is not an index of type %(_type)s."
4958
msgstr ""
4959
4960
#: bzrlib/errors.py:378
4961
msgid "Error in data for index %(value)s."
4962
msgstr ""
4963
4964
#: bzrlib/errors.py:387
4965
msgid "The key '%(key)s' is already in index '%(index)s'."
4966
msgstr ""
4967
4968
#: bzrlib/errors.py:397
4969
msgid "The key '%(key)s' is not a valid key."
4970
msgstr ""
4971
4972
#: bzrlib/errors.py:406
4973
msgid "Could not parse options for index %(value)s."
4974
msgstr ""
4975
4976
#: bzrlib/errors.py:415
4977
msgid "The value '%(value)s' is not a valid value."
4978
msgstr ""
4979
4980
#: bzrlib/errors.py:443
4981
msgid "Generic path error: %(path)r%(extra)s)"
4982
msgstr ""
4983
4984
#: bzrlib/errors.py:456
4985
msgid "No such file: %(path)r%(extra)s"
4986
msgstr ""
4987
4988
#: bzrlib/errors.py:461
4989
msgid "File exists: %(path)r%(extra)s"
4990
msgstr ""
4991
4992
#: bzrlib/errors.py:467
4993
msgid ""
4994
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
4995
"after to tell bzr about a rename that has already happened)%(extra)s"
4996
msgstr ""
4997
4998
#: bzrlib/errors.py:483
4999
msgid "\"%(path)s\" is not a directory %(extra)s"
5000
msgstr ""
5001
5002
#: bzrlib/errors.py:488
5003
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5004
msgstr ""
5005
5006
#: bzrlib/errors.py:493
5007
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5008
msgstr ""
5009
5010
#: bzrlib/errors.py:498
5011
msgid "Hard-linking \"%(path)s\" is not supported"
5012
msgstr ""
5013
5014
#: bzrlib/errors.py:513
5015
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5016
msgstr ""
5017
5018
#: bzrlib/errors.py:518
5019
msgid "Permission denied: \"%(path)s\"%(extra)s"
5020
msgstr ""
5021
5022
#: bzrlib/errors.py:523
5023
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5024
msgstr ""
5025
5026
#: bzrlib/errors.py:528
5027
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5028
msgstr ""
5029
5030
#: bzrlib/errors.py:539
5031
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5032
msgstr ""
5033
5034
#: bzrlib/errors.py:561
5035
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5036
msgstr ""
5037
5038
#: bzrlib/errors.py:571
5039
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5040
msgstr ""
5041
5042
#: bzrlib/errors.py:579
5043
msgid ""
5044
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5045
"upgrade the branch to permit branch stacking."
5046
msgstr ""
5047
5048
#: bzrlib/errors.py:590
5049
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5050
msgstr ""
5051
5052
#: bzrlib/errors.py:600
5053
msgid ""
5054
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5055
"need to upgrade the repository to permit branch stacking."
5056
msgstr ""
5057
5058
#: bzrlib/errors.py:611
5059
msgid "Error reading from %(path)r."
5060
msgstr ""
5061
5062
#: bzrlib/errors.py:630
5063
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5064
msgstr ""
5065
5066
#: bzrlib/errors.py:646
5067
msgid "Path \"%(path)s\" is not unicode normalized"
5068
msgstr ""
5069
5070
#: bzrlib/errors.py:654
5071
msgid "Not a branch: \"%(path)s\"%(detail)s."
5072
msgstr ""
5073
5074
#: bzrlib/errors.py:696
5075
msgid "No submit branch available for branch \"%(path)s\""
5076
msgstr ""
5077
5078
#: bzrlib/errors.py:705
5079
msgid "Already a branch: \"%(path)s\"."
5080
msgstr ""
5081
5082
#: bzrlib/errors.py:711
5083
msgid ""
5084
"Directory contains a branch, but no working tree (use bzr checkout if you "
5085
"wish to build a working tree): \"%(path)s\""
5086
msgstr ""
5087
5088
#: bzrlib/errors.py:716
5089
msgid ""
5090
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5091
msgstr ""
5092
5093
#: bzrlib/errors.py:726
5094
msgid ""
5095
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5096
msgstr ""
5097
5098
#: bzrlib/errors.py:736
5099
msgid "No repository present: \"%(path)s\""
5100
msgstr ""
5101
5102
#: bzrlib/errors.py:743
5103
msgid ""
5104
"Unsupported branch format: %(format)s\n"
5105
"Please run 'bzr upgrade'"
5106
msgstr ""
5107
5108
#: bzrlib/errors.py:749
5109
msgid "Unknown %(kind)s format: %(format)r"
5110
msgstr ""
5111
5112
#: bzrlib/errors.py:758
5113
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5114
msgstr ""
5115
5116
#: bzrlib/errors.py:768
5117
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5118
msgstr ""
5119
5120
#: bzrlib/errors.py:783
5121
msgid ""
5122
"%(target)s\n"
5123
"is not compatible with\n"
5124
"%(source)s\n"
5125
"%(details)s"
5126
msgstr ""
5127
5128
#: bzrlib/errors.py:799
5129
msgid "Revision is not compatible with %(repo_format)s"
5130
msgstr ""
5131
5132
#: bzrlib/errors.py:809
5133
msgid "%(context_info)s%(path)s is already versioned."
5134
msgstr ""
5135
5136
#: bzrlib/errors.py:830
5137
msgid "%(context_info)s%(path)s is not versioned."
5138
msgstr ""
5139
5140
#: bzrlib/errors.py:851
5141
msgid "Path(s) are not versioned: %(paths_as_string)s"
5142
msgstr ""
5143
5144
#: bzrlib/errors.py:862
5145
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5146
msgstr ""
5147
5148
#: bzrlib/errors.py:881
5149
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5150
msgstr ""
5151
5152
#: bzrlib/errors.py:889
5153
msgid ""
5154
"Filename %(filename)r is not valid in your current filesystem encoding "
5155
"%(fs_encoding)s"
5156
msgstr ""
5157
5158
#: bzrlib/errors.py:900
5159
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5160
msgstr ""
5161
5162
#: bzrlib/errors.py:918
5163
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5164
msgstr ""
5165
5166
#: bzrlib/errors.py:957
5167
msgid "Cannot lock %(lock)s: %(why)s"
5168
msgstr ""
5169
5170
#: bzrlib/errors.py:967
5171
msgid ""
5172
"A transaction related operation was attempted after the transaction finished."
5173
msgstr ""
5174
5175
#: bzrlib/errors.py:994
5176
msgid "Cannot lock: transport is read only: %(transport)s"
5177
msgstr ""
5178
5179
#: bzrlib/errors.py:1002
5180
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5181
msgstr ""
5182
5183
#: bzrlib/errors.py:1013
5184
msgid ""
5185
"Lock was broken while still open: %(lock)s - check storage consistency!"
5186
msgstr ""
5187
5188
#: bzrlib/errors.py:1024
5189
msgid ""
5190
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5191
"%(holder)r, wanted to break %(target)r"
5192
msgstr ""
5193
5194
#: bzrlib/errors.py:1036
5195
msgid ""
5196
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5197
"Use 'bzr break-lock' to clear it"
5198
msgstr ""
5199
5200
#: bzrlib/errors.py:1049
5201
msgid "Lock not held: %(lock)s"
5202
msgstr ""
5203
5204
#: bzrlib/errors.py:1078
5205
msgid "No changes to commit"
5206
msgstr ""
5207
5208
#: bzrlib/errors.py:1083
5209
msgid ""
5210
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5211
msgstr ""
5212
5213
#: bzrlib/errors.py:1093
5214
msgid ""
5215
"Excluding paths during commit is not supported by repository at "
5216
"%(repository)r."
5217
msgstr ""
5218
5219
#: bzrlib/errors.py:1102
5220
msgid ""
5221
"The specified commit message contains characters unsupported by the current "
5222
"encoding."
5223
msgstr ""
5224
5225
#: bzrlib/errors.py:1108
5226
msgid "Upgrade URL cannot work with readonly URLs."
5227
msgstr ""
5228
5229
#: bzrlib/errors.py:1113
5230
msgid "The branch format %(format)s is already at the most recent format."
5231
msgstr ""
5232
5233
#: bzrlib/errors.py:1136
5234
msgid "Option --change does not accept revision ranges"
5235
msgstr ""
5236
5237
#: bzrlib/errors.py:1141
5238
msgid "No namespace registered for string: %(spec)r"
5239
msgstr ""
5240
5241
#: bzrlib/errors.py:1160
5242
msgid ""
5243
"Requested revision: '%(spec)s' does not exist in branch: "
5244
"%(branch_url)s%(extra)s"
5245
msgstr ""
5246
5247
#: bzrlib/errors.py:1174
5248
msgid ""
5249
"Operation denied because it would change the main history, which is not "
5250
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5251
msgstr ""
5252
5253
#: bzrlib/errors.py:1185
5254
msgid ""
5255
"These branches have diverged. Use the missing command to see how.\n"
5256
"Use the merge command to reconcile them."
5257
msgstr ""
5258
5259
#: bzrlib/errors.py:1205
5260
msgid ""
5261
"Branches have no common ancestor, and no merge base revision was specified."
5262
msgstr ""
5263
5264
#: bzrlib/errors.py:1211
5265
msgid ""
5266
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5267
msgstr ""
5268
5269
#: bzrlib/errors.py:1217
5270
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5271
msgstr ""
5272
5273
#: bzrlib/errors.py:1226
5274
msgid ""
5275
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5276
msgstr ""
5277
5278
#: bzrlib/errors.py:1235
5279
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5280
msgstr ""
5281
5282
#: bzrlib/errors.py:1244
5283
msgid "Branch %(branch)s has no commits."
5284
msgstr ""
5285
5286
#: bzrlib/errors.py:1262
5287
msgid ""
5288
"Bound branch %(branch)s is out of date with master branch "
5289
"%(master)s.%(extra_help)s"
5290
msgstr ""
5291
5292
#: bzrlib/errors.py:1274
5293
msgid ""
5294
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5295
"bound to %(remote)s."
5296
msgstr ""
5297
5298
#: bzrlib/errors.py:1286
5299
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5300
msgstr ""
5301
5302
#: bzrlib/errors.py:1295
5303
msgid ""
5304
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5305
"%(error)s"
5306
msgstr ""
5307
5308
#: bzrlib/errors.py:1307
5309
msgid "Error in processing weave: %(msg)s"
5310
msgstr ""
5311
5312
#: bzrlib/errors.py:1316
5313
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5314
msgstr ""
5315
5316
#: bzrlib/errors.py:1327
5317
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5318
msgstr ""
5319
5320
#: bzrlib/errors.py:1337
5321
msgid "Weave invariant violated: %(what)s"
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:1346
5325
msgid "Parents are mismatched between two revisions. %(msg)s"
5326
msgstr ""
5327
5328
#: bzrlib/errors.py:1368
5329
msgid ""
5330
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5331
"%(weave_b)s"
5332
msgstr ""
5333
5334
#: bzrlib/errors.py:1380
5335
msgid "Versioned file error"
5336
msgstr ""
5337
5338
#: bzrlib/errors.py:1385
5339
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5340
msgstr ""
5341
5342
#: bzrlib/errors.py:1395
5343
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5344
msgstr ""
5345
5346
#: bzrlib/errors.py:1405
5347
msgid "Text did not match its checksum: %(msg)s"
5348
msgstr ""
5349
5350
#: bzrlib/errors.py:1531
5351
msgid "Export format %(format)r not supported"
5352
msgstr ""
5353
5354
#: bzrlib/errors.py:1540
5355
msgid "Transport error: %(msg)s %(orig_error)s"
5356
msgstr ""
5357
5358
#: bzrlib/errors.py:1566
5359
msgid "Generic bzr smart protocol error: %(details)s"
5360
msgstr ""
5361
5362
#: bzrlib/errors.py:1574
5363
msgid "Received bad protocol version marker: %(marker)r"
5364
msgstr ""
5365
5366
#: bzrlib/errors.py:1606
5367
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5368
msgstr ""
5369
5370
#: bzrlib/errors.py:1611
5371
msgid "Connection error: %(msg)s %(orig_error)s"
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:1616
5375
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5376
msgstr ""
5377
5378
#: bzrlib/errors.py:1637
5379
msgid "Connection closed: %(msg)s %(orig_error)s"
5380
msgstr ""
5381
5382
#: bzrlib/errors.py:1642
5383
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5384
msgstr ""
5385
5386
#: bzrlib/errors.py:1647
5387
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5388
msgstr ""
5389
5390
#: bzrlib/errors.py:1657
5391
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5392
msgstr ""
5393
5394
#: bzrlib/errors.py:1672
5395
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5396
msgstr ""
5397
5398
#: bzrlib/errors.py:1686
5399
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5400
msgstr ""
5401
5402
#: bzrlib/errors.py:1694
5403
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5404
msgstr ""
5405
5406
#: bzrlib/errors.py:1703
5407
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5408
msgstr ""
5409
5410
#: bzrlib/errors.py:1717
5411
msgid "Too many redirections"
5412
msgstr ""
5413
5414
#: bzrlib/errors.py:1722
5415
msgid "Working tree has conflicts."
5416
msgstr ""
5417
5418
#: bzrlib/errors.py:1726
5419
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5420
msgstr ""
5421
5422
#: bzrlib/errors.py:1735
5423
msgid ""
5424
"Error(s) parsing config file %(filename)s:\n"
5425
"%(errors)s"
5426
msgstr ""
5427
5428
#: bzrlib/errors.py:1746
5429
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5430
msgstr ""
5431
5432
#: bzrlib/errors.py:1754
5433
msgid "%(username)r does not seem to contain a reasonable email address"
5434
msgstr ""
5435
5436
#: bzrlib/errors.py:1763
5437
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5438
msgstr ""
5439
5440
#: bzrlib/errors.py:1771
5441
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5442
msgstr ""
5443
5444
#: bzrlib/errors.py:1779
5445
msgid "Unable to import library \"%(library)s\": %(error)s"
5446
msgstr ""
5447
5448
#: bzrlib/errors.py:1787
5449
msgid "python-gpgme is not installed, it is needed to verify signatures"
5450
msgstr ""
5451
5452
#: bzrlib/errors.py:1795
5453
msgid ""
5454
"The working tree for %(basedir)s has changed since the last commit, but "
5455
"weave merge requires that it be unchanged"
5456
msgstr ""
5457
5458
#: bzrlib/errors.py:1805
5459
msgid ""
5460
"Can't reprocess and show base, because reprocessing obscures the "
5461
"relationship of conflicting lines to the base"
5462
msgstr ""
5463
5464
#: bzrlib/errors.py:1811
5465
msgid "Cycle in graph %(graph)r"
5466
msgstr ""
5467
5468
#: bzrlib/errors.py:1839
5469
msgid "File %(filename)s is not conflicted."
5470
msgstr ""
5471
5472
#: bzrlib/errors.py:1861
5473
msgid "No bundle was found in \"%(filename)s\"."
5474
msgstr ""
5475
5476
#: bzrlib/errors.py:1870
5477
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5478
msgstr ""
5479
5480
#: bzrlib/errors.py:1880
5481
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5482
msgstr ""
5483
5484
#: bzrlib/errors.py:1893
5485
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5486
msgstr ""
5487
5488
#: bzrlib/errors.py:1903
5489
msgid "Key %(key)s is already present in map"
5490
msgstr ""
5491
5492
#: bzrlib/errors.py:1908
5493
msgid "The prefix %(prefix)s is in the help search path twice."
5494
msgstr ""
5495
5496
#: bzrlib/errors.py:1918
5497
msgid ""
5498
"No final name for trans_id %(trans_id)r\n"
5499
"file-id: %(file_id)r\n"
5500
"root trans-id: %(root_trans_id)r\n"
5501
msgstr ""
5502
5503
#: bzrlib/errors.py:1950
5504
msgid "Attempt to reuse a transform that has already been applied."
5505
msgstr ""
5506
5507
#: bzrlib/errors.py:1955
5508
msgid "Moving the root directory is not supported at this time"
5509
msgstr ""
5510
5511
#: bzrlib/errors.py:1960
5512
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5513
msgstr ""
5514
5515
#: bzrlib/errors.py:1971
5516
msgid ""
5517
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5518
msgstr ""
5519
5520
#: bzrlib/errors.py:2007
5521
msgid ""
5522
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5523
msgstr ""
5524
5525
#: bzrlib/errors.py:2037
5526
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5527
msgstr ""
5528
5529
#: bzrlib/errors.py:2045
5530
msgid "Nothing to merge."
5531
msgstr ""
5532
5533
#: bzrlib/errors.py:2050
5534
msgid "Format %(format)s cannot be initialised by this version of bzr."
5535
msgstr ""
5536
5537
#: bzrlib/errors.py:2059
5538
msgid ""
5539
"Cannot convert from format %(from_format)s to format %(format)s. "
5540
"%(problem)s"
5541
msgstr ""
5542
5543
#: bzrlib/errors.py:2071
5544
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5545
msgstr ""
5546
5547
#: bzrlib/errors.py:2079
5548
msgid "%(exe_name)s could not be found on this machine"
5549
msgstr ""
5550
5551
#: bzrlib/errors.py:2087
5552
msgid "Diff is not installed on this machine: %(msg)s"
5553
msgstr ""
5554
5555
#: bzrlib/errors.py:2095
5556
msgid "Diff3 is not installed on this machine."
5557
msgstr ""
5558
5559
#: bzrlib/errors.py:2101
5560
msgid "The content being inserted is already present."
5561
msgstr ""
5562
5563
#: bzrlib/errors.py:2106
5564
msgid ""
5565
"This tree contains left-over files from a failed operation.\n"
5566
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5567
"to\n"
5568
" keep, and delete it when you are done."
5569
msgstr ""
5570
5571
#: bzrlib/errors.py:2117
5572
msgid ""
5573
"This tree contains left-over files from a failed operation.\n"
5574
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5575
" wish to keep, and delete it when you are done."
5576
msgstr ""
5577
5578
#: bzrlib/errors.py:2127
5579
msgid ""
5580
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5581
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5582
"to\n"
5583
" keep, and delete it when you are done."
5584
msgstr ""
5585
5586
#: bzrlib/errors.py:2138
5587
msgid ""
5588
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5589
"examine %(pending_deletion)s to see if it contains any files you wish to "
5590
"keep, and delete it when you are done."
5591
msgstr ""
5592
5593
#: bzrlib/errors.py:2148
5594
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5595
msgstr ""
5596
5597
#: bzrlib/errors.py:2162
5598
msgid ""
5599
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5600
msgstr ""
5601
5602
#: bzrlib/errors.py:2175
5603
msgid "Error in merge modified format"
5604
msgstr ""
5605
5606
#: bzrlib/errors.py:2180
5607
msgid "Format error in conflict listings"
5608
msgstr ""
5609
5610
#: bzrlib/errors.py:2184
5611
msgid ""
5612
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5613
"Error: %(description)s"
5614
msgstr ""
5615
5616
#: bzrlib/errors.py:2195
5617
msgid ""
5618
"An error has been detected in the repository %(repo_path)s.\n"
5619
"Please run bzr reconcile on this repository."
5620
msgstr ""
5621
5622
#: bzrlib/errors.py:2206
5623
msgid ""
5624
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5625
"reason: %(reason)s"
5626
msgstr ""
5627
5628
#: bzrlib/errors.py:2219
5629
msgid ""
5630
"An inconsistent delta was supplied: %(delta)r\n"
5631
"reason: %(reason)s"
5632
msgstr ""
5633
5634
#: bzrlib/errors.py:2231
5635
msgid "To use this feature you must upgrade your branch at %(path)s."
5636
msgstr ""
5637
5638
#: bzrlib/errors.py:2240
5639
msgid "To use this feature you must upgrade your repository at %(path)s."
5640
msgstr ""
5641
5642
#: bzrlib/errors.py:2245
5643
msgid ""
5644
"To use this feature you must upgrade your branch at %(path)s to a format "
5645
"which supports rich roots."
5646
msgstr ""
5647
5648
#: bzrlib/errors.py:2251
5649
msgid "Cannot perform local-only commits on unbound branches."
5650
msgstr ""
5651
5652
#: bzrlib/errors.py:2256
5653
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5654
msgstr ""
5655
5656
#: bzrlib/errors.py:2277
5657
msgid "Ghost tags not supported by format %(format)r."
5658
msgstr ""
5659
5660
#: bzrlib/errors.py:2285
5661
msgid "File is binary but should be text."
5662
msgstr ""
5663
5664
#: bzrlib/errors.py:2290
5665
msgid "The path %(path)s is not permitted on this platform"
5666
msgstr ""
5667
5668
#: bzrlib/errors.py:2299
5669
msgid ""
5670
"Testament did not match expected value.\n"
5671
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5672
" {%(measured)s}"
5673
msgstr ""
5674
5675
#: bzrlib/errors.py:2311
5676
msgid "Not a bzr revision-bundle: %(text)r"
5677
msgstr ""
5678
5679
#: bzrlib/errors.py:2320
5680
msgid "Bad bzr revision-bundle: %(text)r"
5681
msgstr ""
5682
5683
#: bzrlib/errors.py:2329
5684
msgid "Malformed bzr revision-bundle header: %(text)r"
5685
msgstr ""
5686
5687
#: bzrlib/errors.py:2334
5688
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5689
msgstr ""
5690
5691
#: bzrlib/errors.py:2339
5692
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5693
msgstr ""
5694
5695
#: bzrlib/errors.py:2344
5696
msgid "End of line marker was not \\n in bzr revision-bundle"
5697
msgstr ""
5698
5699
#: bzrlib/errors.py:2354
5700
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5701
msgstr ""
5702
5703
#: bzrlib/errors.py:2364
5704
msgid "Root class for inventory serialization errors"
5705
msgstr ""
5706
5707
#: bzrlib/errors.py:2368
5708
msgid ""
5709
"The inventory was not in the expected format:\n"
5710
" %(msg)s"
5711
msgstr ""
5712
5713
#: bzrlib/errors.py:2377
5714
msgid "This operation requires rich root data storage"
5715
msgstr ""
5716
5717
#: bzrlib/errors.py:2390
5718
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5719
msgstr ""
5720
5721
#: bzrlib/errors.py:2399
5722
msgid ""
5723
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5724
"variable."
5725
msgstr ""
5726
5727
#: bzrlib/errors.py:2406
5728
msgid ""
5729
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5730
"ghost at {%(ghost_revision_id)s}"
5731
msgstr ""
5732
5733
#: bzrlib/errors.py:2416
5734
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5735
msgstr ""
5736
5737
#: bzrlib/errors.py:2467
5738
msgid ""
5739
"A merge directive must provide either a bundle or a public branch location."
5740
msgstr ""
5741
5742
#: bzrlib/errors.py:2474
5743
msgid "Bad merge directive payload %(start)r"
5744
msgstr ""
5745
5746
#: bzrlib/errors.py:2484
5747
msgid "Preview patch does not match requested changes."
5748
msgstr ""
5749
5750
#: bzrlib/errors.py:2490
5751
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5752
msgstr ""
5753
5754
#: bzrlib/errors.py:2500
5755
msgid ""
5756
"Your branch does not have all of the revisions required in order to merge "
5757
"this merge directive and the target location specified in the merge "
5758
"directive is not a branch: %(location)s."
5759
msgstr ""
5760
5761
#: bzrlib/errors.py:2512
5762
msgid "Unsupported entry kind %(kind)s"
5763
msgstr ""
5764
5765
#: bzrlib/errors.py:2520
5766
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5767
msgstr ""
5768
5769
#: bzrlib/errors.py:2530
5770
msgid "Subsume target %(other_tree)s needs to be upgraded."
5771
msgstr ""
5772
5773
#: bzrlib/errors.py:2549
5774
msgid "No such tag: %(tag_name)s"
5775
msgstr ""
5776
5777
#: bzrlib/errors.py:2557
5778
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5779
msgstr ""
5780
5781
#: bzrlib/errors.py:2566
5782
msgid "Tag %(tag_name)s already exists."
5783
msgstr ""
5784
5785
#: bzrlib/errors.py:2574
5786
msgid ""
5787
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5788
"bugs\" for more information on this feature."
5789
msgstr ""
5790
5791
#: bzrlib/errors.py:2584
5792
msgid ""
5793
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5794
msgstr ""
5795
5796
#: bzrlib/errors.py:2594
5797
msgid ""
5798
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5799
msgstr ""
5800
5801
#: bzrlib/errors.py:2604
5802
msgid "Invalid line in bugs property: '%(line)s'"
5803
msgstr ""
5804
5805
#: bzrlib/errors.py:2612
5806
msgid "Invalid bug status: '%(status)s'"
5807
msgstr ""
5808
5809
#: bzrlib/errors.py:2620
5810
msgid "Could not understand response from smart server: %(response_tuple)r"
5811
msgstr ""
5812
5813
#: bzrlib/errors.py:2659
5814
msgid "Server sent an unexpected error: %(error_tuple)r"
5815
msgstr ""
5816
5817
#: bzrlib/errors.py:2678
5818
msgid "Unrecognised container format: %(container_format)r"
5819
msgstr ""
5820
5821
#: bzrlib/errors.py:2686
5822
msgid "Unexpected end of container stream"
5823
msgstr ""
5824
5825
#: bzrlib/errors.py:2691
5826
msgid "Unknown record type: %(record_type)r"
5827
msgstr ""
5828
5829
#: bzrlib/errors.py:2699
5830
msgid "Invalid record: %(reason)s"
5831
msgstr ""
5832
5833
#: bzrlib/errors.py:2707
5834
msgid "Container has data after end marker: %(excess)r"
5835
msgstr ""
5836
5837
#: bzrlib/errors.py:2715
5838
msgid "Container has multiple records with the same name: %(name)s"
5839
msgstr ""
5840
5841
#: bzrlib/errors.py:2728
5842
msgid "Corrupt or incompatible data stream: %(reason)s"
5843
msgstr ""
5844
5845
#: bzrlib/errors.py:2736
5846
msgid "SMTP error: %(error)s"
5847
msgstr ""
5848
5849
#: bzrlib/errors.py:2744
5850
msgid "No message supplied."
5851
msgstr ""
5852
5853
#: bzrlib/errors.py:2749
5854
msgid "No mail-to address (--mail-to) or output (-o) specified."
5855
msgstr ""
5856
5857
#: bzrlib/errors.py:2754
5858
msgid "Unknown mail client: %(mail_client)s"
5859
msgstr ""
5860
5861
#: bzrlib/errors.py:2762
5862
msgid ""
5863
"Unable to find mail client with the following names: "
5864
"%(mail_command_list_string)s"
5865
msgstr ""
5866
5867
#: bzrlib/errors.py:2772
5868
msgid "SMTP connection to %(host)s refused"
5869
msgstr ""
5870
5871
#: bzrlib/errors.py:2781
5872
msgid "Please specify smtp_server. No server at default %(host)s."
5873
msgstr ""
5874
5875
#: bzrlib/errors.py:2795
5876
msgid ""
5877
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5878
"reconfigure."
5879
msgstr ""
5880
5881
#: bzrlib/errors.py:2807
5882
msgid "'%(display_url)s' is already a branch."
5883
msgstr ""
5884
5885
#: bzrlib/errors.py:2812
5886
msgid "'%(display_url)s' is already a tree."
5887
msgstr ""
5888
5889
#: bzrlib/errors.py:2817
5890
msgid "'%(display_url)s' is already a checkout."
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:2822
5894
msgid "'%(display_url)s' is already a lightweight checkout."
5895
msgstr ""
5896
5897
#: bzrlib/errors.py:2827
5898
msgid "'%(display_url)s' is already using a shared repository."
5899
msgstr ""
5900
5901
#: bzrlib/errors.py:2832
5902
msgid "'%(display_url)s' is already standalone."
5903
msgstr ""
5904
5905
#: bzrlib/errors.py:2837
5906
msgid "Shared repository '%(display_url)s' already creates working trees."
5907
msgstr ""
5908
5909
#: bzrlib/errors.py:2843
5910
msgid ""
5911
"Shared repository '%(display_url)s' already doesn't create working trees."
5912
msgstr ""
5913
5914
#: bzrlib/errors.py:2849
5915
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:2854
5919
msgid "No location could be found to bind to at %(display_url)s."
5920
msgstr ""
5921
5922
#: bzrlib/errors.py:2859
5923
msgid ""
5924
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5925
"status).%(more)s"
5926
msgstr ""
5927
5928
#: bzrlib/errors.py:2878
5929
msgid ""
5930
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5931
"list).%(more)s"
5932
msgstr ""
5933
5934
#: bzrlib/errors.py:2884
5935
msgid "Variable {%(name)s} is not available."
5936
msgstr ""
5937
5938
#: bzrlib/errors.py:2892
5939
msgid "No template specified."
5940
msgstr ""
5941
5942
#: bzrlib/errors.py:2897
5943
msgid "Unable to create symlink %(path_str)son this platform"
5944
msgstr ""
5945
5946
#: bzrlib/errors.py:2912
5947
msgid ""
5948
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5949
"\"original\", \"local\"."
5950
msgstr ""
5951
5952
#: bzrlib/errors.py:2946
5953
msgid ""
5954
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5955
msgstr ""
5956
5957
#: bzrlib/errors.py:2958
5958
msgid "The \"%(config_id)s\" configuration does not exist."
5959
msgstr ""
5960
5961
#: bzrlib/errors.py:2966
5962
msgid "The \"%(option_name)s\" configuration option does not exist."
5963
msgstr ""
5964
5965
#: bzrlib/errors.py:2974
5966
msgid "The alias \"%(alias_name)s\" does not exist."
5967
msgstr ""
5968
5969
#: bzrlib/errors.py:2988
5970
msgid "\"%(alias_name)s\" is not a valid location alias."
5971
msgstr ""
5972
5973
#: bzrlib/errors.py:2996
5974
msgid "No %(alias_name)s location assigned."
5975
msgstr ""
5976
5977
#: bzrlib/errors.py:3004
5978
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
5979
msgstr ""
5980
5981
#: bzrlib/errors.py:3014
5982
msgid "Unknown rules detected: %(unknowns_str)s."
5983
msgstr ""
5984
5985
#: bzrlib/errors.py:3025
5986
msgid "Tip change rejected: %(msg)s"
5987
msgstr ""
5988
5989
#: bzrlib/errors.py:3033
5990
msgid "Shelf corrupt."
5991
msgstr ""
5992
5993
#: bzrlib/errors.py:3038
5994
msgid "Corruption while decompressing repository file%(orig_error)s"
5995
msgstr ""
5996
5997
#: bzrlib/errors.py:3050
5998
msgid "No changes are shelved with id \"%(shelf_id)d\"."
5999
msgstr ""
6000
6001
#: bzrlib/errors.py:3058
6002
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6003
msgstr ""
6004
6005
#: bzrlib/errors.py:3066
6006
msgid ""
6007
"An attempt to access a url outside the server jail was made: '%(url)s'."
6008
msgstr ""
6009
6010
#: bzrlib/errors.py:3074
6011
msgid "The user aborted the operation."
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:3079
6015
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:3089
6019
msgid "No such view: %(view_name)s."
6020
msgstr ""
6021
6022
#: bzrlib/errors.py:3099
6023
msgid ""
6024
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6025
"to a later format."
6026
msgstr ""
6027
6028
#: bzrlib/errors.py:3108
6029
msgid ""
6030
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6031
msgstr ""
6032
6033
#: bzrlib/errors.py:3175
6034
msgid "%(bzrdir)r does not support co-located branches."
6035
msgstr ""
6036
6037
#: bzrlib/errors.py:3181
6038
msgid ""
6039
"Unable to determine your name.\n"
6040
"Please, set your name with the 'whoami' command.\n"
6041
"E.g. bzr whoami \"Your Name <name@example.com>\""
6042
msgstr ""
6043
6044
#: bzrlib/errors.py:3190
6045
msgid "Invalid pattern(s) found. %(msg)s"
6046
msgstr ""
6047
6048
#: bzrlib/errors.py:3198
6049
msgid ""
6050
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6051
"unbind` to fix."
6052
msgstr ""
6053
6054
#: bzrlib/errors.py:3209
6055
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6056
msgstr ""
6057
6058
#: bzrlib/errors.py:3218
6059
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6060
msgstr ""
6061
6062
#: bzrlib/errors.py:3227
6063
msgid ""
6064
"No compatible object available for operations from %(source)r to %(target)r."
6065
msgstr ""
6066
6067
#: bzrlib/errors.py:3237
6068
msgid ""
6069
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6070
"%(arguments)s."
6071
msgstr ""
6072
6073
#: bzrlib/errors.py:3247
6074
msgid ""
6075
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6076
"format %(format)r"
6077
msgstr ""
6078
6079
#: bzrlib/errors.py:3259
6080
msgid ""
6081
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6082
"plugin."
6083
msgstr ""
6084
6085
#: bzrlib/errors.py:3272
6086
msgid "Binary files section encountered."
6087
msgstr ""
6088
6089
#: bzrlib/errors.py:3280
6090
msgid ""
6091
"Malformed patch header. %(desc)s\n"
6092
"%(line)r"
6093
msgstr ""
6094
6095
#: bzrlib/errors.py:3289
6096
msgid ""
6097
"Malformed hunk header. %(desc)s\n"
6098
"%(line)r"
6099
msgstr ""
6100
6101
#: bzrlib/errors.py:3298
6102
msgid ""
6103
"Malformed line. %(desc)s\n"
6104
"%(line)r"
6105
msgstr ""
6106
6107
#: bzrlib/errors.py:3308
6108
msgid ""
6109
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6110
"but patch says it should be \"%(patch_line)s\""
6111
msgstr ""
6112
6113
#: bzrlib/errors.py:3319
6114
msgid "The feature %(feature)s has already been registered."
6115
msgstr ""
6116
6117
#: bzrlib/export_pot.py:252
6118
#, python-format
6119
msgid "Exporting messages from builtin command: %s"
6120
msgstr ""
6121
6122
#: bzrlib/export_pot.py:271
6123
msgid "Exporting messages from plugin command: {0} in {1}"
6124
msgstr ""
6125
6126
#: bzrlib/export_pot.py:292
6127
#, python-format
6128
msgid "Exporting message from error: %s"
6129
msgstr ""
6130
6131
#: bzrlib/fetch.py:98
6132
msgid "Finding revisions"
6133
msgstr ""
6134
6135
#: bzrlib/fetch.py:103
6136
msgid "Fetching revisions"
6137
msgstr ""
6138
6139
#: bzrlib/foreign.py:262
6140
msgid "Push into a different VCS without any custom bzr metadata."
6141
msgstr ""
6142
6143
#: bzrlib/foreign.py:264
6144
msgid ""
6145
"This will afterwards rebase the local branch on the remote\n"
6146
"branch unless the --no-rebase option is used, in which case \n"
6147
"the two branches will be out of sync after the push. "
6148
msgstr ""
6149
6150
#: bzrlib/foreign.py:277
6151
msgid "Do not rebase after push."
6152
msgstr ""
6153
6154
#: bzrlib/foreign.py:311
6155
#, python-format
6156
msgid "Using saved location: %s\n"
6157
msgstr ""
6158
6159
#: bzrlib/foreign.py:321
6160
msgid ""
6161
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6162
"regular push."
6163
msgstr ""
6164
6165
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6166
msgid "{0} commits with valid signatures"
6167
msgstr ""
6168
6169
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6170
msgid "{0} commit with unknown key"
6171
msgid_plural "{0} commits with unknown keys"
6172
msgstr[0] ""
6173
msgstr[1] ""
6174
6175
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6176
msgid "{0} commit not valid"
6177
msgid_plural "{0} commits not valid"
6178
msgstr[0] ""
6179
msgstr[1] ""
6180
6181
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6182
msgid "{0} commit not signed"
6183
msgid_plural "{0} commits not signed"
6184
msgstr[0] ""
6185
msgstr[1] ""
6186
6187
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6188
msgid "{0} commit with key now expired"
6189
msgid_plural "{0} commits with key now expired"
6190
msgstr[0] ""
6191
msgstr[1] ""
6192
6193
#: bzrlib/gpg.py:343
6194
msgid "No GnuPG key results for pattern: {0}"
6195
msgstr ""
6196
6197
#: bzrlib/gpg.py:386
6198
msgid "{0} signed {1} commit"
6199
msgid_plural "{0} signed {1} commits"
6200
msgstr[0] ""
6201
msgstr[1] ""
6202
6203
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6204
msgid "{0} commit by author {1}"
6205
msgid_plural "{0} commits by author {1}"
6206
msgstr[0] ""
6207
msgstr[1] ""
6208
6209
#: bzrlib/gpg.py:433
6210
msgid "Unknown key {0} signed {1} commit"
6211
msgid_plural "Unknown key {0} signed {1} commits"
6212
msgstr[0] ""
6213
msgstr[1] ""
6214
6215
#: bzrlib/gpg.py:452
6216
msgid "{0} commit by author {1} with key {2} now expired"
6217
msgid_plural "{0} commits by author {1} with key {2} now expired"
6218
msgstr[0] ""
6219
msgstr[1] ""
6220
6221
#: bzrlib/groupcompress.py:1739
6222
#, python-format
6223
msgid "Insert claimed random_id=True, but then inserted %r two times"
6224
msgstr ""
6225
6226
#: bzrlib/hooks.py:331
6227
#, python-format
6228
msgid "Introduced in: %s"
6229
msgstr ""
6230
6231
#: bzrlib/hooks.py:334
6232
#, python-format
6233
msgid "Deprecated in: %s"
6234
msgstr ""
6235
6236
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6237
msgid "Walking content"
6238
msgstr ""
6239
6240
#: bzrlib/knit.py:3330
6241
msgid "annotating"
6242
msgstr ""
6243
6244
#: bzrlib/lock.py:548
6245
msgid "{0!r} was {1} locked again"
6246
msgstr ""
6247
6248
#: bzrlib/lockdir.py:321
6249
#, python-format
6250
msgid "error removing pending lock: %s"
6251
msgstr ""
6252
6253
#: bzrlib/lockdir.py:616
6254
msgid "Unable to obtain"
6255
msgstr ""
6256
6257
#: bzrlib/lockdir.py:618
6258
msgid "Lock owner changed for"
6259
msgstr ""
6260
6261
#: bzrlib/lockdir.py:620
6262
msgid "{0} lock {1} {2}."
6263
msgstr ""
6264
6265
#: bzrlib/lockdir.py:627
6266
#, python-format
6267
msgid "Will continue to try until %s, unless you press Ctrl-C."
6268
msgstr ""
6269
6270
#: bzrlib/lockdir.py:629
6271
msgid "See \"bzr help break-lock\" for more."
6272
msgstr ""
6273
6274
#: bzrlib/lockdir.py:739
6275
#, python-format
6276
msgid ""
6277
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6278
msgstr ""
6279
6280
#: bzrlib/log.py:572
6281
msgid "--exclude-common-ancestry requires two different revisions"
6282
msgstr ""
6283
6284
#: bzrlib/log.py:574
6285
#, python-format
6286
msgid "invalid direction %r"
6287
msgstr ""
6288
6289
#: bzrlib/log.py:662
6290
msgid "Start revision not found in history of end revision."
6291
msgstr ""
6292
6293
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6294
msgid "Logging revision 0 is invalid."
6295
msgstr ""
6296
6297
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6298
msgid "Start revision must be older than the end revision."
6299
msgstr ""
6300
6301
#: bzrlib/log.py:1827
6302
#, python-format
6303
msgid "unknown log formatter: %r"
6304
msgstr ""
6305
6306
#: bzrlib/log.py:2123
6307
msgid "fixes bug"
6308
msgid_plural "fixes bugs"
6309
msgstr[0] ""
6310
msgstr[1] ""
6311
6312
#: bzrlib/merge.py:689
6313
msgid "All changes applied successfully."
6314
msgstr ""
6315
6316
#: bzrlib/merge.py:691
6317
#, python-format
6318
msgid "%d conflicts encountered."
6319
msgstr ""
6320
6321
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6322
msgid "Preparing file merge"
6323
msgstr ""
6324
6325
#: bzrlib/multiparent.py:426
6326
msgid "Importing revisions"
6327
msgstr ""
6328
6329
#: bzrlib/option.py:526
6330
msgid "Show help message."
6331
msgstr ""
6332
6333
#: bzrlib/option.py:528
6334
msgid "Only display errors and warnings."
6335
msgstr ""
6336
6337
#: bzrlib/option.py:531
6338
msgid "Show usage message and options."
6339
msgstr ""
6340
6341
#: bzrlib/option.py:533
6342
msgid "Display more information."
6343
msgstr ""
6344
6345
#: bzrlib/option.py:541
6346
msgid ""
6347
"Select changes introduced by the specified revision. See also \"help "
6348
"revisionspec\"."
6349
msgstr ""
6350
6351
#: bzrlib/option.py:543
6352
msgid "Branch to operate on, instead of working directory."
6353
msgstr ""
6354
6355
#: bzrlib/option.py:545
6356
msgid "Detailed log format."
6357
msgstr ""
6358
6359
#: bzrlib/option.py:545
6360
msgid "Format used by GNU ChangeLog files."
6361
msgstr ""
6362
6363
#: bzrlib/option.py:545
6364
msgid "Log format with one line per revision."
6365
msgstr ""
6366
6367
#: bzrlib/option.py:545
6368
msgid "Moderately short log format."
6369
msgstr ""
6370
6371
#: bzrlib/option.py:545
6372
msgid "Use specified log format."
6373
msgstr ""
6374
6375
#: bzrlib/option.py:547
6376
msgid "Log format"
6377
msgstr ""
6378
6379
#: bzrlib/option.py:549
6380
msgid "LCA-newness merge."
6381
msgstr ""
6382
6383
#: bzrlib/option.py:549
6384
msgid "Merge using external diff3."
6385
msgstr ""
6386
6387
#: bzrlib/option.py:549
6388
msgid "Native diff3-style merge."
6389
msgstr ""
6390
6391
#: bzrlib/option.py:549
6392
msgid "Select a particular merge algorithm."
6393
msgstr ""
6394
6395
#: bzrlib/option.py:549
6396
msgid "Weave-based merge."
6397
msgstr ""
6398
6399
#: bzrlib/option.py:551
6400
msgid "Merge algorithm"
6401
msgstr ""
6402
6403
#: bzrlib/option.py:554
6404
msgid "Message string."
6405
msgstr ""
6406
6407
#: bzrlib/option.py:556
6408
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6409
msgstr ""
6410
6411
#: bzrlib/option.py:558
6412
msgid "Ignore differences between branches and overwrite unconditionally."
6413
msgstr ""
6414
6415
#: bzrlib/option.py:560
6416
msgid "Remember the specified location as a default."
6417
msgstr ""
6418
6419
#: bzrlib/option.py:562
6420
msgid "Reprocess to reduce spurious conflicts."
6421
msgstr ""
6422
6423
#: bzrlib/option.py:566
6424
msgid "See \"help revisionspec\" for details."
6425
msgstr ""
6426
6427
#: bzrlib/option.py:568
6428
msgid "Show internal object ids."
6429
msgstr ""
6430
6431
#: bzrlib/option.py:571
6432
msgid "Display timezone as local, original, or utc."
6433
msgstr ""
6434
6435
#: bzrlib/osutils.py:100
6436
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6437
msgstr ""
6438
6439
#: bzrlib/osutils.py:220
6440
msgid "lstat/stat of ({0!r}): {1!r}"
6441
msgstr ""
6442
6443
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6444
#, python-format
6445
msgid "sorry, %r not allowed in path"
6446
msgstr ""
6447
6448
#: bzrlib/osutils.py:1226
6449
#, python-format
6450
msgid "%r is too short to calculate a relative path"
6451
msgstr ""
6452
6453
#: bzrlib/plugin.py:143
6454
#, python-format
6455
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6456
msgstr ""
6457
6458
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6459
msgid "Enable completions for the selected plugin (default: all plugins)"
6460
msgstr ""
6461
6462
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6463
msgid "Generate a shell function for bash command line completion."
6464
msgstr ""
6465
6466
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6467
msgid ""
6468
"This command generates a shell function which can be used by bash to\n"
6469
"automatically complete the currently typed command when the user presses\n"
6470
"the completion key (usually tab)."
6471
msgstr ""
6472
6473
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6474
msgid ""
6475
"Commonly used like this:\n"
6476
" eval \"`bzr bash-completion`\""
6477
msgstr ""
6478
6479
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6480
msgid "Name of the generated function (default: _bzr)"
6481
msgstr ""
6482
6483
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6484
msgid "Generate only the shell function, don't enable it"
6485
msgstr ""
6486
6487
#: bzrlib/plugins/launchpad/__init__.py:81
6488
msgid "Register a branch with launchpad.net."
6489
msgstr ""
6490
6491
#: bzrlib/plugins/launchpad/__init__.py:83
6492
msgid ""
6493
"This command lists a bzr branch in the directory of branches on\n"
6494
"launchpad.net. Registration allows the branch to be associated with\n"
6495
"bugs or specifications."
6496
msgstr ""
6497
6498
#: bzrlib/plugins/launchpad/__init__.py:87
6499
msgid ""
6500
"Before using this command you must register the project to which the\n"
6501
"branch belongs, and create an account for yourself on launchpad.net."
6502
msgstr ""
6503
6504
#: bzrlib/plugins/launchpad/__init__.py:90
6505
msgid ""
6506
"arguments:\n"
6507
" public_url: The publicly visible url for the branch to register.\n"
6508
" This must be an http or https url (which Launchpad can read\n"
6509
" from to access the branch). Local file urls, SFTP urls, and\n"
6510
" bzr+ssh urls will not work.\n"
6511
" If no public_url is provided, bzr will use the configured\n"
6512
" public_url if there is one for the current branch, and\n"
6513
" otherwise error."
6514
msgstr ""
6515
6516
#: bzrlib/plugins/launchpad/__init__.py:99
6517
msgid ""
6518
"example:\n"
6519
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6520
" --project fooproject"
6521
msgstr ""
6522
6523
#: bzrlib/plugins/launchpad/__init__.py:106
6524
msgid "Launchpad project short name to associate with the branch."
6525
msgstr ""
6526
6527
#: bzrlib/plugins/launchpad/__init__.py:113
6528
msgid ""
6529
"Short name for the branch; by default taken from the last component of the "
6530
"url."
6531
msgstr ""
6532
6533
#: bzrlib/plugins/launchpad/__init__.py:117
6534
msgid "One-sentence description of the branch."
6535
msgstr ""
6536
6537
#: bzrlib/plugins/launchpad/__init__.py:120
6538
msgid "Longer description of the purpose or contents of the branch."
6539
msgstr ""
6540
6541
#: bzrlib/plugins/launchpad/__init__.py:123
6542
msgid "Branch author's email address, if not yourself."
6543
msgstr ""
6544
6545
#: bzrlib/plugins/launchpad/__init__.py:126
6546
msgid "The bug this branch fixes."
6547
msgstr ""
6548
6549
#: bzrlib/plugins/launchpad/__init__.py:129
6550
msgid "Prepare the request but don't actually send it."
6551
msgstr ""
6552
6553
#: bzrlib/plugins/launchpad/__init__.py:151
6554
msgid ""
6555
"register-branch requires a public branch url - see bzr help register-branch."
6556
msgstr ""
6557
6558
#: bzrlib/plugins/launchpad/__init__.py:159
6559
msgid "--product is deprecated; please use --project."
6560
msgstr ""
6561
6562
#: bzrlib/plugins/launchpad/__init__.py:191
6563
msgid "Open a Launchpad branch page in your web browser."
6564
msgstr ""
6565
6566
#: bzrlib/plugins/launchpad/__init__.py:196
6567
msgid "Do not actually open the browser. Just say the URL we would use."
6568
msgstr ""
6569
6570
#: bzrlib/plugins/launchpad/__init__.py:231
6571
#, python-format
6572
msgid "Opening %s in web browser"
6573
msgstr ""
6574
6575
#: bzrlib/plugins/launchpad/__init__.py:241
6576
msgid "Show or set the Launchpad user ID."
6577
msgstr ""
6578
6579
#: bzrlib/plugins/launchpad/__init__.py:243
6580
msgid ""
6581
"When communicating with Launchpad, some commands need to know your\n"
6582
"Launchpad user ID. This command can be used to set or show the\n"
6583
"user ID that Bazaar will use for such communication."
6584
msgstr ""
6585
6586
#: bzrlib/plugins/launchpad/__init__.py:247
6587
msgid ""
6588
":Examples:\n"
6589
" Show the Launchpad ID of the current user::"
6590
msgstr ""
6591
6592
#: bzrlib/plugins/launchpad/__init__.py:250
6593
msgid " bzr launchpad-login"
6594
msgstr ""
6595
6596
#: bzrlib/plugins/launchpad/__init__.py:252
6597
msgid " Set the Launchpad ID of the current user to 'bob'::"
6598
msgstr ""
6599
6600
#: bzrlib/plugins/launchpad/__init__.py:254
6601
msgid " bzr launchpad-login bob"
6602
msgstr ""
6603
6604
#: bzrlib/plugins/launchpad/__init__.py:261
6605
msgid "Don't check that the user name is valid."
6606
msgstr ""
6607
6608
#: bzrlib/plugins/launchpad/__init__.py:276
6609
#: bzrlib/plugins/launchpad/__init__.py:287
6610
msgid "Launchpad user ID exists and has SSH keys.\n"
6611
msgstr ""
6612
6613
#: bzrlib/plugins/launchpad/__init__.py:279
6614
msgid "No Launchpad user ID configured.\n"
6615
msgstr ""
6616
6617
#: bzrlib/plugins/launchpad/__init__.py:290
6618
#, python-format
6619
msgid "Launchpad user ID set to '%s'.\n"
6620
msgstr ""
6621
6622
#: bzrlib/plugins/launchpad/__init__.py:298
6623
msgid "Ask Launchpad to mirror a branch now."
6624
msgstr ""
6625
6626
#: bzrlib/plugins/launchpad/__init__.py:318
6627
msgid "Propose merging a branch on Launchpad."
6628
msgstr ""
6629
6630
#: bzrlib/plugins/launchpad/__init__.py:320
6631
msgid ""
6632
"This will open your usual editor to provide the initial comment. When it\n"
6633
"has created the proposal, it will open it in your default web browser."
6634
msgstr ""
6635
6636
#: bzrlib/plugins/launchpad/__init__.py:323
6637
msgid ""
6638
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6639
"is not supplied, the remembered submit branch will be used. If no submit\n"
6640
"branch is remembered, the development focus will be used."
6641
msgstr ""
6642
6643
#: bzrlib/plugins/launchpad/__init__.py:327
6644
msgid ""
6645
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6646
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6647
"The parameter the launchpad account name of the desired reviewer. This\n"
6648
"may optionally be followed by '=' and the review type. For example:"
6649
msgstr ""
6650
6651
#: bzrlib/plugins/launchpad/__init__.py:332
6652
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6653
msgstr ""
6654
6655
#: bzrlib/plugins/launchpad/__init__.py:334
6656
msgid ""
6657
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6658
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6659
msgstr ""
6660
6661
#: bzrlib/plugins/launchpad/__init__.py:339
6662
msgid "Propose the merge on staging."
6663
msgstr ""
6664
6665
#: bzrlib/plugins/launchpad/__init__.py:341
6666
msgid "Commit message."
6667
msgstr ""
6668
6669
#: bzrlib/plugins/launchpad/__init__.py:343
6670
msgid "Mark the proposal as approved immediately."
6671
msgstr ""
6672
6673
#: bzrlib/plugins/launchpad/__init__.py:345
6674
msgid "Requested reviewer and optional type."
6675
msgstr ""
6676
6677
#: bzrlib/plugins/launchpad/__init__.py:382
6678
msgid "Find the proposal to merge this revision."
6679
msgstr ""
6680
6681
#: bzrlib/plugins/launchpad/__init__.py:384
6682
msgid ""
6683
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6684
"This works only if the selected branch was the merge proposal target, and\n"
6685
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6686
"are opened in a web browser."
6687
msgstr ""
6688
6689
#: bzrlib/plugins/launchpad/__init__.py:389
6690
msgid ""
6691
"Any revision involved in the merge may be specified-- the revision in\n"
6692
"which the merge was performed, or one of the revisions that was merged."
6693
msgstr ""
6694
6695
#: bzrlib/plugins/launchpad/__init__.py:392
6696
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6697
msgstr ""
6698
6699
#: bzrlib/plugins/launchpad/__init__.py:394
6700
msgid " bzr lp-find-proposal -r annotate:README:1"
6701
msgstr ""
6702
6703
#: bzrlib/plugins/launchpad/__init__.py:409
6704
msgid "No review found."
6705
msgstr ""
6706
6707
#: bzrlib/plugins/launchpad/__init__.py:410
6708
#, python-format
6709
msgid "%d proposals(s) found."
6710
msgstr ""
6711
6712
#: bzrlib/plugins/launchpad/__init__.py:420
6713
msgid "Finding revision-id"
6714
msgstr ""
6715
6716
#: bzrlib/plugins/launchpad/__init__.py:427
6717
msgid "Finding merge"
6718
msgstr ""
6719
6720
#: bzrlib/plugins/launchpad/__init__.py:432
6721
msgid "Finding revno"
6722
msgstr ""
6723
6724
#: bzrlib/plugins/launchpad/__init__.py:437
6725
msgid "Finding Launchpad branch"
6726
msgstr ""
6727
6728
#: bzrlib/plugins/launchpad/__init__.py:440
6729
msgid "Finding proposals"
6730
msgstr ""
6731
6732
#: bzrlib/plugins/launchpad/account.py:66
6733
msgid "Setting ssh/sftp usernames for launchpad.net."
6734
msgstr ""
6735
6736
#: bzrlib/plugins/launchpad/lp_api.py:241
6737
#: bzrlib/plugins/launchpad/lp_api.py:246
6738
#, python-format
6739
msgid "%s is not registered on Launchpad"
6740
msgstr ""
6741
6742
#: bzrlib/plugins/launchpad/lp_api.py:256
6743
#, python-format
6744
msgid "%s has no development focus."
6745
msgstr ""
6746
6747
#: bzrlib/plugins/launchpad/lp_api.py:261
6748
#, python-format
6749
msgid "development focus %s has no branch."
6750
msgstr ""
6751
6752
#: bzrlib/plugins/launchpad/lp_api.py:266
6753
#, python-format
6754
msgid "source package %s has no branch."
6755
msgstr ""
6756
6757
#: bzrlib/plugins/launchpad/lp_api.py:270
6758
#, python-format
6759
msgid "%s has no associated product or source package."
6760
msgstr ""
6761
6762
#: bzrlib/plugins/launchpad/lp_api.py:282
6763
#, python-format
6764
msgid "%s is already up-to-date."
6765
msgstr ""
6766
6767
#: bzrlib/plugins/launchpad/lp_api.py:289
6768
#, python-format
6769
msgid "Pushing to %s"
6770
msgstr ""
6771
6772
#: bzrlib/plugins/launchpad/lp_directory.py:170
6773
msgid ""
6774
"resolution for {0}\n"
6775
" local: {1}\n"
6776
" remote: {2}"
6777
msgstr ""
6778
6779
#: bzrlib/plugins/launchpad/lp_propose.py:149
6780
#, python-format
6781
msgid "There is already a branch merge proposal: %s"
6782
msgstr ""
6783
6784
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6785
msgid "pb parameter to convert() is deprecated"
6786
msgstr ""
6787
6788
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6789
msgid "starting upgrade from format 4 to 5"
6790
msgstr ""
6791
6792
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6793
msgid "note: upgrade may be faster if all store files are ungzipped first"
6794
msgstr ""
6795
6796
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6797
msgid "converting revision"
6798
msgstr ""
6799
6800
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6801
msgid "upgraded to weaves:"
6802
msgstr ""
6803
6804
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6805
#, python-format
6806
msgid "%6d revisions and inventories"
6807
msgstr ""
6808
6809
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6810
#, python-format
6811
msgid "%6d revisions not present"
6812
msgstr ""
6813
6814
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6815
#, python-format
6816
msgid "%6d texts"
6817
msgstr ""
6818
6819
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6820
msgid "writing weave"
6821
msgstr ""
6822
6823
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6824
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6825
msgid "inventory"
6826
msgstr ""
6827
6828
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6829
msgid "write revision"
6830
msgstr ""
6831
6832
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6833
msgid "loading revision"
6834
msgstr ""
6835
6836
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6837
#, python-format
6838
msgid "revision {%s} not present in branch; will be converted as a ghost"
6839
msgstr ""
6840
6841
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6842
msgid "starting upgrade from format 5 to 6"
6843
msgstr ""
6844
6845
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6846
#, python-format
6847
msgid "adding prefixes to %s"
6848
msgstr ""
6849
6850
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6851
msgid "starting upgrade from format 6 to metadir"
6852
msgstr ""
6853
6854
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6855
msgid "Removing ancestry.weave"
6856
msgstr ""
6857
6858
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6859
msgid "Finding branch files"
6860
msgstr ""
6861
6862
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6863
msgid "Upgrading repository"
6864
msgstr ""
6865
6866
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6867
msgid "Upgrading branch"
6868
msgstr ""
6869
6870
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6871
msgid "No working tree."
6872
msgstr ""
6873
6874
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6875
msgid "Upgrading working tree"
6876
msgstr ""
6877
6878
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6879
#, python-format
6880
msgid "Make %s lock"
6881
msgstr ""
6882
6883
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6884
#, python-format
6885
msgid "Moving %s"
6886
msgstr ""
6887
6888
#: bzrlib/push.py:56
6889
msgid "Created new branch."
6890
msgstr ""
6891
6892
#: bzrlib/push.py:98
6893
#, python-format
6894
msgid ""
6895
"Target directory %s already contains a .bzr directory, but it is not valid."
6896
msgstr ""
6897
6898
#: bzrlib/push.py:101
6899
#, python-format
6900
msgid ""
6901
"Target directory %s already exists, but does not have a .bzr directory. "
6902
"Supply --use-existing-dir to push there anyway."
6903
msgstr ""
6904
6905
#: bzrlib/push.py:122
6906
#, python-format
6907
msgid "Too many redirections trying to make %s."
6908
msgstr ""
6909
6910
#: bzrlib/push.py:147
6911
msgid ""
6912
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6913
"information."
6914
msgstr ""
6915
6916
#: bzrlib/push.py:151
6917
#, python-format
6918
msgid ""
6919
"It is not possible to losslessly push to %s. You may want to use dpush "
6920
"instead."
6921
msgstr ""
6922
6923
#: bzrlib/push.py:157
6924
#, python-format
6925
msgid ""
6926
"At %s you have a valid .bzr control directory, but not a branch or "
6927
"repository. This is an unsupported configuration. Please move the target "
6928
"directory out of the way and try again."
6929
msgstr ""
6930
6931
#: bzrlib/reconcile.py:97
6932
#, python-format
6933
msgid "Reconciling branch %s"
6934
msgstr ""
6935
6936
#: bzrlib/reconcile.py:103
6937
#, python-format
6938
msgid "Reconciling repository %s"
6939
msgstr ""
6940
6941
#: bzrlib/reconcile.py:105
6942
msgid "Reconciling repository"
6943
msgstr ""
6944
6945
#: bzrlib/reconcile.py:111
6946
#, python-format
6947
msgid "%s cannot canonicalize CHKs."
6948
msgstr ""
6949
6950
#: bzrlib/reconcile.py:119
6951
msgid "Reconcile aborted: revision index has inconsistent parents."
6952
msgstr ""
6953
6954
#: bzrlib/reconcile.py:121
6955
msgid "Run \"bzr check\" for more details."
6956
msgstr ""
6957
6958
#: bzrlib/reconcile.py:123
6959
msgid "Reconciliation complete."
6960
msgstr ""
6961
6962
#: bzrlib/reconcile.py:166
6963
msgid "Fixing last revision info {0} => {1}"
6964
msgstr ""
6965
6966
#: bzrlib/reconcile.py:173
6967
msgid "revision_history ok."
6968
msgstr ""
6969
6970
#: bzrlib/reconcile.py:234
6971
msgid "Reading inventory data"
6972
msgstr ""
6973
6974
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
6975
msgid "Inventory ok."
6976
msgstr ""
6977
6978
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
6979
msgid "Backing up inventory"
6980
msgstr ""
6981
6982
#: bzrlib/reconcile.py:258
6983
msgid "Backup inventory created."
6984
msgstr ""
6985
6986
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
6987
msgid "Writing weave"
6988
msgstr ""
6989
6990
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
6991
msgid "Inventory regenerated."
6992
msgstr ""
6993
6994
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
6995
msgid "Reading indexes"
6996
msgstr ""
6997
6998
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
6999
msgid "Checking unused inventories"
7000
msgstr ""
7001
7002
#: bzrlib/reconcile.py:388
7003
msgid "Backup Inventory created"
7004
msgstr ""
7005
7006
#: bzrlib/reconcile.py:446
7007
msgid "Fixing text parents"
7008
msgstr ""
7009
7010
#: bzrlib/reconfigure.py:54
7011
msgid "{0} is now stacked on {1}\n"
7012
msgstr ""
7013
7014
#: bzrlib/reconfigure.py:69
7015
#, python-format
7016
msgid "%s is now not stacked\n"
7017
msgstr ""
7018
7019
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7020
#, python-format
7021
msgid "bzr: ERROR (ignored): %s"
7022
msgstr ""
7023
7024
#: bzrlib/remote.py:2493
7025
msgid "Copying repository content as tarball..."
7026
msgstr ""
7027
7028
#: bzrlib/rename_map.py:69
7029
msgid "Calculating hashes"
7030
msgstr ""
7031
7032
#: bzrlib/rename_map.py:107
7033
msgid "Determining hash hits"
7034
msgstr ""
7035
7036
#: bzrlib/rename_map.py:242
7037
msgid "{0} => {1}"
7038
msgstr ""
7039
7040
#: bzrlib/repository.py:1787
7041
msgid "Moving repository to repository.backup"
7042
msgstr ""
7043
7044
#: bzrlib/repository.py:1794
7045
msgid "Creating new repository"
7046
msgstr ""
7047
7048
#: bzrlib/repository.py:1799
7049
msgid "Copying content"
7050
msgstr ""
7051
7052
#: bzrlib/repository.py:1803
7053
msgid "Deleting old repository content"
7054
msgstr ""
7055
7056
#: bzrlib/repository.py:1805
7057
msgid "repository converted"
7058
msgstr ""
7059
7060
#: bzrlib/revisionspec.py:903
7061
msgid "Using {0} {1}"
7062
msgstr ""
7063
7064
#: bzrlib/send.py:58
7065
#, python-format
7066
msgid "Mail client \"%s\" does not support specifying body"
7067
msgstr ""
7068
7069
#: bzrlib/send.py:62
7070
msgid "--remember requires a branch to be specified."
7071
msgstr ""
7072
7073
#: bzrlib/send.py:77
7074
msgid "No submit branch known or specified"
7075
msgstr ""
7076
7077
#: bzrlib/send.py:80
7078
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7079
msgstr ""
7080
7081
#: bzrlib/send.py:98
7082
#, python-format
7083
msgid "No such send format '%s'."
7084
msgstr ""
7085
7086
#: bzrlib/send.py:114
7087
msgid "bzr send takes at most two one revision identifiers"
7088
msgstr ""
7089
7090
#: bzrlib/send.py:127
7091
msgid "No revisions to submit."
7092
msgstr ""
7093
7094
#: bzrlib/send.py:139
7095
msgid ""
7096
"- not supported for merge directives that use more than one output file."
7097
msgstr ""
7098
7099
#: bzrlib/send.py:185
7100
msgid "Format 0.9 does not permit bundle with no patch"
7101
msgstr ""
7102
7103
#: bzrlib/shelf_ui.py:46
7104
#, python-format
7105
msgid "Shelve adding file \"%(path)s\"?"
7106
msgstr ""
7107
7108
#: bzrlib/shelf_ui.py:47
7109
msgid "Shelve binary changes?"
7110
msgstr ""
7111
7112
#: bzrlib/shelf_ui.py:48
7113
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7114
msgstr ""
7115
7116
#: bzrlib/shelf_ui.py:50
7117
#, python-format
7118
msgid "Shelve removing file \"%(path)s\"?"
7119
msgstr ""
7120
7121
#: bzrlib/shelf_ui.py:51
7122
#, python-format
7123
msgid "Shelve %d change(s)?"
7124
msgstr ""
7125
7126
#: bzrlib/shelf_ui.py:52
7127
msgid "Shelve?"
7128
msgstr ""
7129
7130
#: bzrlib/shelf_ui.py:53
7131
#, python-format
7132
msgid ""
7133
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7134
msgstr ""
7135
7136
#: bzrlib/shelf_ui.py:55
7137
#, python-format
7138
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7139
msgstr ""
7140
7141
#: bzrlib/shelf_ui.py:70
7142
#, python-format
7143
msgid "Changes shelved with id \"%d\"."
7144
msgstr ""
7145
7146
#: bzrlib/shelf_ui.py:74
7147
msgid "Selected changes destroyed."
7148
msgstr ""
7149
7150
#: bzrlib/shelf_ui.py:78
7151
msgid "Selected changes:"
7152
msgstr ""
7153
7154
#: bzrlib/shelf_ui.py:98
7155
#, python-format
7156
msgid "Delete file \"%(path)s\"?"
7157
msgstr ""
7158
7159
#: bzrlib/shelf_ui.py:99
7160
msgid "Apply binary changes?"
7161
msgstr ""
7162
7163
#: bzrlib/shelf_ui.py:100
7164
#, python-format
7165
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7166
msgstr ""
7167
7168
#: bzrlib/shelf_ui.py:102
7169
#, python-format
7170
msgid "Add file \"%(path)s\"?"
7171
msgstr ""
7172
7173
#: bzrlib/shelf_ui.py:103
7174
#, python-format
7175
msgid "Apply %d change(s)?"
7176
msgstr ""
7177
7178
#: bzrlib/shelf_ui.py:104
7179
msgid "Apply change?"
7180
msgstr ""
7181
7182
#: bzrlib/shelf_ui.py:105
7183
#, python-format
7184
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7185
msgstr ""
7186
7187
#: bzrlib/shelf_ui.py:107
7188
#, python-format
7189
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7190
msgstr ""
7191
7192
#: bzrlib/shelf_ui.py:402
7193
msgid "No changes are shelved."
7194
msgstr ""
7195
7196
#: bzrlib/shelf_ui.py:460
7197
#, python-format
7198
msgid "Using changes with id \"%d\"."
7199
msgstr ""
7200
7201
#: bzrlib/shelf_ui.py:464
7202
#, python-format
7203
msgid "Message: %s"
7204
msgstr ""
7205
7206
#: bzrlib/shelf_ui.py:476
7207
#, python-format
7208
msgid "Deleted changes with id \"%d\"."
7209
msgstr ""
7210
7211
#: bzrlib/smart/medium.py:714
7212
msgid "HPSS calls: {0} ({1} vfs) {2}"
7213
msgstr ""
7214
7215
#: bzrlib/smart/server.py:169
7216
msgid "Requested to stop gracefully"
7217
msgstr ""
7218
7219
#: bzrlib/smart/server.py:179
7220
#, python-format
7221
msgid "Waiting for %d client(s) to finish"
7222
msgstr ""
7223
7224
#: bzrlib/smart/server.py:185
7225
#, python-format
7226
msgid "Still waiting for %d client(s) to finish"
7227
msgstr ""
7228
7229
#: bzrlib/smart/server.py:219
7230
#, python-format
7231
msgid "listening socket error: %s"
7232
msgstr ""
7233
7234
#: bzrlib/smart/server.py:452
7235
#, python-format
7236
msgid "listening on port: %s"
7237
msgstr ""
7238
7239
#: bzrlib/switch.py:69
7240
msgid "Pending merges must be committed or reverted before using switch."
7241
msgstr ""
7242
7243
#: bzrlib/switch.py:96
7244
msgid ""
7245
"Cannot switch as local commits found in the checkout. Commit these to the "
7246
"bound branch or use --force to throw them away."
7247
msgstr ""
7248
7249
#: bzrlib/switch.py:101
7250
#, python-format
7251
msgid ""
7252
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7253
"anyway, use --force."
7254
msgstr ""
7255
7256
#: bzrlib/switch.py:110
7257
msgid "Cannot switch a branch, only a checkout."
7258
msgstr ""
7259
7260
#: bzrlib/switch.py:146
7261
#, python-format
7262
msgid "Tree is up to date at revision %d."
7263
msgstr ""
7264
7265
#: bzrlib/switch.py:152
7266
#, python-format
7267
msgid "Updated to revision %d."
7268
msgstr ""
7269
7270
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7271
msgid "Apply phase"
7272
msgstr ""
7273
7274
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7275
msgid "removing file"
7276
msgstr ""
7277
7278
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7279
msgid "adding file"
7280
msgstr ""
7281
7282
#: bzrlib/transform.py:2587
7283
msgid "Building tree"
7284
msgstr ""
7285
7286
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7287
msgid "Adding file contents"
7288
msgstr ""
7289
7290
#: bzrlib/transform.py:3024
7291
msgid "Resolution pass"
7292
msgstr ""
7293
7294
#: bzrlib/transport/ftp/_gssapi.py:88
7295
#, python-format
7296
msgid "Authenticated as %s"
7297
msgstr ""
7298
7299
#: bzrlib/tree.py:634
7300
msgid "*** {0} content-filter: {1} => {2!r}"
7301
msgstr ""
7302
7303
#: bzrlib/upgrade.py:77
7304
#, python-format
7305
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7306
msgstr ""
7307
7308
#: bzrlib/upgrade.py:100
7309
#, python-format
7310
msgid "cannot upgrade from bzrdir format %s"
7311
msgstr ""
7312
7313
#: bzrlib/upgrade.py:103
7314
#, python-format
7315
msgid "starting upgrade of %s"
7316
msgstr ""
7317
7318
#: bzrlib/upgrade.py:110
7319
msgid "finished"
7320
msgstr ""
7321
7322
#: bzrlib/upgrade.py:120
7323
msgid "Deleting backup.bzr"
7324
msgstr ""
7325
7326
#: bzrlib/upgrade.py:151
7327
msgid ""
7328
"\n"
7329
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7330
msgstr ""
7331
7332
#: bzrlib/upgrade.py:208
7333
#, python-format
7334
msgid "Found %d dependent branches - upgrading ..."
7335
msgstr ""
7336
7337
#: bzrlib/upgrade.py:276
7338
msgid "Upgrading bzrdirs"
7339
msgstr ""
7340
7341
#: bzrlib/upgrade.py:282
7342
#, python-format
7343
msgid "Upgrading %s"
7344
msgstr ""
7345
7346
#: bzrlib/upgrade.py:283
7347
msgid "Upgrading {0} {1} ..."
7348
msgstr ""
7349
7350
#: bzrlib/upgrade.py:301
7351
msgid "Removing backup ..."
7352
msgstr ""
7353
7354
#: bzrlib/upgrade.py:305
7355
msgid "failed to clean-up {0}: {1}"
7356
msgstr ""
7357
7358
#: bzrlib/vf_repository.py:1090
7359
msgid "inventories"
7360
msgstr ""
7361
7362
#: bzrlib/vf_repository.py:1116
7363
msgid "texts"
7364
msgstr ""
7365
7366
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7367
msgid "Calculating text parents"
7368
msgstr ""
7369
7370
#: bzrlib/vf_repository.py:1706
7371
msgid "Fetch texts"
7372
msgstr ""
7373
7374
#: bzrlib/vf_repository.py:2535
7375
msgid "loading text store"
7376
msgstr ""
7377
7378
#: bzrlib/vf_repository.py:2541
7379
msgid "checking text graph"
7380
msgstr ""
7381
7382
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7383
#: bzrlib/vf_repository.py:3124
7384
msgid "Transferring revisions"
7385
msgstr ""
7386
7387
#: bzrlib/win32utils.py:146
7388
msgid "Failed to GetProcessMemoryInfo()"
7389
msgstr ""
7390
7391
#: bzrlib/win32utils.py:167
7392
msgid "Cannot debug memory on win32 without ctypes or win32process"
7393
msgstr ""
7394
7395
#: bzrlib/win32utils.py:172
7396
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7397
msgstr ""
7398
7399
#: bzrlib/win32utils.py:180
7400
#, python-format
7401
msgid "WorkingSize %8d KiB"
7402
msgstr ""
7403
7404
#: bzrlib/win32utils.py:181
7405
#, python-format
7406
msgid "PeakWorking %8d KiB"
7407
msgstr ""
7408
7409
#: bzrlib/win32utils.py:182
7410
#, python-format
7411
msgid "PagefileUsage %8d KiB"
7412
msgstr ""
7413
7414
#: bzrlib/win32utils.py:183
7415
#, python-format
7416
msgid "PeakPagefileUsage %8d KiB"
7417
msgstr ""
7418
7419
#: bzrlib/win32utils.py:185
7420
#, python-format
7421
msgid "PrivateUsage %8d KiB"
7422
msgstr ""
7423
7424
#: bzrlib/win32utils.py:186
7425
#, python-format
7426
msgid "PageFaultCount %8d"
7427
msgstr ""
7428
7429
#: bzrlib/workingtree.py:1478
7430
msgid "Rerun update after fixing the conflicts."
7431
msgstr ""
7432
7433
#: dummy/help_topics/authentication/summary.txt:1
7434
msgid "Information on configuring authentication"
7435
msgstr ""
7436
7437
#: dummy/help_topics/basic/detail.txt:1
7438
msgid ""
7439
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7440
"http://bazaar.canonical.com/"
7441
msgstr ""
7442
7443
#: dummy/help_topics/basic/detail.txt:4
7444
msgid ""
7445
"Basic commands:\n"
7446
" bzr init makes this directory a versioned branch\n"
7447
" bzr branch make a copy of another branch"
7448
msgstr ""
7449
7450
#: dummy/help_topics/basic/detail.txt:8
7451
msgid ""
7452
" bzr add make files or directories versioned\n"
7453
" bzr ignore ignore a file or pattern\n"
7454
" bzr mv move or rename a versioned file"
7455
msgstr ""
7456
7457
#: dummy/help_topics/basic/detail.txt:12
7458
msgid ""
7459
" bzr status summarize changes in working copy\n"
7460
" bzr diff show detailed diffs"
7461
msgstr ""
7462
7463
#: dummy/help_topics/basic/detail.txt:15
7464
msgid ""
7465
" bzr merge pull in changes from another branch\n"
7466
" bzr commit save some or all changes\n"
7467
" bzr send send changes via email"
7468
msgstr ""
7469
7470
#: dummy/help_topics/basic/detail.txt:19
7471
msgid ""
7472
" bzr log show history of changes\n"
7473
" bzr check validate storage"
7474
msgstr ""
7475
7476
#: dummy/help_topics/basic/detail.txt:22
7477
msgid ""
7478
" bzr help init more help on e.g. init command\n"
7479
" bzr help commands list all commands\n"
7480
" bzr help topics list all help topics\n"
7481
msgstr ""
7482
7483
#: dummy/help_topics/basic/summary.txt:1
7484
msgid "Basic commands"
7485
msgstr ""
7486
7487
#: dummy/help_topics/branches/detail.txt:1
7488
msgid "Branches"
7489
msgstr ""
7490
7491
#: dummy/help_topics/branches/detail.txt:3
7492
msgid ""
7493
"A branch consists of the state of a project, including all of its\n"
7494
"history. All branches have a repository associated (which is where the\n"
7495
"branch history is stored), but multiple branches may share the same\n"
7496
"repository (a shared repository). Branches can be copied and merged."
7497
msgstr ""
7498
7499
#: dummy/help_topics/branches/detail.txt:8
7500
msgid ""
7501
"In addition, one branch may be bound to another one. Binding to another\n"
7502
"branch indicates that commits which happen in this branch must also \n"
7503
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7504
"commits when the two branches are out of date. In order for a commit \n"
7505
"to succeed, it may be necessary to update the current branch using \n"
7506
"``bzr update``."
7507
msgstr ""
7508
7509
#: dummy/help_topics/branches/detail.txt:15
7510
#: dummy/help_topics/checkouts/detail.txt:66
7511
#: dummy/help_topics/repositories/detail.txt:36
7512
msgid "Related commands::"
7513
msgstr ""
7514
7515
#: dummy/help_topics/branches/detail.txt:17
7516
msgid ""
7517
" init Change a directory into a versioned branch.\n"
7518
" branch Create a new branch that is a copy of an existing branch.\n"
7519
" merge Perform a three-way merge.\n"
7520
" bind Bind a branch to another one.\n"
7521
msgstr ""
7522
7523
#: dummy/help_topics/branches/summary.txt:1
7524
msgid "Information on what a branch is"
7525
msgstr ""
7526
7527
#: dummy/help_topics/bugs/summary.txt:1
7528
msgid "Bug tracker settings"
7529
msgstr ""
7530
7531
#: dummy/help_topics/checkouts/detail.txt:1
7532
msgid "Checkouts"
7533
msgstr ""
7534
7535
#: dummy/help_topics/checkouts/detail.txt:3
7536
msgid ""
7537
"Checkouts are source trees that are connected to a branch, so that when\n"
7538
"you commit in the source tree, the commit goes into that branch. They\n"
7539
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7540
"Bazaar's decentralized features until you want them. Using checkouts\n"
7541
"with shared repositories is very similar to working with SVN or CVS, but\n"
7542
"doesn't have the same restrictions. And using checkouts still allows\n"
7543
"others working on the project to use whatever workflow they like."
7544
msgstr ""
7545
7546
#: dummy/help_topics/checkouts/detail.txt:11
7547
msgid ""
7548
"A checkout is created with the bzr checkout command (see \"help "
7549
"checkout\").\n"
7550
"You pass it a reference to another branch, and it will create a local copy\n"
7551
"for you that still contains a reference to the branch you created the\n"
7552
"checkout from (the master branch). Then if you make any commits they will "
7553
"be\n"
7554
"made on the other branch first. This creates an instant mirror of your work, "
7555
"or\n"
7556
"facilitates lockstep development, where each developer is working together,\n"
7557
"continuously integrating the changes of others."
7558
msgstr ""
7559
7560
#: dummy/help_topics/checkouts/detail.txt:19
7561
msgid ""
7562
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7563
"you have the full history locally. As you have a first class branch you "
7564
"can\n"
7565
"also commit locally if you want, for instance due to the temporary loss af "
7566
"a\n"
7567
"network connection. Use the --local option to commit to do this. All the "
7568
"local\n"
7569
"commits will then be made on the master branch the next time you do a non-"
7570
"local\n"
7571
"commit."
7572
msgstr ""
7573
7574
#: dummy/help_topics/checkouts/detail.txt:26
7575
msgid ""
7576
"If you are using a checkout from a shared branch you will periodically want "
7577
"to\n"
7578
"pull in all the changes made by others. This is done using the \"update\"\n"
7579
"command. The changes need to be applied before any non-local commit, but\n"
7580
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7581
"command when needed."
7582
msgstr ""
7583
7584
#: dummy/help_topics/checkouts/detail.txt:32
7585
msgid ""
7586
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7587
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7588
"SVN checkout in that it is not a first class branch, it mainly consists of "
7589
"the\n"
7590
"working tree. This means that any history operations must query the master\n"
7591
"branch, which could be slow if a network connection is involved. Also, as "
7592
"you\n"
7593
"don't have a local branch, then you cannot commit locally."
7594
msgstr ""
7595
7596
#: dummy/help_topics/checkouts/detail.txt:39
7597
msgid ""
7598
"Lightweight checkouts work best when you have fast reliable access to the\n"
7599
"master branch. This means that if the master branch is on the same disk or "
7600
"LAN\n"
7601
"a lightweight checkout will be faster than a heavyweight one for any "
7602
"commands\n"
7603
"that modify the revision history (as only one copy of the branch needs to\n"
7604
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7605
"that uses the history but does not change it, but if the master branch is "
7606
"on\n"
7607
"the same disk then there won't be a noticeable difference."
7608
msgstr ""
7609
7610
#: dummy/help_topics/checkouts/detail.txt:47
7611
msgid ""
7612
"Another possible use for a checkout is to use it with a treeless repository\n"
7613
"containing your branches, where you maintain only one working tree by\n"
7614
"switching the master branch that the checkout points to when you want to\n"
7615
"work on a different branch."
7616
msgstr ""
7617
7618
#: dummy/help_topics/checkouts/detail.txt:52
7619
msgid ""
7620
"Obviously to commit on a checkout you need to be able to write to the "
7621
"master\n"
7622
"branch. This means that the master branch must be accessible over a "
7623
"writeable\n"
7624
"protocol , such as sftp://, and that you have write permissions at the "
7625
"other\n"
7626
"end. Checkouts also work on the local file system, so that all that matters "
7627
"is\n"
7628
"file permissions."
7629
msgstr ""
7630
7631
#: dummy/help_topics/checkouts/detail.txt:58
7632
msgid ""
7633
"You can change the master of a checkout by using the \"switch\" command "
7634
"(see\n"
7635
"\"help switch\"). This will change the location that the commits are sent "
7636
"to.\n"
7637
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7638
"checkout. If you would like to convert your heavy checkout into a normal\n"
7639
"branch so that every commit is local, you can use the \"unbind\" command. To "
7640
"see\n"
7641
"whether or not a branch is bound or not you can use the \"info\" command. If "
7642
"the\n"
7643
"branch is bound it will tell you the location of the bound branch."
7644
msgstr ""
7645
7646
#: dummy/help_topics/checkouts/detail.txt:68
7647
msgid ""
7648
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7649
" checkout\n"
7650
" update Pull any changes in the master branch in to your checkout\n"
7651
" commit Make a commit that is sent to the master branch. If you have\n"
7652
" a heavy checkout then the --local option will commit to the\n"
7653
" checkout without sending the commit to the master\n"
7654
" switch Change the master branch that the commits in the checkout "
7655
"will\n"
7656
" be sent to\n"
7657
" bind Turn a standalone branch into a heavy checkout so that any\n"
7658
" commits will be sent to the master branch\n"
7659
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7660
" commits are only made locally\n"
7661
" info Displays whether a branch is bound or unbound. If the branch "
7662
"is\n"
7663
" bound, then it will also display the location of the bound "
7664
"branch\n"
7665
msgstr ""
7666
7667
#: dummy/help_topics/checkouts/summary.txt:1
7668
msgid "Information on what a checkout is"
7669
msgstr ""
7670
7671
#: dummy/help_topics/commands/summary.txt:1
7672
msgid "Basic help for all commands"
7673
msgstr ""
7674
7675
#: dummy/help_topics/configuration/summary.txt:1
7676
msgid "Details on the configuration settings available"
7677
msgstr ""
7678
7679
#: dummy/help_topics/conflict-types/summary.txt:1
7680
msgid "Types of conflicts and what to do about them"
7681
msgstr ""
7682
7683
#: dummy/help_topics/content-filters/summary.txt:1
7684
msgid "Conversion of content into/from working trees"
7685
msgstr ""
7686
7687
#: dummy/help_topics/criss-cross/detail.txt:1
7688
msgid "Criss-Cross"
7689
msgstr ""
7690
7691
#: dummy/help_topics/criss-cross/detail.txt:3
7692
msgid ""
7693
"A criss-cross in the branch history can cause the default merge technique\n"
7694
"to emit more conflicts than would normally be expected."
7695
msgstr ""
7696
7697
#: dummy/help_topics/criss-cross/detail.txt:6
7698
msgid ""
7699
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7700
"give\n"
7701
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7702
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7703
msgstr ""
7704
7705
#: dummy/help_topics/criss-cross/detail.txt:10
7706
msgid ""
7707
"Criss-crosses occur in a branch's history if two branches merge the same "
7708
"thing\n"
7709
"and then merge one another, or if two branches merge one another at the "
7710
"same\n"
7711
"time. They can be avoided by having each branch only merge from or into a\n"
7712
"designated central branch (a \"star topology\")."
7713
msgstr ""
7714
7715
#: dummy/help_topics/criss-cross/detail.txt:15
7716
msgid ""
7717
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7718
"default\n"
7719
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7720
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7721
"differences between THIS and OTHER are due to one side adding lines, or\n"
7722
"from another side removing lines."
7723
msgstr ""
7724
7725
#: dummy/help_topics/criss-cross/detail.txt:21
7726
msgid ""
7727
"Criss-crosses mean there is no good choice for a base. Selecting the "
7728
"recent\n"
7729
"merge points could cause one side's changes to be silently discarded.\n"
7730
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7731
"are emitted."
7732
msgstr ""
7733
7734
#: dummy/help_topics/criss-cross/detail.txt:26
7735
msgid ""
7736
"The ``weave`` merge type is not affected by this problem because it uses\n"
7737
"line-origin detection instead of a basis revision to determine the cause of\n"
7738
"differences.\n"
7739
msgstr ""
7740
7741
#: dummy/help_topics/criss-cross/summary.txt:1
7742
msgid "Information on criss-cross merging"
7743
msgstr ""
7744
7745
#: dummy/help_topics/current-formats/summary.txt:1
7746
msgid "Current storage formats"
7747
msgstr ""
7748
7749
#: dummy/help_topics/debug-flags/summary.txt:1
7750
msgid "Options to show or record debug information"
7751
msgstr ""
7752
7753
#: dummy/help_topics/diverged-branches/summary.txt:1
7754
msgid "How to fix diverged branches"
7755
msgstr ""
7756
7757
#: dummy/help_topics/env-variables/detail.txt:1
7758
msgid "Environment Variables"
7759
msgstr ""
7760
7761
#: dummy/help_topics/env-variables/detail.txt:3
7762
msgid ""
7763
"=================== "
7764
"===========================================================\n"
7765
"BZRPATH Path where bzr is to look for shell plugin external\n"
7766
" commands.\n"
7767
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7768
"EMAIL E-Mail address of the user.\n"
7769
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7770
"EDITOR Editor for editing commit messages.\n"
7771
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7772
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7773
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7774
"BZR_PLUGIN_PATH.\n"
7775
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7776
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7777
"and\n"
7778
" HOME.\n"
7779
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7780
"URLs).\n"
7781
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7782
"sshcorp,\n"
7783
" plink or lsh.\n"
7784
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7785
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7786
"BZR_COLUMNS Override implicit terminal width.\n"
7787
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7788
"(selftest)\n"
7789
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7790
"'text'.\n"
7791
"BZR_PDB Control whether to launch a debugger on error.\n"
7792
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7793
" breakin debugger.\n"
7794
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7795
"(instead\n"
7796
" of char-based).\n"
7797
"=================== "
7798
"===========================================================\n"
7799
msgstr ""
7800
7801
#: dummy/help_topics/env-variables/summary.txt:1
7802
msgid "Environment variable names and values"
7803
msgstr ""
7804
7805
#: dummy/help_topics/eol/summary.txt:1
7806
msgid "Information on end-of-line handling"
7807
msgstr ""
7808
7809
#: dummy/help_topics/files/detail.txt:1
7810
msgid "Files"
7811
msgstr ""
7812
7813
#: dummy/help_topics/files/detail.txt:3
7814
msgid ""
7815
":On Unix: ~/.bazaar/bazaar.conf\n"
7816
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7817
"bazaar\\\\2.0\\\\bazaar.conf"
7818
msgstr ""
7819
7820
#: dummy/help_topics/files/detail.txt:6
7821
msgid ""
7822
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7823
"used to define general configuration that will be applied everywhere.\n"
7824
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7825
"commonly used options."
7826
msgstr ""
7827
7828
#: dummy/help_topics/files/detail.txt:11
7829
msgid "A typical config file might look something like::"
7830
msgstr ""
7831
7832
#: dummy/help_topics/files/detail.txt:13
7833
msgid ""
7834
" [DEFAULT]\n"
7835
" email=John Doe <jdoe@isp.com>"
7836
msgstr ""
7837
7838
#: dummy/help_topics/files/detail.txt:16
7839
msgid ""
7840
" [ALIASES]\n"
7841
" commit = commit --strict\n"
7842
" log10 = log --short -r -10..-1\n"
7843
msgstr ""
7844
7845
#: dummy/help_topics/files/summary.txt:1
7846
msgid "Information on configuration and log files"
7847
msgstr ""
7848
7849
#: dummy/help_topics/formats/detail.txt:1
7850
msgid "Storage Formats"
7851
msgstr ""
7852
7853
#: dummy/help_topics/formats/detail.txt:3
7854
msgid ""
7855
"To ensure that older clients do not access data incorrectly,\n"
7856
"Bazaar's policy is to introduce a new storage format whenever\n"
7857
"new features requiring new metadata are added. New storage\n"
7858
"formats may also be introduced to improve performance and\n"
7859
"scalability."
7860
msgstr ""
7861
7862
#: dummy/help_topics/formats/detail.txt:9
7863
msgid ""
7864
"The newest format, 2a, is highly recommended. If your\n"
7865
"project is not using 2a, then you should suggest to the\n"
7866
"project owner to upgrade."
7867
msgstr ""
7868
7869
#: dummy/help_topics/formats/detail.txt:13
7870
msgid ""
7871
"\n"
7872
".. note::"
7873
msgstr ""
7874
7875
#: dummy/help_topics/formats/detail.txt:16
7876
msgid ""
7877
" Some of the older formats have two variants:\n"
7878
" a plain one and a rich-root one. The latter include an additional\n"
7879
" field about the root of the tree. There is no performance cost\n"
7880
" for using a rich-root format but you cannot easily merge changes\n"
7881
" from a rich-root format into a plain format. As a consequence,\n"
7882
" moving a project to a rich-root format takes some co-ordination\n"
7883
" in that all contributors need to upgrade their repositories\n"
7884
" around the same time. 2a and all future formats will be\n"
7885
" implicitly rich-root."
7886
msgstr ""
7887
7888
#: dummy/help_topics/formats/detail.txt:26
7889
msgid ""
7890
"See :doc:`current-formats-help` for the complete list of\n"
7891
"currently supported formats. See :doc:`other-formats-help` for\n"
7892
"descriptions of any available experimental and deprecated formats.\n"
7893
msgstr ""
7894
7895
#: dummy/help_topics/formats/summary.txt:1
7896
msgid "Information on choosing a storage format"
7897
msgstr ""
7898
7899
#: dummy/help_topics/global-options/detail.txt:1
7900
msgid "Global Options"
7901
msgstr ""
7902
7903
#: dummy/help_topics/global-options/detail.txt:3
7904
msgid ""
7905
"These options may be used with any command, and may appear in front of any\n"
7906
"command. (e.g. ``bzr --profile help``)."
7907
msgstr ""
7908
7909
#: dummy/help_topics/global-options/detail.txt:6
7910
msgid ""
7911
"--version Print the version number. Must be supplied before the "
7912
"command.\n"
7913
"--no-aliases Do not process command aliases when running this command.\n"
7914
"--builtin Use the built-in version of a command, not the plugin "
7915
"version.\n"
7916
" This does not suppress other plugin effects.\n"
7917
"--no-plugins Do not process any plugins.\n"
7918
"--no-l10n Do not translate messages.\n"
7919
"--concurrency Number of processes that can be run concurrently (selftest)."
7920
msgstr ""
7921
7922
#: dummy/help_topics/global-options/detail.txt:14
7923
msgid ""
7924
"--profile Profile execution using the hotshot profiler.\n"
7925
"--lsprof Profile execution using the lsprof profiler.\n"
7926
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7927
" results to a specified file. If the filename ends with "
7928
"\".txt\",\n"
7929
" text format will be used. If the filename either starts "
7930
"with\n"
7931
" \"callgrind.out\" or end with \".callgrind\", the output will "
7932
"be\n"
7933
" formatted for use with KCacheGrind. Otherwise, the output\n"
7934
" will be a pickle.\n"
7935
"--coverage Generate line coverage report in the specified directory."
7936
msgstr ""
7937
7938
#: dummy/help_topics/global-options/detail.txt:24
7939
msgid ""
7940
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7941
"for\n"
7942
" the duration of the command. This can be used multiple times "
7943
"if\n"
7944
" several options need to be overridden."
7945
msgstr ""
7946
7947
#: dummy/help_topics/global-options/detail.txt:28
7948
msgid ""
7949
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7950
"information on profiling."
7951
msgstr ""
7952
7953
#: dummy/help_topics/global-options/detail.txt:31
7954
msgid ""
7955
"A number of debug flags are also available to assist troubleshooting and\n"
7956
"development. See :doc:`debug-flags-help`.\n"
7957
msgstr ""
7958
7959
#: dummy/help_topics/global-options/summary.txt:1
7960
msgid "Options that control how Bazaar runs"
7961
msgstr ""
7962
7963
#: dummy/help_topics/hidden-commands/summary.txt:1
7964
msgid "All hidden commands"
7965
msgstr ""
7966
7967
#: dummy/help_topics/hooks/summary.txt:1
7968
msgid "Points at which custom processing can be added"
7969
msgstr ""
7970
7971
#: dummy/help_topics/launchpad/detail.txt:1
7972
msgid "Integration with Launchpad.net"
7973
msgstr ""
7974
7975
#: dummy/help_topics/launchpad/detail.txt:3
7976
msgid ""
7977
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
7978
"specification tracking."
7979
msgstr ""
7980
7981
#: dummy/help_topics/launchpad/detail.txt:6
7982
msgid ""
7983
"The bzr client (through the plugin called 'launchpad') has special\n"
7984
"features to communicate with Launchpad:"
7985
msgstr ""
7986
7987
#: dummy/help_topics/launchpad/detail.txt:9
7988
msgid ""
7989
" * The launchpad-login command tells Bazaar your Launchpad user name. "
7990
"This\n"
7991
" is then used by the 'lp:' transport to download your branches using\n"
7992
" bzr+ssh://."
7993
msgstr ""
7994
7995
#: dummy/help_topics/launchpad/detail.txt:13
7996
msgid ""
7997
" * The 'lp:' transport uses Launchpad as a directory service: for "
7998
"example\n"
7999
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8000
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8001
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8002
msgstr ""
8003
8004
#: dummy/help_topics/launchpad/detail.txt:18
8005
msgid ""
8006
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8007
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8008
"lp:12345'\n"
8009
" will record a revision property that marks that revision as fixing\n"
8010
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8011
" automatically be linked to the bug report."
8012
msgstr ""
8013
8014
#: dummy/help_topics/launchpad/detail.txt:24
8015
msgid ""
8016
" * The register-branch command tells Launchpad about the url of a\n"
8017
" public branch. Launchpad will then mirror the branch, display\n"
8018
" its contents and allow it to be attached to bugs and other\n"
8019
" objects."
8020
msgstr ""
8021
8022
#: dummy/help_topics/launchpad/detail.txt:29
8023
msgid "For more information see http://help.launchpad.net/\n"
8024
msgstr ""
8025
8026
#: dummy/help_topics/launchpad/summary.txt:1
8027
msgid "Using Bazaar with Launchpad.net"
8028
msgstr ""
8029
8030
#: dummy/help_topics/location-alias/summary.txt:1
8031
msgid "Aliases for remembered locations"
8032
msgstr ""
8033
8034
#: dummy/help_topics/log-formats/summary.txt:1
8035
msgid "Details on the logging formats available"
8036
msgstr ""
8037
8038
#: dummy/help_topics/other-formats/summary.txt:1
8039
msgid "Experimental and deprecated storage formats"
8040
msgstr ""
8041
8042
#: dummy/help_topics/patterns/summary.txt:1
8043
msgid "Information on the pattern syntax"
8044
msgstr ""
8045
8046
#: dummy/help_topics/repositories/detail.txt:1
8047
msgid "Repositories"
8048
msgstr ""
8049
8050
#: dummy/help_topics/repositories/detail.txt:3
8051
msgid ""
8052
"Repositories in Bazaar are where committed information is stored. There is\n"
8053
"a repository associated with every branch."
8054
msgstr ""
8055
8056
#: dummy/help_topics/repositories/detail.txt:6
8057
msgid ""
8058
"Repositories are a form of database. Bzr will usually maintain this for\n"
8059
"good performance automatically, but in some situations (e.g. when doing\n"
8060
"very many commits in a short time period) you may want to ask bzr to\n"
8061
"optimise the database indices. This can be done by the 'bzr pack' command."
8062
msgstr ""
8063
8064
#: dummy/help_topics/repositories/detail.txt:11
8065
msgid ""
8066
"By default just running 'bzr init' will create a repository within the new\n"
8067
"branch but it is possible to create a shared repository which allows "
8068
"multiple\n"
8069
"branches to share their information in the same location. When a new branch "
8070
"is\n"
8071
"created it will first look to see if there is a containing shared repository "
8072
"it\n"
8073
"can use."
8074
msgstr ""
8075
8076
#: dummy/help_topics/repositories/detail.txt:17
8077
msgid ""
8078
"When two branches of the same project share a repository, there is\n"
8079
"generally a large space saving. For some operations (e.g. branching\n"
8080
"within the repository) this translates in to a large time saving."
8081
msgstr ""
8082
8083
#: dummy/help_topics/repositories/detail.txt:21
8084
msgid ""
8085
"To create a shared repository use the init-repository command (or the alias\n"
8086
"init-repo). This command takes the location of the repository to create. "
8087
"This\n"
8088
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8089
"which contains a shared repository. Any new branches that are created in "
8090
"this\n"
8091
"directory will then use it for storage."
8092
msgstr ""
8093
8094
#: dummy/help_topics/repositories/detail.txt:27
8095
msgid ""
8096
"It is a good idea to create a repository whenever you might create more\n"
8097
"than one branch of a project. This is true for both working areas where you\n"
8098
"are doing the development, and any server areas that you use for hosting\n"
8099
"projects. In the latter case, it is common to want branches without working\n"
8100
"trees. Since the files in the branch will not be edited directly there is "
8101
"no\n"
8102
"need to use up disk space for a working tree. To create a repository in "
8103
"which\n"
8104
"the branches will not have working trees pass the '--no-trees' option to\n"
8105
"'init-repository'."
8106
msgstr ""
8107
8108
#: dummy/help_topics/repositories/detail.txt:38
8109
msgid ""
8110
" init-repository Create a shared repository. Use --no-trees to create "
8111
"one\n"
8112
" in which new branches won't get a working tree.\n"
8113
msgstr ""
8114
8115
#: dummy/help_topics/repositories/summary.txt:1
8116
msgid "Basic information on shared repositories."
8117
msgstr ""
8118
8119
#: dummy/help_topics/revisionspec/summary.txt:1
8120
msgid "Explain how to use --revision"
8121
msgstr ""
8122
8123
#: dummy/help_topics/rules/summary.txt:1
8124
msgid "Information on defining rule-based preferences"
8125
msgstr ""
8126
8127
#: dummy/help_topics/standalone-trees/detail.txt:1
8128
msgid "Standalone Trees"
8129
msgstr ""
8130
8131
#: dummy/help_topics/standalone-trees/detail.txt:3
8132
msgid ""
8133
"A standalone tree is a working tree with an associated repository. It\n"
8134
"is an independently usable branch, with no dependencies on any other.\n"
8135
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8136
"an existing project under version control."
8137
msgstr ""
8138
8139
#: dummy/help_topics/standalone-trees/detail.txt:8
8140
msgid "Related Commands::"
8141
msgstr ""
8142
8143
#: dummy/help_topics/standalone-trees/detail.txt:10
8144
msgid " init Make a directory into a versioned branch.\n"
8145
msgstr ""
8146
8147
#: dummy/help_topics/standalone-trees/summary.txt:1
8148
msgid "Information on what a standalone tree is"
8149
msgstr ""
8150
8151
#: dummy/help_topics/standard-options/detail.txt:1
8152
msgid "Standard Options"
8153
msgstr ""
8154
8155
#: dummy/help_topics/standard-options/detail.txt:3
8156
msgid "Standard options are legal for all commands."
8157
msgstr ""
8158
8159
#: dummy/help_topics/standard-options/detail.txt:5
8160
msgid ""
8161
"--help, -h Show help message.\n"
8162
"--verbose, -v Display more information.\n"
8163
"--quiet, -q Only display errors and warnings."
8164
msgstr ""
8165
8166
#: dummy/help_topics/standard-options/detail.txt:9
8167
msgid "Unlike global options, standard options can be used in aliases.\n"
8168
msgstr ""
8169
8170
#: dummy/help_topics/standard-options/summary.txt:1
8171
msgid "Options that can be used with any command"
8172
msgstr ""
8173
8174
#: dummy/help_topics/status-flags/detail.txt:1
8175
msgid "Status Flags"
8176
msgstr ""
8177
8178
#: dummy/help_topics/status-flags/detail.txt:3
8179
msgid ""
8180
"Status flags are used to summarise changes to the working tree in a concise\n"
8181
"manner. They are in the form::"
8182
msgstr ""
8183
8184
#: dummy/help_topics/status-flags/detail.txt:6
8185
msgid " xxx <filename>"
8186
msgstr ""
8187
8188
#: dummy/help_topics/status-flags/detail.txt:8
8189
msgid "where the columns' meanings are as follows."
8190
msgstr ""
8191
8192
#: dummy/help_topics/status-flags/detail.txt:10
8193
msgid "Column 1 - versioning/renames::"
8194
msgstr ""
8195
8196
#: dummy/help_topics/status-flags/detail.txt:12
8197
msgid ""
8198
" + File versioned\n"
8199
" - File unversioned\n"
8200
" R File renamed\n"
8201
" ? File unknown\n"
8202
" X File nonexistent (and unknown to bzr)\n"
8203
" C File has conflicts\n"
8204
" P Entry for a pending merge (not a file)"
8205
msgstr ""
8206
8207
#: dummy/help_topics/status-flags/detail.txt:20
8208
msgid "Column 2 - contents::"
8209
msgstr ""
8210
8211
#: dummy/help_topics/status-flags/detail.txt:22
8212
msgid ""
8213
" N File created\n"
8214
" D File deleted\n"
8215
" K File kind changed\n"
8216
" M File modified"
8217
msgstr ""
8218
8219
#: dummy/help_topics/status-flags/detail.txt:27
8220
msgid "Column 3 - execute::"
8221
msgstr ""
8222
8223
#: dummy/help_topics/status-flags/detail.txt:29
8224
msgid " * The execute bit was changed\n"
8225
msgstr ""
8226
8227
#: dummy/help_topics/status-flags/summary.txt:1
8228
msgid "Help on status flags"
8229
msgstr ""
8230
8231
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8232
msgid "Branches Out of Sync"
8233
msgstr ""
8234
8235
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8236
msgid ""
8237
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8238
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8239
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8240
"have the same last revision as the new reference branch for the lightweight\n"
8241
"checkout, data could be lost, so Bazaar refuses."
8242
msgstr ""
8243
8244
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8245
msgid "How you deal with this depends on *why* the branches are out of sync."
8246
msgstr ""
8247
8248
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8249
msgid ""
8250
"If you have a checkout and have done local commits, you can get back in "
8251
"sync\n"
8252
"by running \"bzr update\" (and possibly \"bzr commit\")."
8253
msgstr ""
8254
8255
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8256
msgid ""
8257
"If you have a branch and the remote branch is out-of-date, you can push\n"
8258
"the local changes using \"bzr push\". If the local branch is out of date, "
8259
"you\n"
8260
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8261
"commit\n"
8262
"and then push your changes. If you decide that some of the changes aren't\n"
8263
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8264
msgstr ""
8265
8266
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8267
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8268
msgstr ""
8269
8270
#: dummy/help_topics/topics/summary.txt:1
8271
msgid "Topics list"
8272
msgstr ""
8273
8274
#: dummy/help_topics/url-special-chars/summary.txt:1
8275
msgid "Special character handling in URLs"
8276
msgstr ""
8277
8278
#: dummy/help_topics/urlspec/summary.txt:1
8279
msgid "Supported transport protocols"
8280
msgstr ""
8281
8282
#: dummy/help_topics/working-trees/detail.txt:1
8283
msgid "Working Trees"
8284
msgstr ""
8285
8286
#: dummy/help_topics/working-trees/detail.txt:3
8287
msgid ""
8288
"A working tree is the contents of a branch placed on disk so that you can\n"
8289
"see the files and edit them. The working tree is where you make changes to "
8290
"a\n"
8291
"branch, and when you commit the current state of the working tree is the\n"
8292
"snapshot that is recorded in the commit."
8293
msgstr ""
8294
8295
#: dummy/help_topics/working-trees/detail.txt:8
8296
msgid ""
8297
"When you push a branch to a remote system, a working tree will not be\n"
8298
"created. If one is already present the files will not be updated. The\n"
8299
"branch information will be updated and the working tree will be marked\n"
8300
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8301
"may be uncommitted changes or the update may cause content conflicts that "
8302
"are\n"
8303
"difficult to deal with remotely."
8304
msgstr ""
8305
8306
#: dummy/help_topics/working-trees/detail.txt:15
8307
msgid ""
8308
"If you have a branch with no working tree you can use the 'checkout' "
8309
"command\n"
8310
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8311
"will\n"
8312
"create the working tree. If the branch is updated remotely, you can update "
8313
"the\n"
8314
"working tree by running 'bzr update' in that directory."
8315
msgstr ""
8316
8317
#: dummy/help_topics/working-trees/detail.txt:20
8318
msgid ""
8319
"If you have a branch with a working tree that you do not want the 'remove-"
8320
"tree'\n"
8321
"command will remove the tree if it is safe. This can be done to avoid the\n"
8322
"warning about the remote working tree not being updated when pushing to the\n"
8323
"branch. It can also be useful when working with a '--no-trees' repository\n"
8324
"(see 'bzr help repositories')."
8325
msgstr ""
8326
8327
#: dummy/help_topics/working-trees/detail.txt:26
8328
msgid ""
8329
"If you want to have a working tree on a remote machine that you push to you\n"
8330
"can either run 'bzr update' in the remote branch after each push, or use "
8331
"some\n"
8332
"other method to update the tree during the push. There is an 'rspush' "
8333
"plugin\n"
8334
"that will update the working tree using rsync as well as doing a push. "
8335
"There\n"
8336
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8337
"SSH\n"
8338
"after each push."
8339
msgstr ""
8340
8341
#: dummy/help_topics/working-trees/detail.txt:33
8342
msgid "Useful commands::"
8343
msgstr ""
8344
8345
#: dummy/help_topics/working-trees/detail.txt:35
8346
msgid ""
8347
" checkout Create a working tree when a branch does not have one.\n"
8348
" remove-tree Removes the working tree from a branch when it is safe to do "
8349
"so.\n"
8350
" update When a working tree is out of sync with its associated "
8351
"branch\n"
8352
" this will update the tree to match the branch.\n"
8353
msgstr ""
8354
8355
#: dummy/help_topics/working-trees/summary.txt:1
8356
msgid "Information on working trees"
8357
msgstr ""
8358
8359
#: en/help_topics/authentication.txt:1
8360
msgid ""
8361
"Authentication Settings\n"
8362
"======================="
8363
msgstr ""
8364
8365
#: en/help_topics/authentication.txt:4
8366
msgid ""
8367
"\n"
8368
"Intent\n"
8369
"------"
8370
msgstr ""
8371
8372
#: en/help_topics/authentication.txt:8
8373
msgid ""
8374
"Many different authentication policies can be described in the\n"
8375
"``authentication.conf`` file but a particular user should need only a few\n"
8376
"definitions to cover his needs without having to specify a user and a "
8377
"password\n"
8378
"for every branch he uses."
8379
msgstr ""
8380
8381
#: en/help_topics/authentication.txt:13
8382
msgid ""
8383
"The definitions found in this file are used to find the credentials to use "
8384
"for\n"
8385
"a given url. The same credentials can generally be used for as many branches "
8386
"as\n"
8387
"possible by grouping their declaration around the remote servers that need\n"
8388
"them. It's even possible to declare credentials that will be used by "
8389
"different\n"
8390
"servers."
8391
msgstr ""
8392
8393
#: en/help_topics/authentication.txt:19
8394
msgid ""
8395
"The intent is to make this file as small as possible to minimize maintenance."
8396
msgstr ""
8397
8398
#: en/help_topics/authentication.txt:21
8399
msgid ""
8400
"Once the relevant credentials are declared in this file you may use branch "
8401
"urls\n"
8402
"without embedding passwords (security hazard) or even users (enabling "
8403
"sharing\n"
8404
"of your urls with others)."
8405
msgstr ""
8406
8407
#: en/help_topics/authentication.txt:25
8408
msgid "Instead of using::"
8409
msgstr ""
8410
8411
#: en/help_topics/authentication.txt:27
8412
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8413
msgstr ""
8414
8415
#: en/help_topics/authentication.txt:29
8416
msgid "you simply use::"
8417
msgstr ""
8418
8419
#: en/help_topics/authentication.txt:31
8420
msgid " bzr branch ftp://host.com/path/to/my/branch"
8421
msgstr ""
8422
8423
#: en/help_topics/authentication.txt:33
8424
msgid ""
8425
"provided you have created the following ``authentication.conf`` file::"
8426
msgstr ""
8427
8428
#: en/help_topics/authentication.txt:35
8429
msgid ""
8430
" [myprojects]\n"
8431
" scheme=ftp\n"
8432
" host=host.com\n"
8433
" user=joe\n"
8434
" password=secret\n"
8435
" "
8436
msgstr ""
8437
8438
#: en/help_topics/authentication.txt:42
8439
msgid ""
8440
"Authentication definitions\n"
8441
"--------------------------"
8442
msgstr ""
8443
8444
#: en/help_topics/authentication.txt:45
8445
msgid ""
8446
"There are two kinds of authentication used by the various schemes supported "
8447
"by\n"
8448
"bzr:"
8449
msgstr ""
8450
8451
#: en/help_topics/authentication.txt:48
8452
msgid "1. user and password"
8453
msgstr ""
8454
8455
#: en/help_topics/authentication.txt:50
8456
msgid ""
8457
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8458
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8459
"ssh agents are a better, more secure solution. So we have chosen to not "
8460
"provide\n"
8461
"our own less secure method."
8462
msgstr ""
8463
8464
#: en/help_topics/authentication.txt:55
8465
msgid "2. user, realm and password"
8466
msgstr ""
8467
8468
#: en/help_topics/authentication.txt:57
8469
msgid ""
8470
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8471
"against a host. But, by using ``.htaccess`` files, for example, it is "
8472
"possible\n"
8473
"to define several (``user, realm, password``) for a given ``host``. So what "
8474
"is\n"
8475
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8476
"is\n"
8477
"not taken into account in the definitions, but will displayed if bzr "
8478
"prompts\n"
8479
"you for a password."
8480
msgstr ""
8481
8482
#: en/help_topics/authentication.txt:64
8483
msgid ""
8484
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8485
"specifying the appropriate port."
8486
msgstr ""
8487
8488
#: en/help_topics/authentication.txt:67
8489
msgid ""
8490
"To take all schemes into account, the password will be deduced from a set "
8491
"of\n"
8492
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8493
"``user``,\n"
8494
"``password``)."
8495
msgstr ""
8496
8497
#: en/help_topics/authentication.txt:71
8498
msgid ""
8499
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8500
"used\n"
8501
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8502
"``ssh``\n"
8503
" should be used instead since this is the real scheme regarding\n"
8504
" authentication,"
8505
msgstr ""
8506
8507
#: en/help_topics/authentication.txt:76
8508
msgid " * ``host``: can be empty (to act as a default for any host),"
8509
msgstr ""
8510
8511
#: en/help_topics/authentication.txt:78
8512
msgid ""
8513
" * ``port`` can be empty (useful when an host provides several servers for "
8514
"the\n"
8515
" same scheme), only numerical values are allowed, this should be used "
8516
"only\n"
8517
" when the server uses a port different than the scheme standard port,"
8518
msgstr ""
8519
8520
#: en/help_topics/authentication.txt:82
8521
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8522
msgstr ""
8523
8524
#: en/help_topics/authentication.txt:84
8525
msgid ""
8526
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8527
" ``getpass.get_user()``),"
8528
msgstr ""
8529
8530
#: en/help_topics/authentication.txt:87
8531
msgid ""
8532
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8533
" password."
8534
msgstr ""
8535
8536
#: en/help_topics/authentication.txt:90
8537
msgid ""
8538
"Multiple definitions can be provided and, for a given URL, bzr will select "
8539
"a\n"
8540
"(``user`` [, ``password``]) based on the following rules :"
8541
msgstr ""
8542
8543
#: en/help_topics/authentication.txt:93
8544
msgid " 1. the first match wins,"
8545
msgstr ""
8546
8547
#: en/help_topics/authentication.txt:95
8548
msgid " 2. empty fields match everything,"
8549
msgstr ""
8550
8551
#: en/help_topics/authentication.txt:97
8552
msgid ""
8553
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8554
msgstr ""
8555
8556
#: en/help_topics/authentication.txt:99
8557
msgid ""
8558
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8559
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8560
"``projectbzr.sf.net``\n"
8561
" will not match ``bzr.sf.net``)."
8562
msgstr ""
8563
8564
#: en/help_topics/authentication.txt:103
8565
msgid ""
8566
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8567
msgstr ""
8568
8569
#: en/help_topics/authentication.txt:105
8570
msgid ""
8571
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8572
"above,\n"
8573
" empty paths will match any provided path)."
8574
msgstr ""
8575
8576
#: en/help_topics/authentication.txt:110
8577
msgid ""
8578
"File format\n"
8579
"-----------"
8580
msgstr ""
8581
8582
#: en/help_topics/authentication.txt:113
8583
msgid ""
8584
"The general rules for :doc:`configuration files <configuration-help>`\n"
8585
"apply except for the variable policies."
8586
msgstr ""
8587
8588
#: en/help_topics/authentication.txt:116
8589
msgid "Each section describes an authentication definition."
8590
msgstr ""
8591
8592
#: en/help_topics/authentication.txt:118
8593
msgid ""
8594
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8595
"reserved\n"
8596
"and should appear as the *last* section."
8597
msgstr ""
8598
8599
#: en/help_topics/authentication.txt:121
8600
msgid "Each section should define:"
8601
msgstr ""
8602
8603
#: en/help_topics/authentication.txt:123
8604
msgid "* ``user``: the login to be used,"
8605
msgstr ""
8606
8607
#: en/help_topics/authentication.txt:125
8608
msgid "Each section could define:"
8609
msgstr ""
8610
8611
#: en/help_topics/authentication.txt:127
8612
msgid "* ``host``: the remote server,"
8613
msgstr ""
8614
8615
#: en/help_topics/authentication.txt:129
8616
msgid "* ``port``: the port the server is listening,"
8617
msgstr ""
8618
8619
#: en/help_topics/authentication.txt:131
8620
msgid "* ``path``: the branch location,"
8621
msgstr ""
8622
8623
#: en/help_topics/authentication.txt:133
8624
msgid "* ``password``: the password."
8625
msgstr ""
8626
8627
#: en/help_topics/authentication.txt:135
8628
msgid ""
8629
"\n"
8630
"Examples\n"
8631
"--------"
8632
msgstr ""
8633
8634
#: en/help_topics/authentication.txt:139
8635
msgid ""
8636
"\n"
8637
"Personal projects hosted outside\n"
8638
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8639
msgstr ""
8640
8641
#: en/help_topics/authentication.txt:143
8642
msgid ""
8643
"All connections are done with the same ``user`` (the remote one for which "
8644
"the\n"
8645
"default bzr one is not appropriate) and the password is always prompted "
8646
"with\n"
8647
"some exceptions::"
8648
msgstr ""
8649
8650
#: en/help_topics/authentication.txt:147
8651
msgid ""
8652
" # Pet projects on hobby.net\n"
8653
" [hobby]\n"
8654
" host=r.hobby.net\n"
8655
" user=jim\n"
8656
" password=obvious1234\n"
8657
" \n"
8658
" # Home server\n"
8659
" [home]\n"
8660
" scheme=https\n"
8661
" host=home.net\n"
8662
" user=joe\n"
8663
" password=1essobV10us\n"
8664
" \n"
8665
" [DEFAULT]\n"
8666
" # Our local user is barbaz, on all remote sites we're known as "
8667
"foobar\n"
8668
" user=foobar"
8669
msgstr ""
8670
8671
#: en/help_topics/authentication.txt:164
8672
msgid ""
8673
"\n"
8674
"Source hosting provider\n"
8675
"~~~~~~~~~~~~~~~~~~~~~~~"
8676
msgstr ""
8677
8678
#: en/help_topics/authentication.txt:168
8679
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8680
msgstr ""
8681
8682
#: en/help_topics/authentication.txt:170
8683
msgid ""
8684
" [shpnet domain]\n"
8685
" # we use sftp, but ssh is the scheme used for authentication\n"
8686
" scheme=ssh\n"
8687
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8688
" host=.shp.net\n"
8689
" user=joe\n"
8690
" # bzr don't support supplying a password for sftp,\n"
8691
" # consider using an ssh agent if you don't want to supply\n"
8692
" # a password interactively. (pageant, ssh-agent, etc)"
8693
msgstr ""
8694
8695
#: en/help_topics/authentication.txt:180
8696
msgid ""
8697
"HTTPS, SFTP servers and their proxy\n"
8698
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8699
msgstr ""
8700
8701
#: en/help_topics/authentication.txt:183
8702
msgid ""
8703
"At company.com, the server hosting release and integration branches is "
8704
"behind a\n"
8705
"proxy, and the two branches use different authentication policies::"
8706
msgstr ""
8707
8708
#: en/help_topics/authentication.txt:186
8709
msgid ""
8710
" [reference code]\n"
8711
" scheme=https\n"
8712
" host=dev.company.com\n"
8713
" path=/dev\n"
8714
" user=user1\n"
8715
" password=pass1"
8716
msgstr ""
8717
8718
#: en/help_topics/authentication.txt:193
8719
msgid ""
8720
" # development branches on dev server\n"
8721
" [dev]\n"
8722
" scheme=ssh # bzr+ssh and sftp are available here\n"
8723
" host=dev.company.com\n"
8724
" path=/dev/integration\n"
8725
" user=user2\n"
8726
" \n"
8727
" # proxy\n"
8728
" [proxy]\n"
8729
" scheme=http\n"
8730
" host=proxy.company.com\n"
8731
" port=3128\n"
8732
" user=proxyuser1\n"
8733
" password=proxypass1"
8734
msgstr ""
8735
8736
#: en/help_topics/authentication.txt:208
8737
msgid ""
8738
"\n"
8739
"Planned enhancements\n"
8740
"--------------------"
8741
msgstr ""
8742
8743
#: en/help_topics/authentication.txt:212
8744
msgid ""
8745
"The following are not yet implemented but planned as parts of a work in\n"
8746
"progress:"
8747
msgstr ""
8748
8749
#: en/help_topics/authentication.txt:215
8750
msgid "* add a ``password_encoding`` field allowing:"
8751
msgstr ""
8752
8753
#: en/help_topics/authentication.txt:217
8754
msgid ""
8755
" - storing the passwords in various obfuscating encodings (base64 for one),"
8756
msgstr ""
8757
8758
#: en/help_topics/authentication.txt:219
8759
msgid " - delegate password storage to plugins (.netrc for example)."
8760
msgstr ""
8761
8762
#: en/help_topics/authentication.txt:221
8763
msgid ""
8764
"* update the credentials when the user is prompted for user or password,"
8765
msgstr ""
8766
8767
#: en/help_topics/authentication.txt:223
8768
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8769
msgstr ""
8770
8771
#: en/help_topics/authentication.txt:225
8772
msgid ""
8773
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8774
"but\n"
8775
"ignored in the actual implementation.\n"
8776
msgstr ""
8777
8778
#: en/help_topics/bugs.txt:1
8779
msgid "Bug Tracker Settings"
8780
msgstr ""
8781
8782
#: en/help_topics/bugs.txt:3
8783
msgid ""
8784
"When making a commit, metadata about bugs fixed by that change can be\n"
8785
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8786
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8787
"(The only ``status`` value currently supported is ``fixed.``)"
8788
msgstr ""
8789
8790
#: en/help_topics/bugs.txt:8
8791
msgid ""
8792
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8793
"identifier\n"
8794
"rather than a full URL. This looks like::"
8795
msgstr ""
8796
8797
#: en/help_topics/bugs.txt:11
8798
msgid " bzr commit --fixes <tracker>:<id>"
8799
msgstr ""
8800
8801
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8802
msgid "or::"
8803
msgstr ""
8804
8805
#: en/help_topics/bugs.txt:15
8806
msgid " bzr commit --fixes <id>"
8807
msgstr ""
8808
8809
#: en/help_topics/bugs.txt:17
8810
msgid ""
8811
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8812
"the\n"
8813
"identifier for that bug within the bugtracker, usually the bug number.\n"
8814
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8815
"or global configuration is used."
8816
msgstr ""
8817
8818
#: en/help_topics/bugs.txt:22
8819
msgid ""
8820
"Bazaar knows about a few bug trackers that have many users. If\n"
8821
"you use one of these bug trackers then there is no setup required to\n"
8822
"use this feature, you just need to know the tracker identifier to use.\n"
8823
"These are the bugtrackers that are built in:"
8824
msgstr ""
8825
8826
#: en/help_topics/bugs.txt:27
8827
msgid ""
8828
" ============================ ============ ============\n"
8829
" URL Abbreviation Example\n"
8830
" ============================ ============ ============\n"
8831
" https://bugs.launchpad.net/ lp lp:12345\n"
8832
" http://bugs.debian.org/ deb deb:12345\n"
8833
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8834
" ============================ ============ ============"
8835
msgstr ""
8836
8837
#: en/help_topics/bugs.txt:35
8838
msgid ""
8839
"For the bug trackers not listed above configuration is required.\n"
8840
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8841
"is built in, along with a template mechanism for other bugtrackers with\n"
8842
"simple URL schemes. If your bug tracker can't be described by one\n"
8843
"of the schemes described below then you can write a plugin to support\n"
8844
"it."
8845
msgstr ""
8846
8847
#: en/help_topics/bugs.txt:42
8848
msgid ""
8849
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8850
"variable which contains the base URL of the bug tracker. These options\n"
8851
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8852
"configuration section in ``locations.conf``. You can set up these values\n"
8853
"for each of the projects you work on."
8854
msgstr ""
8855
8856
#: en/help_topics/bugs.txt:48
8857
msgid ""
8858
"Note: As you provide a short name for each tracker, you can specify one or\n"
8859
"more bugs in one or more trackers at commit time if you wish."
8860
msgstr ""
8861
8862
#: en/help_topics/bugs.txt:51
8863
msgid ""
8864
"Launchpad\n"
8865
"---------"
8866
msgstr ""
8867
8868
#: en/help_topics/bugs.txt:54
8869
msgid ""
8870
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8871
msgstr ""
8872
8873
#: en/help_topics/bugs.txt:56
8874
msgid ""
8875
"bugzilla_<tracker>_url\n"
8876
"----------------------"
8877
msgstr ""
8878
8879
#: en/help_topics/bugs.txt:59
8880
msgid ""
8881
"If present, the location of the Bugzilla bug tracker referred to by\n"
8882
"<tracker>. This option can then be used together with ``bzr commit\n"
8883
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8884
"example::"
8885
msgstr ""
8886
8887
#: en/help_topics/bugs.txt:64
8888
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8889
msgstr ""
8890
8891
#: en/help_topics/bugs.txt:66
8892
msgid ""
8893
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8894
"fixed."
8895
msgstr ""
8896
8897
#: en/help_topics/bugs.txt:69
8898
msgid ""
8899
"trac_<tracker>_url\n"
8900
"------------------"
8901
msgstr ""
8902
8903
#: en/help_topics/bugs.txt:72
8904
msgid ""
8905
"If present, the location of the Trac instance referred to by\n"
8906
"<tracker>. This option can then be used together with ``bzr commit\n"
8907
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8908
"example::"
8909
msgstr ""
8910
8911
#: en/help_topics/bugs.txt:77
8912
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8913
msgstr ""
8914
8915
#: en/help_topics/bugs.txt:79
8916
msgid ""
8917
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8918
"as\n"
8919
"fixed."
8920
msgstr ""
8921
8922
#: en/help_topics/bugs.txt:82
8923
msgid ""
8924
"bugtracker_<tracker>_url\n"
8925
"------------------------"
8926
msgstr ""
8927
8928
#: en/help_topics/bugs.txt:85
8929
msgid ""
8930
"If present, the location of a generic bug tracker instance referred to by\n"
8931
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8932
"which will be replaced by a specific bug ID. This option can then be used\n"
8933
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8934
"fixed by that commit. For example::"
8935
msgstr ""
8936
8937
#: en/help_topics/bugs.txt:91
8938
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8939
msgstr ""
8940
8941
#: en/help_topics/bugs.txt:93
8942
msgid ""
8943
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8944
"Roundup bug tracker as fixed, or::"
8945
msgstr ""
8946
8947
#: en/help_topics/bugs.txt:96
8948
msgid ""
8949
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8950
msgstr ""
8951
8952
#: en/help_topics/bugs.txt:98
8953
msgid ""
8954
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8955
"RT bug tracker as fixed, or::"
8956
msgstr ""
8957
8958
#: en/help_topics/bugs.txt:101
8959
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8960
msgstr ""
8961
8962
#: en/help_topics/bugs.txt:103
8963
msgid ""
8964
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8965
"1234\n"
8966
"in Hudson's JIRA bug tracker as fixed.\n"
8967
msgstr ""
8968
8969
#: en/help_topics/commands.txt:1
8970
msgid ""
8971
"add Add specified files or directories.\n"
8972
"alias Set/unset and display aliases.\n"
8973
"annotate Show the origin of each line in a file.\n"
8974
"bash-completion Generate a shell function for bash command line "
8975
"completion.\n"
8976
" [bash_completion]\n"
8977
"bind Convert the current branch into a checkout of the "
8978
"supplied\n"
8979
" branch.\n"
8980
"branch Create a new branch that is a copy of an existing branch.\n"
8981
"branches List the branches available at the current location.\n"
8982
"break-lock Break a dead lock.\n"
8983
"cat Write the contents of a file as of a given revision to\n"
8984
" standard output.\n"
8985
"check Validate working tree structure, branch consistency and\n"
8986
" repository history.\n"
8987
"checkout Create a new checkout of an existing branch.\n"
8988
"clean-tree Remove unwanted files from working tree.\n"
8989
"commit Commit changes into a new revision.\n"
8990
"config Display, set or remove a configuration option.\n"
8991
"conflicts List files with conflicts.\n"
8992
"deleted List files deleted in the working tree.\n"
8993
"diff Show differences in the working tree, between revisions "
8994
"or\n"
8995
" branches.\n"
8996
"dpush Push into a different VCS without any custom bzr "
8997
"metadata.\n"
8998
"export Export current or past revision to a destination directory "
8999
"or\n"
9000
" archive.\n"
9001
"help Show help on a command or other topic.\n"
9002
"ignore Ignore specified files or patterns.\n"
9003
"ignored List ignored files and the patterns that matched them.\n"
9004
"info Show information about a working tree, branch or "
9005
"repository.\n"
9006
"init Make a directory into a versioned branch.\n"
9007
"init-repository Create a shared repository for branches to share storage\n"
9008
" space.\n"
9009
"join Combine a tree into its containing tree.\n"
9010
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9011
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9012
"launchpad-open Open a Launchpad branch page in your web browser. "
9013
"[launchpad]\n"
9014
"log Show historical log for a branch or subset of a branch.\n"
9015
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9016
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9017
"ls List files in a tree.\n"
9018
"merge Perform a three-way merge.\n"
9019
"missing Show unmerged/unpulled revisions between two branches.\n"
9020
"mkdir Create a new versioned directory.\n"
9021
"mv Move or rename a file.\n"
9022
"nick Print or set the branch nickname.\n"
9023
"pack Compress the data within a repository.\n"
9024
"plugins List the installed plugins.\n"
9025
"pull Turn this branch into a mirror of another branch.\n"
9026
"push Update a mirror of this branch.\n"
9027
"reconcile Reconcile bzr metadata in a branch.\n"
9028
"reconfigure Reconfigure the type of a bzr directory.\n"
9029
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9030
"remerge Redo a merge.\n"
9031
"remove Remove files or directories.\n"
9032
"remove-branch Remove a branch.\n"
9033
"remove-tree Remove the working tree from a given branch/checkout.\n"
9034
"renames Show list of renamed files.\n"
9035
"resolve Mark a conflict as resolved.\n"
9036
"revert Revert files to a previous revision.\n"
9037
"revno Show current revision number.\n"
9038
"root Show the tree root directory.\n"
9039
"send Mail or create a merge-directive for submitting changes.\n"
9040
"serve Run the bzr server.\n"
9041
"shelve Temporarily set aside some changes from the current tree.\n"
9042
"sign-my-commits Sign all commits by a given committer.\n"
9043
"split Split a subdirectory of a tree into a separate tree.\n"
9044
"status Display status summary.\n"
9045
"switch Set the branch of a checkout and update.\n"
9046
"tag Create, remove or modify a tag naming a revision.\n"
9047
"tags List tags.\n"
9048
"testament Show testament (signing-form) of a revision.\n"
9049
"unbind Convert the current checkout into a regular branch.\n"
9050
"uncommit Remove the last committed revision.\n"
9051
"unshelve Restore shelved changes.\n"
9052
"update Update a working tree to a new revision.\n"
9053
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9054
" format.\n"
9055
"verify-signatures Verify all commit signatures.\n"
9056
"version Show version of bzr.\n"
9057
"version-info Show version information about this tree.\n"
9058
"view Manage filtered views.\n"
9059
"whoami Show or set bzr user id.\n"
9060
msgstr ""
9061
9062
#: en/help_topics/configuration.txt:1
9063
msgid ""
9064
"Configuration Settings\n"
9065
"======================="
9066
msgstr ""
9067
9068
#: en/help_topics/configuration.txt:4
9069
msgid ""
9070
"Environment settings\n"
9071
"---------------------"
9072
msgstr ""
9073
9074
#: en/help_topics/configuration.txt:7
9075
msgid ""
9076
"While most configuration is handled by configuration files, some options\n"
9077
"which may be semi-permanent can also be controlled through the environment."
9078
msgstr ""
9079
9080
#: en/help_topics/configuration.txt:10
9081
msgid ""
9082
"BZR_EMAIL\n"
9083
"~~~~~~~~~"
9084
msgstr ""
9085
9086
#: en/help_topics/configuration.txt:13
9087
msgid "Override the email id used by Bazaar. Typical format::"
9088
msgstr ""
9089
9090
#: en/help_topics/configuration.txt:15
9091
msgid " \"John Doe <jdoe@example.com>\""
9092
msgstr ""
9093
9094
#: en/help_topics/configuration.txt:17
9095
msgid "See also the ``email`` configuration option."
9096
msgstr ""
9097
9098
#: en/help_topics/configuration.txt:19
9099
msgid ""
9100
"BZR_PROGRESS_BAR\n"
9101
"~~~~~~~~~~~~~~~~"
9102
msgstr ""
9103
9104
#: en/help_topics/configuration.txt:22
9105
msgid ""
9106
"Override the progress display. Possible values are \"none\" or \"text\". "
9107
"If\n"
9108
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9109
"draws\n"
9110
"the ordinary command line progress bar."
9111
msgstr ""
9112
9113
#: en/help_topics/configuration.txt:26
9114
msgid ""
9115
"BZR_SIGQUIT_PDB\n"
9116
"~~~~~~~~~~~~~~~"
9117
msgstr ""
9118
9119
#: en/help_topics/configuration.txt:29
9120
msgid ""
9121
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9122
msgstr ""
9123
9124
#: en/help_topics/configuration.txt:31
9125
msgid ""
9126
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9127
"* 1 = Invoke breakin debugger (default)"
9128
msgstr ""
9129
9130
#: en/help_topics/configuration.txt:34
9131
msgid ""
9132
"BZR_HOME\n"
9133
"~~~~~~~~"
9134
msgstr ""
9135
9136
#: en/help_topics/configuration.txt:37
9137
msgid "Override the home directory used by Bazaar."
9138
msgstr ""
9139
9140
#: en/help_topics/configuration.txt:39
9141
msgid ""
9142
"BZR_SSH\n"
9143
"~~~~~~~"
9144
msgstr ""
9145
9146
#: en/help_topics/configuration.txt:42
9147
msgid "Select a different SSH implementation."
9148
msgstr ""
9149
9150
#: en/help_topics/configuration.txt:44
9151
msgid ""
9152
"BZR_PDB\n"
9153
"~~~~~~~"
9154
msgstr ""
9155
9156
#: en/help_topics/configuration.txt:47
9157
msgid "Control whether to launch a debugger on error."
9158
msgstr ""
9159
9160
#: en/help_topics/configuration.txt:49
9161
msgid ""
9162
"* 0 = Standard behavior\n"
9163
"* 1 = Launch debugger"
9164
msgstr ""
9165
9166
#: en/help_topics/configuration.txt:52
9167
msgid ""
9168
"BZR_REMOTE_PATH\n"
9169
"~~~~~~~~~~~~~~~"
9170
msgstr ""
9171
9172
#: en/help_topics/configuration.txt:55
9173
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9174
msgstr ""
9175
9176
#: en/help_topics/configuration.txt:57
9177
msgid "See also the ``bzr_remote_path`` configuration option."
9178
msgstr ""
9179
9180
#: en/help_topics/configuration.txt:59
9181
msgid ""
9182
"BZR_EDITOR\n"
9183
"~~~~~~~~~~"
9184
msgstr ""
9185
9186
#: en/help_topics/configuration.txt:62
9187
msgid "Path to the editor Bazaar should use for commit messages, etc."
9188
msgstr ""
9189
9190
#: en/help_topics/configuration.txt:64
9191
msgid ""
9192
"BZR_LOG\n"
9193
"~~~~~~~"
9194
msgstr ""
9195
9196
#: en/help_topics/configuration.txt:67
9197
msgid ""
9198
"Location of the Bazaar log file. You can check the current location by\n"
9199
"running ``bzr version``."
9200
msgstr ""
9201
9202
#: en/help_topics/configuration.txt:70
9203
msgid ""
9204
"The log file contains debug information that is useful for diagnosing or\n"
9205
"reporting problems with Bazaar."
9206
msgstr ""
9207
9208
#: en/help_topics/configuration.txt:73
9209
msgid ""
9210
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9211
"will disable logging."
9212
msgstr ""
9213
9214
#: en/help_topics/configuration.txt:76
9215
msgid ""
9216
"\n"
9217
"BZR_PLUGIN_PATH\n"
9218
"~~~~~~~~~~~~~~~"
9219
msgstr ""
9220
9221
#: en/help_topics/configuration.txt:80
9222
msgid ""
9223
"The path to the plugins directory that Bazaar should use.\n"
9224
"If not set, Bazaar will search for plugins in:"
9225
msgstr ""
9226
9227
#: en/help_topics/configuration.txt:83
9228
msgid ""
9229
"* the user specific plugin directory (containing the ``user`` plugins),"
9230
msgstr ""
9231
9232
#: en/help_topics/configuration.txt:85
9233
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9234
msgstr ""
9235
9236
#: en/help_topics/configuration.txt:87
9237
msgid ""
9238
"* the site specific plugin directory if applicable (containing\n"
9239
" the ``site`` plugins)."
9240
msgstr ""
9241
9242
#: en/help_topics/configuration.txt:90
9243
msgid ""
9244
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9245
"the way the plugin are searched. "
9246
msgstr ""
9247
9248
#: en/help_topics/configuration.txt:93
9249
msgid ""
9250
"As for the ``PATH`` variables, if multiple directories are\n"
9251
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9252
"platform specific appropriate character (':' on Unix,\n"
9253
"';' on windows)"
9254
msgstr ""
9255
9256
#: en/help_topics/configuration.txt:98
9257
msgid ""
9258
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9259
"in ``user``. However it will continue to search in ``core`` and\n"
9260
"``site`` unless they are explicitly removed."
9261
msgstr ""
9262
9263
#: en/help_topics/configuration.txt:102
9264
msgid ""
9265
"If you need to change the order or remove one of these\n"
9266
"directories, you should use special values:"
9267
msgstr ""
9268
9269
#: en/help_topics/configuration.txt:105
9270
msgid ""
9271
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9272
" path from the default values,"
9273
msgstr ""
9274
9275
#: en/help_topics/configuration.txt:108
9276
msgid ""
9277
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9278
" before the remaining default values (and also remove it from\n"
9279
" the default values)."
9280
msgstr ""
9281
9282
#: en/help_topics/configuration.txt:112
9283
msgid ""
9284
"Note that the special values 'user', 'core' and 'site' should be\n"
9285
"used literally, they will be substituted by the corresponding,\n"
9286
"platform specific, values."
9287
msgstr ""
9288
9289
#: en/help_topics/configuration.txt:116
9290
msgid ""
9291
"The examples below use ':' as the separator, windows users\n"
9292
"should use ';'."
9293
msgstr ""
9294
9295
#: en/help_topics/configuration.txt:119
9296
msgid "Overriding the default user plugin directory::"
9297
msgstr ""
9298
9299
#: en/help_topics/configuration.txt:121
9300
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9301
msgstr ""
9302
9303
#: en/help_topics/configuration.txt:123
9304
msgid "Disabling the site directory while retaining the user directory::"
9305
msgstr ""
9306
9307
#: en/help_topics/configuration.txt:125
9308
msgid " BZR_PLUGIN_PATH='-site:+user'"
9309
msgstr ""
9310
9311
#: en/help_topics/configuration.txt:127
9312
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9313
msgstr ""
9314
9315
#: en/help_topics/configuration.txt:129
9316
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9317
msgstr ""
9318
9319
#: en/help_topics/configuration.txt:131
9320
msgid "Overriding the default site plugin directory::"
9321
msgstr ""
9322
9323
#: en/help_topics/configuration.txt:133
9324
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9325
msgstr ""
9326
9327
#: en/help_topics/configuration.txt:135
9328
msgid ""
9329
"BZR_DISABLE_PLUGINS\n"
9330
"~~~~~~~~~~~~~~~~~~~"
9331
msgstr ""
9332
9333
#: en/help_topics/configuration.txt:138
9334
msgid ""
9335
"Under special circumstances (mostly when trying to diagnose a\n"
9336
"bug), it's better to disable a plugin (or several) rather than\n"
9337
"uninstalling them completely. Such plugins can be specified in\n"
9338
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9339
msgstr ""
9340
9341
#: en/help_topics/configuration.txt:143
9342
msgid ""
9343
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9344
"will raise an import error if they are explicitly imported (by\n"
9345
"another plugin that depends on them for example)."
9346
msgstr ""
9347
9348
#: en/help_topics/configuration.txt:147
9349
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9350
msgstr ""
9351
9352
#: en/help_topics/configuration.txt:149
9353
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9354
msgstr ""
9355
9356
#: en/help_topics/configuration.txt:151
9357
msgid ""
9358
"BZR_PLUGINS_AT\n"
9359
"~~~~~~~~~~~~~~"
9360
msgstr ""
9361
9362
#: en/help_topics/configuration.txt:154
9363
msgid ""
9364
"When adding a new feature or working on a bug in a plugin,\n"
9365
"developers often need to use a specific version of a given\n"
9366
"plugin. Since python requires that the directory containing the\n"
9367
"code is named like the plugin itself this make it impossible to\n"
9368
"use arbitrary directory names (using a two-level directory scheme\n"
9369
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9370
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9371
msgstr ""
9372
9373
#: en/help_topics/configuration.txt:162
9374
msgid ""
9375
"Plugins specified in this environment variable takes precedence\n"
9376
"over the ones in ``BZR_PLUGIN_PATH``."
9377
msgstr ""
9378
9379
#: en/help_topics/configuration.txt:165
9380
msgid ""
9381
"The variable specified a list of ``plugin_name@plugin path``,\n"
9382
"``plugin_name`` being the name of the plugin as it appears in\n"
9383
"python module paths, ``plugin_path`` being the path to the\n"
9384
"directory containing the plugin code itself\n"
9385
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9386
"separator, use ';' on windows."
9387
msgstr ""
9388
9389
#: en/help_topics/configuration.txt:172
9390
msgid ""
9391
"Example:\n"
9392
"~~~~~~~~"
9393
msgstr ""
9394
9395
#: en/help_topics/configuration.txt:175
9396
msgid ""
9397
"Using a specific version of ``myplugin``:\n"
9398
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9399
msgstr ""
9400
9401
#: en/help_topics/configuration.txt:178
9402
msgid ""
9403
"BZRPATH\n"
9404
"~~~~~~~"
9405
msgstr ""
9406
9407
#: en/help_topics/configuration.txt:181
9408
msgid "The path where Bazaar should look for shell plugin external commands."
9409
msgstr ""
9410
9411
#: en/help_topics/configuration.txt:183
9412
msgid ""
9413
"\n"
9414
"http_proxy, https_proxy\n"
9415
"~~~~~~~~~~~~~~~~~~~~~~~"
9416
msgstr ""
9417
9418
#: en/help_topics/configuration.txt:187
9419
msgid "Specifies the network proxy for outgoing connections, for example::"
9420
msgstr ""
9421
9422
#: en/help_topics/configuration.txt:189
9423
msgid ""
9424
" http_proxy=http://proxy.example.com:3128/ \n"
9425
" https_proxy=http://proxy.example.com:3128/"
9426
msgstr ""
9427
9428
#: en/help_topics/configuration.txt:192
9429
msgid ""
9430
"\n"
9431
"Configuration files\n"
9432
"-------------------"
9433
msgstr ""
9434
9435
#: en/help_topics/configuration.txt:196
9436
msgid ""
9437
"Location\n"
9438
"~~~~~~~~"
9439
msgstr ""
9440
9441
#: en/help_topics/configuration.txt:199
9442
msgid ""
9443
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9444
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9445
"on\n"
9446
"Windows. (You can check the location for your system by using\n"
9447
"``bzr version``.)"
9448
msgstr ""
9449
9450
#: en/help_topics/configuration.txt:204
9451
msgid "There are three primary configuration files in this location:"
9452
msgstr ""
9453
9454
#: en/help_topics/configuration.txt:206
9455
msgid "* ``bazaar.conf`` describes default configuration options,"
9456
msgstr ""
9457
9458
#: en/help_topics/configuration.txt:208
9459
msgid ""
9460
"* ``locations.conf`` describes configuration information for\n"
9461
" specific branch locations,"
9462
msgstr ""
9463
9464
#: en/help_topics/configuration.txt:211
9465
msgid ""
9466
"* ``authentication.conf`` describes credential information for\n"
9467
" remote servers."
9468
msgstr ""
9469
9470
#: en/help_topics/configuration.txt:214
9471
msgid ""
9472
"Each branch can also contain a configuration file that sets values specific\n"
9473
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9474
"the\n"
9475
"branch. This file is visible to all users of a branch, if you wish to "
9476
"override\n"
9477
"one of the values for a branch with a setting that is specific to you then "
9478
"you\n"
9479
"can do so in ``locations.conf``."
9480
msgstr ""
9481
9482
#: en/help_topics/configuration.txt:220
9483
msgid ""
9484
"General format\n"
9485
"~~~~~~~~~~~~~~"
9486
msgstr ""
9487
9488
#: en/help_topics/configuration.txt:223
9489
msgid ""
9490
"An ini file has three types of contructs: section headers, section\n"
9491
"options and comments."
9492
msgstr ""
9493
9494
#: en/help_topics/configuration.txt:226
9495
msgid ""
9496
"Comments\n"
9497
"^^^^^^^^"
9498
msgstr ""
9499
9500
#: en/help_topics/configuration.txt:229
9501
msgid ""
9502
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9503
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9504
"Bazaar when parsing ini files."
9505
msgstr ""
9506
9507
#: en/help_topics/configuration.txt:233
9508
msgid ""
9509
"Section headers\n"
9510
"^^^^^^^^^^^^^^^"
9511
msgstr ""
9512
9513
#: en/help_topics/configuration.txt:236
9514
msgid ""
9515
"A section header is a word enclosed in brackets that starts at the begining\n"
9516
"of a line. A typical section header looks like this::"
9517
msgstr ""
9518
9519
#: en/help_topics/configuration.txt:239
9520
msgid " [DEFAULT]"
9521
msgstr ""
9522
9523
#: en/help_topics/configuration.txt:241
9524
msgid ""
9525
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9526
"[ALIASES]. Section headers are case sensitive. The default section provides "
9527
"for\n"
9528
"setting options which can be overridden with the branch config file."
9529
msgstr ""
9530
9531
#: en/help_topics/configuration.txt:245
9532
msgid ""
9533
"For ``locations.conf``, the options from the section with the\n"
9534
"longest matching section header are used to the exclusion of other\n"
9535
"potentially valid section headers. A section header uses the path for\n"
9536
"the branch as the section header. Some examples include::"
9537
msgstr ""
9538
9539
#: en/help_topics/configuration.txt:250
9540
msgid ""
9541
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9542
" [/home/jdoe/branches/]"
9543
msgstr ""
9544
9545
#: en/help_topics/configuration.txt:253
9546
msgid ""
9547
"\n"
9548
"Section options\n"
9549
"^^^^^^^^^^^^^^^"
9550
msgstr ""
9551
9552
#: en/help_topics/configuration.txt:257
9553
msgid ""
9554
"A section option resides within a section. A section option contains an\n"
9555
"option name, an equals sign and a value. For example::"
9556
msgstr ""
9557
9558
#: en/help_topics/configuration.txt:260
9559
msgid ""
9560
" email = John Doe <jdoe@isp.com>\n"
9561
" gpg_signing_key = Amy Pond <amy@example.com>"
9562
msgstr ""
9563
9564
#: en/help_topics/configuration.txt:263
9565
msgid ""
9566
"A option can reference other options by enclosing them in curly brackets::"
9567
msgstr ""
9568
9569
#: en/help_topics/configuration.txt:265
9570
msgid ""
9571
" my_branch_name = feature_x\n"
9572
" my_server = bzr+ssh://example.com\n"
9573
" push_location = {my_server}/project/{my_branch_name}"
9574
msgstr ""
9575
9576
#: en/help_topics/configuration.txt:269
9577
msgid ""
9578
"Option policies\n"
9579
"^^^^^^^^^^^^^^^"
9580
msgstr ""
9581
9582
#: en/help_topics/configuration.txt:272
9583
msgid ""
9584
"Options defined in a section affect the named directory or URL plus\n"
9585
"any locations they contain. Policies can be used to change how an\n"
9586
"option value is interpreted for contained locations. Currently\n"
9587
"there are three policies available:"
9588
msgstr ""
9589
9590
#: en/help_topics/configuration.txt:277
9591
msgid ""
9592
" none:\n"
9593
" the value is interpreted the same for contained locations. This is\n"
9594
" the default behaviour.\n"
9595
" norecurse:\n"
9596
" the value is only used for the exact location specified by the\n"
9597
" section name.\n"
9598
" appendpath:\n"
9599
" for contained locations, any additional path components are\n"
9600
" appended to the value."
9601
msgstr ""
9602
9603
#: en/help_topics/configuration.txt:287
9604
msgid ""
9605
"Policies are specified by keys with names of the form "
9606
"\"<option_name>:policy\".\n"
9607
"For example, to define the push location for a tree of branches, the\n"
9608
"following could be used::"
9609
msgstr ""
9610
9611
#: en/help_topics/configuration.txt:291
9612
msgid ""
9613
" [/top/location]\n"
9614
" push_location = sftp://example.com/location\n"
9615
" push_location:policy = appendpath"
9616
msgstr ""
9617
9618
#: en/help_topics/configuration.txt:295
9619
msgid ""
9620
"With this configuration, the push location for ``/top/location/branch1``\n"
9621
"would be ``sftp://example.com/location/branch1``."
9622
msgstr ""
9623
9624
#: en/help_topics/configuration.txt:298
9625
msgid ""
9626
"Section local options\n"
9627
"^^^^^^^^^^^^^^^^^^^^^"
9628
msgstr ""
9629
9630
#: en/help_topics/configuration.txt:301
9631
msgid ""
9632
"Some options are defined automatically inside a given section and can be\n"
9633
"refered to in this section only. "
9634
msgstr ""
9635
9636
#: en/help_topics/configuration.txt:304
9637
msgid "For example, the ``appendpath`` policy can be used like this::"
9638
msgstr ""
9639
9640
#: en/help_topics/configuration.txt:306
9641
msgid ""
9642
" [/home/vila/src/bzr/bugs]\n"
9643
" mypush = lp:~vila/bzr\n"
9644
" mypush:policy=appendpath"
9645
msgstr ""
9646
9647
#: en/help_topics/configuration.txt:310
9648
msgid "Using ``relpath`` to achieve the same result is done like this::"
9649
msgstr ""
9650
9651
#: en/help_topics/configuration.txt:312
9652
msgid ""
9653
" [/home/vila/src/bzr/bugs]\n"
9654
" mypush = lp:~vila/bzr/{relpath}"
9655
msgstr ""
9656
9657
#: en/help_topics/configuration.txt:315
9658
msgid ""
9659
"In both cases, when used in a directory like\n"
9660
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9661
msgstr ""
9662
9663
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9664
msgid ""
9665
" $ bzr config mypush\n"
9666
" lp:~vila/bzr/832013-expand-in-stack"
9667
msgstr ""
9668
9669
#: en/help_topics/configuration.txt:321
9670
msgid "Another such option is ``basename`` which can be used like this::"
9671
msgstr ""
9672
9673
#: en/help_topics/configuration.txt:323
9674
msgid ""
9675
" [/home/vila/src/bzr]\n"
9676
" mypush = lp:~vila/bzr/{basename}"
9677
msgstr ""
9678
9679
#: en/help_topics/configuration.txt:326
9680
msgid ""
9681
"When used in a directory like\n"
9682
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9683
msgstr ""
9684
9685
#: en/help_topics/configuration.txt:332
9686
msgid ""
9687
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9688
"itself is defined as the relative path between the section name and the\n"
9689
"location it matches."
9690
msgstr ""
9691
9692
#: en/help_topics/configuration.txt:336
9693
msgid ""
9694
"When an option is local to a Section, it cannot be referred to from option\n"
9695
"values in any other section from the same ``Store`` nor from any other\n"
9696
"``Store``."
9697
msgstr ""
9698
9699
#: en/help_topics/configuration.txt:340
9700
msgid ""
9701
"\n"
9702
"The main configuration file, bazaar.conf\n"
9703
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9704
msgstr ""
9705
9706
#: en/help_topics/configuration.txt:344
9707
msgid ""
9708
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9709
"The default section contains the default\n"
9710
"configuration options for all branches. The default section can be\n"
9711
"overriden by providing a branch-specific section in ``locations.conf``."
9712
msgstr ""
9713
9714
#: en/help_topics/configuration.txt:349
9715
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9716
msgstr ""
9717
9718
#: en/help_topics/configuration.txt:351
9719
msgid ""
9720
" [DEFAULT]\n"
9721
" email = John Doe <jdoe@isp.com>\n"
9722
" editor = /usr/bin/vim\n"
9723
" create_signatures = when-required"
9724
msgstr ""
9725
9726
#: en/help_topics/configuration.txt:356
9727
msgid ""
9728
"\n"
9729
"The branch location configuration file, locations.conf\n"
9730
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9731
msgstr ""
9732
9733
#: en/help_topics/configuration.txt:360
9734
msgid ""
9735
"``locations.conf`` allows one to specify overriding settings for\n"
9736
"a specific branch. The format is almost identical to the default section in\n"
9737
"bazaar.conf with one significant change: The section header, instead of "
9738
"saying\n"
9739
"default, will be the path to a branch that you wish to override a value\n"
9740
"for. The '?' and '*' wildcards are supported::"
9741
msgstr ""
9742
9743
#: en/help_topics/configuration.txt:366
9744
msgid ""
9745
" [/home/jdoe/branches/nethack]\n"
9746
" email = Nethack Admin <nethack@nethack.com>"
9747
msgstr ""
9748
9749
#: en/help_topics/configuration.txt:369
9750
msgid ""
9751
" [http://hypothetical.site.com/branches/devel-branch]\n"
9752
" create_signatures = always"
9753
msgstr ""
9754
9755
#: en/help_topics/configuration.txt:372
9756
msgid ""
9757
"The authentication configuration file, authentication.conf\n"
9758
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9759
msgstr ""
9760
9761
#: en/help_topics/configuration.txt:375
9762
msgid ""
9763
"``authentication.conf`` allows one to specify credentials for\n"
9764
"remote servers. This can be used for all the supported transports and any "
9765
"part\n"
9766
"of bzr that requires authentication (smtp for example)."
9767
msgstr ""
9768
9769
#: en/help_topics/configuration.txt:379
9770
msgid ""
9771
"The syntax of the file obeys the same rules as the others except for the\n"
9772
"option policies which don't apply."
9773
msgstr ""
9774
9775
#: en/help_topics/configuration.txt:382
9776
msgid ""
9777
"For more information on the possible uses of the authentication "
9778
"configuration\n"
9779
"file see :doc:`authentication-help`."
9780
msgstr ""
9781
9782
#: en/help_topics/configuration.txt:385
9783
msgid ""
9784
"\n"
9785
"Common options\n"
9786
"--------------"
9787
msgstr ""
9788
9789
#: en/help_topics/configuration.txt:389
9790
msgid ""
9791
"debug_flags\n"
9792
"~~~~~~~~~~~"
9793
msgstr ""
9794
9795
#: en/help_topics/configuration.txt:392
9796
msgid ""
9797
"A comma-separated list of debugging options to turn on. The same values\n"
9798
"can be used as with the -D command-line option (see `help global-options`).\n"
9799
"For example::"
9800
msgstr ""
9801
9802
#: en/help_topics/configuration.txt:396
9803
msgid " debug_flags = hpss"
9804
msgstr ""
9805
9806
#: en/help_topics/configuration.txt:400
9807
msgid " debug_flags = hpss,evil"
9808
msgstr ""
9809
9810
#: en/help_topics/configuration.txt:402
9811
msgid ""
9812
"email\n"
9813
"~~~~~"
9814
msgstr ""
9815
9816
#: en/help_topics/configuration.txt:405
9817
msgid ""
9818
"The email address to use when committing a branch. Typically takes the form\n"
9819
"of::"
9820
msgstr ""
9821
9822
#: en/help_topics/configuration.txt:408
9823
msgid " email = Full Name <account@hostname.tld>"
9824
msgstr ""
9825
9826
#: en/help_topics/configuration.txt:410
9827
msgid ""
9828
"editor\n"
9829
"~~~~~~"
9830
msgstr ""
9831
9832
#: en/help_topics/configuration.txt:413
9833
msgid ""
9834
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9835
"a commit message. This setting is trumped by the environment variable\n"
9836
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9837
"variables."
9838
msgstr ""
9839
9840
#: en/help_topics/configuration.txt:418
9841
msgid ""
9842
"log_format\n"
9843
"~~~~~~~~~~"
9844
msgstr ""
9845
9846
#: en/help_topics/configuration.txt:421
9847
msgid ""
9848
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9849
"and ``line``. Additional formats may be provided by plugins. The default\n"
9850
"value is ``long``."
9851
msgstr ""
9852
9853
#: en/help_topics/configuration.txt:425
9854
msgid ""
9855
"check_signatures\n"
9856
"~~~~~~~~~~~~~~~~"
9857
msgstr ""
9858
9859
#: en/help_topics/configuration.txt:428
9860
msgid ""
9861
"Reserved for future use. These options will allow a policy for branches to\n"
9862
"require signatures."
9863
msgstr ""
9864
9865
#: en/help_topics/configuration.txt:431
9866
msgid ""
9867
"require\n"
9868
" The gnupg signature for revisions must be present and must be valid."
9869
msgstr ""
9870
9871
#: en/help_topics/configuration.txt:434
9872
msgid ""
9873
"ignore\n"
9874
" Do not check gnupg signatures of revisions."
9875
msgstr ""
9876
9877
#: en/help_topics/configuration.txt:437
9878
msgid ""
9879
"check-available\n"
9880
" (default) If gnupg signatures for revisions are present, check them.\n"
9881
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9882
" no signature is present."
9883
msgstr ""
9884
9885
#: en/help_topics/configuration.txt:442
9886
msgid ""
9887
"create_signatures\n"
9888
"~~~~~~~~~~~~~~~~~"
9889
msgstr ""
9890
9891
#: en/help_topics/configuration.txt:445
9892
msgid ""
9893
"Defines the behaviour of signing revisions on commits. By default bzr will "
9894
"not\n"
9895
"sign new commits."
9896
msgstr ""
9897
9898
#: en/help_topics/configuration.txt:448
9899
msgid ""
9900
"always\n"
9901
" Sign every new revision that is committed. If the signing fails then "
9902
"the\n"
9903
" commit will not be made."
9904
msgstr ""
9905
9906
#: en/help_topics/configuration.txt:452
9907
msgid ""
9908
"when-required\n"
9909
" Reserved for future use."
9910
msgstr ""
9911
9912
#: en/help_topics/configuration.txt:455
9913
msgid ""
9914
"never\n"
9915
" Reserved for future use."
9916
msgstr ""
9917
9918
#: en/help_topics/configuration.txt:458
9919
msgid ""
9920
"In future it is planned that ``when-required`` will sign newly\n"
9921
"committed revisions only when the branch requires them. ``never`` will "
9922
"refuse\n"
9923
"to sign newly committed revisions, even if the branch requires signatures."
9924
msgstr ""
9925
9926
#: en/help_topics/configuration.txt:462
9927
msgid ""
9928
"dirstate.fdatasync\n"
9929
"~~~~~~~~~~~~~~~~~~"
9930
msgstr ""
9931
9932
#: en/help_topics/configuration.txt:465
9933
msgid ""
9934
"If true (default), working tree metadata changes are flushed through the\n"
9935
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9936
"should not be lost if the machine crashes. See also repository.fdatasync."
9937
msgstr ""
9938
9939
#: en/help_topics/configuration.txt:469
9940
msgid ""
9941
"gpg_signing_key\n"
9942
"~~~~~~~~~~~~~~~"
9943
msgstr ""
9944
9945
#: en/help_topics/configuration.txt:472
9946
msgid ""
9947
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9948
"address, key fingerprint or full key ID. When unset or when set to\n"
9949
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9950
msgstr ""
9951
9952
#: en/help_topics/configuration.txt:476
9953
msgid ""
9954
"recurse\n"
9955
"~~~~~~~"
9956
msgstr ""
9957
9958
#: en/help_topics/configuration.txt:479
9959
msgid ""
9960
"Only useful in ``locations.conf``. Defines whether or not the\n"
9961
"configuration for this section applies to subdirectories:"
9962
msgstr ""
9963
9964
#: en/help_topics/configuration.txt:482
9965
msgid ""
9966
"true\n"
9967
" (default) This section applies to subdirectories as well."
9968
msgstr ""
9969
9970
#: en/help_topics/configuration.txt:485
9971
msgid ""
9972
"false\n"
9973
" This section only applies to the branch at this directory and not\n"
9974
" branches below it."
9975
msgstr ""
9976
9977
#: en/help_topics/configuration.txt:489
9978
msgid ""
9979
"gpg_signing_command\n"
9980
"~~~~~~~~~~~~~~~~~~~"
9981
msgstr ""
9982
9983
#: en/help_topics/configuration.txt:492
9984
msgid ""
9985
"(Default: \"gpg\"). Which program should be used to sign and check "
9986
"revisions.\n"
9987
"For example::"
9988
msgstr ""
9989
9990
#: en/help_topics/configuration.txt:495
9991
msgid " gpg_signing_command = /usr/bin/gnpg"
9992
msgstr ""
9993
9994
#: en/help_topics/configuration.txt:497
9995
msgid ""
9996
"The specified command must accept the options \"--clearsign\" and \"-u "
9997
"<email>\"."
9998
msgstr ""
9999
10000
#: en/help_topics/configuration.txt:499
10001
msgid ""
10002
"bzr_remote_path\n"
10003
"~~~~~~~~~~~~~~~"
10004
msgstr ""
10005
10006
#: en/help_topics/configuration.txt:502
10007
msgid ""
10008
"(Default: \"bzr\"). The path to the command that should be used to run the "
10009
"smart\n"
10010
"server for bzr. This value may only be specified in locations.conf, because:"
10011
msgstr ""
10012
10013
#: en/help_topics/configuration.txt:505
10014
msgid ""
10015
"- it's needed before branch.conf is accessible\n"
10016
"- allowing remote branch.conf files to specify commands would be a security\n"
10017
" risk"
10018
msgstr ""
10019
10020
#: en/help_topics/configuration.txt:509
10021
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10022
msgstr ""
10023
10024
#: en/help_topics/configuration.txt:511
10025
msgid ""
10026
"smtp_server\n"
10027
"~~~~~~~~~~~"
10028
msgstr ""
10029
10030
#: en/help_topics/configuration.txt:514
10031
msgid ""
10032
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10033
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10034
msgstr ""
10035
10036
#: en/help_topics/configuration.txt:517
10037
msgid ""
10038
"smtp_username, smtp_password\n"
10039
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10040
msgstr ""
10041
10042
#: en/help_topics/configuration.txt:520
10043
msgid ""
10044
"User and password to authenticate to the SMTP server. If smtp_username\n"
10045
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10046
"These settings are only needed if the SMTP server requires authentication\n"
10047
"to send mail."
10048
msgstr ""
10049
10050
#: en/help_topics/configuration.txt:525
10051
msgid ""
10052
"locks.steal_dead\n"
10053
"~~~~~~~~~~~~~~~~"
10054
msgstr ""
10055
10056
#: en/help_topics/configuration.txt:528
10057
msgid ""
10058
"If set to true, bzr will automatically break locks held by processes from\n"
10059
"the same machine and user that are no longer alive. Otherwise, it will\n"
10060
"print a message and you can break the lock manually, if you are satisfied\n"
10061
"the object is no longer in use."
10062
msgstr ""
10063
10064
#: en/help_topics/configuration.txt:533
10065
msgid ""
10066
"mail_client\n"
10067
"~~~~~~~~~~~"
10068
msgstr ""
10069
10070
#: en/help_topics/configuration.txt:536
10071
msgid ""
10072
"A mail client to use for sending merge requests.\n"
10073
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10074
"it\n"
10075
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10076
"``editor``."
10077
msgstr ""
10078
10079
#: en/help_topics/configuration.txt:541
10080
msgid "Supported values for specific clients:"
10081
msgstr ""
10082
10083
#: en/help_topics/configuration.txt:543
10084
msgid ""
10085
":claws: Use Claws. This skips a dialog for attaching files.\n"
10086
":evolution: Use Evolution.\n"
10087
":kmail: Use KMail.\n"
10088
":mutt: Use Mutt.\n"
10089
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10090
"1.5,\n"
10091
" this works around some bugs that xdg-email doesn't handle."
10092
msgstr ""
10093
10094
#: en/help_topics/configuration.txt:550
10095
msgid "Supported generic values are:"
10096
msgstr ""
10097
10098
#: en/help_topics/configuration.txt:552
10099
msgid ""
10100
":default: See above.\n"
10101
":editor: Use your editor to compose the merge request. This also uses\n"
10102
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10103
" smtp_username and smtp_password.\n"
10104
":mapi: Use your preferred e-mail client on Windows.\n"
10105
":xdg-email: Use xdg-email to run your preferred mail program"
10106
msgstr ""
10107
10108
#: en/help_topics/configuration.txt:559
10109
msgid ""
10110
"repository.fdatasync\n"
10111
"~~~~~~~~~~~~~~~~~~~~"
10112
msgstr ""
10113
10114
#: en/help_topics/configuration.txt:562
10115
msgid ""
10116
"If true (default), repository changes are flushed through the OS buffers\n"
10117
"to physical disk. This is somewhat slower, but means data should not be\n"
10118
"lost if the machine crashes. See also dirstate.fdatasync."
10119
msgstr ""
10120
10121
#: en/help_topics/configuration.txt:566
10122
msgid ""
10123
"submit_branch\n"
10124
"~~~~~~~~~~~~~"
10125
msgstr ""
10126
10127
#: en/help_topics/configuration.txt:569
10128
msgid ""
10129
"The branch you intend to submit your current work to. This is "
10130
"automatically\n"
10131
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10132
"This\n"
10133
"should usually be set on a per-branch or per-location basis."
10134
msgstr ""
10135
10136
#: en/help_topics/configuration.txt:573
10137
msgid ""
10138
"public_branch\n"
10139
"~~~~~~~~~~~~~"
10140
msgstr ""
10141
10142
#: en/help_topics/configuration.txt:576
10143
msgid ""
10144
"A publically-accessible version of this branch (implying that this version "
10145
"is\n"
10146
"not publically-accessible). Used (and set) by ``bzr send``."
10147
msgstr ""
10148
10149
#: en/help_topics/configuration.txt:579
10150
msgid ""
10151
"suppress_warnings\n"
10152
"~~~~~~~~~~~~~~~~~"
10153
msgstr ""
10154
10155
#: en/help_topics/configuration.txt:582
10156
msgid ""
10157
"A list of strings, each string represent a warning that can be emitted by\n"
10158
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10159
msgstr ""
10160
10161
#: en/help_topics/configuration.txt:585
10162
msgid "Valid values:"
10163
msgstr ""
10164
10165
#: en/help_topics/configuration.txt:587
10166
msgid ""
10167
"* ``format_deprecation``:\n"
10168
" whether the format deprecation warning is shown on repositories that "
10169
"are\n"
10170
" using deprecated formats."
10171
msgstr ""
10172
10173
#: en/help_topics/configuration.txt:591
10174
msgid ""
10175
"default_format\n"
10176
"~~~~~~~~~~~~~~"
10177
msgstr ""
10178
10179
#: en/help_topics/configuration.txt:594
10180
msgid ""
10181
"A format name for the default format used when creating branches. See "
10182
"``bzr\n"
10183
"help formats`` for possible values."
10184
msgstr ""
10185
10186
#: en/help_topics/configuration.txt:597
10187
msgid ""
10188
"\n"
10189
"Unicode options\n"
10190
"---------------"
10191
msgstr ""
10192
10193
#: en/help_topics/configuration.txt:601
10194
msgid ""
10195
"output_encoding\n"
10196
"~~~~~~~~~~~~~~~"
10197
msgstr ""
10198
10199
#: en/help_topics/configuration.txt:604
10200
msgid ""
10201
"A Python unicode encoding name for text output from bzr, such as log\n"
10202
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10203
"is the terminal encoding prefered by the operating system."
10204
msgstr ""
10205
10206
#: en/help_topics/configuration.txt:608
10207
msgid ""
10208
"\n"
10209
"Branch type specific options\n"
10210
"----------------------------"
10211
msgstr ""
10212
10213
#: en/help_topics/configuration.txt:612
10214
msgid ""
10215
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10216
"later format. They\n"
10217
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10218
"manually set in ``locations.conf`` or ``bazaar.conf``."
10219
msgstr ""
10220
10221
#: en/help_topics/configuration.txt:617
10222
msgid ""
10223
"append_revisions_only\n"
10224
"~~~~~~~~~~~~~~~~~~~~~"
10225
msgstr ""
10226
10227
#: en/help_topics/configuration.txt:620
10228
msgid ""
10229
"If set to \"True\" then revisions can only be appended to the log, not\n"
10230
"removed. A branch with this setting enabled can only pull from another\n"
10231
"branch if the other branch's log is a longer version of its own. This is\n"
10232
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10233
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10234
"compatibility with previous bzr versions (older than 2.2)."
10235
msgstr ""
10236
10237
#: en/help_topics/configuration.txt:627
10238
msgid ""
10239
"parent_location\n"
10240
"~~~~~~~~~~~~~~~"
10241
msgstr ""
10242
10243
#: en/help_topics/configuration.txt:630
10244
msgid ""
10245
"If present, the location of the default branch for pull or merge. This "
10246
"option\n"
10247
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10248
"--remember``."
10249
msgstr ""
10250
10251
#: en/help_topics/configuration.txt:634
10252
msgid ""
10253
"push_location\n"
10254
"~~~~~~~~~~~~~"
10255
msgstr ""
10256
10257
#: en/help_topics/configuration.txt:637
10258
msgid ""
10259
"If present, the location of the default branch for push. This option\n"
10260
"is normally set by the first ``push`` or ``push --remember``."
10261
msgstr ""
10262
10263
#: en/help_topics/configuration.txt:640
10264
msgid ""
10265
"push_strict\n"
10266
"~~~~~~~~~~~"
10267
msgstr ""
10268
10269
#: en/help_topics/configuration.txt:643
10270
msgid ""
10271
"If present, defines the ``--strict`` option default value for checking\n"
10272
"uncommitted changes before pushing."
10273
msgstr ""
10274
10275
#: en/help_topics/configuration.txt:646
10276
msgid ""
10277
"dpush_strict\n"
10278
"~~~~~~~~~~~~"
10279
msgstr ""
10280
10281
#: en/help_topics/configuration.txt:649
10282
msgid ""
10283
"If present, defines the ``--strict`` option default value for checking\n"
10284
"uncommitted changes before pushing into a different VCS without any\n"
10285
"custom bzr metadata."
10286
msgstr ""
10287
10288
#: en/help_topics/configuration.txt:653
10289
msgid ""
10290
"bound_location\n"
10291
"~~~~~~~~~~~~~~"
10292
msgstr ""
10293
10294
#: en/help_topics/configuration.txt:656
10295
msgid ""
10296
"The location that commits should go to when acting as a checkout.\n"
10297
"This option is normally set by ``bind``."
10298
msgstr ""
10299
10300
#: en/help_topics/configuration.txt:659
10301
msgid ""
10302
"bound\n"
10303
"~~~~~"
10304
msgstr ""
10305
10306
#: en/help_topics/configuration.txt:662
10307
msgid ""
10308
"If set to \"True\", the branch should act as a checkout, and push each "
10309
"commit to\n"
10310
"the bound_location. This option is normally set by ``bind``/``unbind``."
10311
msgstr ""
10312
10313
#: en/help_topics/configuration.txt:665
10314
msgid ""
10315
"send_strict\n"
10316
"~~~~~~~~~~~"
10317
msgstr ""
10318
10319
#: en/help_topics/configuration.txt:668
10320
msgid ""
10321
"If present, defines the ``--strict`` option default value for checking\n"
10322
"uncommitted changes before sending a merge directive."
10323
msgstr ""
10324
10325
#: en/help_topics/configuration.txt:671
10326
msgid ""
10327
"add.maximum_file_size\n"
10328
"~~~~~~~~~~~~~~~~~~~~~"
10329
msgstr ""
10330
10331
#: en/help_topics/configuration.txt:674
10332
msgid ""
10333
"Defines the maximum file size the command line \"add\" operation will allow\n"
10334
"in recursive mode, with files larger than this value being skipped. You may "
10335
"\n"
10336
"specify this value as an integer (in which case it is interpreted as bytes), "
10337
"\n"
10338
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10339
"0 \n"
10340
"will disable skipping."
10341
msgstr ""
10342
10343
#: en/help_topics/configuration.txt:680
10344
msgid ""
10345
"External Merge Tools\n"
10346
"--------------------"
10347
msgstr ""
10348
10349
#: en/help_topics/configuration.txt:683
10350
msgid ""
10351
"bzr.mergetool.<name>\n"
10352
"~~~~~~~~~~~~~~~~~~~~"
10353
msgstr ""
10354
10355
#: en/help_topics/configuration.txt:686
10356
msgid ""
10357
"Defines an external merge tool called <name> with the given command-line.\n"
10358
"Arguments containing spaces should be quoted using single or double quotes. "
10359
"The\n"
10360
"executable may omit its path if it can be found on the PATH."
10361
msgstr ""
10362
10363
#: en/help_topics/configuration.txt:690
10364
msgid ""
10365
"The following markers can be used in the command-line to substitute "
10366
"filenames\n"
10367
"involved in the merge conflict::"
10368
msgstr ""
10369
10370
#: en/help_topics/configuration.txt:693
10371
msgid ""
10372
" {base} file.BASE\n"
10373
" {this} file.THIS\n"
10374
" {other} file.OTHER\n"
10375
" {result} output file\n"
10376
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10377
"merge\n"
10378
" succeeds."
10379
msgstr ""
10380
10381
#: en/help_topics/configuration.txt:702
10382
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10383
msgstr ""
10384
10385
#: en/help_topics/configuration.txt:704
10386
msgid ""
10387
"bzr.default_mergetool\n"
10388
"~~~~~~~~~~~~~~~~~~~~~"
10389
msgstr ""
10390
10391
#: en/help_topics/configuration.txt:707
10392
msgid ""
10393
"Specifies which external merge tool (as defined above) should be selected "
10394
"by\n"
10395
"default in tools such as ``bzr qconflicts``."
10396
msgstr ""
10397
10398
#: en/help_topics/configuration.txt:712
10399
msgid " bzr.default_mergetool = kdiff3\n"
10400
msgstr ""
10401
10402
#: en/help_topics/conflict-types.txt:1
10403
msgid ""
10404
"Conflict Types\n"
10405
"=============="
10406
msgstr ""
10407
10408
#: en/help_topics/conflict-types.txt:4
10409
msgid ""
10410
"Some operations, like merge, revert and pull, modify the contents of your\n"
10411
"working tree. These modifications are programmatically generated, and so "
10412
"they\n"
10413
"may conflict with the current state of your working tree. "
10414
msgstr ""
10415
10416
#: en/help_topics/conflict-types.txt:8
10417
msgid ""
10418
"When conflicts are present in your working tree (as shown by ``bzr\n"
10419
"conflicts``), you should resolve them and then inform bzr that the "
10420
"conflicts\n"
10421
"have been resolved."
10422
msgstr ""
10423
10424
#: en/help_topics/conflict-types.txt:12
10425
msgid ""
10426
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10427
"should resolve them is not the one responsible for their occurrence, as is "
10428
"the\n"
10429
"case when merging other people's work or because some conflicts are "
10430
"presented\n"
10431
"in a way that is not easy to understand."
10432
msgstr ""
10433
10434
#: en/help_topics/conflict-types.txt:17
10435
msgid ""
10436
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10437
"conflict if and only if there's an actual conceptual conflict in the source\n"
10438
"tree. Because Bazaar doesn't understand the real meaning of the files "
10439
"being\n"
10440
"versioned, it can, when faced with ambiguities, fall short in either "
10441
"direction\n"
10442
"trying to resolve the conflict itself. Many kinds of changes can be "
10443
"combined\n"
10444
"programmatically, but sometimes only a human can determine the right thing "
10445
"to\n"
10446
"do."
10447
msgstr ""
10448
10449
#: en/help_topics/conflict-types.txt:25
10450
msgid ""
10451
"When Bazaar generates a conflict, it adds information into the working tree "
10452
"to\n"
10453
"present the conflicting versions, and it's up to you to find the correct\n"
10454
"resolution."
10455
msgstr ""
10456
10457
#: en/help_topics/conflict-types.txt:29
10458
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10459
msgstr ""
10460
10461
#: en/help_topics/conflict-types.txt:31
10462
msgid ""
10463
"1. Modify the working tree content so that the conflicted item is now in "
10464
"the\n"
10465
" state you want to keep, then"
10466
msgstr ""
10467
10468
#: en/help_topics/conflict-types.txt:34
10469
msgid ""
10470
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10471
" remaining generated information (``bzr resolve <item>``)."
10472
msgstr ""
10473
10474
#: en/help_topics/conflict-types.txt:37
10475
msgid ""
10476
"For most conflict types, there are some obvious ways to modify the working\n"
10477
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10478
"itself already made a choice, when possible."
10479
msgstr ""
10480
10481
#: en/help_topics/conflict-types.txt:41
10482
msgid ""
10483
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10484
"different ways to resolve the conflict."
10485
msgstr ""
10486
10487
#: en/help_topics/conflict-types.txt:44
10488
msgid ""
10489
"Each type of conflict is explained below, and the action which must be done "
10490
"to\n"
10491
"resolve the conflict is outlined."
10492
msgstr ""
10493
10494
#: en/help_topics/conflict-types.txt:47
10495
msgid ""
10496
"Various actions are available depending on the kind of conflict, for some "
10497
"of\n"
10498
"these actions, Bazaar can provide some help. In the end you should at least\n"
10499
"inform Bazaar that you're done with the conflict with::"
10500
msgstr ""
10501
10502
#: en/help_topics/conflict-types.txt:51
10503
msgid " ``bzr resolve FILE --action=done'"
10504
msgstr ""
10505
10506
#: en/help_topics/conflict-types.txt:53
10507
msgid ""
10508
"Note that this is the default action when a single file is involved so you "
10509
"can\n"
10510
"simply use::"
10511
msgstr ""
10512
10513
#: en/help_topics/conflict-types.txt:56
10514
msgid " ``bzr resolve FILE``"
10515
msgstr ""
10516
10517
#: en/help_topics/conflict-types.txt:58
10518
msgid "See ``bzr help resolve`` for more details."
10519
msgstr ""
10520
10521
#: en/help_topics/conflict-types.txt:60
10522
msgid ""
10523
"Text conflicts\n"
10524
"--------------"
10525
msgstr ""
10526
10527
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10528
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10529
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10530
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10531
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10532
msgid "Typical message::"
10533
msgstr ""
10534
10535
#: en/help_topics/conflict-types.txt:65
10536
msgid " Text conflict in FILE"
10537
msgstr ""
10538
10539
#: en/help_topics/conflict-types.txt:67
10540
msgid ""
10541
"These are produced when a text merge cannot completely reconcile two sets "
10542
"of\n"
10543
"text changes. Bazaar will emit files for each version with the extensions\n"
10544
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10545
"tree,\n"
10546
"i.e. the tree that you are merging changes into. OTHER is the version that "
10547
"you\n"
10548
"are merging into the target. BASE is an older version that is used as a "
10549
"basis\n"
10550
"for comparison."
10551
msgstr ""
10552
10553
#: en/help_topics/conflict-types.txt:74
10554
msgid ""
10555
"In the main copy of the file, Bazaar will include all the changes that it\n"
10556
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10557
"\"herringbone\" markers like ``<<<<<<<``."
10558
msgstr ""
10559
10560
#: en/help_topics/conflict-types.txt:78
10561
msgid ""
10562
"Say the initial text is \"The project leader released it.\", and THIS "
10563
"modifies it\n"
10564
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10565
"leader\n"
10566
"released Bazaar.\" A conflict would look like this::"
10567
msgstr ""
10568
10569
#: en/help_topics/conflict-types.txt:82
10570
msgid ""
10571
" <<<<<<< TREE\n"
10572
" Martin Pool released it.\n"
10573
" =======\n"
10574
" The project leader released Bazaar.\n"
10575
" >>>>>>> MERGE-SOURCE"
10576
msgstr ""
10577
10578
#: en/help_topics/conflict-types.txt:88
10579
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10580
msgstr ""
10581
10582
#: en/help_topics/conflict-types.txt:90
10583
msgid ""
10584
"You can handle text conflicts either by editing the main copy of the file,\n"
10585
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10586
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10587
"set of changes over the other (but see below when you encounter these\n"
10588
"cases). More often, the two sets of changes must be intelligently combined."
10589
msgstr ""
10590
10591
#: en/help_topics/conflict-types.txt:96
10592
msgid ""
10593
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10594
"you are done editing, the file should look like it never had a conflict, and "
10595
"be\n"
10596
"ready to commit."
10597
msgstr ""
10598
10599
#: en/help_topics/conflict-types.txt:100
10600
msgid ""
10601
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10602
"Bazaar will auto-detect which conflicts you have resolved."
10603
msgstr ""
10604
10605
#: en/help_topics/conflict-types.txt:103
10606
msgid ""
10607
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10608
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10609
"working tree."
10610
msgstr ""
10611
10612
#: en/help_topics/conflict-types.txt:107
10613
msgid ""
10614
"\n"
10615
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10616
"resolve`` with one of the following actions:"
10617
msgstr ""
10618
10619
#: en/help_topics/conflict-types.txt:111
10620
msgid ""
10621
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10622
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10623
msgstr ""
10624
10625
#: en/help_topics/conflict-types.txt:114
10626
msgid ""
10627
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10628
"modifications will be taken into account."
10629
msgstr ""
10630
10631
#: en/help_topics/conflict-types.txt:117
10632
msgid ""
10633
"Content conflicts\n"
10634
"-----------------"
10635
msgstr ""
10636
10637
#: en/help_topics/conflict-types.txt:122
10638
msgid " Contents conflict in FILE"
10639
msgstr ""
10640
10641
#: en/help_topics/conflict-types.txt:124
10642
msgid ""
10643
"This conflict happens when there are conflicting changes in the working "
10644
"tree\n"
10645
"and the merge source, but the conflicted items are not text files. They "
10646
"may\n"
10647
"be binary files, or symlinks, or directories. It can even happen with "
10648
"files\n"
10649
"that are deleted on one side, and modified on the other."
10650
msgstr ""
10651
10652
#: en/help_topics/conflict-types.txt:129
10653
msgid ""
10654
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10655
"be\n"
10656
"regular files, symlinks or directories). But it will not include a \"main "
10657
"copy\"\n"
10658
"of the file with herringbone conflict markers. It will appear that the "
10659
"\"main\n"
10660
"copy\" has been renamed to THIS or OTHER."
10661
msgstr ""
10662
10663
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10664
msgid ""
10665
"To resolve that kind of conflict, you should rebuild FILE from either "
10666
"version\n"
10667
"or a combination of both."
10668
msgstr ""
10669
10670
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10671
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10672
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10673
#: en/help_topics/conflict-types.txt:361
10674
msgid "``bzr resolve`` recognizes the following actions:"
10675
msgstr ""
10676
10677
#: en/help_topics/conflict-types.txt:139
10678
msgid ""
10679
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10680
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10681
"* ``--action=done`` will just mark the conflict as resolved."
10682
msgstr ""
10683
10684
#: en/help_topics/conflict-types.txt:143
10685
msgid ""
10686
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10687
"and\n"
10688
"``.OTHER`` files if they are still present in the working tree."
10689
msgstr ""
10690
10691
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10692
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10693
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10694
#: en/help_topics/conflict-types.txt:369
10695
msgid ""
10696
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10697
msgstr ""
10698
10699
#: en/help_topics/conflict-types.txt:148
10700
msgid ""
10701
"Tag conflicts\n"
10702
"-------------"
10703
msgstr ""
10704
10705
#: en/help_topics/conflict-types.txt:153
10706
msgid ""
10707
" Conflicting tags:\n"
10708
" version-0.1"
10709
msgstr ""
10710
10711
#: en/help_topics/conflict-types.txt:156
10712
msgid ""
10713
"When pulling from or pushing to another branch, Bazaar informs you about "
10714
"tags\n"
10715
"that conflict between the two branches; that is the same tag points to two\n"
10716
"different revisions. You need not resolve these conflicts, but subsequent\n"
10717
"uses of pull or push will result in the same message."
10718
msgstr ""
10719
10720
#: en/help_topics/conflict-types.txt:161
10721
msgid ""
10722
"To resolve the conflict, you must apply the correct tags to either the "
10723
"target\n"
10724
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10725
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10726
"target branch's tags match the source branch, then in the target branch do\n"
10727
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10728
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10729
"source\n"
10730
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10731
"favor of the target branch, you need to similarly use ``tag --force`` in "
10732
"the\n"
10733
"source branch. (Note that pulling or pushing using --overwrite will "
10734
"overwrite\n"
10735
"all tags as well.)"
10736
msgstr ""
10737
10738
#: en/help_topics/conflict-types.txt:172
10739
msgid ""
10740
"Duplicate paths\n"
10741
"---------------"
10742
msgstr ""
10743
10744
#: en/help_topics/conflict-types.txt:177
10745
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10746
msgstr ""
10747
10748
#: en/help_topics/conflict-types.txt:179
10749
msgid ""
10750
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10751
"already been used. The existing file will be renamed to \"FILE.moved\". "
10752
msgstr ""
10753
10754
#: en/help_topics/conflict-types.txt:187
10755
msgid ""
10756
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10757
"FILE``,\n"
10758
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10759
"* ``--action=done`` will just mark the conflict as resolved."
10760
msgstr ""
10761
10762
#: en/help_topics/conflict-types.txt:191
10763
msgid ""
10764
"Note that you must get rid of FILE.moved before using ``--action=done``."
10765
msgstr ""
10766
10767
#: en/help_topics/conflict-types.txt:195
10768
msgid ""
10769
"Unversioned parent\n"
10770
"------------------"
10771
msgstr ""
10772
10773
#: en/help_topics/conflict-types.txt:200
10774
msgid ""
10775
" Conflict because FILE is not versioned, but has versioned children."
10776
msgstr ""
10777
10778
#: en/help_topics/conflict-types.txt:202
10779
msgid ""
10780
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10781
"not\n"
10782
"versioned. This happens when the directory has been deleted in the target,\n"
10783
"but has a new child in the source, or vice versa. In this situation, "
10784
"Bazaar\n"
10785
"will version the parent directory as well. Resolving this issue depends\n"
10786
"very much on the particular scenario. You may wish to rename or delete "
10787
"either\n"
10788
"the file or the directory. When you are satisfied, you can run \"bzr "
10789
"resolve\n"
10790
"FILE\" to mark the conflict as resolved."
10791
msgstr ""
10792
10793
#: en/help_topics/conflict-types.txt:210
10794
msgid ""
10795
"Missing parent\n"
10796
"--------------"
10797
msgstr ""
10798
10799
#: en/help_topics/conflict-types.txt:215
10800
msgid " Conflict adding files to FILE. Created directory."
10801
msgstr ""
10802
10803
#: en/help_topics/conflict-types.txt:217
10804
msgid ""
10805
"This happens when a directory has been deleted in the target, but has new\n"
10806
"children in the source. This is similar to the \"unversioned parent\" "
10807
"conflict,\n"
10808
"except that the parent directory does not *exist*, instead of just being\n"
10809
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10810
"Resolving this issue depends very much on the particular scenario."
10811
msgstr ""
10812
10813
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10814
msgid ""
10815
"To resolve that kind of conflict, you should either remove or rename the\n"
10816
"children or the directory or a combination of both."
10817
msgstr ""
10818
10819
#: en/help_topics/conflict-types.txt:228
10820
msgid ""
10821
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10822
" children,\n"
10823
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10824
"children\n"
10825
" and restoring the directory,\n"
10826
"* ``--action=done`` will just mark the conflict as resolved."
10827
msgstr ""
10828
10829
#: en/help_topics/conflict-types.txt:236
10830
msgid ""
10831
"Deleting parent\n"
10832
"---------------"
10833
msgstr ""
10834
10835
#: en/help_topics/conflict-types.txt:241
10836
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10837
msgstr ""
10838
10839
#: en/help_topics/conflict-types.txt:243
10840
msgid ""
10841
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10842
"source, but has new children in the target (either because a directory\n"
10843
"deletion is merged or because the merge introduce new children). Bazaar\n"
10844
"will retain the directory. Resolving this issue depends very much on the\n"
10845
"particular scenario."
10846
msgstr ""
10847
10848
#: en/help_topics/conflict-types.txt:254
10849
msgid ""
10850
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10851
"directory,"
10852
msgstr ""
10853
10854
#: en/help_topics/conflict-types.txt:256
10855
msgid ""
10856
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10857
" children,"
10858
msgstr ""
10859
10860
#: en/help_topics/conflict-types.txt:259
10861
msgid "* ``--action=done`` will just mark the conflict as resolved."
10862
msgstr ""
10863
10864
#: en/help_topics/conflict-types.txt:261
10865
msgid ""
10866
"Note that when merging a directory deletion, if unversioned files are\n"
10867
"present, they become potential orphans has they don't have a directory\n"
10868
"parent anymore."
10869
msgstr ""
10870
10871
#: en/help_topics/conflict-types.txt:265
10872
msgid ""
10873
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10874
"setting the ``bzr.transform.orphan_policy`` configuration option."
10875
msgstr ""
10876
10877
#: en/help_topics/conflict-types.txt:268
10878
msgid "There are two possible values for this option:"
10879
msgstr ""
10880
10881
#: en/help_topics/conflict-types.txt:270
10882
msgid ""
10883
"* ``conflict`` (the default): will leave the orphans in place and\n"
10884
" generate a conflicts,"
10885
msgstr ""
10886
10887
#: en/help_topics/conflict-types.txt:273
10888
msgid ""
10889
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10890
"root\n"
10891
" of the working tree with names like ``<file>.~#~``."
10892
msgstr ""
10893
10894
#: en/help_topics/conflict-types.txt:278
10895
msgid ""
10896
"Path conflict\n"
10897
"-------------"
10898
msgstr ""
10899
10900
#: en/help_topics/conflict-types.txt:283
10901
msgid " Path conflict: PATH1 / PATH2"
10902
msgstr ""
10903
10904
#: en/help_topics/conflict-types.txt:285
10905
msgid ""
10906
"This happens when the source and target have each modified the name or "
10907
"parent\n"
10908
"directory of a file. Bazaar will use the path elements from the source."
10909
msgstr ""
10910
10911
#: en/help_topics/conflict-types.txt:288
10912
msgid ""
10913
"To resolve that kind of conflict, you just have to decide what name should "
10914
"be\n"
10915
"retained for the file involved."
10916
msgstr ""
10917
10918
#: en/help_topics/conflict-types.txt:293
10919
msgid ""
10920
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10921
" issuing ``bzr mv PATH2 PATH1``,\n"
10922
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10923
"``PATH2``,\n"
10924
"* ``--action=done`` will just mark the conflict as resolved."
10925
msgstr ""
10926
10927
#: en/help_topics/conflict-types.txt:300
10928
msgid ""
10929
"Parent loop\n"
10930
"-----------"
10931
msgstr ""
10932
10933
#: en/help_topics/conflict-types.txt:305
10934
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10935
msgstr ""
10936
10937
#: en/help_topics/conflict-types.txt:307
10938
msgid ""
10939
"This happens when the source and the target have each moved directories, so\n"
10940
"that, if the change could be applied, a directory would be contained by "
10941
"itself.\n"
10942
"For example::"
10943
msgstr ""
10944
10945
#: en/help_topics/conflict-types.txt:311
10946
msgid ""
10947
" $ bzr init\n"
10948
" $ bzr mkdir white\n"
10949
" $ bzr mkdir black\n"
10950
" $ bzr commit -m \"BASE\"\n"
10951
" $ bzr branch . ../other\n"
10952
" $ bzr mv white black\n"
10953
" $ bzr commit -m \"THIS\"\n"
10954
" $ bzr mv ../other/black ../other/white\n"
10955
" $ bzr commit ../other -m \"OTHER\"\n"
10956
" $ bzr merge ../other"
10957
msgstr ""
10958
10959
#: en/help_topics/conflict-types.txt:322
10960
msgid ""
10961
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
10962
"``black``. To resolve that kind of conflict, you just have to decide what\n"
10963
"name should be retained for the directories involved."
10964
msgstr ""
10965
10966
#: en/help_topics/conflict-types.txt:328
10967
msgid ""
10968
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
10969
"\n"
10970
" in ``black``,\n"
10971
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
10972
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
10973
"* ``--action=done`` will just mark the conflict as resolved."
10974
msgstr ""
10975
10976
#: en/help_topics/conflict-types.txt:336
10977
msgid ""
10978
"Non-directory parent\n"
10979
"--------------------"
10980
msgstr ""
10981
10982
#: en/help_topics/conflict-types.txt:341
10983
msgid ""
10984
" Conflict: foo.new is not a directory, but has files in it.\n"
10985
" Created directory."
10986
msgstr ""
10987
10988
#: en/help_topics/conflict-types.txt:344
10989
msgid ""
10990
"This happens when one side has added files to a directory, and the other "
10991
"side\n"
10992
"has changed the directory into a file or symlink. For example::"
10993
msgstr ""
10994
10995
#: en/help_topics/conflict-types.txt:347
10996
msgid ""
10997
" $ bzr init\n"
10998
" $ bzr mkdir foo\n"
10999
" $ bzr commit -m \"BASE\"\n"
11000
" $ bzr branch . ../other\n"
11001
" $ rmdir foo\n"
11002
" $ touch foo\n"
11003
" $ bzr commit -m \"THIS\"\n"
11004
" $ bzr mkdir ../other/foo/bar\n"
11005
" $ bzr commit ../other -m \"OTHER\"\n"
11006
" $ bzr merge ../other"
11007
msgstr ""
11008
11009
#: en/help_topics/conflict-types.txt:358
11010
msgid ""
11011
"To resolve that kind of conflict, you have to decide what name should be\n"
11012
"retained for the file, directory or symlink involved."
11013
msgstr ""
11014
11015
#: en/help_topics/conflict-types.txt:363
11016
msgid ""
11017
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11018
" ``bzr add foo``,\n"
11019
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11020
" ``bzr mv foo.new foo``,\n"
11021
"* ``--action=done`` will just mark the conflict as resolved."
11022
msgstr ""
11023
11024
#: en/help_topics/conflict-types.txt:371
11025
msgid ""
11026
"MalformedTransform\n"
11027
"------------------"
11028
msgstr ""
11029
11030
#: en/help_topics/conflict-types.txt:374
11031
msgid ""
11032
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11033
"exception. This means that Bazaar encountered a filesystem conflict that it "
11034
"was\n"
11035
"unable to resolve. This usually indicates a bug. Please let us know if "
11036
"you\n"
11037
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11038
msgstr ""
11039
11040
#: en/help_topics/content-filters.txt:1
11041
msgid ""
11042
"Content Filters\n"
11043
"==============="
11044
msgstr ""
11045
11046
#: en/help_topics/content-filters.txt:4
11047
msgid ""
11048
"Content formats\n"
11049
"---------------"
11050
msgstr ""
11051
11052
#: en/help_topics/content-filters.txt:7
11053
msgid ""
11054
"Bazaar's content filtering allows you to store files in a different\n"
11055
"format from the copy in your working tree. This lets you, or your\n"
11056
"co-developers, use Windows development tools that expect CRLF files\n"
11057
"on projects that use other line-ending conventions. Among other things,\n"
11058
"content filters also let Unix developers more easily work on projects\n"
11059
"using Windows line-ending conventions, keyword expansion/compression,\n"
11060
"and trailing spaces on lines in text files to be implicitly stripped\n"
11061
"when committed."
11062
msgstr ""
11063
11064
#: en/help_topics/content-filters.txt:16
11065
msgid "To generalize, there are two content formats supported by Bazaar:"
11066
msgstr ""
11067
11068
#: en/help_topics/content-filters.txt:18
11069
msgid ""
11070
"* a canonical format - how files are stored internally\n"
11071
"* a convenience format - how files are created in a working tree."
11072
msgstr ""
11073
11074
#: en/help_topics/content-filters.txt:21
11075
msgid ""
11076
"\n"
11077
"Format conversion\n"
11078
"-----------------"
11079
msgstr ""
11080
11081
#: en/help_topics/content-filters.txt:25
11082
msgid ""
11083
"The conversion between these formats is done by content filters.\n"
11084
"A content filter has two parts:"
11085
msgstr ""
11086
11087
#: en/help_topics/content-filters.txt:28
11088
msgid ""
11089
"* a read converter - converts from convenience to canonical format\n"
11090
"* a write converter - converts from canonical to convenience format."
11091
msgstr ""
11092
11093
#: en/help_topics/content-filters.txt:31
11094
msgid ""
11095
"Many of these converters will provide *round-trip* conversion,\n"
11096
"i.e. applying the read converter followed by the write converter\n"
11097
"gives back the original content. However, others may provide an\n"
11098
"asymmetric conversion. For example, a read converter might strip\n"
11099
"trailing whitespace off lines in source code while the matching\n"
11100
"write converter might pass content through unchanged."
11101
msgstr ""
11102
11103
#: en/help_topics/content-filters.txt:38
11104
msgid ""
11105
"\n"
11106
"Enabling content filters\n"
11107
"------------------------"
11108
msgstr ""
11109
11110
#: en/help_topics/content-filters.txt:42
11111
msgid ""
11112
"Content filters are typically provided by plugins, so the first step\n"
11113
"in using them is to install the relevant plugins and read their\n"
11114
"documentation. Some plugins may be very specific about which files\n"
11115
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11116
"In other cases, the plugin may leave it in the user's hands to\n"
11117
"define which files are to be filtered. This is typically done\n"
11118
"using rule-based preferences. See ``bzr help rules`` for general\n"
11119
"information about defining these."
11120
msgstr ""
11121
11122
#: en/help_topics/content-filters.txt:51
11123
msgid ""
11124
"\n"
11125
"Impact on commands\n"
11126
"------------------"
11127
msgstr ""
11128
11129
#: en/help_topics/content-filters.txt:55
11130
msgid ""
11131
"Read converters are only applied to commands that read content from\n"
11132
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11133
"will apply read converters to files in the working tree, then compare\n"
11134
"the results to the content last committed."
11135
msgstr ""
11136
11137
#: en/help_topics/content-filters.txt:60
11138
msgid ""
11139
"Write converters are only applied by commands that **create files in a\n"
11140
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11141
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11142
"respectively."
11143
msgstr ""
11144
11145
#: en/help_topics/content-filters.txt:65
11146
msgid ""
11147
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11148
"comitting files. If this makes sense for a given plugin providing\n"
11149
"a content filter, the plugin can usually achieve this effect by using a\n"
11150
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11151
"for more information on hooks."
11152
msgstr ""
11153
11154
#: en/help_topics/content-filters.txt:71
11155
msgid ""
11156
"\n"
11157
"Refreshing your working tree\n"
11158
"----------------------------"
11159
msgstr ""
11160
11161
#: en/help_topics/content-filters.txt:75
11162
msgid ""
11163
"For performance reasons, Bazaar caches the timestamps of files in\n"
11164
"a working tree, and assumes files are unchanged if their timestamps\n"
11165
"match the cached values. As a consequence, there are times when\n"
11166
"you may need to explicitly ask for content filtering to be reapplied\n"
11167
"in one or both directions, e.g. after installing or reconfiguring\n"
11168
"plugins providing it."
11169
msgstr ""
11170
11171
#: en/help_topics/content-filters.txt:82
11172
msgid "Here are some general guidelines for doing this:"
11173
msgstr ""
11174
11175
#: en/help_topics/content-filters.txt:84
11176
msgid ""
11177
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11178
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11179
" relevant read converters and compare the end result with the\n"
11180
" canonical format."
11181
msgstr ""
11182
11183
#: en/help_topics/content-filters.txt:89
11184
msgid ""
11185
" * To reapply write converters, ensure there are no local changes,\n"
11186
" delete the relevant files and run ``bzr revert`` on those files."
11187
msgstr ""
11188
11189
#: en/help_topics/content-filters.txt:92
11190
msgid ""
11191
"Note: In the future, it is likely that additional options will be added\n"
11192
"to commands to make this refreshing process faster and safer.\n"
11193
msgstr ""
11194
11195
#: en/help_topics/current-formats.txt:1
11196
msgid "Current Storage Formats"
11197
msgstr ""
11198
11199
#: en/help_topics/current-formats.txt:3
11200
msgid ""
11201
":2a:\n"
11202
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11203
" compress storage. Provides rich roots which are a one-way\n"
11204
" transition."
11205
msgstr ""
11206
11207
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11208
msgid ""
11209
"\n"
11210
"See :doc:`formats-help` for more about storage formats."
11211
msgstr ""
11212
11213
#: en/help_topics/debug-flags.txt:1
11214
msgid ""
11215
"Debug Flags\n"
11216
"==========="
11217
msgstr ""
11218
11219
#: en/help_topics/debug-flags.txt:4
11220
msgid ""
11221
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11222
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11223
msgstr ""
11224
11225
#: en/help_topics/debug-flags.txt:7
11226
msgid ""
11227
"-Dauth Trace authentication sections used.\n"
11228
"-Dbytes Print out how many bytes were transferred\n"
11229
"-Ddirstate Trace dirstate activity (verbose!)\n"
11230
"-Derror Instead of normal error handling, always print a "
11231
"traceback\n"
11232
" on error.\n"
11233
"-Devil Capture call sites that do expensive or badly-scaling\n"
11234
" operations.\n"
11235
"-Dfetch Trace history copying between repositories.\n"
11236
"-Dfilters Emit information for debugging content filtering.\n"
11237
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11238
"fetch.\n"
11239
"-Dgraph Trace graph traversal.\n"
11240
"-Dhashcache Log every time a working file is read to determine its "
11241
"hash.\n"
11242
"-Dhooks Trace hook execution.\n"
11243
"-Dhpss Trace smart protocol requests and responses.\n"
11244
"-Dhpssdetail More hpss details.\n"
11245
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11246
"-Dhttp Trace http connections, requests and responses.\n"
11247
"-Dindex Trace major index operations.\n"
11248
"-Dknit Trace knit operations.\n"
11249
"-Dlock Trace when lockdir locks are taken or released.\n"
11250
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11251
" retrying the request.\n"
11252
"-Dprogress Trace progress bar operations.\n"
11253
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11254
"-Dmerge Emit information for debugging merges.\n"
11255
"-Dno_apport Don't use apport to report crashes.\n"
11256
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11257
"-Dpack Emit information about pack operations.\n"
11258
"-Drelock Emit a message every time a branch or repository object "
11259
"is\n"
11260
" unlocked then relocked the same way.\n"
11261
"-Dsftp Trace SFTP internals.\n"
11262
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11263
"expected\n"
11264
"-Dstream Trace fetch streams.\n"
11265
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11266
"portable\n"
11267
" manner.\n"
11268
"-Dunlock Some errors during unlock are treated as warnings.\n"
11269
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11270
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11271
"appropriate\n"
11272
" for the format, even for non-local fetches.\n"
11273
msgstr ""
11274
11275
#: en/help_topics/diverged-branches.txt:1
11276
msgid ""
11277
"Diverged Branches\n"
11278
"================="
11279
msgstr ""
11280
11281
#: en/help_topics/diverged-branches.txt:4
11282
msgid ""
11283
"When Bazaar tries to push one branch onto another, it requires that the\n"
11284
"destination branch must be ready to receive the source branch. If this "
11285
"isn't\n"
11286
"the case, then we say that the branches have ``diverged``. Branches are\n"
11287
"considered diverged if the destination branch's most recent commit is one "
11288
"that\n"
11289
"has not been merged (directly or indirectly) by the source branch. To "
11290
"recover\n"
11291
"from diverged branches, one must merge the missing revisions into the "
11292
"source\n"
11293
"branch."
11294
msgstr ""
11295
11296
#: en/help_topics/diverged-branches.txt:12
11297
msgid ""
11298
"This situation commonly arises when using a centralized workflow with local\n"
11299
"commits. If someone else has committed new work to the mainline since your\n"
11300
"last pull and you have local commits that have not yet been pushed to the\n"
11301
"mainline, then your local branch and the mainline have diverged."
11302
msgstr ""
11303
11304
#: en/help_topics/diverged-branches.txt:17
11305
msgid ""
11306
"Discovering What Has Diverged\n"
11307
"-----------------------------"
11308
msgstr ""
11309
11310
#: en/help_topics/diverged-branches.txt:20
11311
msgid ""
11312
"The ``bzr missing`` command is used to find out what revisions are in "
11313
"another\n"
11314
"branch that are not present in the current branch, and vice-versa. It shows "
11315
"a\n"
11316
"summary of which extra revisions exist in each branch. If you want to see "
11317
"the\n"
11318
"precise effects of those revisions, you can use ``bzr diff --"
11319
"old=other_branch``\n"
11320
"to show the differences between other_branch and your current branch."
11321
msgstr ""
11322
11323
#: en/help_topics/diverged-branches.txt:26
11324
msgid ""
11325
"A Solution\n"
11326
"----------"
11327
msgstr ""
11328
11329
#: en/help_topics/diverged-branches.txt:29
11330
msgid ""
11331
"The solution is to merge the revisions from the mainline into your local\n"
11332
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11333
"mainline. This merge may result in conflicts if the other developer's "
11334
"changes\n"
11335
"overlap with your changes. These conflicts should be resolved before\n"
11336
"continuing. After any conflicts have been resolved, or even if there were "
11337
"no\n"
11338
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11339
"to your local branch. This requirement gives you an opportunity to test "
11340
"the\n"
11341
"resulting working tree for correctness, since the merged revisions could "
11342
"have\n"
11343
"made arbitrary changes. After testing, you should commit the merge using\n"
11344
"``bzr commit``. This clears up the diverged branches situation. Your "
11345
"local\n"
11346
"branch can now be pushed to the mainline.\n"
11347
msgstr ""
11348
11349
#: en/help_topics/eol.txt:1
11350
msgid ""
11351
"End of Line Conversion\n"
11352
"======================"
11353
msgstr ""
11354
11355
#: en/help_topics/eol.txt:4
11356
msgid ""
11357
"EOL conversion is provided as a content filter where Bazaar internally\n"
11358
"stores a canonical format but outputs a convenience format. See\n"
11359
"``bzr help content-filters`` for general information about using these."
11360
msgstr ""
11361
11362
#: en/help_topics/eol.txt:8
11363
msgid ""
11364
"Note: Content filtering is only supported in recently added formats,\n"
11365
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11366
"in a recent format. (Just setting the format on the repository\n"
11367
"is not enough.) If content filtering does not appear to be working, use\n"
11368
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11369
"or later."
11370
msgstr ""
11371
11372
#: en/help_topics/eol.txt:15
11373
msgid ""
11374
"EOL conversion needs to be enabled for selected file patterns using\n"
11375
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11376
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11377
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11378
"supported in a future verison of Bazaar."
11379
msgstr ""
11380
11381
#: en/help_topics/eol.txt:21
11382
msgid ""
11383
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11384
"(If a value is not set, ``exact`` is the default.)"
11385
msgstr ""
11386
11387
#: en/help_topics/eol.txt:24
11388
msgid ""
11389
" ========== ===================================== ======================\n"
11390
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11391
" ========== ===================================== ======================\n"
11392
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11393
" ---------- ------------------------------------- ----------------------\n"
11394
" ``lf`` ``lf`` ``lf``\n"
11395
" ---------- ------------------------------------- ----------------------\n"
11396
" ``crlf`` ``crlf`` ``lf``\n"
11397
" ---------- ------------------------------------- ----------------------\n"
11398
" ``exact`` No conversion Exactly as in file\n"
11399
" ========== ===================================== ======================"
11400
msgstr ""
11401
11402
#: en/help_topics/eol.txt:36
11403
msgid ""
11404
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11405
"byte is detected in the file."
11406
msgstr ""
11407
11408
#: en/help_topics/eol.txt:39
11409
msgid ""
11410
"For users working on a cross-platform project, here is a suggested rule\n"
11411
"to use as a starting point::"
11412
msgstr ""
11413
11414
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11415
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11416
msgid ""
11417
" [name *]\n"
11418
" eol = native"
11419
msgstr ""
11420
11421
#: en/help_topics/eol.txt:45
11422
msgid ""
11423
"If you have binary files that do not contain a null byte though, be\n"
11424
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11425
"by giving more explicit patterns earlier in the rules file. For example::"
11426
msgstr ""
11427
11428
#: en/help_topics/eol.txt:49
11429
msgid ""
11430
" [name *.png]\n"
11431
" eol = exact"
11432
msgstr ""
11433
11434
#: en/help_topics/eol.txt:55
11435
msgid ""
11436
"If your working tree is on a network drive shared by users on different\n"
11437
"operating systems, you typically want to force certain conventions for\n"
11438
"certain files. In that way, if a file is created with the wrong line\n"
11439
"endings or line endings get mixed during editing, it gets committed\n"
11440
"correctly and gets checked out correctly. For example::"
11441
msgstr ""
11442
11443
#: en/help_topics/eol.txt:61
11444
msgid ""
11445
" [name *.bat]\n"
11446
" eol = crlf"
11447
msgstr ""
11448
11449
#: en/help_topics/eol.txt:64
11450
msgid ""
11451
" [name *.sh]\n"
11452
" eol = lf"
11453
msgstr ""
11454
11455
#: en/help_topics/eol.txt:70
11456
msgid ""
11457
"If you take the care to create files with their required endings, you can\n"
11458
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11459
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11460
"introducing mixed line endings will be corrected during commit for files\n"
11461
"with those settings."
11462
msgstr ""
11463
11464
#: en/help_topics/eol.txt:76
11465
msgid ""
11466
"If you have sample test data that deliberately has text files with mixed\n"
11467
"newline conventions, you can ask for those to be left alone like this::"
11468
msgstr ""
11469
11470
#: en/help_topics/eol.txt:79
11471
msgid ""
11472
" [name test_data/]\n"
11473
" eol = exact"
11474
msgstr ""
11475
11476
#: en/help_topics/eol.txt:85
11477
msgid ""
11478
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11479
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11480
"of content analysis to detect binary files for commands like ``diff``.\n"
11481
"In the future, a ``binary = true`` rule may be added but it is not\n"
11482
"supported yet.)"
11483
msgstr ""
11484
11485
#: en/help_topics/eol.txt:91
11486
msgid ""
11487
"If you have an existing repository with text files already stored using\n"
11488
"Windows newline conventions (``crlf``), then you may want to keep using "
11489
"that\n"
11490
"convention in the repository. Forcing certain files to this convention\n"
11491
"may also help users who do not have rules configured. To do this, set\n"
11492
"``eol`` to one of the values below."
11493
msgstr ""
11494
11495
#: en/help_topics/eol.txt:97
11496
msgid ""
11497
" ============================ ======================== "
11498
"======================\n"
11499
" Value Checkout end-of-lines as Commit end-of-lines "
11500
"as\n"
11501
" ============================ ======================== "
11502
"======================\n"
11503
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11504
" ``lf`` otherwise\n"
11505
" ---------------------------- ------------------------ ----------------------"
11506
"\n"
11507
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11508
" ---------------------------- ------------------------ ----------------------"
11509
"\n"
11510
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11511
" ============================ ======================== ======================"
11512
msgstr ""
11513
11514
#: en/help_topics/eol.txt:108
11515
msgid ""
11516
"For users working on an existing project that uses Windows newline\n"
11517
"conventions in their Bazaar repository, this rule is suggested as a\n"
11518
"starting point::"
11519
msgstr ""
11520
11521
#: en/help_topics/eol.txt:112
11522
msgid ""
11523
" [name *]\n"
11524
" eol = native-with-crlf-in-repo"
11525
msgstr ""
11526
11527
#: en/help_topics/eol.txt:115
11528
msgid ""
11529
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11530
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11531
"``crlf`` and ``exact``."
11532
msgstr ""
11533
11534
#: en/help_topics/eol.txt:119
11535
msgid ""
11536
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11537
"never reject files because a given line ending or mixed line endings\n"
11538
"are found. A precommit hook should be used if you wish to validate\n"
11539
"(and not just convert) content before committing.\n"
11540
msgstr ""
11541
11542
#: en/help_topics/hidden-commands.txt:1
11543
msgid ""
11544
"added List files added in working tree.\n"
11545
"ancestry List all revisions merged into this branch.\n"
11546
"assert-fail Test reporting of assertion failures\n"
11547
"bundle-info Output interesting stats about a bundle\n"
11548
"bundle-revisions Create a merge-directive for submitting changes.\n"
11549
"cat-revision Write out metadata for a revision.\n"
11550
"dump-btree Dump the contents of a btree index file to stdout.\n"
11551
"export-pot Export command helps and error messages in po format.\n"
11552
"file-id Print file_id of a particular file or directory.\n"
11553
"file-path Print path of file_ids to a file or directory.\n"
11554
"find-merge-base Find and print a base revision for merging two "
11555
"branches.\n"
11556
"hooks Show hooks.\n"
11557
"inventory Show inventory of the current working copy or a "
11558
"revision.\n"
11559
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11560
"lookup-revision Lookup the revision-id from a revision-number\n"
11561
"merge-directive Generate a merge directive for auto-merge tools.\n"
11562
"modified List files modified in working tree.\n"
11563
"re-sign Create a digital signature for an existing revision.\n"
11564
"reference list, view and set branch locations for nested trees.\n"
11565
"relpath Show path of a file relative to root\n"
11566
"repair-workingtree Reset the working tree state file.\n"
11567
"revision-history Display the list of revision ids on a branch.\n"
11568
"revision-info Show revision number and revision id for a given "
11569
"revision\n"
11570
" identifier.\n"
11571
"rocks Statement of optimism.\n"
11572
"selftest Run internal test suite.\n"
11573
"shell-complete Show appropriate completions for context.\n"
11574
"test-script Run a shell-like test from a file.\n"
11575
"touching-revisions Return revision-ids which affected a particular file.\n"
11576
"unknowns List unknown files.\n"
11577
"wait-until-signalled Test helper for\n"
11578
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11579
msgstr ""
11580
11581
#: en/help_topics/hooks.txt:1
11582
msgid ""
11583
"\n"
11584
"Hooks\n"
11585
"====="
11586
msgstr ""
11587
11588
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11589
msgid ""
11590
"Introduction\n"
11591
"------------"
11592
msgstr ""
11593
11594
#: en/help_topics/hooks.txt:8
11595
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11596
msgstr ""
11597
11598
#: en/help_topics/hooks.txt:10
11599
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11600
msgstr ""
11601
11602
#: en/help_topics/hooks.txt:12
11603
msgid ""
11604
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11605
msgstr ""
11606
11607
#: en/help_topics/hooks.txt:14
11608
msgid ""
11609
"The class that contains each hook is given before the hooks it supplies. "
11610
"For\n"
11611
"instance, BranchHooks as the class is the hooks class for\n"
11612
"`bzrlib.branch.Branch.hooks`."
11613
msgstr ""
11614
11615
#: en/help_topics/hooks.txt:18
11616
msgid ""
11617
"Each description also indicates whether the hook runs on the client (the\n"
11618
"machine where bzr was invoked) or the server (the machine addressed by\n"
11619
"the branch URL). These may be, but are not necessarily, the same machine."
11620
msgstr ""
11621
11622
#: en/help_topics/hooks.txt:22
11623
msgid ""
11624
"Plugins (including hooks) are run on the server if all of these is true:"
11625
msgstr ""
11626
11627
#: en/help_topics/hooks.txt:24
11628
msgid ""
11629
" * The connection is via a smart server (accessed with a URL starting with\n"
11630
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11631
"\"http://\"\n"
11632
" URL when a smart server is available via HTTP)."
11633
msgstr ""
11634
11635
#: en/help_topics/hooks.txt:28
11636
msgid ""
11637
" * The hook is either server specific or part of general infrastructure "
11638
"rather\n"
11639
" than client specific code (such as commit)."
11640
msgstr ""
11641
11642
#: en/help_topics/hooks.txt:31
11643
msgid ""
11644
"\n"
11645
"BranchHooks\n"
11646
"-----------"
11647
msgstr ""
11648
11649
#: en/help_topics/hooks.txt:35
11650
msgid ""
11651
"automatic_tag_name\n"
11652
"~~~~~~~~~~~~~~~~~~"
11653
msgstr ""
11654
11655
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11656
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11657
msgid "Introduced in: 2.2"
11658
msgstr ""
11659
11660
#: en/help_topics/hooks.txt:40
11661
msgid ""
11662
"Called to determine an automatic tag name for a revision.\n"
11663
"automatic_tag_name is called with (branch, revision_id) and should\n"
11664
"return a tag name or None if no tag name could be determined. The\n"
11665
"first non-None tag name returned will be used."
11666
msgstr ""
11667
11668
#: en/help_topics/hooks.txt:45
11669
msgid ""
11670
"open\n"
11671
"~~~~"
11672
msgstr ""
11673
11674
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11675
#: en/help_topics/hooks.txt:304
11676
msgid "Introduced in: 1.8"
11677
msgstr ""
11678
11679
#: en/help_topics/hooks.txt:50
11680
msgid ""
11681
"Called with the Branch object that has been opened after a branch is\n"
11682
"opened."
11683
msgstr ""
11684
11685
#: en/help_topics/hooks.txt:53
11686
msgid ""
11687
"post_branch_init\n"
11688
"~~~~~~~~~~~~~~~~"
11689
msgstr ""
11690
11691
#: en/help_topics/hooks.txt:58
11692
msgid ""
11693
"Called after new branch initialization completes. post_branch_init is\n"
11694
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11695
"branch and checkout (both heavyweight and lightweight) will all\n"
11696
"trigger this hook."
11697
msgstr ""
11698
11699
#: en/help_topics/hooks.txt:63
11700
msgid ""
11701
"post_change_branch_tip\n"
11702
"~~~~~~~~~~~~~~~~~~~~~~"
11703
msgstr ""
11704
11705
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
11706
msgid "Introduced in: 1.4"
11707
msgstr ""
11708
11709
#: en/help_topics/hooks.txt:68
11710
msgid ""
11711
"Called in bzr client and server after a change to the tip of a branch\n"
11712
"is made. post_change_branch_tip is called with a\n"
11713
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11714
"uncommit will all trigger this hook."
11715
msgstr ""
11716
11717
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11718
msgid ""
11719
"post_commit\n"
11720
"~~~~~~~~~~~"
11721
msgstr ""
11722
11723
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11724
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11725
#: en/help_topics/hooks.txt:145
11726
msgid "Introduced in: 0.15"
11727
msgstr ""
11728
11729
#: en/help_topics/hooks.txt:78
11730
msgid ""
11731
"Called in the bzr client after a commit has completed. post_commit is\n"
11732
"called with (local, master, old_revno, old_revid, new_revno,\n"
11733
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11734
"branch."
11735
msgstr ""
11736
11737
#: en/help_topics/hooks.txt:83
11738
msgid ""
11739
"post_pull\n"
11740
"~~~~~~~~~"
11741
msgstr ""
11742
11743
#: en/help_topics/hooks.txt:88
11744
msgid ""
11745
"Called after a pull operation completes. post_pull is called with a\n"
11746
"bzrlib.branch.PullResult object and only runs in the bzr client."
11747
msgstr ""
11748
11749
#: en/help_topics/hooks.txt:91
11750
msgid ""
11751
"post_push\n"
11752
"~~~~~~~~~"
11753
msgstr ""
11754
11755
#: en/help_topics/hooks.txt:96
11756
msgid ""
11757
"Called after a push operation completes. post_push is called with a\n"
11758
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11759
msgstr ""
11760
11761
#: en/help_topics/hooks.txt:99
11762
msgid ""
11763
"post_switch\n"
11764
"~~~~~~~~~~~"
11765
msgstr ""
11766
11767
#: en/help_topics/hooks.txt:104
11768
msgid ""
11769
"Called after a checkout switches branch. post_switch is called with a\n"
11770
"bzrlib.branch.SwitchHookParams."
11771
msgstr ""
11772
11773
#: en/help_topics/hooks.txt:107
11774
msgid ""
11775
"post_uncommit\n"
11776
"~~~~~~~~~~~~~"
11777
msgstr ""
11778
11779
#: en/help_topics/hooks.txt:112
11780
msgid ""
11781
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11782
"called with (local, master, old_revno, old_revid, new_revno,\n"
11783
"new_revid) where local is the local branch or None, master is the\n"
11784
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11785
"of None."
11786
msgstr ""
11787
11788
#: en/help_topics/hooks.txt:118
11789
msgid ""
11790
"pre_change_branch_tip\n"
11791
"~~~~~~~~~~~~~~~~~~~~~"
11792
msgstr ""
11793
11794
#: en/help_topics/hooks.txt:121
11795
msgid "Introduced in: 1.6"
11796
msgstr ""
11797
11798
#: en/help_topics/hooks.txt:123
11799
msgid ""
11800
"Called in bzr client and server before a change to the tip of a branch\n"
11801
"is made. pre_change_branch_tip is called with a\n"
11802
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11803
"uncommit will all trigger this hook."
11804
msgstr ""
11805
11806
#: en/help_topics/hooks.txt:128
11807
msgid ""
11808
"pre_commit\n"
11809
"~~~~~~~~~~"
11810
msgstr ""
11811
11812
#: en/help_topics/hooks.txt:131
11813
msgid "Introduced in: 0.91"
11814
msgstr ""
11815
11816
#: en/help_topics/hooks.txt:133
11817
msgid ""
11818
"Called after a commit is calculated but before it is completed.\n"
11819
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11820
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11821
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11822
"TreeDelta object describing changes from the basis revision. hooks\n"
11823
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11824
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11825
"tree."
11826
msgstr ""
11827
11828
#: en/help_topics/hooks.txt:142
11829
msgid ""
11830
"set_rh\n"
11831
"~~~~~~"
11832
msgstr ""
11833
11834
#: en/help_topics/hooks.txt:147
11835
msgid ""
11836
"Invoked whenever the revision history has been set via\n"
11837
"set_revision_history. The api signature is (branch, revision_history),\n"
11838
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11839
"for bzr to trigger, a better hook to use is\n"
11840
"Branch.post_change_branch_tip."
11841
msgstr ""
11842
11843
#: en/help_topics/hooks.txt:153
11844
msgid ""
11845
"transform_fallback_location\n"
11846
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11847
msgstr ""
11848
11849
#: en/help_topics/hooks.txt:156
11850
msgid "Introduced in: 1.9"
11851
msgstr ""
11852
11853
#: en/help_topics/hooks.txt:158
11854
msgid ""
11855
"Called when a stacked branch is activating its fallback locations.\n"
11856
"transform_fallback_location is called with (branch, url), and should\n"
11857
"return a new url. Returning the same url allows it to be used as-is,\n"
11858
"returning a different one can be used to cause the branch to stack on\n"
11859
"a closer copy of that fallback_location. Note that the branch cannot\n"
11860
"have history accessing methods called on it during this hook because\n"
11861
"the fallback locations have not been activated. When there are\n"
11862
"multiple hooks installed for transform_fallback_location, all are\n"
11863
"called with the url returned from the previous hook.The order is\n"
11864
"however undefined."
11865
msgstr ""
11866
11867
#: en/help_topics/hooks.txt:169
11868
msgid ""
11869
"CommandHooks\n"
11870
"------------"
11871
msgstr ""
11872
11873
#: en/help_topics/hooks.txt:172
11874
msgid ""
11875
"extend_command\n"
11876
"~~~~~~~~~~~~~~"
11877
msgstr ""
11878
11879
#: en/help_topics/hooks.txt:175
11880
msgid "Introduced in: 1.13"
11881
msgstr ""
11882
11883
#: en/help_topics/hooks.txt:177
11884
msgid ""
11885
"Called after creating a command object to allow modifications such as\n"
11886
"adding or removing options, docs etc. Called with the new\n"
11887
"bzrlib.commands.Command object."
11888
msgstr ""
11889
11890
#: en/help_topics/hooks.txt:181
11891
msgid ""
11892
"get_command\n"
11893
"~~~~~~~~~~~"
11894
msgstr ""
11895
11896
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11897
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
11898
msgid "Introduced in: 1.17"
11899
msgstr ""
11900
11901
#: en/help_topics/hooks.txt:186
11902
msgid ""
11903
"Called when creating a single command. Called with (cmd_or_None,\n"
11904
"command_name). get_command should either return the cmd_or_None\n"
11905
"parameter, or a replacement Command object that should be used for the\n"
11906
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11907
"Many users will prefer to use bzrlib.commands.register_command or\n"
11908
"plugin_cmds.register_lazy."
11909
msgstr ""
11910
11911
#: en/help_topics/hooks.txt:193
11912
msgid ""
11913
"get_missing_command\n"
11914
"~~~~~~~~~~~~~~~~~~~"
11915
msgstr ""
11916
11917
#: en/help_topics/hooks.txt:198
11918
msgid ""
11919
"Called when creating a single command if no command could be found.\n"
11920
"Called with (command_name). get_missing_command should either return\n"
11921
"None, or a Command object to be used for the command."
11922
msgstr ""
11923
11924
#: en/help_topics/hooks.txt:202
11925
msgid ""
11926
"list_commands\n"
11927
"~~~~~~~~~~~~~"
11928
msgstr ""
11929
11930
#: en/help_topics/hooks.txt:207
11931
msgid ""
11932
"Called when enumerating commands. Called with a set of cmd_name\n"
11933
"strings for all the commands found so far. This set is safe to mutate\n"
11934
"- e.g. to remove a command. list_commands should return the updated\n"
11935
"set of command names."
11936
msgstr ""
11937
11938
#: en/help_topics/hooks.txt:212
11939
msgid ""
11940
"_ConfigHooks\n"
11941
"------------"
11942
msgstr ""
11943
11944
#: en/help_topics/hooks.txt:215
11945
msgid ""
11946
"get\n"
11947
"~~~"
11948
msgstr ""
11949
11950
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11951
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11952
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11953
#: en/help_topics/hooks.txt:427
11954
msgid "Introduced in: 2.4"
11955
msgstr ""
11956
11957
#: en/help_topics/hooks.txt:220
11958
msgid ""
11959
"Invoked when a config option is read. The signature is (stack, name,\n"
11960
"value)."
11961
msgstr ""
11962
11963
#: en/help_topics/hooks.txt:223
11964
msgid ""
11965
"load\n"
11966
"~~~~"
11967
msgstr ""
11968
11969
#: en/help_topics/hooks.txt:228
11970
msgid "Invoked when a config store is loaded. The signature is (store)."
11971
msgstr ""
11972
11973
#: en/help_topics/hooks.txt:230
11974
msgid ""
11975
"remove\n"
11976
"~~~~~~"
11977
msgstr ""
11978
11979
#: en/help_topics/hooks.txt:235
11980
msgid ""
11981
"Invoked when a config option is removed. The signature is (stack,\n"
11982
"name)."
11983
msgstr ""
11984
11985
#: en/help_topics/hooks.txt:238
11986
msgid ""
11987
"save\n"
11988
"~~~~"
11989
msgstr ""
11990
11991
#: en/help_topics/hooks.txt:243
11992
msgid "Invoked when a config store is saved. The signature is (store)."
11993
msgstr ""
11994
11995
#: en/help_topics/hooks.txt:245
11996
msgid ""
11997
"set\n"
11998
"~~~"
11999
msgstr ""
12000
12001
#: en/help_topics/hooks.txt:250
12002
msgid ""
12003
"Invoked when a config option is set. The signature is (stack, name,\n"
12004
"value)."
12005
msgstr ""
12006
12007
#: en/help_topics/hooks.txt:253
12008
msgid ""
12009
"ControlDirHooks\n"
12010
"---------------"
12011
msgstr ""
12012
12013
#: en/help_topics/hooks.txt:256
12014
msgid ""
12015
"post_repo_init\n"
12016
"~~~~~~~~~~~~~~"
12017
msgstr ""
12018
12019
#: en/help_topics/hooks.txt:261
12020
msgid ""
12021
"Invoked after a repository has been initialized. post_repo_init is\n"
12022
"called with a bzrlib.controldir.RepoInitHookParams."
12023
msgstr ""
12024
12025
#: en/help_topics/hooks.txt:264
12026
msgid ""
12027
"pre_open\n"
12028
"~~~~~~~~"
12029
msgstr ""
12030
12031
#: en/help_topics/hooks.txt:267
12032
msgid "Introduced in: 1.14"
12033
msgstr ""
12034
12035
#: en/help_topics/hooks.txt:269
12036
msgid ""
12037
"Invoked before attempting to open a ControlDir with the transport that\n"
12038
"the open will use."
12039
msgstr ""
12040
12041
#: en/help_topics/hooks.txt:272
12042
msgid ""
12043
"InfoHooks\n"
12044
"---------"
12045
msgstr ""
12046
12047
#: en/help_topics/hooks.txt:275
12048
msgid ""
12049
"repository\n"
12050
"~~~~~~~~~~"
12051
msgstr ""
12052
12053
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12054
#: en/help_topics/hooks.txt:505
12055
msgid "Introduced in: 1.15"
12056
msgstr ""
12057
12058
#: en/help_topics/hooks.txt:280
12059
msgid ""
12060
"Invoked when displaying the statistics for a repository. repository is\n"
12061
"called with a statistics dictionary as returned by the repository and\n"
12062
"a file-like object to write to."
12063
msgstr ""
12064
12065
#: en/help_topics/hooks.txt:284
12066
msgid ""
12067
"LockHooks\n"
12068
"---------"
12069
msgstr ""
12070
12071
#: en/help_topics/hooks.txt:287
12072
msgid ""
12073
"lock_acquired\n"
12074
"~~~~~~~~~~~~~"
12075
msgstr ""
12076
12077
#: en/help_topics/hooks.txt:292
12078
msgid ""
12079
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12080
msgstr ""
12081
12082
#: en/help_topics/hooks.txt:294
12083
msgid ""
12084
"lock_broken\n"
12085
"~~~~~~~~~~~"
12086
msgstr ""
12087
12088
#: en/help_topics/hooks.txt:299
12089
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12090
msgstr ""
12091
12092
#: en/help_topics/hooks.txt:301
12093
msgid ""
12094
"lock_released\n"
12095
"~~~~~~~~~~~~~"
12096
msgstr ""
12097
12098
#: en/help_topics/hooks.txt:306
12099
msgid ""
12100
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12101
msgstr ""
12102
12103
#: en/help_topics/hooks.txt:308
12104
msgid ""
12105
"MergeHooks\n"
12106
"----------"
12107
msgstr ""
12108
12109
#: en/help_topics/hooks.txt:311
12110
msgid ""
12111
"merge_file_content\n"
12112
"~~~~~~~~~~~~~~~~~~"
12113
msgstr ""
12114
12115
#: en/help_topics/hooks.txt:314
12116
msgid "Introduced in: 2.1"
12117
msgstr ""
12118
12119
#: en/help_topics/hooks.txt:316
12120
msgid ""
12121
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12122
"object when starting a merge. Should return either None or a subclass\n"
12123
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12124
"called per file that needs to be merged (including when one side has\n"
12125
"deleted the file and the other has changed it). See the\n"
12126
"AbstractPerFileMerger API docs for details on how it is used by merge."
12127
msgstr ""
12128
12129
#: en/help_topics/hooks.txt:323
12130
msgid ""
12131
"post_merge\n"
12132
"~~~~~~~~~~"
12133
msgstr ""
12134
12135
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12136
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
12137
msgid "Introduced in: 2.5"
12138
msgstr ""
12139
12140
#: en/help_topics/hooks.txt:328
12141
msgid ""
12142
"Called after a merge. Receives a Merger object as the single argument.\n"
12143
"The return value is ignored."
12144
msgstr ""
12145
12146
#: en/help_topics/hooks.txt:331
12147
msgid ""
12148
"pre_merge\n"
12149
"~~~~~~~~~"
12150
msgstr ""
12151
12152
#: en/help_topics/hooks.txt:336
12153
msgid ""
12154
"Called before a merge. Receives a Merger object as the single\n"
12155
"argument."
12156
msgstr ""
12157
12158
#: en/help_topics/hooks.txt:339
12159
msgid ""
12160
"MergeDirectiveHooks\n"
12161
"-------------------"
12162
msgstr ""
12163
12164
#: en/help_topics/hooks.txt:342
12165
msgid ""
12166
"merge_request_body\n"
12167
"~~~~~~~~~~~~~~~~~~"
12168
msgstr ""
12169
12170
#: en/help_topics/hooks.txt:345
12171
msgid "Introduced in: 1.15.0"
12172
msgstr ""
12173
12174
#: en/help_topics/hooks.txt:347
12175
msgid ""
12176
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12177
"request. Callbacks must return a body. If more than one callback is\n"
12178
"registered, the output of one callback is provided to the next."
12179
msgstr ""
12180
12181
#: en/help_topics/hooks.txt:351
12182
msgid ""
12183
"MessageEditorHooks\n"
12184
"------------------"
12185
msgstr ""
12186
12187
#: en/help_topics/hooks.txt:354
12188
msgid ""
12189
"commit_message_template\n"
12190
"~~~~~~~~~~~~~~~~~~~~~~~"
12191
msgstr ""
12192
12193
#: en/help_topics/hooks.txt:357
12194
msgid "Introduced in: 1.10"
12195
msgstr ""
12196
12197
#: en/help_topics/hooks.txt:359
12198
msgid ""
12199
"Called when a commit message is being generated.\n"
12200
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12201
"and the message that is known so far. commit_message_template must\n"
12202
"return a new message to use (which could be the same as it was given).\n"
12203
"When there are multiple hooks registered for commit_message_template,\n"
12204
"they are chained with the result from the first passed into the\n"
12205
"second, and so on."
12206
msgstr ""
12207
12208
#: en/help_topics/hooks.txt:367
12209
msgid ""
12210
"set_commit_message\n"
12211
"~~~~~~~~~~~~~~~~~~"
12212
msgstr ""
12213
12214
#: en/help_topics/hooks.txt:372
12215
msgid ""
12216
"Set a fixed commit message. set_commit_message is called with the\n"
12217
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12218
"properties by editing commit.builder._revprops) and the message so\n"
12219
"far. set_commit_message must return the message to use or None if it\n"
12220
"should use the message editor as normal."
12221
msgstr ""
12222
12223
#: en/help_topics/hooks.txt:378
12224
msgid ""
12225
"MutableTreeHooks\n"
12226
"----------------"
12227
msgstr ""
12228
12229
#: en/help_topics/hooks.txt:381
12230
msgid ""
12231
"post_build_tree\n"
12232
"~~~~~~~~~~~~~~~"
12233
msgstr ""
12234
12235
#: en/help_topics/hooks.txt:386
12236
msgid ""
12237
"Called after a completely new tree is built. The hook is called with\n"
12238
"the tree as its only argument."
12239
msgstr ""
12240
12241
#: en/help_topics/hooks.txt:392
12242
msgid "Introduced in: 2.0"
12243
msgstr ""
12244
12245
#: en/help_topics/hooks.txt:394
12246
msgid ""
12247
"Called after a commit is performed on a tree. The hook is called with\n"
12248
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12249
"commit was performed on is available via the mutable_tree attribute of\n"
12250
"that object."
12251
msgstr ""
12252
12253
#: en/help_topics/hooks.txt:399
12254
msgid ""
12255
"start_commit\n"
12256
"~~~~~~~~~~~~"
12257
msgstr ""
12258
12259
#: en/help_topics/hooks.txt:404
12260
msgid ""
12261
"Called before a commit is performed on a tree. The start commit hook\n"
12262
"is able to change the tree before the commit takes place. start_commit\n"
12263
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12264
"being performed on."
12265
msgstr ""
12266
12267
#: en/help_topics/hooks.txt:409
12268
msgid ""
12269
"SmartClientHooks\n"
12270
"----------------"
12271
msgstr ""
12272
12273
#: en/help_topics/hooks.txt:412
12274
msgid ""
12275
"call\n"
12276
"~~~~"
12277
msgstr ""
12278
12279
#: en/help_topics/hooks.txt:415
12280
msgid "Introduced in: unknown"
12281
msgstr ""
12282
12283
#: en/help_topics/hooks.txt:417
12284
msgid ""
12285
"Called when the smart client is submitting a request to the smart\n"
12286
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12287
"Streaming request bodies, and responses, are not accessible."
12288
msgstr ""
12289
12290
#: en/help_topics/hooks.txt:421
12291
msgid ""
12292
"SmartServerHooks\n"
12293
"----------------"
12294
msgstr ""
12295
12296
#: en/help_topics/hooks.txt:424
12297
msgid ""
12298
"server_exception\n"
12299
"~~~~~~~~~~~~~~~~"
12300
msgstr ""
12301
12302
#: en/help_topics/hooks.txt:429
12303
msgid ""
12304
"Called by the bzr server when an exception occurs. server_exception is\n"
12305
"called with the sys.exc_info() tuple return true for the hook if the\n"
12306
"exception has been handled, in which case the server will exit\n"
12307
"normally."
12308
msgstr ""
12309
12310
#: en/help_topics/hooks.txt:434
12311
msgid ""
12312
"server_started\n"
12313
"~~~~~~~~~~~~~~"
12314
msgstr ""
12315
12316
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12317
msgid "Introduced in: 0.16"
12318
msgstr ""
12319
12320
#: en/help_topics/hooks.txt:439
12321
msgid ""
12322
"Called by the bzr server when it starts serving a directory.\n"
12323
"server_started is called with (backing urls, public url), where\n"
12324
"backing_url is a list of URLs giving the server-specific directory\n"
12325
"locations, and public_url is the public URL for the directory being\n"
12326
"served."
12327
msgstr ""
12328
12329
#: en/help_topics/hooks.txt:445
12330
msgid ""
12331
"server_started_ex\n"
12332
"~~~~~~~~~~~~~~~~~"
12333
msgstr ""
12334
12335
#: en/help_topics/hooks.txt:450
12336
msgid ""
12337
"Called by the bzr server when it starts serving a directory.\n"
12338
"server_started is called with (backing_urls, server_obj)."
12339
msgstr ""
12340
12341
#: en/help_topics/hooks.txt:453
12342
msgid ""
12343
"server_stopped\n"
12344
"~~~~~~~~~~~~~~"
12345
msgstr ""
12346
12347
#: en/help_topics/hooks.txt:458
12348
msgid ""
12349
"Called by the bzr server when it stops serving a directory.\n"
12350
"server_stopped is called with the same parameters as the\n"
12351
"server_started hook: (backing_urls, public_url)."
12352
msgstr ""
12353
12354
#: en/help_topics/hooks.txt:462
12355
msgid ""
12356
"StatusHooks\n"
12357
"-----------"
12358
msgstr ""
12359
12360
#: en/help_topics/hooks.txt:465
12361
msgid ""
12362
"post_status\n"
12363
"~~~~~~~~~~~"
12364
msgstr ""
12365
12366
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
12367
msgid "Introduced in: 2.3"
12368
msgstr ""
12369
12370
#: en/help_topics/hooks.txt:470
12371
msgid ""
12372
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12373
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12374
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12375
"correspond to the command line options specified by the user for the\n"
12376
"status command. to_file is the output stream for writing."
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:476
12380
msgid ""
12381
"pre_status\n"
12382
"~~~~~~~~~~"
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:481
12386
msgid ""
12387
"Called with argument StatusHookParams before Bazaar displays the\n"
12388
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12389
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12390
"correspond to the command line options specified by the user for the\n"
12391
"status command. to_file is the output stream for writing."
12392
msgstr ""
12393
12394
#: en/help_topics/hooks.txt:487
12395
msgid ""
12396
"TransportHooks\n"
12397
"--------------"
12398
msgstr ""
12399
12400
#: en/help_topics/hooks.txt:490
12401
msgid ""
12402
"post_connect\n"
12403
"~~~~~~~~~~~~"
12404
msgstr ""
12405
12406
#: en/help_topics/hooks.txt:495
12407
msgid ""
12408
"Called after a new connection is established or a reconnect occurs.\n"
12409
"The sole argument passed is either the connected transport or smart\n"
12410
"medium instance."
12411
msgstr ""
12412
12413
#: en/help_topics/hooks.txt:499
12414
msgid ""
12415
"RioVersionInfoBuilderHooks\n"
12416
"--------------------------"
12417
msgstr ""
12418
12419
#: en/help_topics/hooks.txt:502
12420
msgid ""
12421
"revision\n"
12422
"~~~~~~~~"
12423
msgstr ""
12424
12425
#: en/help_topics/hooks.txt:507
12426
msgid ""
12427
"Invoked when adding information about a revision to the RIO stanza\n"
12428
"that is printed. revision is called with a revision object and a RIO\n"
12429
"stanza.\n"
12430
msgstr ""
12431
12432
#: en/help_topics/location-alias.txt:1
12433
msgid ""
12434
"Location aliases\n"
12435
"================"
12436
msgstr ""
12437
12438
#: en/help_topics/location-alias.txt:4
12439
msgid ""
12440
"Bazaar defines several aliases for locations associated with a branch. "
12441
"These\n"
12442
"can be used with most commands that expect a location, such as `bzr push`."
12443
msgstr ""
12444
12445
#: en/help_topics/location-alias.txt:7
12446
msgid "The aliases are::"
12447
msgstr ""
12448
12449
#: en/help_topics/location-alias.txt:9
12450
msgid ""
12451
" :bound The branch this branch is bound to, for bound branches.\n"
12452
" :parent The parent of this branch.\n"
12453
" :public The public location of this branch.\n"
12454
" :push The saved location used for `bzr push` with no arguments.\n"
12455
" :submit The submit branch for this branch.\n"
12456
" :this This branch."
12457
msgstr ""
12458
12459
#: en/help_topics/location-alias.txt:16
12460
msgid "For example, to push to the parent location::"
12461
msgstr ""
12462
12463
#: en/help_topics/location-alias.txt:18
12464
msgid " bzr push :parent\n"
12465
msgstr ""
12466
12467
#: en/help_topics/log-formats.txt:1
12468
msgid ""
12469
"Log Formats\n"
12470
"==========="
12471
msgstr ""
12472
12473
#: en/help_topics/log-formats.txt:4
12474
msgid ""
12475
"A log format controls how information about each revision is displayed.\n"
12476
"The standard log formats are compared below::"
12477
msgstr ""
12478
12479
#: en/help_topics/log-formats.txt:7
12480
msgid ""
12481
" Feature long short line\n"
12482
" ---------------------- ------------- ------------ -------------------\n"
12483
" design goal detailed view concise view 1 revision per line\n"
12484
" committer name+email name only name only\n"
12485
" author name+email - -\n"
12486
" date-time format full date only date only\n"
12487
" commit message full full top line\n"
12488
" tags yes yes yes\n"
12489
" merges indicator - yes -\n"
12490
" status/delta optional optional -\n"
12491
" diff/patch optional optional -\n"
12492
" revision-id optional optional -\n"
12493
" branch nick yes - -\n"
12494
" foreign vcs properties yes yes -\n"
12495
" preferred levels all 1 1\n"
12496
" digital signature optional - -"
12497
msgstr ""
12498
12499
#: en/help_topics/log-formats.txt:24
12500
msgid ""
12501
"The default format is ``long``. To change this, define the ``log_format``\n"
12502
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12503
msgstr ""
12504
12505
#: en/help_topics/log-formats.txt:27
12506
msgid ""
12507
" [DEFAULT]\n"
12508
" log_format = short"
12509
msgstr ""
12510
12511
#: en/help_topics/log-formats.txt:30
12512
msgid ""
12513
"Alternatively, to change the log format used for a given query, use the\n"
12514
"--long, --short or --line options."
12515
msgstr ""
12516
12517
#: en/help_topics/log-formats.txt:33
12518
msgid ""
12519
"If one of the standard log formats does not meet your needs, additional\n"
12520
"formats can be provided by plugins.\n"
12521
msgstr ""
12522
12523
#: en/help_topics/other-formats.txt:1
12524
msgid "Other Storage Formats"
12525
msgstr ""
12526
12527
#: en/help_topics/other-formats.txt:3
12528
msgid "Experimental formats are shown below."
12529
msgstr ""
12530
12531
#: en/help_topics/other-formats.txt:5
12532
msgid ""
12533
":development-colo:\n"
12534
" (native) The 2a format with experimental support for colocated\n"
12535
" branches."
12536
msgstr ""
12537
12538
#: en/help_topics/other-formats.txt:9
12539
msgid ""
12540
"\n"
12541
"Deprecated formats are shown below."
12542
msgstr ""
12543
12544
#: en/help_topics/other-formats.txt:12
12545
msgid ""
12546
":pack-0.92:\n"
12547
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12548
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12549
" by bzr < 0.92."
12550
msgstr ""
12551
12552
#: en/help_topics/patterns.txt:1
12553
msgid ""
12554
"Patterns\n"
12555
"========"
12556
msgstr ""
12557
12558
#: en/help_topics/patterns.txt:4
12559
msgid ""
12560
"Bazaar uses patterns to match files at various times. For example,\n"
12561
"the ``add`` command skips over files that match ignore patterns\n"
12562
"and preferences can be associated with files using rule patterns.\n"
12563
"The pattern syntax is described below."
12564
msgstr ""
12565
12566
#: en/help_topics/patterns.txt:9
12567
msgid ""
12568
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12569
"slash or is a regular expression, it is compared to the whole path\n"
12570
"from the branch root. Otherwise, it is compared to only the last\n"
12571
"component of the path. To match a file only in the root directory,\n"
12572
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12573
msgstr ""
12574
12575
#: en/help_topics/patterns.txt:15
12576
msgid "Patterns may include globbing wildcards such as::"
12577
msgstr ""
12578
12579
#: en/help_topics/patterns.txt:17
12580
msgid ""
12581
" ? - Matches any single character except '/'\n"
12582
" * - Matches 0 or more characters except '/'\n"
12583
" /**/ - Matches 0 or more directories in a path\n"
12584
" [a-z] - Matches a single character from within a group of characters"
12585
msgstr ""
12586
12587
#: en/help_topics/patterns.txt:22
12588
msgid ""
12589
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12590
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12591
"expression. Regular expression patterns may not include named or\n"
12592
"numbered groups."
12593
msgstr ""
12594
12595
#: en/help_topics/patterns.txt:27
12596
msgid ""
12597
"Case insensitive ignore patterns can be specified with regular expressions\n"
12598
"by using the ``i`` (for ignore case) flag in the pattern."
12599
msgstr ""
12600
12601
#: en/help_topics/patterns.txt:30
12602
msgid ""
12603
"For example, a case insensitive match for ``foo`` may be specified as::"
12604
msgstr ""
12605
12606
#: en/help_topics/patterns.txt:32
12607
msgid " RE:(?i)foo"
12608
msgstr ""
12609
12610
#: en/help_topics/patterns.txt:34
12611
msgid ""
12612
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12613
"matched by that pattern will not be ignored."
12614
msgstr ""
12615
12616
#: en/help_topics/patterns.txt:37
12617
msgid ""
12618
".. _Python regular expressions: http://docs.python.org/library/re.html"
12619
msgstr ""
12620
12621
#: en/help_topics/revisionspec.txt:1
12622
msgid "Revision Identifiers"
12623
msgstr ""
12624
12625
#: en/help_topics/revisionspec.txt:3
12626
msgid ""
12627
"A revision identifier refers to a specific state of a branch's history. It\n"
12628
"can be expressed in several ways. It can begin with a keyword to\n"
12629
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12630
"'before:yesterday' and 'submit:'."
12631
msgstr ""
12632
12633
#: en/help_topics/revisionspec.txt:8
12634
msgid ""
12635
"Alternately, it can be given without a keyword, in which case it will be\n"
12636
"checked as a revision number, a tag, a revision id, a date specification, or "
12637
"a\n"
12638
"branch specification, in that order. For example, 'date:today' could be\n"
12639
"written as simply 'today', though if you have a tag called 'today' that "
12640
"will\n"
12641
"be found first."
12642
msgstr ""
12643
12644
#: en/help_topics/revisionspec.txt:14
12645
msgid ""
12646
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12647
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12648
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12649
"or\n"
12650
"spaces around the '..')."
12651
msgstr ""
12652
12653
#: en/help_topics/revisionspec.txt:19
12654
msgid ""
12655
"Ranges are interpreted differently by different commands. To the \"log\" "
12656
"command,\n"
12657
"a range is a sequence of log messages, but to the \"diff\" command, the "
12658
"range\n"
12659
"denotes a change between revisions (and not a sequence of changes). In\n"
12660
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12661
"consider it\n"
12662
"to be open-ended, that is, they include one end but not the other. For "
12663
"example:\n"
12664
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12665
"3649,\n"
12666
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12667
"and\n"
12668
"3649, but not 3647."
12669
msgstr ""
12670
12671
#: en/help_topics/revisionspec.txt:28
12672
msgid "The keywords used as revision selection methods are the following:"
12673
msgstr ""
12674
12675
#: en/help_topics/revisionspec.txt:30
12676
msgid ""
12677
":revid:\n"
12678
"\tSelects a revision using the revision id.\n"
12679
":submit:\n"
12680
"\tSelects a common ancestor with the submit branch.\n"
12681
":ancestor:\n"
12682
"\tSelects a common ancestor with a second branch.\n"
12683
":date:\n"
12684
"\tSelects a revision on the basis of a datestamp.\n"
12685
":branch:\n"
12686
"\tSelects the last revision of a specified branch.\n"
12687
":tag:\n"
12688
"\tSelects a revision identified by a tag name.\n"
12689
":revno:\n"
12690
"\tSelects a revision using a number.\n"
12691
":before:\n"
12692
"\tSelects the parent of the revision specified.\n"
12693
":annotate:\n"
12694
"\tSelect the revision that last modified the specified line.\n"
12695
":mainline:\n"
12696
"\tSelect mainline revision that merged the specified revision.\n"
12697
":last:\n"
12698
"\tSelects the nth revision from the end."
12699
msgstr ""
12700
12701
#: en/help_topics/revisionspec.txt:53
12702
msgid "In addition, plugins can provide other keywords."
12703
msgstr ""
12704
12705
#: en/help_topics/revisionspec.txt:55
12706
msgid "A detailed description of each keyword is given below."
12707
msgstr ""
12708
12709
#: en/help_topics/revisionspec.txt:57
12710
msgid ":revid:"
12711
msgstr ""
12712
12713
#: en/help_topics/revisionspec.txt:59
12714
msgid ""
12715
" Supply a specific revision id, that can be used to specify any\n"
12716
" revision id in the ancestry of the branch.\n"
12717
" Including merges, and pending merges.\n"
12718
" Examples::"
12719
msgstr ""
12720
12721
#: en/help_topics/revisionspec.txt:64
12722
msgid ""
12723
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12724
msgstr ""
12725
12726
#: en/help_topics/revisionspec.txt:66
12727
msgid ":submit:"
12728
msgstr ""
12729
12730
#: en/help_topics/revisionspec.txt:68
12731
msgid ""
12732
" Diffing against this shows all the changes that were made in this "
12733
"branch,\n"
12734
" and is a good predictor of what merge will do. The submit branch is\n"
12735
" used by the bundle and merge directive commands. If no submit branch\n"
12736
" is specified, the parent branch is used instead."
12737
msgstr ""
12738
12739
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12740
msgid ""
12741
" The common ancestor is the last revision that existed in both\n"
12742
" branches. Usually this is the branch point, but it could also be\n"
12743
" a revision that was merged."
12744
msgstr ""
12745
12746
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12747
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12748
#: en/help_topics/revisionspec.txt:153
12749
msgid " Examples::"
12750
msgstr ""
12751
12752
#: en/help_topics/revisionspec.txt:79
12753
msgid " $ bzr diff -r submit:"
12754
msgstr ""
12755
12756
#: en/help_topics/revisionspec.txt:81
12757
msgid ":ancestor:"
12758
msgstr ""
12759
12760
#: en/help_topics/revisionspec.txt:83
12761
msgid " Supply the path to a branch to select the common ancestor."
12762
msgstr ""
12763
12764
#: en/help_topics/revisionspec.txt:89
12765
msgid ""
12766
" This is frequently used with 'diff' to return all of the changes\n"
12767
" that your branch introduces, while excluding the changes that you\n"
12768
" have not merged from the remote branch."
12769
msgstr ""
12770
12771
#: en/help_topics/revisionspec.txt:95
12772
msgid ""
12773
" ancestor:/path/to/branch\n"
12774
" $ bzr diff -r ancestor:../../mainline/branch"
12775
msgstr ""
12776
12777
#: en/help_topics/revisionspec.txt:98
12778
msgid ":date:"
12779
msgstr ""
12780
12781
#: en/help_topics/revisionspec.txt:100
12782
msgid ""
12783
" Supply a datestamp to select the first revision that matches the date.\n"
12784
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12785
" Matches the first entry after a given date (either at midnight or\n"
12786
" at a specified time)."
12787
msgstr ""
12788
12789
#: en/help_topics/revisionspec.txt:105
12790
msgid " One way to display all the changes since yesterday would be::"
12791
msgstr ""
12792
12793
#: en/help_topics/revisionspec.txt:107
12794
msgid " bzr log -r date:yesterday.."
12795
msgstr ""
12796
12797
#: en/help_topics/revisionspec.txt:111
12798
msgid ""
12799
" date:yesterday -> select the first revision since "
12800
"yesterday\n"
12801
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12802
" August 14th, 2006 at 5:10pm."
12803
msgstr ""
12804
12805
#: en/help_topics/revisionspec.txt:115
12806
msgid ":branch:"
12807
msgstr ""
12808
12809
#: en/help_topics/revisionspec.txt:117
12810
msgid " Supply the path to a branch to select its last revision."
12811
msgstr ""
12812
12813
#: en/help_topics/revisionspec.txt:121
12814
msgid " branch:/path/to/branch"
12815
msgstr ""
12816
12817
#: en/help_topics/revisionspec.txt:123
12818
msgid ":tag:"
12819
msgstr ""
12820
12821
#: en/help_topics/revisionspec.txt:125
12822
msgid " Tags are stored in the branch and created by the 'tag' command."
12823
msgstr ""
12824
12825
#: en/help_topics/revisionspec.txt:127
12826
msgid ":revno:"
12827
msgstr ""
12828
12829
#: en/help_topics/revisionspec.txt:129
12830
msgid ""
12831
" Use an integer to specify a revision in the history of the branch.\n"
12832
" Optionally a branch can be specified. A negative number will count\n"
12833
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12834
" one). If the negative number is larger than the branch's history, the\n"
12835
" first revision is returned.\n"
12836
" Examples::"
12837
msgstr ""
12838
12839
#: en/help_topics/revisionspec.txt:136
12840
msgid ""
12841
" revno:1 -> return the first revision of this branch\n"
12842
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12843
" the branch '/path/to/branch'\n"
12844
" revno:-1 -> The last revision in a branch.\n"
12845
" -2:http://other/branch -> The second to last revision in the\n"
12846
" remote branch.\n"
12847
" -1000000 -> Most likely the first revision, unless\n"
12848
" your history is very long."
12849
msgstr ""
12850
12851
#: en/help_topics/revisionspec.txt:145
12852
msgid ":before:"
12853
msgstr ""
12854
12855
#: en/help_topics/revisionspec.txt:147
12856
msgid ""
12857
" Supply any revision spec to return the parent of that revision. This "
12858
"is\n"
12859
" mostly useful when inspecting revisions that are not in the revision "
12860
"history\n"
12861
" of a branch."
12862
msgstr ""
12863
12864
#: en/help_topics/revisionspec.txt:151
12865
msgid ""
12866
" It is an error to request the parent of the null revision (before:0)."
12867
msgstr ""
12868
12869
#: en/help_topics/revisionspec.txt:155
12870
msgid ""
12871
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12872
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12873
" aaaa@bbbb-1234567890\n"
12874
" bzr diff -r before:1913..1913\n"
12875
" -> Find the changes between revision 1913 and its parent "
12876
"(1912).\n"
12877
" (What changes did revision 1913 introduce).\n"
12878
" This is equivalent to: bzr diff -c 1913"
12879
msgstr ""
12880
12881
#: en/help_topics/revisionspec.txt:163
12882
msgid ":annotate:"
12883
msgstr ""
12884
12885
#: en/help_topics/revisionspec.txt:165
12886
msgid ""
12887
" Select the revision that last modified the specified line. Line is\n"
12888
" specified as path:number. Path is a relative path to the file. "
12889
"Numbers\n"
12890
" start at 1, and are relative to the current version, not the last-\n"
12891
" committed version of the file."
12892
msgstr ""
12893
12894
#: en/help_topics/revisionspec.txt:170
12895
msgid ":mainline:"
12896
msgstr ""
12897
12898
#: en/help_topics/revisionspec.txt:172
12899
msgid ""
12900
" Select the revision that merged the specified revision into mainline."
12901
msgstr ""
12902
12903
#: en/help_topics/revisionspec.txt:174
12904
msgid ":last:"
12905
msgstr ""
12906
12907
#: en/help_topics/revisionspec.txt:176
12908
msgid ""
12909
" Supply a positive number to get the nth revision from the end.\n"
12910
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12911
" Examples::"
12912
msgstr ""
12913
12914
#: en/help_topics/revisionspec.txt:180
12915
msgid ""
12916
" last:1 -> return the last revision\n"
12917
" last:3 -> return the revision 2 before the end.\n"
12918
msgstr ""
12919
12920
#: en/help_topics/rules.txt:1
12921
msgid ""
12922
"Rules\n"
12923
"====="
12924
msgstr ""
12925
12926
#: en/help_topics/rules.txt:7
12927
msgid ""
12928
"Rules are defined in ini file format where the sections are file glob\n"
12929
"patterns and the contents of each section are the preferences for files\n"
12930
"matching that pattern(s). For example::"
12931
msgstr ""
12932
12933
#: en/help_topics/rules.txt:11
12934
msgid ""
12935
" [name *.bat]\n"
12936
" eol = native"
12937
msgstr ""
12938
12939
#: en/help_topics/rules.txt:14
12940
msgid ""
12941
" [name *.html *.xml]\n"
12942
" keywords = xml_escape"
12943
msgstr ""
12944
12945
#: en/help_topics/rules.txt:17
12946
msgid ""
12947
"Preferences like these are useful for commands and plugins wishing to\n"
12948
"provide custom behaviour for selected files. For more information on \n"
12949
"end of line conversion see :doc:`eol-help`.\n"
12950
"Keyword support is provided by the `keywords plugin\n"
12951
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
12952
msgstr ""
12953
12954
#: en/help_topics/rules.txt:23
12955
msgid ""
12956
"Files\n"
12957
"-----"
12958
msgstr ""
12959
12960
#: en/help_topics/rules.txt:26
12961
msgid ""
12962
"Default rules for all branches are defined in the optional file\n"
12963
"``BZR_HOME/rules``. "
12964
msgstr ""
12965
12966
#: en/help_topics/rules.txt:29
12967
msgid ""
12968
"Rule Patterns\n"
12969
"-------------"
12970
msgstr ""
12971
12972
#: en/help_topics/rules.txt:32
12973
msgid ""
12974
"Patterns are ordered and searching stops as soon as one matches.\n"
12975
"As a consequence, more explicit patterns should be placed towards\n"
12976
"the top of the file. Rule patterns use exactly the same conventions\n"
12977
"as ignore patterns. See :doc:`patterns-help` for details."
12978
msgstr ""
12979
12980
#: en/help_topics/rules.txt:37
12981
msgid ".. note::"
12982
msgstr ""
12983
12984
#: en/help_topics/rules.txt:39
12985
msgid ""
12986
" Patterns containing square brackets or spaces should be\n"
12987
" surrounded in quotes to ensure they are correctly parsed.\n"
12988
msgstr ""
12989
12990
#: en/help_topics/topics.txt:1
12991
msgid ""
12992
"authentication Information on configuring authentication\n"
12993
"basic Basic commands\n"
12994
"branches Information on what a branch is\n"
12995
"bugs Bug tracker settings\n"
12996
"checkouts Information on what a checkout is\n"
12997
"commands Basic help for all commands\n"
12998
"configuration Details on the configuration settings available\n"
12999
"conflict-types Types of conflicts and what to do about them\n"
13000
"content-filters Conversion of content into/from working trees\n"
13001
"criss-cross Information on criss-cross merging\n"
13002
"current-formats Current storage formats\n"
13003
"debug-flags Options to show or record debug information\n"
13004
"diverged-branches How to fix diverged branches\n"
13005
"env-variables Environment variable names and values\n"
13006
"eol Information on end-of-line handling\n"
13007
"files Information on configuration and log files\n"
13008
"formats Information on choosing a storage format\n"
13009
"global-options Options that control how Bazaar runs\n"
13010
"hidden-commands All hidden commands\n"
13011
"hooks Points at which custom processing can be added\n"
13012
"launchpad Using Bazaar with Launchpad.net\n"
13013
"location-alias Aliases for remembered locations\n"
13014
"log-formats Details on the logging formats available\n"
13015
"other-formats Experimental and deprecated storage formats\n"
13016
"patterns Information on the pattern syntax\n"
13017
"repositories Basic information on shared repositories.\n"
13018
"revisionspec Explain how to use --revision\n"
13019
"rules Information on defining rule-based preferences\n"
13020
"standalone-trees Information on what a standalone tree is\n"
13021
"standard-options Options that can be used with any command\n"
13022
"status-flags Help on status flags\n"
13023
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13024
"topics Topics list\n"
13025
"url-special-chars Special character handling in URLs\n"
13026
"urlspec Supported transport protocols\n"
13027
"working-trees Information on working trees\n"
13028
msgstr ""
13029
13030
#: en/help_topics/url-special-chars.txt:1
13031
msgid ""
13032
"Special character handling in URLs\n"
13033
"=================================="
13034
msgstr ""
13035
13036
#: en/help_topics/url-special-chars.txt:4
13037
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13038
msgstr ""
13039
13040
#: en/help_topics/url-special-chars.txt:6
13041
msgid " * Fully qualified URLs"
13042
msgstr ""
13043
13044
#: en/help_topics/url-special-chars.txt:8
13045
msgid " * File system paths, relative or absolute"
13046
msgstr ""
13047
13048
#: en/help_topics/url-special-chars.txt:10
13049
msgid ""
13050
"Internally bzr treats all locations as URLs. For any file system paths\n"
13051
"that are specified it will automatically determine the appropriate URL\n"
13052
"representation, and escape special characters where necessary."
13053
msgstr ""
13054
13055
#: en/help_topics/url-special-chars.txt:14
13056
msgid ""
13057
"There are a few characters which have special meaning in URLs and need "
13058
"careful\n"
13059
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13060
"value in URLs. Any non-ASCII characters in a file path will automatically "
13061
"be\n"
13062
"urlencoded when the path is converted to a URL."
13063
msgstr ""
13064
13065
#: en/help_topics/url-special-chars.txt:19
13066
msgid ""
13067
"URLs represent non-ASCII characters in an encoding defined by the server, "
13068
"but\n"
13069
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13070
"be\n"
13071
"generous in what it accepts as a URL and to print them in a way that\n"
13072
"will be readable."
13073
msgstr ""
13074
13075
#: en/help_topics/url-special-chars.txt:24
13076
msgid ""
13077
"For example, if you have a directory named '/tmp/%2False' these are all "
13078
"valid\n"
13079
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13080
"slash)::"
13081
msgstr ""
13082
13083
#: en/help_topics/url-special-chars.txt:27
13084
msgid ""
13085
" cd /tmp\n"
13086
" bzr log /tmp/%2False\n"
13087
" bzr log %2False\n"
13088
" bzr log file:///tmp/%252False\n"
13089
" bzr log file://localhost/tmp/%252False\n"
13090
" bzr log file:%252False"
13091
msgstr ""
13092
13093
#: en/help_topics/url-special-chars.txt:34
13094
msgid "These are valid but do not refer to the same file::"
13095
msgstr ""
13096
13097
#: en/help_topics/url-special-chars.txt:36
13098
msgid ""
13099
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13100
" bzr log %252False (refers to a file called /tmp/%252False)"
13101
msgstr ""
13102
13103
#: en/help_topics/url-special-chars.txt:39
13104
msgid ""
13105
"Comma also has special meaning in URLs, because it denotes `segment "
13106
"parameters`_"
13107
msgstr ""
13108
13109
#: en/help_topics/url-special-chars.txt:41
13110
msgid ""
13111
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13112
msgstr ""
13113
13114
#: en/help_topics/url-special-chars.txt:43
13115
msgid ""
13116
"Comma is also special in any file system paths that are specified. To use a "
13117
"literal\n"
13118
"comma in a file system path, specify a URL and URL encode the comma::"
13119
msgstr ""
13120
13121
#: en/help_topics/url-special-chars.txt:46
13122
msgid ""
13123
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13124
"\"branch\" set to \"bla\"\n"
13125
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13126
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13127
"\"branch\" set to \"bla\"\n"
13128
msgstr ""
13129
13130
#: en/help_topics/urlspec.txt:1
13131
msgid "URL Identifiers"
13132
msgstr ""
13133
13134
#: en/help_topics/urlspec.txt:3
13135
msgid "Supported URL prefixes::"
13136
msgstr ""
13137
13138
#: en/help_topics/urlspec.txt:5
13139
msgid ""
13140
" aftp:// Access using active FTP.\n"
13141
" bzr:// Fast access using the Bazaar smart server.\n"
13142
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13143
" file:// Access using the standard filesystem (default)\n"
13144
" ftp:// Access using passive FTP.\n"
13145
" http:// Read-only access of branches exported on the web.\n"
13146
" https:// Read-only access of branches exported on the web using "
13147
"SSL.\n"
13148
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13149
msgstr ""
13150
13151
#: en/help_topics/urlspec.txt:14
13152
msgid "Supported modifiers::"
13153
msgstr ""
13154
13155
#: en/help_topics/urlspec.txt:16
13156
msgid " gio+ Access using any GIO supported protocols."
13157
msgstr ""
13158
13159
#: en/help_topics/urlspec.txt:18
13160
msgid "Bazaar supports all of the standard parts within the URL::"
13161
msgstr ""
13162
13163
#: en/help_topics/urlspec.txt:20
13164
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13165
msgstr ""
13166
13167
#: en/help_topics/urlspec.txt:22
13168
msgid "allowing URLs such as::"
13169
msgstr ""
13170
13171
#: en/help_topics/urlspec.txt:24
13172
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13173
msgstr ""
13174
13175
#: en/help_topics/urlspec.txt:26
13176
msgid ""
13177
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13178
"with '~' as meaning that the rest of the path should be interpreted\n"
13179
"relative to the remote user's home directory. For example if the user\n"
13180
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13181
"shell.example.com, then::"
13182
msgstr ""
13183
13184
#: en/help_topics/urlspec.txt:32
13185
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13186
msgstr ""
13187
13188
#: en/help_topics/urlspec.txt:34
13189
msgid "would refer to ``/home/remote/myproject/trunk``."
13190
msgstr ""
13191
13192
#: en/help_topics/urlspec.txt:36
13193
msgid ""
13194
"Many commands that accept URLs also accept location aliases too.\n"
13195
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13196
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1