« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6391
- compare with another revision
- download diff
- download tarball
- view history from revision 6391
- Committer: Patch Queue Manager
- Date: 2011-12-20 18:47:35 UTC
- mfrom: (6379.8.3 smtpconnection-config-stacks)
- Revision ID: pqm@pqm.ubuntu.com-20111220184735-nvjnbab2d88i60ca
(jelmer) Convert bzrlib.smtp_connection to use config stacks. (Jelmer
Vernooij)
Vernooij)
- files added:
- bzrlib/estimate_compressed_size.py
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files removed:
- bzrlib/help_topics/en/location-alias.txt
- files renamed:
- tools/build_mo.py => bzrlib/bzr_distutils.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- files modified:
- Makefile
added
removed
po/bzr.pot
1
# SOME DESCRIPTIVE TITLE.
2
# Copyright (C) YEAR Canonical
3
# This file is distributed under the same license as the PACKAGE package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5
#
6
#, fuzzy
7
msgid ""
8
msgstr ""
9
"Project-Id-Version: bzr\n"
10
"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
11
"POT-Creation-Date: 2011-12-08 09:21+0100\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
15
"Language: \n"
16
"MIME-Version: 1.0\n"
17
"Content-Type: text/plain; charset=CHARSET\n"
18
"Content-Transfer-Encoding: 8bit\n"
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:871
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:3173
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:3175
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:3178
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:3180
46
msgid "No new revisions to push."
47
msgstr ""
48
49
#: bzrlib/branch.py:3200
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3203
54
#, python-format
55
msgid "found error:%s"
56
msgstr ""
57
58
#: bzrlib/builtins.py:118 bzrlib/builtins.py:2868 bzrlib/workingtree.py:304
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:127
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:212
69
msgid "Display status summary."
70
msgstr ""
71
72
#: bzrlib/builtins.py:214
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:217
79
msgid ""
80
"added\n"
81
" Versioned in the working copy but not in the previous revision."
82
msgstr ""
83
84
#: bzrlib/builtins.py:220
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:224
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:229
100
msgid ""
101
"modified\n"
102
" Text has changed since the previous revision."
103
msgstr ""
104
105
#: bzrlib/builtins.py:232
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:235
112
msgid ""
113
"unknown\n"
114
" Not versioned and not matching an ignore pattern."
115
msgstr ""
116
117
#: bzrlib/builtins.py:238
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:243
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:246
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:250
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:255
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:260
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:263
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
# help of 'short' option of 'status' command
168
#: bzrlib/builtins.py:272
169
msgid "Use short status indicators."
170
msgstr ""
171
172
# help of 'versioned' option of 'status' command
173
#: bzrlib/builtins.py:274
174
msgid "Only show versioned files."
175
msgstr ""
176
177
# help of 'no-pending' option of 'status' command
178
#: bzrlib/builtins.py:276
179
msgid "Don't show pending merges."
180
msgstr ""
181
182
# help of 'no-classify' option of 'status' command
183
#: bzrlib/builtins.py:279
184
msgid "Do not mark object type using indicator."
185
msgstr ""
186
187
#: bzrlib/builtins.py:294
188
msgid "bzr status --revision takes exactly one or two revision specifiers"
189
msgstr ""
190
191
#: bzrlib/builtins.py:338 bzrlib/builtins.py:5024
192
msgid "You can only supply one of revision_id or --revision"
193
msgstr ""
194
195
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5026
196
msgid "You must supply either --revision or a revision_id"
197
msgstr ""
198
199
#: bzrlib/builtins.py:348
200
#, python-format
201
msgid "Repository %r does not support access to raw revision texts"
202
msgstr ""
203
204
#: bzrlib/builtins.py:359
205
msgid "The repository {0} contains no revision {1}."
206
msgstr ""
207
208
#: bzrlib/builtins.py:366
209
msgid "You cannot specify a NULL revision."
210
msgstr ""
211
212
#: bzrlib/builtins.py:458
213
msgid "Remove the working tree from a given branch/checkout."
214
msgstr ""
215
216
#: bzrlib/builtins.py:460
217
msgid ""
218
"Since a lightweight checkout is little more than a working tree\n"
219
"this will refuse to run against one."
220
msgstr ""
221
222
#: bzrlib/builtins.py:463
223
msgid "To re-create the working tree, use \"bzr checkout\"."
224
msgstr ""
225
226
# help of 'force' option of 'remove-tree' command
227
#: bzrlib/builtins.py:469
228
msgid "Remove the working tree even if it has uncommitted or shelved changes."
229
msgstr ""
230
231
#: bzrlib/builtins.py:483
232
msgid "No working tree to remove"
233
msgstr ""
234
235
#: bzrlib/builtins.py:485
236
msgid "You cannot remove the working tree of a remote path"
237
msgstr ""
238
239
#: bzrlib/builtins.py:494
240
msgid "You cannot remove the working tree from a lightweight checkout"
241
msgstr ""
242
243
#: bzrlib/builtins.py:534
244
msgid ""
245
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
246
"instead. Use \"--force\" if you are sure you want to reset the working tree."
247
msgstr ""
248
249
#: bzrlib/builtins.py:545
250
msgid ""
251
", the header appears corrupt, try passing -r -1 to set the state to the last "
252
"commit"
253
msgstr ""
254
255
#: bzrlib/builtins.py:549
256
msgid "failed to reset the tree state{0}"
257
msgstr ""
258
259
#: bzrlib/builtins.py:553
260
msgid "Show current revision number."
261
msgstr ""
262
263
#: bzrlib/builtins.py:555
264
msgid "This is equal to the number of revisions on this branch."
265
msgstr ""
266
267
#: bzrlib/builtins.py:568
268
msgid "--tree and --revision can not be used together"
269
msgstr ""
270
271
#: bzrlib/builtins.py:585 bzrlib/builtins.py:5808
272
msgid "Tags can only be placed on a single revision, not on a range"
273
msgstr ""
274
275
# help of 'tree' option of 'revno' command
276
#: bzrlib/builtins.py:609
277
msgid "Show revno of working tree."
278
msgstr ""
279
280
#: bzrlib/builtins.py:657
281
msgid "Add specified files or directories."
282
msgstr ""
283
284
#: bzrlib/builtins.py:659
285
msgid ""
286
"In non-recursive mode, all the named items are added, regardless\n"
287
"of whether they were previously ignored. A warning is given if\n"
288
"any of the named files are already versioned."
289
msgstr ""
290
291
#: bzrlib/builtins.py:663
292
msgid ""
293
"In recursive mode (the default), files are treated the same way\n"
294
"but the behaviour for directories is different. Directories that\n"
295
"are already versioned do not give a warning. All directories,\n"
296
"whether already versioned or not, are searched for files or\n"
297
"subdirectories that are neither versioned or ignored, and these\n"
298
"are added. This search proceeds recursively into versioned\n"
299
"directories. If no names are given '.' is assumed."
300
msgstr ""
301
302
#: bzrlib/builtins.py:671
303
msgid ""
304
"A warning will be printed when nested trees are encountered,\n"
305
"unless they are explicitly ignored."
306
msgstr ""
307
308
#: bzrlib/builtins.py:674
309
msgid ""
310
"Therefore simply saying 'bzr add' will version all files that\n"
311
"are currently unknown."
312
msgstr ""
313
314
#: bzrlib/builtins.py:677
315
msgid ""
316
"Adding a file whose parent directory is not versioned will\n"
317
"implicitly add the parent, and so on up to the root. This means\n"
318
"you should never need to explicitly add a directory, they'll just\n"
319
"get added when you add a file in the directory."
320
msgstr ""
321
322
#: bzrlib/builtins.py:682
323
msgid ""
324
"--dry-run will show which files would be added, but not actually\n"
325
"add them."
326
msgstr ""
327
328
#: bzrlib/builtins.py:685
329
msgid ""
330
"--file-ids-from will try to use the file ids from the supplied path.\n"
331
"It looks up ids trying to find a matching parent directory with the\n"
332
"same filename, and then by pure path. This option is rarely needed\n"
333
"but can be useful when adding the same logical file into two\n"
334
"branches that will be merged later (without showing the two different\n"
335
"adds as a conflict). It is also useful when merging another project\n"
336
"into a subdirectory of this one."
337
msgstr ""
338
339
#: bzrlib/builtins.py:693
340
msgid ""
341
"Any files matching patterns in the ignore list will not be added\n"
342
"unless they are explicitly mentioned."
343
msgstr ""
344
345
#: bzrlib/builtins.py:696
346
msgid ""
347
"In recursive mode, files larger than the configuration option \n"
348
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
349
"to file size."
350
msgstr ""
351
352
# help of 'no-recurse' option of 'add' command
353
#: bzrlib/builtins.py:703
354
msgid "Don't recursively add the contents of directories."
355
msgstr ""
356
357
# help of 'file-ids-from' option of 'add' command
358
#: bzrlib/builtins.py:709
359
msgid "Lookup file ids from this tree."
360
msgstr ""
361
362
#: bzrlib/builtins.py:745
363
msgid "ignored {0} matching \"{1}\"\n"
364
msgstr ""
365
366
#: bzrlib/builtins.py:750
367
msgid "Create a new versioned directory."
368
msgstr ""
369
370
#: bzrlib/builtins.py:752
371
msgid "This is equivalent to creating the directory and then adding it."
372
msgstr ""
373
374
#: bzrlib/builtins.py:767
375
#, python-format
376
msgid "added %s\n"
377
msgstr ""
378
379
#: bzrlib/builtins.py:811
380
#, python-format
381
msgid "invalid kind %r specified"
382
msgstr ""
383
384
#: bzrlib/builtins.py:848
385
msgid "Move or rename a file."
386
msgstr ""
387
388
#: bzrlib/builtins.py:850
389
msgid " bzr mv SOURCE... DESTINATION"
390
msgstr ""
391
392
#: bzrlib/builtins.py:852
393
msgid ""
394
"If the last argument is a versioned directory, all the other names\n"
395
"are moved into it. Otherwise, there must be exactly two arguments\n"
396
"and the file is changed to a new name."
397
msgstr ""
398
399
#: bzrlib/builtins.py:856
400
msgid ""
401
"If OLDNAME does not exist on the filesystem but is versioned and\n"
402
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
403
"assumes that the file has been manually moved and only updates\n"
404
"its internal inventory to reflect that change.\n"
405
"The same is valid when moving many SOURCE files to a DESTINATION."
406
msgstr ""
407
408
#: bzrlib/builtins.py:862
409
msgid "Files cannot be moved between branches."
410
msgstr ""
411
412
# help of 'after' option of 'mv' command
413
#: bzrlib/builtins.py:869
414
msgid ""
415
"Move only the bzr identifier of the file, because the file has already been "
416
"moved."
417
msgstr ""
418
419
# help of 'auto' option of 'mv' command
420
#: bzrlib/builtins.py:871
421
msgid "Automatically guess renames."
422
msgstr ""
423
424
# help of 'dry-run' option of 'mv' command
425
#: bzrlib/builtins.py:872
426
msgid "Avoid making changes when guessing renames."
427
msgstr ""
428
429
#: bzrlib/builtins.py:881
430
msgid "--dry-run requires --auto."
431
msgstr ""
432
433
#: bzrlib/builtins.py:885
434
msgid "missing file argument"
435
msgstr ""
436
437
#: bzrlib/builtins.py:889
438
msgid "can not move root of branch"
439
msgstr ""
440
441
#: bzrlib/builtins.py:895
442
msgid "Only one path may be specified to --auto."
443
msgstr ""
444
445
#: bzrlib/builtins.py:898
446
msgid "--after cannot be specified with --auto."
447
msgstr ""
448
449
#: bzrlib/builtins.py:935
450
msgid "to mv multiple files the destination must be a versioned directory"
451
msgstr ""
452
453
#: bzrlib/builtins.py:987
454
msgid "Turn this branch into a mirror of another branch."
455
msgstr ""
456
457
#: bzrlib/builtins.py:989
458
msgid ""
459
"By default, this command only works on branches that have not diverged.\n"
460
"Branches are considered diverged if the destination branch's most recent \n"
461
"commit is one that has not been merged (directly or indirectly) into the \n"
462
"parent."
463
msgstr ""
464
465
#: bzrlib/builtins.py:994
466
msgid ""
467
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
468
"from one into the other. Once one branch has merged, the other should\n"
469
"be able to pull it again."
470
msgstr ""
471
472
#: bzrlib/builtins.py:998
473
msgid ""
474
"If you want to replace your local changes and just want your branch to\n"
475
"match the remote one, use pull --overwrite. This will work even if the two\n"
476
"branches have diverged."
477
msgstr ""
478
479
#: bzrlib/builtins.py:1002
480
msgid ""
481
"If there is no default location set, the first pull will set it (use\n"
482
"--no-remember to avoid setting it). After that, you can omit the\n"
483
"location to use the default. To change the default, use --remember. The\n"
484
"value will only be saved if the remote location can be accessed."
485
msgstr ""
486
487
#: bzrlib/builtins.py:1007
488
msgid ""
489
"The --verbose option will display the revisions pulled using the log_format\n"
490
"configuration option. You can use a different format by overriding it with\n"
491
"-Olog_format=<other_format>."
492
msgstr ""
493
494
#: bzrlib/builtins.py:1011
495
msgid ""
496
"Note: The location can be specified either in the form of a branch,\n"
497
"or in the form of a path to a file containing a merge directive generated\n"
498
"with bzr send."
499
msgstr ""
500
501
# help of 'verbose' option of 'pull' command
502
#: bzrlib/builtins.py:1019
503
msgid "Show logs of pulled revisions."
504
msgstr ""
505
506
# help of 'directory' option of 'pull' command
507
#: bzrlib/builtins.py:1021
508
msgid ""
509
"Branch to pull into, rather than the one containing the working directory."
510
msgstr ""
511
512
# help of 'local' option of 'pull' command
513
#: bzrlib/builtins.py:1024
514
msgid ""
515
"Perform a local pull in a bound branch. Local pulls are not applied to the "
516
"master branch."
517
msgstr ""
518
519
#: bzrlib/builtins.py:1053
520
msgid "Need working tree for --show-base."
521
msgstr ""
522
523
#: bzrlib/builtins.py:1069
524
msgid "No pull location known or specified."
525
msgstr ""
526
527
#: bzrlib/builtins.py:1075
528
#, python-format
529
msgid "Using saved parent location: %s\n"
530
msgstr ""
531
532
#: bzrlib/builtins.py:1082 bzrlib/builtins.py:4234
533
msgid "Cannot use -r with merge directives or bundles"
534
msgstr ""
535
536
#: bzrlib/builtins.py:1123
537
msgid "Update a mirror of this branch."
538
msgstr ""
539
540
#: bzrlib/builtins.py:1125
541
msgid ""
542
"The target branch will not have its working tree populated because this\n"
543
"is both expensive, and is not supported on remote file systems."
544
msgstr ""
545
546
#: bzrlib/builtins.py:1128
547
msgid ""
548
"Some smart servers or protocols *may* put the working tree in place in\n"
549
"the future."
550
msgstr ""
551
552
#: bzrlib/builtins.py:1131
553
msgid ""
554
"This command only works on branches that have not diverged. Branches are\n"
555
"considered diverged if the destination branch's most recent commit is one\n"
556
"that has not been merged (directly or indirectly) by the source branch."
557
msgstr ""
558
559
#: bzrlib/builtins.py:1135
560
msgid ""
561
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
562
"the other branch completely, discarding its unmerged changes."
563
msgstr ""
564
565
#: bzrlib/builtins.py:1138
566
msgid ""
567
"If you want to ensure you have the different changes in the other branch,\n"
568
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
569
"After that you will be able to do a push without '--overwrite'."
570
msgstr ""
571
572
#: bzrlib/builtins.py:1142
573
msgid ""
574
"If there is no default push location set, the first push will set it (use\n"
575
"--no-remember to avoid setting it). After that, you can omit the\n"
576
"location to use the default. To change the default, use --remember. The\n"
577
"value will only be saved if the remote location can be accessed."
578
msgstr ""
579
580
#: bzrlib/builtins.py:1147
581
msgid ""
582
"The --verbose option will display the revisions pushed using the log_format\n"
583
"configuration option. You can use a different format by overriding it with\n"
584
"-Olog_format=<other_format>."
585
msgstr ""
586
587
# help of 'use-existing-dir' option of 'push' command
588
#: bzrlib/builtins.py:1161
589
msgid ""
590
"By default push will fail if the target directory exists, but does not "
591
"already have a control directory. This flag will allow push to proceed."
592
msgstr ""
593
594
# help of 'stacked' option of 'push' command
595
#: bzrlib/builtins.py:1166
596
msgid ""
597
"Create a stacked branch that references the public location of the parent "
598
"branch."
599
msgstr ""
600
601
# help of 'stacked-on' option of 'push' command
602
#: bzrlib/builtins.py:1169
603
msgid ""
604
"Create a stacked branch that refers to another branch for the commit "
605
"history. Only the work not present in the referenced branch is included in "
606
"the branch created."
607
msgstr ""
608
609
# help of 'no-tree' option of 'push' command
610
#: bzrlib/builtins.py:1177
611
msgid "Don't populate the working tree, even for protocols that support it."
612
msgstr ""
613
614
#: bzrlib/builtins.py:1221
615
msgid "Could not determine branch to refer to."
616
msgstr ""
617
618
#: bzrlib/builtins.py:1228 bzrlib/foreign.py:305
619
msgid "No push location known or specified."
620
msgstr ""
621
622
#: bzrlib/builtins.py:1232
623
#, python-format
624
msgid "Using saved push location: %s"
625
msgstr ""
626
627
#: bzrlib/builtins.py:1242
628
msgid "Create a new branch that is a copy of an existing branch."
629
msgstr ""
630
631
#: bzrlib/builtins.py:1244
632
msgid ""
633
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
634
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
635
"bar.\n"
636
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
637
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
638
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
639
"create ./foo-bar."
640
msgstr ""
641
642
#: bzrlib/builtins.py:1251
643
msgid ""
644
"To retrieve the branch as of a particular revision, supply the --revision\n"
645
"parameter, as in \"branch foo/bar -r 5\"."
646
msgstr ""
647
648
#: bzrlib/builtins.py:1254
649
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
650
msgstr ""
651
652
# help of 'no-tree' option of 'branch' command
653
#: bzrlib/builtins.py:1264
654
msgid "Create a branch without a working-tree."
655
msgstr ""
656
657
# help of 'switch' option of 'branch' command
658
#: bzrlib/builtins.py:1266
659
msgid "Switch the checkout in the current directory to the new branch."
660
msgstr ""
661
662
# help of 'stacked' option of 'branch' command
663
#: bzrlib/builtins.py:1269
664
msgid ""
665
"Create a stacked branch referring to the source branch. The new branch will "
666
"depend on the availability of the source branch for all operations."
667
msgstr ""
668
669
# help of 'standalone' option of 'branch' command
670
#: bzrlib/builtins.py:1273
671
msgid "Do not use a shared repository, even if available."
672
msgstr ""
673
674
# help of 'use-existing-dir' option of 'branch' command
675
#: bzrlib/builtins.py:1275
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
# help of 'bind' option of 'branch' command
682
#: bzrlib/builtins.py:1280
683
msgid "Bind new branch to from location."
684
msgstr ""
685
686
#: bzrlib/builtins.py:1327
687
#, python-format
688
msgid "Target directory \"%s\" already exists."
689
msgstr ""
690
691
#: bzrlib/builtins.py:1339
692
#, python-format
693
msgid "Parent of \"%s\" does not exist."
694
msgstr ""
695
696
#: bzrlib/builtins.py:1358
697
msgid "The branch {0} has no revision {1}."
698
msgstr ""
699
700
#: bzrlib/builtins.py:1368 bzrlib/push.py:51
701
#, python-format
702
msgid "Created new stacked branch referring to %s."
703
msgstr ""
704
705
#: bzrlib/builtins.py:1372
706
#, python-format
707
msgid "Branched %d revision."
708
msgid_plural "Branched %d revisions."
709
msgstr[0] ""
710
msgstr[1] ""
711
712
#: bzrlib/builtins.py:1377
713
#, python-format
714
msgid "New branch bound to %s"
715
msgstr ""
716
717
#: bzrlib/builtins.py:1382 bzrlib/builtins.py:6121
718
#, python-format
719
msgid "Switched to branch: %s"
720
msgstr ""
721
722
#: bzrlib/builtins.py:1387
723
msgid "List the branches available at the current location."
724
msgstr ""
725
726
#: bzrlib/builtins.py:1389
727
msgid ""
728
"This command will print the names of all the branches at the current\n"
729
"location."
730
msgstr ""
731
732
# help of 'recursive' option of 'branches' command
733
#: bzrlib/builtins.py:1396
734
msgid ""
735
"Recursively scan for branches rather than just looking in the specified "
736
"location."
737
msgstr ""
738
739
#: bzrlib/builtins.py:1413
740
msgid " (default)\n"
741
msgstr ""
742
743
#: bzrlib/builtins.py:1420
744
msgid "Create a new checkout of an existing branch."
745
msgstr ""
746
747
#: bzrlib/builtins.py:1422
748
msgid ""
749
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
750
"for\n"
751
"the branch found in '.'. This is useful if you have removed the working "
752
"tree\n"
753
"or if it was never created - i.e. if you pushed the branch to its current\n"
754
"location using SFTP."
755
msgstr ""
756
757
#: bzrlib/builtins.py:1427
758
msgid ""
759
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
760
"will\n"
761
"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./"
762
"bar.\n"
763
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
764
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
765
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
766
"create ./foo-bar."
767
msgstr ""
768
769
#: bzrlib/builtins.py:1434
770
msgid ""
771
"To retrieve the branch as of a particular revision, supply the --revision\n"
772
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
773
"immediately\n"
774
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
775
"old\n"
776
"code.)"
777
msgstr ""
778
779
# help of 'lightweight' option of 'checkout' command
780
#: bzrlib/builtins.py:1444
781
msgid ""
782
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
783
"the branch for every operation. Normal checkouts can perform common "
784
"operations like diff and status without such access, and also support local "
785
"commits."
786
msgstr ""
787
788
# help of 'files-from' option of 'branch' command
789
#: bzrlib/builtins.py:1451
790
msgid "Get file contents from this tree."
791
msgstr ""
792
793
# help of 'hardlink' option of 'branch' command
794
#: bzrlib/builtins.py:1453
795
msgid "Hard-link working tree files where possible."
796
msgstr ""
797
798
#: bzrlib/builtins.py:1494
799
msgid ""
800
"Show list of renamed files.\n"
801
" "
802
msgstr ""
803
804
#: bzrlib/builtins.py:1524
805
msgid "Update a working tree to a new revision."
806
msgstr ""
807
808
#: bzrlib/builtins.py:1526
809
msgid ""
810
"This will perform a merge of the destination revision (the tip of the\n"
811
"branch, or the specified revision) into the working tree, and then make\n"
812
"that revision the basis revision for the working tree. "
813
msgstr ""
814
815
#: bzrlib/builtins.py:1530
816
msgid ""
817
"You can use this to visit an older revision, or to update a working tree\n"
818
"that is out of date from its branch."
819
msgstr ""
820
821
#: bzrlib/builtins.py:1533
822
msgid ""
823
"If there are any uncommitted changes in the tree, they will be carried\n"
824
"across and remain as uncommitted changes after the update. To discard\n"
825
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
826
"with the changes brought in by the change in basis revision."
827
msgstr ""
828
829
#: bzrlib/builtins.py:1538
830
msgid ""
831
"If the tree's branch is bound to a master branch, bzr will also update\n"
832
"the branch from the master."
833
msgstr ""
834
835
#: bzrlib/builtins.py:1541
836
msgid ""
837
"You cannot update just a single file or directory, because each Bazaar\n"
838
"working tree has just a single basis revision. If you want to restore a\n"
839
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
840
"update'. If you want to restore a file to its state in a previous\n"
841
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
842
"out the old content of that file to a new location."
843
msgstr ""
844
845
#: bzrlib/builtins.py:1548
846
msgid ""
847
"The 'dir' argument, if given, must be the location of the root of a\n"
848
"working tree to update. By default, the working tree that contains the \n"
849
"current working directory is used."
850
msgstr ""
851
852
#: bzrlib/builtins.py:1564
853
msgid "bzr update --revision takes exactly one revision"
854
msgstr ""
855
856
#: bzrlib/builtins.py:1572
857
msgid "bzr update can only update a whole tree, not a file or subdirectory"
858
msgstr ""
859
860
#: bzrlib/builtins.py:1603
861
msgid "Tree is up to date at revision {0} of branch {1}"
862
msgstr ""
863
864
#: bzrlib/builtins.py:1619
865
#, python-format
866
msgid ""
867
"branch has no revision %s\n"
868
"bzr update --revision only works for a revision in the branch history"
869
msgstr ""
870
871
#: bzrlib/builtins.py:1625
872
msgid "Updated to revision {0} of branch {1}"
873
msgstr ""
874
875
#: bzrlib/builtins.py:1629
876
msgid ""
877
"Your local commits will now show as pending merges with 'bzr status', and "
878
"can be committed with 'bzr commit'."
879
msgstr ""
880
881
#: bzrlib/builtins.py:1638
882
msgid "Show information about a working tree, branch or repository."
883
msgstr ""
884
885
#: bzrlib/builtins.py:1640
886
msgid ""
887
"This command will show all known locations and formats associated to the\n"
888
"tree, branch or repository."
889
msgstr ""
890
891
#: bzrlib/builtins.py:1643
892
msgid ""
893
"In verbose mode, statistical information is included with each report.\n"
894
"To see extended statistic information, use a verbosity level of 2 or\n"
895
"higher by specifying the verbose option multiple times, e.g. -vv."
896
msgstr ""
897
898
#: bzrlib/builtins.py:1647
899
msgid "Branches and working trees will also report any missing revisions."
900
msgstr ""
901
902
#: bzrlib/builtins.py:1651
903
msgid " Display information on the format and related locations:"
904
msgstr ""
905
906
#: bzrlib/builtins.py:1653
907
msgid " bzr info"
908
msgstr ""
909
910
#: bzrlib/builtins.py:1655
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:1659
918
msgid " bzr info -v"
919
msgstr ""
920
921
#: bzrlib/builtins.py:1661
922
msgid " Display the above together with number of committers to the branch:"
923
msgstr ""
924
925
#: bzrlib/builtins.py:1663
926
msgid " bzr info -vv"
927
msgstr ""
928
929
#: bzrlib/builtins.py:1682
930
msgid "Remove files or directories."
931
msgstr ""
932
933
#: bzrlib/builtins.py:1684
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
# help of 'new' option of 'remove' command
943
#: bzrlib/builtins.py:1692
944
msgid "Only remove files that have never been committed."
945
msgstr ""
946
947
# help of 'file-deletion-strategy' option of 'remove' command
948
#: bzrlib/builtins.py:1694
949
msgid "The file deletion mode to be used."
950
msgstr ""
951
952
# title of 'file-deletion-strategy' option of 'remove' command
953
#: bzrlib/builtins.py:1695
954
msgid "Deletion Strategy"
955
msgstr ""
956
957
# help of 'file-deletion-strategy=safe' option of 'remove' command
958
#: bzrlib/builtins.py:1696
959
msgid "Backup changed files (default)."
960
msgstr ""
961
962
# help of 'file-deletion-strategy=keep' option of 'remove' command
963
#: bzrlib/builtins.py:1697
964
msgid "Delete from bzr but leave the working copy."
965
msgstr ""
966
967
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
968
#: bzrlib/builtins.py:1698
969
msgid "Don't backup changed files."
970
msgstr ""
971
972
# help of 'file-deletion-strategy=force' option of 'remove' command
973
#: bzrlib/builtins.py:1699
974
msgid ""
975
"Delete all the specified files, even if they can not be recovered and even "
976
"if they are non-empty directories. (deprecated, use no-backup)"
977
msgstr ""
978
979
#: bzrlib/builtins.py:1708
980
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
981
msgstr ""
982
983
#: bzrlib/builtins.py:1725
984
msgid "No matching files."
985
msgstr ""
986
987
#: bzrlib/builtins.py:1786
988
msgid "Reconcile bzr metadata in a branch."
989
msgstr ""
990
991
#: bzrlib/builtins.py:1788
992
msgid ""
993
"This can correct data mismatches that may have been caused by\n"
994
"previous ghost operations or bzr upgrades. You should only\n"
995
"need to run this command if 'bzr check' or a bzr developer\n"
996
"advises you to run it."
997
msgstr ""
998
999
#: bzrlib/builtins.py:1793
1000
msgid ""
1001
"If a second branch is provided, cross-branch reconciliation is\n"
1002
"also attempted, which will check that data like the tree root\n"
1003
"id which was not present in very early bzr versions is represented\n"
1004
"correctly in both branches."
1005
msgstr ""
1006
1007
#: bzrlib/builtins.py:1798
1008
msgid ""
1009
"At the same time it is run it may recompress data resulting in\n"
1010
"a potential saving in disk space or performance gain."
1011
msgstr ""
1012
1013
#: bzrlib/builtins.py:1801
1014
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1015
msgstr ""
1016
1017
# help of 'format=2a' option of 'init' command
1018
#: bzrlib/builtins.py:1868
1019
msgid ""
1020
"Format for the bzr 2.0 series.\n"
1021
"Uses group-compress storage.\n"
1022
"Provides rich roots which are a one-way transition.\n"
1023
msgstr ""
1024
1025
# help of 'format=pack-0.92' option of 'init' command
1026
#: bzrlib/builtins.py:1868
1027
msgid ""
1028
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1029
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1030
msgstr ""
1031
1032
# help of 'format=development-colo' option of 'init' command
1033
#: bzrlib/builtins.py:1868
1034
msgid "The 2a format with experimental support for colocated branches.\n"
1035
msgstr ""
1036
1037
#: bzrlib/builtins.py:1869
1038
msgid "Make a directory into a versioned branch."
1039
msgstr ""
1040
1041
#: bzrlib/builtins.py:1871
1042
msgid ""
1043
"Use this to create an empty branch, or before importing an\n"
1044
"existing project."
1045
msgstr ""
1046
1047
#: bzrlib/builtins.py:1874
1048
msgid ""
1049
"If there is a repository in a parent directory of the location, then\n"
1050
"the history of the branch will be stored in the repository. Otherwise\n"
1051
"init creates a standalone branch which carries its own history\n"
1052
"in the .bzr directory."
1053
msgstr ""
1054
1055
#: bzrlib/builtins.py:1879
1056
msgid ""
1057
"If there is already a branch at the location but it has no working tree,\n"
1058
"the tree can be populated with 'bzr checkout'."
1059
msgstr ""
1060
1061
#: bzrlib/builtins.py:1882
1062
msgid "Recipe for importing a tree of files::"
1063
msgstr ""
1064
1065
#: bzrlib/builtins.py:1884
1066
msgid ""
1067
" cd ~/project\n"
1068
" bzr init\n"
1069
" bzr add .\n"
1070
" bzr status\n"
1071
" bzr commit -m \"imported project\""
1072
msgstr ""
1073
1074
# help of 'create-prefix' option of 'init' command
1075
#: bzrlib/builtins.py:1895
1076
msgid "Create the path leading up to the branch if it does not already exist."
1077
msgstr ""
1078
1079
# help of 'format' option of 'init' command
1080
#: bzrlib/builtins.py:1898
1081
msgid "Specify a format for this branch. See \"help formats\"."
1082
msgstr ""
1083
1084
# help of 'append-revisions-only' option of 'init' command
1085
#: bzrlib/builtins.py:1906
1086
msgid "Never change revnos or the existing log. Append revisions to it only."
1087
msgstr ""
1088
1089
# help of 'no-tree' option of 'init' command
1090
#: bzrlib/builtins.py:1909
1091
msgid "Create a branch without a working tree."
1092
msgstr ""
1093
1094
#: bzrlib/builtins.py:1929 bzrlib/push.py:108
1095
#, python-format
1096
msgid ""
1097
"Parent directory of %s does not exist.\n"
1098
"You may supply --create-prefix to create all leading parent directories."
1099
msgstr ""
1100
1101
#: bzrlib/builtins.py:1963
1102
msgid ""
1103
"This branch format cannot be set to append-revisions-only. Try --default."
1104
msgstr ""
1105
1106
#: bzrlib/builtins.py:1974
1107
msgid "Created a {0} (format: {1})\n"
1108
msgstr ""
1109
1110
#: bzrlib/builtins.py:1983
1111
#, python-format
1112
msgid "Using shared repository: %s\n"
1113
msgstr ""
1114
1115
#: bzrlib/builtins.py:1987
1116
msgid "Create a shared repository for branches to share storage space."
1117
msgstr ""
1118
1119
#: bzrlib/builtins.py:1989
1120
msgid ""
1121
"New branches created under the repository directory will store their\n"
1122
"revisions in the repository, not in the branch directory. For branches\n"
1123
"with shared history, this reduces the amount of storage needed and \n"
1124
"speeds up the creation of new branches."
1125
msgstr ""
1126
1127
#: bzrlib/builtins.py:1994
1128
msgid ""
1129
"If the --no-trees option is given then the branches in the repository\n"
1130
"will not have working trees by default. They will still exist as \n"
1131
"directories on disk, but they will not have separate copies of the \n"
1132
"files at a certain revision. This can be useful for repositories that\n"
1133
"store branches which are interacted with through checkouts or remote\n"
1134
"branches, such as on a server."
1135
msgstr ""
1136
1137
#: bzrlib/builtins.py:2001
1138
msgid ""
1139
":Examples:\n"
1140
" Create a shared repository holding just branches::"
1141
msgstr ""
1142
1143
#: bzrlib/builtins.py:2004
1144
msgid ""
1145
" bzr init-repo --no-trees repo\n"
1146
" bzr init repo/trunk"
1147
msgstr ""
1148
1149
#: bzrlib/builtins.py:2007
1150
msgid " Make a lightweight checkout elsewhere::"
1151
msgstr ""
1152
1153
#: bzrlib/builtins.py:2009
1154
msgid ""
1155
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1156
" cd trunk-checkout\n"
1157
" (add files here)"
1158
msgstr ""
1159
1160
# help of 'format' option of 'init-repository' command
1161
#: bzrlib/builtins.py:2017
1162
msgid ""
1163
"Specify a format for this repository. See \"bzr help formats\" for details."
1164
msgstr ""
1165
1166
# title of 'format' option of 'init-repository' command
1167
#: bzrlib/builtins.py:2021
1168
msgid "Repository format"
1169
msgstr ""
1170
1171
# help of 'no-trees' option of 'init-repository' command
1172
#: bzrlib/builtins.py:2023
1173
msgid "Branches in the repository will default to not having a working tree."
1174
msgstr ""
1175
1176
#: bzrlib/builtins.py:2047
1177
msgid "Show differences in the working tree, between revisions or branches."
1178
msgstr ""
1179
1180
#: bzrlib/builtins.py:2049
1181
msgid ""
1182
"If no arguments are given, all changes for the current tree are listed.\n"
1183
"If files are given, only the changes in those files are listed.\n"
1184
"Remote and multiple branches can be compared by using the --old and\n"
1185
"--new options. If not provided, the default for both is derived from\n"
1186
"the first argument, if any, or the current tree if no arguments are\n"
1187
"given."
1188
msgstr ""
1189
1190
#: bzrlib/builtins.py:2056
1191
msgid ""
1192
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1193
"produces patches suitable for \"patch -p1\"."
1194
msgstr ""
1195
1196
#: bzrlib/builtins.py:2059
1197
msgid ""
1198
"Note that when using the -r argument with a range of revisions, the\n"
1199
"differences are computed between the two specified revisions. That\n"
1200
"is, the command does not show the changes introduced by the first \n"
1201
"revision in the range. This differs from the interpretation of \n"
1202
"revision ranges used by \"bzr log\" which includes the first revision\n"
1203
"in the range."
1204
msgstr ""
1205
1206
#: bzrlib/builtins.py:2066
1207
msgid ""
1208
":Exit values:\n"
1209
" 1 - changed\n"
1210
" 2 - unrepresentable changes\n"
1211
" 3 - error\n"
1212
" 0 - no change"
1213
msgstr ""
1214
1215
#: bzrlib/builtins.py:2072
1216
msgid ""
1217
":Examples:\n"
1218
" Shows the difference in the working tree versus the last commit::"
1219
msgstr ""
1220
1221
#: bzrlib/builtins.py:2075
1222
msgid " bzr diff"
1223
msgstr ""
1224
1225
#: bzrlib/builtins.py:2077
1226
msgid " Difference between the working tree and revision 1::"
1227
msgstr ""
1228
1229
#: bzrlib/builtins.py:2079
1230
msgid " bzr diff -r1"
1231
msgstr ""
1232
1233
#: bzrlib/builtins.py:2081
1234
msgid " Difference between revision 3 and revision 1::"
1235
msgstr ""
1236
1237
#: bzrlib/builtins.py:2083
1238
msgid " bzr diff -r1..3"
1239
msgstr ""
1240
1241
#: bzrlib/builtins.py:2085
1242
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1243
msgstr ""
1244
1245
#: bzrlib/builtins.py:2087
1246
msgid " bzr diff -r1..3 xxx"
1247
msgstr ""
1248
1249
#: bzrlib/builtins.py:2089
1250
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1251
msgstr ""
1252
1253
#: bzrlib/builtins.py:2091
1254
msgid " bzr diff -c2"
1255
msgstr ""
1256
1257
#: bzrlib/builtins.py:2093
1258
msgid ""
1259
" To see the changes introduced by revision X::\n"
1260
" \n"
1261
" bzr diff -cX"
1262
msgstr ""
1263
1264
#: bzrlib/builtins.py:2097
1265
msgid ""
1266
" Note that in the case of a merge, the -c option shows the changes\n"
1267
" compared to the left hand parent. To see the changes against\n"
1268
" another parent, use::"
1269
msgstr ""
1270
1271
#: bzrlib/builtins.py:2101
1272
msgid " bzr diff -r<chosen_parent>..X"
1273
msgstr ""
1274
1275
#: bzrlib/builtins.py:2103
1276
msgid ""
1277
" The changes between the current revision and the previous revision\n"
1278
" (equivalent to -c-1 and -r-2..-1)"
1279
msgstr ""
1280
1281
#: bzrlib/builtins.py:2106
1282
msgid " bzr diff -r-2.."
1283
msgstr ""
1284
1285
#: bzrlib/builtins.py:2108
1286
msgid " Show just the differences for file NEWS::"
1287
msgstr ""
1288
1289
#: bzrlib/builtins.py:2110
1290
msgid " bzr diff NEWS"
1291
msgstr ""
1292
1293
#: bzrlib/builtins.py:2112
1294
msgid " Show the differences in working tree xxx for file NEWS::"
1295
msgstr ""
1296
1297
#: bzrlib/builtins.py:2114
1298
msgid " bzr diff xxx/NEWS"
1299
msgstr ""
1300
1301
#: bzrlib/builtins.py:2116
1302
msgid " Show the differences from branch xxx to this working tree:"
1303
msgstr ""
1304
1305
#: bzrlib/builtins.py:2118
1306
msgid " bzr diff --old xxx"
1307
msgstr ""
1308
1309
#: bzrlib/builtins.py:2120
1310
msgid " Show the differences between two branches for file NEWS::"
1311
msgstr ""
1312
1313
#: bzrlib/builtins.py:2122
1314
msgid " bzr diff --old xxx --new yyy NEWS"
1315
msgstr ""
1316
1317
#: bzrlib/builtins.py:2124
1318
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1319
msgstr ""
1320
1321
#: bzrlib/builtins.py:2126
1322
msgid ""
1323
" bzr diff --prefix old/:new/\n"
1324
" \n"
1325
" Show the differences using a custom diff program with options::\n"
1326
" \n"
1327
" bzr diff --using /usr/bin/diff --diff-options -wu"
1328
msgstr ""
1329
1330
# help of 'diff-options' option of 'diff' command
1331
#: bzrlib/builtins.py:2136
1332
msgid "Pass these options to the external diff program."
1333
msgstr ""
1334
1335
# help of 'prefix' option of 'diff' command
1336
#: bzrlib/builtins.py:2139
1337
msgid ""
1338
"Set prefixes added to old and new filenames, as two values separated by a "
1339
"colon. (eg \"old/:new/\")."
1340
msgstr ""
1341
1342
# help of 'old' option of 'diff' command
1343
#: bzrlib/builtins.py:2142
1344
msgid "Branch/tree to compare from."
1345
msgstr ""
1346
1347
# help of 'new' option of 'diff' command
1348
#: bzrlib/builtins.py:2146
1349
msgid "Branch/tree to compare to."
1350
msgstr ""
1351
1352
# help of 'using' option of 'diff' command
1353
#: bzrlib/builtins.py:2152
1354
msgid "Use this command to compare files."
1355
msgstr ""
1356
1357
# help of 'format' option of 'diff' command
1358
#: bzrlib/builtins.py:2157
1359
msgid "Diff format to use."
1360
msgstr ""
1361
1362
# title of 'format' option of 'diff' command
1363
#: bzrlib/builtins.py:2159
1364
msgid "Diff format"
1365
msgstr ""
1366
1367
#: bzrlib/builtins.py:2181
1368
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1369
msgstr ""
1370
1371
#: bzrlib/builtins.py:2185
1372
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1373
msgstr ""
1374
1375
#: bzrlib/builtins.py:2190 bzrlib/builtins.py:2588 bzrlib/builtins.py:2601
1376
#: bzrlib/builtins.py:2609 bzrlib/builtins.py:4760
1377
msgid "{0} and {1} are mutually exclusive"
1378
msgstr ""
1379
1380
#: bzrlib/builtins.py:2210
1381
msgid ""
1382
"List files deleted in the working tree.\n"
1383
" "
1384
msgstr ""
1385
1386
#: bzrlib/builtins.py:2288
1387
msgid "Show the tree root directory."
1388
msgstr ""
1389
1390
#: bzrlib/builtins.py:2290
1391
msgid ""
1392
"The root is the nearest enclosing directory with a .bzr control\n"
1393
"directory."
1394
msgstr ""
1395
1396
#: bzrlib/builtins.py:2305
1397
msgid "The limit argument must be an integer."
1398
msgstr ""
1399
1400
#: bzrlib/builtins.py:2313
1401
msgid "The levels argument must be an integer."
1402
msgstr ""
1403
1404
#: bzrlib/builtins.py:2318
1405
msgid "Show historical log for a branch or subset of a branch."
1406
msgstr ""
1407
1408
#: bzrlib/builtins.py:2320
1409
msgid ""
1410
"log is bzr's default tool for exploring the history of a branch.\n"
1411
"The branch to use is taken from the first parameter. If no parameters\n"
1412
"are given, the branch containing the working directory is logged.\n"
1413
"Here are some simple examples::"
1414
msgstr ""
1415
1416
#: bzrlib/builtins.py:2325
1417
msgid ""
1418
" bzr log log the current branch\n"
1419
" bzr log foo.py log a file in its branch\n"
1420
" bzr log http://server/branch log a branch on a server"
1421
msgstr ""
1422
1423
#: bzrlib/builtins.py:2329
1424
msgid ""
1425
"The filtering, ordering and information shown for each revision can\n"
1426
"be controlled as explained below. By default, all revisions are\n"
1427
"shown sorted (topologically) so that newer revisions appear before\n"
1428
"older ones and descendants always appear before ancestors. If displayed,\n"
1429
"merged revisions are shown indented under the revision in which they\n"
1430
"were merged."
1431
msgstr ""
1432
1433
#: bzrlib/builtins.py:2336
1434
msgid ":Output control:"
1435
msgstr ""
1436
1437
#: bzrlib/builtins.py:2338
1438
msgid ""
1439
" The log format controls how information about each revision is\n"
1440
" displayed. The standard log formats are called ``long``, ``short``\n"
1441
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1442
" for more details on log formats."
1443
msgstr ""
1444
1445
#: bzrlib/builtins.py:2343
1446
msgid ""
1447
" The following options can be used to control what information is\n"
1448
" displayed::"
1449
msgstr ""
1450
1451
#: bzrlib/builtins.py:2346
1452
msgid ""
1453
" -l N display a maximum of N revisions\n"
1454
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1455
" -v display a status summary (delta) for each revision\n"
1456
" -p display a diff (patch) for each revision\n"
1457
" --show-ids display revision-ids (and file-ids), not just revnos"
1458
msgstr ""
1459
1460
#: bzrlib/builtins.py:2352
1461
msgid ""
1462
" Note that the default number of levels to display is a function of the\n"
1463
" log format. If the -n option is not used, the standard log formats show\n"
1464
" just the top level (mainline)."
1465
msgstr ""
1466
1467
#: bzrlib/builtins.py:2356
1468
msgid ""
1469
" Status summaries are shown using status flags like A, M, etc. To see\n"
1470
" the changes explained using words like ``added`` and ``modified``\n"
1471
" instead, use the -vv option."
1472
msgstr ""
1473
1474
#: bzrlib/builtins.py:2360
1475
msgid ":Ordering control:"
1476
msgstr ""
1477
1478
#: bzrlib/builtins.py:2362
1479
msgid ""
1480
" To display revisions from oldest to newest, use the --forward option.\n"
1481
" In most cases, using this option will have little impact on the total\n"
1482
" time taken to produce a log, though --forward does not incrementally\n"
1483
" display revisions like --reverse does when it can."
1484
msgstr ""
1485
1486
#: bzrlib/builtins.py:2367
1487
msgid ":Revision filtering:"
1488
msgstr ""
1489
1490
#: bzrlib/builtins.py:2369
1491
msgid ""
1492
" The -r option can be used to specify what revision or range of revisions\n"
1493
" to filter against. The various forms are shown below::"
1494
msgstr ""
1495
1496
#: bzrlib/builtins.py:2372
1497
msgid ""
1498
" -rX display revision X\n"
1499
" -rX.. display revision X and later\n"
1500
" -r..Y display up to and including revision Y\n"
1501
" -rX..Y display from X to Y inclusive"
1502
msgstr ""
1503
1504
#: bzrlib/builtins.py:2377
1505
msgid ""
1506
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1507
" Some common examples are given below::"
1508
msgstr ""
1509
1510
#: bzrlib/builtins.py:2380
1511
msgid ""
1512
" -r-1 show just the tip\n"
1513
" -r-10.. show the last 10 mainline revisions\n"
1514
" -rsubmit:.. show what's new on this branch\n"
1515
" -rancestor:path.. show changes since the common ancestor of this\n"
1516
" branch and the one at location path\n"
1517
" -rdate:yesterday.. show changes since yesterday"
1518
msgstr ""
1519
1520
#: bzrlib/builtins.py:2387
1521
msgid ""
1522
" When logging a range of revisions using -rX..Y, log starts at\n"
1523
" revision Y and searches back in history through the primary\n"
1524
" (\"left-hand\") parents until it finds X. When logging just the\n"
1525
" top level (using -n1), an error is reported if X is not found\n"
1526
" along the way. If multi-level logging is used (-n0), X may be\n"
1527
" a nested merge revision and the log will be truncated accordingly."
1528
msgstr ""
1529
1530
#: bzrlib/builtins.py:2394
1531
msgid ":Path filtering:"
1532
msgstr ""
1533
1534
#: bzrlib/builtins.py:2396
1535
msgid ""
1536
" If parameters are given and the first one is not a branch, the log\n"
1537
" will be filtered to show only those revisions that changed the\n"
1538
" nominated files or directories."
1539
msgstr ""
1540
1541
#: bzrlib/builtins.py:2400
1542
msgid ""
1543
" Filenames are interpreted within their historical context. To log a\n"
1544
" deleted file, specify a revision range so that the file existed at\n"
1545
" the end or start of the range."
1546
msgstr ""
1547
1548
#: bzrlib/builtins.py:2404
1549
msgid ""
1550
" Historical context is also important when interpreting pathnames of\n"
1551
" renamed files/directories. Consider the following example:"
1552
msgstr ""
1553
1554
#: bzrlib/builtins.py:2407
1555
msgid ""
1556
" * revision 1: add tutorial.txt\n"
1557
" * revision 2: modify tutorial.txt\n"
1558
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1559
msgstr ""
1560
1561
#: bzrlib/builtins.py:2411
1562
msgid " In this case:"
1563
msgstr ""
1564
1565
#: bzrlib/builtins.py:2413
1566
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1567
msgstr ""
1568
1569
#: bzrlib/builtins.py:2415
1570
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1571
msgstr ""
1572
1573
#: bzrlib/builtins.py:2417
1574
msgid ""
1575
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1576
" the original file in revision 2."
1577
msgstr ""
1578
1579
#: bzrlib/builtins.py:2420
1580
msgid ""
1581
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1582
" was no file called guide.txt in revision 2."
1583
msgstr ""
1584
1585
#: bzrlib/builtins.py:2423
1586
msgid ""
1587
" Renames are always followed by log. By design, there is no need to\n"
1588
" explicitly ask for this (and no way to stop logging a file back\n"
1589
" until it was last renamed)."
1590
msgstr ""
1591
1592
#: bzrlib/builtins.py:2427
1593
msgid ":Other filtering:"
1594
msgstr ""
1595
1596
#: bzrlib/builtins.py:2429
1597
msgid ""
1598
" The --match option can be used for finding revisions that match a\n"
1599
" regular expression in a commit message, committer, author or bug.\n"
1600
" Specifying the option several times will match any of the supplied\n"
1601
" expressions. --match-author, --match-bugs, --match-committer and\n"
1602
" --match-message can be used to only match a specific field."
1603
msgstr ""
1604
1605
#: bzrlib/builtins.py:2435
1606
msgid ":Tips & tricks:"
1607
msgstr ""
1608
1609
#: bzrlib/builtins.py:2437
1610
msgid ""
1611
" GUI tools and IDEs are often better at exploring history than command\n"
1612
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1613
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1614
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1615
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1616
msgstr ""
1617
1618
#: bzrlib/builtins.py:2443
1619
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1620
msgstr ""
1621
1622
#: bzrlib/builtins.py:2445
1623
msgid ""
1624
" [ALIASES]\n"
1625
" tip = log -r-1\n"
1626
" top = log -l10 --line\n"
1627
" show = log -v -p"
1628
msgstr ""
1629
1630
#: bzrlib/builtins.py:2450
1631
msgid ""
1632
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1633
" will show the last 10 mainline revisions. To see the details of a\n"
1634
" particular revision X, ``bzr show -rX``."
1635
msgstr ""
1636
1637
#: bzrlib/builtins.py:2454
1638
msgid ""
1639
" If you are interested in looking deeper into a particular merge X,\n"
1640
" use ``bzr log -n0 -rX``."
1641
msgstr ""
1642
1643
#: bzrlib/builtins.py:2457
1644
msgid ""
1645
" ``bzr log -v`` on a branch with lots of history is currently\n"
1646
" very slow. A fix for this issue is currently under development.\n"
1647
" With or without that fix, it is recommended that a revision range\n"
1648
" be given when using the -v option."
1649
msgstr ""
1650
1651
#: bzrlib/builtins.py:2462
1652
msgid ""
1653
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1654
" used to find revisions matching user names, commit messages, etc.\n"
1655
" Among other features, this plugin can find all revisions containing\n"
1656
" a list of words but not others."
1657
msgstr ""
1658
1659
#: bzrlib/builtins.py:2467
1660
msgid ""
1661
" When exploring non-mainline history on large projects with deep\n"
1662
" history, the performance of log can be greatly improved by installing\n"
1663
" the historycache plugin. This plugin buffers historical information\n"
1664
" trading disk space for faster speed."
1665
msgstr ""
1666
1667
# help of 'forward' option of 'log' command
1668
#: bzrlib/builtins.py:2476
1669
msgid "Show from oldest to newest."
1670
msgstr ""
1671
1672
# help of 'verbose' option of 'log' command
1673
#: bzrlib/builtins.py:2479
1674
msgid "Show files changed in each revision."
1675
msgstr ""
1676
1677
# help of 'change' option of 'log' command
1678
#: bzrlib/builtins.py:2485
1679
msgid "Show just the specified revision. See also \"help revisionspec\"."
1680
msgstr ""
1681
1682
# help of 'authors' option of 'log' command
1683
#: bzrlib/builtins.py:2489
1684
msgid "What names to list as authors - first, all or committer."
1685
msgstr ""
1686
1687
# title of 'authors' option of 'log' command
1688
#: bzrlib/builtins.py:2490
1689
msgid "Authors"
1690
msgstr ""
1691
1692
# help of 'levels' option of 'log' command
1693
#: bzrlib/builtins.py:2495
1694
msgid "Number of levels to display - 0 for all, 1 for flat."
1695
msgstr ""
1696
1697
# help of 'limit' option of 'log' command
1698
#: bzrlib/builtins.py:2505
1699
msgid "Limit the output to the first N revisions."
1700
msgstr ""
1701
1702
# help of 'show-diff' option of 'log' command
1703
#: bzrlib/builtins.py:2510
1704
msgid "Show changes made in each revision as a patch."
1705
msgstr ""
1706
1707
# help of 'include-merged' option of 'log' command
1708
#: bzrlib/builtins.py:2512
1709
msgid "Show merged revisions like --levels 0 does."
1710
msgstr ""
1711
1712
# help of 'omit-merges' option of 'log' command
1713
#: bzrlib/builtins.py:2516
1714
msgid "Do not report commits with more than one parent."
1715
msgstr ""
1716
1717
# help of 'exclude-common-ancestry' option of 'log' command
1718
#: bzrlib/builtins.py:2518
1719
msgid ""
1720
"Display only the revisions that are not part of both ancestries (require -"
1721
"rX..Y)."
1722
msgstr ""
1723
1724
# help of 'signatures' option of 'log' command
1725
#: bzrlib/builtins.py:2522
1726
msgid "Show digital signature validity."
1727
msgstr ""
1728
1729
# help of 'match' option of 'log' command
1730
#: bzrlib/builtins.py:2525
1731
msgid "Show revisions whose properties match this expression."
1732
msgstr ""
1733
1734
# help of 'match-message' option of 'log' command
1735
#: bzrlib/builtins.py:2529
1736
msgid "Show revisions whose message matches this expression."
1737
msgstr ""
1738
1739
# help of 'match-committer' option of 'log' command
1740
#: bzrlib/builtins.py:2533
1741
msgid "Show revisions whose committer matches this expression."
1742
msgstr ""
1743
1744
# help of 'match-author' option of 'log' command
1745
#: bzrlib/builtins.py:2537
1746
msgid "Show revisions whose authors match this expression."
1747
msgstr ""
1748
1749
# help of 'match-bugs' option of 'log' command
1750
#: bzrlib/builtins.py:2541
1751
msgid "Show revisions whose bugs match this expression."
1752
msgstr ""
1753
1754
#: bzrlib/builtins.py:2595
1755
msgid "--exclude-common-ancestry requires -r with two revisions"
1756
msgstr ""
1757
1758
#: bzrlib/builtins.py:2623
1759
#, python-format
1760
msgid "Path unknown at end or start of revision range: %s"
1761
msgstr ""
1762
1763
#: bzrlib/builtins.py:2740
1764
#, python-format
1765
msgid "bzr %s doesn't accept two revisions in different branches."
1766
msgstr ""
1767
1768
#: bzrlib/builtins.py:2756
1769
#, python-format
1770
msgid "bzr %s --revision takes one or two values."
1771
msgstr ""
1772
1773
#: bzrlib/builtins.py:2801
1774
msgid ""
1775
"List files in a tree.\n"
1776
" "
1777
msgstr ""
1778
1779
# help of 'recursive' option of 'ls' command
1780
#: bzrlib/builtins.py:2810
1781
msgid "Recurse into subdirectories."
1782
msgstr ""
1783
1784
# help of 'from-root' option of 'ls' command
1785
#: bzrlib/builtins.py:2812
1786
msgid "Print paths relative to the root of the branch."
1787
msgstr ""
1788
1789
# help of 'unknown' option of 'ls' command
1790
#: bzrlib/builtins.py:2814
1791
msgid "Print unknown files."
1792
msgstr ""
1793
1794
# help of 'versioned' option of 'ls' command
1795
#: bzrlib/builtins.py:2815
1796
msgid "Print versioned files."
1797
msgstr ""
1798
1799
# help of 'ignored' option of 'ls' command
1800
#: bzrlib/builtins.py:2818
1801
msgid "Print ignored files."
1802
msgstr ""
1803
1804
# help of 'kind' option of 'ls' command
1805
#: bzrlib/builtins.py:2820
1806
msgid "List entries of a particular kind: file, directory, symlink."
1807
msgstr ""
1808
1809
#: bzrlib/builtins.py:2833
1810
msgid "invalid kind specified"
1811
msgstr ""
1812
1813
#: bzrlib/builtins.py:2836
1814
msgid "Cannot set both --verbose and --null"
1815
msgstr ""
1816
1817
#: bzrlib/builtins.py:2845
1818
msgid "cannot specify both --from-root and PATH"
1819
msgstr ""
1820
1821
#: bzrlib/builtins.py:2932
1822
msgid "Ignore specified files or patterns."
1823
msgstr ""
1824
1825
#: bzrlib/builtins.py:2934
1826
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1827
msgstr ""
1828
1829
#: bzrlib/builtins.py:2936
1830
msgid ""
1831
"If a .bzrignore file does not exist, the ignore command\n"
1832
"will create one and add the specified files or patterns to the newly\n"
1833
"created file. The ignore command will also automatically add the \n"
1834
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1835
"the use of the ignore command will require an explicit add command."
1836
msgstr ""
1837
1838
#: bzrlib/builtins.py:2942
1839
msgid ""
1840
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1841
"After adding, editing or deleting that file either indirectly by\n"
1842
"using this command or directly by using an editor, be sure to commit\n"
1843
"it."
1844
msgstr ""
1845
1846
#: bzrlib/builtins.py:2947
1847
msgid ""
1848
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1849
"the global ignore file can be found in the application data directory as\n"
1850
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1851
"Global ignores are not touched by this command. The global ignore file\n"
1852
"can be edited directly using an editor."
1853
msgstr ""
1854
1855
#: bzrlib/builtins.py:2953
1856
msgid ""
1857
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1858
"precedence over regular ignores. Such exceptions are used to specify\n"
1859
"files that should be versioned which would otherwise be ignored."
1860
msgstr ""
1861
1862
#: bzrlib/builtins.py:2957
1863
msgid ""
1864
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1865
"precedence over the '!' exception patterns."
1866
msgstr ""
1867
1868
#: bzrlib/builtins.py:2960
1869
msgid ""
1870
":Notes: \n"
1871
" \n"
1872
"* Ignore patterns containing shell wildcards must be quoted from\n"
1873
" the shell on Unix."
1874
msgstr ""
1875
1876
#: bzrlib/builtins.py:2965
1877
msgid ""
1878
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1879
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1880
msgstr ""
1881
1882
#: bzrlib/builtins.py:2968
1883
msgid ""
1884
":Examples:\n"
1885
" Ignore the top level Makefile::"
1886
msgstr ""
1887
1888
#: bzrlib/builtins.py:2971
1889
msgid " bzr ignore ./Makefile"
1890
msgstr ""
1891
1892
#: bzrlib/builtins.py:2973
1893
msgid " Ignore .class files in all directories...::"
1894
msgstr ""
1895
1896
#: bzrlib/builtins.py:2975
1897
msgid " bzr ignore \"*.class\""
1898
msgstr ""
1899
1900
#: bzrlib/builtins.py:2977
1901
msgid " ...but do not ignore \"special.class\"::"
1902
msgstr ""
1903
1904
#: bzrlib/builtins.py:2979
1905
msgid " bzr ignore \"!special.class\""
1906
msgstr ""
1907
1908
#: bzrlib/builtins.py:2981
1909
msgid " Ignore files whose name begins with the \"#\" character::"
1910
msgstr ""
1911
1912
#: bzrlib/builtins.py:2983
1913
msgid " bzr ignore \"RE:^#\""
1914
msgstr ""
1915
1916
#: bzrlib/builtins.py:2985
1917
msgid " Ignore .o files under the lib directory::"
1918
msgstr ""
1919
1920
#: bzrlib/builtins.py:2987
1921
msgid " bzr ignore \"lib/**/*.o\""
1922
msgstr ""
1923
1924
#: bzrlib/builtins.py:2991
1925
msgid " bzr ignore \"RE:lib/.*\\.o\""
1926
msgstr ""
1927
1928
#: bzrlib/builtins.py:2993
1929
msgid " Ignore everything but the \"debian\" toplevel directory::"
1930
msgstr ""
1931
1932
#: bzrlib/builtins.py:2995
1933
msgid ""
1934
" bzr ignore \"RE:(?!debian/).*\"\n"
1935
" \n"
1936
" Ignore everything except the \"local\" toplevel directory,\n"
1937
" but always ignore autosave files ending in ~, even under local/::\n"
1938
" \n"
1939
" bzr ignore \"*\"\n"
1940
" bzr ignore \"!./local\"\n"
1941
" bzr ignore \"!!*~\""
1942
msgstr ""
1943
1944
# help of 'default-rules' option of 'ignore' command
1945
#: bzrlib/builtins.py:3009
1946
msgid "Display the default ignore rules that bzr uses."
1947
msgstr ""
1948
1949
#: bzrlib/builtins.py:3021
1950
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1951
msgstr ""
1952
1953
#: bzrlib/builtins.py:3032
1954
#, python-format
1955
msgid "Invalid ignore pattern found. %s"
1956
msgid_plural "Invalid ignore patterns found. %s"
1957
msgstr[0] ""
1958
msgstr[1] ""
1959
1960
#: bzrlib/builtins.py:3041
1961
msgid "NAME_PATTERN should not be an absolute path"
1962
msgstr ""
1963
1964
#: bzrlib/builtins.py:3054
1965
#, python-format
1966
msgid ""
1967
"Warning: the following files are version controlled and match your ignore "
1968
"pattern:\n"
1969
"%s\n"
1970
"These files will continue to be version controlled unless you 'bzr remove' "
1971
"them.\n"
1972
msgstr ""
1973
1974
#: bzrlib/builtins.py:3061
1975
msgid "List ignored files and the patterns that matched them."
1976
msgstr ""
1977
1978
#: bzrlib/builtins.py:3063
1979
msgid ""
1980
"List all the ignored files and the ignore pattern that caused the file to\n"
1981
"be ignored."
1982
msgstr ""
1983
1984
#: bzrlib/builtins.py:3066
1985
msgid "Alternatively, to list just the files::"
1986
msgstr ""
1987
1988
#: bzrlib/builtins.py:3068
1989
msgid " bzr ls --ignored"
1990
msgstr ""
1991
1992
#: bzrlib/builtins.py:3102
1993
#, python-format
1994
msgid "not a valid revision-number: %r"
1995
msgstr ""
1996
1997
#: bzrlib/builtins.py:3109
1998
msgid "Export current or past revision to a destination directory or archive."
1999
msgstr ""
2000
2001
#: bzrlib/builtins.py:3111
2002
msgid "If no revision is specified this exports the last committed revision."
2003
msgstr ""
2004
2005
#: bzrlib/builtins.py:3113
2006
msgid ""
2007
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2008
"given, try to find the format with the extension. If no extension\n"
2009
"is found exports to a directory (equivalent to --format=dir)."
2010
msgstr ""
2011
2012
#: bzrlib/builtins.py:3117
2013
msgid ""
2014
"If root is supplied, it will be used as the root directory inside\n"
2015
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2016
"to the exported filename. The root option has no effect for 'dir' format."
2017
msgstr ""
2018
2019
#: bzrlib/builtins.py:3121
2020
msgid ""
2021
"If branch is omitted then the branch containing the current working\n"
2022
"directory will be used."
2023
msgstr ""
2024
2025
#: bzrlib/builtins.py:3124
2026
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2027
msgstr ""
2028
2029
#: bzrlib/builtins.py:3126
2030
msgid ""
2031
" ================= =========================\n"
2032
" Supported formats Autodetected by extension\n"
2033
" ================= =========================\n"
2034
" dir (none)\n"
2035
" tar .tar\n"
2036
" tbz2 .tar.bz2, .tbz2\n"
2037
" tgz .tar.gz, .tgz\n"
2038
" zip .zip\n"
2039
" ================= ========================="
2040
msgstr ""
2041
2042
# help of 'format' option of 'export' command
2043
#: bzrlib/builtins.py:3140
2044
msgid "Type of file to export to."
2045
msgstr ""
2046
2047
# help of 'filters' option of 'export' command
2048
#: bzrlib/builtins.py:3143
2049
msgid "Apply content filters to export the convenient form."
2050
msgstr ""
2051
2052
# help of 'root' option of 'export' command
2053
#: bzrlib/builtins.py:3147
2054
msgid "Name of the root directory inside the exported file."
2055
msgstr ""
2056
2057
# help of 'per-file-timestamps' option of 'export' command
2058
#: bzrlib/builtins.py:3149
2059
msgid ""
2060
"Set modification time of files to that of the last revision in which it was "
2061
"changed."
2062
msgstr ""
2063
2064
# help of 'uncommitted' option of 'export' command
2065
#: bzrlib/builtins.py:3152
2066
msgid "Export the working tree contents rather than that of the last revision."
2067
msgstr ""
2068
2069
#: bzrlib/builtins.py:3171
2070
msgid "--uncommitted requires a working tree"
2071
msgstr ""
2072
2073
#: bzrlib/builtins.py:3180
2074
#, python-format
2075
msgid "Unsupported export format: %s"
2076
msgstr ""
2077
2078
#: bzrlib/builtins.py:3184
2079
msgid "Write the contents of a file as of a given revision to standard output."
2080
msgstr ""
2081
2082
#: bzrlib/builtins.py:3186
2083
msgid "If no revision is nominated, the last revision is used."
2084
msgstr ""
2085
2086
#: bzrlib/builtins.py:3188
2087
msgid ""
2088
"Note: Take care to redirect standard output when using this command on a\n"
2089
"binary file."
2090
msgstr ""
2091
2092
# help of 'name-from-revision' option of 'cat' command
2093
#: bzrlib/builtins.py:3194
2094
msgid "The path name in the old tree."
2095
msgstr ""
2096
2097
# help of 'filters' option of 'cat' command
2098
#: bzrlib/builtins.py:3195
2099
msgid "Apply content filters to display the convenience form."
2100
msgstr ""
2101
2102
#: bzrlib/builtins.py:3206
2103
msgid "bzr cat --revision takes exactly one revision specifier"
2104
msgstr ""
2105
2106
#: bzrlib/builtins.py:3231 bzrlib/builtins.py:3243
2107
msgid "{0!r} is not present in revision {1}"
2108
msgstr ""
2109
2110
#: bzrlib/builtins.py:3266
2111
msgid "Commit changes into a new revision."
2112
msgstr ""
2113
2114
#: bzrlib/builtins.py:3268
2115
msgid ""
2116
"An explanatory message needs to be given for each commit. This is\n"
2117
"often done by using the --message option (getting the message from the\n"
2118
"command line) or by using the --file option (getting the message from\n"
2119
"a file). If neither of these options is given, an editor is opened for\n"
2120
"the user to enter the message. To see the changed files in the\n"
2121
"boilerplate text loaded into the editor, use the --show-diff option."
2122
msgstr ""
2123
2124
#: bzrlib/builtins.py:3275
2125
msgid ""
2126
"By default, the entire tree is committed and the person doing the\n"
2127
"commit is assumed to be the author. These defaults can be overridden\n"
2128
"as explained below."
2129
msgstr ""
2130
2131
#: bzrlib/builtins.py:3279
2132
msgid ":Selective commits:"
2133
msgstr ""
2134
2135
#: bzrlib/builtins.py:3281
2136
msgid ""
2137
" If selected files are specified, only changes to those files are\n"
2138
" committed. If a directory is specified then the directory and\n"
2139
" everything within it is committed."
2140
msgstr ""
2141
2142
#: bzrlib/builtins.py:3285
2143
msgid ""
2144
" When excludes are given, they take precedence over selected files.\n"
2145
" For example, to commit only changes within foo, but not changes\n"
2146
" within foo/bar::"
2147
msgstr ""
2148
2149
#: bzrlib/builtins.py:3289
2150
msgid " bzr commit foo -x foo/bar"
2151
msgstr ""
2152
2153
#: bzrlib/builtins.py:3291
2154
msgid " A selective commit after a merge is not yet supported."
2155
msgstr ""
2156
2157
#: bzrlib/builtins.py:3293
2158
msgid ":Custom authors:"
2159
msgstr ""
2160
2161
#: bzrlib/builtins.py:3295
2162
msgid ""
2163
" If the author of the change is not the same person as the committer,\n"
2164
" you can specify the author's name using the --author option. The\n"
2165
" name should be in the same format as a committer-id, e.g.\n"
2166
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2167
" the change you can specify the option multiple times, once for each\n"
2168
" author."
2169
msgstr ""
2170
2171
#: bzrlib/builtins.py:3302
2172
msgid ":Checks:"
2173
msgstr ""
2174
2175
#: bzrlib/builtins.py:3304
2176
msgid ""
2177
" A common mistake is to forget to add a new file or directory before\n"
2178
" running the commit command. The --strict option checks for unknown\n"
2179
" files and aborts the commit if any are found. More advanced pre-commit\n"
2180
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2181
" for details."
2182
msgstr ""
2183
2184
#: bzrlib/builtins.py:3310
2185
msgid ":Things to note:"
2186
msgstr ""
2187
2188
#: bzrlib/builtins.py:3312
2189
msgid ""
2190
" If you accidentially commit the wrong changes or make a spelling\n"
2191
" mistake in the commit message say, you can use the uncommit command\n"
2192
" to undo it. See ``bzr help uncommit`` for details."
2193
msgstr ""
2194
2195
#: bzrlib/builtins.py:3316
2196
msgid ""
2197
" Hooks can also be configured to run after a commit. This allows you\n"
2198
" to trigger updates to external systems like bug trackers. The --fixes\n"
2199
" option can be used to record the association between a revision and\n"
2200
" one or more bugs. See ``bzr help bugs`` for details."
2201
msgstr ""
2202
2203
# help of 'exclude' option of 'commit' command
2204
#: bzrlib/builtins.py:3326
2205
msgid "Do not consider changes made to a given path."
2206
msgstr ""
2207
2208
# help of 'message' option of 'commit' command
2209
#: bzrlib/builtins.py:3329
2210
msgid "Description of the new revision."
2211
msgstr ""
2212
2213
# help of 'unchanged' option of 'commit' command
2214
#: bzrlib/builtins.py:3332
2215
msgid "Commit even if nothing has changed."
2216
msgstr ""
2217
2218
# help of 'file' option of 'commit' command
2219
#: bzrlib/builtins.py:3336
2220
msgid "Take commit message from this file."
2221
msgstr ""
2222
2223
# help of 'strict' option of 'commit' command
2224
#: bzrlib/builtins.py:3338
2225
msgid "Refuse to commit if there are unknown files in the working tree."
2226
msgstr ""
2227
2228
# help of 'commit-time' option of 'commit' command
2229
#: bzrlib/builtins.py:3341
2230
msgid ""
2231
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2232
"08:00:00 +0100'."
2233
msgstr ""
2234
2235
# help of 'fixes' option of 'commit' command
2236
#: bzrlib/builtins.py:3344
2237
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2238
msgstr ""
2239
2240
# help of 'author' option of 'commit' command
2241
#: bzrlib/builtins.py:3347
2242
msgid "Set the author's name, if it's different from the committer."
2243
msgstr ""
2244
2245
# help of 'local' option of 'commit' command
2246
#: bzrlib/builtins.py:3350
2247
msgid ""
2248
"Perform a local commit in a bound branch. Local commits are not pushed to "
2249
"the master branch until a normal commit is performed."
2250
msgstr ""
2251
2252
# help of 'show-diff' option of 'commit' command
2253
#: bzrlib/builtins.py:3356
2254
msgid ""
2255
"When no message is supplied, show the diff along with the status summary in "
2256
"the message editor."
2257
msgstr ""
2258
2259
# help of 'lossy' option of 'commit' command
2260
#: bzrlib/builtins.py:3359
2261
msgid ""
2262
"When committing to a foreign version control system do not push data that "
2263
"can not be natively represented."
2264
msgstr ""
2265
2266
#: bzrlib/builtins.py:3377
2267
#, python-format
2268
msgid ""
2269
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2270
"default bug tracker using the `bugtracker` option.\n"
2271
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2272
msgstr ""
2273
2274
#: bzrlib/builtins.py:3386
2275
#, python-format
2276
msgid ""
2277
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2278
"for more information on this feature.\n"
2279
"Commit refused."
2280
msgstr ""
2281
2282
#: bzrlib/builtins.py:3395
2283
#, python-format
2284
msgid "Unrecognized bug %s. Commit refused."
2285
msgstr ""
2286
2287
#: bzrlib/builtins.py:3398
2288
#, python-format
2289
msgid ""
2290
"%s\n"
2291
"Commit refused."
2292
msgstr ""
2293
2294
#: bzrlib/builtins.py:3422
2295
msgid "Could not parse --commit-time: "
2296
msgstr ""
2297
2298
#: bzrlib/builtins.py:3462
2299
msgid "please specify either --message or --file"
2300
msgstr ""
2301
2302
#: bzrlib/builtins.py:3491
2303
msgid "please specify a commit message with either --message or --file"
2304
msgstr ""
2305
2306
#: bzrlib/builtins.py:3494
2307
msgid ""
2308
"Empty commit message specified. Please specify a commit message with either "
2309
"--message or --file or leave a blank message with --message \"\"."
2310
msgstr ""
2311
2312
#: bzrlib/builtins.py:3514
2313
msgid ""
2314
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2315
"--unchanged to force an empty commit."
2316
msgstr ""
2317
2318
#: bzrlib/builtins.py:3518
2319
msgid ""
2320
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2321
"resolve FILE\" to resolve."
2322
msgstr ""
2323
2324
#: bzrlib/builtins.py:3522
2325
msgid "Commit refused because there are unknown files in the working tree."
2326
msgstr ""
2327
2328
#: bzrlib/builtins.py:3525
2329
msgid ""
2330
"\n"
2331
"To commit to master branch, run update and then commit.\n"
2332
"You can also pass --local to commit to continue working disconnected."
2333
msgstr ""
2334
2335
#: bzrlib/builtins.py:3533
2336
msgid ""
2337
"Validate working tree structure, branch consistency and repository history."
2338
msgstr ""
2339
2340
#: bzrlib/builtins.py:3535
2341
msgid ""
2342
"This command checks various invariants about branch and repository storage\n"
2343
"to detect data corruption or bzr bugs."
2344
msgstr ""
2345
2346
#: bzrlib/builtins.py:3538
2347
msgid ""
2348
"The working tree and branch checks will only give output if a problem is\n"
2349
"detected. The output fields of the repository check are:"
2350
msgstr ""
2351
2352
#: bzrlib/builtins.py:3541
2353
msgid ""
2354
"revisions\n"
2355
" This is just the number of revisions checked. It doesn't\n"
2356
" indicate a problem."
2357
msgstr ""
2358
2359
#: bzrlib/builtins.py:3545
2360
msgid ""
2361
"versionedfiles\n"
2362
" This is just the number of versionedfiles checked. It\n"
2363
" doesn't indicate a problem."
2364
msgstr ""
2365
2366
#: bzrlib/builtins.py:3549
2367
msgid ""
2368
"unreferenced ancestors\n"
2369
" Texts that are ancestors of other texts, but\n"
2370
" are not properly referenced by the revision ancestry. This is a\n"
2371
" subtle problem that Bazaar can work around."
2372
msgstr ""
2373
2374
#: bzrlib/builtins.py:3554
2375
msgid ""
2376
"unique file texts\n"
2377
" This is the total number of unique file contents\n"
2378
" seen in the checked revisions. It does not indicate a problem."
2379
msgstr ""
2380
2381
#: bzrlib/builtins.py:3558
2382
msgid ""
2383
"repeated file texts\n"
2384
" This is the total number of repeated texts seen\n"
2385
" in the checked revisions. Texts can be repeated when their file\n"
2386
" entries are modified, but the file contents are not. It does not\n"
2387
" indicate a problem."
2388
msgstr ""
2389
2390
#: bzrlib/builtins.py:3564
2391
msgid ""
2392
"If no restrictions are specified, all Bazaar data that is found at the "
2393
"given\n"
2394
"location will be checked."
2395
msgstr ""
2396
2397
#: bzrlib/builtins.py:3567
2398
msgid ":Examples:"
2399
msgstr ""
2400
2401
#: bzrlib/builtins.py:3569
2402
msgid " Check the tree and branch at 'foo'::"
2403
msgstr ""
2404
2405
#: bzrlib/builtins.py:3571
2406
msgid " bzr check --tree --branch foo"
2407
msgstr ""
2408
2409
#: bzrlib/builtins.py:3573
2410
msgid " Check only the repository at 'bar'::"
2411
msgstr ""
2412
2413
#: bzrlib/builtins.py:3575
2414
msgid " bzr check --repo bar"
2415
msgstr ""
2416
2417
#: bzrlib/builtins.py:3577
2418
msgid " Check everything at 'baz'::"
2419
msgstr ""
2420
2421
#: bzrlib/builtins.py:3579
2422
msgid " bzr check baz"
2423
msgstr ""
2424
2425
# help of 'branch' option of 'check' command
2426
#: bzrlib/builtins.py:3585
2427
msgid "Check the branch related to the current directory."
2428
msgstr ""
2429
2430
# help of 'repo' option of 'check' command
2431
#: bzrlib/builtins.py:3587
2432
msgid "Check the repository related to the current directory."
2433
msgstr ""
2434
2435
# help of 'tree' option of 'check' command
2436
#: bzrlib/builtins.py:3589
2437
msgid "Check the working tree related to the current directory."
2438
msgstr ""
2439
2440
#: bzrlib/builtins.py:3603
2441
msgid "Upgrade a repository, branch or working tree to a newer format."
2442
msgstr ""
2443
2444
#: bzrlib/builtins.py:3605
2445
msgid ""
2446
"When the default format has changed after a major new release of\n"
2447
"Bazaar, you may be informed during certain operations that you\n"
2448
"should upgrade. Upgrading to a newer format may improve performance\n"
2449
"or make new features available. It may however limit interoperability\n"
2450
"with older repositories or with older versions of Bazaar."
2451
msgstr ""
2452
2453
#: bzrlib/builtins.py:3611
2454
msgid ""
2455
"If you wish to upgrade to a particular format rather than the\n"
2456
"current default, that can be specified using the --format option.\n"
2457
"As a consequence, you can use the upgrade command this way to\n"
2458
"\"downgrade\" to an earlier format, though some conversions are\n"
2459
"a one way process (e.g. changing from the 1.x default to the\n"
2460
"2.x default) so downgrading is not always possible."
2461
msgstr ""
2462
2463
#: bzrlib/builtins.py:3618
2464
msgid ""
2465
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2466
"process (where # is a number). By default, this is left there on\n"
2467
"completion. If the conversion fails, delete the new .bzr directory\n"
2468
"and rename this one back in its place. Use the --clean option to ask\n"
2469
"for the backup.bzr directory to be removed on successful conversion.\n"
2470
"Alternatively, you can delete it by hand if everything looks good\n"
2471
"afterwards."
2472
msgstr ""
2473
2474
#: bzrlib/builtins.py:3626
2475
msgid ""
2476
"If the location given is a shared repository, dependent branches\n"
2477
"are also converted provided the repository converts successfully.\n"
2478
"If the conversion of a branch fails, remaining branches are still\n"
2479
"tried."
2480
msgstr ""
2481
2482
#: bzrlib/builtins.py:3631
2483
msgid ""
2484
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2485
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2486
msgstr ""
2487
2488
# help of 'format' option of 'upgrade' command
2489
#: bzrlib/builtins.py:3639
2490
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2491
msgstr ""
2492
2493
# title of 'format' option of 'init' command
2494
#: bzrlib/builtins.py:3643
2495
msgid "Branch format"
2496
msgstr ""
2497
2498
# help of 'clean' option of 'upgrade' command
2499
#: bzrlib/builtins.py:3645
2500
msgid "Remove the backup.bzr directory if successful."
2501
msgstr ""
2502
2503
# help of 'dry-run' option of 'add' command
2504
#: bzrlib/builtins.py:3647
2505
msgid "Show what would be done, but don't actually do anything."
2506
msgstr ""
2507
2508
#: bzrlib/builtins.py:3662
2509
msgid "Show or set bzr user id."
2510
msgstr ""
2511
2512
#: bzrlib/builtins.py:3664
2513
msgid ""
2514
":Examples:\n"
2515
" Show the email of the current user::"
2516
msgstr ""
2517
2518
#: bzrlib/builtins.py:3667
2519
msgid " bzr whoami --email"
2520
msgstr ""
2521
2522
#: bzrlib/builtins.py:3669
2523
msgid " Set the current user::"
2524
msgstr ""
2525
2526
#: bzrlib/builtins.py:3671
2527
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2528
msgstr ""
2529
2530
# help of 'email' option of 'whoami' command
2531
#: bzrlib/builtins.py:3675
2532
msgid "Display email address only."
2533
msgstr ""
2534
2535
# help of 'branch' option of 'whoami' command
2536
#: bzrlib/builtins.py:3677
2537
msgid "Set identity for the current branch instead of globally."
2538
msgstr ""
2539
2540
#: bzrlib/builtins.py:3701
2541
msgid "--email can only be used to display existing identity"
2542
msgstr ""
2543
2544
#: bzrlib/builtins.py:3723
2545
msgid "Print or set the branch nickname."
2546
msgstr ""
2547
2548
#: bzrlib/builtins.py:3725
2549
msgid ""
2550
"If unset, the tree root directory name is used as the nickname.\n"
2551
"To print the current nickname, execute with no argument."
2552
msgstr ""
2553
2554
#: bzrlib/builtins.py:3728
2555
msgid ""
2556
"Bound branches use the nickname of its master branch unless it is set\n"
2557
"locally."
2558
msgstr ""
2559
2560
#: bzrlib/builtins.py:3748
2561
msgid "Set/unset and display aliases."
2562
msgstr ""
2563
2564
#: bzrlib/builtins.py:3750
2565
msgid ""
2566
":Examples:\n"
2567
" Show the current aliases::"
2568
msgstr ""
2569
2570
#: bzrlib/builtins.py:3753
2571
msgid " bzr alias"
2572
msgstr ""
2573
2574
#: bzrlib/builtins.py:3755
2575
msgid " Show the alias specified for 'll'::"
2576
msgstr ""
2577
2578
#: bzrlib/builtins.py:3757
2579
msgid " bzr alias ll"
2580
msgstr ""
2581
2582
#: bzrlib/builtins.py:3759
2583
msgid " Set an alias for 'll'::"
2584
msgstr ""
2585
2586
#: bzrlib/builtins.py:3761
2587
msgid " bzr alias ll=\"log --line -r-10..-1\""
2588
msgstr ""
2589
2590
#: bzrlib/builtins.py:3763
2591
msgid " To remove an alias for 'll'::"
2592
msgstr ""
2593
2594
#: bzrlib/builtins.py:3765
2595
msgid " bzr alias --remove ll"
2596
msgstr ""
2597
2598
# help of 'remove' option of 'alias' command
2599
#: bzrlib/builtins.py:3770
2600
msgid "Remove the alias."
2601
msgstr ""
2602
2603
#: bzrlib/builtins.py:3788
2604
msgid "bzr alias --remove expects an alias to remove."
2605
msgstr ""
2606
2607
#: bzrlib/builtins.py:3960
2608
msgid "subunit not available. subunit needs to be installed to use --subunit."
2609
msgstr ""
2610
2611
#: bzrlib/builtins.py:3977
2612
msgid ""
2613
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2614
msgstr ""
2615
2616
#: bzrlib/builtins.py:4024
2617
msgid "Show version of bzr."
2618
msgstr ""
2619
2620
# help of 'short' option of 'version' command
2621
#: bzrlib/builtins.py:4028
2622
msgid "Print just the version number."
2623
msgstr ""
2624
2625
#: bzrlib/builtins.py:4047
2626
msgid "It sure does!\n"
2627
msgstr ""
2628
2629
#: bzrlib/builtins.py:4071
2630
#, python-format
2631
msgid "merge base is revision %s\n"
2632
msgstr ""
2633
2634
#: bzrlib/builtins.py:4075
2635
msgid "Perform a three-way merge."
2636
msgstr ""
2637
2638
#: bzrlib/builtins.py:4077
2639
msgid ""
2640
"The source of the merge can be specified either in the form of a branch,\n"
2641
"or in the form of a path to a file containing a merge directive generated\n"
2642
"with bzr send. If neither is specified, the default is the upstream branch\n"
2643
"or the branch most recently merged using --remember. The source of the\n"
2644
"merge may also be specified in the form of a path to a file in another\n"
2645
"branch: in this case, only the modifications to that file are merged into\n"
2646
"the current working tree."
2647
msgstr ""
2648
2649
#: bzrlib/builtins.py:4085
2650
msgid ""
2651
"When merging from a branch, by default bzr will try to merge in all new\n"
2652
"work from the other branch, automatically determining an appropriate base\n"
2653
"revision. If this fails, you may need to give an explicit base."
2654
msgstr ""
2655
2656
#: bzrlib/builtins.py:4089
2657
msgid ""
2658
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2659
"try to merge in all new work up to and including revision OTHER."
2660
msgstr ""
2661
2662
#: bzrlib/builtins.py:4092
2663
msgid ""
2664
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2665
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2666
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2667
"not already contain revision BASE, such a merge is commonly referred to as\n"
2668
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2669
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2670
"changes from the other branch is not stored in the commit."
2671
msgstr ""
2672
2673
#: bzrlib/builtins.py:4100
2674
msgid "Revision numbers are always relative to the source branch."
2675
msgstr ""
2676
2677
#: bzrlib/builtins.py:4107
2678
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2679
msgstr ""
2680
2681
#: bzrlib/builtins.py:4109
2682
msgid ""
2683
"If there is no default branch set, the first merge will set it (use\n"
2684
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2685
"to use the default. To change the default, use --remember. The value will\n"
2686
"only be saved if the remote location can be accessed."
2687
msgstr ""
2688
2689
#: bzrlib/builtins.py:4114
2690
msgid ""
2691
"The results of the merge are placed into the destination working\n"
2692
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2693
"committed to record the result of the merge."
2694
msgstr ""
2695
2696
#: bzrlib/builtins.py:4118
2697
msgid ""
2698
"merge refuses to run if there are any uncommitted changes, unless\n"
2699
"--force is given. If --force is given, then the changes from the source \n"
2700
"will be merged with the current working tree, including any uncommitted\n"
2701
"changes in the tree. The --force option can also be used to create a\n"
2702
"merge revision which has more than two parents."
2703
msgstr ""
2704
2705
#: bzrlib/builtins.py:4124
2706
msgid ""
2707
"If one would like to merge changes from the working tree of the other\n"
2708
"branch without merging any committed revisions, the --uncommitted option\n"
2709
"can be given."
2710
msgstr ""
2711
2712
#: bzrlib/builtins.py:4128
2713
msgid ""
2714
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2715
"you to apply each diff hunk and file change, similar to \"shelve\"."
2716
msgstr ""
2717
2718
#: bzrlib/builtins.py:4131
2719
msgid ""
2720
":Examples:\n"
2721
" To merge all new revisions from bzr.dev::"
2722
msgstr ""
2723
2724
#: bzrlib/builtins.py:4134
2725
msgid " bzr merge ../bzr.dev"
2726
msgstr ""
2727
2728
#: bzrlib/builtins.py:4136
2729
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2730
msgstr ""
2731
2732
#: bzrlib/builtins.py:4138
2733
msgid " bzr merge -r 82 ../bzr.dev"
2734
msgstr ""
2735
2736
#: bzrlib/builtins.py:4140
2737
msgid " To merge the changes introduced by 82, without previous changes::"
2738
msgstr ""
2739
2740
#: bzrlib/builtins.py:4142
2741
msgid " bzr merge -r 81..82 ../bzr.dev"
2742
msgstr ""
2743
2744
#: bzrlib/builtins.py:4144
2745
msgid " To apply a merge directive contained in /tmp/merge::"
2746
msgstr ""
2747
2748
#: bzrlib/builtins.py:4146
2749
msgid " bzr merge /tmp/merge"
2750
msgstr ""
2751
2752
#: bzrlib/builtins.py:4148
2753
msgid ""
2754
" To create a merge revision with three parents from two branches\n"
2755
" feature1a and feature1b:"
2756
msgstr ""
2757
2758
#: bzrlib/builtins.py:4151
2759
msgid ""
2760
" bzr merge ../feature1a\n"
2761
" bzr merge ../feature1b --force\n"
2762
" bzr commit -m 'revision with three parents'"
2763
msgstr ""
2764
2765
# help of 'force' option of 'merge' command
2766
#: bzrlib/builtins.py:4163
2767
msgid "Merge even if the destination tree has uncommitted changes."
2768
msgstr ""
2769
2770
# help of 'uncommitted' option of 'merge' command
2771
#: bzrlib/builtins.py:4169
2772
msgid ""
2773
"Apply uncommitted changes from a working copy, instead of branch changes."
2774
msgstr ""
2775
2776
# help of 'pull' option of 'merge' command
2777
#: bzrlib/builtins.py:4171
2778
msgid ""
2779
"If the destination is already completely merged into the source, pull from "
2780
"the source rather than merging. When this happens, you do not need to "
2781
"commit the result."
2782
msgstr ""
2783
2784
# help of 'directory' option of 'merge' command
2785
#: bzrlib/builtins.py:4176
2786
msgid ""
2787
"Branch to merge into, rather than the one containing the working directory."
2788
msgstr ""
2789
2790
# help of 'preview' option of 'merge' command
2791
#: bzrlib/builtins.py:4178
2792
msgid "Instead of merging, show a diff of the merge."
2793
msgstr ""
2794
2795
# help of 'interactive' option of 'merge' command
2796
#: bzrlib/builtins.py:4180
2797
msgid "Select changes interactively."
2798
msgstr ""
2799
2800
#: bzrlib/builtins.py:4202
2801
msgid ""
2802
"Merging into empty branches not currently supported, https://bugs.launchpad."
2803
"net/bzr/+bug/308562"
2804
msgstr ""
2805
2806
#: bzrlib/builtins.py:4229
2807
msgid "Cannot use --uncommitted with bundles or merge directives."
2808
msgstr ""
2809
2810
#: bzrlib/builtins.py:4240
2811
msgid "Cannot use --uncommitted and --revision at the same time."
2812
msgstr ""
2813
2814
#: bzrlib/builtins.py:4260
2815
msgid "merger: "
2816
msgstr ""
2817
2818
#: bzrlib/builtins.py:4262 bzrlib/bundle/apply_bundle.py:68
2819
msgid "Nothing to do."
2820
msgstr ""
2821
2822
#: bzrlib/builtins.py:4266
2823
msgid "Cannot pull individual files"
2824
msgstr ""
2825
2826
#: bzrlib/builtins.py:4274
2827
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2828
msgstr ""
2829
2830
#: bzrlib/builtins.py:4332
2831
#, python-format
2832
msgid "Show-base is not supported for this merge type. %s"
2833
msgstr ""
2834
2835
#: bzrlib/builtins.py:4341
2836
#, python-format
2837
msgid "Conflict reduction is not supported for merge type %s."
2838
msgstr ""
2839
2840
#: bzrlib/builtins.py:4345
2841
msgid "Cannot do conflict reduction and show base."
2842
msgstr ""
2843
2844
#: bzrlib/builtins.py:4456
2845
msgid "No location specified or remembered"
2846
msgstr ""
2847
2848
#: bzrlib/builtins.py:4458
2849
msgid "{0} remembered {1} location {2}"
2850
msgstr ""
2851
2852
#: bzrlib/builtins.py:4464
2853
msgid "Redo a merge."
2854
msgstr ""
2855
2856
#: bzrlib/builtins.py:4466
2857
msgid ""
2858
"Use this if you want to try a different merge technique while resolving\n"
2859
"conflicts. Some merge techniques are better than others, and remerge\n"
2860
"lets you try different ones on different files."
2861
msgstr ""
2862
2863
#: bzrlib/builtins.py:4470
2864
msgid ""
2865
"The options for remerge have the same meaning and defaults as the ones for\n"
2866
"merge. The difference is that remerge can (only) be run when there is a\n"
2867
"pending merge, and it lets you specify particular files."
2868
msgstr ""
2869
2870
#: bzrlib/builtins.py:4474
2871
msgid ""
2872
":Examples:\n"
2873
" Re-do the merge of all conflicted files, and show the base text in\n"
2874
" conflict regions, in addition to the usual THIS and OTHER texts::"
2875
msgstr ""
2876
2877
#: bzrlib/builtins.py:4478
2878
msgid " bzr remerge --show-base"
2879
msgstr ""
2880
2881
#: bzrlib/builtins.py:4480
2882
msgid ""
2883
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2884
" additional processing to reduce the size of conflict regions::"
2885
msgstr ""
2886
2887
#: bzrlib/builtins.py:4483
2888
msgid " bzr remerge --merge-type weave --reprocess foobar"
2889
msgstr ""
2890
2891
# help of 'show-base' option of 'merge' command
2892
#: bzrlib/builtins.py:4490
2893
msgid "Show base revision text in conflicts."
2894
msgstr ""
2895
2896
#: bzrlib/builtins.py:4502
2897
msgid ""
2898
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2899
"merges."
2900
msgstr ""
2901
2902
#: bzrlib/builtins.py:4558
2903
msgid "Revert files to a previous revision."
2904
msgstr ""
2905
2906
#: bzrlib/builtins.py:4560
2907
msgid ""
2908
"Giving a list of files will revert only those files. Otherwise, all files\n"
2909
"will be reverted. If the revision is not specified with '--revision', the\n"
2910
"last committed revision is used."
2911
msgstr ""
2912
2913
#: bzrlib/builtins.py:4564
2914
msgid ""
2915
"To remove only some changes, without reverting to a prior version, use\n"
2916
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2917
"will remove the changes introduced by the second last commit (-2), without\n"
2918
"affecting the changes introduced by the last commit (-1). To remove\n"
2919
"certain changes on a hunk-by-hunk basis, see the shelve command."
2920
msgstr ""
2921
2922
#: bzrlib/builtins.py:4570
2923
msgid ""
2924
"By default, any files that have been manually changed will be backed up\n"
2925
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2926
"'.~#~' appended to their name, where # is a number."
2927
msgstr ""
2928
2929
#: bzrlib/builtins.py:4574
2930
msgid ""
2931
"When you provide files, you can use their current pathname or the pathname\n"
2932
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2933
"name. If you name a directory, all the contents of that directory will be\n"
2934
"reverted."
2935
msgstr ""
2936
2937
#: bzrlib/builtins.py:4579
2938
msgid ""
2939
"If you have newly added files since the target revision, they will be\n"
2940
"removed. If the files to be removed have been changed, backups will be\n"
2941
"created as above. Directories containing unknown files will not be\n"
2942
"deleted."
2943
msgstr ""
2944
2945
#: bzrlib/builtins.py:4584
2946
msgid ""
2947
"The working tree contains a list of revisions that have been merged but\n"
2948
"not yet committed. These revisions will be included as additional parents\n"
2949
"of the next commit. Normally, using revert clears that list as well as\n"
2950
"reverting the files. If any files are specified, revert leaves the list\n"
2951
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2952
".`` in the tree root to revert all files but keep the recorded merges,\n"
2953
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2954
"reverting any files."
2955
msgstr ""
2956
2957
#: bzrlib/builtins.py:4593
2958
msgid ""
2959
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2960
"changes from a branch in a single revision. To do this, perform the merge\n"
2961
"as desired. Then doing revert with the \"--forget-merges\" option will "
2962
"keep\n"
2963
"the content of the tree as it was, but it will clear the list of pending\n"
2964
"merges. The next commit will then contain all of the changes that are\n"
2965
"present in the other branch, but without any other parent revisions.\n"
2966
"Because this technique forgets where these changes originated, it may\n"
2967
"cause additional conflicts on later merges involving the same source and\n"
2968
"target branches."
2969
msgstr ""
2970
2971
# help of 'no-backup' option of 'revert' command
2972
#: bzrlib/builtins.py:4607
2973
msgid "Do not save backups of reverted files."
2974
msgstr ""
2975
2976
# help of 'forget-merges' option of 'revert' command
2977
#: bzrlib/builtins.py:4609
2978
msgid "Remove pending merge marker, without changing any files."
2979
msgstr ""
2980
2981
#: bzrlib/builtins.py:4640
2982
msgid ""
2983
"Show help on a command or other topic.\n"
2984
" "
2985
msgstr ""
2986
2987
# help of 'long' option of 'help' command
2988
#: bzrlib/builtins.py:4645
2989
msgid "Show help on all commands."
2990
msgstr ""
2991
2992
#: bzrlib/builtins.py:4674
2993
msgid "Show unmerged/unpulled revisions between two branches."
2994
msgstr ""
2995
2996
#: bzrlib/builtins.py:4676
2997
msgid "OTHER_BRANCH may be local or remote."
2998
msgstr ""
2999
3000
#: bzrlib/builtins.py:4678
3001
msgid ""
3002
"To filter on a range of revisions, you can use the command -r begin..end\n"
3003
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3004
"also valid.\n"
3005
" \n"
3006
":Exit values:\n"
3007
" 1 - some missing revisions\n"
3008
" 0 - no missing revisions"
3009
msgstr ""
3010
3011
#: bzrlib/builtins.py:4688
3012
msgid ""
3013
" Determine the missing revisions between this and the branch at the\n"
3014
" remembered pull location::"
3015
msgstr ""
3016
3017
#: bzrlib/builtins.py:4691
3018
msgid " bzr missing"
3019
msgstr ""
3020
3021
#: bzrlib/builtins.py:4693
3022
msgid " Determine the missing revisions between this and another branch::"
3023
msgstr ""
3024
3025
#: bzrlib/builtins.py:4695
3026
msgid " bzr missing http://server/branch"
3027
msgstr ""
3028
3029
#: bzrlib/builtins.py:4697
3030
msgid ""
3031
" Determine the missing revisions up to a specific revision on the other\n"
3032
" branch::"
3033
msgstr ""
3034
3035
#: bzrlib/builtins.py:4700
3036
msgid " bzr missing -r ..-10"
3037
msgstr ""
3038
3039
#: bzrlib/builtins.py:4702
3040
msgid ""
3041
" Determine the missing revisions up to a specific revision on this\n"
3042
" branch::"
3043
msgstr ""
3044
3045
#: bzrlib/builtins.py:4705
3046
msgid " bzr missing --my-revision ..-10"
3047
msgstr ""
3048
3049
# help of 'reverse' option of 'missing' command
3050
#: bzrlib/builtins.py:4712
3051
msgid "Reverse the order of revisions."
3052
msgstr ""
3053
3054
# help of 'mine-only' option of 'missing' command
3055
#: bzrlib/builtins.py:4714
3056
msgid "Display changes in the local branch only."
3057
msgstr ""
3058
3059
# help of 'this' option of 'missing' command
3060
#: bzrlib/builtins.py:4715
3061
msgid "Same as --mine-only."
3062
msgstr ""
3063
3064
# help of 'theirs-only' option of 'missing' command
3065
#: bzrlib/builtins.py:4717
3066
msgid "Display changes in the remote branch only."
3067
msgstr ""
3068
3069
# help of 'other' option of 'missing' command
3070
#: bzrlib/builtins.py:4718
3071
msgid "Same as --theirs-only."
3072
msgstr ""
3073
3074
# help of 'revision' option of 'missing' command
3075
#: bzrlib/builtins.py:4723
3076
msgid ""
3077
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3078
"details."
3079
msgstr ""
3080
3081
# help of 'my-revision' option of 'missing' command
3082
#: bzrlib/builtins.py:4727
3083
msgid ""
3084
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3085
"details."
3086
msgstr ""
3087
3088
# help of 'include-merged' option of 'missing' command
3089
#: bzrlib/builtins.py:4730
3090
msgid "Show all revisions in addition to the mainline ones."
3091
msgstr ""
3092
3093
#: bzrlib/builtins.py:4784
3094
msgid "No peer location known or specified."
3095
msgstr ""
3096
3097
#: bzrlib/builtins.py:4788
3098
msgid "Using saved parent location: {0}\n"
3099
msgstr ""
3100
3101
#: bzrlib/builtins.py:4821
3102
#, python-format
3103
msgid "You have %d extra revision:\n"
3104
msgid_plural "You have %d extra revisions:\n"
3105
msgstr[0] ""
3106
msgstr[1] ""
3107
3108
#: bzrlib/builtins.py:4837
3109
#, python-format
3110
msgid "You are missing %d revision:\n"
3111
msgid_plural "You are missing %d revisions:\n"
3112
msgstr[0] ""
3113
msgstr[1] ""
3114
3115
#: bzrlib/builtins.py:4849
3116
msgid "This branch has no new revisions.\n"
3117
msgstr ""
3118
3119
#: bzrlib/builtins.py:4852
3120
msgid "Other branch has no new revisions.\n"
3121
msgstr ""
3122
3123
#: bzrlib/builtins.py:4857
3124
msgid "Branches are up to date.\n"
3125
msgstr ""
3126
3127
#: bzrlib/builtins.py:4868
3128
msgid "Compress the data within a repository."
3129
msgstr ""
3130
3131
#: bzrlib/builtins.py:4870
3132
msgid ""
3133
"This operation compresses the data within a bazaar repository. As\n"
3134
"bazaar supports automatic packing of repository, this operation is\n"
3135
"normally not required to be done manually."
3136
msgstr ""
3137
3138
#: bzrlib/builtins.py:4874
3139
msgid ""
3140
"During the pack operation, bazaar takes a backup of existing repository\n"
3141
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3142
"automatically when it is safe to do so. To save disk space by removing\n"
3143
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3144
"used."
3145
msgstr ""
3146
3147
#: bzrlib/builtins.py:4880
3148
msgid ""
3149
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3150
"during or immediately after repacking, you may be left with a state\n"
3151
"where the deletion has been written to disk but the new packs have not\n"
3152
"been. In this case the repository may be unusable."
3153
msgstr ""
3154
3155
# help of 'clean-obsolete-packs' option of 'pack' command
3156
#: bzrlib/builtins.py:4889
3157
msgid "Delete obsolete packs to save disk space."
3158
msgstr ""
3159
3160
#: bzrlib/builtins.py:4903
3161
msgid "List the installed plugins."
3162
msgstr ""
3163
3164
#: bzrlib/builtins.py:4905
3165
msgid ""
3166
"This command displays the list of installed plugins including\n"
3167
"version of plugin and a short description of each."
3168
msgstr ""
3169
3170
#: bzrlib/builtins.py:4908
3171
msgid "--verbose shows the path where each plugin is located."
3172
msgstr ""
3173
3174
#: bzrlib/builtins.py:4910
3175
msgid ""
3176
"A plugin is an external component for Bazaar that extends the\n"
3177
"revision control system, by adding or replacing code in Bazaar.\n"
3178
"Plugins can do a variety of things, including overriding commands,\n"
3179
"adding new commands, providing additional network transports and\n"
3180
"customizing log output."
3181
msgstr ""
3182
3183
#: bzrlib/builtins.py:4916
3184
msgid ""
3185
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3186
"for further information on plugins including where to find them and how to\n"
3187
"install them. Instructions are also provided there on how to write new\n"
3188
"plugins using the Python programming language."
3189
msgstr ""
3190
3191
#: bzrlib/builtins.py:4932
3192
msgid "Show testament (signing-form) of a revision."
3193
msgstr ""
3194
3195
# help of 'long' option of 'testament' command
3196
#: bzrlib/builtins.py:4935
3197
msgid "Produce long-format testament."
3198
msgstr ""
3199
3200
# help of 'strict' option of 'testament' command
3201
#: bzrlib/builtins.py:4937
3202
msgid "Produce a strict-format testament."
3203
msgstr ""
3204
3205
#: bzrlib/builtins.py:4963
3206
msgid "Show the origin of each line in a file."
3207
msgstr ""
3208
3209
#: bzrlib/builtins.py:4965
3210
msgid ""
3211
"This prints out the given file with an annotation on the left side\n"
3212
"indicating which revision, author and date introduced the change."
3213
msgstr ""
3214
3215
#: bzrlib/builtins.py:4968
3216
msgid ""
3217
"If the origin is the same for a run of consecutive lines, it is\n"
3218
"shown only at the top, unless the --all option is given."
3219
msgstr ""
3220
3221
# help of 'all' option of 'annotate' command
3222
#: bzrlib/builtins.py:4976
3223
msgid "Show annotations on all lines."
3224
msgstr ""
3225
3226
# help of 'long' option of 'annotate' command
3227
#: bzrlib/builtins.py:4977
3228
msgid "Show commit date in annotations."
3229
msgstr ""
3230
3231
#: bzrlib/builtins.py:5064
3232
msgid "Cannot sign a range of non-revision-history revisions"
3233
msgstr ""
3234
3235
#: bzrlib/builtins.py:5076
3236
msgid "Please supply either one revision, or a range."
3237
msgstr ""
3238
3239
#: bzrlib/builtins.py:5080
3240
msgid ""
3241
"Convert the current branch into a checkout of the supplied branch.\n"
3242
"If no branch is supplied, rebind to the last bound location."
3243
msgstr ""
3244
3245
#: bzrlib/builtins.py:5083
3246
msgid ""
3247
"Once converted into a checkout, commits must succeed on the master branch\n"
3248
"before they will be applied to the local branch."
3249
msgstr ""
3250
3251
#: bzrlib/builtins.py:5086
3252
msgid ""
3253
"Bound branches use the nickname of its master branch unless it is set\n"
3254
"locally, in which case binding will update the local nickname to be\n"
3255
"that of the master."
3256
msgstr ""
3257
3258
#: bzrlib/builtins.py:5101
3259
msgid "No location supplied. This format does not remember old locations."
3260
msgstr ""
3261
3262
#: bzrlib/builtins.py:5106
3263
msgid "Branch is already bound"
3264
msgstr ""
3265
3266
#: bzrlib/builtins.py:5108
3267
msgid "No location supplied and no previous location known"
3268
msgstr ""
3269
3270
#: bzrlib/builtins.py:5114
3271
msgid "These branches have diverged. Try merging, and then bind again."
3272
msgstr ""
3273
3274
#: bzrlib/builtins.py:5121
3275
msgid "Convert the current checkout into a regular branch."
3276
msgstr ""
3277
3278
#: bzrlib/builtins.py:5123
3279
msgid ""
3280
"After unbinding, the local branch is considered independent and subsequent\n"
3281
"commits will be local only."
3282
msgstr ""
3283
3284
#: bzrlib/builtins.py:5134
3285
msgid "Local branch is not bound"
3286
msgstr ""
3287
3288
#: bzrlib/builtins.py:5138
3289
msgid "Remove the last committed revision."
3290
msgstr ""
3291
3292
#: bzrlib/builtins.py:5140
3293
msgid ""
3294
"--verbose will print out what is being removed.\n"
3295
"--dry-run will go through all the motions, but not actually\n"
3296
"remove anything."
3297
msgstr ""
3298
3299
#: bzrlib/builtins.py:5144
3300
msgid ""
3301
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3302
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3303
"branch at revision 15."
3304
msgstr ""
3305
3306
#: bzrlib/builtins.py:5148
3307
msgid ""
3308
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3309
"it may make is to restore any pending merges that were present before\n"
3310
"the commit."
3311
msgstr ""
3312
3313
# help of 'dry-run' option of 'uncommit' command
3314
#: bzrlib/builtins.py:5159
3315
msgid "Don't actually make changes."
3316
msgstr ""
3317
3318
# help of 'force' option of 'uncommit' command
3319
#: bzrlib/builtins.py:5160
3320
msgid "Say yes to all questions."
3321
msgstr ""
3322
3323
# help of 'keep-tags' option of 'uncommit' command
3324
#: bzrlib/builtins.py:5162
3325
msgid "Keep tags that point to removed revisions."
3326
msgstr ""
3327
3328
# help of 'local' option of 'uncommit' command
3329
#: bzrlib/builtins.py:5164
3330
msgid "Only remove the commits from the local branch when in a checkout."
3331
msgstr ""
3332
3333
#: bzrlib/builtins.py:5213
3334
msgid "No revisions to uncommit.\n"
3335
msgstr ""
3336
3337
#: bzrlib/builtins.py:5228
3338
msgid "Dry-run, pretending to remove the above revisions.\n"
3339
msgstr ""
3340
3341
#: bzrlib/builtins.py:5231
3342
msgid "The above revision(s) will be removed.\n"
3343
msgstr ""
3344
3345
#: bzrlib/builtins.py:5235
3346
msgid "Uncommit these revisions"
3347
msgstr ""
3348
3349
#: bzrlib/builtins.py:5238
3350
msgid "Canceled\n"
3351
msgstr ""
3352
3353
#: bzrlib/builtins.py:5245
3354
#, python-format
3355
msgid ""
3356
"You can restore the old tip by running:\n"
3357
" bzr pull . -r revid:%s\n"
3358
msgstr ""
3359
3360
#: bzrlib/builtins.py:5250
3361
msgid "Break a dead lock."
3362
msgstr ""
3363
3364
#: bzrlib/builtins.py:5252
3365
msgid ""
3366
"This command breaks a lock on a repository, branch, working directory or\n"
3367
"config file."
3368
msgstr ""
3369
3370
#: bzrlib/builtins.py:5255
3371
msgid ""
3372
"CAUTION: Locks should only be broken when you are sure that the process\n"
3373
"holding the lock has been stopped."
3374
msgstr ""
3375
3376
#: bzrlib/builtins.py:5258
3377
msgid ""
3378
"You can get information on what locks are open via the 'bzr info\n"
3379
"[location]' command."
3380
msgstr ""
3381
3382
#: bzrlib/builtins.py:5261
3383
msgid ""
3384
":Examples:\n"
3385
" bzr break-lock\n"
3386
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3387
" bzr break-lock --conf ~/.bazaar"
3388
msgstr ""
3389
3390
# help of 'config' option of 'break-lock' command
3391
#: bzrlib/builtins.py:5270
3392
msgid "LOCATION is the directory where the config lock is."
3393
msgstr ""
3394
3395
# help of 'force' option of 'break-lock' command
3396
#: bzrlib/builtins.py:5272
3397
msgid "Do not ask for confirmation before breaking the lock."
3398
msgstr ""
3399
3400
# help of 'protocol=bzr' option of 'serve' command
3401
#: bzrlib/builtins.py:5307
3402
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3403
msgstr ""
3404
3405
#: bzrlib/builtins.py:5308
3406
msgid "Run the bzr server."
3407
msgstr ""
3408
3409
# help of 'inet' option of 'serve' command
3410
#: bzrlib/builtins.py:5314
3411
msgid "Serve on stdin/out for use from inetd or sshd."
3412
msgstr ""
3413
3414
# title of 'protocol' option of 'serve' command
3415
#: bzrlib/builtins.py:5315
3416
msgid "protocol"
3417
msgstr ""
3418
3419
# help of 'protocol' option of 'serve' command
3420
#: bzrlib/builtins.py:5316
3421
msgid "Protocol to serve."
3422
msgstr ""
3423
3424
# help of 'port' option of 'serve' command
3425
#: bzrlib/builtins.py:5320
3426
msgid ""
3427
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3428
"Passing 0 as the port number will result in a dynamically allocated port. "
3429
"The default port depends on the protocol."
3430
msgstr ""
3431
3432
# help of 'directory' option of 'serve' command
3433
#: bzrlib/builtins.py:5326
3434
msgid "Serve contents of this directory."
3435
msgstr ""
3436
3437
# help of 'allow-writes' option of 'serve' command
3438
#: bzrlib/builtins.py:5328
3439
msgid ""
3440
"By default the server is a readonly server. Supplying --allow-writes "
3441
"enables write access to the contents of the served directory and below. "
3442
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3443
"of external authentication is arranged supplying this option leads to global "
3444
"uncontrolled write access to your file system."
3445
msgstr ""
3446
3447
# help of 'client-timeout' option of 'serve' command
3448
#: bzrlib/builtins.py:5337
3449
msgid "Override the default idle client timeout (5min)."
3450
msgstr ""
3451
3452
#: bzrlib/builtins.py:5387
3453
msgid "Combine a tree into its containing tree."
3454
msgstr ""
3455
3456
#: bzrlib/builtins.py:5389
3457
msgid "This command requires the target tree to be in a rich-root format."
3458
msgstr ""
3459
3460
#: bzrlib/builtins.py:5391
3461
msgid ""
3462
"The TREE argument should be an independent tree, inside another tree, but\n"
3463
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3464
"running \"bzr branch\" with the target inside a tree.)"
3465
msgstr ""
3466
3467
#: bzrlib/builtins.py:5395
3468
msgid ""
3469
"The result is a combined tree, with the subtree no longer an independent\n"
3470
"part. This is marked as a merge of the subtree into the containing tree,\n"
3471
"and all history is preserved."
3472
msgstr ""
3473
3474
#: bzrlib/builtins.py:5413
3475
#, python-format
3476
msgid ""
3477
"Can't join trees because %s doesn't support rich root data.\n"
3478
"You can use bzr upgrade on the repository."
3479
msgstr ""
3480
3481
#: bzrlib/builtins.py:5423 bzrlib/builtins.py:5429
3482
msgid "Cannot join {0}. {1}"
3483
msgstr ""
3484
3485
#: bzrlib/builtins.py:5433
3486
msgid "Split a subdirectory of a tree into a separate tree."
3487
msgstr ""
3488
3489
#: bzrlib/builtins.py:5435
3490
msgid ""
3491
"This command will produce a target tree in a format that supports\n"
3492
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3493
"converted into earlier formats like 'dirstate-tags'."
3494
msgstr ""
3495
3496
#: bzrlib/builtins.py:5439
3497
msgid ""
3498
"The TREE argument should be a subdirectory of a working tree. That\n"
3499
"subdirectory will be converted into an independent tree, with its own\n"
3500
"branch. Commits in the top-level tree will not apply to the new subtree."
3501
msgstr ""
3502
3503
#: bzrlib/builtins.py:5519
3504
msgid "No submit branch specified or known"
3505
msgstr ""
3506
3507
#: bzrlib/builtins.py:5527 bzrlib/send.py:106
3508
msgid "No public branch specified or known"
3509
msgstr ""
3510
3511
#: bzrlib/builtins.py:5532
3512
msgid "bzr merge-directive takes at most two one revision identifiers"
3513
msgstr ""
3514
3515
#: bzrlib/builtins.py:5541
3516
msgid "No revisions to bundle."
3517
msgstr ""
3518
3519
#: bzrlib/builtins.py:5560
3520
msgid "Mail or create a merge-directive for submitting changes."
3521
msgstr ""
3522
3523
#: bzrlib/builtins.py:5562
3524
msgid "A merge directive provides many things needed for requesting merges:"
3525
msgstr ""
3526
3527
#: bzrlib/builtins.py:5564
3528
msgid "* A machine-readable description of the merge to perform"
3529
msgstr ""
3530
3531
#: bzrlib/builtins.py:5566
3532
msgid "* An optional patch that is a preview of the changes requested"
3533
msgstr ""
3534
3535
#: bzrlib/builtins.py:5568
3536
msgid ""
3537
"* An optional bundle of revision data, so that the changes can be applied\n"
3538
" directly from the merge directive, without retrieving data from a\n"
3539
" branch."
3540
msgstr ""
3541
3542
#: bzrlib/builtins.py:5572
3543
msgid ""
3544
"`bzr send` creates a compact data set that, when applied using bzr\n"
3545
"merge, has the same effect as merging from the source branch. "
3546
msgstr ""
3547
3548
#: bzrlib/builtins.py:5575
3549
msgid ""
3550
"By default the merge directive is self-contained and can be applied to any\n"
3551
"branch containing submit_branch in its ancestory without needing access to\n"
3552
"the source branch."
3553
msgstr ""
3554
3555
#: bzrlib/builtins.py:5579
3556
msgid ""
3557
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3558
"revisions, but only a structured request to merge from the\n"
3559
"public_location. In that case the public_branch is needed and it must be\n"
3560
"up-to-date and accessible to the recipient. The public_branch is always\n"
3561
"included if known, so that people can check it later."
3562
msgstr ""
3563
3564
#: bzrlib/builtins.py:5585
3565
msgid ""
3566
"The submit branch defaults to the parent of the source branch, but can be\n"
3567
"overridden. Both submit branch and public branch will be remembered in\n"
3568
"branch.conf the first time they are used for a particular branch. The\n"
3569
"source branch defaults to that containing the working directory, but can\n"
3570
"be changed using --from."
3571
msgstr ""
3572
3573
#: bzrlib/builtins.py:5591
3574
msgid ""
3575
"Both the submit branch and the public branch follow the usual behavior with\n"
3576
"respect to --remember: If there is no default location set, the first send\n"
3577
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3578
"omit the location to use the default. To change the default, use\n"
3579
"--remember. The value will only be saved if the location can be accessed."
3580
msgstr ""
3581
3582
#: bzrlib/builtins.py:5597
3583
msgid ""
3584
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3585
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3586
"If a public location is known for the submit_branch, that location is used\n"
3587
"in the merge directive."
3588
msgstr ""
3589
3590
#: bzrlib/builtins.py:5602
3591
msgid ""
3592
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3593
"given, in which case it is sent to a file."
3594
msgstr ""
3595
3596
#: bzrlib/builtins.py:5605
3597
msgid ""
3598
"Mail is sent using your preferred mail program. This should be transparent\n"
3599
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3600
"If the preferred client can't be found (or used), your editor will be used."
3601
msgstr ""
3602
3603
#: bzrlib/builtins.py:5609
3604
msgid ""
3605
"To use a specific mail program, set the mail_client configuration option.\n"
3606
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3607
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
3608
"\" (MacOS X's\n"
3609
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3610
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3611
"add\n"
3612
"supported clients."
3613
msgstr ""
3614
3615
#: bzrlib/builtins.py:5616
3616
msgid ""
3617
"If mail is being sent, a to address is required. This can be supplied\n"
3618
"either on the commandline, by setting the submit_to configuration\n"
3619
"option in the branch itself or the child_submit_to configuration option\n"
3620
"in the submit branch."
3621
msgstr ""
3622
3623
#: bzrlib/builtins.py:5621
3624
msgid ""
3625
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3626
"and\n"
3627
"merge directive format 2. It is significantly faster and smaller than\n"
3628
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3629
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3630
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3631
msgstr ""
3632
3633
#: bzrlib/builtins.py:5627
3634
msgid ""
3635
"The merge directives created by bzr send may be applied using bzr merge or\n"
3636
"bzr pull by specifying a file containing a merge directive as the location."
3637
msgstr ""
3638
3639
#: bzrlib/builtins.py:5630
3640
msgid ""
3641
"bzr send makes extensive use of public locations to map local locations "
3642
"into\n"
3643
"URLs that can be used by other people. See `bzr help configuration` to\n"
3644
"set them, and use `bzr info` to display them."
3645
msgstr ""
3646
3647
# help of 'output' option of 'send' command
3648
#: bzrlib/builtins.py:5654
3649
msgid "Write merge directive to this file or directory; use - for stdout."
3650
msgstr ""
3651
3652
# help of 'strict' option of 'send' command
3653
#: bzrlib/builtins.py:5658
3654
msgid ""
3655
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3656
"strict disables the check."
3657
msgstr ""
3658
3659
# help of 'mail-to' option of 'send' command
3660
#: bzrlib/builtins.py:5660
3661
msgid "Mail the request to this address."
3662
msgstr ""
3663
3664
# help of 'body' option of 'send' command
3665
#: bzrlib/builtins.py:5664
3666
msgid "Body for the email."
3667
msgstr ""
3668
3669
# help of 'no-bundle' option of 'send' command
3670
#: bzrlib/builtins.py:5717
3671
msgid "Do not include a bundle in the merge directive."
3672
msgstr ""
3673
3674
# help of 'no-patch' option of 'send' command
3675
#: bzrlib/builtins.py:5718
3676
msgid "Do not include a preview patch in the merge directive."
3677
msgstr ""
3678
3679
# help of 'remember' option of 'send' command
3680
#: bzrlib/builtins.py:5721
3681
msgid "Remember submit and public branch."
3682
msgstr ""
3683
3684
# help of 'from' option of 'send' command
3685
#: bzrlib/builtins.py:5723
3686
msgid ""
3687
"Branch to generate the submission from, rather than the one containing the "
3688
"working directory."
3689
msgstr ""
3690
3691
# title of 'format' option of 'send' command
3692
#: bzrlib/builtins.py:5733
3693
msgid "format"
3694
msgstr ""
3695
3696
# help of 'format' option of 'send' command
3697
#: bzrlib/builtins.py:5734
3698
msgid "Use the specified output format."
3699
msgstr ""
3700
3701
#: bzrlib/builtins.py:5756
3702
msgid "Create, remove or modify a tag naming a revision."
3703
msgstr ""
3704
3705
#: bzrlib/builtins.py:5758
3706
msgid ""
3707
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3708
"(--revision) option can be given -rtag:X, where X is any previously\n"
3709
"created tag."
3710
msgstr ""
3711
3712
#: bzrlib/builtins.py:5762
3713
msgid ""
3714
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3715
"along when you branch, push, pull or merge."
3716
msgstr ""
3717
3718
#: bzrlib/builtins.py:5765
3719
msgid ""
3720
"It is an error to give a tag name that already exists unless you pass\n"
3721
"--force, in which case the tag is moved to point to the new revision."
3722
msgstr ""
3723
3724
#: bzrlib/builtins.py:5768
3725
msgid ""
3726
"To rename a tag (change the name but keep it on the same revsion), run "
3727
"``bzr\n"
3728
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3729
msgstr ""
3730
3731
#: bzrlib/builtins.py:5771
3732
msgid ""
3733
"If no tag name is specified it will be determined through the \n"
3734
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3735
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3736
"details."
3737
msgstr ""
3738
3739
# help of 'delete' option of 'tag' command
3740
#: bzrlib/builtins.py:5781
3741
msgid "Delete this tag rather than placing it."
3742
msgstr ""
3743
3744
# help of 'directory' option of 'tag' command
3745
#: bzrlib/builtins.py:5784
3746
msgid "Branch in which to place the tag."
3747
msgstr ""
3748
3749
# help of 'force' option of 'tag' command
3750
#: bzrlib/builtins.py:5786
3751
msgid "Replace existing tags."
3752
msgstr ""
3753
3754
#: bzrlib/builtins.py:5801
3755
msgid "No tag specified to delete."
3756
msgstr ""
3757
3758
#: bzrlib/builtins.py:5803
3759
#, python-format
3760
msgid "Deleted tag %s."
3761
msgstr ""
3762
3763
#: bzrlib/builtins.py:5817
3764
msgid "Please specify a tag name."
3765
msgstr ""
3766
3767
#: bzrlib/builtins.py:5825
3768
#, python-format
3769
msgid "Tag %s already exists for that revision."
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:5829
3773
#, python-format
3774
msgid "Created tag %s."
3775
msgstr ""
3776
3777
#: bzrlib/builtins.py:5831
3778
#, python-format
3779
msgid "Updated tag %s."
3780
msgstr ""
3781
3782
#: bzrlib/builtins.py:5835
3783
msgid "List tags."
3784
msgstr ""
3785
3786
#: bzrlib/builtins.py:5837
3787
msgid ""
3788
"This command shows a table of tag names and the revisions they reference."
3789
msgstr ""
3790
3791
# help of 'directory' option of 'tags' command
3792
#: bzrlib/builtins.py:5843
3793
msgid "Branch whose tags should be displayed."
3794
msgstr ""
3795
3796
# help of 'sort' option of 'tags' command
3797
#: bzrlib/builtins.py:5845
3798
msgid "Sort tags by different criteria."
3799
msgstr ""
3800
3801
# title of 'sort' option of 'tags' command
3802
#: bzrlib/builtins.py:5845
3803
msgid "Sorting"
3804
msgstr ""
3805
3806
#: bzrlib/builtins.py:5914
3807
msgid "Reconfigure the type of a bzr directory."
3808
msgstr ""
3809
3810
#: bzrlib/builtins.py:5916
3811
msgid "A target configuration must be specified."
3812
msgstr ""
3813
3814
#: bzrlib/builtins.py:5918
3815
msgid ""
3816
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3817
"The order of preference is\n"
3818
"1. For a lightweight checkout, the current bound location.\n"
3819
"2. For branches that used to be checkouts, the previously-bound location.\n"
3820
"3. The push location.\n"
3821
"4. The parent location.\n"
3822
"If none of these is available, --bind-to must be specified."
3823
msgstr ""
3824
3825
# title of 'tree_type' option of 'reconfigure' command
3826
#: bzrlib/builtins.py:5932
3827
msgid "Tree type"
3828
msgstr ""
3829
3830
# help of 'tree_type' option of 'reconfigure' command
3831
#: bzrlib/builtins.py:5933
3832
msgid "The relation between branch and tree."
3833
msgstr ""
3834
3835
# help of 'tree_type=branch' option of 'reconfigure' command
3836
#: bzrlib/builtins.py:5935
3837
msgid "Reconfigure to be an unbound branch with no working tree."
3838
msgstr ""
3839
3840
# help of 'tree_type=tree' option of 'reconfigure' command
3841
#: bzrlib/builtins.py:5936
3842
msgid "Reconfigure to be an unbound branch with a working tree."
3843
msgstr ""
3844
3845
# help of 'tree_type=checkout' option of 'reconfigure' command
3846
#: bzrlib/builtins.py:5937
3847
msgid "Reconfigure to be a bound branch with a working tree."
3848
msgstr ""
3849
3850
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3851
#: bzrlib/builtins.py:5938
3852
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3853
msgstr ""
3854
3855
# title of 'repository_type' option of 'reconfigure' command
3856
#: bzrlib/builtins.py:5943
3857
msgid "Repository type"
3858
msgstr ""
3859
3860
# help of 'repository_type' option of 'reconfigure' command
3861
#: bzrlib/builtins.py:5944
3862
msgid "Location fo the repository."
3863
msgstr ""
3864
3865
# help of 'repository_type=standalone' option of 'reconfigure' command
3866
#: bzrlib/builtins.py:5946
3867
msgid ""
3868
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3869
msgstr ""
3870
3871
# help of 'repository_type=use-shared' option of 'reconfigure' command
3872
#: bzrlib/builtins.py:5948
3873
msgid "Reconfigure to use a shared repository."
3874
msgstr ""
3875
3876
# title of 'repository_trees' option of 'reconfigure' command
3877
#: bzrlib/builtins.py:5952
3878
msgid "Trees in Repository"
3879
msgstr ""
3880
3881
# help of 'repository_trees' option of 'reconfigure' command
3882
#: bzrlib/builtins.py:5953
3883
msgid "Whether new branches in the repository have trees."
3884
msgstr ""
3885
3886
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3887
#: bzrlib/builtins.py:5955
3888
msgid "Reconfigure repository to create working trees on branches by default."
3889
msgstr ""
3890
3891
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3892
#: bzrlib/builtins.py:5957
3893
msgid ""
3894
"Reconfigure repository to not create working trees on branches by default."
3895
msgstr ""
3896
3897
# help of 'bind-to' option of 'reconfigure' command
3898
#: bzrlib/builtins.py:5960
3899
msgid "Branch to bind checkout to."
3900
msgstr ""
3901
3902
# help of 'force' option of 'reconfigure' command
3903
#: bzrlib/builtins.py:5962
3904
msgid "Perform reconfiguration even if local changes will be lost."
3905
msgstr ""
3906
3907
# help of 'stacked-on' option of 'reconfigure' command
3908
#: bzrlib/builtins.py:5965
3909
msgid "Reconfigure a branch to be stacked on another branch."
3910
msgstr ""
3911
3912
# help of 'unstacked' option of 'reconfigure' command
3913
#: bzrlib/builtins.py:5969
3914
msgid ""
3915
"Reconfigure a branch to be unstacked. This may require copying substantial "
3916
"data into it."
3917
msgstr ""
3918
3919
#: bzrlib/builtins.py:5979
3920
msgid "Can't use both --stacked-on and --unstacked"
3921
msgstr ""
3922
3923
#: bzrlib/builtins.py:5993
3924
msgid "No target configuration specified"
3925
msgstr ""
3926
3927
#: bzrlib/builtins.py:6028
3928
msgid "Set the branch of a checkout and update."
3929
msgstr ""
3930
3931
#: bzrlib/builtins.py:6030
3932
msgid ""
3933
"For lightweight checkouts, this changes the branch being referenced.\n"
3934
"For heavyweight checkouts, this checks that there are no local commits\n"
3935
"versus the current bound branch, then it makes the local branch a mirror\n"
3936
"of the new location and binds to it."
3937
msgstr ""
3938
3939
#: bzrlib/builtins.py:6035
3940
msgid ""
3941
"In both cases, the working tree is updated and uncommitted changes\n"
3942
"are merged. The user can commit or revert these as they desire."
3943
msgstr ""
3944
3945
#: bzrlib/builtins.py:6038
3946
msgid "Pending merges need to be committed or reverted before using switch."
3947
msgstr ""
3948
3949
#: bzrlib/builtins.py:6040
3950
msgid ""
3951
"The path to the branch to switch to can be specified relative to the parent\n"
3952
"directory of the current branch. For example, if you are currently in a\n"
3953
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3954
"/path/to/newbranch."
3955
msgstr ""
3956
3957
#: bzrlib/builtins.py:6045
3958
msgid ""
3959
"Bound branches use the nickname of its master branch unless it is set\n"
3960
"locally, in which case switching will update the local nickname to be\n"
3961
"that of the master."
3962
msgstr ""
3963
3964
# help of 'force' option of 'switch' command
3965
#: bzrlib/builtins.py:6053
3966
msgid "Switch even if local commits will be lost."
3967
msgstr ""
3968
3969
# help of 'create-branch' option of 'switch' command
3970
#: bzrlib/builtins.py:6056
3971
msgid "Create the target branch from this one before switching to it."
3972
msgstr ""
3973
3974
#: bzrlib/builtins.py:6068
3975
msgid "You must supply either a revision or a location"
3976
msgstr ""
3977
3978
#: bzrlib/builtins.py:6079
3979
msgid "cannot create branch without source branch"
3980
msgstr ""
3981
3982
#: bzrlib/builtins.py:6143
3983
msgid "Manage filtered views."
3984
msgstr ""
3985
3986
#: bzrlib/builtins.py:6145
3987
msgid ""
3988
"Views provide a mask over the tree so that users can focus on\n"
3989
"a subset of a tree when doing their work. After creating a view,\n"
3990
"commands that support a list of files - status, diff, commit, etc -\n"
3991
"effectively have that list of files implicitly given each time.\n"
3992
"An explicit list of files can still be given but those files\n"
3993
"must be within the current view."
3994
msgstr ""
3995
3996
#: bzrlib/builtins.py:6152
3997
msgid ""
3998
"In most cases, a view has a short life-span: it is created to make\n"
3999
"a selected change and is deleted once that change is committed.\n"
4000
"At other times, you may wish to create one or more named views\n"
4001
"and switch between them."
4002
msgstr ""
4003
4004
#: bzrlib/builtins.py:6157
4005
msgid ""
4006
"To disable the current view without deleting it, you can switch to\n"
4007
"the pseudo view called ``off``. This can be useful when you need\n"
4008
"to see the whole tree for an operation or two (e.g. merge) but\n"
4009
"want to switch back to your view after that."
4010
msgstr ""
4011
4012
#: bzrlib/builtins.py:6162
4013
msgid ""
4014
":Examples:\n"
4015
" To define the current view::"
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:6165
4019
msgid " bzr view file1 dir1 ..."
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:6167
4023
msgid " To list the current view::"
4024
msgstr ""
4025
4026
#: bzrlib/builtins.py:6169
4027
msgid " bzr view"
4028
msgstr ""
4029
4030
#: bzrlib/builtins.py:6171
4031
msgid " To delete the current view::"
4032
msgstr ""
4033
4034
#: bzrlib/builtins.py:6173
4035
msgid " bzr view --delete"
4036
msgstr ""
4037
4038
#: bzrlib/builtins.py:6175
4039
msgid " To disable the current view without deleting it::"
4040
msgstr ""
4041
4042
#: bzrlib/builtins.py:6177
4043
msgid " bzr view --switch off"
4044
msgstr ""
4045
4046
#: bzrlib/builtins.py:6179
4047
msgid " To define a named view and switch to it::"
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6181
4051
msgid " bzr view --name view-name file1 dir1 ..."
4052
msgstr ""
4053
4054
#: bzrlib/builtins.py:6183
4055
msgid " To list a named view::"
4056
msgstr ""
4057
4058
#: bzrlib/builtins.py:6185
4059
msgid " bzr view --name view-name"
4060
msgstr ""
4061
4062
#: bzrlib/builtins.py:6187
4063
msgid " To delete a named view::"
4064
msgstr ""
4065
4066
#: bzrlib/builtins.py:6189
4067
msgid " bzr view --name view-name --delete"
4068
msgstr ""
4069
4070
#: bzrlib/builtins.py:6191
4071
msgid " To switch to a named view::"
4072
msgstr ""
4073
4074
#: bzrlib/builtins.py:6193
4075
msgid " bzr view --switch view-name"
4076
msgstr ""
4077
4078
#: bzrlib/builtins.py:6195
4079
msgid " To list all views defined::"
4080
msgstr ""
4081
4082
#: bzrlib/builtins.py:6197
4083
msgid " bzr view --all"
4084
msgstr ""
4085
4086
#: bzrlib/builtins.py:6199
4087
msgid " To delete all views::"
4088
msgstr ""
4089
4090
#: bzrlib/builtins.py:6201
4091
msgid " bzr view --delete --all"
4092
msgstr ""
4093
4094
# help of 'all' option of 'view' command
4095
#: bzrlib/builtins.py:6208
4096
msgid "Apply list or delete action to all views."
4097
msgstr ""
4098
4099
# help of 'delete' option of 'view' command
4100
#: bzrlib/builtins.py:6211
4101
msgid "Delete the view."
4102
msgstr ""
4103
4104
# help of 'name' option of 'view' command
4105
#: bzrlib/builtins.py:6214
4106
msgid "Name of the view to define, list or delete."
4107
msgstr ""
4108
4109
# help of 'switch' option of 'view' command
4110
#: bzrlib/builtins.py:6218
4111
msgid "Name of the view to switch to."
4112
msgstr ""
4113
4114
#: bzrlib/builtins.py:6237
4115
msgid "Both --delete and a file list specified"
4116
msgstr ""
4117
4118
#: bzrlib/builtins.py:6240
4119
msgid "Both --delete and --switch specified"
4120
msgstr ""
4121
4122
#: bzrlib/builtins.py:6243
4123
msgid "Deleted all views.\n"
4124
msgstr ""
4125
4126
#: bzrlib/builtins.py:6245
4127
msgid "No current view to delete"
4128
msgstr ""
4129
4130
#: bzrlib/builtins.py:6248
4131
#, python-format
4132
msgid "Deleted '%s' view.\n"
4133
msgstr ""
4134
4135
#: bzrlib/builtins.py:6252
4136
msgid "Both --switch and a file list specified"
4137
msgstr ""
4138
4139
#: bzrlib/builtins.py:6255
4140
msgid "Both --switch and --all specified"
4141
msgstr ""
4142
4143
#: bzrlib/builtins.py:6258
4144
msgid "No current view to disable"
4145
msgstr ""
4146
4147
#: bzrlib/builtins.py:6260
4148
#, python-format
4149
msgid "Disabled '%s' view.\n"
4150
msgstr ""
4151
4152
#: bzrlib/builtins.py:6264 bzrlib/builtins.py:6286
4153
msgid "Using '{0}' view: {1}\n"
4154
msgstr ""
4155
4156
#: bzrlib/builtins.py:6267
4157
msgid "Views defined:\n"
4158
msgstr ""
4159
4160
#: bzrlib/builtins.py:6276
4161
msgid "No views defined.\n"
4162
msgstr ""
4163
4164
#: bzrlib/builtins.py:6283
4165
msgid "Cannot change the 'off' pseudo view"
4166
msgstr ""
4167
4168
#: bzrlib/builtins.py:6291
4169
msgid "No current view.\n"
4170
msgstr ""
4171
4172
#: bzrlib/builtins.py:6294
4173
msgid "'{0}' view is: {1}\n"
4174
msgstr ""
4175
4176
#: bzrlib/builtins.py:6314
4177
msgid " <no hooks installed>\n"
4178
msgstr ""
4179
4180
#: bzrlib/builtins.py:6318
4181
msgid "Remove a branch."
4182
msgstr ""
4183
4184
#: bzrlib/builtins.py:6320
4185
msgid ""
4186
"This will remove the branch from the specified location but \n"
4187
"will keep any working tree or repository in place."
4188
msgstr ""
4189
4190
#: bzrlib/builtins.py:6325
4191
msgid " Remove the branch at repo/trunk::"
4192
msgstr ""
4193
4194
#: bzrlib/builtins.py:6327
4195
msgid " bzr remove-branch repo/trunk"
4196
msgstr ""
4197
4198
# help of 'writer=plain' option of 'shelve' command
4199
#: bzrlib/builtins.py:6342
4200
msgid "Plaintext diff output."
4201
msgstr ""
4202
4203
#: bzrlib/builtins.py:6343
4204
msgid "Temporarily set aside some changes from the current tree."
4205
msgstr ""
4206
4207
#: bzrlib/builtins.py:6345
4208
msgid ""
4209
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4210
"ie. out of the way, until a later time when you can bring them back from\n"
4211
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4212
"your working tree, and so they aren't propagated along with your branch nor\n"
4213
"will they survive its deletion."
4214
msgstr ""
4215
4216
#: bzrlib/builtins.py:6351
4217
msgid "If shelve --list is specified, previously-shelved changes are listed."
4218
msgstr ""
4219
4220
#: bzrlib/builtins.py:6353
4221
msgid ""
4222
"Shelve is intended to help separate several sets of changes that have\n"
4223
"been inappropriately mingled. If you just want to get rid of all changes\n"
4224
"and you don't need to restore them later, use revert. If you want to\n"
4225
"shelve all text changes at once, use shelve --all."
4226
msgstr ""
4227
4228
#: bzrlib/builtins.py:6358
4229
msgid ""
4230
"If filenames are specified, only the changes to those files will be\n"
4231
"shelved. Other files will be left untouched."
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:6361
4235
msgid ""
4236
"If a revision is specified, changes since that revision will be shelved."
4237
msgstr ""
4238
4239
#: bzrlib/builtins.py:6363
4240
msgid ""
4241
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4242
"restore the most recently shelved changes."
4243
msgstr ""
4244
4245
#: bzrlib/builtins.py:6366
4246
msgid ""
4247
"For complicated changes, it is possible to edit the changes in a separate\n"
4248
"editor program to decide what the file remaining in the working copy\n"
4249
"should look like. To do this, add the configuration option"
4250
msgstr ""
4251
4252
#: bzrlib/builtins.py:6370
4253
msgid " change_editor = PROGRAM @new_path @old_path"
4254
msgstr ""
4255
4256
#: bzrlib/builtins.py:6372
4257
msgid ""
4258
"where @new_path is replaced with the path of the new version of the \n"
4259
"file and @old_path is replaced with the path of the old version of \n"
4260
"the file. The PROGRAM should save the new file with the desired \n"
4261
"contents of the file in the working tree.\n"
4262
" "
4263
msgstr ""
4264
4265
# help of 'all' option of 'shelve' command
4266
#: bzrlib/builtins.py:6384
4267
msgid "Shelve all changes."
4268
msgstr ""
4269
4270
# help of 'writer' option of 'shelve' command
4271
#: bzrlib/builtins.py:6386
4272
msgid "Method to use for writing diffs."
4273
msgstr ""
4274
4275
# title of 'writer' option of 'shelve' command
4276
#: bzrlib/builtins.py:6386
4277
msgid "writer"
4278
msgstr ""
4279
4280
# help of 'list' option of 'shelve' command
4281
#: bzrlib/builtins.py:6390
4282
msgid "List shelved changes."
4283
msgstr ""
4284
4285
# help of 'destroy' option of 'shelve' command
4286
#: bzrlib/builtins.py:6392
4287
msgid "Destroy removed changes instead of shelving them."
4288
msgstr ""
4289
4290
#: bzrlib/builtins.py:6421
4291
msgid "No shelved changes."
4292
msgstr ""
4293
4294
#: bzrlib/builtins.py:6432
4295
msgid "Restore shelved changes."
4296
msgstr ""
4297
4298
#: bzrlib/builtins.py:6434
4299
msgid ""
4300
"By default, the most recently shelved changes are restored. However if you\n"
4301
"specify a shelf by id those changes will be restored instead. This works\n"
4302
"best when the changes don't depend on each other."
4303
msgstr ""
4304
4305
# help of 'action' option of 'unshelve' command
4306
#: bzrlib/builtins.py:6443
4307
msgid "The action to perform."
4308
msgstr ""
4309
4310
# help of 'action=apply' option of 'unshelve' command
4311
#: bzrlib/builtins.py:6445
4312
msgid "Apply changes and remove from the shelf."
4313
msgstr ""
4314
4315
# help of 'action=dry-run' option of 'unshelve' command
4316
#: bzrlib/builtins.py:6446
4317
msgid "Show changes, but do not apply or remove them."
4318
msgstr ""
4319
4320
# help of 'action=preview' option of 'unshelve' command
4321
#: bzrlib/builtins.py:6447
4322
msgid ""
4323
"Instead of unshelving the changes, show the diff that would result from "
4324
"unshelving."
4325
msgstr ""
4326
4327
# help of 'action=delete-only' option of 'unshelve' command
4328
#: bzrlib/builtins.py:6449
4329
msgid "Delete changes without applying them."
4330
msgstr ""
4331
4332
# help of 'action=keep' option of 'unshelve' command
4333
#: bzrlib/builtins.py:6450
4334
msgid "Apply changes but don't delete them."
4335
msgstr ""
4336
4337
#: bzrlib/builtins.py:6465
4338
msgid "Remove unwanted files from working tree."
4339
msgstr ""
4340
4341
#: bzrlib/builtins.py:6467
4342
msgid ""
4343
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4344
"files are never deleted."
4345
msgstr ""
4346
4347
#: bzrlib/builtins.py:6470
4348
msgid ""
4349
"Another class is 'detritus', which includes files emitted by bzr during\n"
4350
"normal operations and selftests. (The value of these files decreases with\n"
4351
"time.)"
4352
msgstr ""
4353
4354
#: bzrlib/builtins.py:6474
4355
msgid ""
4356
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4357
"flags are respected, and may be combined."
4358
msgstr ""
4359
4360
#: bzrlib/builtins.py:6477
4361
msgid "To check what clean-tree will do, use --dry-run."
4362
msgstr ""
4363
4364
# help of 'ignored' option of 'clean-tree' command
4365
#: bzrlib/builtins.py:6480
4366
msgid "Delete all ignored files."
4367
msgstr ""
4368
4369
# help of 'detritus' option of 'clean-tree' command
4370
#: bzrlib/builtins.py:6481
4371
msgid ""
4372
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4373
msgstr ""
4374
4375
# help of 'unknown' option of 'clean-tree' command
4376
#: bzrlib/builtins.py:6484
4377
msgid "Delete files unknown to bzr (default)."
4378
msgstr ""
4379
4380
# help of 'dry-run' option of 'clean-tree' command
4381
#: bzrlib/builtins.py:6485
4382
msgid "Show files to delete instead of deleting them."
4383
msgstr ""
4384
4385
# help of 'force' option of 'clean-tree' command
4386
#: bzrlib/builtins.py:6487
4387
msgid "Do not prompt before deleting."
4388
msgstr ""
4389
4390
#: bzrlib/bundle/__init__.py:57
4391
msgid "A directory cannot be a bundle"
4392
msgstr ""
4393
4394
#: bzrlib/bundle/apply_bundle.py:37
4395
msgid "Install revisions"
4396
msgstr ""
4397
4398
#: bzrlib/bundle/commands.py:61
4399
msgid "--verbose requires a merge directive"
4400
msgstr ""
4401
4402
#: bzrlib/bundle/commands.py:64
4403
msgid "Bundle format not supported"
4404
msgstr ""
4405
4406
#: bzrlib/bundle/commands.py:74
4407
msgid "Records\n"
4408
msgstr ""
4409
4410
#: bzrlib/bundle/commands.py:78
4411
msgid "{0}: {1} ({2} multiparent)\n"
4412
msgstr ""
4413
4414
#: bzrlib/bundle/commands.py:80
4415
#, python-format
4416
msgid "unique files: %d\n"
4417
msgstr ""
4418
4419
#: bzrlib/bundle/commands.py:89
4420
msgid "Revisions\n"
4421
msgstr ""
4422
4423
#: bzrlib/bundle/commands.py:90
4424
#, python-format
4425
msgid "nicks: %s\n"
4426
msgstr ""
4427
4428
#: bzrlib/bundle/commands.py:92
4429
#, python-format
4430
msgid ""
4431
"committers: \n"
4432
"%s\n"
4433
msgstr ""
4434
4435
#: bzrlib/bundle/commands.py:100
4436
msgid "Decoded contents\n"
4437
msgstr ""
4438
4439
#: bzrlib/bundle/serializer/v4.py:325
4440
#, python-format
4441
msgid "Bundling %d revision."
4442
msgid_plural "Bundling %d revisions."
4443
msgstr[0] ""
4444
msgstr[1] ""
4445
4446
#: bzrlib/bzrdir.py:487
4447
msgid ""
4448
"making backup of {0}\n"
4449
" to {1}"
4450
msgstr ""
4451
4452
#: bzrlib/bzrdir.py:510
4453
msgid "renamed {0} to {1}"
4454
msgstr ""
4455
4456
#: bzrlib/bzrdir.py:1512
4457
#, python-format
4458
msgid ""
4459
"Source repository format does not support stacking, using format:\n"
4460
" %s"
4461
msgstr ""
4462
4463
#: bzrlib/bzrdir.py:1532
4464
#, python-format
4465
msgid ""
4466
"Source branch format does not support stacking, using format:\n"
4467
" %s"
4468
msgstr ""
4469
4470
#: bzrlib/bzrdir.py:1677
4471
msgid "starting repository conversion"
4472
msgstr ""
4473
4474
#: bzrlib/bzrdir.py:1906
4475
msgid "Using default stacking branch {0} at {1}"
4476
msgstr ""
4477
4478
#: bzrlib/check.py:106
4479
msgid "check"
4480
msgstr ""
4481
4482
#: bzrlib/check.py:108
4483
msgid "checking revisions"
4484
msgstr ""
4485
4486
#: bzrlib/check.py:110
4487
msgid "checking commit contents"
4488
msgstr ""
4489
4490
#: bzrlib/check.py:112
4491
msgid "checking file graphs"
4492
msgstr ""
4493
4494
#: bzrlib/check.py:116
4495
msgid "checking branches and trees"
4496
msgstr ""
4497
4498
#: bzrlib/check.py:203
4499
msgid "checked repository {0} format {1}"
4500
msgstr ""
4501
4502
#: bzrlib/check.py:206
4503
#, python-format
4504
msgid "%6d revisions"
4505
msgstr ""
4506
4507
#: bzrlib/check.py:207
4508
#, python-format
4509
msgid "%6d file-ids"
4510
msgstr ""
4511
4512
#: bzrlib/check.py:209
4513
#, python-format
4514
msgid "%6d unreferenced text versions"
4515
msgstr ""
4516
4517
#: bzrlib/check.py:213
4518
msgid "unreferenced version: {{{0}}} in {1}"
4519
msgstr ""
4520
4521
#: bzrlib/check.py:216
4522
#, python-format
4523
msgid "%6d revisions are missing inventory_sha1"
4524
msgstr ""
4525
4526
#: bzrlib/check.py:219
4527
#, python-format
4528
msgid "%6d revisions are mentioned but not present"
4529
msgstr ""
4530
4531
#: bzrlib/check.py:222
4532
#, python-format
4533
msgid "%6d ghost revisions"
4534
msgstr ""
4535
4536
#: bzrlib/check.py:227
4537
#, python-format
4538
msgid "%6d revisions missing parents in ancestry"
4539
msgstr ""
4540
4541
#: bzrlib/check.py:231
4542
#, python-format
4543
msgid " %s should be in the ancestry for:"
4544
msgstr ""
4545
4546
#: bzrlib/check.py:235
4547
#, python-format
4548
msgid "%6d inconsistent parents"
4549
msgstr ""
4550
4551
#: bzrlib/check.py:239
4552
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4553
msgstr ""
4554
4555
#: bzrlib/check.py:245
4556
#, python-format
4557
msgid "%6d revisions have incorrect parents in the revision index"
4558
msgstr ""
4559
4560
#: bzrlib/check.py:251
4561
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4562
msgstr ""
4563
4564
#: bzrlib/check.py:265
4565
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4566
msgstr ""
4567
4568
#: bzrlib/check.py:294
4569
msgid ""
4570
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4571
"{{{4}}}"
4572
msgstr ""
4573
4574
#: bzrlib/check.py:352
4575
#, python-format
4576
msgid "Checking branch at '%s'."
4577
msgstr ""
4578
4579
#: bzrlib/check.py:372
4580
#, python-format
4581
msgid "Checking working tree at '%s'."
4582
msgstr ""
4583
4584
#: bzrlib/check.py:425 bzrlib/check.py:439
4585
msgid "No branch found at specified location."
4586
msgstr ""
4587
4588
#: bzrlib/check.py:427 bzrlib/check.py:437
4589
msgid "No working tree found at specified location."
4590
msgstr ""
4591
4592
#: bzrlib/check.py:430
4593
#, python-format
4594
msgid "Checking repository at '%s'."
4595
msgstr ""
4596
4597
#: bzrlib/check.py:441
4598
msgid "No repository found at specified location."
4599
msgstr ""
4600
4601
#: bzrlib/clean_tree.py:62
4602
msgid "Nothing to delete."
4603
msgstr ""
4604
4605
#: bzrlib/clean_tree.py:67
4606
msgid "Are you sure you wish to delete these"
4607
msgstr ""
4608
4609
#: bzrlib/clean_tree.py:69
4610
msgid "Canceled"
4611
msgstr ""
4612
4613
#: bzrlib/clean_tree.py:106
4614
#, python-format
4615
msgid "unable to remove %s"
4616
msgstr ""
4617
4618
#: bzrlib/clean_tree.py:110
4619
msgid "deleting paths:"
4620
msgstr ""
4621
4622
#: bzrlib/clean_tree.py:124
4623
msgid "unable to remove \"{0}\": {1}."
4624
msgstr ""
4625
4626
#: bzrlib/clean_tree.py:129
4627
msgid "No files deleted."
4628
msgstr ""
4629
4630
#: bzrlib/cmd_version_info.py:45
4631
msgid "No known version info format {0}. Supported types are: {1}"
4632
msgstr ""
4633
4634
# help of 'format=custom' option of 'version-info' command
4635
#: bzrlib/cmd_version_info.py:50
4636
msgid "Version info in Custom template-based format."
4637
msgstr ""
4638
4639
# help of 'format=python' option of 'version-info' command
4640
#: bzrlib/cmd_version_info.py:50
4641
msgid "Version info in Python format."
4642
msgstr ""
4643
4644
# help of 'format=rio' option of 'version-info' command
4645
#: bzrlib/cmd_version_info.py:50
4646
msgid "Version info in RIO (simple text) format (default)."
4647
msgstr ""
4648
4649
#: bzrlib/cmd_version_info.py:51
4650
msgid "Show version information about this tree."
4651
msgstr ""
4652
4653
#: bzrlib/cmd_version_info.py:53
4654
msgid ""
4655
"You can use this command to add information about version into\n"
4656
"source code of an application. The output can be in one of the\n"
4657
"supported formats or in a custom format based on a template."
4658
msgstr ""
4659
4660
#: bzrlib/cmd_version_info.py:57
4661
msgid "For example::"
4662
msgstr ""
4663
4664
#: bzrlib/cmd_version_info.py:59
4665
msgid ""
4666
" bzr version-info --custom \\\n"
4667
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4668
msgstr ""
4669
4670
#: bzrlib/cmd_version_info.py:62
4671
msgid ""
4672
"will produce a C header file with formatted string containing the\n"
4673
"current revision number. Other supported variables in templates are:"
4674
msgstr ""
4675
4676
#: bzrlib/cmd_version_info.py:65
4677
msgid ""
4678
" * {date} - date of the last revision\n"
4679
" * {build_date} - current date\n"
4680
" * {revno} - revision number\n"
4681
" * {revision_id} - revision id\n"
4682
" * {branch_nick} - branch nickname\n"
4683
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4684
" otherwise 1"
4685
msgstr ""
4686
4687
# help of 'format' option of 'version-info' command
4688
#: bzrlib/cmd_version_info.py:75
4689
msgid "Select the output format."
4690
msgstr ""
4691
4692
# help of 'all' option of 'version-info' command
4693
#: bzrlib/cmd_version_info.py:79
4694
msgid "Include all possible information."
4695
msgstr ""
4696
4697
# help of 'check-clean' option of 'version-info' command
4698
#: bzrlib/cmd_version_info.py:80
4699
msgid "Check if tree is clean."
4700
msgstr ""
4701
4702
# help of 'include-history' option of 'version-info' command
4703
#: bzrlib/cmd_version_info.py:82
4704
msgid "Include the revision-history."
4705
msgstr ""
4706
4707
# help of 'include-file-revisions' option of 'version-info' command
4708
#: bzrlib/cmd_version_info.py:84
4709
msgid "Include the last revision for each file."
4710
msgstr ""
4711
4712
# help of 'template' option of 'version-info' command
4713
#: bzrlib/cmd_version_info.py:85
4714
msgid "Template for the output."
4715
msgstr ""
4716
4717
#: bzrlib/cmd_version_info.py:99
4718
msgid "bzr version-info --revision takes exactly one revision specifier"
4719
msgstr ""
4720
4721
#: bzrlib/commands.py:232
4722
#, python-format
4723
msgid "unknown command \"%s\""
4724
msgstr ""
4725
4726
#: bzrlib/commands.py:479
4727
msgid "No help for this command."
4728
msgstr ""
4729
4730
#: bzrlib/commands.py:492
4731
#, python-format
4732
msgid ":Purpose: %s\n"
4733
msgstr ""
4734
4735
#: bzrlib/commands.py:494
4736
#, python-format
4737
msgid ""
4738
":Usage:\n"
4739
"%s\n"
4740
msgstr ""
4741
4742
#: bzrlib/commands.py:496
4743
#, python-format
4744
msgid ":Usage: %s\n"
4745
msgstr ""
4746
4747
#: bzrlib/commands.py:515
4748
#, python-format
4749
msgid ":Options:%s"
4750
msgstr ""
4751
4752
#: bzrlib/commands.py:526
4753
#, python-format
4754
msgid ""
4755
":Description:\n"
4756
" %s\n"
4757
"\n"
4758
msgstr ""
4759
4760
#: bzrlib/commands.py:536
4761
#, python-format
4762
msgid ""
4763
"See bzr help %s for more details and examples.\n"
4764
"\n"
4765
msgstr ""
4766
4767
#: bzrlib/commands.py:541
4768
msgid ":Aliases: "
4769
msgstr ""
4770
4771
#: bzrlib/commands.py:545
4772
#, python-format
4773
msgid ":From: plugin \"%s\"\n"
4774
msgstr ""
4775
4776
#: bzrlib/commands.py:557
4777
msgid ":doc:`{0} <{1}-help>`"
4778
msgstr ""
4779
4780
#: bzrlib/commands.py:561
4781
#, python-format
4782
msgid ":See also: %s"
4783
msgstr ""
4784
4785
#: bzrlib/commands.py:819 bzrlib/gpg.py:317
4786
msgid "Only ASCII permitted in option names"
4787
msgstr ""
4788
4789
#: bzrlib/commands.py:844 bzrlib/commands.py:852
4790
msgid "command {0!r} needs one or more {1}"
4791
msgstr ""
4792
4793
#: bzrlib/commands.py:861
4794
msgid "command {0!r} requires argument {1}"
4795
msgstr ""
4796
4797
#: bzrlib/commands.py:868
4798
msgid "extra argument to command {0}: {1}"
4799
msgstr ""
4800
4801
#: bzrlib/commands.py:965
4802
#, python-format
4803
msgid "Profile data written to \"%s\"."
4804
msgstr ""
4805
4806
#: bzrlib/commit.py:116 bzrlib/commit.py:738
4807
msgid "added"
4808
msgstr ""
4809
4810
#: bzrlib/commit.py:116 bzrlib/commit.py:746
4811
msgid "modified"
4812
msgstr ""
4813
4814
#: bzrlib/commit.py:130
4815
#, python-format
4816
msgid "Committing%s"
4817
msgstr ""
4818
4819
#: bzrlib/commit.py:133
4820
#, python-format
4821
msgid "Committed revision %d."
4822
msgstr ""
4823
4824
#: bzrlib/commit.py:142
4825
#, python-format
4826
msgid "deleted %s"
4827
msgstr ""
4828
4829
#: bzrlib/commit.py:145
4830
#, python-format
4831
msgid "missing %s"
4832
msgstr ""
4833
4834
#: bzrlib/commit.py:510
4835
msgid ""
4836
"Conflicting tags in bound branch:\n"
4837
"{0}"
4838
msgstr ""
4839
4840
#: bzrlib/commit.py:740
4841
msgid "renamed"
4842
msgstr ""
4843
4844
#: bzrlib/commit.py:975
4845
msgid "unchanged"
4846
msgstr ""
4847
4848
#: bzrlib/commit.py:997
4849
msgid "{0} [{1}] - Stage"
4850
msgstr ""
4851
4852
#: bzrlib/commit.py:1000
4853
#, python-format
4854
msgid "%s - Stage"
4855
msgstr ""
4856
4857
#: bzrlib/commit_signature_commands.py:34
4858
msgid "Sign all commits by a given committer."
4859
msgstr ""
4860
4861
#: bzrlib/commit_signature_commands.py:36
4862
msgid ""
4863
"If location is not specified the local tree is used.\n"
4864
"If committer is not specified the default committer is used."
4865
msgstr ""
4866
4867
#: bzrlib/commit_signature_commands.py:39
4868
msgid "This does not sign commits that already have signatures."
4869
msgstr ""
4870
4871
# help of 'dry-run' option of 'sign-my-commits' command
4872
#: bzrlib/commit_signature_commands.py:47
4873
msgid ""
4874
"Don't actually sign anything, just print the revisions that would be signed."
4875
msgstr ""
4876
4877
#: bzrlib/commit_signature_commands.py:101
4878
msgid "Verify all commit signatures."
4879
msgstr ""
4880
4881
#: bzrlib/commit_signature_commands.py:103
4882
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
4883
msgstr ""
4884
4885
# help of 'acceptable-keys' option of 'verify-signatures' command
4886
#: bzrlib/commit_signature_commands.py:108
4887
msgid ""
4888
"Comma separated list of GPG key patterns which are acceptable for "
4889
"verification."
4890
msgstr ""
4891
4892
#: bzrlib/commit_signature_commands.py:145
4893
msgid "Cannot verify a range of non-revision-history revisions"
4894
msgstr ""
4895
4896
#: bzrlib/commit_signature_commands.py:166
4897
msgid "All commits signed with verifiable keys"
4898
msgstr ""
4899
4900
#: bzrlib/config.py:451
4901
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4902
msgstr ""
4903
4904
#: bzrlib/config.py:2762
4905
#, python-format
4906
msgid "Invalid '%s', should be of the form 'name=value'"
4907
msgstr ""
4908
4909
#: bzrlib/config.py:3469
4910
msgid "Display, set or remove a configuration option."
4911
msgstr ""
4912
4913
#: bzrlib/config.py:3471
4914
msgid "Display the active value for a given option."
4915
msgstr ""
4916
4917
#: bzrlib/config.py:3473
4918
msgid ""
4919
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4920
"matching options are displayed mentioning their scope. The active value\n"
4921
"that bzr will take into account is the first one displayed for each option."
4922
msgstr ""
4923
4924
#: bzrlib/config.py:3477
4925
msgid "If no NAME is given, --all .* is implied."
4926
msgstr ""
4927
4928
#: bzrlib/config.py:3479
4929
msgid ""
4930
"Setting a value is achieved by using name=value without spaces. The value\n"
4931
"is set in the most relevant scope and can be checked by displaying the\n"
4932
"option again."
4933
msgstr ""
4934
4935
# help of 'scope' option of 'config' command
4936
#: bzrlib/config.py:3491
4937
msgid "Reduce the scope to the specified configuration file."
4938
msgstr ""
4939
4940
# help of 'all' option of 'config' command
4941
#: bzrlib/config.py:3495
4942
msgid "Display all the defined values for the matching options."
4943
msgstr ""
4944
4945
# help of 'remove' option of 'config' command
4946
#: bzrlib/config.py:3497
4947
msgid "Remove the option from the configuration file."
4948
msgstr ""
4949
4950
#: bzrlib/conflicts.py:48
4951
msgid "List files with conflicts."
4952
msgstr ""
4953
4954
#: bzrlib/conflicts.py:50
4955
msgid ""
4956
"Merge will do its best to combine the changes in two branches, but there\n"
4957
"are some kinds of problems only a human can fix. When it encounters those,\n"
4958
"it will mark a conflict. A conflict means that you need to fix something,\n"
4959
"before you should commit."
4960
msgstr ""
4961
4962
#: bzrlib/conflicts.py:55
4963
msgid ""
4964
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4965
"is supplied, the pathnames of files with text conflicts are listed,\n"
4966
"instead. (This is useful for editing all files with text conflicts.)"
4967
msgstr ""
4968
4969
#: bzrlib/conflicts.py:59
4970
msgid "Use bzr resolve when you have fixed a problem."
4971
msgstr ""
4972
4973
# help of 'text' option of 'conflicts' command
4974
#: bzrlib/conflicts.py:64
4975
msgid "List paths of files with text conflicts."
4976
msgstr ""
4977
4978
# help of 'action=done' option of 'resolve' command
4979
#: bzrlib/conflicts.py:83
4980
msgid "Marks the conflict as resolved."
4981
msgstr ""
4982
4983
# help of 'action=take-this' option of 'resolve' command
4984
#: bzrlib/conflicts.py:86
4985
msgid "Resolve the conflict preserving the version in the working tree."
4986
msgstr ""
4987
4988
# help of 'action=take-other' option of 'resolve' command
4989
#: bzrlib/conflicts.py:89
4990
msgid "Resolve the conflict taking the merged version into account."
4991
msgstr ""
4992
4993
# help of 'action' option of 'resolve' command
4994
#: bzrlib/conflicts.py:96
4995
msgid "How to resolve the conflict."
4996
msgstr ""
4997
4998
#: bzrlib/conflicts.py:102
4999
msgid "Mark a conflict as resolved."
5000
msgstr ""
5001
5002
#: bzrlib/conflicts.py:109
5003
msgid ""
5004
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5005
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5006
"as\n"
5007
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5008
msgstr ""
5009
5010
# help of 'all' option of 'resolve' command
5011
#: bzrlib/conflicts.py:117
5012
msgid "Resolve all conflicts in this tree."
5013
msgstr ""
5014
5015
#: bzrlib/conflicts.py:124
5016
msgid "If --all is specified, no FILE may be provided"
5017
msgstr ""
5018
5019
#: bzrlib/conflicts.py:149
5020
#, python-format
5021
msgid "%d conflict auto-resolved."
5022
msgid_plural "%d conflicts auto-resolved."
5023
msgstr[0] ""
5024
msgstr[1] ""
5025
5026
#: bzrlib/conflicts.py:152
5027
msgid "Remaining conflicts:"
5028
msgstr ""
5029
5030
#: bzrlib/conflicts.py:157
5031
msgid "All conflicts resolved."
5032
msgstr ""
5033
5034
#: bzrlib/conflicts.py:166
5035
msgid "{0} conflict resolved, {1} remaining"
5036
msgid_plural "{0} conflicts resolved, {1} remaining"
5037
msgstr[0] ""
5038
msgstr[1] ""
5039
5040
# title of 'action' option of 'resolve' command
5041
#: bzrlib/conflicts.py:692
5042
msgid "action"
5043
msgstr ""
5044
5045
#: bzrlib/controldir.py:682
5046
msgid "{0} is{1} redirected to {2}"
5047
msgstr ""
5048
5049
#: bzrlib/diff.py:397
5050
#, python-format
5051
msgid "*** Ignoring files outside view. View is %s"
5052
msgstr ""
5053
5054
#: bzrlib/errors.py:155
5055
msgid "The tree builder is already building a tree."
5056
msgstr ""
5057
5058
#: bzrlib/errors.py:176
5059
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5060
msgstr ""
5061
5062
#: bzrlib/errors.py:195
5063
msgid ""
5064
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5065
"versions \"%(minimum)s\" to \"%(current)s\"."
5066
msgstr ""
5067
5068
#: bzrlib/errors.py:207
5069
msgid "The transport '%(transport)s' is only accessible within this process."
5070
msgstr ""
5071
5072
#: bzrlib/errors.py:225
5073
msgid "Invalid revision number %(revno)s"
5074
msgstr ""
5075
5076
#: bzrlib/errors.py:234
5077
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5078
msgstr ""
5079
5080
#: bzrlib/errors.py:245
5081
msgid "Reserved revision-id {%(revision_id)s}"
5082
msgstr ""
5083
5084
#: bzrlib/errors.py:259
5085
msgid "There is no public branch set for \"%(branch_url)s\"."
5086
msgstr ""
5087
5088
#: bzrlib/errors.py:269
5089
msgid ""
5090
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5091
"obtain a list of topics."
5092
msgstr ""
5093
5094
#: bzrlib/errors.py:278
5095
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5096
msgstr ""
5097
5098
#: bzrlib/errors.py:288
5099
msgid ""
5100
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5101
msgstr ""
5102
5103
#: bzrlib/errors.py:297
5104
msgid "The branch '%(branch)s' is not stacked."
5105
msgstr ""
5106
5107
#: bzrlib/errors.py:311
5108
msgid "No WorkingTree exists for \"%(base)s\"."
5109
msgstr ""
5110
5111
#: bzrlib/errors.py:320
5112
msgid "Not currently building a tree."
5113
msgstr ""
5114
5115
#: bzrlib/errors.py:325
5116
msgid "%(url)s is not a local path."
5117
msgstr ""
5118
5119
#: bzrlib/errors.py:353
5120
msgid "%(not_locked)r is not write locked but needs to be."
5121
msgstr ""
5122
5123
#: bzrlib/errors.py:361
5124
msgid "Error in command line options"
5125
msgstr ""
5126
5127
#: bzrlib/errors.py:366
5128
msgid "%(value)s is not an index of type %(_type)s."
5129
msgstr ""
5130
5131
#: bzrlib/errors.py:376
5132
msgid "Error in data for index %(value)s."
5133
msgstr ""
5134
5135
#: bzrlib/errors.py:385
5136
msgid "The key '%(key)s' is already in index '%(index)s'."
5137
msgstr ""
5138
5139
#: bzrlib/errors.py:395
5140
msgid "The key '%(key)s' is not a valid key."
5141
msgstr ""
5142
5143
#: bzrlib/errors.py:404
5144
msgid "Could not parse options for index %(value)s."
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:413
5148
msgid "The value '%(value)s' is not a valid value."
5149
msgstr ""
5150
5151
#: bzrlib/errors.py:441
5152
msgid "Generic path error: %(path)r%(extra)s)"
5153
msgstr ""
5154
5155
#: bzrlib/errors.py:454
5156
msgid "No such file: %(path)r%(extra)s"
5157
msgstr ""
5158
5159
#: bzrlib/errors.py:459
5160
msgid "File exists: %(path)r%(extra)s"
5161
msgstr ""
5162
5163
#: bzrlib/errors.py:465
5164
msgid ""
5165
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5166
"after to tell bzr about a rename that has already happened)%(extra)s"
5167
msgstr ""
5168
5169
#: bzrlib/errors.py:481
5170
msgid "\"%(path)s\" is not a directory %(extra)s"
5171
msgstr ""
5172
5173
#: bzrlib/errors.py:486
5174
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5175
msgstr ""
5176
5177
#: bzrlib/errors.py:491
5178
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5179
msgstr ""
5180
5181
#: bzrlib/errors.py:496
5182
msgid "Hard-linking \"%(path)s\" is not supported"
5183
msgstr ""
5184
5185
#: bzrlib/errors.py:511
5186
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5187
msgstr ""
5188
5189
#: bzrlib/errors.py:516
5190
msgid "Permission denied: \"%(path)s\"%(extra)s"
5191
msgstr ""
5192
5193
#: bzrlib/errors.py:521
5194
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5195
msgstr ""
5196
5197
#: bzrlib/errors.py:526
5198
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5199
msgstr ""
5200
5201
#: bzrlib/errors.py:537
5202
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5203
msgstr ""
5204
5205
#: bzrlib/errors.py:559
5206
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5207
msgstr ""
5208
5209
#: bzrlib/errors.py:569
5210
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5211
msgstr ""
5212
5213
#: bzrlib/errors.py:577
5214
msgid ""
5215
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5216
"upgrade the branch to permit branch stacking."
5217
msgstr ""
5218
5219
#: bzrlib/errors.py:588
5220
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5221
msgstr ""
5222
5223
#: bzrlib/errors.py:598
5224
msgid ""
5225
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5226
"need to upgrade the repository to permit branch stacking."
5227
msgstr ""
5228
5229
#: bzrlib/errors.py:609
5230
msgid "Error reading from %(path)r."
5231
msgstr ""
5232
5233
#: bzrlib/errors.py:628
5234
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5235
msgstr ""
5236
5237
#: bzrlib/errors.py:644
5238
msgid "Path \"%(path)s\" is not unicode normalized"
5239
msgstr ""
5240
5241
#: bzrlib/errors.py:652
5242
msgid "Not a branch: \"%(path)s\"%(detail)s."
5243
msgstr ""
5244
5245
#: bzrlib/errors.py:694
5246
msgid "No submit branch available for branch \"%(path)s\""
5247
msgstr ""
5248
5249
#: bzrlib/errors.py:703
5250
msgid "Already a branch: \"%(path)s\"."
5251
msgstr ""
5252
5253
#: bzrlib/errors.py:709
5254
msgid ""
5255
"Directory contains a branch, but no working tree (use bzr checkout if you "
5256
"wish to build a working tree): \"%(path)s\""
5257
msgstr ""
5258
5259
#: bzrlib/errors.py:714
5260
msgid ""
5261
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5262
msgstr ""
5263
5264
#: bzrlib/errors.py:724
5265
msgid ""
5266
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5267
msgstr ""
5268
5269
#: bzrlib/errors.py:734
5270
msgid "No repository present: \"%(path)s\""
5271
msgstr ""
5272
5273
#: bzrlib/errors.py:741
5274
msgid ""
5275
"Unsupported branch format: %(format)s\n"
5276
"Please run 'bzr upgrade'"
5277
msgstr ""
5278
5279
#: bzrlib/errors.py:747
5280
msgid "Unknown %(kind)s format: %(format)r"
5281
msgstr ""
5282
5283
#: bzrlib/errors.py:756
5284
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5285
msgstr ""
5286
5287
#: bzrlib/errors.py:769
5288
msgid ""
5289
"%(target)s\n"
5290
"is not compatible with\n"
5291
"%(source)s\n"
5292
"%(details)s"
5293
msgstr ""
5294
5295
#: bzrlib/errors.py:785
5296
msgid "Revision is not compatible with %(repo_format)s"
5297
msgstr ""
5298
5299
#: bzrlib/errors.py:795
5300
msgid "%(context_info)s%(path)s is already versioned."
5301
msgstr ""
5302
5303
#: bzrlib/errors.py:816
5304
msgid "%(context_info)s%(path)s is not versioned."
5305
msgstr ""
5306
5307
#: bzrlib/errors.py:837
5308
msgid "Path(s) are not versioned: %(paths_as_string)s"
5309
msgstr ""
5310
5311
#: bzrlib/errors.py:848
5312
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5313
msgstr ""
5314
5315
#: bzrlib/errors.py:867
5316
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5317
msgstr ""
5318
5319
#: bzrlib/errors.py:875
5320
msgid ""
5321
"Filename %(filename)r is not valid in your current filesystem encoding "
5322
"%(fs_encoding)s"
5323
msgstr ""
5324
5325
#: bzrlib/errors.py:886
5326
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5327
msgstr ""
5328
5329
#: bzrlib/errors.py:904
5330
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5331
msgstr ""
5332
5333
#: bzrlib/errors.py:943
5334
msgid "Cannot lock %(lock)s: %(why)s"
5335
msgstr ""
5336
5337
#: bzrlib/errors.py:953
5338
msgid ""
5339
"A transaction related operation was attempted after the transaction finished."
5340
msgstr ""
5341
5342
#: bzrlib/errors.py:980
5343
msgid "Cannot lock: transport is read only: %(transport)s"
5344
msgstr ""
5345
5346
#: bzrlib/errors.py:988
5347
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5348
msgstr ""
5349
5350
#: bzrlib/errors.py:999
5351
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5352
msgstr ""
5353
5354
#: bzrlib/errors.py:1010
5355
msgid ""
5356
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5357
"%(holder)r, wanted to break %(target)r"
5358
msgstr ""
5359
5360
#: bzrlib/errors.py:1022
5361
msgid ""
5362
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5363
"Use 'bzr break-lock' to clear it"
5364
msgstr ""
5365
5366
#: bzrlib/errors.py:1035
5367
msgid "Lock not held: %(lock)s"
5368
msgstr ""
5369
5370
#: bzrlib/errors.py:1064
5371
msgid "No changes to commit"
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:1069
5375
msgid ""
5376
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5377
msgstr ""
5378
5379
#: bzrlib/errors.py:1079
5380
msgid ""
5381
"Excluding paths during commit is not supported by repository at %(repository)"
5382
"r."
5383
msgstr ""
5384
5385
#: bzrlib/errors.py:1088
5386
msgid ""
5387
"The specified commit message contains characters unsupported by the current "
5388
"encoding."
5389
msgstr ""
5390
5391
#: bzrlib/errors.py:1094
5392
msgid "Upgrade URL cannot work with readonly URLs."
5393
msgstr ""
5394
5395
#: bzrlib/errors.py:1099
5396
msgid "The branch format %(format)s is already at the most recent format."
5397
msgstr ""
5398
5399
#: bzrlib/errors.py:1122
5400
msgid "Option --change does not accept revision ranges"
5401
msgstr ""
5402
5403
#: bzrlib/errors.py:1127
5404
msgid "No namespace registered for string: %(spec)r"
5405
msgstr ""
5406
5407
#: bzrlib/errors.py:1146
5408
msgid ""
5409
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5410
"%(extra)s"
5411
msgstr ""
5412
5413
#: bzrlib/errors.py:1160
5414
msgid ""
5415
"Operation denied because it would change the main history, which is not "
5416
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5417
msgstr ""
5418
5419
#: bzrlib/errors.py:1171
5420
msgid ""
5421
"These branches have diverged. Use the missing command to see how.\n"
5422
"Use the merge command to reconcile them."
5423
msgstr ""
5424
5425
#: bzrlib/errors.py:1191
5426
msgid ""
5427
"Branches have no common ancestor, and no merge base revision was specified."
5428
msgstr ""
5429
5430
#: bzrlib/errors.py:1197
5431
msgid ""
5432
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5433
msgstr ""
5434
5435
#: bzrlib/errors.py:1203
5436
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5437
msgstr ""
5438
5439
#: bzrlib/errors.py:1212
5440
msgid ""
5441
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5442
msgstr ""
5443
5444
#: bzrlib/errors.py:1221
5445
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5446
msgstr ""
5447
5448
#: bzrlib/errors.py:1230
5449
msgid "Branch %(branch)s has no commits."
5450
msgstr ""
5451
5452
#: bzrlib/errors.py:1248
5453
msgid ""
5454
"Bound branch %(branch)s is out of date with master branch %(master)s."
5455
"%(extra_help)s"
5456
msgstr ""
5457
5458
#: bzrlib/errors.py:1260
5459
msgid ""
5460
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5461
"bound to %(remote)s."
5462
msgstr ""
5463
5464
#: bzrlib/errors.py:1272
5465
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5466
msgstr ""
5467
5468
#: bzrlib/errors.py:1281
5469
msgid ""
5470
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5471
"%(error)s"
5472
msgstr ""
5473
5474
#: bzrlib/errors.py:1293
5475
msgid "Error in processing weave: %(msg)s"
5476
msgstr ""
5477
5478
#: bzrlib/errors.py:1302
5479
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5480
msgstr ""
5481
5482
#: bzrlib/errors.py:1313
5483
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5484
msgstr ""
5485
5486
#: bzrlib/errors.py:1323
5487
msgid "Weave invariant violated: %(what)s"
5488
msgstr ""
5489
5490
#: bzrlib/errors.py:1332
5491
msgid "Parents are mismatched between two revisions. %(msg)s"
5492
msgstr ""
5493
5494
#: bzrlib/errors.py:1354
5495
msgid ""
5496
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5497
"%(weave_b)s"
5498
msgstr ""
5499
5500
#: bzrlib/errors.py:1366
5501
msgid "Versioned file error"
5502
msgstr ""
5503
5504
#: bzrlib/errors.py:1371
5505
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5506
msgstr ""
5507
5508
#: bzrlib/errors.py:1381
5509
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5510
msgstr ""
5511
5512
#: bzrlib/errors.py:1391
5513
msgid "Text did not match its checksum: %(msg)s"
5514
msgstr ""
5515
5516
#: bzrlib/errors.py:1517
5517
msgid "Export format %(format)r not supported"
5518
msgstr ""
5519
5520
#: bzrlib/errors.py:1526
5521
msgid "Transport error: %(msg)s %(orig_error)s"
5522
msgstr ""
5523
5524
#: bzrlib/errors.py:1552
5525
msgid "Generic bzr smart protocol error: %(details)s"
5526
msgstr ""
5527
5528
#: bzrlib/errors.py:1560
5529
msgid "Received bad protocol version marker: %(marker)r"
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:1592
5533
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:1597
5537
msgid "Connection error: %(msg)s %(orig_error)s"
5538
msgstr ""
5539
5540
#: bzrlib/errors.py:1602
5541
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5542
msgstr ""
5543
5544
#: bzrlib/errors.py:1623
5545
msgid "Connection closed: %(msg)s %(orig_error)s"
5546
msgstr ""
5547
5548
#: bzrlib/errors.py:1628
5549
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5550
msgstr ""
5551
5552
#: bzrlib/errors.py:1633
5553
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:1643
5557
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5558
msgstr ""
5559
5560
#: bzrlib/errors.py:1658
5561
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5562
msgstr ""
5563
5564
#: bzrlib/errors.py:1672
5565
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5566
msgstr ""
5567
5568
#: bzrlib/errors.py:1680
5569
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5570
msgstr ""
5571
5572
#: bzrlib/errors.py:1689
5573
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5574
msgstr ""
5575
5576
#: bzrlib/errors.py:1703
5577
msgid "Too many redirections"
5578
msgstr ""
5579
5580
#: bzrlib/errors.py:1708
5581
msgid "Working tree has conflicts."
5582
msgstr ""
5583
5584
#: bzrlib/errors.py:1712
5585
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5586
msgstr ""
5587
5588
#: bzrlib/errors.py:1721
5589
msgid ""
5590
"Error(s) parsing config file %(filename)s:\n"
5591
"%(errors)s"
5592
msgstr ""
5593
5594
#: bzrlib/errors.py:1732
5595
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5596
msgstr ""
5597
5598
#: bzrlib/errors.py:1740
5599
msgid "%(username)r does not seem to contain a reasonable email address"
5600
msgstr ""
5601
5602
#: bzrlib/errors.py:1749
5603
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5604
msgstr ""
5605
5606
#: bzrlib/errors.py:1757
5607
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5608
msgstr ""
5609
5610
#: bzrlib/errors.py:1765
5611
msgid "Unable to import library \"%(library)s\": %(error)s"
5612
msgstr ""
5613
5614
#: bzrlib/errors.py:1773
5615
msgid "python-gpgme is not installed, it is needed to verify signatures"
5616
msgstr ""
5617
5618
#: bzrlib/errors.py:1781
5619
msgid ""
5620
"The working tree for %(basedir)s has changed since the last commit, but "
5621
"weave merge requires that it be unchanged"
5622
msgstr ""
5623
5624
#: bzrlib/errors.py:1791
5625
msgid ""
5626
"Can't reprocess and show base, because reprocessing obscures the "
5627
"relationship of conflicting lines to the base"
5628
msgstr ""
5629
5630
#: bzrlib/errors.py:1797
5631
msgid "Cycle in graph %(graph)r"
5632
msgstr ""
5633
5634
#: bzrlib/errors.py:1825
5635
msgid "File %(filename)s is not conflicted."
5636
msgstr ""
5637
5638
#: bzrlib/errors.py:1847
5639
msgid "No bundle was found in \"%(filename)s\"."
5640
msgstr ""
5641
5642
#: bzrlib/errors.py:1856
5643
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:1866
5647
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:1879
5651
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5652
msgstr ""
5653
5654
#: bzrlib/errors.py:1889
5655
msgid "Key %(key)s is already present in map"
5656
msgstr ""
5657
5658
#: bzrlib/errors.py:1894
5659
msgid "The prefix %(prefix)s is in the help search path twice."
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:1904
5663
msgid ""
5664
"No final name for trans_id %(trans_id)r\n"
5665
"file-id: %(file_id)r\n"
5666
"root trans-id: %(root_trans_id)r\n"
5667
msgstr ""
5668
5669
#: bzrlib/errors.py:1936
5670
msgid "Attempt to reuse a transform that has already been applied."
5671
msgstr ""
5672
5673
#: bzrlib/errors.py:1941
5674
msgid "Moving the root directory is not supported at this time"
5675
msgstr ""
5676
5677
#: bzrlib/errors.py:1946
5678
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5679
msgstr ""
5680
5681
#: bzrlib/errors.py:1957
5682
msgid ""
5683
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5684
msgstr ""
5685
5686
#: bzrlib/errors.py:1993
5687
msgid ""
5688
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5689
msgstr ""
5690
5691
#: bzrlib/errors.py:2023
5692
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5693
msgstr ""
5694
5695
#: bzrlib/errors.py:2031
5696
msgid "Nothing to merge."
5697
msgstr ""
5698
5699
#: bzrlib/errors.py:2036
5700
msgid "Format %(format)s cannot be initialised by this version of bzr."
5701
msgstr ""
5702
5703
#: bzrlib/errors.py:2045
5704
msgid ""
5705
"Cannot convert from format %(from_format)s to format %(format)s. "
5706
"%(problem)s"
5707
msgstr ""
5708
5709
#: bzrlib/errors.py:2057
5710
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5711
msgstr ""
5712
5713
#: bzrlib/errors.py:2065
5714
msgid "%(exe_name)s could not be found on this machine"
5715
msgstr ""
5716
5717
#: bzrlib/errors.py:2073
5718
msgid "Diff is not installed on this machine: %(msg)s"
5719
msgstr ""
5720
5721
#: bzrlib/errors.py:2081
5722
msgid "Diff3 is not installed on this machine."
5723
msgstr ""
5724
5725
#: bzrlib/errors.py:2087
5726
msgid "The content being inserted is already present."
5727
msgstr ""
5728
5729
#: bzrlib/errors.py:2092
5730
msgid ""
5731
"This tree contains left-over files from a failed operation.\n"
5732
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5733
"to\n"
5734
" keep, and delete it when you are done."
5735
msgstr ""
5736
5737
#: bzrlib/errors.py:2103
5738
msgid ""
5739
"This tree contains left-over files from a failed operation.\n"
5740
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5741
" wish to keep, and delete it when you are done."
5742
msgstr ""
5743
5744
#: bzrlib/errors.py:2113
5745
msgid ""
5746
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5747
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5748
"to\n"
5749
" keep, and delete it when you are done."
5750
msgstr ""
5751
5752
#: bzrlib/errors.py:2124
5753
msgid ""
5754
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5755
"examine %(pending_deletion)s to see if it contains any files you wish to "
5756
"keep, and delete it when you are done."
5757
msgstr ""
5758
5759
#: bzrlib/errors.py:2134
5760
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5761
msgstr ""
5762
5763
#: bzrlib/errors.py:2148
5764
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:2161
5768
msgid "Error in merge modified format"
5769
msgstr ""
5770
5771
#: bzrlib/errors.py:2166
5772
msgid "Format error in conflict listings"
5773
msgstr ""
5774
5775
#: bzrlib/errors.py:2170
5776
msgid ""
5777
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5778
"Error: %(description)s"
5779
msgstr ""
5780
5781
#: bzrlib/errors.py:2181
5782
msgid ""
5783
"An error has been detected in the repository %(repo_path)s.\n"
5784
"Please run bzr reconcile on this repository."
5785
msgstr ""
5786
5787
#: bzrlib/errors.py:2192
5788
msgid ""
5789
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5790
"reason: %(reason)s"
5791
msgstr ""
5792
5793
#: bzrlib/errors.py:2205
5794
msgid ""
5795
"An inconsistent delta was supplied: %(delta)r\n"
5796
"reason: %(reason)s"
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:2217
5800
msgid "To use this feature you must upgrade your branch at %(path)s."
5801
msgstr ""
5802
5803
#: bzrlib/errors.py:2226
5804
msgid "To use this feature you must upgrade your repository at %(path)s."
5805
msgstr ""
5806
5807
#: bzrlib/errors.py:2231
5808
msgid ""
5809
"To use this feature you must upgrade your branch at %(path)s to a format "
5810
"which supports rich roots."
5811
msgstr ""
5812
5813
#: bzrlib/errors.py:2237
5814
msgid "Cannot perform local-only commits on unbound branches."
5815
msgstr ""
5816
5817
#: bzrlib/errors.py:2242
5818
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5819
msgstr ""
5820
5821
#: bzrlib/errors.py:2263
5822
msgid "Ghost tags not supported by format %(format)r."
5823
msgstr ""
5824
5825
#: bzrlib/errors.py:2271
5826
msgid "File is binary but should be text."
5827
msgstr ""
5828
5829
#: bzrlib/errors.py:2276
5830
msgid "The path %(path)s is not permitted on this platform"
5831
msgstr ""
5832
5833
#: bzrlib/errors.py:2285
5834
msgid ""
5835
"Testament did not match expected value.\n"
5836
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5837
" {%(measured)s}"
5838
msgstr ""
5839
5840
#: bzrlib/errors.py:2297
5841
msgid "Not a bzr revision-bundle: %(text)r"
5842
msgstr ""
5843
5844
#: bzrlib/errors.py:2306
5845
msgid "Bad bzr revision-bundle: %(text)r"
5846
msgstr ""
5847
5848
#: bzrlib/errors.py:2315
5849
msgid "Malformed bzr revision-bundle header: %(text)r"
5850
msgstr ""
5851
5852
#: bzrlib/errors.py:2320
5853
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5854
msgstr ""
5855
5856
#: bzrlib/errors.py:2325
5857
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5858
msgstr ""
5859
5860
#: bzrlib/errors.py:2330
5861
msgid "End of line marker was not \\n in bzr revision-bundle"
5862
msgstr ""
5863
5864
#: bzrlib/errors.py:2340
5865
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5866
msgstr ""
5867
5868
#: bzrlib/errors.py:2350
5869
msgid "Root class for inventory serialization errors"
5870
msgstr ""
5871
5872
#: bzrlib/errors.py:2354
5873
msgid ""
5874
"The inventory was not in the expected format:\n"
5875
" %(msg)s"
5876
msgstr ""
5877
5878
#: bzrlib/errors.py:2363
5879
msgid "This operation requires rich root data storage"
5880
msgstr ""
5881
5882
#: bzrlib/errors.py:2376
5883
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5884
msgstr ""
5885
5886
#: bzrlib/errors.py:2385
5887
msgid ""
5888
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5889
"variable."
5890
msgstr ""
5891
5892
#: bzrlib/errors.py:2392
5893
msgid ""
5894
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5895
"ghost at {%(ghost_revision_id)s}"
5896
msgstr ""
5897
5898
#: bzrlib/errors.py:2402
5899
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:2453
5903
msgid ""
5904
"A merge directive must provide either a bundle or a public branch location."
5905
msgstr ""
5906
5907
#: bzrlib/errors.py:2460
5908
msgid "Bad merge directive payload %(start)r"
5909
msgstr ""
5910
5911
#: bzrlib/errors.py:2470
5912
msgid "Preview patch does not match requested changes."
5913
msgstr ""
5914
5915
#: bzrlib/errors.py:2476
5916
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5917
msgstr ""
5918
5919
#: bzrlib/errors.py:2486
5920
msgid ""
5921
"Your branch does not have all of the revisions required in order to merge "
5922
"this merge directive and the target location specified in the merge "
5923
"directive is not a branch: %(location)s."
5924
msgstr ""
5925
5926
#: bzrlib/errors.py:2498
5927
msgid "Unsupported entry kind %(kind)s"
5928
msgstr ""
5929
5930
#: bzrlib/errors.py:2506
5931
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5932
msgstr ""
5933
5934
#: bzrlib/errors.py:2516
5935
msgid "Subsume target %(other_tree)s needs to be upgraded."
5936
msgstr ""
5937
5938
#: bzrlib/errors.py:2535
5939
msgid "No such tag: %(tag_name)s"
5940
msgstr ""
5941
5942
#: bzrlib/errors.py:2543
5943
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5944
msgstr ""
5945
5946
#: bzrlib/errors.py:2552
5947
msgid "Tag %(tag_name)s already exists."
5948
msgstr ""
5949
5950
#: bzrlib/errors.py:2560
5951
msgid ""
5952
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
5953
"\" for more information on this feature."
5954
msgstr ""
5955
5956
#: bzrlib/errors.py:2570
5957
msgid ""
5958
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5959
msgstr ""
5960
5961
#: bzrlib/errors.py:2580
5962
msgid ""
5963
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5964
msgstr ""
5965
5966
#: bzrlib/errors.py:2590
5967
msgid "Invalid line in bugs property: '%(line)s'"
5968
msgstr ""
5969
5970
#: bzrlib/errors.py:2598
5971
msgid "Invalid bug status: '%(status)s'"
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:2606
5975
msgid "Could not understand response from smart server: %(response_tuple)r"
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:2645
5979
msgid "Server sent an unexpected error: %(error_tuple)r"
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:2664
5983
msgid "Unrecognised container format: %(container_format)r"
5984
msgstr ""
5985
5986
#: bzrlib/errors.py:2672
5987
msgid "Unexpected end of container stream"
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:2677
5991
msgid "Unknown record type: %(record_type)r"
5992
msgstr ""
5993
5994
#: bzrlib/errors.py:2685
5995
msgid "Invalid record: %(reason)s"
5996
msgstr ""
5997
5998
#: bzrlib/errors.py:2693
5999
msgid "Container has data after end marker: %(excess)r"
6000
msgstr ""
6001
6002
#: bzrlib/errors.py:2701
6003
msgid "Container has multiple records with the same name: %(name)s"
6004
msgstr ""
6005
6006
#: bzrlib/errors.py:2714
6007
msgid "Corrupt or incompatible data stream: %(reason)s"
6008
msgstr ""
6009
6010
#: bzrlib/errors.py:2722
6011
msgid "SMTP error: %(error)s"
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:2730
6015
msgid "No message supplied."
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:2735
6019
msgid "No mail-to address (--mail-to) or output (-o) specified."
6020
msgstr ""
6021
6022
#: bzrlib/errors.py:2740
6023
msgid "Unknown mail client: %(mail_client)s"
6024
msgstr ""
6025
6026
#: bzrlib/errors.py:2748
6027
msgid ""
6028
"Unable to find mail client with the following names: "
6029
"%(mail_command_list_string)s"
6030
msgstr ""
6031
6032
#: bzrlib/errors.py:2758
6033
msgid "SMTP connection to %(host)s refused"
6034
msgstr ""
6035
6036
#: bzrlib/errors.py:2767
6037
msgid "Please specify smtp_server. No server at default %(host)s."
6038
msgstr ""
6039
6040
#: bzrlib/errors.py:2781
6041
msgid ""
6042
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6043
"reconfigure."
6044
msgstr ""
6045
6046
#: bzrlib/errors.py:2793
6047
msgid "'%(display_url)s' is already a branch."
6048
msgstr ""
6049
6050
#: bzrlib/errors.py:2798
6051
msgid "'%(display_url)s' is already a tree."
6052
msgstr ""
6053
6054
#: bzrlib/errors.py:2803
6055
msgid "'%(display_url)s' is already a checkout."
6056
msgstr ""
6057
6058
#: bzrlib/errors.py:2808
6059
msgid "'%(display_url)s' is already a lightweight checkout."
6060
msgstr ""
6061
6062
#: bzrlib/errors.py:2813
6063
msgid "'%(display_url)s' is already using a shared repository."
6064
msgstr ""
6065
6066
#: bzrlib/errors.py:2818
6067
msgid "'%(display_url)s' is already standalone."
6068
msgstr ""
6069
6070
#: bzrlib/errors.py:2823
6071
msgid "Shared repository '%(display_url)s' already creates working trees."
6072
msgstr ""
6073
6074
#: bzrlib/errors.py:2829
6075
msgid ""
6076
"Shared repository '%(display_url)s' already doesn't create working trees."
6077
msgstr ""
6078
6079
#: bzrlib/errors.py:2835
6080
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6081
msgstr ""
6082
6083
#: bzrlib/errors.py:2840
6084
msgid "No location could be found to bind to at %(display_url)s."
6085
msgstr ""
6086
6087
#: bzrlib/errors.py:2845
6088
msgid ""
6089
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
6090
"%(more)s"
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:2864
6094
msgid ""
6095
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
6096
"%(more)s"
6097
msgstr ""
6098
6099
#: bzrlib/errors.py:2870
6100
msgid "Variable {%(name)s} is not available."
6101
msgstr ""
6102
6103
#: bzrlib/errors.py:2878
6104
msgid "No template specified."
6105
msgstr ""
6106
6107
#: bzrlib/errors.py:2883
6108
msgid "Unable to create symlink %(path_str)son this platform"
6109
msgstr ""
6110
6111
#: bzrlib/errors.py:2898
6112
msgid ""
6113
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6114
"\", \"local\"."
6115
msgstr ""
6116
6117
#: bzrlib/errors.py:2932
6118
msgid ""
6119
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6120
msgstr ""
6121
6122
#: bzrlib/errors.py:2944
6123
msgid "The \"%(config_id)s\" configuration does not exist."
6124
msgstr ""
6125
6126
#: bzrlib/errors.py:2952
6127
msgid "The \"%(option_name)s\" configuration option does not exist."
6128
msgstr ""
6129
6130
#: bzrlib/errors.py:2960
6131
msgid "The alias \"%(alias_name)s\" does not exist."
6132
msgstr ""
6133
6134
#: bzrlib/errors.py:2974
6135
msgid "\"%(alias_name)s\" is not a valid location alias."
6136
msgstr ""
6137
6138
#: bzrlib/errors.py:2982
6139
msgid "No %(alias_name)s location assigned."
6140
msgstr ""
6141
6142
#: bzrlib/errors.py:2990
6143
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6144
msgstr ""
6145
6146
#: bzrlib/errors.py:3000
6147
msgid "Unknown rules detected: %(unknowns_str)s."
6148
msgstr ""
6149
6150
#: bzrlib/errors.py:3011
6151
msgid "Tip change rejected: %(msg)s"
6152
msgstr ""
6153
6154
#: bzrlib/errors.py:3019
6155
msgid "Shelf corrupt."
6156
msgstr ""
6157
6158
#: bzrlib/errors.py:3024
6159
msgid "Corruption while decompressing repository file%(orig_error)s"
6160
msgstr ""
6161
6162
#: bzrlib/errors.py:3036
6163
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6164
msgstr ""
6165
6166
#: bzrlib/errors.py:3044
6167
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6168
msgstr ""
6169
6170
#: bzrlib/errors.py:3052
6171
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6172
msgstr ""
6173
6174
#: bzrlib/errors.py:3060
6175
msgid "The user aborted the operation."
6176
msgstr ""
6177
6178
#: bzrlib/errors.py:3065
6179
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6180
msgstr ""
6181
6182
#: bzrlib/errors.py:3075
6183
msgid "No such view: %(view_name)s."
6184
msgstr ""
6185
6186
#: bzrlib/errors.py:3085
6187
msgid ""
6188
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6189
"to a later format."
6190
msgstr ""
6191
6192
#: bzrlib/errors.py:3094
6193
msgid ""
6194
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6195
msgstr ""
6196
6197
#: bzrlib/errors.py:3161
6198
msgid "%(bzrdir)r does not support co-located branches."
6199
msgstr ""
6200
6201
#: bzrlib/errors.py:3167
6202
msgid ""
6203
"Unable to determine your name.\n"
6204
"Please, set your name with the 'whoami' command.\n"
6205
"E.g. bzr whoami \"Your Name <name@example.com>\""
6206
msgstr ""
6207
6208
#: bzrlib/errors.py:3176
6209
msgid "Invalid pattern(s) found. %(msg)s"
6210
msgstr ""
6211
6212
#: bzrlib/errors.py:3184
6213
msgid ""
6214
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6215
"unbind` to fix."
6216
msgstr ""
6217
6218
#: bzrlib/errors.py:3195
6219
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6220
msgstr ""
6221
6222
#: bzrlib/errors.py:3204
6223
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6224
msgstr ""
6225
6226
#: bzrlib/errors.py:3213
6227
msgid ""
6228
"No compatible object available for operations from %(source)r to %(target)r."
6229
msgstr ""
6230
6231
#: bzrlib/errors.py:3223
6232
msgid ""
6233
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6234
"%(arguments)s."
6235
msgstr ""
6236
6237
#: bzrlib/errors.py:3233
6238
msgid ""
6239
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6240
"format %(format)r"
6241
msgstr ""
6242
6243
#: bzrlib/errors.py:3249
6244
msgid "Binary files section encountered."
6245
msgstr ""
6246
6247
#: bzrlib/errors.py:3257
6248
msgid ""
6249
"Malformed patch header. %(desc)s\n"
6250
"%(line)r"
6251
msgstr ""
6252
6253
#: bzrlib/errors.py:3266
6254
msgid ""
6255
"Malformed hunk header. %(desc)s\n"
6256
"%(line)r"
6257
msgstr ""
6258
6259
#: bzrlib/errors.py:3275
6260
msgid ""
6261
"Malformed line. %(desc)s\n"
6262
"%(line)r"
6263
msgstr ""
6264
6265
#: bzrlib/errors.py:3285
6266
msgid ""
6267
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6268
"but patch says it should be \"%(patch_line)s\""
6269
msgstr ""
6270
6271
#: bzrlib/export_pot.py:246
6272
#, python-format
6273
msgid "Exporting messages from builtin command: %s"
6274
msgstr ""
6275
6276
#: bzrlib/export_pot.py:265
6277
msgid "Exporting messages from plugin command: {0} in {1}"
6278
msgstr ""
6279
6280
#: bzrlib/export_pot.py:286
6281
#, python-format
6282
msgid "Exporting message from error: %s"
6283
msgstr ""
6284
6285
#: bzrlib/fetch.py:97
6286
msgid "Finding revisions"
6287
msgstr ""
6288
6289
#: bzrlib/fetch.py:102
6290
msgid "Fetching revisions"
6291
msgstr ""
6292
6293
#: bzrlib/foreign.py:261
6294
msgid "Push into a different VCS without any custom bzr metadata."
6295
msgstr ""
6296
6297
#: bzrlib/foreign.py:263
6298
msgid ""
6299
"This will afterwards rebase the local branch on the remote\n"
6300
"branch unless the --no-rebase option is used, in which case \n"
6301
"the two branches will be out of sync after the push. "
6302
msgstr ""
6303
6304
# help of 'directory' option of 'dpush' command
6305
#: bzrlib/foreign.py:271
6306
msgid ""
6307
"Branch to push from, rather than the one containing the working directory."
6308
msgstr ""
6309
6310
# help of 'no-rebase' option of 'dpush' command
6311
#: bzrlib/foreign.py:276
6312
msgid "Do not rebase after push."
6313
msgstr ""
6314
6315
# help of 'strict' option of 'dpush' command
6316
#: bzrlib/foreign.py:278
6317
msgid ""
6318
"Refuse to push if there are uncommitted changes in the working tree, --no-"
6319
"strict disables the check."
6320
msgstr ""
6321
6322
#: bzrlib/foreign.py:310
6323
#, python-format
6324
msgid "Using saved location: %s\n"
6325
msgstr ""
6326
6327
#: bzrlib/foreign.py:320
6328
msgid ""
6329
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6330
"regular push."
6331
msgstr ""
6332
6333
#: bzrlib/gpg.py:116 bzrlib/gpg.py:454
6334
msgid "{0} commits with valid signatures"
6335
msgstr ""
6336
6337
#: bzrlib/gpg.py:120 bzrlib/gpg.py:459
6338
msgid "{0} commit with unknown key"
6339
msgid_plural "{0} commits with unknown keys"
6340
msgstr[0] ""
6341
msgstr[1] ""
6342
6343
#: bzrlib/gpg.py:126 bzrlib/gpg.py:466
6344
msgid "{0} commit not valid"
6345
msgid_plural "{0} commits not valid"
6346
msgstr[0] ""
6347
msgstr[1] ""
6348
6349
#: bzrlib/gpg.py:132 bzrlib/gpg.py:473
6350
msgid "{0} commit not signed"
6351
msgid_plural "{0} commits not signed"
6352
msgstr[0] ""
6353
msgstr[1] ""
6354
6355
#: bzrlib/gpg.py:138 bzrlib/gpg.py:480
6356
msgid "{0} commit with key now expired"
6357
msgid_plural "{0} commits with key now expired"
6358
msgstr[0] ""
6359
msgstr[1] ""
6360
6361
#: bzrlib/gpg.py:336
6362
msgid "No GnuPG key results for pattern: {0}"
6363
msgstr ""
6364
6365
#: bzrlib/gpg.py:379
6366
msgid "{0} signed {1} commit"
6367
msgid_plural "{0} signed {1} commits"
6368
msgstr[0] ""
6369
msgstr[1] ""
6370
6371
#: bzrlib/gpg.py:396 bzrlib/gpg.py:412
6372
msgid "{0} commit by author {1}"
6373
msgid_plural "{0} commits by author {1}"
6374
msgstr[0] ""
6375
msgstr[1] ""
6376
6377
#: bzrlib/gpg.py:426
6378
msgid "Unknown key {0} signed {1} commit"
6379
msgid_plural "Unknown key {0} signed {1} commits"
6380
msgstr[0] ""
6381
msgstr[1] ""
6382
6383
#: bzrlib/gpg.py:444
6384
msgid "{0} commit by author {1} with key {2} now expired"
6385
msgid_plural "{0} commits by author {1} with key {2} now expired"
6386
msgstr[0] ""
6387
msgstr[1] ""
6388
6389
#: bzrlib/groupcompress.py:1737
6390
#, python-format
6391
msgid "Insert claimed random_id=True, but then inserted %r two times"
6392
msgstr ""
6393
6394
#: bzrlib/hooks.py:329
6395
#, python-format
6396
msgid "Introduced in: %s"
6397
msgstr ""
6398
6399
#: bzrlib/hooks.py:332
6400
#, python-format
6401
msgid "Deprecated in: %s"
6402
msgstr ""
6403
6404
#: bzrlib/knit.py:1764 bzrlib/knit.py:1800
6405
msgid "Walking content"
6406
msgstr ""
6407
6408
#: bzrlib/knit.py:3328
6409
msgid "annotating"
6410
msgstr ""
6411
6412
#: bzrlib/lock.py:547
6413
msgid "{0!r} was {1} locked again"
6414
msgstr ""
6415
6416
#: bzrlib/lockdir.py:320
6417
#, python-format
6418
msgid "error removing pending lock: %s"
6419
msgstr ""
6420
6421
#: bzrlib/lockdir.py:615
6422
msgid "Unable to obtain"
6423
msgstr ""
6424
6425
#: bzrlib/lockdir.py:617
6426
msgid "Lock owner changed for"
6427
msgstr ""
6428
6429
#: bzrlib/lockdir.py:619
6430
msgid "{0} lock {1} {2}."
6431
msgstr ""
6432
6433
#: bzrlib/lockdir.py:626
6434
#, python-format
6435
msgid "Will continue to try until %s, unless you press Ctrl-C."
6436
msgstr ""
6437
6438
#: bzrlib/lockdir.py:628
6439
msgid "See \"bzr help break-lock\" for more."
6440
msgstr ""
6441
6442
#: bzrlib/lockdir.py:738
6443
#, python-format
6444
msgid ""
6445
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6446
msgstr ""
6447
6448
#: bzrlib/log.py:572
6449
msgid "--exclude-common-ancestry requires two different revisions"
6450
msgstr ""
6451
6452
#: bzrlib/log.py:574
6453
#, python-format
6454
msgid "invalid direction %r"
6455
msgstr ""
6456
6457
#: bzrlib/log.py:621
6458
msgid "Start revision not found in left-hand history of end revision."
6459
msgstr ""
6460
6461
#: bzrlib/log.py:667
6462
msgid "Start revision not found in history of end revision."
6463
msgstr ""
6464
6465
#: bzrlib/log.py:1085 bzrlib/log.py:1143
6466
msgid "Logging revision 0 is invalid."
6467
msgstr ""
6468
6469
#: bzrlib/log.py:1087 bzrlib/log.py:1145
6470
msgid "Start revision must be older than the end revision."
6471
msgstr ""
6472
6473
#: bzrlib/log.py:1832
6474
#, python-format
6475
msgid "unknown log formatter: %r"
6476
msgstr ""
6477
6478
#: bzrlib/log.py:2128
6479
msgid "fixes bug"
6480
msgid_plural "fixes bugs"
6481
msgstr[0] ""
6482
msgstr[1] ""
6483
6484
#: bzrlib/merge.py:718
6485
msgid "All changes applied successfully."
6486
msgstr ""
6487
6488
#: bzrlib/merge.py:720
6489
#, python-format
6490
msgid "%d conflicts encountered."
6491
msgstr ""
6492
6493
#: bzrlib/merge.py:868 bzrlib/merge.py:1956
6494
msgid "Preparing file merge"
6495
msgstr ""
6496
6497
#: bzrlib/multiparent.py:424
6498
msgid "Importing revisions"
6499
msgstr ""
6500
6501
# help of 'help' option
6502
#: bzrlib/option.py:524
6503
msgid "Show help message."
6504
msgstr ""
6505
6506
# help of 'quiet' option
6507
#: bzrlib/option.py:526
6508
msgid "Only display errors and warnings."
6509
msgstr ""
6510
6511
# help of 'usage' option
6512
#: bzrlib/option.py:529
6513
msgid "Show usage message and options."
6514
msgstr ""
6515
6516
# help of 'verbose' option
6517
#: bzrlib/option.py:531
6518
msgid "Display more information."
6519
msgstr ""
6520
6521
# help of 'change' option
6522
#: bzrlib/option.py:539
6523
msgid ""
6524
"Select changes introduced by the specified revision. See also \"help "
6525
"revisionspec\"."
6526
msgstr ""
6527
6528
# help of 'directory' option
6529
#: bzrlib/option.py:541
6530
msgid "Branch to operate on, instead of working directory."
6531
msgstr ""
6532
6533
# help of 'log-format=long' option
6534
#: bzrlib/option.py:543
6535
msgid "Detailed log format."
6536
msgstr ""
6537
6538
# help of 'log-format=gnu-changelog' option
6539
#: bzrlib/option.py:543
6540
msgid "Format used by GNU ChangeLog files."
6541
msgstr ""
6542
6543
# help of 'log-format=line' option
6544
#: bzrlib/option.py:543
6545
msgid "Log format with one line per revision."
6546
msgstr ""
6547
6548
# help of 'log-format=short' option
6549
#: bzrlib/option.py:543
6550
msgid "Moderately short log format."
6551
msgstr ""
6552
6553
# help of 'log-format' option
6554
#: bzrlib/option.py:543
6555
msgid "Use specified log format."
6556
msgstr ""
6557
6558
# title of 'log-format' option
6559
#: bzrlib/option.py:545
6560
msgid "Log format"
6561
msgstr ""
6562
6563
# help of 'merge-type=lca' option
6564
#: bzrlib/option.py:547
6565
msgid "LCA-newness merge."
6566
msgstr ""
6567
6568
# help of 'merge-type=diff3' option
6569
#: bzrlib/option.py:547
6570
msgid "Merge using external diff3."
6571
msgstr ""
6572
6573
# help of 'merge-type=merge3' option
6574
#: bzrlib/option.py:547
6575
msgid "Native diff3-style merge."
6576
msgstr ""
6577
6578
# help of 'merge-type' option
6579
#: bzrlib/option.py:547
6580
msgid "Select a particular merge algorithm."
6581
msgstr ""
6582
6583
# help of 'merge-type=weave' option
6584
#: bzrlib/option.py:547
6585
msgid "Weave-based merge."
6586
msgstr ""
6587
6588
# title of 'merge-type' option
6589
#: bzrlib/option.py:549
6590
msgid "Merge algorithm"
6591
msgstr ""
6592
6593
# help of 'message' option
6594
#: bzrlib/option.py:552
6595
msgid "Message string."
6596
msgstr ""
6597
6598
# help of 'null' option
6599
#: bzrlib/option.py:554
6600
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6601
msgstr ""
6602
6603
# help of 'overwrite' option
6604
#: bzrlib/option.py:556
6605
msgid "Ignore differences between branches and overwrite unconditionally."
6606
msgstr ""
6607
6608
# help of 'remember' option
6609
#: bzrlib/option.py:558
6610
msgid "Remember the specified location as a default."
6611
msgstr ""
6612
6613
# help of 'reprocess' option
6614
#: bzrlib/option.py:560
6615
msgid "Reprocess to reduce spurious conflicts."
6616
msgstr ""
6617
6618
# help of 'revision' option
6619
#: bzrlib/option.py:564
6620
msgid "See \"help revisionspec\" for details."
6621
msgstr ""
6622
6623
# help of 'show-ids' option
6624
#: bzrlib/option.py:566
6625
msgid "Show internal object ids."
6626
msgstr ""
6627
6628
# help of 'timezone' option
6629
#: bzrlib/option.py:569
6630
msgid "Display timezone as local, original, or utc."
6631
msgstr ""
6632
6633
#: bzrlib/osutils.py:94
6634
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6635
msgstr ""
6636
6637
#: bzrlib/osutils.py:214
6638
msgid "lstat/stat of ({0!r}): {1!r}"
6639
msgstr ""
6640
6641
#: bzrlib/osutils.py:964 bzrlib/osutils.py:975
6642
#, python-format
6643
msgid "sorry, %r not allowed in path"
6644
msgstr ""
6645
6646
#: bzrlib/osutils.py:1193
6647
#, python-format
6648
msgid "%r is too short to calculate a relative path"
6649
msgstr ""
6650
6651
#: bzrlib/plugin.py:142
6652
#, python-format
6653
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6654
msgstr ""
6655
6656
# help of 'plugin' option of 'bash-completion' command
6657
#: bzrlib/plugins/bash_completion/bashcomp.py:408
6658
msgid "Enable completions for the selected plugin (default: all plugins)"
6659
msgstr ""
6660
6661
#: bzrlib/plugins/bash_completion/bashcomp.py:409
6662
msgid "Generate a shell function for bash command line completion."
6663
msgstr ""
6664
6665
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6666
msgid ""
6667
"This command generates a shell function which can be used by bash to\n"
6668
"automatically complete the currently typed command when the user presses\n"
6669
"the completion key (usually tab)."
6670
msgstr ""
6671
6672
#: bzrlib/plugins/bash_completion/bashcomp.py:415
6673
msgid ""
6674
"Commonly used like this:\n"
6675
" eval \"`bzr bash-completion`\""
6676
msgstr ""
6677
6678
# help of 'function-name' option of 'bash-completion' command
6679
#: bzrlib/plugins/bash_completion/bashcomp.py:421
6680
msgid "Name of the generated function (default: _bzr)"
6681
msgstr ""
6682
6683
# help of 'function-only' option of 'bash-completion' command
6684
#: bzrlib/plugins/bash_completion/bashcomp.py:423
6685
msgid "Generate only the shell function, don't enable it"
6686
msgstr ""
6687
6688
#: bzrlib/plugins/launchpad/__init__.py:79
6689
msgid "Register a branch with launchpad.net."
6690
msgstr ""
6691
6692
#: bzrlib/plugins/launchpad/__init__.py:81
6693
msgid ""
6694
"This command lists a bzr branch in the directory of branches on\n"
6695
"launchpad.net. Registration allows the branch to be associated with\n"
6696
"bugs or specifications."
6697
msgstr ""
6698
6699
#: bzrlib/plugins/launchpad/__init__.py:85
6700
msgid ""
6701
"Before using this command you must register the project to which the\n"
6702
"branch belongs, and create an account for yourself on launchpad.net."
6703
msgstr ""
6704
6705
#: bzrlib/plugins/launchpad/__init__.py:88
6706
msgid ""
6707
"arguments:\n"
6708
" public_url: The publicly visible url for the branch to register.\n"
6709
" This must be an http or https url (which Launchpad can read\n"
6710
" from to access the branch). Local file urls, SFTP urls, and\n"
6711
" bzr+ssh urls will not work.\n"
6712
" If no public_url is provided, bzr will use the configured\n"
6713
" public_url if there is one for the current branch, and\n"
6714
" otherwise error."
6715
msgstr ""
6716
6717
#: bzrlib/plugins/launchpad/__init__.py:97
6718
msgid ""
6719
"example:\n"
6720
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6721
" --project fooproject"
6722
msgstr ""
6723
6724
# help of 'project' option of 'register-branch' command
6725
#: bzrlib/plugins/launchpad/__init__.py:104
6726
msgid "Launchpad project short name to associate with the branch."
6727
msgstr ""
6728
6729
# help of 'branch-name' option of 'register-branch' command
6730
#: bzrlib/plugins/launchpad/__init__.py:111
6731
msgid ""
6732
"Short name for the branch; by default taken from the last component of the "
6733
"url."
6734
msgstr ""
6735
6736
# help of 'branch-title' option of 'register-branch' command
6737
#: bzrlib/plugins/launchpad/__init__.py:115
6738
msgid "One-sentence description of the branch."
6739
msgstr ""
6740
6741
# help of 'branch-description' option of 'register-branch' command
6742
#: bzrlib/plugins/launchpad/__init__.py:118
6743
msgid "Longer description of the purpose or contents of the branch."
6744
msgstr ""
6745
6746
# help of 'author' option of 'register-branch' command
6747
#: bzrlib/plugins/launchpad/__init__.py:121
6748
msgid "Branch author's email address, if not yourself."
6749
msgstr ""
6750
6751
# help of 'link-bug' option of 'register-branch' command
6752
#: bzrlib/plugins/launchpad/__init__.py:124
6753
msgid "The bug this branch fixes."
6754
msgstr ""
6755
6756
# help of 'dry-run' option of 'register-branch' command
6757
#: bzrlib/plugins/launchpad/__init__.py:127
6758
msgid "Prepare the request but don't actually send it."
6759
msgstr ""
6760
6761
#: bzrlib/plugins/launchpad/__init__.py:149
6762
msgid ""
6763
"register-branch requires a public branch url - see bzr help register-branch."
6764
msgstr ""
6765
6766
#: bzrlib/plugins/launchpad/__init__.py:157
6767
msgid "--product is deprecated; please use --project."
6768
msgstr ""
6769
6770
#: bzrlib/plugins/launchpad/__init__.py:189
6771
msgid "Open a Launchpad branch page in your web browser."
6772
msgstr ""
6773
6774
# help of 'dry-run' option of 'launchpad-open' command
6775
#: bzrlib/plugins/launchpad/__init__.py:194
6776
msgid "Do not actually open the browser. Just say the URL we would use."
6777
msgstr ""
6778
6779
#: bzrlib/plugins/launchpad/__init__.py:229
6780
#, python-format
6781
msgid "Opening %s in web browser"
6782
msgstr ""
6783
6784
#: bzrlib/plugins/launchpad/__init__.py:239
6785
msgid "Show or set the Launchpad user ID."
6786
msgstr ""
6787
6788
#: bzrlib/plugins/launchpad/__init__.py:241
6789
msgid ""
6790
"When communicating with Launchpad, some commands need to know your\n"
6791
"Launchpad user ID. This command can be used to set or show the\n"
6792
"user ID that Bazaar will use for such communication."
6793
msgstr ""
6794
6795
#: bzrlib/plugins/launchpad/__init__.py:245
6796
msgid ""
6797
":Examples:\n"
6798
" Show the Launchpad ID of the current user::"
6799
msgstr ""
6800
6801
#: bzrlib/plugins/launchpad/__init__.py:248
6802
msgid " bzr launchpad-login"
6803
msgstr ""
6804
6805
#: bzrlib/plugins/launchpad/__init__.py:250
6806
msgid " Set the Launchpad ID of the current user to 'bob'::"
6807
msgstr ""
6808
6809
#: bzrlib/plugins/launchpad/__init__.py:252
6810
msgid " bzr launchpad-login bob"
6811
msgstr ""
6812
6813
# help of 'no-check' option of 'launchpad-login' command
6814
#: bzrlib/plugins/launchpad/__init__.py:259
6815
msgid "Don't check that the user name is valid."
6816
msgstr ""
6817
6818
#: bzrlib/plugins/launchpad/__init__.py:274
6819
#: bzrlib/plugins/launchpad/__init__.py:285
6820
msgid "Launchpad user ID exists and has SSH keys.\n"
6821
msgstr ""
6822
6823
#: bzrlib/plugins/launchpad/__init__.py:277
6824
msgid "No Launchpad user ID configured.\n"
6825
msgstr ""
6826
6827
#: bzrlib/plugins/launchpad/__init__.py:288
6828
#, python-format
6829
msgid "Launchpad user ID set to '%s'.\n"
6830
msgstr ""
6831
6832
#: bzrlib/plugins/launchpad/__init__.py:296
6833
msgid "Ask Launchpad to mirror a branch now."
6834
msgstr ""
6835
6836
#: bzrlib/plugins/launchpad/__init__.py:316
6837
msgid "Propose merging a branch on Launchpad."
6838
msgstr ""
6839
6840
#: bzrlib/plugins/launchpad/__init__.py:318
6841
msgid ""
6842
"This will open your usual editor to provide the initial comment. When it\n"
6843
"has created the proposal, it will open it in your default web browser."
6844
msgstr ""
6845
6846
#: bzrlib/plugins/launchpad/__init__.py:321
6847
msgid ""
6848
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6849
"is not supplied, the remembered submit branch will be used. If no submit\n"
6850
"branch is remembered, the development focus will be used."
6851
msgstr ""
6852
6853
#: bzrlib/plugins/launchpad/__init__.py:325
6854
msgid ""
6855
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6856
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6857
"The parameter the launchpad account name of the desired reviewer. This\n"
6858
"may optionally be followed by '=' and the review type. For example:"
6859
msgstr ""
6860
6861
#: bzrlib/plugins/launchpad/__init__.py:330
6862
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6863
msgstr ""
6864
6865
#: bzrlib/plugins/launchpad/__init__.py:332
6866
msgid ""
6867
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6868
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6869
msgstr ""
6870
6871
# help of 'staging' option of 'lp-propose-merge' command
6872
#: bzrlib/plugins/launchpad/__init__.py:337
6873
msgid "Propose the merge on staging."
6874
msgstr ""
6875
6876
# help of 'message' option of 'lp-propose-merge' command
6877
#: bzrlib/plugins/launchpad/__init__.py:339
6878
msgid "Commit message."
6879
msgstr ""
6880
6881
# help of 'approve' option of 'lp-propose-merge' command
6882
#: bzrlib/plugins/launchpad/__init__.py:341
6883
msgid "Mark the proposal as approved immediately."
6884
msgstr ""
6885
6886
# help of 'review' option of 'lp-propose-merge' command
6887
#: bzrlib/plugins/launchpad/__init__.py:343
6888
msgid "Requested reviewer and optional type."
6889
msgstr ""
6890
6891
#: bzrlib/plugins/launchpad/__init__.py:380
6892
msgid "Find the proposal to merge this revision."
6893
msgstr ""
6894
6895
#: bzrlib/plugins/launchpad/__init__.py:382
6896
msgid ""
6897
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6898
"This works only if the selected branch was the merge proposal target, and\n"
6899
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6900
"are opened in a web browser."
6901
msgstr ""
6902
6903
#: bzrlib/plugins/launchpad/__init__.py:387
6904
msgid ""
6905
"Any revision involved in the merge may be specified-- the revision in\n"
6906
"which the merge was performed, or one of the revisions that was merged."
6907
msgstr ""
6908
6909
#: bzrlib/plugins/launchpad/__init__.py:390
6910
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6911
msgstr ""
6912
6913
#: bzrlib/plugins/launchpad/__init__.py:392
6914
msgid " bzr lp-find-proposal -r annotate:README:1"
6915
msgstr ""
6916
6917
#: bzrlib/plugins/launchpad/__init__.py:407
6918
msgid "No review found."
6919
msgstr ""
6920
6921
#: bzrlib/plugins/launchpad/__init__.py:408
6922
#, python-format
6923
msgid "%d proposals(s) found."
6924
msgstr ""
6925
6926
#: bzrlib/plugins/launchpad/__init__.py:418
6927
msgid "Finding revision-id"
6928
msgstr ""
6929
6930
#: bzrlib/plugins/launchpad/__init__.py:425
6931
msgid "Finding merge"
6932
msgstr ""
6933
6934
#: bzrlib/plugins/launchpad/__init__.py:430
6935
msgid "Finding revno"
6936
msgstr ""
6937
6938
#: bzrlib/plugins/launchpad/__init__.py:435
6939
msgid "Finding Launchpad branch"
6940
msgstr ""
6941
6942
#: bzrlib/plugins/launchpad/__init__.py:438
6943
msgid "Finding proposals"
6944
msgstr ""
6945
6946
#: bzrlib/plugins/launchpad/account.py:64
6947
msgid "Setting ssh/sftp usernames for launchpad.net."
6948
msgstr ""
6949
6950
#: bzrlib/plugins/launchpad/lp_api.py:239
6951
#: bzrlib/plugins/launchpad/lp_api.py:244
6952
#, python-format
6953
msgid "%s is not registered on Launchpad"
6954
msgstr ""
6955
6956
#: bzrlib/plugins/launchpad/lp_api.py:254
6957
#, python-format
6958
msgid "%s has no development focus."
6959
msgstr ""
6960
6961
#: bzrlib/plugins/launchpad/lp_api.py:259
6962
#, python-format
6963
msgid "development focus %s has no branch."
6964
msgstr ""
6965
6966
#: bzrlib/plugins/launchpad/lp_api.py:264
6967
#, python-format
6968
msgid "source package %s has no branch."
6969
msgstr ""
6970
6971
#: bzrlib/plugins/launchpad/lp_api.py:268
6972
#, python-format
6973
msgid "%s has no associated product or source package."
6974
msgstr ""
6975
6976
#: bzrlib/plugins/launchpad/lp_api.py:280
6977
#, python-format
6978
msgid "%s is already up-to-date."
6979
msgstr ""
6980
6981
#: bzrlib/plugins/launchpad/lp_api.py:287
6982
#, python-format
6983
msgid "Pushing to %s"
6984
msgstr ""
6985
6986
#: bzrlib/plugins/launchpad/lp_directory.py:169
6987
msgid ""
6988
"resolution for {0}\n"
6989
" local: {1}\n"
6990
" remote: {2}"
6991
msgstr ""
6992
6993
#: bzrlib/plugins/launchpad/lp_propose.py:147
6994
#, python-format
6995
msgid "There is already a branch merge proposal: %s"
6996
msgstr ""
6997
6998
#: bzrlib/plugins/weave_fmt/bzrdir.py:226
6999
msgid "pb parameter to convert() is deprecated"
7000
msgstr ""
7001
7002
#: bzrlib/plugins/weave_fmt/bzrdir.py:229
7003
msgid "starting upgrade from format 4 to 5"
7004
msgstr ""
7005
7006
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7007
msgid "note: upgrade may be faster if all store files are ungzipped first"
7008
msgstr ""
7009
7010
#: bzrlib/plugins/weave_fmt/bzrdir.py:268
7011
msgid "converting revision"
7012
msgstr ""
7013
7014
#: bzrlib/plugins/weave_fmt/bzrdir.py:273
7015
msgid "upgraded to weaves:"
7016
msgstr ""
7017
7018
#: bzrlib/plugins/weave_fmt/bzrdir.py:274
7019
#, python-format
7020
msgid "%6d revisions and inventories"
7021
msgstr ""
7022
7023
#: bzrlib/plugins/weave_fmt/bzrdir.py:276
7024
#, python-format
7025
msgid "%6d revisions not present"
7026
msgstr ""
7027
7028
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7029
#, python-format
7030
msgid "%6d texts"
7031
msgstr ""
7032
7033
#: bzrlib/plugins/weave_fmt/bzrdir.py:314
7034
msgid "writing weave"
7035
msgstr ""
7036
7037
#: bzrlib/plugins/weave_fmt/bzrdir.py:318
7038
#: bzrlib/plugins/weave_fmt/bzrdir.py:320
7039
msgid "inventory"
7040
msgstr ""
7041
7042
#: bzrlib/plugins/weave_fmt/bzrdir.py:337
7043
msgid "write revision"
7044
msgstr ""
7045
7046
#: bzrlib/plugins/weave_fmt/bzrdir.py:351
7047
msgid "loading revision"
7048
msgstr ""
7049
7050
#: bzrlib/plugins/weave_fmt/bzrdir.py:356
7051
#, python-format
7052
msgid "revision {%s} not present in branch; will be converted as a ghost"
7053
msgstr ""
7054
7055
#: bzrlib/plugins/weave_fmt/bzrdir.py:496
7056
msgid "starting upgrade from format 5 to 6"
7057
msgstr ""
7058
7059
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7060
#, python-format
7061
msgid "adding prefixes to %s"
7062
msgstr ""
7063
7064
#: bzrlib/plugins/weave_fmt/bzrdir.py:546
7065
msgid "starting upgrade from format 6 to metadir"
7066
msgstr ""
7067
7068
#: bzrlib/plugins/weave_fmt/bzrdir.py:554
7069
msgid "Removing ancestry.weave"
7070
msgstr ""
7071
7072
#: bzrlib/plugins/weave_fmt/bzrdir.py:559
7073
msgid "Finding branch files"
7074
msgstr ""
7075
7076
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7077
msgid "Upgrading repository"
7078
msgstr ""
7079
7080
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7081
msgid "Upgrading branch"
7082
msgstr ""
7083
7084
#: bzrlib/plugins/weave_fmt/bzrdir.py:602
7085
msgid "No working tree."
7086
msgstr ""
7087
7088
#: bzrlib/plugins/weave_fmt/bzrdir.py:609
7089
msgid "Upgrading working tree"
7090
msgstr ""
7091
7092
#: bzrlib/plugins/weave_fmt/bzrdir.py:630
7093
#, python-format
7094
msgid "Make %s lock"
7095
msgstr ""
7096
7097
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7098
#, python-format
7099
msgid "Moving %s"
7100
msgstr ""
7101
7102
#: bzrlib/push.py:54
7103
msgid "Created new branch."
7104
msgstr ""
7105
7106
#: bzrlib/push.py:96
7107
#, python-format
7108
msgid ""
7109
"Target directory %s already contains a .bzr directory, but it is not valid."
7110
msgstr ""
7111
7112
#: bzrlib/push.py:99
7113
#, python-format
7114
msgid ""
7115
"Target directory %s already exists, but does not have a .bzr directory. "
7116
"Supply --use-existing-dir to push there anyway."
7117
msgstr ""
7118
7119
#: bzrlib/push.py:120
7120
#, python-format
7121
msgid "Too many redirections trying to make %s."
7122
msgstr ""
7123
7124
#: bzrlib/push.py:145
7125
msgid ""
7126
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7127
"information."
7128
msgstr ""
7129
7130
#: bzrlib/push.py:149
7131
#, python-format
7132
msgid ""
7133
"It is not possible to losslessly push to %s. You may want to use dpush "
7134
"instead."
7135
msgstr ""
7136
7137
#: bzrlib/push.py:155
7138
#, python-format
7139
msgid ""
7140
"At %s you have a valid .bzr control directory, but not a branch or "
7141
"repository. This is an unsupported configuration. Please move the target "
7142
"directory out of the way and try again."
7143
msgstr ""
7144
7145
#: bzrlib/reconcile.py:96
7146
#, python-format
7147
msgid "Reconciling branch %s"
7148
msgstr ""
7149
7150
#: bzrlib/reconcile.py:102
7151
#, python-format
7152
msgid "Reconciling repository %s"
7153
msgstr ""
7154
7155
#: bzrlib/reconcile.py:104
7156
msgid "Reconciling repository"
7157
msgstr ""
7158
7159
#: bzrlib/reconcile.py:110
7160
#, python-format
7161
msgid "%s cannot canonicalize CHKs."
7162
msgstr ""
7163
7164
#: bzrlib/reconcile.py:118
7165
msgid "Reconcile aborted: revision index has inconsistent parents."
7166
msgstr ""
7167
7168
#: bzrlib/reconcile.py:120
7169
msgid "Run \"bzr check\" for more details."
7170
msgstr ""
7171
7172
#: bzrlib/reconcile.py:122
7173
msgid "Reconciliation complete."
7174
msgstr ""
7175
7176
#: bzrlib/reconcile.py:165
7177
msgid "Fixing last revision info {0} => {1}"
7178
msgstr ""
7179
7180
#: bzrlib/reconcile.py:172
7181
msgid "revision_history ok."
7182
msgstr ""
7183
7184
#: bzrlib/reconcile.py:233
7185
msgid "Reading inventory data"
7186
msgstr ""
7187
7188
#: bzrlib/reconcile.py:253 bzrlib/reconcile.py:383
7189
msgid "Inventory ok."
7190
msgstr ""
7191
7192
#: bzrlib/reconcile.py:255 bzrlib/reconcile.py:385
7193
msgid "Backing up inventory"
7194
msgstr ""
7195
7196
#: bzrlib/reconcile.py:257
7197
msgid "Backup inventory created."
7198
msgstr ""
7199
7200
#: bzrlib/reconcile.py:273 bzrlib/reconcile.py:404
7201
msgid "Writing weave"
7202
msgstr ""
7203
7204
#: bzrlib/reconcile.py:276 bzrlib/reconcile.py:407
7205
msgid "Inventory regenerated."
7206
msgstr ""
7207
7208
#: bzrlib/reconcile.py:370 bzrlib/reconcile.py:372 bzrlib/reconcile.py:375
7209
msgid "Reading indexes"
7210
msgstr ""
7211
7212
#: bzrlib/reconcile.py:379 bzrlib/reconcile.py:381
7213
msgid "Checking unused inventories"
7214
msgstr ""
7215
7216
#: bzrlib/reconcile.py:387
7217
msgid "Backup Inventory created"
7218
msgstr ""
7219
7220
#: bzrlib/reconcile.py:445
7221
msgid "Fixing text parents"
7222
msgstr ""
7223
7224
#: bzrlib/reconfigure.py:52
7225
msgid "{0} is now stacked on {1}\n"
7226
msgstr ""
7227
7228
#: bzrlib/reconfigure.py:67
7229
#, python-format
7230
msgid "%s is now not stacked\n"
7231
msgstr ""
7232
7233
#: bzrlib/remote.py:1134 bzrlib/repository.py:287
7234
#, python-format
7235
msgid "bzr: ERROR (ignored): %s"
7236
msgstr ""
7237
7238
#: bzrlib/remote.py:2217
7239
msgid "Copying repository content as tarball..."
7240
msgstr ""
7241
7242
#: bzrlib/rename_map.py:68
7243
msgid "Calculating hashes"
7244
msgstr ""
7245
7246
#: bzrlib/rename_map.py:106
7247
msgid "Determining hash hits"
7248
msgstr ""
7249
7250
#: bzrlib/rename_map.py:241
7251
msgid "{0} => {1}"
7252
msgstr ""
7253
7254
#: bzrlib/repository.py:1781
7255
msgid "Moving repository to repository.backup"
7256
msgstr ""
7257
7258
#: bzrlib/repository.py:1788
7259
msgid "Creating new repository"
7260
msgstr ""
7261
7262
#: bzrlib/repository.py:1793
7263
msgid "Copying content"
7264
msgstr ""
7265
7266
#: bzrlib/repository.py:1797
7267
msgid "Deleting old repository content"
7268
msgstr ""
7269
7270
#: bzrlib/repository.py:1799
7271
msgid "repository converted"
7272
msgstr ""
7273
7274
#: bzrlib/revisionspec.py:904
7275
msgid "Using {0} {1}"
7276
msgstr ""
7277
7278
#: bzrlib/send.py:57
7279
#, python-format
7280
msgid "Mail client \"%s\" does not support specifying body"
7281
msgstr ""
7282
7283
#: bzrlib/send.py:61
7284
msgid "--remember requires a branch to be specified."
7285
msgstr ""
7286
7287
#: bzrlib/send.py:75
7288
msgid "No submit branch known or specified"
7289
msgstr ""
7290
7291
#: bzrlib/send.py:78
7292
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7293
msgstr ""
7294
7295
#: bzrlib/send.py:95
7296
#, python-format
7297
msgid "No such send format '%s'."
7298
msgstr ""
7299
7300
#: bzrlib/send.py:112
7301
msgid "bzr send takes at most two one revision identifiers"
7302
msgstr ""
7303
7304
#: bzrlib/send.py:125
7305
msgid "No revisions to submit."
7306
msgstr ""
7307
7308
#: bzrlib/send.py:136
7309
msgid ""
7310
"- not supported for merge directives that use more than one output file."
7311
msgstr ""
7312
7313
#: bzrlib/send.py:178
7314
msgid "Format 0.9 does not permit bundle with no patch"
7315
msgstr ""
7316
7317
#: bzrlib/shelf_ui.py:45
7318
#, python-format
7319
msgid "Shelve adding file \"%(path)s\"?"
7320
msgstr ""
7321
7322
#: bzrlib/shelf_ui.py:46
7323
msgid "Shelve binary changes?"
7324
msgstr ""
7325
7326
#: bzrlib/shelf_ui.py:47
7327
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7328
msgstr ""
7329
7330
#: bzrlib/shelf_ui.py:49
7331
#, python-format
7332
msgid "Shelve removing file \"%(path)s\"?"
7333
msgstr ""
7334
7335
#: bzrlib/shelf_ui.py:50
7336
#, python-format
7337
msgid "Shelve %d change(s)?"
7338
msgstr ""
7339
7340
#: bzrlib/shelf_ui.py:51
7341
msgid "Shelve?"
7342
msgstr ""
7343
7344
#: bzrlib/shelf_ui.py:52
7345
#, python-format
7346
msgid ""
7347
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7348
msgstr ""
7349
7350
#: bzrlib/shelf_ui.py:54
7351
#, python-format
7352
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7353
msgstr ""
7354
7355
#: bzrlib/shelf_ui.py:69
7356
#, python-format
7357
msgid "Changes shelved with id \"%d\"."
7358
msgstr ""
7359
7360
#: bzrlib/shelf_ui.py:73
7361
msgid "Selected changes destroyed."
7362
msgstr ""
7363
7364
#: bzrlib/shelf_ui.py:77
7365
msgid "Selected changes:"
7366
msgstr ""
7367
7368
#: bzrlib/shelf_ui.py:97
7369
#, python-format
7370
msgid "Delete file \"%(path)s\"?"
7371
msgstr ""
7372
7373
#: bzrlib/shelf_ui.py:98
7374
msgid "Apply binary changes?"
7375
msgstr ""
7376
7377
#: bzrlib/shelf_ui.py:99
7378
#, python-format
7379
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7380
msgstr ""
7381
7382
#: bzrlib/shelf_ui.py:101
7383
#, python-format
7384
msgid "Add file \"%(path)s\"?"
7385
msgstr ""
7386
7387
#: bzrlib/shelf_ui.py:102
7388
#, python-format
7389
msgid "Apply %d change(s)?"
7390
msgstr ""
7391
7392
#: bzrlib/shelf_ui.py:103
7393
msgid "Apply change?"
7394
msgstr ""
7395
7396
#: bzrlib/shelf_ui.py:104
7397
#, python-format
7398
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7399
msgstr ""
7400
7401
#: bzrlib/shelf_ui.py:106
7402
#, python-format
7403
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7404
msgstr ""
7405
7406
#: bzrlib/shelf_ui.py:401
7407
msgid "No changes are shelved."
7408
msgstr ""
7409
7410
#: bzrlib/shelf_ui.py:459
7411
#, python-format
7412
msgid "Using changes with id \"%d\"."
7413
msgstr ""
7414
7415
#: bzrlib/shelf_ui.py:463
7416
#, python-format
7417
msgid "Message: %s"
7418
msgstr ""
7419
7420
#: bzrlib/shelf_ui.py:475
7421
#, python-format
7422
msgid "Deleted changes with id \"%d\"."
7423
msgstr ""
7424
7425
#: bzrlib/smart/medium.py:712
7426
msgid "HPSS calls: {0} ({1} vfs) {2}"
7427
msgstr ""
7428
7429
#: bzrlib/smart/server.py:167
7430
msgid "Requested to stop gracefully"
7431
msgstr ""
7432
7433
#: bzrlib/smart/server.py:177
7434
#, python-format
7435
msgid "Waiting for %d client(s) to finish"
7436
msgstr ""
7437
7438
#: bzrlib/smart/server.py:183
7439
#, python-format
7440
msgid "Still waiting for %d client(s) to finish"
7441
msgstr ""
7442
7443
#: bzrlib/smart/server.py:217
7444
#, python-format
7445
msgid "listening socket error: %s"
7446
msgstr ""
7447
7448
#: bzrlib/smart/server.py:450
7449
#, python-format
7450
msgid "listening on port: %s"
7451
msgstr ""
7452
7453
#: bzrlib/switch.py:67
7454
msgid "Pending merges must be committed or reverted before using switch."
7455
msgstr ""
7456
7457
#: bzrlib/switch.py:94
7458
msgid ""
7459
"Cannot switch as local commits found in the checkout. Commit these to the "
7460
"bound branch or use --force to throw them away."
7461
msgstr ""
7462
7463
#: bzrlib/switch.py:99
7464
#, python-format
7465
msgid ""
7466
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7467
"anyway, use --force."
7468
msgstr ""
7469
7470
#: bzrlib/switch.py:108
7471
msgid "Cannot switch a branch, only a checkout."
7472
msgstr ""
7473
7474
#: bzrlib/switch.py:144
7475
#, python-format
7476
msgid "Tree is up to date at revision %d."
7477
msgstr ""
7478
7479
#: bzrlib/switch.py:150
7480
#, python-format
7481
msgid "Updated to revision %d."
7482
msgstr ""
7483
7484
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7485
msgid "Apply phase"
7486
msgstr ""
7487
7488
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7489
msgid "removing file"
7490
msgstr ""
7491
7492
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7493
msgid "adding file"
7494
msgstr ""
7495
7496
#: bzrlib/transform.py:2580
7497
msgid "Building tree"
7498
msgstr ""
7499
7500
#: bzrlib/transform.py:2670 bzrlib/transform.py:2697
7501
msgid "Adding file contents"
7502
msgstr ""
7503
7504
#: bzrlib/transform.py:3017
7505
msgid "Resolution pass"
7506
msgstr ""
7507
7508
#: bzrlib/transport/ftp/_gssapi.py:86
7509
#, python-format
7510
msgid "Authenticated as %s"
7511
msgstr ""
7512
7513
#: bzrlib/tree.py:632
7514
msgid "*** {0} content-filter: {1} => {2!r}"
7515
msgstr ""
7516
7517
#: bzrlib/upgrade.py:76
7518
#, python-format
7519
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7520
msgstr ""
7521
7522
#: bzrlib/upgrade.py:99
7523
#, python-format
7524
msgid "cannot upgrade from bzrdir format %s"
7525
msgstr ""
7526
7527
#: bzrlib/upgrade.py:102
7528
#, python-format
7529
msgid "starting upgrade of %s"
7530
msgstr ""
7531
7532
#: bzrlib/upgrade.py:109
7533
msgid "finished"
7534
msgstr ""
7535
7536
#: bzrlib/upgrade.py:119
7537
msgid "Deleting backup.bzr"
7538
msgstr ""
7539
7540
#: bzrlib/upgrade.py:150
7541
msgid ""
7542
"\n"
7543
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7544
msgstr ""
7545
7546
#: bzrlib/upgrade.py:207
7547
#, python-format
7548
msgid "Found %d dependent branches - upgrading ..."
7549
msgstr ""
7550
7551
#: bzrlib/upgrade.py:275
7552
msgid "Upgrading bzrdirs"
7553
msgstr ""
7554
7555
#: bzrlib/upgrade.py:281
7556
#, python-format
7557
msgid "Upgrading %s"
7558
msgstr ""
7559
7560
#: bzrlib/upgrade.py:282
7561
msgid "Upgrading {0} {1} ..."
7562
msgstr ""
7563
7564
#: bzrlib/upgrade.py:300
7565
msgid "Removing backup ..."
7566
msgstr ""
7567
7568
#: bzrlib/upgrade.py:304
7569
msgid "failed to clean-up {0}: {1}"
7570
msgstr ""
7571
7572
#: bzrlib/vf_repository.py:1093
7573
msgid "inventories"
7574
msgstr ""
7575
7576
#: bzrlib/vf_repository.py:1119
7577
msgid "texts"
7578
msgstr ""
7579
7580
#: bzrlib/vf_repository.py:1624 bzrlib/vf_repository.py:1633
7581
msgid "Calculating text parents"
7582
msgstr ""
7583
7584
#: bzrlib/vf_repository.py:1709
7585
msgid "Fetch texts"
7586
msgstr ""
7587
7588
#: bzrlib/vf_repository.py:2538
7589
msgid "loading text store"
7590
msgstr ""
7591
7592
#: bzrlib/vf_repository.py:2544
7593
msgid "checking text graph"
7594
msgstr ""
7595
7596
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7597
#: bzrlib/vf_repository.py:3127
7598
msgid "Transferring revisions"
7599
msgstr ""
7600
7601
#: bzrlib/win32utils.py:137
7602
msgid "Failed to GetProcessMemoryInfo()"
7603
msgstr ""
7604
7605
#: bzrlib/win32utils.py:158
7606
msgid "Cannot debug memory on win32 without ctypes or win32process"
7607
msgstr ""
7608
7609
#: bzrlib/win32utils.py:163
7610
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7611
msgstr ""
7612
7613
#: bzrlib/win32utils.py:171
7614
#, python-format
7615
msgid "WorkingSize %8d KiB"
7616
msgstr ""
7617
7618
#: bzrlib/win32utils.py:172
7619
#, python-format
7620
msgid "PeakWorking %8d KiB"
7621
msgstr ""
7622
7623
#: bzrlib/win32utils.py:173
7624
#, python-format
7625
msgid "PagefileUsage %8d KiB"
7626
msgstr ""
7627
7628
#: bzrlib/win32utils.py:174
7629
#, python-format
7630
msgid "PeakPagefileUsage %8d KiB"
7631
msgstr ""
7632
7633
#: bzrlib/win32utils.py:176
7634
#, python-format
7635
msgid "PrivateUsage %8d KiB"
7636
msgstr ""
7637
7638
#: bzrlib/win32utils.py:177
7639
#, python-format
7640
msgid "PageFaultCount %8d"
7641
msgstr ""
7642
7643
#: bzrlib/workingtree.py:1467
7644
msgid "Rerun update after fixing the conflicts."
7645
msgstr ""
7646
7647
#: dummy/help_topics/authentication/summary.txt:1
7648
msgid "Information on configuring authentication"
7649
msgstr ""
7650
7651
#: dummy/help_topics/basic/detail.txt:1
7652
msgid ""
7653
"Bazaar 2.5b4 -- a free distributed version-control tool\n"
7654
"http://bazaar.canonical.com/"
7655
msgstr ""
7656
7657
#: dummy/help_topics/basic/detail.txt:4
7658
msgid ""
7659
"Basic commands:\n"
7660
" bzr init makes this directory a versioned branch\n"
7661
" bzr branch make a copy of another branch"
7662
msgstr ""
7663
7664
#: dummy/help_topics/basic/detail.txt:8
7665
msgid ""
7666
" bzr add make files or directories versioned\n"
7667
" bzr ignore ignore a file or pattern\n"
7668
" bzr mv move or rename a versioned file"
7669
msgstr ""
7670
7671
#: dummy/help_topics/basic/detail.txt:12
7672
msgid ""
7673
" bzr status summarize changes in working copy\n"
7674
" bzr diff show detailed diffs"
7675
msgstr ""
7676
7677
#: dummy/help_topics/basic/detail.txt:15
7678
msgid ""
7679
" bzr merge pull in changes from another branch\n"
7680
" bzr commit save some or all changes\n"
7681
" bzr send send changes via email"
7682
msgstr ""
7683
7684
#: dummy/help_topics/basic/detail.txt:19
7685
msgid ""
7686
" bzr log show history of changes\n"
7687
" bzr check validate storage"
7688
msgstr ""
7689
7690
#: dummy/help_topics/basic/detail.txt:22
7691
msgid ""
7692
" bzr help init more help on e.g. init command\n"
7693
" bzr help commands list all commands\n"
7694
" bzr help topics list all help topics\n"
7695
msgstr ""
7696
7697
#: dummy/help_topics/basic/summary.txt:1
7698
msgid "Basic commands"
7699
msgstr ""
7700
7701
#: dummy/help_topics/branches/detail.txt:1
7702
msgid "Branches"
7703
msgstr ""
7704
7705
#: dummy/help_topics/branches/detail.txt:3
7706
msgid ""
7707
"A branch consists of the state of a project, including all of its\n"
7708
"history. All branches have a repository associated (which is where the\n"
7709
"branch history is stored), but multiple branches may share the same\n"
7710
"repository (a shared repository). Branches can be copied and merged."
7711
msgstr ""
7712
7713
#: dummy/help_topics/branches/detail.txt:8
7714
msgid ""
7715
"In addition, one branch may be bound to another one. Binding to another\n"
7716
"branch indicates that commits which happen in this branch must also \n"
7717
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7718
"commits when the two branches are out of date. In order for a commit \n"
7719
"to succeed, it may be necessary to update the current branch using \n"
7720
"``bzr update``."
7721
msgstr ""
7722
7723
#: dummy/help_topics/branches/detail.txt:15
7724
msgid "Related commands::"
7725
msgstr ""
7726
7727
#: dummy/help_topics/branches/detail.txt:17
7728
msgid ""
7729
" init Change a directory into a versioned branch.\n"
7730
" branch Create a new branch that is a copy of an existing branch.\n"
7731
" merge Perform a three-way merge.\n"
7732
" bind Bind a branch to another one.\n"
7733
msgstr ""
7734
7735
#: dummy/help_topics/branches/summary.txt:1
7736
msgid "Information on what a branch is"
7737
msgstr ""
7738
7739
#: dummy/help_topics/bugs/summary.txt:1
7740
msgid "Bug tracker settings"
7741
msgstr ""
7742
7743
#: dummy/help_topics/checkouts/detail.txt:1
7744
msgid "Checkouts"
7745
msgstr ""
7746
7747
#: dummy/help_topics/checkouts/detail.txt:3
7748
msgid ""
7749
"Checkouts are source trees that are connected to a branch, so that when\n"
7750
"you commit in the source tree, the commit goes into that branch. They\n"
7751
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7752
"Bazaar's decentralized features until you want them. Using checkouts\n"
7753
"with shared repositories is very similar to working with SVN or CVS, but\n"
7754
"doesn't have the same restrictions. And using checkouts still allows\n"
7755
"others working on the project to use whatever workflow they like."
7756
msgstr ""
7757
7758
#: dummy/help_topics/checkouts/detail.txt:11
7759
msgid ""
7760
"A checkout is created with the bzr checkout command (see \"help checkout"
7761
"\").\n"
7762
"You pass it a reference to another branch, and it will create a local copy\n"
7763
"for you that still contains a reference to the branch you created the\n"
7764
"checkout from (the master branch). Then if you make any commits they will "
7765
"be\n"
7766
"made on the other branch first. This creates an instant mirror of your work, "
7767
"or\n"
7768
"facilitates lockstep development, where each developer is working together,\n"
7769
"continuously integrating the changes of others."
7770
msgstr ""
7771
7772
#: dummy/help_topics/checkouts/detail.txt:19
7773
msgid ""
7774
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7775
"you have the full history locally. As you have a first class branch you "
7776
"can\n"
7777
"also commit locally if you want, for instance due to the temporary loss af "
7778
"a\n"
7779
"network connection. Use the --local option to commit to do this. All the "
7780
"local\n"
7781
"commits will then be made on the master branch the next time you do a non-"
7782
"local\n"
7783
"commit."
7784
msgstr ""
7785
7786
#: dummy/help_topics/checkouts/detail.txt:26
7787
msgid ""
7788
"If you are using a checkout from a shared branch you will periodically want "
7789
"to\n"
7790
"pull in all the changes made by others. This is done using the \"update\"\n"
7791
"command. The changes need to be applied before any non-local commit, but\n"
7792
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7793
"command when needed."
7794
msgstr ""
7795
7796
#: dummy/help_topics/checkouts/detail.txt:32
7797
msgid ""
7798
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7799
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7800
"SVN checkout in that it is not a first class branch, it mainly consists of "
7801
"the\n"
7802
"working tree. This means that any history operations must query the master\n"
7803
"branch, which could be slow if a network connection is involved. Also, as "
7804
"you\n"
7805
"don't have a local branch, then you cannot commit locally."
7806
msgstr ""
7807
7808
#: dummy/help_topics/checkouts/detail.txt:39
7809
msgid ""
7810
"Lightweight checkouts work best when you have fast reliable access to the\n"
7811
"master branch. This means that if the master branch is on the same disk or "
7812
"LAN\n"
7813
"a lightweight checkout will be faster than a heavyweight one for any "
7814
"commands\n"
7815
"that modify the revision history (as only one copy of the branch needs to\n"
7816
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7817
"that uses the history but does not change it, but if the master branch is "
7818
"on\n"
7819
"the same disk then there won't be a noticeable difference."
7820
msgstr ""
7821
7822
#: dummy/help_topics/checkouts/detail.txt:47
7823
msgid ""
7824
"Another possible use for a checkout is to use it with a treeless repository\n"
7825
"containing your branches, where you maintain only one working tree by\n"
7826
"switching the master branch that the checkout points to when you want to\n"
7827
"work on a different branch."
7828
msgstr ""
7829
7830
#: dummy/help_topics/checkouts/detail.txt:52
7831
msgid ""
7832
"Obviously to commit on a checkout you need to be able to write to the "
7833
"master\n"
7834
"branch. This means that the master branch must be accessible over a "
7835
"writeable\n"
7836
"protocol , such as sftp://, and that you have write permissions at the "
7837
"other\n"
7838
"end. Checkouts also work on the local file system, so that all that matters "
7839
"is\n"
7840
"file permissions."
7841
msgstr ""
7842
7843
#: dummy/help_topics/checkouts/detail.txt:58
7844
msgid ""
7845
"You can change the master of a checkout by using the \"switch\" command "
7846
"(see\n"
7847
"\"help switch\"). This will change the location that the commits are sent "
7848
"to.\n"
7849
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7850
"checkout. If you would like to convert your heavy checkout into a normal\n"
7851
"branch so that every commit is local, you can use the \"unbind\" command. To "
7852
"see\n"
7853
"whether or not a branch is bound or not you can use the \"info\" command. If "
7854
"the\n"
7855
"branch is bound it will tell you the location of the bound branch."
7856
msgstr ""
7857
7858
#: dummy/help_topics/checkouts/detail.txt:68
7859
msgid ""
7860
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7861
" checkout\n"
7862
" update Pull any changes in the master branch in to your checkout\n"
7863
" commit Make a commit that is sent to the master branch. If you have\n"
7864
" a heavy checkout then the --local option will commit to the\n"
7865
" checkout without sending the commit to the master\n"
7866
" switch Change the master branch that the commits in the checkout "
7867
"will\n"
7868
" be sent to\n"
7869
" bind Turn a standalone branch into a heavy checkout so that any\n"
7870
" commits will be sent to the master branch\n"
7871
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7872
" commits are only made locally\n"
7873
" info Displays whether a branch is bound or unbound. If the branch "
7874
"is\n"
7875
" bound, then it will also display the location of the bound "
7876
"branch\n"
7877
msgstr ""
7878
7879
#: dummy/help_topics/checkouts/summary.txt:1
7880
msgid "Information on what a checkout is"
7881
msgstr ""
7882
7883
#: dummy/help_topics/commands/summary.txt:1
7884
msgid "Basic help for all commands"
7885
msgstr ""
7886
7887
#: dummy/help_topics/configuration/summary.txt:1
7888
msgid "Details on the configuration settings available"
7889
msgstr ""
7890
7891
#: dummy/help_topics/conflict-types/summary.txt:1
7892
msgid "Types of conflicts and what to do about them"
7893
msgstr ""
7894
7895
#: dummy/help_topics/content-filters/summary.txt:1
7896
msgid "Conversion of content into/from working trees"
7897
msgstr ""
7898
7899
#: dummy/help_topics/criss-cross/detail.txt:1
7900
msgid "Criss-Cross"
7901
msgstr ""
7902
7903
#: dummy/help_topics/criss-cross/detail.txt:3
7904
msgid ""
7905
"A criss-cross in the branch history can cause the default merge technique\n"
7906
"to emit more conflicts than would normally be expected."
7907
msgstr ""
7908
7909
#: dummy/help_topics/criss-cross/detail.txt:6
7910
msgid ""
7911
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7912
"give\n"
7913
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7914
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7915
msgstr ""
7916
7917
#: dummy/help_topics/criss-cross/detail.txt:10
7918
msgid ""
7919
"Criss-crosses occur in a branch's history if two branches merge the same "
7920
"thing\n"
7921
"and then merge one another, or if two branches merge one another at the "
7922
"same\n"
7923
"time. They can be avoided by having each branch only merge from or into a\n"
7924
"designated central branch (a \"star topology\")."
7925
msgstr ""
7926
7927
#: dummy/help_topics/criss-cross/detail.txt:15
7928
msgid ""
7929
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7930
"default\n"
7931
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7932
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7933
"differences between THIS and OTHER are due to one side adding lines, or\n"
7934
"from another side removing lines."
7935
msgstr ""
7936
7937
#: dummy/help_topics/criss-cross/detail.txt:21
7938
msgid ""
7939
"Criss-crosses mean there is no good choice for a base. Selecting the "
7940
"recent\n"
7941
"merge points could cause one side's changes to be silently discarded.\n"
7942
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7943
"are emitted."
7944
msgstr ""
7945
7946
#: dummy/help_topics/criss-cross/detail.txt:26
7947
msgid ""
7948
"The ``weave`` merge type is not affected by this problem because it uses\n"
7949
"line-origin detection instead of a basis revision to determine the cause of\n"
7950
"differences.\n"
7951
msgstr ""
7952
7953
#: dummy/help_topics/criss-cross/summary.txt:1
7954
msgid "Information on criss-cross merging"
7955
msgstr ""
7956
7957
#: dummy/help_topics/current-formats/summary.txt:1
7958
msgid "Current storage formats"
7959
msgstr ""
7960
7961
#: dummy/help_topics/debug-flags/summary.txt:1
7962
msgid "Options to show or record debug information"
7963
msgstr ""
7964
7965
#: dummy/help_topics/diverged-branches/summary.txt:1
7966
msgid "How to fix diverged branches"
7967
msgstr ""
7968
7969
#: dummy/help_topics/env-variables/detail.txt:1
7970
msgid "Environment Variables"
7971
msgstr ""
7972
7973
#: dummy/help_topics/env-variables/detail.txt:3
7974
msgid ""
7975
"=================== "
7976
"===========================================================\n"
7977
"BZRPATH Path where bzr is to look for shell plugin external\n"
7978
" commands.\n"
7979
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7980
"EMAIL E-Mail address of the user.\n"
7981
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7982
"EDITOR Editor for editing commit messages.\n"
7983
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7984
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7985
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7986
"BZR_PLUGIN_PATH.\n"
7987
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7988
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7989
"and\n"
7990
" HOME.\n"
7991
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7992
"URLs).\n"
7993
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7994
"sshcorp,\n"
7995
" plink or lsh.\n"
7996
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7997
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7998
"BZR_COLUMNS Override implicit terminal width.\n"
7999
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8000
"(selftest)\n"
8001
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8002
"'text'.\n"
8003
"BZR_PDB Control whether to launch a debugger on error.\n"
8004
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8005
" breakin debugger.\n"
8006
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8007
"(instead\n"
8008
" of char-based).\n"
8009
"=================== "
8010
"===========================================================\n"
8011
msgstr ""
8012
8013
#: dummy/help_topics/env-variables/summary.txt:1
8014
msgid "Environment variable names and values"
8015
msgstr ""
8016
8017
#: dummy/help_topics/eol/summary.txt:1
8018
msgid "Information on end-of-line handling"
8019
msgstr ""
8020
8021
#: dummy/help_topics/files/detail.txt:1
8022
msgid "Files"
8023
msgstr ""
8024
8025
#: dummy/help_topics/files/detail.txt:3
8026
msgid ""
8027
":On Unix: ~/.bazaar/bazaar.conf\n"
8028
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
8029
"\\bazaar\\\\2.0\\\\bazaar.conf"
8030
msgstr ""
8031
8032
#: dummy/help_topics/files/detail.txt:6
8033
msgid ""
8034
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8035
"used to define general configuration that will be applied everywhere.\n"
8036
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8037
"commonly used options."
8038
msgstr ""
8039
8040
#: dummy/help_topics/files/detail.txt:11
8041
msgid "A typical config file might look something like::"
8042
msgstr ""
8043
8044
#: dummy/help_topics/files/detail.txt:13
8045
msgid ""
8046
" [DEFAULT]\n"
8047
" email=John Doe <jdoe@isp.com>"
8048
msgstr ""
8049
8050
#: dummy/help_topics/files/detail.txt:16
8051
msgid ""
8052
" [ALIASES]\n"
8053
" commit = commit --strict\n"
8054
" log10 = log --short -r -10..-1\n"
8055
msgstr ""
8056
8057
#: dummy/help_topics/files/summary.txt:1
8058
msgid "Information on configuration and log files"
8059
msgstr ""
8060
8061
#: dummy/help_topics/formats/detail.txt:1
8062
msgid "Storage Formats"
8063
msgstr ""
8064
8065
#: dummy/help_topics/formats/detail.txt:3
8066
msgid ""
8067
"To ensure that older clients do not access data incorrectly,\n"
8068
"Bazaar's policy is to introduce a new storage format whenever\n"
8069
"new features requiring new metadata are added. New storage\n"
8070
"formats may also be introduced to improve performance and\n"
8071
"scalability."
8072
msgstr ""
8073
8074
#: dummy/help_topics/formats/detail.txt:9
8075
msgid ""
8076
"The newest format, 2a, is highly recommended. If your\n"
8077
"project is not using 2a, then you should suggest to the\n"
8078
"project owner to upgrade."
8079
msgstr ""
8080
8081
#: dummy/help_topics/formats/detail.txt:13
8082
msgid ""
8083
"\n"
8084
".. note::"
8085
msgstr ""
8086
8087
#: dummy/help_topics/formats/detail.txt:16
8088
msgid ""
8089
" Some of the older formats have two variants:\n"
8090
" a plain one and a rich-root one. The latter include an additional\n"
8091
" field about the root of the tree. There is no performance cost\n"
8092
" for using a rich-root format but you cannot easily merge changes\n"
8093
" from a rich-root format into a plain format. As a consequence,\n"
8094
" moving a project to a rich-root format takes some co-ordination\n"
8095
" in that all contributors need to upgrade their repositories\n"
8096
" around the same time. 2a and all future formats will be\n"
8097
" implicitly rich-root."
8098
msgstr ""
8099
8100
#: dummy/help_topics/formats/detail.txt:26
8101
msgid ""
8102
"See :doc:`current-formats-help` for the complete list of\n"
8103
"currently supported formats. See :doc:`other-formats-help` for\n"
8104
"descriptions of any available experimental and deprecated formats.\n"
8105
msgstr ""
8106
8107
#: dummy/help_topics/formats/summary.txt:1
8108
msgid "Information on choosing a storage format"
8109
msgstr ""
8110
8111
#: dummy/help_topics/global-options/detail.txt:1
8112
msgid "Global Options"
8113
msgstr ""
8114
8115
#: dummy/help_topics/global-options/detail.txt:3
8116
msgid ""
8117
"These options may be used with any command, and may appear in front of any\n"
8118
"command. (e.g. ``bzr --profile help``)."
8119
msgstr ""
8120
8121
#: dummy/help_topics/global-options/detail.txt:6
8122
msgid ""
8123
"--version Print the version number. Must be supplied before the "
8124
"command.\n"
8125
"--no-aliases Do not process command aliases when running this command.\n"
8126
"--builtin Use the built-in version of a command, not the plugin "
8127
"version.\n"
8128
" This does not suppress other plugin effects.\n"
8129
"--no-plugins Do not process any plugins.\n"
8130
"--no-l10n Do not translate messages.\n"
8131
"--concurrency Number of processes that can be run concurrently (selftest)."
8132
msgstr ""
8133
8134
#: dummy/help_topics/global-options/detail.txt:14
8135
msgid ""
8136
"--profile Profile execution using the hotshot profiler.\n"
8137
"--lsprof Profile execution using the lsprof profiler.\n"
8138
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8139
" results to a specified file. If the filename ends with \".txt"
8140
"\",\n"
8141
" text format will be used. If the filename either starts "
8142
"with\n"
8143
" \"callgrind.out\" or end with \".callgrind\", the output will "
8144
"be\n"
8145
" formatted for use with KCacheGrind. Otherwise, the output\n"
8146
" will be a pickle.\n"
8147
"--coverage Generate line coverage report in the specified directory."
8148
msgstr ""
8149
8150
#: dummy/help_topics/global-options/detail.txt:24
8151
msgid ""
8152
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8153
"for\n"
8154
" the duration of the command. This can be used multiple times "
8155
"if\n"
8156
" several options need to be overridden."
8157
msgstr ""
8158
8159
#: dummy/help_topics/global-options/detail.txt:28
8160
msgid ""
8161
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8162
"information on profiling."
8163
msgstr ""
8164
8165
#: dummy/help_topics/global-options/detail.txt:31
8166
msgid ""
8167
"A number of debug flags are also available to assist troubleshooting and\n"
8168
"development. See :doc:`debug-flags-help`.\n"
8169
msgstr ""
8170
8171
#: dummy/help_topics/global-options/summary.txt:1
8172
msgid "Options that control how Bazaar runs"
8173
msgstr ""
8174
8175
#: dummy/help_topics/hidden-commands/summary.txt:1
8176
msgid "All hidden commands"
8177
msgstr ""
8178
8179
#: dummy/help_topics/hooks/summary.txt:1
8180
msgid "Points at which custom processing can be added"
8181
msgstr ""
8182
8183
#: dummy/help_topics/launchpad/detail.txt:1
8184
msgid "Integration with Launchpad.net"
8185
msgstr ""
8186
8187
#: dummy/help_topics/launchpad/detail.txt:3
8188
msgid ""
8189
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8190
"specification tracking."
8191
msgstr ""
8192
8193
#: dummy/help_topics/launchpad/detail.txt:6
8194
msgid ""
8195
"The bzr client (through the plugin called 'launchpad') has special\n"
8196
"features to communicate with Launchpad:"
8197
msgstr ""
8198
8199
#: dummy/help_topics/launchpad/detail.txt:9
8200
msgid ""
8201
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8202
"This\n"
8203
" is then used by the 'lp:' transport to download your branches using\n"
8204
" bzr+ssh://."
8205
msgstr ""
8206
8207
#: dummy/help_topics/launchpad/detail.txt:13
8208
msgid ""
8209
" * The 'lp:' transport uses Launchpad as a directory service: for "
8210
"example\n"
8211
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8212
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8213
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8214
msgstr ""
8215
8216
#: dummy/help_topics/launchpad/detail.txt:18
8217
msgid ""
8218
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8219
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8220
"lp:12345'\n"
8221
" will record a revision property that marks that revision as fixing\n"
8222
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8223
" automatically be linked to the bug report."
8224
msgstr ""
8225
8226
#: dummy/help_topics/launchpad/detail.txt:24
8227
msgid ""
8228
" * The register-branch command tells Launchpad about the url of a\n"
8229
" public branch. Launchpad will then mirror the branch, display\n"
8230
" its contents and allow it to be attached to bugs and other\n"
8231
" objects."
8232
msgstr ""
8233
8234
#: dummy/help_topics/launchpad/detail.txt:29
8235
msgid "For more information see http://help.launchpad.net/\n"
8236
msgstr ""
8237
8238
#: dummy/help_topics/launchpad/summary.txt:1
8239
msgid "Using Bazaar with Launchpad.net"
8240
msgstr ""
8241
8242
#: dummy/help_topics/location-alias/summary.txt:1
8243
msgid "Aliases for remembered locations"
8244
msgstr ""
8245
8246
#: dummy/help_topics/log-formats/summary.txt:1
8247
msgid "Details on the logging formats available"
8248
msgstr ""
8249
8250
#: dummy/help_topics/other-formats/summary.txt:1
8251
msgid "Experimental and deprecated storage formats"
8252
msgstr ""
8253
8254
#: dummy/help_topics/patterns/summary.txt:1
8255
msgid "Information on the pattern syntax"
8256
msgstr ""
8257
8258
#: dummy/help_topics/repositories/detail.txt:1
8259
msgid "Repositories"
8260
msgstr ""
8261
8262
#: dummy/help_topics/repositories/detail.txt:3
8263
msgid ""
8264
"Repositories in Bazaar are where committed information is stored. There is\n"
8265
"a repository associated with every branch."
8266
msgstr ""
8267
8268
#: dummy/help_topics/repositories/detail.txt:6
8269
msgid ""
8270
"Repositories are a form of database. Bzr will usually maintain this for\n"
8271
"good performance automatically, but in some situations (e.g. when doing\n"
8272
"very many commits in a short time period) you may want to ask bzr to\n"
8273
"optimise the database indices. This can be done by the 'bzr pack' command."
8274
msgstr ""
8275
8276
#: dummy/help_topics/repositories/detail.txt:11
8277
msgid ""
8278
"By default just running 'bzr init' will create a repository within the new\n"
8279
"branch but it is possible to create a shared repository which allows "
8280
"multiple\n"
8281
"branches to share their information in the same location. When a new branch "
8282
"is\n"
8283
"created it will first look to see if there is a containing shared repository "
8284
"it\n"
8285
"can use."
8286
msgstr ""
8287
8288
#: dummy/help_topics/repositories/detail.txt:17
8289
msgid ""
8290
"When two branches of the same project share a repository, there is\n"
8291
"generally a large space saving. For some operations (e.g. branching\n"
8292
"within the repository) this translates in to a large time saving."
8293
msgstr ""
8294
8295
#: dummy/help_topics/repositories/detail.txt:21
8296
msgid ""
8297
"To create a shared repository use the init-repository command (or the alias\n"
8298
"init-repo). This command takes the location of the repository to create. "
8299
"This\n"
8300
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8301
"which contains a shared repository. Any new branches that are created in "
8302
"this\n"
8303
"directory will then use it for storage."
8304
msgstr ""
8305
8306
#: dummy/help_topics/repositories/detail.txt:27
8307
msgid ""
8308
"It is a good idea to create a repository whenever you might create more\n"
8309
"than one branch of a project. This is true for both working areas where you\n"
8310
"are doing the development, and any server areas that you use for hosting\n"
8311
"projects. In the latter case, it is common to want branches without working\n"
8312
"trees. Since the files in the branch will not be edited directly there is "
8313
"no\n"
8314
"need to use up disk space for a working tree. To create a repository in "
8315
"which\n"
8316
"the branches will not have working trees pass the '--no-trees' option to\n"
8317
"'init-repository'."
8318
msgstr ""
8319
8320
#: dummy/help_topics/repositories/detail.txt:38
8321
msgid ""
8322
" init-repository Create a shared repository. Use --no-trees to create "
8323
"one\n"
8324
" in which new branches won't get a working tree.\n"
8325
msgstr ""
8326
8327
#: dummy/help_topics/repositories/summary.txt:1
8328
msgid "Basic information on shared repositories."
8329
msgstr ""
8330
8331
#: dummy/help_topics/revisionspec/summary.txt:1
8332
msgid "Explain how to use --revision"
8333
msgstr ""
8334
8335
#: dummy/help_topics/rules/summary.txt:1
8336
msgid "Information on defining rule-based preferences"
8337
msgstr ""
8338
8339
#: dummy/help_topics/standalone-trees/detail.txt:1
8340
msgid "Standalone Trees"
8341
msgstr ""
8342
8343
#: dummy/help_topics/standalone-trees/detail.txt:3
8344
msgid ""
8345
"A standalone tree is a working tree with an associated repository. It\n"
8346
"is an independently usable branch, with no dependencies on any other.\n"
8347
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8348
"an existing project under version control."
8349
msgstr ""
8350
8351
#: dummy/help_topics/standalone-trees/detail.txt:8
8352
msgid "Related Commands::"
8353
msgstr ""
8354
8355
#: dummy/help_topics/standalone-trees/detail.txt:10
8356
msgid " init Make a directory into a versioned branch.\n"
8357
msgstr ""
8358
8359
#: dummy/help_topics/standalone-trees/summary.txt:1
8360
msgid "Information on what a standalone tree is"
8361
msgstr ""
8362
8363
#: dummy/help_topics/standard-options/detail.txt:1
8364
msgid "Standard Options"
8365
msgstr ""
8366
8367
#: dummy/help_topics/standard-options/detail.txt:3
8368
msgid "Standard options are legal for all commands."
8369
msgstr ""
8370
8371
#: dummy/help_topics/standard-options/detail.txt:5
8372
msgid ""
8373
"--help, -h Show help message.\n"
8374
"--verbose, -v Display more information.\n"
8375
"--quiet, -q Only display errors and warnings."
8376
msgstr ""
8377
8378
#: dummy/help_topics/standard-options/detail.txt:9
8379
msgid "Unlike global options, standard options can be used in aliases.\n"
8380
msgstr ""
8381
8382
#: dummy/help_topics/standard-options/summary.txt:1
8383
msgid "Options that can be used with any command"
8384
msgstr ""
8385
8386
#: dummy/help_topics/status-flags/detail.txt:1
8387
msgid "Status Flags"
8388
msgstr ""
8389
8390
#: dummy/help_topics/status-flags/detail.txt:3
8391
msgid ""
8392
"Status flags are used to summarise changes to the working tree in a concise\n"
8393
"manner. They are in the form::"
8394
msgstr ""
8395
8396
#: dummy/help_topics/status-flags/detail.txt:6
8397
msgid " xxx <filename>"
8398
msgstr ""
8399
8400
#: dummy/help_topics/status-flags/detail.txt:8
8401
msgid "where the columns' meanings are as follows."
8402
msgstr ""
8403
8404
#: dummy/help_topics/status-flags/detail.txt:10
8405
msgid "Column 1 - versioning/renames::"
8406
msgstr ""
8407
8408
#: dummy/help_topics/status-flags/detail.txt:12
8409
msgid ""
8410
" + File versioned\n"
8411
" - File unversioned\n"
8412
" R File renamed\n"
8413
" ? File unknown\n"
8414
" X File nonexistent (and unknown to bzr)\n"
8415
" C File has conflicts\n"
8416
" P Entry for a pending merge (not a file)"
8417
msgstr ""
8418
8419
#: dummy/help_topics/status-flags/detail.txt:20
8420
msgid "Column 2 - contents::"
8421
msgstr ""
8422
8423
#: dummy/help_topics/status-flags/detail.txt:22
8424
msgid ""
8425
" N File created\n"
8426
" D File deleted\n"
8427
" K File kind changed\n"
8428
" M File modified"
8429
msgstr ""
8430
8431
#: dummy/help_topics/status-flags/detail.txt:27
8432
msgid "Column 3 - execute::"
8433
msgstr ""
8434
8435
#: dummy/help_topics/status-flags/detail.txt:29
8436
msgid " * The execute bit was changed\n"
8437
msgstr ""
8438
8439
#: dummy/help_topics/status-flags/summary.txt:1
8440
msgid "Help on status flags"
8441
msgstr ""
8442
8443
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8444
msgid "Branches Out of Sync"
8445
msgstr ""
8446
8447
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8448
msgid ""
8449
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8450
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8451
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8452
"have the same last revision as the new reference branch for the lightweight\n"
8453
"checkout, data could be lost, so Bazaar refuses."
8454
msgstr ""
8455
8456
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8457
msgid "How you deal with this depends on *why* the branches are out of sync."
8458
msgstr ""
8459
8460
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8461
msgid ""
8462
"If you have a checkout and have done local commits, you can get back in "
8463
"sync\n"
8464
"by running \"bzr update\" (and possibly \"bzr commit\")."
8465
msgstr ""
8466
8467
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8468
msgid ""
8469
"If you have a branch and the remote branch is out-of-date, you can push\n"
8470
"the local changes using \"bzr push\". If the local branch is out of date, "
8471
"you\n"
8472
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8473
"commit\n"
8474
"and then push your changes. If you decide that some of the changes aren't\n"
8475
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8476
msgstr ""
8477
8478
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8479
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8480
msgstr ""
8481
8482
#: dummy/help_topics/topics/summary.txt:1
8483
msgid "Topics list"
8484
msgstr ""
8485
8486
#: dummy/help_topics/url-special-chars/summary.txt:1
8487
msgid "Special character handling in URLs"
8488
msgstr ""
8489
8490
#: dummy/help_topics/urlspec/summary.txt:1
8491
msgid "Supported transport protocols"
8492
msgstr ""
8493
8494
#: dummy/help_topics/working-trees/detail.txt:1
8495
msgid "Working Trees"
8496
msgstr ""
8497
8498
#: dummy/help_topics/working-trees/detail.txt:3
8499
msgid ""
8500
"A working tree is the contents of a branch placed on disk so that you can\n"
8501
"see the files and edit them. The working tree is where you make changes to "
8502
"a\n"
8503
"branch, and when you commit the current state of the working tree is the\n"
8504
"snapshot that is recorded in the commit."
8505
msgstr ""
8506
8507
#: dummy/help_topics/working-trees/detail.txt:8
8508
msgid ""
8509
"When you push a branch to a remote system, a working tree will not be\n"
8510
"created. If one is already present the files will not be updated. The\n"
8511
"branch information will be updated and the working tree will be marked\n"
8512
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8513
"may be uncommitted changes or the update may cause content conflicts that "
8514
"are\n"
8515
"difficult to deal with remotely."
8516
msgstr ""
8517
8518
#: dummy/help_topics/working-trees/detail.txt:15
8519
msgid ""
8520
"If you have a branch with no working tree you can use the 'checkout' "
8521
"command\n"
8522
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8523
"will\n"
8524
"create the working tree. If the branch is updated remotely, you can update "
8525
"the\n"
8526
"working tree by running 'bzr update' in that directory."
8527
msgstr ""
8528
8529
#: dummy/help_topics/working-trees/detail.txt:20
8530
msgid ""
8531
"If you have a branch with a working tree that you do not want the 'remove-"
8532
"tree'\n"
8533
"command will remove the tree if it is safe. This can be done to avoid the\n"
8534
"warning about the remote working tree not being updated when pushing to the\n"
8535
"branch. It can also be useful when working with a '--no-trees' repository\n"
8536
"(see 'bzr help repositories')."
8537
msgstr ""
8538
8539
#: dummy/help_topics/working-trees/detail.txt:26
8540
msgid ""
8541
"If you want to have a working tree on a remote machine that you push to you\n"
8542
"can either run 'bzr update' in the remote branch after each push, or use "
8543
"some\n"
8544
"other method to update the tree during the push. There is an 'rspush' "
8545
"plugin\n"
8546
"that will update the working tree using rsync as well as doing a push. "
8547
"There\n"
8548
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8549
"SSH\n"
8550
"after each push."
8551
msgstr ""
8552
8553
#: dummy/help_topics/working-trees/detail.txt:33
8554
msgid "Useful commands::"
8555
msgstr ""
8556
8557
#: dummy/help_topics/working-trees/detail.txt:35
8558
msgid ""
8559
" checkout Create a working tree when a branch does not have one.\n"
8560
" remove-tree Removes the working tree from a branch when it is safe to do "
8561
"so.\n"
8562
" update When a working tree is out of sync with its associated "
8563
"branch\n"
8564
" this will update the tree to match the branch.\n"
8565
msgstr ""
8566
8567
#: dummy/help_topics/working-trees/summary.txt:1
8568
msgid "Information on working trees"
8569
msgstr ""
8570
8571
#: en/help_topics/authentication.txt:1
8572
msgid ""
8573
"Authentication Settings\n"
8574
"======================="
8575
msgstr ""
8576
8577
#: en/help_topics/authentication.txt:4
8578
msgid ""
8579
"\n"
8580
"Intent\n"
8581
"------"
8582
msgstr ""
8583
8584
#: en/help_topics/authentication.txt:8
8585
msgid ""
8586
"Many different authentication policies can be described in the\n"
8587
"``authentication.conf`` file but a particular user should need only a few\n"
8588
"definitions to cover his needs without having to specify a user and a "
8589
"password\n"
8590
"for every branch he uses."
8591
msgstr ""
8592
8593
#: en/help_topics/authentication.txt:13
8594
msgid ""
8595
"The definitions found in this file are used to find the credentials to use "
8596
"for\n"
8597
"a given url. The same credentials can generally be used for as many branches "
8598
"as\n"
8599
"possible by grouping their declaration around the remote servers that need\n"
8600
"them. It's even possible to declare credentials that will be used by "
8601
"different\n"
8602
"servers."
8603
msgstr ""
8604
8605
#: en/help_topics/authentication.txt:19
8606
msgid ""
8607
"The intent is to make this file as small as possible to minimize maintenance."
8608
msgstr ""
8609
8610
#: en/help_topics/authentication.txt:21
8611
msgid ""
8612
"Once the relevant credentials are declared in this file you may use branch "
8613
"urls\n"
8614
"without embedding passwords (security hazard) or even users (enabling "
8615
"sharing\n"
8616
"of your urls with others)."
8617
msgstr ""
8618
8619
#: en/help_topics/authentication.txt:25
8620
msgid "Instead of using::"
8621
msgstr ""
8622
8623
#: en/help_topics/authentication.txt:27
8624
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8625
msgstr ""
8626
8627
#: en/help_topics/authentication.txt:29
8628
msgid "you simply use::"
8629
msgstr ""
8630
8631
#: en/help_topics/authentication.txt:31
8632
msgid " bzr branch ftp://host.com/path/to/my/branch"
8633
msgstr ""
8634
8635
#: en/help_topics/authentication.txt:33
8636
msgid "provided you have created the following ``authentication.conf`` file::"
8637
msgstr ""
8638
8639
#: en/help_topics/authentication.txt:35
8640
msgid ""
8641
" [myprojects]\n"
8642
" scheme=ftp\n"
8643
" host=host.com\n"
8644
" user=joe\n"
8645
" password=secret\n"
8646
" "
8647
msgstr ""
8648
8649
#: en/help_topics/authentication.txt:42
8650
msgid ""
8651
"Authentication definitions\n"
8652
"--------------------------"
8653
msgstr ""
8654
8655
#: en/help_topics/authentication.txt:45
8656
msgid ""
8657
"There are two kinds of authentication used by the various schemes supported "
8658
"by\n"
8659
"bzr:"
8660
msgstr ""
8661
8662
#: en/help_topics/authentication.txt:48
8663
msgid "1. user and password"
8664
msgstr ""
8665
8666
#: en/help_topics/authentication.txt:50
8667
msgid ""
8668
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8669
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8670
"ssh agents are a better, more secure solution. So we have chosen to not "
8671
"provide\n"
8672
"our own less secure method."
8673
msgstr ""
8674
8675
#: en/help_topics/authentication.txt:55
8676
msgid "2. user, realm and password"
8677
msgstr ""
8678
8679
#: en/help_topics/authentication.txt:57
8680
msgid ""
8681
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8682
"against a host. But, by using ``.htaccess`` files, for example, it is "
8683
"possible\n"
8684
"to define several (``user, realm, password``) for a given ``host``. So what "
8685
"is\n"
8686
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8687
"is\n"
8688
"not taken into account in the definitions, but will displayed if bzr "
8689
"prompts\n"
8690
"you for a password."
8691
msgstr ""
8692
8693
#: en/help_topics/authentication.txt:64
8694
msgid ""
8695
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8696
"specifying the appropriate port."
8697
msgstr ""
8698
8699
#: en/help_topics/authentication.txt:67
8700
msgid ""
8701
"To take all schemes into account, the password will be deduced from a set "
8702
"of\n"
8703
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8704
"``user``,\n"
8705
"``password``)."
8706
msgstr ""
8707
8708
#: en/help_topics/authentication.txt:71
8709
msgid ""
8710
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8711
"used\n"
8712
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8713
"``ssh``\n"
8714
" should be used instead since this is the real scheme regarding\n"
8715
" authentication,"
8716
msgstr ""
8717
8718
#: en/help_topics/authentication.txt:76
8719
msgid " * ``host``: can be empty (to act as a default for any host),"
8720
msgstr ""
8721
8722
#: en/help_topics/authentication.txt:78
8723
msgid ""
8724
" * ``port`` can be empty (useful when an host provides several servers for "
8725
"the\n"
8726
" same scheme), only numerical values are allowed, this should be used "
8727
"only\n"
8728
" when the server uses a port different than the scheme standard port,"
8729
msgstr ""
8730
8731
#: en/help_topics/authentication.txt:82
8732
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8733
msgstr ""
8734
8735
#: en/help_topics/authentication.txt:84
8736
msgid ""
8737
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8738
" ``getpass.get_user()``),"
8739
msgstr ""
8740
8741
#: en/help_topics/authentication.txt:87
8742
msgid ""
8743
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8744
" password."
8745
msgstr ""
8746
8747
#: en/help_topics/authentication.txt:90
8748
msgid ""
8749
"Multiple definitions can be provided and, for a given URL, bzr will select "
8750
"a\n"
8751
"(``user`` [, ``password``]) based on the following rules :"
8752
msgstr ""
8753
8754
#: en/help_topics/authentication.txt:93
8755
msgid " 1. the first match wins,"
8756
msgstr ""
8757
8758
#: en/help_topics/authentication.txt:95
8759
msgid " 2. empty fields match everything,"
8760
msgstr ""
8761
8762
#: en/help_topics/authentication.txt:97
8763
msgid ""
8764
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8765
msgstr ""
8766
8767
#: en/help_topics/authentication.txt:99
8768
msgid ""
8769
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8770
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
8771
"net``\n"
8772
" will not match ``bzr.sf.net``)."
8773
msgstr ""
8774
8775
#: en/help_topics/authentication.txt:103
8776
msgid ""
8777
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8778
msgstr ""
8779
8780
#: en/help_topics/authentication.txt:105
8781
msgid ""
8782
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8783
"above,\n"
8784
" empty paths will match any provided path)."
8785
msgstr ""
8786
8787
#: en/help_topics/authentication.txt:110
8788
msgid ""
8789
"File format\n"
8790
"-----------"
8791
msgstr ""
8792
8793
#: en/help_topics/authentication.txt:113
8794
msgid ""
8795
"The general rules for :doc:`configuration files <configuration-help>`\n"
8796
"apply except for the variable policies."
8797
msgstr ""
8798
8799
#: en/help_topics/authentication.txt:116
8800
msgid "Each section describes an authentication definition."
8801
msgstr ""
8802
8803
#: en/help_topics/authentication.txt:118
8804
msgid ""
8805
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8806
"reserved\n"
8807
"and should appear as the *last* section."
8808
msgstr ""
8809
8810
#: en/help_topics/authentication.txt:121
8811
msgid "Each section should define:"
8812
msgstr ""
8813
8814
#: en/help_topics/authentication.txt:123
8815
msgid "* ``user``: the login to be used,"
8816
msgstr ""
8817
8818
#: en/help_topics/authentication.txt:125
8819
msgid "Each section could define:"
8820
msgstr ""
8821
8822
#: en/help_topics/authentication.txt:127
8823
msgid "* ``host``: the remote server,"
8824
msgstr ""
8825
8826
#: en/help_topics/authentication.txt:129
8827
msgid "* ``port``: the port the server is listening,"
8828
msgstr ""
8829
8830
#: en/help_topics/authentication.txt:131
8831
msgid "* ``path``: the branch location,"
8832
msgstr ""
8833
8834
#: en/help_topics/authentication.txt:133
8835
msgid "* ``password``: the password."
8836
msgstr ""
8837
8838
#: en/help_topics/authentication.txt:135
8839
msgid ""
8840
"\n"
8841
"Examples\n"
8842
"--------"
8843
msgstr ""
8844
8845
#: en/help_topics/authentication.txt:139
8846
msgid ""
8847
"\n"
8848
"Personal projects hosted outside\n"
8849
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8850
msgstr ""
8851
8852
#: en/help_topics/authentication.txt:143
8853
msgid ""
8854
"All connections are done with the same ``user`` (the remote one for which "
8855
"the\n"
8856
"default bzr one is not appropriate) and the password is always prompted "
8857
"with\n"
8858
"some exceptions::"
8859
msgstr ""
8860
8861
#: en/help_topics/authentication.txt:147
8862
msgid ""
8863
" # Pet projects on hobby.net\n"
8864
" [hobby]\n"
8865
" host=r.hobby.net\n"
8866
" user=jim\n"
8867
" password=obvious1234\n"
8868
" \n"
8869
" # Home server\n"
8870
" [home]\n"
8871
" scheme=https\n"
8872
" host=home.net\n"
8873
" user=joe\n"
8874
" password=1essobV10us\n"
8875
" \n"
8876
" [DEFAULT]\n"
8877
" # Our local user is barbaz, on all remote sites we're known as "
8878
"foobar\n"
8879
" user=foobar"
8880
msgstr ""
8881
8882
#: en/help_topics/authentication.txt:164
8883
msgid ""
8884
"\n"
8885
"Source hosting provider\n"
8886
"~~~~~~~~~~~~~~~~~~~~~~~"
8887
msgstr ""
8888
8889
#: en/help_topics/authentication.txt:168
8890
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8891
msgstr ""
8892
8893
#: en/help_topics/authentication.txt:170
8894
msgid ""
8895
" [shpnet domain]\n"
8896
" # we use sftp, but ssh is the scheme used for authentication\n"
8897
" scheme=ssh\n"
8898
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8899
" host=.shp.net\n"
8900
" user=joe\n"
8901
" # bzr don't support supplying a password for sftp,\n"
8902
" # consider using an ssh agent if you don't want to supply\n"
8903
" # a password interactively. (pageant, ssh-agent, etc)"
8904
msgstr ""
8905
8906
#: en/help_topics/authentication.txt:180
8907
msgid ""
8908
"HTTPS, SFTP servers and their proxy\n"
8909
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8910
msgstr ""
8911
8912
#: en/help_topics/authentication.txt:183
8913
msgid ""
8914
"At company.com, the server hosting release and integration branches is "
8915
"behind a\n"
8916
"proxy, and the two branches use different authentication policies::"
8917
msgstr ""
8918
8919
#: en/help_topics/authentication.txt:186
8920
msgid ""
8921
" [reference code]\n"
8922
" scheme=https\n"
8923
" host=dev.company.com\n"
8924
" path=/dev\n"
8925
" user=user1\n"
8926
" password=pass1"
8927
msgstr ""
8928
8929
#: en/help_topics/authentication.txt:193
8930
msgid ""
8931
" # development branches on dev server\n"
8932
" [dev]\n"
8933
" scheme=ssh # bzr+ssh and sftp are available here\n"
8934
" host=dev.company.com\n"
8935
" path=/dev/integration\n"
8936
" user=user2\n"
8937
" \n"
8938
" # proxy\n"
8939
" [proxy]\n"
8940
" scheme=http\n"
8941
" host=proxy.company.com\n"
8942
" port=3128\n"
8943
" user=proxyuser1\n"
8944
" password=proxypass1"
8945
msgstr ""
8946
8947
#: en/help_topics/authentication.txt:208
8948
msgid ""
8949
"\n"
8950
"Planned enhancements\n"
8951
"--------------------"
8952
msgstr ""
8953
8954
#: en/help_topics/authentication.txt:212
8955
msgid ""
8956
"The following are not yet implemented but planned as parts of a work in\n"
8957
"progress:"
8958
msgstr ""
8959
8960
#: en/help_topics/authentication.txt:215
8961
msgid "* add a ``password_encoding`` field allowing:"
8962
msgstr ""
8963
8964
#: en/help_topics/authentication.txt:217
8965
msgid ""
8966
" - storing the passwords in various obfuscating encodings (base64 for one),"
8967
msgstr ""
8968
8969
#: en/help_topics/authentication.txt:219
8970
msgid " - delegate password storage to plugins (.netrc for example)."
8971
msgstr ""
8972
8973
#: en/help_topics/authentication.txt:221
8974
msgid ""
8975
"* update the credentials when the user is prompted for user or password,"
8976
msgstr ""
8977
8978
#: en/help_topics/authentication.txt:223
8979
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8980
msgstr ""
8981
8982
#: en/help_topics/authentication.txt:225
8983
msgid ""
8984
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8985
"but\n"
8986
"ignored in the actual implementation.\n"
8987
msgstr ""
8988
8989
#: en/help_topics/bugs.txt:1
8990
msgid "Bug Tracker Settings"
8991
msgstr ""
8992
8993
#: en/help_topics/bugs.txt:3
8994
msgid ""
8995
"When making a commit, metadata about bugs fixed by that change can be\n"
8996
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8997
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8998
"(The only ``status`` value currently supported is ``fixed.``)"
8999
msgstr ""
9000
9001
#: en/help_topics/bugs.txt:8
9002
msgid ""
9003
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9004
"identifier\n"
9005
"rather than a full URL. This looks like::"
9006
msgstr ""
9007
9008
#: en/help_topics/bugs.txt:11
9009
msgid " bzr commit --fixes <tracker>:<id>"
9010
msgstr ""
9011
9012
#: en/help_topics/bugs.txt:13
9013
msgid "or::"
9014
msgstr ""
9015
9016
#: en/help_topics/bugs.txt:15
9017
msgid " bzr commit --fixes <id>"
9018
msgstr ""
9019
9020
#: en/help_topics/bugs.txt:17
9021
msgid ""
9022
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9023
"the\n"
9024
"identifier for that bug within the bugtracker, usually the bug number.\n"
9025
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9026
"or global configuration is used."
9027
msgstr ""
9028
9029
#: en/help_topics/bugs.txt:22
9030
msgid ""
9031
"Bazaar knows about a few bug trackers that have many users. If\n"
9032
"you use one of these bug trackers then there is no setup required to\n"
9033
"use this feature, you just need to know the tracker identifier to use.\n"
9034
"These are the bugtrackers that are built in:"
9035
msgstr ""
9036
9037
#: en/help_topics/bugs.txt:27
9038
msgid ""
9039
" ============================ ============ ============\n"
9040
" URL Abbreviation Example\n"
9041
" ============================ ============ ============\n"
9042
" https://bugs.launchpad.net/ lp lp:12345\n"
9043
" http://bugs.debian.org/ deb deb:12345\n"
9044
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9045
" ============================ ============ ============"
9046
msgstr ""
9047
9048
#: en/help_topics/bugs.txt:35
9049
msgid ""
9050
"For the bug trackers not listed above configuration is required.\n"
9051
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9052
"is built in, along with a template mechanism for other bugtrackers with\n"
9053
"simple URL schemes. If your bug tracker can't be described by one\n"
9054
"of the schemes described below then you can write a plugin to support\n"
9055
"it."
9056
msgstr ""
9057
9058
#: en/help_topics/bugs.txt:42
9059
msgid ""
9060
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9061
"variable which contains the base URL of the bug tracker. These options\n"
9062
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9063
"configuration section in ``locations.conf``. You can set up these values\n"
9064
"for each of the projects you work on."
9065
msgstr ""
9066
9067
#: en/help_topics/bugs.txt:48
9068
msgid ""
9069
"Note: As you provide a short name for each tracker, you can specify one or\n"
9070
"more bugs in one or more trackers at commit time if you wish."
9071
msgstr ""
9072
9073
#: en/help_topics/bugs.txt:51
9074
msgid ""
9075
"Launchpad\n"
9076
"---------"
9077
msgstr ""
9078
9079
#: en/help_topics/bugs.txt:54
9080
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9081
msgstr ""
9082
9083
#: en/help_topics/bugs.txt:56
9084
msgid ""
9085
"bugzilla_<tracker>_url\n"
9086
"----------------------"
9087
msgstr ""
9088
9089
#: en/help_topics/bugs.txt:59
9090
msgid ""
9091
"If present, the location of the Bugzilla bug tracker referred to by\n"
9092
"<tracker>. This option can then be used together with ``bzr commit\n"
9093
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9094
"example::"
9095
msgstr ""
9096
9097
#: en/help_topics/bugs.txt:64
9098
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9099
msgstr ""
9100
9101
#: en/help_topics/bugs.txt:66
9102
msgid ""
9103
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9104
"fixed."
9105
msgstr ""
9106
9107
#: en/help_topics/bugs.txt:69
9108
msgid ""
9109
"trac_<tracker>_url\n"
9110
"------------------"
9111
msgstr ""
9112
9113
#: en/help_topics/bugs.txt:72
9114
msgid ""
9115
"If present, the location of the Trac instance referred to by\n"
9116
"<tracker>. This option can then be used together with ``bzr commit\n"
9117
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9118
"example::"
9119
msgstr ""
9120
9121
#: en/help_topics/bugs.txt:77
9122
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9123
msgstr ""
9124
9125
#: en/help_topics/bugs.txt:79
9126
msgid ""
9127
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9128
"as\n"
9129
"fixed."
9130
msgstr ""
9131
9132
#: en/help_topics/bugs.txt:82
9133
msgid ""
9134
"bugtracker_<tracker>_url\n"
9135
"------------------------"
9136
msgstr ""
9137
9138
#: en/help_topics/bugs.txt:85
9139
msgid ""
9140
"If present, the location of a generic bug tracker instance referred to by\n"
9141
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9142
"which will be replaced by a specific bug ID. This option can then be used\n"
9143
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9144
"fixed by that commit. For example::"
9145
msgstr ""
9146
9147
#: en/help_topics/bugs.txt:91
9148
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9149
msgstr ""
9150
9151
#: en/help_topics/bugs.txt:93
9152
msgid ""
9153
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9154
"Roundup bug tracker as fixed, or::"
9155
msgstr ""
9156
9157
#: en/help_topics/bugs.txt:96
9158
msgid ""
9159
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9160
msgstr ""
9161
9162
#: en/help_topics/bugs.txt:98
9163
msgid ""
9164
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9165
"RT bug tracker as fixed, or::"
9166
msgstr ""
9167
9168
#: en/help_topics/bugs.txt:101
9169
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9170
msgstr ""
9171
9172
#: en/help_topics/bugs.txt:103
9173
msgid ""
9174
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
9175
"HUDSON-1234\n"
9176
"in Hudson's JIRA bug tracker as fixed.\n"
9177
msgstr ""
9178
9179
#: en/help_topics/commands.txt:1
9180
msgid ""
9181
"add Add specified files or directories.\n"
9182
"alias Set/unset and display aliases.\n"
9183
"annotate Show the origin of each line in a file.\n"
9184
"bash-completion Generate a shell function for bash command line "
9185
"completion.\n"
9186
" [bash_completion]\n"
9187
"bind Convert the current branch into a checkout of the "
9188
"supplied\n"
9189
" branch.\n"
9190
"branch Create a new branch that is a copy of an existing branch.\n"
9191
"branches List the branches available at the current location.\n"
9192
"break-lock Break a dead lock.\n"
9193
"cat Write the contents of a file as of a given revision to\n"
9194
" standard output.\n"
9195
"check Validate working tree structure, branch consistency and\n"
9196
" repository history.\n"
9197
"checkout Create a new checkout of an existing branch.\n"
9198
"clean-tree Remove unwanted files from working tree.\n"
9199
"commit Commit changes into a new revision.\n"
9200
"config Display, set or remove a configuration option.\n"
9201
"conflicts List files with conflicts.\n"
9202
"deleted List files deleted in the working tree.\n"
9203
"diff Show differences in the working tree, between revisions "
9204
"or\n"
9205
" branches.\n"
9206
"dpush Push into a different VCS without any custom bzr "
9207
"metadata.\n"
9208
"export Export current or past revision to a destination directory "
9209
"or\n"
9210
" archive.\n"
9211
"help Show help on a command or other topic.\n"
9212
"ignore Ignore specified files or patterns.\n"
9213
"ignored List ignored files and the patterns that matched them.\n"
9214
"info Show information about a working tree, branch or "
9215
"repository.\n"
9216
"init Make a directory into a versioned branch.\n"
9217
"init-repository Create a shared repository for branches to share storage\n"
9218
" space.\n"
9219
"join Combine a tree into its containing tree.\n"
9220
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9221
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9222
"launchpad-open Open a Launchpad branch page in your web browser. "
9223
"[launchpad]\n"
9224
"log Show historical log for a branch or subset of a branch.\n"
9225
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9226
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9227
"ls List files in a tree.\n"
9228
"merge Perform a three-way merge.\n"
9229
"missing Show unmerged/unpulled revisions between two branches.\n"
9230
"mkdir Create a new versioned directory.\n"
9231
"mv Move or rename a file.\n"
9232
"nick Print or set the branch nickname.\n"
9233
"pack Compress the data within a repository.\n"
9234
"plugins List the installed plugins.\n"
9235
"pull Turn this branch into a mirror of another branch.\n"
9236
"push Update a mirror of this branch.\n"
9237
"reconcile Reconcile bzr metadata in a branch.\n"
9238
"reconfigure Reconfigure the type of a bzr directory.\n"
9239
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9240
"remerge Redo a merge.\n"
9241
"remove Remove files or directories.\n"
9242
"remove-branch Remove a branch.\n"
9243
"remove-tree Remove the working tree from a given branch/checkout.\n"
9244
"renames Show list of renamed files.\n"
9245
"resolve Mark a conflict as resolved.\n"
9246
"revert Revert files to a previous revision.\n"
9247
"revno Show current revision number.\n"
9248
"root Show the tree root directory.\n"
9249
"send Mail or create a merge-directive for submitting changes.\n"
9250
"serve Run the bzr server.\n"
9251
"shelve Temporarily set aside some changes from the current tree.\n"
9252
"sign-my-commits Sign all commits by a given committer.\n"
9253
"split Split a subdirectory of a tree into a separate tree.\n"
9254
"status Display status summary.\n"
9255
"switch Set the branch of a checkout and update.\n"
9256
"tag Create, remove or modify a tag naming a revision.\n"
9257
"tags List tags.\n"
9258
"testament Show testament (signing-form) of a revision.\n"
9259
"unbind Convert the current checkout into a regular branch.\n"
9260
"uncommit Remove the last committed revision.\n"
9261
"unshelve Restore shelved changes.\n"
9262
"update Update a working tree to a new revision.\n"
9263
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9264
" format.\n"
9265
"verify-signatures Verify all commit signatures.\n"
9266
"version Show version of bzr.\n"
9267
"version-info Show version information about this tree.\n"
9268
"view Manage filtered views.\n"
9269
"whoami Show or set bzr user id.\n"
9270
msgstr ""
9271
9272
#: en/help_topics/configuration.txt:1
9273
msgid ""
9274
"Configuration Settings\n"
9275
"======================="
9276
msgstr ""
9277
9278
#: en/help_topics/configuration.txt:4
9279
msgid ""
9280
"Environment settings\n"
9281
"---------------------"
9282
msgstr ""
9283
9284
#: en/help_topics/configuration.txt:7
9285
msgid ""
9286
"While most configuration is handled by configuration files, some options\n"
9287
"which may be semi-permanent can also be controlled through the environment."
9288
msgstr ""
9289
9290
#: en/help_topics/configuration.txt:10
9291
msgid ""
9292
"BZR_EMAIL\n"
9293
"~~~~~~~~~"
9294
msgstr ""
9295
9296
#: en/help_topics/configuration.txt:13
9297
msgid "Override the email id used by Bazaar. Typical format::"
9298
msgstr ""
9299
9300
#: en/help_topics/configuration.txt:15
9301
msgid " \"John Doe <jdoe@example.com>\""
9302
msgstr ""
9303
9304
#: en/help_topics/configuration.txt:17
9305
msgid "See also the ``email`` configuration option."
9306
msgstr ""
9307
9308
#: en/help_topics/configuration.txt:19
9309
msgid ""
9310
"BZR_PROGRESS_BAR\n"
9311
"~~~~~~~~~~~~~~~~"
9312
msgstr ""
9313
9314
#: en/help_topics/configuration.txt:22
9315
msgid ""
9316
"Override the progress display. Possible values are \"none\" or \"text\". "
9317
"If\n"
9318
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9319
"draws\n"
9320
"the ordinary command line progress bar."
9321
msgstr ""
9322
9323
#: en/help_topics/configuration.txt:26
9324
msgid ""
9325
"BZR_SIGQUIT_PDB\n"
9326
"~~~~~~~~~~~~~~~"
9327
msgstr ""
9328
9329
#: en/help_topics/configuration.txt:29
9330
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9331
msgstr ""
9332
9333
#: en/help_topics/configuration.txt:31
9334
msgid ""
9335
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9336
"* 1 = Invoke breakin debugger (default)"
9337
msgstr ""
9338
9339
#: en/help_topics/configuration.txt:34
9340
msgid ""
9341
"BZR_HOME\n"
9342
"~~~~~~~~"
9343
msgstr ""
9344
9345
#: en/help_topics/configuration.txt:37
9346
msgid "Override the home directory used by Bazaar."
9347
msgstr ""
9348
9349
#: en/help_topics/configuration.txt:39
9350
msgid ""
9351
"BZR_SSH\n"
9352
"~~~~~~~"
9353
msgstr ""
9354
9355
#: en/help_topics/configuration.txt:42
9356
msgid "Select a different SSH implementation."
9357
msgstr ""
9358
9359
#: en/help_topics/configuration.txt:44
9360
msgid ""
9361
"BZR_PDB\n"
9362
"~~~~~~~"
9363
msgstr ""
9364
9365
#: en/help_topics/configuration.txt:47
9366
msgid "Control whether to launch a debugger on error."
9367
msgstr ""
9368
9369
#: en/help_topics/configuration.txt:49
9370
msgid ""
9371
"* 0 = Standard behavior\n"
9372
"* 1 = Launch debugger"
9373
msgstr ""
9374
9375
#: en/help_topics/configuration.txt:52
9376
msgid ""
9377
"BZR_REMOTE_PATH\n"
9378
"~~~~~~~~~~~~~~~"
9379
msgstr ""
9380
9381
#: en/help_topics/configuration.txt:55
9382
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9383
msgstr ""
9384
9385
#: en/help_topics/configuration.txt:57
9386
msgid "See also the ``bzr_remote_path`` configuration option."
9387
msgstr ""
9388
9389
#: en/help_topics/configuration.txt:59
9390
msgid ""
9391
"BZR_EDITOR\n"
9392
"~~~~~~~~~~"
9393
msgstr ""
9394
9395
#: en/help_topics/configuration.txt:62
9396
msgid "Path to the editor Bazaar should use for commit messages, etc."
9397
msgstr ""
9398
9399
#: en/help_topics/configuration.txt:64
9400
msgid ""
9401
"BZR_LOG\n"
9402
"~~~~~~~"
9403
msgstr ""
9404
9405
#: en/help_topics/configuration.txt:67
9406
msgid ""
9407
"Location of the Bazaar log file. You can check the current location by\n"
9408
"running ``bzr version``."
9409
msgstr ""
9410
9411
#: en/help_topics/configuration.txt:70
9412
msgid ""
9413
"The log file contains debug information that is useful for diagnosing or\n"
9414
"reporting problems with Bazaar."
9415
msgstr ""
9416
9417
#: en/help_topics/configuration.txt:73
9418
msgid ""
9419
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9420
"will disable logging."
9421
msgstr ""
9422
9423
#: en/help_topics/configuration.txt:76
9424
msgid ""
9425
"\n"
9426
"BZR_PLUGIN_PATH\n"
9427
"~~~~~~~~~~~~~~~"
9428
msgstr ""
9429
9430
#: en/help_topics/configuration.txt:80
9431
msgid ""
9432
"The path to the plugins directory that Bazaar should use.\n"
9433
"If not set, Bazaar will search for plugins in:"
9434
msgstr ""
9435
9436
#: en/help_topics/configuration.txt:83
9437
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
9438
msgstr ""
9439
9440
#: en/help_topics/configuration.txt:85
9441
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9442
msgstr ""
9443
9444
#: en/help_topics/configuration.txt:87
9445
msgid ""
9446
"* the site specific plugin directory if applicable (containing\n"
9447
" the ``site`` plugins)."
9448
msgstr ""
9449
9450
#: en/help_topics/configuration.txt:90
9451
msgid ""
9452
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9453
"the way the plugin are searched. "
9454
msgstr ""
9455
9456
#: en/help_topics/configuration.txt:93
9457
msgid ""
9458
"As for the ``PATH`` variables, if multiple directories are\n"
9459
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9460
"platform specific appropriate character (':' on Unix,\n"
9461
"';' on windows)"
9462
msgstr ""
9463
9464
#: en/help_topics/configuration.txt:98
9465
msgid ""
9466
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9467
"in ``user``. However it will continue to search in ``core`` and\n"
9468
"``site`` unless they are explicitly removed."
9469
msgstr ""
9470
9471
#: en/help_topics/configuration.txt:102
9472
msgid ""
9473
"If you need to change the order or remove one of these\n"
9474
"directories, you should use special values:"
9475
msgstr ""
9476
9477
#: en/help_topics/configuration.txt:105
9478
msgid ""
9479
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9480
" path from the default values,"
9481
msgstr ""
9482
9483
#: en/help_topics/configuration.txt:108
9484
msgid ""
9485
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9486
" before the remaining default values (and also remove it from\n"
9487
" the default values)."
9488
msgstr ""
9489
9490
#: en/help_topics/configuration.txt:112
9491
msgid ""
9492
"Note that the special values 'user', 'core' and 'site' should be\n"
9493
"used literally, they will be substituted by the corresponding,\n"
9494
"platform specific, values."
9495
msgstr ""
9496
9497
#: en/help_topics/configuration.txt:116
9498
msgid ""
9499
"The examples below use ':' as the separator, windows users\n"
9500
"should use ';'."
9501
msgstr ""
9502
9503
#: en/help_topics/configuration.txt:119
9504
msgid "Overriding the default user plugin directory::"
9505
msgstr ""
9506
9507
#: en/help_topics/configuration.txt:121
9508
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9509
msgstr ""
9510
9511
#: en/help_topics/configuration.txt:123
9512
msgid "Disabling the site directory while retaining the user directory::"
9513
msgstr ""
9514
9515
#: en/help_topics/configuration.txt:125
9516
msgid " BZR_PLUGIN_PATH='-site:+user'"
9517
msgstr ""
9518
9519
#: en/help_topics/configuration.txt:127
9520
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9521
msgstr ""
9522
9523
#: en/help_topics/configuration.txt:129
9524
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9525
msgstr ""
9526
9527
#: en/help_topics/configuration.txt:131
9528
msgid "Overriding the default site plugin directory::"
9529
msgstr ""
9530
9531
#: en/help_topics/configuration.txt:133
9532
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9533
msgstr ""
9534
9535
#: en/help_topics/configuration.txt:135
9536
msgid ""
9537
"BZR_DISABLE_PLUGINS\n"
9538
"~~~~~~~~~~~~~~~~~~~"
9539
msgstr ""
9540
9541
#: en/help_topics/configuration.txt:138
9542
msgid ""
9543
"Under special circumstances (mostly when trying to diagnose a\n"
9544
"bug), it's better to disable a plugin (or several) rather than\n"
9545
"uninstalling them completely. Such plugins can be specified in\n"
9546
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9547
msgstr ""
9548
9549
#: en/help_topics/configuration.txt:143
9550
msgid ""
9551
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9552
"will raise an import error if they are explicitly imported (by\n"
9553
"another plugin that depends on them for example)."
9554
msgstr ""
9555
9556
#: en/help_topics/configuration.txt:147
9557
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9558
msgstr ""
9559
9560
#: en/help_topics/configuration.txt:149
9561
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9562
msgstr ""
9563
9564
#: en/help_topics/configuration.txt:151
9565
msgid ""
9566
"BZR_PLUGINS_AT\n"
9567
"~~~~~~~~~~~~~~"
9568
msgstr ""
9569
9570
#: en/help_topics/configuration.txt:154
9571
msgid ""
9572
"When adding a new feature or working on a bug in a plugin,\n"
9573
"developers often need to use a specific version of a given\n"
9574
"plugin. Since python requires that the directory containing the\n"
9575
"code is named like the plugin itself this make it impossible to\n"
9576
"use arbitrary directory names (using a two-level directory scheme\n"
9577
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9578
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9579
msgstr ""
9580
9581
#: en/help_topics/configuration.txt:162
9582
msgid ""
9583
"Plugins specified in this environment variable takes precedence\n"
9584
"over the ones in ``BZR_PLUGIN_PATH``."
9585
msgstr ""
9586
9587
#: en/help_topics/configuration.txt:165
9588
msgid ""
9589
"The variable specified a list of ``plugin_name@plugin path``,\n"
9590
"``plugin_name`` being the name of the plugin as it appears in\n"
9591
"python module paths, ``plugin_path`` being the path to the\n"
9592
"directory containing the plugin code itself\n"
9593
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9594
"separator, use ';' on windows."
9595
msgstr ""
9596
9597
#: en/help_topics/configuration.txt:172
9598
msgid ""
9599
"Example:\n"
9600
"~~~~~~~~"
9601
msgstr ""
9602
9603
#: en/help_topics/configuration.txt:175
9604
msgid ""
9605
"Using a specific version of ``myplugin``:\n"
9606
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9607
msgstr ""
9608
9609
#: en/help_topics/configuration.txt:178
9610
msgid ""
9611
"BZRPATH\n"
9612
"~~~~~~~"
9613
msgstr ""
9614
9615
#: en/help_topics/configuration.txt:181
9616
msgid "The path where Bazaar should look for shell plugin external commands."
9617
msgstr ""
9618
9619
#: en/help_topics/configuration.txt:183
9620
msgid ""
9621
"\n"
9622
"http_proxy, https_proxy\n"
9623
"~~~~~~~~~~~~~~~~~~~~~~~"
9624
msgstr ""
9625
9626
#: en/help_topics/configuration.txt:187
9627
msgid "Specifies the network proxy for outgoing connections, for example::"
9628
msgstr ""
9629
9630
#: en/help_topics/configuration.txt:189
9631
msgid ""
9632
" http_proxy=http://proxy.example.com:3128/ \n"
9633
" https_proxy=http://proxy.example.com:3128/"
9634
msgstr ""
9635
9636
#: en/help_topics/configuration.txt:192
9637
msgid ""
9638
"\n"
9639
"Configuration files\n"
9640
"-------------------"
9641
msgstr ""
9642
9643
#: en/help_topics/configuration.txt:196
9644
msgid ""
9645
"Location\n"
9646
"~~~~~~~~"
9647
msgstr ""
9648
9649
#: en/help_topics/configuration.txt:199
9650
msgid ""
9651
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9652
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9653
"on\n"
9654
"Windows. (You can check the location for your system by using\n"
9655
"``bzr version``.)"
9656
msgstr ""
9657
9658
#: en/help_topics/configuration.txt:204
9659
msgid "There are three primary configuration files in this location:"
9660
msgstr ""
9661
9662
#: en/help_topics/configuration.txt:206
9663
msgid "* ``bazaar.conf`` describes default configuration options,"
9664
msgstr ""
9665
9666
#: en/help_topics/configuration.txt:208
9667
msgid ""
9668
"* ``locations.conf`` describes configuration information for\n"
9669
" specific branch locations,"
9670
msgstr ""
9671
9672
#: en/help_topics/configuration.txt:211
9673
msgid ""
9674
"* ``authentication.conf`` describes credential information for\n"
9675
" remote servers."
9676
msgstr ""
9677
9678
#: en/help_topics/configuration.txt:214
9679
msgid ""
9680
"Each branch can also contain a configuration file that sets values specific\n"
9681
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9682
"the\n"
9683
"branch. This file is visible to all users of a branch, if you wish to "
9684
"override\n"
9685
"one of the values for a branch with a setting that is specific to you then "
9686
"you\n"
9687
"can do so in ``locations.conf``."
9688
msgstr ""
9689
9690
#: en/help_topics/configuration.txt:220
9691
msgid ""
9692
"General format\n"
9693
"~~~~~~~~~~~~~~"
9694
msgstr ""
9695
9696
#: en/help_topics/configuration.txt:223
9697
msgid ""
9698
"An ini file has three types of contructs: section headers, section\n"
9699
"options and comments."
9700
msgstr ""
9701
9702
#: en/help_topics/configuration.txt:226
9703
msgid ""
9704
"Comments\n"
9705
"^^^^^^^^"
9706
msgstr ""
9707
9708
#: en/help_topics/configuration.txt:229
9709
msgid ""
9710
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9711
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9712
"Bazaar when parsing ini files."
9713
msgstr ""
9714
9715
#: en/help_topics/configuration.txt:233
9716
msgid ""
9717
"Section headers\n"
9718
"^^^^^^^^^^^^^^^"
9719
msgstr ""
9720
9721
#: en/help_topics/configuration.txt:236
9722
msgid ""
9723
"A section header is a word enclosed in brackets that starts at the begining\n"
9724
"of a line. A typical section header looks like this::"
9725
msgstr ""
9726
9727
#: en/help_topics/configuration.txt:239
9728
msgid " [DEFAULT]"
9729
msgstr ""
9730
9731
#: en/help_topics/configuration.txt:241
9732
msgid ""
9733
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9734
"[ALIASES]. Section headers are case sensitive. The default section provides "
9735
"for\n"
9736
"setting options which can be overridden with the branch config file."
9737
msgstr ""
9738
9739
#: en/help_topics/configuration.txt:245
9740
msgid ""
9741
"For ``locations.conf``, the options from the section with the\n"
9742
"longest matching section header are used to the exclusion of other\n"
9743
"potentially valid section headers. A section header uses the path for\n"
9744
"the branch as the section header. Some examples include::"
9745
msgstr ""
9746
9747
#: en/help_topics/configuration.txt:250
9748
msgid ""
9749
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9750
" [/home/jdoe/branches/]"
9751
msgstr ""
9752
9753
#: en/help_topics/configuration.txt:253
9754
msgid ""
9755
"\n"
9756
"Section options\n"
9757
"^^^^^^^^^^^^^^^"
9758
msgstr ""
9759
9760
#: en/help_topics/configuration.txt:257
9761
msgid ""
9762
"A section option resides within a section. A section option contains an\n"
9763
"option name, an equals sign and a value. For example::"
9764
msgstr ""
9765
9766
#: en/help_topics/configuration.txt:260
9767
msgid ""
9768
" email = John Doe <jdoe@isp.com>\n"
9769
" gpg_signing_key = Amy Pond <amy@example.com>"
9770
msgstr ""
9771
9772
#: en/help_topics/configuration.txt:263
9773
msgid ""
9774
"A option can reference other options by enclosing them in curly brackets::"
9775
msgstr ""
9776
9777
#: en/help_topics/configuration.txt:265
9778
msgid ""
9779
" my_branch_name = feature_x\n"
9780
" my_server = bzr+ssh://example.com\n"
9781
" push_location = {my_server}/project/{my_branch_name}"
9782
msgstr ""
9783
9784
#: en/help_topics/configuration.txt:269
9785
msgid ""
9786
"Option policies\n"
9787
"^^^^^^^^^^^^^^^"
9788
msgstr ""
9789
9790
#: en/help_topics/configuration.txt:272
9791
msgid ""
9792
"Options defined in a section affect the named directory or URL plus\n"
9793
"any locations they contain. Policies can be used to change how an\n"
9794
"option value is interpreted for contained locations. Currently\n"
9795
"there are three policies available:"
9796
msgstr ""
9797
9798
#: en/help_topics/configuration.txt:277
9799
msgid ""
9800
" none:\n"
9801
" the value is interpreted the same for contained locations. This is\n"
9802
" the default behaviour.\n"
9803
" norecurse:\n"
9804
" the value is only used for the exact location specified by the\n"
9805
" section name.\n"
9806
" appendpath:\n"
9807
" for contained locations, any additional path components are\n"
9808
" appended to the value."
9809
msgstr ""
9810
9811
#: en/help_topics/configuration.txt:287
9812
msgid ""
9813
"Policies are specified by keys with names of the form \"<option_name>:policy"
9814
"\".\n"
9815
"For example, to define the push location for a tree of branches, the\n"
9816
"following could be used::"
9817
msgstr ""
9818
9819
#: en/help_topics/configuration.txt:291
9820
msgid ""
9821
" [/top/location]\n"
9822
" push_location = sftp://example.com/location\n"
9823
" push_location:policy = appendpath"
9824
msgstr ""
9825
9826
#: en/help_topics/configuration.txt:295
9827
msgid ""
9828
"With this configuration, the push location for ``/top/location/branch1``\n"
9829
"would be ``sftp://example.com/location/branch1``."
9830
msgstr ""
9831
9832
#: en/help_topics/configuration.txt:298
9833
msgid ""
9834
"Section local options\n"
9835
"^^^^^^^^^^^^^^^^^^^^^"
9836
msgstr ""
9837
9838
#: en/help_topics/configuration.txt:301
9839
msgid ""
9840
"Some options are defined automatically inside a given section and can be\n"
9841
"refered to in this section only. "
9842
msgstr ""
9843
9844
#: en/help_topics/configuration.txt:304
9845
msgid "For example, the ``appendpath`` policy can be used like this::"
9846
msgstr ""
9847
9848
#: en/help_topics/configuration.txt:306
9849
msgid ""
9850
" [/home/vila/src/bzr/bugs]\n"
9851
" mypush = lp:~vila/bzr\n"
9852
" mypush:policy=appendpath"
9853
msgstr ""
9854
9855
#: en/help_topics/configuration.txt:310
9856
msgid "Using ``relpath`` to achieve the same result is done like this::"
9857
msgstr ""
9858
9859
#: en/help_topics/configuration.txt:312
9860
msgid ""
9861
" [/home/vila/src/bzr/bugs]\n"
9862
" mypush = lp:~vila/bzr/{relpath}"
9863
msgstr ""
9864
9865
#: en/help_topics/configuration.txt:315
9866
msgid ""
9867
"In both cases, when used in a directory like\n"
9868
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9869
msgstr ""
9870
9871
#: en/help_topics/configuration.txt:318
9872
msgid ""
9873
" $ bzr config mypush\n"
9874
" lp:~vila/bzr/832013-expand-in-stack"
9875
msgstr ""
9876
9877
#: en/help_topics/configuration.txt:321
9878
msgid "Another such option is ``basename`` which can be used like this::"
9879
msgstr ""
9880
9881
#: en/help_topics/configuration.txt:323
9882
msgid ""
9883
" [/home/vila/src/bzr]\n"
9884
" mypush = lp:~vila/bzr/{basename}"
9885
msgstr ""
9886
9887
#: en/help_topics/configuration.txt:326
9888
msgid ""
9889
"When used in a directory like\n"
9890
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9891
msgstr ""
9892
9893
#: en/help_topics/configuration.txt:332
9894
msgid ""
9895
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9896
"itself is defined as the relative path between the section name and the\n"
9897
"location it matches."
9898
msgstr ""
9899
9900
#: en/help_topics/configuration.txt:336
9901
msgid ""
9902
"When an option is local to a Section, it cannot be referred to from option\n"
9903
"values in any other section from the same ``Store`` nor from any other\n"
9904
"``Store``."
9905
msgstr ""
9906
9907
#: en/help_topics/configuration.txt:340
9908
msgid ""
9909
"\n"
9910
"The main configuration file, bazaar.conf\n"
9911
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9912
msgstr ""
9913
9914
#: en/help_topics/configuration.txt:344
9915
msgid ""
9916
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9917
"The default section contains the default\n"
9918
"configuration options for all branches. The default section can be\n"
9919
"overriden by providing a branch-specific section in ``locations.conf``."
9920
msgstr ""
9921
9922
#: en/help_topics/configuration.txt:349
9923
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9924
msgstr ""
9925
9926
#: en/help_topics/configuration.txt:351
9927
msgid ""
9928
" [DEFAULT]\n"
9929
" email = John Doe <jdoe@isp.com>\n"
9930
" editor = /usr/bin/vim\n"
9931
" create_signatures = when-required"
9932
msgstr ""
9933
9934
#: en/help_topics/configuration.txt:356
9935
msgid ""
9936
"\n"
9937
"The branch location configuration file, locations.conf\n"
9938
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9939
msgstr ""
9940
9941
#: en/help_topics/configuration.txt:360
9942
msgid ""
9943
"``locations.conf`` allows one to specify overriding settings for\n"
9944
"a specific branch. The format is almost identical to the default section in\n"
9945
"bazaar.conf with one significant change: The section header, instead of "
9946
"saying\n"
9947
"default, will be the path to a branch that you wish to override a value\n"
9948
"for. The '?' and '*' wildcards are supported::"
9949
msgstr ""
9950
9951
#: en/help_topics/configuration.txt:366
9952
msgid ""
9953
" [/home/jdoe/branches/nethack]\n"
9954
" email = Nethack Admin <nethack@nethack.com>"
9955
msgstr ""
9956
9957
#: en/help_topics/configuration.txt:369
9958
msgid ""
9959
" [http://hypothetical.site.com/branches/devel-branch]\n"
9960
" create_signatures = always"
9961
msgstr ""
9962
9963
#: en/help_topics/configuration.txt:372
9964
msgid ""
9965
"The authentication configuration file, authentication.conf\n"
9966
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9967
msgstr ""
9968
9969
#: en/help_topics/configuration.txt:375
9970
msgid ""
9971
"``authentication.conf`` allows one to specify credentials for\n"
9972
"remote servers. This can be used for all the supported transports and any "
9973
"part\n"
9974
"of bzr that requires authentication (smtp for example)."
9975
msgstr ""
9976
9977
#: en/help_topics/configuration.txt:379
9978
msgid ""
9979
"The syntax of the file obeys the same rules as the others except for the\n"
9980
"option policies which don't apply."
9981
msgstr ""
9982
9983
#: en/help_topics/configuration.txt:382
9984
msgid ""
9985
"For more information on the possible uses of the authentication "
9986
"configuration\n"
9987
"file see :doc:`authentication-help`."
9988
msgstr ""
9989
9990
#: en/help_topics/configuration.txt:385
9991
msgid ""
9992
"\n"
9993
"Common options\n"
9994
"--------------"
9995
msgstr ""
9996
9997
#: en/help_topics/configuration.txt:389
9998
msgid ""
9999
"debug_flags\n"
10000
"~~~~~~~~~~~"
10001
msgstr ""
10002
10003
#: en/help_topics/configuration.txt:392
10004
msgid ""
10005
"A comma-separated list of debugging options to turn on. The same values\n"
10006
"can be used as with the -D command-line option (see `help global-options`).\n"
10007
"For example::"
10008
msgstr ""
10009
10010
#: en/help_topics/configuration.txt:396
10011
msgid " debug_flags = hpss"
10012
msgstr ""
10013
10014
#: en/help_topics/configuration.txt:400
10015
msgid " debug_flags = hpss,evil"
10016
msgstr ""
10017
10018
#: en/help_topics/configuration.txt:402
10019
msgid ""
10020
"email\n"
10021
"~~~~~"
10022
msgstr ""
10023
10024
#: en/help_topics/configuration.txt:405
10025
msgid ""
10026
"The email address to use when committing a branch. Typically takes the form\n"
10027
"of::"
10028
msgstr ""
10029
10030
#: en/help_topics/configuration.txt:408
10031
msgid " email = Full Name <account@hostname.tld>"
10032
msgstr ""
10033
10034
#: en/help_topics/configuration.txt:410
10035
msgid ""
10036
"editor\n"
10037
"~~~~~~"
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:413
10041
msgid ""
10042
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10043
"a commit message. This setting is trumped by the environment variable\n"
10044
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10045
"variables."
10046
msgstr ""
10047
10048
#: en/help_topics/configuration.txt:418
10049
msgid ""
10050
"log_format\n"
10051
"~~~~~~~~~~"
10052
msgstr ""
10053
10054
#: en/help_topics/configuration.txt:421
10055
msgid ""
10056
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10057
"and ``line``. Additional formats may be provided by plugins. The default\n"
10058
"value is ``long``."
10059
msgstr ""
10060
10061
#: en/help_topics/configuration.txt:425
10062
msgid ""
10063
"check_signatures\n"
10064
"~~~~~~~~~~~~~~~~"
10065
msgstr ""
10066
10067
#: en/help_topics/configuration.txt:428
10068
msgid ""
10069
"Reserved for future use. These options will allow a policy for branches to\n"
10070
"require signatures."
10071
msgstr ""
10072
10073
#: en/help_topics/configuration.txt:431
10074
msgid ""
10075
"require\n"
10076
" The gnupg signature for revisions must be present and must be valid."
10077
msgstr ""
10078
10079
#: en/help_topics/configuration.txt:434
10080
msgid ""
10081
"ignore\n"
10082
" Do not check gnupg signatures of revisions."
10083
msgstr ""
10084
10085
#: en/help_topics/configuration.txt:437
10086
msgid ""
10087
"check-available\n"
10088
" (default) If gnupg signatures for revisions are present, check them.\n"
10089
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10090
" no signature is present."
10091
msgstr ""
10092
10093
#: en/help_topics/configuration.txt:442
10094
msgid ""
10095
"create_signatures\n"
10096
"~~~~~~~~~~~~~~~~~"
10097
msgstr ""
10098
10099
#: en/help_topics/configuration.txt:445
10100
msgid ""
10101
"Defines the behaviour of signing revisions on commits. By default bzr will "
10102
"not\n"
10103
"sign new commits."
10104
msgstr ""
10105
10106
#: en/help_topics/configuration.txt:448
10107
msgid ""
10108
"always\n"
10109
" Sign every new revision that is committed. If the signing fails then "
10110
"the\n"
10111
" commit will not be made."
10112
msgstr ""
10113
10114
#: en/help_topics/configuration.txt:452
10115
msgid ""
10116
"when-required\n"
10117
" Reserved for future use."
10118
msgstr ""
10119
10120
#: en/help_topics/configuration.txt:455
10121
msgid ""
10122
"never\n"
10123
" Reserved for future use."
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:458
10127
msgid ""
10128
"In future it is planned that ``when-required`` will sign newly\n"
10129
"committed revisions only when the branch requires them. ``never`` will "
10130
"refuse\n"
10131
"to sign newly committed revisions, even if the branch requires signatures."
10132
msgstr ""
10133
10134
#: en/help_topics/configuration.txt:462
10135
msgid ""
10136
"dirstate.fdatasync\n"
10137
"~~~~~~~~~~~~~~~~~~"
10138
msgstr ""
10139
10140
#: en/help_topics/configuration.txt:465
10141
msgid ""
10142
"If true (default), working tree metadata changes are flushed through the\n"
10143
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10144
"should not be lost if the machine crashes. See also repository.fdatasync."
10145
msgstr ""
10146
10147
#: en/help_topics/configuration.txt:469
10148
msgid ""
10149
"gpg_signing_key\n"
10150
"~~~~~~~~~~~~~~~"
10151
msgstr ""
10152
10153
#: en/help_topics/configuration.txt:472
10154
msgid ""
10155
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10156
"address, key fingerprint or full key ID. When unset or when set to\n"
10157
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10158
msgstr ""
10159
10160
#: en/help_topics/configuration.txt:476
10161
msgid ""
10162
"recurse\n"
10163
"~~~~~~~"
10164
msgstr ""
10165
10166
#: en/help_topics/configuration.txt:479
10167
msgid ""
10168
"Only useful in ``locations.conf``. Defines whether or not the\n"
10169
"configuration for this section applies to subdirectories:"
10170
msgstr ""
10171
10172
#: en/help_topics/configuration.txt:482
10173
msgid ""
10174
"true\n"
10175
" (default) This section applies to subdirectories as well."
10176
msgstr ""
10177
10178
#: en/help_topics/configuration.txt:485
10179
msgid ""
10180
"false\n"
10181
" This section only applies to the branch at this directory and not\n"
10182
" branches below it."
10183
msgstr ""
10184
10185
#: en/help_topics/configuration.txt:489
10186
msgid ""
10187
"gpg_signing_command\n"
10188
"~~~~~~~~~~~~~~~~~~~"
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:492
10192
msgid ""
10193
"(Default: \"gpg\"). Which program should be used to sign and check "
10194
"revisions.\n"
10195
"For example::"
10196
msgstr ""
10197
10198
#: en/help_topics/configuration.txt:495
10199
msgid " gpg_signing_command = /usr/bin/gnpg"
10200
msgstr ""
10201
10202
#: en/help_topics/configuration.txt:497
10203
msgid ""
10204
"The specified command must accept the options \"--clearsign\" and \"-u "
10205
"<email>\"."
10206
msgstr ""
10207
10208
#: en/help_topics/configuration.txt:499
10209
msgid ""
10210
"bzr_remote_path\n"
10211
"~~~~~~~~~~~~~~~"
10212
msgstr ""
10213
10214
#: en/help_topics/configuration.txt:502
10215
msgid ""
10216
"(Default: \"bzr\"). The path to the command that should be used to run the "
10217
"smart\n"
10218
"server for bzr. This value may only be specified in locations.conf, because:"
10219
msgstr ""
10220
10221
#: en/help_topics/configuration.txt:505
10222
msgid ""
10223
"- it's needed before branch.conf is accessible\n"
10224
"- allowing remote branch.conf files to specify commands would be a security\n"
10225
" risk"
10226
msgstr ""
10227
10228
#: en/help_topics/configuration.txt:509
10229
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10230
msgstr ""
10231
10232
#: en/help_topics/configuration.txt:511
10233
msgid ""
10234
"smtp_server\n"
10235
"~~~~~~~~~~~"
10236
msgstr ""
10237
10238
#: en/help_topics/configuration.txt:514
10239
msgid ""
10240
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10241
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10242
msgstr ""
10243
10244
#: en/help_topics/configuration.txt:517
10245
msgid ""
10246
"smtp_username, smtp_password\n"
10247
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10248
msgstr ""
10249
10250
#: en/help_topics/configuration.txt:520
10251
msgid ""
10252
"User and password to authenticate to the SMTP server. If smtp_username\n"
10253
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10254
"These settings are only needed if the SMTP server requires authentication\n"
10255
"to send mail."
10256
msgstr ""
10257
10258
#: en/help_topics/configuration.txt:525
10259
msgid ""
10260
"locks.steal_dead\n"
10261
"~~~~~~~~~~~~~~~~"
10262
msgstr ""
10263
10264
#: en/help_topics/configuration.txt:528
10265
msgid ""
10266
"If set to true, bzr will automatically break locks held by processes from\n"
10267
"the same machine and user that are no longer alive. Otherwise, it will\n"
10268
"print a message and you can break the lock manually, if you are satisfied\n"
10269
"the object is no longer in use."
10270
msgstr ""
10271
10272
#: en/help_topics/configuration.txt:533
10273
msgid ""
10274
"mail_client\n"
10275
"~~~~~~~~~~~"
10276
msgstr ""
10277
10278
#: en/help_topics/configuration.txt:536
10279
msgid ""
10280
"A mail client to use for sending merge requests.\n"
10281
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10282
"it\n"
10283
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10284
"``editor``."
10285
msgstr ""
10286
10287
#: en/help_topics/configuration.txt:541
10288
msgid "Supported values for specific clients:"
10289
msgstr ""
10290
10291
#: en/help_topics/configuration.txt:543
10292
msgid ""
10293
":claws: Use Claws. This skips a dialog for attaching files.\n"
10294
":evolution: Use Evolution.\n"
10295
":kmail: Use KMail.\n"
10296
":mutt: Use Mutt.\n"
10297
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10298
"1.5,\n"
10299
" this works around some bugs that xdg-email doesn't handle."
10300
msgstr ""
10301
10302
#: en/help_topics/configuration.txt:550
10303
msgid "Supported generic values are:"
10304
msgstr ""
10305
10306
#: en/help_topics/configuration.txt:552
10307
msgid ""
10308
":default: See above.\n"
10309
":editor: Use your editor to compose the merge request. This also uses\n"
10310
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10311
" smtp_username and smtp_password.\n"
10312
":mapi: Use your preferred e-mail client on Windows.\n"
10313
":xdg-email: Use xdg-email to run your preferred mail program"
10314
msgstr ""
10315
10316
#: en/help_topics/configuration.txt:559
10317
msgid ""
10318
"repository.fdatasync\n"
10319
"~~~~~~~~~~~~~~~~~~~~"
10320
msgstr ""
10321
10322
#: en/help_topics/configuration.txt:562
10323
msgid ""
10324
"If true (default), repository changes are flushed through the OS buffers\n"
10325
"to physical disk. This is somewhat slower, but means data should not be\n"
10326
"lost if the machine crashes. See also dirstate.fdatasync."
10327
msgstr ""
10328
10329
#: en/help_topics/configuration.txt:566
10330
msgid ""
10331
"submit_branch\n"
10332
"~~~~~~~~~~~~~"
10333
msgstr ""
10334
10335
#: en/help_topics/configuration.txt:569
10336
msgid ""
10337
"The branch you intend to submit your current work to. This is "
10338
"automatically\n"
10339
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10340
"This\n"
10341
"should usually be set on a per-branch or per-location basis."
10342
msgstr ""
10343
10344
#: en/help_topics/configuration.txt:573
10345
msgid ""
10346
"public_branch\n"
10347
"~~~~~~~~~~~~~"
10348
msgstr ""
10349
10350
#: en/help_topics/configuration.txt:576
10351
msgid ""
10352
"A publically-accessible version of this branch (implying that this version "
10353
"is\n"
10354
"not publically-accessible). Used (and set) by ``bzr send``."
10355
msgstr ""
10356
10357
#: en/help_topics/configuration.txt:579
10358
msgid ""
10359
"suppress_warnings\n"
10360
"~~~~~~~~~~~~~~~~~"
10361
msgstr ""
10362
10363
#: en/help_topics/configuration.txt:582
10364
msgid ""
10365
"A list of strings, each string represent a warning that can be emitted by\n"
10366
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10367
msgstr ""
10368
10369
#: en/help_topics/configuration.txt:585
10370
msgid "Valid values:"
10371
msgstr ""
10372
10373
#: en/help_topics/configuration.txt:587
10374
msgid ""
10375
"* ``format_deprecation``:\n"
10376
" whether the format deprecation warning is shown on repositories that "
10377
"are\n"
10378
" using deprecated formats."
10379
msgstr ""
10380
10381
#: en/help_topics/configuration.txt:591
10382
msgid ""
10383
"default_format\n"
10384
"~~~~~~~~~~~~~~"
10385
msgstr ""
10386
10387
#: en/help_topics/configuration.txt:594
10388
msgid ""
10389
"A format name for the default format used when creating branches. See "
10390
"``bzr\n"
10391
"help formats`` for possible values."
10392
msgstr ""
10393
10394
#: en/help_topics/configuration.txt:597
10395
msgid ""
10396
"\n"
10397
"Unicode options\n"
10398
"---------------"
10399
msgstr ""
10400
10401
#: en/help_topics/configuration.txt:601
10402
msgid ""
10403
"output_encoding\n"
10404
"~~~~~~~~~~~~~~~"
10405
msgstr ""
10406
10407
#: en/help_topics/configuration.txt:604
10408
msgid ""
10409
"A Python unicode encoding name for text output from bzr, such as log\n"
10410
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10411
"is the terminal encoding prefered by the operating system."
10412
msgstr ""
10413
10414
#: en/help_topics/configuration.txt:608
10415
msgid ""
10416
"\n"
10417
"Branch type specific options\n"
10418
"----------------------------"
10419
msgstr ""
10420
10421
#: en/help_topics/configuration.txt:612
10422
msgid ""
10423
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10424
"later format. They\n"
10425
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10426
"manually set in ``locations.conf`` or ``bazaar.conf``."
10427
msgstr ""
10428
10429
#: en/help_topics/configuration.txt:617
10430
msgid ""
10431
"append_revisions_only\n"
10432
"~~~~~~~~~~~~~~~~~~~~~"
10433
msgstr ""
10434
10435
#: en/help_topics/configuration.txt:620
10436
msgid ""
10437
"If set to \"True\" then revisions can only be appended to the log, not\n"
10438
"removed. A branch with this setting enabled can only pull from another\n"
10439
"branch if the other branch's log is a longer version of its own. This is\n"
10440
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10441
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10442
"compatibility with previous bzr versions (older than 2.2)."
10443
msgstr ""
10444
10445
#: en/help_topics/configuration.txt:627
10446
msgid ""
10447
"parent_location\n"
10448
"~~~~~~~~~~~~~~~"
10449
msgstr ""
10450
10451
#: en/help_topics/configuration.txt:630
10452
msgid ""
10453
"If present, the location of the default branch for pull or merge. This "
10454
"option\n"
10455
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10456
"--remember``."
10457
msgstr ""
10458
10459
#: en/help_topics/configuration.txt:634
10460
msgid ""
10461
"push_location\n"
10462
"~~~~~~~~~~~~~"
10463
msgstr ""
10464
10465
#: en/help_topics/configuration.txt:637
10466
msgid ""
10467
"If present, the location of the default branch for push. This option\n"
10468
"is normally set by the first ``push`` or ``push --remember``."
10469
msgstr ""
10470
10471
#: en/help_topics/configuration.txt:640
10472
msgid ""
10473
"push_strict\n"
10474
"~~~~~~~~~~~"
10475
msgstr ""
10476
10477
#: en/help_topics/configuration.txt:643
10478
msgid ""
10479
"If present, defines the ``--strict`` option default value for checking\n"
10480
"uncommitted changes before pushing."
10481
msgstr ""
10482
10483
#: en/help_topics/configuration.txt:646
10484
msgid ""
10485
"dpush_strict\n"
10486
"~~~~~~~~~~~~"
10487
msgstr ""
10488
10489
#: en/help_topics/configuration.txt:649
10490
msgid ""
10491
"If present, defines the ``--strict`` option default value for checking\n"
10492
"uncommitted changes before pushing into a different VCS without any\n"
10493
"custom bzr metadata."
10494
msgstr ""
10495
10496
#: en/help_topics/configuration.txt:653
10497
msgid ""
10498
"bound_location\n"
10499
"~~~~~~~~~~~~~~"
10500
msgstr ""
10501
10502
#: en/help_topics/configuration.txt:656
10503
msgid ""
10504
"The location that commits should go to when acting as a checkout.\n"
10505
"This option is normally set by ``bind``."
10506
msgstr ""
10507
10508
#: en/help_topics/configuration.txt:659
10509
msgid ""
10510
"bound\n"
10511
"~~~~~"
10512
msgstr ""
10513
10514
#: en/help_topics/configuration.txt:662
10515
msgid ""
10516
"If set to \"True\", the branch should act as a checkout, and push each "
10517
"commit to\n"
10518
"the bound_location. This option is normally set by ``bind``/``unbind``."
10519
msgstr ""
10520
10521
#: en/help_topics/configuration.txt:665
10522
msgid ""
10523
"send_strict\n"
10524
"~~~~~~~~~~~"
10525
msgstr ""
10526
10527
#: en/help_topics/configuration.txt:668
10528
msgid ""
10529
"If present, defines the ``--strict`` option default value for checking\n"
10530
"uncommitted changes before sending a merge directive."
10531
msgstr ""
10532
10533
#: en/help_topics/configuration.txt:671
10534
msgid ""
10535
"add.maximum_file_size\n"
10536
"~~~~~~~~~~~~~~~~~~~~~"
10537
msgstr ""
10538
10539
#: en/help_topics/configuration.txt:674
10540
msgid ""
10541
"Defines the maximum file size the command line \"add\" operation will allow\n"
10542
"in recursive mode, with files larger than this value being skipped. You "
10543
"may \n"
10544
"specify this value as an integer (in which case it is interpreted as "
10545
"bytes), \n"
10546
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10547
"0 \n"
10548
"will disable skipping."
10549
msgstr ""
10550
10551
#: en/help_topics/configuration.txt:680
10552
msgid ""
10553
"External Merge Tools\n"
10554
"--------------------"
10555
msgstr ""
10556
10557
#: en/help_topics/configuration.txt:683
10558
msgid ""
10559
"bzr.mergetool.<name>\n"
10560
"~~~~~~~~~~~~~~~~~~~~"
10561
msgstr ""
10562
10563
#: en/help_topics/configuration.txt:686
10564
msgid ""
10565
"Defines an external merge tool called <name> with the given command-line.\n"
10566
"Arguments containing spaces should be quoted using single or double quotes. "
10567
"The\n"
10568
"executable may omit its path if it can be found on the PATH."
10569
msgstr ""
10570
10571
#: en/help_topics/configuration.txt:690
10572
msgid ""
10573
"The following markers can be used in the command-line to substitute "
10574
"filenames\n"
10575
"involved in the merge conflict::"
10576
msgstr ""
10577
10578
#: en/help_topics/configuration.txt:693
10579
msgid ""
10580
" {base} file.BASE\n"
10581
" {this} file.THIS\n"
10582
" {other} file.OTHER\n"
10583
" {result} output file\n"
10584
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10585
"merge\n"
10586
" succeeds."
10587
msgstr ""
10588
10589
#: en/help_topics/configuration.txt:702
10590
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10591
msgstr ""
10592
10593
#: en/help_topics/configuration.txt:704
10594
msgid ""
10595
"bzr.default_mergetool\n"
10596
"~~~~~~~~~~~~~~~~~~~~~"
10597
msgstr ""
10598
10599
#: en/help_topics/configuration.txt:707
10600
msgid ""
10601
"Specifies which external merge tool (as defined above) should be selected "
10602
"by\n"
10603
"default in tools such as ``bzr qconflicts``."
10604
msgstr ""
10605
10606
#: en/help_topics/configuration.txt:712
10607
msgid " bzr.default_mergetool = kdiff3\n"
10608
msgstr ""
10609
10610
#: en/help_topics/conflict-types.txt:1
10611
msgid ""
10612
"Conflict Types\n"
10613
"=============="
10614
msgstr ""
10615
10616
#: en/help_topics/conflict-types.txt:4
10617
msgid ""
10618
"Some operations, like merge, revert and pull, modify the contents of your\n"
10619
"working tree. These modifications are programmatically generated, and so "
10620
"they\n"
10621
"may conflict with the current state of your working tree. "
10622
msgstr ""
10623
10624
#: en/help_topics/conflict-types.txt:8
10625
msgid ""
10626
"When conflicts are present in your working tree (as shown by ``bzr\n"
10627
"conflicts``), you should resolve them and then inform bzr that the "
10628
"conflicts\n"
10629
"have been resolved."
10630
msgstr ""
10631
10632
#: en/help_topics/conflict-types.txt:12
10633
msgid ""
10634
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10635
"should resolve them is not the one responsible for their occurrence, as is "
10636
"the\n"
10637
"case when merging other people's work or because some conflicts are "
10638
"presented\n"
10639
"in a way that is not easy to understand."
10640
msgstr ""
10641
10642
#: en/help_topics/conflict-types.txt:17
10643
msgid ""
10644
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10645
"conflict if and only if there's an actual conceptual conflict in the source\n"
10646
"tree. Because Bazaar doesn't understand the real meaning of the files "
10647
"being\n"
10648
"versioned, it can, when faced with ambiguities, fall short in either "
10649
"direction\n"
10650
"trying to resolve the conflict itself. Many kinds of changes can be "
10651
"combined\n"
10652
"programmatically, but sometimes only a human can determine the right thing "
10653
"to\n"
10654
"do."
10655
msgstr ""
10656
10657
#: en/help_topics/conflict-types.txt:25
10658
msgid ""
10659
"When Bazaar generates a conflict, it adds information into the working tree "
10660
"to\n"
10661
"present the conflicting versions, and it's up to you to find the correct\n"
10662
"resolution."
10663
msgstr ""
10664
10665
#: en/help_topics/conflict-types.txt:29
10666
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10667
msgstr ""
10668
10669
#: en/help_topics/conflict-types.txt:31
10670
msgid ""
10671
"1. Modify the working tree content so that the conflicted item is now in "
10672
"the\n"
10673
" state you want to keep, then"
10674
msgstr ""
10675
10676
#: en/help_topics/conflict-types.txt:34
10677
msgid ""
10678
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10679
" remaining generated information (``bzr resolve <item>``)."
10680
msgstr ""
10681
10682
#: en/help_topics/conflict-types.txt:37
10683
msgid ""
10684
"For most conflict types, there are some obvious ways to modify the working\n"
10685
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10686
"itself already made a choice, when possible."
10687
msgstr ""
10688
10689
#: en/help_topics/conflict-types.txt:41
10690
msgid ""
10691
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10692
"different ways to resolve the conflict."
10693
msgstr ""
10694
10695
#: en/help_topics/conflict-types.txt:44
10696
msgid ""
10697
"Each type of conflict is explained below, and the action which must be done "
10698
"to\n"
10699
"resolve the conflict is outlined."
10700
msgstr ""
10701
10702
#: en/help_topics/conflict-types.txt:47
10703
msgid ""
10704
"Various actions are available depending on the kind of conflict, for some "
10705
"of\n"
10706
"these actions, Bazaar can provide some help. In the end you should at least\n"
10707
"inform Bazaar that you're done with the conflict with::"
10708
msgstr ""
10709
10710
#: en/help_topics/conflict-types.txt:51
10711
msgid " ``bzr resolve FILE --action=done'"
10712
msgstr ""
10713
10714
#: en/help_topics/conflict-types.txt:53
10715
msgid ""
10716
"Note that this is the default action when a single file is involved so you "
10717
"can\n"
10718
"simply use::"
10719
msgstr ""
10720
10721
#: en/help_topics/conflict-types.txt:56
10722
msgid " ``bzr resolve FILE``"
10723
msgstr ""
10724
10725
#: en/help_topics/conflict-types.txt:58
10726
msgid "See ``bzr help resolve`` for more details."
10727
msgstr ""
10728
10729
#: en/help_topics/conflict-types.txt:60
10730
msgid ""
10731
"Text conflicts\n"
10732
"--------------"
10733
msgstr ""
10734
10735
#: en/help_topics/conflict-types.txt:63
10736
msgid "Typical message::"
10737
msgstr ""
10738
10739
#: en/help_topics/conflict-types.txt:65
10740
msgid " Text conflict in FILE"
10741
msgstr ""
10742
10743
#: en/help_topics/conflict-types.txt:67
10744
msgid ""
10745
"These are produced when a text merge cannot completely reconcile two sets "
10746
"of\n"
10747
"text changes. Bazaar will emit files for each version with the extensions\n"
10748
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10749
"tree,\n"
10750
"i.e. the tree that you are merging changes into. OTHER is the version that "
10751
"you\n"
10752
"are merging into the target. BASE is an older version that is used as a "
10753
"basis\n"
10754
"for comparison."
10755
msgstr ""
10756
10757
#: en/help_topics/conflict-types.txt:74
10758
msgid ""
10759
"In the main copy of the file, Bazaar will include all the changes that it\n"
10760
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10761
"\"herringbone\" markers like ``<<<<<<<``."
10762
msgstr ""
10763
10764
#: en/help_topics/conflict-types.txt:78
10765
msgid ""
10766
"Say the initial text is \"The project leader released it.\", and THIS "
10767
"modifies it\n"
10768
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10769
"leader\n"
10770
"released Bazaar.\" A conflict would look like this::"
10771
msgstr ""
10772
10773
#: en/help_topics/conflict-types.txt:82
10774
msgid ""
10775
" <<<<<<< TREE\n"
10776
" Martin Pool released it.\n"
10777
" =======\n"
10778
" The project leader released Bazaar.\n"
10779
" >>>>>>> MERGE-SOURCE"
10780
msgstr ""
10781
10782
#: en/help_topics/conflict-types.txt:88
10783
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10784
msgstr ""
10785
10786
#: en/help_topics/conflict-types.txt:90
10787
msgid ""
10788
"You can handle text conflicts either by editing the main copy of the file,\n"
10789
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10790
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10791
"set of changes over the other (but see below when you encounter these\n"
10792
"cases). More often, the two sets of changes must be intelligently combined."
10793
msgstr ""
10794
10795
#: en/help_topics/conflict-types.txt:96
10796
msgid ""
10797
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10798
"you are done editing, the file should look like it never had a conflict, and "
10799
"be\n"
10800
"ready to commit."
10801
msgstr ""
10802
10803
#: en/help_topics/conflict-types.txt:100
10804
msgid ""
10805
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10806
"Bazaar will auto-detect which conflicts you have resolved."
10807
msgstr ""
10808
10809
#: en/help_topics/conflict-types.txt:103
10810
msgid ""
10811
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10812
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10813
"working tree."
10814
msgstr ""
10815
10816
#: en/help_topics/conflict-types.txt:107
10817
msgid ""
10818
"\n"
10819
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10820
"resolve`` with one of the following actions:"
10821
msgstr ""
10822
10823
#: en/help_topics/conflict-types.txt:111
10824
msgid ""
10825
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10826
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10827
msgstr ""
10828
10829
#: en/help_topics/conflict-types.txt:114
10830
msgid ""
10831
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10832
"modifications will be taken into account."
10833
msgstr ""
10834
10835
#: en/help_topics/conflict-types.txt:117
10836
msgid ""
10837
"Content conflicts\n"
10838
"-----------------"
10839
msgstr ""
10840
10841
#: en/help_topics/conflict-types.txt:122
10842
msgid " Contents conflict in FILE"
10843
msgstr ""
10844
10845
#: en/help_topics/conflict-types.txt:124
10846
msgid ""
10847
"This conflict happens when there are conflicting changes in the working "
10848
"tree\n"
10849
"and the merge source, but the conflicted items are not text files. They "
10850
"may\n"
10851
"be binary files, or symlinks, or directories. It can even happen with "
10852
"files\n"
10853
"that are deleted on one side, and modified on the other."
10854
msgstr ""
10855
10856
#: en/help_topics/conflict-types.txt:129
10857
msgid ""
10858
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10859
"be\n"
10860
"regular files, symlinks or directories). But it will not include a \"main "
10861
"copy\"\n"
10862
"of the file with herringbone conflict markers. It will appear that the "
10863
"\"main\n"
10864
"copy\" has been renamed to THIS or OTHER."
10865
msgstr ""
10866
10867
#: en/help_topics/conflict-types.txt:134
10868
msgid ""
10869
"To resolve that kind of conflict, you should rebuild FILE from either "
10870
"version\n"
10871
"or a combination of both."
10872
msgstr ""
10873
10874
#: en/help_topics/conflict-types.txt:137
10875
msgid "``bzr resolve`` recognizes the following actions:"
10876
msgstr ""
10877
10878
#: en/help_topics/conflict-types.txt:139
10879
msgid ""
10880
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10881
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10882
"* ``--action=done`` will just mark the conflict as resolved."
10883
msgstr ""
10884
10885
#: en/help_topics/conflict-types.txt:143
10886
msgid ""
10887
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10888
"and\n"
10889
"``.OTHER`` files if they are still present in the working tree."
10890
msgstr ""
10891
10892
#: en/help_topics/conflict-types.txt:146
10893
msgid ""
10894
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10895
msgstr ""
10896
10897
#: en/help_topics/conflict-types.txt:148
10898
msgid ""
10899
"Tag conflicts\n"
10900
"-------------"
10901
msgstr ""
10902
10903
#: en/help_topics/conflict-types.txt:153
10904
msgid ""
10905
" Conflicting tags:\n"
10906
" version-0.1"
10907
msgstr ""
10908
10909
#: en/help_topics/conflict-types.txt:156
10910
msgid ""
10911
"When pulling from or pushing to another branch, Bazaar informs you about "
10912
"tags\n"
10913
"that conflict between the two branches; that is the same tag points to two\n"
10914
"different revisions. You need not resolve these conflicts, but subsequent\n"
10915
"uses of pull or push will result in the same message."
10916
msgstr ""
10917
10918
#: en/help_topics/conflict-types.txt:161
10919
msgid ""
10920
"To resolve the conflict, you must apply the correct tags to either the "
10921
"target\n"
10922
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10923
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10924
"target branch's tags match the source branch, then in the target branch do\n"
10925
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10926
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10927
"source\n"
10928
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10929
"favor of the target branch, you need to similarly use ``tag --force`` in "
10930
"the\n"
10931
"source branch. (Note that pulling or pushing using --overwrite will "
10932
"overwrite\n"
10933
"all tags as well.)"
10934
msgstr ""
10935
10936
#: en/help_topics/conflict-types.txt:172
10937
msgid ""
10938
"Duplicate paths\n"
10939
"---------------"
10940
msgstr ""
10941
10942
#: en/help_topics/conflict-types.txt:177
10943
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10944
msgstr ""
10945
10946
#: en/help_topics/conflict-types.txt:179
10947
msgid ""
10948
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10949
"already been used. The existing file will be renamed to \"FILE.moved\". "
10950
msgstr ""
10951
10952
#: en/help_topics/conflict-types.txt:187
10953
msgid ""
10954
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10955
"FILE``,\n"
10956
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10957
"* ``--action=done`` will just mark the conflict as resolved."
10958
msgstr ""
10959
10960
#: en/help_topics/conflict-types.txt:191
10961
msgid ""
10962
"Note that you must get rid of FILE.moved before using ``--action=done``."
10963
msgstr ""
10964
10965
#: en/help_topics/conflict-types.txt:195
10966
msgid ""
10967
"Unversioned parent\n"
10968
"------------------"
10969
msgstr ""
10970
10971
#: en/help_topics/conflict-types.txt:200
10972
msgid " Conflict because FILE is not versioned, but has versioned children."
10973
msgstr ""
10974
10975
#: en/help_topics/conflict-types.txt:202
10976
msgid ""
10977
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10978
"not\n"
10979
"versioned. This happens when the directory has been deleted in the target,\n"
10980
"but has a new child in the source, or vice versa. In this situation, "
10981
"Bazaar\n"
10982
"will version the parent directory as well. Resolving this issue depends\n"
10983
"very much on the particular scenario. You may wish to rename or delete "
10984
"either\n"
10985
"the file or the directory. When you are satisfied, you can run \"bzr "
10986
"resolve\n"
10987
"FILE\" to mark the conflict as resolved."
10988
msgstr ""
10989
10990
#: en/help_topics/conflict-types.txt:210
10991
msgid ""
10992
"Missing parent\n"
10993
"--------------"
10994
msgstr ""
10995
10996
#: en/help_topics/conflict-types.txt:215
10997
msgid " Conflict adding files to FILE. Created directory."
10998
msgstr ""
10999
11000
#: en/help_topics/conflict-types.txt:217
11001
msgid ""
11002
"This happens when a directory has been deleted in the target, but has new\n"
11003
"children in the source. This is similar to the \"unversioned parent\" "
11004
"conflict,\n"
11005
"except that the parent directory does not *exist*, instead of just being\n"
11006
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11007
"Resolving this issue depends very much on the particular scenario."
11008
msgstr ""
11009
11010
#: en/help_topics/conflict-types.txt:223
11011
msgid ""
11012
"To resolve that kind of conflict, you should either remove or rename the\n"
11013
"children or the directory or a combination of both."
11014
msgstr ""
11015
11016
#: en/help_topics/conflict-types.txt:228
11017
msgid ""
11018
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11019
" children,\n"
11020
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11021
"children\n"
11022
" and restoring the directory,\n"
11023
"* ``--action=done`` will just mark the conflict as resolved."
11024
msgstr ""
11025
11026
#: en/help_topics/conflict-types.txt:236
11027
msgid ""
11028
"Deleting parent\n"
11029
"---------------"
11030
msgstr ""
11031
11032
#: en/help_topics/conflict-types.txt:241
11033
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11034
msgstr ""
11035
11036
#: en/help_topics/conflict-types.txt:243
11037
msgid ""
11038
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11039
"source, but has new children in the target (either because a directory\n"
11040
"deletion is merged or because the merge introduce new children). Bazaar\n"
11041
"will retain the directory. Resolving this issue depends very much on the\n"
11042
"particular scenario."
11043
msgstr ""
11044
11045
#: en/help_topics/conflict-types.txt:254
11046
msgid ""
11047
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11048
"directory,"
11049
msgstr ""
11050
11051
#: en/help_topics/conflict-types.txt:256
11052
msgid ""
11053
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11054
" children,"
11055
msgstr ""
11056
11057
#: en/help_topics/conflict-types.txt:259
11058
msgid "* ``--action=done`` will just mark the conflict as resolved."
11059
msgstr ""
11060
11061
#: en/help_topics/conflict-types.txt:261
11062
msgid ""
11063
"Note that when merging a directory deletion, if unversioned files are\n"
11064
"present, they become potential orphans has they don't have a directory\n"
11065
"parent anymore."
11066
msgstr ""
11067
11068
#: en/help_topics/conflict-types.txt:265
11069
msgid ""
11070
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11071
"setting the ``bzr.transform.orphan_policy`` configuration option."
11072
msgstr ""
11073
11074
#: en/help_topics/conflict-types.txt:268
11075
msgid "There are two possible values for this option:"
11076
msgstr ""
11077
11078
#: en/help_topics/conflict-types.txt:270
11079
msgid ""
11080
"* ``conflict`` (the default): will leave the orphans in place and\n"
11081
" generate a conflicts,"
11082
msgstr ""
11083
11084
#: en/help_topics/conflict-types.txt:273
11085
msgid ""
11086
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11087
"root\n"
11088
" of the working tree with names like ``<file>.~#~``."
11089
msgstr ""
11090
11091
#: en/help_topics/conflict-types.txt:278
11092
msgid ""
11093
"Path conflict\n"
11094
"-------------"
11095
msgstr ""
11096
11097
#: en/help_topics/conflict-types.txt:283
11098
msgid " Path conflict: PATH1 / PATH2"
11099
msgstr ""
11100
11101
#: en/help_topics/conflict-types.txt:285
11102
msgid ""
11103
"This happens when the source and target have each modified the name or "
11104
"parent\n"
11105
"directory of a file. Bazaar will use the path elements from the source."
11106
msgstr ""
11107
11108
#: en/help_topics/conflict-types.txt:288
11109
msgid ""
11110
"To resolve that kind of conflict, you just have to decide what name should "
11111
"be\n"
11112
"retained for the file involved."
11113
msgstr ""
11114
11115
#: en/help_topics/conflict-types.txt:293
11116
msgid ""
11117
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11118
" issuing ``bzr mv PATH2 PATH1``,\n"
11119
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11120
"``PATH2``,\n"
11121
"* ``--action=done`` will just mark the conflict as resolved."
11122
msgstr ""
11123
11124
#: en/help_topics/conflict-types.txt:300
11125
msgid ""
11126
"Parent loop\n"
11127
"-----------"
11128
msgstr ""
11129
11130
#: en/help_topics/conflict-types.txt:305
11131
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11132
msgstr ""
11133
11134
#: en/help_topics/conflict-types.txt:307
11135
msgid ""
11136
"This happens when the source and the target have each moved directories, so\n"
11137
"that, if the change could be applied, a directory would be contained by "
11138
"itself.\n"
11139
"For example::"
11140
msgstr ""
11141
11142
#: en/help_topics/conflict-types.txt:311
11143
msgid ""
11144
" $ bzr init\n"
11145
" $ bzr mkdir white\n"
11146
" $ bzr mkdir black\n"
11147
" $ bzr commit -m \"BASE\"\n"
11148
" $ bzr branch . ../other\n"
11149
" $ bzr mv white black\n"
11150
" $ bzr commit -m \"THIS\"\n"
11151
" $ bzr mv ../other/black ../other/white\n"
11152
" $ bzr commit ../other -m \"OTHER\"\n"
11153
" $ bzr merge ../other"
11154
msgstr ""
11155
11156
#: en/help_topics/conflict-types.txt:322
11157
msgid ""
11158
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11159
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11160
"name should be retained for the directories involved."
11161
msgstr ""
11162
11163
#: en/help_topics/conflict-types.txt:328
11164
msgid ""
11165
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
11166
"``white`` \n"
11167
" in ``black``,\n"
11168
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11169
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11170
"* ``--action=done`` will just mark the conflict as resolved."
11171
msgstr ""
11172
11173
#: en/help_topics/conflict-types.txt:336
11174
msgid ""
11175
"Non-directory parent\n"
11176
"--------------------"
11177
msgstr ""
11178
11179
#: en/help_topics/conflict-types.txt:341
11180
msgid ""
11181
" Conflict: foo.new is not a directory, but has files in it.\n"
11182
" Created directory."
11183
msgstr ""
11184
11185
#: en/help_topics/conflict-types.txt:344
11186
msgid ""
11187
"This happens when one side has added files to a directory, and the other "
11188
"side\n"
11189
"has changed the directory into a file or symlink. For example::"
11190
msgstr ""
11191
11192
#: en/help_topics/conflict-types.txt:347
11193
msgid ""
11194
" $ bzr init\n"
11195
" $ bzr mkdir foo\n"
11196
" $ bzr commit -m \"BASE\"\n"
11197
" $ bzr branch . ../other\n"
11198
" $ rmdir foo\n"
11199
" $ touch foo\n"
11200
" $ bzr commit -m \"THIS\"\n"
11201
" $ bzr mkdir ../other/foo/bar\n"
11202
" $ bzr commit ../other -m \"OTHER\"\n"
11203
" $ bzr merge ../other"
11204
msgstr ""
11205
11206
#: en/help_topics/conflict-types.txt:358
11207
msgid ""
11208
"To resolve that kind of conflict, you have to decide what name should be\n"
11209
"retained for the file, directory or symlink involved."
11210
msgstr ""
11211
11212
#: en/help_topics/conflict-types.txt:363
11213
msgid ""
11214
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11215
" ``bzr add foo``,\n"
11216
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11217
" ``bzr mv foo.new foo``,\n"
11218
"* ``--action=done`` will just mark the conflict as resolved."
11219
msgstr ""
11220
11221
#: en/help_topics/conflict-types.txt:371
11222
msgid ""
11223
"MalformedTransform\n"
11224
"------------------"
11225
msgstr ""
11226
11227
#: en/help_topics/conflict-types.txt:374
11228
msgid ""
11229
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11230
"exception. This means that Bazaar encountered a filesystem conflict that it "
11231
"was\n"
11232
"unable to resolve. This usually indicates a bug. Please let us know if "
11233
"you\n"
11234
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11235
msgstr ""
11236
11237
#: en/help_topics/content-filters.txt:1
11238
msgid ""
11239
"Content Filters\n"
11240
"==============="
11241
msgstr ""
11242
11243
#: en/help_topics/content-filters.txt:4
11244
msgid ""
11245
"Content formats\n"
11246
"---------------"
11247
msgstr ""
11248
11249
#: en/help_topics/content-filters.txt:7
11250
msgid ""
11251
"Bazaar's content filtering allows you to store files in a different\n"
11252
"format from the copy in your working tree. This lets you, or your\n"
11253
"co-developers, use Windows development tools that expect CRLF files\n"
11254
"on projects that use other line-ending conventions. Among other things,\n"
11255
"content filters also let Unix developers more easily work on projects\n"
11256
"using Windows line-ending conventions, keyword expansion/compression,\n"
11257
"and trailing spaces on lines in text files to be implicitly stripped\n"
11258
"when committed."
11259
msgstr ""
11260
11261
#: en/help_topics/content-filters.txt:16
11262
msgid "To generalize, there are two content formats supported by Bazaar:"
11263
msgstr ""
11264
11265
#: en/help_topics/content-filters.txt:18
11266
msgid ""
11267
"* a canonical format - how files are stored internally\n"
11268
"* a convenience format - how files are created in a working tree."
11269
msgstr ""
11270
11271
#: en/help_topics/content-filters.txt:21
11272
msgid ""
11273
"\n"
11274
"Format conversion\n"
11275
"-----------------"
11276
msgstr ""
11277
11278
#: en/help_topics/content-filters.txt:25
11279
msgid ""
11280
"The conversion between these formats is done by content filters.\n"
11281
"A content filter has two parts:"
11282
msgstr ""
11283
11284
#: en/help_topics/content-filters.txt:28
11285
msgid ""
11286
"* a read converter - converts from convenience to canonical format\n"
11287
"* a write converter - converts from canonical to convenience format."
11288
msgstr ""
11289
11290
#: en/help_topics/content-filters.txt:31
11291
msgid ""
11292
"Many of these converters will provide *round-trip* conversion,\n"
11293
"i.e. applying the read converter followed by the write converter\n"
11294
"gives back the original content. However, others may provide an\n"
11295
"asymmetric conversion. For example, a read converter might strip\n"
11296
"trailing whitespace off lines in source code while the matching\n"
11297
"write converter might pass content through unchanged."
11298
msgstr ""
11299
11300
#: en/help_topics/content-filters.txt:38
11301
msgid ""
11302
"\n"
11303
"Enabling content filters\n"
11304
"------------------------"
11305
msgstr ""
11306
11307
#: en/help_topics/content-filters.txt:42
11308
msgid ""
11309
"Content filters are typically provided by plugins, so the first step\n"
11310
"in using them is to install the relevant plugins and read their\n"
11311
"documentation. Some plugins may be very specific about which files\n"
11312
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11313
"In other cases, the plugin may leave it in the user's hands to\n"
11314
"define which files are to be filtered. This is typically done\n"
11315
"using rule-based preferences. See ``bzr help rules`` for general\n"
11316
"information about defining these."
11317
msgstr ""
11318
11319
#: en/help_topics/content-filters.txt:51
11320
msgid ""
11321
"\n"
11322
"Impact on commands\n"
11323
"------------------"
11324
msgstr ""
11325
11326
#: en/help_topics/content-filters.txt:55
11327
msgid ""
11328
"Read converters are only applied to commands that read content from\n"
11329
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11330
"will apply read converters to files in the working tree, then compare\n"
11331
"the results to the content last committed."
11332
msgstr ""
11333
11334
#: en/help_topics/content-filters.txt:60
11335
msgid ""
11336
"Write converters are only applied by commands that **create files in a\n"
11337
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11338
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11339
"respectively."
11340
msgstr ""
11341
11342
#: en/help_topics/content-filters.txt:65
11343
msgid ""
11344
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11345
"comitting files. If this makes sense for a given plugin providing\n"
11346
"a content filter, the plugin can usually achieve this effect by using a\n"
11347
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11348
"for more information on hooks."
11349
msgstr ""
11350
11351
#: en/help_topics/content-filters.txt:71
11352
msgid ""
11353
"\n"
11354
"Refreshing your working tree\n"
11355
"----------------------------"
11356
msgstr ""
11357
11358
#: en/help_topics/content-filters.txt:75
11359
msgid ""
11360
"For performance reasons, Bazaar caches the timestamps of files in\n"
11361
"a working tree, and assumes files are unchanged if their timestamps\n"
11362
"match the cached values. As a consequence, there are times when\n"
11363
"you may need to explicitly ask for content filtering to be reapplied\n"
11364
"in one or both directions, e.g. after installing or reconfiguring\n"
11365
"plugins providing it."
11366
msgstr ""
11367
11368
#: en/help_topics/content-filters.txt:82
11369
msgid "Here are some general guidelines for doing this:"
11370
msgstr ""
11371
11372
#: en/help_topics/content-filters.txt:84
11373
msgid ""
11374
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11375
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11376
" relevant read converters and compare the end result with the\n"
11377
" canonical format."
11378
msgstr ""
11379
11380
#: en/help_topics/content-filters.txt:89
11381
msgid ""
11382
" * To reapply write converters, ensure there are no local changes,\n"
11383
" delete the relevant files and run ``bzr revert`` on those files."
11384
msgstr ""
11385
11386
#: en/help_topics/content-filters.txt:92
11387
msgid ""
11388
"Note: In the future, it is likely that additional options will be added\n"
11389
"to commands to make this refreshing process faster and safer.\n"
11390
msgstr ""
11391
11392
#: en/help_topics/current-formats.txt:1
11393
msgid "Current Storage Formats"
11394
msgstr ""
11395
11396
#: en/help_topics/current-formats.txt:3
11397
msgid ""
11398
":2a:\n"
11399
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11400
" compress storage. Provides rich roots which are a one-way\n"
11401
" transition."
11402
msgstr ""
11403
11404
#: en/help_topics/current-formats.txt:8
11405
msgid ""
11406
"\n"
11407
"See :doc:`formats-help` for more about storage formats."
11408
msgstr ""
11409
11410
#: en/help_topics/debug-flags.txt:1
11411
msgid ""
11412
"Debug Flags\n"
11413
"==========="
11414
msgstr ""
11415
11416
#: en/help_topics/debug-flags.txt:4
11417
msgid ""
11418
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11419
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11420
msgstr ""
11421
11422
#: en/help_topics/debug-flags.txt:7
11423
msgid ""
11424
"-Dauth Trace authentication sections used.\n"
11425
"-Dbytes Print out how many bytes were transferred\n"
11426
"-Ddirstate Trace dirstate activity (verbose!)\n"
11427
"-Derror Instead of normal error handling, always print a "
11428
"traceback\n"
11429
" on error.\n"
11430
"-Devil Capture call sites that do expensive or badly-scaling\n"
11431
" operations.\n"
11432
"-Dfetch Trace history copying between repositories.\n"
11433
"-Dfilters Emit information for debugging content filtering.\n"
11434
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11435
"fetch.\n"
11436
"-Dgraph Trace graph traversal.\n"
11437
"-Dhashcache Log every time a working file is read to determine its "
11438
"hash.\n"
11439
"-Dhooks Trace hook execution.\n"
11440
"-Dhpss Trace smart protocol requests and responses.\n"
11441
"-Dhpssdetail More hpss details.\n"
11442
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11443
"-Dhttp Trace http connections, requests and responses.\n"
11444
"-Dindex Trace major index operations.\n"
11445
"-Dknit Trace knit operations.\n"
11446
"-Dlock Trace when lockdir locks are taken or released.\n"
11447
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11448
" retrying the request.\n"
11449
"-Dprogress Trace progress bar operations.\n"
11450
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11451
"-Dmerge Emit information for debugging merges.\n"
11452
"-Dno_apport Don't use apport to report crashes.\n"
11453
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11454
"-Dpack Emit information about pack operations.\n"
11455
"-Drelock Emit a message every time a branch or repository object "
11456
"is\n"
11457
" unlocked then relocked the same way.\n"
11458
"-Dsftp Trace SFTP internals.\n"
11459
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11460
"expected\n"
11461
"-Dstream Trace fetch streams.\n"
11462
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11463
"portable\n"
11464
" manner.\n"
11465
"-Dunlock Some errors during unlock are treated as warnings.\n"
11466
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11467
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11468
"appropriate\n"
11469
" for the format, even for non-local fetches.\n"
11470
msgstr ""
11471
11472
#: en/help_topics/diverged-branches.txt:1
11473
msgid ""
11474
"Diverged Branches\n"
11475
"================="
11476
msgstr ""
11477
11478
#: en/help_topics/diverged-branches.txt:4
11479
msgid ""
11480
"When Bazaar tries to push one branch onto another, it requires that the\n"
11481
"destination branch must be ready to receive the source branch. If this "
11482
"isn't\n"
11483
"the case, then we say that the branches have ``diverged``. Branches are\n"
11484
"considered diverged if the destination branch's most recent commit is one "
11485
"that\n"
11486
"has not been merged (directly or indirectly) by the source branch. To "
11487
"recover\n"
11488
"from diverged branches, one must merge the missing revisions into the "
11489
"source\n"
11490
"branch."
11491
msgstr ""
11492
11493
#: en/help_topics/diverged-branches.txt:12
11494
msgid ""
11495
"This situation commonly arises when using a centralized workflow with local\n"
11496
"commits. If someone else has committed new work to the mainline since your\n"
11497
"last pull and you have local commits that have not yet been pushed to the\n"
11498
"mainline, then your local branch and the mainline have diverged."
11499
msgstr ""
11500
11501
#: en/help_topics/diverged-branches.txt:17
11502
msgid ""
11503
"Discovering What Has Diverged\n"
11504
"-----------------------------"
11505
msgstr ""
11506
11507
#: en/help_topics/diverged-branches.txt:20
11508
msgid ""
11509
"The ``bzr missing`` command is used to find out what revisions are in "
11510
"another\n"
11511
"branch that are not present in the current branch, and vice-versa. It shows "
11512
"a\n"
11513
"summary of which extra revisions exist in each branch. If you want to see "
11514
"the\n"
11515
"precise effects of those revisions, you can use ``bzr diff --"
11516
"old=other_branch``\n"
11517
"to show the differences between other_branch and your current branch."
11518
msgstr ""
11519
11520
#: en/help_topics/diverged-branches.txt:26
11521
msgid ""
11522
"A Solution\n"
11523
"----------"
11524
msgstr ""
11525
11526
#: en/help_topics/diverged-branches.txt:29
11527
msgid ""
11528
"The solution is to merge the revisions from the mainline into your local\n"
11529
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11530
"mainline. This merge may result in conflicts if the other developer's "
11531
"changes\n"
11532
"overlap with your changes. These conflicts should be resolved before\n"
11533
"continuing. After any conflicts have been resolved, or even if there were "
11534
"no\n"
11535
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11536
"to your local branch. This requirement gives you an opportunity to test "
11537
"the\n"
11538
"resulting working tree for correctness, since the merged revisions could "
11539
"have\n"
11540
"made arbitrary changes. After testing, you should commit the merge using\n"
11541
"``bzr commit``. This clears up the diverged branches situation. Your "
11542
"local\n"
11543
"branch can now be pushed to the mainline.\n"
11544
msgstr ""
11545
11546
#: en/help_topics/eol.txt:1
11547
msgid ""
11548
"End of Line Conversion\n"
11549
"======================"
11550
msgstr ""
11551
11552
#: en/help_topics/eol.txt:4
11553
msgid ""
11554
"EOL conversion is provided as a content filter where Bazaar internally\n"
11555
"stores a canonical format but outputs a convenience format. See\n"
11556
"``bzr help content-filters`` for general information about using these."
11557
msgstr ""
11558
11559
#: en/help_topics/eol.txt:8
11560
msgid ""
11561
"Note: Content filtering is only supported in recently added formats,\n"
11562
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11563
"in a recent format. (Just setting the format on the repository\n"
11564
"is not enough.) If content filtering does not appear to be working, use\n"
11565
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11566
"or later."
11567
msgstr ""
11568
11569
#: en/help_topics/eol.txt:15
11570
msgid ""
11571
"EOL conversion needs to be enabled for selected file patterns using\n"
11572
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11573
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11574
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11575
"supported in a future verison of Bazaar."
11576
msgstr ""
11577
11578
#: en/help_topics/eol.txt:21
11579
msgid ""
11580
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11581
"(If a value is not set, ``exact`` is the default.)"
11582
msgstr ""
11583
11584
#: en/help_topics/eol.txt:24
11585
msgid ""
11586
" ========== ===================================== ======================\n"
11587
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11588
" ========== ===================================== ======================\n"
11589
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11590
" ---------- ------------------------------------- ----------------------\n"
11591
" ``lf`` ``lf`` ``lf``\n"
11592
" ---------- ------------------------------------- ----------------------\n"
11593
" ``crlf`` ``crlf`` ``lf``\n"
11594
" ---------- ------------------------------------- ----------------------\n"
11595
" ``exact`` No conversion Exactly as in file\n"
11596
" ========== ===================================== ======================"
11597
msgstr ""
11598
11599
#: en/help_topics/eol.txt:36
11600
msgid ""
11601
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11602
"byte is detected in the file."
11603
msgstr ""
11604
11605
#: en/help_topics/eol.txt:39
11606
msgid ""
11607
"For users working on a cross-platform project, here is a suggested rule\n"
11608
"to use as a starting point::"
11609
msgstr ""
11610
11611
#: en/help_topics/eol.txt:42
11612
msgid ""
11613
" [name *]\n"
11614
" eol = native"
11615
msgstr ""
11616
11617
#: en/help_topics/eol.txt:45
11618
msgid ""
11619
"If you have binary files that do not contain a null byte though, be\n"
11620
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11621
"by giving more explicit patterns earlier in the rules file. For example::"
11622
msgstr ""
11623
11624
#: en/help_topics/eol.txt:49
11625
msgid ""
11626
" [name *.png]\n"
11627
" eol = exact"
11628
msgstr ""
11629
11630
#: en/help_topics/eol.txt:55
11631
msgid ""
11632
"If your working tree is on a network drive shared by users on different\n"
11633
"operating systems, you typically want to force certain conventions for\n"
11634
"certain files. In that way, if a file is created with the wrong line\n"
11635
"endings or line endings get mixed during editing, it gets committed\n"
11636
"correctly and gets checked out correctly. For example::"
11637
msgstr ""
11638
11639
#: en/help_topics/eol.txt:61
11640
msgid ""
11641
" [name *.bat]\n"
11642
" eol = crlf"
11643
msgstr ""
11644
11645
#: en/help_topics/eol.txt:64
11646
msgid ""
11647
" [name *.sh]\n"
11648
" eol = lf"
11649
msgstr ""
11650
11651
#: en/help_topics/eol.txt:70
11652
msgid ""
11653
"If you take the care to create files with their required endings, you can\n"
11654
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11655
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11656
"introducing mixed line endings will be corrected during commit for files\n"
11657
"with those settings."
11658
msgstr ""
11659
11660
#: en/help_topics/eol.txt:76
11661
msgid ""
11662
"If you have sample test data that deliberately has text files with mixed\n"
11663
"newline conventions, you can ask for those to be left alone like this::"
11664
msgstr ""
11665
11666
#: en/help_topics/eol.txt:79
11667
msgid ""
11668
" [name test_data/]\n"
11669
" eol = exact"
11670
msgstr ""
11671
11672
#: en/help_topics/eol.txt:85
11673
msgid ""
11674
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11675
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11676
"of content analysis to detect binary files for commands like ``diff``.\n"
11677
"In the future, a ``binary = true`` rule may be added but it is not\n"
11678
"supported yet.)"
11679
msgstr ""
11680
11681
#: en/help_topics/eol.txt:91
11682
msgid ""
11683
"If you have an existing repository with text files already stored using\n"
11684
"Windows newline conventions (``crlf``), then you may want to keep using "
11685
"that\n"
11686
"convention in the repository. Forcing certain files to this convention\n"
11687
"may also help users who do not have rules configured. To do this, set\n"
11688
"``eol`` to one of the values below."
11689
msgstr ""
11690
11691
#: en/help_topics/eol.txt:97
11692
msgid ""
11693
" ============================ ======================== "
11694
"======================\n"
11695
" Value Checkout end-of-lines as Commit end-of-lines "
11696
"as\n"
11697
" ============================ ======================== "
11698
"======================\n"
11699
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11700
" ``lf`` otherwise\n"
11701
" ---------------------------- ------------------------ "
11702
"----------------------\n"
11703
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11704
" ---------------------------- ------------------------ "
11705
"----------------------\n"
11706
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11707
" ============================ ======================== ======================"
11708
msgstr ""
11709
11710
#: en/help_topics/eol.txt:108
11711
msgid ""
11712
"For users working on an existing project that uses Windows newline\n"
11713
"conventions in their Bazaar repository, this rule is suggested as a\n"
11714
"starting point::"
11715
msgstr ""
11716
11717
#: en/help_topics/eol.txt:112
11718
msgid ""
11719
" [name *]\n"
11720
" eol = native-with-crlf-in-repo"
11721
msgstr ""
11722
11723
#: en/help_topics/eol.txt:115
11724
msgid ""
11725
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11726
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11727
"``crlf`` and ``exact``."
11728
msgstr ""
11729
11730
#: en/help_topics/eol.txt:119
11731
msgid ""
11732
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11733
"never reject files because a given line ending or mixed line endings\n"
11734
"are found. A precommit hook should be used if you wish to validate\n"
11735
"(and not just convert) content before committing.\n"
11736
msgstr ""
11737
11738
#: en/help_topics/hidden-commands.txt:1
11739
msgid ""
11740
"added List files added in working tree.\n"
11741
"ancestry List all revisions merged into this branch.\n"
11742
"assert-fail Test reporting of assertion failures\n"
11743
"bundle-info Output interesting stats about a bundle\n"
11744
"bundle-revisions Create a merge-directive for submitting changes.\n"
11745
"cat-revision Write out metadata for a revision.\n"
11746
"dump-btree Dump the contents of a btree index file to stdout.\n"
11747
"export-pot Export command helps and error messages in po format.\n"
11748
"file-id Print file_id of a particular file or directory.\n"
11749
"file-path Print path of file_ids to a file or directory.\n"
11750
"find-merge-base Find and print a base revision for merging two "
11751
"branches.\n"
11752
"hooks Show hooks.\n"
11753
"inventory Show inventory of the current working copy or a "
11754
"revision.\n"
11755
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11756
"lookup-revision Lookup the revision-id from a revision-number\n"
11757
"merge-directive Generate a merge directive for auto-merge tools.\n"
11758
"modified List files modified in working tree.\n"
11759
"re-sign Create a digital signature for an existing revision.\n"
11760
"reference list, view and set branch locations for nested trees.\n"
11761
"relpath Show path of a file relative to root\n"
11762
"repair-workingtree Reset the working tree state file.\n"
11763
"revision-history Display the list of revision ids on a branch.\n"
11764
"revision-info Show revision number and revision id for a given "
11765
"revision\n"
11766
" identifier.\n"
11767
"rocks Statement of optimism.\n"
11768
"selftest Run internal test suite.\n"
11769
"shell-complete Show appropriate completions for context.\n"
11770
"test-script Run a shell-like test from a file.\n"
11771
"touching-revisions Return revision-ids which affected a particular file.\n"
11772
"unknowns List unknown files.\n"
11773
"wait-until-signalled Test helper for\n"
11774
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11775
msgstr ""
11776
11777
#: en/help_topics/hooks.txt:1
11778
msgid ""
11779
"\n"
11780
"Hooks\n"
11781
"====="
11782
msgstr ""
11783
11784
#: en/help_topics/hooks.txt:5
11785
msgid ""
11786
"Introduction\n"
11787
"------------"
11788
msgstr ""
11789
11790
#: en/help_topics/hooks.txt:8
11791
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11792
msgstr ""
11793
11794
#: en/help_topics/hooks.txt:10
11795
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11796
msgstr ""
11797
11798
#: en/help_topics/hooks.txt:12
11799
msgid ""
11800
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11801
msgstr ""
11802
11803
#: en/help_topics/hooks.txt:14
11804
msgid ""
11805
"The class that contains each hook is given before the hooks it supplies. "
11806
"For\n"
11807
"instance, BranchHooks as the class is the hooks class for\n"
11808
"`bzrlib.branch.Branch.hooks`."
11809
msgstr ""
11810
11811
#: en/help_topics/hooks.txt:18
11812
msgid ""
11813
"Each description also indicates whether the hook runs on the client (the\n"
11814
"machine where bzr was invoked) or the server (the machine addressed by\n"
11815
"the branch URL). These may be, but are not necessarily, the same machine."
11816
msgstr ""
11817
11818
#: en/help_topics/hooks.txt:22
11819
msgid ""
11820
"Plugins (including hooks) are run on the server if all of these is true:"
11821
msgstr ""
11822
11823
#: en/help_topics/hooks.txt:24
11824
msgid ""
11825
" * The connection is via a smart server (accessed with a URL starting with\n"
11826
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11827
"\"http://\"\n"
11828
" URL when a smart server is available via HTTP)."
11829
msgstr ""
11830
11831
#: en/help_topics/hooks.txt:28
11832
msgid ""
11833
" * The hook is either server specific or part of general infrastructure "
11834
"rather\n"
11835
" than client specific code (such as commit)."
11836
msgstr ""
11837
11838
#: en/help_topics/hooks.txt:31
11839
msgid ""
11840
"\n"
11841
"BranchHooks\n"
11842
"-----------"
11843
msgstr ""
11844
11845
#: en/help_topics/hooks.txt:35
11846
msgid ""
11847
"automatic_tag_name\n"
11848
"~~~~~~~~~~~~~~~~~~"
11849
msgstr ""
11850
11851
#: en/help_topics/hooks.txt:38
11852
msgid "Introduced in: 2.2"
11853
msgstr ""
11854
11855
#: en/help_topics/hooks.txt:40
11856
msgid ""
11857
"Called to determine an automatic tag name for a revision.\n"
11858
"automatic_tag_name is called with (branch, revision_id) and should\n"
11859
"return a tag name or None if no tag name could be determined. The\n"
11860
"first non-None tag name returned will be used."
11861
msgstr ""
11862
11863
#: en/help_topics/hooks.txt:45
11864
msgid ""
11865
"open\n"
11866
"~~~~"
11867
msgstr ""
11868
11869
#: en/help_topics/hooks.txt:48
11870
msgid "Introduced in: 1.8"
11871
msgstr ""
11872
11873
#: en/help_topics/hooks.txt:50
11874
msgid ""
11875
"Called with the Branch object that has been opened after a branch is\n"
11876
"opened."
11877
msgstr ""
11878
11879
#: en/help_topics/hooks.txt:53
11880
msgid ""
11881
"post_branch_init\n"
11882
"~~~~~~~~~~~~~~~~"
11883
msgstr ""
11884
11885
#: en/help_topics/hooks.txt:58
11886
msgid ""
11887
"Called after new branch initialization completes. post_branch_init is\n"
11888
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11889
"branch and checkout (both heavyweight and lightweight) will all\n"
11890
"trigger this hook."
11891
msgstr ""
11892
11893
#: en/help_topics/hooks.txt:63
11894
msgid ""
11895
"post_change_branch_tip\n"
11896
"~~~~~~~~~~~~~~~~~~~~~~"
11897
msgstr ""
11898
11899
#: en/help_topics/hooks.txt:66
11900
msgid "Introduced in: 1.4"
11901
msgstr ""
11902
11903
#: en/help_topics/hooks.txt:68
11904
msgid ""
11905
"Called in bzr client and server after a change to the tip of a branch\n"
11906
"is made. post_change_branch_tip is called with a\n"
11907
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11908
"uncommit will all trigger this hook."
11909
msgstr ""
11910
11911
#: en/help_topics/hooks.txt:73
11912
msgid ""
11913
"post_commit\n"
11914
"~~~~~~~~~~~"
11915
msgstr ""
11916
11917
#: en/help_topics/hooks.txt:76
11918
msgid "Introduced in: 0.15"
11919
msgstr ""
11920
11921
#: en/help_topics/hooks.txt:78
11922
msgid ""
11923
"Called in the bzr client after a commit has completed. post_commit is\n"
11924
"called with (local, master, old_revno, old_revid, new_revno,\n"
11925
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11926
"branch."
11927
msgstr ""
11928
11929
#: en/help_topics/hooks.txt:83
11930
msgid ""
11931
"post_pull\n"
11932
"~~~~~~~~~"
11933
msgstr ""
11934
11935
#: en/help_topics/hooks.txt:88
11936
msgid ""
11937
"Called after a pull operation completes. post_pull is called with a\n"
11938
"bzrlib.branch.PullResult object and only runs in the bzr client."
11939
msgstr ""
11940
11941
#: en/help_topics/hooks.txt:91
11942
msgid ""
11943
"post_push\n"
11944
"~~~~~~~~~"
11945
msgstr ""
11946
11947
#: en/help_topics/hooks.txt:96
11948
msgid ""
11949
"Called after a push operation completes. post_push is called with a\n"
11950
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11951
msgstr ""
11952
11953
#: en/help_topics/hooks.txt:99
11954
msgid ""
11955
"post_switch\n"
11956
"~~~~~~~~~~~"
11957
msgstr ""
11958
11959
#: en/help_topics/hooks.txt:104
11960
msgid ""
11961
"Called after a checkout switches branch. post_switch is called with a\n"
11962
"bzrlib.branch.SwitchHookParams."
11963
msgstr ""
11964
11965
#: en/help_topics/hooks.txt:107
11966
msgid ""
11967
"post_uncommit\n"
11968
"~~~~~~~~~~~~~"
11969
msgstr ""
11970
11971
#: en/help_topics/hooks.txt:112
11972
msgid ""
11973
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11974
"called with (local, master, old_revno, old_revid, new_revno,\n"
11975
"new_revid) where local is the local branch or None, master is the\n"
11976
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11977
"of None."
11978
msgstr ""
11979
11980
#: en/help_topics/hooks.txt:118
11981
msgid ""
11982
"pre_change_branch_tip\n"
11983
"~~~~~~~~~~~~~~~~~~~~~"
11984
msgstr ""
11985
11986
#: en/help_topics/hooks.txt:121
11987
msgid "Introduced in: 1.6"
11988
msgstr ""
11989
11990
#: en/help_topics/hooks.txt:123
11991
msgid ""
11992
"Called in bzr client and server before a change to the tip of a branch\n"
11993
"is made. pre_change_branch_tip is called with a\n"
11994
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11995
"uncommit will all trigger this hook."
11996
msgstr ""
11997
11998
#: en/help_topics/hooks.txt:128
11999
msgid ""
12000
"pre_commit\n"
12001
"~~~~~~~~~~"
12002
msgstr ""
12003
12004
#: en/help_topics/hooks.txt:131
12005
msgid "Introduced in: 0.91"
12006
msgstr ""
12007
12008
#: en/help_topics/hooks.txt:133
12009
msgid ""
12010
"Called after a commit is calculated but before it is completed.\n"
12011
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12012
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12013
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12014
"TreeDelta object describing changes from the basis revision. hooks\n"
12015
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12016
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12017
"tree."
12018
msgstr ""
12019
12020
#: en/help_topics/hooks.txt:142
12021
msgid ""
12022
"set_rh\n"
12023
"~~~~~~"
12024
msgstr ""
12025
12026
#: en/help_topics/hooks.txt:147
12027
msgid ""
12028
"Invoked whenever the revision history has been set via\n"
12029
"set_revision_history. The api signature is (branch, revision_history),\n"
12030
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12031
"for bzr to trigger, a better hook to use is\n"
12032
"Branch.post_change_branch_tip."
12033
msgstr ""
12034
12035
#: en/help_topics/hooks.txt:153
12036
msgid ""
12037
"transform_fallback_location\n"
12038
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12039
msgstr ""
12040
12041
#: en/help_topics/hooks.txt:156
12042
msgid "Introduced in: 1.9"
12043
msgstr ""
12044
12045
#: en/help_topics/hooks.txt:158
12046
msgid ""
12047
"Called when a stacked branch is activating its fallback locations.\n"
12048
"transform_fallback_location is called with (branch, url), and should\n"
12049
"return a new url. Returning the same url allows it to be used as-is,\n"
12050
"returning a different one can be used to cause the branch to stack on\n"
12051
"a closer copy of that fallback_location. Note that the branch cannot\n"
12052
"have history accessing methods called on it during this hook because\n"
12053
"the fallback locations have not been activated. When there are\n"
12054
"multiple hooks installed for transform_fallback_location, all are\n"
12055
"called with the url returned from the previous hook.The order is\n"
12056
"however undefined."
12057
msgstr ""
12058
12059
#: en/help_topics/hooks.txt:169
12060
msgid ""
12061
"CommandHooks\n"
12062
"------------"
12063
msgstr ""
12064
12065
#: en/help_topics/hooks.txt:172
12066
msgid ""
12067
"extend_command\n"
12068
"~~~~~~~~~~~~~~"
12069
msgstr ""
12070
12071
#: en/help_topics/hooks.txt:175
12072
msgid "Introduced in: 1.13"
12073
msgstr ""
12074
12075
#: en/help_topics/hooks.txt:177
12076
msgid ""
12077
"Called after creating a command object to allow modifications such as\n"
12078
"adding or removing options, docs etc. Called with the new\n"
12079
"bzrlib.commands.Command object."
12080
msgstr ""
12081
12082
#: en/help_topics/hooks.txt:181
12083
msgid ""
12084
"get_command\n"
12085
"~~~~~~~~~~~"
12086
msgstr ""
12087
12088
#: en/help_topics/hooks.txt:184
12089
msgid "Introduced in: 1.17"
12090
msgstr ""
12091
12092
#: en/help_topics/hooks.txt:186
12093
msgid ""
12094
"Called when creating a single command. Called with (cmd_or_None,\n"
12095
"command_name). get_command should either return the cmd_or_None\n"
12096
"parameter, or a replacement Command object that should be used for the\n"
12097
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12098
"Many users will prefer to use bzrlib.commands.register_command or\n"
12099
"plugin_cmds.register_lazy."
12100
msgstr ""
12101
12102
#: en/help_topics/hooks.txt:193
12103
msgid ""
12104
"get_missing_command\n"
12105
"~~~~~~~~~~~~~~~~~~~"
12106
msgstr ""
12107
12108
#: en/help_topics/hooks.txt:198
12109
msgid ""
12110
"Called when creating a single command if no command could be found.\n"
12111
"Called with (command_name). get_missing_command should either return\n"
12112
"None, or a Command object to be used for the command."
12113
msgstr ""
12114
12115
#: en/help_topics/hooks.txt:202
12116
msgid ""
12117
"list_commands\n"
12118
"~~~~~~~~~~~~~"
12119
msgstr ""
12120
12121
#: en/help_topics/hooks.txt:207
12122
msgid ""
12123
"Called when enumerating commands. Called with a set of cmd_name\n"
12124
"strings for all the commands found so far. This set is safe to mutate\n"
12125
"- e.g. to remove a command. list_commands should return the updated\n"
12126
"set of command names."
12127
msgstr ""
12128
12129
#: en/help_topics/hooks.txt:212
12130
msgid ""
12131
"_ConfigHooks\n"
12132
"------------"
12133
msgstr ""
12134
12135
#: en/help_topics/hooks.txt:215
12136
msgid ""
12137
"get\n"
12138
"~~~"
12139
msgstr ""
12140
12141
#: en/help_topics/hooks.txt:218
12142
msgid "Introduced in: 2.4"
12143
msgstr ""
12144
12145
#: en/help_topics/hooks.txt:220
12146
msgid ""
12147
"Invoked when a config option is read. The signature is (stack, name,\n"
12148
"value)."
12149
msgstr ""
12150
12151
#: en/help_topics/hooks.txt:223
12152
msgid ""
12153
"load\n"
12154
"~~~~"
12155
msgstr ""
12156
12157
#: en/help_topics/hooks.txt:228
12158
msgid "Invoked when a config store is loaded. The signature is (store)."
12159
msgstr ""
12160
12161
#: en/help_topics/hooks.txt:230
12162
msgid ""
12163
"remove\n"
12164
"~~~~~~"
12165
msgstr ""
12166
12167
#: en/help_topics/hooks.txt:235
12168
msgid ""
12169
"Invoked when a config option is removed. The signature is (stack,\n"
12170
"name)."
12171
msgstr ""
12172
12173
#: en/help_topics/hooks.txt:238
12174
msgid ""
12175
"save\n"
12176
"~~~~"
12177
msgstr ""
12178
12179
#: en/help_topics/hooks.txt:243
12180
msgid "Invoked when a config store is saved. The signature is (store)."
12181
msgstr ""
12182
12183
#: en/help_topics/hooks.txt:245
12184
msgid ""
12185
"set\n"
12186
"~~~"
12187
msgstr ""
12188
12189
#: en/help_topics/hooks.txt:250
12190
msgid ""
12191
"Invoked when a config option is set. The signature is (stack, name,\n"
12192
"value)."
12193
msgstr ""
12194
12195
#: en/help_topics/hooks.txt:253
12196
msgid ""
12197
"ControlDirHooks\n"
12198
"---------------"
12199
msgstr ""
12200
12201
#: en/help_topics/hooks.txt:256
12202
msgid ""
12203
"post_repo_init\n"
12204
"~~~~~~~~~~~~~~"
12205
msgstr ""
12206
12207
#: en/help_topics/hooks.txt:261
12208
msgid ""
12209
"Invoked after a repository has been initialized. post_repo_init is\n"
12210
"called with a bzrlib.controldir.RepoInitHookParams."
12211
msgstr ""
12212
12213
#: en/help_topics/hooks.txt:264
12214
msgid ""
12215
"pre_open\n"
12216
"~~~~~~~~"
12217
msgstr ""
12218
12219
#: en/help_topics/hooks.txt:267
12220
msgid "Introduced in: 1.14"
12221
msgstr ""
12222
12223
#: en/help_topics/hooks.txt:269
12224
msgid ""
12225
"Invoked before attempting to open a ControlDir with the transport that\n"
12226
"the open will use."
12227
msgstr ""
12228
12229
#: en/help_topics/hooks.txt:272
12230
msgid ""
12231
"InfoHooks\n"
12232
"---------"
12233
msgstr ""
12234
12235
#: en/help_topics/hooks.txt:275
12236
msgid ""
12237
"repository\n"
12238
"~~~~~~~~~~"
12239
msgstr ""
12240
12241
#: en/help_topics/hooks.txt:278
12242
msgid "Introduced in: 1.15"
12243
msgstr ""
12244
12245
#: en/help_topics/hooks.txt:280
12246
msgid ""
12247
"Invoked when displaying the statistics for a repository. repository is\n"
12248
"called with a statistics dictionary as returned by the repository and\n"
12249
"a file-like object to write to."
12250
msgstr ""
12251
12252
#: en/help_topics/hooks.txt:284
12253
msgid ""
12254
"LockHooks\n"
12255
"---------"
12256
msgstr ""
12257
12258
#: en/help_topics/hooks.txt:287
12259
msgid ""
12260
"lock_acquired\n"
12261
"~~~~~~~~~~~~~"
12262
msgstr ""
12263
12264
#: en/help_topics/hooks.txt:292
12265
msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12266
msgstr ""
12267
12268
#: en/help_topics/hooks.txt:294
12269
msgid ""
12270
"lock_broken\n"
12271
"~~~~~~~~~~~"
12272
msgstr ""
12273
12274
#: en/help_topics/hooks.txt:299
12275
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12276
msgstr ""
12277
12278
#: en/help_topics/hooks.txt:301
12279
msgid ""
12280
"lock_released\n"
12281
"~~~~~~~~~~~~~"
12282
msgstr ""
12283
12284
#: en/help_topics/hooks.txt:306
12285
msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."
12286
msgstr ""
12287
12288
#: en/help_topics/hooks.txt:308
12289
msgid ""
12290
"MergeHooks\n"
12291
"----------"
12292
msgstr ""
12293
12294
#: en/help_topics/hooks.txt:311
12295
msgid ""
12296
"merge_file_content\n"
12297
"~~~~~~~~~~~~~~~~~~"
12298
msgstr ""
12299
12300
#: en/help_topics/hooks.txt:314
12301
msgid "Introduced in: 2.1"
12302
msgstr ""
12303
12304
#: en/help_topics/hooks.txt:316
12305
msgid ""
12306
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12307
"object when starting a merge. Should return either None or a subclass\n"
12308
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12309
"called per file that needs to be merged (including when one side has\n"
12310
"deleted the file and the other has changed it). See the\n"
12311
"AbstractPerFileMerger API docs for details on how it is used by merge."
12312
msgstr ""
12313
12314
#: en/help_topics/hooks.txt:323
12315
msgid ""
12316
"MergeDirectiveHooks\n"
12317
"-------------------"
12318
msgstr ""
12319
12320
#: en/help_topics/hooks.txt:326
12321
msgid ""
12322
"merge_request_body\n"
12323
"~~~~~~~~~~~~~~~~~~"
12324
msgstr ""
12325
12326
#: en/help_topics/hooks.txt:329
12327
msgid "Introduced in: 1.15.0"
12328
msgstr ""
12329
12330
#: en/help_topics/hooks.txt:331
12331
msgid ""
12332
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12333
"request. Callbacks must return a body. If more than one callback is\n"
12334
"registered, the output of one callback is provided to the next."
12335
msgstr ""
12336
12337
#: en/help_topics/hooks.txt:335
12338
msgid ""
12339
"MessageEditorHooks\n"
12340
"------------------"
12341
msgstr ""
12342
12343
#: en/help_topics/hooks.txt:338
12344
msgid ""
12345
"commit_message_template\n"
12346
"~~~~~~~~~~~~~~~~~~~~~~~"
12347
msgstr ""
12348
12349
#: en/help_topics/hooks.txt:341
12350
msgid "Introduced in: 1.10"
12351
msgstr ""
12352
12353
#: en/help_topics/hooks.txt:343
12354
msgid ""
12355
"Called when a commit message is being generated.\n"
12356
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12357
"and the message that is known so far. commit_message_template must\n"
12358
"return a new message to use (which could be the same as it was given).\n"
12359
"When there are multiple hooks registered for commit_message_template,\n"
12360
"they are chained with the result from the first passed into the\n"
12361
"second, and so on."
12362
msgstr ""
12363
12364
#: en/help_topics/hooks.txt:351
12365
msgid ""
12366
"set_commit_message\n"
12367
"~~~~~~~~~~~~~~~~~~"
12368
msgstr ""
12369
12370
#: en/help_topics/hooks.txt:356
12371
msgid ""
12372
"Set a fixed commit message. set_commit_message is called with the\n"
12373
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12374
"properties by editing commit.builder._revprops) and the message so\n"
12375
"far. set_commit_message must return the message to use or None if it\n"
12376
"should use the message editor as normal."
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:362
12380
msgid ""
12381
"MutableTreeHooks\n"
12382
"----------------"
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:368
12386
msgid "Introduced in: 2.0"
12387
msgstr ""
12388
12389
#: en/help_topics/hooks.txt:370
12390
msgid ""
12391
"Called after a commit is performed on a tree. The hook is called with\n"
12392
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12393
"commit was performed on is available via the mutable_tree attribute of\n"
12394
"that object."
12395
msgstr ""
12396
12397
#: en/help_topics/hooks.txt:375
12398
msgid ""
12399
"start_commit\n"
12400
"~~~~~~~~~~~~"
12401
msgstr ""
12402
12403
#: en/help_topics/hooks.txt:380
12404
msgid ""
12405
"Called before a commit is performed on a tree. The start commit hook\n"
12406
"is able to change the tree before the commit takes place. start_commit\n"
12407
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12408
"being performed on."
12409
msgstr ""
12410
12411
#: en/help_topics/hooks.txt:385
12412
msgid ""
12413
"SmartClientHooks\n"
12414
"----------------"
12415
msgstr ""
12416
12417
#: en/help_topics/hooks.txt:388
12418
msgid ""
12419
"call\n"
12420
"~~~~"
12421
msgstr ""
12422
12423
#: en/help_topics/hooks.txt:391
12424
msgid "Introduced in: unknown"
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:393
12428
msgid ""
12429
"Called when the smart client is submitting a request to the smart\n"
12430
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12431
"Streaming request bodies, and responses, are not accessible."
12432
msgstr ""
12433
12434
#: en/help_topics/hooks.txt:397
12435
msgid ""
12436
"SmartServerHooks\n"
12437
"----------------"
12438
msgstr ""
12439
12440
#: en/help_topics/hooks.txt:400
12441
msgid ""
12442
"server_exception\n"
12443
"~~~~~~~~~~~~~~~~"
12444
msgstr ""
12445
12446
#: en/help_topics/hooks.txt:405
12447
msgid ""
12448
"Called by the bzr server when an exception occurs. server_exception is\n"
12449
"called with the sys.exc_info() tuple return true for the hook if the\n"
12450
"exception has been handled, in which case the server will exit\n"
12451
"normally."
12452
msgstr ""
12453
12454
#: en/help_topics/hooks.txt:410
12455
msgid ""
12456
"server_started\n"
12457
"~~~~~~~~~~~~~~"
12458
msgstr ""
12459
12460
#: en/help_topics/hooks.txt:413
12461
msgid "Introduced in: 0.16"
12462
msgstr ""
12463
12464
#: en/help_topics/hooks.txt:415
12465
msgid ""
12466
"Called by the bzr server when it starts serving a directory.\n"
12467
"server_started is called with (backing urls, public url), where\n"
12468
"backing_url is a list of URLs giving the server-specific directory\n"
12469
"locations, and public_url is the public URL for the directory being\n"
12470
"served."
12471
msgstr ""
12472
12473
#: en/help_topics/hooks.txt:421
12474
msgid ""
12475
"server_started_ex\n"
12476
"~~~~~~~~~~~~~~~~~"
12477
msgstr ""
12478
12479
#: en/help_topics/hooks.txt:426
12480
msgid ""
12481
"Called by the bzr server when it starts serving a directory.\n"
12482
"server_started is called with (backing_urls, server_obj)."
12483
msgstr ""
12484
12485
#: en/help_topics/hooks.txt:429
12486
msgid ""
12487
"server_stopped\n"
12488
"~~~~~~~~~~~~~~"
12489
msgstr ""
12490
12491
#: en/help_topics/hooks.txt:434
12492
msgid ""
12493
"Called by the bzr server when it stops serving a directory.\n"
12494
"server_stopped is called with the same parameters as the\n"
12495
"server_started hook: (backing_urls, public_url)."
12496
msgstr ""
12497
12498
#: en/help_topics/hooks.txt:438
12499
msgid ""
12500
"StatusHooks\n"
12501
"-----------"
12502
msgstr ""
12503
12504
#: en/help_topics/hooks.txt:441
12505
msgid ""
12506
"post_status\n"
12507
"~~~~~~~~~~~"
12508
msgstr ""
12509
12510
#: en/help_topics/hooks.txt:444
12511
msgid "Introduced in: 2.3"
12512
msgstr ""
12513
12514
#: en/help_topics/hooks.txt:446
12515
msgid ""
12516
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12517
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12518
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12519
"correspond to the command line options specified by the user for the\n"
12520
"status command. to_file is the output stream for writing."
12521
msgstr ""
12522
12523
#: en/help_topics/hooks.txt:452
12524
msgid ""
12525
"pre_status\n"
12526
"~~~~~~~~~~"
12527
msgstr ""
12528
12529
#: en/help_topics/hooks.txt:457
12530
msgid ""
12531
"Called with argument StatusHookParams before Bazaar displays the\n"
12532
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12533
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12534
"correspond to the command line options specified by the user for the\n"
12535
"status command. to_file is the output stream for writing."
12536
msgstr ""
12537
12538
#: en/help_topics/hooks.txt:463
12539
msgid ""
12540
"RioVersionInfoBuilderHooks\n"
12541
"--------------------------"
12542
msgstr ""
12543
12544
#: en/help_topics/hooks.txt:466
12545
msgid ""
12546
"revision\n"
12547
"~~~~~~~~"
12548
msgstr ""
12549
12550
#: en/help_topics/hooks.txt:471
12551
msgid ""
12552
"Invoked when adding information about a revision to the RIO stanza\n"
12553
"that is printed. revision is called with a revision object and a RIO\n"
12554
"stanza.\n"
12555
msgstr ""
12556
12557
#: en/help_topics/location-alias.txt:1
12558
msgid ""
12559
"Location aliases\n"
12560
"================"
12561
msgstr ""
12562
12563
#: en/help_topics/location-alias.txt:4
12564
msgid ""
12565
"Bazaar defines several aliases for locations associated with a branch. "
12566
"These\n"
12567
"can be used with most commands that expect a location, such as `bzr push`."
12568
msgstr ""
12569
12570
#: en/help_topics/location-alias.txt:7
12571
msgid "The aliases are::"
12572
msgstr ""
12573
12574
#: en/help_topics/location-alias.txt:9
12575
msgid ""
12576
" :bound The branch this branch is bound to, for bound branches.\n"
12577
" :parent The parent of this branch.\n"
12578
" :public The public location of this branch.\n"
12579
" :push The saved location used for `bzr push` with no arguments.\n"
12580
" :submit The submit branch for this branch.\n"
12581
" :this This branch."
12582
msgstr ""
12583
12584
#: en/help_topics/location-alias.txt:16
12585
msgid "For example, to push to the parent location::"
12586
msgstr ""
12587
12588
#: en/help_topics/location-alias.txt:18
12589
msgid " bzr push :parent\n"
12590
msgstr ""
12591
12592
#: en/help_topics/log-formats.txt:1
12593
msgid ""
12594
"Log Formats\n"
12595
"==========="
12596
msgstr ""
12597
12598
#: en/help_topics/log-formats.txt:4
12599
msgid ""
12600
"A log format controls how information about each revision is displayed.\n"
12601
"The standard log formats are compared below::"
12602
msgstr ""
12603
12604
#: en/help_topics/log-formats.txt:7
12605
msgid ""
12606
" Feature long short line\n"
12607
" ---------------------- ------------- ------------ -------------------\n"
12608
" design goal detailed view concise view 1 revision per line\n"
12609
" committer name+email name only name only\n"
12610
" author name+email - -\n"
12611
" date-time format full date only date only\n"
12612
" commit message full full top line\n"
12613
" tags yes yes yes\n"
12614
" merges indicator - yes -\n"
12615
" status/delta optional optional -\n"
12616
" diff/patch optional optional -\n"
12617
" revision-id optional optional -\n"
12618
" branch nick yes - -\n"
12619
" foreign vcs properties yes yes -\n"
12620
" preferred levels all 1 1\n"
12621
" digital signature optional - -"
12622
msgstr ""
12623
12624
#: en/help_topics/log-formats.txt:24
12625
msgid ""
12626
"The default format is ``long``. To change this, define the ``log_format``\n"
12627
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12628
msgstr ""
12629
12630
#: en/help_topics/log-formats.txt:27
12631
msgid ""
12632
" [DEFAULT]\n"
12633
" log_format = short"
12634
msgstr ""
12635
12636
#: en/help_topics/log-formats.txt:30
12637
msgid ""
12638
"Alternatively, to change the log format used for a given query, use the\n"
12639
"--long, --short or --line options."
12640
msgstr ""
12641
12642
#: en/help_topics/log-formats.txt:33
12643
msgid ""
12644
"If one of the standard log formats does not meet your needs, additional\n"
12645
"formats can be provided by plugins.\n"
12646
msgstr ""
12647
12648
#: en/help_topics/other-formats.txt:1
12649
msgid "Other Storage Formats"
12650
msgstr ""
12651
12652
#: en/help_topics/other-formats.txt:3
12653
msgid "Experimental formats are shown below."
12654
msgstr ""
12655
12656
#: en/help_topics/other-formats.txt:5
12657
msgid ""
12658
":development-colo:\n"
12659
" (native) The 2a format with experimental support for colocated\n"
12660
" branches."
12661
msgstr ""
12662
12663
#: en/help_topics/other-formats.txt:9
12664
msgid ""
12665
"\n"
12666
"Deprecated formats are shown below."
12667
msgstr ""
12668
12669
#: en/help_topics/other-formats.txt:12
12670
msgid ""
12671
":pack-0.92:\n"
12672
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12673
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12674
" by bzr < 0.92."
12675
msgstr ""
12676
12677
#: en/help_topics/patterns.txt:1
12678
msgid ""
12679
"Patterns\n"
12680
"========"
12681
msgstr ""
12682
12683
#: en/help_topics/patterns.txt:4
12684
msgid ""
12685
"Bazaar uses patterns to match files at various times. For example,\n"
12686
"the ``add`` command skips over files that match ignore patterns\n"
12687
"and preferences can be associated with files using rule patterns.\n"
12688
"The pattern syntax is described below."
12689
msgstr ""
12690
12691
#: en/help_topics/patterns.txt:9
12692
msgid ""
12693
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12694
"slash or is a regular expression, it is compared to the whole path\n"
12695
"from the branch root. Otherwise, it is compared to only the last\n"
12696
"component of the path. To match a file only in the root directory,\n"
12697
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12698
msgstr ""
12699
12700
#: en/help_topics/patterns.txt:15
12701
msgid "Patterns may include globbing wildcards such as::"
12702
msgstr ""
12703
12704
#: en/help_topics/patterns.txt:17
12705
msgid ""
12706
" ? - Matches any single character except '/'\n"
12707
" * - Matches 0 or more characters except '/'\n"
12708
" /**/ - Matches 0 or more directories in a path\n"
12709
" [a-z] - Matches a single character from within a group of characters"
12710
msgstr ""
12711
12712
#: en/help_topics/patterns.txt:22
12713
msgid ""
12714
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12715
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12716
"expression. Regular expression patterns may not include named or\n"
12717
"numbered groups."
12718
msgstr ""
12719
12720
#: en/help_topics/patterns.txt:27
12721
msgid ""
12722
"Case insensitive ignore patterns can be specified with regular expressions\n"
12723
"by using the ``i`` (for ignore case) flag in the pattern."
12724
msgstr ""
12725
12726
#: en/help_topics/patterns.txt:30
12727
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
12728
msgstr ""
12729
12730
#: en/help_topics/patterns.txt:32
12731
msgid " RE:(?i)foo"
12732
msgstr ""
12733
12734
#: en/help_topics/patterns.txt:34
12735
msgid ""
12736
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12737
"matched by that pattern will not be ignored."
12738
msgstr ""
12739
12740
#: en/help_topics/patterns.txt:37
12741
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
12742
msgstr ""
12743
12744
#: en/help_topics/revisionspec.txt:1
12745
msgid "Revision Identifiers"
12746
msgstr ""
12747
12748
#: en/help_topics/revisionspec.txt:3
12749
msgid ""
12750
"A revision identifier refers to a specific state of a branch's history. It\n"
12751
"can be expressed in several ways. It can begin with a keyword to\n"
12752
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12753
"'before:yesterday' and 'submit:'."
12754
msgstr ""
12755
12756
#: en/help_topics/revisionspec.txt:8
12757
msgid ""
12758
"Alternately, it can be given without a keyword, in which case it will be\n"
12759
"checked as a revision number, a tag, a revision id, a date specification, or "
12760
"a\n"
12761
"branch specification, in that order. For example, 'date:today' could be\n"
12762
"written as simply 'today', though if you have a tag called 'today' that "
12763
"will\n"
12764
"be found first."
12765
msgstr ""
12766
12767
#: en/help_topics/revisionspec.txt:14
12768
msgid ""
12769
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12770
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12771
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12772
"or\n"
12773
"spaces around the '..')."
12774
msgstr ""
12775
12776
#: en/help_topics/revisionspec.txt:19
12777
msgid ""
12778
"Ranges are interpreted differently by different commands. To the \"log\" "
12779
"command,\n"
12780
"a range is a sequence of log messages, but to the \"diff\" command, the "
12781
"range\n"
12782
"denotes a change between revisions (and not a sequence of changes). In\n"
12783
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12784
"consider it\n"
12785
"to be open-ended, that is, they include one end but not the other. For "
12786
"example:\n"
12787
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12788
"3649,\n"
12789
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12790
"and\n"
12791
"3649, but not 3647."
12792
msgstr ""
12793
12794
#: en/help_topics/revisionspec.txt:28
12795
msgid "The keywords used as revision selection methods are the following:"
12796
msgstr ""
12797
12798
#: en/help_topics/revisionspec.txt:30
12799
msgid ""
12800
":revid:\n"
12801
"\tSelects a revision using the revision id.\n"
12802
":submit:\n"
12803
"\tSelects a common ancestor with the submit branch.\n"
12804
":ancestor:\n"
12805
"\tSelects a common ancestor with a second branch.\n"
12806
":date:\n"
12807
"\tSelects a revision on the basis of a datestamp.\n"
12808
":branch:\n"
12809
"\tSelects the last revision of a specified branch.\n"
12810
":tag:\n"
12811
"\tSelects a revision identified by a tag name.\n"
12812
":revno:\n"
12813
"\tSelects a revision using a number.\n"
12814
":before:\n"
12815
"\tSelects the parent of the revision specified.\n"
12816
":annotate:\n"
12817
"\tSelect the revision that last modified the specified line.\n"
12818
":mainline:\n"
12819
"\tSelect mainline revision that merged the specified revision.\n"
12820
":last:\n"
12821
"\tSelects the nth revision from the end."
12822
msgstr ""
12823
12824
#: en/help_topics/revisionspec.txt:53
12825
msgid "In addition, plugins can provide other keywords."
12826
msgstr ""
12827
12828
#: en/help_topics/revisionspec.txt:55
12829
msgid "A detailed description of each keyword is given below."
12830
msgstr ""
12831
12832
#: en/help_topics/revisionspec.txt:57
12833
msgid ":revid:"
12834
msgstr ""
12835
12836
#: en/help_topics/revisionspec.txt:59
12837
msgid ""
12838
" Supply a specific revision id, that can be used to specify any\n"
12839
" revision id in the ancestry of the branch.\n"
12840
" Including merges, and pending merges.\n"
12841
" Examples::"
12842
msgstr ""
12843
12844
#: en/help_topics/revisionspec.txt:64
12845
msgid ""
12846
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12847
msgstr ""
12848
12849
#: en/help_topics/revisionspec.txt:66
12850
msgid ":submit:"
12851
msgstr ""
12852
12853
#: en/help_topics/revisionspec.txt:68
12854
msgid ""
12855
" Diffing against this shows all the changes that were made in this "
12856
"branch,\n"
12857
" and is a good predictor of what merge will do. The submit branch is\n"
12858
" used by the bundle and merge directive commands. If no submit branch\n"
12859
" is specified, the parent branch is used instead."
12860
msgstr ""
12861
12862
#: en/help_topics/revisionspec.txt:73
12863
msgid ""
12864
" The common ancestor is the last revision that existed in both\n"
12865
" branches. Usually this is the branch point, but it could also be\n"
12866
" a revision that was merged."
12867
msgstr ""
12868
12869
#: en/help_topics/revisionspec.txt:77
12870
msgid " Examples::"
12871
msgstr ""
12872
12873
#: en/help_topics/revisionspec.txt:79
12874
msgid " $ bzr diff -r submit:"
12875
msgstr ""
12876
12877
#: en/help_topics/revisionspec.txt:81
12878
msgid ":ancestor:"
12879
msgstr ""
12880
12881
#: en/help_topics/revisionspec.txt:83
12882
msgid " Supply the path to a branch to select the common ancestor."
12883
msgstr ""
12884
12885
#: en/help_topics/revisionspec.txt:89
12886
msgid ""
12887
" This is frequently used with 'diff' to return all of the changes\n"
12888
" that your branch introduces, while excluding the changes that you\n"
12889
" have not merged from the remote branch."
12890
msgstr ""
12891
12892
#: en/help_topics/revisionspec.txt:95
12893
msgid ""
12894
" ancestor:/path/to/branch\n"
12895
" $ bzr diff -r ancestor:../../mainline/branch"
12896
msgstr ""
12897
12898
#: en/help_topics/revisionspec.txt:98
12899
msgid ":date:"
12900
msgstr ""
12901
12902
#: en/help_topics/revisionspec.txt:100
12903
msgid ""
12904
" Supply a datestamp to select the first revision that matches the date.\n"
12905
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12906
" Matches the first entry after a given date (either at midnight or\n"
12907
" at a specified time)."
12908
msgstr ""
12909
12910
#: en/help_topics/revisionspec.txt:105
12911
msgid " One way to display all the changes since yesterday would be::"
12912
msgstr ""
12913
12914
#: en/help_topics/revisionspec.txt:107
12915
msgid " bzr log -r date:yesterday.."
12916
msgstr ""
12917
12918
#: en/help_topics/revisionspec.txt:111
12919
msgid ""
12920
" date:yesterday -> select the first revision since "
12921
"yesterday\n"
12922
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12923
" August 14th, 2006 at 5:10pm."
12924
msgstr ""
12925
12926
#: en/help_topics/revisionspec.txt:115
12927
msgid ":branch:"
12928
msgstr ""
12929
12930
#: en/help_topics/revisionspec.txt:117
12931
msgid " Supply the path to a branch to select its last revision."
12932
msgstr ""
12933
12934
#: en/help_topics/revisionspec.txt:121
12935
msgid " branch:/path/to/branch"
12936
msgstr ""
12937
12938
#: en/help_topics/revisionspec.txt:123
12939
msgid ":tag:"
12940
msgstr ""
12941
12942
#: en/help_topics/revisionspec.txt:125
12943
msgid " Tags are stored in the branch and created by the 'tag' command."
12944
msgstr ""
12945
12946
#: en/help_topics/revisionspec.txt:127
12947
msgid ":revno:"
12948
msgstr ""
12949
12950
#: en/help_topics/revisionspec.txt:129
12951
msgid ""
12952
" Use an integer to specify a revision in the history of the branch.\n"
12953
" Optionally a branch can be specified. A negative number will count\n"
12954
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12955
" one). If the negative number is larger than the branch's history, the\n"
12956
" first revision is returned.\n"
12957
" Examples::"
12958
msgstr ""
12959
12960
#: en/help_topics/revisionspec.txt:136
12961
msgid ""
12962
" revno:1 -> return the first revision of this branch\n"
12963
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12964
" the branch '/path/to/branch'\n"
12965
" revno:-1 -> The last revision in a branch.\n"
12966
" -2:http://other/branch -> The second to last revision in the\n"
12967
" remote branch.\n"
12968
" -1000000 -> Most likely the first revision, unless\n"
12969
" your history is very long."
12970
msgstr ""
12971
12972
#: en/help_topics/revisionspec.txt:145
12973
msgid ":before:"
12974
msgstr ""
12975
12976
#: en/help_topics/revisionspec.txt:147
12977
msgid ""
12978
" Supply any revision spec to return the parent of that revision. This "
12979
"is\n"
12980
" mostly useful when inspecting revisions that are not in the revision "
12981
"history\n"
12982
" of a branch."
12983
msgstr ""
12984
12985
#: en/help_topics/revisionspec.txt:151
12986
msgid ""
12987
" It is an error to request the parent of the null revision (before:0)."
12988
msgstr ""
12989
12990
#: en/help_topics/revisionspec.txt:155
12991
msgid ""
12992
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12993
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12994
" aaaa@bbbb-1234567890\n"
12995
" bzr diff -r before:1913..1913\n"
12996
" -> Find the changes between revision 1913 and its parent "
12997
"(1912).\n"
12998
" (What changes did revision 1913 introduce).\n"
12999
" This is equivalent to: bzr diff -c 1913"
13000
msgstr ""
13001
13002
#: en/help_topics/revisionspec.txt:163
13003
msgid ":annotate:"
13004
msgstr ""
13005
13006
#: en/help_topics/revisionspec.txt:165
13007
msgid ""
13008
" Select the revision that last modified the specified line. Line is\n"
13009
" specified as path:number. Path is a relative path to the file. "
13010
"Numbers\n"
13011
" start at 1, and are relative to the current version, not the last-\n"
13012
" committed version of the file."
13013
msgstr ""
13014
13015
#: en/help_topics/revisionspec.txt:170
13016
msgid ":mainline:"
13017
msgstr ""
13018
13019
#: en/help_topics/revisionspec.txt:172
13020
msgid ""
13021
" Select the revision that merged the specified revision into mainline."
13022
msgstr ""
13023
13024
#: en/help_topics/revisionspec.txt:174
13025
msgid ":last:"
13026
msgstr ""
13027
13028
#: en/help_topics/revisionspec.txt:176
13029
msgid ""
13030
" Supply a positive number to get the nth revision from the end.\n"
13031
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13032
" Examples::"
13033
msgstr ""
13034
13035
#: en/help_topics/revisionspec.txt:180
13036
msgid ""
13037
" last:1 -> return the last revision\n"
13038
" last:3 -> return the revision 2 before the end.\n"
13039
msgstr ""
13040
13041
#: en/help_topics/rules.txt:1
13042
msgid ""
13043
"Rules\n"
13044
"====="
13045
msgstr ""
13046
13047
#: en/help_topics/rules.txt:7
13048
msgid ""
13049
"Rules are defined in ini file format where the sections are file glob\n"
13050
"patterns and the contents of each section are the preferences for files\n"
13051
"matching that pattern(s). For example::"
13052
msgstr ""
13053
13054
#: en/help_topics/rules.txt:11
13055
msgid ""
13056
" [name *.bat]\n"
13057
" eol = native"
13058
msgstr ""
13059
13060
#: en/help_topics/rules.txt:14
13061
msgid ""
13062
" [name *.html *.xml]\n"
13063
" keywords = xml_escape"
13064
msgstr ""
13065
13066
#: en/help_topics/rules.txt:17
13067
msgid ""
13068
"Preferences like these are useful for commands and plugins wishing to\n"
13069
"provide custom behaviour for selected files. For more information on \n"
13070
"end of line conversion see :doc:`eol-help`.\n"
13071
"Keyword support is provided by the `keywords plugin\n"
13072
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13073
msgstr ""
13074
13075
#: en/help_topics/rules.txt:23
13076
msgid ""
13077
"Files\n"
13078
"-----"
13079
msgstr ""
13080
13081
#: en/help_topics/rules.txt:26
13082
msgid ""
13083
"Default rules for all branches are defined in the optional file\n"
13084
"``BZR_HOME/rules``. "
13085
msgstr ""
13086
13087
#: en/help_topics/rules.txt:29
13088
msgid ""
13089
"Rule Patterns\n"
13090
"-------------"
13091
msgstr ""
13092
13093
#: en/help_topics/rules.txt:32
13094
msgid ""
13095
"Patterns are ordered and searching stops as soon as one matches.\n"
13096
"As a consequence, more explicit patterns should be placed towards\n"
13097
"the top of the file. Rule patterns use exactly the same conventions\n"
13098
"as ignore patterns. See :doc:`patterns-help` for details."
13099
msgstr ""
13100
13101
#: en/help_topics/rules.txt:37
13102
msgid ".. note::"
13103
msgstr ""
13104
13105
#: en/help_topics/rules.txt:39
13106
msgid ""
13107
" Patterns containing square brackets or spaces should be\n"
13108
" surrounded in quotes to ensure they are correctly parsed.\n"
13109
msgstr ""
13110
13111
#: en/help_topics/topics.txt:1
13112
msgid ""
13113
"authentication Information on configuring authentication\n"
13114
"basic Basic commands\n"
13115
"branches Information on what a branch is\n"
13116
"bugs Bug tracker settings\n"
13117
"checkouts Information on what a checkout is\n"
13118
"commands Basic help for all commands\n"
13119
"configuration Details on the configuration settings available\n"
13120
"conflict-types Types of conflicts and what to do about them\n"
13121
"content-filters Conversion of content into/from working trees\n"
13122
"criss-cross Information on criss-cross merging\n"
13123
"current-formats Current storage formats\n"
13124
"debug-flags Options to show or record debug information\n"
13125
"diverged-branches How to fix diverged branches\n"
13126
"env-variables Environment variable names and values\n"
13127
"eol Information on end-of-line handling\n"
13128
"files Information on configuration and log files\n"
13129
"formats Information on choosing a storage format\n"
13130
"global-options Options that control how Bazaar runs\n"
13131
"hidden-commands All hidden commands\n"
13132
"hooks Points at which custom processing can be added\n"
13133
"launchpad Using Bazaar with Launchpad.net\n"
13134
"location-alias Aliases for remembered locations\n"
13135
"log-formats Details on the logging formats available\n"
13136
"other-formats Experimental and deprecated storage formats\n"
13137
"patterns Information on the pattern syntax\n"
13138
"repositories Basic information on shared repositories.\n"
13139
"revisionspec Explain how to use --revision\n"
13140
"rules Information on defining rule-based preferences\n"
13141
"standalone-trees Information on what a standalone tree is\n"
13142
"standard-options Options that can be used with any command\n"
13143
"status-flags Help on status flags\n"
13144
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13145
"topics Topics list\n"
13146
"url-special-chars Special character handling in URLs\n"
13147
"urlspec Supported transport protocols\n"
13148
"working-trees Information on working trees\n"
13149
msgstr ""
13150
13151
#: en/help_topics/url-special-chars.txt:1
13152
msgid ""
13153
"Special character handling in URLs\n"
13154
"=================================="
13155
msgstr ""
13156
13157
#: en/help_topics/url-special-chars.txt:4
13158
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13159
msgstr ""
13160
13161
#: en/help_topics/url-special-chars.txt:6
13162
msgid " * Fully qualified URLs"
13163
msgstr ""
13164
13165
#: en/help_topics/url-special-chars.txt:8
13166
msgid " * File system paths, relative or absolute"
13167
msgstr ""
13168
13169
#: en/help_topics/url-special-chars.txt:10
13170
msgid ""
13171
"Internally bzr treats all locations as URLs. For any file system paths\n"
13172
"that are specified it will automatically determine the appropriate URL\n"
13173
"representation, and escape special characters where necessary."
13174
msgstr ""
13175
13176
#: en/help_topics/url-special-chars.txt:14
13177
msgid ""
13178
"There are a few characters which have special meaning in URLs and need "
13179
"careful\n"
13180
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13181
"value in URLs. Any non-ASCII characters in a file path will automatically "
13182
"be\n"
13183
"urlencoded when the path is converted to a URL."
13184
msgstr ""
13185
13186
#: en/help_topics/url-special-chars.txt:19
13187
msgid ""
13188
"URLs represent non-ASCII characters in an encoding defined by the server, "
13189
"but\n"
13190
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13191
"be\n"
13192
"generous in what it accepts as a URL and to print them in a way that\n"
13193
"will be readable."
13194
msgstr ""
13195
13196
#: en/help_topics/url-special-chars.txt:24
13197
msgid ""
13198
"For example, if you have a directory named '/tmp/%2False' these are all "
13199
"valid\n"
13200
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13201
"slash)::"
13202
msgstr ""
13203
13204
#: en/help_topics/url-special-chars.txt:27
13205
msgid ""
13206
" cd /tmp\n"
13207
" bzr log /tmp/%2False\n"
13208
" bzr log %2False\n"
13209
" bzr log file:///tmp/%252False\n"
13210
" bzr log file://localhost/tmp/%252False\n"
13211
" bzr log file:%252False"
13212
msgstr ""
13213
13214
#: en/help_topics/url-special-chars.txt:34
13215
msgid "These are valid but do not refer to the same file::"
13216
msgstr ""
13217
13218
#: en/help_topics/url-special-chars.txt:36
13219
msgid ""
13220
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13221
" bzr log %252False (refers to a file called /tmp/%252False)"
13222
msgstr ""
13223
13224
#: en/help_topics/url-special-chars.txt:39
13225
msgid ""
13226
"Comma also has special meaning in URLs, because it denotes `segment "
13227
"parameters`_"
13228
msgstr ""
13229
13230
#: en/help_topics/url-special-chars.txt:41
13231
msgid ""
13232
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13233
msgstr ""
13234
13235
#: en/help_topics/url-special-chars.txt:43
13236
msgid ""
13237
"Comma is also special in any file system paths that are specified. To use a "
13238
"literal\n"
13239
"comma in a file system path, specify a URL and URL encode the comma::"
13240
msgstr ""
13241
13242
#: en/help_topics/url-special-chars.txt:46
13243
msgid ""
13244
" bzr log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
13245
"\" set to \"bla\"\n"
13246
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13247
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
13248
"\" set to \"bla\"\n"
13249
msgstr ""
13250
13251
#: en/help_topics/urlspec.txt:1
13252
msgid "URL Identifiers"
13253
msgstr ""
13254
13255
#: en/help_topics/urlspec.txt:3
13256
msgid "Supported URL prefixes::"
13257
msgstr ""
13258
13259
#: en/help_topics/urlspec.txt:5
13260
msgid ""
13261
" aftp:// Access using active FTP.\n"
13262
" bzr:// Fast access using the Bazaar smart server.\n"
13263
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13264
" file:// Access using the standard filesystem (default)\n"
13265
" ftp:// Access using passive FTP.\n"
13266
" http:// Read-only access of branches exported on the web.\n"
13267
" https:// Read-only access of branches exported on the web using "
13268
"SSL.\n"
13269
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13270
msgstr ""
13271
13272
#: en/help_topics/urlspec.txt:14
13273
msgid "Supported modifiers::"
13274
msgstr ""
13275
13276
#: en/help_topics/urlspec.txt:16
13277
msgid " gio+ Access using any GIO supported protocols."
13278
msgstr ""
13279
13280
#: en/help_topics/urlspec.txt:18
13281
msgid "Bazaar supports all of the standard parts within the URL::"
13282
msgstr ""
13283
13284
#: en/help_topics/urlspec.txt:20
13285
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13286
msgstr ""
13287
13288
#: en/help_topics/urlspec.txt:22
13289
msgid "allowing URLs such as::"
13290
msgstr ""
13291
13292
#: en/help_topics/urlspec.txt:24
13293
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13294
msgstr ""
13295
13296
#: en/help_topics/urlspec.txt:26
13297
msgid ""
13298
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13299
"with '~' as meaning that the rest of the path should be interpreted\n"
13300
"relative to the remote user's home directory. For example if the user\n"
13301
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13302
"shell.example.com, then::"
13303
msgstr ""
13304
13305
#: en/help_topics/urlspec.txt:32
13306
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13307
msgstr ""
13308
13309
#: en/help_topics/urlspec.txt:34
13310
msgid "would refer to ``/home/remote/myproject/trunk``."
13311
msgstr ""
13312
13313
#: en/help_topics/urlspec.txt:36
13314
msgid ""
13315
"Many commands that accept URLs also accept location aliases too.\n"
13316
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13317
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1