« back to all changes in this revision
Viewing changes to po/el.po
- browse files at revision 6093.4.145
- compare with another revision
- compare with revision 2131
- download diff
- download tarball
- view history from revision 6093.4.145
- Committer: Launchpad Translations on behalf of bzr-core
- Date: 2012-07-04 04:33:39 UTC
- mto: (6581.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: launchpad_translations_on_behalf_of_bzr-core-20120704043339-fppsjkfs65ewkh9m
Launchpad automatic translations update.
added
removed
po/el.po
1
# Greek 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-03-15 10:20+0100\n"
11
"PO-Revision-Date: 2012-07-03 04:42+0000\n"
12
"Last-Translator: tzem <athmakrigiannis@gmail.com>\n"
13
"Language-Team: Greek <el@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-07-04 04:33+0000\n"
19
"X-Generator: Launchpad (build 15544)\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
78
#: bzrlib/builtins.py:308
79
msgid ""
80
"added\n"
81
" Versioned in the working copy but not in the previous revision."
82
msgstr ""
83
84
#: bzrlib/builtins.py:311
85
msgid ""
86
"removed\n"
87
" Versioned in the previous revision but removed or deleted\n"
88
" in the working copy."
89
msgstr ""
90
91
#: bzrlib/builtins.py:315
92
msgid ""
93
"renamed\n"
94
" Path of this file changed from the previous revision;\n"
95
" the text may also have changed. This includes files whose\n"
96
" parent directory was renamed."
97
msgstr ""
98
99
#: bzrlib/builtins.py:320
100
msgid ""
101
"modified\n"
102
" Text has changed since the previous revision."
103
msgstr ""
104
105
#: bzrlib/builtins.py:323
106
msgid ""
107
"kind changed\n"
108
" File kind has been changed (e.g. from file to directory)."
109
msgstr ""
110
111
#: bzrlib/builtins.py:326
112
msgid ""
113
"unknown\n"
114
" Not versioned and not matching an ignore pattern."
115
msgstr ""
116
117
#: bzrlib/builtins.py:329
118
msgid ""
119
"Additionally for directories, symlinks and files with a changed\n"
120
"executable bit, Bazaar indicates their type using a trailing\n"
121
"character: '/', '@' or '*' respectively. These decorations can be\n"
122
"disabled using the '--no-classify' option."
123
msgstr ""
124
125
#: bzrlib/builtins.py:334
126
msgid ""
127
"To see ignored files use 'bzr ignored'. For details on the\n"
128
"changes to file texts, use 'bzr diff'."
129
msgstr ""
130
131
#: bzrlib/builtins.py:337
132
msgid ""
133
"Note that --short or -S gives status flags for each item, similar\n"
134
"to Subversion's status command. To get output similar to svn -q,\n"
135
"use bzr status -SV."
136
msgstr ""
137
138
#: bzrlib/builtins.py:341
139
msgid ""
140
"If no arguments are specified, the status of the entire working\n"
141
"directory is shown. Otherwise, only the status of the specified\n"
142
"files or directories is reported. If a directory is given, status\n"
143
"is reported for everything inside that directory."
144
msgstr ""
145
146
#: bzrlib/builtins.py:346
147
msgid ""
148
"Before merges are committed, the pending merge tip revisions are\n"
149
"shown. To see all pending merge revisions, use the -v option.\n"
150
"To skip the display of pending merge information altogether, use\n"
151
"the no-pending option or specify a file/directory."
152
msgstr ""
153
154
#: bzrlib/builtins.py:351
155
msgid ""
156
"To compare the working directory to a specific revision, pass a\n"
157
"single revision to the revision argument."
158
msgstr ""
159
160
#: bzrlib/builtins.py:354
161
msgid ""
162
"To see which files have changed in a specific revision, or between\n"
163
"two revisions, pass a revision range to the revision argument.\n"
164
"This will produce the same results as calling 'bzr diff --summarize'."
165
msgstr ""
166
167
#: bzrlib/builtins.py:363
168
msgid "Use short status indicators."
169
msgstr ""
170
171
#: bzrlib/builtins.py:365
172
msgid "Only show versioned files."
173
msgstr ""
174
175
#: bzrlib/builtins.py:367
176
msgid "Don't show pending merges."
177
msgstr ""
178
179
#: bzrlib/builtins.py:370
180
msgid "Do not mark object type using indicator."
181
msgstr ""
182
183
#: bzrlib/builtins.py:385
184
msgid "bzr status --revision takes exactly one or two revision specifiers"
185
msgstr ""
186
187
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
188
msgid "You can only supply one of revision_id or --revision"
189
msgstr ""
190
191
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
192
msgid "You must supply either --revision or a revision_id"
193
msgstr ""
194
195
#: bzrlib/builtins.py:439
196
#, python-format
197
msgid "Repository %r does not support access to raw revision texts"
198
msgstr ""
199
200
#: bzrlib/builtins.py:450
201
msgid "The repository {0} contains no revision {1}."
202
msgstr ""
203
204
#: bzrlib/builtins.py:457
205
msgid "You cannot specify a NULL revision."
206
msgstr ""
207
208
#: bzrlib/builtins.py:549
209
msgid "Remove the working tree from a given branch/checkout."
210
msgstr ""
211
212
#: bzrlib/builtins.py:551
213
msgid ""
214
"Since a lightweight checkout is little more than a working tree\n"
215
"this will refuse to run against one."
216
msgstr ""
217
218
#: bzrlib/builtins.py:554
219
msgid "To re-create the working tree, use \"bzr checkout\"."
220
msgstr ""
221
222
#: bzrlib/builtins.py:560
223
msgid ""
224
"Remove the working tree even if it has uncommitted or shelved changes."
225
msgstr ""
226
227
#: bzrlib/builtins.py:574
228
msgid "No working tree to remove"
229
msgstr ""
230
231
#: bzrlib/builtins.py:576
232
msgid "You cannot remove the working tree of a remote path"
233
msgstr ""
234
235
#: bzrlib/builtins.py:585
236
msgid "You cannot remove the working tree from a lightweight checkout"
237
msgstr ""
238
239
#: bzrlib/builtins.py:625
240
msgid ""
241
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
242
"instead. Use \"--force\" if you are sure you want to reset the working tree."
243
msgstr ""
244
245
#: bzrlib/builtins.py:636
246
msgid ""
247
", the header appears corrupt, try passing -r -1 to set the state to the last "
248
"commit"
249
msgstr ""
250
251
#: bzrlib/builtins.py:640
252
msgid "failed to reset the tree state{0}"
253
msgstr ""
254
255
#: bzrlib/builtins.py:644
256
msgid "Show current revision number."
257
msgstr ""
258
259
#: bzrlib/builtins.py:646
260
msgid "This is equal to the number of revisions on this branch."
261
msgstr ""
262
263
#: bzrlib/builtins.py:659
264
msgid "--tree and --revision can not be used together"
265
msgstr ""
266
267
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
268
msgid "Tags can only be placed on a single revision, not on a range"
269
msgstr ""
270
271
#: bzrlib/builtins.py:700
272
msgid "Show revno of working tree."
273
msgstr ""
274
275
#: bzrlib/builtins.py:748
276
msgid "Add specified files or directories."
277
msgstr ""
278
279
#: bzrlib/builtins.py:750
280
msgid ""
281
"In non-recursive mode, all the named items are added, regardless\n"
282
"of whether they were previously ignored. A warning is given if\n"
283
"any of the named files are already versioned."
284
msgstr ""
285
286
#: bzrlib/builtins.py:754
287
msgid ""
288
"In recursive mode (the default), files are treated the same way\n"
289
"but the behaviour for directories is different. Directories that\n"
290
"are already versioned do not give a warning. All directories,\n"
291
"whether already versioned or not, are searched for files or\n"
292
"subdirectories that are neither versioned or ignored, and these\n"
293
"are added. This search proceeds recursively into versioned\n"
294
"directories. If no names are given '.' is assumed."
295
msgstr ""
296
297
#: bzrlib/builtins.py:762
298
msgid ""
299
"A warning will be printed when nested trees are encountered,\n"
300
"unless they are explicitly ignored."
301
msgstr ""
302
303
#: bzrlib/builtins.py:765
304
msgid ""
305
"Therefore simply saying 'bzr add' will version all files that\n"
306
"are currently unknown."
307
msgstr ""
308
309
#: bzrlib/builtins.py:768
310
msgid ""
311
"Adding a file whose parent directory is not versioned will\n"
312
"implicitly add the parent, and so on up to the root. This means\n"
313
"you should never need to explicitly add a directory, they'll just\n"
314
"get added when you add a file in the directory."
315
msgstr ""
316
317
#: bzrlib/builtins.py:773
318
msgid ""
319
"--dry-run will show which files would be added, but not actually\n"
320
"add them."
321
msgstr ""
322
323
#: bzrlib/builtins.py:776
324
msgid ""
325
"--file-ids-from will try to use the file ids from the supplied path.\n"
326
"It looks up ids trying to find a matching parent directory with the\n"
327
"same filename, and then by pure path. This option is rarely needed\n"
328
"but can be useful when adding the same logical file into two\n"
329
"branches that will be merged later (without showing the two different\n"
330
"adds as a conflict). It is also useful when merging another project\n"
331
"into a subdirectory of this one."
332
msgstr ""
333
334
#: bzrlib/builtins.py:784
335
msgid ""
336
"Any files matching patterns in the ignore list will not be added\n"
337
"unless they are explicitly mentioned."
338
msgstr ""
339
340
#: bzrlib/builtins.py:787
341
msgid ""
342
"In recursive mode, files larger than the configuration option \n"
343
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
344
"to file size."
345
msgstr ""
346
347
#: bzrlib/builtins.py:794
348
msgid "Don't recursively add the contents of directories."
349
msgstr ""
350
351
#: bzrlib/builtins.py:800
352
msgid "Lookup file ids from this tree."
353
msgstr ""
354
355
#: bzrlib/builtins.py:836
356
msgid "ignored {0} matching \"{1}\"\n"
357
msgstr ""
358
359
#: bzrlib/builtins.py:841
360
msgid "Create a new versioned directory."
361
msgstr ""
362
363
#: bzrlib/builtins.py:843
364
msgid "This is equivalent to creating the directory and then adding it."
365
msgstr ""
366
367
#: bzrlib/builtins.py:850
368
msgid "No error if existing, make parent directories as needed."
369
msgstr ""
370
371
#: bzrlib/builtins.py:884
372
#, python-format
373
msgid "added %s\n"
374
msgstr ""
375
376
#: bzrlib/builtins.py:926
377
#, python-format
378
msgid "invalid kind %r specified"
379
msgstr ""
380
381
#: bzrlib/builtins.py:963
382
msgid "Move or rename a file."
383
msgstr ""
384
385
#: bzrlib/builtins.py:965
386
msgid " bzr mv SOURCE... DESTINATION"
387
msgstr ""
388
389
#: bzrlib/builtins.py:967
390
msgid ""
391
"If the last argument is a versioned directory, all the other names\n"
392
"are moved into it. Otherwise, there must be exactly two arguments\n"
393
"and the file is changed to a new name."
394
msgstr ""
395
396
#: bzrlib/builtins.py:971
397
msgid ""
398
"If OLDNAME does not exist on the filesystem but is versioned and\n"
399
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
400
"assumes that the file has been manually moved and only updates\n"
401
"its internal inventory to reflect that change.\n"
402
"The same is valid when moving many SOURCE files to a DESTINATION."
403
msgstr ""
404
405
#: bzrlib/builtins.py:977
406
msgid "Files cannot be moved between branches."
407
msgstr ""
408
409
#: bzrlib/builtins.py:984
410
msgid ""
411
"Move only the bzr identifier of the file, because the file has already been "
412
"moved."
413
msgstr ""
414
415
#: bzrlib/builtins.py:986
416
msgid "Automatically guess renames."
417
msgstr ""
418
419
#: bzrlib/builtins.py:987
420
msgid "Avoid making changes when guessing renames."
421
msgstr ""
422
423
#: bzrlib/builtins.py:996
424
msgid "--dry-run requires --auto."
425
msgstr ""
426
427
#: bzrlib/builtins.py:1000
428
msgid "missing file argument"
429
msgstr ""
430
431
#: bzrlib/builtins.py:1004
432
msgid "can not move root of branch"
433
msgstr ""
434
435
#: bzrlib/builtins.py:1010
436
msgid "Only one path may be specified to --auto."
437
msgstr ""
438
439
#: bzrlib/builtins.py:1013
440
msgid "--after cannot be specified with --auto."
441
msgstr ""
442
443
#: bzrlib/builtins.py:1050
444
msgid "to mv multiple files the destination must be a versioned directory"
445
msgstr ""
446
447
#: bzrlib/builtins.py:1102
448
msgid "Turn this branch into a mirror of another branch."
449
msgstr ""
450
451
#: bzrlib/builtins.py:1104
452
msgid ""
453
"By default, this command only works on branches that have not diverged.\n"
454
"Branches are considered diverged if the destination branch's most recent \n"
455
"commit is one that has not been merged (directly or indirectly) into the \n"
456
"parent."
457
msgstr ""
458
459
#: bzrlib/builtins.py:1109
460
msgid ""
461
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
462
"from one into the other. Once one branch has merged, the other should\n"
463
"be able to pull it again."
464
msgstr ""
465
466
#: bzrlib/builtins.py:1113
467
msgid ""
468
"If you want to replace your local changes and just want your branch to\n"
469
"match the remote one, use pull --overwrite. This will work even if the two\n"
470
"branches have diverged."
471
msgstr ""
472
473
#: bzrlib/builtins.py:1117
474
msgid ""
475
"If there is no default location set, the first pull will set it (use\n"
476
"--no-remember to avoid setting it). After that, you can omit the\n"
477
"location to use the default. To change the default, use --remember. The\n"
478
"value will only be saved if the remote location can be accessed."
479
msgstr ""
480
481
#: bzrlib/builtins.py:1122
482
msgid ""
483
"The --verbose option will display the revisions pulled using the log_format\n"
484
"configuration option. You can use a different format by overriding it with\n"
485
"-Olog_format=<other_format>."
486
msgstr ""
487
488
#: bzrlib/builtins.py:1126
489
msgid ""
490
"Note: The location can be specified either in the form of a branch,\n"
491
"or in the form of a path to a file containing a merge directive generated\n"
492
"with bzr send."
493
msgstr ""
494
495
#: bzrlib/builtins.py:1134
496
msgid "Show logs of pulled revisions."
497
msgstr ""
498
499
#: bzrlib/builtins.py:1136
500
msgid ""
501
"Branch to pull into, rather than the one containing the working directory."
502
msgstr ""
503
504
#: bzrlib/builtins.py:1139
505
msgid ""
506
"Perform a local pull in a bound branch. Local pulls are not applied to the "
507
"master branch."
508
msgstr ""
509
510
#: bzrlib/builtins.py:1168
511
msgid "Need working tree for --show-base."
512
msgstr ""
513
514
#: bzrlib/builtins.py:1184
515
msgid "No pull location known or specified."
516
msgstr ""
517
518
#: bzrlib/builtins.py:1190
519
#, python-format
520
msgid "Using saved parent location: %s\n"
521
msgstr ""
522
523
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
524
msgid "Cannot use -r with merge directives or bundles"
525
msgstr ""
526
527
#: bzrlib/builtins.py:1238
528
msgid "Update a mirror of this branch."
529
msgstr ""
530
531
#: bzrlib/builtins.py:1240
532
msgid ""
533
"The target branch will not have its working tree populated because this\n"
534
"is both expensive, and is not supported on remote file systems."
535
msgstr ""
536
537
#: bzrlib/builtins.py:1243
538
msgid ""
539
"Some smart servers or protocols *may* put the working tree in place in\n"
540
"the future."
541
msgstr ""
542
543
#: bzrlib/builtins.py:1246
544
msgid ""
545
"This command only works on branches that have not diverged. Branches are\n"
546
"considered diverged if the destination branch's most recent commit is one\n"
547
"that has not been merged (directly or indirectly) by the source branch."
548
msgstr ""
549
550
#: bzrlib/builtins.py:1250
551
msgid ""
552
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
553
"the other branch completely, discarding its unmerged changes."
554
msgstr ""
555
556
#: bzrlib/builtins.py:1253
557
msgid ""
558
"If you want to ensure you have the different changes in the other branch,\n"
559
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
560
"After that you will be able to do a push without '--overwrite'."
561
msgstr ""
562
563
#: bzrlib/builtins.py:1257
564
msgid ""
565
"If there is no default push location set, the first push will set it (use\n"
566
"--no-remember to avoid setting it). After that, you can omit the\n"
567
"location to use the default. To change the default, use --remember. The\n"
568
"value will only be saved if the remote location can be accessed."
569
msgstr ""
570
571
#: bzrlib/builtins.py:1262
572
msgid ""
573
"The --verbose option will display the revisions pushed using the log_format\n"
574
"configuration option. You can use a different format by overriding it with\n"
575
"-Olog_format=<other_format>."
576
msgstr ""
577
578
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
579
msgid ""
580
"Branch to push from, rather than the one containing the working directory."
581
msgstr ""
582
583
#: bzrlib/builtins.py:1276
584
msgid ""
585
"By default push will fail if the target directory exists, but does not "
586
"already have a control directory. This flag will allow push to proceed."
587
msgstr ""
588
589
#: bzrlib/builtins.py:1281
590
msgid ""
591
"Create a stacked branch that references the public location of the parent "
592
"branch."
593
msgstr ""
594
595
#: bzrlib/builtins.py:1284
596
msgid ""
597
"Create a stacked branch that refers to another branch for the commit "
598
"history. Only the work not present in the referenced branch is included in "
599
"the branch created."
600
msgstr ""
601
602
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
603
msgid ""
604
"Refuse to push if there are uncommitted changes in the working tree, --no-"
605
"strict disables the check."
606
msgstr ""
607
608
#: bzrlib/builtins.py:1292
609
msgid "Don't populate the working tree, even for protocols that support it."
610
msgstr ""
611
612
#: bzrlib/builtins.py:1336
613
msgid "Could not determine branch to refer to."
614
msgstr ""
615
616
#: bzrlib/builtins.py:1345
617
#, python-format
618
msgid ""
619
"No push location known or specified. To push to the parent branch (at %s), "
620
"use 'bzr push :parent'."
621
msgstr ""
622
623
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
624
msgid "No push location known or specified."
625
msgstr ""
626
627
#: bzrlib/builtins.py:1355
628
#, python-format
629
msgid "Using saved push location: %s"
630
msgstr ""
631
632
#: bzrlib/builtins.py:1365
633
msgid "Create a new branch that is a copy of an existing branch."
634
msgstr ""
635
636
#: bzrlib/builtins.py:1367
637
msgid ""
638
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
639
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
640
"./bar.\n"
641
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
642
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
643
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
644
"create ./foo-bar."
645
msgstr ""
646
647
#: bzrlib/builtins.py:1374
648
msgid ""
649
"To retrieve the branch as of a particular revision, supply the --revision\n"
650
"parameter, as in \"branch foo/bar -r 5\"."
651
msgstr ""
652
653
#: bzrlib/builtins.py:1377
654
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
655
msgstr ""
656
657
#: bzrlib/builtins.py:1387
658
msgid "Create a branch without a working-tree."
659
msgstr ""
660
661
#: bzrlib/builtins.py:1389
662
msgid "Switch the checkout in the current directory to the new branch."
663
msgstr ""
664
665
#: bzrlib/builtins.py:1392
666
msgid ""
667
"Create a stacked branch referring to the source branch. The new branch will "
668
"depend on the availability of the source branch for all operations."
669
msgstr ""
670
671
#: bzrlib/builtins.py:1396
672
msgid "Do not use a shared repository, even if available."
673
msgstr ""
674
675
#: bzrlib/builtins.py:1398
676
msgid ""
677
"By default branch will fail if the target directory exists, but does not "
678
"already have a control directory. This flag will allow branch to proceed."
679
msgstr ""
680
681
#: bzrlib/builtins.py:1403
682
msgid "Bind new branch to from location."
683
msgstr ""
684
685
#: bzrlib/builtins.py:1450
686
#, python-format
687
msgid "Target directory \"%s\" already exists."
688
msgstr ""
689
690
#: bzrlib/builtins.py:1462
691
#, python-format
692
msgid "Parent of \"%s\" does not exist."
693
msgstr ""
694
695
#: bzrlib/builtins.py:1481
696
msgid "The branch {0} has no revision {1}."
697
msgstr ""
698
699
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
700
#, python-format
701
msgid "Created new stacked branch referring to %s."
702
msgstr ""
703
704
#: bzrlib/builtins.py:1500
705
#, python-format
706
msgid "Branched %d revision."
707
msgid_plural "Branched %d revisions."
708
msgstr[0] ""
709
msgstr[1] ""
710
711
#: bzrlib/builtins.py:1505
712
#, python-format
713
msgid "New branch bound to %s"
714
msgstr ""
715
716
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
717
#, python-format
718
msgid "Switched to branch: %s"
719
msgstr ""
720
721
#: bzrlib/builtins.py:1515
722
msgid "List the branches available at the current location."
723
msgstr ""
724
725
#: bzrlib/builtins.py:1517
726
msgid ""
727
"This command will print the names of all the branches at the current\n"
728
"location."
729
msgstr ""
730
731
#: bzrlib/builtins.py:1524
732
msgid ""
733
"Recursively scan for branches rather than just looking in the specified "
734
"location."
735
msgstr ""
736
737
#: bzrlib/builtins.py:1554
738
msgid "(default)"
739
msgstr ""
740
741
#: bzrlib/builtins.py:1566
742
msgid "Create a new checkout of an existing branch."
743
msgstr ""
744
745
#: bzrlib/builtins.py:1568
746
msgid ""
747
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
748
"for\n"
749
"the branch found in '.'. This is useful if you have removed the working "
750
"tree\n"
751
"or if it was never created - i.e. if you pushed the branch to its current\n"
752
"location using SFTP."
753
msgstr ""
754
755
#: bzrlib/builtins.py:1573
756
msgid ""
757
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
758
"will\n"
759
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
760
"./bar.\n"
761
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
762
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
763
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
764
"create ./foo-bar."
765
msgstr ""
766
767
#: bzrlib/builtins.py:1580
768
msgid ""
769
"To retrieve the branch as of a particular revision, supply the --revision\n"
770
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
771
"immediately\n"
772
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
773
"old\n"
774
"code.)"
775
msgstr ""
776
777
#: bzrlib/builtins.py:1590
778
msgid ""
779
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
780
"the branch for every operation. Normal checkouts can perform common "
781
"operations like diff and status without such access, and also support local "
782
"commits."
783
msgstr ""
784
785
#: bzrlib/builtins.py:1597
786
msgid "Get file contents from this tree."
787
msgstr ""
788
789
#: bzrlib/builtins.py:1599
790
msgid "Hard-link working tree files where possible."
791
msgstr ""
792
793
#: bzrlib/builtins.py:1640
794
msgid ""
795
"Show list of renamed files.\n"
796
" "
797
msgstr ""
798
799
#: bzrlib/builtins.py:1670
800
msgid "Update a working tree to a new revision."
801
msgstr ""
802
803
#: bzrlib/builtins.py:1672
804
msgid ""
805
"This will perform a merge of the destination revision (the tip of the\n"
806
"branch, or the specified revision) into the working tree, and then make\n"
807
"that revision the basis revision for the working tree. "
808
msgstr ""
809
810
#: bzrlib/builtins.py:1676
811
msgid ""
812
"You can use this to visit an older revision, or to update a working tree\n"
813
"that is out of date from its branch."
814
msgstr ""
815
816
#: bzrlib/builtins.py:1679
817
msgid ""
818
"If there are any uncommitted changes in the tree, they will be carried\n"
819
"across and remain as uncommitted changes after the update. To discard\n"
820
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
821
"with the changes brought in by the change in basis revision."
822
msgstr ""
823
824
#: bzrlib/builtins.py:1684
825
msgid ""
826
"If the tree's branch is bound to a master branch, bzr will also update\n"
827
"the branch from the master."
828
msgstr ""
829
830
#: bzrlib/builtins.py:1687
831
msgid ""
832
"You cannot update just a single file or directory, because each Bazaar\n"
833
"working tree has just a single basis revision. If you want to restore a\n"
834
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
835
"update'. If you want to restore a file to its state in a previous\n"
836
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
837
"out the old content of that file to a new location."
838
msgstr ""
839
840
#: bzrlib/builtins.py:1694
841
msgid ""
842
"The 'dir' argument, if given, must be the location of the root of a\n"
843
"working tree to update. By default, the working tree that contains the \n"
844
"current working directory is used."
845
msgstr ""
846
847
#: bzrlib/builtins.py:1710
848
msgid "bzr update --revision takes exactly one revision"
849
msgstr ""
850
851
#: bzrlib/builtins.py:1718
852
msgid "bzr update can only update a whole tree, not a file or subdirectory"
853
msgstr ""
854
855
#: bzrlib/builtins.py:1749
856
msgid "Tree is up to date at revision {0} of branch {1}"
857
msgstr ""
858
859
#: bzrlib/builtins.py:1765
860
#, python-format
861
msgid ""
862
"branch has no revision %s\n"
863
"bzr update --revision only works for a revision in the branch history"
864
msgstr ""
865
866
#: bzrlib/builtins.py:1771
867
msgid "Updated to revision {0} of branch {1}"
868
msgstr ""
869
870
#: bzrlib/builtins.py:1775
871
msgid ""
872
"Your local commits will now show as pending merges with 'bzr status', and "
873
"can be committed with 'bzr commit'."
874
msgstr ""
875
876
#: bzrlib/builtins.py:1784
877
msgid "Show information about a working tree, branch or repository."
878
msgstr ""
879
880
#: bzrlib/builtins.py:1786
881
msgid ""
882
"This command will show all known locations and formats associated to the\n"
883
"tree, branch or repository."
884
msgstr ""
885
886
#: bzrlib/builtins.py:1789
887
msgid ""
888
"In verbose mode, statistical information is included with each report.\n"
889
"To see extended statistic information, use a verbosity level of 2 or\n"
890
"higher by specifying the verbose option multiple times, e.g. -vv."
891
msgstr ""
892
893
#: bzrlib/builtins.py:1793
894
msgid "Branches and working trees will also report any missing revisions."
895
msgstr ""
896
897
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
898
#: bzrlib/builtins.py:6442
899
msgid ":Examples:"
900
msgstr ""
901
902
#: bzrlib/builtins.py:1797
903
msgid " Display information on the format and related locations:"
904
msgstr ""
905
906
#: bzrlib/builtins.py:1799
907
msgid " bzr info"
908
msgstr ""
909
910
#: bzrlib/builtins.py:1801
911
msgid ""
912
" Display the above together with extended format information and\n"
913
" basic statistics (like the number of files in the working tree and\n"
914
" number of revisions in the branch and repository):"
915
msgstr ""
916
917
#: bzrlib/builtins.py:1805
918
msgid " bzr info -v"
919
msgstr ""
920
921
#: bzrlib/builtins.py:1807
922
msgid " Display the above together with number of committers to the branch:"
923
msgstr ""
924
925
#: bzrlib/builtins.py:1809
926
msgid " bzr info -vv"
927
msgstr ""
928
929
#: bzrlib/builtins.py:1828
930
msgid "Remove files or directories."
931
msgstr ""
932
933
#: bzrlib/builtins.py:1830
934
msgid ""
935
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
936
"delete them if they can easily be recovered using revert otherwise they\n"
937
"will be backed up (adding an extention of the form .~#~). If no options or\n"
938
"parameters are given Bazaar will scan for files that are being tracked by\n"
939
"Bazaar but missing in your tree and stop tracking them for you."
940
msgstr ""
941
942
#: bzrlib/builtins.py:1838
943
msgid "Only remove files that have never been committed."
944
msgstr ""
945
946
#: bzrlib/builtins.py:1840
947
msgid "The file deletion mode to be used."
948
msgstr ""
949
950
#: bzrlib/builtins.py:1841
951
msgid "Deletion Strategy"
952
msgstr ""
953
954
#: bzrlib/builtins.py:1842
955
msgid "Backup changed files (default)."
956
msgstr ""
957
958
#: bzrlib/builtins.py:1843
959
msgid "Delete from bzr but leave the working copy."
960
msgstr ""
961
962
#: bzrlib/builtins.py:1844
963
msgid "Don't backup changed files."
964
msgstr ""
965
966
#: bzrlib/builtins.py:1845
967
msgid ""
968
"Delete all the specified files, even if they can not be recovered and even "
969
"if they are non-empty directories. (deprecated, use no-backup)"
970
msgstr ""
971
972
#: bzrlib/builtins.py:1854
973
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
974
msgstr ""
975
976
#: bzrlib/builtins.py:1871
977
msgid "No matching files."
978
msgstr ""
979
980
#: bzrlib/builtins.py:1932
981
msgid "Reconcile bzr metadata in a branch."
982
msgstr ""
983
984
#: bzrlib/builtins.py:1934
985
msgid ""
986
"This can correct data mismatches that may have been caused by\n"
987
"previous ghost operations or bzr upgrades. You should only\n"
988
"need to run this command if 'bzr check' or a bzr developer\n"
989
"advises you to run it."
990
msgstr ""
991
992
#: bzrlib/builtins.py:1939
993
msgid ""
994
"If a second branch is provided, cross-branch reconciliation is\n"
995
"also attempted, which will check that data like the tree root\n"
996
"id which was not present in very early bzr versions is represented\n"
997
"correctly in both branches."
998
msgstr ""
999
1000
#: bzrlib/builtins.py:1944
1001
msgid ""
1002
"At the same time it is run it may recompress data resulting in\n"
1003
"a potential saving in disk space or performance gain."
1004
msgstr ""
1005
1006
#: bzrlib/builtins.py:1947
1007
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1008
msgstr ""
1009
1010
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1011
msgid ""
1012
"Format for the bzr 2.0 series.\n"
1013
"Uses group-compress storage.\n"
1014
"Provides rich roots which are a one-way transition.\n"
1015
msgstr ""
1016
1017
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1018
msgid ""
1019
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1020
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1021
msgstr ""
1022
1023
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1024
msgid "The 2a format with experimental support for colocated branches.\n"
1025
msgstr ""
1026
1027
#: bzrlib/builtins.py:2015
1028
msgid "Make a directory into a versioned branch."
1029
msgstr ""
1030
1031
#: bzrlib/builtins.py:2017
1032
msgid ""
1033
"Use this to create an empty branch, or before importing an\n"
1034
"existing project."
1035
msgstr ""
1036
1037
#: bzrlib/builtins.py:2020
1038
msgid ""
1039
"If there is a repository in a parent directory of the location, then\n"
1040
"the history of the branch will be stored in the repository. Otherwise\n"
1041
"init creates a standalone branch which carries its own history\n"
1042
"in the .bzr directory."
1043
msgstr ""
1044
1045
#: bzrlib/builtins.py:2025
1046
msgid ""
1047
"If there is already a branch at the location but it has no working tree,\n"
1048
"the tree can be populated with 'bzr checkout'."
1049
msgstr ""
1050
1051
#: bzrlib/builtins.py:2028
1052
msgid "Recipe for importing a tree of files::"
1053
msgstr ""
1054
1055
#: bzrlib/builtins.py:2030
1056
msgid ""
1057
" cd ~/project\n"
1058
" bzr init\n"
1059
" bzr add .\n"
1060
" bzr status\n"
1061
" bzr commit -m \"imported project\""
1062
msgstr ""
1063
1064
#: bzrlib/builtins.py:2041
1065
msgid ""
1066
"Create the path leading up to the branch if it does not already exist."
1067
msgstr ""
1068
1069
#: bzrlib/builtins.py:2044
1070
msgid "Specify a format for this branch. See \"help formats\"."
1071
msgstr ""
1072
1073
#: bzrlib/builtins.py:2052
1074
msgid ""
1075
"Never change revnos or the existing log. Append revisions to it only."
1076
msgstr ""
1077
1078
#: bzrlib/builtins.py:2055
1079
msgid "Create a branch without a working tree."
1080
msgstr ""
1081
1082
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1083
#, python-format
1084
msgid ""
1085
"Parent directory of %s does not exist.\n"
1086
"You may supply --create-prefix to create all leading parent directories."
1087
msgstr ""
1088
1089
#: bzrlib/builtins.py:2109
1090
msgid ""
1091
"This branch format cannot be set to append-revisions-only. Try --default."
1092
msgstr ""
1093
1094
#: bzrlib/builtins.py:2120
1095
msgid "Created a {0} (format: {1})\n"
1096
msgstr ""
1097
1098
#: bzrlib/builtins.py:2129
1099
#, python-format
1100
msgid "Using shared repository: %s\n"
1101
msgstr ""
1102
1103
#: bzrlib/builtins.py:2133
1104
msgid "Create a shared repository for branches to share storage space."
1105
msgstr ""
1106
1107
#: bzrlib/builtins.py:2135
1108
msgid ""
1109
"New branches created under the repository directory will store their\n"
1110
"revisions in the repository, not in the branch directory. For branches\n"
1111
"with shared history, this reduces the amount of storage needed and \n"
1112
"speeds up the creation of new branches."
1113
msgstr ""
1114
1115
#: bzrlib/builtins.py:2140
1116
msgid ""
1117
"If the --no-trees option is given then the branches in the repository\n"
1118
"will not have working trees by default. They will still exist as \n"
1119
"directories on disk, but they will not have separate copies of the \n"
1120
"files at a certain revision. This can be useful for repositories that\n"
1121
"store branches which are interacted with through checkouts or remote\n"
1122
"branches, such as on a server."
1123
msgstr ""
1124
1125
#: bzrlib/builtins.py:2147
1126
msgid ""
1127
":Examples:\n"
1128
" Create a shared repository holding just branches::"
1129
msgstr ""
1130
1131
#: bzrlib/builtins.py:2150
1132
msgid ""
1133
" bzr init-repo --no-trees repo\n"
1134
" bzr init repo/trunk"
1135
msgstr ""
1136
1137
#: bzrlib/builtins.py:2153
1138
msgid " Make a lightweight checkout elsewhere::"
1139
msgstr ""
1140
1141
#: bzrlib/builtins.py:2155
1142
msgid ""
1143
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1144
" cd trunk-checkout\n"
1145
" (add files here)"
1146
msgstr ""
1147
1148
#: bzrlib/builtins.py:2163
1149
msgid ""
1150
"Specify a format for this repository. See \"bzr help formats\" for details."
1151
msgstr ""
1152
1153
#: bzrlib/builtins.py:2167
1154
msgid "Repository format"
1155
msgstr ""
1156
1157
#: bzrlib/builtins.py:2169
1158
msgid "Branches in the repository will default to not having a working tree."
1159
msgstr ""
1160
1161
#: bzrlib/builtins.py:2195
1162
msgid "Show differences in the working tree, between revisions or branches."
1163
msgstr ""
1164
1165
#: bzrlib/builtins.py:2197
1166
msgid ""
1167
"If no arguments are given, all changes for the current tree are listed.\n"
1168
"If files are given, only the changes in those files are listed.\n"
1169
"Remote and multiple branches can be compared by using the --old and\n"
1170
"--new options. If not provided, the default for both is derived from\n"
1171
"the first argument, if any, or the current tree if no arguments are\n"
1172
"given."
1173
msgstr ""
1174
1175
#: bzrlib/builtins.py:2204
1176
msgid ""
1177
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1178
"produces patches suitable for \"patch -p1\"."
1179
msgstr ""
1180
1181
#: bzrlib/builtins.py:2207
1182
msgid ""
1183
"Note that when using the -r argument with a range of revisions, the\n"
1184
"differences are computed between the two specified revisions. That\n"
1185
"is, the command does not show the changes introduced by the first \n"
1186
"revision in the range. This differs from the interpretation of \n"
1187
"revision ranges used by \"bzr log\" which includes the first revision\n"
1188
"in the range."
1189
msgstr ""
1190
1191
#: bzrlib/builtins.py:2214
1192
msgid ""
1193
":Exit values:\n"
1194
" 1 - changed\n"
1195
" 2 - unrepresentable changes\n"
1196
" 3 - error\n"
1197
" 0 - no change"
1198
msgstr ""
1199
1200
#: bzrlib/builtins.py:2220
1201
msgid ""
1202
":Examples:\n"
1203
" Shows the difference in the working tree versus the last commit::"
1204
msgstr ""
1205
1206
#: bzrlib/builtins.py:2223
1207
msgid " bzr diff"
1208
msgstr ""
1209
1210
#: bzrlib/builtins.py:2225
1211
msgid " Difference between the working tree and revision 1::"
1212
msgstr ""
1213
1214
#: bzrlib/builtins.py:2227
1215
msgid " bzr diff -r1"
1216
msgstr ""
1217
1218
#: bzrlib/builtins.py:2229
1219
msgid " Difference between revision 3 and revision 1::"
1220
msgstr ""
1221
1222
#: bzrlib/builtins.py:2231
1223
msgid " bzr diff -r1..3"
1224
msgstr ""
1225
1226
#: bzrlib/builtins.py:2233
1227
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1228
msgstr ""
1229
1230
#: bzrlib/builtins.py:2235
1231
msgid " bzr diff -r1..3 xxx"
1232
msgstr ""
1233
1234
#: bzrlib/builtins.py:2237
1235
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1236
msgstr ""
1237
1238
#: bzrlib/builtins.py:2239
1239
msgid " bzr diff -c2"
1240
msgstr ""
1241
1242
#: bzrlib/builtins.py:2241
1243
msgid ""
1244
" To see the changes introduced by revision X::\n"
1245
" \n"
1246
" bzr diff -cX"
1247
msgstr ""
1248
1249
#: bzrlib/builtins.py:2245
1250
msgid ""
1251
" Note that in the case of a merge, the -c option shows the changes\n"
1252
" compared to the left hand parent. To see the changes against\n"
1253
" another parent, use::"
1254
msgstr ""
1255
1256
#: bzrlib/builtins.py:2249
1257
msgid " bzr diff -r<chosen_parent>..X"
1258
msgstr ""
1259
1260
#: bzrlib/builtins.py:2251
1261
msgid ""
1262
" The changes between the current revision and the previous revision\n"
1263
" (equivalent to -c-1 and -r-2..-1)"
1264
msgstr ""
1265
1266
#: bzrlib/builtins.py:2254
1267
msgid " bzr diff -r-2.."
1268
msgstr ""
1269
1270
#: bzrlib/builtins.py:2256
1271
msgid " Show just the differences for file NEWS::"
1272
msgstr ""
1273
1274
#: bzrlib/builtins.py:2258
1275
msgid " bzr diff NEWS"
1276
msgstr ""
1277
1278
#: bzrlib/builtins.py:2260
1279
msgid " Show the differences in working tree xxx for file NEWS::"
1280
msgstr ""
1281
1282
#: bzrlib/builtins.py:2262
1283
msgid " bzr diff xxx/NEWS"
1284
msgstr ""
1285
1286
#: bzrlib/builtins.py:2264
1287
msgid " Show the differences from branch xxx to this working tree:"
1288
msgstr ""
1289
1290
#: bzrlib/builtins.py:2266
1291
msgid " bzr diff --old xxx"
1292
msgstr ""
1293
1294
#: bzrlib/builtins.py:2268
1295
msgid " Show the differences between two branches for file NEWS::"
1296
msgstr ""
1297
1298
#: bzrlib/builtins.py:2270
1299
msgid " bzr diff --old xxx --new yyy NEWS"
1300
msgstr ""
1301
1302
#: bzrlib/builtins.py:2272
1303
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1304
msgstr ""
1305
1306
#: bzrlib/builtins.py:2274
1307
msgid ""
1308
" bzr diff --prefix old/:new/\n"
1309
" \n"
1310
" Show the differences using a custom diff program with options::\n"
1311
" \n"
1312
" bzr diff --using /usr/bin/diff --diff-options -wu"
1313
msgstr ""
1314
1315
#: bzrlib/builtins.py:2284
1316
msgid "Pass these options to the external diff program."
1317
msgstr ""
1318
1319
#: bzrlib/builtins.py:2287
1320
msgid ""
1321
"Set prefixes added to old and new filenames, as two values separated by a "
1322
"colon. (eg \"old/:new/\")."
1323
msgstr ""
1324
1325
#: bzrlib/builtins.py:2290
1326
msgid "Branch/tree to compare from."
1327
msgstr ""
1328
1329
#: bzrlib/builtins.py:2294
1330
msgid "Branch/tree to compare to."
1331
msgstr ""
1332
1333
#: bzrlib/builtins.py:2300
1334
msgid "Use this command to compare files."
1335
msgstr ""
1336
1337
#: bzrlib/builtins.py:2305
1338
msgid "Diff format to use."
1339
msgstr ""
1340
1341
#: bzrlib/builtins.py:2307
1342
msgid "Diff format"
1343
msgstr ""
1344
1345
#: bzrlib/builtins.py:2329
1346
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1347
msgstr ""
1348
1349
#: bzrlib/builtins.py:2333
1350
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1351
msgstr ""
1352
1353
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1354
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1355
msgid "{0} and {1} are mutually exclusive"
1356
msgstr ""
1357
1358
#: bzrlib/builtins.py:2358
1359
msgid ""
1360
"List files deleted in the working tree.\n"
1361
" "
1362
msgstr ""
1363
1364
#: bzrlib/builtins.py:2436
1365
msgid "Show the tree root directory."
1366
msgstr ""
1367
1368
#: bzrlib/builtins.py:2438
1369
msgid ""
1370
"The root is the nearest enclosing directory with a .bzr control\n"
1371
"directory."
1372
msgstr ""
1373
1374
#: bzrlib/builtins.py:2453
1375
msgid "The limit argument must be an integer."
1376
msgstr ""
1377
1378
#: bzrlib/builtins.py:2461
1379
msgid "The levels argument must be an integer."
1380
msgstr ""
1381
1382
#: bzrlib/builtins.py:2466
1383
msgid "Show historical log for a branch or subset of a branch."
1384
msgstr ""
1385
1386
#: bzrlib/builtins.py:2468
1387
msgid ""
1388
"log is bzr's default tool for exploring the history of a branch.\n"
1389
"The branch to use is taken from the first parameter. If no parameters\n"
1390
"are given, the branch containing the working directory is logged.\n"
1391
"Here are some simple examples::"
1392
msgstr ""
1393
1394
#: bzrlib/builtins.py:2473
1395
msgid ""
1396
" bzr log log the current branch\n"
1397
" bzr log foo.py log a file in its branch\n"
1398
" bzr log http://server/branch log a branch on a server"
1399
msgstr ""
1400
1401
#: bzrlib/builtins.py:2477
1402
msgid ""
1403
"The filtering, ordering and information shown for each revision can\n"
1404
"be controlled as explained below. By default, all revisions are\n"
1405
"shown sorted (topologically) so that newer revisions appear before\n"
1406
"older ones and descendants always appear before ancestors. If displayed,\n"
1407
"merged revisions are shown indented under the revision in which they\n"
1408
"were merged."
1409
msgstr ""
1410
1411
#: bzrlib/builtins.py:2484
1412
msgid ":Output control:"
1413
msgstr ""
1414
1415
#: bzrlib/builtins.py:2486
1416
msgid ""
1417
" The log format controls how information about each revision is\n"
1418
" displayed. The standard log formats are called ``long``, ``short``\n"
1419
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1420
" for more details on log formats."
1421
msgstr ""
1422
1423
#: bzrlib/builtins.py:2491
1424
msgid ""
1425
" The following options can be used to control what information is\n"
1426
" displayed::"
1427
msgstr ""
1428
1429
#: bzrlib/builtins.py:2494
1430
msgid ""
1431
" -l N display a maximum of N revisions\n"
1432
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1433
" -v display a status summary (delta) for each revision\n"
1434
" -p display a diff (patch) for each revision\n"
1435
" --show-ids display revision-ids (and file-ids), not just revnos"
1436
msgstr ""
1437
1438
#: bzrlib/builtins.py:2500
1439
msgid ""
1440
" Note that the default number of levels to display is a function of the\n"
1441
" log format. If the -n option is not used, the standard log formats show\n"
1442
" just the top level (mainline)."
1443
msgstr ""
1444
1445
#: bzrlib/builtins.py:2504
1446
msgid ""
1447
" Status summaries are shown using status flags like A, M, etc. To see\n"
1448
" the changes explained using words like ``added`` and ``modified``\n"
1449
" instead, use the -vv option."
1450
msgstr ""
1451
1452
#: bzrlib/builtins.py:2508
1453
msgid ":Ordering control:"
1454
msgstr ""
1455
1456
#: bzrlib/builtins.py:2510
1457
msgid ""
1458
" To display revisions from oldest to newest, use the --forward option.\n"
1459
" In most cases, using this option will have little impact on the total\n"
1460
" time taken to produce a log, though --forward does not incrementally\n"
1461
" display revisions like --reverse does when it can."
1462
msgstr ""
1463
1464
#: bzrlib/builtins.py:2515
1465
msgid ":Revision filtering:"
1466
msgstr ""
1467
1468
#: bzrlib/builtins.py:2517
1469
msgid ""
1470
" The -r option can be used to specify what revision or range of revisions\n"
1471
" to filter against. The various forms are shown below::"
1472
msgstr ""
1473
1474
#: bzrlib/builtins.py:2520
1475
msgid ""
1476
" -rX display revision X\n"
1477
" -rX.. display revision X and later\n"
1478
" -r..Y display up to and including revision Y\n"
1479
" -rX..Y display from X to Y inclusive"
1480
msgstr ""
1481
1482
#: bzrlib/builtins.py:2525
1483
msgid ""
1484
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1485
" Some common examples are given below::"
1486
msgstr ""
1487
1488
#: bzrlib/builtins.py:2528
1489
msgid ""
1490
" -r-1 show just the tip\n"
1491
" -r-10.. show the last 10 mainline revisions\n"
1492
" -rsubmit:.. show what's new on this branch\n"
1493
" -rancestor:path.. show changes since the common ancestor of this\n"
1494
" branch and the one at location path\n"
1495
" -rdate:yesterday.. show changes since yesterday"
1496
msgstr ""
1497
1498
#: bzrlib/builtins.py:2535
1499
msgid ""
1500
" When logging a range of revisions using -rX..Y, log starts at\n"
1501
" revision Y and searches back in history through the primary\n"
1502
" (\"left-hand\") parents until it finds X. When logging just the\n"
1503
" top level (using -n1), an error is reported if X is not found\n"
1504
" along the way. If multi-level logging is used (-n0), X may be\n"
1505
" a nested merge revision and the log will be truncated accordingly."
1506
msgstr ""
1507
1508
#: bzrlib/builtins.py:2542
1509
msgid ":Path filtering:"
1510
msgstr ""
1511
1512
#: bzrlib/builtins.py:2544
1513
msgid ""
1514
" If parameters are given and the first one is not a branch, the log\n"
1515
" will be filtered to show only those revisions that changed the\n"
1516
" nominated files or directories."
1517
msgstr ""
1518
1519
#: bzrlib/builtins.py:2548
1520
msgid ""
1521
" Filenames are interpreted within their historical context. To log a\n"
1522
" deleted file, specify a revision range so that the file existed at\n"
1523
" the end or start of the range."
1524
msgstr ""
1525
1526
#: bzrlib/builtins.py:2552
1527
msgid ""
1528
" Historical context is also important when interpreting pathnames of\n"
1529
" renamed files/directories. Consider the following example:"
1530
msgstr ""
1531
1532
#: bzrlib/builtins.py:2555
1533
msgid ""
1534
" * revision 1: add tutorial.txt\n"
1535
" * revision 2: modify tutorial.txt\n"
1536
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1537
msgstr ""
1538
1539
#: bzrlib/builtins.py:2559
1540
msgid " In this case:"
1541
msgstr ""
1542
1543
#: bzrlib/builtins.py:2561
1544
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1545
msgstr ""
1546
1547
#: bzrlib/builtins.py:2563
1548
msgid ""
1549
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1550
msgstr ""
1551
1552
#: bzrlib/builtins.py:2565
1553
msgid ""
1554
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1555
" the original file in revision 2."
1556
msgstr ""
1557
1558
#: bzrlib/builtins.py:2568
1559
msgid ""
1560
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1561
" was no file called guide.txt in revision 2."
1562
msgstr ""
1563
1564
#: bzrlib/builtins.py:2571
1565
msgid ""
1566
" Renames are always followed by log. By design, there is no need to\n"
1567
" explicitly ask for this (and no way to stop logging a file back\n"
1568
" until it was last renamed)."
1569
msgstr ""
1570
1571
#: bzrlib/builtins.py:2575
1572
msgid ":Other filtering:"
1573
msgstr ""
1574
1575
#: bzrlib/builtins.py:2577
1576
msgid ""
1577
" The --match option can be used for finding revisions that match a\n"
1578
" regular expression in a commit message, committer, author or bug.\n"
1579
" Specifying the option several times will match any of the supplied\n"
1580
" expressions. --match-author, --match-bugs, --match-committer and\n"
1581
" --match-message can be used to only match a specific field."
1582
msgstr ""
1583
1584
#: bzrlib/builtins.py:2583
1585
msgid ":Tips & tricks:"
1586
msgstr ""
1587
1588
#: bzrlib/builtins.py:2585
1589
msgid ""
1590
" GUI tools and IDEs are often better at exploring history than command\n"
1591
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1592
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1593
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1594
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1595
msgstr ""
1596
1597
#: bzrlib/builtins.py:2591
1598
msgid ""
1599
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1600
msgstr ""
1601
1602
#: bzrlib/builtins.py:2593
1603
msgid ""
1604
" [ALIASES]\n"
1605
" tip = log -r-1\n"
1606
" top = log -l10 --line\n"
1607
" show = log -v -p"
1608
msgstr ""
1609
1610
#: bzrlib/builtins.py:2598
1611
msgid ""
1612
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1613
" will show the last 10 mainline revisions. To see the details of a\n"
1614
" particular revision X, ``bzr show -rX``."
1615
msgstr ""
1616
1617
#: bzrlib/builtins.py:2602
1618
msgid ""
1619
" If you are interested in looking deeper into a particular merge X,\n"
1620
" use ``bzr log -n0 -rX``."
1621
msgstr ""
1622
1623
#: bzrlib/builtins.py:2605
1624
msgid ""
1625
" ``bzr log -v`` on a branch with lots of history is currently\n"
1626
" very slow. A fix for this issue is currently under development.\n"
1627
" With or without that fix, it is recommended that a revision range\n"
1628
" be given when using the -v option."
1629
msgstr ""
1630
1631
#: bzrlib/builtins.py:2610
1632
msgid ""
1633
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1634
" used to find revisions matching user names, commit messages, etc.\n"
1635
" Among other features, this plugin can find all revisions containing\n"
1636
" a list of words but not others."
1637
msgstr ""
1638
1639
#: bzrlib/builtins.py:2615
1640
msgid ""
1641
" When exploring non-mainline history on large projects with deep\n"
1642
" history, the performance of log can be greatly improved by installing\n"
1643
" the historycache plugin. This plugin buffers historical information\n"
1644
" trading disk space for faster speed."
1645
msgstr ""
1646
1647
#: bzrlib/builtins.py:2624
1648
msgid "Show from oldest to newest."
1649
msgstr ""
1650
1651
#: bzrlib/builtins.py:2627
1652
msgid "Show files changed in each revision."
1653
msgstr ""
1654
1655
#: bzrlib/builtins.py:2633
1656
msgid "Show just the specified revision. See also \"help revisionspec\"."
1657
msgstr ""
1658
1659
#: bzrlib/builtins.py:2637
1660
msgid "What names to list as authors - first, all or committer."
1661
msgstr ""
1662
1663
#: bzrlib/builtins.py:2638
1664
msgid "Authors"
1665
msgstr ""
1666
1667
#: bzrlib/builtins.py:2643
1668
msgid "Number of levels to display - 0 for all, 1 for flat."
1669
msgstr ""
1670
1671
#: bzrlib/builtins.py:2653
1672
msgid "Limit the output to the first N revisions."
1673
msgstr ""
1674
1675
#: bzrlib/builtins.py:2658
1676
msgid "Show changes made in each revision as a patch."
1677
msgstr ""
1678
1679
#: bzrlib/builtins.py:2660
1680
msgid "Show merged revisions like --levels 0 does."
1681
msgstr ""
1682
1683
#: bzrlib/builtins.py:2664
1684
msgid "Do not report commits with more than one parent."
1685
msgstr ""
1686
1687
#: bzrlib/builtins.py:2666
1688
msgid ""
1689
"Display only the revisions that are not part of both ancestries (require -"
1690
"rX..Y)."
1691
msgstr ""
1692
1693
#: bzrlib/builtins.py:2670
1694
msgid "Show digital signature validity."
1695
msgstr ""
1696
1697
#: bzrlib/builtins.py:2673
1698
msgid "Show revisions whose properties match this expression."
1699
msgstr ""
1700
1701
#: bzrlib/builtins.py:2677
1702
msgid "Show revisions whose message matches this expression."
1703
msgstr ""
1704
1705
#: bzrlib/builtins.py:2681
1706
msgid "Show revisions whose committer matches this expression."
1707
msgstr ""
1708
1709
#: bzrlib/builtins.py:2685
1710
msgid "Show revisions whose authors match this expression."
1711
msgstr ""
1712
1713
#: bzrlib/builtins.py:2689
1714
msgid "Show revisions whose bugs match this expression."
1715
msgstr ""
1716
1717
#: bzrlib/builtins.py:2743
1718
msgid "--exclude-common-ancestry requires -r with two revisions"
1719
msgstr ""
1720
1721
#: bzrlib/builtins.py:2771
1722
#, python-format
1723
msgid "Path unknown at end or start of revision range: %s"
1724
msgstr ""
1725
1726
#: bzrlib/builtins.py:2888
1727
#, python-format
1728
msgid "bzr %s doesn't accept two revisions in different branches."
1729
msgstr ""
1730
1731
#: bzrlib/builtins.py:2904
1732
#, python-format
1733
msgid "bzr %s --revision takes one or two values."
1734
msgstr ""
1735
1736
#: bzrlib/builtins.py:2949
1737
msgid ""
1738
"List files in a tree.\n"
1739
" "
1740
msgstr ""
1741
1742
#: bzrlib/builtins.py:2958
1743
msgid "Recurse into subdirectories."
1744
msgstr ""
1745
1746
#: bzrlib/builtins.py:2960
1747
msgid "Print paths relative to the root of the branch."
1748
msgstr ""
1749
1750
#: bzrlib/builtins.py:2962
1751
msgid "Print unknown files."
1752
msgstr ""
1753
1754
#: bzrlib/builtins.py:2963
1755
msgid "Print versioned files."
1756
msgstr ""
1757
1758
#: bzrlib/builtins.py:2966
1759
msgid "Print ignored files."
1760
msgstr ""
1761
1762
#: bzrlib/builtins.py:2968
1763
msgid "List entries of a particular kind: file, directory, symlink."
1764
msgstr ""
1765
1766
#: bzrlib/builtins.py:2981
1767
msgid "invalid kind specified"
1768
msgstr ""
1769
1770
#: bzrlib/builtins.py:2984
1771
msgid "Cannot set both --verbose and --null"
1772
msgstr ""
1773
1774
#: bzrlib/builtins.py:2993
1775
msgid "cannot specify both --from-root and PATH"
1776
msgstr ""
1777
1778
#: bzrlib/builtins.py:3080
1779
msgid "Ignore specified files or patterns."
1780
msgstr ""
1781
1782
#: bzrlib/builtins.py:3082
1783
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1784
msgstr ""
1785
1786
#: bzrlib/builtins.py:3084
1787
msgid ""
1788
"If a .bzrignore file does not exist, the ignore command\n"
1789
"will create one and add the specified files or patterns to the newly\n"
1790
"created file. The ignore command will also automatically add the \n"
1791
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1792
"the use of the ignore command will require an explicit add command."
1793
msgstr ""
1794
1795
#: bzrlib/builtins.py:3090
1796
msgid ""
1797
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1798
"After adding, editing or deleting that file either indirectly by\n"
1799
"using this command or directly by using an editor, be sure to commit\n"
1800
"it."
1801
msgstr ""
1802
1803
#: bzrlib/builtins.py:3095
1804
msgid ""
1805
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1806
"the global ignore file can be found in the application data directory as\n"
1807
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1808
"Global ignores are not touched by this command. The global ignore file\n"
1809
"can be edited directly using an editor."
1810
msgstr ""
1811
1812
#: bzrlib/builtins.py:3101
1813
msgid ""
1814
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1815
"precedence over regular ignores. Such exceptions are used to specify\n"
1816
"files that should be versioned which would otherwise be ignored."
1817
msgstr ""
1818
1819
#: bzrlib/builtins.py:3105
1820
msgid ""
1821
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1822
"precedence over the '!' exception patterns."
1823
msgstr ""
1824
1825
#: bzrlib/builtins.py:3108
1826
msgid ""
1827
":Notes: \n"
1828
" \n"
1829
"* Ignore patterns containing shell wildcards must be quoted from\n"
1830
" the shell on Unix."
1831
msgstr ""
1832
1833
#: bzrlib/builtins.py:3113
1834
msgid ""
1835
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1836
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1837
msgstr ""
1838
1839
#: bzrlib/builtins.py:3116
1840
msgid ""
1841
":Examples:\n"
1842
" Ignore the top level Makefile::"
1843
msgstr ""
1844
1845
#: bzrlib/builtins.py:3119
1846
msgid " bzr ignore ./Makefile"
1847
msgstr ""
1848
1849
#: bzrlib/builtins.py:3121
1850
msgid " Ignore .class files in all directories...::"
1851
msgstr ""
1852
1853
#: bzrlib/builtins.py:3123
1854
msgid " bzr ignore \"*.class\""
1855
msgstr ""
1856
1857
#: bzrlib/builtins.py:3125
1858
msgid " ...but do not ignore \"special.class\"::"
1859
msgstr ""
1860
1861
#: bzrlib/builtins.py:3127
1862
msgid " bzr ignore \"!special.class\""
1863
msgstr ""
1864
1865
#: bzrlib/builtins.py:3129
1866
msgid " Ignore files whose name begins with the \"#\" character::"
1867
msgstr ""
1868
1869
#: bzrlib/builtins.py:3131
1870
msgid " bzr ignore \"RE:^#\""
1871
msgstr ""
1872
1873
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1874
msgid " Ignore .o files under the lib directory::"
1875
msgstr ""
1876
1877
#: bzrlib/builtins.py:3135
1878
msgid " bzr ignore \"lib/**/*.o\""
1879
msgstr ""
1880
1881
#: bzrlib/builtins.py:3139
1882
msgid " bzr ignore \"RE:lib/.*\\.o\""
1883
msgstr ""
1884
1885
#: bzrlib/builtins.py:3141
1886
msgid " Ignore everything but the \"debian\" toplevel directory::"
1887
msgstr ""
1888
1889
#: bzrlib/builtins.py:3143
1890
msgid ""
1891
" bzr ignore \"RE:(?!debian/).*\"\n"
1892
" \n"
1893
" Ignore everything except the \"local\" toplevel directory,\n"
1894
" but always ignore autosave files ending in ~, even under local/::\n"
1895
" \n"
1896
" bzr ignore \"*\"\n"
1897
" bzr ignore \"!./local\"\n"
1898
" bzr ignore \"!!*~\""
1899
msgstr ""
1900
1901
#: bzrlib/builtins.py:3157
1902
msgid "Display the default ignore rules that bzr uses."
1903
msgstr ""
1904
1905
#: bzrlib/builtins.py:3169
1906
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1907
msgstr ""
1908
1909
#: bzrlib/builtins.py:3180
1910
#, python-format
1911
msgid "Invalid ignore pattern found. %s"
1912
msgid_plural "Invalid ignore patterns found. %s"
1913
msgstr[0] ""
1914
msgstr[1] ""
1915
1916
#: bzrlib/builtins.py:3189
1917
msgid "NAME_PATTERN should not be an absolute path"
1918
msgstr ""
1919
1920
#: bzrlib/builtins.py:3202
1921
#, python-format
1922
msgid ""
1923
"Warning: the following files are version controlled and match your ignore "
1924
"pattern:\n"
1925
"%s\n"
1926
"These files will continue to be version controlled unless you 'bzr remove' "
1927
"them.\n"
1928
msgstr ""
1929
1930
#: bzrlib/builtins.py:3209
1931
msgid "List ignored files and the patterns that matched them."
1932
msgstr ""
1933
1934
#: bzrlib/builtins.py:3211
1935
msgid ""
1936
"List all the ignored files and the ignore pattern that caused the file to\n"
1937
"be ignored."
1938
msgstr ""
1939
1940
#: bzrlib/builtins.py:3214
1941
msgid "Alternatively, to list just the files::"
1942
msgstr ""
1943
1944
#: bzrlib/builtins.py:3216
1945
msgid " bzr ls --ignored"
1946
msgstr ""
1947
1948
#: bzrlib/builtins.py:3250
1949
#, python-format
1950
msgid "not a valid revision-number: %r"
1951
msgstr ""
1952
1953
#: bzrlib/builtins.py:3257
1954
msgid ""
1955
"Export current or past revision to a destination directory or archive."
1956
msgstr ""
1957
1958
#: bzrlib/builtins.py:3259
1959
msgid "If no revision is specified this exports the last committed revision."
1960
msgstr ""
1961
1962
#: bzrlib/builtins.py:3261
1963
msgid ""
1964
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1965
"given, try to find the format with the extension. If no extension\n"
1966
"is found exports to a directory (equivalent to --format=dir)."
1967
msgstr ""
1968
1969
#: bzrlib/builtins.py:3265
1970
msgid ""
1971
"If root is supplied, it will be used as the root directory inside\n"
1972
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1973
"to the exported filename. The root option has no effect for 'dir' format."
1974
msgstr ""
1975
1976
#: bzrlib/builtins.py:3269
1977
msgid ""
1978
"If branch is omitted then the branch containing the current working\n"
1979
"directory will be used."
1980
msgstr ""
1981
1982
#: bzrlib/builtins.py:3272
1983
msgid ""
1984
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1985
msgstr ""
1986
1987
#: bzrlib/builtins.py:3274
1988
msgid ""
1989
" ================= =========================\n"
1990
" Supported formats Autodetected by extension\n"
1991
" ================= =========================\n"
1992
" dir (none)\n"
1993
" tar .tar\n"
1994
" tbz2 .tar.bz2, .tbz2\n"
1995
" tgz .tar.gz, .tgz\n"
1996
" zip .zip\n"
1997
" ================= ========================="
1998
msgstr ""
1999
2000
#: bzrlib/builtins.py:3288
2001
msgid "Type of file to export to."
2002
msgstr ""
2003
2004
#: bzrlib/builtins.py:3291
2005
msgid "Apply content filters to export the convenient form."
2006
msgstr ""
2007
2008
#: bzrlib/builtins.py:3295
2009
msgid "Name of the root directory inside the exported file."
2010
msgstr ""
2011
2012
#: bzrlib/builtins.py:3297
2013
msgid ""
2014
"Set modification time of files to that of the last revision in which it was "
2015
"changed."
2016
msgstr ""
2017
2018
#: bzrlib/builtins.py:3300
2019
msgid ""
2020
"Export the working tree contents rather than that of the last revision."
2021
msgstr ""
2022
2023
#: bzrlib/builtins.py:3319
2024
msgid "--uncommitted requires a working tree"
2025
msgstr ""
2026
2027
#: bzrlib/builtins.py:3328
2028
#, python-format
2029
msgid "Unsupported export format: %s"
2030
msgstr ""
2031
2032
#: bzrlib/builtins.py:3332
2033
msgid ""
2034
"Write the contents of a file as of a given revision to standard output."
2035
msgstr ""
2036
2037
#: bzrlib/builtins.py:3334
2038
msgid "If no revision is nominated, the last revision is used."
2039
msgstr ""
2040
2041
#: bzrlib/builtins.py:3336
2042
msgid ""
2043
"Note: Take care to redirect standard output when using this command on a\n"
2044
"binary file."
2045
msgstr ""
2046
2047
#: bzrlib/builtins.py:3342
2048
msgid "The path name in the old tree."
2049
msgstr ""
2050
2051
#: bzrlib/builtins.py:3343
2052
msgid "Apply content filters to display the convenience form."
2053
msgstr ""
2054
2055
#: bzrlib/builtins.py:3354
2056
msgid "bzr cat --revision takes exactly one revision specifier"
2057
msgstr ""
2058
2059
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2060
msgid "{0!r} is not present in revision {1}"
2061
msgstr ""
2062
2063
#: bzrlib/builtins.py:3414
2064
msgid "Commit changes into a new revision."
2065
msgstr ""
2066
2067
#: bzrlib/builtins.py:3416
2068
msgid ""
2069
"An explanatory message needs to be given for each commit. This is\n"
2070
"often done by using the --message option (getting the message from the\n"
2071
"command line) or by using the --file option (getting the message from\n"
2072
"a file). If neither of these options is given, an editor is opened for\n"
2073
"the user to enter the message. To see the changed files in the\n"
2074
"boilerplate text loaded into the editor, use the --show-diff option."
2075
msgstr ""
2076
2077
#: bzrlib/builtins.py:3423
2078
msgid ""
2079
"By default, the entire tree is committed and the person doing the\n"
2080
"commit is assumed to be the author. These defaults can be overridden\n"
2081
"as explained below."
2082
msgstr ""
2083
2084
#: bzrlib/builtins.py:3427
2085
msgid ":Selective commits:"
2086
msgstr ""
2087
2088
#: bzrlib/builtins.py:3429
2089
msgid ""
2090
" If selected files are specified, only changes to those files are\n"
2091
" committed. If a directory is specified then the directory and\n"
2092
" everything within it is committed."
2093
msgstr ""
2094
2095
#: bzrlib/builtins.py:3433
2096
msgid ""
2097
" When excludes are given, they take precedence over selected files.\n"
2098
" For example, to commit only changes within foo, but not changes\n"
2099
" within foo/bar::"
2100
msgstr ""
2101
2102
#: bzrlib/builtins.py:3437
2103
msgid " bzr commit foo -x foo/bar"
2104
msgstr ""
2105
2106
#: bzrlib/builtins.py:3439
2107
msgid " A selective commit after a merge is not yet supported."
2108
msgstr ""
2109
2110
#: bzrlib/builtins.py:3441
2111
msgid ":Custom authors:"
2112
msgstr ""
2113
2114
#: bzrlib/builtins.py:3443
2115
msgid ""
2116
" If the author of the change is not the same person as the committer,\n"
2117
" you can specify the author's name using the --author option. The\n"
2118
" name should be in the same format as a committer-id, e.g.\n"
2119
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2120
" the change you can specify the option multiple times, once for each\n"
2121
" author."
2122
msgstr ""
2123
2124
#: bzrlib/builtins.py:3450
2125
msgid ":Checks:"
2126
msgstr ""
2127
2128
#: bzrlib/builtins.py:3452
2129
msgid ""
2130
" A common mistake is to forget to add a new file or directory before\n"
2131
" running the commit command. The --strict option checks for unknown\n"
2132
" files and aborts the commit if any are found. More advanced pre-commit\n"
2133
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2134
" for details."
2135
msgstr ""
2136
2137
#: bzrlib/builtins.py:3458
2138
msgid ":Things to note:"
2139
msgstr ""
2140
2141
#: bzrlib/builtins.py:3460
2142
msgid ""
2143
" If you accidentially commit the wrong changes or make a spelling\n"
2144
" mistake in the commit message say, you can use the uncommit command\n"
2145
" to undo it. See ``bzr help uncommit`` for details."
2146
msgstr ""
2147
2148
#: bzrlib/builtins.py:3464
2149
msgid ""
2150
" Hooks can also be configured to run after a commit. This allows you\n"
2151
" to trigger updates to external systems like bug trackers. The --fixes\n"
2152
" option can be used to record the association between a revision and\n"
2153
" one or more bugs. See ``bzr help bugs`` for details."
2154
msgstr ""
2155
2156
#: bzrlib/builtins.py:3474
2157
msgid "Do not consider changes made to a given path."
2158
msgstr ""
2159
2160
#: bzrlib/builtins.py:3477
2161
msgid "Description of the new revision."
2162
msgstr ""
2163
2164
#: bzrlib/builtins.py:3480
2165
msgid "Commit even if nothing has changed."
2166
msgstr ""
2167
2168
#: bzrlib/builtins.py:3484
2169
msgid "Take commit message from this file."
2170
msgstr ""
2171
2172
#: bzrlib/builtins.py:3486
2173
msgid "Refuse to commit if there are unknown files in the working tree."
2174
msgstr ""
2175
2176
#: bzrlib/builtins.py:3489
2177
msgid ""
2178
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2179
"08:00:00 +0100'."
2180
msgstr ""
2181
2182
#: bzrlib/builtins.py:3492
2183
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2184
msgstr ""
2185
2186
#: bzrlib/builtins.py:3495
2187
msgid "Set the author's name, if it's different from the committer."
2188
msgstr ""
2189
2190
#: bzrlib/builtins.py:3498
2191
msgid ""
2192
"Perform a local commit in a bound branch. Local commits are not pushed to "
2193
"the master branch until a normal commit is performed."
2194
msgstr ""
2195
2196
#: bzrlib/builtins.py:3504
2197
msgid ""
2198
"When no message is supplied, show the diff along with the status summary in "
2199
"the message editor."
2200
msgstr ""
2201
2202
#: bzrlib/builtins.py:3507
2203
msgid ""
2204
"When committing to a foreign version control system do not push data that "
2205
"can not be natively represented."
2206
msgstr ""
2207
2208
#: bzrlib/builtins.py:3525
2209
#, python-format
2210
msgid ""
2211
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2212
"default bug tracker using the `bugtracker` option.\n"
2213
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2214
msgstr ""
2215
2216
#: bzrlib/builtins.py:3534
2217
#, python-format
2218
msgid ""
2219
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2220
"for more information on this feature.\n"
2221
"Commit refused."
2222
msgstr ""
2223
2224
#: bzrlib/builtins.py:3543
2225
#, python-format
2226
msgid "Unrecognized bug %s. Commit refused."
2227
msgstr ""
2228
2229
#: bzrlib/builtins.py:3546
2230
#, python-format
2231
msgid ""
2232
"%s\n"
2233
"Commit refused."
2234
msgstr ""
2235
2236
#: bzrlib/builtins.py:3570
2237
msgid "Could not parse --commit-time: "
2238
msgstr ""
2239
2240
#: bzrlib/builtins.py:3610
2241
msgid "please specify either --message or --file"
2242
msgstr ""
2243
2244
#: bzrlib/builtins.py:3639
2245
msgid "please specify a commit message with either --message or --file"
2246
msgstr ""
2247
2248
#: bzrlib/builtins.py:3642
2249
msgid ""
2250
"Empty commit message specified. Please specify a commit message with either -"
2251
"-message or --file or leave a blank message with --message \"\"."
2252
msgstr ""
2253
2254
#: bzrlib/builtins.py:3662
2255
msgid ""
2256
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2257
"-unchanged to force an empty commit."
2258
msgstr ""
2259
2260
#: bzrlib/builtins.py:3666
2261
msgid ""
2262
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2263
"resolve FILE\" to resolve."
2264
msgstr ""
2265
2266
#: bzrlib/builtins.py:3670
2267
msgid "Commit refused because there are unknown files in the working tree."
2268
msgstr ""
2269
2270
#: bzrlib/builtins.py:3673
2271
msgid ""
2272
"\n"
2273
"To commit to master branch, run update and then commit.\n"
2274
"You can also pass --local to commit to continue working disconnected."
2275
msgstr ""
2276
2277
#: bzrlib/builtins.py:3681
2278
msgid ""
2279
"Validate working tree structure, branch consistency and repository history."
2280
msgstr ""
2281
2282
#: bzrlib/builtins.py:3683
2283
msgid ""
2284
"This command checks various invariants about branch and repository storage\n"
2285
"to detect data corruption or bzr bugs."
2286
msgstr ""
2287
2288
#: bzrlib/builtins.py:3686
2289
msgid ""
2290
"The working tree and branch checks will only give output if a problem is\n"
2291
"detected. The output fields of the repository check are:"
2292
msgstr ""
2293
2294
#: bzrlib/builtins.py:3689
2295
msgid ""
2296
"revisions\n"
2297
" This is just the number of revisions checked. It doesn't\n"
2298
" indicate a problem."
2299
msgstr ""
2300
2301
#: bzrlib/builtins.py:3693
2302
msgid ""
2303
"versionedfiles\n"
2304
" This is just the number of versionedfiles checked. It\n"
2305
" doesn't indicate a problem."
2306
msgstr ""
2307
2308
#: bzrlib/builtins.py:3697
2309
msgid ""
2310
"unreferenced ancestors\n"
2311
" Texts that are ancestors of other texts, but\n"
2312
" are not properly referenced by the revision ancestry. This is a\n"
2313
" subtle problem that Bazaar can work around."
2314
msgstr ""
2315
2316
#: bzrlib/builtins.py:3702
2317
msgid ""
2318
"unique file texts\n"
2319
" This is the total number of unique file contents\n"
2320
" seen in the checked revisions. It does not indicate a problem."
2321
msgstr ""
2322
2323
#: bzrlib/builtins.py:3706
2324
msgid ""
2325
"repeated file texts\n"
2326
" This is the total number of repeated texts seen\n"
2327
" in the checked revisions. Texts can be repeated when their file\n"
2328
" entries are modified, but the file contents are not. It does not\n"
2329
" indicate a problem."
2330
msgstr ""
2331
2332
#: bzrlib/builtins.py:3712
2333
msgid ""
2334
"If no restrictions are specified, all Bazaar data that is found at the "
2335
"given\n"
2336
"location will be checked."
2337
msgstr ""
2338
2339
#: bzrlib/builtins.py:3717
2340
msgid " Check the tree and branch at 'foo'::"
2341
msgstr ""
2342
2343
#: bzrlib/builtins.py:3719
2344
msgid " bzr check --tree --branch foo"
2345
msgstr ""
2346
2347
#: bzrlib/builtins.py:3721
2348
msgid " Check only the repository at 'bar'::"
2349
msgstr ""
2350
2351
#: bzrlib/builtins.py:3723
2352
msgid " bzr check --repo bar"
2353
msgstr ""
2354
2355
#: bzrlib/builtins.py:3725
2356
msgid " Check everything at 'baz'::"
2357
msgstr ""
2358
2359
#: bzrlib/builtins.py:3727
2360
msgid " bzr check baz"
2361
msgstr ""
2362
2363
#: bzrlib/builtins.py:3733
2364
msgid "Check the branch related to the current directory."
2365
msgstr ""
2366
2367
#: bzrlib/builtins.py:3735
2368
msgid "Check the repository related to the current directory."
2369
msgstr ""
2370
2371
#: bzrlib/builtins.py:3737
2372
msgid "Check the working tree related to the current directory."
2373
msgstr ""
2374
2375
#: bzrlib/builtins.py:3751
2376
msgid "Upgrade a repository, branch or working tree to a newer format."
2377
msgstr ""
2378
2379
#: bzrlib/builtins.py:3753
2380
msgid ""
2381
"When the default format has changed after a major new release of\n"
2382
"Bazaar, you may be informed during certain operations that you\n"
2383
"should upgrade. Upgrading to a newer format may improve performance\n"
2384
"or make new features available. It may however limit interoperability\n"
2385
"with older repositories or with older versions of Bazaar."
2386
msgstr ""
2387
2388
#: bzrlib/builtins.py:3759
2389
msgid ""
2390
"If you wish to upgrade to a particular format rather than the\n"
2391
"current default, that can be specified using the --format option.\n"
2392
"As a consequence, you can use the upgrade command this way to\n"
2393
"\"downgrade\" to an earlier format, though some conversions are\n"
2394
"a one way process (e.g. changing from the 1.x default to the\n"
2395
"2.x default) so downgrading is not always possible."
2396
msgstr ""
2397
2398
#: bzrlib/builtins.py:3766
2399
msgid ""
2400
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2401
"process (where # is a number). By default, this is left there on\n"
2402
"completion. If the conversion fails, delete the new .bzr directory\n"
2403
"and rename this one back in its place. Use the --clean option to ask\n"
2404
"for the backup.bzr directory to be removed on successful conversion.\n"
2405
"Alternatively, you can delete it by hand if everything looks good\n"
2406
"afterwards."
2407
msgstr ""
2408
2409
#: bzrlib/builtins.py:3774
2410
msgid ""
2411
"If the location given is a shared repository, dependent branches\n"
2412
"are also converted provided the repository converts successfully.\n"
2413
"If the conversion of a branch fails, remaining branches are still\n"
2414
"tried."
2415
msgstr ""
2416
2417
#: bzrlib/builtins.py:3779
2418
msgid ""
2419
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2420
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2421
msgstr ""
2422
2423
#: bzrlib/builtins.py:3787
2424
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2425
msgstr ""
2426
2427
#: bzrlib/builtins.py:3791
2428
msgid "Branch format"
2429
msgstr ""
2430
2431
#: bzrlib/builtins.py:3793
2432
msgid "Remove the backup.bzr directory if successful."
2433
msgstr ""
2434
2435
#: bzrlib/builtins.py:3795
2436
msgid "Show what would be done, but don't actually do anything."
2437
msgstr ""
2438
2439
#: bzrlib/builtins.py:3810
2440
msgid "Show or set bzr user id."
2441
msgstr ""
2442
2443
#: bzrlib/builtins.py:3812
2444
msgid ""
2445
":Examples:\n"
2446
" Show the email of the current user::"
2447
msgstr ""
2448
2449
#: bzrlib/builtins.py:3815
2450
msgid " bzr whoami --email"
2451
msgstr ""
2452
2453
#: bzrlib/builtins.py:3817
2454
msgid " Set the current user::"
2455
msgstr ""
2456
2457
#: bzrlib/builtins.py:3819
2458
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2459
msgstr ""
2460
2461
#: bzrlib/builtins.py:3823
2462
msgid "Display email address only."
2463
msgstr ""
2464
2465
#: bzrlib/builtins.py:3825
2466
msgid "Set identity for the current branch instead of globally."
2467
msgstr ""
2468
2469
#: bzrlib/builtins.py:3851
2470
msgid "--email can only be used to display existing identity"
2471
msgstr ""
2472
2473
#: bzrlib/builtins.py:3873
2474
msgid "Print or set the branch nickname."
2475
msgstr ""
2476
2477
#: bzrlib/builtins.py:3887
2478
msgid ""
2479
"If unset, the colocated branch name is used for colocated branches, and\n"
2480
"the branch directory name is used for other branches. To print the\n"
2481
"current nickname, execute with no argument."
2482
msgstr ""
2483
2484
#: bzrlib/builtins.py:3878
2485
msgid ""
2486
"Bound branches use the nickname of its master branch unless it is set\n"
2487
"locally."
2488
msgstr ""
2489
2490
#: bzrlib/builtins.py:3898
2491
msgid "Set/unset and display aliases."
2492
msgstr ""
2493
2494
#: bzrlib/builtins.py:3900
2495
msgid ""
2496
":Examples:\n"
2497
" Show the current aliases::"
2498
msgstr ""
2499
2500
#: bzrlib/builtins.py:3903
2501
msgid " bzr alias"
2502
msgstr ""
2503
2504
#: bzrlib/builtins.py:3905
2505
msgid " Show the alias specified for 'll'::"
2506
msgstr ""
2507
2508
#: bzrlib/builtins.py:3907
2509
msgid " bzr alias ll"
2510
msgstr ""
2511
2512
#: bzrlib/builtins.py:3909
2513
msgid " Set an alias for 'll'::"
2514
msgstr ""
2515
2516
#: bzrlib/builtins.py:3911
2517
msgid " bzr alias ll=\"log --line -r-10..-1\""
2518
msgstr ""
2519
2520
#: bzrlib/builtins.py:3913
2521
msgid " To remove an alias for 'll'::"
2522
msgstr ""
2523
2524
#: bzrlib/builtins.py:3915
2525
msgid " bzr alias --remove ll"
2526
msgstr ""
2527
2528
#: bzrlib/builtins.py:3920
2529
msgid "Remove the alias."
2530
msgstr ""
2531
2532
#: bzrlib/builtins.py:3938
2533
msgid "bzr alias --remove expects an alias to remove."
2534
msgstr ""
2535
2536
#: bzrlib/builtins.py:4119
2537
msgid ""
2538
"subunit not available. subunit needs to be installed to use --subunit."
2539
msgstr ""
2540
2541
#: bzrlib/builtins.py:4136
2542
msgid ""
2543
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2544
msgstr ""
2545
2546
#: bzrlib/builtins.py:4183
2547
msgid "Show version of bzr."
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:4187
2551
msgid "Print just the version number."
2552
msgstr ""
2553
2554
#: bzrlib/builtins.py:4206
2555
msgid "It sure does!\n"
2556
msgstr ""
2557
2558
#: bzrlib/builtins.py:4230
2559
#, python-format
2560
msgid "merge base is revision %s\n"
2561
msgstr ""
2562
2563
#: bzrlib/builtins.py:4234
2564
msgid "Perform a three-way merge."
2565
msgstr ""
2566
2567
#: bzrlib/builtins.py:4236
2568
msgid ""
2569
"The source of the merge can be specified either in the form of a branch,\n"
2570
"or in the form of a path to a file containing a merge directive generated\n"
2571
"with bzr send. If neither is specified, the default is the upstream branch\n"
2572
"or the branch most recently merged using --remember. The source of the\n"
2573
"merge may also be specified in the form of a path to a file in another\n"
2574
"branch: in this case, only the modifications to that file are merged into\n"
2575
"the current working tree."
2576
msgstr ""
2577
2578
#: bzrlib/builtins.py:4244
2579
msgid ""
2580
"When merging from a branch, by default bzr will try to merge in all new\n"
2581
"work from the other branch, automatically determining an appropriate base\n"
2582
"revision. If this fails, you may need to give an explicit base."
2583
msgstr ""
2584
2585
#: bzrlib/builtins.py:4248
2586
msgid ""
2587
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2588
"try to merge in all new work up to and including revision OTHER."
2589
msgstr ""
2590
2591
#: bzrlib/builtins.py:4251
2592
msgid ""
2593
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2594
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2595
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2596
"not already contain revision BASE, such a merge is commonly referred to as\n"
2597
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2598
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2599
"changes from the other branch is not stored in the commit."
2600
msgstr ""
2601
2602
#: bzrlib/builtins.py:4259
2603
msgid "Revision numbers are always relative to the source branch."
2604
msgstr ""
2605
2606
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2607
msgid ""
2608
"Merge will do its best to combine the changes in two branches, but there\n"
2609
"are some kinds of problems only a human can fix. When it encounters those,\n"
2610
"it will mark a conflict. A conflict means that you need to fix something,\n"
2611
"before you can commit."
2612
msgstr ""
2613
2614
#: bzrlib/builtins.py:4266
2615
msgid ""
2616
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2617
msgstr ""
2618
2619
#: bzrlib/builtins.py:4268
2620
msgid ""
2621
"If there is no default branch set, the first merge will set it (use\n"
2622
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2623
"to use the default. To change the default, use --remember. The value will\n"
2624
"only be saved if the remote location can be accessed."
2625
msgstr ""
2626
2627
#: bzrlib/builtins.py:4273
2628
msgid ""
2629
"The results of the merge are placed into the destination working\n"
2630
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2631
"committed to record the result of the merge."
2632
msgstr ""
2633
2634
#: bzrlib/builtins.py:4277
2635
msgid ""
2636
"merge refuses to run if there are any uncommitted changes, unless\n"
2637
"--force is given. If --force is given, then the changes from the source \n"
2638
"will be merged with the current working tree, including any uncommitted\n"
2639
"changes in the tree. The --force option can also be used to create a\n"
2640
"merge revision which has more than two parents."
2641
msgstr ""
2642
2643
#: bzrlib/builtins.py:4283
2644
msgid ""
2645
"If one would like to merge changes from the working tree of the other\n"
2646
"branch without merging any committed revisions, the --uncommitted option\n"
2647
"can be given."
2648
msgstr ""
2649
2650
#: bzrlib/builtins.py:4287
2651
msgid ""
2652
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2653
"you to apply each diff hunk and file change, similar to \"shelve\"."
2654
msgstr ""
2655
2656
#: bzrlib/builtins.py:4290
2657
msgid ""
2658
":Examples:\n"
2659
" To merge all new revisions from bzr.dev::"
2660
msgstr ""
2661
2662
#: bzrlib/builtins.py:4293
2663
msgid " bzr merge ../bzr.dev"
2664
msgstr ""
2665
2666
#: bzrlib/builtins.py:4295
2667
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2668
msgstr ""
2669
2670
#: bzrlib/builtins.py:4297
2671
msgid " bzr merge -r 82 ../bzr.dev"
2672
msgstr ""
2673
2674
#: bzrlib/builtins.py:4299
2675
msgid " To merge the changes introduced by 82, without previous changes::"
2676
msgstr ""
2677
2678
#: bzrlib/builtins.py:4301
2679
msgid " bzr merge -r 81..82 ../bzr.dev"
2680
msgstr ""
2681
2682
#: bzrlib/builtins.py:4303
2683
msgid " To apply a merge directive contained in /tmp/merge::"
2684
msgstr ""
2685
2686
#: bzrlib/builtins.py:4305
2687
msgid " bzr merge /tmp/merge"
2688
msgstr ""
2689
2690
#: bzrlib/builtins.py:4307
2691
msgid ""
2692
" To create a merge revision with three parents from two branches\n"
2693
" feature1a and feature1b:"
2694
msgstr ""
2695
2696
#: bzrlib/builtins.py:4310
2697
msgid ""
2698
" bzr merge ../feature1a\n"
2699
" bzr merge ../feature1b --force\n"
2700
" bzr commit -m 'revision with three parents'"
2701
msgstr ""
2702
2703
#: bzrlib/builtins.py:4322
2704
msgid "Merge even if the destination tree has uncommitted changes."
2705
msgstr ""
2706
2707
#: bzrlib/builtins.py:4328
2708
msgid ""
2709
"Apply uncommitted changes from a working copy, instead of branch changes."
2710
msgstr ""
2711
2712
#: bzrlib/builtins.py:4330
2713
msgid ""
2714
"If the destination is already completely merged into the source, pull from "
2715
"the source rather than merging. When this happens, you do not need to "
2716
"commit the result."
2717
msgstr ""
2718
2719
#: bzrlib/builtins.py:4335
2720
msgid ""
2721
"Branch to merge into, rather than the one containing the working directory."
2722
msgstr ""
2723
2724
#: bzrlib/builtins.py:4337
2725
msgid "Instead of merging, show a diff of the merge."
2726
msgstr ""
2727
2728
#: bzrlib/builtins.py:4339
2729
msgid "Select changes interactively."
2730
msgstr ""
2731
2732
#: bzrlib/builtins.py:4361
2733
msgid ""
2734
"Merging into empty branches not currently supported, "
2735
"https://bugs.launchpad.net/bzr/+bug/308562"
2736
msgstr ""
2737
2738
#: bzrlib/builtins.py:4388
2739
msgid "Cannot use --uncommitted with bundles or merge directives."
2740
msgstr ""
2741
2742
#: bzrlib/builtins.py:4399
2743
msgid "Cannot use --uncommitted and --revision at the same time."
2744
msgstr ""
2745
2746
#: bzrlib/builtins.py:4419
2747
msgid "merger: "
2748
msgstr ""
2749
2750
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2751
msgid "Nothing to do."
2752
msgstr ""
2753
2754
#: bzrlib/builtins.py:4425
2755
msgid "Cannot pull individual files"
2756
msgstr ""
2757
2758
#: bzrlib/builtins.py:4433
2759
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4491
2763
#, python-format
2764
msgid "Show-base is not supported for this merge type. %s"
2765
msgstr ""
2766
2767
#: bzrlib/builtins.py:4500
2768
#, python-format
2769
msgid "Conflict reduction is not supported for merge type %s."
2770
msgstr ""
2771
2772
#: bzrlib/builtins.py:4504
2773
msgid "Cannot do conflict reduction and show base."
2774
msgstr ""
2775
2776
#: bzrlib/builtins.py:4615
2777
msgid "No location specified or remembered"
2778
msgstr ""
2779
2780
#: bzrlib/builtins.py:4617
2781
msgid "{0} remembered {1} location {2}"
2782
msgstr ""
2783
2784
#: bzrlib/builtins.py:4623
2785
msgid "Redo a merge."
2786
msgstr ""
2787
2788
#: bzrlib/builtins.py:4625
2789
msgid ""
2790
"Use this if you want to try a different merge technique while resolving\n"
2791
"conflicts. Some merge techniques are better than others, and remerge\n"
2792
"lets you try different ones on different files."
2793
msgstr ""
2794
2795
#: bzrlib/builtins.py:4629
2796
msgid ""
2797
"The options for remerge have the same meaning and defaults as the ones for\n"
2798
"merge. The difference is that remerge can (only) be run when there is a\n"
2799
"pending merge, and it lets you specify particular files."
2800
msgstr ""
2801
2802
#: bzrlib/builtins.py:4633
2803
msgid ""
2804
":Examples:\n"
2805
" Re-do the merge of all conflicted files, and show the base text in\n"
2806
" conflict regions, in addition to the usual THIS and OTHER texts::"
2807
msgstr ""
2808
2809
#: bzrlib/builtins.py:4637
2810
msgid " bzr remerge --show-base"
2811
msgstr ""
2812
2813
#: bzrlib/builtins.py:4639
2814
msgid ""
2815
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2816
" additional processing to reduce the size of conflict regions::"
2817
msgstr ""
2818
2819
#: bzrlib/builtins.py:4642
2820
msgid " bzr remerge --merge-type weave --reprocess foobar"
2821
msgstr ""
2822
2823
#: bzrlib/builtins.py:4649
2824
msgid "Show base revision text in conflicts."
2825
msgstr ""
2826
2827
#: bzrlib/builtins.py:4661
2828
msgid ""
2829
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2830
"merges."
2831
msgstr ""
2832
2833
#: bzrlib/builtins.py:4717
2834
msgid "Revert files to a previous revision."
2835
msgstr ""
2836
2837
#: bzrlib/builtins.py:4719
2838
msgid ""
2839
"Giving a list of files will revert only those files. Otherwise, all files\n"
2840
"will be reverted. If the revision is not specified with '--revision', the\n"
2841
"last committed revision is used."
2842
msgstr ""
2843
2844
#: bzrlib/builtins.py:4723
2845
msgid ""
2846
"To remove only some changes, without reverting to a prior version, use\n"
2847
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2848
"will remove the changes introduced by the second last commit (-2), without\n"
2849
"affecting the changes introduced by the last commit (-1). To remove\n"
2850
"certain changes on a hunk-by-hunk basis, see the shelve command."
2851
msgstr ""
2852
2853
#: bzrlib/builtins.py:4729
2854
msgid ""
2855
"By default, any files that have been manually changed will be backed up\n"
2856
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2857
"'.~#~' appended to their name, where # is a number."
2858
msgstr ""
2859
2860
#: bzrlib/builtins.py:4733
2861
msgid ""
2862
"When you provide files, you can use their current pathname or the pathname\n"
2863
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2864
"name. If you name a directory, all the contents of that directory will be\n"
2865
"reverted."
2866
msgstr ""
2867
2868
#: bzrlib/builtins.py:4738
2869
msgid ""
2870
"If you have newly added files since the target revision, they will be\n"
2871
"removed. If the files to be removed have been changed, backups will be\n"
2872
"created as above. Directories containing unknown files will not be\n"
2873
"deleted."
2874
msgstr ""
2875
2876
#: bzrlib/builtins.py:4743
2877
msgid ""
2878
"The working tree contains a list of revisions that have been merged but\n"
2879
"not yet committed. These revisions will be included as additional parents\n"
2880
"of the next commit. Normally, using revert clears that list as well as\n"
2881
"reverting the files. If any files are specified, revert leaves the list\n"
2882
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2883
".`` in the tree root to revert all files but keep the recorded merges,\n"
2884
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2885
"reverting any files."
2886
msgstr ""
2887
2888
#: bzrlib/builtins.py:4752
2889
msgid ""
2890
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2891
"changes from a branch in a single revision. To do this, perform the merge\n"
2892
"as desired. Then doing revert with the \"--forget-merges\" option will "
2893
"keep\n"
2894
"the content of the tree as it was, but it will clear the list of pending\n"
2895
"merges. The next commit will then contain all of the changes that are\n"
2896
"present in the other branch, but without any other parent revisions.\n"
2897
"Because this technique forgets where these changes originated, it may\n"
2898
"cause additional conflicts on later merges involving the same source and\n"
2899
"target branches."
2900
msgstr ""
2901
2902
#: bzrlib/builtins.py:4766
2903
msgid "Do not save backups of reverted files."
2904
msgstr ""
2905
2906
#: bzrlib/builtins.py:4768
2907
msgid "Remove pending merge marker, without changing any files."
2908
msgstr ""
2909
2910
#: bzrlib/builtins.py:4799
2911
msgid ""
2912
"Show help on a command or other topic.\n"
2913
" "
2914
msgstr ""
2915
2916
#: bzrlib/builtins.py:4804
2917
msgid "Show help on all commands."
2918
msgstr ""
2919
2920
#: bzrlib/builtins.py:4833
2921
msgid "Show unmerged/unpulled revisions between two branches."
2922
msgstr ""
2923
2924
#: bzrlib/builtins.py:4835
2925
msgid "OTHER_BRANCH may be local or remote."
2926
msgstr ""
2927
2928
#: bzrlib/builtins.py:4837
2929
msgid ""
2930
"To filter on a range of revisions, you can use the command -r begin..end\n"
2931
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2932
"also valid.\n"
2933
" \n"
2934
":Exit values:\n"
2935
" 1 - some missing revisions\n"
2936
" 0 - no missing revisions"
2937
msgstr ""
2938
2939
#: bzrlib/builtins.py:4847
2940
msgid ""
2941
" Determine the missing revisions between this and the branch at the\n"
2942
" remembered pull location::"
2943
msgstr ""
2944
2945
#: bzrlib/builtins.py:4850
2946
msgid " bzr missing"
2947
msgstr ""
2948
2949
#: bzrlib/builtins.py:4852
2950
msgid " Determine the missing revisions between this and another branch::"
2951
msgstr ""
2952
2953
#: bzrlib/builtins.py:4854
2954
msgid " bzr missing http://server/branch"
2955
msgstr ""
2956
2957
#: bzrlib/builtins.py:4856
2958
msgid ""
2959
" Determine the missing revisions up to a specific revision on the other\n"
2960
" branch::"
2961
msgstr ""
2962
2963
#: bzrlib/builtins.py:4859
2964
msgid " bzr missing -r ..-10"
2965
msgstr ""
2966
2967
#: bzrlib/builtins.py:4861
2968
msgid ""
2969
" Determine the missing revisions up to a specific revision on this\n"
2970
" branch::"
2971
msgstr ""
2972
2973
#: bzrlib/builtins.py:4864
2974
msgid " bzr missing --my-revision ..-10"
2975
msgstr ""
2976
2977
#: bzrlib/builtins.py:4871
2978
msgid "Reverse the order of revisions."
2979
msgstr ""
2980
2981
#: bzrlib/builtins.py:4873
2982
msgid "Display changes in the local branch only."
2983
msgstr ""
2984
2985
#: bzrlib/builtins.py:4874
2986
msgid "Same as --mine-only."
2987
msgstr ""
2988
2989
#: bzrlib/builtins.py:4876
2990
msgid "Display changes in the remote branch only."
2991
msgstr ""
2992
2993
#: bzrlib/builtins.py:4877
2994
msgid "Same as --theirs-only."
2995
msgstr ""
2996
2997
#: bzrlib/builtins.py:4882
2998
msgid ""
2999
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3000
"details."
3001
msgstr ""
3002
3003
#: bzrlib/builtins.py:4886
3004
msgid ""
3005
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3006
"details."
3007
msgstr ""
3008
3009
#: bzrlib/builtins.py:4889
3010
msgid "Show all revisions in addition to the mainline ones."
3011
msgstr ""
3012
3013
#: bzrlib/builtins.py:4943
3014
msgid "No peer location known or specified."
3015
msgstr ""
3016
3017
#: bzrlib/builtins.py:4947
3018
msgid "Using saved parent location: {0}\n"
3019
msgstr ""
3020
3021
#: bzrlib/builtins.py:4980
3022
#, python-format
3023
msgid "You have %d extra revision:\n"
3024
msgid_plural "You have %d extra revisions:\n"
3025
msgstr[0] ""
3026
msgstr[1] ""
3027
3028
#: bzrlib/builtins.py:4996
3029
#, python-format
3030
msgid "You are missing %d revision:\n"
3031
msgid_plural "You are missing %d revisions:\n"
3032
msgstr[0] ""
3033
msgstr[1] ""
3034
3035
#: bzrlib/builtins.py:5008
3036
msgid "This branch has no new revisions.\n"
3037
msgstr ""
3038
3039
#: bzrlib/builtins.py:5011
3040
msgid "Other branch has no new revisions.\n"
3041
msgstr ""
3042
3043
#: bzrlib/builtins.py:5016
3044
msgid "Branches are up to date.\n"
3045
msgstr ""
3046
3047
#: bzrlib/builtins.py:5027
3048
msgid "Compress the data within a repository."
3049
msgstr ""
3050
3051
#: bzrlib/builtins.py:5029
3052
msgid ""
3053
"This operation compresses the data within a bazaar repository. As\n"
3054
"bazaar supports automatic packing of repository, this operation is\n"
3055
"normally not required to be done manually."
3056
msgstr ""
3057
3058
#: bzrlib/builtins.py:5033
3059
msgid ""
3060
"During the pack operation, bazaar takes a backup of existing repository\n"
3061
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3062
"automatically when it is safe to do so. To save disk space by removing\n"
3063
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3064
"used."
3065
msgstr ""
3066
3067
#: bzrlib/builtins.py:5039
3068
msgid ""
3069
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3070
"during or immediately after repacking, you may be left with a state\n"
3071
"where the deletion has been written to disk but the new packs have not\n"
3072
"been. In this case the repository may be unusable."
3073
msgstr ""
3074
3075
#: bzrlib/builtins.py:5048
3076
msgid "Delete obsolete packs to save disk space."
3077
msgstr ""
3078
3079
#: bzrlib/builtins.py:5062
3080
msgid "List the installed plugins."
3081
msgstr ""
3082
3083
#: bzrlib/builtins.py:5064
3084
msgid ""
3085
"This command displays the list of installed plugins including\n"
3086
"version of plugin and a short description of each."
3087
msgstr ""
3088
3089
#: bzrlib/builtins.py:5067
3090
msgid "--verbose shows the path where each plugin is located."
3091
msgstr ""
3092
3093
#: bzrlib/builtins.py:5069
3094
msgid ""
3095
"A plugin is an external component for Bazaar that extends the\n"
3096
"revision control system, by adding or replacing code in Bazaar.\n"
3097
"Plugins can do a variety of things, including overriding commands,\n"
3098
"adding new commands, providing additional network transports and\n"
3099
"customizing log output."
3100
msgstr ""
3101
3102
#: bzrlib/builtins.py:5075
3103
msgid ""
3104
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3105
"for further information on plugins including where to find them and how to\n"
3106
"install them. Instructions are also provided there on how to write new\n"
3107
"plugins using the Python programming language."
3108
msgstr ""
3109
3110
#: bzrlib/builtins.py:5091
3111
msgid "Show testament (signing-form) of a revision."
3112
msgstr ""
3113
3114
#: bzrlib/builtins.py:5094
3115
msgid "Produce long-format testament."
3116
msgstr ""
3117
3118
#: bzrlib/builtins.py:5096
3119
msgid "Produce a strict-format testament."
3120
msgstr ""
3121
3122
#: bzrlib/builtins.py:5122
3123
msgid "Show the origin of each line in a file."
3124
msgstr ""
3125
3126
#: bzrlib/builtins.py:5124
3127
msgid ""
3128
"This prints out the given file with an annotation on the left side\n"
3129
"indicating which revision, author and date introduced the change."
3130
msgstr ""
3131
3132
#: bzrlib/builtins.py:5127
3133
msgid ""
3134
"If the origin is the same for a run of consecutive lines, it is\n"
3135
"shown only at the top, unless the --all option is given."
3136
msgstr ""
3137
3138
#: bzrlib/builtins.py:5135
3139
msgid "Show annotations on all lines."
3140
msgstr ""
3141
3142
#: bzrlib/builtins.py:5136
3143
msgid "Show commit date in annotations."
3144
msgstr ""
3145
3146
#: bzrlib/builtins.py:5223
3147
msgid "Cannot sign a range of non-revision-history revisions"
3148
msgstr ""
3149
3150
#: bzrlib/builtins.py:5235
3151
msgid "Please supply either one revision, or a range."
3152
msgstr ""
3153
3154
#: bzrlib/builtins.py:5239
3155
msgid ""
3156
"Convert the current branch into a checkout of the supplied branch.\n"
3157
"If no branch is supplied, rebind to the last bound location."
3158
msgstr ""
3159
3160
#: bzrlib/builtins.py:5242
3161
msgid ""
3162
"Once converted into a checkout, commits must succeed on the master branch\n"
3163
"before they will be applied to the local branch."
3164
msgstr ""
3165
3166
#: bzrlib/builtins.py:5245
3167
msgid ""
3168
"Bound branches use the nickname of its master branch unless it is set\n"
3169
"locally, in which case binding will update the local nickname to be\n"
3170
"that of the master."
3171
msgstr ""
3172
3173
#: bzrlib/builtins.py:5260
3174
msgid "No location supplied. This format does not remember old locations."
3175
msgstr ""
3176
3177
#: bzrlib/builtins.py:5265
3178
msgid "Branch is already bound"
3179
msgstr ""
3180
3181
#: bzrlib/builtins.py:5267
3182
msgid "No location supplied and no previous location known"
3183
msgstr ""
3184
3185
#: bzrlib/builtins.py:5273
3186
msgid "These branches have diverged. Try merging, and then bind again."
3187
msgstr ""
3188
3189
#: bzrlib/builtins.py:5280
3190
msgid "Convert the current checkout into a regular branch."
3191
msgstr ""
3192
3193
#: bzrlib/builtins.py:5282
3194
msgid ""
3195
"After unbinding, the local branch is considered independent and subsequent\n"
3196
"commits will be local only."
3197
msgstr ""
3198
3199
#: bzrlib/builtins.py:5293
3200
msgid "Local branch is not bound"
3201
msgstr ""
3202
3203
#: bzrlib/builtins.py:5297
3204
msgid "Remove the last committed revision."
3205
msgstr ""
3206
3207
#: bzrlib/builtins.py:5299
3208
msgid ""
3209
"--verbose will print out what is being removed.\n"
3210
"--dry-run will go through all the motions, but not actually\n"
3211
"remove anything."
3212
msgstr ""
3213
3214
#: bzrlib/builtins.py:5303
3215
msgid ""
3216
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3217
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3218
"branch at revision 15."
3219
msgstr ""
3220
3221
#: bzrlib/builtins.py:5307
3222
msgid ""
3223
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3224
"it may make is to restore any pending merges that were present before\n"
3225
"the commit."
3226
msgstr ""
3227
3228
#: bzrlib/builtins.py:5318
3229
msgid "Don't actually make changes."
3230
msgstr ""
3231
3232
#: bzrlib/builtins.py:5319
3233
msgid "Say yes to all questions."
3234
msgstr ""
3235
3236
#: bzrlib/builtins.py:5321
3237
msgid "Keep tags that point to removed revisions."
3238
msgstr ""
3239
3240
#: bzrlib/builtins.py:5323
3241
msgid "Only remove the commits from the local branch when in a checkout."
3242
msgstr ""
3243
3244
#: bzrlib/builtins.py:5372
3245
msgid "No revisions to uncommit.\n"
3246
msgstr ""
3247
3248
#: bzrlib/builtins.py:5387
3249
msgid "Dry-run, pretending to remove the above revisions.\n"
3250
msgstr ""
3251
3252
#: bzrlib/builtins.py:5390
3253
msgid "The above revision(s) will be removed.\n"
3254
msgstr ""
3255
3256
#: bzrlib/builtins.py:5394
3257
msgid "Uncommit these revisions"
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:5397
3261
msgid "Canceled\n"
3262
msgstr ""
3263
3264
#: bzrlib/builtins.py:5404
3265
#, python-format
3266
msgid ""
3267
"You can restore the old tip by running:\n"
3268
" bzr pull . -r revid:%s\n"
3269
msgstr ""
3270
3271
#: bzrlib/builtins.py:5409
3272
msgid "Break a dead lock."
3273
msgstr ""
3274
3275
#: bzrlib/builtins.py:5411
3276
msgid ""
3277
"This command breaks a lock on a repository, branch, working directory or\n"
3278
"config file."
3279
msgstr ""
3280
3281
#: bzrlib/builtins.py:5414
3282
msgid ""
3283
"CAUTION: Locks should only be broken when you are sure that the process\n"
3284
"holding the lock has been stopped."
3285
msgstr ""
3286
3287
#: bzrlib/builtins.py:5417
3288
msgid ""
3289
"You can get information on what locks are open via the 'bzr info\n"
3290
"[location]' command."
3291
msgstr ""
3292
3293
#: bzrlib/builtins.py:5420
3294
msgid ""
3295
":Examples:\n"
3296
" bzr break-lock\n"
3297
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3298
" bzr break-lock --conf ~/.bazaar"
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5429
3302
msgid "LOCATION is the directory where the config lock is."
3303
msgstr ""
3304
3305
#: bzrlib/builtins.py:5431
3306
msgid "Do not ask for confirmation before breaking the lock."
3307
msgstr ""
3308
3309
#: bzrlib/builtins.py:5466
3310
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3311
msgstr ""
3312
3313
#: bzrlib/builtins.py:5467
3314
msgid "Run the bzr server."
3315
msgstr ""
3316
3317
#: bzrlib/builtins.py:5473
3318
msgid "Serve on stdin/out for use from inetd or sshd."
3319
msgstr ""
3320
3321
#: bzrlib/builtins.py:5474
3322
msgid "protocol"
3323
msgstr ""
3324
3325
#: bzrlib/builtins.py:5475
3326
msgid "Protocol to serve."
3327
msgstr ""
3328
3329
#: bzrlib/builtins.py:5495
3330
msgid "Listen for connections on nominated address."
3331
msgstr ""
3332
3333
#: bzrlib/builtins.py:5497
3334
msgid ""
3335
"Listen for connections on nominated port. Passing 0 as the port number will "
3336
"result in a dynamically allocated port. The default port depends on the "
3337
"protocol."
3338
msgstr ""
3339
3340
#: bzrlib/builtins.py:5485
3341
msgid "Serve contents of this directory."
3342
msgstr ""
3343
3344
#: bzrlib/builtins.py:5487
3345
msgid ""
3346
"By default the server is a readonly server. Supplying --allow-writes "
3347
"enables write access to the contents of the served directory and below. "
3348
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3349
"of external authentication is arranged supplying this option leads to global "
3350
"uncontrolled write access to your file system."
3351
msgstr ""
3352
3353
#: bzrlib/builtins.py:5496
3354
msgid "Override the default idle client timeout (5min)."
3355
msgstr ""
3356
3357
#: bzrlib/builtins.py:5546
3358
msgid "Combine a tree into its containing tree."
3359
msgstr ""
3360
3361
#: bzrlib/builtins.py:5548
3362
msgid "This command requires the target tree to be in a rich-root format."
3363
msgstr ""
3364
3365
#: bzrlib/builtins.py:5550
3366
msgid ""
3367
"The TREE argument should be an independent tree, inside another tree, but\n"
3368
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3369
"running \"bzr branch\" with the target inside a tree.)"
3370
msgstr ""
3371
3372
#: bzrlib/builtins.py:5554
3373
msgid ""
3374
"The result is a combined tree, with the subtree no longer an independent\n"
3375
"part. This is marked as a merge of the subtree into the containing tree,\n"
3376
"and all history is preserved."
3377
msgstr ""
3378
3379
#: bzrlib/builtins.py:5572
3380
#, python-format
3381
msgid ""
3382
"Can't join trees because %s doesn't support rich root data.\n"
3383
"You can use bzr upgrade on the repository."
3384
msgstr ""
3385
3386
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3387
msgid "Cannot join {0}. {1}"
3388
msgstr ""
3389
3390
#: bzrlib/builtins.py:5592
3391
msgid "Split a subdirectory of a tree into a separate tree."
3392
msgstr ""
3393
3394
#: bzrlib/builtins.py:5594
3395
msgid ""
3396
"This command will produce a target tree in a format that supports\n"
3397
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3398
"converted into earlier formats like 'dirstate-tags'."
3399
msgstr ""
3400
3401
#: bzrlib/builtins.py:5598
3402
msgid ""
3403
"The TREE argument should be a subdirectory of a working tree. That\n"
3404
"subdirectory will be converted into an independent tree, with its own\n"
3405
"branch. Commits in the top-level tree will not apply to the new subtree."
3406
msgstr ""
3407
3408
#: bzrlib/builtins.py:5678
3409
msgid "No submit branch specified or known"
3410
msgstr ""
3411
3412
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3413
msgid "No public branch specified or known"
3414
msgstr ""
3415
3416
#: bzrlib/builtins.py:5691
3417
msgid "bzr merge-directive takes at most two one revision identifiers"
3418
msgstr ""
3419
3420
#: bzrlib/builtins.py:5700
3421
msgid "No revisions to bundle."
3422
msgstr ""
3423
3424
#: bzrlib/builtins.py:5719
3425
msgid "Mail or create a merge-directive for submitting changes."
3426
msgstr ""
3427
3428
#: bzrlib/builtins.py:5721
3429
msgid "A merge directive provides many things needed for requesting merges:"
3430
msgstr ""
3431
3432
#: bzrlib/builtins.py:5723
3433
msgid "* A machine-readable description of the merge to perform"
3434
msgstr ""
3435
3436
#: bzrlib/builtins.py:5725
3437
msgid "* An optional patch that is a preview of the changes requested"
3438
msgstr ""
3439
3440
#: bzrlib/builtins.py:5727
3441
msgid ""
3442
"* An optional bundle of revision data, so that the changes can be applied\n"
3443
" directly from the merge directive, without retrieving data from a\n"
3444
" branch."
3445
msgstr ""
3446
3447
#: bzrlib/builtins.py:5731
3448
msgid ""
3449
"`bzr send` creates a compact data set that, when applied using bzr\n"
3450
"merge, has the same effect as merging from the source branch. "
3451
msgstr ""
3452
3453
#: bzrlib/builtins.py:5734
3454
msgid ""
3455
"By default the merge directive is self-contained and can be applied to any\n"
3456
"branch containing submit_branch in its ancestory without needing access to\n"
3457
"the source branch."
3458
msgstr ""
3459
3460
#: bzrlib/builtins.py:5738
3461
msgid ""
3462
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3463
"revisions, but only a structured request to merge from the\n"
3464
"public_location. In that case the public_branch is needed and it must be\n"
3465
"up-to-date and accessible to the recipient. The public_branch is always\n"
3466
"included if known, so that people can check it later."
3467
msgstr ""
3468
3469
#: bzrlib/builtins.py:5744
3470
msgid ""
3471
"The submit branch defaults to the parent of the source branch, but can be\n"
3472
"overridden. Both submit branch and public branch will be remembered in\n"
3473
"branch.conf the first time they are used for a particular branch. The\n"
3474
"source branch defaults to that containing the working directory, but can\n"
3475
"be changed using --from."
3476
msgstr ""
3477
3478
#: bzrlib/builtins.py:5750
3479
msgid ""
3480
"Both the submit branch and the public branch follow the usual behavior with\n"
3481
"respect to --remember: If there is no default location set, the first send\n"
3482
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3483
"omit the location to use the default. To change the default, use\n"
3484
"--remember. The value will only be saved if the location can be accessed."
3485
msgstr ""
3486
3487
#: bzrlib/builtins.py:5756
3488
msgid ""
3489
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3490
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3491
"If a public location is known for the submit_branch, that location is used\n"
3492
"in the merge directive."
3493
msgstr ""
3494
3495
#: bzrlib/builtins.py:5761
3496
msgid ""
3497
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3498
"given, in which case it is sent to a file."
3499
msgstr ""
3500
3501
#: bzrlib/builtins.py:5764
3502
msgid ""
3503
"Mail is sent using your preferred mail program. This should be transparent\n"
3504
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3505
"If the preferred client can't be found (or used), your editor will be used."
3506
msgstr ""
3507
3508
#: bzrlib/builtins.py:5768
3509
msgid ""
3510
"To use a specific mail program, set the mail_client configuration option.\n"
3511
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3512
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3513
"(MacOS X's\n"
3514
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3515
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3516
"add\n"
3517
"supported clients."
3518
msgstr ""
3519
3520
#: bzrlib/builtins.py:5775
3521
msgid ""
3522
"If mail is being sent, a to address is required. This can be supplied\n"
3523
"either on the commandline, by setting the submit_to configuration\n"
3524
"option in the branch itself or the child_submit_to configuration option\n"
3525
"in the submit branch."
3526
msgstr ""
3527
3528
#: bzrlib/builtins.py:5780
3529
msgid ""
3530
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3531
"and\n"
3532
"merge directive format 2. It is significantly faster and smaller than\n"
3533
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3534
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3535
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3536
msgstr ""
3537
3538
#: bzrlib/builtins.py:5786
3539
msgid ""
3540
"The merge directives created by bzr send may be applied using bzr merge or\n"
3541
"bzr pull by specifying a file containing a merge directive as the location."
3542
msgstr ""
3543
3544
#: bzrlib/builtins.py:5789
3545
msgid ""
3546
"bzr send makes extensive use of public locations to map local locations "
3547
"into\n"
3548
"URLs that can be used by other people. See `bzr help configuration` to\n"
3549
"set them, and use `bzr info` to display them."
3550
msgstr ""
3551
3552
#: bzrlib/builtins.py:5813
3553
msgid "Write merge directive to this file or directory; use - for stdout."
3554
msgstr ""
3555
3556
#: bzrlib/builtins.py:5817
3557
msgid ""
3558
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3559
"strict disables the check."
3560
msgstr ""
3561
3562
#: bzrlib/builtins.py:5819
3563
msgid "Mail the request to this address."
3564
msgstr ""
3565
3566
#: bzrlib/builtins.py:5823
3567
msgid "Body for the email."
3568
msgstr ""
3569
3570
#: bzrlib/builtins.py:5876
3571
msgid "Do not include a bundle in the merge directive."
3572
msgstr ""
3573
3574
#: bzrlib/builtins.py:5877
3575
msgid "Do not include a preview patch in the merge directive."
3576
msgstr ""
3577
3578
#: bzrlib/builtins.py:5880
3579
msgid "Remember submit and public branch."
3580
msgstr ""
3581
3582
#: bzrlib/builtins.py:5882
3583
msgid ""
3584
"Branch to generate the submission from, rather than the one containing the "
3585
"working directory."
3586
msgstr ""
3587
3588
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3589
msgid "format"
3590
msgstr ""
3591
3592
#: bzrlib/builtins.py:5893
3593
msgid "Use the specified output format."
3594
msgstr ""
3595
3596
#: bzrlib/builtins.py:5915
3597
msgid "Create, remove or modify a tag naming a revision."
3598
msgstr ""
3599
3600
#: bzrlib/builtins.py:5917
3601
msgid ""
3602
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3603
"(--revision) option can be given -rtag:X, where X is any previously\n"
3604
"created tag."
3605
msgstr ""
3606
3607
#: bzrlib/builtins.py:5921
3608
msgid ""
3609
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3610
"along when you branch, push, pull or merge."
3611
msgstr ""
3612
3613
#: bzrlib/builtins.py:5924
3614
msgid ""
3615
"It is an error to give a tag name that already exists unless you pass\n"
3616
"--force, in which case the tag is moved to point to the new revision."
3617
msgstr ""
3618
3619
#: bzrlib/builtins.py:5927
3620
msgid ""
3621
"To rename a tag (change the name but keep it on the same revsion), run "
3622
"``bzr\n"
3623
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3624
msgstr ""
3625
3626
#: bzrlib/builtins.py:5930
3627
msgid ""
3628
"If no tag name is specified it will be determined through the \n"
3629
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3630
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3631
"details."
3632
msgstr ""
3633
3634
#: bzrlib/builtins.py:5940
3635
msgid "Delete this tag rather than placing it."
3636
msgstr ""
3637
3638
#: bzrlib/builtins.py:5943
3639
msgid "Branch in which to place the tag."
3640
msgstr ""
3641
3642
#: bzrlib/builtins.py:5945
3643
msgid "Replace existing tags."
3644
msgstr ""
3645
3646
#: bzrlib/builtins.py:5960
3647
msgid "No tag specified to delete."
3648
msgstr ""
3649
3650
#: bzrlib/builtins.py:5962
3651
#, python-format
3652
msgid "Deleted tag %s."
3653
msgstr ""
3654
3655
#: bzrlib/builtins.py:5976
3656
msgid "Please specify a tag name."
3657
msgstr ""
3658
3659
#: bzrlib/builtins.py:5984
3660
#, python-format
3661
msgid "Tag %s already exists for that revision."
3662
msgstr ""
3663
3664
#: bzrlib/builtins.py:5988
3665
#, python-format
3666
msgid "Created tag %s."
3667
msgstr ""
3668
3669
#: bzrlib/builtins.py:5990
3670
#, python-format
3671
msgid "Updated tag %s."
3672
msgstr ""
3673
3674
#: bzrlib/builtins.py:5994
3675
msgid "List tags."
3676
msgstr ""
3677
3678
#: bzrlib/builtins.py:5996
3679
msgid ""
3680
"This command shows a table of tag names and the revisions they reference."
3681
msgstr ""
3682
3683
#: bzrlib/builtins.py:6002
3684
msgid "Branch whose tags should be displayed."
3685
msgstr ""
3686
3687
#: bzrlib/builtins.py:6004
3688
msgid "Sort tags by different criteria."
3689
msgstr ""
3690
3691
#: bzrlib/builtins.py:6004
3692
msgid "Sorting"
3693
msgstr ""
3694
3695
#: bzrlib/builtins.py:6073
3696
msgid "Reconfigure the type of a bzr directory."
3697
msgstr ""
3698
3699
#: bzrlib/builtins.py:6075
3700
msgid "A target configuration must be specified."
3701
msgstr ""
3702
3703
#: bzrlib/builtins.py:6077
3704
msgid ""
3705
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3706
"The order of preference is\n"
3707
"1. For a lightweight checkout, the current bound location.\n"
3708
"2. For branches that used to be checkouts, the previously-bound location.\n"
3709
"3. The push location.\n"
3710
"4. The parent location.\n"
3711
"If none of these is available, --bind-to must be specified."
3712
msgstr ""
3713
3714
#: bzrlib/builtins.py:6091
3715
msgid "Tree type"
3716
msgstr ""
3717
3718
#: bzrlib/builtins.py:6092
3719
msgid "The relation between branch and tree."
3720
msgstr ""
3721
3722
#: bzrlib/builtins.py:6094
3723
msgid "Reconfigure to be an unbound branch with no working tree."
3724
msgstr ""
3725
3726
#: bzrlib/builtins.py:6095
3727
msgid "Reconfigure to be an unbound branch with a working tree."
3728
msgstr ""
3729
3730
#: bzrlib/builtins.py:6096
3731
msgid "Reconfigure to be a bound branch with a working tree."
3732
msgstr ""
3733
3734
#: bzrlib/builtins.py:6097
3735
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3736
msgstr ""
3737
3738
#: bzrlib/builtins.py:6102
3739
msgid "Repository type"
3740
msgstr ""
3741
3742
#: bzrlib/builtins.py:6103
3743
msgid "Location fo the repository."
3744
msgstr ""
3745
3746
#: bzrlib/builtins.py:6105
3747
msgid ""
3748
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3749
msgstr ""
3750
3751
#: bzrlib/builtins.py:6107
3752
msgid "Reconfigure to use a shared repository."
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:6111
3756
msgid "Trees in Repository"
3757
msgstr ""
3758
3759
#: bzrlib/builtins.py:6112
3760
msgid "Whether new branches in the repository have trees."
3761
msgstr ""
3762
3763
#: bzrlib/builtins.py:6114
3764
msgid ""
3765
"Reconfigure repository to create working trees on branches by default."
3766
msgstr ""
3767
3768
#: bzrlib/builtins.py:6116
3769
msgid ""
3770
"Reconfigure repository to not create working trees on branches by default."
3771
msgstr ""
3772
3773
#: bzrlib/builtins.py:6119
3774
msgid "Branch to bind checkout to."
3775
msgstr ""
3776
3777
#: bzrlib/builtins.py:6121
3778
msgid "Perform reconfiguration even if local changes will be lost."
3779
msgstr ""
3780
3781
#: bzrlib/builtins.py:6124
3782
msgid "Reconfigure a branch to be stacked on another branch."
3783
msgstr ""
3784
3785
#: bzrlib/builtins.py:6128
3786
msgid ""
3787
"Reconfigure a branch to be unstacked. This may require copying substantial "
3788
"data into it."
3789
msgstr ""
3790
3791
#: bzrlib/builtins.py:6138
3792
msgid "Can't use both --stacked-on and --unstacked"
3793
msgstr ""
3794
3795
#: bzrlib/builtins.py:6152
3796
msgid "No target configuration specified"
3797
msgstr ""
3798
3799
#: bzrlib/builtins.py:6187
3800
msgid "Set the branch of a checkout and update."
3801
msgstr ""
3802
3803
#: bzrlib/builtins.py:6189
3804
msgid ""
3805
"For lightweight checkouts, this changes the branch being referenced.\n"
3806
"For heavyweight checkouts, this checks that there are no local commits\n"
3807
"versus the current bound branch, then it makes the local branch a mirror\n"
3808
"of the new location and binds to it."
3809
msgstr ""
3810
3811
#: bzrlib/builtins.py:6194
3812
msgid ""
3813
"In both cases, the working tree is updated and uncommitted changes\n"
3814
"are merged. The user can commit or revert these as they desire."
3815
msgstr ""
3816
3817
#: bzrlib/builtins.py:6197
3818
msgid "Pending merges need to be committed or reverted before using switch."
3819
msgstr ""
3820
3821
#: bzrlib/builtins.py:6199
3822
msgid ""
3823
"The path to the branch to switch to can be specified relative to the parent\n"
3824
"directory of the current branch. For example, if you are currently in a\n"
3825
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3826
"/path/to/newbranch."
3827
msgstr ""
3828
3829
#: bzrlib/builtins.py:6204
3830
msgid ""
3831
"Bound branches use the nickname of its master branch unless it is set\n"
3832
"locally, in which case switching will update the local nickname to be\n"
3833
"that of the master."
3834
msgstr ""
3835
3836
#: bzrlib/builtins.py:6212
3837
msgid "Switch even if local commits will be lost."
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:6215
3841
msgid "Create the target branch from this one before switching to it."
3842
msgstr ""
3843
3844
#: bzrlib/builtins.py:6229
3845
msgid "You must supply either a revision or a location"
3846
msgstr ""
3847
3848
#: bzrlib/builtins.py:6242
3849
msgid "cannot create branch without source branch"
3850
msgstr ""
3851
3852
#: bzrlib/builtins.py:6262
3853
msgid "Manage filtered views."
3854
msgstr ""
3855
3856
#: bzrlib/builtins.py:6264
3857
msgid ""
3858
"Views provide a mask over the tree so that users can focus on\n"
3859
"a subset of a tree when doing their work. After creating a view,\n"
3860
"commands that support a list of files - status, diff, commit, etc -\n"
3861
"effectively have that list of files implicitly given each time.\n"
3862
"An explicit list of files can still be given but those files\n"
3863
"must be within the current view."
3864
msgstr ""
3865
3866
#: bzrlib/builtins.py:6271
3867
msgid ""
3868
"In most cases, a view has a short life-span: it is created to make\n"
3869
"a selected change and is deleted once that change is committed.\n"
3870
"At other times, you may wish to create one or more named views\n"
3871
"and switch between them."
3872
msgstr ""
3873
3874
#: bzrlib/builtins.py:6276
3875
msgid ""
3876
"To disable the current view without deleting it, you can switch to\n"
3877
"the pseudo view called ``off``. This can be useful when you need\n"
3878
"to see the whole tree for an operation or two (e.g. merge) but\n"
3879
"want to switch back to your view after that."
3880
msgstr ""
3881
3882
#: bzrlib/builtins.py:6281
3883
msgid ""
3884
":Examples:\n"
3885
" To define the current view::"
3886
msgstr ""
3887
3888
#: bzrlib/builtins.py:6284
3889
msgid " bzr view file1 dir1 ..."
3890
msgstr ""
3891
3892
#: bzrlib/builtins.py:6286
3893
msgid " To list the current view::"
3894
msgstr ""
3895
3896
#: bzrlib/builtins.py:6288
3897
msgid " bzr view"
3898
msgstr ""
3899
3900
#: bzrlib/builtins.py:6290
3901
msgid " To delete the current view::"
3902
msgstr ""
3903
3904
#: bzrlib/builtins.py:6292
3905
msgid " bzr view --delete"
3906
msgstr ""
3907
3908
#: bzrlib/builtins.py:6294
3909
msgid " To disable the current view without deleting it::"
3910
msgstr ""
3911
3912
#: bzrlib/builtins.py:6296
3913
msgid " bzr view --switch off"
3914
msgstr ""
3915
3916
#: bzrlib/builtins.py:6298
3917
msgid " To define a named view and switch to it::"
3918
msgstr ""
3919
3920
#: bzrlib/builtins.py:6300
3921
msgid " bzr view --name view-name file1 dir1 ..."
3922
msgstr ""
3923
3924
#: bzrlib/builtins.py:6302
3925
msgid " To list a named view::"
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:6304
3929
msgid " bzr view --name view-name"
3930
msgstr ""
3931
3932
#: bzrlib/builtins.py:6306
3933
msgid " To delete a named view::"
3934
msgstr ""
3935
3936
#: bzrlib/builtins.py:6308
3937
msgid " bzr view --name view-name --delete"
3938
msgstr ""
3939
3940
#: bzrlib/builtins.py:6310
3941
msgid " To switch to a named view::"
3942
msgstr ""
3943
3944
#: bzrlib/builtins.py:6312
3945
msgid " bzr view --switch view-name"
3946
msgstr ""
3947
3948
#: bzrlib/builtins.py:6314
3949
msgid " To list all views defined::"
3950
msgstr ""
3951
3952
#: bzrlib/builtins.py:6316
3953
msgid " bzr view --all"
3954
msgstr ""
3955
3956
#: bzrlib/builtins.py:6318
3957
msgid " To delete all views::"
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:6320
3961
msgid " bzr view --delete --all"
3962
msgstr ""
3963
3964
#: bzrlib/builtins.py:6327
3965
msgid "Apply list or delete action to all views."
3966
msgstr ""
3967
3968
#: bzrlib/builtins.py:6330
3969
msgid "Delete the view."
3970
msgstr ""
3971
3972
#: bzrlib/builtins.py:6333
3973
msgid "Name of the view to define, list or delete."
3974
msgstr ""
3975
3976
#: bzrlib/builtins.py:6337
3977
msgid "Name of the view to switch to."
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:6356
3981
msgid "Both --delete and a file list specified"
3982
msgstr ""
3983
3984
#: bzrlib/builtins.py:6359
3985
msgid "Both --delete and --switch specified"
3986
msgstr ""
3987
3988
#: bzrlib/builtins.py:6362
3989
msgid "Deleted all views.\n"
3990
msgstr ""
3991
3992
#: bzrlib/builtins.py:6364
3993
msgid "No current view to delete"
3994
msgstr ""
3995
3996
#: bzrlib/builtins.py:6367
3997
#, python-format
3998
msgid "Deleted '%s' view.\n"
3999
msgstr ""
4000
4001
#: bzrlib/builtins.py:6371
4002
msgid "Both --switch and a file list specified"
4003
msgstr ""
4004
4005
#: bzrlib/builtins.py:6374
4006
msgid "Both --switch and --all specified"
4007
msgstr ""
4008
4009
#: bzrlib/builtins.py:6377
4010
msgid "No current view to disable"
4011
msgstr ""
4012
4013
#: bzrlib/builtins.py:6379
4014
#, python-format
4015
msgid "Disabled '%s' view.\n"
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4019
msgid "Using '{0}' view: {1}\n"
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:6386
4023
msgid "Views defined:\n"
4024
msgstr ""
4025
4026
#: bzrlib/builtins.py:6395
4027
msgid "No views defined.\n"
4028
msgstr ""
4029
4030
#: bzrlib/builtins.py:6402
4031
msgid "Cannot change the 'off' pseudo view"
4032
msgstr ""
4033
4034
#: bzrlib/builtins.py:6410
4035
msgid "No current view.\n"
4036
msgstr ""
4037
4038
#: bzrlib/builtins.py:6413
4039
msgid "'{0}' view is: {1}\n"
4040
msgstr ""
4041
4042
#: bzrlib/builtins.py:6433
4043
msgid " <no hooks installed>\n"
4044
msgstr ""
4045
4046
#: bzrlib/builtins.py:6437
4047
msgid "Remove a branch."
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6439
4051
msgid ""
4052
"This will remove the branch from the specified location but \n"
4053
"will keep any working tree or repository in place."
4054
msgstr ""
4055
4056
#: bzrlib/builtins.py:6444
4057
msgid " Remove the branch at repo/trunk::"
4058
msgstr ""
4059
4060
#: bzrlib/builtins.py:6446
4061
msgid " bzr remove-branch repo/trunk"
4062
msgstr ""
4063
4064
#: bzrlib/builtins.py:6444
4065
msgid "Remove branch even if it is the active branch."
4066
msgstr ""
4067
4068
#: bzrlib/builtins.py:6458
4069
msgid "Branch is active. Use --force to remove it."
4070
msgstr ""
4071
4072
#: bzrlib/builtins.py:6461
4073
msgid "Plaintext diff output."
4074
msgstr ""
4075
4076
#: bzrlib/builtins.py:6462
4077
msgid "Temporarily set aside some changes from the current tree."
4078
msgstr ""
4079
4080
#: bzrlib/builtins.py:6464
4081
msgid ""
4082
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4083
"ie. out of the way, until a later time when you can bring them back from\n"
4084
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4085
"your working tree, and so they aren't propagated along with your branch nor\n"
4086
"will they survive its deletion."
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:6470
4090
msgid "If shelve --list is specified, previously-shelved changes are listed."
4091
msgstr ""
4092
4093
#: bzrlib/builtins.py:6472
4094
msgid ""
4095
"Shelve is intended to help separate several sets of changes that have\n"
4096
"been inappropriately mingled. If you just want to get rid of all changes\n"
4097
"and you don't need to restore them later, use revert. If you want to\n"
4098
"shelve all text changes at once, use shelve --all."
4099
msgstr ""
4100
4101
#: bzrlib/builtins.py:6477
4102
msgid ""
4103
"If filenames are specified, only the changes to those files will be\n"
4104
"shelved. Other files will be left untouched."
4105
msgstr ""
4106
4107
#: bzrlib/builtins.py:6480
4108
msgid ""
4109
"If a revision is specified, changes since that revision will be shelved."
4110
msgstr ""
4111
4112
#: bzrlib/builtins.py:6482
4113
msgid ""
4114
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4115
"restore the most recently shelved changes."
4116
msgstr ""
4117
4118
#: bzrlib/builtins.py:6485
4119
msgid ""
4120
"For complicated changes, it is possible to edit the changes in a separate\n"
4121
"editor program to decide what the file remaining in the working copy\n"
4122
"should look like. To do this, add the configuration option"
4123
msgstr ""
4124
4125
#: bzrlib/builtins.py:6489
4126
msgid " change_editor = PROGRAM @new_path @old_path"
4127
msgstr ""
4128
4129
#: bzrlib/builtins.py:6491
4130
msgid ""
4131
"where @new_path is replaced with the path of the new version of the \n"
4132
"file and @old_path is replaced with the path of the old version of \n"
4133
"the file. The PROGRAM should save the new file with the desired \n"
4134
"contents of the file in the working tree.\n"
4135
" "
4136
msgstr ""
4137
4138
#: bzrlib/builtins.py:6503
4139
msgid "Shelve all changes."
4140
msgstr ""
4141
4142
#: bzrlib/builtins.py:6505
4143
msgid "Method to use for writing diffs."
4144
msgstr ""
4145
4146
#: bzrlib/builtins.py:6505
4147
msgid "writer"
4148
msgstr ""
4149
4150
#: bzrlib/builtins.py:6509
4151
msgid "List shelved changes."
4152
msgstr ""
4153
4154
#: bzrlib/builtins.py:6511
4155
msgid "Destroy removed changes instead of shelving them."
4156
msgstr ""
4157
4158
#: bzrlib/builtins.py:6540
4159
msgid "No shelved changes."
4160
msgstr ""
4161
4162
#: bzrlib/builtins.py:6551
4163
msgid "Restore shelved changes."
4164
msgstr ""
4165
4166
#: bzrlib/builtins.py:6553
4167
msgid ""
4168
"By default, the most recently shelved changes are restored. However if you\n"
4169
"specify a shelf by id those changes will be restored instead. This works\n"
4170
"best when the changes don't depend on each other."
4171
msgstr ""
4172
4173
#: bzrlib/builtins.py:6562
4174
msgid "The action to perform."
4175
msgstr ""
4176
4177
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4178
msgid "action"
4179
msgstr ""
4180
4181
#: bzrlib/builtins.py:6564
4182
msgid "Apply changes and remove from the shelf."
4183
msgstr ""
4184
4185
#: bzrlib/builtins.py:6565
4186
msgid "Show changes, but do not apply or remove them."
4187
msgstr ""
4188
4189
#: bzrlib/builtins.py:6566
4190
msgid ""
4191
"Instead of unshelving the changes, show the diff that would result from "
4192
"unshelving."
4193
msgstr ""
4194
4195
#: bzrlib/builtins.py:6568
4196
msgid "Delete changes without applying them."
4197
msgstr ""
4198
4199
#: bzrlib/builtins.py:6569
4200
msgid "Apply changes but don't delete them."
4201
msgstr ""
4202
4203
#: bzrlib/builtins.py:6584
4204
msgid "Remove unwanted files from working tree."
4205
msgstr ""
4206
4207
#: bzrlib/builtins.py:6586
4208
msgid ""
4209
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4210
"files are never deleted."
4211
msgstr ""
4212
4213
#: bzrlib/builtins.py:6589
4214
msgid ""
4215
"Another class is 'detritus', which includes files emitted by bzr during\n"
4216
"normal operations and selftests. (The value of these files decreases with\n"
4217
"time.)"
4218
msgstr ""
4219
4220
#: bzrlib/builtins.py:6593
4221
msgid ""
4222
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4223
"flags are respected, and may be combined."
4224
msgstr ""
4225
4226
#: bzrlib/builtins.py:6596
4227
msgid "To check what clean-tree will do, use --dry-run."
4228
msgstr ""
4229
4230
#: bzrlib/builtins.py:6599
4231
msgid "Delete all ignored files."
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:6600
4235
msgid ""
4236
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4237
msgstr ""
4238
4239
#: bzrlib/builtins.py:6603
4240
msgid "Delete files unknown to bzr (default)."
4241
msgstr ""
4242
4243
#: bzrlib/builtins.py:6604
4244
msgid "Show files to delete instead of deleting them."
4245
msgstr ""
4246
4247
#: bzrlib/builtins.py:6606
4248
msgid "Do not prompt before deleting."
4249
msgstr ""
4250
4251
#: bzrlib/bundle/__init__.py:59
4252
msgid "A directory cannot be a bundle"
4253
msgstr ""
4254
4255
#: bzrlib/bundle/apply_bundle.py:40
4256
msgid "Install revisions"
4257
msgstr ""
4258
4259
#: bzrlib/bundle/commands.py:64
4260
msgid "--verbose requires a merge directive"
4261
msgstr ""
4262
4263
#: bzrlib/bundle/commands.py:67
4264
msgid "Bundle format not supported"
4265
msgstr ""
4266
4267
#: bzrlib/bundle/commands.py:77
4268
msgid "Records\n"
4269
msgstr ""
4270
4271
#: bzrlib/bundle/commands.py:81
4272
msgid "{0}: {1} ({2} multiparent)\n"
4273
msgstr ""
4274
4275
#: bzrlib/bundle/commands.py:83
4276
#, python-format
4277
msgid "unique files: %d\n"
4278
msgstr ""
4279
4280
#: bzrlib/bundle/commands.py:92
4281
msgid "Revisions\n"
4282
msgstr ""
4283
4284
#: bzrlib/bundle/commands.py:93
4285
#, python-format
4286
msgid "nicks: %s\n"
4287
msgstr ""
4288
4289
#: bzrlib/bundle/commands.py:95
4290
#, python-format
4291
msgid ""
4292
"committers: \n"
4293
"%s\n"
4294
msgstr ""
4295
4296
#: bzrlib/bundle/commands.py:103
4297
msgid "Decoded contents\n"
4298
msgstr ""
4299
4300
#: bzrlib/bundle/serializer/v4.py:327
4301
#, python-format
4302
msgid "Bundling %d revision."
4303
msgid_plural "Bundling %d revisions."
4304
msgstr[0] ""
4305
msgstr[1] ""
4306
4307
#: bzrlib/bzrdir.py:490
4308
msgid ""
4309
"making backup of {0}\n"
4310
" to {1}"
4311
msgstr ""
4312
4313
#: bzrlib/bzrdir.py:513
4314
msgid "renamed {0} to {1}"
4315
msgstr ""
4316
4317
#: bzrlib/bzrdir.py:1652
4318
#, python-format
4319
msgid ""
4320
"Source repository format does not support stacking, using format:\n"
4321
" %s"
4322
msgstr ""
4323
4324
#: bzrlib/bzrdir.py:1672
4325
#, python-format
4326
msgid ""
4327
"Source branch format does not support stacking, using format:\n"
4328
" %s"
4329
msgstr ""
4330
4331
#: bzrlib/bzrdir.py:1818
4332
msgid "starting repository conversion"
4333
msgstr ""
4334
4335
#: bzrlib/bzrdir.py:2039
4336
msgid "Using default stacking branch {0} at {1}"
4337
msgstr ""
4338
4339
#: bzrlib/check.py:108
4340
msgid "check"
4341
msgstr ""
4342
4343
#: bzrlib/check.py:110
4344
msgid "checking revisions"
4345
msgstr ""
4346
4347
#: bzrlib/check.py:112
4348
msgid "checking commit contents"
4349
msgstr ""
4350
4351
#: bzrlib/check.py:114
4352
msgid "checking file graphs"
4353
msgstr ""
4354
4355
#: bzrlib/check.py:118
4356
msgid "checking branches and trees"
4357
msgstr ""
4358
4359
#: bzrlib/check.py:205
4360
msgid "checked repository {0} format {1}"
4361
msgstr ""
4362
4363
#: bzrlib/check.py:208
4364
#, python-format
4365
msgid "%6d revisions"
4366
msgstr ""
4367
4368
#: bzrlib/check.py:209
4369
#, python-format
4370
msgid "%6d file-ids"
4371
msgstr ""
4372
4373
#: bzrlib/check.py:211
4374
#, python-format
4375
msgid "%6d unreferenced text versions"
4376
msgstr ""
4377
4378
#: bzrlib/check.py:215
4379
msgid "unreferenced version: {{{0}}} in {1}"
4380
msgstr ""
4381
4382
#: bzrlib/check.py:218
4383
#, python-format
4384
msgid "%6d revisions are missing inventory_sha1"
4385
msgstr ""
4386
4387
#: bzrlib/check.py:221
4388
#, python-format
4389
msgid "%6d revisions are mentioned but not present"
4390
msgstr ""
4391
4392
#: bzrlib/check.py:224
4393
#, python-format
4394
msgid "%6d ghost revisions"
4395
msgstr ""
4396
4397
#: bzrlib/check.py:229
4398
#, python-format
4399
msgid "%6d revisions missing parents in ancestry"
4400
msgstr ""
4401
4402
#: bzrlib/check.py:233
4403
#, python-format
4404
msgid " %s should be in the ancestry for:"
4405
msgstr ""
4406
4407
#: bzrlib/check.py:237
4408
#, python-format
4409
msgid "%6d inconsistent parents"
4410
msgstr ""
4411
4412
#: bzrlib/check.py:241
4413
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4414
msgstr ""
4415
4416
#: bzrlib/check.py:247
4417
#, python-format
4418
msgid "%6d revisions have incorrect parents in the revision index"
4419
msgstr ""
4420
4421
#: bzrlib/check.py:253
4422
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4423
msgstr ""
4424
4425
#: bzrlib/check.py:267
4426
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4427
msgstr ""
4428
4429
#: bzrlib/check.py:296
4430
msgid ""
4431
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4432
"{{{4}}}"
4433
msgstr ""
4434
4435
#: bzrlib/check.py:354
4436
#, python-format
4437
msgid "Checking branch at '%s'."
4438
msgstr ""
4439
4440
#: bzrlib/check.py:374
4441
#, python-format
4442
msgid "Checking working tree at '%s'."
4443
msgstr ""
4444
4445
#: bzrlib/check.py:427 bzrlib/check.py:441
4446
msgid "No branch found at specified location."
4447
msgstr ""
4448
4449
#: bzrlib/check.py:429 bzrlib/check.py:439
4450
msgid "No working tree found at specified location."
4451
msgstr ""
4452
4453
#: bzrlib/check.py:432
4454
#, python-format
4455
msgid "Checking repository at '%s'."
4456
msgstr ""
4457
4458
#: bzrlib/check.py:443
4459
msgid "No repository found at specified location."
4460
msgstr ""
4461
4462
#: bzrlib/clean_tree.py:63
4463
msgid "Nothing to delete."
4464
msgstr ""
4465
4466
#: bzrlib/clean_tree.py:68
4467
msgid "Are you sure you wish to delete these"
4468
msgstr ""
4469
4470
#: bzrlib/clean_tree.py:70
4471
msgid "Canceled"
4472
msgstr ""
4473
4474
#: bzrlib/clean_tree.py:107
4475
#, python-format
4476
msgid "unable to remove %s"
4477
msgstr ""
4478
4479
#: bzrlib/clean_tree.py:111
4480
msgid "deleting paths:"
4481
msgstr ""
4482
4483
#: bzrlib/clean_tree.py:125
4484
msgid "unable to remove \"{0}\": {1}."
4485
msgstr ""
4486
4487
#: bzrlib/clean_tree.py:130
4488
msgid "No files deleted."
4489
msgstr ""
4490
4491
#: bzrlib/cmd_version_info.py:47
4492
msgid "No known version info format {0}. Supported types are: {1}"
4493
msgstr ""
4494
4495
#: bzrlib/cmd_version_info.py:52
4496
msgid "Version info in Custom template-based format."
4497
msgstr ""
4498
4499
#: bzrlib/cmd_version_info.py:52
4500
msgid "Version info in Python format."
4501
msgstr ""
4502
4503
#: bzrlib/cmd_version_info.py:52
4504
msgid "Version info in RIO (simple text) format (default)."
4505
msgstr ""
4506
4507
#: bzrlib/cmd_version_info.py:53
4508
msgid "Show version information about this tree."
4509
msgstr ""
4510
4511
#: bzrlib/cmd_version_info.py:55
4512
msgid ""
4513
"You can use this command to add information about version into\n"
4514
"source code of an application. The output can be in one of the\n"
4515
"supported formats or in a custom format based on a template."
4516
msgstr ""
4517
4518
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4519
#: en/help_topics/configuration.txt:710
4520
msgid "For example::"
4521
msgstr ""
4522
4523
#: bzrlib/cmd_version_info.py:61
4524
msgid ""
4525
" bzr version-info --custom \\\n"
4526
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4527
msgstr ""
4528
4529
#: bzrlib/cmd_version_info.py:64
4530
msgid ""
4531
"will produce a C header file with formatted string containing the\n"
4532
"current revision number. Other supported variables in templates are:"
4533
msgstr ""
4534
4535
#: bzrlib/cmd_version_info.py:67
4536
msgid ""
4537
" * {date} - date of the last revision\n"
4538
" * {build_date} - current date\n"
4539
" * {revno} - revision number\n"
4540
" * {revision_id} - revision id\n"
4541
" * {branch_nick} - branch nickname\n"
4542
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4543
" otherwise 1"
4544
msgstr ""
4545
4546
#: bzrlib/cmd_version_info.py:77
4547
msgid "Select the output format."
4548
msgstr ""
4549
4550
#: bzrlib/cmd_version_info.py:81
4551
msgid "Include all possible information."
4552
msgstr ""
4553
4554
#: bzrlib/cmd_version_info.py:82
4555
msgid "Check if tree is clean."
4556
msgstr ""
4557
4558
#: bzrlib/cmd_version_info.py:84
4559
msgid "Include the revision-history."
4560
msgstr ""
4561
4562
#: bzrlib/cmd_version_info.py:86
4563
msgid "Include the last revision for each file."
4564
msgstr ""
4565
4566
#: bzrlib/cmd_version_info.py:87
4567
msgid "Template for the output."
4568
msgstr ""
4569
4570
#: bzrlib/cmd_version_info.py:101
4571
msgid "bzr version-info --revision takes exactly one revision specifier"
4572
msgstr ""
4573
4574
#: bzrlib/commands.py:229
4575
#, python-format
4576
msgid "unknown command \"%s\""
4577
msgstr ""
4578
4579
#: bzrlib/commands.py:476
4580
msgid "No help for this command."
4581
msgstr ""
4582
4583
#: bzrlib/commands.py:489
4584
#, python-format
4585
msgid ":Purpose: %s\n"
4586
msgstr ""
4587
4588
#: bzrlib/commands.py:491
4589
#, python-format
4590
msgid ""
4591
":Usage:\n"
4592
"%s\n"
4593
msgstr ""
4594
4595
#: bzrlib/commands.py:493
4596
#, python-format
4597
msgid ":Usage: %s\n"
4598
msgstr ""
4599
4600
#: bzrlib/commands.py:512
4601
#, python-format
4602
msgid ":Options:%s"
4603
msgstr ""
4604
4605
#: bzrlib/commands.py:523
4606
#, python-format
4607
msgid ""
4608
":Description:\n"
4609
" %s\n"
4610
"\n"
4611
msgstr ""
4612
4613
#: bzrlib/commands.py:533
4614
#, python-format
4615
msgid ""
4616
"See bzr help %s for more details and examples.\n"
4617
"\n"
4618
msgstr ""
4619
4620
#: bzrlib/commands.py:538
4621
msgid ":Aliases: "
4622
msgstr ""
4623
4624
#: bzrlib/commands.py:542
4625
#, python-format
4626
msgid ":From: plugin \"%s\"\n"
4627
msgstr ""
4628
4629
#: bzrlib/commands.py:554
4630
msgid ":doc:`{0} <{1}-help>`"
4631
msgstr ""
4632
4633
#: bzrlib/commands.py:558
4634
#, python-format
4635
msgid ":See also: %s"
4636
msgstr ""
4637
4638
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4639
msgid "Only ASCII permitted in option names"
4640
msgstr ""
4641
4642
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4643
msgid "command {0!r} needs one or more {1}"
4644
msgstr ""
4645
4646
#: bzrlib/commands.py:858
4647
msgid "command {0!r} requires argument {1}"
4648
msgstr ""
4649
4650
#: bzrlib/commands.py:865
4651
msgid "extra argument to command {0}: {1}"
4652
msgstr ""
4653
4654
#: bzrlib/commands.py:962
4655
#, python-format
4656
msgid "Profile data written to \"%s\"."
4657
msgstr ""
4658
4659
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4660
msgid "added"
4661
msgstr ""
4662
4663
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4664
msgid "modified"
4665
msgstr ""
4666
4667
#: bzrlib/commit.py:131
4668
#, python-format
4669
msgid "Committing%s"
4670
msgstr ""
4671
4672
#: bzrlib/commit.py:134
4673
#, python-format
4674
msgid "Committed revision %d."
4675
msgstr ""
4676
4677
#: bzrlib/commit.py:143
4678
#, python-format
4679
msgid "deleted %s"
4680
msgstr ""
4681
4682
#: bzrlib/commit.py:146
4683
#, python-format
4684
msgid "missing %s"
4685
msgstr ""
4686
4687
#: bzrlib/commit.py:511
4688
msgid ""
4689
"Conflicting tags in bound branch:\n"
4690
"{0}"
4691
msgstr ""
4692
4693
#: bzrlib/commit.py:742
4694
msgid "renamed"
4695
msgstr ""
4696
4697
#: bzrlib/commit.py:977
4698
msgid "unchanged"
4699
msgstr ""
4700
4701
#: bzrlib/commit.py:999
4702
msgid "{0} [{1}] - Stage"
4703
msgstr ""
4704
4705
#: bzrlib/commit.py:1002
4706
#, python-format
4707
msgid "%s - Stage"
4708
msgstr ""
4709
4710
#: bzrlib/commit_signature_commands.py:36
4711
msgid "Sign all commits by a given committer."
4712
msgstr ""
4713
4714
#: bzrlib/commit_signature_commands.py:38
4715
msgid ""
4716
"If location is not specified the local tree is used.\n"
4717
"If committer is not specified the default committer is used."
4718
msgstr ""
4719
4720
#: bzrlib/commit_signature_commands.py:41
4721
msgid "This does not sign commits that already have signatures."
4722
msgstr ""
4723
4724
#: bzrlib/commit_signature_commands.py:49
4725
msgid ""
4726
"Don't actually sign anything, just print the revisions that would be signed."
4727
msgstr ""
4728
4729
#: bzrlib/commit_signature_commands.py:98
4730
#, python-format
4731
msgid "Signed %d revision.\n"
4732
msgid_plural "Signed %d revisions.\n"
4733
msgstr[0] ""
4734
msgstr[1] ""
4735
4736
#: bzrlib/commit_signature_commands.py:103
4737
msgid "Verify all commit signatures."
4738
msgstr ""
4739
4740
#: bzrlib/commit_signature_commands.py:105
4741
msgid ""
4742
"Verifies that all commits in the branch are signed by known GnuPG keys."
4743
msgstr ""
4744
4745
#: bzrlib/commit_signature_commands.py:110
4746
msgid ""
4747
"Comma separated list of GPG key patterns which are acceptable for "
4748
"verification."
4749
msgstr ""
4750
4751
#: bzrlib/commit_signature_commands.py:147
4752
msgid "Cannot verify a range of non-revision-history revisions"
4753
msgstr ""
4754
4755
#: bzrlib/commit_signature_commands.py:168
4756
msgid "All commits signed with verifiable keys"
4757
msgstr ""
4758
4759
#: bzrlib/config.py:475
4760
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4761
msgstr ""
4762
4763
#: bzrlib/config.py:2485
4764
msgid "{0} is not an SI unit."
4765
msgstr ""
4766
4767
#: bzrlib/config.py:2949
4768
msgid ""
4769
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4770
"will be saved."
4771
msgstr ""
4772
4773
#: bzrlib/config.py:3093
4774
#, python-format
4775
msgid "Invalid '%s', should be of the form 'name=value'"
4776
msgstr ""
4777
4778
#: bzrlib/config.py:3962
4779
msgid "Display, set or remove a configuration option."
4780
msgstr ""
4781
4782
#: bzrlib/config.py:3964
4783
msgid "Display the active value for a given option."
4784
msgstr ""
4785
4786
#: bzrlib/config.py:3966
4787
msgid ""
4788
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4789
"matching options are displayed mentioning their scope. The active value\n"
4790
"that bzr will take into account is the first one displayed for each option."
4791
msgstr ""
4792
4793
#: bzrlib/config.py:3970
4794
msgid "If no NAME is given, --all .* is implied."
4795
msgstr ""
4796
4797
#: bzrlib/config.py:3972
4798
msgid ""
4799
"Setting a value is achieved by using name=value without spaces. The value\n"
4800
"is set in the most relevant scope and can be checked by displaying the\n"
4801
"option again."
4802
msgstr ""
4803
4804
#: bzrlib/config.py:3984
4805
msgid "Reduce the scope to the specified configuration file."
4806
msgstr ""
4807
4808
#: bzrlib/config.py:3988
4809
msgid "Display all the defined values for the matching options."
4810
msgstr ""
4811
4812
#: bzrlib/config.py:3990
4813
msgid "Remove the option from the configuration file."
4814
msgstr ""
4815
4816
#: bzrlib/conflicts.py:50
4817
msgid "List files with conflicts."
4818
msgstr ""
4819
4820
#: bzrlib/conflicts.py:57
4821
msgid ""
4822
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4823
"is supplied, the pathnames of files with text conflicts are listed,\n"
4824
"instead. (This is useful for editing all files with text conflicts.)"
4825
msgstr ""
4826
4827
#: bzrlib/conflicts.py:61
4828
msgid "Use bzr resolve when you have fixed a problem."
4829
msgstr ""
4830
4831
#: bzrlib/conflicts.py:66
4832
msgid "List paths of files with text conflicts."
4833
msgstr ""
4834
4835
#: bzrlib/conflicts.py:85
4836
msgid "Marks the conflict as resolved."
4837
msgstr ""
4838
4839
#: bzrlib/conflicts.py:88
4840
msgid "Resolve the conflict preserving the version in the working tree."
4841
msgstr ""
4842
4843
#: bzrlib/conflicts.py:91
4844
msgid "Resolve the conflict taking the merged version into account."
4845
msgstr ""
4846
4847
#: bzrlib/conflicts.py:98
4848
msgid "How to resolve the conflict."
4849
msgstr ""
4850
4851
#: bzrlib/conflicts.py:104
4852
msgid "Mark a conflict as resolved."
4853
msgstr ""
4854
4855
#: bzrlib/conflicts.py:111
4856
msgid ""
4857
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4858
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4859
"as\n"
4860
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4861
msgstr ""
4862
4863
#: bzrlib/conflicts.py:119
4864
msgid "Resolve all conflicts in this tree."
4865
msgstr ""
4866
4867
#: bzrlib/conflicts.py:126
4868
msgid "If --all is specified, no FILE may be provided"
4869
msgstr ""
4870
4871
#: bzrlib/conflicts.py:151
4872
#, python-format
4873
msgid "%d conflict auto-resolved."
4874
msgid_plural "%d conflicts auto-resolved."
4875
msgstr[0] ""
4876
msgstr[1] ""
4877
4878
#: bzrlib/conflicts.py:154
4879
msgid "Remaining conflicts:"
4880
msgstr ""
4881
4882
#: bzrlib/conflicts.py:159
4883
msgid "All conflicts resolved."
4884
msgstr ""
4885
4886
#: bzrlib/conflicts.py:168
4887
msgid "{0} conflict resolved, {1} remaining"
4888
msgid_plural "{0} conflicts resolved, {1} remaining"
4889
msgstr[0] ""
4890
msgstr[1] ""
4891
4892
#: bzrlib/controldir.py:710
4893
msgid "{0} is{1} redirected to {2}"
4894
msgstr ""
4895
4896
#: bzrlib/diff.py:399
4897
#, python-format
4898
msgid "*** Ignoring files outside view. View is %s"
4899
msgstr ""
4900
4901
#: bzrlib/errors.py:157
4902
msgid "The tree builder is already building a tree."
4903
msgstr ""
4904
4905
#: bzrlib/errors.py:178
4906
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4907
msgstr ""
4908
4909
#: bzrlib/errors.py:197
4910
msgid ""
4911
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4912
"versions \"%(minimum)s\" to \"%(current)s\"."
4913
msgstr ""
4914
4915
#: bzrlib/errors.py:209
4916
msgid "The transport '%(transport)s' is only accessible within this process."
4917
msgstr ""
4918
4919
#: bzrlib/errors.py:227
4920
msgid "Invalid revision number %(revno)s"
4921
msgstr ""
4922
4923
#: bzrlib/errors.py:236
4924
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4925
msgstr ""
4926
4927
#: bzrlib/errors.py:247
4928
msgid "Reserved revision-id {%(revision_id)s}"
4929
msgstr ""
4930
4931
#: bzrlib/errors.py:261
4932
msgid "There is no public branch set for \"%(branch_url)s\"."
4933
msgstr ""
4934
4935
#: bzrlib/errors.py:271
4936
msgid ""
4937
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4938
"obtain a list of topics."
4939
msgstr ""
4940
4941
#: bzrlib/errors.py:280
4942
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4943
msgstr ""
4944
4945
#: bzrlib/errors.py:290
4946
msgid ""
4947
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4948
msgstr ""
4949
4950
#: bzrlib/errors.py:299
4951
msgid "The branch '%(branch)s' is not stacked."
4952
msgstr ""
4953
4954
#: bzrlib/errors.py:313
4955
msgid "No WorkingTree exists for \"%(base)s\"."
4956
msgstr ""
4957
4958
#: bzrlib/errors.py:322
4959
msgid "Not currently building a tree."
4960
msgstr ""
4961
4962
#: bzrlib/errors.py:327
4963
msgid "%(url)s is not a local path."
4964
msgstr ""
4965
4966
#: bzrlib/errors.py:355
4967
msgid "%(not_locked)r is not write locked but needs to be."
4968
msgstr ""
4969
4970
#: bzrlib/errors.py:363
4971
msgid "Error in command line options"
4972
msgstr ""
4973
4974
#: bzrlib/errors.py:368
4975
msgid "%(value)s is not an index of type %(_type)s."
4976
msgstr ""
4977
4978
#: bzrlib/errors.py:378
4979
msgid "Error in data for index %(value)s."
4980
msgstr ""
4981
4982
#: bzrlib/errors.py:387
4983
msgid "The key '%(key)s' is already in index '%(index)s'."
4984
msgstr ""
4985
4986
#: bzrlib/errors.py:397
4987
msgid "The key '%(key)s' is not a valid key."
4988
msgstr ""
4989
4990
#: bzrlib/errors.py:406
4991
msgid "Could not parse options for index %(value)s."
4992
msgstr ""
4993
4994
#: bzrlib/errors.py:415
4995
msgid "The value '%(value)s' is not a valid value."
4996
msgstr ""
4997
4998
#: bzrlib/errors.py:424
4999
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5000
msgstr ""
5001
5002
#: bzrlib/errors.py:443
5003
msgid "Generic path error: %(path)r%(extra)s)"
5004
msgstr ""
5005
5006
#: bzrlib/errors.py:456
5007
msgid "No such file: %(path)r%(extra)s"
5008
msgstr ""
5009
5010
#: bzrlib/errors.py:461
5011
msgid "File exists: %(path)r%(extra)s"
5012
msgstr ""
5013
5014
#: bzrlib/errors.py:467
5015
msgid ""
5016
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5017
"after to tell bzr about a rename that has already happened)%(extra)s"
5018
msgstr ""
5019
5020
#: bzrlib/errors.py:483
5021
msgid "\"%(path)s\" is not a directory %(extra)s"
5022
msgstr ""
5023
5024
#: bzrlib/errors.py:488
5025
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5026
msgstr ""
5027
5028
#: bzrlib/errors.py:493
5029
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5030
msgstr ""
5031
5032
#: bzrlib/errors.py:498
5033
msgid "Hard-linking \"%(path)s\" is not supported"
5034
msgstr ""
5035
5036
#: bzrlib/errors.py:513
5037
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5038
msgstr ""
5039
5040
#: bzrlib/errors.py:518
5041
msgid "Permission denied: \"%(path)s\"%(extra)s"
5042
msgstr ""
5043
5044
#: bzrlib/errors.py:523
5045
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5046
msgstr ""
5047
5048
#: bzrlib/errors.py:528
5049
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5050
msgstr ""
5051
5052
#: bzrlib/errors.py:539
5053
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5054
msgstr ""
5055
5056
#: bzrlib/errors.py:561
5057
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5058
msgstr ""
5059
5060
#: bzrlib/errors.py:571
5061
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5062
msgstr ""
5063
5064
#: bzrlib/errors.py:579
5065
msgid ""
5066
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5067
"upgrade the branch to permit branch stacking."
5068
msgstr ""
5069
5070
#: bzrlib/errors.py:590
5071
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5072
msgstr ""
5073
5074
#: bzrlib/errors.py:600
5075
msgid ""
5076
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5077
"need to upgrade the repository to permit branch stacking."
5078
msgstr ""
5079
5080
#: bzrlib/errors.py:611
5081
msgid "Error reading from %(path)r."
5082
msgstr ""
5083
5084
#: bzrlib/errors.py:630
5085
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5086
msgstr ""
5087
5088
#: bzrlib/errors.py:646
5089
msgid "Path \"%(path)s\" is not unicode normalized"
5090
msgstr ""
5091
5092
#: bzrlib/errors.py:654
5093
msgid "Not a branch: \"%(path)s\"%(detail)s."
5094
msgstr ""
5095
5096
#: bzrlib/errors.py:696
5097
msgid "No submit branch available for branch \"%(path)s\""
5098
msgstr ""
5099
5100
#: bzrlib/errors.py:705
5101
msgid "A control directory already exists: \"%(path)s\"."
5102
msgstr ""
5103
5104
#: bzrlib/errors.py:710
5105
msgid "Already a branch: \"%(path)s\"."
5106
msgstr ""
5107
5108
#: bzrlib/errors.py:715
5109
msgid "Invalid branch name: %(name)s"
5110
msgstr ""
5111
5112
#: bzrlib/errors.py:715
5113
msgid "Parent branch already exists: \"%(path)s\"."
5114
msgstr ""
5115
5116
#: bzrlib/errors.py:721
5117
msgid ""
5118
"Directory contains a branch, but no working tree (use bzr checkout if you "
5119
"wish to build a working tree): \"%(path)s\""
5120
msgstr ""
5121
5122
#: bzrlib/errors.py:726
5123
msgid ""
5124
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5125
msgstr ""
5126
5127
#: bzrlib/errors.py:736
5128
msgid ""
5129
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5130
msgstr ""
5131
5132
#: bzrlib/errors.py:746
5133
msgid "No repository present: \"%(path)s\""
5134
msgstr ""
5135
5136
#: bzrlib/errors.py:753
5137
msgid ""
5138
"Unsupported branch format: %(format)s\n"
5139
"Please run 'bzr upgrade'"
5140
msgstr ""
5141
5142
#: bzrlib/errors.py:759
5143
msgid "Unknown %(kind)s format: %(format)r"
5144
msgstr ""
5145
5146
#: bzrlib/errors.py:768
5147
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5148
msgstr ""
5149
5150
#: bzrlib/errors.py:778
5151
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5152
msgstr ""
5153
5154
#: bzrlib/errors.py:793
5155
msgid ""
5156
"%(target)s\n"
5157
"is not compatible with\n"
5158
"%(source)s\n"
5159
"%(details)s"
5160
msgstr ""
5161
5162
#: bzrlib/errors.py:809
5163
msgid "Revision is not compatible with %(repo_format)s"
5164
msgstr ""
5165
5166
#: bzrlib/errors.py:819
5167
msgid "%(context_info)s%(path)s is already versioned."
5168
msgstr ""
5169
5170
#: bzrlib/errors.py:840
5171
msgid "%(context_info)s%(path)s is not versioned."
5172
msgstr ""
5173
5174
#: bzrlib/errors.py:861
5175
msgid "Path(s) are not versioned: %(paths_as_string)s"
5176
msgstr ""
5177
5178
#: bzrlib/errors.py:872
5179
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5180
msgstr ""
5181
5182
#: bzrlib/errors.py:891
5183
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5184
msgstr ""
5185
5186
#: bzrlib/errors.py:899
5187
msgid ""
5188
"Filename %(filename)r is not valid in your current filesystem encoding "
5189
"%(fs_encoding)s"
5190
msgstr ""
5191
5192
#: bzrlib/errors.py:910
5193
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5194
msgstr ""
5195
5196
#: bzrlib/errors.py:928
5197
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5198
msgstr ""
5199
5200
#: bzrlib/errors.py:967
5201
msgid "Cannot lock %(lock)s: %(why)s"
5202
msgstr ""
5203
5204
#: bzrlib/errors.py:977
5205
msgid ""
5206
"A transaction related operation was attempted after the transaction finished."
5207
msgstr ""
5208
5209
#: bzrlib/errors.py:1004
5210
msgid "Cannot lock: transport is read only: %(transport)s"
5211
msgstr ""
5212
5213
#: bzrlib/errors.py:1012
5214
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5215
msgstr ""
5216
5217
#: bzrlib/errors.py:1023
5218
msgid ""
5219
"Lock was broken while still open: %(lock)s - check storage consistency!"
5220
msgstr ""
5221
5222
#: bzrlib/errors.py:1034
5223
msgid ""
5224
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5225
"%(holder)r, wanted to break %(target)r"
5226
msgstr ""
5227
5228
#: bzrlib/errors.py:1046
5229
msgid ""
5230
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5231
"Use 'bzr break-lock' to clear it"
5232
msgstr ""
5233
5234
#: bzrlib/errors.py:1059
5235
msgid "Lock not held: %(lock)s"
5236
msgstr ""
5237
5238
#: bzrlib/errors.py:1088
5239
msgid "No changes to commit"
5240
msgstr ""
5241
5242
#: bzrlib/errors.py:1093
5243
msgid ""
5244
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5245
msgstr ""
5246
5247
#: bzrlib/errors.py:1103
5248
msgid ""
5249
"Excluding paths during commit is not supported by repository at "
5250
"%(repository)r."
5251
msgstr ""
5252
5253
#: bzrlib/errors.py:1112
5254
msgid ""
5255
"The specified commit message contains characters unsupported by the current "
5256
"encoding."
5257
msgstr ""
5258
5259
#: bzrlib/errors.py:1118
5260
msgid "Upgrade URL cannot work with readonly URLs."
5261
msgstr ""
5262
5263
#: bzrlib/errors.py:1123
5264
msgid "The branch format %(format)s is already at the most recent format."
5265
msgstr ""
5266
5267
#: bzrlib/errors.py:1146
5268
msgid "Option --change does not accept revision ranges"
5269
msgstr ""
5270
5271
#: bzrlib/errors.py:1151
5272
msgid "No namespace registered for string: %(spec)r"
5273
msgstr ""
5274
5275
#: bzrlib/errors.py:1170
5276
msgid ""
5277
"Requested revision: '%(spec)s' does not exist in branch: "
5278
"%(branch_url)s%(extra)s"
5279
msgstr ""
5280
5281
#: bzrlib/errors.py:1184
5282
msgid ""
5283
"Operation denied because it would change the main history, which is not "
5284
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5285
msgstr ""
5286
5287
#: bzrlib/errors.py:1195
5288
msgid ""
5289
"These branches have diverged. Use the missing command to see how.\n"
5290
"Use the merge command to reconcile them."
5291
msgstr ""
5292
5293
#: bzrlib/errors.py:1215
5294
msgid ""
5295
"Branches have no common ancestor, and no merge base revision was specified."
5296
msgstr ""
5297
5298
#: bzrlib/errors.py:1221
5299
msgid ""
5300
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5301
msgstr ""
5302
5303
#: bzrlib/errors.py:1227
5304
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5305
msgstr ""
5306
5307
#: bzrlib/errors.py:1236
5308
msgid ""
5309
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5310
msgstr ""
5311
5312
#: bzrlib/errors.py:1245
5313
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5314
msgstr ""
5315
5316
#: bzrlib/errors.py:1254
5317
msgid "Branch %(branch)s has no commits."
5318
msgstr ""
5319
5320
#: bzrlib/errors.py:1272
5321
msgid ""
5322
"Bound branch %(branch)s is out of date with master branch "
5323
"%(master)s.%(extra_help)s"
5324
msgstr ""
5325
5326
#: bzrlib/errors.py:1284
5327
msgid ""
5328
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5329
"bound to %(remote)s."
5330
msgstr ""
5331
5332
#: bzrlib/errors.py:1296
5333
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5334
msgstr ""
5335
5336
#: bzrlib/errors.py:1305
5337
msgid ""
5338
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5339
"%(error)s"
5340
msgstr ""
5341
5342
#: bzrlib/errors.py:1317
5343
msgid "Error in processing weave: %(msg)s"
5344
msgstr ""
5345
5346
#: bzrlib/errors.py:1326
5347
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5348
msgstr ""
5349
5350
#: bzrlib/errors.py:1337
5351
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5352
msgstr ""
5353
5354
#: bzrlib/errors.py:1347
5355
msgid "Weave invariant violated: %(what)s"
5356
msgstr ""
5357
5358
#: bzrlib/errors.py:1356
5359
msgid "Parents are mismatched between two revisions. %(msg)s"
5360
msgstr ""
5361
5362
#: bzrlib/errors.py:1378
5363
msgid ""
5364
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5365
"%(weave_b)s"
5366
msgstr ""
5367
5368
#: bzrlib/errors.py:1390
5369
msgid "Versioned file error"
5370
msgstr ""
5371
5372
#: bzrlib/errors.py:1395
5373
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5374
msgstr ""
5375
5376
#: bzrlib/errors.py:1405
5377
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5378
msgstr ""
5379
5380
#: bzrlib/errors.py:1415
5381
msgid "Text did not match its checksum: %(msg)s"
5382
msgstr ""
5383
5384
#: bzrlib/errors.py:1541
5385
msgid "Export format %(format)r not supported"
5386
msgstr ""
5387
5388
#: bzrlib/errors.py:1550
5389
msgid "Transport error: %(msg)s %(orig_error)s"
5390
msgstr ""
5391
5392
#: bzrlib/errors.py:1576
5393
msgid "Generic bzr smart protocol error: %(details)s"
5394
msgstr ""
5395
5396
#: bzrlib/errors.py:1584
5397
msgid "Received bad protocol version marker: %(marker)r"
5398
msgstr ""
5399
5400
#: bzrlib/errors.py:1616
5401
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5402
msgstr ""
5403
5404
#: bzrlib/errors.py:1621
5405
msgid "Connection error: %(msg)s %(orig_error)s"
5406
msgstr ""
5407
5408
#: bzrlib/errors.py:1626
5409
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5410
msgstr ""
5411
5412
#: bzrlib/errors.py:1647
5413
msgid "Connection closed: %(msg)s %(orig_error)s"
5414
msgstr ""
5415
5416
#: bzrlib/errors.py:1652
5417
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5418
msgstr ""
5419
5420
#: bzrlib/errors.py:1657
5421
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5422
msgstr ""
5423
5424
#: bzrlib/errors.py:1667
5425
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5426
msgstr ""
5427
5428
#: bzrlib/errors.py:1682
5429
msgid "Certificate error: %(error)s"
5430
msgstr ""
5431
5432
#: bzrlib/errors.py:1690
5433
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5434
msgstr ""
5435
5436
#: bzrlib/errors.py:1704
5437
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5438
msgstr ""
5439
5440
#: bzrlib/errors.py:1712
5441
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5442
msgstr ""
5443
5444
#: bzrlib/errors.py:1721
5445
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5446
msgstr ""
5447
5448
#: bzrlib/errors.py:1735
5449
msgid "Too many redirections"
5450
msgstr ""
5451
5452
#: bzrlib/errors.py:1740
5453
msgid "Working tree has conflicts."
5454
msgstr ""
5455
5456
#: bzrlib/errors.py:1744
5457
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5458
msgstr ""
5459
5460
#: bzrlib/errors.py:1753
5461
msgid ""
5462
"Error(s) parsing config file %(filename)s:\n"
5463
"%(errors)s"
5464
msgstr ""
5465
5466
#: bzrlib/errors.py:1763
5467
msgid ""
5468
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5469
"See ``bzr help %(name)s``"
5470
msgstr ""
5471
5472
#: bzrlib/errors.py:1773
5473
msgid "%(username)r does not seem to contain a reasonable email address"
5474
msgstr ""
5475
5476
#: bzrlib/errors.py:1782
5477
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5478
msgstr ""
5479
5480
#: bzrlib/errors.py:1790
5481
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5482
msgstr ""
5483
5484
#: bzrlib/errors.py:1798
5485
msgid "Unable to import library \"%(library)s\": %(error)s"
5486
msgstr ""
5487
5488
#: bzrlib/errors.py:1806
5489
msgid "python-gpgme is not installed, it is needed to verify signatures"
5490
msgstr ""
5491
5492
#: bzrlib/errors.py:1814
5493
msgid ""
5494
"The working tree for %(basedir)s has changed since the last commit, but "
5495
"weave merge requires that it be unchanged"
5496
msgstr ""
5497
5498
#: bzrlib/errors.py:1824
5499
msgid ""
5500
"Can't reprocess and show base, because reprocessing obscures the "
5501
"relationship of conflicting lines to the base"
5502
msgstr ""
5503
5504
#: bzrlib/errors.py:1830
5505
msgid "Cycle in graph %(graph)r"
5506
msgstr ""
5507
5508
#: bzrlib/errors.py:1858
5509
msgid "File %(filename)s is not conflicted."
5510
msgstr ""
5511
5512
#: bzrlib/errors.py:1880
5513
msgid "No bundle was found in \"%(filename)s\"."
5514
msgstr ""
5515
5516
#: bzrlib/errors.py:1889
5517
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5518
msgstr ""
5519
5520
#: bzrlib/errors.py:1899
5521
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5522
msgstr ""
5523
5524
#: bzrlib/errors.py:1912
5525
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5526
msgstr ""
5527
5528
#: bzrlib/errors.py:1922
5529
msgid "Key %(key)s is already present in map"
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:1927
5533
msgid "The prefix %(prefix)s is in the help search path twice."
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:1937
5537
msgid ""
5538
"No final name for trans_id %(trans_id)r\n"
5539
"file-id: %(file_id)r\n"
5540
"root trans-id: %(root_trans_id)r\n"
5541
msgstr ""
5542
5543
#: bzrlib/errors.py:1969
5544
msgid "Attempt to reuse a transform that has already been applied."
5545
msgstr ""
5546
5547
#: bzrlib/errors.py:1974
5548
msgid "Moving the root directory is not supported at this time"
5549
msgstr ""
5550
5551
#: bzrlib/errors.py:1979
5552
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5553
msgstr ""
5554
5555
#: bzrlib/errors.py:1990
5556
msgid ""
5557
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5558
msgstr ""
5559
5560
#: bzrlib/errors.py:2026
5561
msgid ""
5562
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5563
msgstr ""
5564
5565
#: bzrlib/errors.py:2056
5566
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5567
msgstr ""
5568
5569
#: bzrlib/errors.py:2064
5570
msgid "Nothing to merge."
5571
msgstr ""
5572
5573
#: bzrlib/errors.py:2069
5574
msgid "Format %(format)s cannot be initialised by this version of bzr."
5575
msgstr ""
5576
5577
#: bzrlib/errors.py:2078
5578
msgid ""
5579
"Cannot convert from format %(from_format)s to format %(format)s. "
5580
"%(problem)s"
5581
msgstr ""
5582
5583
#: bzrlib/errors.py:2090
5584
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5585
msgstr ""
5586
5587
#: bzrlib/errors.py:2098
5588
msgid "%(exe_name)s could not be found on this machine"
5589
msgstr ""
5590
5591
#: bzrlib/errors.py:2106
5592
msgid "Diff is not installed on this machine: %(msg)s"
5593
msgstr ""
5594
5595
#: bzrlib/errors.py:2114
5596
msgid "Diff3 is not installed on this machine."
5597
msgstr ""
5598
5599
#: bzrlib/errors.py:2120
5600
msgid "The content being inserted is already present."
5601
msgstr ""
5602
5603
#: bzrlib/errors.py:2125
5604
msgid ""
5605
"This tree contains left-over files from a failed operation.\n"
5606
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5607
"to\n"
5608
" keep, and delete it when you are done."
5609
msgstr ""
5610
5611
#: bzrlib/errors.py:2136
5612
msgid ""
5613
"This tree contains left-over files from a failed operation.\n"
5614
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5615
" wish to keep, and delete it when you are done."
5616
msgstr ""
5617
5618
#: bzrlib/errors.py:2146
5619
msgid ""
5620
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5621
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5622
"to\n"
5623
" keep, and delete it when you are done."
5624
msgstr ""
5625
5626
#: bzrlib/errors.py:2157
5627
msgid ""
5628
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5629
"examine %(pending_deletion)s to see if it contains any files you wish to "
5630
"keep, and delete it when you are done."
5631
msgstr ""
5632
5633
#: bzrlib/errors.py:2167
5634
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5635
msgstr ""
5636
5637
#: bzrlib/errors.py:2181
5638
msgid ""
5639
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5640
msgstr ""
5641
5642
#: bzrlib/errors.py:2194
5643
msgid "Error in merge modified format"
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:2199
5647
msgid "Format error in conflict listings"
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:2203
5651
msgid ""
5652
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5653
"Error: %(description)s"
5654
msgstr ""
5655
5656
#: bzrlib/errors.py:2214
5657
msgid ""
5658
"An error has been detected in the repository %(repo_path)s.\n"
5659
"Please run bzr reconcile on this repository."
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:2225
5663
msgid ""
5664
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5665
"reason: %(reason)s"
5666
msgstr ""
5667
5668
#: bzrlib/errors.py:2238
5669
msgid ""
5670
"An inconsistent delta was supplied: %(delta)r\n"
5671
"reason: %(reason)s"
5672
msgstr ""
5673
5674
#: bzrlib/errors.py:2250
5675
msgid "To use this feature you must upgrade your branch at %(path)s."
5676
msgstr ""
5677
5678
#: bzrlib/errors.py:2259
5679
msgid "To use this feature you must upgrade your repository at %(path)s."
5680
msgstr ""
5681
5682
#: bzrlib/errors.py:2264
5683
msgid ""
5684
"To use this feature you must upgrade your branch at %(path)s to a format "
5685
"which supports rich roots."
5686
msgstr ""
5687
5688
#: bzrlib/errors.py:2270
5689
msgid "Cannot perform local-only commits on unbound branches."
5690
msgstr ""
5691
5692
#: bzrlib/errors.py:2275
5693
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5694
msgstr ""
5695
5696
#: bzrlib/errors.py:2296
5697
msgid "Ghost tags not supported by format %(format)r."
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:2304
5701
msgid "File is binary but should be text."
5702
msgstr ""
5703
5704
#: bzrlib/errors.py:2309
5705
msgid "The path %(path)s is not permitted on this platform"
5706
msgstr ""
5707
5708
#: bzrlib/errors.py:2318
5709
msgid ""
5710
"Testament did not match expected value.\n"
5711
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5712
" {%(measured)s}"
5713
msgstr ""
5714
5715
#: bzrlib/errors.py:2330
5716
msgid "Not a bzr revision-bundle: %(text)r"
5717
msgstr ""
5718
5719
#: bzrlib/errors.py:2339
5720
msgid "Bad bzr revision-bundle: %(text)r"
5721
msgstr ""
5722
5723
#: bzrlib/errors.py:2348
5724
msgid "Malformed bzr revision-bundle header: %(text)r"
5725
msgstr ""
5726
5727
#: bzrlib/errors.py:2353
5728
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5729
msgstr ""
5730
5731
#: bzrlib/errors.py:2358
5732
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5733
msgstr ""
5734
5735
#: bzrlib/errors.py:2363
5736
msgid "End of line marker was not \\n in bzr revision-bundle"
5737
msgstr ""
5738
5739
#: bzrlib/errors.py:2373
5740
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5741
msgstr ""
5742
5743
#: bzrlib/errors.py:2383
5744
msgid "Root class for inventory serialization errors"
5745
msgstr ""
5746
5747
#: bzrlib/errors.py:2387
5748
msgid ""
5749
"The inventory was not in the expected format:\n"
5750
" %(msg)s"
5751
msgstr ""
5752
5753
#: bzrlib/errors.py:2396
5754
msgid "This operation requires rich root data storage"
5755
msgstr ""
5756
5757
#: bzrlib/errors.py:2409
5758
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5759
msgstr ""
5760
5761
#: bzrlib/errors.py:2418
5762
msgid ""
5763
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5764
"variable."
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:2425
5768
msgid ""
5769
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5770
"ghost at {%(ghost_revision_id)s}"
5771
msgstr ""
5772
5773
#: bzrlib/errors.py:2435
5774
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5775
msgstr ""
5776
5777
#: bzrlib/errors.py:2486
5778
msgid ""
5779
"A merge directive must provide either a bundle or a public branch location."
5780
msgstr ""
5781
5782
#: bzrlib/errors.py:2493
5783
msgid "Bad merge directive payload %(start)r"
5784
msgstr ""
5785
5786
#: bzrlib/errors.py:2503
5787
msgid "Preview patch does not match requested changes."
5788
msgstr ""
5789
5790
#: bzrlib/errors.py:2509
5791
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5792
msgstr ""
5793
5794
#: bzrlib/errors.py:2519
5795
msgid ""
5796
"Your branch does not have all of the revisions required in order to merge "
5797
"this merge directive and the target location specified in the merge "
5798
"directive is not a branch: %(location)s."
5799
msgstr ""
5800
5801
#: bzrlib/errors.py:2531
5802
msgid "Unsupported entry kind %(kind)s"
5803
msgstr ""
5804
5805
#: bzrlib/errors.py:2539
5806
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5807
msgstr ""
5808
5809
#: bzrlib/errors.py:2549
5810
msgid "Subsume target %(other_tree)s needs to be upgraded."
5811
msgstr ""
5812
5813
#: bzrlib/errors.py:2568
5814
msgid "No such tag: %(tag_name)s"
5815
msgstr ""
5816
5817
#: bzrlib/errors.py:2576
5818
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5819
msgstr ""
5820
5821
#: bzrlib/errors.py:2585
5822
msgid "Tag %(tag_name)s already exists."
5823
msgstr ""
5824
5825
#: bzrlib/errors.py:2593
5826
msgid ""
5827
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5828
"bugs\" for more information on this feature."
5829
msgstr ""
5830
5831
#: bzrlib/errors.py:2603
5832
msgid ""
5833
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5834
msgstr ""
5835
5836
#: bzrlib/errors.py:2613
5837
msgid ""
5838
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5839
msgstr ""
5840
5841
#: bzrlib/errors.py:2623
5842
msgid "Invalid line in bugs property: '%(line)s'"
5843
msgstr ""
5844
5845
#: bzrlib/errors.py:2631
5846
msgid "Invalid bug status: '%(status)s'"
5847
msgstr ""
5848
5849
#: bzrlib/errors.py:2639
5850
msgid "Could not understand response from smart server: %(response_tuple)r"
5851
msgstr ""
5852
5853
#: bzrlib/errors.py:2678
5854
msgid "Server sent an unexpected error: %(error_tuple)r"
5855
msgstr ""
5856
5857
#: bzrlib/errors.py:2697
5858
msgid "Unrecognised container format: %(container_format)r"
5859
msgstr ""
5860
5861
#: bzrlib/errors.py:2705
5862
msgid "Unexpected end of container stream"
5863
msgstr ""
5864
5865
#: bzrlib/errors.py:2710
5866
msgid "Unknown record type: %(record_type)r"
5867
msgstr ""
5868
5869
#: bzrlib/errors.py:2718
5870
msgid "Invalid record: %(reason)s"
5871
msgstr ""
5872
5873
#: bzrlib/errors.py:2726
5874
msgid "Container has data after end marker: %(excess)r"
5875
msgstr ""
5876
5877
#: bzrlib/errors.py:2734
5878
msgid "Container has multiple records with the same name: %(name)s"
5879
msgstr ""
5880
5881
#: bzrlib/errors.py:2747
5882
msgid "Corrupt or incompatible data stream: %(reason)s"
5883
msgstr ""
5884
5885
#: bzrlib/errors.py:2755
5886
msgid "SMTP error: %(error)s"
5887
msgstr ""
5888
5889
#: bzrlib/errors.py:2763
5890
msgid "No message supplied."
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:2768
5894
msgid "No mail-to address (--mail-to) or output (-o) specified."
5895
msgstr ""
5896
5897
#: bzrlib/errors.py:2781
5898
msgid ""
5899
"Unable to find mail client with the following names: "
5900
"%(mail_command_list_string)s"
5901
msgstr ""
5902
5903
#: bzrlib/errors.py:2791
5904
msgid "SMTP connection to %(host)s refused"
5905
msgstr ""
5906
5907
#: bzrlib/errors.py:2800
5908
msgid "Please specify smtp_server. No server at default %(host)s."
5909
msgstr ""
5910
5911
#: bzrlib/errors.py:2814
5912
msgid ""
5913
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5914
"reconfigure."
5915
msgstr ""
5916
5917
#: bzrlib/errors.py:2826
5918
msgid "'%(display_url)s' is already a branch."
5919
msgstr ""
5920
5921
#: bzrlib/errors.py:2831
5922
msgid "'%(display_url)s' is already a tree."
5923
msgstr ""
5924
5925
#: bzrlib/errors.py:2836
5926
msgid "'%(display_url)s' is already a checkout."
5927
msgstr ""
5928
5929
#: bzrlib/errors.py:2841
5930
msgid "'%(display_url)s' is already a lightweight checkout."
5931
msgstr ""
5932
5933
#: bzrlib/errors.py:2846
5934
msgid "'%(display_url)s' is already using a shared repository."
5935
msgstr ""
5936
5937
#: bzrlib/errors.py:2851
5938
msgid "'%(display_url)s' is already standalone."
5939
msgstr ""
5940
5941
#: bzrlib/errors.py:2856
5942
msgid "Shared repository '%(display_url)s' already creates working trees."
5943
msgstr ""
5944
5945
#: bzrlib/errors.py:2862
5946
msgid ""
5947
"Shared repository '%(display_url)s' already doesn't create working trees."
5948
msgstr ""
5949
5950
#: bzrlib/errors.py:2868
5951
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5952
msgstr ""
5953
5954
#: bzrlib/errors.py:2873
5955
msgid "No location could be found to bind to at %(display_url)s."
5956
msgstr ""
5957
5958
#: bzrlib/errors.py:2878
5959
msgid ""
5960
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5961
"status).%(more)s"
5962
msgstr ""
5963
5964
#: bzrlib/errors.py:2897
5965
msgid ""
5966
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5967
"list).%(more)s"
5968
msgstr ""
5969
5970
#: bzrlib/errors.py:2903
5971
msgid "Variable {%(name)s} is not available."
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:2911
5975
msgid "No template specified."
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:2916
5979
msgid "Unable to create symlink %(path_str)son this platform"
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:2931
5983
msgid ""
5984
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5985
"\"original\", \"local\"."
5986
msgstr ""
5987
5988
#: bzrlib/errors.py:2965
5989
msgid ""
5990
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5991
msgstr ""
5992
5993
#: bzrlib/errors.py:2977
5994
msgid "The \"%(config_id)s\" configuration does not exist."
5995
msgstr ""
5996
5997
#: bzrlib/errors.py:2985
5998
msgid "The \"%(option_name)s\" configuration option does not exist."
5999
msgstr ""
6000
6001
#: bzrlib/errors.py:2993
6002
msgid "The alias \"%(alias_name)s\" does not exist."
6003
msgstr ""
6004
6005
#: bzrlib/errors.py:3007
6006
msgid "\"%(alias_name)s\" is not a valid location alias."
6007
msgstr ""
6008
6009
#: bzrlib/errors.py:3015
6010
msgid "No %(alias_name)s location assigned."
6011
msgstr ""
6012
6013
#: bzrlib/errors.py:3023
6014
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6015
msgstr ""
6016
6017
#: bzrlib/errors.py:3033
6018
msgid "Unknown rules detected: %(unknowns_str)s."
6019
msgstr ""
6020
6021
#: bzrlib/errors.py:3044
6022
msgid "Tip change rejected: %(msg)s"
6023
msgstr ""
6024
6025
#: bzrlib/errors.py:3052
6026
msgid "Shelf corrupt."
6027
msgstr ""
6028
6029
#: bzrlib/errors.py:3057
6030
msgid "Corruption while decompressing repository file%(orig_error)s"
6031
msgstr ""
6032
6033
#: bzrlib/errors.py:3069
6034
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6035
msgstr ""
6036
6037
#: bzrlib/errors.py:3077
6038
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6039
msgstr ""
6040
6041
#: bzrlib/errors.py:3085
6042
msgid ""
6043
"An attempt to access a url outside the server jail was made: '%(url)s'."
6044
msgstr ""
6045
6046
#: bzrlib/errors.py:3093
6047
msgid "The user aborted the operation."
6048
msgstr ""
6049
6050
#: bzrlib/errors.py:3098
6051
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6052
msgstr ""
6053
6054
#: bzrlib/errors.py:3108
6055
msgid "No such view: %(view_name)s."
6056
msgstr ""
6057
6058
#: bzrlib/errors.py:3118
6059
msgid ""
6060
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6061
"to a later format."
6062
msgstr ""
6063
6064
#: bzrlib/errors.py:3127
6065
msgid ""
6066
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6067
msgstr ""
6068
6069
#: bzrlib/errors.py:3194
6070
msgid "%(bzrdir)r does not support co-located branches."
6071
msgstr ""
6072
6073
#: bzrlib/errors.py:3200
6074
msgid ""
6075
"Unable to determine your name.\n"
6076
"Please, set your name with the 'whoami' command.\n"
6077
"E.g. bzr whoami \"Your Name <name@example.com>\""
6078
msgstr ""
6079
6080
#: bzrlib/errors.py:3209
6081
msgid "Invalid pattern(s) found. %(msg)s"
6082
msgstr ""
6083
6084
#: bzrlib/errors.py:3217
6085
msgid ""
6086
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6087
"unbind` to fix."
6088
msgstr ""
6089
6090
#: bzrlib/errors.py:3228
6091
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6092
msgstr ""
6093
6094
#: bzrlib/errors.py:3237
6095
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6096
msgstr ""
6097
6098
#: bzrlib/errors.py:3246
6099
msgid ""
6100
"No compatible object available for operations from %(source)r to %(target)r."
6101
msgstr ""
6102
6103
#: bzrlib/errors.py:3256
6104
msgid ""
6105
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6106
"%(arguments)s."
6107
msgstr ""
6108
6109
#: bzrlib/errors.py:3266
6110
msgid ""
6111
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6112
"format %(format)r"
6113
msgstr ""
6114
6115
#: bzrlib/errors.py:3278
6116
msgid ""
6117
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6118
"plugin."
6119
msgstr ""
6120
6121
#: bzrlib/errors.py:3291
6122
msgid "Binary files section encountered."
6123
msgstr ""
6124
6125
#: bzrlib/errors.py:3299
6126
msgid ""
6127
"Malformed patch header. %(desc)s\n"
6128
"%(line)r"
6129
msgstr ""
6130
6131
#: bzrlib/errors.py:3308
6132
msgid ""
6133
"Malformed hunk header. %(desc)s\n"
6134
"%(line)r"
6135
msgstr ""
6136
6137
#: bzrlib/errors.py:3317
6138
msgid ""
6139
"Malformed line. %(desc)s\n"
6140
"%(line)r"
6141
msgstr ""
6142
6143
#: bzrlib/errors.py:3327
6144
msgid ""
6145
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6146
"but patch says it should be \"%(patch_line)s\""
6147
msgstr ""
6148
6149
#: bzrlib/errors.py:3338
6150
msgid "The feature %(feature)s has already been registered."
6151
msgstr ""
6152
6153
#: bzrlib/export_pot.py:252
6154
#, python-format
6155
msgid "Exporting messages from builtin command: %s"
6156
msgstr ""
6157
6158
#: bzrlib/export_pot.py:271
6159
msgid "Exporting messages from plugin command: {0} in {1}"
6160
msgstr ""
6161
6162
#: bzrlib/export_pot.py:292
6163
#, python-format
6164
msgid "Exporting message from error: %s"
6165
msgstr ""
6166
6167
#: bzrlib/fetch.py:98
6168
msgid "Finding revisions"
6169
msgstr ""
6170
6171
#: bzrlib/fetch.py:103
6172
msgid "Fetching revisions"
6173
msgstr ""
6174
6175
#: bzrlib/foreign.py:262
6176
msgid "Push into a different VCS without any custom bzr metadata."
6177
msgstr ""
6178
6179
#: bzrlib/foreign.py:264
6180
msgid ""
6181
"This will afterwards rebase the local branch on the remote\n"
6182
"branch unless the --no-rebase option is used, in which case \n"
6183
"the two branches will be out of sync after the push. "
6184
msgstr ""
6185
6186
#: bzrlib/foreign.py:277
6187
msgid "Do not rebase after push."
6188
msgstr ""
6189
6190
#: bzrlib/foreign.py:311
6191
#, python-format
6192
msgid "Using saved location: %s\n"
6193
msgstr ""
6194
6195
#: bzrlib/foreign.py:321
6196
msgid ""
6197
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6198
"regular push."
6199
msgstr ""
6200
6201
#: bzrlib/gpg.py:343
6202
msgid "No GnuPG key results for pattern: {0}"
6203
msgstr ""
6204
6205
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6206
msgid "{0} commits with valid signatures"
6207
msgstr ""
6208
6209
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6210
msgid "{0} commit with unknown key"
6211
msgid_plural "{0} commits with unknown keys"
6212
msgstr[0] ""
6213
msgstr[1] ""
6214
6215
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6216
msgid "{0} commit not valid"
6217
msgid_plural "{0} commits not valid"
6218
msgstr[0] ""
6219
msgstr[1] ""
6220
6221
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6222
msgid "{0} commit not signed"
6223
msgid_plural "{0} commits not signed"
6224
msgstr[0] ""
6225
msgstr[1] ""
6226
6227
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6228
msgid "{0} commit with key now expired"
6229
msgid_plural "{0} commits with key now expired"
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/gpg.py:386
6240
msgid "{0} signed {1} commit"
6241
msgid_plural "{0} signed {1} commits"
6242
msgstr[0] ""
6243
msgstr[1] ""
6244
6245
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6246
msgid "{0} commit by author {1}"
6247
msgid_plural "{0} commits by author {1}"
6248
msgstr[0] ""
6249
msgstr[1] ""
6250
6251
#: bzrlib/gpg.py:433
6252
msgid "Unknown key {0} signed {1} commit"
6253
msgid_plural "Unknown key {0} signed {1} commits"
6254
msgstr[0] ""
6255
msgstr[1] ""
6256
6257
#: bzrlib/groupcompress.py:1739
6258
#, python-format
6259
msgid "Insert claimed random_id=True, but then inserted %r two times"
6260
msgstr ""
6261
6262
#: bzrlib/hooks.py:331
6263
#, python-format
6264
msgid "Introduced in: %s"
6265
msgstr ""
6266
6267
#: bzrlib/hooks.py:334
6268
#, python-format
6269
msgid "Deprecated in: %s"
6270
msgstr ""
6271
6272
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6273
msgid "Walking content"
6274
msgstr ""
6275
6276
#: bzrlib/knit.py:3330
6277
msgid "annotating"
6278
msgstr ""
6279
6280
#: bzrlib/lock.py:548
6281
msgid "{0!r} was {1} locked again"
6282
msgstr ""
6283
6284
#: bzrlib/lockdir.py:321
6285
#, python-format
6286
msgid "error removing pending lock: %s"
6287
msgstr ""
6288
6289
#: bzrlib/lockdir.py:616
6290
msgid "Unable to obtain"
6291
msgstr ""
6292
6293
#: bzrlib/lockdir.py:618
6294
msgid "Lock owner changed for"
6295
msgstr ""
6296
6297
#: bzrlib/lockdir.py:620
6298
msgid "{0} lock {1} {2}."
6299
msgstr ""
6300
6301
#: bzrlib/lockdir.py:627
6302
#, python-format
6303
msgid "Will continue to try until %s, unless you press Ctrl-C."
6304
msgstr ""
6305
6306
#: bzrlib/lockdir.py:629
6307
msgid "See \"bzr help break-lock\" for more."
6308
msgstr ""
6309
6310
#: bzrlib/lockdir.py:739
6311
#, python-format
6312
msgid ""
6313
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6314
msgstr ""
6315
6316
#: bzrlib/log.py:572
6317
msgid "--exclude-common-ancestry requires two different revisions"
6318
msgstr ""
6319
6320
#: bzrlib/log.py:574
6321
#, python-format
6322
msgid "invalid direction %r"
6323
msgstr ""
6324
6325
#: bzrlib/log.py:662
6326
msgid "Start revision not found in history of end revision."
6327
msgstr ""
6328
6329
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6330
msgid "Logging revision 0 is invalid."
6331
msgstr ""
6332
6333
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6334
msgid "Start revision must be older than the end revision."
6335
msgstr ""
6336
6337
#: bzrlib/log.py:1827
6338
#, python-format
6339
msgid "unknown log formatter: %r"
6340
msgstr ""
6341
6342
#: bzrlib/log.py:2123
6343
msgid "fixes bug"
6344
msgid_plural "fixes bugs"
6345
msgstr[0] ""
6346
msgstr[1] ""
6347
6348
#: bzrlib/merge.py:689
6349
msgid "All changes applied successfully."
6350
msgstr ""
6351
6352
#: bzrlib/merge.py:691
6353
#, python-format
6354
msgid "%d conflicts encountered."
6355
msgstr ""
6356
6357
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6358
msgid "Preparing file merge"
6359
msgstr ""
6360
6361
#: bzrlib/multiparent.py:426
6362
msgid "Importing revisions"
6363
msgstr ""
6364
6365
#: bzrlib/option.py:526
6366
msgid "Show help message."
6367
msgstr ""
6368
6369
#: bzrlib/option.py:528
6370
msgid "Only display errors and warnings."
6371
msgstr ""
6372
6373
#: bzrlib/option.py:531
6374
msgid "Show usage message and options."
6375
msgstr ""
6376
6377
#: bzrlib/option.py:533
6378
msgid "Display more information."
6379
msgstr ""
6380
6381
#: bzrlib/option.py:541
6382
msgid ""
6383
"Select changes introduced by the specified revision. See also \"help "
6384
"revisionspec\"."
6385
msgstr ""
6386
6387
#: bzrlib/option.py:543
6388
msgid "Branch to operate on, instead of working directory."
6389
msgstr ""
6390
6391
#: bzrlib/option.py:545
6392
msgid "Detailed log format."
6393
msgstr ""
6394
6395
#: bzrlib/option.py:545
6396
msgid "Format used by GNU ChangeLog files."
6397
msgstr ""
6398
6399
#: bzrlib/option.py:545
6400
msgid "Log format with one line per revision."
6401
msgstr ""
6402
6403
#: bzrlib/option.py:545
6404
msgid "Moderately short log format."
6405
msgstr ""
6406
6407
#: bzrlib/option.py:545
6408
msgid "Use specified log format."
6409
msgstr ""
6410
6411
#: bzrlib/option.py:547
6412
msgid "Log format"
6413
msgstr ""
6414
6415
#: bzrlib/option.py:549
6416
msgid "LCA-newness merge."
6417
msgstr ""
6418
6419
#: bzrlib/option.py:549
6420
msgid "Merge using external diff3."
6421
msgstr ""
6422
6423
#: bzrlib/option.py:549
6424
msgid "Native diff3-style merge."
6425
msgstr ""
6426
6427
#: bzrlib/option.py:549
6428
msgid "Select a particular merge algorithm."
6429
msgstr ""
6430
6431
#: bzrlib/option.py:549
6432
msgid "Weave-based merge."
6433
msgstr ""
6434
6435
#: bzrlib/option.py:551
6436
msgid "Merge algorithm"
6437
msgstr ""
6438
6439
#: bzrlib/option.py:554
6440
msgid "Message string."
6441
msgstr ""
6442
6443
#: bzrlib/option.py:556
6444
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6445
msgstr ""
6446
6447
#: bzrlib/option.py:558
6448
msgid "Ignore differences between branches and overwrite unconditionally."
6449
msgstr ""
6450
6451
#: bzrlib/option.py:560
6452
msgid "Remember the specified location as a default."
6453
msgstr ""
6454
6455
#: bzrlib/option.py:562
6456
msgid "Reprocess to reduce spurious conflicts."
6457
msgstr ""
6458
6459
#: bzrlib/option.py:566
6460
msgid "See \"help revisionspec\" for details."
6461
msgstr ""
6462
6463
#: bzrlib/option.py:568
6464
msgid "Show internal object ids."
6465
msgstr ""
6466
6467
#: bzrlib/option.py:571
6468
msgid "Display timezone as local, original, or utc."
6469
msgstr ""
6470
6471
#: bzrlib/osutils.py:100
6472
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6473
msgstr ""
6474
6475
#: bzrlib/osutils.py:220
6476
msgid "lstat/stat of ({0!r}): {1!r}"
6477
msgstr ""
6478
6479
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6480
#, python-format
6481
msgid "sorry, %r not allowed in path"
6482
msgstr ""
6483
6484
#: bzrlib/osutils.py:1237
6485
#, python-format
6486
msgid "%r is too short to calculate a relative path"
6487
msgstr ""
6488
6489
#: bzrlib/plugin.py:143
6490
#, python-format
6491
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6492
msgstr ""
6493
6494
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6495
msgid "Enable completions for the selected plugin (default: all plugins)"
6496
msgstr ""
6497
6498
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6499
msgid "Generate a shell function for bash command line completion."
6500
msgstr ""
6501
6502
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6503
msgid ""
6504
"This command generates a shell function which can be used by bash to\n"
6505
"automatically complete the currently typed command when the user presses\n"
6506
"the completion key (usually tab)."
6507
msgstr ""
6508
6509
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6510
msgid ""
6511
"Commonly used like this:\n"
6512
" eval \"`bzr bash-completion`\""
6513
msgstr ""
6514
6515
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6516
msgid "Name of the generated function (default: _bzr)"
6517
msgstr ""
6518
6519
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6520
msgid "Generate only the shell function, don't enable it"
6521
msgstr ""
6522
6523
#: bzrlib/plugins/launchpad/account.py:66
6524
msgid "Setting ssh/sftp usernames for launchpad.net."
6525
msgstr ""
6526
6527
#: bzrlib/plugins/launchpad/__init__.py:81
6528
msgid "Register a branch with launchpad.net."
6529
msgstr ""
6530
6531
#: bzrlib/plugins/launchpad/__init__.py:83
6532
msgid ""
6533
"This command lists a bzr branch in the directory of branches on\n"
6534
"launchpad.net. Registration allows the branch to be associated with\n"
6535
"bugs or specifications."
6536
msgstr ""
6537
6538
#: bzrlib/plugins/launchpad/__init__.py:87
6539
msgid ""
6540
"Before using this command you must register the project to which the\n"
6541
"branch belongs, and create an account for yourself on launchpad.net."
6542
msgstr ""
6543
6544
#: bzrlib/plugins/launchpad/__init__.py:90
6545
msgid ""
6546
"arguments:\n"
6547
" public_url: The publicly visible url for the branch to register.\n"
6548
" This must be an http or https url (which Launchpad can read\n"
6549
" from to access the branch). Local file urls, SFTP urls, and\n"
6550
" bzr+ssh urls will not work.\n"
6551
" If no public_url is provided, bzr will use the configured\n"
6552
" public_url if there is one for the current branch, and\n"
6553
" otherwise error."
6554
msgstr ""
6555
6556
#: bzrlib/plugins/launchpad/__init__.py:99
6557
msgid ""
6558
"example:\n"
6559
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6560
" --project fooproject"
6561
msgstr ""
6562
6563
#: bzrlib/plugins/launchpad/__init__.py:106
6564
msgid "Launchpad project short name to associate with the branch."
6565
msgstr ""
6566
6567
#: bzrlib/plugins/launchpad/__init__.py:113
6568
msgid ""
6569
"Short name for the branch; by default taken from the last component of the "
6570
"url."
6571
msgstr ""
6572
6573
#: bzrlib/plugins/launchpad/__init__.py:117
6574
msgid "One-sentence description of the branch."
6575
msgstr ""
6576
6577
#: bzrlib/plugins/launchpad/__init__.py:120
6578
msgid "Longer description of the purpose or contents of the branch."
6579
msgstr ""
6580
6581
#: bzrlib/plugins/launchpad/__init__.py:123
6582
msgid "Branch author's email address, if not yourself."
6583
msgstr ""
6584
6585
#: bzrlib/plugins/launchpad/__init__.py:126
6586
msgid "The bug this branch fixes."
6587
msgstr ""
6588
6589
#: bzrlib/plugins/launchpad/__init__.py:129
6590
msgid "Prepare the request but don't actually send it."
6591
msgstr ""
6592
6593
#: bzrlib/plugins/launchpad/__init__.py:151
6594
msgid ""
6595
"register-branch requires a public branch url - see bzr help register-branch."
6596
msgstr ""
6597
6598
#: bzrlib/plugins/launchpad/__init__.py:159
6599
msgid "--product is deprecated; please use --project."
6600
msgstr ""
6601
6602
#: bzrlib/plugins/launchpad/__init__.py:191
6603
msgid "Open a Launchpad branch page in your web browser."
6604
msgstr ""
6605
6606
#: bzrlib/plugins/launchpad/__init__.py:196
6607
msgid "Do not actually open the browser. Just say the URL we would use."
6608
msgstr ""
6609
6610
#: bzrlib/plugins/launchpad/__init__.py:231
6611
#, python-format
6612
msgid "Opening %s in web browser"
6613
msgstr ""
6614
6615
#: bzrlib/plugins/launchpad/__init__.py:241
6616
msgid "Show or set the Launchpad user ID."
6617
msgstr ""
6618
6619
#: bzrlib/plugins/launchpad/__init__.py:243
6620
msgid ""
6621
"When communicating with Launchpad, some commands need to know your\n"
6622
"Launchpad user ID. This command can be used to set or show the\n"
6623
"user ID that Bazaar will use for such communication."
6624
msgstr ""
6625
6626
#: bzrlib/plugins/launchpad/__init__.py:247
6627
msgid ""
6628
":Examples:\n"
6629
" Show the Launchpad ID of the current user::"
6630
msgstr ""
6631
6632
#: bzrlib/plugins/launchpad/__init__.py:250
6633
msgid " bzr launchpad-login"
6634
msgstr ""
6635
6636
#: bzrlib/plugins/launchpad/__init__.py:252
6637
msgid " Set the Launchpad ID of the current user to 'bob'::"
6638
msgstr ""
6639
6640
#: bzrlib/plugins/launchpad/__init__.py:254
6641
msgid " bzr launchpad-login bob"
6642
msgstr ""
6643
6644
#: bzrlib/plugins/launchpad/__init__.py:261
6645
msgid "Don't check that the user name is valid."
6646
msgstr ""
6647
6648
#: bzrlib/plugins/launchpad/__init__.py:276
6649
#: bzrlib/plugins/launchpad/__init__.py:287
6650
msgid "Launchpad user ID exists and has SSH keys.\n"
6651
msgstr ""
6652
6653
#: bzrlib/plugins/launchpad/__init__.py:279
6654
msgid "No Launchpad user ID configured.\n"
6655
msgstr ""
6656
6657
#: bzrlib/plugins/launchpad/__init__.py:290
6658
#, python-format
6659
msgid "Launchpad user ID set to '%s'.\n"
6660
msgstr ""
6661
6662
#: bzrlib/plugins/launchpad/__init__.py:298
6663
msgid "Ask Launchpad to mirror a branch now."
6664
msgstr ""
6665
6666
#: bzrlib/plugins/launchpad/__init__.py:318
6667
msgid "Propose merging a branch on Launchpad."
6668
msgstr ""
6669
6670
#: bzrlib/plugins/launchpad/__init__.py:320
6671
msgid ""
6672
"This will open your usual editor to provide the initial comment. When it\n"
6673
"has created the proposal, it will open it in your default web browser."
6674
msgstr ""
6675
6676
#: bzrlib/plugins/launchpad/__init__.py:323
6677
msgid ""
6678
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6679
"is not supplied, the remembered submit branch will be used. If no submit\n"
6680
"branch is remembered, the development focus will be used."
6681
msgstr ""
6682
6683
#: bzrlib/plugins/launchpad/__init__.py:327
6684
msgid ""
6685
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6686
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6687
"The parameter the launchpad account name of the desired reviewer. This\n"
6688
"may optionally be followed by '=' and the review type. For example:"
6689
msgstr ""
6690
6691
#: bzrlib/plugins/launchpad/__init__.py:332
6692
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6693
msgstr ""
6694
6695
#: bzrlib/plugins/launchpad/__init__.py:334
6696
msgid ""
6697
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6698
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6699
msgstr ""
6700
6701
#: bzrlib/plugins/launchpad/__init__.py:339
6702
msgid "Propose the merge on staging."
6703
msgstr ""
6704
6705
#: bzrlib/plugins/launchpad/__init__.py:341
6706
msgid "Commit message."
6707
msgstr ""
6708
6709
#: bzrlib/plugins/launchpad/__init__.py:343
6710
msgid "Mark the proposal as approved immediately."
6711
msgstr ""
6712
6713
#: bzrlib/plugins/launchpad/cmds.py:298
6714
msgid "The bug this proposal fixes."
6715
msgstr ""
6716
6717
#: bzrlib/plugins/launchpad/__init__.py:345
6718
msgid "Requested reviewer and optional type."
6719
msgstr ""
6720
6721
#: bzrlib/plugins/launchpad/__init__.py:382
6722
msgid "Find the proposal to merge this revision."
6723
msgstr ""
6724
6725
#: bzrlib/plugins/launchpad/__init__.py:384
6726
msgid ""
6727
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6728
"This works only if the selected branch was the merge proposal target, and\n"
6729
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6730
"are opened in a web browser."
6731
msgstr ""
6732
6733
#: bzrlib/plugins/launchpad/__init__.py:389
6734
msgid ""
6735
"Any revision involved in the merge may be specified-- the revision in\n"
6736
"which the merge was performed, or one of the revisions that was merged."
6737
msgstr ""
6738
6739
#: bzrlib/plugins/launchpad/__init__.py:392
6740
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6741
msgstr ""
6742
6743
#: bzrlib/plugins/launchpad/__init__.py:394
6744
msgid " bzr lp-find-proposal -r annotate:README:1"
6745
msgstr ""
6746
6747
#: bzrlib/plugins/launchpad/__init__.py:409
6748
msgid "No review found."
6749
msgstr ""
6750
6751
#: bzrlib/plugins/launchpad/__init__.py:410
6752
#, python-format
6753
msgid "%d proposals(s) found."
6754
msgstr ""
6755
6756
#: bzrlib/plugins/launchpad/__init__.py:420
6757
msgid "Finding revision-id"
6758
msgstr ""
6759
6760
#: bzrlib/plugins/launchpad/__init__.py:427
6761
msgid "Finding merge"
6762
msgstr ""
6763
6764
#: bzrlib/plugins/launchpad/__init__.py:432
6765
msgid "Finding revno"
6766
msgstr ""
6767
6768
#: bzrlib/plugins/launchpad/__init__.py:437
6769
msgid "Finding Launchpad branch"
6770
msgstr ""
6771
6772
#: bzrlib/plugins/launchpad/__init__.py:440
6773
msgid "Finding proposals"
6774
msgstr ""
6775
6776
#: bzrlib/plugins/launchpad/lp_api.py:241
6777
#: bzrlib/plugins/launchpad/lp_api.py:246
6778
#, python-format
6779
msgid "%s is not registered on Launchpad"
6780
msgstr ""
6781
6782
#: bzrlib/plugins/launchpad/lp_api.py:256
6783
#, python-format
6784
msgid "%s has no development focus."
6785
msgstr ""
6786
6787
#: bzrlib/plugins/launchpad/lp_api.py:261
6788
#, python-format
6789
msgid "development focus %s has no branch."
6790
msgstr ""
6791
6792
#: bzrlib/plugins/launchpad/lp_api.py:266
6793
#, python-format
6794
msgid "source package %s has no branch."
6795
msgstr ""
6796
6797
#: bzrlib/plugins/launchpad/lp_api.py:270
6798
#, python-format
6799
msgid "%s has no associated product or source package."
6800
msgstr ""
6801
6802
#: bzrlib/plugins/launchpad/lp_api.py:282
6803
#, python-format
6804
msgid "%s is already up-to-date."
6805
msgstr ""
6806
6807
#: bzrlib/plugins/launchpad/lp_api.py:289
6808
#, python-format
6809
msgid "Pushing to %s"
6810
msgstr ""
6811
6812
#: bzrlib/plugins/launchpad/lp_directory.py:170
6813
msgid ""
6814
"resolution for {0}\n"
6815
" local: {1}\n"
6816
" remote: {2}"
6817
msgstr ""
6818
6819
#: bzrlib/plugins/launchpad/lp_propose.py:149
6820
#, python-format
6821
msgid "There is already a branch merge proposal: %s"
6822
msgstr ""
6823
6824
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6825
msgid "pb parameter to convert() is deprecated"
6826
msgstr ""
6827
6828
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6829
msgid "starting upgrade from format 4 to 5"
6830
msgstr ""
6831
6832
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6833
msgid "note: upgrade may be faster if all store files are ungzipped first"
6834
msgstr ""
6835
6836
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6837
msgid "converting revision"
6838
msgstr ""
6839
6840
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6841
msgid "upgraded to weaves:"
6842
msgstr ""
6843
6844
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6845
#, python-format
6846
msgid "%6d revisions and inventories"
6847
msgstr ""
6848
6849
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6850
#, python-format
6851
msgid "%6d revisions not present"
6852
msgstr ""
6853
6854
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6855
#, python-format
6856
msgid "%6d texts"
6857
msgstr ""
6858
6859
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6860
msgid "writing weave"
6861
msgstr ""
6862
6863
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6864
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6865
msgid "inventory"
6866
msgstr ""
6867
6868
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6869
msgid "write revision"
6870
msgstr ""
6871
6872
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6873
msgid "loading revision"
6874
msgstr ""
6875
6876
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6877
#, python-format
6878
msgid "revision {%s} not present in branch; will be converted as a ghost"
6879
msgstr ""
6880
6881
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6882
msgid "starting upgrade from format 5 to 6"
6883
msgstr ""
6884
6885
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6886
#, python-format
6887
msgid "adding prefixes to %s"
6888
msgstr ""
6889
6890
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6891
msgid "starting upgrade from format 6 to metadir"
6892
msgstr ""
6893
6894
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6895
msgid "Removing ancestry.weave"
6896
msgstr ""
6897
6898
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6899
msgid "Finding branch files"
6900
msgstr ""
6901
6902
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6903
msgid "Upgrading repository"
6904
msgstr ""
6905
6906
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6907
msgid "Upgrading branch"
6908
msgstr ""
6909
6910
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6911
msgid "No working tree."
6912
msgstr ""
6913
6914
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6915
msgid "Upgrading working tree"
6916
msgstr ""
6917
6918
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6919
#, python-format
6920
msgid "Make %s lock"
6921
msgstr ""
6922
6923
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6924
#, python-format
6925
msgid "Moving %s"
6926
msgstr ""
6927
6928
#: bzrlib/push.py:56
6929
msgid "Created new branch."
6930
msgstr ""
6931
6932
#: bzrlib/push.py:97
6933
#, python-format
6934
msgid ""
6935
"Target directory %s already contains a .bzr directory, but it is not valid."
6936
msgstr ""
6937
6938
#: bzrlib/push.py:101
6939
#, python-format
6940
msgid ""
6941
"Target directory %s already exists, but does not have a .bzr directory. "
6942
"Supply --use-existing-dir to push there anyway."
6943
msgstr ""
6944
6945
#: bzrlib/push.py:122
6946
#, python-format
6947
msgid "Too many redirections trying to make %s."
6948
msgstr ""
6949
6950
#: bzrlib/push.py:147
6951
msgid ""
6952
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6953
"information."
6954
msgstr ""
6955
6956
#: bzrlib/push.py:151
6957
#, python-format
6958
msgid ""
6959
"It is not possible to losslessly push to %s. You may want to use dpush "
6960
"instead."
6961
msgstr ""
6962
6963
#: bzrlib/push.py:157
6964
#, python-format
6965
msgid ""
6966
"At %s you have a valid .bzr control directory, but not a branch or "
6967
"repository. This is an unsupported configuration. Please move the target "
6968
"directory out of the way and try again."
6969
msgstr ""
6970
6971
#: bzrlib/reconcile.py:97
6972
#, python-format
6973
msgid "Reconciling branch %s"
6974
msgstr ""
6975
6976
#: bzrlib/reconcile.py:103
6977
#, python-format
6978
msgid "Reconciling repository %s"
6979
msgstr ""
6980
6981
#: bzrlib/reconcile.py:105
6982
msgid "Reconciling repository"
6983
msgstr ""
6984
6985
#: bzrlib/reconcile.py:111
6986
#, python-format
6987
msgid "%s cannot canonicalize CHKs."
6988
msgstr ""
6989
6990
#: bzrlib/reconcile.py:119
6991
msgid "Reconcile aborted: revision index has inconsistent parents."
6992
msgstr ""
6993
6994
#: bzrlib/reconcile.py:121
6995
msgid "Run \"bzr check\" for more details."
6996
msgstr ""
6997
6998
#: bzrlib/reconcile.py:123
6999
msgid "Reconciliation complete."
7000
msgstr ""
7001
7002
#: bzrlib/reconcile.py:166
7003
msgid "Fixing last revision info {0} => {1}"
7004
msgstr ""
7005
7006
#: bzrlib/reconcile.py:173
7007
msgid "revision_history ok."
7008
msgstr ""
7009
7010
#: bzrlib/reconcile.py:234
7011
msgid "Reading inventory data"
7012
msgstr ""
7013
7014
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7015
msgid "Inventory ok."
7016
msgstr ""
7017
7018
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7019
msgid "Backing up inventory"
7020
msgstr ""
7021
7022
#: bzrlib/reconcile.py:258
7023
msgid "Backup inventory created."
7024
msgstr ""
7025
7026
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7027
msgid "Writing weave"
7028
msgstr ""
7029
7030
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7031
msgid "Inventory regenerated."
7032
msgstr ""
7033
7034
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7035
msgid "Reading indexes"
7036
msgstr ""
7037
7038
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7039
msgid "Checking unused inventories"
7040
msgstr ""
7041
7042
#: bzrlib/reconcile.py:388
7043
msgid "Backup Inventory created"
7044
msgstr ""
7045
7046
#: bzrlib/reconcile.py:446
7047
msgid "Fixing text parents"
7048
msgstr ""
7049
7050
#: bzrlib/reconfigure.py:54
7051
msgid "{0} is now stacked on {1}\n"
7052
msgstr ""
7053
7054
#: bzrlib/reconfigure.py:69
7055
#, python-format
7056
msgid "%s is now not stacked\n"
7057
msgstr ""
7058
7059
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7060
#, python-format
7061
msgid "bzr: ERROR (ignored): %s"
7062
msgstr ""
7063
7064
#: bzrlib/remote.py:2541
7065
msgid "Copying repository content as tarball..."
7066
msgstr ""
7067
7068
#: bzrlib/rename_map.py:69
7069
msgid "Calculating hashes"
7070
msgstr ""
7071
7072
#: bzrlib/rename_map.py:107
7073
msgid "Determining hash hits"
7074
msgstr ""
7075
7076
#: bzrlib/rename_map.py:242
7077
msgid "{0} => {1}"
7078
msgstr ""
7079
7080
#: bzrlib/repository.py:1787
7081
msgid "Moving repository to repository.backup"
7082
msgstr ""
7083
7084
#: bzrlib/repository.py:1794
7085
msgid "Creating new repository"
7086
msgstr ""
7087
7088
#: bzrlib/repository.py:1799
7089
msgid "Copying content"
7090
msgstr ""
7091
7092
#: bzrlib/repository.py:1803
7093
msgid "Deleting old repository content"
7094
msgstr ""
7095
7096
#: bzrlib/repository.py:1805
7097
msgid "repository converted"
7098
msgstr ""
7099
7100
#: bzrlib/revisionspec.py:903
7101
msgid "Using {0} {1}"
7102
msgstr ""
7103
7104
#: bzrlib/send.py:58
7105
#, python-format
7106
msgid "Mail client \"%s\" does not support specifying body"
7107
msgstr ""
7108
7109
#: bzrlib/send.py:62
7110
msgid "--remember requires a branch to be specified."
7111
msgstr ""
7112
7113
#: bzrlib/send.py:77
7114
msgid "No submit branch known or specified"
7115
msgstr ""
7116
7117
#: bzrlib/send.py:80
7118
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7119
msgstr ""
7120
7121
#: bzrlib/send.py:98
7122
#, python-format
7123
msgid "No such send format '%s'."
7124
msgstr ""
7125
7126
#: bzrlib/send.py:114
7127
msgid "bzr send takes at most two one revision identifiers"
7128
msgstr ""
7129
7130
#: bzrlib/send.py:127
7131
msgid "No revisions to submit."
7132
msgstr ""
7133
7134
#: bzrlib/send.py:139
7135
msgid ""
7136
"- not supported for merge directives that use more than one output file."
7137
msgstr ""
7138
7139
#: bzrlib/send.py:185
7140
msgid "Format 0.9 does not permit bundle with no patch"
7141
msgstr ""
7142
7143
#: bzrlib/shelf_ui.py:46
7144
#, python-format
7145
msgid "Shelve adding file \"%(path)s\"?"
7146
msgstr ""
7147
7148
#: bzrlib/shelf_ui.py:47
7149
msgid "Shelve binary changes?"
7150
msgstr ""
7151
7152
#: bzrlib/shelf_ui.py:48
7153
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7154
msgstr ""
7155
7156
#: bzrlib/shelf_ui.py:50
7157
#, python-format
7158
msgid "Shelve removing file \"%(path)s\"?"
7159
msgstr ""
7160
7161
#: bzrlib/shelf_ui.py:51
7162
#, python-format
7163
msgid "Shelve %d change(s)?"
7164
msgstr ""
7165
7166
#: bzrlib/shelf_ui.py:52
7167
msgid "Shelve?"
7168
msgstr ""
7169
7170
#: bzrlib/shelf_ui.py:53
7171
#, python-format
7172
msgid ""
7173
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7174
msgstr ""
7175
7176
#: bzrlib/shelf_ui.py:55
7177
#, python-format
7178
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7179
msgstr ""
7180
7181
#: bzrlib/shelf_ui.py:70
7182
#, python-format
7183
msgid "Changes shelved with id \"%d\"."
7184
msgstr ""
7185
7186
#: bzrlib/shelf_ui.py:74
7187
msgid "Selected changes destroyed."
7188
msgstr ""
7189
7190
#: bzrlib/shelf_ui.py:78
7191
msgid "Selected changes:"
7192
msgstr ""
7193
7194
#: bzrlib/shelf_ui.py:98
7195
#, python-format
7196
msgid "Delete file \"%(path)s\"?"
7197
msgstr ""
7198
7199
#: bzrlib/shelf_ui.py:99
7200
msgid "Apply binary changes?"
7201
msgstr ""
7202
7203
#: bzrlib/shelf_ui.py:100
7204
#, python-format
7205
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7206
msgstr ""
7207
7208
#: bzrlib/shelf_ui.py:102
7209
#, python-format
7210
msgid "Add file \"%(path)s\"?"
7211
msgstr ""
7212
7213
#: bzrlib/shelf_ui.py:103
7214
#, python-format
7215
msgid "Apply %d change(s)?"
7216
msgstr ""
7217
7218
#: bzrlib/shelf_ui.py:104
7219
msgid "Apply change?"
7220
msgstr ""
7221
7222
#: bzrlib/shelf_ui.py:105
7223
#, python-format
7224
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7225
msgstr ""
7226
7227
#: bzrlib/shelf_ui.py:107
7228
#, python-format
7229
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7230
msgstr ""
7231
7232
#: bzrlib/shelf_ui.py:402
7233
msgid "No changes are shelved."
7234
msgstr ""
7235
7236
#: bzrlib/shelf_ui.py:460
7237
#, python-format
7238
msgid "Using changes with id \"%d\"."
7239
msgstr ""
7240
7241
#: bzrlib/shelf_ui.py:464
7242
#, python-format
7243
msgid "Message: %s"
7244
msgstr ""
7245
7246
#: bzrlib/shelf_ui.py:476
7247
#, python-format
7248
msgid "Deleted changes with id \"%d\"."
7249
msgstr ""
7250
7251
#: bzrlib/smart/medium.py:714
7252
msgid "HPSS calls: {0} ({1} vfs) {2}"
7253
msgstr ""
7254
7255
#: bzrlib/smart/server.py:169
7256
msgid "Requested to stop gracefully"
7257
msgstr ""
7258
7259
#: bzrlib/smart/server.py:179
7260
#, python-format
7261
msgid "Waiting for %d client(s) to finish"
7262
msgstr ""
7263
7264
#: bzrlib/smart/server.py:185
7265
#, python-format
7266
msgid "Still waiting for %d client(s) to finish"
7267
msgstr ""
7268
7269
#: bzrlib/smart/server.py:219
7270
#, python-format
7271
msgid "listening socket error: %s"
7272
msgstr ""
7273
7274
#: bzrlib/smart/server.py:452
7275
#, python-format
7276
msgid "listening on port: %s"
7277
msgstr ""
7278
7279
#: bzrlib/switch.py:73
7280
msgid "Pending merges must be committed or reverted before using switch."
7281
msgstr ""
7282
7283
#: bzrlib/switch.py:100
7284
msgid ""
7285
"Cannot switch as local commits found in the checkout. Commit these to the "
7286
"bound branch or use --force to throw them away."
7287
msgstr ""
7288
7289
#: bzrlib/switch.py:105
7290
#, python-format
7291
msgid ""
7292
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7293
"anyway, use --force."
7294
msgstr ""
7295
7296
#: bzrlib/switch.py:125
7297
msgid "Cannot switch a branch, only a checkout."
7298
msgstr ""
7299
7300
#: bzrlib/switch.py:163
7301
#, python-format
7302
msgid "Tree is up to date at revision %d."
7303
msgstr ""
7304
7305
#: bzrlib/switch.py:169
7306
#, python-format
7307
msgid "Updated to revision %d."
7308
msgstr ""
7309
7310
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7311
msgid "Apply phase"
7312
msgstr ""
7313
7314
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7315
msgid "removing file"
7316
msgstr ""
7317
7318
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7319
msgid "adding file"
7320
msgstr ""
7321
7322
#: bzrlib/transform.py:2591
7323
msgid "Building tree"
7324
msgstr ""
7325
7326
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7327
msgid "Adding file contents"
7328
msgstr ""
7329
7330
#: bzrlib/transform.py:3028
7331
msgid "Resolution pass"
7332
msgstr ""
7333
7334
#: bzrlib/transport/ftp/_gssapi.py:88
7335
#, python-format
7336
msgid "Authenticated as %s"
7337
msgstr ""
7338
7339
#: bzrlib/tree.py:634
7340
msgid "*** {0} content-filter: {1} => {2!r}"
7341
msgstr ""
7342
7343
#: bzrlib/upgrade.py:77
7344
#, python-format
7345
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7346
msgstr ""
7347
7348
#: bzrlib/upgrade.py:100
7349
#, python-format
7350
msgid "cannot upgrade from bzrdir format %s"
7351
msgstr ""
7352
7353
#: bzrlib/upgrade.py:103
7354
#, python-format
7355
msgid "starting upgrade of %s"
7356
msgstr ""
7357
7358
#: bzrlib/upgrade.py:110
7359
msgid "finished"
7360
msgstr ""
7361
7362
#: bzrlib/upgrade.py:120
7363
msgid "Deleting backup.bzr"
7364
msgstr ""
7365
7366
#: bzrlib/upgrade.py:151
7367
msgid ""
7368
"\n"
7369
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7370
msgstr ""
7371
7372
#: bzrlib/upgrade.py:208
7373
#, python-format
7374
msgid "Found %d dependent branches - upgrading ..."
7375
msgstr ""
7376
7377
#: bzrlib/upgrade.py:276
7378
msgid "Upgrading bzrdirs"
7379
msgstr ""
7380
7381
#: bzrlib/upgrade.py:282
7382
#, python-format
7383
msgid "Upgrading %s"
7384
msgstr ""
7385
7386
#: bzrlib/upgrade.py:283
7387
msgid "Upgrading {0} {1} ..."
7388
msgstr ""
7389
7390
#: bzrlib/upgrade.py:301
7391
msgid "Removing backup ..."
7392
msgstr ""
7393
7394
#: bzrlib/upgrade.py:305
7395
msgid "failed to clean-up {0}: {1}"
7396
msgstr ""
7397
7398
#: bzrlib/vf_repository.py:1090
7399
msgid "inventories"
7400
msgstr ""
7401
7402
#: bzrlib/vf_repository.py:1116
7403
msgid "texts"
7404
msgstr ""
7405
7406
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7407
msgid "Calculating text parents"
7408
msgstr ""
7409
7410
#: bzrlib/vf_repository.py:1706
7411
msgid "Fetch texts"
7412
msgstr ""
7413
7414
#: bzrlib/vf_repository.py:2535
7415
msgid "loading text store"
7416
msgstr ""
7417
7418
#: bzrlib/vf_repository.py:2541
7419
msgid "checking text graph"
7420
msgstr ""
7421
7422
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7423
#: bzrlib/vf_repository.py:3124
7424
msgid "Transferring revisions"
7425
msgstr ""
7426
7427
#: bzrlib/win32utils.py:146
7428
msgid "Failed to GetProcessMemoryInfo()"
7429
msgstr ""
7430
7431
#: bzrlib/win32utils.py:167
7432
msgid "Cannot debug memory on win32 without ctypes or win32process"
7433
msgstr ""
7434
7435
#: bzrlib/win32utils.py:172
7436
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7437
msgstr ""
7438
7439
#: bzrlib/win32utils.py:180
7440
#, python-format
7441
msgid "WorkingSize %8d KiB"
7442
msgstr ""
7443
7444
#: bzrlib/win32utils.py:181
7445
#, python-format
7446
msgid "PeakWorking %8d KiB"
7447
msgstr ""
7448
7449
#: bzrlib/win32utils.py:182
7450
#, python-format
7451
msgid "PagefileUsage %8d KiB"
7452
msgstr ""
7453
7454
#: bzrlib/win32utils.py:183
7455
#, python-format
7456
msgid "PeakPagefileUsage %8d KiB"
7457
msgstr ""
7458
7459
#: bzrlib/win32utils.py:185
7460
#, python-format
7461
msgid "PrivateUsage %8d KiB"
7462
msgstr ""
7463
7464
#: bzrlib/win32utils.py:186
7465
#, python-format
7466
msgid "PageFaultCount %8d"
7467
msgstr ""
7468
7469
#: bzrlib/workingtree.py:1478
7470
msgid "Rerun update after fixing the conflicts."
7471
msgstr ""
7472
7473
#: dummy/help_topics/authentication/summary.txt:1
7474
msgid "Information on configuring authentication"
7475
msgstr ""
7476
7477
#: dummy/help_topics/basic/detail.txt:1
7478
msgid ""
7479
"Bazaar 2.6.0dev1 -- a free distributed version-control tool\n"
7480
"http://bazaar.canonical.com/"
7481
msgstr ""
7482
7483
#: dummy/help_topics/basic/detail.txt:4
7484
msgid ""
7485
"Basic commands:\n"
7486
" bzr init makes this directory a versioned branch\n"
7487
" bzr branch make a copy of another branch"
7488
msgstr ""
7489
7490
#: dummy/help_topics/basic/detail.txt:8
7491
msgid ""
7492
" bzr add make files or directories versioned\n"
7493
" bzr ignore ignore a file or pattern\n"
7494
" bzr mv move or rename a versioned file"
7495
msgstr ""
7496
7497
#: dummy/help_topics/basic/detail.txt:12
7498
msgid ""
7499
" bzr status summarize changes in working copy\n"
7500
" bzr diff show detailed diffs"
7501
msgstr ""
7502
7503
#: dummy/help_topics/basic/detail.txt:15
7504
msgid ""
7505
" bzr merge pull in changes from another branch\n"
7506
" bzr commit save some or all changes\n"
7507
" bzr send send changes via email"
7508
msgstr ""
7509
7510
#: dummy/help_topics/basic/detail.txt:19
7511
msgid ""
7512
" bzr log show history of changes\n"
7513
" bzr check validate storage"
7514
msgstr ""
7515
7516
#: dummy/help_topics/basic/detail.txt:22
7517
msgid ""
7518
" bzr help init more help on e.g. init command\n"
7519
" bzr help commands list all commands\n"
7520
" bzr help topics list all help topics\n"
7521
msgstr ""
7522
7523
#: dummy/help_topics/basic/summary.txt:1
7524
msgid "Basic commands"
7525
msgstr ""
7526
7527
#: dummy/help_topics/branches/detail.txt:1
7528
msgid "Branches"
7529
msgstr ""
7530
7531
#: dummy/help_topics/branches/detail.txt:3
7532
msgid ""
7533
"A branch consists of the state of a project, including all of its\n"
7534
"history. All branches have a repository associated (which is where the\n"
7535
"branch history is stored), but multiple branches may share the same\n"
7536
"repository (a shared repository). Branches can be copied and merged."
7537
msgstr ""
7538
7539
#: dummy/help_topics/branches/detail.txt:8
7540
msgid ""
7541
"In addition, one branch may be bound to another one. Binding to another\n"
7542
"branch indicates that commits which happen in this branch must also \n"
7543
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7544
"commits when the two branches are out of date. In order for a commit \n"
7545
"to succeed, it may be necessary to update the current branch using \n"
7546
"``bzr update``."
7547
msgstr ""
7548
7549
#: dummy/help_topics/branches/detail.txt:15
7550
#: dummy/help_topics/checkouts/detail.txt:66
7551
#: dummy/help_topics/repositories/detail.txt:36
7552
msgid "Related commands::"
7553
msgstr ""
7554
7555
#: dummy/help_topics/branches/detail.txt:17
7556
msgid ""
7557
" init Change a directory into a versioned branch.\n"
7558
" branch Create a new branch that is a copy of an existing branch.\n"
7559
" merge Perform a three-way merge.\n"
7560
" bind Bind a branch to another one.\n"
7561
msgstr ""
7562
7563
#: dummy/help_topics/branches/summary.txt:1
7564
msgid "Information on what a branch is"
7565
msgstr ""
7566
7567
#: dummy/help_topics/bugs/summary.txt:1
7568
msgid "Bug tracker settings"
7569
msgstr ""
7570
7571
#: dummy/help_topics/checkouts/detail.txt:1
7572
msgid "Checkouts"
7573
msgstr ""
7574
7575
#: dummy/help_topics/checkouts/detail.txt:3
7576
msgid ""
7577
"Checkouts are source trees that are connected to a branch, so that when\n"
7578
"you commit in the source tree, the commit goes into that branch. They\n"
7579
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7580
"Bazaar's decentralized features until you want them. Using checkouts\n"
7581
"with shared repositories is very similar to working with SVN or CVS, but\n"
7582
"doesn't have the same restrictions. And using checkouts still allows\n"
7583
"others working on the project to use whatever workflow they like."
7584
msgstr ""
7585
7586
#: dummy/help_topics/checkouts/detail.txt:11
7587
msgid ""
7588
"A checkout is created with the bzr checkout command (see \"help "
7589
"checkout\").\n"
7590
"You pass it a reference to another branch, and it will create a local copy\n"
7591
"for you that still contains a reference to the branch you created the\n"
7592
"checkout from (the master branch). Then if you make any commits they will "
7593
"be\n"
7594
"made on the other branch first. This creates an instant mirror of your work, "
7595
"or\n"
7596
"facilitates lockstep development, where each developer is working together,\n"
7597
"continuously integrating the changes of others."
7598
msgstr ""
7599
7600
#: dummy/help_topics/checkouts/detail.txt:19
7601
msgid ""
7602
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7603
"you have the full history locally. As you have a first class branch you "
7604
"can\n"
7605
"also commit locally if you want, for instance due to the temporary loss af "
7606
"a\n"
7607
"network connection. Use the --local option to commit to do this. All the "
7608
"local\n"
7609
"commits will then be made on the master branch the next time you do a non-"
7610
"local\n"
7611
"commit."
7612
msgstr ""
7613
7614
#: dummy/help_topics/checkouts/detail.txt:26
7615
msgid ""
7616
"If you are using a checkout from a shared branch you will periodically want "
7617
"to\n"
7618
"pull in all the changes made by others. This is done using the \"update\"\n"
7619
"command. The changes need to be applied before any non-local commit, but\n"
7620
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7621
"command when needed."
7622
msgstr ""
7623
7624
#: dummy/help_topics/checkouts/detail.txt:32
7625
msgid ""
7626
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7627
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7628
"SVN checkout in that it is not a first class branch, it mainly consists of "
7629
"the\n"
7630
"working tree. This means that any history operations must query the master\n"
7631
"branch, which could be slow if a network connection is involved. Also, as "
7632
"you\n"
7633
"don't have a local branch, then you cannot commit locally."
7634
msgstr ""
7635
7636
#: dummy/help_topics/checkouts/detail.txt:39
7637
msgid ""
7638
"Lightweight checkouts work best when you have fast reliable access to the\n"
7639
"master branch. This means that if the master branch is on the same disk or "
7640
"LAN\n"
7641
"a lightweight checkout will be faster than a heavyweight one for any "
7642
"commands\n"
7643
"that modify the revision history (as only one copy of the branch needs to\n"
7644
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7645
"that uses the history but does not change it, but if the master branch is "
7646
"on\n"
7647
"the same disk then there won't be a noticeable difference."
7648
msgstr ""
7649
7650
#: dummy/help_topics/checkouts/detail.txt:47
7651
msgid ""
7652
"Another possible use for a checkout is to use it with a treeless repository\n"
7653
"containing your branches, where you maintain only one working tree by\n"
7654
"switching the master branch that the checkout points to when you want to\n"
7655
"work on a different branch."
7656
msgstr ""
7657
7658
#: dummy/help_topics/checkouts/detail.txt:52
7659
msgid ""
7660
"Obviously to commit on a checkout you need to be able to write to the "
7661
"master\n"
7662
"branch. This means that the master branch must be accessible over a "
7663
"writeable\n"
7664
"protocol , such as sftp://, and that you have write permissions at the "
7665
"other\n"
7666
"end. Checkouts also work on the local file system, so that all that matters "
7667
"is\n"
7668
"file permissions."
7669
msgstr ""
7670
7671
#: dummy/help_topics/checkouts/detail.txt:58
7672
msgid ""
7673
"You can change the master of a checkout by using the \"switch\" command "
7674
"(see\n"
7675
"\"help switch\"). This will change the location that the commits are sent "
7676
"to.\n"
7677
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7678
"checkout. If you would like to convert your heavy checkout into a normal\n"
7679
"branch so that every commit is local, you can use the \"unbind\" command. To "
7680
"see\n"
7681
"whether or not a branch is bound or not you can use the \"info\" command. If "
7682
"the\n"
7683
"branch is bound it will tell you the location of the bound branch."
7684
msgstr ""
7685
7686
#: dummy/help_topics/checkouts/detail.txt:68
7687
msgid ""
7688
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7689
" checkout\n"
7690
" update Pull any changes in the master branch in to your checkout\n"
7691
" commit Make a commit that is sent to the master branch. If you have\n"
7692
" a heavy checkout then the --local option will commit to the\n"
7693
" checkout without sending the commit to the master\n"
7694
" switch Change the master branch that the commits in the checkout "
7695
"will\n"
7696
" be sent to\n"
7697
" bind Turn a standalone branch into a heavy checkout so that any\n"
7698
" commits will be sent to the master branch\n"
7699
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7700
" commits are only made locally\n"
7701
" info Displays whether a branch is bound or unbound. If the branch "
7702
"is\n"
7703
" bound, then it will also display the location of the bound "
7704
"branch\n"
7705
msgstr ""
7706
7707
#: dummy/help_topics/checkouts/summary.txt:1
7708
msgid "Information on what a checkout is"
7709
msgstr ""
7710
7711
#: dummy/help_topics/commands/summary.txt:1
7712
msgid "Basic help for all commands"
7713
msgstr ""
7714
7715
#: dummy/help_topics/configuration/summary.txt:1
7716
msgid "Details on the configuration settings available"
7717
msgstr ""
7718
7719
#: dummy/help_topics/conflict-types/summary.txt:1
7720
msgid "Types of conflicts and what to do about them"
7721
msgstr ""
7722
7723
#: dummy/help_topics/content-filters/summary.txt:1
7724
msgid "Conversion of content into/from working trees"
7725
msgstr ""
7726
7727
#: dummy/help_topics/criss-cross/detail.txt:1
7728
msgid "Criss-Cross"
7729
msgstr ""
7730
7731
#: dummy/help_topics/criss-cross/detail.txt:3
7732
msgid ""
7733
"A criss-cross in the branch history can cause the default merge technique\n"
7734
"to emit more conflicts than would normally be expected."
7735
msgstr ""
7736
7737
#: dummy/help_topics/criss-cross/detail.txt:6
7738
msgid ""
7739
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7740
"give\n"
7741
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7742
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7743
msgstr ""
7744
7745
#: dummy/help_topics/criss-cross/detail.txt:10
7746
msgid ""
7747
"Criss-crosses occur in a branch's history if two branches merge the same "
7748
"thing\n"
7749
"and then merge one another, or if two branches merge one another at the "
7750
"same\n"
7751
"time. They can be avoided by having each branch only merge from or into a\n"
7752
"designated central branch (a \"star topology\")."
7753
msgstr ""
7754
7755
#: dummy/help_topics/criss-cross/detail.txt:15
7756
msgid ""
7757
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7758
"default\n"
7759
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7760
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7761
"differences between THIS and OTHER are due to one side adding lines, or\n"
7762
"from another side removing lines."
7763
msgstr ""
7764
7765
#: dummy/help_topics/criss-cross/detail.txt:21
7766
msgid ""
7767
"Criss-crosses mean there is no good choice for a base. Selecting the "
7768
"recent\n"
7769
"merge points could cause one side's changes to be silently discarded.\n"
7770
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7771
"are emitted."
7772
msgstr ""
7773
7774
#: dummy/help_topics/criss-cross/detail.txt:26
7775
msgid ""
7776
"The ``weave`` merge type is not affected by this problem because it uses\n"
7777
"line-origin detection instead of a basis revision to determine the cause of\n"
7778
"differences.\n"
7779
msgstr ""
7780
7781
#: dummy/help_topics/criss-cross/summary.txt:1
7782
msgid "Information on criss-cross merging"
7783
msgstr ""
7784
7785
#: dummy/help_topics/current-formats/summary.txt:1
7786
msgid "Current storage formats"
7787
msgstr ""
7788
7789
#: dummy/help_topics/debug-flags/summary.txt:1
7790
msgid "Options to show or record debug information"
7791
msgstr ""
7792
7793
#: dummy/help_topics/diverged-branches/summary.txt:1
7794
msgid "How to fix diverged branches"
7795
msgstr ""
7796
7797
#: dummy/help_topics/env-variables/detail.txt:1
7798
msgid "Environment Variables"
7799
msgstr ""
7800
7801
#: dummy/help_topics/env-variables/detail.txt:3
7802
msgid ""
7803
"=================== "
7804
"===========================================================\n"
7805
"BZRPATH Path where bzr is to look for shell plugin external\n"
7806
" commands.\n"
7807
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7808
"EMAIL E-Mail address of the user.\n"
7809
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7810
"EDITOR Editor for editing commit messages.\n"
7811
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7812
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7813
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7814
"BZR_PLUGIN_PATH.\n"
7815
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7816
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7817
"and\n"
7818
" HOME.\n"
7819
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7820
"URLs).\n"
7821
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7822
"sshcorp,\n"
7823
" plink or lsh.\n"
7824
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7825
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7826
"BZR_COLUMNS Override implicit terminal width.\n"
7827
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7828
"(selftest)\n"
7829
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7830
"'text'.\n"
7831
"BZR_PDB Control whether to launch a debugger on error.\n"
7832
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7833
" breakin debugger.\n"
7834
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7835
"(instead\n"
7836
" of char-based).\n"
7837
"=================== "
7838
"===========================================================\n"
7839
msgstr ""
7840
7841
#: dummy/help_topics/env-variables/summary.txt:1
7842
msgid "Environment variable names and values"
7843
msgstr ""
7844
7845
#: dummy/help_topics/eol/summary.txt:1
7846
msgid "Information on end-of-line handling"
7847
msgstr ""
7848
7849
#: dummy/help_topics/files/detail.txt:1
7850
msgid "Files"
7851
msgstr ""
7852
7853
#: dummy/help_topics/files/detail.txt:3
7854
msgid ""
7855
":On Unix: ~/.bazaar/bazaar.conf\n"
7856
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7857
"bazaar\\\\2.0\\\\bazaar.conf"
7858
msgstr ""
7859
7860
#: dummy/help_topics/files/detail.txt:6
7861
msgid ""
7862
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7863
"used to define general configuration that will be applied everywhere.\n"
7864
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7865
"commonly used options."
7866
msgstr ""
7867
7868
#: dummy/help_topics/files/detail.txt:11
7869
msgid "A typical config file might look something like::"
7870
msgstr ""
7871
7872
#: dummy/help_topics/files/detail.txt:13
7873
msgid ""
7874
" [DEFAULT]\n"
7875
" email=John Doe <jdoe@isp.com>"
7876
msgstr ""
7877
7878
#: dummy/help_topics/files/detail.txt:16
7879
msgid ""
7880
" [ALIASES]\n"
7881
" commit = commit --strict\n"
7882
" log10 = log --short -r -10..-1\n"
7883
msgstr ""
7884
7885
#: dummy/help_topics/files/summary.txt:1
7886
msgid "Information on configuration and log files"
7887
msgstr ""
7888
7889
#: dummy/help_topics/formats/detail.txt:1
7890
msgid "Storage Formats"
7891
msgstr ""
7892
7893
#: dummy/help_topics/formats/detail.txt:3
7894
msgid ""
7895
"To ensure that older clients do not access data incorrectly,\n"
7896
"Bazaar's policy is to introduce a new storage format whenever\n"
7897
"new features requiring new metadata are added. New storage\n"
7898
"formats may also be introduced to improve performance and\n"
7899
"scalability."
7900
msgstr ""
7901
7902
#: dummy/help_topics/formats/detail.txt:9
7903
msgid ""
7904
"The newest format, 2a, is highly recommended. If your\n"
7905
"project is not using 2a, then you should suggest to the\n"
7906
"project owner to upgrade."
7907
msgstr ""
7908
7909
#: dummy/help_topics/formats/detail.txt:13
7910
msgid ""
7911
"\n"
7912
".. note::"
7913
msgstr ""
7914
7915
#: dummy/help_topics/formats/detail.txt:16
7916
msgid ""
7917
" Some of the older formats have two variants:\n"
7918
" a plain one and a rich-root one. The latter include an additional\n"
7919
" field about the root of the tree. There is no performance cost\n"
7920
" for using a rich-root format but you cannot easily merge changes\n"
7921
" from a rich-root format into a plain format. As a consequence,\n"
7922
" moving a project to a rich-root format takes some co-ordination\n"
7923
" in that all contributors need to upgrade their repositories\n"
7924
" around the same time. 2a and all future formats will be\n"
7925
" implicitly rich-root."
7926
msgstr ""
7927
7928
#: dummy/help_topics/formats/detail.txt:26
7929
msgid ""
7930
"See :doc:`current-formats-help` for the complete list of\n"
7931
"currently supported formats. See :doc:`other-formats-help` for\n"
7932
"descriptions of any available experimental and deprecated formats.\n"
7933
msgstr ""
7934
7935
#: dummy/help_topics/formats/summary.txt:1
7936
msgid "Information on choosing a storage format"
7937
msgstr ""
7938
7939
#: dummy/help_topics/global-options/detail.txt:1
7940
msgid "Global Options"
7941
msgstr ""
7942
7943
#: dummy/help_topics/global-options/detail.txt:3
7944
msgid ""
7945
"These options may be used with any command, and may appear in front of any\n"
7946
"command. (e.g. ``bzr --profile help``)."
7947
msgstr ""
7948
7949
#: dummy/help_topics/global-options/detail.txt:6
7950
msgid ""
7951
"--version Print the version number. Must be supplied before the "
7952
"command.\n"
7953
"--no-aliases Do not process command aliases when running this command.\n"
7954
"--builtin Use the built-in version of a command, not the plugin "
7955
"version.\n"
7956
" This does not suppress other plugin effects.\n"
7957
"--no-plugins Do not process any plugins.\n"
7958
"--no-l10n Do not translate messages.\n"
7959
"--concurrency Number of processes that can be run concurrently (selftest)."
7960
msgstr ""
7961
7962
#: dummy/help_topics/global-options/detail.txt:14
7963
msgid ""
7964
"--profile Profile execution using the hotshot profiler.\n"
7965
"--lsprof Profile execution using the lsprof profiler.\n"
7966
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7967
" results to a specified file. If the filename ends with "
7968
"\".txt\",\n"
7969
" text format will be used. If the filename either starts "
7970
"with\n"
7971
" \"callgrind.out\" or end with \".callgrind\", the output will "
7972
"be\n"
7973
" formatted for use with KCacheGrind. Otherwise, the output\n"
7974
" will be a pickle.\n"
7975
"--coverage Generate line coverage report in the specified directory."
7976
msgstr ""
7977
7978
#: dummy/help_topics/global-options/detail.txt:24
7979
msgid ""
7980
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7981
"for\n"
7982
" the duration of the command. This can be used multiple times "
7983
"if\n"
7984
" several options need to be overridden."
7985
msgstr ""
7986
7987
#: dummy/help_topics/global-options/detail.txt:28
7988
msgid ""
7989
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7990
"information on profiling."
7991
msgstr ""
7992
7993
#: dummy/help_topics/global-options/detail.txt:31
7994
msgid ""
7995
"A number of debug flags are also available to assist troubleshooting and\n"
7996
"development. See :doc:`debug-flags-help`.\n"
7997
msgstr ""
7998
7999
#: dummy/help_topics/global-options/summary.txt:1
8000
msgid "Options that control how Bazaar runs"
8001
msgstr ""
8002
8003
#: dummy/help_topics/hidden-commands/summary.txt:1
8004
msgid "All hidden commands"
8005
msgstr ""
8006
8007
#: dummy/help_topics/hooks/summary.txt:1
8008
msgid "Points at which custom processing can be added"
8009
msgstr ""
8010
8011
#: dummy/help_topics/launchpad/detail.txt:1
8012
msgid "Integration with Launchpad.net"
8013
msgstr ""
8014
8015
#: dummy/help_topics/launchpad/detail.txt:3
8016
msgid ""
8017
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8018
"specification tracking."
8019
msgstr ""
8020
8021
#: dummy/help_topics/launchpad/detail.txt:6
8022
msgid ""
8023
"The bzr client (through the plugin called 'launchpad') has special\n"
8024
"features to communicate with Launchpad:"
8025
msgstr ""
8026
8027
#: dummy/help_topics/launchpad/detail.txt:9
8028
msgid ""
8029
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8030
"This\n"
8031
" is then used by the 'lp:' transport to download your branches using\n"
8032
" bzr+ssh://."
8033
msgstr ""
8034
8035
#: dummy/help_topics/launchpad/detail.txt:13
8036
msgid ""
8037
" * The 'lp:' transport uses Launchpad as a directory service: for "
8038
"example\n"
8039
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8040
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8041
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8042
msgstr ""
8043
8044
#: dummy/help_topics/launchpad/detail.txt:18
8045
msgid ""
8046
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8047
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8048
"lp:12345'\n"
8049
" will record a revision property that marks that revision as fixing\n"
8050
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8051
" automatically be linked to the bug report."
8052
msgstr ""
8053
8054
#: dummy/help_topics/launchpad/detail.txt:24
8055
msgid ""
8056
" * The register-branch command tells Launchpad about the url of a\n"
8057
" public branch. Launchpad will then mirror the branch, display\n"
8058
" its contents and allow it to be attached to bugs and other\n"
8059
" objects."
8060
msgstr ""
8061
8062
#: dummy/help_topics/launchpad/detail.txt:29
8063
msgid "For more information see http://help.launchpad.net/\n"
8064
msgstr ""
8065
8066
#: dummy/help_topics/launchpad/summary.txt:1
8067
msgid "Using Bazaar with Launchpad.net"
8068
msgstr ""
8069
8070
#: dummy/help_topics/location-alias/summary.txt:1
8071
msgid "Aliases for remembered locations"
8072
msgstr ""
8073
8074
#: dummy/help_topics/log-formats/summary.txt:1
8075
msgid "Details on the logging formats available"
8076
msgstr ""
8077
8078
#: dummy/help_topics/other-formats/summary.txt:1
8079
msgid "Experimental and deprecated storage formats"
8080
msgstr ""
8081
8082
#: dummy/help_topics/patterns/summary.txt:1
8083
msgid "Information on the pattern syntax"
8084
msgstr ""
8085
8086
#: dummy/help_topics/repositories/detail.txt:1
8087
msgid "Repositories"
8088
msgstr ""
8089
8090
#: dummy/help_topics/repositories/detail.txt:3
8091
msgid ""
8092
"Repositories in Bazaar are where committed information is stored. There is\n"
8093
"a repository associated with every branch."
8094
msgstr ""
8095
8096
#: dummy/help_topics/repositories/detail.txt:6
8097
msgid ""
8098
"Repositories are a form of database. Bzr will usually maintain this for\n"
8099
"good performance automatically, but in some situations (e.g. when doing\n"
8100
"very many commits in a short time period) you may want to ask bzr to\n"
8101
"optimise the database indices. This can be done by the 'bzr pack' command."
8102
msgstr ""
8103
8104
#: dummy/help_topics/repositories/detail.txt:11
8105
msgid ""
8106
"By default just running 'bzr init' will create a repository within the new\n"
8107
"branch but it is possible to create a shared repository which allows "
8108
"multiple\n"
8109
"branches to share their information in the same location. When a new branch "
8110
"is\n"
8111
"created it will first look to see if there is a containing shared repository "
8112
"it\n"
8113
"can use."
8114
msgstr ""
8115
8116
#: dummy/help_topics/repositories/detail.txt:17
8117
msgid ""
8118
"When two branches of the same project share a repository, there is\n"
8119
"generally a large space saving. For some operations (e.g. branching\n"
8120
"within the repository) this translates in to a large time saving."
8121
msgstr ""
8122
8123
#: dummy/help_topics/repositories/detail.txt:21
8124
msgid ""
8125
"To create a shared repository use the init-repository command (or the alias\n"
8126
"init-repo). This command takes the location of the repository to create. "
8127
"This\n"
8128
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8129
"which contains a shared repository. Any new branches that are created in "
8130
"this\n"
8131
"directory will then use it for storage."
8132
msgstr ""
8133
8134
#: dummy/help_topics/repositories/detail.txt:27
8135
msgid ""
8136
"It is a good idea to create a repository whenever you might create more\n"
8137
"than one branch of a project. This is true for both working areas where you\n"
8138
"are doing the development, and any server areas that you use for hosting\n"
8139
"projects. In the latter case, it is common to want branches without working\n"
8140
"trees. Since the files in the branch will not be edited directly there is "
8141
"no\n"
8142
"need to use up disk space for a working tree. To create a repository in "
8143
"which\n"
8144
"the branches will not have working trees pass the '--no-trees' option to\n"
8145
"'init-repository'."
8146
msgstr ""
8147
8148
#: dummy/help_topics/repositories/detail.txt:38
8149
msgid ""
8150
" init-repository Create a shared repository. Use --no-trees to create "
8151
"one\n"
8152
" in which new branches won't get a working tree.\n"
8153
msgstr ""
8154
8155
#: dummy/help_topics/repositories/summary.txt:1
8156
msgid "Basic information on shared repositories."
8157
msgstr ""
8158
8159
#: dummy/help_topics/revisionspec/summary.txt:1
8160
msgid "Explain how to use --revision"
8161
msgstr ""
8162
8163
#: dummy/help_topics/rules/summary.txt:1
8164
msgid "Information on defining rule-based preferences"
8165
msgstr ""
8166
8167
#: dummy/help_topics/standalone-trees/detail.txt:1
8168
msgid "Standalone Trees"
8169
msgstr ""
8170
8171
#: dummy/help_topics/standalone-trees/detail.txt:3
8172
msgid ""
8173
"A standalone tree is a working tree with an associated repository. It\n"
8174
"is an independently usable branch, with no dependencies on any other.\n"
8175
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8176
"an existing project under version control."
8177
msgstr ""
8178
8179
#: dummy/help_topics/standalone-trees/detail.txt:8
8180
msgid "Related Commands::"
8181
msgstr ""
8182
8183
#: dummy/help_topics/standalone-trees/detail.txt:10
8184
msgid " init Make a directory into a versioned branch.\n"
8185
msgstr ""
8186
8187
#: dummy/help_topics/standalone-trees/summary.txt:1
8188
msgid "Information on what a standalone tree is"
8189
msgstr ""
8190
8191
#: dummy/help_topics/standard-options/detail.txt:1
8192
msgid "Standard Options"
8193
msgstr ""
8194
8195
#: dummy/help_topics/standard-options/detail.txt:3
8196
msgid "Standard options are legal for all commands."
8197
msgstr ""
8198
8199
#: dummy/help_topics/standard-options/detail.txt:5
8200
msgid ""
8201
"--help, -h Show help message.\n"
8202
"--verbose, -v Display more information.\n"
8203
"--quiet, -q Only display errors and warnings."
8204
msgstr ""
8205
8206
#: dummy/help_topics/standard-options/detail.txt:9
8207
msgid "Unlike global options, standard options can be used in aliases.\n"
8208
msgstr ""
8209
8210
#: dummy/help_topics/standard-options/summary.txt:1
8211
msgid "Options that can be used with any command"
8212
msgstr ""
8213
8214
#: dummy/help_topics/status-flags/detail.txt:1
8215
msgid "Status Flags"
8216
msgstr ""
8217
8218
#: dummy/help_topics/status-flags/detail.txt:3
8219
msgid ""
8220
"Status flags are used to summarise changes to the working tree in a concise\n"
8221
"manner. They are in the form::"
8222
msgstr ""
8223
8224
#: dummy/help_topics/status-flags/detail.txt:6
8225
msgid " xxx <filename>"
8226
msgstr ""
8227
8228
#: dummy/help_topics/status-flags/detail.txt:8
8229
msgid "where the columns' meanings are as follows."
8230
msgstr ""
8231
8232
#: dummy/help_topics/status-flags/detail.txt:10
8233
msgid "Column 1 - versioning/renames::"
8234
msgstr ""
8235
8236
#: dummy/help_topics/status-flags/detail.txt:12
8237
msgid ""
8238
" + File versioned\n"
8239
" - File unversioned\n"
8240
" R File renamed\n"
8241
" ? File unknown\n"
8242
" X File nonexistent (and unknown to bzr)\n"
8243
" C File has conflicts\n"
8244
" P Entry for a pending merge (not a file)"
8245
msgstr ""
8246
8247
#: dummy/help_topics/status-flags/detail.txt:20
8248
msgid "Column 2 - contents::"
8249
msgstr ""
8250
8251
#: dummy/help_topics/status-flags/detail.txt:22
8252
msgid ""
8253
" N File created\n"
8254
" D File deleted\n"
8255
" K File kind changed\n"
8256
" M File modified"
8257
msgstr ""
8258
8259
#: dummy/help_topics/status-flags/detail.txt:27
8260
msgid "Column 3 - execute::"
8261
msgstr ""
8262
8263
#: dummy/help_topics/status-flags/detail.txt:29
8264
msgid " * The execute bit was changed\n"
8265
msgstr ""
8266
8267
#: dummy/help_topics/status-flags/summary.txt:1
8268
msgid "Help on status flags"
8269
msgstr ""
8270
8271
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8272
msgid "Branches Out of Sync"
8273
msgstr ""
8274
8275
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8276
msgid ""
8277
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8278
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8279
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8280
"have the same last revision as the new reference branch for the lightweight\n"
8281
"checkout, data could be lost, so Bazaar refuses."
8282
msgstr ""
8283
8284
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8285
msgid "How you deal with this depends on *why* the branches are out of sync."
8286
msgstr ""
8287
8288
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8289
msgid ""
8290
"If you have a checkout and have done local commits, you can get back in "
8291
"sync\n"
8292
"by running \"bzr update\" (and possibly \"bzr commit\")."
8293
msgstr ""
8294
8295
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8296
msgid ""
8297
"If you have a branch and the remote branch is out-of-date, you can push\n"
8298
"the local changes using \"bzr push\". If the local branch is out of date, "
8299
"you\n"
8300
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8301
"commit\n"
8302
"and then push your changes. If you decide that some of the changes aren't\n"
8303
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8304
msgstr ""
8305
8306
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8307
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8308
msgstr ""
8309
8310
#: dummy/help_topics/topics/summary.txt:1
8311
msgid "Topics list"
8312
msgstr ""
8313
8314
#: dummy/help_topics/url-special-chars/summary.txt:1
8315
msgid "Special character handling in URLs"
8316
msgstr ""
8317
8318
#: dummy/help_topics/urlspec/summary.txt:1
8319
msgid "Supported transport protocols"
8320
msgstr ""
8321
8322
#: dummy/help_topics/working-trees/detail.txt:1
8323
msgid "Working Trees"
8324
msgstr ""
8325
8326
#: dummy/help_topics/working-trees/detail.txt:3
8327
msgid ""
8328
"A working tree is the contents of a branch placed on disk so that you can\n"
8329
"see the files and edit them. The working tree is where you make changes to "
8330
"a\n"
8331
"branch, and when you commit the current state of the working tree is the\n"
8332
"snapshot that is recorded in the commit."
8333
msgstr ""
8334
8335
#: dummy/help_topics/working-trees/detail.txt:8
8336
msgid ""
8337
"When you push a branch to a remote system, a working tree will not be\n"
8338
"created. If one is already present the files will not be updated. The\n"
8339
"branch information will be updated and the working tree will be marked\n"
8340
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8341
"may be uncommitted changes or the update may cause content conflicts that "
8342
"are\n"
8343
"difficult to deal with remotely."
8344
msgstr ""
8345
8346
#: dummy/help_topics/working-trees/detail.txt:15
8347
msgid ""
8348
"If you have a branch with no working tree you can use the 'checkout' "
8349
"command\n"
8350
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8351
"will\n"
8352
"create the working tree. If the branch is updated remotely, you can update "
8353
"the\n"
8354
"working tree by running 'bzr update' in that directory."
8355
msgstr ""
8356
8357
#: dummy/help_topics/working-trees/detail.txt:20
8358
msgid ""
8359
"If you have a branch with a working tree that you do not want the 'remove-"
8360
"tree'\n"
8361
"command will remove the tree if it is safe. This can be done to avoid the\n"
8362
"warning about the remote working tree not being updated when pushing to the\n"
8363
"branch. It can also be useful when working with a '--no-trees' repository\n"
8364
"(see 'bzr help repositories')."
8365
msgstr ""
8366
8367
#: dummy/help_topics/working-trees/detail.txt:26
8368
msgid ""
8369
"If you want to have a working tree on a remote machine that you push to you\n"
8370
"can either run 'bzr update' in the remote branch after each push, or use "
8371
"some\n"
8372
"other method to update the tree during the push. There is an 'rspush' "
8373
"plugin\n"
8374
"that will update the working tree using rsync as well as doing a push. "
8375
"There\n"
8376
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8377
"SSH\n"
8378
"after each push."
8379
msgstr ""
8380
8381
#: dummy/help_topics/working-trees/detail.txt:33
8382
msgid "Useful commands::"
8383
msgstr ""
8384
8385
#: dummy/help_topics/working-trees/detail.txt:35
8386
msgid ""
8387
" checkout Create a working tree when a branch does not have one.\n"
8388
" remove-tree Removes the working tree from a branch when it is safe to do "
8389
"so.\n"
8390
" update When a working tree is out of sync with its associated "
8391
"branch\n"
8392
" this will update the tree to match the branch.\n"
8393
msgstr ""
8394
8395
#: dummy/help_topics/working-trees/summary.txt:1
8396
msgid "Information on working trees"
8397
msgstr ""
8398
8399
#: en/help_topics/authentication.txt:1
8400
msgid ""
8401
"Authentication Settings\n"
8402
"======================="
8403
msgstr ""
8404
8405
#: en/help_topics/authentication.txt:4
8406
msgid ""
8407
"\n"
8408
"Intent\n"
8409
"------"
8410
msgstr ""
8411
8412
#: en/help_topics/authentication.txt:8
8413
msgid ""
8414
"Many different authentication policies can be described in the\n"
8415
"``authentication.conf`` file but a particular user should need only a few\n"
8416
"definitions to cover his needs without having to specify a user and a "
8417
"password\n"
8418
"for every branch he uses."
8419
msgstr ""
8420
8421
#: en/help_topics/authentication.txt:13
8422
msgid ""
8423
"The definitions found in this file are used to find the credentials to use "
8424
"for\n"
8425
"a given url. The same credentials can generally be used for as many branches "
8426
"as\n"
8427
"possible by grouping their declaration around the remote servers that need\n"
8428
"them. It's even possible to declare credentials that will be used by "
8429
"different\n"
8430
"servers."
8431
msgstr ""
8432
8433
#: en/help_topics/authentication.txt:19
8434
msgid ""
8435
"The intent is to make this file as small as possible to minimize maintenance."
8436
msgstr ""
8437
8438
#: en/help_topics/authentication.txt:21
8439
msgid ""
8440
"Once the relevant credentials are declared in this file you may use branch "
8441
"urls\n"
8442
"without embedding passwords (security hazard) or even users (enabling "
8443
"sharing\n"
8444
"of your urls with others)."
8445
msgstr ""
8446
8447
#: en/help_topics/authentication.txt:25
8448
msgid "Instead of using::"
8449
msgstr ""
8450
8451
#: en/help_topics/authentication.txt:27
8452
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8453
msgstr ""
8454
8455
#: en/help_topics/authentication.txt:29
8456
msgid "you simply use::"
8457
msgstr ""
8458
8459
#: en/help_topics/authentication.txt:31
8460
msgid " bzr branch ftp://host.com/path/to/my/branch"
8461
msgstr ""
8462
8463
#: en/help_topics/authentication.txt:33
8464
msgid ""
8465
"provided you have created the following ``authentication.conf`` file::"
8466
msgstr ""
8467
8468
#: en/help_topics/authentication.txt:35
8469
msgid ""
8470
" [myprojects]\n"
8471
" scheme=ftp\n"
8472
" host=host.com\n"
8473
" user=joe\n"
8474
" password=secret\n"
8475
" "
8476
msgstr ""
8477
8478
#: en/help_topics/authentication.txt:42
8479
msgid ""
8480
"Authentication definitions\n"
8481
"--------------------------"
8482
msgstr ""
8483
8484
#: en/help_topics/authentication.txt:45
8485
msgid ""
8486
"There are two kinds of authentication used by the various schemes supported "
8487
"by\n"
8488
"bzr:"
8489
msgstr ""
8490
8491
#: en/help_topics/authentication.txt:48
8492
msgid "1. user and password"
8493
msgstr ""
8494
8495
#: en/help_topics/authentication.txt:50
8496
msgid ""
8497
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8498
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8499
"ssh agents are a better, more secure solution. So we have chosen to not "
8500
"provide\n"
8501
"our own less secure method."
8502
msgstr ""
8503
8504
#: en/help_topics/authentication.txt:55
8505
msgid "2. user, realm and password"
8506
msgstr ""
8507
8508
#: en/help_topics/authentication.txt:57
8509
msgid ""
8510
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8511
"against a host. But, by using ``.htaccess`` files, for example, it is "
8512
"possible\n"
8513
"to define several (``user, realm, password``) for a given ``host``. So what "
8514
"is\n"
8515
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8516
"is\n"
8517
"not taken into account in the definitions, but will displayed if bzr "
8518
"prompts\n"
8519
"you for a password."
8520
msgstr ""
8521
8522
#: en/help_topics/authentication.txt:64
8523
msgid ""
8524
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8525
"specifying the appropriate port."
8526
msgstr ""
8527
8528
#: en/help_topics/authentication.txt:67
8529
msgid ""
8530
"To take all schemes into account, the password will be deduced from a set "
8531
"of\n"
8532
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8533
"``user``,\n"
8534
"``password``)."
8535
msgstr ""
8536
8537
#: en/help_topics/authentication.txt:71
8538
msgid ""
8539
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8540
"used\n"
8541
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8542
"``ssh``\n"
8543
" should be used instead since this is the real scheme regarding\n"
8544
" authentication,"
8545
msgstr ""
8546
8547
#: en/help_topics/authentication.txt:76
8548
msgid " * ``host``: can be empty (to act as a default for any host),"
8549
msgstr ""
8550
8551
#: en/help_topics/authentication.txt:78
8552
msgid ""
8553
" * ``port`` can be empty (useful when an host provides several servers for "
8554
"the\n"
8555
" same scheme), only numerical values are allowed, this should be used "
8556
"only\n"
8557
" when the server uses a port different than the scheme standard port,"
8558
msgstr ""
8559
8560
#: en/help_topics/authentication.txt:82
8561
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8562
msgstr ""
8563
8564
#: en/help_topics/authentication.txt:84
8565
msgid ""
8566
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8567
" ``getpass.get_user()``),"
8568
msgstr ""
8569
8570
#: en/help_topics/authentication.txt:87
8571
msgid ""
8572
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8573
" password."
8574
msgstr ""
8575
8576
#: en/help_topics/authentication.txt:90
8577
msgid ""
8578
"Multiple definitions can be provided and, for a given URL, bzr will select "
8579
"a\n"
8580
"(``user`` [, ``password``]) based on the following rules :"
8581
msgstr ""
8582
8583
#: en/help_topics/authentication.txt:93
8584
msgid " 1. the first match wins,"
8585
msgstr ""
8586
8587
#: en/help_topics/authentication.txt:95
8588
msgid " 2. empty fields match everything,"
8589
msgstr ""
8590
8591
#: en/help_topics/authentication.txt:97
8592
msgid ""
8593
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8594
msgstr ""
8595
8596
#: en/help_topics/authentication.txt:99
8597
msgid ""
8598
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8599
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8600
"``projectbzr.sf.net``\n"
8601
" will not match ``bzr.sf.net``)."
8602
msgstr ""
8603
8604
#: en/help_topics/authentication.txt:103
8605
msgid ""
8606
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8607
msgstr ""
8608
8609
#: en/help_topics/authentication.txt:105
8610
msgid ""
8611
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8612
"above,\n"
8613
" empty paths will match any provided path)."
8614
msgstr ""
8615
8616
#: en/help_topics/authentication.txt:110
8617
msgid ""
8618
"File format\n"
8619
"-----------"
8620
msgstr ""
8621
8622
#: en/help_topics/authentication.txt:113
8623
msgid ""
8624
"The general rules for :doc:`configuration files <configuration-help>`\n"
8625
"apply except for the variable policies."
8626
msgstr ""
8627
8628
#: en/help_topics/authentication.txt:116
8629
msgid "Each section describes an authentication definition."
8630
msgstr ""
8631
8632
#: en/help_topics/authentication.txt:118
8633
msgid ""
8634
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8635
"reserved\n"
8636
"and should appear as the *last* section."
8637
msgstr ""
8638
8639
#: en/help_topics/authentication.txt:121
8640
msgid "Each section should define:"
8641
msgstr ""
8642
8643
#: en/help_topics/authentication.txt:123
8644
msgid "* ``user``: the login to be used,"
8645
msgstr ""
8646
8647
#: en/help_topics/authentication.txt:125
8648
msgid "Each section could define:"
8649
msgstr ""
8650
8651
#: en/help_topics/authentication.txt:127
8652
msgid "* ``host``: the remote server,"
8653
msgstr ""
8654
8655
#: en/help_topics/authentication.txt:129
8656
msgid "* ``port``: the port the server is listening,"
8657
msgstr ""
8658
8659
#: en/help_topics/authentication.txt:131
8660
msgid "* ``path``: the branch location,"
8661
msgstr ""
8662
8663
#: en/help_topics/authentication.txt:133
8664
msgid "* ``password``: the password."
8665
msgstr ""
8666
8667
#: en/help_topics/authentication.txt:135
8668
msgid ""
8669
"\n"
8670
"Examples\n"
8671
"--------"
8672
msgstr ""
8673
8674
#: en/help_topics/authentication.txt:139
8675
msgid ""
8676
"\n"
8677
"Personal projects hosted outside\n"
8678
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8679
msgstr ""
8680
8681
#: en/help_topics/authentication.txt:143
8682
msgid ""
8683
"All connections are done with the same ``user`` (the remote one for which "
8684
"the\n"
8685
"default bzr one is not appropriate) and the password is always prompted "
8686
"with\n"
8687
"some exceptions::"
8688
msgstr ""
8689
8690
#: en/help_topics/authentication.txt:147
8691
msgid ""
8692
" # Pet projects on hobby.net\n"
8693
" [hobby]\n"
8694
" host=r.hobby.net\n"
8695
" user=jim\n"
8696
" password=obvious1234\n"
8697
" \n"
8698
" # Home server\n"
8699
" [home]\n"
8700
" scheme=https\n"
8701
" host=home.net\n"
8702
" user=joe\n"
8703
" password=1essobV10us\n"
8704
" \n"
8705
" [DEFAULT]\n"
8706
" # Our local user is barbaz, on all remote sites we're known as "
8707
"foobar\n"
8708
" user=foobar"
8709
msgstr ""
8710
8711
#: en/help_topics/authentication.txt:164
8712
msgid ""
8713
"\n"
8714
"Source hosting provider\n"
8715
"~~~~~~~~~~~~~~~~~~~~~~~"
8716
msgstr ""
8717
8718
#: en/help_topics/authentication.txt:168
8719
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8720
msgstr ""
8721
8722
#: en/help_topics/authentication.txt:170
8723
msgid ""
8724
" [shpnet domain]\n"
8725
" # we use sftp, but ssh is the scheme used for authentication\n"
8726
" scheme=ssh\n"
8727
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8728
" host=.shp.net\n"
8729
" user=joe\n"
8730
" # bzr don't support supplying a password for sftp,\n"
8731
" # consider using an ssh agent if you don't want to supply\n"
8732
" # a password interactively. (pageant, ssh-agent, etc)"
8733
msgstr ""
8734
8735
#: en/help_topics/authentication.txt:180
8736
msgid ""
8737
"HTTPS, SFTP servers and their proxy\n"
8738
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8739
msgstr ""
8740
8741
#: en/help_topics/authentication.txt:183
8742
msgid ""
8743
"At company.com, the server hosting release and integration branches is "
8744
"behind a\n"
8745
"proxy, and the two branches use different authentication policies::"
8746
msgstr ""
8747
8748
#: en/help_topics/authentication.txt:186
8749
msgid ""
8750
" [reference code]\n"
8751
" scheme=https\n"
8752
" host=dev.company.com\n"
8753
" path=/dev\n"
8754
" user=user1\n"
8755
" password=pass1"
8756
msgstr ""
8757
8758
#: en/help_topics/authentication.txt:193
8759
msgid ""
8760
" # development branches on dev server\n"
8761
" [dev]\n"
8762
" scheme=ssh # bzr+ssh and sftp are available here\n"
8763
" host=dev.company.com\n"
8764
" path=/dev/integration\n"
8765
" user=user2\n"
8766
" \n"
8767
" # proxy\n"
8768
" [proxy]\n"
8769
" scheme=http\n"
8770
" host=proxy.company.com\n"
8771
" port=3128\n"
8772
" user=proxyuser1\n"
8773
" password=proxypass1"
8774
msgstr ""
8775
8776
#: en/help_topics/authentication.txt:208
8777
msgid ""
8778
"\n"
8779
"Planned enhancements\n"
8780
"--------------------"
8781
msgstr ""
8782
8783
#: en/help_topics/authentication.txt:212
8784
msgid ""
8785
"The following are not yet implemented but planned as parts of a work in\n"
8786
"progress:"
8787
msgstr ""
8788
8789
#: en/help_topics/authentication.txt:215
8790
msgid "* add a ``password_encoding`` field allowing:"
8791
msgstr ""
8792
8793
#: en/help_topics/authentication.txt:217
8794
msgid ""
8795
" - storing the passwords in various obfuscating encodings (base64 for one),"
8796
msgstr ""
8797
8798
#: en/help_topics/authentication.txt:219
8799
msgid " - delegate password storage to plugins (.netrc for example)."
8800
msgstr ""
8801
8802
#: en/help_topics/authentication.txt:221
8803
msgid ""
8804
"* update the credentials when the user is prompted for user or password,"
8805
msgstr ""
8806
8807
#: en/help_topics/authentication.txt:223
8808
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8809
msgstr ""
8810
8811
#: en/help_topics/authentication.txt:225
8812
msgid ""
8813
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8814
"but\n"
8815
"ignored in the actual implementation.\n"
8816
msgstr ""
8817
8818
#: en/help_topics/bugs.txt:1
8819
msgid "Bug Tracker Settings"
8820
msgstr ""
8821
8822
#: en/help_topics/bugs.txt:3
8823
msgid ""
8824
"When making a commit, metadata about bugs fixed by that change can be\n"
8825
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8826
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8827
"(The only ``status`` value currently supported is ``fixed.``)"
8828
msgstr ""
8829
8830
#: en/help_topics/bugs.txt:8
8831
msgid ""
8832
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8833
"identifier\n"
8834
"rather than a full URL. This looks like::"
8835
msgstr ""
8836
8837
#: en/help_topics/bugs.txt:11
8838
msgid " bzr commit --fixes <tracker>:<id>"
8839
msgstr ""
8840
8841
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8842
msgid "or::"
8843
msgstr ""
8844
8845
#: en/help_topics/bugs.txt:15
8846
msgid " bzr commit --fixes <id>"
8847
msgstr ""
8848
8849
#: en/help_topics/bugs.txt:17
8850
msgid ""
8851
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8852
"the\n"
8853
"identifier for that bug within the bugtracker, usually the bug number.\n"
8854
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8855
"or global configuration is used."
8856
msgstr ""
8857
8858
#: en/help_topics/bugs.txt:22
8859
msgid ""
8860
"Bazaar knows about a few bug trackers that have many users. If\n"
8861
"you use one of these bug trackers then there is no setup required to\n"
8862
"use this feature, you just need to know the tracker identifier to use.\n"
8863
"These are the bugtrackers that are built in:"
8864
msgstr ""
8865
8866
#: en/help_topics/bugs.txt:27
8867
msgid ""
8868
" ============================ ============ ============\n"
8869
" URL Abbreviation Example\n"
8870
" ============================ ============ ============\n"
8871
" https://bugs.launchpad.net/ lp lp:12345\n"
8872
" http://bugs.debian.org/ deb deb:12345\n"
8873
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8874
" ============================ ============ ============"
8875
msgstr ""
8876
8877
#: en/help_topics/bugs.txt:35
8878
msgid ""
8879
"For the bug trackers not listed above configuration is required.\n"
8880
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8881
"is built in, along with a template mechanism for other bugtrackers with\n"
8882
"simple URL schemes. If your bug tracker can't be described by one\n"
8883
"of the schemes described below then you can write a plugin to support\n"
8884
"it."
8885
msgstr ""
8886
8887
#: en/help_topics/bugs.txt:42
8888
msgid ""
8889
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8890
"variable which contains the base URL of the bug tracker. These options\n"
8891
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8892
"configuration section in ``locations.conf``. You can set up these values\n"
8893
"for each of the projects you work on."
8894
msgstr ""
8895
8896
#: en/help_topics/bugs.txt:48
8897
msgid ""
8898
"Note: As you provide a short name for each tracker, you can specify one or\n"
8899
"more bugs in one or more trackers at commit time if you wish."
8900
msgstr ""
8901
8902
#: en/help_topics/bugs.txt:51
8903
msgid ""
8904
"Launchpad\n"
8905
"---------"
8906
msgstr ""
8907
8908
#: en/help_topics/bugs.txt:54
8909
msgid ""
8910
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8911
msgstr ""
8912
8913
#: en/help_topics/bugs.txt:56
8914
msgid ""
8915
"bugzilla_<tracker>_url\n"
8916
"----------------------"
8917
msgstr ""
8918
8919
#: en/help_topics/bugs.txt:59
8920
msgid ""
8921
"If present, the location of the Bugzilla bug tracker referred to by\n"
8922
"<tracker>. This option can then be used together with ``bzr commit\n"
8923
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8924
"example::"
8925
msgstr ""
8926
8927
#: en/help_topics/bugs.txt:64
8928
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8929
msgstr ""
8930
8931
#: en/help_topics/bugs.txt:66
8932
msgid ""
8933
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8934
"fixed."
8935
msgstr ""
8936
8937
#: en/help_topics/bugs.txt:69
8938
msgid ""
8939
"trac_<tracker>_url\n"
8940
"------------------"
8941
msgstr ""
8942
8943
#: en/help_topics/bugs.txt:72
8944
msgid ""
8945
"If present, the location of the Trac instance referred to by\n"
8946
"<tracker>. This option can then be used together with ``bzr commit\n"
8947
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8948
"example::"
8949
msgstr ""
8950
8951
#: en/help_topics/bugs.txt:77
8952
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8953
msgstr ""
8954
8955
#: en/help_topics/bugs.txt:79
8956
msgid ""
8957
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8958
"as\n"
8959
"fixed."
8960
msgstr ""
8961
8962
#: en/help_topics/bugs.txt:82
8963
msgid ""
8964
"bugtracker_<tracker>_url\n"
8965
"------------------------"
8966
msgstr ""
8967
8968
#: en/help_topics/bugs.txt:85
8969
msgid ""
8970
"If present, the location of a generic bug tracker instance referred to by\n"
8971
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8972
"which will be replaced by a specific bug ID. This option can then be used\n"
8973
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8974
"fixed by that commit. For example::"
8975
msgstr ""
8976
8977
#: en/help_topics/bugs.txt:91
8978
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8979
msgstr ""
8980
8981
#: en/help_topics/bugs.txt:93
8982
msgid ""
8983
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8984
"Roundup bug tracker as fixed, or::"
8985
msgstr ""
8986
8987
#: en/help_topics/bugs.txt:96
8988
msgid ""
8989
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8990
msgstr ""
8991
8992
#: en/help_topics/bugs.txt:98
8993
msgid ""
8994
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8995
"RT bug tracker as fixed, or::"
8996
msgstr ""
8997
8998
#: en/help_topics/bugs.txt:101
8999
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9000
msgstr ""
9001
9002
#: en/help_topics/bugs.txt:103
9003
msgid ""
9004
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9005
"1234\n"
9006
"in Hudson's JIRA bug tracker as fixed.\n"
9007
msgstr ""
9008
9009
#: en/help_topics/commands.txt:1
9010
msgid ""
9011
"add Add specified files or directories.\n"
9012
"alias Set/unset and display aliases.\n"
9013
"annotate Show the origin of each line in a file.\n"
9014
"bash-completion Generate a shell function for bash command line "
9015
"completion.\n"
9016
" [bash_completion]\n"
9017
"bind Convert the current branch into a checkout of the "
9018
"supplied\n"
9019
" branch.\n"
9020
"branch Create a new branch that is a copy of an existing branch.\n"
9021
"branches List the branches available at the current location.\n"
9022
"break-lock Break a dead lock.\n"
9023
"cat Write the contents of a file as of a given revision to\n"
9024
" standard output.\n"
9025
"check Validate working tree structure, branch consistency and\n"
9026
" repository history.\n"
9027
"checkout Create a new checkout of an existing branch.\n"
9028
"clean-tree Remove unwanted files from working tree.\n"
9029
"commit Commit changes into a new revision.\n"
9030
"config Display, set or remove a configuration option.\n"
9031
"conflicts List files with conflicts.\n"
9032
"deleted List files deleted in the working tree.\n"
9033
"diff Show differences in the working tree, between revisions "
9034
"or\n"
9035
" branches.\n"
9036
"dpush Push into a different VCS without any custom bzr "
9037
"metadata.\n"
9038
"export Export current or past revision to a destination directory "
9039
"or\n"
9040
" archive.\n"
9041
"help Show help on a command or other topic.\n"
9042
"ignore Ignore specified files or patterns.\n"
9043
"ignored List ignored files and the patterns that matched them.\n"
9044
"info Show information about a working tree, branch or "
9045
"repository.\n"
9046
"init Make a directory into a versioned branch.\n"
9047
"init-repository Create a shared repository for branches to share storage\n"
9048
" space.\n"
9049
"join Combine a tree into its containing tree.\n"
9050
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9051
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9052
"launchpad-open Open a Launchpad branch page in your web browser. "
9053
"[launchpad]\n"
9054
"log Show historical log for a branch or subset of a branch.\n"
9055
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9056
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9057
"ls List files in a tree.\n"
9058
"merge Perform a three-way merge.\n"
9059
"missing Show unmerged/unpulled revisions between two branches.\n"
9060
"mkdir Create a new versioned directory.\n"
9061
"mv Move or rename a file.\n"
9062
"nick Print or set the branch nickname.\n"
9063
"pack Compress the data within a repository.\n"
9064
"plugins List the installed plugins.\n"
9065
"pull Turn this branch into a mirror of another branch.\n"
9066
"push Update a mirror of this branch.\n"
9067
"reconcile Reconcile bzr metadata in a branch.\n"
9068
"reconfigure Reconfigure the type of a bzr directory.\n"
9069
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9070
"remerge Redo a merge.\n"
9071
"remove Remove files or directories.\n"
9072
"remove-branch Remove a branch.\n"
9073
"remove-tree Remove the working tree from a given branch/checkout.\n"
9074
"renames Show list of renamed files.\n"
9075
"resolve Mark a conflict as resolved.\n"
9076
"revert Revert files to a previous revision.\n"
9077
"revno Show current revision number.\n"
9078
"root Show the tree root directory.\n"
9079
"send Mail or create a merge-directive for submitting changes.\n"
9080
"serve Run the bzr server.\n"
9081
"shelve Temporarily set aside some changes from the current tree.\n"
9082
"sign-my-commits Sign all commits by a given committer.\n"
9083
"split Split a subdirectory of a tree into a separate tree.\n"
9084
"status Display status summary.\n"
9085
"switch Set the branch of a checkout and update.\n"
9086
"tag Create, remove or modify a tag naming a revision.\n"
9087
"tags List tags.\n"
9088
"testament Show testament (signing-form) of a revision.\n"
9089
"unbind Convert the current checkout into a regular branch.\n"
9090
"uncommit Remove the last committed revision.\n"
9091
"unshelve Restore shelved changes.\n"
9092
"update Update a working tree to a new revision.\n"
9093
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9094
" format.\n"
9095
"verify-signatures Verify all commit signatures.\n"
9096
"version Show version of bzr.\n"
9097
"version-info Show version information about this tree.\n"
9098
"view Manage filtered views.\n"
9099
"whoami Show or set bzr user id.\n"
9100
msgstr ""
9101
9102
#: en/help_topics/configuration.txt:1
9103
msgid ""
9104
"Configuration Settings\n"
9105
"======================="
9106
msgstr ""
9107
9108
#: en/help_topics/configuration.txt:4
9109
msgid ""
9110
"Environment settings\n"
9111
"---------------------"
9112
msgstr ""
9113
9114
#: en/help_topics/configuration.txt:7
9115
msgid ""
9116
"While most configuration is handled by configuration files, some options\n"
9117
"which may be semi-permanent can also be controlled through the environment."
9118
msgstr ""
9119
9120
#: en/help_topics/configuration.txt:10
9121
msgid ""
9122
"BZR_EMAIL\n"
9123
"~~~~~~~~~"
9124
msgstr ""
9125
9126
#: en/help_topics/configuration.txt:13
9127
msgid "Override the email id used by Bazaar. Typical format::"
9128
msgstr ""
9129
9130
#: en/help_topics/configuration.txt:15
9131
msgid " \"John Doe <jdoe@example.com>\""
9132
msgstr ""
9133
9134
#: en/help_topics/configuration.txt:17
9135
msgid "See also the ``email`` configuration option."
9136
msgstr ""
9137
9138
#: en/help_topics/configuration.txt:19
9139
msgid ""
9140
"BZR_PROGRESS_BAR\n"
9141
"~~~~~~~~~~~~~~~~"
9142
msgstr ""
9143
9144
#: en/help_topics/configuration.txt:22
9145
msgid ""
9146
"Override the progress display. Possible values are \"none\" or \"text\". "
9147
"If\n"
9148
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9149
"draws\n"
9150
"the ordinary command line progress bar."
9151
msgstr ""
9152
9153
#: en/help_topics/configuration.txt:26
9154
msgid ""
9155
"BZR_SIGQUIT_PDB\n"
9156
"~~~~~~~~~~~~~~~"
9157
msgstr ""
9158
9159
#: en/help_topics/configuration.txt:29
9160
msgid ""
9161
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9162
msgstr ""
9163
9164
#: en/help_topics/configuration.txt:31
9165
msgid ""
9166
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9167
"* 1 = Invoke breakin debugger (default)"
9168
msgstr ""
9169
9170
#: en/help_topics/configuration.txt:34
9171
msgid ""
9172
"BZR_HOME\n"
9173
"~~~~~~~~"
9174
msgstr ""
9175
9176
#: en/help_topics/configuration.txt:37
9177
msgid "Override the home directory used by Bazaar."
9178
msgstr ""
9179
9180
#: en/help_topics/configuration.txt:39
9181
msgid ""
9182
"BZR_SSH\n"
9183
"~~~~~~~"
9184
msgstr ""
9185
9186
#: en/help_topics/configuration.txt:42
9187
msgid "Select a different SSH implementation."
9188
msgstr ""
9189
9190
#: en/help_topics/configuration.txt:44
9191
msgid ""
9192
"BZR_PDB\n"
9193
"~~~~~~~"
9194
msgstr ""
9195
9196
#: en/help_topics/configuration.txt:47
9197
msgid "Control whether to launch a debugger on error."
9198
msgstr ""
9199
9200
#: en/help_topics/configuration.txt:49
9201
msgid ""
9202
"* 0 = Standard behavior\n"
9203
"* 1 = Launch debugger"
9204
msgstr ""
9205
9206
#: en/help_topics/configuration.txt:52
9207
msgid ""
9208
"BZR_REMOTE_PATH\n"
9209
"~~~~~~~~~~~~~~~"
9210
msgstr ""
9211
9212
#: en/help_topics/configuration.txt:55
9213
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9214
msgstr ""
9215
9216
#: en/help_topics/configuration.txt:57
9217
msgid "See also the ``bzr_remote_path`` configuration option."
9218
msgstr ""
9219
9220
#: en/help_topics/configuration.txt:59
9221
msgid ""
9222
"BZR_EDITOR\n"
9223
"~~~~~~~~~~"
9224
msgstr ""
9225
9226
#: en/help_topics/configuration.txt:62
9227
msgid "Path to the editor Bazaar should use for commit messages, etc."
9228
msgstr ""
9229
9230
#: en/help_topics/configuration.txt:64
9231
msgid ""
9232
"BZR_LOG\n"
9233
"~~~~~~~"
9234
msgstr ""
9235
9236
#: en/help_topics/configuration.txt:67
9237
msgid ""
9238
"Location of the Bazaar log file. You can check the current location by\n"
9239
"running ``bzr version``."
9240
msgstr ""
9241
9242
#: en/help_topics/configuration.txt:70
9243
msgid ""
9244
"The log file contains debug information that is useful for diagnosing or\n"
9245
"reporting problems with Bazaar."
9246
msgstr ""
9247
9248
#: en/help_topics/configuration.txt:73
9249
msgid ""
9250
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9251
"will disable logging."
9252
msgstr ""
9253
9254
#: en/help_topics/configuration.txt:76
9255
msgid ""
9256
"\n"
9257
"BZR_PLUGIN_PATH\n"
9258
"~~~~~~~~~~~~~~~"
9259
msgstr ""
9260
9261
#: en/help_topics/configuration.txt:80
9262
msgid ""
9263
"The path to the plugins directory that Bazaar should use.\n"
9264
"If not set, Bazaar will search for plugins in:"
9265
msgstr ""
9266
9267
#: en/help_topics/configuration.txt:83
9268
msgid ""
9269
"* the user specific plugin directory (containing the ``user`` plugins),"
9270
msgstr ""
9271
9272
#: en/help_topics/configuration.txt:85
9273
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9274
msgstr ""
9275
9276
#: en/help_topics/configuration.txt:87
9277
msgid ""
9278
"* the site specific plugin directory if applicable (containing\n"
9279
" the ``site`` plugins)."
9280
msgstr ""
9281
9282
#: en/help_topics/configuration.txt:90
9283
msgid ""
9284
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9285
"the way the plugin are searched. "
9286
msgstr ""
9287
9288
#: en/help_topics/configuration.txt:93
9289
msgid ""
9290
"As for the ``PATH`` variables, if multiple directories are\n"
9291
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9292
"platform specific appropriate character (':' on Unix,\n"
9293
"';' on windows)"
9294
msgstr ""
9295
9296
#: en/help_topics/configuration.txt:98
9297
msgid ""
9298
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9299
"in ``user``. However it will continue to search in ``core`` and\n"
9300
"``site`` unless they are explicitly removed."
9301
msgstr ""
9302
9303
#: en/help_topics/configuration.txt:102
9304
msgid ""
9305
"If you need to change the order or remove one of these\n"
9306
"directories, you should use special values:"
9307
msgstr ""
9308
9309
#: en/help_topics/configuration.txt:105
9310
msgid ""
9311
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9312
" path from the default values,"
9313
msgstr ""
9314
9315
#: en/help_topics/configuration.txt:108
9316
msgid ""
9317
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9318
" before the remaining default values (and also remove it from\n"
9319
" the default values)."
9320
msgstr ""
9321
9322
#: en/help_topics/configuration.txt:112
9323
msgid ""
9324
"Note that the special values 'user', 'core' and 'site' should be\n"
9325
"used literally, they will be substituted by the corresponding,\n"
9326
"platform specific, values."
9327
msgstr ""
9328
9329
#: en/help_topics/configuration.txt:116
9330
msgid ""
9331
"The examples below use ':' as the separator, windows users\n"
9332
"should use ';'."
9333
msgstr ""
9334
9335
#: en/help_topics/configuration.txt:119
9336
msgid "Overriding the default user plugin directory::"
9337
msgstr ""
9338
9339
#: en/help_topics/configuration.txt:121
9340
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9341
msgstr ""
9342
9343
#: en/help_topics/configuration.txt:123
9344
msgid "Disabling the site directory while retaining the user directory::"
9345
msgstr ""
9346
9347
#: en/help_topics/configuration.txt:125
9348
msgid " BZR_PLUGIN_PATH='-site:+user'"
9349
msgstr ""
9350
9351
#: en/help_topics/configuration.txt:127
9352
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9353
msgstr ""
9354
9355
#: en/help_topics/configuration.txt:129
9356
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9357
msgstr ""
9358
9359
#: en/help_topics/configuration.txt:131
9360
msgid "Overriding the default site plugin directory::"
9361
msgstr ""
9362
9363
#: en/help_topics/configuration.txt:133
9364
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9365
msgstr ""
9366
9367
#: en/help_topics/configuration.txt:135
9368
msgid ""
9369
"BZR_DISABLE_PLUGINS\n"
9370
"~~~~~~~~~~~~~~~~~~~"
9371
msgstr ""
9372
9373
#: en/help_topics/configuration.txt:138
9374
msgid ""
9375
"Under special circumstances (mostly when trying to diagnose a\n"
9376
"bug), it's better to disable a plugin (or several) rather than\n"
9377
"uninstalling them completely. Such plugins can be specified in\n"
9378
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9379
msgstr ""
9380
9381
#: en/help_topics/configuration.txt:143
9382
msgid ""
9383
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9384
"will raise an import error if they are explicitly imported (by\n"
9385
"another plugin that depends on them for example)."
9386
msgstr ""
9387
9388
#: en/help_topics/configuration.txt:147
9389
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9390
msgstr ""
9391
9392
#: en/help_topics/configuration.txt:149
9393
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9394
msgstr ""
9395
9396
#: en/help_topics/configuration.txt:151
9397
msgid ""
9398
"BZR_PLUGINS_AT\n"
9399
"~~~~~~~~~~~~~~"
9400
msgstr ""
9401
9402
#: en/help_topics/configuration.txt:154
9403
msgid ""
9404
"When adding a new feature or working on a bug in a plugin,\n"
9405
"developers often need to use a specific version of a given\n"
9406
"plugin. Since python requires that the directory containing the\n"
9407
"code is named like the plugin itself this make it impossible to\n"
9408
"use arbitrary directory names (using a two-level directory scheme\n"
9409
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9410
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9411
msgstr ""
9412
9413
#: en/help_topics/configuration.txt:162
9414
msgid ""
9415
"Plugins specified in this environment variable takes precedence\n"
9416
"over the ones in ``BZR_PLUGIN_PATH``."
9417
msgstr ""
9418
9419
#: en/help_topics/configuration.txt:165
9420
msgid ""
9421
"The variable specified a list of ``plugin_name@plugin path``,\n"
9422
"``plugin_name`` being the name of the plugin as it appears in\n"
9423
"python module paths, ``plugin_path`` being the path to the\n"
9424
"directory containing the plugin code itself\n"
9425
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9426
"separator, use ';' on windows."
9427
msgstr ""
9428
9429
#: en/help_topics/configuration.txt:172
9430
msgid ""
9431
"Example:\n"
9432
"~~~~~~~~"
9433
msgstr ""
9434
9435
#: en/help_topics/configuration.txt:175
9436
msgid ""
9437
"Using a specific version of ``myplugin``:\n"
9438
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9439
msgstr ""
9440
9441
#: en/help_topics/configuration.txt:178
9442
msgid ""
9443
"BZRPATH\n"
9444
"~~~~~~~"
9445
msgstr ""
9446
9447
#: en/help_topics/configuration.txt:181
9448
msgid "The path where Bazaar should look for shell plugin external commands."
9449
msgstr ""
9450
9451
#: en/help_topics/configuration.txt:183
9452
msgid ""
9453
"\n"
9454
"http_proxy, https_proxy\n"
9455
"~~~~~~~~~~~~~~~~~~~~~~~"
9456
msgstr ""
9457
9458
#: en/help_topics/configuration.txt:187
9459
msgid "Specifies the network proxy for outgoing connections, for example::"
9460
msgstr ""
9461
9462
#: en/help_topics/configuration.txt:189
9463
msgid ""
9464
" http_proxy=http://proxy.example.com:3128/ \n"
9465
" https_proxy=http://proxy.example.com:3128/"
9466
msgstr ""
9467
9468
#: en/help_topics/configuration.txt:192
9469
msgid ""
9470
"\n"
9471
"Configuration files\n"
9472
"-------------------"
9473
msgstr ""
9474
9475
#: en/help_topics/configuration.txt:196
9476
msgid ""
9477
"Location\n"
9478
"~~~~~~~~"
9479
msgstr ""
9480
9481
#: en/help_topics/configuration.txt:199
9482
msgid ""
9483
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9484
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9485
"on\n"
9486
"Windows. (You can check the location for your system by using\n"
9487
"``bzr version``.)"
9488
msgstr ""
9489
9490
#: en/help_topics/configuration.txt:204
9491
msgid "There are three primary configuration files in this location:"
9492
msgstr ""
9493
9494
#: en/help_topics/configuration.txt:206
9495
msgid "* ``bazaar.conf`` describes default configuration options,"
9496
msgstr ""
9497
9498
#: en/help_topics/configuration.txt:208
9499
msgid ""
9500
"* ``locations.conf`` describes configuration information for\n"
9501
" specific branch locations,"
9502
msgstr ""
9503
9504
#: en/help_topics/configuration.txt:211
9505
msgid ""
9506
"* ``authentication.conf`` describes credential information for\n"
9507
" remote servers."
9508
msgstr ""
9509
9510
#: en/help_topics/configuration.txt:214
9511
msgid ""
9512
"Each branch can also contain a configuration file that sets values specific\n"
9513
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9514
"the\n"
9515
"branch. This file is visible to all users of a branch, if you wish to "
9516
"override\n"
9517
"one of the values for a branch with a setting that is specific to you then "
9518
"you\n"
9519
"can do so in ``locations.conf``."
9520
msgstr ""
9521
9522
#: en/help_topics/configuration.txt:220
9523
msgid ""
9524
"General format\n"
9525
"~~~~~~~~~~~~~~"
9526
msgstr ""
9527
9528
#: en/help_topics/configuration.txt:223
9529
msgid ""
9530
"An ini file has three types of contructs: section headers, section\n"
9531
"options and comments."
9532
msgstr ""
9533
9534
#: en/help_topics/configuration.txt:226
9535
msgid ""
9536
"Comments\n"
9537
"^^^^^^^^"
9538
msgstr ""
9539
9540
#: en/help_topics/configuration.txt:229
9541
msgid ""
9542
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9543
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9544
"Bazaar when parsing ini files."
9545
msgstr ""
9546
9547
#: en/help_topics/configuration.txt:233
9548
msgid ""
9549
"Section headers\n"
9550
"^^^^^^^^^^^^^^^"
9551
msgstr ""
9552
9553
#: en/help_topics/configuration.txt:236
9554
msgid ""
9555
"A section header is a word enclosed in brackets that starts at the begining\n"
9556
"of a line. A typical section header looks like this::"
9557
msgstr ""
9558
9559
#: en/help_topics/configuration.txt:239
9560
msgid " [DEFAULT]"
9561
msgstr ""
9562
9563
#: en/help_topics/configuration.txt:241
9564
msgid ""
9565
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9566
"[ALIASES]. Section headers are case sensitive. The default section provides "
9567
"for\n"
9568
"setting options which can be overridden with the branch config file."
9569
msgstr ""
9570
9571
#: en/help_topics/configuration.txt:245
9572
msgid ""
9573
"For ``locations.conf``, the options from the section with the\n"
9574
"longest matching section header are used to the exclusion of other\n"
9575
"potentially valid section headers. A section header uses the path for\n"
9576
"the branch as the section header. Some examples include::"
9577
msgstr ""
9578
9579
#: en/help_topics/configuration.txt:250
9580
msgid ""
9581
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9582
" [/home/jdoe/branches/]"
9583
msgstr ""
9584
9585
#: en/help_topics/configuration.txt:253
9586
msgid ""
9587
"\n"
9588
"Section options\n"
9589
"^^^^^^^^^^^^^^^"
9590
msgstr ""
9591
9592
#: en/help_topics/configuration.txt:257
9593
msgid ""
9594
"A section option resides within a section. A section option contains an\n"
9595
"option name, an equals sign and a value. For example::"
9596
msgstr ""
9597
9598
#: en/help_topics/configuration.txt:260
9599
msgid ""
9600
" email = John Doe <jdoe@isp.com>\n"
9601
" gpg_signing_key = Amy Pond <amy@example.com>"
9602
msgstr ""
9603
9604
#: en/help_topics/configuration.txt:263
9605
msgid ""
9606
"A option can reference other options by enclosing them in curly brackets::"
9607
msgstr ""
9608
9609
#: en/help_topics/configuration.txt:265
9610
msgid ""
9611
" my_branch_name = feature_x\n"
9612
" my_server = bzr+ssh://example.com\n"
9613
" push_location = {my_server}/project/{my_branch_name}"
9614
msgstr ""
9615
9616
#: en/help_topics/configuration.txt:269
9617
msgid ""
9618
"Option policies\n"
9619
"^^^^^^^^^^^^^^^"
9620
msgstr ""
9621
9622
#: en/help_topics/configuration.txt:272
9623
msgid ""
9624
"Options defined in a section affect the named directory or URL plus\n"
9625
"any locations they contain. Policies can be used to change how an\n"
9626
"option value is interpreted for contained locations. Currently\n"
9627
"there are three policies available:"
9628
msgstr ""
9629
9630
#: en/help_topics/configuration.txt:277
9631
msgid ""
9632
" none:\n"
9633
" the value is interpreted the same for contained locations. This is\n"
9634
" the default behaviour.\n"
9635
" norecurse:\n"
9636
" the value is only used for the exact location specified by the\n"
9637
" section name.\n"
9638
" appendpath:\n"
9639
" for contained locations, any additional path components are\n"
9640
" appended to the value."
9641
msgstr ""
9642
9643
#: en/help_topics/configuration.txt:287
9644
msgid ""
9645
"Policies are specified by keys with names of the form "
9646
"\"<option_name>:policy\".\n"
9647
"For example, to define the push location for a tree of branches, the\n"
9648
"following could be used::"
9649
msgstr ""
9650
9651
#: en/help_topics/configuration.txt:291
9652
msgid ""
9653
" [/top/location]\n"
9654
" push_location = sftp://example.com/location\n"
9655
" push_location:policy = appendpath"
9656
msgstr ""
9657
9658
#: en/help_topics/configuration.txt:295
9659
msgid ""
9660
"With this configuration, the push location for ``/top/location/branch1``\n"
9661
"would be ``sftp://example.com/location/branch1``."
9662
msgstr ""
9663
9664
#: en/help_topics/configuration.txt:298
9665
msgid ""
9666
"Section local options\n"
9667
"^^^^^^^^^^^^^^^^^^^^^"
9668
msgstr ""
9669
9670
#: en/help_topics/configuration.txt:301
9671
msgid ""
9672
"Some options are defined automatically inside a given section and can be\n"
9673
"refered to in this section only. "
9674
msgstr ""
9675
9676
#: en/help_topics/configuration.txt:304
9677
msgid "For example, the ``appendpath`` policy can be used like this::"
9678
msgstr ""
9679
9680
#: en/help_topics/configuration.txt:306
9681
msgid ""
9682
" [/home/vila/src/bzr/bugs]\n"
9683
" mypush = lp:~vila/bzr\n"
9684
" mypush:policy=appendpath"
9685
msgstr ""
9686
9687
#: en/help_topics/configuration.txt:310
9688
msgid "Using ``relpath`` to achieve the same result is done like this::"
9689
msgstr ""
9690
9691
#: en/help_topics/configuration.txt:312
9692
msgid ""
9693
" [/home/vila/src/bzr/bugs]\n"
9694
" mypush = lp:~vila/bzr/{relpath}"
9695
msgstr ""
9696
9697
#: en/help_topics/configuration.txt:315
9698
msgid ""
9699
"In both cases, 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:318 en/help_topics/configuration.txt:329
9704
msgid ""
9705
" $ bzr config mypush\n"
9706
" lp:~vila/bzr/832013-expand-in-stack"
9707
msgstr ""
9708
9709
#: en/help_topics/configuration.txt:321
9710
msgid "Another such option is ``basename`` which can be used like this::"
9711
msgstr ""
9712
9713
#: en/help_topics/configuration.txt:323
9714
msgid ""
9715
" [/home/vila/src/bzr]\n"
9716
" mypush = lp:~vila/bzr/{basename}"
9717
msgstr ""
9718
9719
#: en/help_topics/configuration.txt:326
9720
msgid ""
9721
"When used in a directory like\n"
9722
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9723
msgstr ""
9724
9725
#: en/help_topics/configuration.txt:332
9726
msgid ""
9727
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9728
"itself is defined as the relative path between the section name and the\n"
9729
"location it matches."
9730
msgstr ""
9731
9732
#: en/help_topics/configuration.txt:336
9733
msgid ""
9734
"When an option is local to a Section, it cannot be referred to from option\n"
9735
"values in any other section from the same ``Store`` nor from any other\n"
9736
"``Store``."
9737
msgstr ""
9738
9739
#: en/help_topics/configuration.txt:340
9740
msgid ""
9741
"\n"
9742
"The main configuration file, bazaar.conf\n"
9743
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9744
msgstr ""
9745
9746
#: en/help_topics/configuration.txt:344
9747
msgid ""
9748
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9749
"The default section contains the default\n"
9750
"configuration options for all branches. The default section can be\n"
9751
"overriden by providing a branch-specific section in ``locations.conf``."
9752
msgstr ""
9753
9754
#: en/help_topics/configuration.txt:349
9755
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9756
msgstr ""
9757
9758
#: en/help_topics/configuration.txt:351
9759
msgid ""
9760
" [DEFAULT]\n"
9761
" email = John Doe <jdoe@isp.com>\n"
9762
" editor = /usr/bin/vim\n"
9763
" create_signatures = when-required"
9764
msgstr ""
9765
9766
#: en/help_topics/configuration.txt:356
9767
msgid ""
9768
"\n"
9769
"The branch location configuration file, locations.conf\n"
9770
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9771
msgstr ""
9772
9773
#: en/help_topics/configuration.txt:360
9774
msgid ""
9775
"``locations.conf`` allows one to specify overriding settings for\n"
9776
"a specific branch. The format is almost identical to the default section in\n"
9777
"bazaar.conf with one significant change: The section header, instead of "
9778
"saying\n"
9779
"default, will be the path to a branch that you wish to override a value\n"
9780
"for. The '?' and '*' wildcards are supported::"
9781
msgstr ""
9782
9783
#: en/help_topics/configuration.txt:366
9784
msgid ""
9785
" [/home/jdoe/branches/nethack]\n"
9786
" email = Nethack Admin <nethack@nethack.com>"
9787
msgstr ""
9788
9789
#: en/help_topics/configuration.txt:369
9790
msgid ""
9791
" [http://hypothetical.site.com/branches/devel-branch]\n"
9792
" create_signatures = always"
9793
msgstr ""
9794
9795
#: en/help_topics/configuration.txt:372
9796
msgid ""
9797
"The authentication configuration file, authentication.conf\n"
9798
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9799
msgstr ""
9800
9801
#: en/help_topics/configuration.txt:375
9802
msgid ""
9803
"``authentication.conf`` allows one to specify credentials for\n"
9804
"remote servers. This can be used for all the supported transports and any "
9805
"part\n"
9806
"of bzr that requires authentication (smtp for example)."
9807
msgstr ""
9808
9809
#: en/help_topics/configuration.txt:379
9810
msgid ""
9811
"The syntax of the file obeys the same rules as the others except for the\n"
9812
"option policies which don't apply."
9813
msgstr ""
9814
9815
#: en/help_topics/configuration.txt:382
9816
msgid ""
9817
"For more information on the possible uses of the authentication "
9818
"configuration\n"
9819
"file see :doc:`authentication-help`."
9820
msgstr ""
9821
9822
#: en/help_topics/configuration.txt:385
9823
msgid ""
9824
"\n"
9825
"Common options\n"
9826
"--------------"
9827
msgstr ""
9828
9829
#: en/help_topics/configuration.txt:389
9830
msgid ""
9831
"debug_flags\n"
9832
"~~~~~~~~~~~"
9833
msgstr ""
9834
9835
#: en/help_topics/configuration.txt:392
9836
msgid ""
9837
"A comma-separated list of debugging options to turn on. The same values\n"
9838
"can be used as with the -D command-line option (see `help global-options`).\n"
9839
"For example::"
9840
msgstr ""
9841
9842
#: en/help_topics/configuration.txt:396
9843
msgid " debug_flags = hpss"
9844
msgstr ""
9845
9846
#: en/help_topics/configuration.txt:400
9847
msgid " debug_flags = hpss,evil"
9848
msgstr ""
9849
9850
#: en/help_topics/configuration.txt:402
9851
msgid ""
9852
"email\n"
9853
"~~~~~"
9854
msgstr ""
9855
9856
#: en/help_topics/configuration.txt:405
9857
msgid ""
9858
"The email address to use when committing a branch. Typically takes the form\n"
9859
"of::"
9860
msgstr ""
9861
9862
#: en/help_topics/configuration.txt:408
9863
msgid " email = Full Name <account@hostname.tld>"
9864
msgstr ""
9865
9866
#: en/help_topics/configuration.txt:410
9867
msgid ""
9868
"editor\n"
9869
"~~~~~~"
9870
msgstr ""
9871
9872
#: en/help_topics/configuration.txt:413
9873
msgid ""
9874
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9875
"a commit message. This setting is trumped by the environment variable\n"
9876
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9877
"variables."
9878
msgstr ""
9879
9880
#: en/help_topics/configuration.txt:418
9881
msgid ""
9882
"log_format\n"
9883
"~~~~~~~~~~"
9884
msgstr ""
9885
9886
#: en/help_topics/configuration.txt:421
9887
msgid ""
9888
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9889
"and ``line``. Additional formats may be provided by plugins. The default\n"
9890
"value is ``long``."
9891
msgstr ""
9892
9893
#: en/help_topics/configuration.txt:425
9894
msgid ""
9895
"check_signatures\n"
9896
"~~~~~~~~~~~~~~~~"
9897
msgstr ""
9898
9899
#: en/help_topics/configuration.txt:428
9900
msgid ""
9901
"Reserved for future use. These options will allow a policy for branches to\n"
9902
"require signatures."
9903
msgstr ""
9904
9905
#: en/help_topics/configuration.txt:431
9906
msgid ""
9907
"require\n"
9908
" The gnupg signature for revisions must be present and must be valid."
9909
msgstr ""
9910
9911
#: en/help_topics/configuration.txt:434
9912
msgid ""
9913
"ignore\n"
9914
" Do not check gnupg signatures of revisions."
9915
msgstr ""
9916
9917
#: en/help_topics/configuration.txt:437
9918
msgid ""
9919
"check-available\n"
9920
" (default) If gnupg signatures for revisions are present, check them.\n"
9921
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9922
" no signature is present."
9923
msgstr ""
9924
9925
#: en/help_topics/configuration.txt:442
9926
msgid ""
9927
"create_signatures\n"
9928
"~~~~~~~~~~~~~~~~~"
9929
msgstr ""
9930
9931
#: en/help_topics/configuration.txt:445
9932
msgid ""
9933
"Defines the behaviour of signing revisions on commits. By default bzr will "
9934
"not\n"
9935
"sign new commits."
9936
msgstr ""
9937
9938
#: en/help_topics/configuration.txt:448
9939
msgid ""
9940
"always\n"
9941
" Sign every new revision that is committed. If the signing fails then "
9942
"the\n"
9943
" commit will not be made."
9944
msgstr ""
9945
9946
#: en/help_topics/configuration.txt:452
9947
msgid ""
9948
"when-required\n"
9949
" Reserved for future use."
9950
msgstr ""
9951
9952
#: en/help_topics/configuration.txt:455
9953
msgid ""
9954
"never\n"
9955
" Reserved for future use."
9956
msgstr ""
9957
9958
#: en/help_topics/configuration.txt:458
9959
msgid ""
9960
"In future it is planned that ``when-required`` will sign newly\n"
9961
"committed revisions only when the branch requires them. ``never`` will "
9962
"refuse\n"
9963
"to sign newly committed revisions, even if the branch requires signatures."
9964
msgstr ""
9965
9966
#: en/help_topics/configuration.txt:462
9967
msgid ""
9968
"dirstate.fdatasync\n"
9969
"~~~~~~~~~~~~~~~~~~"
9970
msgstr ""
9971
9972
#: en/help_topics/configuration.txt:465
9973
msgid ""
9974
"If true (default), working tree metadata changes are flushed through the\n"
9975
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9976
"should not be lost if the machine crashes. See also repository.fdatasync."
9977
msgstr ""
9978
9979
#: en/help_topics/configuration.txt:469
9980
msgid ""
9981
"gpg_signing_key\n"
9982
"~~~~~~~~~~~~~~~"
9983
msgstr ""
9984
9985
#: en/help_topics/configuration.txt:472
9986
msgid ""
9987
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9988
"address, key fingerprint or full key ID. When unset or when set to\n"
9989
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9990
msgstr ""
9991
9992
#: en/help_topics/configuration.txt:476
9993
msgid ""
9994
"recurse\n"
9995
"~~~~~~~"
9996
msgstr ""
9997
9998
#: en/help_topics/configuration.txt:479
9999
msgid ""
10000
"Only useful in ``locations.conf``. Defines whether or not the\n"
10001
"configuration for this section applies to subdirectories:"
10002
msgstr ""
10003
10004
#: en/help_topics/configuration.txt:482
10005
msgid ""
10006
"true\n"
10007
" (default) This section applies to subdirectories as well."
10008
msgstr ""
10009
10010
#: en/help_topics/configuration.txt:485
10011
msgid ""
10012
"false\n"
10013
" This section only applies to the branch at this directory and not\n"
10014
" branches below it."
10015
msgstr ""
10016
10017
#: en/help_topics/configuration.txt:489
10018
msgid ""
10019
"gpg_signing_command\n"
10020
"~~~~~~~~~~~~~~~~~~~"
10021
msgstr ""
10022
10023
#: en/help_topics/configuration.txt:492
10024
msgid ""
10025
"(Default: \"gpg\"). Which program should be used to sign and check "
10026
"revisions.\n"
10027
"For example::"
10028
msgstr ""
10029
10030
#: en/help_topics/configuration.txt:495
10031
msgid " gpg_signing_command = /usr/bin/gnpg"
10032
msgstr ""
10033
10034
#: en/help_topics/configuration.txt:497
10035
msgid ""
10036
"The specified command must accept the options \"--clearsign\" and \"-u "
10037
"<email>\"."
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:499
10041
msgid ""
10042
"bzr_remote_path\n"
10043
"~~~~~~~~~~~~~~~"
10044
msgstr ""
10045
10046
#: en/help_topics/configuration.txt:502
10047
msgid ""
10048
"(Default: \"bzr\"). The path to the command that should be used to run the "
10049
"smart\n"
10050
"server for bzr. This value may only be specified in locations.conf, because:"
10051
msgstr ""
10052
10053
#: en/help_topics/configuration.txt:505
10054
msgid ""
10055
"- it's needed before branch.conf is accessible\n"
10056
"- allowing remote branch.conf files to specify commands would be a security\n"
10057
" risk"
10058
msgstr ""
10059
10060
#: en/help_topics/configuration.txt:509
10061
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10062
msgstr ""
10063
10064
#: en/help_topics/configuration.txt:511
10065
msgid ""
10066
"smtp_server\n"
10067
"~~~~~~~~~~~"
10068
msgstr ""
10069
10070
#: en/help_topics/configuration.txt:514
10071
msgid ""
10072
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10073
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10074
msgstr ""
10075
10076
#: en/help_topics/configuration.txt:517
10077
msgid ""
10078
"smtp_username, smtp_password\n"
10079
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10080
msgstr ""
10081
10082
#: en/help_topics/configuration.txt:520
10083
msgid ""
10084
"User and password to authenticate to the SMTP server. If smtp_username\n"
10085
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10086
"These settings are only needed if the SMTP server requires authentication\n"
10087
"to send mail."
10088
msgstr ""
10089
10090
#: en/help_topics/configuration.txt:525
10091
msgid ""
10092
"locks.steal_dead\n"
10093
"~~~~~~~~~~~~~~~~"
10094
msgstr ""
10095
10096
#: en/help_topics/configuration.txt:528
10097
msgid ""
10098
"If set to true, bzr will automatically break locks held by processes from\n"
10099
"the same machine and user that are no longer alive. Otherwise, it will\n"
10100
"print a message and you can break the lock manually, if you are satisfied\n"
10101
"the object is no longer in use."
10102
msgstr ""
10103
10104
#: en/help_topics/configuration.txt:533
10105
msgid ""
10106
"mail_client\n"
10107
"~~~~~~~~~~~"
10108
msgstr ""
10109
10110
#: en/help_topics/configuration.txt:536
10111
msgid ""
10112
"A mail client to use for sending merge requests.\n"
10113
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10114
"it\n"
10115
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10116
"``editor``."
10117
msgstr ""
10118
10119
#: en/help_topics/configuration.txt:541
10120
msgid "Supported values for specific clients:"
10121
msgstr ""
10122
10123
#: en/help_topics/configuration.txt:543
10124
msgid ""
10125
":claws: Use Claws. This skips a dialog for attaching files.\n"
10126
":evolution: Use Evolution.\n"
10127
":kmail: Use KMail.\n"
10128
":mutt: Use Mutt.\n"
10129
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10130
"1.5,\n"
10131
" this works around some bugs that xdg-email doesn't handle."
10132
msgstr ""
10133
10134
#: en/help_topics/configuration.txt:550
10135
msgid "Supported generic values are:"
10136
msgstr ""
10137
10138
#: en/help_topics/configuration.txt:552
10139
msgid ""
10140
":default: See above.\n"
10141
":editor: Use your editor to compose the merge request. This also uses\n"
10142
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10143
" smtp_username and smtp_password.\n"
10144
":mapi: Use your preferred e-mail client on Windows.\n"
10145
":xdg-email: Use xdg-email to run your preferred mail program"
10146
msgstr ""
10147
10148
#: en/help_topics/configuration.txt:559
10149
msgid ""
10150
"repository.fdatasync\n"
10151
"~~~~~~~~~~~~~~~~~~~~"
10152
msgstr ""
10153
10154
#: en/help_topics/configuration.txt:562
10155
msgid ""
10156
"If true (default), repository changes are flushed through the OS buffers\n"
10157
"to physical disk. This is somewhat slower, but means data should not be\n"
10158
"lost if the machine crashes. See also dirstate.fdatasync."
10159
msgstr ""
10160
10161
#: en/help_topics/configuration.txt:566
10162
msgid ""
10163
"submit_branch\n"
10164
"~~~~~~~~~~~~~"
10165
msgstr ""
10166
10167
#: en/help_topics/configuration.txt:569
10168
msgid ""
10169
"The branch you intend to submit your current work to. This is "
10170
"automatically\n"
10171
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10172
"This\n"
10173
"should usually be set on a per-branch or per-location basis."
10174
msgstr ""
10175
10176
#: en/help_topics/configuration.txt:573
10177
msgid ""
10178
"public_branch\n"
10179
"~~~~~~~~~~~~~"
10180
msgstr ""
10181
10182
#: en/help_topics/configuration.txt:576
10183
msgid ""
10184
"A publically-accessible version of this branch (implying that this version "
10185
"is\n"
10186
"not publically-accessible). Used (and set) by ``bzr send``."
10187
msgstr ""
10188
10189
#: en/help_topics/configuration.txt:579
10190
msgid ""
10191
"suppress_warnings\n"
10192
"~~~~~~~~~~~~~~~~~"
10193
msgstr ""
10194
10195
#: en/help_topics/configuration.txt:582
10196
msgid ""
10197
"A list of strings, each string represent a warning that can be emitted by\n"
10198
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10199
msgstr ""
10200
10201
#: en/help_topics/configuration.txt:585
10202
msgid "Valid values:"
10203
msgstr ""
10204
10205
#: en/help_topics/configuration.txt:587
10206
msgid ""
10207
"* ``format_deprecation``:\n"
10208
" whether the format deprecation warning is shown on repositories that "
10209
"are\n"
10210
" using deprecated formats."
10211
msgstr ""
10212
10213
#: en/help_topics/configuration.txt:591
10214
msgid ""
10215
"default_format\n"
10216
"~~~~~~~~~~~~~~"
10217
msgstr ""
10218
10219
#: en/help_topics/configuration.txt:594
10220
msgid ""
10221
"A format name for the default format used when creating branches. See "
10222
"``bzr\n"
10223
"help formats`` for possible values."
10224
msgstr ""
10225
10226
#: en/help_topics/configuration.txt:597
10227
msgid ""
10228
"\n"
10229
"Unicode options\n"
10230
"---------------"
10231
msgstr ""
10232
10233
#: en/help_topics/configuration.txt:601
10234
msgid ""
10235
"output_encoding\n"
10236
"~~~~~~~~~~~~~~~"
10237
msgstr ""
10238
10239
#: en/help_topics/configuration.txt:604
10240
msgid ""
10241
"A Python unicode encoding name for text output from bzr, such as log\n"
10242
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10243
"is the terminal encoding prefered by the operating system."
10244
msgstr ""
10245
10246
#: en/help_topics/configuration.txt:608
10247
msgid ""
10248
"\n"
10249
"Branch type specific options\n"
10250
"----------------------------"
10251
msgstr ""
10252
10253
#: en/help_topics/configuration.txt:612
10254
msgid ""
10255
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10256
"later format. They\n"
10257
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10258
"manually set in ``locations.conf`` or ``bazaar.conf``."
10259
msgstr ""
10260
10261
#: en/help_topics/configuration.txt:617
10262
msgid ""
10263
"append_revisions_only\n"
10264
"~~~~~~~~~~~~~~~~~~~~~"
10265
msgstr ""
10266
10267
#: en/help_topics/configuration.txt:620
10268
msgid ""
10269
"If set to \"True\" then revisions can only be appended to the log, not\n"
10270
"removed. A branch with this setting enabled can only pull from another\n"
10271
"branch if the other branch's log is a longer version of its own. This is\n"
10272
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10273
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10274
"compatibility with previous bzr versions (older than 2.2)."
10275
msgstr ""
10276
10277
#: en/help_topics/configuration.txt:627
10278
msgid ""
10279
"parent_location\n"
10280
"~~~~~~~~~~~~~~~"
10281
msgstr ""
10282
10283
#: en/help_topics/configuration.txt:630
10284
msgid ""
10285
"If present, the location of the default branch for pull or merge. This "
10286
"option\n"
10287
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10288
"--remember``."
10289
msgstr ""
10290
10291
#: en/help_topics/configuration.txt:634
10292
msgid ""
10293
"push_location\n"
10294
"~~~~~~~~~~~~~"
10295
msgstr ""
10296
10297
#: en/help_topics/configuration.txt:637
10298
msgid ""
10299
"If present, the location of the default branch for push. This option\n"
10300
"is normally set by the first ``push`` or ``push --remember``."
10301
msgstr ""
10302
10303
#: en/help_topics/configuration.txt:640
10304
msgid ""
10305
"push_strict\n"
10306
"~~~~~~~~~~~"
10307
msgstr ""
10308
10309
#: en/help_topics/configuration.txt:643
10310
msgid ""
10311
"If present, defines the ``--strict`` option default value for checking\n"
10312
"uncommitted changes before pushing."
10313
msgstr ""
10314
10315
#: en/help_topics/configuration.txt:646
10316
msgid ""
10317
"dpush_strict\n"
10318
"~~~~~~~~~~~~"
10319
msgstr ""
10320
10321
#: en/help_topics/configuration.txt:649
10322
msgid ""
10323
"If present, defines the ``--strict`` option default value for checking\n"
10324
"uncommitted changes before pushing into a different VCS without any\n"
10325
"custom bzr metadata."
10326
msgstr ""
10327
10328
#: en/help_topics/configuration.txt:653
10329
msgid ""
10330
"bound_location\n"
10331
"~~~~~~~~~~~~~~"
10332
msgstr ""
10333
10334
#: en/help_topics/configuration.txt:656
10335
msgid ""
10336
"The location that commits should go to when acting as a checkout.\n"
10337
"This option is normally set by ``bind``."
10338
msgstr ""
10339
10340
#: en/help_topics/configuration.txt:659
10341
msgid ""
10342
"bound\n"
10343
"~~~~~"
10344
msgstr ""
10345
10346
#: en/help_topics/configuration.txt:662
10347
msgid ""
10348
"If set to \"True\", the branch should act as a checkout, and push each "
10349
"commit to\n"
10350
"the bound_location. This option is normally set by ``bind``/``unbind``."
10351
msgstr ""
10352
10353
#: en/help_topics/configuration.txt:665
10354
msgid ""
10355
"send_strict\n"
10356
"~~~~~~~~~~~"
10357
msgstr ""
10358
10359
#: en/help_topics/configuration.txt:668
10360
msgid ""
10361
"If present, defines the ``--strict`` option default value for checking\n"
10362
"uncommitted changes before sending a merge directive."
10363
msgstr ""
10364
10365
#: en/help_topics/configuration.txt:671
10366
msgid ""
10367
"add.maximum_file_size\n"
10368
"~~~~~~~~~~~~~~~~~~~~~"
10369
msgstr ""
10370
10371
#: en/help_topics/configuration.txt:674
10372
msgid ""
10373
"Defines the maximum file size the command line \"add\" operation will allow\n"
10374
"in recursive mode, with files larger than this value being skipped. You may "
10375
"\n"
10376
"specify this value as an integer (in which case it is interpreted as bytes), "
10377
"\n"
10378
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10379
"0 \n"
10380
"will disable skipping."
10381
msgstr ""
10382
10383
#: en/help_topics/configuration.txt:680
10384
msgid ""
10385
"External Merge Tools\n"
10386
"--------------------"
10387
msgstr ""
10388
10389
#: en/help_topics/configuration.txt:683
10390
msgid ""
10391
"bzr.mergetool.<name>\n"
10392
"~~~~~~~~~~~~~~~~~~~~"
10393
msgstr ""
10394
10395
#: en/help_topics/configuration.txt:686
10396
msgid ""
10397
"Defines an external merge tool called <name> with the given command-line.\n"
10398
"Arguments containing spaces should be quoted using single or double quotes. "
10399
"The\n"
10400
"executable may omit its path if it can be found on the PATH."
10401
msgstr ""
10402
10403
#: en/help_topics/configuration.txt:690
10404
msgid ""
10405
"The following markers can be used in the command-line to substitute "
10406
"filenames\n"
10407
"involved in the merge conflict::"
10408
msgstr ""
10409
10410
#: en/help_topics/configuration.txt:693
10411
msgid ""
10412
" {base} file.BASE\n"
10413
" {this} file.THIS\n"
10414
" {other} file.OTHER\n"
10415
" {result} output file\n"
10416
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10417
"merge\n"
10418
" succeeds."
10419
msgstr ""
10420
10421
#: en/help_topics/configuration.txt:702
10422
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10423
msgstr ""
10424
10425
#: en/help_topics/configuration.txt:704
10426
msgid ""
10427
"bzr.default_mergetool\n"
10428
"~~~~~~~~~~~~~~~~~~~~~"
10429
msgstr ""
10430
10431
#: en/help_topics/configuration.txt:707
10432
msgid ""
10433
"Specifies which external merge tool (as defined above) should be selected "
10434
"by\n"
10435
"default in tools such as ``bzr qconflicts``."
10436
msgstr ""
10437
10438
#: en/help_topics/configuration.txt:712
10439
msgid " bzr.default_mergetool = kdiff3\n"
10440
msgstr ""
10441
10442
#: en/help_topics/conflict-types.txt:1
10443
msgid ""
10444
"Conflict Types\n"
10445
"=============="
10446
msgstr ""
10447
10448
#: en/help_topics/conflict-types.txt:4
10449
msgid ""
10450
"Some operations, like merge, revert and pull, modify the contents of your\n"
10451
"working tree. These modifications are programmatically generated, and so "
10452
"they\n"
10453
"may conflict with the current state of your working tree. "
10454
msgstr ""
10455
10456
#: en/help_topics/conflict-types.txt:8
10457
msgid ""
10458
"When conflicts are present in your working tree (as shown by ``bzr\n"
10459
"conflicts``), you should resolve them and then inform bzr that the "
10460
"conflicts\n"
10461
"have been resolved."
10462
msgstr ""
10463
10464
#: en/help_topics/conflict-types.txt:12
10465
msgid ""
10466
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10467
"should resolve them is not the one responsible for their occurrence, as is "
10468
"the\n"
10469
"case when merging other people's work or because some conflicts are "
10470
"presented\n"
10471
"in a way that is not easy to understand."
10472
msgstr ""
10473
10474
#: en/help_topics/conflict-types.txt:17
10475
msgid ""
10476
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10477
"conflict if and only if there's an actual conceptual conflict in the source\n"
10478
"tree. Because Bazaar doesn't understand the real meaning of the files "
10479
"being\n"
10480
"versioned, it can, when faced with ambiguities, fall short in either "
10481
"direction\n"
10482
"trying to resolve the conflict itself. Many kinds of changes can be "
10483
"combined\n"
10484
"programmatically, but sometimes only a human can determine the right thing "
10485
"to\n"
10486
"do."
10487
msgstr ""
10488
10489
#: en/help_topics/conflict-types.txt:25
10490
msgid ""
10491
"When Bazaar generates a conflict, it adds information into the working tree "
10492
"to\n"
10493
"present the conflicting versions, and it's up to you to find the correct\n"
10494
"resolution."
10495
msgstr ""
10496
10497
#: en/help_topics/conflict-types.txt:29
10498
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10499
msgstr ""
10500
10501
#: en/help_topics/conflict-types.txt:31
10502
msgid ""
10503
"1. Modify the working tree content so that the conflicted item is now in "
10504
"the\n"
10505
" state you want to keep, then"
10506
msgstr ""
10507
10508
#: en/help_topics/conflict-types.txt:34
10509
msgid ""
10510
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10511
" remaining generated information (``bzr resolve <item>``)."
10512
msgstr ""
10513
10514
#: en/help_topics/conflict-types.txt:37
10515
msgid ""
10516
"For most conflict types, there are some obvious ways to modify the working\n"
10517
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10518
"itself already made a choice, when possible."
10519
msgstr ""
10520
10521
#: en/help_topics/conflict-types.txt:41
10522
msgid ""
10523
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10524
"different ways to resolve the conflict."
10525
msgstr ""
10526
10527
#: en/help_topics/conflict-types.txt:44
10528
msgid ""
10529
"Each type of conflict is explained below, and the action which must be done "
10530
"to\n"
10531
"resolve the conflict is outlined."
10532
msgstr ""
10533
10534
#: en/help_topics/conflict-types.txt:47
10535
msgid ""
10536
"Various actions are available depending on the kind of conflict, for some "
10537
"of\n"
10538
"these actions, Bazaar can provide some help. In the end you should at least\n"
10539
"inform Bazaar that you're done with the conflict with::"
10540
msgstr ""
10541
10542
#: en/help_topics/conflict-types.txt:51
10543
msgid " ``bzr resolve FILE --action=done'"
10544
msgstr ""
10545
10546
#: en/help_topics/conflict-types.txt:53
10547
msgid ""
10548
"Note that this is the default action when a single file is involved so you "
10549
"can\n"
10550
"simply use::"
10551
msgstr ""
10552
10553
#: en/help_topics/conflict-types.txt:56
10554
msgid " ``bzr resolve FILE``"
10555
msgstr ""
10556
10557
#: en/help_topics/conflict-types.txt:58
10558
msgid "See ``bzr help resolve`` for more details."
10559
msgstr ""
10560
10561
#: en/help_topics/conflict-types.txt:60
10562
msgid ""
10563
"Text conflicts\n"
10564
"--------------"
10565
msgstr ""
10566
10567
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10568
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10569
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10570
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10571
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10572
msgid "Typical message::"
10573
msgstr ""
10574
10575
#: en/help_topics/conflict-types.txt:65
10576
msgid " Text conflict in FILE"
10577
msgstr ""
10578
10579
#: en/help_topics/conflict-types.txt:67
10580
msgid ""
10581
"These are produced when a text merge cannot completely reconcile two sets "
10582
"of\n"
10583
"text changes. Bazaar will emit files for each version with the extensions\n"
10584
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10585
"tree,\n"
10586
"i.e. the tree that you are merging changes into. OTHER is the version that "
10587
"you\n"
10588
"are merging into the target. BASE is an older version that is used as a "
10589
"basis\n"
10590
"for comparison."
10591
msgstr ""
10592
10593
#: en/help_topics/conflict-types.txt:74
10594
msgid ""
10595
"In the main copy of the file, Bazaar will include all the changes that it\n"
10596
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10597
"\"herringbone\" markers like ``<<<<<<<``."
10598
msgstr ""
10599
10600
#: en/help_topics/conflict-types.txt:78
10601
msgid ""
10602
"Say the initial text is \"The project leader released it.\", and THIS "
10603
"modifies it\n"
10604
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10605
"leader\n"
10606
"released Bazaar.\" A conflict would look like this::"
10607
msgstr ""
10608
10609
#: en/help_topics/conflict-types.txt:82
10610
msgid ""
10611
" <<<<<<< TREE\n"
10612
" Martin Pool released it.\n"
10613
" =======\n"
10614
" The project leader released Bazaar.\n"
10615
" >>>>>>> MERGE-SOURCE"
10616
msgstr ""
10617
10618
#: en/help_topics/conflict-types.txt:88
10619
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10620
msgstr ""
10621
10622
#: en/help_topics/conflict-types.txt:90
10623
msgid ""
10624
"You can handle text conflicts either by editing the main copy of the file,\n"
10625
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10626
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10627
"set of changes over the other (but see below when you encounter these\n"
10628
"cases). More often, the two sets of changes must be intelligently combined."
10629
msgstr ""
10630
10631
#: en/help_topics/conflict-types.txt:96
10632
msgid ""
10633
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10634
"you are done editing, the file should look like it never had a conflict, and "
10635
"be\n"
10636
"ready to commit."
10637
msgstr ""
10638
10639
#: en/help_topics/conflict-types.txt:100
10640
msgid ""
10641
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10642
"Bazaar will auto-detect which conflicts you have resolved."
10643
msgstr ""
10644
10645
#: en/help_topics/conflict-types.txt:103
10646
msgid ""
10647
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10648
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10649
"working tree."
10650
msgstr ""
10651
10652
#: en/help_topics/conflict-types.txt:107
10653
msgid ""
10654
"\n"
10655
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10656
"resolve`` with one of the following actions:"
10657
msgstr ""
10658
10659
#: en/help_topics/conflict-types.txt:111
10660
msgid ""
10661
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10662
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10663
msgstr ""
10664
10665
#: en/help_topics/conflict-types.txt:114
10666
msgid ""
10667
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10668
"modifications will be taken into account."
10669
msgstr ""
10670
10671
#: en/help_topics/conflict-types.txt:117
10672
msgid ""
10673
"Content conflicts\n"
10674
"-----------------"
10675
msgstr ""
10676
10677
#: en/help_topics/conflict-types.txt:122
10678
msgid " Contents conflict in FILE"
10679
msgstr ""
10680
10681
#: en/help_topics/conflict-types.txt:124
10682
msgid ""
10683
"This conflict happens when there are conflicting changes in the working "
10684
"tree\n"
10685
"and the merge source, but the conflicted items are not text files. They "
10686
"may\n"
10687
"be binary files, or symlinks, or directories. It can even happen with "
10688
"files\n"
10689
"that are deleted on one side, and modified on the other."
10690
msgstr ""
10691
10692
#: en/help_topics/conflict-types.txt:129
10693
msgid ""
10694
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10695
"be\n"
10696
"regular files, symlinks or directories). But it will not include a \"main "
10697
"copy\"\n"
10698
"of the file with herringbone conflict markers. It will appear that the "
10699
"\"main\n"
10700
"copy\" has been renamed to THIS or OTHER."
10701
msgstr ""
10702
10703
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10704
msgid ""
10705
"To resolve that kind of conflict, you should rebuild FILE from either "
10706
"version\n"
10707
"or a combination of both."
10708
msgstr ""
10709
10710
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10711
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10712
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10713
#: en/help_topics/conflict-types.txt:361
10714
msgid "``bzr resolve`` recognizes the following actions:"
10715
msgstr ""
10716
10717
#: en/help_topics/conflict-types.txt:139
10718
msgid ""
10719
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10720
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10721
"* ``--action=done`` will just mark the conflict as resolved."
10722
msgstr ""
10723
10724
#: en/help_topics/conflict-types.txt:143
10725
msgid ""
10726
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10727
"and\n"
10728
"``.OTHER`` files if they are still present in the working tree."
10729
msgstr ""
10730
10731
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10732
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10733
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10734
#: en/help_topics/conflict-types.txt:369
10735
msgid ""
10736
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10737
msgstr ""
10738
10739
#: en/help_topics/conflict-types.txt:148
10740
msgid ""
10741
"Tag conflicts\n"
10742
"-------------"
10743
msgstr ""
10744
10745
#: en/help_topics/conflict-types.txt:153
10746
msgid ""
10747
" Conflicting tags:\n"
10748
" version-0.1"
10749
msgstr ""
10750
10751
#: en/help_topics/conflict-types.txt:156
10752
msgid ""
10753
"When pulling from or pushing to another branch, Bazaar informs you about "
10754
"tags\n"
10755
"that conflict between the two branches; that is the same tag points to two\n"
10756
"different revisions. You need not resolve these conflicts, but subsequent\n"
10757
"uses of pull or push will result in the same message."
10758
msgstr ""
10759
10760
#: en/help_topics/conflict-types.txt:161
10761
msgid ""
10762
"To resolve the conflict, you must apply the correct tags to either the "
10763
"target\n"
10764
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10765
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10766
"target branch's tags match the source branch, then in the target branch do\n"
10767
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10768
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10769
"source\n"
10770
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10771
"favor of the target branch, you need to similarly use ``tag --force`` in "
10772
"the\n"
10773
"source branch. (Note that pulling or pushing using --overwrite will "
10774
"overwrite\n"
10775
"all tags as well.)"
10776
msgstr ""
10777
10778
#: en/help_topics/conflict-types.txt:172
10779
msgid ""
10780
"Duplicate paths\n"
10781
"---------------"
10782
msgstr ""
10783
10784
#: en/help_topics/conflict-types.txt:177
10785
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10786
msgstr ""
10787
10788
#: en/help_topics/conflict-types.txt:179
10789
msgid ""
10790
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10791
"already been used. The existing file will be renamed to \"FILE.moved\". "
10792
msgstr ""
10793
10794
#: en/help_topics/conflict-types.txt:187
10795
msgid ""
10796
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10797
"FILE``,\n"
10798
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10799
"* ``--action=done`` will just mark the conflict as resolved."
10800
msgstr ""
10801
10802
#: en/help_topics/conflict-types.txt:191
10803
msgid ""
10804
"Note that you must get rid of FILE.moved before using ``--action=done``."
10805
msgstr ""
10806
10807
#: en/help_topics/conflict-types.txt:195
10808
msgid ""
10809
"Unversioned parent\n"
10810
"------------------"
10811
msgstr ""
10812
10813
#: en/help_topics/conflict-types.txt:200
10814
msgid ""
10815
" Conflict because FILE is not versioned, but has versioned children."
10816
msgstr ""
10817
10818
#: en/help_topics/conflict-types.txt:202
10819
msgid ""
10820
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10821
"not\n"
10822
"versioned. This happens when the directory has been deleted in the target,\n"
10823
"but has a new child in the source, or vice versa. In this situation, "
10824
"Bazaar\n"
10825
"will version the parent directory as well. Resolving this issue depends\n"
10826
"very much on the particular scenario. You may wish to rename or delete "
10827
"either\n"
10828
"the file or the directory. When you are satisfied, you can run \"bzr "
10829
"resolve\n"
10830
"FILE\" to mark the conflict as resolved."
10831
msgstr ""
10832
10833
#: en/help_topics/conflict-types.txt:210
10834
msgid ""
10835
"Missing parent\n"
10836
"--------------"
10837
msgstr ""
10838
10839
#: en/help_topics/conflict-types.txt:215
10840
msgid " Conflict adding files to FILE. Created directory."
10841
msgstr ""
10842
10843
#: en/help_topics/conflict-types.txt:217
10844
msgid ""
10845
"This happens when a directory has been deleted in the target, but has new\n"
10846
"children in the source. This is similar to the \"unversioned parent\" "
10847
"conflict,\n"
10848
"except that the parent directory does not *exist*, instead of just being\n"
10849
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10850
"Resolving this issue depends very much on the particular scenario."
10851
msgstr ""
10852
10853
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10854
msgid ""
10855
"To resolve that kind of conflict, you should either remove or rename the\n"
10856
"children or the directory or a combination of both."
10857
msgstr ""
10858
10859
#: en/help_topics/conflict-types.txt:228
10860
msgid ""
10861
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10862
" children,\n"
10863
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10864
"children\n"
10865
" and restoring the directory,\n"
10866
"* ``--action=done`` will just mark the conflict as resolved."
10867
msgstr ""
10868
10869
#: en/help_topics/conflict-types.txt:236
10870
msgid ""
10871
"Deleting parent\n"
10872
"---------------"
10873
msgstr ""
10874
10875
#: en/help_topics/conflict-types.txt:241
10876
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10877
msgstr ""
10878
10879
#: en/help_topics/conflict-types.txt:243
10880
msgid ""
10881
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10882
"source, but has new children in the target (either because a directory\n"
10883
"deletion is merged or because the merge introduce new children). Bazaar\n"
10884
"will retain the directory. Resolving this issue depends very much on the\n"
10885
"particular scenario."
10886
msgstr ""
10887
10888
#: en/help_topics/conflict-types.txt:254
10889
msgid ""
10890
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10891
"directory,"
10892
msgstr ""
10893
10894
#: en/help_topics/conflict-types.txt:256
10895
msgid ""
10896
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10897
" children,"
10898
msgstr ""
10899
10900
#: en/help_topics/conflict-types.txt:259
10901
msgid "* ``--action=done`` will just mark the conflict as resolved."
10902
msgstr ""
10903
10904
#: en/help_topics/conflict-types.txt:261
10905
msgid ""
10906
"Note that when merging a directory deletion, if unversioned files are\n"
10907
"present, they become potential orphans has they don't have a directory\n"
10908
"parent anymore."
10909
msgstr ""
10910
10911
#: en/help_topics/conflict-types.txt:265
10912
msgid ""
10913
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10914
"setting the ``bzr.transform.orphan_policy`` configuration option."
10915
msgstr ""
10916
10917
#: en/help_topics/conflict-types.txt:268
10918
msgid "There are two possible values for this option:"
10919
msgstr ""
10920
10921
#: en/help_topics/conflict-types.txt:270
10922
msgid ""
10923
"* ``conflict`` (the default): will leave the orphans in place and\n"
10924
" generate a conflicts,"
10925
msgstr ""
10926
10927
#: en/help_topics/conflict-types.txt:273
10928
msgid ""
10929
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10930
"root\n"
10931
" of the working tree with names like ``<file>.~#~``."
10932
msgstr ""
10933
10934
#: en/help_topics/conflict-types.txt:278
10935
msgid ""
10936
"Path conflict\n"
10937
"-------------"
10938
msgstr ""
10939
10940
#: en/help_topics/conflict-types.txt:283
10941
msgid " Path conflict: PATH1 / PATH2"
10942
msgstr ""
10943
10944
#: en/help_topics/conflict-types.txt:285
10945
msgid ""
10946
"This happens when the source and target have each modified the name or "
10947
"parent\n"
10948
"directory of a file. Bazaar will use the path elements from the source."
10949
msgstr ""
10950
10951
#: en/help_topics/conflict-types.txt:288
10952
msgid ""
10953
"To resolve that kind of conflict, you just have to decide what name should "
10954
"be\n"
10955
"retained for the file involved."
10956
msgstr ""
10957
10958
#: en/help_topics/conflict-types.txt:293
10959
msgid ""
10960
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10961
" issuing ``bzr mv PATH2 PATH1``,\n"
10962
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10963
"``PATH2``,\n"
10964
"* ``--action=done`` will just mark the conflict as resolved."
10965
msgstr ""
10966
10967
#: en/help_topics/conflict-types.txt:300
10968
msgid ""
10969
"Parent loop\n"
10970
"-----------"
10971
msgstr ""
10972
10973
#: en/help_topics/conflict-types.txt:305
10974
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10975
msgstr ""
10976
10977
#: en/help_topics/conflict-types.txt:307
10978
msgid ""
10979
"This happens when the source and the target have each moved directories, so\n"
10980
"that, if the change could be applied, a directory would be contained by "
10981
"itself.\n"
10982
"For example::"
10983
msgstr ""
10984
10985
#: en/help_topics/conflict-types.txt:311
10986
msgid ""
10987
" $ bzr init\n"
10988
" $ bzr mkdir white\n"
10989
" $ bzr mkdir black\n"
10990
" $ bzr commit -m \"BASE\"\n"
10991
" $ bzr branch . ../other\n"
10992
" $ bzr mv white black\n"
10993
" $ bzr commit -m \"THIS\"\n"
10994
" $ bzr mv ../other/black ../other/white\n"
10995
" $ bzr commit ../other -m \"OTHER\"\n"
10996
" $ bzr merge ../other"
10997
msgstr ""
10998
10999
#: en/help_topics/conflict-types.txt:322
11000
msgid ""
11001
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11002
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11003
"name should be retained for the directories involved."
11004
msgstr ""
11005
11006
#: en/help_topics/conflict-types.txt:328
11007
msgid ""
11008
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11009
"\n"
11010
" in ``black``,\n"
11011
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11012
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11013
"* ``--action=done`` will just mark the conflict as resolved."
11014
msgstr ""
11015
11016
#: en/help_topics/conflict-types.txt:336
11017
msgid ""
11018
"Non-directory parent\n"
11019
"--------------------"
11020
msgstr ""
11021
11022
#: en/help_topics/conflict-types.txt:341
11023
msgid ""
11024
" Conflict: foo.new is not a directory, but has files in it.\n"
11025
" Created directory."
11026
msgstr ""
11027
11028
#: en/help_topics/conflict-types.txt:344
11029
msgid ""
11030
"This happens when one side has added files to a directory, and the other "
11031
"side\n"
11032
"has changed the directory into a file or symlink. For example::"
11033
msgstr ""
11034
11035
#: en/help_topics/conflict-types.txt:347
11036
msgid ""
11037
" $ bzr init\n"
11038
" $ bzr mkdir foo\n"
11039
" $ bzr commit -m \"BASE\"\n"
11040
" $ bzr branch . ../other\n"
11041
" $ rmdir foo\n"
11042
" $ touch foo\n"
11043
" $ bzr commit -m \"THIS\"\n"
11044
" $ bzr mkdir ../other/foo/bar\n"
11045
" $ bzr commit ../other -m \"OTHER\"\n"
11046
" $ bzr merge ../other"
11047
msgstr ""
11048
11049
#: en/help_topics/conflict-types.txt:358
11050
msgid ""
11051
"To resolve that kind of conflict, you have to decide what name should be\n"
11052
"retained for the file, directory or symlink involved."
11053
msgstr ""
11054
11055
#: en/help_topics/conflict-types.txt:363
11056
msgid ""
11057
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11058
" ``bzr add foo``,\n"
11059
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11060
" ``bzr mv foo.new foo``,\n"
11061
"* ``--action=done`` will just mark the conflict as resolved."
11062
msgstr ""
11063
11064
#: en/help_topics/conflict-types.txt:371
11065
msgid ""
11066
"MalformedTransform\n"
11067
"------------------"
11068
msgstr ""
11069
11070
#: en/help_topics/conflict-types.txt:374
11071
msgid ""
11072
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11073
"exception. This means that Bazaar encountered a filesystem conflict that it "
11074
"was\n"
11075
"unable to resolve. This usually indicates a bug. Please let us know if "
11076
"you\n"
11077
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11078
msgstr ""
11079
11080
#: en/help_topics/content-filters.txt:1
11081
msgid ""
11082
"Content Filters\n"
11083
"==============="
11084
msgstr ""
11085
11086
#: en/help_topics/content-filters.txt:4
11087
msgid ""
11088
"Content formats\n"
11089
"---------------"
11090
msgstr ""
11091
11092
#: en/help_topics/content-filters.txt:7
11093
msgid ""
11094
"Bazaar's content filtering allows you to store files in a different\n"
11095
"format from the copy in your working tree. This lets you, or your\n"
11096
"co-developers, use Windows development tools that expect CRLF files\n"
11097
"on projects that use other line-ending conventions. Among other things,\n"
11098
"content filters also let Unix developers more easily work on projects\n"
11099
"using Windows line-ending conventions, keyword expansion/compression,\n"
11100
"and trailing spaces on lines in text files to be implicitly stripped\n"
11101
"when committed."
11102
msgstr ""
11103
11104
#: en/help_topics/content-filters.txt:16
11105
msgid "To generalize, there are two content formats supported by Bazaar:"
11106
msgstr ""
11107
11108
#: en/help_topics/content-filters.txt:18
11109
msgid ""
11110
"* a canonical format - how files are stored internally\n"
11111
"* a convenience format - how files are created in a working tree."
11112
msgstr ""
11113
11114
#: en/help_topics/content-filters.txt:21
11115
msgid ""
11116
"\n"
11117
"Format conversion\n"
11118
"-----------------"
11119
msgstr ""
11120
11121
#: en/help_topics/content-filters.txt:25
11122
msgid ""
11123
"The conversion between these formats is done by content filters.\n"
11124
"A content filter has two parts:"
11125
msgstr ""
11126
11127
#: en/help_topics/content-filters.txt:28
11128
msgid ""
11129
"* a read converter - converts from convenience to canonical format\n"
11130
"* a write converter - converts from canonical to convenience format."
11131
msgstr ""
11132
11133
#: en/help_topics/content-filters.txt:31
11134
msgid ""
11135
"Many of these converters will provide *round-trip* conversion,\n"
11136
"i.e. applying the read converter followed by the write converter\n"
11137
"gives back the original content. However, others may provide an\n"
11138
"asymmetric conversion. For example, a read converter might strip\n"
11139
"trailing whitespace off lines in source code while the matching\n"
11140
"write converter might pass content through unchanged."
11141
msgstr ""
11142
11143
#: en/help_topics/content-filters.txt:38
11144
msgid ""
11145
"\n"
11146
"Enabling content filters\n"
11147
"------------------------"
11148
msgstr ""
11149
11150
#: en/help_topics/content-filters.txt:42
11151
msgid ""
11152
"Content filters are typically provided by plugins, so the first step\n"
11153
"in using them is to install the relevant plugins and read their\n"
11154
"documentation. Some plugins may be very specific about which files\n"
11155
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11156
"In other cases, the plugin may leave it in the user's hands to\n"
11157
"define which files are to be filtered. This is typically done\n"
11158
"using rule-based preferences. See ``bzr help rules`` for general\n"
11159
"information about defining these."
11160
msgstr ""
11161
11162
#: en/help_topics/content-filters.txt:51
11163
msgid ""
11164
"\n"
11165
"Impact on commands\n"
11166
"------------------"
11167
msgstr ""
11168
11169
#: en/help_topics/content-filters.txt:55
11170
msgid ""
11171
"Read converters are only applied to commands that read content from\n"
11172
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11173
"will apply read converters to files in the working tree, then compare\n"
11174
"the results to the content last committed."
11175
msgstr ""
11176
11177
#: en/help_topics/content-filters.txt:60
11178
msgid ""
11179
"Write converters are only applied by commands that **create files in a\n"
11180
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11181
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11182
"respectively."
11183
msgstr ""
11184
11185
#: en/help_topics/content-filters.txt:65
11186
msgid ""
11187
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11188
"comitting files. If this makes sense for a given plugin providing\n"
11189
"a content filter, the plugin can usually achieve this effect by using a\n"
11190
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11191
"for more information on hooks."
11192
msgstr ""
11193
11194
#: en/help_topics/content-filters.txt:71
11195
msgid ""
11196
"\n"
11197
"Refreshing your working tree\n"
11198
"----------------------------"
11199
msgstr ""
11200
11201
#: en/help_topics/content-filters.txt:75
11202
msgid ""
11203
"For performance reasons, Bazaar caches the timestamps of files in\n"
11204
"a working tree, and assumes files are unchanged if their timestamps\n"
11205
"match the cached values. As a consequence, there are times when\n"
11206
"you may need to explicitly ask for content filtering to be reapplied\n"
11207
"in one or both directions, e.g. after installing or reconfiguring\n"
11208
"plugins providing it."
11209
msgstr ""
11210
11211
#: en/help_topics/content-filters.txt:82
11212
msgid "Here are some general guidelines for doing this:"
11213
msgstr ""
11214
11215
#: en/help_topics/content-filters.txt:84
11216
msgid ""
11217
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11218
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11219
" relevant read converters and compare the end result with the\n"
11220
" canonical format."
11221
msgstr ""
11222
11223
#: en/help_topics/content-filters.txt:89
11224
msgid ""
11225
" * To reapply write converters, ensure there are no local changes,\n"
11226
" delete the relevant files and run ``bzr revert`` on those files."
11227
msgstr ""
11228
11229
#: en/help_topics/content-filters.txt:92
11230
msgid ""
11231
"Note: In the future, it is likely that additional options will be added\n"
11232
"to commands to make this refreshing process faster and safer.\n"
11233
msgstr ""
11234
11235
#: en/help_topics/current-formats.txt:1
11236
msgid "Current Storage Formats"
11237
msgstr ""
11238
11239
#: en/help_topics/current-formats.txt:3
11240
msgid ""
11241
":2a:\n"
11242
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11243
" compress storage. Provides rich roots which are a one-way\n"
11244
" transition."
11245
msgstr ""
11246
11247
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11248
msgid ""
11249
"\n"
11250
"See :doc:`formats-help` for more about storage formats."
11251
msgstr ""
11252
11253
#: en/help_topics/debug-flags.txt:1
11254
msgid ""
11255
"Debug Flags\n"
11256
"==========="
11257
msgstr ""
11258
11259
#: en/help_topics/debug-flags.txt:4
11260
msgid ""
11261
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11262
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11263
msgstr ""
11264
11265
#: en/help_topics/debug-flags.txt:7
11266
msgid ""
11267
"-Dauth Trace authentication sections used.\n"
11268
"-Dbytes Print out how many bytes were transferred\n"
11269
"-Ddirstate Trace dirstate activity (verbose!)\n"
11270
"-Derror Instead of normal error handling, always print a "
11271
"traceback\n"
11272
" on error.\n"
11273
"-Devil Capture call sites that do expensive or badly-scaling\n"
11274
" operations.\n"
11275
"-Dfetch Trace history copying between repositories.\n"
11276
"-Dfilters Emit information for debugging content filtering.\n"
11277
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11278
"fetch.\n"
11279
"-Dgraph Trace graph traversal.\n"
11280
"-Dhashcache Log every time a working file is read to determine its "
11281
"hash.\n"
11282
"-Dhooks Trace hook execution.\n"
11283
"-Dhpss Trace smart protocol requests and responses.\n"
11284
"-Dhpssdetail More hpss details.\n"
11285
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11286
"-Dhttp Trace http connections, requests and responses.\n"
11287
"-Dindex Trace major index operations.\n"
11288
"-Dknit Trace knit operations.\n"
11289
"-Dlock Trace when lockdir locks are taken or released.\n"
11290
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11291
" retrying the request.\n"
11292
"-Dprogress Trace progress bar operations.\n"
11293
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11294
"-Dmerge Emit information for debugging merges.\n"
11295
"-Dno_apport Don't use apport to report crashes.\n"
11296
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11297
"-Dpack Emit information about pack operations.\n"
11298
"-Drelock Emit a message every time a branch or repository object "
11299
"is\n"
11300
" unlocked then relocked the same way.\n"
11301
"-Dsftp Trace SFTP internals.\n"
11302
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11303
"expected\n"
11304
"-Dstream Trace fetch streams.\n"
11305
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11306
"portable\n"
11307
" manner.\n"
11308
"-Dunlock Some errors during unlock are treated as warnings.\n"
11309
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11310
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11311
"appropriate\n"
11312
" for the format, even for non-local fetches.\n"
11313
msgstr ""
11314
11315
#: en/help_topics/diverged-branches.txt:1
11316
msgid ""
11317
"Diverged Branches\n"
11318
"================="
11319
msgstr ""
11320
11321
#: en/help_topics/diverged-branches.txt:4
11322
msgid ""
11323
"When Bazaar tries to push one branch onto another, it requires that the\n"
11324
"destination branch must be ready to receive the source branch. If this "
11325
"isn't\n"
11326
"the case, then we say that the branches have ``diverged``. Branches are\n"
11327
"considered diverged if the destination branch's most recent commit is one "
11328
"that\n"
11329
"has not been merged (directly or indirectly) by the source branch. To "
11330
"recover\n"
11331
"from diverged branches, one must merge the missing revisions into the "
11332
"source\n"
11333
"branch."
11334
msgstr ""
11335
11336
#: en/help_topics/diverged-branches.txt:12
11337
msgid ""
11338
"This situation commonly arises when using a centralized workflow with local\n"
11339
"commits. If someone else has committed new work to the mainline since your\n"
11340
"last pull and you have local commits that have not yet been pushed to the\n"
11341
"mainline, then your local branch and the mainline have diverged."
11342
msgstr ""
11343
11344
#: en/help_topics/diverged-branches.txt:17
11345
msgid ""
11346
"Discovering What Has Diverged\n"
11347
"-----------------------------"
11348
msgstr ""
11349
11350
#: en/help_topics/diverged-branches.txt:20
11351
msgid ""
11352
"The ``bzr missing`` command is used to find out what revisions are in "
11353
"another\n"
11354
"branch that are not present in the current branch, and vice-versa. It shows "
11355
"a\n"
11356
"summary of which extra revisions exist in each branch. If you want to see "
11357
"the\n"
11358
"precise effects of those revisions, you can use ``bzr diff --"
11359
"old=other_branch``\n"
11360
"to show the differences between other_branch and your current branch."
11361
msgstr ""
11362
11363
#: en/help_topics/diverged-branches.txt:26
11364
msgid ""
11365
"A Solution\n"
11366
"----------"
11367
msgstr ""
11368
11369
#: en/help_topics/diverged-branches.txt:29
11370
msgid ""
11371
"The solution is to merge the revisions from the mainline into your local\n"
11372
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11373
"mainline. This merge may result in conflicts if the other developer's "
11374
"changes\n"
11375
"overlap with your changes. These conflicts should be resolved before\n"
11376
"continuing. After any conflicts have been resolved, or even if there were "
11377
"no\n"
11378
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11379
"to your local branch. This requirement gives you an opportunity to test "
11380
"the\n"
11381
"resulting working tree for correctness, since the merged revisions could "
11382
"have\n"
11383
"made arbitrary changes. After testing, you should commit the merge using\n"
11384
"``bzr commit``. This clears up the diverged branches situation. Your "
11385
"local\n"
11386
"branch can now be pushed to the mainline.\n"
11387
msgstr ""
11388
11389
#: en/help_topics/eol.txt:1
11390
msgid ""
11391
"End of Line Conversion\n"
11392
"======================"
11393
msgstr ""
11394
11395
#: en/help_topics/eol.txt:4
11396
msgid ""
11397
"EOL conversion is provided as a content filter where Bazaar internally\n"
11398
"stores a canonical format but outputs a convenience format. See\n"
11399
"``bzr help content-filters`` for general information about using these."
11400
msgstr ""
11401
11402
#: en/help_topics/eol.txt:8
11403
msgid ""
11404
"Note: Content filtering is only supported in recently added formats,\n"
11405
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11406
"in a recent format. (Just setting the format on the repository\n"
11407
"is not enough.) If content filtering does not appear to be working, use\n"
11408
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11409
"or later."
11410
msgstr ""
11411
11412
#: en/help_topics/eol.txt:15
11413
msgid ""
11414
"EOL conversion needs to be enabled for selected file patterns using\n"
11415
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11416
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11417
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11418
"supported in a future verison of Bazaar."
11419
msgstr ""
11420
11421
#: en/help_topics/eol.txt:21
11422
msgid ""
11423
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11424
"(If a value is not set, ``exact`` is the default.)"
11425
msgstr ""
11426
11427
#: en/help_topics/eol.txt:24
11428
msgid ""
11429
" ========== ===================================== ======================\n"
11430
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11431
" ========== ===================================== ======================\n"
11432
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11433
" ---------- ------------------------------------- ----------------------\n"
11434
" ``lf`` ``lf`` ``lf``\n"
11435
" ---------- ------------------------------------- ----------------------\n"
11436
" ``crlf`` ``crlf`` ``lf``\n"
11437
" ---------- ------------------------------------- ----------------------\n"
11438
" ``exact`` No conversion Exactly as in file\n"
11439
" ========== ===================================== ======================"
11440
msgstr ""
11441
11442
#: en/help_topics/eol.txt:36
11443
msgid ""
11444
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11445
"byte is detected in the file."
11446
msgstr ""
11447
11448
#: en/help_topics/eol.txt:39
11449
msgid ""
11450
"For users working on a cross-platform project, here is a suggested rule\n"
11451
"to use as a starting point::"
11452
msgstr ""
11453
11454
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11455
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11456
msgid ""
11457
" [name *]\n"
11458
" eol = native"
11459
msgstr ""
11460
11461
#: en/help_topics/eol.txt:45
11462
msgid ""
11463
"If you have binary files that do not contain a null byte though, be\n"
11464
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11465
"by giving more explicit patterns earlier in the rules file. For example::"
11466
msgstr ""
11467
11468
#: en/help_topics/eol.txt:49
11469
msgid ""
11470
" [name *.png]\n"
11471
" eol = exact"
11472
msgstr ""
11473
11474
#: en/help_topics/eol.txt:55
11475
msgid ""
11476
"If your working tree is on a network drive shared by users on different\n"
11477
"operating systems, you typically want to force certain conventions for\n"
11478
"certain files. In that way, if a file is created with the wrong line\n"
11479
"endings or line endings get mixed during editing, it gets committed\n"
11480
"correctly and gets checked out correctly. For example::"
11481
msgstr ""
11482
11483
#: en/help_topics/eol.txt:61
11484
msgid ""
11485
" [name *.bat]\n"
11486
" eol = crlf"
11487
msgstr ""
11488
11489
#: en/help_topics/eol.txt:64
11490
msgid ""
11491
" [name *.sh]\n"
11492
" eol = lf"
11493
msgstr ""
11494
11495
#: en/help_topics/eol.txt:70
11496
msgid ""
11497
"If you take the care to create files with their required endings, you can\n"
11498
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11499
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11500
"introducing mixed line endings will be corrected during commit for files\n"
11501
"with those settings."
11502
msgstr ""
11503
11504
#: en/help_topics/eol.txt:76
11505
msgid ""
11506
"If you have sample test data that deliberately has text files with mixed\n"
11507
"newline conventions, you can ask for those to be left alone like this::"
11508
msgstr ""
11509
11510
#: en/help_topics/eol.txt:79
11511
msgid ""
11512
" [name test_data/]\n"
11513
" eol = exact"
11514
msgstr ""
11515
11516
#: en/help_topics/eol.txt:85
11517
msgid ""
11518
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11519
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11520
"of content analysis to detect binary files for commands like ``diff``.\n"
11521
"In the future, a ``binary = true`` rule may be added but it is not\n"
11522
"supported yet.)"
11523
msgstr ""
11524
11525
#: en/help_topics/eol.txt:91
11526
msgid ""
11527
"If you have an existing repository with text files already stored using\n"
11528
"Windows newline conventions (``crlf``), then you may want to keep using "
11529
"that\n"
11530
"convention in the repository. Forcing certain files to this convention\n"
11531
"may also help users who do not have rules configured. To do this, set\n"
11532
"``eol`` to one of the values below."
11533
msgstr ""
11534
11535
#: en/help_topics/eol.txt:97
11536
msgid ""
11537
" ============================ ======================== "
11538
"======================\n"
11539
" Value Checkout end-of-lines as Commit end-of-lines "
11540
"as\n"
11541
" ============================ ======================== "
11542
"======================\n"
11543
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11544
" ``lf`` otherwise\n"
11545
" ---------------------------- ------------------------ ----------------------"
11546
"\n"
11547
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11548
" ---------------------------- ------------------------ ----------------------"
11549
"\n"
11550
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11551
" ============================ ======================== ======================"
11552
msgstr ""
11553
11554
#: en/help_topics/eol.txt:108
11555
msgid ""
11556
"For users working on an existing project that uses Windows newline\n"
11557
"conventions in their Bazaar repository, this rule is suggested as a\n"
11558
"starting point::"
11559
msgstr ""
11560
11561
#: en/help_topics/eol.txt:112
11562
msgid ""
11563
" [name *]\n"
11564
" eol = native-with-crlf-in-repo"
11565
msgstr ""
11566
11567
#: en/help_topics/eol.txt:115
11568
msgid ""
11569
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11570
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11571
"``crlf`` and ``exact``."
11572
msgstr ""
11573
11574
#: en/help_topics/eol.txt:119
11575
msgid ""
11576
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11577
"never reject files because a given line ending or mixed line endings\n"
11578
"are found. A precommit hook should be used if you wish to validate\n"
11579
"(and not just convert) content before committing.\n"
11580
msgstr ""
11581
11582
#: en/help_topics/hidden-commands.txt:1
11583
msgid ""
11584
"added List files added in working tree.\n"
11585
"ancestry List all revisions merged into this branch.\n"
11586
"assert-fail Test reporting of assertion failures\n"
11587
"bundle-info Output interesting stats about a bundle\n"
11588
"bundle-revisions Create a merge-directive for submitting changes.\n"
11589
"cat-revision Write out metadata for a revision.\n"
11590
"dump-btree Dump the contents of a btree index file to stdout.\n"
11591
"export-pot Export command helps and error messages in po format.\n"
11592
"file-id Print file_id of a particular file or directory.\n"
11593
"file-path Print path of file_ids to a file or directory.\n"
11594
"find-merge-base Find and print a base revision for merging two "
11595
"branches.\n"
11596
"hooks Show hooks.\n"
11597
"inventory Show inventory of the current working copy or a "
11598
"revision.\n"
11599
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11600
"lookup-revision Lookup the revision-id from a revision-number\n"
11601
"merge-directive Generate a merge directive for auto-merge tools.\n"
11602
"modified List files modified in working tree.\n"
11603
"re-sign Create a digital signature for an existing revision.\n"
11604
"reference list, view and set branch locations for nested trees.\n"
11605
"relpath Show path of a file relative to root\n"
11606
"repair-workingtree Reset the working tree state file.\n"
11607
"revision-history Display the list of revision ids on a branch.\n"
11608
"revision-info Show revision number and revision id for a given "
11609
"revision\n"
11610
" identifier.\n"
11611
"rocks Statement of optimism.\n"
11612
"selftest Run internal test suite.\n"
11613
"shell-complete Show appropriate completions for context.\n"
11614
"test-script Run a shell-like test from a file.\n"
11615
"touching-revisions Return revision-ids which affected a particular file.\n"
11616
"unknowns List unknown files.\n"
11617
"wait-until-signalled Test helper for\n"
11618
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11619
msgstr ""
11620
11621
#: en/help_topics/hooks.txt:1
11622
msgid ""
11623
"\n"
11624
"Hooks\n"
11625
"====="
11626
msgstr ""
11627
11628
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11629
msgid ""
11630
"Introduction\n"
11631
"------------"
11632
msgstr ""
11633
11634
#: en/help_topics/hooks.txt:8
11635
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11636
msgstr ""
11637
11638
#: en/help_topics/hooks.txt:10
11639
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11640
msgstr ""
11641
11642
#: en/help_topics/hooks.txt:12
11643
msgid ""
11644
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11645
msgstr ""
11646
11647
#: en/help_topics/hooks.txt:14
11648
msgid ""
11649
"The class that contains each hook is given before the hooks it supplies. "
11650
"For\n"
11651
"instance, BranchHooks as the class is the hooks class for\n"
11652
"`bzrlib.branch.Branch.hooks`."
11653
msgstr ""
11654
11655
#: en/help_topics/hooks.txt:18
11656
msgid ""
11657
"Each description also indicates whether the hook runs on the client (the\n"
11658
"machine where bzr was invoked) or the server (the machine addressed by\n"
11659
"the branch URL). These may be, but are not necessarily, the same machine."
11660
msgstr ""
11661
11662
#: en/help_topics/hooks.txt:22
11663
msgid ""
11664
"Plugins (including hooks) are run on the server if all of these is true:"
11665
msgstr ""
11666
11667
#: en/help_topics/hooks.txt:24
11668
msgid ""
11669
" * The connection is via a smart server (accessed with a URL starting with\n"
11670
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11671
"\"http://\"\n"
11672
" URL when a smart server is available via HTTP)."
11673
msgstr ""
11674
11675
#: en/help_topics/hooks.txt:28
11676
msgid ""
11677
" * The hook is either server specific or part of general infrastructure "
11678
"rather\n"
11679
" than client specific code (such as commit)."
11680
msgstr ""
11681
11682
#: en/help_topics/hooks.txt:31
11683
msgid ""
11684
"\n"
11685
"BranchHooks\n"
11686
"-----------"
11687
msgstr ""
11688
11689
#: en/help_topics/hooks.txt:35
11690
msgid ""
11691
"automatic_tag_name\n"
11692
"~~~~~~~~~~~~~~~~~~"
11693
msgstr ""
11694
11695
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11696
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11697
msgid "Introduced in: 2.2"
11698
msgstr ""
11699
11700
#: en/help_topics/hooks.txt:40
11701
msgid ""
11702
"Called to determine an automatic tag name for a revision.\n"
11703
"automatic_tag_name is called with (branch, revision_id) and should\n"
11704
"return a tag name or None if no tag name could be determined. The\n"
11705
"first non-None tag name returned will be used."
11706
msgstr ""
11707
11708
#: en/help_topics/hooks.txt:45
11709
msgid ""
11710
"open\n"
11711
"~~~~"
11712
msgstr ""
11713
11714
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11715
#: en/help_topics/hooks.txt:304
11716
msgid "Introduced in: 1.8"
11717
msgstr ""
11718
11719
#: en/help_topics/hooks.txt:50
11720
msgid ""
11721
"Called with the Branch object that has been opened after a branch is\n"
11722
"opened."
11723
msgstr ""
11724
11725
#: en/help_topics/hooks.txt:53
11726
msgid ""
11727
"post_branch_init\n"
11728
"~~~~~~~~~~~~~~~~"
11729
msgstr ""
11730
11731
#: en/help_topics/hooks.txt:58
11732
msgid ""
11733
"Called after new branch initialization completes. post_branch_init is\n"
11734
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11735
"branch and checkout (both heavyweight and lightweight) will all\n"
11736
"trigger this hook."
11737
msgstr ""
11738
11739
#: en/help_topics/hooks.txt:63
11740
msgid ""
11741
"post_change_branch_tip\n"
11742
"~~~~~~~~~~~~~~~~~~~~~~"
11743
msgstr ""
11744
11745
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11746
msgid "Introduced in: 1.4"
11747
msgstr ""
11748
11749
#: en/help_topics/hooks.txt:68
11750
msgid ""
11751
"Called in bzr client and server after a change to the tip of a branch\n"
11752
"is made. post_change_branch_tip is called with a\n"
11753
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11754
"uncommit will all trigger this hook."
11755
msgstr ""
11756
11757
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11758
msgid ""
11759
"post_commit\n"
11760
"~~~~~~~~~~~"
11761
msgstr ""
11762
11763
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11764
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11765
#: en/help_topics/hooks.txt:145
11766
msgid "Introduced in: 0.15"
11767
msgstr ""
11768
11769
#: en/help_topics/hooks.txt:78
11770
msgid ""
11771
"Called in the bzr client after a commit has completed. post_commit is\n"
11772
"called with (local, master, old_revno, old_revid, new_revno,\n"
11773
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11774
"branch."
11775
msgstr ""
11776
11777
#: en/help_topics/hooks.txt:83
11778
msgid ""
11779
"post_pull\n"
11780
"~~~~~~~~~"
11781
msgstr ""
11782
11783
#: en/help_topics/hooks.txt:88
11784
msgid ""
11785
"Called after a pull operation completes. post_pull is called with a\n"
11786
"bzrlib.branch.PullResult object and only runs in the bzr client."
11787
msgstr ""
11788
11789
#: en/help_topics/hooks.txt:91
11790
msgid ""
11791
"post_push\n"
11792
"~~~~~~~~~"
11793
msgstr ""
11794
11795
#: en/help_topics/hooks.txt:96
11796
msgid ""
11797
"Called after a push operation completes. post_push is called with a\n"
11798
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11799
msgstr ""
11800
11801
#: en/help_topics/hooks.txt:99
11802
msgid ""
11803
"post_switch\n"
11804
"~~~~~~~~~~~"
11805
msgstr ""
11806
11807
#: en/help_topics/hooks.txt:104
11808
msgid ""
11809
"Called after a checkout switches branch. post_switch is called with a\n"
11810
"bzrlib.branch.SwitchHookParams."
11811
msgstr ""
11812
11813
#: en/help_topics/hooks.txt:107
11814
msgid ""
11815
"post_uncommit\n"
11816
"~~~~~~~~~~~~~"
11817
msgstr ""
11818
11819
#: en/help_topics/hooks.txt:112
11820
msgid ""
11821
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11822
"called with (local, master, old_revno, old_revid, new_revno,\n"
11823
"new_revid) where local is the local branch or None, master is the\n"
11824
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11825
"of None."
11826
msgstr ""
11827
11828
#: en/help_topics/hooks.txt:118
11829
msgid ""
11830
"pre_change_branch_tip\n"
11831
"~~~~~~~~~~~~~~~~~~~~~"
11832
msgstr ""
11833
11834
#: en/help_topics/hooks.txt:121
11835
msgid "Introduced in: 1.6"
11836
msgstr ""
11837
11838
#: en/help_topics/hooks.txt:123
11839
msgid ""
11840
"Called in bzr client and server before a change to the tip of a branch\n"
11841
"is made. pre_change_branch_tip is called with a\n"
11842
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11843
"uncommit will all trigger this hook."
11844
msgstr ""
11845
11846
#: en/help_topics/hooks.txt:128
11847
msgid ""
11848
"pre_commit\n"
11849
"~~~~~~~~~~"
11850
msgstr ""
11851
11852
#: en/help_topics/hooks.txt:131
11853
msgid "Introduced in: 0.91"
11854
msgstr ""
11855
11856
#: en/help_topics/hooks.txt:133
11857
msgid ""
11858
"Called after a commit is calculated but before it is completed.\n"
11859
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11860
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11861
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11862
"TreeDelta object describing changes from the basis revision. hooks\n"
11863
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11864
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11865
"tree."
11866
msgstr ""
11867
11868
#: en/help_topics/hooks.txt:153
11869
msgid ""
11870
"transform_fallback_location\n"
11871
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11872
msgstr ""
11873
11874
#: en/help_topics/hooks.txt:156
11875
msgid "Introduced in: 1.9"
11876
msgstr ""
11877
11878
#: en/help_topics/hooks.txt:158
11879
msgid ""
11880
"Called when a stacked branch is activating its fallback locations.\n"
11881
"transform_fallback_location is called with (branch, url), and should\n"
11882
"return a new url. Returning the same url allows it to be used as-is,\n"
11883
"returning a different one can be used to cause the branch to stack on\n"
11884
"a closer copy of that fallback_location. Note that the branch cannot\n"
11885
"have history accessing methods called on it during this hook because\n"
11886
"the fallback locations have not been activated. When there are\n"
11887
"multiple hooks installed for transform_fallback_location, all are\n"
11888
"called with the url returned from the previous hook.The order is\n"
11889
"however undefined."
11890
msgstr ""
11891
11892
#: en/help_topics/hooks.txt:169
11893
msgid ""
11894
"CommandHooks\n"
11895
"------------"
11896
msgstr ""
11897
11898
#: en/help_topics/hooks.txt:172
11899
msgid ""
11900
"extend_command\n"
11901
"~~~~~~~~~~~~~~"
11902
msgstr ""
11903
11904
#: en/help_topics/hooks.txt:175
11905
msgid "Introduced in: 1.13"
11906
msgstr ""
11907
11908
#: en/help_topics/hooks.txt:177
11909
msgid ""
11910
"Called after creating a command object to allow modifications such as\n"
11911
"adding or removing options, docs etc. Called with the new\n"
11912
"bzrlib.commands.Command object."
11913
msgstr ""
11914
11915
#: en/help_topics/hooks.txt:181
11916
msgid ""
11917
"get_command\n"
11918
"~~~~~~~~~~~"
11919
msgstr ""
11920
11921
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11922
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
11923
msgid "Introduced in: 1.17"
11924
msgstr ""
11925
11926
#: en/help_topics/hooks.txt:186
11927
msgid ""
11928
"Called when creating a single command. Called with (cmd_or_None,\n"
11929
"command_name). get_command should either return the cmd_or_None\n"
11930
"parameter, or a replacement Command object that should be used for the\n"
11931
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11932
"Many users will prefer to use bzrlib.commands.register_command or\n"
11933
"plugin_cmds.register_lazy."
11934
msgstr ""
11935
11936
#: en/help_topics/hooks.txt:193
11937
msgid ""
11938
"get_missing_command\n"
11939
"~~~~~~~~~~~~~~~~~~~"
11940
msgstr ""
11941
11942
#: en/help_topics/hooks.txt:198
11943
msgid ""
11944
"Called when creating a single command if no command could be found.\n"
11945
"Called with (command_name). get_missing_command should either return\n"
11946
"None, or a Command object to be used for the command."
11947
msgstr ""
11948
11949
#: en/help_topics/hooks.txt:202
11950
msgid ""
11951
"list_commands\n"
11952
"~~~~~~~~~~~~~"
11953
msgstr ""
11954
11955
#: en/help_topics/hooks.txt:207
11956
msgid ""
11957
"Called when enumerating commands. Called with a set of cmd_name\n"
11958
"strings for all the commands found so far. This set is safe to mutate\n"
11959
"- e.g. to remove a command. list_commands should return the updated\n"
11960
"set of command names."
11961
msgstr ""
11962
11963
#: en/help_topics/hooks.txt:201
11964
msgid ""
11965
"post_command\n"
11966
"~~~~~~~~~~~~"
11967
msgstr ""
11968
11969
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
11970
msgid "Introduced in: 2.6"
11971
msgstr ""
11972
11973
#: en/help_topics/hooks.txt:206
11974
msgid "Called after executing a command. Called with the command object."
11975
msgstr ""
11976
11977
#: en/help_topics/hooks.txt:208
11978
msgid ""
11979
"pre_command\n"
11980
"~~~~~~~~~~~"
11981
msgstr ""
11982
11983
#: en/help_topics/hooks.txt:213
11984
msgid "Called prior to executing a command. Called with the command object."
11985
msgstr ""
11986
11987
#: en/help_topics/hooks.txt:212
11988
msgid ""
11989
"_ConfigHooks\n"
11990
"------------"
11991
msgstr ""
11992
11993
#: en/help_topics/hooks.txt:215
11994
msgid ""
11995
"get\n"
11996
"~~~"
11997
msgstr ""
11998
11999
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12000
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12001
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12002
#: en/help_topics/hooks.txt:443
12003
msgid "Introduced in: 2.4"
12004
msgstr ""
12005
12006
#: en/help_topics/hooks.txt:220
12007
msgid ""
12008
"Invoked when a config option is read. The signature is (stack, name,\n"
12009
"value)."
12010
msgstr ""
12011
12012
#: en/help_topics/hooks.txt:223
12013
msgid ""
12014
"load\n"
12015
"~~~~"
12016
msgstr ""
12017
12018
#: en/help_topics/hooks.txt:228
12019
msgid "Invoked when a config store is loaded. The signature is (store)."
12020
msgstr ""
12021
12022
#: en/help_topics/hooks.txt:230
12023
msgid ""
12024
"remove\n"
12025
"~~~~~~"
12026
msgstr ""
12027
12028
#: en/help_topics/hooks.txt:235
12029
msgid ""
12030
"Invoked when a config option is removed. The signature is (stack,\n"
12031
"name)."
12032
msgstr ""
12033
12034
#: en/help_topics/hooks.txt:238
12035
msgid ""
12036
"save\n"
12037
"~~~~"
12038
msgstr ""
12039
12040
#: en/help_topics/hooks.txt:243
12041
msgid "Invoked when a config store is saved. The signature is (store)."
12042
msgstr ""
12043
12044
#: en/help_topics/hooks.txt:245
12045
msgid ""
12046
"set\n"
12047
"~~~"
12048
msgstr ""
12049
12050
#: en/help_topics/hooks.txt:250
12051
msgid ""
12052
"Invoked when a config option is set. The signature is (stack, name,\n"
12053
"value)."
12054
msgstr ""
12055
12056
#: en/help_topics/hooks.txt:253
12057
msgid ""
12058
"ControlDirHooks\n"
12059
"---------------"
12060
msgstr ""
12061
12062
#: en/help_topics/hooks.txt:256
12063
msgid ""
12064
"post_repo_init\n"
12065
"~~~~~~~~~~~~~~"
12066
msgstr ""
12067
12068
#: en/help_topics/hooks.txt:261
12069
msgid ""
12070
"Invoked after a repository has been initialized. post_repo_init is\n"
12071
"called with a bzrlib.controldir.RepoInitHookParams."
12072
msgstr ""
12073
12074
#: en/help_topics/hooks.txt:264
12075
msgid ""
12076
"pre_open\n"
12077
"~~~~~~~~"
12078
msgstr ""
12079
12080
#: en/help_topics/hooks.txt:267
12081
msgid "Introduced in: 1.14"
12082
msgstr ""
12083
12084
#: en/help_topics/hooks.txt:269
12085
msgid ""
12086
"Invoked before attempting to open a ControlDir with the transport that\n"
12087
"the open will use."
12088
msgstr ""
12089
12090
#: en/help_topics/hooks.txt:272
12091
msgid ""
12092
"InfoHooks\n"
12093
"---------"
12094
msgstr ""
12095
12096
#: en/help_topics/hooks.txt:275
12097
msgid ""
12098
"repository\n"
12099
"~~~~~~~~~~"
12100
msgstr ""
12101
12102
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12103
#: en/help_topics/hooks.txt:521
12104
msgid "Introduced in: 1.15"
12105
msgstr ""
12106
12107
#: en/help_topics/hooks.txt:280
12108
msgid ""
12109
"Invoked when displaying the statistics for a repository. repository is\n"
12110
"called with a statistics dictionary as returned by the repository and\n"
12111
"a file-like object to write to."
12112
msgstr ""
12113
12114
#: en/help_topics/hooks.txt:284
12115
msgid ""
12116
"LockHooks\n"
12117
"---------"
12118
msgstr ""
12119
12120
#: en/help_topics/hooks.txt:287
12121
msgid ""
12122
"lock_acquired\n"
12123
"~~~~~~~~~~~~~"
12124
msgstr ""
12125
12126
#: en/help_topics/hooks.txt:292
12127
msgid ""
12128
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12129
msgstr ""
12130
12131
#: en/help_topics/hooks.txt:294
12132
msgid ""
12133
"lock_broken\n"
12134
"~~~~~~~~~~~"
12135
msgstr ""
12136
12137
#: en/help_topics/hooks.txt:299
12138
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12139
msgstr ""
12140
12141
#: en/help_topics/hooks.txt:301
12142
msgid ""
12143
"lock_released\n"
12144
"~~~~~~~~~~~~~"
12145
msgstr ""
12146
12147
#: en/help_topics/hooks.txt:306
12148
msgid ""
12149
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12150
msgstr ""
12151
12152
#: en/help_topics/hooks.txt:308
12153
msgid ""
12154
"MergeHooks\n"
12155
"----------"
12156
msgstr ""
12157
12158
#: en/help_topics/hooks.txt:311
12159
msgid ""
12160
"merge_file_content\n"
12161
"~~~~~~~~~~~~~~~~~~"
12162
msgstr ""
12163
12164
#: en/help_topics/hooks.txt:314
12165
msgid "Introduced in: 2.1"
12166
msgstr ""
12167
12168
#: en/help_topics/hooks.txt:316
12169
msgid ""
12170
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12171
"object when starting a merge. Should return either None or a subclass\n"
12172
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12173
"called per file that needs to be merged (including when one side has\n"
12174
"deleted the file and the other has changed it). See the\n"
12175
"AbstractPerFileMerger API docs for details on how it is used by merge."
12176
msgstr ""
12177
12178
#: en/help_topics/hooks.txt:323
12179
msgid ""
12180
"post_merge\n"
12181
"~~~~~~~~~~"
12182
msgstr ""
12183
12184
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12185
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12186
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12187
msgid "Introduced in: 2.5"
12188
msgstr ""
12189
12190
#: en/help_topics/hooks.txt:328
12191
msgid ""
12192
"Called after a merge. Receives a Merger object as the single argument.\n"
12193
"The return value is ignored."
12194
msgstr ""
12195
12196
#: en/help_topics/hooks.txt:331
12197
msgid ""
12198
"pre_merge\n"
12199
"~~~~~~~~~"
12200
msgstr ""
12201
12202
#: en/help_topics/hooks.txt:336
12203
msgid ""
12204
"Called before a merge. Receives a Merger object as the single\n"
12205
"argument."
12206
msgstr ""
12207
12208
#: en/help_topics/hooks.txt:339
12209
msgid ""
12210
"MergeDirectiveHooks\n"
12211
"-------------------"
12212
msgstr ""
12213
12214
#: en/help_topics/hooks.txt:342
12215
msgid ""
12216
"merge_request_body\n"
12217
"~~~~~~~~~~~~~~~~~~"
12218
msgstr ""
12219
12220
#: en/help_topics/hooks.txt:345
12221
msgid "Introduced in: 1.15.0"
12222
msgstr ""
12223
12224
#: en/help_topics/hooks.txt:347
12225
msgid ""
12226
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12227
"request. Callbacks must return a body. If more than one callback is\n"
12228
"registered, the output of one callback is provided to the next."
12229
msgstr ""
12230
12231
#: en/help_topics/hooks.txt:351
12232
msgid ""
12233
"MessageEditorHooks\n"
12234
"------------------"
12235
msgstr ""
12236
12237
#: en/help_topics/hooks.txt:354
12238
msgid ""
12239
"commit_message_template\n"
12240
"~~~~~~~~~~~~~~~~~~~~~~~"
12241
msgstr ""
12242
12243
#: en/help_topics/hooks.txt:357
12244
msgid "Introduced in: 1.10"
12245
msgstr ""
12246
12247
#: en/help_topics/hooks.txt:359
12248
msgid ""
12249
"Called when a commit message is being generated.\n"
12250
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12251
"and the message that is known so far. commit_message_template must\n"
12252
"return a new message to use (which could be the same as it was given).\n"
12253
"When there are multiple hooks registered for commit_message_template,\n"
12254
"they are chained with the result from the first passed into the\n"
12255
"second, and so on."
12256
msgstr ""
12257
12258
#: en/help_topics/hooks.txt:367
12259
msgid ""
12260
"set_commit_message\n"
12261
"~~~~~~~~~~~~~~~~~~"
12262
msgstr ""
12263
12264
#: en/help_topics/hooks.txt:372
12265
msgid ""
12266
"Set a fixed commit message. set_commit_message is called with the\n"
12267
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12268
"properties by editing commit.builder._revprops) and the message so\n"
12269
"far. set_commit_message must return the message to use or None if it\n"
12270
"should use the message editor as normal."
12271
msgstr ""
12272
12273
#: en/help_topics/hooks.txt:378
12274
msgid ""
12275
"MutableTreeHooks\n"
12276
"----------------"
12277
msgstr ""
12278
12279
#: en/help_topics/hooks.txt:381
12280
msgid ""
12281
"post_build_tree\n"
12282
"~~~~~~~~~~~~~~~"
12283
msgstr ""
12284
12285
#: en/help_topics/hooks.txt:386
12286
msgid ""
12287
"Called after a completely new tree is built. The hook is called with\n"
12288
"the tree as its only argument."
12289
msgstr ""
12290
12291
#: en/help_topics/hooks.txt:392
12292
msgid "Introduced in: 2.0"
12293
msgstr ""
12294
12295
#: en/help_topics/hooks.txt:394
12296
msgid ""
12297
"Called after a commit is performed on a tree. The hook is called with\n"
12298
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12299
"commit was performed on is available via the mutable_tree attribute of\n"
12300
"that object."
12301
msgstr ""
12302
12303
#: en/help_topics/hooks.txt:399
12304
msgid ""
12305
"post_transform\n"
12306
"~~~~~~~~~~~~~~"
12307
msgstr ""
12308
12309
#: en/help_topics/hooks.txt:404
12310
msgid ""
12311
"Called after a tree transform has been performed on a tree. The hook\n"
12312
"is called with the tree that is being transformed and the transform."
12313
msgstr ""
12314
12315
#: en/help_topics/hooks.txt:407
12316
msgid ""
12317
"pre_transform\n"
12318
"~~~~~~~~~~~~~"
12319
msgstr ""
12320
12321
#: en/help_topics/hooks.txt:412
12322
msgid ""
12323
"Called before a tree transform on this tree. The hook is called with\n"
12324
"the tree that is being transformed and the transform."
12325
msgstr ""
12326
12327
#: en/help_topics/hooks.txt:415
12328
msgid ""
12329
"start_commit\n"
12330
"~~~~~~~~~~~~"
12331
msgstr ""
12332
12333
#: en/help_topics/hooks.txt:420
12334
msgid ""
12335
"Called before a commit is performed on a tree. The start commit hook\n"
12336
"is able to change the tree before the commit takes place. start_commit\n"
12337
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12338
"being performed on."
12339
msgstr ""
12340
12341
#: en/help_topics/hooks.txt:425
12342
msgid ""
12343
"SmartClientHooks\n"
12344
"----------------"
12345
msgstr ""
12346
12347
#: en/help_topics/hooks.txt:428
12348
msgid ""
12349
"call\n"
12350
"~~~~"
12351
msgstr ""
12352
12353
#: en/help_topics/hooks.txt:431
12354
msgid "Introduced in: unknown"
12355
msgstr ""
12356
12357
#: en/help_topics/hooks.txt:433
12358
msgid ""
12359
"Called when the smart client is submitting a request to the smart\n"
12360
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12361
"Streaming request bodies, and responses, are not accessible."
12362
msgstr ""
12363
12364
#: en/help_topics/hooks.txt:437
12365
msgid ""
12366
"SmartServerHooks\n"
12367
"----------------"
12368
msgstr ""
12369
12370
#: en/help_topics/hooks.txt:440
12371
msgid ""
12372
"server_exception\n"
12373
"~~~~~~~~~~~~~~~~"
12374
msgstr ""
12375
12376
#: en/help_topics/hooks.txt:445
12377
msgid ""
12378
"Called by the bzr server when an exception occurs. server_exception is\n"
12379
"called with the sys.exc_info() tuple return true for the hook if the\n"
12380
"exception has been handled, in which case the server will exit\n"
12381
"normally."
12382
msgstr ""
12383
12384
#: en/help_topics/hooks.txt:450
12385
msgid ""
12386
"server_started\n"
12387
"~~~~~~~~~~~~~~"
12388
msgstr ""
12389
12390
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12391
msgid "Introduced in: 0.16"
12392
msgstr ""
12393
12394
#: en/help_topics/hooks.txt:455
12395
msgid ""
12396
"Called by the bzr server when it starts serving a directory.\n"
12397
"server_started is called with (backing urls, public url), where\n"
12398
"backing_url is a list of URLs giving the server-specific directory\n"
12399
"locations, and public_url is the public URL for the directory being\n"
12400
"served."
12401
msgstr ""
12402
12403
#: en/help_topics/hooks.txt:461
12404
msgid ""
12405
"server_started_ex\n"
12406
"~~~~~~~~~~~~~~~~~"
12407
msgstr ""
12408
12409
#: en/help_topics/hooks.txt:466
12410
msgid ""
12411
"Called by the bzr server when it starts serving a directory.\n"
12412
"server_started is called with (backing_urls, server_obj)."
12413
msgstr ""
12414
12415
#: en/help_topics/hooks.txt:469
12416
msgid ""
12417
"server_stopped\n"
12418
"~~~~~~~~~~~~~~"
12419
msgstr ""
12420
12421
#: en/help_topics/hooks.txt:474
12422
msgid ""
12423
"Called by the bzr server when it stops serving a directory.\n"
12424
"server_stopped is called with the same parameters as the\n"
12425
"server_started hook: (backing_urls, public_url)."
12426
msgstr ""
12427
12428
#: en/help_topics/hooks.txt:478
12429
msgid ""
12430
"StatusHooks\n"
12431
"-----------"
12432
msgstr ""
12433
12434
#: en/help_topics/hooks.txt:481
12435
msgid ""
12436
"post_status\n"
12437
"~~~~~~~~~~~"
12438
msgstr ""
12439
12440
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12441
msgid "Introduced in: 2.3"
12442
msgstr ""
12443
12444
#: en/help_topics/hooks.txt:486
12445
msgid ""
12446
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12447
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12448
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12449
"correspond to the command line options specified by the user for the\n"
12450
"status command. to_file is the output stream for writing."
12451
msgstr ""
12452
12453
#: en/help_topics/hooks.txt:492
12454
msgid ""
12455
"pre_status\n"
12456
"~~~~~~~~~~"
12457
msgstr ""
12458
12459
#: en/help_topics/hooks.txt:497
12460
msgid ""
12461
"Called with argument StatusHookParams before Bazaar displays the\n"
12462
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12463
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12464
"correspond to the command line options specified by the user for the\n"
12465
"status command. to_file is the output stream for writing."
12466
msgstr ""
12467
12468
#: en/help_topics/hooks.txt:503
12469
msgid ""
12470
"TransportHooks\n"
12471
"--------------"
12472
msgstr ""
12473
12474
#: en/help_topics/hooks.txt:506
12475
msgid ""
12476
"post_connect\n"
12477
"~~~~~~~~~~~~"
12478
msgstr ""
12479
12480
#: en/help_topics/hooks.txt:511
12481
msgid ""
12482
"Called after a new connection is established or a reconnect occurs.\n"
12483
"The sole argument passed is either the connected transport or smart\n"
12484
"medium instance."
12485
msgstr ""
12486
12487
#: en/help_topics/hooks.txt:515
12488
msgid ""
12489
"RioVersionInfoBuilderHooks\n"
12490
"--------------------------"
12491
msgstr ""
12492
12493
#: en/help_topics/hooks.txt:518
12494
msgid ""
12495
"revision\n"
12496
"~~~~~~~~"
12497
msgstr ""
12498
12499
#: en/help_topics/hooks.txt:523
12500
msgid ""
12501
"Invoked when adding information about a revision to the RIO stanza\n"
12502
"that is printed. revision is called with a revision object and a RIO\n"
12503
"stanza.\n"
12504
msgstr ""
12505
12506
#: en/help_topics/location-alias.txt:1
12507
msgid ""
12508
"Location aliases\n"
12509
"================"
12510
msgstr ""
12511
12512
#: en/help_topics/location-alias.txt:4
12513
msgid ""
12514
"Bazaar defines several aliases for locations associated with a branch. "
12515
"These\n"
12516
"can be used with most commands that expect a location, such as `bzr push`."
12517
msgstr ""
12518
12519
#: en/help_topics/location-alias.txt:7
12520
msgid "The aliases are::"
12521
msgstr ""
12522
12523
#: en/help_topics/location-alias.txt:9
12524
msgid ""
12525
" :bound The branch this branch is bound to, for bound branches.\n"
12526
" :parent The parent of this branch.\n"
12527
" :public The public location of this branch.\n"
12528
" :push The saved location used for `bzr push` with no arguments.\n"
12529
" :submit The submit branch for this branch.\n"
12530
" :this This branch."
12531
msgstr ""
12532
12533
#: en/help_topics/location-alias.txt:16
12534
msgid "For example, to push to the parent location::"
12535
msgstr ""
12536
12537
#: en/help_topics/location-alias.txt:18
12538
msgid " bzr push :parent\n"
12539
msgstr ""
12540
12541
#: en/help_topics/log-formats.txt:1
12542
msgid ""
12543
"Log Formats\n"
12544
"==========="
12545
msgstr ""
12546
12547
#: en/help_topics/log-formats.txt:4
12548
msgid ""
12549
"A log format controls how information about each revision is displayed.\n"
12550
"The standard log formats are compared below::"
12551
msgstr ""
12552
12553
#: en/help_topics/log-formats.txt:7
12554
msgid ""
12555
" Feature long short line\n"
12556
" ---------------------- ------------- ------------ -------------------\n"
12557
" design goal detailed view concise view 1 revision per line\n"
12558
" committer name+email name only name only\n"
12559
" author name+email - -\n"
12560
" date-time format full date only date only\n"
12561
" commit message full full top line\n"
12562
" tags yes yes yes\n"
12563
" merges indicator - yes -\n"
12564
" status/delta optional optional -\n"
12565
" diff/patch optional optional -\n"
12566
" revision-id optional optional -\n"
12567
" branch nick yes - -\n"
12568
" foreign vcs properties yes yes -\n"
12569
" preferred levels all 1 1\n"
12570
" digital signature optional - -"
12571
msgstr ""
12572
12573
#: en/help_topics/log-formats.txt:24
12574
msgid ""
12575
"The default format is ``long``. To change this, define the ``log_format``\n"
12576
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12577
msgstr ""
12578
12579
#: en/help_topics/log-formats.txt:27
12580
msgid ""
12581
" [DEFAULT]\n"
12582
" log_format = short"
12583
msgstr ""
12584
12585
#: en/help_topics/log-formats.txt:30
12586
msgid ""
12587
"Alternatively, to change the log format used for a given query, use the\n"
12588
"--long, --short or --line options."
12589
msgstr ""
12590
12591
#: en/help_topics/log-formats.txt:33
12592
msgid ""
12593
"If one of the standard log formats does not meet your needs, additional\n"
12594
"formats can be provided by plugins.\n"
12595
msgstr ""
12596
12597
#: en/help_topics/other-formats.txt:1
12598
msgid "Other Storage Formats"
12599
msgstr ""
12600
12601
#: en/help_topics/other-formats.txt:3
12602
msgid "Experimental formats are shown below."
12603
msgstr ""
12604
12605
#: en/help_topics/other-formats.txt:5
12606
msgid ""
12607
":development-colo:\n"
12608
" (native) The 2a format with experimental support for colocated\n"
12609
" branches."
12610
msgstr ""
12611
12612
#: en/help_topics/other-formats.txt:9
12613
msgid ""
12614
"\n"
12615
"Deprecated formats are shown below."
12616
msgstr ""
12617
12618
#: en/help_topics/other-formats.txt:12
12619
msgid ""
12620
":pack-0.92:\n"
12621
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12622
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12623
" by bzr < 0.92."
12624
msgstr ""
12625
12626
#: en/help_topics/patterns.txt:1
12627
msgid ""
12628
"Patterns\n"
12629
"========"
12630
msgstr ""
12631
12632
#: en/help_topics/patterns.txt:4
12633
msgid ""
12634
"Bazaar uses patterns to match files at various times. For example,\n"
12635
"the ``add`` command skips over files that match ignore patterns\n"
12636
"and preferences can be associated with files using rule patterns.\n"
12637
"The pattern syntax is described below."
12638
msgstr ""
12639
12640
#: en/help_topics/patterns.txt:9
12641
msgid ""
12642
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12643
"slash or is a regular expression, it is compared to the whole path\n"
12644
"from the branch root. Otherwise, it is compared to only the last\n"
12645
"component of the path. To match a file only in the root directory,\n"
12646
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12647
msgstr ""
12648
12649
#: en/help_topics/patterns.txt:15
12650
msgid "Patterns may include globbing wildcards such as::"
12651
msgstr ""
12652
12653
#: en/help_topics/patterns.txt:17
12654
msgid ""
12655
" ? - Matches any single character except '/'\n"
12656
" * - Matches 0 or more characters except '/'\n"
12657
" /**/ - Matches 0 or more directories in a path\n"
12658
" [a-z] - Matches a single character from within a group of characters"
12659
msgstr ""
12660
12661
#: en/help_topics/patterns.txt:22
12662
msgid ""
12663
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12664
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12665
"expression. Regular expression patterns may not include named or\n"
12666
"numbered groups."
12667
msgstr ""
12668
12669
#: en/help_topics/patterns.txt:27
12670
msgid ""
12671
"Case insensitive ignore patterns can be specified with regular expressions\n"
12672
"by using the ``i`` (for ignore case) flag in the pattern."
12673
msgstr ""
12674
12675
#: en/help_topics/patterns.txt:30
12676
msgid ""
12677
"For example, a case insensitive match for ``foo`` may be specified as::"
12678
msgstr ""
12679
12680
#: en/help_topics/patterns.txt:32
12681
msgid " RE:(?i)foo"
12682
msgstr ""
12683
12684
#: en/help_topics/patterns.txt:34
12685
msgid ""
12686
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12687
"matched by that pattern will not be ignored."
12688
msgstr ""
12689
12690
#: en/help_topics/patterns.txt:37
12691
msgid ""
12692
".. _Python regular expressions: http://docs.python.org/library/re.html"
12693
msgstr ""
12694
12695
#: en/help_topics/revisionspec.txt:1
12696
msgid "Revision Identifiers"
12697
msgstr ""
12698
12699
#: en/help_topics/revisionspec.txt:3
12700
msgid ""
12701
"A revision identifier refers to a specific state of a branch's history. It\n"
12702
"can be expressed in several ways. It can begin with a keyword to\n"
12703
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12704
"'before:yesterday' and 'submit:'."
12705
msgstr ""
12706
12707
#: en/help_topics/revisionspec.txt:8
12708
msgid ""
12709
"Alternately, it can be given without a keyword, in which case it will be\n"
12710
"checked as a revision number, a tag, a revision id, a date specification, or "
12711
"a\n"
12712
"branch specification, in that order. For example, 'date:today' could be\n"
12713
"written as simply 'today', though if you have a tag called 'today' that "
12714
"will\n"
12715
"be found first."
12716
msgstr ""
12717
12718
#: en/help_topics/revisionspec.txt:14
12719
msgid ""
12720
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12721
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12722
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12723
"or\n"
12724
"spaces around the '..')."
12725
msgstr ""
12726
12727
#: en/help_topics/revisionspec.txt:19
12728
msgid ""
12729
"Ranges are interpreted differently by different commands. To the \"log\" "
12730
"command,\n"
12731
"a range is a sequence of log messages, but to the \"diff\" command, the "
12732
"range\n"
12733
"denotes a change between revisions (and not a sequence of changes). In\n"
12734
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12735
"consider it\n"
12736
"to be open-ended, that is, they include one end but not the other. For "
12737
"example:\n"
12738
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12739
"3649,\n"
12740
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12741
"and\n"
12742
"3649, but not 3647."
12743
msgstr ""
12744
12745
#: en/help_topics/revisionspec.txt:28
12746
msgid "The keywords used as revision selection methods are the following:"
12747
msgstr ""
12748
12749
#: en/help_topics/revisionspec.txt:30
12750
msgid ""
12751
":revid:\n"
12752
"\tSelects a revision using the revision id.\n"
12753
":submit:\n"
12754
"\tSelects a common ancestor with the submit branch.\n"
12755
":ancestor:\n"
12756
"\tSelects a common ancestor with a second branch.\n"
12757
":date:\n"
12758
"\tSelects a revision on the basis of a datestamp.\n"
12759
":branch:\n"
12760
"\tSelects the last revision of a specified branch.\n"
12761
":tag:\n"
12762
"\tSelects a revision identified by a tag name.\n"
12763
":revno:\n"
12764
"\tSelects a revision using a number.\n"
12765
":before:\n"
12766
"\tSelects the parent of the revision specified.\n"
12767
":annotate:\n"
12768
"\tSelect the revision that last modified the specified line.\n"
12769
":mainline:\n"
12770
"\tSelect mainline revision that merged the specified revision.\n"
12771
":last:\n"
12772
"\tSelects the nth revision from the end."
12773
msgstr ""
12774
12775
#: en/help_topics/revisionspec.txt:53
12776
msgid "In addition, plugins can provide other keywords."
12777
msgstr ""
12778
12779
#: en/help_topics/revisionspec.txt:55
12780
msgid "A detailed description of each keyword is given below."
12781
msgstr ""
12782
12783
#: en/help_topics/revisionspec.txt:57
12784
msgid ":revid:"
12785
msgstr ""
12786
12787
#: en/help_topics/revisionspec.txt:59
12788
msgid ""
12789
" Supply a specific revision id, that can be used to specify any\n"
12790
" revision id in the ancestry of the branch.\n"
12791
" Including merges, and pending merges.\n"
12792
" Examples::"
12793
msgstr ""
12794
12795
#: en/help_topics/revisionspec.txt:64
12796
msgid ""
12797
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12798
msgstr ""
12799
12800
#: en/help_topics/revisionspec.txt:66
12801
msgid ":submit:"
12802
msgstr ""
12803
12804
#: en/help_topics/revisionspec.txt:68
12805
msgid ""
12806
" Diffing against this shows all the changes that were made in this "
12807
"branch,\n"
12808
" and is a good predictor of what merge will do. The submit branch is\n"
12809
" used by the bundle and merge directive commands. If no submit branch\n"
12810
" is specified, the parent branch is used instead."
12811
msgstr ""
12812
12813
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12814
msgid ""
12815
" The common ancestor is the last revision that existed in both\n"
12816
" branches. Usually this is the branch point, but it could also be\n"
12817
" a revision that was merged."
12818
msgstr ""
12819
12820
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12821
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12822
#: en/help_topics/revisionspec.txt:153
12823
msgid " Examples::"
12824
msgstr ""
12825
12826
#: en/help_topics/revisionspec.txt:79
12827
msgid " $ bzr diff -r submit:"
12828
msgstr ""
12829
12830
#: en/help_topics/revisionspec.txt:81
12831
msgid ":ancestor:"
12832
msgstr ""
12833
12834
#: en/help_topics/revisionspec.txt:83
12835
msgid " Supply the path to a branch to select the common ancestor."
12836
msgstr ""
12837
12838
#: en/help_topics/revisionspec.txt:89
12839
msgid ""
12840
" This is frequently used with 'diff' to return all of the changes\n"
12841
" that your branch introduces, while excluding the changes that you\n"
12842
" have not merged from the remote branch."
12843
msgstr ""
12844
12845
#: en/help_topics/revisionspec.txt:95
12846
msgid ""
12847
" ancestor:/path/to/branch\n"
12848
" $ bzr diff -r ancestor:../../mainline/branch"
12849
msgstr ""
12850
12851
#: en/help_topics/revisionspec.txt:98
12852
msgid ":date:"
12853
msgstr ""
12854
12855
#: en/help_topics/revisionspec.txt:100
12856
msgid ""
12857
" Supply a datestamp to select the first revision that matches the date.\n"
12858
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12859
" Matches the first entry after a given date (either at midnight or\n"
12860
" at a specified time)."
12861
msgstr ""
12862
12863
#: en/help_topics/revisionspec.txt:105
12864
msgid " One way to display all the changes since yesterday would be::"
12865
msgstr ""
12866
12867
#: en/help_topics/revisionspec.txt:107
12868
msgid " bzr log -r date:yesterday.."
12869
msgstr ""
12870
12871
#: en/help_topics/revisionspec.txt:111
12872
msgid ""
12873
" date:yesterday -> select the first revision since "
12874
"yesterday\n"
12875
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12876
" August 14th, 2006 at 5:10pm."
12877
msgstr ""
12878
12879
#: en/help_topics/revisionspec.txt:115
12880
msgid ":branch:"
12881
msgstr ""
12882
12883
#: en/help_topics/revisionspec.txt:117
12884
msgid " Supply the path to a branch to select its last revision."
12885
msgstr ""
12886
12887
#: en/help_topics/revisionspec.txt:121
12888
msgid " branch:/path/to/branch"
12889
msgstr ""
12890
12891
#: en/help_topics/revisionspec.txt:123
12892
msgid ":tag:"
12893
msgstr ""
12894
12895
#: en/help_topics/revisionspec.txt:125
12896
msgid " Tags are stored in the branch and created by the 'tag' command."
12897
msgstr ""
12898
12899
#: en/help_topics/revisionspec.txt:127
12900
msgid ":revno:"
12901
msgstr ""
12902
12903
#: en/help_topics/revisionspec.txt:129
12904
msgid ""
12905
" Use an integer to specify a revision in the history of the branch.\n"
12906
" Optionally a branch can be specified. A negative number will count\n"
12907
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12908
" one). If the negative number is larger than the branch's history, the\n"
12909
" first revision is returned.\n"
12910
" Examples::"
12911
msgstr ""
12912
12913
#: en/help_topics/revisionspec.txt:136
12914
msgid ""
12915
" revno:1 -> return the first revision of this branch\n"
12916
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12917
" the branch '/path/to/branch'\n"
12918
" revno:-1 -> The last revision in a branch.\n"
12919
" -2:http://other/branch -> The second to last revision in the\n"
12920
" remote branch.\n"
12921
" -1000000 -> Most likely the first revision, unless\n"
12922
" your history is very long."
12923
msgstr ""
12924
12925
#: en/help_topics/revisionspec.txt:145
12926
msgid ":before:"
12927
msgstr ""
12928
12929
#: en/help_topics/revisionspec.txt:147
12930
msgid ""
12931
" Supply any revision spec to return the parent of that revision. This "
12932
"is\n"
12933
" mostly useful when inspecting revisions that are not in the revision "
12934
"history\n"
12935
" of a branch."
12936
msgstr ""
12937
12938
#: en/help_topics/revisionspec.txt:151
12939
msgid ""
12940
" It is an error to request the parent of the null revision (before:0)."
12941
msgstr ""
12942
12943
#: en/help_topics/revisionspec.txt:155
12944
msgid ""
12945
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12946
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12947
" aaaa@bbbb-1234567890\n"
12948
" bzr diff -r before:1913..1913\n"
12949
" -> Find the changes between revision 1913 and its parent "
12950
"(1912).\n"
12951
" (What changes did revision 1913 introduce).\n"
12952
" This is equivalent to: bzr diff -c 1913"
12953
msgstr ""
12954
12955
#: en/help_topics/revisionspec.txt:163
12956
msgid ":annotate:"
12957
msgstr ""
12958
12959
#: en/help_topics/revisionspec.txt:165
12960
msgid ""
12961
" Select the revision that last modified the specified line. Line is\n"
12962
" specified as path:number. Path is a relative path to the file. "
12963
"Numbers\n"
12964
" start at 1, and are relative to the current version, not the last-\n"
12965
" committed version of the file."
12966
msgstr ""
12967
12968
#: en/help_topics/revisionspec.txt:170
12969
msgid ":mainline:"
12970
msgstr ""
12971
12972
#: en/help_topics/revisionspec.txt:172
12973
msgid ""
12974
" Select the revision that merged the specified revision into mainline."
12975
msgstr ""
12976
12977
#: en/help_topics/revisionspec.txt:174
12978
msgid ":last:"
12979
msgstr ""
12980
12981
#: en/help_topics/revisionspec.txt:176
12982
msgid ""
12983
" Supply a positive number to get the nth revision from the end.\n"
12984
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12985
" Examples::"
12986
msgstr ""
12987
12988
#: en/help_topics/revisionspec.txt:180
12989
msgid ""
12990
" last:1 -> return the last revision\n"
12991
" last:3 -> return the revision 2 before the end.\n"
12992
msgstr ""
12993
12994
#: en/help_topics/rules.txt:1
12995
msgid ""
12996
"Rules\n"
12997
"====="
12998
msgstr ""
12999
13000
#: en/help_topics/rules.txt:7
13001
msgid ""
13002
"Rules are defined in ini file format where the sections are file glob\n"
13003
"patterns and the contents of each section are the preferences for files\n"
13004
"matching that pattern(s). For example::"
13005
msgstr ""
13006
13007
#: en/help_topics/rules.txt:11
13008
msgid ""
13009
" [name *.bat]\n"
13010
" eol = native"
13011
msgstr ""
13012
" [name *.bat]\n"
13013
" eol = native"
13014
13015
#: en/help_topics/rules.txt:14
13016
msgid ""
13017
" [name *.html *.xml]\n"
13018
" keywords = xml_escape"
13019
msgstr ""
13020
" [name *.html *.xml]\n"
13021
" keywords = xml_escape"
13022
13023
#: en/help_topics/rules.txt:17
13024
msgid ""
13025
"Preferences like these are useful for commands and plugins wishing to\n"
13026
"provide custom behaviour for selected files. For more information on \n"
13027
"end of line conversion see :doc:`eol-help`.\n"
13028
"Keyword support is provided by the `keywords plugin\n"
13029
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13030
msgstr ""
13031
13032
#: en/help_topics/rules.txt:23
13033
msgid ""
13034
"Files\n"
13035
"-----"
13036
msgstr ""
13037
13038
#: en/help_topics/rules.txt:26
13039
msgid ""
13040
"Default rules for all branches are defined in the optional file\n"
13041
"``BZR_HOME/rules``. "
13042
msgstr ""
13043
13044
#: en/help_topics/rules.txt:29
13045
msgid ""
13046
"Rule Patterns\n"
13047
"-------------"
13048
msgstr ""
13049
13050
#: en/help_topics/rules.txt:32
13051
msgid ""
13052
"Patterns are ordered and searching stops as soon as one matches.\n"
13053
"As a consequence, more explicit patterns should be placed towards\n"
13054
"the top of the file. Rule patterns use exactly the same conventions\n"
13055
"as ignore patterns. See :doc:`patterns-help` for details."
13056
msgstr ""
13057
13058
#: en/help_topics/rules.txt:37
13059
msgid ".. note::"
13060
msgstr ""
13061
13062
#: en/help_topics/rules.txt:39
13063
msgid ""
13064
" Patterns containing square brackets or spaces should be\n"
13065
" surrounded in quotes to ensure they are correctly parsed.\n"
13066
msgstr ""
13067
13068
#: en/help_topics/topics.txt:1
13069
msgid ""
13070
"authentication Information on configuring authentication\n"
13071
"basic Basic commands\n"
13072
"branches Information on what a branch is\n"
13073
"bugs Bug tracker settings\n"
13074
"checkouts Information on what a checkout is\n"
13075
"commands Basic help for all commands\n"
13076
"configuration Details on the configuration settings available\n"
13077
"conflict-types Types of conflicts and what to do about them\n"
13078
"content-filters Conversion of content into/from working trees\n"
13079
"criss-cross Information on criss-cross merging\n"
13080
"current-formats Current storage formats\n"
13081
"debug-flags Options to show or record debug information\n"
13082
"diverged-branches How to fix diverged branches\n"
13083
"env-variables Environment variable names and values\n"
13084
"eol Information on end-of-line handling\n"
13085
"files Information on configuration and log files\n"
13086
"formats Information on choosing a storage format\n"
13087
"global-options Options that control how Bazaar runs\n"
13088
"hidden-commands All hidden commands\n"
13089
"hooks Points at which custom processing can be added\n"
13090
"launchpad Using Bazaar with Launchpad.net\n"
13091
"location-alias Aliases for remembered locations\n"
13092
"log-formats Details on the logging formats available\n"
13093
"other-formats Experimental and deprecated storage formats\n"
13094
"patterns Information on the pattern syntax\n"
13095
"repositories Basic information on shared repositories.\n"
13096
"revisionspec Explain how to use --revision\n"
13097
"rules Information on defining rule-based preferences\n"
13098
"standalone-trees Information on what a standalone tree is\n"
13099
"standard-options Options that can be used with any command\n"
13100
"status-flags Help on status flags\n"
13101
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13102
"topics Topics list\n"
13103
"url-special-chars Special character handling in URLs\n"
13104
"urlspec Supported transport protocols\n"
13105
"working-trees Information on working trees\n"
13106
msgstr ""
13107
13108
#: en/help_topics/url-special-chars.txt:1
13109
msgid ""
13110
"Special character handling in URLs\n"
13111
"=================================="
13112
msgstr ""
13113
13114
#: en/help_topics/url-special-chars.txt:4
13115
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13116
msgstr ""
13117
13118
#: en/help_topics/url-special-chars.txt:6
13119
msgid " * Fully qualified URLs"
13120
msgstr ""
13121
13122
#: en/help_topics/url-special-chars.txt:8
13123
msgid " * File system paths, relative or absolute"
13124
msgstr ""
13125
13126
#: en/help_topics/url-special-chars.txt:10
13127
msgid ""
13128
"Internally bzr treats all locations as URLs. For any file system paths\n"
13129
"that are specified it will automatically determine the appropriate URL\n"
13130
"representation, and escape special characters where necessary."
13131
msgstr ""
13132
13133
#: en/help_topics/url-special-chars.txt:14
13134
msgid ""
13135
"There are a few characters which have special meaning in URLs and need "
13136
"careful\n"
13137
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13138
"value in URLs. Any non-ASCII characters in a file path will automatically "
13139
"be\n"
13140
"urlencoded when the path is converted to a URL."
13141
msgstr ""
13142
13143
#: en/help_topics/url-special-chars.txt:19
13144
msgid ""
13145
"URLs represent non-ASCII characters in an encoding defined by the server, "
13146
"but\n"
13147
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13148
"be\n"
13149
"generous in what it accepts as a URL and to print them in a way that\n"
13150
"will be readable."
13151
msgstr ""
13152
13153
#: en/help_topics/url-special-chars.txt:24
13154
msgid ""
13155
"For example, if you have a directory named '/tmp/%2False' these are all "
13156
"valid\n"
13157
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13158
"slash)::"
13159
msgstr ""
13160
13161
#: en/help_topics/url-special-chars.txt:27
13162
msgid ""
13163
" cd /tmp\n"
13164
" bzr log /tmp/%2False\n"
13165
" bzr log %2False\n"
13166
" bzr log file:///tmp/%252False\n"
13167
" bzr log file://localhost/tmp/%252False\n"
13168
" bzr log file:%252False"
13169
msgstr ""
13170
" cd /tmp\n"
13171
" bzr log /tmp/%2False\n"
13172
" bzr log %2False\n"
13173
" bzr log file:///tmp/%252False\n"
13174
" bzr log file://localhost/tmp/%252False\n"
13175
" bzr log file:%252False"
13176
13177
#: en/help_topics/url-special-chars.txt:34
13178
msgid "These are valid but do not refer to the same file::"
13179
msgstr ""
13180
13181
#: en/help_topics/url-special-chars.txt:36
13182
msgid ""
13183
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13184
" bzr log %252False (refers to a file called /tmp/%252False)"
13185
msgstr ""
13186
13187
#: en/help_topics/url-special-chars.txt:39
13188
msgid ""
13189
"Comma also has special meaning in URLs, because it denotes `segment "
13190
"parameters`_"
13191
msgstr ""
13192
13193
#: en/help_topics/url-special-chars.txt:41
13194
msgid ""
13195
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13196
msgstr ""
13197
13198
#: en/help_topics/url-special-chars.txt:43
13199
msgid ""
13200
"Comma is also special in any file system paths that are specified. To use a "
13201
"literal\n"
13202
"comma in a file system path, specify a URL and URL encode the comma::"
13203
msgstr ""
13204
13205
#: en/help_topics/url-special-chars.txt:46
13206
msgid ""
13207
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13208
"\"branch\" set to \"bla\"\n"
13209
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13210
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13211
"\"branch\" set to \"bla\"\n"
13212
msgstr ""
13213
13214
#: en/help_topics/urlspec.txt:1
13215
msgid "URL Identifiers"
13216
msgstr ""
13217
13218
#: en/help_topics/urlspec.txt:3
13219
msgid "Supported URL prefixes::"
13220
msgstr ""
13221
13222
#: en/help_topics/urlspec.txt:5
13223
msgid ""
13224
" aftp:// Access using active FTP.\n"
13225
" bzr:// Fast access using the Bazaar smart server.\n"
13226
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13227
" file:// Access using the standard filesystem (default)\n"
13228
" ftp:// Access using passive FTP.\n"
13229
" http:// Read-only access of branches exported on the web.\n"
13230
" https:// Read-only access of branches exported on the web using "
13231
"SSL.\n"
13232
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13233
msgstr ""
13234
13235
#: en/help_topics/urlspec.txt:14
13236
msgid "Supported modifiers::"
13237
msgstr ""
13238
13239
#: en/help_topics/urlspec.txt:16
13240
msgid " gio+ Access using any GIO supported protocols."
13241
msgstr ""
13242
13243
#: en/help_topics/urlspec.txt:18
13244
msgid "Bazaar supports all of the standard parts within the URL::"
13245
msgstr ""
13246
13247
#: en/help_topics/urlspec.txt:20
13248
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13249
msgstr " <protocol>://[user[:password]@]host[:port]/[path]"
13250
13251
#: en/help_topics/urlspec.txt:22
13252
msgid "allowing URLs such as::"
13253
msgstr ""
13254
13255
#: en/help_topics/urlspec.txt:24
13256
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13257
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13258
13259
#: en/help_topics/urlspec.txt:26
13260
msgid ""
13261
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13262
"with '~' as meaning that the rest of the path should be interpreted\n"
13263
"relative to the remote user's home directory. For example if the user\n"
13264
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13265
"shell.example.com, then::"
13266
msgstr ""
13267
13268
#: en/help_topics/urlspec.txt:32
13269
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13270
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13271
13272
#: en/help_topics/urlspec.txt:34
13273
msgid "would refer to ``/home/remote/myproject/trunk``."
13274
msgstr ""
13275
13276
#: en/help_topics/urlspec.txt:36
13277
msgid ""
13278
"Many commands that accept URLs also accept location aliases too.\n"
13279
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13280
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1