« back to all changes in this revision
Viewing changes to po/sco.po
- browse files at revision 6159.2.8
- compare with another revision
- compare with revision 6593
- download diff
- download tarball
- view history from revision 6159.2.8
- Committer: Jelmer Vernooij
- Date: 2012-04-16 11:08:11 UTC
- mfrom: (6521 +trunk)
- mto: This revision was merged to the branch mainline in revision 6522.
- Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.
- files added:
- bzrlib/plugins/launchpad/cmds.py
- files removed:
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- files modified:
- Makefile
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-02-02 17:39+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-02-04 06:21+0000\n"
19
"X-Generator: Launchpad (build 14738)\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:3205
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:3207
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:3210
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:3212
46
msgid "No new revisions to push."
47
msgstr ""
48
49
#: bzrlib/branch.py:3232
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3235
54
#, python-format
55
msgid "found error:%s"
56
msgstr ""
57
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:218
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:303
69
msgid "Display status summary."
70
msgstr ""
71
72
#: bzrlib/builtins.py:305
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:308
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
86
#: bzrlib/builtins.py:311
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:315
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:320
102
msgid ""
103
"modified\n"
104
" Text has changed since the previous revision."
105
msgstr ""
106
107
#: bzrlib/builtins.py:323
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:326
114
msgid ""
115
"unknown\n"
116
" Not versioned and not matching an ignore pattern."
117
msgstr ""
118
119
#: bzrlib/builtins.py:329
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:334
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:337
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:341
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:346
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:351
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:354
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:363
170
msgid "Use short status indicators."
171
msgstr ""
172
173
#: bzrlib/builtins.py:365
174
msgid "Only show versioned files."
175
msgstr ""
176
177
#: bzrlib/builtins.py:367
178
msgid "Don't show pending merges."
179
msgstr ""
180
181
#: bzrlib/builtins.py:370
182
msgid "Do not mark object type using indicator."
183
msgstr ""
184
185
#: bzrlib/builtins.py:385
186
msgid "bzr status --revision takes exactly one or two revision specifiers"
187
msgstr ""
188
189
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
190
msgid "You can only supply one of revision_id or --revision"
191
msgstr ""
192
193
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
194
msgid "You must supply either --revision or a revision_id"
195
msgstr ""
196
197
#: bzrlib/builtins.py:439
198
#, python-format
199
msgid "Repository %r does not support access to raw revision texts"
200
msgstr ""
201
202
#: bzrlib/builtins.py:450
203
msgid "The repository {0} contains no revision {1}."
204
msgstr ""
205
206
#: bzrlib/builtins.py:457
207
msgid "You cannot specify a NULL revision."
208
msgstr ""
209
210
#: bzrlib/builtins.py:549
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:551
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:554
221
msgid "To re-create the working tree, use \"bzr checkout\"."
222
msgstr ""
223
224
#: bzrlib/builtins.py:560
225
msgid ""
226
"Remove the working tree even if it has uncommitted or shelved changes."
227
msgstr ""
228
229
#: bzrlib/builtins.py:574
230
msgid "No working tree to remove"
231
msgstr ""
232
233
#: bzrlib/builtins.py:576
234
msgid "You cannot remove the working tree of a remote path"
235
msgstr ""
236
237
#: bzrlib/builtins.py:585
238
msgid "You cannot remove the working tree from a lightweight checkout"
239
msgstr ""
240
241
#: bzrlib/builtins.py:625
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:636
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:640
254
msgid "failed to reset the tree state{0}"
255
msgstr ""
256
257
#: bzrlib/builtins.py:644
258
msgid "Show current revision number."
259
msgstr ""
260
261
#: bzrlib/builtins.py:646
262
msgid "This is equal to the number of revisions on this branch."
263
msgstr ""
264
265
#: bzrlib/builtins.py:659
266
msgid "--tree and --revision can not be used together"
267
msgstr ""
268
269
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
270
msgid "Tags can only be placed on a single revision, not on a range"
271
msgstr ""
272
273
#: bzrlib/builtins.py:700
274
msgid "Show revno of working tree."
275
msgstr ""
276
277
#: bzrlib/builtins.py:748
278
msgid "Add specified files or directories."
279
msgstr ""
280
281
#: bzrlib/builtins.py:750
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:754
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:762
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:765
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:768
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:773
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:776
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:784
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:787
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:794
350
msgid "Don't recursively add the contents of directories."
351
msgstr ""
352
353
#: bzrlib/builtins.py:800
354
msgid "Lookup file ids from this tree."
355
msgstr ""
356
357
#: bzrlib/builtins.py:836
358
msgid "ignored {0} matching \"{1}\"\n"
359
msgstr ""
360
361
#: bzrlib/builtins.py:841
362
msgid "Create a new versioned directory."
363
msgstr ""
364
365
#: bzrlib/builtins.py:843
366
msgid "This is equivalent to creating the directory and then adding it."
367
msgstr ""
368
369
#: bzrlib/builtins.py:850
370
msgid "No error if existing, make parent directories as needed."
371
msgstr ""
372
373
#: bzrlib/builtins.py:884
374
#, python-format
375
msgid "added %s\n"
376
msgstr ""
377
378
#: bzrlib/builtins.py:926
379
#, python-format
380
msgid "invalid kind %r specified"
381
msgstr ""
382
383
#: bzrlib/builtins.py:963
384
msgid "Move or rename a file."
385
msgstr ""
386
387
#: bzrlib/builtins.py:965
388
msgid " bzr mv SOURCE... DESTINATION"
389
msgstr ""
390
391
#: bzrlib/builtins.py:967
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:971
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:977
408
msgid "Files cannot be moved between branches."
409
msgstr ""
410
411
#: bzrlib/builtins.py:984
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:986
418
msgid "Automatically guess renames."
419
msgstr ""
420
421
#: bzrlib/builtins.py:987
422
msgid "Avoid making changes when guessing renames."
423
msgstr ""
424
425
#: bzrlib/builtins.py:996
426
msgid "--dry-run requires --auto."
427
msgstr ""
428
429
#: bzrlib/builtins.py:1000
430
msgid "missing file argument"
431
msgstr ""
432
433
#: bzrlib/builtins.py:1004
434
msgid "can not move root of branch"
435
msgstr ""
436
437
#: bzrlib/builtins.py:1010
438
msgid "Only one path may be specified to --auto."
439
msgstr ""
440
441
#: bzrlib/builtins.py:1013
442
msgid "--after cannot be specified with --auto."
443
msgstr ""
444
445
#: bzrlib/builtins.py:1050
446
msgid "to mv multiple files the destination must be a versioned directory"
447
msgstr ""
448
449
#: bzrlib/builtins.py:1102
450
msgid "Turn this branch into a mirror of another branch."
451
msgstr ""
452
453
#: bzrlib/builtins.py:1104
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:1109
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:1113
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:1117
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:1122
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:1126
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:1134
498
msgid "Show logs of pulled revisions."
499
msgstr ""
500
501
#: bzrlib/builtins.py:1136
502
msgid ""
503
"Branch to pull into, rather than the one containing the working directory."
504
msgstr ""
505
506
#: bzrlib/builtins.py:1139
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:1168
513
msgid "Need working tree for --show-base."
514
msgstr ""
515
516
#: bzrlib/builtins.py:1184
517
msgid "No pull location known or specified."
518
msgstr ""
519
520
#: bzrlib/builtins.py:1190
521
#, python-format
522
msgid "Using saved parent location: %s\n"
523
msgstr ""
524
525
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
526
msgid "Cannot use -r with merge directives or bundles"
527
msgstr ""
528
529
#: bzrlib/builtins.py:1238
530
msgid "Update a mirror of this branch."
531
msgstr ""
532
533
#: bzrlib/builtins.py:1240
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:1243
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:1246
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:1250
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:1253
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:1257
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:1262
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:1273 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:1276
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:1281
592
msgid ""
593
"Create a stacked branch that references the public location of the parent "
594
"branch."
595
msgstr ""
596
597
#: bzrlib/builtins.py:1284
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:1289 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:1292
611
msgid "Don't populate the working tree, even for protocols that support it."
612
msgstr ""
613
614
#: bzrlib/builtins.py:1336
615
msgid "Could not determine branch to refer to."
616
msgstr ""
617
618
#: bzrlib/builtins.py:1345
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:1351 bzrlib/foreign.py:306
626
msgid "No push location known or specified."
627
msgstr ""
628
629
#: bzrlib/builtins.py:1355
630
#, python-format
631
msgid "Using saved push location: %s"
632
msgstr ""
633
634
#: bzrlib/builtins.py:1365
635
msgid "Create a new branch that is a copy of an existing branch."
636
msgstr ""
637
638
#: bzrlib/builtins.py:1367
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:1374
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:1377
656
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
657
msgstr ""
658
659
#: bzrlib/builtins.py:1387
660
msgid "Create a branch without a working-tree."
661
msgstr ""
662
663
#: bzrlib/builtins.py:1389
664
msgid "Switch the checkout in the current directory to the new branch."
665
msgstr ""
666
667
#: bzrlib/builtins.py:1392
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:1396
674
msgid "Do not use a shared repository, even if available."
675
msgstr ""
676
677
#: bzrlib/builtins.py:1398
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:1403
684
msgid "Bind new branch to from location."
685
msgstr ""
686
687
#: bzrlib/builtins.py:1450
688
#, python-format
689
msgid "Target directory \"%s\" already exists."
690
msgstr ""
691
692
#: bzrlib/builtins.py:1462
693
#, python-format
694
msgid "Parent of \"%s\" does not exist."
695
msgstr ""
696
697
#: bzrlib/builtins.py:1481
698
msgid "The branch {0} has no revision {1}."
699
msgstr ""
700
701
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
702
#, python-format
703
msgid "Created new stacked branch referring to %s."
704
msgstr ""
705
706
#: bzrlib/builtins.py:1500
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:1505
714
#, python-format
715
msgid "New branch bound to %s"
716
msgstr ""
717
718
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
719
#, python-format
720
msgid "Switched to branch: %s"
721
msgstr ""
722
723
#: bzrlib/builtins.py:1515
724
msgid "List the branches available at the current location."
725
msgstr ""
726
727
#: bzrlib/builtins.py:1517
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:1524
734
msgid ""
735
"Recursively scan for branches rather than just looking in the specified "
736
"location."
737
msgstr ""
738
739
#: bzrlib/builtins.py:1554
740
msgid "(default)"
741
msgstr ""
742
743
#: bzrlib/builtins.py:1566
744
msgid "Create a new checkout of an existing branch."
745
msgstr ""
746
747
#: bzrlib/builtins.py:1568
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:1573
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:1580
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:1590
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:1597
788
msgid "Get file contents from this tree."
789
msgstr ""
790
791
#: bzrlib/builtins.py:1599
792
msgid "Hard-link working tree files where possible."
793
msgstr ""
794
795
#: bzrlib/builtins.py:1640
796
msgid ""
797
"Show list of renamed files.\n"
798
" "
799
msgstr ""
800
801
#: bzrlib/builtins.py:1670
802
msgid "Update a working tree to a new revision."
803
msgstr ""
804
805
#: bzrlib/builtins.py:1672
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:1676
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:1679
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:1684
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:1687
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:1694
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:1710
850
msgid "bzr update --revision takes exactly one revision"
851
msgstr ""
852
853
#: bzrlib/builtins.py:1718
854
msgid "bzr update can only update a whole tree, not a file or subdirectory"
855
msgstr ""
856
857
#: bzrlib/builtins.py:1749
858
msgid "Tree is up to date at revision {0} of branch {1}"
859
msgstr ""
860
861
#: bzrlib/builtins.py:1765
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:1771
869
msgid "Updated to revision {0} of branch {1}"
870
msgstr ""
871
872
#: bzrlib/builtins.py:1775
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:1784
879
msgid "Show information about a working tree, branch or repository."
880
msgstr ""
881
882
#: bzrlib/builtins.py:1786
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:1789
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:1793
896
msgid "Branches and working trees will also report any missing revisions."
897
msgstr ""
898
899
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
900
#: bzrlib/builtins.py:6442
901
msgid ":Examples:"
902
msgstr ""
903
904
#: bzrlib/builtins.py:1797
905
msgid " Display information on the format and related locations:"
906
msgstr ""
907
908
#: bzrlib/builtins.py:1799
909
msgid " bzr info"
910
msgstr ""
911
912
#: bzrlib/builtins.py:1801
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:1805
920
msgid " bzr info -v"
921
msgstr ""
922
923
#: bzrlib/builtins.py:1807
924
msgid " Display the above together with number of committers to the branch:"
925
msgstr ""
926
927
#: bzrlib/builtins.py:1809
928
msgid " bzr info -vv"
929
msgstr ""
930
931
#: bzrlib/builtins.py:1828
932
msgid "Remove files or directories."
933
msgstr ""
934
935
#: bzrlib/builtins.py:1830
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:1838
945
msgid "Only remove files that have never been committed."
946
msgstr ""
947
948
#: bzrlib/builtins.py:1840
949
msgid "The file deletion mode to be used."
950
msgstr ""
951
952
#: bzrlib/builtins.py:1841
953
msgid "Deletion Strategy"
954
msgstr ""
955
956
#: bzrlib/builtins.py:1842
957
msgid "Backup changed files (default)."
958
msgstr ""
959
960
#: bzrlib/builtins.py:1843
961
msgid "Delete from bzr but leave the working copy."
962
msgstr ""
963
964
#: bzrlib/builtins.py:1844
965
msgid "Don't backup changed files."
966
msgstr ""
967
968
#: bzrlib/builtins.py:1845
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:1854
975
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
976
msgstr ""
977
978
#: bzrlib/builtins.py:1871
979
msgid "No matching files."
980
msgstr ""
981
982
#: bzrlib/builtins.py:1932
983
msgid "Reconcile bzr metadata in a branch."
984
msgstr ""
985
986
#: bzrlib/builtins.py:1934
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:1939
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:1944
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:1947
1009
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1010
msgstr ""
1011
1012
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
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:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
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:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1026
msgid "The 2a format with experimental support for colocated branches.\n"
1027
msgstr ""
1028
1029
#: bzrlib/builtins.py:2015
1030
msgid "Make a directory into a versioned branch."
1031
msgstr ""
1032
1033
#: bzrlib/builtins.py:2017
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:2020
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:2025
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:2028
1054
msgid "Recipe for importing a tree of files::"
1055
msgstr ""
1056
1057
#: bzrlib/builtins.py:2030
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:2041
1067
msgid ""
1068
"Create the path leading up to the branch if it does not already exist."
1069
msgstr ""
1070
1071
#: bzrlib/builtins.py:2044
1072
msgid "Specify a format for this branch. See \"help formats\"."
1073
msgstr ""
1074
1075
#: bzrlib/builtins.py:2052
1076
msgid ""
1077
"Never change revnos or the existing log. Append revisions to it only."
1078
msgstr ""
1079
1080
#: bzrlib/builtins.py:2055
1081
msgid "Create a branch without a working tree."
1082
msgstr ""
1083
1084
#: bzrlib/builtins.py:2075 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:2109
1092
msgid ""
1093
"This branch format cannot be set to append-revisions-only. Try --default."
1094
msgstr ""
1095
1096
#: bzrlib/builtins.py:2120
1097
msgid "Created a {0} (format: {1})\n"
1098
msgstr ""
1099
1100
#: bzrlib/builtins.py:2129
1101
#, python-format
1102
msgid "Using shared repository: %s\n"
1103
msgstr ""
1104
1105
#: bzrlib/builtins.py:2133
1106
msgid "Create a shared repository for branches to share storage space."
1107
msgstr ""
1108
1109
#: bzrlib/builtins.py:2135
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:2140
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:2147
1128
msgid ""
1129
":Examples:\n"
1130
" Create a shared repository holding just branches::"
1131
msgstr ""
1132
1133
#: bzrlib/builtins.py:2150
1134
msgid ""
1135
" bzr init-repo --no-trees repo\n"
1136
" bzr init repo/trunk"
1137
msgstr ""
1138
1139
#: bzrlib/builtins.py:2153
1140
msgid " Make a lightweight checkout elsewhere::"
1141
msgstr ""
1142
1143
#: bzrlib/builtins.py:2155
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:2163
1151
msgid ""
1152
"Specify a format for this repository. See \"bzr help formats\" for details."
1153
msgstr ""
1154
1155
#: bzrlib/builtins.py:2167
1156
msgid "Repository format"
1157
msgstr ""
1158
1159
#: bzrlib/builtins.py:2169
1160
msgid "Branches in the repository will default to not having a working tree."
1161
msgstr ""
1162
1163
#: bzrlib/builtins.py:2195
1164
msgid "Show differences in the working tree, between revisions or branches."
1165
msgstr ""
1166
1167
#: bzrlib/builtins.py:2197
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:2204
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:2207
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:2214
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:2220
1203
msgid ""
1204
":Examples:\n"
1205
" Shows the difference in the working tree versus the last commit::"
1206
msgstr ""
1207
1208
#: bzrlib/builtins.py:2223
1209
msgid " bzr diff"
1210
msgstr ""
1211
1212
#: bzrlib/builtins.py:2225
1213
msgid " Difference between the working tree and revision 1::"
1214
msgstr ""
1215
1216
#: bzrlib/builtins.py:2227
1217
msgid " bzr diff -r1"
1218
msgstr ""
1219
1220
#: bzrlib/builtins.py:2229
1221
msgid " Difference between revision 3 and revision 1::"
1222
msgstr ""
1223
1224
#: bzrlib/builtins.py:2231
1225
msgid " bzr diff -r1..3"
1226
msgstr ""
1227
1228
#: bzrlib/builtins.py:2233
1229
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1230
msgstr ""
1231
1232
#: bzrlib/builtins.py:2235
1233
msgid " bzr diff -r1..3 xxx"
1234
msgstr ""
1235
1236
#: bzrlib/builtins.py:2237
1237
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1238
msgstr ""
1239
1240
#: bzrlib/builtins.py:2239
1241
msgid " bzr diff -c2"
1242
msgstr ""
1243
1244
#: bzrlib/builtins.py:2241
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:2245
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:2249
1259
msgid " bzr diff -r<chosen_parent>..X"
1260
msgstr ""
1261
1262
#: bzrlib/builtins.py:2251
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:2254
1269
msgid " bzr diff -r-2.."
1270
msgstr ""
1271
1272
#: bzrlib/builtins.py:2256
1273
msgid " Show just the differences for file NEWS::"
1274
msgstr ""
1275
1276
#: bzrlib/builtins.py:2258
1277
msgid " bzr diff NEWS"
1278
msgstr ""
1279
1280
#: bzrlib/builtins.py:2260
1281
msgid " Show the differences in working tree xxx for file NEWS::"
1282
msgstr ""
1283
1284
#: bzrlib/builtins.py:2262
1285
msgid " bzr diff xxx/NEWS"
1286
msgstr ""
1287
1288
#: bzrlib/builtins.py:2264
1289
msgid " Show the differences from branch xxx to this working tree:"
1290
msgstr ""
1291
1292
#: bzrlib/builtins.py:2266
1293
msgid " bzr diff --old xxx"
1294
msgstr ""
1295
1296
#: bzrlib/builtins.py:2268
1297
msgid " Show the differences between two branches for file NEWS::"
1298
msgstr ""
1299
1300
#: bzrlib/builtins.py:2270
1301
msgid " bzr diff --old xxx --new yyy NEWS"
1302
msgstr ""
1303
1304
#: bzrlib/builtins.py:2272
1305
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1306
msgstr ""
1307
1308
#: bzrlib/builtins.py:2274
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:2284
1318
msgid "Pass these options to the external diff program."
1319
msgstr ""
1320
1321
#: bzrlib/builtins.py:2287
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:2290
1328
msgid "Branch/tree to compare from."
1329
msgstr ""
1330
1331
#: bzrlib/builtins.py:2294
1332
msgid "Branch/tree to compare to."
1333
msgstr ""
1334
1335
#: bzrlib/builtins.py:2300
1336
msgid "Use this command to compare files."
1337
msgstr ""
1338
1339
#: bzrlib/builtins.py:2305
1340
msgid "Diff format to use."
1341
msgstr ""
1342
1343
#: bzrlib/builtins.py:2307
1344
msgid "Diff format"
1345
msgstr ""
1346
1347
#: bzrlib/builtins.py:2329
1348
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1349
msgstr ""
1350
1351
#: bzrlib/builtins.py:2333
1352
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1353
msgstr ""
1354
1355
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1356
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1357
msgid "{0} and {1} are mutually exclusive"
1358
msgstr ""
1359
1360
#: bzrlib/builtins.py:2358
1361
msgid ""
1362
"List files deleted in the working tree.\n"
1363
" "
1364
msgstr ""
1365
1366
#: bzrlib/builtins.py:2436
1367
msgid "Show the tree root directory."
1368
msgstr ""
1369
1370
#: bzrlib/builtins.py:2438
1371
msgid ""
1372
"The root is the nearest enclosing directory with a .bzr control\n"
1373
"directory."
1374
msgstr ""
1375
1376
#: bzrlib/builtins.py:2453
1377
msgid "The limit argument must be an integer."
1378
msgstr ""
1379
1380
#: bzrlib/builtins.py:2461
1381
msgid "The levels argument must be an integer."
1382
msgstr ""
1383
1384
#: bzrlib/builtins.py:2466
1385
msgid "Show historical log for a branch or subset of a branch."
1386
msgstr ""
1387
1388
#: bzrlib/builtins.py:2468
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:2473
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:2477
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:2484
1414
msgid ":Output control:"
1415
msgstr ""
1416
1417
#: bzrlib/builtins.py:2486
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:2491
1426
msgid ""
1427
" The following options can be used to control what information is\n"
1428
" displayed::"
1429
msgstr ""
1430
1431
#: bzrlib/builtins.py:2494
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:2500
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:2504
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:2508
1455
msgid ":Ordering control:"
1456
msgstr ""
1457
1458
#: bzrlib/builtins.py:2510
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:2515
1467
msgid ":Revision filtering:"
1468
msgstr ""
1469
1470
#: bzrlib/builtins.py:2517
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:2520
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:2525
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:2528
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:2535
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:2542
1511
msgid ":Path filtering:"
1512
msgstr ""
1513
1514
#: bzrlib/builtins.py:2544
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:2548
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:2552
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:2555
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:2559
1542
msgid " In this case:"
1543
msgstr ""
1544
1545
#: bzrlib/builtins.py:2561
1546
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1547
msgstr ""
1548
1549
#: bzrlib/builtins.py:2563
1550
msgid ""
1551
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1552
msgstr ""
1553
1554
#: bzrlib/builtins.py:2565
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:2568
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:2571
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:2575
1574
msgid ":Other filtering:"
1575
msgstr ""
1576
1577
#: bzrlib/builtins.py:2577
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:2583
1587
msgid ":Tips & tricks:"
1588
msgstr ""
1589
1590
#: bzrlib/builtins.py:2585
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:2591
1600
msgid ""
1601
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1602
msgstr ""
1603
1604
#: bzrlib/builtins.py:2593
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:2598
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:2602
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:2605
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:2610
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:2615
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:2624
1650
msgid "Show from oldest to newest."
1651
msgstr ""
1652
1653
#: bzrlib/builtins.py:2627
1654
msgid "Show files changed in each revision."
1655
msgstr ""
1656
1657
#: bzrlib/builtins.py:2633
1658
msgid "Show just the specified revision. See also \"help revisionspec\"."
1659
msgstr ""
1660
1661
#: bzrlib/builtins.py:2637
1662
msgid "What names to list as authors - first, all or committer."
1663
msgstr ""
1664
1665
#: bzrlib/builtins.py:2638
1666
msgid "Authors"
1667
msgstr ""
1668
1669
#: bzrlib/builtins.py:2643
1670
msgid "Number of levels to display - 0 for all, 1 for flat."
1671
msgstr ""
1672
1673
#: bzrlib/builtins.py:2653
1674
msgid "Limit the output to the first N revisions."
1675
msgstr ""
1676
1677
#: bzrlib/builtins.py:2658
1678
msgid "Show changes made in each revision as a patch."
1679
msgstr ""
1680
1681
#: bzrlib/builtins.py:2660
1682
msgid "Show merged revisions like --levels 0 does."
1683
msgstr ""
1684
1685
#: bzrlib/builtins.py:2664
1686
msgid "Do not report commits with more than one parent."
1687
msgstr ""
1688
1689
#: bzrlib/builtins.py:2666
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:2670
1696
msgid "Show digital signature validity."
1697
msgstr ""
1698
1699
#: bzrlib/builtins.py:2673
1700
msgid "Show revisions whose properties match this expression."
1701
msgstr ""
1702
1703
#: bzrlib/builtins.py:2677
1704
msgid "Show revisions whose message matches this expression."
1705
msgstr ""
1706
1707
#: bzrlib/builtins.py:2681
1708
msgid "Show revisions whose committer matches this expression."
1709
msgstr ""
1710
1711
#: bzrlib/builtins.py:2685
1712
msgid "Show revisions whose authors match this expression."
1713
msgstr ""
1714
1715
#: bzrlib/builtins.py:2689
1716
msgid "Show revisions whose bugs match this expression."
1717
msgstr ""
1718
1719
#: bzrlib/builtins.py:2743
1720
msgid "--exclude-common-ancestry requires -r with two revisions"
1721
msgstr ""
1722
1723
#: bzrlib/builtins.py:2771
1724
#, python-format
1725
msgid "Path unknown at end or start of revision range: %s"
1726
msgstr ""
1727
1728
#: bzrlib/builtins.py:2888
1729
#, python-format
1730
msgid "bzr %s doesn't accept two revisions in different branches."
1731
msgstr ""
1732
1733
#: bzrlib/builtins.py:2904
1734
#, python-format
1735
msgid "bzr %s --revision takes one or two values."
1736
msgstr ""
1737
1738
#: bzrlib/builtins.py:2949
1739
msgid ""
1740
"List files in a tree.\n"
1741
" "
1742
msgstr ""
1743
1744
#: bzrlib/builtins.py:2958
1745
msgid "Recurse into subdirectories."
1746
msgstr ""
1747
1748
#: bzrlib/builtins.py:2960
1749
msgid "Print paths relative to the root of the branch."
1750
msgstr ""
1751
1752
#: bzrlib/builtins.py:2962
1753
msgid "Print unknown files."
1754
msgstr ""
1755
1756
#: bzrlib/builtins.py:2963
1757
msgid "Print versioned files."
1758
msgstr ""
1759
1760
#: bzrlib/builtins.py:2966
1761
msgid "Print ignored files."
1762
msgstr ""
1763
1764
#: bzrlib/builtins.py:2968
1765
msgid "List entries of a particular kind: file, directory, symlink."
1766
msgstr ""
1767
1768
#: bzrlib/builtins.py:2981
1769
msgid "invalid kind specified"
1770
msgstr ""
1771
1772
#: bzrlib/builtins.py:2984
1773
msgid "Cannot set both --verbose and --null"
1774
msgstr ""
1775
1776
#: bzrlib/builtins.py:2993
1777
msgid "cannot specify both --from-root and PATH"
1778
msgstr ""
1779
1780
#: bzrlib/builtins.py:3080
1781
msgid "Ignore specified files or patterns."
1782
msgstr ""
1783
1784
#: bzrlib/builtins.py:3082
1785
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1786
msgstr ""
1787
1788
#: bzrlib/builtins.py:3084
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:3090
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:3095
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:3101
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:3105
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:3108
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:3113
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:3116
1842
msgid ""
1843
":Examples:\n"
1844
" Ignore the top level Makefile::"
1845
msgstr ""
1846
1847
#: bzrlib/builtins.py:3119
1848
msgid " bzr ignore ./Makefile"
1849
msgstr ""
1850
1851
#: bzrlib/builtins.py:3121
1852
msgid " Ignore .class files in all directories...::"
1853
msgstr ""
1854
1855
#: bzrlib/builtins.py:3123
1856
msgid " bzr ignore \"*.class\""
1857
msgstr ""
1858
1859
#: bzrlib/builtins.py:3125
1860
msgid " ...but do not ignore \"special.class\"::"
1861
msgstr ""
1862
1863
#: bzrlib/builtins.py:3127
1864
msgid " bzr ignore \"!special.class\""
1865
msgstr ""
1866
1867
#: bzrlib/builtins.py:3129
1868
msgid " Ignore files whose name begins with the \"#\" character::"
1869
msgstr ""
1870
1871
#: bzrlib/builtins.py:3131
1872
msgid " bzr ignore \"RE:^#\""
1873
msgstr ""
1874
1875
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1876
msgid " Ignore .o files under the lib directory::"
1877
msgstr ""
1878
1879
#: bzrlib/builtins.py:3135
1880
msgid " bzr ignore \"lib/**/*.o\""
1881
msgstr ""
1882
1883
#: bzrlib/builtins.py:3139
1884
msgid " bzr ignore \"RE:lib/.*\\.o\""
1885
msgstr ""
1886
1887
#: bzrlib/builtins.py:3141
1888
msgid " Ignore everything but the \"debian\" toplevel directory::"
1889
msgstr ""
1890
1891
#: bzrlib/builtins.py:3143
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:3157
1904
msgid "Display the default ignore rules that bzr uses."
1905
msgstr ""
1906
1907
#: bzrlib/builtins.py:3169
1908
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1909
msgstr ""
1910
1911
#: bzrlib/builtins.py:3180
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:3189
1919
msgid "NAME_PATTERN should not be an absolute path"
1920
msgstr ""
1921
1922
#: bzrlib/builtins.py:3202
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:3209
1933
msgid "List ignored files and the patterns that matched them."
1934
msgstr ""
1935
1936
#: bzrlib/builtins.py:3211
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:3214
1943
msgid "Alternatively, to list just the files::"
1944
msgstr ""
1945
1946
#: bzrlib/builtins.py:3216
1947
msgid " bzr ls --ignored"
1948
msgstr ""
1949
1950
#: bzrlib/builtins.py:3250
1951
#, python-format
1952
msgid "not a valid revision-number: %r"
1953
msgstr ""
1954
1955
#: bzrlib/builtins.py:3257
1956
msgid ""
1957
"Export current or past revision to a destination directory or archive."
1958
msgstr ""
1959
1960
#: bzrlib/builtins.py:3259
1961
msgid "If no revision is specified this exports the last committed revision."
1962
msgstr ""
1963
1964
#: bzrlib/builtins.py:3261
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:3265
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:3269
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:3272
1985
msgid ""
1986
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1987
msgstr ""
1988
1989
#: bzrlib/builtins.py:3274
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:3288
2003
msgid "Type of file to export to."
2004
msgstr ""
2005
2006
#: bzrlib/builtins.py:3291
2007
msgid "Apply content filters to export the convenient form."
2008
msgstr ""
2009
2010
#: bzrlib/builtins.py:3295
2011
msgid "Name of the root directory inside the exported file."
2012
msgstr ""
2013
2014
#: bzrlib/builtins.py:3297
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:3300
2021
msgid ""
2022
"Export the working tree contents rather than that of the last revision."
2023
msgstr ""
2024
2025
#: bzrlib/builtins.py:3319
2026
msgid "--uncommitted requires a working tree"
2027
msgstr ""
2028
2029
#: bzrlib/builtins.py:3328
2030
#, python-format
2031
msgid "Unsupported export format: %s"
2032
msgstr ""
2033
2034
#: bzrlib/builtins.py:3332
2035
msgid ""
2036
"Write the contents of a file as of a given revision to standard output."
2037
msgstr ""
2038
2039
#: bzrlib/builtins.py:3334
2040
msgid "If no revision is nominated, the last revision is used."
2041
msgstr ""
2042
2043
#: bzrlib/builtins.py:3336
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:3342
2050
msgid "The path name in the old tree."
2051
msgstr ""
2052
2053
#: bzrlib/builtins.py:3343
2054
msgid "Apply content filters to display the convenience form."
2055
msgstr ""
2056
2057
#: bzrlib/builtins.py:3354
2058
msgid "bzr cat --revision takes exactly one revision specifier"
2059
msgstr ""
2060
2061
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2062
msgid "{0!r} is not present in revision {1}"
2063
msgstr ""
2064
2065
#: bzrlib/builtins.py:3414
2066
msgid "Commit changes into a new revision."
2067
msgstr ""
2068
2069
#: bzrlib/builtins.py:3416
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:3423
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:3427
2087
msgid ":Selective commits:"
2088
msgstr ""
2089
2090
#: bzrlib/builtins.py:3429
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:3433
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:3437
2105
msgid " bzr commit foo -x foo/bar"
2106
msgstr ""
2107
2108
#: bzrlib/builtins.py:3439
2109
msgid " A selective commit after a merge is not yet supported."
2110
msgstr ""
2111
2112
#: bzrlib/builtins.py:3441
2113
msgid ":Custom authors:"
2114
msgstr ""
2115
2116
#: bzrlib/builtins.py:3443
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:3450
2127
msgid ":Checks:"
2128
msgstr ""
2129
2130
#: bzrlib/builtins.py:3452
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:3458
2140
msgid ":Things to note:"
2141
msgstr ""
2142
2143
#: bzrlib/builtins.py:3460
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:3464
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:3474
2159
msgid "Do not consider changes made to a given path."
2160
msgstr ""
2161
2162
#: bzrlib/builtins.py:3477
2163
msgid "Description of the new revision."
2164
msgstr ""
2165
2166
#: bzrlib/builtins.py:3480
2167
msgid "Commit even if nothing has changed."
2168
msgstr ""
2169
2170
#: bzrlib/builtins.py:3484
2171
msgid "Take commit message from this file."
2172
msgstr ""
2173
2174
#: bzrlib/builtins.py:3486
2175
msgid "Refuse to commit if there are unknown files in the working tree."
2176
msgstr ""
2177
2178
#: bzrlib/builtins.py:3489
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:3492
2185
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2186
msgstr ""
2187
2188
#: bzrlib/builtins.py:3495
2189
msgid "Set the author's name, if it's different from the committer."
2190
msgstr ""
2191
2192
#: bzrlib/builtins.py:3498
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:3504
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:3507
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:3525
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:3534
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:3543
2227
#, python-format
2228
msgid "Unrecognized bug %s. Commit refused."
2229
msgstr ""
2230
2231
#: bzrlib/builtins.py:3546
2232
#, python-format
2233
msgid ""
2234
"%s\n"
2235
"Commit refused."
2236
msgstr ""
2237
2238
#: bzrlib/builtins.py:3570
2239
msgid "Could not parse --commit-time: "
2240
msgstr ""
2241
2242
#: bzrlib/builtins.py:3610
2243
msgid "please specify either --message or --file"
2244
msgstr ""
2245
2246
#: bzrlib/builtins.py:3639
2247
msgid "please specify a commit message with either --message or --file"
2248
msgstr ""
2249
2250
#: bzrlib/builtins.py:3642
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:3662
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:3666
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:3670
2269
msgid "Commit refused because there are unknown files in the working tree."
2270
msgstr ""
2271
2272
#: bzrlib/builtins.py:3673
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:3681
2280
msgid ""
2281
"Validate working tree structure, branch consistency and repository history."
2282
msgstr ""
2283
2284
#: bzrlib/builtins.py:3683
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:3686
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:3689
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:3693
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:3697
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:3702
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:3706
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:3712
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:3717
2342
msgid " Check the tree and branch at 'foo'::"
2343
msgstr ""
2344
2345
#: bzrlib/builtins.py:3719
2346
msgid " bzr check --tree --branch foo"
2347
msgstr ""
2348
2349
#: bzrlib/builtins.py:3721
2350
msgid " Check only the repository at 'bar'::"
2351
msgstr ""
2352
2353
#: bzrlib/builtins.py:3723
2354
msgid " bzr check --repo bar"
2355
msgstr ""
2356
2357
#: bzrlib/builtins.py:3725
2358
msgid " Check everything at 'baz'::"
2359
msgstr ""
2360
2361
#: bzrlib/builtins.py:3727
2362
msgid " bzr check baz"
2363
msgstr ""
2364
2365
#: bzrlib/builtins.py:3733
2366
msgid "Check the branch related to the current directory."
2367
msgstr ""
2368
2369
#: bzrlib/builtins.py:3735
2370
msgid "Check the repository related to the current directory."
2371
msgstr ""
2372
2373
#: bzrlib/builtins.py:3737
2374
msgid "Check the working tree related to the current directory."
2375
msgstr ""
2376
2377
#: bzrlib/builtins.py:3751
2378
msgid "Upgrade a repository, branch or working tree to a newer format."
2379
msgstr ""
2380
2381
#: bzrlib/builtins.py:3753
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:3759
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:3766
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:3774
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:3779
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:3787
2426
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2427
msgstr ""
2428
2429
#: bzrlib/builtins.py:3791
2430
msgid "Branch format"
2431
msgstr ""
2432
2433
#: bzrlib/builtins.py:3793
2434
msgid "Remove the backup.bzr directory if successful."
2435
msgstr ""
2436
2437
#: bzrlib/builtins.py:3795
2438
msgid "Show what would be done, but don't actually do anything."
2439
msgstr ""
2440
2441
#: bzrlib/builtins.py:3810
2442
msgid "Show or set bzr user id."
2443
msgstr ""
2444
2445
#: bzrlib/builtins.py:3812
2446
msgid ""
2447
":Examples:\n"
2448
" Show the email of the current user::"
2449
msgstr ""
2450
2451
#: bzrlib/builtins.py:3815
2452
msgid " bzr whoami --email"
2453
msgstr ""
2454
2455
#: bzrlib/builtins.py:3817
2456
msgid " Set the current user::"
2457
msgstr ""
2458
2459
#: bzrlib/builtins.py:3819
2460
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2461
msgstr ""
2462
2463
#: bzrlib/builtins.py:3823
2464
msgid "Display email address only."
2465
msgstr ""
2466
2467
#: bzrlib/builtins.py:3825
2468
msgid "Set identity for the current branch instead of globally."
2469
msgstr ""
2470
2471
#: bzrlib/builtins.py:3851
2472
msgid "--email can only be used to display existing identity"
2473
msgstr ""
2474
2475
#: bzrlib/builtins.py:3873
2476
msgid "Print or set the branch nickname."
2477
msgstr ""
2478
2479
#: bzrlib/builtins.py:3875
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:3878
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:3898
2492
msgid "Set/unset and display aliases."
2493
msgstr ""
2494
2495
#: bzrlib/builtins.py:3900
2496
msgid ""
2497
":Examples:\n"
2498
" Show the current aliases::"
2499
msgstr ""
2500
2501
#: bzrlib/builtins.py:3903
2502
msgid " bzr alias"
2503
msgstr ""
2504
2505
#: bzrlib/builtins.py:3905
2506
msgid " Show the alias specified for 'll'::"
2507
msgstr ""
2508
2509
#: bzrlib/builtins.py:3907
2510
msgid " bzr alias ll"
2511
msgstr ""
2512
2513
#: bzrlib/builtins.py:3909
2514
msgid " Set an alias for 'll'::"
2515
msgstr ""
2516
2517
#: bzrlib/builtins.py:3911
2518
msgid " bzr alias ll=\"log --line -r-10..-1\""
2519
msgstr ""
2520
2521
#: bzrlib/builtins.py:3913
2522
msgid " To remove an alias for 'll'::"
2523
msgstr ""
2524
2525
#: bzrlib/builtins.py:3915
2526
msgid " bzr alias --remove ll"
2527
msgstr ""
2528
2529
#: bzrlib/builtins.py:3920
2530
msgid "Remove the alias."
2531
msgstr ""
2532
2533
#: bzrlib/builtins.py:3938
2534
msgid "bzr alias --remove expects an alias to remove."
2535
msgstr ""
2536
2537
#: bzrlib/builtins.py:4119
2538
msgid ""
2539
"subunit not available. subunit needs to be installed to use --subunit."
2540
msgstr ""
2541
2542
#: bzrlib/builtins.py:4136
2543
msgid ""
2544
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2545
msgstr ""
2546
2547
#: bzrlib/builtins.py:4183
2548
msgid "Show version of bzr."
2549
msgstr ""
2550
2551
#: bzrlib/builtins.py:4187
2552
msgid "Print just the version number."
2553
msgstr ""
2554
2555
#: bzrlib/builtins.py:4206
2556
msgid "It sure does!\n"
2557
msgstr ""
2558
2559
#: bzrlib/builtins.py:4230
2560
#, python-format
2561
msgid "merge base is revision %s\n"
2562
msgstr ""
2563
2564
#: bzrlib/builtins.py:4234
2565
msgid "Perform a three-way merge."
2566
msgstr ""
2567
2568
#: bzrlib/builtins.py:4236
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:4244
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:4248
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:4251
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:4259
2604
msgid "Revision numbers are always relative to the source branch."
2605
msgstr ""
2606
2607
#: bzrlib/builtins.py:4261 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 can commit."
2613
msgstr ""
2614
2615
#: bzrlib/builtins.py:4266
2616
msgid ""
2617
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2618
msgstr ""
2619
2620
#: bzrlib/builtins.py:4268
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:4273
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:4277
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:4283
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:4287
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:4290
2658
msgid ""
2659
":Examples:\n"
2660
" To merge all new revisions from bzr.dev::"
2661
msgstr ""
2662
2663
#: bzrlib/builtins.py:4293
2664
msgid " bzr merge ../bzr.dev"
2665
msgstr ""
2666
2667
#: bzrlib/builtins.py:4295
2668
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2669
msgstr ""
2670
2671
#: bzrlib/builtins.py:4297
2672
msgid " bzr merge -r 82 ../bzr.dev"
2673
msgstr ""
2674
2675
#: bzrlib/builtins.py:4299
2676
msgid " To merge the changes introduced by 82, without previous changes::"
2677
msgstr ""
2678
2679
#: bzrlib/builtins.py:4301
2680
msgid " bzr merge -r 81..82 ../bzr.dev"
2681
msgstr ""
2682
2683
#: bzrlib/builtins.py:4303
2684
msgid " To apply a merge directive contained in /tmp/merge::"
2685
msgstr ""
2686
2687
#: bzrlib/builtins.py:4305
2688
msgid " bzr merge /tmp/merge"
2689
msgstr ""
2690
2691
#: bzrlib/builtins.py:4307
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:4310
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:4322
2705
msgid "Merge even if the destination tree has uncommitted changes."
2706
msgstr ""
2707
2708
#: bzrlib/builtins.py:4328
2709
msgid ""
2710
"Apply uncommitted changes from a working copy, instead of branch changes."
2711
msgstr ""
2712
2713
#: bzrlib/builtins.py:4330
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:4335
2721
msgid ""
2722
"Branch to merge into, rather than the one containing the working directory."
2723
msgstr ""
2724
2725
#: bzrlib/builtins.py:4337
2726
msgid "Instead of merging, show a diff of the merge."
2727
msgstr ""
2728
2729
#: bzrlib/builtins.py:4339
2730
msgid "Select changes interactively."
2731
msgstr ""
2732
2733
#: bzrlib/builtins.py:4361
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:4388
2740
msgid "Cannot use --uncommitted with bundles or merge directives."
2741
msgstr ""
2742
2743
#: bzrlib/builtins.py:4399
2744
msgid "Cannot use --uncommitted and --revision at the same time."
2745
msgstr ""
2746
2747
#: bzrlib/builtins.py:4419
2748
msgid "merger: "
2749
msgstr ""
2750
2751
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2752
msgid "Nothing to do."
2753
msgstr ""
2754
2755
#: bzrlib/builtins.py:4425
2756
msgid "Cannot pull individual files"
2757
msgstr ""
2758
2759
#: bzrlib/builtins.py:4433
2760
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2761
msgstr ""
2762
2763
#: bzrlib/builtins.py:4491
2764
#, python-format
2765
msgid "Show-base is not supported for this merge type. %s"
2766
msgstr ""
2767
2768
#: bzrlib/builtins.py:4500
2769
#, python-format
2770
msgid "Conflict reduction is not supported for merge type %s."
2771
msgstr ""
2772
2773
#: bzrlib/builtins.py:4504
2774
msgid "Cannot do conflict reduction and show base."
2775
msgstr ""
2776
2777
#: bzrlib/builtins.py:4615
2778
msgid "No location specified or remembered"
2779
msgstr ""
2780
2781
#: bzrlib/builtins.py:4617
2782
msgid "{0} remembered {1} location {2}"
2783
msgstr ""
2784
2785
#: bzrlib/builtins.py:4623
2786
msgid "Redo a merge."
2787
msgstr ""
2788
2789
#: bzrlib/builtins.py:4625
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:4629
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:4633
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:4637
2811
msgid " bzr remerge --show-base"
2812
msgstr ""
2813
2814
#: bzrlib/builtins.py:4639
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:4642
2821
msgid " bzr remerge --merge-type weave --reprocess foobar"
2822
msgstr ""
2823
2824
#: bzrlib/builtins.py:4649
2825
msgid "Show base revision text in conflicts."
2826
msgstr ""
2827
2828
#: bzrlib/builtins.py:4661
2829
msgid ""
2830
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2831
"merges."
2832
msgstr ""
2833
2834
#: bzrlib/builtins.py:4717
2835
msgid "Revert files to a previous revision."
2836
msgstr ""
2837
2838
#: bzrlib/builtins.py:4719
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:4723
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:4729
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:4733
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:4738
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:4743
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:4752
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:4766
2904
msgid "Do not save backups of reverted files."
2905
msgstr ""
2906
2907
#: bzrlib/builtins.py:4768
2908
msgid "Remove pending merge marker, without changing any files."
2909
msgstr ""
2910
2911
#: bzrlib/builtins.py:4799
2912
msgid ""
2913
"Show help on a command or other topic.\n"
2914
" "
2915
msgstr ""
2916
2917
#: bzrlib/builtins.py:4804
2918
msgid "Show help on all commands."
2919
msgstr ""
2920
2921
#: bzrlib/builtins.py:4833
2922
msgid "Show unmerged/unpulled revisions between two branches."
2923
msgstr ""
2924
2925
#: bzrlib/builtins.py:4835
2926
msgid "OTHER_BRANCH may be local or remote."
2927
msgstr ""
2928
2929
#: bzrlib/builtins.py:4837
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:4847
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:4850
2947
msgid " bzr missing"
2948
msgstr ""
2949
2950
#: bzrlib/builtins.py:4852
2951
msgid " Determine the missing revisions between this and another branch::"
2952
msgstr ""
2953
2954
#: bzrlib/builtins.py:4854
2955
msgid " bzr missing http://server/branch"
2956
msgstr ""
2957
2958
#: bzrlib/builtins.py:4856
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:4859
2965
msgid " bzr missing -r ..-10"
2966
msgstr ""
2967
2968
#: bzrlib/builtins.py:4861
2969
msgid ""
2970
" Determine the missing revisions up to a specific revision on this\n"
2971
" branch::"
2972
msgstr ""
2973
2974
#: bzrlib/builtins.py:4864
2975
msgid " bzr missing --my-revision ..-10"
2976
msgstr ""
2977
2978
#: bzrlib/builtins.py:4871
2979
msgid "Reverse the order of revisions."
2980
msgstr ""
2981
2982
#: bzrlib/builtins.py:4873
2983
msgid "Display changes in the local branch only."
2984
msgstr ""
2985
2986
#: bzrlib/builtins.py:4874
2987
msgid "Same as --mine-only."
2988
msgstr ""
2989
2990
#: bzrlib/builtins.py:4876
2991
msgid "Display changes in the remote branch only."
2992
msgstr ""
2993
2994
#: bzrlib/builtins.py:4877
2995
msgid "Same as --theirs-only."
2996
msgstr ""
2997
2998
#: bzrlib/builtins.py:4882
2999
msgid ""
3000
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3001
"details."
3002
msgstr ""
3003
3004
#: bzrlib/builtins.py:4886
3005
msgid ""
3006
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3007
"details."
3008
msgstr ""
3009
3010
#: bzrlib/builtins.py:4889
3011
msgid "Show all revisions in addition to the mainline ones."
3012
msgstr ""
3013
3014
#: bzrlib/builtins.py:4943
3015
msgid "No peer location known or specified."
3016
msgstr ""
3017
3018
#: bzrlib/builtins.py:4947
3019
msgid "Using saved parent location: {0}\n"
3020
msgstr ""
3021
3022
#: bzrlib/builtins.py:4980
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:4996
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:5008
3037
msgid "This branch has no new revisions.\n"
3038
msgstr ""
3039
3040
#: bzrlib/builtins.py:5011
3041
msgid "Other branch has no new revisions.\n"
3042
msgstr ""
3043
3044
#: bzrlib/builtins.py:5016
3045
msgid "Branches are up to date.\n"
3046
msgstr ""
3047
3048
#: bzrlib/builtins.py:5027
3049
msgid "Compress the data within a repository."
3050
msgstr ""
3051
3052
#: bzrlib/builtins.py:5029
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:5033
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:5039
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:5048
3077
msgid "Delete obsolete packs to save disk space."
3078
msgstr ""
3079
3080
#: bzrlib/builtins.py:5062
3081
msgid "List the installed plugins."
3082
msgstr ""
3083
3084
#: bzrlib/builtins.py:5064
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:5067
3091
msgid "--verbose shows the path where each plugin is located."
3092
msgstr ""
3093
3094
#: bzrlib/builtins.py:5069
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:5075
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:5091
3112
msgid "Show testament (signing-form) of a revision."
3113
msgstr ""
3114
3115
#: bzrlib/builtins.py:5094
3116
msgid "Produce long-format testament."
3117
msgstr ""
3118
3119
#: bzrlib/builtins.py:5096
3120
msgid "Produce a strict-format testament."
3121
msgstr ""
3122
3123
#: bzrlib/builtins.py:5122
3124
msgid "Show the origin of each line in a file."
3125
msgstr ""
3126
3127
#: bzrlib/builtins.py:5124
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:5127
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:5135
3140
msgid "Show annotations on all lines."
3141
msgstr ""
3142
3143
#: bzrlib/builtins.py:5136
3144
msgid "Show commit date in annotations."
3145
msgstr ""
3146
3147
#: bzrlib/builtins.py:5223
3148
msgid "Cannot sign a range of non-revision-history revisions"
3149
msgstr ""
3150
3151
#: bzrlib/builtins.py:5235
3152
msgid "Please supply either one revision, or a range."
3153
msgstr ""
3154
3155
#: bzrlib/builtins.py:5239
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:5242
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:5245
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:5260
3175
msgid "No location supplied. This format does not remember old locations."
3176
msgstr ""
3177
3178
#: bzrlib/builtins.py:5265
3179
msgid "Branch is already bound"
3180
msgstr ""
3181
3182
#: bzrlib/builtins.py:5267
3183
msgid "No location supplied and no previous location known"
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:5273
3187
msgid "These branches have diverged. Try merging, and then bind again."
3188
msgstr ""
3189
3190
#: bzrlib/builtins.py:5280
3191
msgid "Convert the current checkout into a regular branch."
3192
msgstr ""
3193
3194
#: bzrlib/builtins.py:5282
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:5293
3201
msgid "Local branch is not bound"
3202
msgstr ""
3203
3204
#: bzrlib/builtins.py:5297
3205
msgid "Remove the last committed revision."
3206
msgstr ""
3207
3208
#: bzrlib/builtins.py:5299
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:5303
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:5307
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:5318
3230
msgid "Don't actually make changes."
3231
msgstr ""
3232
3233
#: bzrlib/builtins.py:5319
3234
msgid "Say yes to all questions."
3235
msgstr ""
3236
3237
#: bzrlib/builtins.py:5321
3238
msgid "Keep tags that point to removed revisions."
3239
msgstr ""
3240
3241
#: bzrlib/builtins.py:5323
3242
msgid "Only remove the commits from the local branch when in a checkout."
3243
msgstr ""
3244
3245
#: bzrlib/builtins.py:5372
3246
msgid "No revisions to uncommit.\n"
3247
msgstr ""
3248
3249
#: bzrlib/builtins.py:5387
3250
msgid "Dry-run, pretending to remove the above revisions.\n"
3251
msgstr ""
3252
3253
#: bzrlib/builtins.py:5390
3254
msgid "The above revision(s) will be removed.\n"
3255
msgstr ""
3256
3257
#: bzrlib/builtins.py:5394
3258
msgid "Uncommit these revisions"
3259
msgstr ""
3260
3261
#: bzrlib/builtins.py:5397
3262
msgid "Canceled\n"
3263
msgstr ""
3264
3265
#: bzrlib/builtins.py:5404
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:5409
3273
msgid "Break a dead lock."
3274
msgstr ""
3275
3276
#: bzrlib/builtins.py:5411
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:5414
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:5417
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:5420
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:5429
3303
msgid "LOCATION is the directory where the config lock is."
3304
msgstr ""
3305
3306
#: bzrlib/builtins.py:5431
3307
msgid "Do not ask for confirmation before breaking the lock."
3308
msgstr ""
3309
3310
#: bzrlib/builtins.py:5466
3311
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3312
msgstr ""
3313
3314
#: bzrlib/builtins.py:5467
3315
msgid "Run the bzr server."
3316
msgstr ""
3317
3318
#: bzrlib/builtins.py:5473
3319
msgid "Serve on stdin/out for use from inetd or sshd."
3320
msgstr ""
3321
3322
#: bzrlib/builtins.py:5474
3323
msgid "protocol"
3324
msgstr ""
3325
3326
#: bzrlib/builtins.py:5475
3327
msgid "Protocol to serve."
3328
msgstr ""
3329
3330
#: bzrlib/builtins.py:5479
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:5485
3338
msgid "Serve contents of this directory."
3339
msgstr ""
3340
3341
#: bzrlib/builtins.py:5487
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:5496
3351
msgid "Override the default idle client timeout (5min)."
3352
msgstr ""
3353
3354
#: bzrlib/builtins.py:5546
3355
msgid "Combine a tree into its containing tree."
3356
msgstr ""
3357
3358
#: bzrlib/builtins.py:5548
3359
msgid "This command requires the target tree to be in a rich-root format."
3360
msgstr ""
3361
3362
#: bzrlib/builtins.py:5550
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:5554
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:5572
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:5582 bzrlib/builtins.py:5588
3384
msgid "Cannot join {0}. {1}"
3385
msgstr ""
3386
3387
#: bzrlib/builtins.py:5592
3388
msgid "Split a subdirectory of a tree into a separate tree."
3389
msgstr ""
3390
3391
#: bzrlib/builtins.py:5594
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:5598
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:5678
3406
msgid "No submit branch specified or known"
3407
msgstr ""
3408
3409
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3410
msgid "No public branch specified or known"
3411
msgstr ""
3412
3413
#: bzrlib/builtins.py:5691
3414
msgid "bzr merge-directive takes at most two one revision identifiers"
3415
msgstr ""
3416
3417
#: bzrlib/builtins.py:5700
3418
msgid "No revisions to bundle."
3419
msgstr ""
3420
3421
#: bzrlib/builtins.py:5719
3422
msgid "Mail or create a merge-directive for submitting changes."
3423
msgstr ""
3424
3425
#: bzrlib/builtins.py:5721
3426
msgid "A merge directive provides many things needed for requesting merges:"
3427
msgstr ""
3428
3429
#: bzrlib/builtins.py:5723
3430
msgid "* A machine-readable description of the merge to perform"
3431
msgstr ""
3432
3433
#: bzrlib/builtins.py:5725
3434
msgid "* An optional patch that is a preview of the changes requested"
3435
msgstr ""
3436
3437
#: bzrlib/builtins.py:5727
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:5731
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:5734
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:5738
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:5744
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:5750
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:5756
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:5761
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:5764
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:5768
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:5775
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:5780
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:5786
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:5789
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:5813
3550
msgid "Write merge directive to this file or directory; use - for stdout."
3551
msgstr ""
3552
3553
#: bzrlib/builtins.py:5817
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:5819
3560
msgid "Mail the request to this address."
3561
msgstr ""
3562
3563
#: bzrlib/builtins.py:5823
3564
msgid "Body for the email."
3565
msgstr ""
3566
3567
#: bzrlib/builtins.py:5876
3568
msgid "Do not include a bundle in the merge directive."
3569
msgstr ""
3570
3571
#: bzrlib/builtins.py:5877
3572
msgid "Do not include a preview patch in the merge directive."
3573
msgstr ""
3574
3575
#: bzrlib/builtins.py:5880
3576
msgid "Remember submit and public branch."
3577
msgstr ""
3578
3579
#: bzrlib/builtins.py:5882
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:5892 bzrlib/cmd_version_info.py:76
3586
msgid "format"
3587
msgstr ""
3588
3589
#: bzrlib/builtins.py:5893
3590
msgid "Use the specified output format."
3591
msgstr ""
3592
3593
#: bzrlib/builtins.py:5915
3594
msgid "Create, remove or modify a tag naming a revision."
3595
msgstr ""
3596
3597
#: bzrlib/builtins.py:5917
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:5921
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:5924
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:5927
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:5930
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:5940
3632
msgid "Delete this tag rather than placing it."
3633
msgstr ""
3634
3635
#: bzrlib/builtins.py:5943
3636
msgid "Branch in which to place the tag."
3637
msgstr ""
3638
3639
#: bzrlib/builtins.py:5945
3640
msgid "Replace existing tags."
3641
msgstr ""
3642
3643
#: bzrlib/builtins.py:5960
3644
msgid "No tag specified to delete."
3645
msgstr ""
3646
3647
#: bzrlib/builtins.py:5962
3648
#, python-format
3649
msgid "Deleted tag %s."
3650
msgstr ""
3651
3652
#: bzrlib/builtins.py:5976
3653
msgid "Please specify a tag name."
3654
msgstr ""
3655
3656
#: bzrlib/builtins.py:5984
3657
#, python-format
3658
msgid "Tag %s already exists for that revision."
3659
msgstr ""
3660
3661
#: bzrlib/builtins.py:5988
3662
#, python-format
3663
msgid "Created tag %s."
3664
msgstr ""
3665
3666
#: bzrlib/builtins.py:5990
3667
#, python-format
3668
msgid "Updated tag %s."
3669
msgstr ""
3670
3671
#: bzrlib/builtins.py:5994
3672
msgid "List tags."
3673
msgstr ""
3674
3675
#: bzrlib/builtins.py:5996
3676
msgid ""
3677
"This command shows a table of tag names and the revisions they reference."
3678
msgstr ""
3679
3680
#: bzrlib/builtins.py:6002
3681
msgid "Branch whose tags should be displayed."
3682
msgstr ""
3683
3684
#: bzrlib/builtins.py:6004
3685
msgid "Sort tags by different criteria."
3686
msgstr ""
3687
3688
#: bzrlib/builtins.py:6004
3689
msgid "Sorting"
3690
msgstr ""
3691
3692
#: bzrlib/builtins.py:6073
3693
msgid "Reconfigure the type of a bzr directory."
3694
msgstr ""
3695
3696
#: bzrlib/builtins.py:6075
3697
msgid "A target configuration must be specified."
3698
msgstr ""
3699
3700
#: bzrlib/builtins.py:6077
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:6091
3712
msgid "Tree type"
3713
msgstr ""
3714
3715
#: bzrlib/builtins.py:6092
3716
msgid "The relation between branch and tree."
3717
msgstr ""
3718
3719
#: bzrlib/builtins.py:6094
3720
msgid "Reconfigure to be an unbound branch with no working tree."
3721
msgstr ""
3722
3723
#: bzrlib/builtins.py:6095
3724
msgid "Reconfigure to be an unbound branch with a working tree."
3725
msgstr ""
3726
3727
#: bzrlib/builtins.py:6096
3728
msgid "Reconfigure to be a bound branch with a working tree."
3729
msgstr ""
3730
3731
#: bzrlib/builtins.py:6097
3732
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3733
msgstr ""
3734
3735
#: bzrlib/builtins.py:6102
3736
msgid "Repository type"
3737
msgstr ""
3738
3739
#: bzrlib/builtins.py:6103
3740
msgid "Location fo the repository."
3741
msgstr ""
3742
3743
#: bzrlib/builtins.py:6105
3744
msgid ""
3745
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3746
msgstr ""
3747
3748
#: bzrlib/builtins.py:6107
3749
msgid "Reconfigure to use a shared repository."
3750
msgstr ""
3751
3752
#: bzrlib/builtins.py:6111
3753
msgid "Trees in Repository"
3754
msgstr ""
3755
3756
#: bzrlib/builtins.py:6112
3757
msgid "Whether new branches in the repository have trees."
3758
msgstr ""
3759
3760
#: bzrlib/builtins.py:6114
3761
msgid ""
3762
"Reconfigure repository to create working trees on branches by default."
3763
msgstr ""
3764
3765
#: bzrlib/builtins.py:6116
3766
msgid ""
3767
"Reconfigure repository to not create working trees on branches by default."
3768
msgstr ""
3769
3770
#: bzrlib/builtins.py:6119
3771
msgid "Branch to bind checkout to."
3772
msgstr ""
3773
3774
#: bzrlib/builtins.py:6121
3775
msgid "Perform reconfiguration even if local changes will be lost."
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:6124
3779
msgid "Reconfigure a branch to be stacked on another branch."
3780
msgstr ""
3781
3782
#: bzrlib/builtins.py:6128
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:6138
3789
msgid "Can't use both --stacked-on and --unstacked"
3790
msgstr ""
3791
3792
#: bzrlib/builtins.py:6152
3793
msgid "No target configuration specified"
3794
msgstr ""
3795
3796
#: bzrlib/builtins.py:6187
3797
msgid "Set the branch of a checkout and update."
3798
msgstr ""
3799
3800
#: bzrlib/builtins.py:6189
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:6194
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:6197
3815
msgid "Pending merges need to be committed or reverted before using switch."
3816
msgstr ""
3817
3818
#: bzrlib/builtins.py:6199
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:6204
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:6212
3834
msgid "Switch even if local commits will be lost."
3835
msgstr ""
3836
3837
#: bzrlib/builtins.py:6215
3838
msgid "Create the target branch from this one before switching to it."
3839
msgstr ""
3840
3841
#: bzrlib/builtins.py:6229
3842
msgid "You must supply either a revision or a location"
3843
msgstr ""
3844
3845
#: bzrlib/builtins.py:6242
3846
msgid "cannot create branch without source branch"
3847
msgstr ""
3848
3849
#: bzrlib/builtins.py:6262
3850
msgid "Manage filtered views."
3851
msgstr ""
3852
3853
#: bzrlib/builtins.py:6264
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:6271
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:6276
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:6281
3880
msgid ""
3881
":Examples:\n"
3882
" To define the current view::"
3883
msgstr ""
3884
3885
#: bzrlib/builtins.py:6284
3886
msgid " bzr view file1 dir1 ..."
3887
msgstr ""
3888
3889
#: bzrlib/builtins.py:6286
3890
msgid " To list the current view::"
3891
msgstr ""
3892
3893
#: bzrlib/builtins.py:6288
3894
msgid " bzr view"
3895
msgstr ""
3896
3897
#: bzrlib/builtins.py:6290
3898
msgid " To delete the current view::"
3899
msgstr ""
3900
3901
#: bzrlib/builtins.py:6292
3902
msgid " bzr view --delete"
3903
msgstr ""
3904
3905
#: bzrlib/builtins.py:6294
3906
msgid " To disable the current view without deleting it::"
3907
msgstr ""
3908
3909
#: bzrlib/builtins.py:6296
3910
msgid " bzr view --switch off"
3911
msgstr ""
3912
3913
#: bzrlib/builtins.py:6298
3914
msgid " To define a named view and switch to it::"
3915
msgstr ""
3916
3917
#: bzrlib/builtins.py:6300
3918
msgid " bzr view --name view-name file1 dir1 ..."
3919
msgstr ""
3920
3921
#: bzrlib/builtins.py:6302
3922
msgid " To list a named view::"
3923
msgstr ""
3924
3925
#: bzrlib/builtins.py:6304
3926
msgid " bzr view --name view-name"
3927
msgstr ""
3928
3929
#: bzrlib/builtins.py:6306
3930
msgid " To delete a named view::"
3931
msgstr ""
3932
3933
#: bzrlib/builtins.py:6308
3934
msgid " bzr view --name view-name --delete"
3935
msgstr ""
3936
3937
#: bzrlib/builtins.py:6310
3938
msgid " To switch to a named view::"
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:6312
3942
msgid " bzr view --switch view-name"
3943
msgstr ""
3944
3945
#: bzrlib/builtins.py:6314
3946
msgid " To list all views defined::"
3947
msgstr ""
3948
3949
#: bzrlib/builtins.py:6316
3950
msgid " bzr view --all"
3951
msgstr ""
3952
3953
#: bzrlib/builtins.py:6318
3954
msgid " To delete all views::"
3955
msgstr ""
3956
3957
#: bzrlib/builtins.py:6320
3958
msgid " bzr view --delete --all"
3959
msgstr ""
3960
3961
#: bzrlib/builtins.py:6327
3962
msgid "Apply list or delete action to all views."
3963
msgstr ""
3964
3965
#: bzrlib/builtins.py:6330
3966
msgid "Delete the view."
3967
msgstr ""
3968
3969
#: bzrlib/builtins.py:6333
3970
msgid "Name of the view to define, list or delete."
3971
msgstr ""
3972
3973
#: bzrlib/builtins.py:6337
3974
msgid "Name of the view to switch to."
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:6356
3978
msgid "Both --delete and a file list specified"
3979
msgstr ""
3980
3981
#: bzrlib/builtins.py:6359
3982
msgid "Both --delete and --switch specified"
3983
msgstr ""
3984
3985
#: bzrlib/builtins.py:6362
3986
msgid "Deleted all views.\n"
3987
msgstr ""
3988
3989
#: bzrlib/builtins.py:6364
3990
msgid "No current view to delete"
3991
msgstr ""
3992
3993
#: bzrlib/builtins.py:6367
3994
#, python-format
3995
msgid "Deleted '%s' view.\n"
3996
msgstr ""
3997
3998
#: bzrlib/builtins.py:6371
3999
msgid "Both --switch and a file list specified"
4000
msgstr ""
4001
4002
#: bzrlib/builtins.py:6374
4003
msgid "Both --switch and --all specified"
4004
msgstr ""
4005
4006
#: bzrlib/builtins.py:6377
4007
msgid "No current view to disable"
4008
msgstr ""
4009
4010
#: bzrlib/builtins.py:6379
4011
#, python-format
4012
msgid "Disabled '%s' view.\n"
4013
msgstr ""
4014
4015
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4016
msgid "Using '{0}' view: {1}\n"
4017
msgstr ""
4018
4019
#: bzrlib/builtins.py:6386
4020
msgid "Views defined:\n"
4021
msgstr ""
4022
4023
#: bzrlib/builtins.py:6395
4024
msgid "No views defined.\n"
4025
msgstr ""
4026
4027
#: bzrlib/builtins.py:6402
4028
msgid "Cannot change the 'off' pseudo view"
4029
msgstr ""
4030
4031
#: bzrlib/builtins.py:6410
4032
msgid "No current view.\n"
4033
msgstr ""
4034
4035
#: bzrlib/builtins.py:6413
4036
msgid "'{0}' view is: {1}\n"
4037
msgstr ""
4038
4039
#: bzrlib/builtins.py:6433
4040
msgid " <no hooks installed>\n"
4041
msgstr ""
4042
4043
#: bzrlib/builtins.py:6437
4044
msgid "Remove a branch."
4045
msgstr ""
4046
4047
#: bzrlib/builtins.py:6439
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:6444
4054
msgid " Remove the branch at repo/trunk::"
4055
msgstr ""
4056
4057
#: bzrlib/builtins.py:6446
4058
msgid " bzr remove-branch repo/trunk"
4059
msgstr ""
4060
4061
#: bzrlib/builtins.py:6461
4062
msgid "Plaintext diff output."
4063
msgstr ""
4064
4065
#: bzrlib/builtins.py:6462
4066
msgid "Temporarily set aside some changes from the current tree."
4067
msgstr ""
4068
4069
#: bzrlib/builtins.py:6464
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:6470
4079
msgid "If shelve --list is specified, previously-shelved changes are listed."
4080
msgstr ""
4081
4082
#: bzrlib/builtins.py:6472
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:6477
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:6480
4097
msgid ""
4098
"If a revision is specified, changes since that revision will be shelved."
4099
msgstr ""
4100
4101
#: bzrlib/builtins.py:6482
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:6485
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:6489
4115
msgid " change_editor = PROGRAM @new_path @old_path"
4116
msgstr ""
4117
4118
#: bzrlib/builtins.py:6491
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:6503
4128
msgid "Shelve all changes."
4129
msgstr ""
4130
4131
#: bzrlib/builtins.py:6505
4132
msgid "Method to use for writing diffs."
4133
msgstr ""
4134
4135
#: bzrlib/builtins.py:6505
4136
msgid "writer"
4137
msgstr ""
4138
4139
#: bzrlib/builtins.py:6509
4140
msgid "List shelved changes."
4141
msgstr ""
4142
4143
#: bzrlib/builtins.py:6511
4144
msgid "Destroy removed changes instead of shelving them."
4145
msgstr ""
4146
4147
#: bzrlib/builtins.py:6540
4148
msgid "No shelved changes."
4149
msgstr ""
4150
4151
#: bzrlib/builtins.py:6551
4152
msgid "Restore shelved changes."
4153
msgstr ""
4154
4155
#: bzrlib/builtins.py:6553
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:6562
4163
msgid "The action to perform."
4164
msgstr ""
4165
4166
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4167
msgid "action"
4168
msgstr ""
4169
4170
#: bzrlib/builtins.py:6564
4171
msgid "Apply changes and remove from the shelf."
4172
msgstr ""
4173
4174
#: bzrlib/builtins.py:6565
4175
msgid "Show changes, but do not apply or remove them."
4176
msgstr ""
4177
4178
#: bzrlib/builtins.py:6566
4179
msgid ""
4180
"Instead of unshelving the changes, show the diff that would result from "
4181
"unshelving."
4182
msgstr ""
4183
4184
#: bzrlib/builtins.py:6568
4185
msgid "Delete changes without applying them."
4186
msgstr ""
4187
4188
#: bzrlib/builtins.py:6569
4189
msgid "Apply changes but don't delete them."
4190
msgstr ""
4191
4192
#: bzrlib/builtins.py:6584
4193
msgid "Remove unwanted files from working tree."
4194
msgstr ""
4195
4196
#: bzrlib/builtins.py:6586
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:6589
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:6593
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:6596
4216
msgid "To check what clean-tree will do, use --dry-run."
4217
msgstr ""
4218
4219
#: bzrlib/builtins.py:6599
4220
msgid "Delete all ignored files."
4221
msgstr ""
4222
4223
#: bzrlib/builtins.py:6600
4224
msgid ""
4225
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4226
msgstr ""
4227
4228
#: bzrlib/builtins.py:6603
4229
msgid "Delete files unknown to bzr (default)."
4230
msgstr ""
4231
4232
#: bzrlib/builtins.py:6604
4233
msgid "Show files to delete instead of deleting them."
4234
msgstr ""
4235
4236
#: bzrlib/builtins.py:6606
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:490
4297
msgid ""
4298
"making backup of {0}\n"
4299
" to {1}"
4300
msgstr ""
4301
4302
#: bzrlib/bzrdir.py:513
4303
msgid "renamed {0} to {1}"
4304
msgstr ""
4305
4306
#: bzrlib/bzrdir.py:1652
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:1672
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:1818
4321
msgid "starting repository conversion"
4322
msgstr ""
4323
4324
#: bzrlib/bzrdir.py:2039
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:229
4564
#, python-format
4565
msgid "unknown command \"%s\""
4566
msgstr ""
4567
4568
#: bzrlib/commands.py:476
4569
msgid "No help for this command."
4570
msgstr ""
4571
4572
#: bzrlib/commands.py:489
4573
#, python-format
4574
msgid ":Purpose: %s\n"
4575
msgstr ""
4576
4577
#: bzrlib/commands.py:491
4578
#, python-format
4579
msgid ""
4580
":Usage:\n"
4581
"%s\n"
4582
msgstr ""
4583
4584
#: bzrlib/commands.py:493
4585
#, python-format
4586
msgid ":Usage: %s\n"
4587
msgstr ""
4588
4589
#: bzrlib/commands.py:512
4590
#, python-format
4591
msgid ":Options:%s"
4592
msgstr ""
4593
4594
#: bzrlib/commands.py:523
4595
#, python-format
4596
msgid ""
4597
":Description:\n"
4598
" %s\n"
4599
"\n"
4600
msgstr ""
4601
4602
#: bzrlib/commands.py:533
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:538
4610
msgid ":Aliases: "
4611
msgstr ""
4612
4613
#: bzrlib/commands.py:542
4614
#, python-format
4615
msgid ":From: plugin \"%s\"\n"
4616
msgstr ""
4617
4618
#: bzrlib/commands.py:554
4619
msgid ":doc:`{0} <{1}-help>`"
4620
msgstr ""
4621
4622
#: bzrlib/commands.py:558
4623
#, python-format
4624
msgid ":See also: %s"
4625
msgstr ""
4626
4627
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4628
msgid "Only ASCII permitted in option names"
4629
msgstr ""
4630
4631
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4632
msgid "command {0!r} needs one or more {1}"
4633
msgstr ""
4634
4635
#: bzrlib/commands.py:858
4636
msgid "command {0!r} requires argument {1}"
4637
msgstr ""
4638
4639
#: bzrlib/commands.py:865
4640
msgid "extra argument to command {0}: {1}"
4641
msgstr ""
4642
4643
#: bzrlib/commands.py:962
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:2485
4746
msgid "{0} is not an SI unit."
4747
msgstr ""
4748
4749
#: bzrlib/config.py:2949
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:3093
4756
#, python-format
4757
msgid "Invalid '%s', should be of the form 'name=value'"
4758
msgstr ""
4759
4760
#: bzrlib/config.py:3962
4761
msgid "Display, set or remove a configuration option."
4762
msgstr ""
4763
4764
#: bzrlib/config.py:3964
4765
msgid "Display the active value for a given option."
4766
msgstr ""
4767
4768
#: bzrlib/config.py:3966
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:3970
4776
msgid "If no NAME is given, --all .* is implied."
4777
msgstr ""
4778
4779
#: bzrlib/config.py:3972
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:3984
4787
msgid "Reduce the scope to the specified configuration file."
4788
msgstr ""
4789
4790
#: bzrlib/config.py:3988
4791
msgid "Display all the defined values for the matching options."
4792
msgstr ""
4793
4794
#: bzrlib/config.py:3990
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:710
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:424
4981
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
4982
msgstr ""
4983
4984
#: bzrlib/errors.py:443
4985
msgid "Generic path error: %(path)r%(extra)s)"
4986
msgstr ""
4987
4988
#: bzrlib/errors.py:456
4989
msgid "No such file: %(path)r%(extra)s"
4990
msgstr ""
4991
4992
#: bzrlib/errors.py:461
4993
msgid "File exists: %(path)r%(extra)s"
4994
msgstr ""
4995
4996
#: bzrlib/errors.py:467
4997
msgid ""
4998
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
4999
"after to tell bzr about a rename that has already happened)%(extra)s"
5000
msgstr ""
5001
5002
#: bzrlib/errors.py:483
5003
msgid "\"%(path)s\" is not a directory %(extra)s"
5004
msgstr ""
5005
5006
#: bzrlib/errors.py:488
5007
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5008
msgstr ""
5009
5010
#: bzrlib/errors.py:493
5011
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5012
msgstr ""
5013
5014
#: bzrlib/errors.py:498
5015
msgid "Hard-linking \"%(path)s\" is not supported"
5016
msgstr ""
5017
5018
#: bzrlib/errors.py:513
5019
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5020
msgstr ""
5021
5022
#: bzrlib/errors.py:518
5023
msgid "Permission denied: \"%(path)s\"%(extra)s"
5024
msgstr ""
5025
5026
#: bzrlib/errors.py:523
5027
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5028
msgstr ""
5029
5030
#: bzrlib/errors.py:528
5031
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5032
msgstr ""
5033
5034
#: bzrlib/errors.py:539
5035
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5036
msgstr ""
5037
5038
#: bzrlib/errors.py:561
5039
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5040
msgstr ""
5041
5042
#: bzrlib/errors.py:571
5043
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5044
msgstr ""
5045
5046
#: bzrlib/errors.py:579
5047
msgid ""
5048
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5049
"upgrade the branch to permit branch stacking."
5050
msgstr ""
5051
5052
#: bzrlib/errors.py:590
5053
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5054
msgstr ""
5055
5056
#: bzrlib/errors.py:600
5057
msgid ""
5058
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5059
"need to upgrade the repository to permit branch stacking."
5060
msgstr ""
5061
5062
#: bzrlib/errors.py:611
5063
msgid "Error reading from %(path)r."
5064
msgstr ""
5065
5066
#: bzrlib/errors.py:630
5067
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5068
msgstr ""
5069
5070
#: bzrlib/errors.py:646
5071
msgid "Path \"%(path)s\" is not unicode normalized"
5072
msgstr ""
5073
5074
#: bzrlib/errors.py:654
5075
msgid "Not a branch: \"%(path)s\"%(detail)s."
5076
msgstr ""
5077
5078
#: bzrlib/errors.py:696
5079
msgid "No submit branch available for branch \"%(path)s\""
5080
msgstr ""
5081
5082
#: bzrlib/errors.py:705
5083
msgid "A control directory already exists: \"%(path)s\"."
5084
msgstr ""
5085
5086
#: bzrlib/errors.py:710
5087
msgid "Already a branch: \"%(path)s\"."
5088
msgstr ""
5089
5090
#: bzrlib/errors.py:715
5091
msgid "Parent branch already exists: \"%(path)s\"."
5092
msgstr ""
5093
5094
#: bzrlib/errors.py:721
5095
msgid ""
5096
"Directory contains a branch, but no working tree (use bzr checkout if you "
5097
"wish to build a working tree): \"%(path)s\""
5098
msgstr ""
5099
5100
#: bzrlib/errors.py:726
5101
msgid ""
5102
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5103
msgstr ""
5104
5105
#: bzrlib/errors.py:736
5106
msgid ""
5107
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5108
msgstr ""
5109
5110
#: bzrlib/errors.py:746
5111
msgid "No repository present: \"%(path)s\""
5112
msgstr ""
5113
5114
#: bzrlib/errors.py:753
5115
msgid ""
5116
"Unsupported branch format: %(format)s\n"
5117
"Please run 'bzr upgrade'"
5118
msgstr ""
5119
5120
#: bzrlib/errors.py:759
5121
msgid "Unknown %(kind)s format: %(format)r"
5122
msgstr ""
5123
5124
#: bzrlib/errors.py:768
5125
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5126
msgstr ""
5127
5128
#: bzrlib/errors.py:778
5129
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5130
msgstr ""
5131
5132
#: bzrlib/errors.py:793
5133
msgid ""
5134
"%(target)s\n"
5135
"is not compatible with\n"
5136
"%(source)s\n"
5137
"%(details)s"
5138
msgstr ""
5139
5140
#: bzrlib/errors.py:809
5141
msgid "Revision is not compatible with %(repo_format)s"
5142
msgstr ""
5143
5144
#: bzrlib/errors.py:819
5145
msgid "%(context_info)s%(path)s is already versioned."
5146
msgstr ""
5147
5148
#: bzrlib/errors.py:840
5149
msgid "%(context_info)s%(path)s is not versioned."
5150
msgstr ""
5151
5152
#: bzrlib/errors.py:861
5153
msgid "Path(s) are not versioned: %(paths_as_string)s"
5154
msgstr ""
5155
5156
#: bzrlib/errors.py:872
5157
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5158
msgstr ""
5159
5160
#: bzrlib/errors.py:891
5161
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5162
msgstr ""
5163
5164
#: bzrlib/errors.py:899
5165
msgid ""
5166
"Filename %(filename)r is not valid in your current filesystem encoding "
5167
"%(fs_encoding)s"
5168
msgstr ""
5169
5170
#: bzrlib/errors.py:910
5171
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5172
msgstr ""
5173
5174
#: bzrlib/errors.py:928
5175
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5176
msgstr ""
5177
5178
#: bzrlib/errors.py:967
5179
msgid "Cannot lock %(lock)s: %(why)s"
5180
msgstr ""
5181
5182
#: bzrlib/errors.py:977
5183
msgid ""
5184
"A transaction related operation was attempted after the transaction finished."
5185
msgstr ""
5186
5187
#: bzrlib/errors.py:1004
5188
msgid "Cannot lock: transport is read only: %(transport)s"
5189
msgstr ""
5190
5191
#: bzrlib/errors.py:1012
5192
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5193
msgstr ""
5194
5195
#: bzrlib/errors.py:1023
5196
msgid ""
5197
"Lock was broken while still open: %(lock)s - check storage consistency!"
5198
msgstr ""
5199
5200
#: bzrlib/errors.py:1034
5201
msgid ""
5202
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5203
"%(holder)r, wanted to break %(target)r"
5204
msgstr ""
5205
5206
#: bzrlib/errors.py:1046
5207
msgid ""
5208
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5209
"Use 'bzr break-lock' to clear it"
5210
msgstr ""
5211
5212
#: bzrlib/errors.py:1059
5213
msgid "Lock not held: %(lock)s"
5214
msgstr ""
5215
5216
#: bzrlib/errors.py:1088
5217
msgid "No changes to commit"
5218
msgstr ""
5219
5220
#: bzrlib/errors.py:1093
5221
msgid ""
5222
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5223
msgstr ""
5224
5225
#: bzrlib/errors.py:1103
5226
msgid ""
5227
"Excluding paths during commit is not supported by repository at "
5228
"%(repository)r."
5229
msgstr ""
5230
5231
#: bzrlib/errors.py:1112
5232
msgid ""
5233
"The specified commit message contains characters unsupported by the current "
5234
"encoding."
5235
msgstr ""
5236
5237
#: bzrlib/errors.py:1118
5238
msgid "Upgrade URL cannot work with readonly URLs."
5239
msgstr ""
5240
5241
#: bzrlib/errors.py:1123
5242
msgid "The branch format %(format)s is already at the most recent format."
5243
msgstr ""
5244
5245
#: bzrlib/errors.py:1146
5246
msgid "Option --change does not accept revision ranges"
5247
msgstr ""
5248
5249
#: bzrlib/errors.py:1151
5250
msgid "No namespace registered for string: %(spec)r"
5251
msgstr ""
5252
5253
#: bzrlib/errors.py:1170
5254
msgid ""
5255
"Requested revision: '%(spec)s' does not exist in branch: "
5256
"%(branch_url)s%(extra)s"
5257
msgstr ""
5258
5259
#: bzrlib/errors.py:1184
5260
msgid ""
5261
"Operation denied because it would change the main history, which is not "
5262
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5263
msgstr ""
5264
5265
#: bzrlib/errors.py:1195
5266
msgid ""
5267
"These branches have diverged. Use the missing command to see how.\n"
5268
"Use the merge command to reconcile them."
5269
msgstr ""
5270
5271
#: bzrlib/errors.py:1215
5272
msgid ""
5273
"Branches have no common ancestor, and no merge base revision was specified."
5274
msgstr ""
5275
5276
#: bzrlib/errors.py:1221
5277
msgid ""
5278
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5279
msgstr ""
5280
5281
#: bzrlib/errors.py:1227
5282
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5283
msgstr ""
5284
5285
#: bzrlib/errors.py:1236
5286
msgid ""
5287
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5288
msgstr ""
5289
5290
#: bzrlib/errors.py:1245
5291
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5292
msgstr ""
5293
5294
#: bzrlib/errors.py:1254
5295
msgid "Branch %(branch)s has no commits."
5296
msgstr ""
5297
5298
#: bzrlib/errors.py:1272
5299
msgid ""
5300
"Bound branch %(branch)s is out of date with master branch "
5301
"%(master)s.%(extra_help)s"
5302
msgstr ""
5303
5304
#: bzrlib/errors.py:1284
5305
msgid ""
5306
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5307
"bound to %(remote)s."
5308
msgstr ""
5309
5310
#: bzrlib/errors.py:1296
5311
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5312
msgstr ""
5313
5314
#: bzrlib/errors.py:1305
5315
msgid ""
5316
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5317
"%(error)s"
5318
msgstr ""
5319
5320
#: bzrlib/errors.py:1317
5321
msgid "Error in processing weave: %(msg)s"
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:1326
5325
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5326
msgstr ""
5327
5328
#: bzrlib/errors.py:1337
5329
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5330
msgstr ""
5331
5332
#: bzrlib/errors.py:1347
5333
msgid "Weave invariant violated: %(what)s"
5334
msgstr ""
5335
5336
#: bzrlib/errors.py:1356
5337
msgid "Parents are mismatched between two revisions. %(msg)s"
5338
msgstr ""
5339
5340
#: bzrlib/errors.py:1378
5341
msgid ""
5342
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5343
"%(weave_b)s"
5344
msgstr ""
5345
5346
#: bzrlib/errors.py:1390
5347
msgid "Versioned file error"
5348
msgstr ""
5349
5350
#: bzrlib/errors.py:1395
5351
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5352
msgstr ""
5353
5354
#: bzrlib/errors.py:1405
5355
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5356
msgstr ""
5357
5358
#: bzrlib/errors.py:1415
5359
msgid "Text did not match its checksum: %(msg)s"
5360
msgstr ""
5361
5362
#: bzrlib/errors.py:1541
5363
msgid "Export format %(format)r not supported"
5364
msgstr ""
5365
5366
#: bzrlib/errors.py:1550
5367
msgid "Transport error: %(msg)s %(orig_error)s"
5368
msgstr ""
5369
5370
#: bzrlib/errors.py:1576
5371
msgid "Generic bzr smart protocol error: %(details)s"
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:1584
5375
msgid "Received bad protocol version marker: %(marker)r"
5376
msgstr ""
5377
5378
#: bzrlib/errors.py:1616
5379
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5380
msgstr ""
5381
5382
#: bzrlib/errors.py:1621
5383
msgid "Connection error: %(msg)s %(orig_error)s"
5384
msgstr ""
5385
5386
#: bzrlib/errors.py:1626
5387
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5388
msgstr ""
5389
5390
#: bzrlib/errors.py:1647
5391
msgid "Connection closed: %(msg)s %(orig_error)s"
5392
msgstr ""
5393
5394
#: bzrlib/errors.py:1652
5395
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5396
msgstr ""
5397
5398
#: bzrlib/errors.py:1657
5399
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5400
msgstr ""
5401
5402
#: bzrlib/errors.py:1667
5403
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5404
msgstr ""
5405
5406
#: bzrlib/errors.py:1682
5407
msgid "Certificate error: %(error)s"
5408
msgstr ""
5409
5410
#: bzrlib/errors.py:1690
5411
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5412
msgstr ""
5413
5414
#: bzrlib/errors.py:1704
5415
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5416
msgstr ""
5417
5418
#: bzrlib/errors.py:1712
5419
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5420
msgstr ""
5421
5422
#: bzrlib/errors.py:1721
5423
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5424
msgstr ""
5425
5426
#: bzrlib/errors.py:1735
5427
msgid "Too many redirections"
5428
msgstr ""
5429
5430
#: bzrlib/errors.py:1740
5431
msgid "Working tree has conflicts."
5432
msgstr ""
5433
5434
#: bzrlib/errors.py:1744
5435
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5436
msgstr ""
5437
5438
#: bzrlib/errors.py:1753
5439
msgid ""
5440
"Error(s) parsing config file %(filename)s:\n"
5441
"%(errors)s"
5442
msgstr ""
5443
5444
#: bzrlib/errors.py:1763
5445
msgid ""
5446
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5447
"See ``bzr help %(name)s``"
5448
msgstr ""
5449
5450
#: bzrlib/errors.py:1773
5451
msgid "%(username)r does not seem to contain a reasonable email address"
5452
msgstr ""
5453
5454
#: bzrlib/errors.py:1782
5455
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5456
msgstr ""
5457
5458
#: bzrlib/errors.py:1790
5459
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5460
msgstr ""
5461
5462
#: bzrlib/errors.py:1798
5463
msgid "Unable to import library \"%(library)s\": %(error)s"
5464
msgstr ""
5465
5466
#: bzrlib/errors.py:1806
5467
msgid "python-gpgme is not installed, it is needed to verify signatures"
5468
msgstr ""
5469
5470
#: bzrlib/errors.py:1814
5471
msgid ""
5472
"The working tree for %(basedir)s has changed since the last commit, but "
5473
"weave merge requires that it be unchanged"
5474
msgstr ""
5475
5476
#: bzrlib/errors.py:1824
5477
msgid ""
5478
"Can't reprocess and show base, because reprocessing obscures the "
5479
"relationship of conflicting lines to the base"
5480
msgstr ""
5481
5482
#: bzrlib/errors.py:1830
5483
msgid "Cycle in graph %(graph)r"
5484
msgstr ""
5485
5486
#: bzrlib/errors.py:1858
5487
msgid "File %(filename)s is not conflicted."
5488
msgstr ""
5489
5490
#: bzrlib/errors.py:1880
5491
msgid "No bundle was found in \"%(filename)s\"."
5492
msgstr ""
5493
5494
#: bzrlib/errors.py:1889
5495
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5496
msgstr ""
5497
5498
#: bzrlib/errors.py:1899
5499
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5500
msgstr ""
5501
5502
#: bzrlib/errors.py:1912
5503
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5504
msgstr ""
5505
5506
#: bzrlib/errors.py:1922
5507
msgid "Key %(key)s is already present in map"
5508
msgstr ""
5509
5510
#: bzrlib/errors.py:1927
5511
msgid "The prefix %(prefix)s is in the help search path twice."
5512
msgstr ""
5513
5514
#: bzrlib/errors.py:1937
5515
msgid ""
5516
"No final name for trans_id %(trans_id)r\n"
5517
"file-id: %(file_id)r\n"
5518
"root trans-id: %(root_trans_id)r\n"
5519
msgstr ""
5520
5521
#: bzrlib/errors.py:1969
5522
msgid "Attempt to reuse a transform that has already been applied."
5523
msgstr ""
5524
5525
#: bzrlib/errors.py:1974
5526
msgid "Moving the root directory is not supported at this time"
5527
msgstr ""
5528
5529
#: bzrlib/errors.py:1979
5530
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5531
msgstr ""
5532
5533
#: bzrlib/errors.py:1990
5534
msgid ""
5535
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5536
msgstr ""
5537
5538
#: bzrlib/errors.py:2026
5539
msgid ""
5540
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5541
msgstr ""
5542
5543
#: bzrlib/errors.py:2056
5544
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5545
msgstr ""
5546
5547
#: bzrlib/errors.py:2064
5548
msgid "Nothing to merge."
5549
msgstr ""
5550
5551
#: bzrlib/errors.py:2069
5552
msgid "Format %(format)s cannot be initialised by this version of bzr."
5553
msgstr ""
5554
5555
#: bzrlib/errors.py:2078
5556
msgid ""
5557
"Cannot convert from format %(from_format)s to format %(format)s. "
5558
"%(problem)s"
5559
msgstr ""
5560
5561
#: bzrlib/errors.py:2090
5562
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5563
msgstr ""
5564
5565
#: bzrlib/errors.py:2098
5566
msgid "%(exe_name)s could not be found on this machine"
5567
msgstr ""
5568
5569
#: bzrlib/errors.py:2106
5570
msgid "Diff is not installed on this machine: %(msg)s"
5571
msgstr ""
5572
5573
#: bzrlib/errors.py:2114
5574
msgid "Diff3 is not installed on this machine."
5575
msgstr ""
5576
5577
#: bzrlib/errors.py:2120
5578
msgid "The content being inserted is already present."
5579
msgstr ""
5580
5581
#: bzrlib/errors.py:2125
5582
msgid ""
5583
"This tree contains left-over files from a failed operation.\n"
5584
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5585
"to\n"
5586
" keep, and delete it when you are done."
5587
msgstr ""
5588
5589
#: bzrlib/errors.py:2136
5590
msgid ""
5591
"This tree contains left-over files from a failed operation.\n"
5592
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5593
" wish to keep, and delete it when you are done."
5594
msgstr ""
5595
5596
#: bzrlib/errors.py:2146
5597
msgid ""
5598
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5599
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5600
"to\n"
5601
" keep, and delete it when you are done."
5602
msgstr ""
5603
5604
#: bzrlib/errors.py:2157
5605
msgid ""
5606
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5607
"examine %(pending_deletion)s to see if it contains any files you wish to "
5608
"keep, and delete it when you are done."
5609
msgstr ""
5610
5611
#: bzrlib/errors.py:2167
5612
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5613
msgstr ""
5614
5615
#: bzrlib/errors.py:2181
5616
msgid ""
5617
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5618
msgstr ""
5619
5620
#: bzrlib/errors.py:2194
5621
msgid "Error in merge modified format"
5622
msgstr ""
5623
5624
#: bzrlib/errors.py:2199
5625
msgid "Format error in conflict listings"
5626
msgstr ""
5627
5628
#: bzrlib/errors.py:2203
5629
msgid ""
5630
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5631
"Error: %(description)s"
5632
msgstr ""
5633
5634
#: bzrlib/errors.py:2214
5635
msgid ""
5636
"An error has been detected in the repository %(repo_path)s.\n"
5637
"Please run bzr reconcile on this repository."
5638
msgstr ""
5639
5640
#: bzrlib/errors.py:2225
5641
msgid ""
5642
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5643
"reason: %(reason)s"
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:2238
5647
msgid ""
5648
"An inconsistent delta was supplied: %(delta)r\n"
5649
"reason: %(reason)s"
5650
msgstr ""
5651
5652
#: bzrlib/errors.py:2250
5653
msgid "To use this feature you must upgrade your branch at %(path)s."
5654
msgstr ""
5655
5656
#: bzrlib/errors.py:2259
5657
msgid "To use this feature you must upgrade your repository at %(path)s."
5658
msgstr ""
5659
5660
#: bzrlib/errors.py:2264
5661
msgid ""
5662
"To use this feature you must upgrade your branch at %(path)s to a format "
5663
"which supports rich roots."
5664
msgstr ""
5665
5666
#: bzrlib/errors.py:2270
5667
msgid "Cannot perform local-only commits on unbound branches."
5668
msgstr ""
5669
5670
#: bzrlib/errors.py:2275
5671
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5672
msgstr ""
5673
5674
#: bzrlib/errors.py:2296
5675
msgid "Ghost tags not supported by format %(format)r."
5676
msgstr ""
5677
5678
#: bzrlib/errors.py:2304
5679
msgid "File is binary but should be text."
5680
msgstr ""
5681
5682
#: bzrlib/errors.py:2309
5683
msgid "The path %(path)s is not permitted on this platform"
5684
msgstr ""
5685
5686
#: bzrlib/errors.py:2318
5687
msgid ""
5688
"Testament did not match expected value.\n"
5689
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5690
" {%(measured)s}"
5691
msgstr ""
5692
5693
#: bzrlib/errors.py:2330
5694
msgid "Not a bzr revision-bundle: %(text)r"
5695
msgstr ""
5696
5697
#: bzrlib/errors.py:2339
5698
msgid "Bad bzr revision-bundle: %(text)r"
5699
msgstr ""
5700
5701
#: bzrlib/errors.py:2348
5702
msgid "Malformed bzr revision-bundle header: %(text)r"
5703
msgstr ""
5704
5705
#: bzrlib/errors.py:2353
5706
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5707
msgstr ""
5708
5709
#: bzrlib/errors.py:2358
5710
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5711
msgstr ""
5712
5713
#: bzrlib/errors.py:2363
5714
msgid "End of line marker was not \\n in bzr revision-bundle"
5715
msgstr ""
5716
5717
#: bzrlib/errors.py:2373
5718
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5719
msgstr ""
5720
5721
#: bzrlib/errors.py:2383
5722
msgid "Root class for inventory serialization errors"
5723
msgstr ""
5724
5725
#: bzrlib/errors.py:2387
5726
msgid ""
5727
"The inventory was not in the expected format:\n"
5728
" %(msg)s"
5729
msgstr ""
5730
5731
#: bzrlib/errors.py:2396
5732
msgid "This operation requires rich root data storage"
5733
msgstr ""
5734
5735
#: bzrlib/errors.py:2409
5736
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5737
msgstr ""
5738
5739
#: bzrlib/errors.py:2418
5740
msgid ""
5741
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5742
"variable."
5743
msgstr ""
5744
5745
#: bzrlib/errors.py:2425
5746
msgid ""
5747
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5748
"ghost at {%(ghost_revision_id)s}"
5749
msgstr ""
5750
5751
#: bzrlib/errors.py:2435
5752
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5753
msgstr ""
5754
5755
#: bzrlib/errors.py:2486
5756
msgid ""
5757
"A merge directive must provide either a bundle or a public branch location."
5758
msgstr ""
5759
5760
#: bzrlib/errors.py:2493
5761
msgid "Bad merge directive payload %(start)r"
5762
msgstr ""
5763
5764
#: bzrlib/errors.py:2503
5765
msgid "Preview patch does not match requested changes."
5766
msgstr ""
5767
5768
#: bzrlib/errors.py:2509
5769
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5770
msgstr ""
5771
5772
#: bzrlib/errors.py:2519
5773
msgid ""
5774
"Your branch does not have all of the revisions required in order to merge "
5775
"this merge directive and the target location specified in the merge "
5776
"directive is not a branch: %(location)s."
5777
msgstr ""
5778
5779
#: bzrlib/errors.py:2531
5780
msgid "Unsupported entry kind %(kind)s"
5781
msgstr ""
5782
5783
#: bzrlib/errors.py:2539
5784
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5785
msgstr ""
5786
5787
#: bzrlib/errors.py:2549
5788
msgid "Subsume target %(other_tree)s needs to be upgraded."
5789
msgstr ""
5790
5791
#: bzrlib/errors.py:2568
5792
msgid "No such tag: %(tag_name)s"
5793
msgstr ""
5794
5795
#: bzrlib/errors.py:2576
5796
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:2585
5800
msgid "Tag %(tag_name)s already exists."
5801
msgstr ""
5802
5803
#: bzrlib/errors.py:2593
5804
msgid ""
5805
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5806
"bugs\" for more information on this feature."
5807
msgstr ""
5808
5809
#: bzrlib/errors.py:2603
5810
msgid ""
5811
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5812
msgstr ""
5813
5814
#: bzrlib/errors.py:2613
5815
msgid ""
5816
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5817
msgstr ""
5818
5819
#: bzrlib/errors.py:2623
5820
msgid "Invalid line in bugs property: '%(line)s'"
5821
msgstr ""
5822
5823
#: bzrlib/errors.py:2631
5824
msgid "Invalid bug status: '%(status)s'"
5825
msgstr ""
5826
5827
#: bzrlib/errors.py:2639
5828
msgid "Could not understand response from smart server: %(response_tuple)r"
5829
msgstr ""
5830
5831
#: bzrlib/errors.py:2678
5832
msgid "Server sent an unexpected error: %(error_tuple)r"
5833
msgstr ""
5834
5835
#: bzrlib/errors.py:2697
5836
msgid "Unrecognised container format: %(container_format)r"
5837
msgstr ""
5838
5839
#: bzrlib/errors.py:2705
5840
msgid "Unexpected end of container stream"
5841
msgstr ""
5842
5843
#: bzrlib/errors.py:2710
5844
msgid "Unknown record type: %(record_type)r"
5845
msgstr ""
5846
5847
#: bzrlib/errors.py:2718
5848
msgid "Invalid record: %(reason)s"
5849
msgstr ""
5850
5851
#: bzrlib/errors.py:2726
5852
msgid "Container has data after end marker: %(excess)r"
5853
msgstr ""
5854
5855
#: bzrlib/errors.py:2734
5856
msgid "Container has multiple records with the same name: %(name)s"
5857
msgstr ""
5858
5859
#: bzrlib/errors.py:2747
5860
msgid "Corrupt or incompatible data stream: %(reason)s"
5861
msgstr ""
5862
5863
#: bzrlib/errors.py:2755
5864
msgid "SMTP error: %(error)s"
5865
msgstr ""
5866
5867
#: bzrlib/errors.py:2763
5868
msgid "No message supplied."
5869
msgstr ""
5870
5871
#: bzrlib/errors.py:2768
5872
msgid "No mail-to address (--mail-to) or output (-o) specified."
5873
msgstr ""
5874
5875
#: bzrlib/errors.py:2773
5876
msgid "Unknown mail client: %(mail_client)s"
5877
msgstr ""
5878
5879
#: bzrlib/errors.py:2781
5880
msgid ""
5881
"Unable to find mail client with the following names: "
5882
"%(mail_command_list_string)s"
5883
msgstr ""
5884
5885
#: bzrlib/errors.py:2791
5886
msgid "SMTP connection to %(host)s refused"
5887
msgstr ""
5888
5889
#: bzrlib/errors.py:2800
5890
msgid "Please specify smtp_server. No server at default %(host)s."
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:2814
5894
msgid ""
5895
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5896
"reconfigure."
5897
msgstr ""
5898
5899
#: bzrlib/errors.py:2826
5900
msgid "'%(display_url)s' is already a branch."
5901
msgstr ""
5902
5903
#: bzrlib/errors.py:2831
5904
msgid "'%(display_url)s' is already a tree."
5905
msgstr ""
5906
5907
#: bzrlib/errors.py:2836
5908
msgid "'%(display_url)s' is already a checkout."
5909
msgstr ""
5910
5911
#: bzrlib/errors.py:2841
5912
msgid "'%(display_url)s' is already a lightweight checkout."
5913
msgstr ""
5914
5915
#: bzrlib/errors.py:2846
5916
msgid "'%(display_url)s' is already using a shared repository."
5917
msgstr ""
5918
5919
#: bzrlib/errors.py:2851
5920
msgid "'%(display_url)s' is already standalone."
5921
msgstr ""
5922
5923
#: bzrlib/errors.py:2856
5924
msgid "Shared repository '%(display_url)s' already creates working trees."
5925
msgstr ""
5926
5927
#: bzrlib/errors.py:2862
5928
msgid ""
5929
"Shared repository '%(display_url)s' already doesn't create working trees."
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:2868
5933
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5934
msgstr ""
5935
5936
#: bzrlib/errors.py:2873
5937
msgid "No location could be found to bind to at %(display_url)s."
5938
msgstr ""
5939
5940
#: bzrlib/errors.py:2878
5941
msgid ""
5942
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5943
"status).%(more)s"
5944
msgstr ""
5945
5946
#: bzrlib/errors.py:2897
5947
msgid ""
5948
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5949
"list).%(more)s"
5950
msgstr ""
5951
5952
#: bzrlib/errors.py:2903
5953
msgid "Variable {%(name)s} is not available."
5954
msgstr ""
5955
5956
#: bzrlib/errors.py:2911
5957
msgid "No template specified."
5958
msgstr ""
5959
5960
#: bzrlib/errors.py:2916
5961
msgid "Unable to create symlink %(path_str)son this platform"
5962
msgstr ""
5963
5964
#: bzrlib/errors.py:2931
5965
msgid ""
5966
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5967
"\"original\", \"local\"."
5968
msgstr ""
5969
5970
#: bzrlib/errors.py:2965
5971
msgid ""
5972
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5973
msgstr ""
5974
5975
#: bzrlib/errors.py:2977
5976
msgid "The \"%(config_id)s\" configuration does not exist."
5977
msgstr ""
5978
5979
#: bzrlib/errors.py:2985
5980
msgid "The \"%(option_name)s\" configuration option does not exist."
5981
msgstr ""
5982
5983
#: bzrlib/errors.py:2993
5984
msgid "The alias \"%(alias_name)s\" does not exist."
5985
msgstr ""
5986
5987
#: bzrlib/errors.py:3007
5988
msgid "\"%(alias_name)s\" is not a valid location alias."
5989
msgstr ""
5990
5991
#: bzrlib/errors.py:3015
5992
msgid "No %(alias_name)s location assigned."
5993
msgstr ""
5994
5995
#: bzrlib/errors.py:3023
5996
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
5997
msgstr ""
5998
5999
#: bzrlib/errors.py:3033
6000
msgid "Unknown rules detected: %(unknowns_str)s."
6001
msgstr ""
6002
6003
#: bzrlib/errors.py:3044
6004
msgid "Tip change rejected: %(msg)s"
6005
msgstr ""
6006
6007
#: bzrlib/errors.py:3052
6008
msgid "Shelf corrupt."
6009
msgstr ""
6010
6011
#: bzrlib/errors.py:3057
6012
msgid "Corruption while decompressing repository file%(orig_error)s"
6013
msgstr ""
6014
6015
#: bzrlib/errors.py:3069
6016
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6017
msgstr ""
6018
6019
#: bzrlib/errors.py:3077
6020
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6021
msgstr ""
6022
6023
#: bzrlib/errors.py:3085
6024
msgid ""
6025
"An attempt to access a url outside the server jail was made: '%(url)s'."
6026
msgstr ""
6027
6028
#: bzrlib/errors.py:3093
6029
msgid "The user aborted the operation."
6030
msgstr ""
6031
6032
#: bzrlib/errors.py:3098
6033
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6034
msgstr ""
6035
6036
#: bzrlib/errors.py:3108
6037
msgid "No such view: %(view_name)s."
6038
msgstr ""
6039
6040
#: bzrlib/errors.py:3118
6041
msgid ""
6042
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6043
"to a later format."
6044
msgstr ""
6045
6046
#: bzrlib/errors.py:3127
6047
msgid ""
6048
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6049
msgstr ""
6050
6051
#: bzrlib/errors.py:3194
6052
msgid "%(bzrdir)r does not support co-located branches."
6053
msgstr ""
6054
6055
#: bzrlib/errors.py:3200
6056
msgid ""
6057
"Unable to determine your name.\n"
6058
"Please, set your name with the 'whoami' command.\n"
6059
"E.g. bzr whoami \"Your Name <name@example.com>\""
6060
msgstr ""
6061
6062
#: bzrlib/errors.py:3209
6063
msgid "Invalid pattern(s) found. %(msg)s"
6064
msgstr ""
6065
6066
#: bzrlib/errors.py:3217
6067
msgid ""
6068
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6069
"unbind` to fix."
6070
msgstr ""
6071
6072
#: bzrlib/errors.py:3228
6073
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6074
msgstr ""
6075
6076
#: bzrlib/errors.py:3237
6077
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6078
msgstr ""
6079
6080
#: bzrlib/errors.py:3246
6081
msgid ""
6082
"No compatible object available for operations from %(source)r to %(target)r."
6083
msgstr ""
6084
6085
#: bzrlib/errors.py:3256
6086
msgid ""
6087
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6088
"%(arguments)s."
6089
msgstr ""
6090
6091
#: bzrlib/errors.py:3266
6092
msgid ""
6093
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6094
"format %(format)r"
6095
msgstr ""
6096
6097
#: bzrlib/errors.py:3278
6098
msgid ""
6099
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6100
"plugin."
6101
msgstr ""
6102
6103
#: bzrlib/errors.py:3291
6104
msgid "Binary files section encountered."
6105
msgstr ""
6106
6107
#: bzrlib/errors.py:3299
6108
msgid ""
6109
"Malformed patch header. %(desc)s\n"
6110
"%(line)r"
6111
msgstr ""
6112
6113
#: bzrlib/errors.py:3308
6114
msgid ""
6115
"Malformed hunk header. %(desc)s\n"
6116
"%(line)r"
6117
msgstr ""
6118
6119
#: bzrlib/errors.py:3317
6120
msgid ""
6121
"Malformed line. %(desc)s\n"
6122
"%(line)r"
6123
msgstr ""
6124
6125
#: bzrlib/errors.py:3327
6126
msgid ""
6127
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6128
"but patch says it should be \"%(patch_line)s\""
6129
msgstr ""
6130
6131
#: bzrlib/errors.py:3338
6132
msgid "The feature %(feature)s has already been registered."
6133
msgstr ""
6134
6135
#: bzrlib/export_pot.py:252
6136
#, python-format
6137
msgid "Exporting messages from builtin command: %s"
6138
msgstr ""
6139
6140
#: bzrlib/export_pot.py:271
6141
msgid "Exporting messages from plugin command: {0} in {1}"
6142
msgstr ""
6143
6144
#: bzrlib/export_pot.py:292
6145
#, python-format
6146
msgid "Exporting message from error: %s"
6147
msgstr ""
6148
6149
#: bzrlib/fetch.py:98
6150
msgid "Finding revisions"
6151
msgstr ""
6152
6153
#: bzrlib/fetch.py:103
6154
msgid "Fetching revisions"
6155
msgstr ""
6156
6157
#: bzrlib/foreign.py:262
6158
msgid "Push into a different VCS without any custom bzr metadata."
6159
msgstr ""
6160
6161
#: bzrlib/foreign.py:264
6162
msgid ""
6163
"This will afterwards rebase the local branch on the remote\n"
6164
"branch unless the --no-rebase option is used, in which case \n"
6165
"the two branches will be out of sync after the push. "
6166
msgstr ""
6167
6168
#: bzrlib/foreign.py:277
6169
msgid "Do not rebase after push."
6170
msgstr ""
6171
6172
#: bzrlib/foreign.py:311
6173
#, python-format
6174
msgid "Using saved location: %s\n"
6175
msgstr ""
6176
6177
#: bzrlib/foreign.py:321
6178
msgid ""
6179
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6180
"regular push."
6181
msgstr ""
6182
6183
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6184
msgid "{0} commits with valid signatures"
6185
msgstr ""
6186
6187
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6188
msgid "{0} commit with unknown key"
6189
msgid_plural "{0} commits with unknown keys"
6190
msgstr[0] ""
6191
msgstr[1] ""
6192
6193
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6194
msgid "{0} commit not valid"
6195
msgid_plural "{0} commits not valid"
6196
msgstr[0] ""
6197
msgstr[1] ""
6198
6199
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6200
msgid "{0} commit not signed"
6201
msgid_plural "{0} commits not signed"
6202
msgstr[0] ""
6203
msgstr[1] ""
6204
6205
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6206
msgid "{0} commit with key now expired"
6207
msgid_plural "{0} commits with key now expired"
6208
msgstr[0] ""
6209
msgstr[1] ""
6210
6211
#: bzrlib/gpg.py:343
6212
msgid "No GnuPG key results for pattern: {0}"
6213
msgstr ""
6214
6215
#: bzrlib/gpg.py:386
6216
msgid "{0} signed {1} commit"
6217
msgid_plural "{0} signed {1} commits"
6218
msgstr[0] ""
6219
msgstr[1] ""
6220
6221
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6222
msgid "{0} commit by author {1}"
6223
msgid_plural "{0} commits by author {1}"
6224
msgstr[0] ""
6225
msgstr[1] ""
6226
6227
#: bzrlib/gpg.py:433
6228
msgid "Unknown key {0} signed {1} commit"
6229
msgid_plural "Unknown key {0} signed {1} commits"
6230
msgstr[0] ""
6231
msgstr[1] ""
6232
6233
#: bzrlib/gpg.py:452
6234
msgid "{0} commit by author {1} with key {2} now expired"
6235
msgid_plural "{0} commits by author {1} with key {2} now expired"
6236
msgstr[0] ""
6237
msgstr[1] ""
6238
6239
#: bzrlib/groupcompress.py:1739
6240
#, python-format
6241
msgid "Insert claimed random_id=True, but then inserted %r two times"
6242
msgstr ""
6243
6244
#: bzrlib/hooks.py:331
6245
#, python-format
6246
msgid "Introduced in: %s"
6247
msgstr ""
6248
6249
#: bzrlib/hooks.py:334
6250
#, python-format
6251
msgid "Deprecated in: %s"
6252
msgstr ""
6253
6254
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6255
msgid "Walking content"
6256
msgstr ""
6257
6258
#: bzrlib/knit.py:3330
6259
msgid "annotating"
6260
msgstr ""
6261
6262
#: bzrlib/lock.py:548
6263
msgid "{0!r} was {1} locked again"
6264
msgstr ""
6265
6266
#: bzrlib/lockdir.py:321
6267
#, python-format
6268
msgid "error removing pending lock: %s"
6269
msgstr ""
6270
6271
#: bzrlib/lockdir.py:616
6272
msgid "Unable to obtain"
6273
msgstr ""
6274
6275
#: bzrlib/lockdir.py:618
6276
msgid "Lock owner changed for"
6277
msgstr ""
6278
6279
#: bzrlib/lockdir.py:620
6280
msgid "{0} lock {1} {2}."
6281
msgstr ""
6282
6283
#: bzrlib/lockdir.py:627
6284
#, python-format
6285
msgid "Will continue to try until %s, unless you press Ctrl-C."
6286
msgstr ""
6287
6288
#: bzrlib/lockdir.py:629
6289
msgid "See \"bzr help break-lock\" for more."
6290
msgstr ""
6291
6292
#: bzrlib/lockdir.py:739
6293
#, python-format
6294
msgid ""
6295
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6296
msgstr ""
6297
6298
#: bzrlib/log.py:572
6299
msgid "--exclude-common-ancestry requires two different revisions"
6300
msgstr ""
6301
6302
#: bzrlib/log.py:574
6303
#, python-format
6304
msgid "invalid direction %r"
6305
msgstr ""
6306
6307
#: bzrlib/log.py:662
6308
msgid "Start revision not found in history of end revision."
6309
msgstr ""
6310
6311
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6312
msgid "Logging revision 0 is invalid."
6313
msgstr ""
6314
6315
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6316
msgid "Start revision must be older than the end revision."
6317
msgstr ""
6318
6319
#: bzrlib/log.py:1827
6320
#, python-format
6321
msgid "unknown log formatter: %r"
6322
msgstr ""
6323
6324
#: bzrlib/log.py:2123
6325
msgid "fixes bug"
6326
msgid_plural "fixes bugs"
6327
msgstr[0] ""
6328
msgstr[1] ""
6329
6330
#: bzrlib/merge.py:689
6331
msgid "All changes applied successfully."
6332
msgstr ""
6333
6334
#: bzrlib/merge.py:691
6335
#, python-format
6336
msgid "%d conflicts encountered."
6337
msgstr ""
6338
6339
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6340
msgid "Preparing file merge"
6341
msgstr ""
6342
6343
#: bzrlib/multiparent.py:426
6344
msgid "Importing revisions"
6345
msgstr ""
6346
6347
#: bzrlib/option.py:526
6348
msgid "Show help message."
6349
msgstr ""
6350
6351
#: bzrlib/option.py:528
6352
msgid "Only display errors and warnings."
6353
msgstr ""
6354
6355
#: bzrlib/option.py:531
6356
msgid "Show usage message and options."
6357
msgstr ""
6358
6359
#: bzrlib/option.py:533
6360
msgid "Display more information."
6361
msgstr ""
6362
6363
#: bzrlib/option.py:541
6364
msgid ""
6365
"Select changes introduced by the specified revision. See also \"help "
6366
"revisionspec\"."
6367
msgstr ""
6368
6369
#: bzrlib/option.py:543
6370
msgid "Branch to operate on, instead of working directory."
6371
msgstr ""
6372
6373
#: bzrlib/option.py:545
6374
msgid "Detailed log format."
6375
msgstr ""
6376
6377
#: bzrlib/option.py:545
6378
msgid "Format used by GNU ChangeLog files."
6379
msgstr ""
6380
6381
#: bzrlib/option.py:545
6382
msgid "Log format with one line per revision."
6383
msgstr ""
6384
6385
#: bzrlib/option.py:545
6386
msgid "Moderately short log format."
6387
msgstr ""
6388
6389
#: bzrlib/option.py:545
6390
msgid "Use specified log format."
6391
msgstr ""
6392
6393
#: bzrlib/option.py:547
6394
msgid "Log format"
6395
msgstr ""
6396
6397
#: bzrlib/option.py:549
6398
msgid "LCA-newness merge."
6399
msgstr ""
6400
6401
#: bzrlib/option.py:549
6402
msgid "Merge using external diff3."
6403
msgstr ""
6404
6405
#: bzrlib/option.py:549
6406
msgid "Native diff3-style merge."
6407
msgstr ""
6408
6409
#: bzrlib/option.py:549
6410
msgid "Select a particular merge algorithm."
6411
msgstr ""
6412
6413
#: bzrlib/option.py:549
6414
msgid "Weave-based merge."
6415
msgstr ""
6416
6417
#: bzrlib/option.py:551
6418
msgid "Merge algorithm"
6419
msgstr ""
6420
6421
#: bzrlib/option.py:554
6422
msgid "Message string."
6423
msgstr ""
6424
6425
#: bzrlib/option.py:556
6426
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6427
msgstr ""
6428
6429
#: bzrlib/option.py:558
6430
msgid "Ignore differences between branches and overwrite unconditionally."
6431
msgstr ""
6432
6433
#: bzrlib/option.py:560
6434
msgid "Remember the specified location as a default."
6435
msgstr ""
6436
6437
#: bzrlib/option.py:562
6438
msgid "Reprocess to reduce spurious conflicts."
6439
msgstr ""
6440
6441
#: bzrlib/option.py:566
6442
msgid "See \"help revisionspec\" for details."
6443
msgstr ""
6444
6445
#: bzrlib/option.py:568
6446
msgid "Show internal object ids."
6447
msgstr ""
6448
6449
#: bzrlib/option.py:571
6450
msgid "Display timezone as local, original, or utc."
6451
msgstr ""
6452
6453
#: bzrlib/osutils.py:100
6454
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6455
msgstr ""
6456
6457
#: bzrlib/osutils.py:220
6458
msgid "lstat/stat of ({0!r}): {1!r}"
6459
msgstr ""
6460
6461
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6462
#, python-format
6463
msgid "sorry, %r not allowed in path"
6464
msgstr ""
6465
6466
#: bzrlib/osutils.py:1237
6467
#, python-format
6468
msgid "%r is too short to calculate a relative path"
6469
msgstr ""
6470
6471
#: bzrlib/plugin.py:143
6472
#, python-format
6473
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6474
msgstr ""
6475
6476
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6477
msgid "Enable completions for the selected plugin (default: all plugins)"
6478
msgstr ""
6479
6480
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6481
msgid "Generate a shell function for bash command line completion."
6482
msgstr ""
6483
6484
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6485
msgid ""
6486
"This command generates a shell function which can be used by bash to\n"
6487
"automatically complete the currently typed command when the user presses\n"
6488
"the completion key (usually tab)."
6489
msgstr ""
6490
6491
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6492
msgid ""
6493
"Commonly used like this:\n"
6494
" eval \"`bzr bash-completion`\""
6495
msgstr ""
6496
6497
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6498
msgid "Name of the generated function (default: _bzr)"
6499
msgstr ""
6500
6501
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6502
msgid "Generate only the shell function, don't enable it"
6503
msgstr ""
6504
6505
#: bzrlib/plugins/launchpad/__init__.py:81
6506
msgid "Register a branch with launchpad.net."
6507
msgstr ""
6508
6509
#: bzrlib/plugins/launchpad/__init__.py:83
6510
msgid ""
6511
"This command lists a bzr branch in the directory of branches on\n"
6512
"launchpad.net. Registration allows the branch to be associated with\n"
6513
"bugs or specifications."
6514
msgstr ""
6515
6516
#: bzrlib/plugins/launchpad/__init__.py:87
6517
msgid ""
6518
"Before using this command you must register the project to which the\n"
6519
"branch belongs, and create an account for yourself on launchpad.net."
6520
msgstr ""
6521
6522
#: bzrlib/plugins/launchpad/__init__.py:90
6523
msgid ""
6524
"arguments:\n"
6525
" public_url: The publicly visible url for the branch to register.\n"
6526
" This must be an http or https url (which Launchpad can read\n"
6527
" from to access the branch). Local file urls, SFTP urls, and\n"
6528
" bzr+ssh urls will not work.\n"
6529
" If no public_url is provided, bzr will use the configured\n"
6530
" public_url if there is one for the current branch, and\n"
6531
" otherwise error."
6532
msgstr ""
6533
6534
#: bzrlib/plugins/launchpad/__init__.py:99
6535
msgid ""
6536
"example:\n"
6537
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6538
" --project fooproject"
6539
msgstr ""
6540
6541
#: bzrlib/plugins/launchpad/__init__.py:106
6542
msgid "Launchpad project short name to associate with the branch."
6543
msgstr ""
6544
6545
#: bzrlib/plugins/launchpad/__init__.py:113
6546
msgid ""
6547
"Short name for the branch; by default taken from the last component of the "
6548
"url."
6549
msgstr ""
6550
6551
#: bzrlib/plugins/launchpad/__init__.py:117
6552
msgid "One-sentence description of the branch."
6553
msgstr ""
6554
6555
#: bzrlib/plugins/launchpad/__init__.py:120
6556
msgid "Longer description of the purpose or contents of the branch."
6557
msgstr ""
6558
6559
#: bzrlib/plugins/launchpad/__init__.py:123
6560
msgid "Branch author's email address, if not yourself."
6561
msgstr ""
6562
6563
#: bzrlib/plugins/launchpad/__init__.py:126
6564
msgid "The bug this branch fixes."
6565
msgstr ""
6566
6567
#: bzrlib/plugins/launchpad/__init__.py:129
6568
msgid "Prepare the request but don't actually send it."
6569
msgstr ""
6570
6571
#: bzrlib/plugins/launchpad/__init__.py:151
6572
msgid ""
6573
"register-branch requires a public branch url - see bzr help register-branch."
6574
msgstr ""
6575
6576
#: bzrlib/plugins/launchpad/__init__.py:159
6577
msgid "--product is deprecated; please use --project."
6578
msgstr ""
6579
6580
#: bzrlib/plugins/launchpad/__init__.py:191
6581
msgid "Open a Launchpad branch page in your web browser."
6582
msgstr ""
6583
6584
#: bzrlib/plugins/launchpad/__init__.py:196
6585
msgid "Do not actually open the browser. Just say the URL we would use."
6586
msgstr ""
6587
6588
#: bzrlib/plugins/launchpad/__init__.py:231
6589
#, python-format
6590
msgid "Opening %s in web browser"
6591
msgstr ""
6592
6593
#: bzrlib/plugins/launchpad/__init__.py:241
6594
msgid "Show or set the Launchpad user ID."
6595
msgstr ""
6596
6597
#: bzrlib/plugins/launchpad/__init__.py:243
6598
msgid ""
6599
"When communicating with Launchpad, some commands need to know your\n"
6600
"Launchpad user ID. This command can be used to set or show the\n"
6601
"user ID that Bazaar will use for such communication."
6602
msgstr ""
6603
6604
#: bzrlib/plugins/launchpad/__init__.py:247
6605
msgid ""
6606
":Examples:\n"
6607
" Show the Launchpad ID of the current user::"
6608
msgstr ""
6609
6610
#: bzrlib/plugins/launchpad/__init__.py:250
6611
msgid " bzr launchpad-login"
6612
msgstr ""
6613
6614
#: bzrlib/plugins/launchpad/__init__.py:252
6615
msgid " Set the Launchpad ID of the current user to 'bob'::"
6616
msgstr ""
6617
6618
#: bzrlib/plugins/launchpad/__init__.py:254
6619
msgid " bzr launchpad-login bob"
6620
msgstr ""
6621
6622
#: bzrlib/plugins/launchpad/__init__.py:261
6623
msgid "Don't check that the user name is valid."
6624
msgstr ""
6625
6626
#: bzrlib/plugins/launchpad/__init__.py:276
6627
#: bzrlib/plugins/launchpad/__init__.py:287
6628
msgid "Launchpad user ID exists and has SSH keys.\n"
6629
msgstr ""
6630
6631
#: bzrlib/plugins/launchpad/__init__.py:279
6632
msgid "No Launchpad user ID configured.\n"
6633
msgstr ""
6634
6635
#: bzrlib/plugins/launchpad/__init__.py:290
6636
#, python-format
6637
msgid "Launchpad user ID set to '%s'.\n"
6638
msgstr ""
6639
6640
#: bzrlib/plugins/launchpad/__init__.py:298
6641
msgid "Ask Launchpad to mirror a branch now."
6642
msgstr ""
6643
6644
#: bzrlib/plugins/launchpad/__init__.py:318
6645
msgid "Propose merging a branch on Launchpad."
6646
msgstr ""
6647
6648
#: bzrlib/plugins/launchpad/__init__.py:320
6649
msgid ""
6650
"This will open your usual editor to provide the initial comment. When it\n"
6651
"has created the proposal, it will open it in your default web browser."
6652
msgstr ""
6653
6654
#: bzrlib/plugins/launchpad/__init__.py:323
6655
msgid ""
6656
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6657
"is not supplied, the remembered submit branch will be used. If no submit\n"
6658
"branch is remembered, the development focus will be used."
6659
msgstr ""
6660
6661
#: bzrlib/plugins/launchpad/__init__.py:327
6662
msgid ""
6663
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6664
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6665
"The parameter the launchpad account name of the desired reviewer. This\n"
6666
"may optionally be followed by '=' and the review type. For example:"
6667
msgstr ""
6668
6669
#: bzrlib/plugins/launchpad/__init__.py:332
6670
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6671
msgstr ""
6672
6673
#: bzrlib/plugins/launchpad/__init__.py:334
6674
msgid ""
6675
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6676
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6677
msgstr ""
6678
6679
#: bzrlib/plugins/launchpad/__init__.py:339
6680
msgid "Propose the merge on staging."
6681
msgstr ""
6682
6683
#: bzrlib/plugins/launchpad/__init__.py:341
6684
msgid "Commit message."
6685
msgstr ""
6686
6687
#: bzrlib/plugins/launchpad/__init__.py:343
6688
msgid "Mark the proposal as approved immediately."
6689
msgstr ""
6690
6691
#: bzrlib/plugins/launchpad/__init__.py:345
6692
msgid "Requested reviewer and optional type."
6693
msgstr ""
6694
6695
#: bzrlib/plugins/launchpad/__init__.py:382
6696
msgid "Find the proposal to merge this revision."
6697
msgstr ""
6698
6699
#: bzrlib/plugins/launchpad/__init__.py:384
6700
msgid ""
6701
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6702
"This works only if the selected branch was the merge proposal target, and\n"
6703
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6704
"are opened in a web browser."
6705
msgstr ""
6706
6707
#: bzrlib/plugins/launchpad/__init__.py:389
6708
msgid ""
6709
"Any revision involved in the merge may be specified-- the revision in\n"
6710
"which the merge was performed, or one of the revisions that was merged."
6711
msgstr ""
6712
6713
#: bzrlib/plugins/launchpad/__init__.py:392
6714
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6715
msgstr ""
6716
6717
#: bzrlib/plugins/launchpad/__init__.py:394
6718
msgid " bzr lp-find-proposal -r annotate:README:1"
6719
msgstr ""
6720
6721
#: bzrlib/plugins/launchpad/__init__.py:409
6722
msgid "No review found."
6723
msgstr ""
6724
6725
#: bzrlib/plugins/launchpad/__init__.py:410
6726
#, python-format
6727
msgid "%d proposals(s) found."
6728
msgstr ""
6729
6730
#: bzrlib/plugins/launchpad/__init__.py:420
6731
msgid "Finding revision-id"
6732
msgstr ""
6733
6734
#: bzrlib/plugins/launchpad/__init__.py:427
6735
msgid "Finding merge"
6736
msgstr ""
6737
6738
#: bzrlib/plugins/launchpad/__init__.py:432
6739
msgid "Finding revno"
6740
msgstr ""
6741
6742
#: bzrlib/plugins/launchpad/__init__.py:437
6743
msgid "Finding Launchpad branch"
6744
msgstr ""
6745
6746
#: bzrlib/plugins/launchpad/__init__.py:440
6747
msgid "Finding proposals"
6748
msgstr ""
6749
6750
#: bzrlib/plugins/launchpad/account.py:66
6751
msgid "Setting ssh/sftp usernames for launchpad.net."
6752
msgstr ""
6753
6754
#: bzrlib/plugins/launchpad/lp_api.py:241
6755
#: bzrlib/plugins/launchpad/lp_api.py:246
6756
#, python-format
6757
msgid "%s is not registered on Launchpad"
6758
msgstr ""
6759
6760
#: bzrlib/plugins/launchpad/lp_api.py:256
6761
#, python-format
6762
msgid "%s has no development focus."
6763
msgstr ""
6764
6765
#: bzrlib/plugins/launchpad/lp_api.py:261
6766
#, python-format
6767
msgid "development focus %s has no branch."
6768
msgstr ""
6769
6770
#: bzrlib/plugins/launchpad/lp_api.py:266
6771
#, python-format
6772
msgid "source package %s has no branch."
6773
msgstr ""
6774
6775
#: bzrlib/plugins/launchpad/lp_api.py:270
6776
#, python-format
6777
msgid "%s has no associated product or source package."
6778
msgstr ""
6779
6780
#: bzrlib/plugins/launchpad/lp_api.py:282
6781
#, python-format
6782
msgid "%s is already up-to-date."
6783
msgstr ""
6784
6785
#: bzrlib/plugins/launchpad/lp_api.py:289
6786
#, python-format
6787
msgid "Pushing to %s"
6788
msgstr ""
6789
6790
#: bzrlib/plugins/launchpad/lp_directory.py:170
6791
msgid ""
6792
"resolution for {0}\n"
6793
" local: {1}\n"
6794
" remote: {2}"
6795
msgstr ""
6796
6797
#: bzrlib/plugins/launchpad/lp_propose.py:149
6798
#, python-format
6799
msgid "There is already a branch merge proposal: %s"
6800
msgstr ""
6801
6802
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6803
msgid "pb parameter to convert() is deprecated"
6804
msgstr ""
6805
6806
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6807
msgid "starting upgrade from format 4 to 5"
6808
msgstr ""
6809
6810
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6811
msgid "note: upgrade may be faster if all store files are ungzipped first"
6812
msgstr ""
6813
6814
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6815
msgid "converting revision"
6816
msgstr ""
6817
6818
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6819
msgid "upgraded to weaves:"
6820
msgstr ""
6821
6822
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6823
#, python-format
6824
msgid "%6d revisions and inventories"
6825
msgstr ""
6826
6827
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6828
#, python-format
6829
msgid "%6d revisions not present"
6830
msgstr ""
6831
6832
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6833
#, python-format
6834
msgid "%6d texts"
6835
msgstr ""
6836
6837
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6838
msgid "writing weave"
6839
msgstr ""
6840
6841
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6842
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6843
msgid "inventory"
6844
msgstr ""
6845
6846
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6847
msgid "write revision"
6848
msgstr ""
6849
6850
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6851
msgid "loading revision"
6852
msgstr ""
6853
6854
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6855
#, python-format
6856
msgid "revision {%s} not present in branch; will be converted as a ghost"
6857
msgstr ""
6858
6859
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6860
msgid "starting upgrade from format 5 to 6"
6861
msgstr ""
6862
6863
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6864
#, python-format
6865
msgid "adding prefixes to %s"
6866
msgstr ""
6867
6868
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6869
msgid "starting upgrade from format 6 to metadir"
6870
msgstr ""
6871
6872
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6873
msgid "Removing ancestry.weave"
6874
msgstr ""
6875
6876
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6877
msgid "Finding branch files"
6878
msgstr ""
6879
6880
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6881
msgid "Upgrading repository"
6882
msgstr ""
6883
6884
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6885
msgid "Upgrading branch"
6886
msgstr ""
6887
6888
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6889
msgid "No working tree."
6890
msgstr ""
6891
6892
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6893
msgid "Upgrading working tree"
6894
msgstr ""
6895
6896
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6897
#, python-format
6898
msgid "Make %s lock"
6899
msgstr ""
6900
6901
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6902
#, python-format
6903
msgid "Moving %s"
6904
msgstr ""
6905
6906
#: bzrlib/push.py:56
6907
msgid "Created new branch."
6908
msgstr ""
6909
6910
#: bzrlib/push.py:97
6911
#, python-format
6912
msgid ""
6913
"Target directory %s already contains a .bzr directory, but it is not valid."
6914
msgstr ""
6915
6916
#: bzrlib/push.py:101
6917
#, python-format
6918
msgid ""
6919
"Target directory %s already exists, but does not have a .bzr directory. "
6920
"Supply --use-existing-dir to push there anyway."
6921
msgstr ""
6922
6923
#: bzrlib/push.py:122
6924
#, python-format
6925
msgid "Too many redirections trying to make %s."
6926
msgstr ""
6927
6928
#: bzrlib/push.py:147
6929
msgid ""
6930
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6931
"information."
6932
msgstr ""
6933
6934
#: bzrlib/push.py:151
6935
#, python-format
6936
msgid ""
6937
"It is not possible to losslessly push to %s. You may want to use dpush "
6938
"instead."
6939
msgstr ""
6940
6941
#: bzrlib/push.py:157
6942
#, python-format
6943
msgid ""
6944
"At %s you have a valid .bzr control directory, but not a branch or "
6945
"repository. This is an unsupported configuration. Please move the target "
6946
"directory out of the way and try again."
6947
msgstr ""
6948
6949
#: bzrlib/reconcile.py:97
6950
#, python-format
6951
msgid "Reconciling branch %s"
6952
msgstr ""
6953
6954
#: bzrlib/reconcile.py:103
6955
#, python-format
6956
msgid "Reconciling repository %s"
6957
msgstr ""
6958
6959
#: bzrlib/reconcile.py:105
6960
msgid "Reconciling repository"
6961
msgstr ""
6962
6963
#: bzrlib/reconcile.py:111
6964
#, python-format
6965
msgid "%s cannot canonicalize CHKs."
6966
msgstr ""
6967
6968
#: bzrlib/reconcile.py:119
6969
msgid "Reconcile aborted: revision index has inconsistent parents."
6970
msgstr ""
6971
6972
#: bzrlib/reconcile.py:121
6973
msgid "Run \"bzr check\" for more details."
6974
msgstr ""
6975
6976
#: bzrlib/reconcile.py:123
6977
msgid "Reconciliation complete."
6978
msgstr ""
6979
6980
#: bzrlib/reconcile.py:166
6981
msgid "Fixing last revision info {0} => {1}"
6982
msgstr ""
6983
6984
#: bzrlib/reconcile.py:173
6985
msgid "revision_history ok."
6986
msgstr ""
6987
6988
#: bzrlib/reconcile.py:234
6989
msgid "Reading inventory data"
6990
msgstr ""
6991
6992
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
6993
msgid "Inventory ok."
6994
msgstr ""
6995
6996
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
6997
msgid "Backing up inventory"
6998
msgstr ""
6999
7000
#: bzrlib/reconcile.py:258
7001
msgid "Backup inventory created."
7002
msgstr ""
7003
7004
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7005
msgid "Writing weave"
7006
msgstr ""
7007
7008
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7009
msgid "Inventory regenerated."
7010
msgstr ""
7011
7012
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7013
msgid "Reading indexes"
7014
msgstr ""
7015
7016
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7017
msgid "Checking unused inventories"
7018
msgstr ""
7019
7020
#: bzrlib/reconcile.py:388
7021
msgid "Backup Inventory created"
7022
msgstr ""
7023
7024
#: bzrlib/reconcile.py:446
7025
msgid "Fixing text parents"
7026
msgstr ""
7027
7028
#: bzrlib/reconfigure.py:54
7029
msgid "{0} is now stacked on {1}\n"
7030
msgstr ""
7031
7032
#: bzrlib/reconfigure.py:69
7033
#, python-format
7034
msgid "%s is now not stacked\n"
7035
msgstr ""
7036
7037
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7038
#, python-format
7039
msgid "bzr: ERROR (ignored): %s"
7040
msgstr ""
7041
7042
#: bzrlib/remote.py:2541
7043
msgid "Copying repository content as tarball..."
7044
msgstr ""
7045
7046
#: bzrlib/rename_map.py:69
7047
msgid "Calculating hashes"
7048
msgstr ""
7049
7050
#: bzrlib/rename_map.py:107
7051
msgid "Determining hash hits"
7052
msgstr ""
7053
7054
#: bzrlib/rename_map.py:242
7055
msgid "{0} => {1}"
7056
msgstr ""
7057
7058
#: bzrlib/repository.py:1787
7059
msgid "Moving repository to repository.backup"
7060
msgstr ""
7061
7062
#: bzrlib/repository.py:1794
7063
msgid "Creating new repository"
7064
msgstr ""
7065
7066
#: bzrlib/repository.py:1799
7067
msgid "Copying content"
7068
msgstr ""
7069
7070
#: bzrlib/repository.py:1803
7071
msgid "Deleting old repository content"
7072
msgstr ""
7073
7074
#: bzrlib/repository.py:1805
7075
msgid "repository converted"
7076
msgstr ""
7077
7078
#: bzrlib/revisionspec.py:903
7079
msgid "Using {0} {1}"
7080
msgstr ""
7081
7082
#: bzrlib/send.py:58
7083
#, python-format
7084
msgid "Mail client \"%s\" does not support specifying body"
7085
msgstr ""
7086
7087
#: bzrlib/send.py:62
7088
msgid "--remember requires a branch to be specified."
7089
msgstr ""
7090
7091
#: bzrlib/send.py:77
7092
msgid "No submit branch known or specified"
7093
msgstr ""
7094
7095
#: bzrlib/send.py:80
7096
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7097
msgstr ""
7098
7099
#: bzrlib/send.py:98
7100
#, python-format
7101
msgid "No such send format '%s'."
7102
msgstr ""
7103
7104
#: bzrlib/send.py:114
7105
msgid "bzr send takes at most two one revision identifiers"
7106
msgstr ""
7107
7108
#: bzrlib/send.py:127
7109
msgid "No revisions to submit."
7110
msgstr ""
7111
7112
#: bzrlib/send.py:139
7113
msgid ""
7114
"- not supported for merge directives that use more than one output file."
7115
msgstr ""
7116
7117
#: bzrlib/send.py:185
7118
msgid "Format 0.9 does not permit bundle with no patch"
7119
msgstr ""
7120
7121
#: bzrlib/shelf_ui.py:46
7122
#, python-format
7123
msgid "Shelve adding file \"%(path)s\"?"
7124
msgstr ""
7125
7126
#: bzrlib/shelf_ui.py:47
7127
msgid "Shelve binary changes?"
7128
msgstr ""
7129
7130
#: bzrlib/shelf_ui.py:48
7131
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7132
msgstr ""
7133
7134
#: bzrlib/shelf_ui.py:50
7135
#, python-format
7136
msgid "Shelve removing file \"%(path)s\"?"
7137
msgstr ""
7138
7139
#: bzrlib/shelf_ui.py:51
7140
#, python-format
7141
msgid "Shelve %d change(s)?"
7142
msgstr ""
7143
7144
#: bzrlib/shelf_ui.py:52
7145
msgid "Shelve?"
7146
msgstr ""
7147
7148
#: bzrlib/shelf_ui.py:53
7149
#, python-format
7150
msgid ""
7151
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7152
msgstr ""
7153
7154
#: bzrlib/shelf_ui.py:55
7155
#, python-format
7156
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7157
msgstr ""
7158
7159
#: bzrlib/shelf_ui.py:70
7160
#, python-format
7161
msgid "Changes shelved with id \"%d\"."
7162
msgstr ""
7163
7164
#: bzrlib/shelf_ui.py:74
7165
msgid "Selected changes destroyed."
7166
msgstr ""
7167
7168
#: bzrlib/shelf_ui.py:78
7169
msgid "Selected changes:"
7170
msgstr ""
7171
7172
#: bzrlib/shelf_ui.py:98
7173
#, python-format
7174
msgid "Delete file \"%(path)s\"?"
7175
msgstr ""
7176
7177
#: bzrlib/shelf_ui.py:99
7178
msgid "Apply binary changes?"
7179
msgstr ""
7180
7181
#: bzrlib/shelf_ui.py:100
7182
#, python-format
7183
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7184
msgstr ""
7185
7186
#: bzrlib/shelf_ui.py:102
7187
#, python-format
7188
msgid "Add file \"%(path)s\"?"
7189
msgstr ""
7190
7191
#: bzrlib/shelf_ui.py:103
7192
#, python-format
7193
msgid "Apply %d change(s)?"
7194
msgstr ""
7195
7196
#: bzrlib/shelf_ui.py:104
7197
msgid "Apply change?"
7198
msgstr ""
7199
7200
#: bzrlib/shelf_ui.py:105
7201
#, python-format
7202
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7203
msgstr ""
7204
7205
#: bzrlib/shelf_ui.py:107
7206
#, python-format
7207
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7208
msgstr ""
7209
7210
#: bzrlib/shelf_ui.py:402
7211
msgid "No changes are shelved."
7212
msgstr ""
7213
7214
#: bzrlib/shelf_ui.py:460
7215
#, python-format
7216
msgid "Using changes with id \"%d\"."
7217
msgstr ""
7218
7219
#: bzrlib/shelf_ui.py:464
7220
#, python-format
7221
msgid "Message: %s"
7222
msgstr ""
7223
7224
#: bzrlib/shelf_ui.py:476
7225
#, python-format
7226
msgid "Deleted changes with id \"%d\"."
7227
msgstr ""
7228
7229
#: bzrlib/smart/medium.py:714
7230
msgid "HPSS calls: {0} ({1} vfs) {2}"
7231
msgstr ""
7232
7233
#: bzrlib/smart/server.py:169
7234
msgid "Requested to stop gracefully"
7235
msgstr ""
7236
7237
#: bzrlib/smart/server.py:179
7238
#, python-format
7239
msgid "Waiting for %d client(s) to finish"
7240
msgstr ""
7241
7242
#: bzrlib/smart/server.py:185
7243
#, python-format
7244
msgid "Still waiting for %d client(s) to finish"
7245
msgstr ""
7246
7247
#: bzrlib/smart/server.py:219
7248
#, python-format
7249
msgid "listening socket error: %s"
7250
msgstr ""
7251
7252
#: bzrlib/smart/server.py:452
7253
#, python-format
7254
msgid "listening on port: %s"
7255
msgstr ""
7256
7257
#: bzrlib/switch.py:73
7258
msgid "Pending merges must be committed or reverted before using switch."
7259
msgstr ""
7260
7261
#: bzrlib/switch.py:100
7262
msgid ""
7263
"Cannot switch as local commits found in the checkout. Commit these to the "
7264
"bound branch or use --force to throw them away."
7265
msgstr ""
7266
7267
#: bzrlib/switch.py:105
7268
#, python-format
7269
msgid ""
7270
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7271
"anyway, use --force."
7272
msgstr ""
7273
7274
#: bzrlib/switch.py:125
7275
msgid "Cannot switch a branch, only a checkout."
7276
msgstr ""
7277
7278
#: bzrlib/switch.py:163
7279
#, python-format
7280
msgid "Tree is up to date at revision %d."
7281
msgstr ""
7282
7283
#: bzrlib/switch.py:169
7284
#, python-format
7285
msgid "Updated to revision %d."
7286
msgstr ""
7287
7288
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7289
msgid "Apply phase"
7290
msgstr ""
7291
7292
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7293
msgid "removing file"
7294
msgstr ""
7295
7296
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7297
msgid "adding file"
7298
msgstr ""
7299
7300
#: bzrlib/transform.py:2591
7301
msgid "Building tree"
7302
msgstr ""
7303
7304
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7305
msgid "Adding file contents"
7306
msgstr ""
7307
7308
#: bzrlib/transform.py:3028
7309
msgid "Resolution pass"
7310
msgstr ""
7311
7312
#: bzrlib/transport/ftp/_gssapi.py:88
7313
#, python-format
7314
msgid "Authenticated as %s"
7315
msgstr ""
7316
7317
#: bzrlib/tree.py:634
7318
msgid "*** {0} content-filter: {1} => {2!r}"
7319
msgstr ""
7320
7321
#: bzrlib/upgrade.py:77
7322
#, python-format
7323
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7324
msgstr ""
7325
7326
#: bzrlib/upgrade.py:100
7327
#, python-format
7328
msgid "cannot upgrade from bzrdir format %s"
7329
msgstr ""
7330
7331
#: bzrlib/upgrade.py:103
7332
#, python-format
7333
msgid "starting upgrade of %s"
7334
msgstr ""
7335
7336
#: bzrlib/upgrade.py:110
7337
msgid "finished"
7338
msgstr ""
7339
7340
#: bzrlib/upgrade.py:120
7341
msgid "Deleting backup.bzr"
7342
msgstr ""
7343
7344
#: bzrlib/upgrade.py:151
7345
msgid ""
7346
"\n"
7347
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7348
msgstr ""
7349
7350
#: bzrlib/upgrade.py:208
7351
#, python-format
7352
msgid "Found %d dependent branches - upgrading ..."
7353
msgstr ""
7354
7355
#: bzrlib/upgrade.py:276
7356
msgid "Upgrading bzrdirs"
7357
msgstr ""
7358
7359
#: bzrlib/upgrade.py:282
7360
#, python-format
7361
msgid "Upgrading %s"
7362
msgstr ""
7363
7364
#: bzrlib/upgrade.py:283
7365
msgid "Upgrading {0} {1} ..."
7366
msgstr ""
7367
7368
#: bzrlib/upgrade.py:301
7369
msgid "Removing backup ..."
7370
msgstr ""
7371
7372
#: bzrlib/upgrade.py:305
7373
msgid "failed to clean-up {0}: {1}"
7374
msgstr ""
7375
7376
#: bzrlib/vf_repository.py:1090
7377
msgid "inventories"
7378
msgstr ""
7379
7380
#: bzrlib/vf_repository.py:1116
7381
msgid "texts"
7382
msgstr ""
7383
7384
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7385
msgid "Calculating text parents"
7386
msgstr ""
7387
7388
#: bzrlib/vf_repository.py:1706
7389
msgid "Fetch texts"
7390
msgstr ""
7391
7392
#: bzrlib/vf_repository.py:2535
7393
msgid "loading text store"
7394
msgstr ""
7395
7396
#: bzrlib/vf_repository.py:2541
7397
msgid "checking text graph"
7398
msgstr ""
7399
7400
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7401
#: bzrlib/vf_repository.py:3124
7402
msgid "Transferring revisions"
7403
msgstr ""
7404
7405
#: bzrlib/win32utils.py:146
7406
msgid "Failed to GetProcessMemoryInfo()"
7407
msgstr ""
7408
7409
#: bzrlib/win32utils.py:167
7410
msgid "Cannot debug memory on win32 without ctypes or win32process"
7411
msgstr ""
7412
7413
#: bzrlib/win32utils.py:172
7414
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7415
msgstr ""
7416
7417
#: bzrlib/win32utils.py:180
7418
#, python-format
7419
msgid "WorkingSize %8d KiB"
7420
msgstr ""
7421
7422
#: bzrlib/win32utils.py:181
7423
#, python-format
7424
msgid "PeakWorking %8d KiB"
7425
msgstr ""
7426
7427
#: bzrlib/win32utils.py:182
7428
#, python-format
7429
msgid "PagefileUsage %8d KiB"
7430
msgstr ""
7431
7432
#: bzrlib/win32utils.py:183
7433
#, python-format
7434
msgid "PeakPagefileUsage %8d KiB"
7435
msgstr ""
7436
7437
#: bzrlib/win32utils.py:185
7438
#, python-format
7439
msgid "PrivateUsage %8d KiB"
7440
msgstr ""
7441
7442
#: bzrlib/win32utils.py:186
7443
#, python-format
7444
msgid "PageFaultCount %8d"
7445
msgstr ""
7446
7447
#: bzrlib/workingtree.py:1478
7448
msgid "Rerun update after fixing the conflicts."
7449
msgstr ""
7450
7451
#: dummy/help_topics/authentication/summary.txt:1
7452
msgid "Information on configuring authentication"
7453
msgstr ""
7454
7455
#: dummy/help_topics/basic/detail.txt:1
7456
msgid ""
7457
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7458
"http://bazaar.canonical.com/"
7459
msgstr ""
7460
7461
#: dummy/help_topics/basic/detail.txt:4
7462
msgid ""
7463
"Basic commands:\n"
7464
" bzr init makes this directory a versioned branch\n"
7465
" bzr branch make a copy of another branch"
7466
msgstr ""
7467
7468
#: dummy/help_topics/basic/detail.txt:8
7469
msgid ""
7470
" bzr add make files or directories versioned\n"
7471
" bzr ignore ignore a file or pattern\n"
7472
" bzr mv move or rename a versioned file"
7473
msgstr ""
7474
7475
#: dummy/help_topics/basic/detail.txt:12
7476
msgid ""
7477
" bzr status summarize changes in working copy\n"
7478
" bzr diff show detailed diffs"
7479
msgstr ""
7480
7481
#: dummy/help_topics/basic/detail.txt:15
7482
msgid ""
7483
" bzr merge pull in changes from another branch\n"
7484
" bzr commit save some or all changes\n"
7485
" bzr send send changes via email"
7486
msgstr ""
7487
7488
#: dummy/help_topics/basic/detail.txt:19
7489
msgid ""
7490
" bzr log show history of changes\n"
7491
" bzr check validate storage"
7492
msgstr ""
7493
7494
#: dummy/help_topics/basic/detail.txt:22
7495
msgid ""
7496
" bzr help init more help on e.g. init command\n"
7497
" bzr help commands list all commands\n"
7498
" bzr help topics list all help topics\n"
7499
msgstr ""
7500
7501
#: dummy/help_topics/basic/summary.txt:1
7502
msgid "Basic commands"
7503
msgstr ""
7504
7505
#: dummy/help_topics/branches/detail.txt:1
7506
msgid "Branches"
7507
msgstr ""
7508
7509
#: dummy/help_topics/branches/detail.txt:3
7510
msgid ""
7511
"A branch consists of the state of a project, including all of its\n"
7512
"history. All branches have a repository associated (which is where the\n"
7513
"branch history is stored), but multiple branches may share the same\n"
7514
"repository (a shared repository). Branches can be copied and merged."
7515
msgstr ""
7516
7517
#: dummy/help_topics/branches/detail.txt:8
7518
msgid ""
7519
"In addition, one branch may be bound to another one. Binding to another\n"
7520
"branch indicates that commits which happen in this branch must also \n"
7521
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7522
"commits when the two branches are out of date. In order for a commit \n"
7523
"to succeed, it may be necessary to update the current branch using \n"
7524
"``bzr update``."
7525
msgstr ""
7526
7527
#: dummy/help_topics/branches/detail.txt:15
7528
#: dummy/help_topics/checkouts/detail.txt:66
7529
#: dummy/help_topics/repositories/detail.txt:36
7530
msgid "Related commands::"
7531
msgstr ""
7532
7533
#: dummy/help_topics/branches/detail.txt:17
7534
msgid ""
7535
" init Change a directory into a versioned branch.\n"
7536
" branch Create a new branch that is a copy of an existing branch.\n"
7537
" merge Perform a three-way merge.\n"
7538
" bind Bind a branch to another one.\n"
7539
msgstr ""
7540
7541
#: dummy/help_topics/branches/summary.txt:1
7542
msgid "Information on what a branch is"
7543
msgstr ""
7544
7545
#: dummy/help_topics/bugs/summary.txt:1
7546
msgid "Bug tracker settings"
7547
msgstr ""
7548
7549
#: dummy/help_topics/checkouts/detail.txt:1
7550
msgid "Checkouts"
7551
msgstr ""
7552
7553
#: dummy/help_topics/checkouts/detail.txt:3
7554
msgid ""
7555
"Checkouts are source trees that are connected to a branch, so that when\n"
7556
"you commit in the source tree, the commit goes into that branch. They\n"
7557
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7558
"Bazaar's decentralized features until you want them. Using checkouts\n"
7559
"with shared repositories is very similar to working with SVN or CVS, but\n"
7560
"doesn't have the same restrictions. And using checkouts still allows\n"
7561
"others working on the project to use whatever workflow they like."
7562
msgstr ""
7563
7564
#: dummy/help_topics/checkouts/detail.txt:11
7565
msgid ""
7566
"A checkout is created with the bzr checkout command (see \"help "
7567
"checkout\").\n"
7568
"You pass it a reference to another branch, and it will create a local copy\n"
7569
"for you that still contains a reference to the branch you created the\n"
7570
"checkout from (the master branch). Then if you make any commits they will "
7571
"be\n"
7572
"made on the other branch first. This creates an instant mirror of your work, "
7573
"or\n"
7574
"facilitates lockstep development, where each developer is working together,\n"
7575
"continuously integrating the changes of others."
7576
msgstr ""
7577
7578
#: dummy/help_topics/checkouts/detail.txt:19
7579
msgid ""
7580
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7581
"you have the full history locally. As you have a first class branch you "
7582
"can\n"
7583
"also commit locally if you want, for instance due to the temporary loss af "
7584
"a\n"
7585
"network connection. Use the --local option to commit to do this. All the "
7586
"local\n"
7587
"commits will then be made on the master branch the next time you do a non-"
7588
"local\n"
7589
"commit."
7590
msgstr ""
7591
7592
#: dummy/help_topics/checkouts/detail.txt:26
7593
msgid ""
7594
"If you are using a checkout from a shared branch you will periodically want "
7595
"to\n"
7596
"pull in all the changes made by others. This is done using the \"update\"\n"
7597
"command. The changes need to be applied before any non-local commit, but\n"
7598
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7599
"command when needed."
7600
msgstr ""
7601
7602
#: dummy/help_topics/checkouts/detail.txt:32
7603
msgid ""
7604
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7605
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7606
"SVN checkout in that it is not a first class branch, it mainly consists of "
7607
"the\n"
7608
"working tree. This means that any history operations must query the master\n"
7609
"branch, which could be slow if a network connection is involved. Also, as "
7610
"you\n"
7611
"don't have a local branch, then you cannot commit locally."
7612
msgstr ""
7613
7614
#: dummy/help_topics/checkouts/detail.txt:39
7615
msgid ""
7616
"Lightweight checkouts work best when you have fast reliable access to the\n"
7617
"master branch. This means that if the master branch is on the same disk or "
7618
"LAN\n"
7619
"a lightweight checkout will be faster than a heavyweight one for any "
7620
"commands\n"
7621
"that modify the revision history (as only one copy of the branch needs to\n"
7622
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7623
"that uses the history but does not change it, but if the master branch is "
7624
"on\n"
7625
"the same disk then there won't be a noticeable difference."
7626
msgstr ""
7627
7628
#: dummy/help_topics/checkouts/detail.txt:47
7629
msgid ""
7630
"Another possible use for a checkout is to use it with a treeless repository\n"
7631
"containing your branches, where you maintain only one working tree by\n"
7632
"switching the master branch that the checkout points to when you want to\n"
7633
"work on a different branch."
7634
msgstr ""
7635
7636
#: dummy/help_topics/checkouts/detail.txt:52
7637
msgid ""
7638
"Obviously to commit on a checkout you need to be able to write to the "
7639
"master\n"
7640
"branch. This means that the master branch must be accessible over a "
7641
"writeable\n"
7642
"protocol , such as sftp://, and that you have write permissions at the "
7643
"other\n"
7644
"end. Checkouts also work on the local file system, so that all that matters "
7645
"is\n"
7646
"file permissions."
7647
msgstr ""
7648
7649
#: dummy/help_topics/checkouts/detail.txt:58
7650
msgid ""
7651
"You can change the master of a checkout by using the \"switch\" command "
7652
"(see\n"
7653
"\"help switch\"). This will change the location that the commits are sent "
7654
"to.\n"
7655
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7656
"checkout. If you would like to convert your heavy checkout into a normal\n"
7657
"branch so that every commit is local, you can use the \"unbind\" command. To "
7658
"see\n"
7659
"whether or not a branch is bound or not you can use the \"info\" command. If "
7660
"the\n"
7661
"branch is bound it will tell you the location of the bound branch."
7662
msgstr ""
7663
7664
#: dummy/help_topics/checkouts/detail.txt:68
7665
msgid ""
7666
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7667
" checkout\n"
7668
" update Pull any changes in the master branch in to your checkout\n"
7669
" commit Make a commit that is sent to the master branch. If you have\n"
7670
" a heavy checkout then the --local option will commit to the\n"
7671
" checkout without sending the commit to the master\n"
7672
" switch Change the master branch that the commits in the checkout "
7673
"will\n"
7674
" be sent to\n"
7675
" bind Turn a standalone branch into a heavy checkout so that any\n"
7676
" commits will be sent to the master branch\n"
7677
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7678
" commits are only made locally\n"
7679
" info Displays whether a branch is bound or unbound. If the branch "
7680
"is\n"
7681
" bound, then it will also display the location of the bound "
7682
"branch\n"
7683
msgstr ""
7684
7685
#: dummy/help_topics/checkouts/summary.txt:1
7686
msgid "Information on what a checkout is"
7687
msgstr ""
7688
7689
#: dummy/help_topics/commands/summary.txt:1
7690
msgid "Basic help for all commands"
7691
msgstr ""
7692
7693
#: dummy/help_topics/configuration/summary.txt:1
7694
msgid "Details on the configuration settings available"
7695
msgstr ""
7696
7697
#: dummy/help_topics/conflict-types/summary.txt:1
7698
msgid "Types of conflicts and what to do about them"
7699
msgstr ""
7700
7701
#: dummy/help_topics/content-filters/summary.txt:1
7702
msgid "Conversion of content into/from working trees"
7703
msgstr ""
7704
7705
#: dummy/help_topics/criss-cross/detail.txt:1
7706
msgid "Criss-Cross"
7707
msgstr ""
7708
7709
#: dummy/help_topics/criss-cross/detail.txt:3
7710
msgid ""
7711
"A criss-cross in the branch history can cause the default merge technique\n"
7712
"to emit more conflicts than would normally be expected."
7713
msgstr ""
7714
7715
#: dummy/help_topics/criss-cross/detail.txt:6
7716
msgid ""
7717
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7718
"give\n"
7719
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7720
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7721
msgstr ""
7722
7723
#: dummy/help_topics/criss-cross/detail.txt:10
7724
msgid ""
7725
"Criss-crosses occur in a branch's history if two branches merge the same "
7726
"thing\n"
7727
"and then merge one another, or if two branches merge one another at the "
7728
"same\n"
7729
"time. They can be avoided by having each branch only merge from or into a\n"
7730
"designated central branch (a \"star topology\")."
7731
msgstr ""
7732
7733
#: dummy/help_topics/criss-cross/detail.txt:15
7734
msgid ""
7735
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7736
"default\n"
7737
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7738
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7739
"differences between THIS and OTHER are due to one side adding lines, or\n"
7740
"from another side removing lines."
7741
msgstr ""
7742
7743
#: dummy/help_topics/criss-cross/detail.txt:21
7744
msgid ""
7745
"Criss-crosses mean there is no good choice for a base. Selecting the "
7746
"recent\n"
7747
"merge points could cause one side's changes to be silently discarded.\n"
7748
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7749
"are emitted."
7750
msgstr ""
7751
7752
#: dummy/help_topics/criss-cross/detail.txt:26
7753
msgid ""
7754
"The ``weave`` merge type is not affected by this problem because it uses\n"
7755
"line-origin detection instead of a basis revision to determine the cause of\n"
7756
"differences.\n"
7757
msgstr ""
7758
7759
#: dummy/help_topics/criss-cross/summary.txt:1
7760
msgid "Information on criss-cross merging"
7761
msgstr ""
7762
7763
#: dummy/help_topics/current-formats/summary.txt:1
7764
msgid "Current storage formats"
7765
msgstr ""
7766
7767
#: dummy/help_topics/debug-flags/summary.txt:1
7768
msgid "Options to show or record debug information"
7769
msgstr ""
7770
7771
#: dummy/help_topics/diverged-branches/summary.txt:1
7772
msgid "How to fix diverged branches"
7773
msgstr ""
7774
7775
#: dummy/help_topics/env-variables/detail.txt:1
7776
msgid "Environment Variables"
7777
msgstr ""
7778
7779
#: dummy/help_topics/env-variables/detail.txt:3
7780
msgid ""
7781
"=================== "
7782
"===========================================================\n"
7783
"BZRPATH Path where bzr is to look for shell plugin external\n"
7784
" commands.\n"
7785
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7786
"EMAIL E-Mail address of the user.\n"
7787
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7788
"EDITOR Editor for editing commit messages.\n"
7789
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7790
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7791
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7792
"BZR_PLUGIN_PATH.\n"
7793
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7794
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7795
"and\n"
7796
" HOME.\n"
7797
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7798
"URLs).\n"
7799
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7800
"sshcorp,\n"
7801
" plink or lsh.\n"
7802
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7803
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7804
"BZR_COLUMNS Override implicit terminal width.\n"
7805
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7806
"(selftest)\n"
7807
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7808
"'text'.\n"
7809
"BZR_PDB Control whether to launch a debugger on error.\n"
7810
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7811
" breakin debugger.\n"
7812
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7813
"(instead\n"
7814
" of char-based).\n"
7815
"=================== "
7816
"===========================================================\n"
7817
msgstr ""
7818
7819
#: dummy/help_topics/env-variables/summary.txt:1
7820
msgid "Environment variable names and values"
7821
msgstr ""
7822
7823
#: dummy/help_topics/eol/summary.txt:1
7824
msgid "Information on end-of-line handling"
7825
msgstr ""
7826
7827
#: dummy/help_topics/files/detail.txt:1
7828
msgid "Files"
7829
msgstr ""
7830
7831
#: dummy/help_topics/files/detail.txt:3
7832
msgid ""
7833
":On Unix: ~/.bazaar/bazaar.conf\n"
7834
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7835
"bazaar\\\\2.0\\\\bazaar.conf"
7836
msgstr ""
7837
7838
#: dummy/help_topics/files/detail.txt:6
7839
msgid ""
7840
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7841
"used to define general configuration that will be applied everywhere.\n"
7842
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7843
"commonly used options."
7844
msgstr ""
7845
7846
#: dummy/help_topics/files/detail.txt:11
7847
msgid "A typical config file might look something like::"
7848
msgstr ""
7849
7850
#: dummy/help_topics/files/detail.txt:13
7851
msgid ""
7852
" [DEFAULT]\n"
7853
" email=John Doe <jdoe@isp.com>"
7854
msgstr ""
7855
7856
#: dummy/help_topics/files/detail.txt:16
7857
msgid ""
7858
" [ALIASES]\n"
7859
" commit = commit --strict\n"
7860
" log10 = log --short -r -10..-1\n"
7861
msgstr ""
7862
7863
#: dummy/help_topics/files/summary.txt:1
7864
msgid "Information on configuration and log files"
7865
msgstr ""
7866
7867
#: dummy/help_topics/formats/detail.txt:1
7868
msgid "Storage Formats"
7869
msgstr ""
7870
7871
#: dummy/help_topics/formats/detail.txt:3
7872
msgid ""
7873
"To ensure that older clients do not access data incorrectly,\n"
7874
"Bazaar's policy is to introduce a new storage format whenever\n"
7875
"new features requiring new metadata are added. New storage\n"
7876
"formats may also be introduced to improve performance and\n"
7877
"scalability."
7878
msgstr ""
7879
7880
#: dummy/help_topics/formats/detail.txt:9
7881
msgid ""
7882
"The newest format, 2a, is highly recommended. If your\n"
7883
"project is not using 2a, then you should suggest to the\n"
7884
"project owner to upgrade."
7885
msgstr ""
7886
7887
#: dummy/help_topics/formats/detail.txt:13
7888
msgid ""
7889
"\n"
7890
".. note::"
7891
msgstr ""
7892
7893
#: dummy/help_topics/formats/detail.txt:16
7894
msgid ""
7895
" Some of the older formats have two variants:\n"
7896
" a plain one and a rich-root one. The latter include an additional\n"
7897
" field about the root of the tree. There is no performance cost\n"
7898
" for using a rich-root format but you cannot easily merge changes\n"
7899
" from a rich-root format into a plain format. As a consequence,\n"
7900
" moving a project to a rich-root format takes some co-ordination\n"
7901
" in that all contributors need to upgrade their repositories\n"
7902
" around the same time. 2a and all future formats will be\n"
7903
" implicitly rich-root."
7904
msgstr ""
7905
7906
#: dummy/help_topics/formats/detail.txt:26
7907
msgid ""
7908
"See :doc:`current-formats-help` for the complete list of\n"
7909
"currently supported formats. See :doc:`other-formats-help` for\n"
7910
"descriptions of any available experimental and deprecated formats.\n"
7911
msgstr ""
7912
7913
#: dummy/help_topics/formats/summary.txt:1
7914
msgid "Information on choosing a storage format"
7915
msgstr ""
7916
7917
#: dummy/help_topics/global-options/detail.txt:1
7918
msgid "Global Options"
7919
msgstr ""
7920
7921
#: dummy/help_topics/global-options/detail.txt:3
7922
msgid ""
7923
"These options may be used with any command, and may appear in front of any\n"
7924
"command. (e.g. ``bzr --profile help``)."
7925
msgstr ""
7926
7927
#: dummy/help_topics/global-options/detail.txt:6
7928
msgid ""
7929
"--version Print the version number. Must be supplied before the "
7930
"command.\n"
7931
"--no-aliases Do not process command aliases when running this command.\n"
7932
"--builtin Use the built-in version of a command, not the plugin "
7933
"version.\n"
7934
" This does not suppress other plugin effects.\n"
7935
"--no-plugins Do not process any plugins.\n"
7936
"--no-l10n Do not translate messages.\n"
7937
"--concurrency Number of processes that can be run concurrently (selftest)."
7938
msgstr ""
7939
7940
#: dummy/help_topics/global-options/detail.txt:14
7941
msgid ""
7942
"--profile Profile execution using the hotshot profiler.\n"
7943
"--lsprof Profile execution using the lsprof profiler.\n"
7944
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7945
" results to a specified file. If the filename ends with "
7946
"\".txt\",\n"
7947
" text format will be used. If the filename either starts "
7948
"with\n"
7949
" \"callgrind.out\" or end with \".callgrind\", the output will "
7950
"be\n"
7951
" formatted for use with KCacheGrind. Otherwise, the output\n"
7952
" will be a pickle.\n"
7953
"--coverage Generate line coverage report in the specified directory."
7954
msgstr ""
7955
7956
#: dummy/help_topics/global-options/detail.txt:24
7957
msgid ""
7958
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7959
"for\n"
7960
" the duration of the command. This can be used multiple times "
7961
"if\n"
7962
" several options need to be overridden."
7963
msgstr ""
7964
7965
#: dummy/help_topics/global-options/detail.txt:28
7966
msgid ""
7967
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7968
"information on profiling."
7969
msgstr ""
7970
7971
#: dummy/help_topics/global-options/detail.txt:31
7972
msgid ""
7973
"A number of debug flags are also available to assist troubleshooting and\n"
7974
"development. See :doc:`debug-flags-help`.\n"
7975
msgstr ""
7976
7977
#: dummy/help_topics/global-options/summary.txt:1
7978
msgid "Options that control how Bazaar runs"
7979
msgstr ""
7980
7981
#: dummy/help_topics/hidden-commands/summary.txt:1
7982
msgid "All hidden commands"
7983
msgstr ""
7984
7985
#: dummy/help_topics/hooks/summary.txt:1
7986
msgid "Points at which custom processing can be added"
7987
msgstr ""
7988
7989
#: dummy/help_topics/launchpad/detail.txt:1
7990
msgid "Integration with Launchpad.net"
7991
msgstr ""
7992
7993
#: dummy/help_topics/launchpad/detail.txt:3
7994
msgid ""
7995
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
7996
"specification tracking."
7997
msgstr ""
7998
7999
#: dummy/help_topics/launchpad/detail.txt:6
8000
msgid ""
8001
"The bzr client (through the plugin called 'launchpad') has special\n"
8002
"features to communicate with Launchpad:"
8003
msgstr ""
8004
8005
#: dummy/help_topics/launchpad/detail.txt:9
8006
msgid ""
8007
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8008
"This\n"
8009
" is then used by the 'lp:' transport to download your branches using\n"
8010
" bzr+ssh://."
8011
msgstr ""
8012
8013
#: dummy/help_topics/launchpad/detail.txt:13
8014
msgid ""
8015
" * The 'lp:' transport uses Launchpad as a directory service: for "
8016
"example\n"
8017
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8018
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8019
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8020
msgstr ""
8021
8022
#: dummy/help_topics/launchpad/detail.txt:18
8023
msgid ""
8024
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8025
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8026
"lp:12345'\n"
8027
" will record a revision property that marks that revision as fixing\n"
8028
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8029
" automatically be linked to the bug report."
8030
msgstr ""
8031
8032
#: dummy/help_topics/launchpad/detail.txt:24
8033
msgid ""
8034
" * The register-branch command tells Launchpad about the url of a\n"
8035
" public branch. Launchpad will then mirror the branch, display\n"
8036
" its contents and allow it to be attached to bugs and other\n"
8037
" objects."
8038
msgstr ""
8039
8040
#: dummy/help_topics/launchpad/detail.txt:29
8041
msgid "For more information see http://help.launchpad.net/\n"
8042
msgstr ""
8043
8044
#: dummy/help_topics/launchpad/summary.txt:1
8045
msgid "Using Bazaar with Launchpad.net"
8046
msgstr ""
8047
8048
#: dummy/help_topics/location-alias/summary.txt:1
8049
msgid "Aliases for remembered locations"
8050
msgstr ""
8051
8052
#: dummy/help_topics/log-formats/summary.txt:1
8053
msgid "Details on the logging formats available"
8054
msgstr ""
8055
8056
#: dummy/help_topics/other-formats/summary.txt:1
8057
msgid "Experimental and deprecated storage formats"
8058
msgstr ""
8059
8060
#: dummy/help_topics/patterns/summary.txt:1
8061
msgid "Information on the pattern syntax"
8062
msgstr ""
8063
8064
#: dummy/help_topics/repositories/detail.txt:1
8065
msgid "Repositories"
8066
msgstr ""
8067
8068
#: dummy/help_topics/repositories/detail.txt:3
8069
msgid ""
8070
"Repositories in Bazaar are where committed information is stored. There is\n"
8071
"a repository associated with every branch."
8072
msgstr ""
8073
8074
#: dummy/help_topics/repositories/detail.txt:6
8075
msgid ""
8076
"Repositories are a form of database. Bzr will usually maintain this for\n"
8077
"good performance automatically, but in some situations (e.g. when doing\n"
8078
"very many commits in a short time period) you may want to ask bzr to\n"
8079
"optimise the database indices. This can be done by the 'bzr pack' command."
8080
msgstr ""
8081
8082
#: dummy/help_topics/repositories/detail.txt:11
8083
msgid ""
8084
"By default just running 'bzr init' will create a repository within the new\n"
8085
"branch but it is possible to create a shared repository which allows "
8086
"multiple\n"
8087
"branches to share their information in the same location. When a new branch "
8088
"is\n"
8089
"created it will first look to see if there is a containing shared repository "
8090
"it\n"
8091
"can use."
8092
msgstr ""
8093
8094
#: dummy/help_topics/repositories/detail.txt:17
8095
msgid ""
8096
"When two branches of the same project share a repository, there is\n"
8097
"generally a large space saving. For some operations (e.g. branching\n"
8098
"within the repository) this translates in to a large time saving."
8099
msgstr ""
8100
8101
#: dummy/help_topics/repositories/detail.txt:21
8102
msgid ""
8103
"To create a shared repository use the init-repository command (or the alias\n"
8104
"init-repo). This command takes the location of the repository to create. "
8105
"This\n"
8106
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8107
"which contains a shared repository. Any new branches that are created in "
8108
"this\n"
8109
"directory will then use it for storage."
8110
msgstr ""
8111
8112
#: dummy/help_topics/repositories/detail.txt:27
8113
msgid ""
8114
"It is a good idea to create a repository whenever you might create more\n"
8115
"than one branch of a project. This is true for both working areas where you\n"
8116
"are doing the development, and any server areas that you use for hosting\n"
8117
"projects. In the latter case, it is common to want branches without working\n"
8118
"trees. Since the files in the branch will not be edited directly there is "
8119
"no\n"
8120
"need to use up disk space for a working tree. To create a repository in "
8121
"which\n"
8122
"the branches will not have working trees pass the '--no-trees' option to\n"
8123
"'init-repository'."
8124
msgstr ""
8125
8126
#: dummy/help_topics/repositories/detail.txt:38
8127
msgid ""
8128
" init-repository Create a shared repository. Use --no-trees to create "
8129
"one\n"
8130
" in which new branches won't get a working tree.\n"
8131
msgstr ""
8132
8133
#: dummy/help_topics/repositories/summary.txt:1
8134
msgid "Basic information on shared repositories."
8135
msgstr ""
8136
8137
#: dummy/help_topics/revisionspec/summary.txt:1
8138
msgid "Explain how to use --revision"
8139
msgstr ""
8140
8141
#: dummy/help_topics/rules/summary.txt:1
8142
msgid "Information on defining rule-based preferences"
8143
msgstr ""
8144
8145
#: dummy/help_topics/standalone-trees/detail.txt:1
8146
msgid "Standalone Trees"
8147
msgstr ""
8148
8149
#: dummy/help_topics/standalone-trees/detail.txt:3
8150
msgid ""
8151
"A standalone tree is a working tree with an associated repository. It\n"
8152
"is an independently usable branch, with no dependencies on any other.\n"
8153
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8154
"an existing project under version control."
8155
msgstr ""
8156
8157
#: dummy/help_topics/standalone-trees/detail.txt:8
8158
msgid "Related Commands::"
8159
msgstr ""
8160
8161
#: dummy/help_topics/standalone-trees/detail.txt:10
8162
msgid " init Make a directory into a versioned branch.\n"
8163
msgstr ""
8164
8165
#: dummy/help_topics/standalone-trees/summary.txt:1
8166
msgid "Information on what a standalone tree is"
8167
msgstr ""
8168
8169
#: dummy/help_topics/standard-options/detail.txt:1
8170
msgid "Standard Options"
8171
msgstr ""
8172
8173
#: dummy/help_topics/standard-options/detail.txt:3
8174
msgid "Standard options are legal for all commands."
8175
msgstr ""
8176
8177
#: dummy/help_topics/standard-options/detail.txt:5
8178
msgid ""
8179
"--help, -h Show help message.\n"
8180
"--verbose, -v Display more information.\n"
8181
"--quiet, -q Only display errors and warnings."
8182
msgstr ""
8183
8184
#: dummy/help_topics/standard-options/detail.txt:9
8185
msgid "Unlike global options, standard options can be used in aliases.\n"
8186
msgstr ""
8187
8188
#: dummy/help_topics/standard-options/summary.txt:1
8189
msgid "Options that can be used with any command"
8190
msgstr ""
8191
8192
#: dummy/help_topics/status-flags/detail.txt:1
8193
msgid "Status Flags"
8194
msgstr ""
8195
8196
#: dummy/help_topics/status-flags/detail.txt:3
8197
msgid ""
8198
"Status flags are used to summarise changes to the working tree in a concise\n"
8199
"manner. They are in the form::"
8200
msgstr ""
8201
8202
#: dummy/help_topics/status-flags/detail.txt:6
8203
msgid " xxx <filename>"
8204
msgstr ""
8205
8206
#: dummy/help_topics/status-flags/detail.txt:8
8207
msgid "where the columns' meanings are as follows."
8208
msgstr ""
8209
8210
#: dummy/help_topics/status-flags/detail.txt:10
8211
msgid "Column 1 - versioning/renames::"
8212
msgstr ""
8213
8214
#: dummy/help_topics/status-flags/detail.txt:12
8215
msgid ""
8216
" + File versioned\n"
8217
" - File unversioned\n"
8218
" R File renamed\n"
8219
" ? File unknown\n"
8220
" X File nonexistent (and unknown to bzr)\n"
8221
" C File has conflicts\n"
8222
" P Entry for a pending merge (not a file)"
8223
msgstr ""
8224
8225
#: dummy/help_topics/status-flags/detail.txt:20
8226
msgid "Column 2 - contents::"
8227
msgstr ""
8228
8229
#: dummy/help_topics/status-flags/detail.txt:22
8230
msgid ""
8231
" N File created\n"
8232
" D File deleted\n"
8233
" K File kind changed\n"
8234
" M File modified"
8235
msgstr ""
8236
8237
#: dummy/help_topics/status-flags/detail.txt:27
8238
msgid "Column 3 - execute::"
8239
msgstr ""
8240
8241
#: dummy/help_topics/status-flags/detail.txt:29
8242
msgid " * The execute bit was changed\n"
8243
msgstr ""
8244
8245
#: dummy/help_topics/status-flags/summary.txt:1
8246
msgid "Help on status flags"
8247
msgstr ""
8248
8249
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8250
msgid "Branches Out of Sync"
8251
msgstr ""
8252
8253
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8254
msgid ""
8255
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8256
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8257
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8258
"have the same last revision as the new reference branch for the lightweight\n"
8259
"checkout, data could be lost, so Bazaar refuses."
8260
msgstr ""
8261
8262
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8263
msgid "How you deal with this depends on *why* the branches are out of sync."
8264
msgstr ""
8265
8266
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8267
msgid ""
8268
"If you have a checkout and have done local commits, you can get back in "
8269
"sync\n"
8270
"by running \"bzr update\" (and possibly \"bzr commit\")."
8271
msgstr ""
8272
8273
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8274
msgid ""
8275
"If you have a branch and the remote branch is out-of-date, you can push\n"
8276
"the local changes using \"bzr push\". If the local branch is out of date, "
8277
"you\n"
8278
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8279
"commit\n"
8280
"and then push your changes. If you decide that some of the changes aren't\n"
8281
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8282
msgstr ""
8283
8284
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8285
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8286
msgstr ""
8287
8288
#: dummy/help_topics/topics/summary.txt:1
8289
msgid "Topics list"
8290
msgstr ""
8291
8292
#: dummy/help_topics/url-special-chars/summary.txt:1
8293
msgid "Special character handling in URLs"
8294
msgstr ""
8295
8296
#: dummy/help_topics/urlspec/summary.txt:1
8297
msgid "Supported transport protocols"
8298
msgstr ""
8299
8300
#: dummy/help_topics/working-trees/detail.txt:1
8301
msgid "Working Trees"
8302
msgstr ""
8303
8304
#: dummy/help_topics/working-trees/detail.txt:3
8305
msgid ""
8306
"A working tree is the contents of a branch placed on disk so that you can\n"
8307
"see the files and edit them. The working tree is where you make changes to "
8308
"a\n"
8309
"branch, and when you commit the current state of the working tree is the\n"
8310
"snapshot that is recorded in the commit."
8311
msgstr ""
8312
8313
#: dummy/help_topics/working-trees/detail.txt:8
8314
msgid ""
8315
"When you push a branch to a remote system, a working tree will not be\n"
8316
"created. If one is already present the files will not be updated. The\n"
8317
"branch information will be updated and the working tree will be marked\n"
8318
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8319
"may be uncommitted changes or the update may cause content conflicts that "
8320
"are\n"
8321
"difficult to deal with remotely."
8322
msgstr ""
8323
8324
#: dummy/help_topics/working-trees/detail.txt:15
8325
msgid ""
8326
"If you have a branch with no working tree you can use the 'checkout' "
8327
"command\n"
8328
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8329
"will\n"
8330
"create the working tree. If the branch is updated remotely, you can update "
8331
"the\n"
8332
"working tree by running 'bzr update' in that directory."
8333
msgstr ""
8334
8335
#: dummy/help_topics/working-trees/detail.txt:20
8336
msgid ""
8337
"If you have a branch with a working tree that you do not want the 'remove-"
8338
"tree'\n"
8339
"command will remove the tree if it is safe. This can be done to avoid the\n"
8340
"warning about the remote working tree not being updated when pushing to the\n"
8341
"branch. It can also be useful when working with a '--no-trees' repository\n"
8342
"(see 'bzr help repositories')."
8343
msgstr ""
8344
8345
#: dummy/help_topics/working-trees/detail.txt:26
8346
msgid ""
8347
"If you want to have a working tree on a remote machine that you push to you\n"
8348
"can either run 'bzr update' in the remote branch after each push, or use "
8349
"some\n"
8350
"other method to update the tree during the push. There is an 'rspush' "
8351
"plugin\n"
8352
"that will update the working tree using rsync as well as doing a push. "
8353
"There\n"
8354
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8355
"SSH\n"
8356
"after each push."
8357
msgstr ""
8358
8359
#: dummy/help_topics/working-trees/detail.txt:33
8360
msgid "Useful commands::"
8361
msgstr ""
8362
8363
#: dummy/help_topics/working-trees/detail.txt:35
8364
msgid ""
8365
" checkout Create a working tree when a branch does not have one.\n"
8366
" remove-tree Removes the working tree from a branch when it is safe to do "
8367
"so.\n"
8368
" update When a working tree is out of sync with its associated "
8369
"branch\n"
8370
" this will update the tree to match the branch.\n"
8371
msgstr ""
8372
8373
#: dummy/help_topics/working-trees/summary.txt:1
8374
msgid "Information on working trees"
8375
msgstr ""
8376
8377
#: en/help_topics/authentication.txt:1
8378
msgid ""
8379
"Authentication Settings\n"
8380
"======================="
8381
msgstr ""
8382
8383
#: en/help_topics/authentication.txt:4
8384
msgid ""
8385
"\n"
8386
"Intent\n"
8387
"------"
8388
msgstr ""
8389
8390
#: en/help_topics/authentication.txt:8
8391
msgid ""
8392
"Many different authentication policies can be described in the\n"
8393
"``authentication.conf`` file but a particular user should need only a few\n"
8394
"definitions to cover his needs without having to specify a user and a "
8395
"password\n"
8396
"for every branch he uses."
8397
msgstr ""
8398
8399
#: en/help_topics/authentication.txt:13
8400
msgid ""
8401
"The definitions found in this file are used to find the credentials to use "
8402
"for\n"
8403
"a given url. The same credentials can generally be used for as many branches "
8404
"as\n"
8405
"possible by grouping their declaration around the remote servers that need\n"
8406
"them. It's even possible to declare credentials that will be used by "
8407
"different\n"
8408
"servers."
8409
msgstr ""
8410
8411
#: en/help_topics/authentication.txt:19
8412
msgid ""
8413
"The intent is to make this file as small as possible to minimize maintenance."
8414
msgstr ""
8415
8416
#: en/help_topics/authentication.txt:21
8417
msgid ""
8418
"Once the relevant credentials are declared in this file you may use branch "
8419
"urls\n"
8420
"without embedding passwords (security hazard) or even users (enabling "
8421
"sharing\n"
8422
"of your urls with others)."
8423
msgstr ""
8424
8425
#: en/help_topics/authentication.txt:25
8426
msgid "Instead of using::"
8427
msgstr ""
8428
8429
#: en/help_topics/authentication.txt:27
8430
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8431
msgstr ""
8432
8433
#: en/help_topics/authentication.txt:29
8434
msgid "you simply use::"
8435
msgstr ""
8436
8437
#: en/help_topics/authentication.txt:31
8438
msgid " bzr branch ftp://host.com/path/to/my/branch"
8439
msgstr ""
8440
8441
#: en/help_topics/authentication.txt:33
8442
msgid ""
8443
"provided you have created the following ``authentication.conf`` file::"
8444
msgstr ""
8445
8446
#: en/help_topics/authentication.txt:35
8447
msgid ""
8448
" [myprojects]\n"
8449
" scheme=ftp\n"
8450
" host=host.com\n"
8451
" user=joe\n"
8452
" password=secret\n"
8453
" "
8454
msgstr ""
8455
8456
#: en/help_topics/authentication.txt:42
8457
msgid ""
8458
"Authentication definitions\n"
8459
"--------------------------"
8460
msgstr ""
8461
8462
#: en/help_topics/authentication.txt:45
8463
msgid ""
8464
"There are two kinds of authentication used by the various schemes supported "
8465
"by\n"
8466
"bzr:"
8467
msgstr ""
8468
8469
#: en/help_topics/authentication.txt:48
8470
msgid "1. user and password"
8471
msgstr ""
8472
8473
#: en/help_topics/authentication.txt:50
8474
msgid ""
8475
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8476
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8477
"ssh agents are a better, more secure solution. So we have chosen to not "
8478
"provide\n"
8479
"our own less secure method."
8480
msgstr ""
8481
8482
#: en/help_topics/authentication.txt:55
8483
msgid "2. user, realm and password"
8484
msgstr ""
8485
8486
#: en/help_topics/authentication.txt:57
8487
msgid ""
8488
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8489
"against a host. But, by using ``.htaccess`` files, for example, it is "
8490
"possible\n"
8491
"to define several (``user, realm, password``) for a given ``host``. So what "
8492
"is\n"
8493
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8494
"is\n"
8495
"not taken into account in the definitions, but will displayed if bzr "
8496
"prompts\n"
8497
"you for a password."
8498
msgstr ""
8499
8500
#: en/help_topics/authentication.txt:64
8501
msgid ""
8502
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8503
"specifying the appropriate port."
8504
msgstr ""
8505
8506
#: en/help_topics/authentication.txt:67
8507
msgid ""
8508
"To take all schemes into account, the password will be deduced from a set "
8509
"of\n"
8510
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8511
"``user``,\n"
8512
"``password``)."
8513
msgstr ""
8514
8515
#: en/help_topics/authentication.txt:71
8516
msgid ""
8517
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8518
"used\n"
8519
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8520
"``ssh``\n"
8521
" should be used instead since this is the real scheme regarding\n"
8522
" authentication,"
8523
msgstr ""
8524
8525
#: en/help_topics/authentication.txt:76
8526
msgid " * ``host``: can be empty (to act as a default for any host),"
8527
msgstr ""
8528
8529
#: en/help_topics/authentication.txt:78
8530
msgid ""
8531
" * ``port`` can be empty (useful when an host provides several servers for "
8532
"the\n"
8533
" same scheme), only numerical values are allowed, this should be used "
8534
"only\n"
8535
" when the server uses a port different than the scheme standard port,"
8536
msgstr ""
8537
8538
#: en/help_topics/authentication.txt:82
8539
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8540
msgstr ""
8541
8542
#: en/help_topics/authentication.txt:84
8543
msgid ""
8544
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8545
" ``getpass.get_user()``),"
8546
msgstr ""
8547
8548
#: en/help_topics/authentication.txt:87
8549
msgid ""
8550
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8551
" password."
8552
msgstr ""
8553
8554
#: en/help_topics/authentication.txt:90
8555
msgid ""
8556
"Multiple definitions can be provided and, for a given URL, bzr will select "
8557
"a\n"
8558
"(``user`` [, ``password``]) based on the following rules :"
8559
msgstr ""
8560
8561
#: en/help_topics/authentication.txt:93
8562
msgid " 1. the first match wins,"
8563
msgstr ""
8564
8565
#: en/help_topics/authentication.txt:95
8566
msgid " 2. empty fields match everything,"
8567
msgstr ""
8568
8569
#: en/help_topics/authentication.txt:97
8570
msgid ""
8571
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8572
msgstr ""
8573
8574
#: en/help_topics/authentication.txt:99
8575
msgid ""
8576
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8577
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8578
"``projectbzr.sf.net``\n"
8579
" will not match ``bzr.sf.net``)."
8580
msgstr ""
8581
8582
#: en/help_topics/authentication.txt:103
8583
msgid ""
8584
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8585
msgstr ""
8586
8587
#: en/help_topics/authentication.txt:105
8588
msgid ""
8589
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8590
"above,\n"
8591
" empty paths will match any provided path)."
8592
msgstr ""
8593
8594
#: en/help_topics/authentication.txt:110
8595
msgid ""
8596
"File format\n"
8597
"-----------"
8598
msgstr ""
8599
8600
#: en/help_topics/authentication.txt:113
8601
msgid ""
8602
"The general rules for :doc:`configuration files <configuration-help>`\n"
8603
"apply except for the variable policies."
8604
msgstr ""
8605
8606
#: en/help_topics/authentication.txt:116
8607
msgid "Each section describes an authentication definition."
8608
msgstr ""
8609
8610
#: en/help_topics/authentication.txt:118
8611
msgid ""
8612
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8613
"reserved\n"
8614
"and should appear as the *last* section."
8615
msgstr ""
8616
8617
#: en/help_topics/authentication.txt:121
8618
msgid "Each section should define:"
8619
msgstr ""
8620
8621
#: en/help_topics/authentication.txt:123
8622
msgid "* ``user``: the login to be used,"
8623
msgstr ""
8624
8625
#: en/help_topics/authentication.txt:125
8626
msgid "Each section could define:"
8627
msgstr ""
8628
8629
#: en/help_topics/authentication.txt:127
8630
msgid "* ``host``: the remote server,"
8631
msgstr ""
8632
8633
#: en/help_topics/authentication.txt:129
8634
msgid "* ``port``: the port the server is listening,"
8635
msgstr ""
8636
8637
#: en/help_topics/authentication.txt:131
8638
msgid "* ``path``: the branch location,"
8639
msgstr ""
8640
8641
#: en/help_topics/authentication.txt:133
8642
msgid "* ``password``: the password."
8643
msgstr ""
8644
8645
#: en/help_topics/authentication.txt:135
8646
msgid ""
8647
"\n"
8648
"Examples\n"
8649
"--------"
8650
msgstr ""
8651
8652
#: en/help_topics/authentication.txt:139
8653
msgid ""
8654
"\n"
8655
"Personal projects hosted outside\n"
8656
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8657
msgstr ""
8658
8659
#: en/help_topics/authentication.txt:143
8660
msgid ""
8661
"All connections are done with the same ``user`` (the remote one for which "
8662
"the\n"
8663
"default bzr one is not appropriate) and the password is always prompted "
8664
"with\n"
8665
"some exceptions::"
8666
msgstr ""
8667
8668
#: en/help_topics/authentication.txt:147
8669
msgid ""
8670
" # Pet projects on hobby.net\n"
8671
" [hobby]\n"
8672
" host=r.hobby.net\n"
8673
" user=jim\n"
8674
" password=obvious1234\n"
8675
" \n"
8676
" # Home server\n"
8677
" [home]\n"
8678
" scheme=https\n"
8679
" host=home.net\n"
8680
" user=joe\n"
8681
" password=1essobV10us\n"
8682
" \n"
8683
" [DEFAULT]\n"
8684
" # Our local user is barbaz, on all remote sites we're known as "
8685
"foobar\n"
8686
" user=foobar"
8687
msgstr ""
8688
8689
#: en/help_topics/authentication.txt:164
8690
msgid ""
8691
"\n"
8692
"Source hosting provider\n"
8693
"~~~~~~~~~~~~~~~~~~~~~~~"
8694
msgstr ""
8695
8696
#: en/help_topics/authentication.txt:168
8697
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8698
msgstr ""
8699
8700
#: en/help_topics/authentication.txt:170
8701
msgid ""
8702
" [shpnet domain]\n"
8703
" # we use sftp, but ssh is the scheme used for authentication\n"
8704
" scheme=ssh\n"
8705
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8706
" host=.shp.net\n"
8707
" user=joe\n"
8708
" # bzr don't support supplying a password for sftp,\n"
8709
" # consider using an ssh agent if you don't want to supply\n"
8710
" # a password interactively. (pageant, ssh-agent, etc)"
8711
msgstr ""
8712
8713
#: en/help_topics/authentication.txt:180
8714
msgid ""
8715
"HTTPS, SFTP servers and their proxy\n"
8716
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8717
msgstr ""
8718
8719
#: en/help_topics/authentication.txt:183
8720
msgid ""
8721
"At company.com, the server hosting release and integration branches is "
8722
"behind a\n"
8723
"proxy, and the two branches use different authentication policies::"
8724
msgstr ""
8725
8726
#: en/help_topics/authentication.txt:186
8727
msgid ""
8728
" [reference code]\n"
8729
" scheme=https\n"
8730
" host=dev.company.com\n"
8731
" path=/dev\n"
8732
" user=user1\n"
8733
" password=pass1"
8734
msgstr ""
8735
8736
#: en/help_topics/authentication.txt:193
8737
msgid ""
8738
" # development branches on dev server\n"
8739
" [dev]\n"
8740
" scheme=ssh # bzr+ssh and sftp are available here\n"
8741
" host=dev.company.com\n"
8742
" path=/dev/integration\n"
8743
" user=user2\n"
8744
" \n"
8745
" # proxy\n"
8746
" [proxy]\n"
8747
" scheme=http\n"
8748
" host=proxy.company.com\n"
8749
" port=3128\n"
8750
" user=proxyuser1\n"
8751
" password=proxypass1"
8752
msgstr ""
8753
8754
#: en/help_topics/authentication.txt:208
8755
msgid ""
8756
"\n"
8757
"Planned enhancements\n"
8758
"--------------------"
8759
msgstr ""
8760
8761
#: en/help_topics/authentication.txt:212
8762
msgid ""
8763
"The following are not yet implemented but planned as parts of a work in\n"
8764
"progress:"
8765
msgstr ""
8766
8767
#: en/help_topics/authentication.txt:215
8768
msgid "* add a ``password_encoding`` field allowing:"
8769
msgstr ""
8770
8771
#: en/help_topics/authentication.txt:217
8772
msgid ""
8773
" - storing the passwords in various obfuscating encodings (base64 for one),"
8774
msgstr ""
8775
8776
#: en/help_topics/authentication.txt:219
8777
msgid " - delegate password storage to plugins (.netrc for example)."
8778
msgstr ""
8779
8780
#: en/help_topics/authentication.txt:221
8781
msgid ""
8782
"* update the credentials when the user is prompted for user or password,"
8783
msgstr ""
8784
8785
#: en/help_topics/authentication.txt:223
8786
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8787
msgstr ""
8788
8789
#: en/help_topics/authentication.txt:225
8790
msgid ""
8791
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8792
"but\n"
8793
"ignored in the actual implementation.\n"
8794
msgstr ""
8795
8796
#: en/help_topics/bugs.txt:1
8797
msgid "Bug Tracker Settings"
8798
msgstr ""
8799
8800
#: en/help_topics/bugs.txt:3
8801
msgid ""
8802
"When making a commit, metadata about bugs fixed by that change can be\n"
8803
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8804
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8805
"(The only ``status`` value currently supported is ``fixed.``)"
8806
msgstr ""
8807
8808
#: en/help_topics/bugs.txt:8
8809
msgid ""
8810
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8811
"identifier\n"
8812
"rather than a full URL. This looks like::"
8813
msgstr ""
8814
8815
#: en/help_topics/bugs.txt:11
8816
msgid " bzr commit --fixes <tracker>:<id>"
8817
msgstr ""
8818
8819
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8820
msgid "or::"
8821
msgstr ""
8822
8823
#: en/help_topics/bugs.txt:15
8824
msgid " bzr commit --fixes <id>"
8825
msgstr ""
8826
8827
#: en/help_topics/bugs.txt:17
8828
msgid ""
8829
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8830
"the\n"
8831
"identifier for that bug within the bugtracker, usually the bug number.\n"
8832
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8833
"or global configuration is used."
8834
msgstr ""
8835
8836
#: en/help_topics/bugs.txt:22
8837
msgid ""
8838
"Bazaar knows about a few bug trackers that have many users. If\n"
8839
"you use one of these bug trackers then there is no setup required to\n"
8840
"use this feature, you just need to know the tracker identifier to use.\n"
8841
"These are the bugtrackers that are built in:"
8842
msgstr ""
8843
8844
#: en/help_topics/bugs.txt:27
8845
msgid ""
8846
" ============================ ============ ============\n"
8847
" URL Abbreviation Example\n"
8848
" ============================ ============ ============\n"
8849
" https://bugs.launchpad.net/ lp lp:12345\n"
8850
" http://bugs.debian.org/ deb deb:12345\n"
8851
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8852
" ============================ ============ ============"
8853
msgstr ""
8854
8855
#: en/help_topics/bugs.txt:35
8856
msgid ""
8857
"For the bug trackers not listed above configuration is required.\n"
8858
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8859
"is built in, along with a template mechanism for other bugtrackers with\n"
8860
"simple URL schemes. If your bug tracker can't be described by one\n"
8861
"of the schemes described below then you can write a plugin to support\n"
8862
"it."
8863
msgstr ""
8864
8865
#: en/help_topics/bugs.txt:42
8866
msgid ""
8867
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8868
"variable which contains the base URL of the bug tracker. These options\n"
8869
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8870
"configuration section in ``locations.conf``. You can set up these values\n"
8871
"for each of the projects you work on."
8872
msgstr ""
8873
8874
#: en/help_topics/bugs.txt:48
8875
msgid ""
8876
"Note: As you provide a short name for each tracker, you can specify one or\n"
8877
"more bugs in one or more trackers at commit time if you wish."
8878
msgstr ""
8879
8880
#: en/help_topics/bugs.txt:51
8881
msgid ""
8882
"Launchpad\n"
8883
"---------"
8884
msgstr ""
8885
8886
#: en/help_topics/bugs.txt:54
8887
msgid ""
8888
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8889
msgstr ""
8890
8891
#: en/help_topics/bugs.txt:56
8892
msgid ""
8893
"bugzilla_<tracker>_url\n"
8894
"----------------------"
8895
msgstr ""
8896
8897
#: en/help_topics/bugs.txt:59
8898
msgid ""
8899
"If present, the location of the Bugzilla bug tracker referred to by\n"
8900
"<tracker>. This option can then be used together with ``bzr commit\n"
8901
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8902
"example::"
8903
msgstr ""
8904
8905
#: en/help_topics/bugs.txt:64
8906
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8907
msgstr ""
8908
8909
#: en/help_topics/bugs.txt:66
8910
msgid ""
8911
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8912
"fixed."
8913
msgstr ""
8914
8915
#: en/help_topics/bugs.txt:69
8916
msgid ""
8917
"trac_<tracker>_url\n"
8918
"------------------"
8919
msgstr ""
8920
8921
#: en/help_topics/bugs.txt:72
8922
msgid ""
8923
"If present, the location of the Trac instance referred to by\n"
8924
"<tracker>. This option can then be used together with ``bzr commit\n"
8925
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8926
"example::"
8927
msgstr ""
8928
8929
#: en/help_topics/bugs.txt:77
8930
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8931
msgstr ""
8932
8933
#: en/help_topics/bugs.txt:79
8934
msgid ""
8935
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8936
"as\n"
8937
"fixed."
8938
msgstr ""
8939
8940
#: en/help_topics/bugs.txt:82
8941
msgid ""
8942
"bugtracker_<tracker>_url\n"
8943
"------------------------"
8944
msgstr ""
8945
8946
#: en/help_topics/bugs.txt:85
8947
msgid ""
8948
"If present, the location of a generic bug tracker instance referred to by\n"
8949
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8950
"which will be replaced by a specific bug ID. This option can then be used\n"
8951
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8952
"fixed by that commit. For example::"
8953
msgstr ""
8954
8955
#: en/help_topics/bugs.txt:91
8956
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8957
msgstr ""
8958
8959
#: en/help_topics/bugs.txt:93
8960
msgid ""
8961
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8962
"Roundup bug tracker as fixed, or::"
8963
msgstr ""
8964
8965
#: en/help_topics/bugs.txt:96
8966
msgid ""
8967
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8968
msgstr ""
8969
8970
#: en/help_topics/bugs.txt:98
8971
msgid ""
8972
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8973
"RT bug tracker as fixed, or::"
8974
msgstr ""
8975
8976
#: en/help_topics/bugs.txt:101
8977
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8978
msgstr ""
8979
8980
#: en/help_topics/bugs.txt:103
8981
msgid ""
8982
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8983
"1234\n"
8984
"in Hudson's JIRA bug tracker as fixed.\n"
8985
msgstr ""
8986
8987
#: en/help_topics/commands.txt:1
8988
msgid ""
8989
"add Add specified files or directories.\n"
8990
"alias Set/unset and display aliases.\n"
8991
"annotate Show the origin of each line in a file.\n"
8992
"bash-completion Generate a shell function for bash command line "
8993
"completion.\n"
8994
" [bash_completion]\n"
8995
"bind Convert the current branch into a checkout of the "
8996
"supplied\n"
8997
" branch.\n"
8998
"branch Create a new branch that is a copy of an existing branch.\n"
8999
"branches List the branches available at the current location.\n"
9000
"break-lock Break a dead lock.\n"
9001
"cat Write the contents of a file as of a given revision to\n"
9002
" standard output.\n"
9003
"check Validate working tree structure, branch consistency and\n"
9004
" repository history.\n"
9005
"checkout Create a new checkout of an existing branch.\n"
9006
"clean-tree Remove unwanted files from working tree.\n"
9007
"commit Commit changes into a new revision.\n"
9008
"config Display, set or remove a configuration option.\n"
9009
"conflicts List files with conflicts.\n"
9010
"deleted List files deleted in the working tree.\n"
9011
"diff Show differences in the working tree, between revisions "
9012
"or\n"
9013
" branches.\n"
9014
"dpush Push into a different VCS without any custom bzr "
9015
"metadata.\n"
9016
"export Export current or past revision to a destination directory "
9017
"or\n"
9018
" archive.\n"
9019
"help Show help on a command or other topic.\n"
9020
"ignore Ignore specified files or patterns.\n"
9021
"ignored List ignored files and the patterns that matched them.\n"
9022
"info Show information about a working tree, branch or "
9023
"repository.\n"
9024
"init Make a directory into a versioned branch.\n"
9025
"init-repository Create a shared repository for branches to share storage\n"
9026
" space.\n"
9027
"join Combine a tree into its containing tree.\n"
9028
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9029
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9030
"launchpad-open Open a Launchpad branch page in your web browser. "
9031
"[launchpad]\n"
9032
"log Show historical log for a branch or subset of a branch.\n"
9033
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9034
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9035
"ls List files in a tree.\n"
9036
"merge Perform a three-way merge.\n"
9037
"missing Show unmerged/unpulled revisions between two branches.\n"
9038
"mkdir Create a new versioned directory.\n"
9039
"mv Move or rename a file.\n"
9040
"nick Print or set the branch nickname.\n"
9041
"pack Compress the data within a repository.\n"
9042
"plugins List the installed plugins.\n"
9043
"pull Turn this branch into a mirror of another branch.\n"
9044
"push Update a mirror of this branch.\n"
9045
"reconcile Reconcile bzr metadata in a branch.\n"
9046
"reconfigure Reconfigure the type of a bzr directory.\n"
9047
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9048
"remerge Redo a merge.\n"
9049
"remove Remove files or directories.\n"
9050
"remove-branch Remove a branch.\n"
9051
"remove-tree Remove the working tree from a given branch/checkout.\n"
9052
"renames Show list of renamed files.\n"
9053
"resolve Mark a conflict as resolved.\n"
9054
"revert Revert files to a previous revision.\n"
9055
"revno Show current revision number.\n"
9056
"root Show the tree root directory.\n"
9057
"send Mail or create a merge-directive for submitting changes.\n"
9058
"serve Run the bzr server.\n"
9059
"shelve Temporarily set aside some changes from the current tree.\n"
9060
"sign-my-commits Sign all commits by a given committer.\n"
9061
"split Split a subdirectory of a tree into a separate tree.\n"
9062
"status Display status summary.\n"
9063
"switch Set the branch of a checkout and update.\n"
9064
"tag Create, remove or modify a tag naming a revision.\n"
9065
"tags List tags.\n"
9066
"testament Show testament (signing-form) of a revision.\n"
9067
"unbind Convert the current checkout into a regular branch.\n"
9068
"uncommit Remove the last committed revision.\n"
9069
"unshelve Restore shelved changes.\n"
9070
"update Update a working tree to a new revision.\n"
9071
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9072
" format.\n"
9073
"verify-signatures Verify all commit signatures.\n"
9074
"version Show version of bzr.\n"
9075
"version-info Show version information about this tree.\n"
9076
"view Manage filtered views.\n"
9077
"whoami Show or set bzr user id.\n"
9078
msgstr ""
9079
9080
#: en/help_topics/configuration.txt:1
9081
msgid ""
9082
"Configuration Settings\n"
9083
"======================="
9084
msgstr ""
9085
9086
#: en/help_topics/configuration.txt:4
9087
msgid ""
9088
"Environment settings\n"
9089
"---------------------"
9090
msgstr ""
9091
9092
#: en/help_topics/configuration.txt:7
9093
msgid ""
9094
"While most configuration is handled by configuration files, some options\n"
9095
"which may be semi-permanent can also be controlled through the environment."
9096
msgstr ""
9097
9098
#: en/help_topics/configuration.txt:10
9099
msgid ""
9100
"BZR_EMAIL\n"
9101
"~~~~~~~~~"
9102
msgstr ""
9103
9104
#: en/help_topics/configuration.txt:13
9105
msgid "Override the email id used by Bazaar. Typical format::"
9106
msgstr ""
9107
9108
#: en/help_topics/configuration.txt:15
9109
msgid " \"John Doe <jdoe@example.com>\""
9110
msgstr ""
9111
9112
#: en/help_topics/configuration.txt:17
9113
msgid "See also the ``email`` configuration option."
9114
msgstr ""
9115
9116
#: en/help_topics/configuration.txt:19
9117
msgid ""
9118
"BZR_PROGRESS_BAR\n"
9119
"~~~~~~~~~~~~~~~~"
9120
msgstr ""
9121
9122
#: en/help_topics/configuration.txt:22
9123
msgid ""
9124
"Override the progress display. Possible values are \"none\" or \"text\". "
9125
"If\n"
9126
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9127
"draws\n"
9128
"the ordinary command line progress bar."
9129
msgstr ""
9130
9131
#: en/help_topics/configuration.txt:26
9132
msgid ""
9133
"BZR_SIGQUIT_PDB\n"
9134
"~~~~~~~~~~~~~~~"
9135
msgstr ""
9136
9137
#: en/help_topics/configuration.txt:29
9138
msgid ""
9139
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9140
msgstr ""
9141
9142
#: en/help_topics/configuration.txt:31
9143
msgid ""
9144
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9145
"* 1 = Invoke breakin debugger (default)"
9146
msgstr ""
9147
9148
#: en/help_topics/configuration.txt:34
9149
msgid ""
9150
"BZR_HOME\n"
9151
"~~~~~~~~"
9152
msgstr ""
9153
9154
#: en/help_topics/configuration.txt:37
9155
msgid "Override the home directory used by Bazaar."
9156
msgstr ""
9157
9158
#: en/help_topics/configuration.txt:39
9159
msgid ""
9160
"BZR_SSH\n"
9161
"~~~~~~~"
9162
msgstr ""
9163
9164
#: en/help_topics/configuration.txt:42
9165
msgid "Select a different SSH implementation."
9166
msgstr ""
9167
9168
#: en/help_topics/configuration.txt:44
9169
msgid ""
9170
"BZR_PDB\n"
9171
"~~~~~~~"
9172
msgstr ""
9173
9174
#: en/help_topics/configuration.txt:47
9175
msgid "Control whether to launch a debugger on error."
9176
msgstr ""
9177
9178
#: en/help_topics/configuration.txt:49
9179
msgid ""
9180
"* 0 = Standard behavior\n"
9181
"* 1 = Launch debugger"
9182
msgstr ""
9183
9184
#: en/help_topics/configuration.txt:52
9185
msgid ""
9186
"BZR_REMOTE_PATH\n"
9187
"~~~~~~~~~~~~~~~"
9188
msgstr ""
9189
9190
#: en/help_topics/configuration.txt:55
9191
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9192
msgstr ""
9193
9194
#: en/help_topics/configuration.txt:57
9195
msgid "See also the ``bzr_remote_path`` configuration option."
9196
msgstr ""
9197
9198
#: en/help_topics/configuration.txt:59
9199
msgid ""
9200
"BZR_EDITOR\n"
9201
"~~~~~~~~~~"
9202
msgstr ""
9203
9204
#: en/help_topics/configuration.txt:62
9205
msgid "Path to the editor Bazaar should use for commit messages, etc."
9206
msgstr ""
9207
9208
#: en/help_topics/configuration.txt:64
9209
msgid ""
9210
"BZR_LOG\n"
9211
"~~~~~~~"
9212
msgstr ""
9213
9214
#: en/help_topics/configuration.txt:67
9215
msgid ""
9216
"Location of the Bazaar log file. You can check the current location by\n"
9217
"running ``bzr version``."
9218
msgstr ""
9219
9220
#: en/help_topics/configuration.txt:70
9221
msgid ""
9222
"The log file contains debug information that is useful for diagnosing or\n"
9223
"reporting problems with Bazaar."
9224
msgstr ""
9225
9226
#: en/help_topics/configuration.txt:73
9227
msgid ""
9228
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9229
"will disable logging."
9230
msgstr ""
9231
9232
#: en/help_topics/configuration.txt:76
9233
msgid ""
9234
"\n"
9235
"BZR_PLUGIN_PATH\n"
9236
"~~~~~~~~~~~~~~~"
9237
msgstr ""
9238
9239
#: en/help_topics/configuration.txt:80
9240
msgid ""
9241
"The path to the plugins directory that Bazaar should use.\n"
9242
"If not set, Bazaar will search for plugins in:"
9243
msgstr ""
9244
9245
#: en/help_topics/configuration.txt:83
9246
msgid ""
9247
"* the user specific plugin directory (containing the ``user`` plugins),"
9248
msgstr ""
9249
9250
#: en/help_topics/configuration.txt:85
9251
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9252
msgstr ""
9253
9254
#: en/help_topics/configuration.txt:87
9255
msgid ""
9256
"* the site specific plugin directory if applicable (containing\n"
9257
" the ``site`` plugins)."
9258
msgstr ""
9259
9260
#: en/help_topics/configuration.txt:90
9261
msgid ""
9262
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9263
"the way the plugin are searched. "
9264
msgstr ""
9265
9266
#: en/help_topics/configuration.txt:93
9267
msgid ""
9268
"As for the ``PATH`` variables, if multiple directories are\n"
9269
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9270
"platform specific appropriate character (':' on Unix,\n"
9271
"';' on windows)"
9272
msgstr ""
9273
9274
#: en/help_topics/configuration.txt:98
9275
msgid ""
9276
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9277
"in ``user``. However it will continue to search in ``core`` and\n"
9278
"``site`` unless they are explicitly removed."
9279
msgstr ""
9280
9281
#: en/help_topics/configuration.txt:102
9282
msgid ""
9283
"If you need to change the order or remove one of these\n"
9284
"directories, you should use special values:"
9285
msgstr ""
9286
9287
#: en/help_topics/configuration.txt:105
9288
msgid ""
9289
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9290
" path from the default values,"
9291
msgstr ""
9292
9293
#: en/help_topics/configuration.txt:108
9294
msgid ""
9295
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9296
" before the remaining default values (and also remove it from\n"
9297
" the default values)."
9298
msgstr ""
9299
9300
#: en/help_topics/configuration.txt:112
9301
msgid ""
9302
"Note that the special values 'user', 'core' and 'site' should be\n"
9303
"used literally, they will be substituted by the corresponding,\n"
9304
"platform specific, values."
9305
msgstr ""
9306
9307
#: en/help_topics/configuration.txt:116
9308
msgid ""
9309
"The examples below use ':' as the separator, windows users\n"
9310
"should use ';'."
9311
msgstr ""
9312
9313
#: en/help_topics/configuration.txt:119
9314
msgid "Overriding the default user plugin directory::"
9315
msgstr ""
9316
9317
#: en/help_topics/configuration.txt:121
9318
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9319
msgstr ""
9320
9321
#: en/help_topics/configuration.txt:123
9322
msgid "Disabling the site directory while retaining the user directory::"
9323
msgstr ""
9324
9325
#: en/help_topics/configuration.txt:125
9326
msgid " BZR_PLUGIN_PATH='-site:+user'"
9327
msgstr ""
9328
9329
#: en/help_topics/configuration.txt:127
9330
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9331
msgstr ""
9332
9333
#: en/help_topics/configuration.txt:129
9334
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9335
msgstr ""
9336
9337
#: en/help_topics/configuration.txt:131
9338
msgid "Overriding the default site plugin directory::"
9339
msgstr ""
9340
9341
#: en/help_topics/configuration.txt:133
9342
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9343
msgstr ""
9344
9345
#: en/help_topics/configuration.txt:135
9346
msgid ""
9347
"BZR_DISABLE_PLUGINS\n"
9348
"~~~~~~~~~~~~~~~~~~~"
9349
msgstr ""
9350
9351
#: en/help_topics/configuration.txt:138
9352
msgid ""
9353
"Under special circumstances (mostly when trying to diagnose a\n"
9354
"bug), it's better to disable a plugin (or several) rather than\n"
9355
"uninstalling them completely. Such plugins can be specified in\n"
9356
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9357
msgstr ""
9358
9359
#: en/help_topics/configuration.txt:143
9360
msgid ""
9361
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9362
"will raise an import error if they are explicitly imported (by\n"
9363
"another plugin that depends on them for example)."
9364
msgstr ""
9365
9366
#: en/help_topics/configuration.txt:147
9367
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9368
msgstr ""
9369
9370
#: en/help_topics/configuration.txt:149
9371
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9372
msgstr ""
9373
9374
#: en/help_topics/configuration.txt:151
9375
msgid ""
9376
"BZR_PLUGINS_AT\n"
9377
"~~~~~~~~~~~~~~"
9378
msgstr ""
9379
9380
#: en/help_topics/configuration.txt:154
9381
msgid ""
9382
"When adding a new feature or working on a bug in a plugin,\n"
9383
"developers often need to use a specific version of a given\n"
9384
"plugin. Since python requires that the directory containing the\n"
9385
"code is named like the plugin itself this make it impossible to\n"
9386
"use arbitrary directory names (using a two-level directory scheme\n"
9387
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9388
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9389
msgstr ""
9390
9391
#: en/help_topics/configuration.txt:162
9392
msgid ""
9393
"Plugins specified in this environment variable takes precedence\n"
9394
"over the ones in ``BZR_PLUGIN_PATH``."
9395
msgstr ""
9396
9397
#: en/help_topics/configuration.txt:165
9398
msgid ""
9399
"The variable specified a list of ``plugin_name@plugin path``,\n"
9400
"``plugin_name`` being the name of the plugin as it appears in\n"
9401
"python module paths, ``plugin_path`` being the path to the\n"
9402
"directory containing the plugin code itself\n"
9403
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9404
"separator, use ';' on windows."
9405
msgstr ""
9406
9407
#: en/help_topics/configuration.txt:172
9408
msgid ""
9409
"Example:\n"
9410
"~~~~~~~~"
9411
msgstr ""
9412
9413
#: en/help_topics/configuration.txt:175
9414
msgid ""
9415
"Using a specific version of ``myplugin``:\n"
9416
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9417
msgstr ""
9418
9419
#: en/help_topics/configuration.txt:178
9420
msgid ""
9421
"BZRPATH\n"
9422
"~~~~~~~"
9423
msgstr ""
9424
9425
#: en/help_topics/configuration.txt:181
9426
msgid "The path where Bazaar should look for shell plugin external commands."
9427
msgstr ""
9428
9429
#: en/help_topics/configuration.txt:183
9430
msgid ""
9431
"\n"
9432
"http_proxy, https_proxy\n"
9433
"~~~~~~~~~~~~~~~~~~~~~~~"
9434
msgstr ""
9435
9436
#: en/help_topics/configuration.txt:187
9437
msgid "Specifies the network proxy for outgoing connections, for example::"
9438
msgstr ""
9439
9440
#: en/help_topics/configuration.txt:189
9441
msgid ""
9442
" http_proxy=http://proxy.example.com:3128/ \n"
9443
" https_proxy=http://proxy.example.com:3128/"
9444
msgstr ""
9445
9446
#: en/help_topics/configuration.txt:192
9447
msgid ""
9448
"\n"
9449
"Configuration files\n"
9450
"-------------------"
9451
msgstr ""
9452
9453
#: en/help_topics/configuration.txt:196
9454
msgid ""
9455
"Location\n"
9456
"~~~~~~~~"
9457
msgstr ""
9458
9459
#: en/help_topics/configuration.txt:199
9460
msgid ""
9461
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9462
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9463
"on\n"
9464
"Windows. (You can check the location for your system by using\n"
9465
"``bzr version``.)"
9466
msgstr ""
9467
9468
#: en/help_topics/configuration.txt:204
9469
msgid "There are three primary configuration files in this location:"
9470
msgstr ""
9471
9472
#: en/help_topics/configuration.txt:206
9473
msgid "* ``bazaar.conf`` describes default configuration options,"
9474
msgstr ""
9475
9476
#: en/help_topics/configuration.txt:208
9477
msgid ""
9478
"* ``locations.conf`` describes configuration information for\n"
9479
" specific branch locations,"
9480
msgstr ""
9481
9482
#: en/help_topics/configuration.txt:211
9483
msgid ""
9484
"* ``authentication.conf`` describes credential information for\n"
9485
" remote servers."
9486
msgstr ""
9487
9488
#: en/help_topics/configuration.txt:214
9489
msgid ""
9490
"Each branch can also contain a configuration file that sets values specific\n"
9491
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9492
"the\n"
9493
"branch. This file is visible to all users of a branch, if you wish to "
9494
"override\n"
9495
"one of the values for a branch with a setting that is specific to you then "
9496
"you\n"
9497
"can do so in ``locations.conf``."
9498
msgstr ""
9499
9500
#: en/help_topics/configuration.txt:220
9501
msgid ""
9502
"General format\n"
9503
"~~~~~~~~~~~~~~"
9504
msgstr ""
9505
9506
#: en/help_topics/configuration.txt:223
9507
msgid ""
9508
"An ini file has three types of contructs: section headers, section\n"
9509
"options and comments."
9510
msgstr ""
9511
9512
#: en/help_topics/configuration.txt:226
9513
msgid ""
9514
"Comments\n"
9515
"^^^^^^^^"
9516
msgstr ""
9517
9518
#: en/help_topics/configuration.txt:229
9519
msgid ""
9520
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9521
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9522
"Bazaar when parsing ini files."
9523
msgstr ""
9524
9525
#: en/help_topics/configuration.txt:233
9526
msgid ""
9527
"Section headers\n"
9528
"^^^^^^^^^^^^^^^"
9529
msgstr ""
9530
9531
#: en/help_topics/configuration.txt:236
9532
msgid ""
9533
"A section header is a word enclosed in brackets that starts at the begining\n"
9534
"of a line. A typical section header looks like this::"
9535
msgstr ""
9536
9537
#: en/help_topics/configuration.txt:239
9538
msgid " [DEFAULT]"
9539
msgstr ""
9540
9541
#: en/help_topics/configuration.txt:241
9542
msgid ""
9543
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9544
"[ALIASES]. Section headers are case sensitive. The default section provides "
9545
"for\n"
9546
"setting options which can be overridden with the branch config file."
9547
msgstr ""
9548
9549
#: en/help_topics/configuration.txt:245
9550
msgid ""
9551
"For ``locations.conf``, the options from the section with the\n"
9552
"longest matching section header are used to the exclusion of other\n"
9553
"potentially valid section headers. A section header uses the path for\n"
9554
"the branch as the section header. Some examples include::"
9555
msgstr ""
9556
9557
#: en/help_topics/configuration.txt:250
9558
msgid ""
9559
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9560
" [/home/jdoe/branches/]"
9561
msgstr ""
9562
9563
#: en/help_topics/configuration.txt:253
9564
msgid ""
9565
"\n"
9566
"Section options\n"
9567
"^^^^^^^^^^^^^^^"
9568
msgstr ""
9569
9570
#: en/help_topics/configuration.txt:257
9571
msgid ""
9572
"A section option resides within a section. A section option contains an\n"
9573
"option name, an equals sign and a value. For example::"
9574
msgstr ""
9575
9576
#: en/help_topics/configuration.txt:260
9577
msgid ""
9578
" email = John Doe <jdoe@isp.com>\n"
9579
" gpg_signing_key = Amy Pond <amy@example.com>"
9580
msgstr ""
9581
9582
#: en/help_topics/configuration.txt:263
9583
msgid ""
9584
"A option can reference other options by enclosing them in curly brackets::"
9585
msgstr ""
9586
9587
#: en/help_topics/configuration.txt:265
9588
msgid ""
9589
" my_branch_name = feature_x\n"
9590
" my_server = bzr+ssh://example.com\n"
9591
" push_location = {my_server}/project/{my_branch_name}"
9592
msgstr ""
9593
9594
#: en/help_topics/configuration.txt:269
9595
msgid ""
9596
"Option policies\n"
9597
"^^^^^^^^^^^^^^^"
9598
msgstr ""
9599
9600
#: en/help_topics/configuration.txt:272
9601
msgid ""
9602
"Options defined in a section affect the named directory or URL plus\n"
9603
"any locations they contain. Policies can be used to change how an\n"
9604
"option value is interpreted for contained locations. Currently\n"
9605
"there are three policies available:"
9606
msgstr ""
9607
9608
#: en/help_topics/configuration.txt:277
9609
msgid ""
9610
" none:\n"
9611
" the value is interpreted the same for contained locations. This is\n"
9612
" the default behaviour.\n"
9613
" norecurse:\n"
9614
" the value is only used for the exact location specified by the\n"
9615
" section name.\n"
9616
" appendpath:\n"
9617
" for contained locations, any additional path components are\n"
9618
" appended to the value."
9619
msgstr ""
9620
9621
#: en/help_topics/configuration.txt:287
9622
msgid ""
9623
"Policies are specified by keys with names of the form "
9624
"\"<option_name>:policy\".\n"
9625
"For example, to define the push location for a tree of branches, the\n"
9626
"following could be used::"
9627
msgstr ""
9628
9629
#: en/help_topics/configuration.txt:291
9630
msgid ""
9631
" [/top/location]\n"
9632
" push_location = sftp://example.com/location\n"
9633
" push_location:policy = appendpath"
9634
msgstr ""
9635
9636
#: en/help_topics/configuration.txt:295
9637
msgid ""
9638
"With this configuration, the push location for ``/top/location/branch1``\n"
9639
"would be ``sftp://example.com/location/branch1``."
9640
msgstr ""
9641
9642
#: en/help_topics/configuration.txt:298
9643
msgid ""
9644
"Section local options\n"
9645
"^^^^^^^^^^^^^^^^^^^^^"
9646
msgstr ""
9647
9648
#: en/help_topics/configuration.txt:301
9649
msgid ""
9650
"Some options are defined automatically inside a given section and can be\n"
9651
"refered to in this section only. "
9652
msgstr ""
9653
9654
#: en/help_topics/configuration.txt:304
9655
msgid "For example, the ``appendpath`` policy can be used like this::"
9656
msgstr ""
9657
9658
#: en/help_topics/configuration.txt:306
9659
msgid ""
9660
" [/home/vila/src/bzr/bugs]\n"
9661
" mypush = lp:~vila/bzr\n"
9662
" mypush:policy=appendpath"
9663
msgstr ""
9664
9665
#: en/help_topics/configuration.txt:310
9666
msgid "Using ``relpath`` to achieve the same result is done like this::"
9667
msgstr ""
9668
9669
#: en/help_topics/configuration.txt:312
9670
msgid ""
9671
" [/home/vila/src/bzr/bugs]\n"
9672
" mypush = lp:~vila/bzr/{relpath}"
9673
msgstr ""
9674
9675
#: en/help_topics/configuration.txt:315
9676
msgid ""
9677
"In both cases, when used in a directory like\n"
9678
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9679
msgstr ""
9680
9681
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9682
msgid ""
9683
" $ bzr config mypush\n"
9684
" lp:~vila/bzr/832013-expand-in-stack"
9685
msgstr ""
9686
9687
#: en/help_topics/configuration.txt:321
9688
msgid "Another such option is ``basename`` which can be used like this::"
9689
msgstr ""
9690
9691
#: en/help_topics/configuration.txt:323
9692
msgid ""
9693
" [/home/vila/src/bzr]\n"
9694
" mypush = lp:~vila/bzr/{basename}"
9695
msgstr ""
9696
9697
#: en/help_topics/configuration.txt:326
9698
msgid ""
9699
"When used in a directory like\n"
9700
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9701
msgstr ""
9702
9703
#: en/help_topics/configuration.txt:332
9704
msgid ""
9705
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9706
"itself is defined as the relative path between the section name and the\n"
9707
"location it matches."
9708
msgstr ""
9709
9710
#: en/help_topics/configuration.txt:336
9711
msgid ""
9712
"When an option is local to a Section, it cannot be referred to from option\n"
9713
"values in any other section from the same ``Store`` nor from any other\n"
9714
"``Store``."
9715
msgstr ""
9716
9717
#: en/help_topics/configuration.txt:340
9718
msgid ""
9719
"\n"
9720
"The main configuration file, bazaar.conf\n"
9721
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9722
msgstr ""
9723
9724
#: en/help_topics/configuration.txt:344
9725
msgid ""
9726
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9727
"The default section contains the default\n"
9728
"configuration options for all branches. The default section can be\n"
9729
"overriden by providing a branch-specific section in ``locations.conf``."
9730
msgstr ""
9731
9732
#: en/help_topics/configuration.txt:349
9733
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9734
msgstr ""
9735
9736
#: en/help_topics/configuration.txt:351
9737
msgid ""
9738
" [DEFAULT]\n"
9739
" email = John Doe <jdoe@isp.com>\n"
9740
" editor = /usr/bin/vim\n"
9741
" create_signatures = when-required"
9742
msgstr ""
9743
9744
#: en/help_topics/configuration.txt:356
9745
msgid ""
9746
"\n"
9747
"The branch location configuration file, locations.conf\n"
9748
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9749
msgstr ""
9750
9751
#: en/help_topics/configuration.txt:360
9752
msgid ""
9753
"``locations.conf`` allows one to specify overriding settings for\n"
9754
"a specific branch. The format is almost identical to the default section in\n"
9755
"bazaar.conf with one significant change: The section header, instead of "
9756
"saying\n"
9757
"default, will be the path to a branch that you wish to override a value\n"
9758
"for. The '?' and '*' wildcards are supported::"
9759
msgstr ""
9760
9761
#: en/help_topics/configuration.txt:366
9762
msgid ""
9763
" [/home/jdoe/branches/nethack]\n"
9764
" email = Nethack Admin <nethack@nethack.com>"
9765
msgstr ""
9766
9767
#: en/help_topics/configuration.txt:369
9768
msgid ""
9769
" [http://hypothetical.site.com/branches/devel-branch]\n"
9770
" create_signatures = always"
9771
msgstr ""
9772
9773
#: en/help_topics/configuration.txt:372
9774
msgid ""
9775
"The authentication configuration file, authentication.conf\n"
9776
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9777
msgstr ""
9778
9779
#: en/help_topics/configuration.txt:375
9780
msgid ""
9781
"``authentication.conf`` allows one to specify credentials for\n"
9782
"remote servers. This can be used for all the supported transports and any "
9783
"part\n"
9784
"of bzr that requires authentication (smtp for example)."
9785
msgstr ""
9786
9787
#: en/help_topics/configuration.txt:379
9788
msgid ""
9789
"The syntax of the file obeys the same rules as the others except for the\n"
9790
"option policies which don't apply."
9791
msgstr ""
9792
9793
#: en/help_topics/configuration.txt:382
9794
msgid ""
9795
"For more information on the possible uses of the authentication "
9796
"configuration\n"
9797
"file see :doc:`authentication-help`."
9798
msgstr ""
9799
9800
#: en/help_topics/configuration.txt:385
9801
msgid ""
9802
"\n"
9803
"Common options\n"
9804
"--------------"
9805
msgstr ""
9806
9807
#: en/help_topics/configuration.txt:389
9808
msgid ""
9809
"debug_flags\n"
9810
"~~~~~~~~~~~"
9811
msgstr ""
9812
9813
#: en/help_topics/configuration.txt:392
9814
msgid ""
9815
"A comma-separated list of debugging options to turn on. The same values\n"
9816
"can be used as with the -D command-line option (see `help global-options`).\n"
9817
"For example::"
9818
msgstr ""
9819
9820
#: en/help_topics/configuration.txt:396
9821
msgid " debug_flags = hpss"
9822
msgstr ""
9823
9824
#: en/help_topics/configuration.txt:400
9825
msgid " debug_flags = hpss,evil"
9826
msgstr ""
9827
9828
#: en/help_topics/configuration.txt:402
9829
msgid ""
9830
"email\n"
9831
"~~~~~"
9832
msgstr ""
9833
9834
#: en/help_topics/configuration.txt:405
9835
msgid ""
9836
"The email address to use when committing a branch. Typically takes the form\n"
9837
"of::"
9838
msgstr ""
9839
9840
#: en/help_topics/configuration.txt:408
9841
msgid " email = Full Name <account@hostname.tld>"
9842
msgstr ""
9843
9844
#: en/help_topics/configuration.txt:410
9845
msgid ""
9846
"editor\n"
9847
"~~~~~~"
9848
msgstr ""
9849
9850
#: en/help_topics/configuration.txt:413
9851
msgid ""
9852
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9853
"a commit message. This setting is trumped by the environment variable\n"
9854
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9855
"variables."
9856
msgstr ""
9857
9858
#: en/help_topics/configuration.txt:418
9859
msgid ""
9860
"log_format\n"
9861
"~~~~~~~~~~"
9862
msgstr ""
9863
9864
#: en/help_topics/configuration.txt:421
9865
msgid ""
9866
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9867
"and ``line``. Additional formats may be provided by plugins. The default\n"
9868
"value is ``long``."
9869
msgstr ""
9870
9871
#: en/help_topics/configuration.txt:425
9872
msgid ""
9873
"check_signatures\n"
9874
"~~~~~~~~~~~~~~~~"
9875
msgstr ""
9876
9877
#: en/help_topics/configuration.txt:428
9878
msgid ""
9879
"Reserved for future use. These options will allow a policy for branches to\n"
9880
"require signatures."
9881
msgstr ""
9882
9883
#: en/help_topics/configuration.txt:431
9884
msgid ""
9885
"require\n"
9886
" The gnupg signature for revisions must be present and must be valid."
9887
msgstr ""
9888
9889
#: en/help_topics/configuration.txt:434
9890
msgid ""
9891
"ignore\n"
9892
" Do not check gnupg signatures of revisions."
9893
msgstr ""
9894
9895
#: en/help_topics/configuration.txt:437
9896
msgid ""
9897
"check-available\n"
9898
" (default) If gnupg signatures for revisions are present, check them.\n"
9899
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9900
" no signature is present."
9901
msgstr ""
9902
9903
#: en/help_topics/configuration.txt:442
9904
msgid ""
9905
"create_signatures\n"
9906
"~~~~~~~~~~~~~~~~~"
9907
msgstr ""
9908
9909
#: en/help_topics/configuration.txt:445
9910
msgid ""
9911
"Defines the behaviour of signing revisions on commits. By default bzr will "
9912
"not\n"
9913
"sign new commits."
9914
msgstr ""
9915
9916
#: en/help_topics/configuration.txt:448
9917
msgid ""
9918
"always\n"
9919
" Sign every new revision that is committed. If the signing fails then "
9920
"the\n"
9921
" commit will not be made."
9922
msgstr ""
9923
9924
#: en/help_topics/configuration.txt:452
9925
msgid ""
9926
"when-required\n"
9927
" Reserved for future use."
9928
msgstr ""
9929
9930
#: en/help_topics/configuration.txt:455
9931
msgid ""
9932
"never\n"
9933
" Reserved for future use."
9934
msgstr ""
9935
9936
#: en/help_topics/configuration.txt:458
9937
msgid ""
9938
"In future it is planned that ``when-required`` will sign newly\n"
9939
"committed revisions only when the branch requires them. ``never`` will "
9940
"refuse\n"
9941
"to sign newly committed revisions, even if the branch requires signatures."
9942
msgstr ""
9943
9944
#: en/help_topics/configuration.txt:462
9945
msgid ""
9946
"dirstate.fdatasync\n"
9947
"~~~~~~~~~~~~~~~~~~"
9948
msgstr ""
9949
9950
#: en/help_topics/configuration.txt:465
9951
msgid ""
9952
"If true (default), working tree metadata changes are flushed through the\n"
9953
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9954
"should not be lost if the machine crashes. See also repository.fdatasync."
9955
msgstr ""
9956
9957
#: en/help_topics/configuration.txt:469
9958
msgid ""
9959
"gpg_signing_key\n"
9960
"~~~~~~~~~~~~~~~"
9961
msgstr ""
9962
9963
#: en/help_topics/configuration.txt:472
9964
msgid ""
9965
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9966
"address, key fingerprint or full key ID. When unset or when set to\n"
9967
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9968
msgstr ""
9969
9970
#: en/help_topics/configuration.txt:476
9971
msgid ""
9972
"recurse\n"
9973
"~~~~~~~"
9974
msgstr ""
9975
9976
#: en/help_topics/configuration.txt:479
9977
msgid ""
9978
"Only useful in ``locations.conf``. Defines whether or not the\n"
9979
"configuration for this section applies to subdirectories:"
9980
msgstr ""
9981
9982
#: en/help_topics/configuration.txt:482
9983
msgid ""
9984
"true\n"
9985
" (default) This section applies to subdirectories as well."
9986
msgstr ""
9987
9988
#: en/help_topics/configuration.txt:485
9989
msgid ""
9990
"false\n"
9991
" This section only applies to the branch at this directory and not\n"
9992
" branches below it."
9993
msgstr ""
9994
9995
#: en/help_topics/configuration.txt:489
9996
msgid ""
9997
"gpg_signing_command\n"
9998
"~~~~~~~~~~~~~~~~~~~"
9999
msgstr ""
10000
10001
#: en/help_topics/configuration.txt:492
10002
msgid ""
10003
"(Default: \"gpg\"). Which program should be used to sign and check "
10004
"revisions.\n"
10005
"For example::"
10006
msgstr ""
10007
10008
#: en/help_topics/configuration.txt:495
10009
msgid " gpg_signing_command = /usr/bin/gnpg"
10010
msgstr ""
10011
10012
#: en/help_topics/configuration.txt:497
10013
msgid ""
10014
"The specified command must accept the options \"--clearsign\" and \"-u "
10015
"<email>\"."
10016
msgstr ""
10017
10018
#: en/help_topics/configuration.txt:499
10019
msgid ""
10020
"bzr_remote_path\n"
10021
"~~~~~~~~~~~~~~~"
10022
msgstr ""
10023
10024
#: en/help_topics/configuration.txt:502
10025
msgid ""
10026
"(Default: \"bzr\"). The path to the command that should be used to run the "
10027
"smart\n"
10028
"server for bzr. This value may only be specified in locations.conf, because:"
10029
msgstr ""
10030
10031
#: en/help_topics/configuration.txt:505
10032
msgid ""
10033
"- it's needed before branch.conf is accessible\n"
10034
"- allowing remote branch.conf files to specify commands would be a security\n"
10035
" risk"
10036
msgstr ""
10037
10038
#: en/help_topics/configuration.txt:509
10039
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10040
msgstr ""
10041
10042
#: en/help_topics/configuration.txt:511
10043
msgid ""
10044
"smtp_server\n"
10045
"~~~~~~~~~~~"
10046
msgstr ""
10047
10048
#: en/help_topics/configuration.txt:514
10049
msgid ""
10050
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10051
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10052
msgstr ""
10053
10054
#: en/help_topics/configuration.txt:517
10055
msgid ""
10056
"smtp_username, smtp_password\n"
10057
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10058
msgstr ""
10059
10060
#: en/help_topics/configuration.txt:520
10061
msgid ""
10062
"User and password to authenticate to the SMTP server. If smtp_username\n"
10063
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10064
"These settings are only needed if the SMTP server requires authentication\n"
10065
"to send mail."
10066
msgstr ""
10067
10068
#: en/help_topics/configuration.txt:525
10069
msgid ""
10070
"locks.steal_dead\n"
10071
"~~~~~~~~~~~~~~~~"
10072
msgstr ""
10073
10074
#: en/help_topics/configuration.txt:528
10075
msgid ""
10076
"If set to true, bzr will automatically break locks held by processes from\n"
10077
"the same machine and user that are no longer alive. Otherwise, it will\n"
10078
"print a message and you can break the lock manually, if you are satisfied\n"
10079
"the object is no longer in use."
10080
msgstr ""
10081
10082
#: en/help_topics/configuration.txt:533
10083
msgid ""
10084
"mail_client\n"
10085
"~~~~~~~~~~~"
10086
msgstr ""
10087
10088
#: en/help_topics/configuration.txt:536
10089
msgid ""
10090
"A mail client to use for sending merge requests.\n"
10091
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10092
"it\n"
10093
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10094
"``editor``."
10095
msgstr ""
10096
10097
#: en/help_topics/configuration.txt:541
10098
msgid "Supported values for specific clients:"
10099
msgstr ""
10100
10101
#: en/help_topics/configuration.txt:543
10102
msgid ""
10103
":claws: Use Claws. This skips a dialog for attaching files.\n"
10104
":evolution: Use Evolution.\n"
10105
":kmail: Use KMail.\n"
10106
":mutt: Use Mutt.\n"
10107
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10108
"1.5,\n"
10109
" this works around some bugs that xdg-email doesn't handle."
10110
msgstr ""
10111
10112
#: en/help_topics/configuration.txt:550
10113
msgid "Supported generic values are:"
10114
msgstr ""
10115
10116
#: en/help_topics/configuration.txt:552
10117
msgid ""
10118
":default: See above.\n"
10119
":editor: Use your editor to compose the merge request. This also uses\n"
10120
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10121
" smtp_username and smtp_password.\n"
10122
":mapi: Use your preferred e-mail client on Windows.\n"
10123
":xdg-email: Use xdg-email to run your preferred mail program"
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:559
10127
msgid ""
10128
"repository.fdatasync\n"
10129
"~~~~~~~~~~~~~~~~~~~~"
10130
msgstr ""
10131
10132
#: en/help_topics/configuration.txt:562
10133
msgid ""
10134
"If true (default), repository changes are flushed through the OS buffers\n"
10135
"to physical disk. This is somewhat slower, but means data should not be\n"
10136
"lost if the machine crashes. See also dirstate.fdatasync."
10137
msgstr ""
10138
10139
#: en/help_topics/configuration.txt:566
10140
msgid ""
10141
"submit_branch\n"
10142
"~~~~~~~~~~~~~"
10143
msgstr ""
10144
10145
#: en/help_topics/configuration.txt:569
10146
msgid ""
10147
"The branch you intend to submit your current work to. This is "
10148
"automatically\n"
10149
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10150
"This\n"
10151
"should usually be set on a per-branch or per-location basis."
10152
msgstr ""
10153
10154
#: en/help_topics/configuration.txt:573
10155
msgid ""
10156
"public_branch\n"
10157
"~~~~~~~~~~~~~"
10158
msgstr ""
10159
10160
#: en/help_topics/configuration.txt:576
10161
msgid ""
10162
"A publically-accessible version of this branch (implying that this version "
10163
"is\n"
10164
"not publically-accessible). Used (and set) by ``bzr send``."
10165
msgstr ""
10166
10167
#: en/help_topics/configuration.txt:579
10168
msgid ""
10169
"suppress_warnings\n"
10170
"~~~~~~~~~~~~~~~~~"
10171
msgstr ""
10172
10173
#: en/help_topics/configuration.txt:582
10174
msgid ""
10175
"A list of strings, each string represent a warning that can be emitted by\n"
10176
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10177
msgstr ""
10178
10179
#: en/help_topics/configuration.txt:585
10180
msgid "Valid values:"
10181
msgstr ""
10182
10183
#: en/help_topics/configuration.txt:587
10184
msgid ""
10185
"* ``format_deprecation``:\n"
10186
" whether the format deprecation warning is shown on repositories that "
10187
"are\n"
10188
" using deprecated formats."
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:591
10192
msgid ""
10193
"default_format\n"
10194
"~~~~~~~~~~~~~~"
10195
msgstr ""
10196
10197
#: en/help_topics/configuration.txt:594
10198
msgid ""
10199
"A format name for the default format used when creating branches. See "
10200
"``bzr\n"
10201
"help formats`` for possible values."
10202
msgstr ""
10203
10204
#: en/help_topics/configuration.txt:597
10205
msgid ""
10206
"\n"
10207
"Unicode options\n"
10208
"---------------"
10209
msgstr ""
10210
10211
#: en/help_topics/configuration.txt:601
10212
msgid ""
10213
"output_encoding\n"
10214
"~~~~~~~~~~~~~~~"
10215
msgstr ""
10216
10217
#: en/help_topics/configuration.txt:604
10218
msgid ""
10219
"A Python unicode encoding name for text output from bzr, such as log\n"
10220
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10221
"is the terminal encoding prefered by the operating system."
10222
msgstr ""
10223
10224
#: en/help_topics/configuration.txt:608
10225
msgid ""
10226
"\n"
10227
"Branch type specific options\n"
10228
"----------------------------"
10229
msgstr ""
10230
10231
#: en/help_topics/configuration.txt:612
10232
msgid ""
10233
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10234
"later format. They\n"
10235
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10236
"manually set in ``locations.conf`` or ``bazaar.conf``."
10237
msgstr ""
10238
10239
#: en/help_topics/configuration.txt:617
10240
msgid ""
10241
"append_revisions_only\n"
10242
"~~~~~~~~~~~~~~~~~~~~~"
10243
msgstr ""
10244
10245
#: en/help_topics/configuration.txt:620
10246
msgid ""
10247
"If set to \"True\" then revisions can only be appended to the log, not\n"
10248
"removed. A branch with this setting enabled can only pull from another\n"
10249
"branch if the other branch's log is a longer version of its own. This is\n"
10250
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10251
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10252
"compatibility with previous bzr versions (older than 2.2)."
10253
msgstr ""
10254
10255
#: en/help_topics/configuration.txt:627
10256
msgid ""
10257
"parent_location\n"
10258
"~~~~~~~~~~~~~~~"
10259
msgstr ""
10260
10261
#: en/help_topics/configuration.txt:630
10262
msgid ""
10263
"If present, the location of the default branch for pull or merge. This "
10264
"option\n"
10265
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10266
"--remember``."
10267
msgstr ""
10268
10269
#: en/help_topics/configuration.txt:634
10270
msgid ""
10271
"push_location\n"
10272
"~~~~~~~~~~~~~"
10273
msgstr ""
10274
10275
#: en/help_topics/configuration.txt:637
10276
msgid ""
10277
"If present, the location of the default branch for push. This option\n"
10278
"is normally set by the first ``push`` or ``push --remember``."
10279
msgstr ""
10280
10281
#: en/help_topics/configuration.txt:640
10282
msgid ""
10283
"push_strict\n"
10284
"~~~~~~~~~~~"
10285
msgstr ""
10286
10287
#: en/help_topics/configuration.txt:643
10288
msgid ""
10289
"If present, defines the ``--strict`` option default value for checking\n"
10290
"uncommitted changes before pushing."
10291
msgstr ""
10292
10293
#: en/help_topics/configuration.txt:646
10294
msgid ""
10295
"dpush_strict\n"
10296
"~~~~~~~~~~~~"
10297
msgstr ""
10298
10299
#: en/help_topics/configuration.txt:649
10300
msgid ""
10301
"If present, defines the ``--strict`` option default value for checking\n"
10302
"uncommitted changes before pushing into a different VCS without any\n"
10303
"custom bzr metadata."
10304
msgstr ""
10305
10306
#: en/help_topics/configuration.txt:653
10307
msgid ""
10308
"bound_location\n"
10309
"~~~~~~~~~~~~~~"
10310
msgstr ""
10311
10312
#: en/help_topics/configuration.txt:656
10313
msgid ""
10314
"The location that commits should go to when acting as a checkout.\n"
10315
"This option is normally set by ``bind``."
10316
msgstr ""
10317
10318
#: en/help_topics/configuration.txt:659
10319
msgid ""
10320
"bound\n"
10321
"~~~~~"
10322
msgstr ""
10323
10324
#: en/help_topics/configuration.txt:662
10325
msgid ""
10326
"If set to \"True\", the branch should act as a checkout, and push each "
10327
"commit to\n"
10328
"the bound_location. This option is normally set by ``bind``/``unbind``."
10329
msgstr ""
10330
10331
#: en/help_topics/configuration.txt:665
10332
msgid ""
10333
"send_strict\n"
10334
"~~~~~~~~~~~"
10335
msgstr ""
10336
10337
#: en/help_topics/configuration.txt:668
10338
msgid ""
10339
"If present, defines the ``--strict`` option default value for checking\n"
10340
"uncommitted changes before sending a merge directive."
10341
msgstr ""
10342
10343
#: en/help_topics/configuration.txt:671
10344
msgid ""
10345
"add.maximum_file_size\n"
10346
"~~~~~~~~~~~~~~~~~~~~~"
10347
msgstr ""
10348
10349
#: en/help_topics/configuration.txt:674
10350
msgid ""
10351
"Defines the maximum file size the command line \"add\" operation will allow\n"
10352
"in recursive mode, with files larger than this value being skipped. You may "
10353
"\n"
10354
"specify this value as an integer (in which case it is interpreted as bytes), "
10355
"\n"
10356
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10357
"0 \n"
10358
"will disable skipping."
10359
msgstr ""
10360
10361
#: en/help_topics/configuration.txt:680
10362
msgid ""
10363
"External Merge Tools\n"
10364
"--------------------"
10365
msgstr ""
10366
10367
#: en/help_topics/configuration.txt:683
10368
msgid ""
10369
"bzr.mergetool.<name>\n"
10370
"~~~~~~~~~~~~~~~~~~~~"
10371
msgstr ""
10372
10373
#: en/help_topics/configuration.txt:686
10374
msgid ""
10375
"Defines an external merge tool called <name> with the given command-line.\n"
10376
"Arguments containing spaces should be quoted using single or double quotes. "
10377
"The\n"
10378
"executable may omit its path if it can be found on the PATH."
10379
msgstr ""
10380
10381
#: en/help_topics/configuration.txt:690
10382
msgid ""
10383
"The following markers can be used in the command-line to substitute "
10384
"filenames\n"
10385
"involved in the merge conflict::"
10386
msgstr ""
10387
10388
#: en/help_topics/configuration.txt:693
10389
msgid ""
10390
" {base} file.BASE\n"
10391
" {this} file.THIS\n"
10392
" {other} file.OTHER\n"
10393
" {result} output file\n"
10394
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10395
"merge\n"
10396
" succeeds."
10397
msgstr ""
10398
10399
#: en/help_topics/configuration.txt:702
10400
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10401
msgstr ""
10402
10403
#: en/help_topics/configuration.txt:704
10404
msgid ""
10405
"bzr.default_mergetool\n"
10406
"~~~~~~~~~~~~~~~~~~~~~"
10407
msgstr ""
10408
10409
#: en/help_topics/configuration.txt:707
10410
msgid ""
10411
"Specifies which external merge tool (as defined above) should be selected "
10412
"by\n"
10413
"default in tools such as ``bzr qconflicts``."
10414
msgstr ""
10415
10416
#: en/help_topics/configuration.txt:712
10417
msgid " bzr.default_mergetool = kdiff3\n"
10418
msgstr ""
10419
10420
#: en/help_topics/conflict-types.txt:1
10421
msgid ""
10422
"Conflict Types\n"
10423
"=============="
10424
msgstr ""
10425
10426
#: en/help_topics/conflict-types.txt:4
10427
msgid ""
10428
"Some operations, like merge, revert and pull, modify the contents of your\n"
10429
"working tree. These modifications are programmatically generated, and so "
10430
"they\n"
10431
"may conflict with the current state of your working tree. "
10432
msgstr ""
10433
10434
#: en/help_topics/conflict-types.txt:8
10435
msgid ""
10436
"When conflicts are present in your working tree (as shown by ``bzr\n"
10437
"conflicts``), you should resolve them and then inform bzr that the "
10438
"conflicts\n"
10439
"have been resolved."
10440
msgstr ""
10441
10442
#: en/help_topics/conflict-types.txt:12
10443
msgid ""
10444
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10445
"should resolve them is not the one responsible for their occurrence, as is "
10446
"the\n"
10447
"case when merging other people's work or because some conflicts are "
10448
"presented\n"
10449
"in a way that is not easy to understand."
10450
msgstr ""
10451
10452
#: en/help_topics/conflict-types.txt:17
10453
msgid ""
10454
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10455
"conflict if and only if there's an actual conceptual conflict in the source\n"
10456
"tree. Because Bazaar doesn't understand the real meaning of the files "
10457
"being\n"
10458
"versioned, it can, when faced with ambiguities, fall short in either "
10459
"direction\n"
10460
"trying to resolve the conflict itself. Many kinds of changes can be "
10461
"combined\n"
10462
"programmatically, but sometimes only a human can determine the right thing "
10463
"to\n"
10464
"do."
10465
msgstr ""
10466
10467
#: en/help_topics/conflict-types.txt:25
10468
msgid ""
10469
"When Bazaar generates a conflict, it adds information into the working tree "
10470
"to\n"
10471
"present the conflicting versions, and it's up to you to find the correct\n"
10472
"resolution."
10473
msgstr ""
10474
10475
#: en/help_topics/conflict-types.txt:29
10476
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10477
msgstr ""
10478
10479
#: en/help_topics/conflict-types.txt:31
10480
msgid ""
10481
"1. Modify the working tree content so that the conflicted item is now in "
10482
"the\n"
10483
" state you want to keep, then"
10484
msgstr ""
10485
10486
#: en/help_topics/conflict-types.txt:34
10487
msgid ""
10488
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10489
" remaining generated information (``bzr resolve <item>``)."
10490
msgstr ""
10491
10492
#: en/help_topics/conflict-types.txt:37
10493
msgid ""
10494
"For most conflict types, there are some obvious ways to modify the working\n"
10495
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10496
"itself already made a choice, when possible."
10497
msgstr ""
10498
10499
#: en/help_topics/conflict-types.txt:41
10500
msgid ""
10501
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10502
"different ways to resolve the conflict."
10503
msgstr ""
10504
10505
#: en/help_topics/conflict-types.txt:44
10506
msgid ""
10507
"Each type of conflict is explained below, and the action which must be done "
10508
"to\n"
10509
"resolve the conflict is outlined."
10510
msgstr ""
10511
10512
#: en/help_topics/conflict-types.txt:47
10513
msgid ""
10514
"Various actions are available depending on the kind of conflict, for some "
10515
"of\n"
10516
"these actions, Bazaar can provide some help. In the end you should at least\n"
10517
"inform Bazaar that you're done with the conflict with::"
10518
msgstr ""
10519
10520
#: en/help_topics/conflict-types.txt:51
10521
msgid " ``bzr resolve FILE --action=done'"
10522
msgstr ""
10523
10524
#: en/help_topics/conflict-types.txt:53
10525
msgid ""
10526
"Note that this is the default action when a single file is involved so you "
10527
"can\n"
10528
"simply use::"
10529
msgstr ""
10530
10531
#: en/help_topics/conflict-types.txt:56
10532
msgid " ``bzr resolve FILE``"
10533
msgstr ""
10534
10535
#: en/help_topics/conflict-types.txt:58
10536
msgid "See ``bzr help resolve`` for more details."
10537
msgstr ""
10538
10539
#: en/help_topics/conflict-types.txt:60
10540
msgid ""
10541
"Text conflicts\n"
10542
"--------------"
10543
msgstr ""
10544
10545
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10546
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10547
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10548
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10549
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10550
msgid "Typical message::"
10551
msgstr ""
10552
10553
#: en/help_topics/conflict-types.txt:65
10554
msgid " Text conflict in FILE"
10555
msgstr ""
10556
10557
#: en/help_topics/conflict-types.txt:67
10558
msgid ""
10559
"These are produced when a text merge cannot completely reconcile two sets "
10560
"of\n"
10561
"text changes. Bazaar will emit files for each version with the extensions\n"
10562
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10563
"tree,\n"
10564
"i.e. the tree that you are merging changes into. OTHER is the version that "
10565
"you\n"
10566
"are merging into the target. BASE is an older version that is used as a "
10567
"basis\n"
10568
"for comparison."
10569
msgstr ""
10570
10571
#: en/help_topics/conflict-types.txt:74
10572
msgid ""
10573
"In the main copy of the file, Bazaar will include all the changes that it\n"
10574
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10575
"\"herringbone\" markers like ``<<<<<<<``."
10576
msgstr ""
10577
10578
#: en/help_topics/conflict-types.txt:78
10579
msgid ""
10580
"Say the initial text is \"The project leader released it.\", and THIS "
10581
"modifies it\n"
10582
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10583
"leader\n"
10584
"released Bazaar.\" A conflict would look like this::"
10585
msgstr ""
10586
10587
#: en/help_topics/conflict-types.txt:82
10588
msgid ""
10589
" <<<<<<< TREE\n"
10590
" Martin Pool released it.\n"
10591
" =======\n"
10592
" The project leader released Bazaar.\n"
10593
" >>>>>>> MERGE-SOURCE"
10594
msgstr ""
10595
10596
#: en/help_topics/conflict-types.txt:88
10597
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10598
msgstr ""
10599
10600
#: en/help_topics/conflict-types.txt:90
10601
msgid ""
10602
"You can handle text conflicts either by editing the main copy of the file,\n"
10603
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10604
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10605
"set of changes over the other (but see below when you encounter these\n"
10606
"cases). More often, the two sets of changes must be intelligently combined."
10607
msgstr ""
10608
10609
#: en/help_topics/conflict-types.txt:96
10610
msgid ""
10611
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10612
"you are done editing, the file should look like it never had a conflict, and "
10613
"be\n"
10614
"ready to commit."
10615
msgstr ""
10616
10617
#: en/help_topics/conflict-types.txt:100
10618
msgid ""
10619
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10620
"Bazaar will auto-detect which conflicts you have resolved."
10621
msgstr ""
10622
10623
#: en/help_topics/conflict-types.txt:103
10624
msgid ""
10625
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10626
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10627
"working tree."
10628
msgstr ""
10629
10630
#: en/help_topics/conflict-types.txt:107
10631
msgid ""
10632
"\n"
10633
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10634
"resolve`` with one of the following actions:"
10635
msgstr ""
10636
10637
#: en/help_topics/conflict-types.txt:111
10638
msgid ""
10639
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10640
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10641
msgstr ""
10642
10643
#: en/help_topics/conflict-types.txt:114
10644
msgid ""
10645
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10646
"modifications will be taken into account."
10647
msgstr ""
10648
10649
#: en/help_topics/conflict-types.txt:117
10650
msgid ""
10651
"Content conflicts\n"
10652
"-----------------"
10653
msgstr ""
10654
10655
#: en/help_topics/conflict-types.txt:122
10656
msgid " Contents conflict in FILE"
10657
msgstr ""
10658
10659
#: en/help_topics/conflict-types.txt:124
10660
msgid ""
10661
"This conflict happens when there are conflicting changes in the working "
10662
"tree\n"
10663
"and the merge source, but the conflicted items are not text files. They "
10664
"may\n"
10665
"be binary files, or symlinks, or directories. It can even happen with "
10666
"files\n"
10667
"that are deleted on one side, and modified on the other."
10668
msgstr ""
10669
10670
#: en/help_topics/conflict-types.txt:129
10671
msgid ""
10672
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10673
"be\n"
10674
"regular files, symlinks or directories). But it will not include a \"main "
10675
"copy\"\n"
10676
"of the file with herringbone conflict markers. It will appear that the "
10677
"\"main\n"
10678
"copy\" has been renamed to THIS or OTHER."
10679
msgstr ""
10680
10681
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10682
msgid ""
10683
"To resolve that kind of conflict, you should rebuild FILE from either "
10684
"version\n"
10685
"or a combination of both."
10686
msgstr ""
10687
10688
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10689
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10690
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10691
#: en/help_topics/conflict-types.txt:361
10692
msgid "``bzr resolve`` recognizes the following actions:"
10693
msgstr ""
10694
10695
#: en/help_topics/conflict-types.txt:139
10696
msgid ""
10697
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10698
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10699
"* ``--action=done`` will just mark the conflict as resolved."
10700
msgstr ""
10701
10702
#: en/help_topics/conflict-types.txt:143
10703
msgid ""
10704
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10705
"and\n"
10706
"``.OTHER`` files if they are still present in the working tree."
10707
msgstr ""
10708
10709
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10710
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10711
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10712
#: en/help_topics/conflict-types.txt:369
10713
msgid ""
10714
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10715
msgstr ""
10716
10717
#: en/help_topics/conflict-types.txt:148
10718
msgid ""
10719
"Tag conflicts\n"
10720
"-------------"
10721
msgstr ""
10722
10723
#: en/help_topics/conflict-types.txt:153
10724
msgid ""
10725
" Conflicting tags:\n"
10726
" version-0.1"
10727
msgstr ""
10728
10729
#: en/help_topics/conflict-types.txt:156
10730
msgid ""
10731
"When pulling from or pushing to another branch, Bazaar informs you about "
10732
"tags\n"
10733
"that conflict between the two branches; that is the same tag points to two\n"
10734
"different revisions. You need not resolve these conflicts, but subsequent\n"
10735
"uses of pull or push will result in the same message."
10736
msgstr ""
10737
10738
#: en/help_topics/conflict-types.txt:161
10739
msgid ""
10740
"To resolve the conflict, you must apply the correct tags to either the "
10741
"target\n"
10742
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10743
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10744
"target branch's tags match the source branch, then in the target branch do\n"
10745
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10746
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10747
"source\n"
10748
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10749
"favor of the target branch, you need to similarly use ``tag --force`` in "
10750
"the\n"
10751
"source branch. (Note that pulling or pushing using --overwrite will "
10752
"overwrite\n"
10753
"all tags as well.)"
10754
msgstr ""
10755
10756
#: en/help_topics/conflict-types.txt:172
10757
msgid ""
10758
"Duplicate paths\n"
10759
"---------------"
10760
msgstr ""
10761
10762
#: en/help_topics/conflict-types.txt:177
10763
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10764
msgstr ""
10765
10766
#: en/help_topics/conflict-types.txt:179
10767
msgid ""
10768
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10769
"already been used. The existing file will be renamed to \"FILE.moved\". "
10770
msgstr ""
10771
10772
#: en/help_topics/conflict-types.txt:187
10773
msgid ""
10774
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10775
"FILE``,\n"
10776
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10777
"* ``--action=done`` will just mark the conflict as resolved."
10778
msgstr ""
10779
10780
#: en/help_topics/conflict-types.txt:191
10781
msgid ""
10782
"Note that you must get rid of FILE.moved before using ``--action=done``."
10783
msgstr ""
10784
10785
#: en/help_topics/conflict-types.txt:195
10786
msgid ""
10787
"Unversioned parent\n"
10788
"------------------"
10789
msgstr ""
10790
10791
#: en/help_topics/conflict-types.txt:200
10792
msgid ""
10793
" Conflict because FILE is not versioned, but has versioned children."
10794
msgstr ""
10795
10796
#: en/help_topics/conflict-types.txt:202
10797
msgid ""
10798
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10799
"not\n"
10800
"versioned. This happens when the directory has been deleted in the target,\n"
10801
"but has a new child in the source, or vice versa. In this situation, "
10802
"Bazaar\n"
10803
"will version the parent directory as well. Resolving this issue depends\n"
10804
"very much on the particular scenario. You may wish to rename or delete "
10805
"either\n"
10806
"the file or the directory. When you are satisfied, you can run \"bzr "
10807
"resolve\n"
10808
"FILE\" to mark the conflict as resolved."
10809
msgstr ""
10810
10811
#: en/help_topics/conflict-types.txt:210
10812
msgid ""
10813
"Missing parent\n"
10814
"--------------"
10815
msgstr ""
10816
10817
#: en/help_topics/conflict-types.txt:215
10818
msgid " Conflict adding files to FILE. Created directory."
10819
msgstr ""
10820
10821
#: en/help_topics/conflict-types.txt:217
10822
msgid ""
10823
"This happens when a directory has been deleted in the target, but has new\n"
10824
"children in the source. This is similar to the \"unversioned parent\" "
10825
"conflict,\n"
10826
"except that the parent directory does not *exist*, instead of just being\n"
10827
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10828
"Resolving this issue depends very much on the particular scenario."
10829
msgstr ""
10830
10831
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10832
msgid ""
10833
"To resolve that kind of conflict, you should either remove or rename the\n"
10834
"children or the directory or a combination of both."
10835
msgstr ""
10836
10837
#: en/help_topics/conflict-types.txt:228
10838
msgid ""
10839
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10840
" children,\n"
10841
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10842
"children\n"
10843
" and restoring the directory,\n"
10844
"* ``--action=done`` will just mark the conflict as resolved."
10845
msgstr ""
10846
10847
#: en/help_topics/conflict-types.txt:236
10848
msgid ""
10849
"Deleting parent\n"
10850
"---------------"
10851
msgstr ""
10852
10853
#: en/help_topics/conflict-types.txt:241
10854
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10855
msgstr ""
10856
10857
#: en/help_topics/conflict-types.txt:243
10858
msgid ""
10859
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10860
"source, but has new children in the target (either because a directory\n"
10861
"deletion is merged or because the merge introduce new children). Bazaar\n"
10862
"will retain the directory. Resolving this issue depends very much on the\n"
10863
"particular scenario."
10864
msgstr ""
10865
10866
#: en/help_topics/conflict-types.txt:254
10867
msgid ""
10868
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10869
"directory,"
10870
msgstr ""
10871
10872
#: en/help_topics/conflict-types.txt:256
10873
msgid ""
10874
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10875
" children,"
10876
msgstr ""
10877
10878
#: en/help_topics/conflict-types.txt:259
10879
msgid "* ``--action=done`` will just mark the conflict as resolved."
10880
msgstr ""
10881
10882
#: en/help_topics/conflict-types.txt:261
10883
msgid ""
10884
"Note that when merging a directory deletion, if unversioned files are\n"
10885
"present, they become potential orphans has they don't have a directory\n"
10886
"parent anymore."
10887
msgstr ""
10888
10889
#: en/help_topics/conflict-types.txt:265
10890
msgid ""
10891
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10892
"setting the ``bzr.transform.orphan_policy`` configuration option."
10893
msgstr ""
10894
10895
#: en/help_topics/conflict-types.txt:268
10896
msgid "There are two possible values for this option:"
10897
msgstr ""
10898
10899
#: en/help_topics/conflict-types.txt:270
10900
msgid ""
10901
"* ``conflict`` (the default): will leave the orphans in place and\n"
10902
" generate a conflicts,"
10903
msgstr ""
10904
10905
#: en/help_topics/conflict-types.txt:273
10906
msgid ""
10907
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10908
"root\n"
10909
" of the working tree with names like ``<file>.~#~``."
10910
msgstr ""
10911
10912
#: en/help_topics/conflict-types.txt:278
10913
msgid ""
10914
"Path conflict\n"
10915
"-------------"
10916
msgstr ""
10917
10918
#: en/help_topics/conflict-types.txt:283
10919
msgid " Path conflict: PATH1 / PATH2"
10920
msgstr ""
10921
10922
#: en/help_topics/conflict-types.txt:285
10923
msgid ""
10924
"This happens when the source and target have each modified the name or "
10925
"parent\n"
10926
"directory of a file. Bazaar will use the path elements from the source."
10927
msgstr ""
10928
10929
#: en/help_topics/conflict-types.txt:288
10930
msgid ""
10931
"To resolve that kind of conflict, you just have to decide what name should "
10932
"be\n"
10933
"retained for the file involved."
10934
msgstr ""
10935
10936
#: en/help_topics/conflict-types.txt:293
10937
msgid ""
10938
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10939
" issuing ``bzr mv PATH2 PATH1``,\n"
10940
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10941
"``PATH2``,\n"
10942
"* ``--action=done`` will just mark the conflict as resolved."
10943
msgstr ""
10944
10945
#: en/help_topics/conflict-types.txt:300
10946
msgid ""
10947
"Parent loop\n"
10948
"-----------"
10949
msgstr ""
10950
10951
#: en/help_topics/conflict-types.txt:305
10952
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10953
msgstr ""
10954
10955
#: en/help_topics/conflict-types.txt:307
10956
msgid ""
10957
"This happens when the source and the target have each moved directories, so\n"
10958
"that, if the change could be applied, a directory would be contained by "
10959
"itself.\n"
10960
"For example::"
10961
msgstr ""
10962
10963
#: en/help_topics/conflict-types.txt:311
10964
msgid ""
10965
" $ bzr init\n"
10966
" $ bzr mkdir white\n"
10967
" $ bzr mkdir black\n"
10968
" $ bzr commit -m \"BASE\"\n"
10969
" $ bzr branch . ../other\n"
10970
" $ bzr mv white black\n"
10971
" $ bzr commit -m \"THIS\"\n"
10972
" $ bzr mv ../other/black ../other/white\n"
10973
" $ bzr commit ../other -m \"OTHER\"\n"
10974
" $ bzr merge ../other"
10975
msgstr ""
10976
10977
#: en/help_topics/conflict-types.txt:322
10978
msgid ""
10979
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
10980
"``black``. To resolve that kind of conflict, you just have to decide what\n"
10981
"name should be retained for the directories involved."
10982
msgstr ""
10983
10984
#: en/help_topics/conflict-types.txt:328
10985
msgid ""
10986
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
10987
"\n"
10988
" in ``black``,\n"
10989
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
10990
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
10991
"* ``--action=done`` will just mark the conflict as resolved."
10992
msgstr ""
10993
10994
#: en/help_topics/conflict-types.txt:336
10995
msgid ""
10996
"Non-directory parent\n"
10997
"--------------------"
10998
msgstr ""
10999
11000
#: en/help_topics/conflict-types.txt:341
11001
msgid ""
11002
" Conflict: foo.new is not a directory, but has files in it.\n"
11003
" Created directory."
11004
msgstr ""
11005
11006
#: en/help_topics/conflict-types.txt:344
11007
msgid ""
11008
"This happens when one side has added files to a directory, and the other "
11009
"side\n"
11010
"has changed the directory into a file or symlink. For example::"
11011
msgstr ""
11012
11013
#: en/help_topics/conflict-types.txt:347
11014
msgid ""
11015
" $ bzr init\n"
11016
" $ bzr mkdir foo\n"
11017
" $ bzr commit -m \"BASE\"\n"
11018
" $ bzr branch . ../other\n"
11019
" $ rmdir foo\n"
11020
" $ touch foo\n"
11021
" $ bzr commit -m \"THIS\"\n"
11022
" $ bzr mkdir ../other/foo/bar\n"
11023
" $ bzr commit ../other -m \"OTHER\"\n"
11024
" $ bzr merge ../other"
11025
msgstr ""
11026
11027
#: en/help_topics/conflict-types.txt:358
11028
msgid ""
11029
"To resolve that kind of conflict, you have to decide what name should be\n"
11030
"retained for the file, directory or symlink involved."
11031
msgstr ""
11032
11033
#: en/help_topics/conflict-types.txt:363
11034
msgid ""
11035
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11036
" ``bzr add foo``,\n"
11037
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11038
" ``bzr mv foo.new foo``,\n"
11039
"* ``--action=done`` will just mark the conflict as resolved."
11040
msgstr ""
11041
11042
#: en/help_topics/conflict-types.txt:371
11043
msgid ""
11044
"MalformedTransform\n"
11045
"------------------"
11046
msgstr ""
11047
11048
#: en/help_topics/conflict-types.txt:374
11049
msgid ""
11050
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11051
"exception. This means that Bazaar encountered a filesystem conflict that it "
11052
"was\n"
11053
"unable to resolve. This usually indicates a bug. Please let us know if "
11054
"you\n"
11055
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11056
msgstr ""
11057
11058
#: en/help_topics/content-filters.txt:1
11059
msgid ""
11060
"Content Filters\n"
11061
"==============="
11062
msgstr ""
11063
11064
#: en/help_topics/content-filters.txt:4
11065
msgid ""
11066
"Content formats\n"
11067
"---------------"
11068
msgstr ""
11069
11070
#: en/help_topics/content-filters.txt:7
11071
msgid ""
11072
"Bazaar's content filtering allows you to store files in a different\n"
11073
"format from the copy in your working tree. This lets you, or your\n"
11074
"co-developers, use Windows development tools that expect CRLF files\n"
11075
"on projects that use other line-ending conventions. Among other things,\n"
11076
"content filters also let Unix developers more easily work on projects\n"
11077
"using Windows line-ending conventions, keyword expansion/compression,\n"
11078
"and trailing spaces on lines in text files to be implicitly stripped\n"
11079
"when committed."
11080
msgstr ""
11081
11082
#: en/help_topics/content-filters.txt:16
11083
msgid "To generalize, there are two content formats supported by Bazaar:"
11084
msgstr ""
11085
11086
#: en/help_topics/content-filters.txt:18
11087
msgid ""
11088
"* a canonical format - how files are stored internally\n"
11089
"* a convenience format - how files are created in a working tree."
11090
msgstr ""
11091
11092
#: en/help_topics/content-filters.txt:21
11093
msgid ""
11094
"\n"
11095
"Format conversion\n"
11096
"-----------------"
11097
msgstr ""
11098
11099
#: en/help_topics/content-filters.txt:25
11100
msgid ""
11101
"The conversion between these formats is done by content filters.\n"
11102
"A content filter has two parts:"
11103
msgstr ""
11104
11105
#: en/help_topics/content-filters.txt:28
11106
msgid ""
11107
"* a read converter - converts from convenience to canonical format\n"
11108
"* a write converter - converts from canonical to convenience format."
11109
msgstr ""
11110
11111
#: en/help_topics/content-filters.txt:31
11112
msgid ""
11113
"Many of these converters will provide *round-trip* conversion,\n"
11114
"i.e. applying the read converter followed by the write converter\n"
11115
"gives back the original content. However, others may provide an\n"
11116
"asymmetric conversion. For example, a read converter might strip\n"
11117
"trailing whitespace off lines in source code while the matching\n"
11118
"write converter might pass content through unchanged."
11119
msgstr ""
11120
11121
#: en/help_topics/content-filters.txt:38
11122
msgid ""
11123
"\n"
11124
"Enabling content filters\n"
11125
"------------------------"
11126
msgstr ""
11127
11128
#: en/help_topics/content-filters.txt:42
11129
msgid ""
11130
"Content filters are typically provided by plugins, so the first step\n"
11131
"in using them is to install the relevant plugins and read their\n"
11132
"documentation. Some plugins may be very specific about which files\n"
11133
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11134
"In other cases, the plugin may leave it in the user's hands to\n"
11135
"define which files are to be filtered. This is typically done\n"
11136
"using rule-based preferences. See ``bzr help rules`` for general\n"
11137
"information about defining these."
11138
msgstr ""
11139
11140
#: en/help_topics/content-filters.txt:51
11141
msgid ""
11142
"\n"
11143
"Impact on commands\n"
11144
"------------------"
11145
msgstr ""
11146
11147
#: en/help_topics/content-filters.txt:55
11148
msgid ""
11149
"Read converters are only applied to commands that read content from\n"
11150
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11151
"will apply read converters to files in the working tree, then compare\n"
11152
"the results to the content last committed."
11153
msgstr ""
11154
11155
#: en/help_topics/content-filters.txt:60
11156
msgid ""
11157
"Write converters are only applied by commands that **create files in a\n"
11158
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11159
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11160
"respectively."
11161
msgstr ""
11162
11163
#: en/help_topics/content-filters.txt:65
11164
msgid ""
11165
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11166
"comitting files. If this makes sense for a given plugin providing\n"
11167
"a content filter, the plugin can usually achieve this effect by using a\n"
11168
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11169
"for more information on hooks."
11170
msgstr ""
11171
11172
#: en/help_topics/content-filters.txt:71
11173
msgid ""
11174
"\n"
11175
"Refreshing your working tree\n"
11176
"----------------------------"
11177
msgstr ""
11178
11179
#: en/help_topics/content-filters.txt:75
11180
msgid ""
11181
"For performance reasons, Bazaar caches the timestamps of files in\n"
11182
"a working tree, and assumes files are unchanged if their timestamps\n"
11183
"match the cached values. As a consequence, there are times when\n"
11184
"you may need to explicitly ask for content filtering to be reapplied\n"
11185
"in one or both directions, e.g. after installing or reconfiguring\n"
11186
"plugins providing it."
11187
msgstr ""
11188
11189
#: en/help_topics/content-filters.txt:82
11190
msgid "Here are some general guidelines for doing this:"
11191
msgstr ""
11192
11193
#: en/help_topics/content-filters.txt:84
11194
msgid ""
11195
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11196
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11197
" relevant read converters and compare the end result with the\n"
11198
" canonical format."
11199
msgstr ""
11200
11201
#: en/help_topics/content-filters.txt:89
11202
msgid ""
11203
" * To reapply write converters, ensure there are no local changes,\n"
11204
" delete the relevant files and run ``bzr revert`` on those files."
11205
msgstr ""
11206
11207
#: en/help_topics/content-filters.txt:92
11208
msgid ""
11209
"Note: In the future, it is likely that additional options will be added\n"
11210
"to commands to make this refreshing process faster and safer.\n"
11211
msgstr ""
11212
11213
#: en/help_topics/current-formats.txt:1
11214
msgid "Current Storage Formats"
11215
msgstr ""
11216
11217
#: en/help_topics/current-formats.txt:3
11218
msgid ""
11219
":2a:\n"
11220
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11221
" compress storage. Provides rich roots which are a one-way\n"
11222
" transition."
11223
msgstr ""
11224
11225
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11226
msgid ""
11227
"\n"
11228
"See :doc:`formats-help` for more about storage formats."
11229
msgstr ""
11230
11231
#: en/help_topics/debug-flags.txt:1
11232
msgid ""
11233
"Debug Flags\n"
11234
"==========="
11235
msgstr ""
11236
11237
#: en/help_topics/debug-flags.txt:4
11238
msgid ""
11239
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11240
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11241
msgstr ""
11242
11243
#: en/help_topics/debug-flags.txt:7
11244
msgid ""
11245
"-Dauth Trace authentication sections used.\n"
11246
"-Dbytes Print out how many bytes were transferred\n"
11247
"-Ddirstate Trace dirstate activity (verbose!)\n"
11248
"-Derror Instead of normal error handling, always print a "
11249
"traceback\n"
11250
" on error.\n"
11251
"-Devil Capture call sites that do expensive or badly-scaling\n"
11252
" operations.\n"
11253
"-Dfetch Trace history copying between repositories.\n"
11254
"-Dfilters Emit information for debugging content filtering.\n"
11255
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11256
"fetch.\n"
11257
"-Dgraph Trace graph traversal.\n"
11258
"-Dhashcache Log every time a working file is read to determine its "
11259
"hash.\n"
11260
"-Dhooks Trace hook execution.\n"
11261
"-Dhpss Trace smart protocol requests and responses.\n"
11262
"-Dhpssdetail More hpss details.\n"
11263
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11264
"-Dhttp Trace http connections, requests and responses.\n"
11265
"-Dindex Trace major index operations.\n"
11266
"-Dknit Trace knit operations.\n"
11267
"-Dlock Trace when lockdir locks are taken or released.\n"
11268
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11269
" retrying the request.\n"
11270
"-Dprogress Trace progress bar operations.\n"
11271
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11272
"-Dmerge Emit information for debugging merges.\n"
11273
"-Dno_apport Don't use apport to report crashes.\n"
11274
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11275
"-Dpack Emit information about pack operations.\n"
11276
"-Drelock Emit a message every time a branch or repository object "
11277
"is\n"
11278
" unlocked then relocked the same way.\n"
11279
"-Dsftp Trace SFTP internals.\n"
11280
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11281
"expected\n"
11282
"-Dstream Trace fetch streams.\n"
11283
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11284
"portable\n"
11285
" manner.\n"
11286
"-Dunlock Some errors during unlock are treated as warnings.\n"
11287
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11288
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11289
"appropriate\n"
11290
" for the format, even for non-local fetches.\n"
11291
msgstr ""
11292
11293
#: en/help_topics/diverged-branches.txt:1
11294
msgid ""
11295
"Diverged Branches\n"
11296
"================="
11297
msgstr ""
11298
11299
#: en/help_topics/diverged-branches.txt:4
11300
msgid ""
11301
"When Bazaar tries to push one branch onto another, it requires that the\n"
11302
"destination branch must be ready to receive the source branch. If this "
11303
"isn't\n"
11304
"the case, then we say that the branches have ``diverged``. Branches are\n"
11305
"considered diverged if the destination branch's most recent commit is one "
11306
"that\n"
11307
"has not been merged (directly or indirectly) by the source branch. To "
11308
"recover\n"
11309
"from diverged branches, one must merge the missing revisions into the "
11310
"source\n"
11311
"branch."
11312
msgstr ""
11313
11314
#: en/help_topics/diverged-branches.txt:12
11315
msgid ""
11316
"This situation commonly arises when using a centralized workflow with local\n"
11317
"commits. If someone else has committed new work to the mainline since your\n"
11318
"last pull and you have local commits that have not yet been pushed to the\n"
11319
"mainline, then your local branch and the mainline have diverged."
11320
msgstr ""
11321
11322
#: en/help_topics/diverged-branches.txt:17
11323
msgid ""
11324
"Discovering What Has Diverged\n"
11325
"-----------------------------"
11326
msgstr ""
11327
11328
#: en/help_topics/diverged-branches.txt:20
11329
msgid ""
11330
"The ``bzr missing`` command is used to find out what revisions are in "
11331
"another\n"
11332
"branch that are not present in the current branch, and vice-versa. It shows "
11333
"a\n"
11334
"summary of which extra revisions exist in each branch. If you want to see "
11335
"the\n"
11336
"precise effects of those revisions, you can use ``bzr diff --"
11337
"old=other_branch``\n"
11338
"to show the differences between other_branch and your current branch."
11339
msgstr ""
11340
11341
#: en/help_topics/diverged-branches.txt:26
11342
msgid ""
11343
"A Solution\n"
11344
"----------"
11345
msgstr ""
11346
11347
#: en/help_topics/diverged-branches.txt:29
11348
msgid ""
11349
"The solution is to merge the revisions from the mainline into your local\n"
11350
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11351
"mainline. This merge may result in conflicts if the other developer's "
11352
"changes\n"
11353
"overlap with your changes. These conflicts should be resolved before\n"
11354
"continuing. After any conflicts have been resolved, or even if there were "
11355
"no\n"
11356
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11357
"to your local branch. This requirement gives you an opportunity to test "
11358
"the\n"
11359
"resulting working tree for correctness, since the merged revisions could "
11360
"have\n"
11361
"made arbitrary changes. After testing, you should commit the merge using\n"
11362
"``bzr commit``. This clears up the diverged branches situation. Your "
11363
"local\n"
11364
"branch can now be pushed to the mainline.\n"
11365
msgstr ""
11366
11367
#: en/help_topics/eol.txt:1
11368
msgid ""
11369
"End of Line Conversion\n"
11370
"======================"
11371
msgstr ""
11372
11373
#: en/help_topics/eol.txt:4
11374
msgid ""
11375
"EOL conversion is provided as a content filter where Bazaar internally\n"
11376
"stores a canonical format but outputs a convenience format. See\n"
11377
"``bzr help content-filters`` for general information about using these."
11378
msgstr ""
11379
11380
#: en/help_topics/eol.txt:8
11381
msgid ""
11382
"Note: Content filtering is only supported in recently added formats,\n"
11383
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11384
"in a recent format. (Just setting the format on the repository\n"
11385
"is not enough.) If content filtering does not appear to be working, use\n"
11386
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11387
"or later."
11388
msgstr ""
11389
11390
#: en/help_topics/eol.txt:15
11391
msgid ""
11392
"EOL conversion needs to be enabled for selected file patterns using\n"
11393
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11394
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11395
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11396
"supported in a future verison of Bazaar."
11397
msgstr ""
11398
11399
#: en/help_topics/eol.txt:21
11400
msgid ""
11401
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11402
"(If a value is not set, ``exact`` is the default.)"
11403
msgstr ""
11404
11405
#: en/help_topics/eol.txt:24
11406
msgid ""
11407
" ========== ===================================== ======================\n"
11408
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11409
" ========== ===================================== ======================\n"
11410
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11411
" ---------- ------------------------------------- ----------------------\n"
11412
" ``lf`` ``lf`` ``lf``\n"
11413
" ---------- ------------------------------------- ----------------------\n"
11414
" ``crlf`` ``crlf`` ``lf``\n"
11415
" ---------- ------------------------------------- ----------------------\n"
11416
" ``exact`` No conversion Exactly as in file\n"
11417
" ========== ===================================== ======================"
11418
msgstr ""
11419
11420
#: en/help_topics/eol.txt:36
11421
msgid ""
11422
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11423
"byte is detected in the file."
11424
msgstr ""
11425
11426
#: en/help_topics/eol.txt:39
11427
msgid ""
11428
"For users working on a cross-platform project, here is a suggested rule\n"
11429
"to use as a starting point::"
11430
msgstr ""
11431
11432
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11433
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11434
msgid ""
11435
" [name *]\n"
11436
" eol = native"
11437
msgstr ""
11438
11439
#: en/help_topics/eol.txt:45
11440
msgid ""
11441
"If you have binary files that do not contain a null byte though, be\n"
11442
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11443
"by giving more explicit patterns earlier in the rules file. For example::"
11444
msgstr ""
11445
11446
#: en/help_topics/eol.txt:49
11447
msgid ""
11448
" [name *.png]\n"
11449
" eol = exact"
11450
msgstr ""
11451
11452
#: en/help_topics/eol.txt:55
11453
msgid ""
11454
"If your working tree is on a network drive shared by users on different\n"
11455
"operating systems, you typically want to force certain conventions for\n"
11456
"certain files. In that way, if a file is created with the wrong line\n"
11457
"endings or line endings get mixed during editing, it gets committed\n"
11458
"correctly and gets checked out correctly. For example::"
11459
msgstr ""
11460
11461
#: en/help_topics/eol.txt:61
11462
msgid ""
11463
" [name *.bat]\n"
11464
" eol = crlf"
11465
msgstr ""
11466
11467
#: en/help_topics/eol.txt:64
11468
msgid ""
11469
" [name *.sh]\n"
11470
" eol = lf"
11471
msgstr ""
11472
11473
#: en/help_topics/eol.txt:70
11474
msgid ""
11475
"If you take the care to create files with their required endings, you can\n"
11476
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11477
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11478
"introducing mixed line endings will be corrected during commit for files\n"
11479
"with those settings."
11480
msgstr ""
11481
11482
#: en/help_topics/eol.txt:76
11483
msgid ""
11484
"If you have sample test data that deliberately has text files with mixed\n"
11485
"newline conventions, you can ask for those to be left alone like this::"
11486
msgstr ""
11487
11488
#: en/help_topics/eol.txt:79
11489
msgid ""
11490
" [name test_data/]\n"
11491
" eol = exact"
11492
msgstr ""
11493
11494
#: en/help_topics/eol.txt:85
11495
msgid ""
11496
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11497
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11498
"of content analysis to detect binary files for commands like ``diff``.\n"
11499
"In the future, a ``binary = true`` rule may be added but it is not\n"
11500
"supported yet.)"
11501
msgstr ""
11502
11503
#: en/help_topics/eol.txt:91
11504
msgid ""
11505
"If you have an existing repository with text files already stored using\n"
11506
"Windows newline conventions (``crlf``), then you may want to keep using "
11507
"that\n"
11508
"convention in the repository. Forcing certain files to this convention\n"
11509
"may also help users who do not have rules configured. To do this, set\n"
11510
"``eol`` to one of the values below."
11511
msgstr ""
11512
11513
#: en/help_topics/eol.txt:97
11514
msgid ""
11515
" ============================ ======================== "
11516
"======================\n"
11517
" Value Checkout end-of-lines as Commit end-of-lines "
11518
"as\n"
11519
" ============================ ======================== "
11520
"======================\n"
11521
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11522
" ``lf`` otherwise\n"
11523
" ---------------------------- ------------------------ ----------------------"
11524
"\n"
11525
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11526
" ---------------------------- ------------------------ ----------------------"
11527
"\n"
11528
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11529
" ============================ ======================== ======================"
11530
msgstr ""
11531
11532
#: en/help_topics/eol.txt:108
11533
msgid ""
11534
"For users working on an existing project that uses Windows newline\n"
11535
"conventions in their Bazaar repository, this rule is suggested as a\n"
11536
"starting point::"
11537
msgstr ""
11538
11539
#: en/help_topics/eol.txt:112
11540
msgid ""
11541
" [name *]\n"
11542
" eol = native-with-crlf-in-repo"
11543
msgstr ""
11544
11545
#: en/help_topics/eol.txt:115
11546
msgid ""
11547
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11548
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11549
"``crlf`` and ``exact``."
11550
msgstr ""
11551
11552
#: en/help_topics/eol.txt:119
11553
msgid ""
11554
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11555
"never reject files because a given line ending or mixed line endings\n"
11556
"are found. A precommit hook should be used if you wish to validate\n"
11557
"(and not just convert) content before committing.\n"
11558
msgstr ""
11559
11560
#: en/help_topics/hidden-commands.txt:1
11561
msgid ""
11562
"added List files added in working tree.\n"
11563
"ancestry List all revisions merged into this branch.\n"
11564
"assert-fail Test reporting of assertion failures\n"
11565
"bundle-info Output interesting stats about a bundle\n"
11566
"bundle-revisions Create a merge-directive for submitting changes.\n"
11567
"cat-revision Write out metadata for a revision.\n"
11568
"dump-btree Dump the contents of a btree index file to stdout.\n"
11569
"export-pot Export command helps and error messages in po format.\n"
11570
"file-id Print file_id of a particular file or directory.\n"
11571
"file-path Print path of file_ids to a file or directory.\n"
11572
"find-merge-base Find and print a base revision for merging two "
11573
"branches.\n"
11574
"hooks Show hooks.\n"
11575
"inventory Show inventory of the current working copy or a "
11576
"revision.\n"
11577
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11578
"lookup-revision Lookup the revision-id from a revision-number\n"
11579
"merge-directive Generate a merge directive for auto-merge tools.\n"
11580
"modified List files modified in working tree.\n"
11581
"re-sign Create a digital signature for an existing revision.\n"
11582
"reference list, view and set branch locations for nested trees.\n"
11583
"relpath Show path of a file relative to root\n"
11584
"repair-workingtree Reset the working tree state file.\n"
11585
"revision-history Display the list of revision ids on a branch.\n"
11586
"revision-info Show revision number and revision id for a given "
11587
"revision\n"
11588
" identifier.\n"
11589
"rocks Statement of optimism.\n"
11590
"selftest Run internal test suite.\n"
11591
"shell-complete Show appropriate completions for context.\n"
11592
"test-script Run a shell-like test from a file.\n"
11593
"touching-revisions Return revision-ids which affected a particular file.\n"
11594
"unknowns List unknown files.\n"
11595
"wait-until-signalled Test helper for\n"
11596
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11597
msgstr ""
11598
11599
#: en/help_topics/hooks.txt:1
11600
msgid ""
11601
"\n"
11602
"Hooks\n"
11603
"====="
11604
msgstr ""
11605
11606
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11607
msgid ""
11608
"Introduction\n"
11609
"------------"
11610
msgstr ""
11611
11612
#: en/help_topics/hooks.txt:8
11613
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11614
msgstr ""
11615
11616
#: en/help_topics/hooks.txt:10
11617
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11618
msgstr ""
11619
11620
#: en/help_topics/hooks.txt:12
11621
msgid ""
11622
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11623
msgstr ""
11624
11625
#: en/help_topics/hooks.txt:14
11626
msgid ""
11627
"The class that contains each hook is given before the hooks it supplies. "
11628
"For\n"
11629
"instance, BranchHooks as the class is the hooks class for\n"
11630
"`bzrlib.branch.Branch.hooks`."
11631
msgstr ""
11632
11633
#: en/help_topics/hooks.txt:18
11634
msgid ""
11635
"Each description also indicates whether the hook runs on the client (the\n"
11636
"machine where bzr was invoked) or the server (the machine addressed by\n"
11637
"the branch URL). These may be, but are not necessarily, the same machine."
11638
msgstr ""
11639
11640
#: en/help_topics/hooks.txt:22
11641
msgid ""
11642
"Plugins (including hooks) are run on the server if all of these is true:"
11643
msgstr ""
11644
11645
#: en/help_topics/hooks.txt:24
11646
msgid ""
11647
" * The connection is via a smart server (accessed with a URL starting with\n"
11648
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11649
"\"http://\"\n"
11650
" URL when a smart server is available via HTTP)."
11651
msgstr ""
11652
11653
#: en/help_topics/hooks.txt:28
11654
msgid ""
11655
" * The hook is either server specific or part of general infrastructure "
11656
"rather\n"
11657
" than client specific code (such as commit)."
11658
msgstr ""
11659
11660
#: en/help_topics/hooks.txt:31
11661
msgid ""
11662
"\n"
11663
"BranchHooks\n"
11664
"-----------"
11665
msgstr ""
11666
11667
#: en/help_topics/hooks.txt:35
11668
msgid ""
11669
"automatic_tag_name\n"
11670
"~~~~~~~~~~~~~~~~~~"
11671
msgstr ""
11672
11673
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11674
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11675
msgid "Introduced in: 2.2"
11676
msgstr ""
11677
11678
#: en/help_topics/hooks.txt:40
11679
msgid ""
11680
"Called to determine an automatic tag name for a revision.\n"
11681
"automatic_tag_name is called with (branch, revision_id) and should\n"
11682
"return a tag name or None if no tag name could be determined. The\n"
11683
"first non-None tag name returned will be used."
11684
msgstr ""
11685
11686
#: en/help_topics/hooks.txt:45
11687
msgid ""
11688
"open\n"
11689
"~~~~"
11690
msgstr ""
11691
11692
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11693
#: en/help_topics/hooks.txt:304
11694
msgid "Introduced in: 1.8"
11695
msgstr ""
11696
11697
#: en/help_topics/hooks.txt:50
11698
msgid ""
11699
"Called with the Branch object that has been opened after a branch is\n"
11700
"opened."
11701
msgstr ""
11702
11703
#: en/help_topics/hooks.txt:53
11704
msgid ""
11705
"post_branch_init\n"
11706
"~~~~~~~~~~~~~~~~"
11707
msgstr ""
11708
11709
#: en/help_topics/hooks.txt:58
11710
msgid ""
11711
"Called after new branch initialization completes. post_branch_init is\n"
11712
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11713
"branch and checkout (both heavyweight and lightweight) will all\n"
11714
"trigger this hook."
11715
msgstr ""
11716
11717
#: en/help_topics/hooks.txt:63
11718
msgid ""
11719
"post_change_branch_tip\n"
11720
"~~~~~~~~~~~~~~~~~~~~~~"
11721
msgstr ""
11722
11723
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11724
msgid "Introduced in: 1.4"
11725
msgstr ""
11726
11727
#: en/help_topics/hooks.txt:68
11728
msgid ""
11729
"Called in bzr client and server after a change to the tip of a branch\n"
11730
"is made. post_change_branch_tip is called with a\n"
11731
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11732
"uncommit will all trigger this hook."
11733
msgstr ""
11734
11735
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11736
msgid ""
11737
"post_commit\n"
11738
"~~~~~~~~~~~"
11739
msgstr ""
11740
11741
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11742
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11743
#: en/help_topics/hooks.txt:145
11744
msgid "Introduced in: 0.15"
11745
msgstr ""
11746
11747
#: en/help_topics/hooks.txt:78
11748
msgid ""
11749
"Called in the bzr client after a commit has completed. post_commit is\n"
11750
"called with (local, master, old_revno, old_revid, new_revno,\n"
11751
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11752
"branch."
11753
msgstr ""
11754
11755
#: en/help_topics/hooks.txt:83
11756
msgid ""
11757
"post_pull\n"
11758
"~~~~~~~~~"
11759
msgstr ""
11760
11761
#: en/help_topics/hooks.txt:88
11762
msgid ""
11763
"Called after a pull operation completes. post_pull is called with a\n"
11764
"bzrlib.branch.PullResult object and only runs in the bzr client."
11765
msgstr ""
11766
11767
#: en/help_topics/hooks.txt:91
11768
msgid ""
11769
"post_push\n"
11770
"~~~~~~~~~"
11771
msgstr ""
11772
11773
#: en/help_topics/hooks.txt:96
11774
msgid ""
11775
"Called after a push operation completes. post_push is called with a\n"
11776
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11777
msgstr ""
11778
11779
#: en/help_topics/hooks.txt:99
11780
msgid ""
11781
"post_switch\n"
11782
"~~~~~~~~~~~"
11783
msgstr ""
11784
11785
#: en/help_topics/hooks.txt:104
11786
msgid ""
11787
"Called after a checkout switches branch. post_switch is called with a\n"
11788
"bzrlib.branch.SwitchHookParams."
11789
msgstr ""
11790
11791
#: en/help_topics/hooks.txt:107
11792
msgid ""
11793
"post_uncommit\n"
11794
"~~~~~~~~~~~~~"
11795
msgstr ""
11796
11797
#: en/help_topics/hooks.txt:112
11798
msgid ""
11799
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11800
"called with (local, master, old_revno, old_revid, new_revno,\n"
11801
"new_revid) where local is the local branch or None, master is the\n"
11802
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11803
"of None."
11804
msgstr ""
11805
11806
#: en/help_topics/hooks.txt:118
11807
msgid ""
11808
"pre_change_branch_tip\n"
11809
"~~~~~~~~~~~~~~~~~~~~~"
11810
msgstr ""
11811
11812
#: en/help_topics/hooks.txt:121
11813
msgid "Introduced in: 1.6"
11814
msgstr ""
11815
11816
#: en/help_topics/hooks.txt:123
11817
msgid ""
11818
"Called in bzr client and server before a change to the tip of a branch\n"
11819
"is made. pre_change_branch_tip is called with a\n"
11820
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11821
"uncommit will all trigger this hook."
11822
msgstr ""
11823
11824
#: en/help_topics/hooks.txt:128
11825
msgid ""
11826
"pre_commit\n"
11827
"~~~~~~~~~~"
11828
msgstr ""
11829
11830
#: en/help_topics/hooks.txt:131
11831
msgid "Introduced in: 0.91"
11832
msgstr ""
11833
11834
#: en/help_topics/hooks.txt:133
11835
msgid ""
11836
"Called after a commit is calculated but before it is completed.\n"
11837
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11838
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11839
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11840
"TreeDelta object describing changes from the basis revision. hooks\n"
11841
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11842
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11843
"tree."
11844
msgstr ""
11845
11846
#: en/help_topics/hooks.txt:142
11847
msgid ""
11848
"set_rh\n"
11849
"~~~~~~"
11850
msgstr ""
11851
11852
#: en/help_topics/hooks.txt:147
11853
msgid ""
11854
"Invoked whenever the revision history has been set via\n"
11855
"set_revision_history. The api signature is (branch, revision_history),\n"
11856
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11857
"for bzr to trigger, a better hook to use is\n"
11858
"Branch.post_change_branch_tip."
11859
msgstr ""
11860
11861
#: en/help_topics/hooks.txt:153
11862
msgid ""
11863
"transform_fallback_location\n"
11864
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11865
msgstr ""
11866
11867
#: en/help_topics/hooks.txt:156
11868
msgid "Introduced in: 1.9"
11869
msgstr ""
11870
11871
#: en/help_topics/hooks.txt:158
11872
msgid ""
11873
"Called when a stacked branch is activating its fallback locations.\n"
11874
"transform_fallback_location is called with (branch, url), and should\n"
11875
"return a new url. Returning the same url allows it to be used as-is,\n"
11876
"returning a different one can be used to cause the branch to stack on\n"
11877
"a closer copy of that fallback_location. Note that the branch cannot\n"
11878
"have history accessing methods called on it during this hook because\n"
11879
"the fallback locations have not been activated. When there are\n"
11880
"multiple hooks installed for transform_fallback_location, all are\n"
11881
"called with the url returned from the previous hook.The order is\n"
11882
"however undefined."
11883
msgstr ""
11884
11885
#: en/help_topics/hooks.txt:169
11886
msgid ""
11887
"CommandHooks\n"
11888
"------------"
11889
msgstr ""
11890
11891
#: en/help_topics/hooks.txt:172
11892
msgid ""
11893
"extend_command\n"
11894
"~~~~~~~~~~~~~~"
11895
msgstr ""
11896
11897
#: en/help_topics/hooks.txt:175
11898
msgid "Introduced in: 1.13"
11899
msgstr ""
11900
11901
#: en/help_topics/hooks.txt:177
11902
msgid ""
11903
"Called after creating a command object to allow modifications such as\n"
11904
"adding or removing options, docs etc. Called with the new\n"
11905
"bzrlib.commands.Command object."
11906
msgstr ""
11907
11908
#: en/help_topics/hooks.txt:181
11909
msgid ""
11910
"get_command\n"
11911
"~~~~~~~~~~~"
11912
msgstr ""
11913
11914
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11915
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
11916
msgid "Introduced in: 1.17"
11917
msgstr ""
11918
11919
#: en/help_topics/hooks.txt:186
11920
msgid ""
11921
"Called when creating a single command. Called with (cmd_or_None,\n"
11922
"command_name). get_command should either return the cmd_or_None\n"
11923
"parameter, or a replacement Command object that should be used for the\n"
11924
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11925
"Many users will prefer to use bzrlib.commands.register_command or\n"
11926
"plugin_cmds.register_lazy."
11927
msgstr ""
11928
11929
#: en/help_topics/hooks.txt:193
11930
msgid ""
11931
"get_missing_command\n"
11932
"~~~~~~~~~~~~~~~~~~~"
11933
msgstr ""
11934
11935
#: en/help_topics/hooks.txt:198
11936
msgid ""
11937
"Called when creating a single command if no command could be found.\n"
11938
"Called with (command_name). get_missing_command should either return\n"
11939
"None, or a Command object to be used for the command."
11940
msgstr ""
11941
11942
#: en/help_topics/hooks.txt:202
11943
msgid ""
11944
"list_commands\n"
11945
"~~~~~~~~~~~~~"
11946
msgstr ""
11947
11948
#: en/help_topics/hooks.txt:207
11949
msgid ""
11950
"Called when enumerating commands. Called with a set of cmd_name\n"
11951
"strings for all the commands found so far. This set is safe to mutate\n"
11952
"- e.g. to remove a command. list_commands should return the updated\n"
11953
"set of command names."
11954
msgstr ""
11955
11956
#: en/help_topics/hooks.txt:212
11957
msgid ""
11958
"_ConfigHooks\n"
11959
"------------"
11960
msgstr ""
11961
11962
#: en/help_topics/hooks.txt:215
11963
msgid ""
11964
"get\n"
11965
"~~~"
11966
msgstr ""
11967
11968
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11969
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11970
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11971
#: en/help_topics/hooks.txt:443
11972
msgid "Introduced in: 2.4"
11973
msgstr ""
11974
11975
#: en/help_topics/hooks.txt:220
11976
msgid ""
11977
"Invoked when a config option is read. The signature is (stack, name,\n"
11978
"value)."
11979
msgstr ""
11980
11981
#: en/help_topics/hooks.txt:223
11982
msgid ""
11983
"load\n"
11984
"~~~~"
11985
msgstr ""
11986
11987
#: en/help_topics/hooks.txt:228
11988
msgid "Invoked when a config store is loaded. The signature is (store)."
11989
msgstr ""
11990
11991
#: en/help_topics/hooks.txt:230
11992
msgid ""
11993
"remove\n"
11994
"~~~~~~"
11995
msgstr ""
11996
11997
#: en/help_topics/hooks.txt:235
11998
msgid ""
11999
"Invoked when a config option is removed. The signature is (stack,\n"
12000
"name)."
12001
msgstr ""
12002
12003
#: en/help_topics/hooks.txt:238
12004
msgid ""
12005
"save\n"
12006
"~~~~"
12007
msgstr ""
12008
12009
#: en/help_topics/hooks.txt:243
12010
msgid "Invoked when a config store is saved. The signature is (store)."
12011
msgstr ""
12012
12013
#: en/help_topics/hooks.txt:245
12014
msgid ""
12015
"set\n"
12016
"~~~"
12017
msgstr ""
12018
12019
#: en/help_topics/hooks.txt:250
12020
msgid ""
12021
"Invoked when a config option is set. The signature is (stack, name,\n"
12022
"value)."
12023
msgstr ""
12024
12025
#: en/help_topics/hooks.txt:253
12026
msgid ""
12027
"ControlDirHooks\n"
12028
"---------------"
12029
msgstr ""
12030
12031
#: en/help_topics/hooks.txt:256
12032
msgid ""
12033
"post_repo_init\n"
12034
"~~~~~~~~~~~~~~"
12035
msgstr ""
12036
12037
#: en/help_topics/hooks.txt:261
12038
msgid ""
12039
"Invoked after a repository has been initialized. post_repo_init is\n"
12040
"called with a bzrlib.controldir.RepoInitHookParams."
12041
msgstr ""
12042
12043
#: en/help_topics/hooks.txt:264
12044
msgid ""
12045
"pre_open\n"
12046
"~~~~~~~~"
12047
msgstr ""
12048
12049
#: en/help_topics/hooks.txt:267
12050
msgid "Introduced in: 1.14"
12051
msgstr ""
12052
12053
#: en/help_topics/hooks.txt:269
12054
msgid ""
12055
"Invoked before attempting to open a ControlDir with the transport that\n"
12056
"the open will use."
12057
msgstr ""
12058
12059
#: en/help_topics/hooks.txt:272
12060
msgid ""
12061
"InfoHooks\n"
12062
"---------"
12063
msgstr ""
12064
12065
#: en/help_topics/hooks.txt:275
12066
msgid ""
12067
"repository\n"
12068
"~~~~~~~~~~"
12069
msgstr ""
12070
12071
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12072
#: en/help_topics/hooks.txt:521
12073
msgid "Introduced in: 1.15"
12074
msgstr ""
12075
12076
#: en/help_topics/hooks.txt:280
12077
msgid ""
12078
"Invoked when displaying the statistics for a repository. repository is\n"
12079
"called with a statistics dictionary as returned by the repository and\n"
12080
"a file-like object to write to."
12081
msgstr ""
12082
12083
#: en/help_topics/hooks.txt:284
12084
msgid ""
12085
"LockHooks\n"
12086
"---------"
12087
msgstr ""
12088
12089
#: en/help_topics/hooks.txt:287
12090
msgid ""
12091
"lock_acquired\n"
12092
"~~~~~~~~~~~~~"
12093
msgstr ""
12094
12095
#: en/help_topics/hooks.txt:292
12096
msgid ""
12097
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12098
msgstr ""
12099
12100
#: en/help_topics/hooks.txt:294
12101
msgid ""
12102
"lock_broken\n"
12103
"~~~~~~~~~~~"
12104
msgstr ""
12105
12106
#: en/help_topics/hooks.txt:299
12107
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12108
msgstr ""
12109
12110
#: en/help_topics/hooks.txt:301
12111
msgid ""
12112
"lock_released\n"
12113
"~~~~~~~~~~~~~"
12114
msgstr ""
12115
12116
#: en/help_topics/hooks.txt:306
12117
msgid ""
12118
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12119
msgstr ""
12120
12121
#: en/help_topics/hooks.txt:308
12122
msgid ""
12123
"MergeHooks\n"
12124
"----------"
12125
msgstr ""
12126
12127
#: en/help_topics/hooks.txt:311
12128
msgid ""
12129
"merge_file_content\n"
12130
"~~~~~~~~~~~~~~~~~~"
12131
msgstr ""
12132
12133
#: en/help_topics/hooks.txt:314
12134
msgid "Introduced in: 2.1"
12135
msgstr ""
12136
12137
#: en/help_topics/hooks.txt:316
12138
msgid ""
12139
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12140
"object when starting a merge. Should return either None or a subclass\n"
12141
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12142
"called per file that needs to be merged (including when one side has\n"
12143
"deleted the file and the other has changed it). See the\n"
12144
"AbstractPerFileMerger API docs for details on how it is used by merge."
12145
msgstr ""
12146
12147
#: en/help_topics/hooks.txt:323
12148
msgid ""
12149
"post_merge\n"
12150
"~~~~~~~~~~"
12151
msgstr ""
12152
12153
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12154
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12155
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12156
msgid "Introduced in: 2.5"
12157
msgstr ""
12158
12159
#: en/help_topics/hooks.txt:328
12160
msgid ""
12161
"Called after a merge. Receives a Merger object as the single argument.\n"
12162
"The return value is ignored."
12163
msgstr ""
12164
12165
#: en/help_topics/hooks.txt:331
12166
msgid ""
12167
"pre_merge\n"
12168
"~~~~~~~~~"
12169
msgstr ""
12170
12171
#: en/help_topics/hooks.txt:336
12172
msgid ""
12173
"Called before a merge. Receives a Merger object as the single\n"
12174
"argument."
12175
msgstr ""
12176
12177
#: en/help_topics/hooks.txt:339
12178
msgid ""
12179
"MergeDirectiveHooks\n"
12180
"-------------------"
12181
msgstr ""
12182
12183
#: en/help_topics/hooks.txt:342
12184
msgid ""
12185
"merge_request_body\n"
12186
"~~~~~~~~~~~~~~~~~~"
12187
msgstr ""
12188
12189
#: en/help_topics/hooks.txt:345
12190
msgid "Introduced in: 1.15.0"
12191
msgstr ""
12192
12193
#: en/help_topics/hooks.txt:347
12194
msgid ""
12195
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12196
"request. Callbacks must return a body. If more than one callback is\n"
12197
"registered, the output of one callback is provided to the next."
12198
msgstr ""
12199
12200
#: en/help_topics/hooks.txt:351
12201
msgid ""
12202
"MessageEditorHooks\n"
12203
"------------------"
12204
msgstr ""
12205
12206
#: en/help_topics/hooks.txt:354
12207
msgid ""
12208
"commit_message_template\n"
12209
"~~~~~~~~~~~~~~~~~~~~~~~"
12210
msgstr ""
12211
12212
#: en/help_topics/hooks.txt:357
12213
msgid "Introduced in: 1.10"
12214
msgstr ""
12215
12216
#: en/help_topics/hooks.txt:359
12217
msgid ""
12218
"Called when a commit message is being generated.\n"
12219
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12220
"and the message that is known so far. commit_message_template must\n"
12221
"return a new message to use (which could be the same as it was given).\n"
12222
"When there are multiple hooks registered for commit_message_template,\n"
12223
"they are chained with the result from the first passed into the\n"
12224
"second, and so on."
12225
msgstr ""
12226
12227
#: en/help_topics/hooks.txt:367
12228
msgid ""
12229
"set_commit_message\n"
12230
"~~~~~~~~~~~~~~~~~~"
12231
msgstr ""
12232
12233
#: en/help_topics/hooks.txt:372
12234
msgid ""
12235
"Set a fixed commit message. set_commit_message is called with the\n"
12236
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12237
"properties by editing commit.builder._revprops) and the message so\n"
12238
"far. set_commit_message must return the message to use or None if it\n"
12239
"should use the message editor as normal."
12240
msgstr ""
12241
12242
#: en/help_topics/hooks.txt:378
12243
msgid ""
12244
"MutableTreeHooks\n"
12245
"----------------"
12246
msgstr ""
12247
12248
#: en/help_topics/hooks.txt:381
12249
msgid ""
12250
"post_build_tree\n"
12251
"~~~~~~~~~~~~~~~"
12252
msgstr ""
12253
12254
#: en/help_topics/hooks.txt:386
12255
msgid ""
12256
"Called after a completely new tree is built. The hook is called with\n"
12257
"the tree as its only argument."
12258
msgstr ""
12259
12260
#: en/help_topics/hooks.txt:392
12261
msgid "Introduced in: 2.0"
12262
msgstr ""
12263
12264
#: en/help_topics/hooks.txt:394
12265
msgid ""
12266
"Called after a commit is performed on a tree. The hook is called with\n"
12267
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12268
"commit was performed on is available via the mutable_tree attribute of\n"
12269
"that object."
12270
msgstr ""
12271
12272
#: en/help_topics/hooks.txt:399
12273
msgid ""
12274
"post_transform\n"
12275
"~~~~~~~~~~~~~~"
12276
msgstr ""
12277
12278
#: en/help_topics/hooks.txt:404
12279
msgid ""
12280
"Called after a tree transform has been performed on a tree. The hook\n"
12281
"is called with the tree that is being transformed and the transform."
12282
msgstr ""
12283
12284
#: en/help_topics/hooks.txt:407
12285
msgid ""
12286
"pre_transform\n"
12287
"~~~~~~~~~~~~~"
12288
msgstr ""
12289
12290
#: en/help_topics/hooks.txt:412
12291
msgid ""
12292
"Called before a tree transform on this tree. The hook is called with\n"
12293
"the tree that is being transformed and the transform."
12294
msgstr ""
12295
12296
#: en/help_topics/hooks.txt:415
12297
msgid ""
12298
"start_commit\n"
12299
"~~~~~~~~~~~~"
12300
msgstr ""
12301
12302
#: en/help_topics/hooks.txt:420
12303
msgid ""
12304
"Called before a commit is performed on a tree. The start commit hook\n"
12305
"is able to change the tree before the commit takes place. start_commit\n"
12306
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12307
"being performed on."
12308
msgstr ""
12309
12310
#: en/help_topics/hooks.txt:425
12311
msgid ""
12312
"SmartClientHooks\n"
12313
"----------------"
12314
msgstr ""
12315
12316
#: en/help_topics/hooks.txt:428
12317
msgid ""
12318
"call\n"
12319
"~~~~"
12320
msgstr ""
12321
12322
#: en/help_topics/hooks.txt:431
12323
msgid "Introduced in: unknown"
12324
msgstr ""
12325
12326
#: en/help_topics/hooks.txt:433
12327
msgid ""
12328
"Called when the smart client is submitting a request to the smart\n"
12329
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12330
"Streaming request bodies, and responses, are not accessible."
12331
msgstr ""
12332
12333
#: en/help_topics/hooks.txt:437
12334
msgid ""
12335
"SmartServerHooks\n"
12336
"----------------"
12337
msgstr ""
12338
12339
#: en/help_topics/hooks.txt:440
12340
msgid ""
12341
"server_exception\n"
12342
"~~~~~~~~~~~~~~~~"
12343
msgstr ""
12344
12345
#: en/help_topics/hooks.txt:445
12346
msgid ""
12347
"Called by the bzr server when an exception occurs. server_exception is\n"
12348
"called with the sys.exc_info() tuple return true for the hook if the\n"
12349
"exception has been handled, in which case the server will exit\n"
12350
"normally."
12351
msgstr ""
12352
12353
#: en/help_topics/hooks.txt:450
12354
msgid ""
12355
"server_started\n"
12356
"~~~~~~~~~~~~~~"
12357
msgstr ""
12358
12359
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12360
msgid "Introduced in: 0.16"
12361
msgstr ""
12362
12363
#: en/help_topics/hooks.txt:455
12364
msgid ""
12365
"Called by the bzr server when it starts serving a directory.\n"
12366
"server_started is called with (backing urls, public url), where\n"
12367
"backing_url is a list of URLs giving the server-specific directory\n"
12368
"locations, and public_url is the public URL for the directory being\n"
12369
"served."
12370
msgstr ""
12371
12372
#: en/help_topics/hooks.txt:461
12373
msgid ""
12374
"server_started_ex\n"
12375
"~~~~~~~~~~~~~~~~~"
12376
msgstr ""
12377
12378
#: en/help_topics/hooks.txt:466
12379
msgid ""
12380
"Called by the bzr server when it starts serving a directory.\n"
12381
"server_started is called with (backing_urls, server_obj)."
12382
msgstr ""
12383
12384
#: en/help_topics/hooks.txt:469
12385
msgid ""
12386
"server_stopped\n"
12387
"~~~~~~~~~~~~~~"
12388
msgstr ""
12389
12390
#: en/help_topics/hooks.txt:474
12391
msgid ""
12392
"Called by the bzr server when it stops serving a directory.\n"
12393
"server_stopped is called with the same parameters as the\n"
12394
"server_started hook: (backing_urls, public_url)."
12395
msgstr ""
12396
12397
#: en/help_topics/hooks.txt:478
12398
msgid ""
12399
"StatusHooks\n"
12400
"-----------"
12401
msgstr ""
12402
12403
#: en/help_topics/hooks.txt:481
12404
msgid ""
12405
"post_status\n"
12406
"~~~~~~~~~~~"
12407
msgstr ""
12408
12409
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12410
msgid "Introduced in: 2.3"
12411
msgstr ""
12412
12413
#: en/help_topics/hooks.txt:486
12414
msgid ""
12415
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12416
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12417
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12418
"correspond to the command line options specified by the user for the\n"
12419
"status command. to_file is the output stream for writing."
12420
msgstr ""
12421
12422
#: en/help_topics/hooks.txt:492
12423
msgid ""
12424
"pre_status\n"
12425
"~~~~~~~~~~"
12426
msgstr ""
12427
12428
#: en/help_topics/hooks.txt:497
12429
msgid ""
12430
"Called with argument StatusHookParams before Bazaar displays the\n"
12431
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12432
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12433
"correspond to the command line options specified by the user for the\n"
12434
"status command. to_file is the output stream for writing."
12435
msgstr ""
12436
12437
#: en/help_topics/hooks.txt:503
12438
msgid ""
12439
"TransportHooks\n"
12440
"--------------"
12441
msgstr ""
12442
12443
#: en/help_topics/hooks.txt:506
12444
msgid ""
12445
"post_connect\n"
12446
"~~~~~~~~~~~~"
12447
msgstr ""
12448
12449
#: en/help_topics/hooks.txt:511
12450
msgid ""
12451
"Called after a new connection is established or a reconnect occurs.\n"
12452
"The sole argument passed is either the connected transport or smart\n"
12453
"medium instance."
12454
msgstr ""
12455
12456
#: en/help_topics/hooks.txt:515
12457
msgid ""
12458
"RioVersionInfoBuilderHooks\n"
12459
"--------------------------"
12460
msgstr ""
12461
12462
#: en/help_topics/hooks.txt:518
12463
msgid ""
12464
"revision\n"
12465
"~~~~~~~~"
12466
msgstr ""
12467
12468
#: en/help_topics/hooks.txt:523
12469
msgid ""
12470
"Invoked when adding information about a revision to the RIO stanza\n"
12471
"that is printed. revision is called with a revision object and a RIO\n"
12472
"stanza.\n"
12473
msgstr ""
12474
12475
#: en/help_topics/location-alias.txt:1
12476
msgid ""
12477
"Location aliases\n"
12478
"================"
12479
msgstr ""
12480
12481
#: en/help_topics/location-alias.txt:4
12482
msgid ""
12483
"Bazaar defines several aliases for locations associated with a branch. "
12484
"These\n"
12485
"can be used with most commands that expect a location, such as `bzr push`."
12486
msgstr ""
12487
12488
#: en/help_topics/location-alias.txt:7
12489
msgid "The aliases are::"
12490
msgstr ""
12491
12492
#: en/help_topics/location-alias.txt:9
12493
msgid ""
12494
" :bound The branch this branch is bound to, for bound branches.\n"
12495
" :parent The parent of this branch.\n"
12496
" :public The public location of this branch.\n"
12497
" :push The saved location used for `bzr push` with no arguments.\n"
12498
" :submit The submit branch for this branch.\n"
12499
" :this This branch."
12500
msgstr ""
12501
12502
#: en/help_topics/location-alias.txt:16
12503
msgid "For example, to push to the parent location::"
12504
msgstr ""
12505
12506
#: en/help_topics/location-alias.txt:18
12507
msgid " bzr push :parent\n"
12508
msgstr ""
12509
12510
#: en/help_topics/log-formats.txt:1
12511
msgid ""
12512
"Log Formats\n"
12513
"==========="
12514
msgstr ""
12515
12516
#: en/help_topics/log-formats.txt:4
12517
msgid ""
12518
"A log format controls how information about each revision is displayed.\n"
12519
"The standard log formats are compared below::"
12520
msgstr ""
12521
12522
#: en/help_topics/log-formats.txt:7
12523
msgid ""
12524
" Feature long short line\n"
12525
" ---------------------- ------------- ------------ -------------------\n"
12526
" design goal detailed view concise view 1 revision per line\n"
12527
" committer name+email name only name only\n"
12528
" author name+email - -\n"
12529
" date-time format full date only date only\n"
12530
" commit message full full top line\n"
12531
" tags yes yes yes\n"
12532
" merges indicator - yes -\n"
12533
" status/delta optional optional -\n"
12534
" diff/patch optional optional -\n"
12535
" revision-id optional optional -\n"
12536
" branch nick yes - -\n"
12537
" foreign vcs properties yes yes -\n"
12538
" preferred levels all 1 1\n"
12539
" digital signature optional - -"
12540
msgstr ""
12541
12542
#: en/help_topics/log-formats.txt:24
12543
msgid ""
12544
"The default format is ``long``. To change this, define the ``log_format``\n"
12545
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12546
msgstr ""
12547
12548
#: en/help_topics/log-formats.txt:27
12549
msgid ""
12550
" [DEFAULT]\n"
12551
" log_format = short"
12552
msgstr ""
12553
12554
#: en/help_topics/log-formats.txt:30
12555
msgid ""
12556
"Alternatively, to change the log format used for a given query, use the\n"
12557
"--long, --short or --line options."
12558
msgstr ""
12559
12560
#: en/help_topics/log-formats.txt:33
12561
msgid ""
12562
"If one of the standard log formats does not meet your needs, additional\n"
12563
"formats can be provided by plugins.\n"
12564
msgstr ""
12565
12566
#: en/help_topics/other-formats.txt:1
12567
msgid "Other Storage Formats"
12568
msgstr ""
12569
12570
#: en/help_topics/other-formats.txt:3
12571
msgid "Experimental formats are shown below."
12572
msgstr ""
12573
12574
#: en/help_topics/other-formats.txt:5
12575
msgid ""
12576
":development-colo:\n"
12577
" (native) The 2a format with experimental support for colocated\n"
12578
" branches."
12579
msgstr ""
12580
12581
#: en/help_topics/other-formats.txt:9
12582
msgid ""
12583
"\n"
12584
"Deprecated formats are shown below."
12585
msgstr ""
12586
12587
#: en/help_topics/other-formats.txt:12
12588
msgid ""
12589
":pack-0.92:\n"
12590
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12591
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12592
" by bzr < 0.92."
12593
msgstr ""
12594
12595
#: en/help_topics/patterns.txt:1
12596
msgid ""
12597
"Patterns\n"
12598
"========"
12599
msgstr ""
12600
12601
#: en/help_topics/patterns.txt:4
12602
msgid ""
12603
"Bazaar uses patterns to match files at various times. For example,\n"
12604
"the ``add`` command skips over files that match ignore patterns\n"
12605
"and preferences can be associated with files using rule patterns.\n"
12606
"The pattern syntax is described below."
12607
msgstr ""
12608
12609
#: en/help_topics/patterns.txt:9
12610
msgid ""
12611
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12612
"slash or is a regular expression, it is compared to the whole path\n"
12613
"from the branch root. Otherwise, it is compared to only the last\n"
12614
"component of the path. To match a file only in the root directory,\n"
12615
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12616
msgstr ""
12617
12618
#: en/help_topics/patterns.txt:15
12619
msgid "Patterns may include globbing wildcards such as::"
12620
msgstr ""
12621
12622
#: en/help_topics/patterns.txt:17
12623
msgid ""
12624
" ? - Matches any single character except '/'\n"
12625
" * - Matches 0 or more characters except '/'\n"
12626
" /**/ - Matches 0 or more directories in a path\n"
12627
" [a-z] - Matches a single character from within a group of characters"
12628
msgstr ""
12629
12630
#: en/help_topics/patterns.txt:22
12631
msgid ""
12632
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12633
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12634
"expression. Regular expression patterns may not include named or\n"
12635
"numbered groups."
12636
msgstr ""
12637
12638
#: en/help_topics/patterns.txt:27
12639
msgid ""
12640
"Case insensitive ignore patterns can be specified with regular expressions\n"
12641
"by using the ``i`` (for ignore case) flag in the pattern."
12642
msgstr ""
12643
12644
#: en/help_topics/patterns.txt:30
12645
msgid ""
12646
"For example, a case insensitive match for ``foo`` may be specified as::"
12647
msgstr ""
12648
12649
#: en/help_topics/patterns.txt:32
12650
msgid " RE:(?i)foo"
12651
msgstr ""
12652
12653
#: en/help_topics/patterns.txt:34
12654
msgid ""
12655
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12656
"matched by that pattern will not be ignored."
12657
msgstr ""
12658
12659
#: en/help_topics/patterns.txt:37
12660
msgid ""
12661
".. _Python regular expressions: http://docs.python.org/library/re.html"
12662
msgstr ""
12663
12664
#: en/help_topics/revisionspec.txt:1
12665
msgid "Revision Identifiers"
12666
msgstr ""
12667
12668
#: en/help_topics/revisionspec.txt:3
12669
msgid ""
12670
"A revision identifier refers to a specific state of a branch's history. It\n"
12671
"can be expressed in several ways. It can begin with a keyword to\n"
12672
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12673
"'before:yesterday' and 'submit:'."
12674
msgstr ""
12675
12676
#: en/help_topics/revisionspec.txt:8
12677
msgid ""
12678
"Alternately, it can be given without a keyword, in which case it will be\n"
12679
"checked as a revision number, a tag, a revision id, a date specification, or "
12680
"a\n"
12681
"branch specification, in that order. For example, 'date:today' could be\n"
12682
"written as simply 'today', though if you have a tag called 'today' that "
12683
"will\n"
12684
"be found first."
12685
msgstr ""
12686
12687
#: en/help_topics/revisionspec.txt:14
12688
msgid ""
12689
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12690
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12691
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12692
"or\n"
12693
"spaces around the '..')."
12694
msgstr ""
12695
12696
#: en/help_topics/revisionspec.txt:19
12697
msgid ""
12698
"Ranges are interpreted differently by different commands. To the \"log\" "
12699
"command,\n"
12700
"a range is a sequence of log messages, but to the \"diff\" command, the "
12701
"range\n"
12702
"denotes a change between revisions (and not a sequence of changes). In\n"
12703
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12704
"consider it\n"
12705
"to be open-ended, that is, they include one end but not the other. For "
12706
"example:\n"
12707
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12708
"3649,\n"
12709
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12710
"and\n"
12711
"3649, but not 3647."
12712
msgstr ""
12713
12714
#: en/help_topics/revisionspec.txt:28
12715
msgid "The keywords used as revision selection methods are the following:"
12716
msgstr ""
12717
12718
#: en/help_topics/revisionspec.txt:30
12719
msgid ""
12720
":revid:\n"
12721
"\tSelects a revision using the revision id.\n"
12722
":submit:\n"
12723
"\tSelects a common ancestor with the submit branch.\n"
12724
":ancestor:\n"
12725
"\tSelects a common ancestor with a second branch.\n"
12726
":date:\n"
12727
"\tSelects a revision on the basis of a datestamp.\n"
12728
":branch:\n"
12729
"\tSelects the last revision of a specified branch.\n"
12730
":tag:\n"
12731
"\tSelects a revision identified by a tag name.\n"
12732
":revno:\n"
12733
"\tSelects a revision using a number.\n"
12734
":before:\n"
12735
"\tSelects the parent of the revision specified.\n"
12736
":annotate:\n"
12737
"\tSelect the revision that last modified the specified line.\n"
12738
":mainline:\n"
12739
"\tSelect mainline revision that merged the specified revision.\n"
12740
":last:\n"
12741
"\tSelects the nth revision from the end."
12742
msgstr ""
12743
12744
#: en/help_topics/revisionspec.txt:53
12745
msgid "In addition, plugins can provide other keywords."
12746
msgstr ""
12747
12748
#: en/help_topics/revisionspec.txt:55
12749
msgid "A detailed description of each keyword is given below."
12750
msgstr ""
12751
12752
#: en/help_topics/revisionspec.txt:57
12753
msgid ":revid:"
12754
msgstr ""
12755
12756
#: en/help_topics/revisionspec.txt:59
12757
msgid ""
12758
" Supply a specific revision id, that can be used to specify any\n"
12759
" revision id in the ancestry of the branch.\n"
12760
" Including merges, and pending merges.\n"
12761
" Examples::"
12762
msgstr ""
12763
12764
#: en/help_topics/revisionspec.txt:64
12765
msgid ""
12766
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12767
msgstr ""
12768
12769
#: en/help_topics/revisionspec.txt:66
12770
msgid ":submit:"
12771
msgstr ""
12772
12773
#: en/help_topics/revisionspec.txt:68
12774
msgid ""
12775
" Diffing against this shows all the changes that were made in this "
12776
"branch,\n"
12777
" and is a good predictor of what merge will do. The submit branch is\n"
12778
" used by the bundle and merge directive commands. If no submit branch\n"
12779
" is specified, the parent branch is used instead."
12780
msgstr ""
12781
12782
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12783
msgid ""
12784
" The common ancestor is the last revision that existed in both\n"
12785
" branches. Usually this is the branch point, but it could also be\n"
12786
" a revision that was merged."
12787
msgstr ""
12788
12789
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12790
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12791
#: en/help_topics/revisionspec.txt:153
12792
msgid " Examples::"
12793
msgstr ""
12794
12795
#: en/help_topics/revisionspec.txt:79
12796
msgid " $ bzr diff -r submit:"
12797
msgstr ""
12798
12799
#: en/help_topics/revisionspec.txt:81
12800
msgid ":ancestor:"
12801
msgstr ""
12802
12803
#: en/help_topics/revisionspec.txt:83
12804
msgid " Supply the path to a branch to select the common ancestor."
12805
msgstr ""
12806
12807
#: en/help_topics/revisionspec.txt:89
12808
msgid ""
12809
" This is frequently used with 'diff' to return all of the changes\n"
12810
" that your branch introduces, while excluding the changes that you\n"
12811
" have not merged from the remote branch."
12812
msgstr ""
12813
12814
#: en/help_topics/revisionspec.txt:95
12815
msgid ""
12816
" ancestor:/path/to/branch\n"
12817
" $ bzr diff -r ancestor:../../mainline/branch"
12818
msgstr ""
12819
12820
#: en/help_topics/revisionspec.txt:98
12821
msgid ":date:"
12822
msgstr ""
12823
12824
#: en/help_topics/revisionspec.txt:100
12825
msgid ""
12826
" Supply a datestamp to select the first revision that matches the date.\n"
12827
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12828
" Matches the first entry after a given date (either at midnight or\n"
12829
" at a specified time)."
12830
msgstr ""
12831
12832
#: en/help_topics/revisionspec.txt:105
12833
msgid " One way to display all the changes since yesterday would be::"
12834
msgstr ""
12835
12836
#: en/help_topics/revisionspec.txt:107
12837
msgid " bzr log -r date:yesterday.."
12838
msgstr ""
12839
12840
#: en/help_topics/revisionspec.txt:111
12841
msgid ""
12842
" date:yesterday -> select the first revision since "
12843
"yesterday\n"
12844
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12845
" August 14th, 2006 at 5:10pm."
12846
msgstr ""
12847
12848
#: en/help_topics/revisionspec.txt:115
12849
msgid ":branch:"
12850
msgstr ""
12851
12852
#: en/help_topics/revisionspec.txt:117
12853
msgid " Supply the path to a branch to select its last revision."
12854
msgstr ""
12855
12856
#: en/help_topics/revisionspec.txt:121
12857
msgid " branch:/path/to/branch"
12858
msgstr ""
12859
12860
#: en/help_topics/revisionspec.txt:123
12861
msgid ":tag:"
12862
msgstr ""
12863
12864
#: en/help_topics/revisionspec.txt:125
12865
msgid " Tags are stored in the branch and created by the 'tag' command."
12866
msgstr ""
12867
12868
#: en/help_topics/revisionspec.txt:127
12869
msgid ":revno:"
12870
msgstr ""
12871
12872
#: en/help_topics/revisionspec.txt:129
12873
msgid ""
12874
" Use an integer to specify a revision in the history of the branch.\n"
12875
" Optionally a branch can be specified. A negative number will count\n"
12876
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12877
" one). If the negative number is larger than the branch's history, the\n"
12878
" first revision is returned.\n"
12879
" Examples::"
12880
msgstr ""
12881
12882
#: en/help_topics/revisionspec.txt:136
12883
msgid ""
12884
" revno:1 -> return the first revision of this branch\n"
12885
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12886
" the branch '/path/to/branch'\n"
12887
" revno:-1 -> The last revision in a branch.\n"
12888
" -2:http://other/branch -> The second to last revision in the\n"
12889
" remote branch.\n"
12890
" -1000000 -> Most likely the first revision, unless\n"
12891
" your history is very long."
12892
msgstr ""
12893
12894
#: en/help_topics/revisionspec.txt:145
12895
msgid ":before:"
12896
msgstr ""
12897
12898
#: en/help_topics/revisionspec.txt:147
12899
msgid ""
12900
" Supply any revision spec to return the parent of that revision. This "
12901
"is\n"
12902
" mostly useful when inspecting revisions that are not in the revision "
12903
"history\n"
12904
" of a branch."
12905
msgstr ""
12906
12907
#: en/help_topics/revisionspec.txt:151
12908
msgid ""
12909
" It is an error to request the parent of the null revision (before:0)."
12910
msgstr ""
12911
12912
#: en/help_topics/revisionspec.txt:155
12913
msgid ""
12914
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12915
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12916
" aaaa@bbbb-1234567890\n"
12917
" bzr diff -r before:1913..1913\n"
12918
" -> Find the changes between revision 1913 and its parent "
12919
"(1912).\n"
12920
" (What changes did revision 1913 introduce).\n"
12921
" This is equivalent to: bzr diff -c 1913"
12922
msgstr ""
12923
12924
#: en/help_topics/revisionspec.txt:163
12925
msgid ":annotate:"
12926
msgstr ""
12927
12928
#: en/help_topics/revisionspec.txt:165
12929
msgid ""
12930
" Select the revision that last modified the specified line. Line is\n"
12931
" specified as path:number. Path is a relative path to the file. "
12932
"Numbers\n"
12933
" start at 1, and are relative to the current version, not the last-\n"
12934
" committed version of the file."
12935
msgstr ""
12936
12937
#: en/help_topics/revisionspec.txt:170
12938
msgid ":mainline:"
12939
msgstr ""
12940
12941
#: en/help_topics/revisionspec.txt:172
12942
msgid ""
12943
" Select the revision that merged the specified revision into mainline."
12944
msgstr ""
12945
12946
#: en/help_topics/revisionspec.txt:174
12947
msgid ":last:"
12948
msgstr ""
12949
12950
#: en/help_topics/revisionspec.txt:176
12951
msgid ""
12952
" Supply a positive number to get the nth revision from the end.\n"
12953
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12954
" Examples::"
12955
msgstr ""
12956
12957
#: en/help_topics/revisionspec.txt:180
12958
msgid ""
12959
" last:1 -> return the last revision\n"
12960
" last:3 -> return the revision 2 before the end.\n"
12961
msgstr ""
12962
12963
#: en/help_topics/rules.txt:1
12964
msgid ""
12965
"Rules\n"
12966
"====="
12967
msgstr ""
12968
12969
#: en/help_topics/rules.txt:7
12970
msgid ""
12971
"Rules are defined in ini file format where the sections are file glob\n"
12972
"patterns and the contents of each section are the preferences for files\n"
12973
"matching that pattern(s). For example::"
12974
msgstr ""
12975
12976
#: en/help_topics/rules.txt:11
12977
msgid ""
12978
" [name *.bat]\n"
12979
" eol = native"
12980
msgstr ""
12981
12982
#: en/help_topics/rules.txt:14
12983
msgid ""
12984
" [name *.html *.xml]\n"
12985
" keywords = xml_escape"
12986
msgstr ""
12987
12988
#: en/help_topics/rules.txt:17
12989
msgid ""
12990
"Preferences like these are useful for commands and plugins wishing to\n"
12991
"provide custom behaviour for selected files. For more information on \n"
12992
"end of line conversion see :doc:`eol-help`.\n"
12993
"Keyword support is provided by the `keywords plugin\n"
12994
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
12995
msgstr ""
12996
12997
#: en/help_topics/rules.txt:23
12998
msgid ""
12999
"Files\n"
13000
"-----"
13001
msgstr ""
13002
13003
#: en/help_topics/rules.txt:26
13004
msgid ""
13005
"Default rules for all branches are defined in the optional file\n"
13006
"``BZR_HOME/rules``. "
13007
msgstr ""
13008
13009
#: en/help_topics/rules.txt:29
13010
msgid ""
13011
"Rule Patterns\n"
13012
"-------------"
13013
msgstr ""
13014
13015
#: en/help_topics/rules.txt:32
13016
msgid ""
13017
"Patterns are ordered and searching stops as soon as one matches.\n"
13018
"As a consequence, more explicit patterns should be placed towards\n"
13019
"the top of the file. Rule patterns use exactly the same conventions\n"
13020
"as ignore patterns. See :doc:`patterns-help` for details."
13021
msgstr ""
13022
13023
#: en/help_topics/rules.txt:37
13024
msgid ".. note::"
13025
msgstr ""
13026
13027
#: en/help_topics/rules.txt:39
13028
msgid ""
13029
" Patterns containing square brackets or spaces should be\n"
13030
" surrounded in quotes to ensure they are correctly parsed.\n"
13031
msgstr ""
13032
13033
#: en/help_topics/topics.txt:1
13034
msgid ""
13035
"authentication Information on configuring authentication\n"
13036
"basic Basic commands\n"
13037
"branches Information on what a branch is\n"
13038
"bugs Bug tracker settings\n"
13039
"checkouts Information on what a checkout is\n"
13040
"commands Basic help for all commands\n"
13041
"configuration Details on the configuration settings available\n"
13042
"conflict-types Types of conflicts and what to do about them\n"
13043
"content-filters Conversion of content into/from working trees\n"
13044
"criss-cross Information on criss-cross merging\n"
13045
"current-formats Current storage formats\n"
13046
"debug-flags Options to show or record debug information\n"
13047
"diverged-branches How to fix diverged branches\n"
13048
"env-variables Environment variable names and values\n"
13049
"eol Information on end-of-line handling\n"
13050
"files Information on configuration and log files\n"
13051
"formats Information on choosing a storage format\n"
13052
"global-options Options that control how Bazaar runs\n"
13053
"hidden-commands All hidden commands\n"
13054
"hooks Points at which custom processing can be added\n"
13055
"launchpad Using Bazaar with Launchpad.net\n"
13056
"location-alias Aliases for remembered locations\n"
13057
"log-formats Details on the logging formats available\n"
13058
"other-formats Experimental and deprecated storage formats\n"
13059
"patterns Information on the pattern syntax\n"
13060
"repositories Basic information on shared repositories.\n"
13061
"revisionspec Explain how to use --revision\n"
13062
"rules Information on defining rule-based preferences\n"
13063
"standalone-trees Information on what a standalone tree is\n"
13064
"standard-options Options that can be used with any command\n"
13065
"status-flags Help on status flags\n"
13066
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13067
"topics Topics list\n"
13068
"url-special-chars Special character handling in URLs\n"
13069
"urlspec Supported transport protocols\n"
13070
"working-trees Information on working trees\n"
13071
msgstr ""
13072
13073
#: en/help_topics/url-special-chars.txt:1
13074
msgid ""
13075
"Special character handling in URLs\n"
13076
"=================================="
13077
msgstr ""
13078
13079
#: en/help_topics/url-special-chars.txt:4
13080
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13081
msgstr ""
13082
13083
#: en/help_topics/url-special-chars.txt:6
13084
msgid " * Fully qualified URLs"
13085
msgstr ""
13086
13087
#: en/help_topics/url-special-chars.txt:8
13088
msgid " * File system paths, relative or absolute"
13089
msgstr ""
13090
13091
#: en/help_topics/url-special-chars.txt:10
13092
msgid ""
13093
"Internally bzr treats all locations as URLs. For any file system paths\n"
13094
"that are specified it will automatically determine the appropriate URL\n"
13095
"representation, and escape special characters where necessary."
13096
msgstr ""
13097
13098
#: en/help_topics/url-special-chars.txt:14
13099
msgid ""
13100
"There are a few characters which have special meaning in URLs and need "
13101
"careful\n"
13102
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13103
"value in URLs. Any non-ASCII characters in a file path will automatically "
13104
"be\n"
13105
"urlencoded when the path is converted to a URL."
13106
msgstr ""
13107
13108
#: en/help_topics/url-special-chars.txt:19
13109
msgid ""
13110
"URLs represent non-ASCII characters in an encoding defined by the server, "
13111
"but\n"
13112
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13113
"be\n"
13114
"generous in what it accepts as a URL and to print them in a way that\n"
13115
"will be readable."
13116
msgstr ""
13117
13118
#: en/help_topics/url-special-chars.txt:24
13119
msgid ""
13120
"For example, if you have a directory named '/tmp/%2False' these are all "
13121
"valid\n"
13122
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13123
"slash)::"
13124
msgstr ""
13125
13126
#: en/help_topics/url-special-chars.txt:27
13127
msgid ""
13128
" cd /tmp\n"
13129
" bzr log /tmp/%2False\n"
13130
" bzr log %2False\n"
13131
" bzr log file:///tmp/%252False\n"
13132
" bzr log file://localhost/tmp/%252False\n"
13133
" bzr log file:%252False"
13134
msgstr ""
13135
13136
#: en/help_topics/url-special-chars.txt:34
13137
msgid "These are valid but do not refer to the same file::"
13138
msgstr ""
13139
13140
#: en/help_topics/url-special-chars.txt:36
13141
msgid ""
13142
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13143
" bzr log %252False (refers to a file called /tmp/%252False)"
13144
msgstr ""
13145
13146
#: en/help_topics/url-special-chars.txt:39
13147
msgid ""
13148
"Comma also has special meaning in URLs, because it denotes `segment "
13149
"parameters`_"
13150
msgstr ""
13151
13152
#: en/help_topics/url-special-chars.txt:41
13153
msgid ""
13154
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13155
msgstr ""
13156
13157
#: en/help_topics/url-special-chars.txt:43
13158
msgid ""
13159
"Comma is also special in any file system paths that are specified. To use a "
13160
"literal\n"
13161
"comma in a file system path, specify a URL and URL encode the comma::"
13162
msgstr ""
13163
13164
#: en/help_topics/url-special-chars.txt:46
13165
msgid ""
13166
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13167
"\"branch\" set to \"bla\"\n"
13168
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13169
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13170
"\"branch\" set to \"bla\"\n"
13171
msgstr ""
13172
13173
#: en/help_topics/urlspec.txt:1
13174
msgid "URL Identifiers"
13175
msgstr ""
13176
13177
#: en/help_topics/urlspec.txt:3
13178
msgid "Supported URL prefixes::"
13179
msgstr ""
13180
13181
#: en/help_topics/urlspec.txt:5
13182
msgid ""
13183
" aftp:// Access using active FTP.\n"
13184
" bzr:// Fast access using the Bazaar smart server.\n"
13185
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13186
" file:// Access using the standard filesystem (default)\n"
13187
" ftp:// Access using passive FTP.\n"
13188
" http:// Read-only access of branches exported on the web.\n"
13189
" https:// Read-only access of branches exported on the web using "
13190
"SSL.\n"
13191
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13192
msgstr ""
13193
13194
#: en/help_topics/urlspec.txt:14
13195
msgid "Supported modifiers::"
13196
msgstr ""
13197
13198
#: en/help_topics/urlspec.txt:16
13199
msgid " gio+ Access using any GIO supported protocols."
13200
msgstr ""
13201
13202
#: en/help_topics/urlspec.txt:18
13203
msgid "Bazaar supports all of the standard parts within the URL::"
13204
msgstr ""
13205
13206
#: en/help_topics/urlspec.txt:20
13207
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13208
msgstr ""
13209
13210
#: en/help_topics/urlspec.txt:22
13211
msgid "allowing URLs such as::"
13212
msgstr ""
13213
13214
#: en/help_topics/urlspec.txt:24
13215
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13216
msgstr ""
13217
13218
#: en/help_topics/urlspec.txt:26
13219
msgid ""
13220
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13221
"with '~' as meaning that the rest of the path should be interpreted\n"
13222
"relative to the remote user's home directory. For example if the user\n"
13223
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13224
"shell.example.com, then::"
13225
msgstr ""
13226
13227
#: en/help_topics/urlspec.txt:32
13228
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13229
msgstr ""
13230
13231
#: en/help_topics/urlspec.txt:34
13232
msgid "would refer to ``/home/remote/myproject/trunk``."
13233
msgstr ""
13234
13235
#: en/help_topics/urlspec.txt:36
13236
msgid ""
13237
"Many commands that accept URLs also accept location aliases too.\n"
13238
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13239
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1