« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6158
- compare with another revision
- download diff
- download tarball
- view history from revision 6158
- Committer: Patch Queue Manager
- Date: 2011-09-22 14:12:18 UTC
- mfrom: (6155.3.1 jam)
- Revision ID: pqm@pqm.ubuntu.com-20110922141218-86s4uu6nqvourw4f
(jameinel) Cleanup comments bzrlib/smart/__init__.py (John A Meinel)
- files added:
- bzrlib/cethread.py
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_repository_vf
- po
- files removed:
- bzrlib/deprecated_graph.py
- files renamed:
- bzrlib/sign_my_commits.py => bzrlib/commit_signature_commands.py
- bzrlib/repofmt/weaverepo.py => bzrlib/plugins/weave_fmt/repository.py
- bzrlib/xml4.py => bzrlib/plugins/weave_fmt/xml4.py
- bzrlib/tests/per_repository/test_is_write_locked.py => bzrlib/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/helpers.py => bzrlib/tests/per_repository_vf/helpers.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => bzrlib/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_check_reconcile.py => bzrlib/tests/per_repository_vf/test_check_reconcile.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => bzrlib/tests/per_repository_vf/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- doc/en/release-notes/NEWS-template.txt => doc/en/release-notes/release-template.txt
- files modified:
- .bzrignore
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-09-20 10:41+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:852
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:3138
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:3140
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:3143
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:3145
46
msgid "No new revisions to push."
47
msgstr ""
48
49
#: bzrlib/branch.py:3165
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3168
54
#, python-format
55
msgid "found error:%s"
56
msgstr ""
57
58
#: bzrlib/builtins.py:116 bzrlib/builtins.py:2782 bzrlib/workingtree.py:306
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:125
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:210
69
msgid "Display status summary."
70
msgstr ""
71
72
#: bzrlib/builtins.py:212
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:215
79
msgid ""
80
"added\n"
81
" Versioned in the working copy but not in the previous revision."
82
msgstr ""
83
84
#: bzrlib/builtins.py:218
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:222
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:227
100
msgid ""
101
"modified\n"
102
" Text has changed since the previous revision."
103
msgstr ""
104
105
#: bzrlib/builtins.py:230
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:233
112
msgid ""
113
"unknown\n"
114
" Not versioned and not matching an ignore pattern."
115
msgstr ""
116
117
#: bzrlib/builtins.py:236
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:241
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:244
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:248
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:253
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:258
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:261
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:270
169
msgid "Use short status indicators."
170
msgstr ""
171
172
# help of 'versioned' option of 'status' command
173
#: bzrlib/builtins.py:272
174
msgid "Only show versioned files."
175
msgstr ""
176
177
# help of 'no-pending' option of 'status' command
178
#: bzrlib/builtins.py:274
179
msgid "Don't show pending merges."
180
msgstr ""
181
182
# help of 'no-classify' option of 'status' command
183
#: bzrlib/builtins.py:277
184
msgid "Do not mark object type using indicator."
185
msgstr ""
186
187
#: bzrlib/builtins.py:292
188
msgid "bzr status --revision takes exactly one or two revision specifiers"
189
msgstr ""
190
191
#: bzrlib/builtins.py:336 bzrlib/builtins.py:4927
192
msgid "You can only supply one of revision_id or --revision"
193
msgstr ""
194
195
#: bzrlib/builtins.py:339 bzrlib/builtins.py:4929
196
msgid "You must supply either --revision or a revision_id"
197
msgstr ""
198
199
#: bzrlib/builtins.py:346
200
#, python-format
201
msgid "Repository %r does not support access to raw revision texts"
202
msgstr ""
203
204
#: bzrlib/builtins.py:357
205
msgid "The repository {0} contains no revision {1}."
206
msgstr ""
207
208
#: bzrlib/builtins.py:364
209
msgid "You cannot specify a NULL revision."
210
msgstr ""
211
212
#: bzrlib/builtins.py:456
213
msgid "Remove the working tree from a given branch/checkout."
214
msgstr ""
215
216
#: bzrlib/builtins.py:458
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:461
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:467
228
msgid "Remove the working tree even if it has uncommitted or shelved changes."
229
msgstr ""
230
231
#: bzrlib/builtins.py:481
232
msgid "No working tree to remove"
233
msgstr ""
234
235
#: bzrlib/builtins.py:483
236
msgid "You cannot remove the working tree of a remote path"
237
msgstr ""
238
239
#: bzrlib/builtins.py:492
240
msgid "You cannot remove the working tree from a lightweight checkout"
241
msgstr ""
242
243
#: bzrlib/builtins.py:532
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:543
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:547
256
msgid "failed to reset the tree state{0}"
257
msgstr ""
258
259
#: bzrlib/builtins.py:551
260
msgid "Show current revision number."
261
msgstr ""
262
263
#: bzrlib/builtins.py:553
264
msgid "This is equal to the number of revisions on this branch."
265
msgstr ""
266
267
# help of 'tree' option of 'revno' command
268
#: bzrlib/builtins.py:594
269
msgid "Show revno of working tree"
270
msgstr ""
271
272
#: bzrlib/builtins.py:642
273
msgid "Add specified files or directories."
274
msgstr ""
275
276
#: bzrlib/builtins.py:644
277
msgid ""
278
"In non-recursive mode, all the named items are added, regardless\n"
279
"of whether they were previously ignored. A warning is given if\n"
280
"any of the named files are already versioned."
281
msgstr ""
282
283
#: bzrlib/builtins.py:648
284
msgid ""
285
"In recursive mode (the default), files are treated the same way\n"
286
"but the behaviour for directories is different. Directories that\n"
287
"are already versioned do not give a warning. All directories,\n"
288
"whether already versioned or not, are searched for files or\n"
289
"subdirectories that are neither versioned or ignored, and these\n"
290
"are added. This search proceeds recursively into versioned\n"
291
"directories. If no names are given '.' is assumed."
292
msgstr ""
293
294
#: bzrlib/builtins.py:656
295
msgid ""
296
"Therefore simply saying 'bzr add' will version all files that\n"
297
"are currently unknown."
298
msgstr ""
299
300
#: bzrlib/builtins.py:659
301
msgid ""
302
"Adding a file whose parent directory is not versioned will\n"
303
"implicitly add the parent, and so on up to the root. This means\n"
304
"you should never need to explicitly add a directory, they'll just\n"
305
"get added when you add a file in the directory."
306
msgstr ""
307
308
#: bzrlib/builtins.py:664
309
msgid ""
310
"--dry-run will show which files would be added, but not actually\n"
311
"add them."
312
msgstr ""
313
314
#: bzrlib/builtins.py:667
315
msgid ""
316
"--file-ids-from will try to use the file ids from the supplied path.\n"
317
"It looks up ids trying to find a matching parent directory with the\n"
318
"same filename, and then by pure path. This option is rarely needed\n"
319
"but can be useful when adding the same logical file into two\n"
320
"branches that will be merged later (without showing the two different\n"
321
"adds as a conflict). It is also useful when merging another project\n"
322
"into a subdirectory of this one."
323
msgstr ""
324
325
#: bzrlib/builtins.py:675
326
msgid ""
327
"Any files matching patterns in the ignore list will not be added\n"
328
"unless they are explicitly mentioned."
329
msgstr ""
330
331
#: bzrlib/builtins.py:678
332
msgid ""
333
"In recursive mode, files larger than the configuration option \n"
334
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
335
"to file size."
336
msgstr ""
337
338
# help of 'no-recurse' option of 'add' command
339
#: bzrlib/builtins.py:685
340
msgid "Don't recursively add the contents of directories."
341
msgstr ""
342
343
# help of 'file-ids-from' option of 'add' command
344
#: bzrlib/builtins.py:691
345
msgid "Lookup file ids from this tree."
346
msgstr ""
347
348
#: bzrlib/builtins.py:727
349
msgid "ignored {0} matching \"{1}\"\n"
350
msgstr ""
351
352
#: bzrlib/builtins.py:732
353
msgid "Create a new versioned directory."
354
msgstr ""
355
356
#: bzrlib/builtins.py:734
357
msgid "This is equivalent to creating the directory and then adding it."
358
msgstr ""
359
360
#: bzrlib/builtins.py:748
361
#, python-format
362
msgid "added %s\n"
363
msgstr ""
364
365
#: bzrlib/builtins.py:792
366
#, python-format
367
msgid "invalid kind %r specified"
368
msgstr ""
369
370
#: bzrlib/builtins.py:829
371
msgid "Move or rename a file."
372
msgstr ""
373
374
#: bzrlib/builtins.py:831
375
msgid " bzr mv SOURCE... DESTINATION"
376
msgstr ""
377
378
#: bzrlib/builtins.py:833
379
msgid ""
380
"If the last argument is a versioned directory, all the other names\n"
381
"are moved into it. Otherwise, there must be exactly two arguments\n"
382
"and the file is changed to a new name."
383
msgstr ""
384
385
#: bzrlib/builtins.py:837
386
msgid ""
387
"If OLDNAME does not exist on the filesystem but is versioned and\n"
388
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
389
"assumes that the file has been manually moved and only updates\n"
390
"its internal inventory to reflect that change.\n"
391
"The same is valid when moving many SOURCE files to a DESTINATION."
392
msgstr ""
393
394
#: bzrlib/builtins.py:843
395
msgid "Files cannot be moved between branches."
396
msgstr ""
397
398
# help of 'after' option of 'mv' command
399
#: bzrlib/builtins.py:850
400
msgid ""
401
"Move only the bzr identifier of the file, because the file has already been "
402
"moved."
403
msgstr ""
404
405
# help of 'auto' option of 'mv' command
406
#: bzrlib/builtins.py:852
407
msgid "Automatically guess renames."
408
msgstr ""
409
410
# help of 'dry-run' option of 'mv' command
411
#: bzrlib/builtins.py:853
412
msgid "Avoid making changes when guessing renames."
413
msgstr ""
414
415
#: bzrlib/builtins.py:862
416
msgid "--dry-run requires --auto."
417
msgstr ""
418
419
#: bzrlib/builtins.py:866
420
msgid "missing file argument"
421
msgstr ""
422
423
#: bzrlib/builtins.py:873
424
msgid "Only one path may be specified to --auto."
425
msgstr ""
426
427
#: bzrlib/builtins.py:876
428
msgid "--after cannot be specified with --auto."
429
msgstr ""
430
431
#: bzrlib/builtins.py:913
432
msgid "to mv multiple files the destination must be a versioned directory"
433
msgstr ""
434
435
#: bzrlib/builtins.py:965
436
msgid "Turn this branch into a mirror of another branch."
437
msgstr ""
438
439
#: bzrlib/builtins.py:967
440
msgid ""
441
"By default, this command only works on branches that have not diverged.\n"
442
"Branches are considered diverged if the destination branch's most recent \n"
443
"commit is one that has not been merged (directly or indirectly) into the \n"
444
"parent."
445
msgstr ""
446
447
#: bzrlib/builtins.py:972
448
msgid ""
449
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
450
"from one into the other. Once one branch has merged, the other should\n"
451
"be able to pull it again."
452
msgstr ""
453
454
#: bzrlib/builtins.py:976
455
msgid ""
456
"If you want to replace your local changes and just want your branch to\n"
457
"match the remote one, use pull --overwrite. This will work even if the two\n"
458
"branches have diverged."
459
msgstr ""
460
461
#: bzrlib/builtins.py:980
462
msgid ""
463
"If there is no default location set, the first pull will set it (use\n"
464
"--no-remember to avoid setting it). After that, you can omit the\n"
465
"location to use the default. To change the default, use --remember. The\n"
466
"value will only be saved if the remote location can be accessed."
467
msgstr ""
468
469
#: bzrlib/builtins.py:985
470
msgid ""
471
"Note: The location can be specified either in the form of a branch,\n"
472
"or in the form of a path to a file containing a merge directive generated\n"
473
"with bzr send."
474
msgstr ""
475
476
# help of 'verbose' option of 'pull' command
477
#: bzrlib/builtins.py:993
478
msgid "Show logs of pulled revisions."
479
msgstr ""
480
481
# help of 'directory' option of 'pull' command
482
#: bzrlib/builtins.py:995
483
msgid ""
484
"Branch to pull into, rather than the one containing the working directory."
485
msgstr ""
486
487
# help of 'local' option of 'pull' command
488
#: bzrlib/builtins.py:998
489
msgid ""
490
"Perform a local pull in a bound branch. Local pulls are not applied to the "
491
"master branch."
492
msgstr ""
493
494
#: bzrlib/builtins.py:1027
495
msgid "Need working tree for --show-base."
496
msgstr ""
497
498
#: bzrlib/builtins.py:1043
499
msgid "No pull location known or specified."
500
msgstr ""
501
502
#: bzrlib/builtins.py:1049
503
#, python-format
504
msgid "Using saved parent location: %s\n"
505
msgstr ""
506
507
#: bzrlib/builtins.py:1056 bzrlib/builtins.py:4137
508
msgid "Cannot use -r with merge directives or bundles"
509
msgstr ""
510
511
#: bzrlib/builtins.py:1097
512
msgid "Update a mirror of this branch."
513
msgstr ""
514
515
#: bzrlib/builtins.py:1099
516
msgid ""
517
"The target branch will not have its working tree populated because this\n"
518
"is both expensive, and is not supported on remote file systems."
519
msgstr ""
520
521
#: bzrlib/builtins.py:1102
522
msgid ""
523
"Some smart servers or protocols *may* put the working tree in place in\n"
524
"the future."
525
msgstr ""
526
527
#: bzrlib/builtins.py:1105
528
msgid ""
529
"This command only works on branches that have not diverged. Branches are\n"
530
"considered diverged if the destination branch's most recent commit is one\n"
531
"that has not been merged (directly or indirectly) by the source branch."
532
msgstr ""
533
534
#: bzrlib/builtins.py:1109
535
msgid ""
536
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
537
"the other branch completely, discarding its unmerged changes."
538
msgstr ""
539
540
#: bzrlib/builtins.py:1112
541
msgid ""
542
"If you want to ensure you have the different changes in the other branch,\n"
543
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
544
"After that you will be able to do a push without '--overwrite'."
545
msgstr ""
546
547
#: bzrlib/builtins.py:1116
548
msgid ""
549
"If there is no default push location set, the first push will set it (use\n"
550
"--no-remember to avoid setting it). After that, you can omit the\n"
551
"location to use the default. To change the default, use --remember. The\n"
552
"value will only be saved if the remote location can be accessed."
553
msgstr ""
554
555
# help of 'directory' option of 'push' command
556
#: bzrlib/builtins.py:1128
557
msgid ""
558
"Branch to push from, rather than the one containing the working directory."
559
msgstr ""
560
561
# help of 'use-existing-dir' option of 'push' command
562
#: bzrlib/builtins.py:1131
563
msgid ""
564
"By default push will fail if the target directory exists, but does not "
565
"already have a control directory. This flag will allow push to proceed."
566
msgstr ""
567
568
# help of 'stacked' option of 'push' command
569
#: bzrlib/builtins.py:1136
570
msgid ""
571
"Create a stacked branch that references the public location of the parent "
572
"branch."
573
msgstr ""
574
575
# help of 'stacked-on' option of 'push' command
576
#: bzrlib/builtins.py:1139
577
msgid ""
578
"Create a stacked branch that refers to another branch for the commit "
579
"history. Only the work not present in the referenced branch is included in "
580
"the branch created."
581
msgstr ""
582
583
# help of 'strict' option of 'push' command
584
#: bzrlib/builtins.py:1144
585
msgid ""
586
"Refuse to push if there are uncommitted changes in the working tree, --no-"
587
"strict disables the check."
588
msgstr ""
589
590
# help of 'no-tree' option of 'push' command
591
#: bzrlib/builtins.py:1147
592
msgid "Don't populate the working tree, even for protocols that support it."
593
msgstr ""
594
595
#: bzrlib/builtins.py:1191
596
msgid "Could not determine branch to refer to."
597
msgstr ""
598
599
#: bzrlib/builtins.py:1198 bzrlib/foreign.py:306
600
msgid "No push location known or specified."
601
msgstr ""
602
603
#: bzrlib/builtins.py:1202
604
#, python-format
605
msgid "Using saved push location: %s"
606
msgstr ""
607
608
#: bzrlib/builtins.py:1212
609
msgid "Create a new branch that is a copy of an existing branch."
610
msgstr ""
611
612
#: bzrlib/builtins.py:1214
613
msgid ""
614
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
615
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
616
"bar.\n"
617
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
618
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
619
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
620
"create ./foo-bar."
621
msgstr ""
622
623
#: bzrlib/builtins.py:1221
624
msgid ""
625
"To retrieve the branch as of a particular revision, supply the --revision\n"
626
"parameter, as in \"branch foo/bar -r 5\"."
627
msgstr ""
628
629
#: bzrlib/builtins.py:1224
630
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
631
msgstr ""
632
633
# help of 'no-tree' option of 'branch' command
634
#: bzrlib/builtins.py:1234
635
msgid "Create a branch without a working-tree."
636
msgstr ""
637
638
# help of 'switch' option of 'branch' command
639
#: bzrlib/builtins.py:1236
640
msgid "Switch the checkout in the current directory to the new branch."
641
msgstr ""
642
643
# help of 'stacked' option of 'branch' command
644
#: bzrlib/builtins.py:1239
645
msgid ""
646
"Create a stacked branch referring to the source branch. The new branch will "
647
"depend on the availability of the source branch for all operations."
648
msgstr ""
649
650
# help of 'standalone' option of 'branch' command
651
#: bzrlib/builtins.py:1243
652
msgid "Do not use a shared repository, even if available."
653
msgstr ""
654
655
# help of 'use-existing-dir' option of 'branch' command
656
#: bzrlib/builtins.py:1245
657
msgid ""
658
"By default branch will fail if the target directory exists, but does not "
659
"already have a control directory. This flag will allow branch to proceed."
660
msgstr ""
661
662
# help of 'bind' option of 'branch' command
663
#: bzrlib/builtins.py:1250
664
msgid "Bind new branch to from location."
665
msgstr ""
666
667
#: bzrlib/builtins.py:1291
668
#, python-format
669
msgid "Target directory \"%s\" already exists."
670
msgstr ""
671
672
#: bzrlib/builtins.py:1301
673
#, python-format
674
msgid "Parent of \"%s\" does not exist."
675
msgstr ""
676
677
#: bzrlib/builtins.py:1315
678
msgid "The branch {0} has no revision {1}."
679
msgstr ""
680
681
#: bzrlib/builtins.py:1323 bzrlib/push.py:51
682
#, python-format
683
msgid "Created new stacked branch referring to %s."
684
msgstr ""
685
686
#: bzrlib/builtins.py:1327
687
#, python-format
688
msgid "Branched %d revision."
689
msgid_plural "Branched %d revisions."
690
msgstr[0] ""
691
msgstr[1] ""
692
693
#: bzrlib/builtins.py:1332
694
#, python-format
695
msgid "New branch bound to %s"
696
msgstr ""
697
698
#: bzrlib/builtins.py:1337 bzrlib/builtins.py:5968
699
#, python-format
700
msgid "Switched to branch: %s"
701
msgstr ""
702
703
#: bzrlib/builtins.py:1342
704
msgid "List the branches available at the current location."
705
msgstr ""
706
707
#: bzrlib/builtins.py:1344
708
msgid ""
709
"This command will print the names of all the branches at the current "
710
"location."
711
msgstr ""
712
713
#: bzrlib/builtins.py:1353
714
msgid " (default)\n"
715
msgstr ""
716
717
#: bzrlib/builtins.py:1359
718
msgid "Create a new checkout of an existing branch."
719
msgstr ""
720
721
#: bzrlib/builtins.py:1361
722
msgid ""
723
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
724
"for\n"
725
"the branch found in '.'. This is useful if you have removed the working "
726
"tree\n"
727
"or if it was never created - i.e. if you pushed the branch to its current\n"
728
"location using SFTP."
729
msgstr ""
730
731
#: bzrlib/builtins.py:1366
732
msgid ""
733
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
734
"will\n"
735
"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./"
736
"bar.\n"
737
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
738
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
739
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
740
"create ./foo-bar."
741
msgstr ""
742
743
#: bzrlib/builtins.py:1373
744
msgid ""
745
"To retrieve the branch as of a particular revision, supply the --revision\n"
746
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
747
"immediately\n"
748
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
749
"old\n"
750
"code.)"
751
msgstr ""
752
753
# help of 'lightweight' option of 'checkout' command
754
#: bzrlib/builtins.py:1383
755
msgid ""
756
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
757
"the branch for every operation. Normal checkouts can perform common "
758
"operations like diff and status without such access, and also support local "
759
"commits."
760
msgstr ""
761
762
# help of 'files-from' option of 'branch' command
763
#: bzrlib/builtins.py:1390
764
msgid "Get file contents from this tree."
765
msgstr ""
766
767
# help of 'hardlink' option of 'branch' command
768
#: bzrlib/builtins.py:1392
769
msgid "Hard-link working tree files where possible."
770
msgstr ""
771
772
#: bzrlib/builtins.py:1433
773
msgid ""
774
"Show list of renamed files.\n"
775
" "
776
msgstr ""
777
778
#: bzrlib/builtins.py:1463
779
msgid "Update a tree to have the latest code committed to its branch."
780
msgstr ""
781
782
#: bzrlib/builtins.py:1465
783
msgid ""
784
"This will perform a merge into the working tree, and may generate\n"
785
"conflicts. If you have any local changes, you will still\n"
786
"need to commit them after the update for the update to be complete."
787
msgstr ""
788
789
#: bzrlib/builtins.py:1469
790
msgid ""
791
"If you want to discard your local changes, you can just do a\n"
792
"'bzr revert' instead of 'bzr commit' after the update."
793
msgstr ""
794
795
#: bzrlib/builtins.py:1472
796
msgid ""
797
"If you want to restore a file that has been removed locally, use\n"
798
"'bzr revert' instead of 'bzr update'."
799
msgstr ""
800
801
#: bzrlib/builtins.py:1475
802
msgid ""
803
"If the tree's branch is bound to a master branch, it will also update\n"
804
"the branch from the master."
805
msgstr ""
806
807
#: bzrlib/builtins.py:1490
808
msgid "bzr update --revision takes exactly one revision"
809
msgstr ""
810
811
#: bzrlib/builtins.py:1521
812
msgid "Tree is up to date at revision {0} of branch {1}"
813
msgstr ""
814
815
#: bzrlib/builtins.py:1537
816
#, python-format
817
msgid ""
818
"branch has no revision %s\n"
819
"bzr update --revision only works for a revision in the branch history"
820
msgstr ""
821
822
#: bzrlib/builtins.py:1543
823
msgid "Updated to revision {0} of branch {1}"
824
msgstr ""
825
826
#: bzrlib/builtins.py:1547
827
msgid ""
828
"Your local commits will now show as pending merges with 'bzr status', and "
829
"can be committed with 'bzr commit'."
830
msgstr ""
831
832
#: bzrlib/builtins.py:1556
833
msgid "Show information about a working tree, branch or repository."
834
msgstr ""
835
836
#: bzrlib/builtins.py:1558
837
msgid ""
838
"This command will show all known locations and formats associated to the\n"
839
"tree, branch or repository."
840
msgstr ""
841
842
#: bzrlib/builtins.py:1561
843
msgid ""
844
"In verbose mode, statistical information is included with each report.\n"
845
"To see extended statistic information, use a verbosity level of 2 or\n"
846
"higher by specifying the verbose option multiple times, e.g. -vv."
847
msgstr ""
848
849
#: bzrlib/builtins.py:1565
850
msgid "Branches and working trees will also report any missing revisions."
851
msgstr ""
852
853
#: bzrlib/builtins.py:1569
854
msgid " Display information on the format and related locations:"
855
msgstr ""
856
857
#: bzrlib/builtins.py:1571
858
msgid " bzr info"
859
msgstr ""
860
861
#: bzrlib/builtins.py:1573
862
msgid ""
863
" Display the above together with extended format information and\n"
864
" basic statistics (like the number of files in the working tree and\n"
865
" number of revisions in the branch and repository):"
866
msgstr ""
867
868
#: bzrlib/builtins.py:1577
869
msgid " bzr info -v"
870
msgstr ""
871
872
#: bzrlib/builtins.py:1579
873
msgid " Display the above together with number of committers to the branch:"
874
msgstr ""
875
876
#: bzrlib/builtins.py:1581
877
msgid " bzr info -vv"
878
msgstr ""
879
880
#: bzrlib/builtins.py:1600
881
msgid "Remove files or directories."
882
msgstr ""
883
884
#: bzrlib/builtins.py:1602
885
msgid ""
886
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
887
"delete them if they can easily be recovered using revert otherwise they\n"
888
"will be backed up (adding an extention of the form .~#~). If no options or\n"
889
"parameters are given Bazaar will scan for files that are being tracked by\n"
890
"Bazaar but missing in your tree and stop tracking them for you."
891
msgstr ""
892
893
# help of 'new' option of 'remove' command
894
#: bzrlib/builtins.py:1610
895
msgid "Only remove files that have never been committed."
896
msgstr ""
897
898
# help of 'file-deletion-strategy' option of 'remove' command
899
#: bzrlib/builtins.py:1612
900
msgid "The file deletion mode to be used."
901
msgstr ""
902
903
# title of 'file-deletion-strategy' option of 'remove' command
904
#: bzrlib/builtins.py:1613
905
msgid "Deletion Strategy"
906
msgstr ""
907
908
#: bzrlib/builtins.py:1626
909
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
910
msgstr ""
911
912
#: bzrlib/builtins.py:1643
913
msgid "No matching files."
914
msgstr ""
915
916
#: bzrlib/builtins.py:1704
917
msgid "Reconcile bzr metadata in a branch."
918
msgstr ""
919
920
#: bzrlib/builtins.py:1706
921
msgid ""
922
"This can correct data mismatches that may have been caused by\n"
923
"previous ghost operations or bzr upgrades. You should only\n"
924
"need to run this command if 'bzr check' or a bzr developer\n"
925
"advises you to run it."
926
msgstr ""
927
928
#: bzrlib/builtins.py:1711
929
msgid ""
930
"If a second branch is provided, cross-branch reconciliation is\n"
931
"also attempted, which will check that data like the tree root\n"
932
"id which was not present in very early bzr versions is represented\n"
933
"correctly in both branches."
934
msgstr ""
935
936
#: bzrlib/builtins.py:1716
937
msgid ""
938
"At the same time it is run it may recompress data resulting in\n"
939
"a potential saving in disk space or performance gain."
940
msgstr ""
941
942
#: bzrlib/builtins.py:1719
943
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
944
msgstr ""
945
946
#: bzrlib/builtins.py:1783
947
msgid "Make a directory into a versioned branch."
948
msgstr ""
949
950
#: bzrlib/builtins.py:1785
951
msgid ""
952
"Use this to create an empty branch, or before importing an\n"
953
"existing project."
954
msgstr ""
955
956
#: bzrlib/builtins.py:1788
957
msgid ""
958
"If there is a repository in a parent directory of the location, then\n"
959
"the history of the branch will be stored in the repository. Otherwise\n"
960
"init creates a standalone branch which carries its own history\n"
961
"in the .bzr directory."
962
msgstr ""
963
964
#: bzrlib/builtins.py:1793
965
msgid ""
966
"If there is already a branch at the location but it has no working tree,\n"
967
"the tree can be populated with 'bzr checkout'."
968
msgstr ""
969
970
#: bzrlib/builtins.py:1796
971
msgid "Recipe for importing a tree of files::"
972
msgstr ""
973
974
#: bzrlib/builtins.py:1798
975
msgid ""
976
" cd ~/project\n"
977
" bzr init\n"
978
" bzr add .\n"
979
" bzr status\n"
980
" bzr commit -m \"imported project\""
981
msgstr ""
982
983
# help of 'create-prefix' option of 'init' command
984
#: bzrlib/builtins.py:1809
985
msgid "Create the path leading up to the branch if it does not already exist."
986
msgstr ""
987
988
# help of 'format' option of 'init' command
989
#: bzrlib/builtins.py:1812
990
msgid "Specify a format for this branch. See \"help formats\"."
991
msgstr ""
992
993
# help of 'append-revisions-only' option of 'init' command
994
#: bzrlib/builtins.py:1820
995
msgid "Never change revnos or the existing log. Append revisions to it only."
996
msgstr ""
997
998
# help of 'no-tree' option of 'init' command
999
#: bzrlib/builtins.py:1823
1000
msgid "Create a branch without a working tree."
1001
msgstr ""
1002
1003
#: bzrlib/builtins.py:1843 bzrlib/push.py:108
1004
#, python-format
1005
msgid ""
1006
"Parent directory of %s does not exist.\n"
1007
"You may supply --create-prefix to create all leading parent directories."
1008
msgstr ""
1009
1010
#: bzrlib/builtins.py:1877
1011
msgid ""
1012
"This branch format cannot be set to append-revisions-only. Try --default."
1013
msgstr ""
1014
1015
#: bzrlib/builtins.py:1888
1016
msgid "Created a {0} (format: {1})\n"
1017
msgstr ""
1018
1019
#: bzrlib/builtins.py:1897
1020
#, python-format
1021
msgid "Using shared repository: %s\n"
1022
msgstr ""
1023
1024
#: bzrlib/builtins.py:1901
1025
msgid "Create a shared repository for branches to share storage space."
1026
msgstr ""
1027
1028
#: bzrlib/builtins.py:1903
1029
msgid ""
1030
"New branches created under the repository directory will store their\n"
1031
"revisions in the repository, not in the branch directory. For branches\n"
1032
"with shared history, this reduces the amount of storage needed and \n"
1033
"speeds up the creation of new branches."
1034
msgstr ""
1035
1036
#: bzrlib/builtins.py:1908
1037
msgid ""
1038
"If the --no-trees option is given then the branches in the repository\n"
1039
"will not have working trees by default. They will still exist as \n"
1040
"directories on disk, but they will not have separate copies of the \n"
1041
"files at a certain revision. This can be useful for repositories that\n"
1042
"store branches which are interacted with through checkouts or remote\n"
1043
"branches, such as on a server."
1044
msgstr ""
1045
1046
#: bzrlib/builtins.py:1915
1047
msgid ""
1048
":Examples:\n"
1049
" Create a shared repository holding just branches::"
1050
msgstr ""
1051
1052
#: bzrlib/builtins.py:1918
1053
msgid ""
1054
" bzr init-repo --no-trees repo\n"
1055
" bzr init repo/trunk"
1056
msgstr ""
1057
1058
#: bzrlib/builtins.py:1921
1059
msgid " Make a lightweight checkout elsewhere::"
1060
msgstr ""
1061
1062
#: bzrlib/builtins.py:1923
1063
msgid ""
1064
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1065
" cd trunk-checkout\n"
1066
" (add files here)"
1067
msgstr ""
1068
1069
# help of 'format' option of 'init-repository' command
1070
#: bzrlib/builtins.py:1931
1071
msgid ""
1072
"Specify a format for this repository. See \"bzr help formats\" for details."
1073
msgstr ""
1074
1075
# title of 'format' option of 'init-repository' command
1076
#: bzrlib/builtins.py:1935
1077
msgid "Repository format"
1078
msgstr ""
1079
1080
# help of 'no-trees' option of 'init-repository' command
1081
#: bzrlib/builtins.py:1937
1082
msgid "Branches in the repository will default to not having a working tree."
1083
msgstr ""
1084
1085
#: bzrlib/builtins.py:1961
1086
msgid "Show differences in the working tree, between revisions or branches."
1087
msgstr ""
1088
1089
#: bzrlib/builtins.py:1963
1090
msgid ""
1091
"If no arguments are given, all changes for the current tree are listed.\n"
1092
"If files are given, only the changes in those files are listed.\n"
1093
"Remote and multiple branches can be compared by using the --old and\n"
1094
"--new options. If not provided, the default for both is derived from\n"
1095
"the first argument, if any, or the current tree if no arguments are\n"
1096
"given."
1097
msgstr ""
1098
1099
#: bzrlib/builtins.py:1970
1100
msgid ""
1101
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1102
"produces patches suitable for \"patch -p1\"."
1103
msgstr ""
1104
1105
#: bzrlib/builtins.py:1973
1106
msgid ""
1107
"Note that when using the -r argument with a range of revisions, the\n"
1108
"differences are computed between the two specified revisions. That\n"
1109
"is, the command does not show the changes introduced by the first \n"
1110
"revision in the range. This differs from the interpretation of \n"
1111
"revision ranges used by \"bzr log\" which includes the first revision\n"
1112
"in the range."
1113
msgstr ""
1114
1115
#: bzrlib/builtins.py:1980
1116
msgid ""
1117
":Exit values:\n"
1118
" 1 - changed\n"
1119
" 2 - unrepresentable changes\n"
1120
" 3 - error\n"
1121
" 0 - no change"
1122
msgstr ""
1123
1124
#: bzrlib/builtins.py:1986
1125
msgid ""
1126
":Examples:\n"
1127
" Shows the difference in the working tree versus the last commit::"
1128
msgstr ""
1129
1130
#: bzrlib/builtins.py:1989
1131
msgid " bzr diff"
1132
msgstr ""
1133
1134
#: bzrlib/builtins.py:1991
1135
msgid " Difference between the working tree and revision 1::"
1136
msgstr ""
1137
1138
#: bzrlib/builtins.py:1993
1139
msgid " bzr diff -r1"
1140
msgstr ""
1141
1142
#: bzrlib/builtins.py:1995
1143
msgid " Difference between revision 3 and revision 1::"
1144
msgstr ""
1145
1146
#: bzrlib/builtins.py:1997
1147
msgid " bzr diff -r1..3"
1148
msgstr ""
1149
1150
#: bzrlib/builtins.py:1999
1151
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1152
msgstr ""
1153
1154
#: bzrlib/builtins.py:2001
1155
msgid " bzr diff -r1..3 xxx"
1156
msgstr ""
1157
1158
#: bzrlib/builtins.py:2003
1159
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1160
msgstr ""
1161
1162
#: bzrlib/builtins.py:2005
1163
msgid " bzr diff -c2"
1164
msgstr ""
1165
1166
#: bzrlib/builtins.py:2007
1167
msgid ""
1168
" To see the changes introduced by revision X::\n"
1169
" \n"
1170
" bzr diff -cX"
1171
msgstr ""
1172
1173
#: bzrlib/builtins.py:2011
1174
msgid ""
1175
" Note that in the case of a merge, the -c option shows the changes\n"
1176
" compared to the left hand parent. To see the changes against\n"
1177
" another parent, use::"
1178
msgstr ""
1179
1180
#: bzrlib/builtins.py:2015
1181
msgid " bzr diff -r<chosen_parent>..X"
1182
msgstr ""
1183
1184
#: bzrlib/builtins.py:2017
1185
msgid ""
1186
" The changes between the current revision and the previous revision\n"
1187
" (equivalent to -c-1 and -r-2..-1)"
1188
msgstr ""
1189
1190
#: bzrlib/builtins.py:2020
1191
msgid " bzr diff -r-2.."
1192
msgstr ""
1193
1194
#: bzrlib/builtins.py:2022
1195
msgid " Show just the differences for file NEWS::"
1196
msgstr ""
1197
1198
#: bzrlib/builtins.py:2024
1199
msgid " bzr diff NEWS"
1200
msgstr ""
1201
1202
#: bzrlib/builtins.py:2026
1203
msgid " Show the differences in working tree xxx for file NEWS::"
1204
msgstr ""
1205
1206
#: bzrlib/builtins.py:2028
1207
msgid " bzr diff xxx/NEWS"
1208
msgstr ""
1209
1210
#: bzrlib/builtins.py:2030
1211
msgid " Show the differences from branch xxx to this working tree:"
1212
msgstr ""
1213
1214
#: bzrlib/builtins.py:2032
1215
msgid " bzr diff --old xxx"
1216
msgstr ""
1217
1218
#: bzrlib/builtins.py:2034
1219
msgid " Show the differences between two branches for file NEWS::"
1220
msgstr ""
1221
1222
#: bzrlib/builtins.py:2036
1223
msgid " bzr diff --old xxx --new yyy NEWS"
1224
msgstr ""
1225
1226
#: bzrlib/builtins.py:2038
1227
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1228
msgstr ""
1229
1230
#: bzrlib/builtins.py:2040
1231
msgid ""
1232
" bzr diff --prefix old/:new/\n"
1233
" \n"
1234
" Show the differences using a custom diff program with options::\n"
1235
" \n"
1236
" bzr diff --using /usr/bin/diff --diff-options -wu"
1237
msgstr ""
1238
1239
# help of 'diff-options' option of 'diff' command
1240
#: bzrlib/builtins.py:2050
1241
msgid "Pass these options to the external diff program."
1242
msgstr ""
1243
1244
# help of 'prefix' option of 'diff' command
1245
#: bzrlib/builtins.py:2053
1246
msgid ""
1247
"Set prefixes added to old and new filenames, as two values separated by a "
1248
"colon. (eg \"old/:new/\")."
1249
msgstr ""
1250
1251
# help of 'old' option of 'diff' command
1252
#: bzrlib/builtins.py:2056
1253
msgid "Branch/tree to compare from."
1254
msgstr ""
1255
1256
# help of 'new' option of 'diff' command
1257
#: bzrlib/builtins.py:2060
1258
msgid "Branch/tree to compare to."
1259
msgstr ""
1260
1261
# help of 'using' option of 'diff' command
1262
#: bzrlib/builtins.py:2066
1263
msgid "Use this command to compare files."
1264
msgstr ""
1265
1266
# help of 'format' option of 'diff' command
1267
#: bzrlib/builtins.py:2071
1268
msgid "Diff format to use."
1269
msgstr ""
1270
1271
# title of 'format' option of 'diff' command
1272
#: bzrlib/builtins.py:2073
1273
msgid "Diff format"
1274
msgstr ""
1275
1276
#: bzrlib/builtins.py:2095
1277
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1278
msgstr ""
1279
1280
#: bzrlib/builtins.py:2099
1281
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1282
msgstr ""
1283
1284
#: bzrlib/builtins.py:2104 bzrlib/builtins.py:2502 bzrlib/builtins.py:2515
1285
#: bzrlib/builtins.py:2523 bzrlib/builtins.py:4663
1286
msgid "{0} and {1} are mutually exclusive"
1287
msgstr ""
1288
1289
#: bzrlib/builtins.py:2124
1290
msgid ""
1291
"List files deleted in the working tree.\n"
1292
" "
1293
msgstr ""
1294
1295
#: bzrlib/builtins.py:2202
1296
msgid "Show the tree root directory."
1297
msgstr ""
1298
1299
#: bzrlib/builtins.py:2204
1300
msgid ""
1301
"The root is the nearest enclosing directory with a .bzr control\n"
1302
"directory."
1303
msgstr ""
1304
1305
#: bzrlib/builtins.py:2219
1306
msgid "The limit argument must be an integer."
1307
msgstr ""
1308
1309
#: bzrlib/builtins.py:2227
1310
msgid "The levels argument must be an integer."
1311
msgstr ""
1312
1313
#: bzrlib/builtins.py:2232
1314
msgid "Show historical log for a branch or subset of a branch."
1315
msgstr ""
1316
1317
#: bzrlib/builtins.py:2234
1318
msgid ""
1319
"log is bzr's default tool for exploring the history of a branch.\n"
1320
"The branch to use is taken from the first parameter. If no parameters\n"
1321
"are given, the branch containing the working directory is logged.\n"
1322
"Here are some simple examples::"
1323
msgstr ""
1324
1325
#: bzrlib/builtins.py:2239
1326
msgid ""
1327
" bzr log log the current branch\n"
1328
" bzr log foo.py log a file in its branch\n"
1329
" bzr log http://server/branch log a branch on a server"
1330
msgstr ""
1331
1332
#: bzrlib/builtins.py:2243
1333
msgid ""
1334
"The filtering, ordering and information shown for each revision can\n"
1335
"be controlled as explained below. By default, all revisions are\n"
1336
"shown sorted (topologically) so that newer revisions appear before\n"
1337
"older ones and descendants always appear before ancestors. If displayed,\n"
1338
"merged revisions are shown indented under the revision in which they\n"
1339
"were merged."
1340
msgstr ""
1341
1342
#: bzrlib/builtins.py:2250
1343
msgid ":Output control:"
1344
msgstr ""
1345
1346
#: bzrlib/builtins.py:2252
1347
msgid ""
1348
" The log format controls how information about each revision is\n"
1349
" displayed. The standard log formats are called ``long``, ``short``\n"
1350
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1351
" for more details on log formats."
1352
msgstr ""
1353
1354
#: bzrlib/builtins.py:2257
1355
msgid ""
1356
" The following options can be used to control what information is\n"
1357
" displayed::"
1358
msgstr ""
1359
1360
#: bzrlib/builtins.py:2260
1361
msgid ""
1362
" -l N display a maximum of N revisions\n"
1363
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1364
" -v display a status summary (delta) for each revision\n"
1365
" -p display a diff (patch) for each revision\n"
1366
" --show-ids display revision-ids (and file-ids), not just revnos"
1367
msgstr ""
1368
1369
#: bzrlib/builtins.py:2266
1370
msgid ""
1371
" Note that the default number of levels to display is a function of the\n"
1372
" log format. If the -n option is not used, the standard log formats show\n"
1373
" just the top level (mainline)."
1374
msgstr ""
1375
1376
#: bzrlib/builtins.py:2270
1377
msgid ""
1378
" Status summaries are shown using status flags like A, M, etc. To see\n"
1379
" the changes explained using words like ``added`` and ``modified``\n"
1380
" instead, use the -vv option."
1381
msgstr ""
1382
1383
#: bzrlib/builtins.py:2274
1384
msgid ":Ordering control:"
1385
msgstr ""
1386
1387
#: bzrlib/builtins.py:2276
1388
msgid ""
1389
" To display revisions from oldest to newest, use the --forward option.\n"
1390
" In most cases, using this option will have little impact on the total\n"
1391
" time taken to produce a log, though --forward does not incrementally\n"
1392
" display revisions like --reverse does when it can."
1393
msgstr ""
1394
1395
#: bzrlib/builtins.py:2281
1396
msgid ":Revision filtering:"
1397
msgstr ""
1398
1399
#: bzrlib/builtins.py:2283
1400
msgid ""
1401
" The -r option can be used to specify what revision or range of revisions\n"
1402
" to filter against. The various forms are shown below::"
1403
msgstr ""
1404
1405
#: bzrlib/builtins.py:2286
1406
msgid ""
1407
" -rX display revision X\n"
1408
" -rX.. display revision X and later\n"
1409
" -r..Y display up to and including revision Y\n"
1410
" -rX..Y display from X to Y inclusive"
1411
msgstr ""
1412
1413
#: bzrlib/builtins.py:2291
1414
msgid ""
1415
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1416
" Some common examples are given below::"
1417
msgstr ""
1418
1419
#: bzrlib/builtins.py:2294
1420
msgid ""
1421
" -r-1 show just the tip\n"
1422
" -r-10.. show the last 10 mainline revisions\n"
1423
" -rsubmit:.. show what's new on this branch\n"
1424
" -rancestor:path.. show changes since the common ancestor of this\n"
1425
" branch and the one at location path\n"
1426
" -rdate:yesterday.. show changes since yesterday"
1427
msgstr ""
1428
1429
#: bzrlib/builtins.py:2301
1430
msgid ""
1431
" When logging a range of revisions using -rX..Y, log starts at\n"
1432
" revision Y and searches back in history through the primary\n"
1433
" (\"left-hand\") parents until it finds X. When logging just the\n"
1434
" top level (using -n1), an error is reported if X is not found\n"
1435
" along the way. If multi-level logging is used (-n0), X may be\n"
1436
" a nested merge revision and the log will be truncated accordingly."
1437
msgstr ""
1438
1439
#: bzrlib/builtins.py:2308
1440
msgid ":Path filtering:"
1441
msgstr ""
1442
1443
#: bzrlib/builtins.py:2310
1444
msgid ""
1445
" If parameters are given and the first one is not a branch, the log\n"
1446
" will be filtered to show only those revisions that changed the\n"
1447
" nominated files or directories."
1448
msgstr ""
1449
1450
#: bzrlib/builtins.py:2314
1451
msgid ""
1452
" Filenames are interpreted within their historical context. To log a\n"
1453
" deleted file, specify a revision range so that the file existed at\n"
1454
" the end or start of the range."
1455
msgstr ""
1456
1457
#: bzrlib/builtins.py:2318
1458
msgid ""
1459
" Historical context is also important when interpreting pathnames of\n"
1460
" renamed files/directories. Consider the following example:"
1461
msgstr ""
1462
1463
#: bzrlib/builtins.py:2321
1464
msgid ""
1465
" * revision 1: add tutorial.txt\n"
1466
" * revision 2: modify tutorial.txt\n"
1467
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1468
msgstr ""
1469
1470
#: bzrlib/builtins.py:2325
1471
msgid " In this case:"
1472
msgstr ""
1473
1474
#: bzrlib/builtins.py:2327
1475
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1476
msgstr ""
1477
1478
#: bzrlib/builtins.py:2329
1479
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1480
msgstr ""
1481
1482
#: bzrlib/builtins.py:2331
1483
msgid ""
1484
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1485
" the original file in revision 2."
1486
msgstr ""
1487
1488
#: bzrlib/builtins.py:2334
1489
msgid ""
1490
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1491
" was no file called guide.txt in revision 2."
1492
msgstr ""
1493
1494
#: bzrlib/builtins.py:2337
1495
msgid ""
1496
" Renames are always followed by log. By design, there is no need to\n"
1497
" explicitly ask for this (and no way to stop logging a file back\n"
1498
" until it was last renamed)."
1499
msgstr ""
1500
1501
#: bzrlib/builtins.py:2341
1502
msgid ":Other filtering:"
1503
msgstr ""
1504
1505
#: bzrlib/builtins.py:2343
1506
msgid ""
1507
" The --match option can be used for finding revisions that match a\n"
1508
" regular expression in a commit message, committer, author or bug.\n"
1509
" Specifying the option several times will match any of the supplied\n"
1510
" expressions. --match-author, --match-bugs, --match-committer and\n"
1511
" --match-message can be used to only match a specific field."
1512
msgstr ""
1513
1514
#: bzrlib/builtins.py:2349
1515
msgid ":Tips & tricks:"
1516
msgstr ""
1517
1518
#: bzrlib/builtins.py:2351
1519
msgid ""
1520
" GUI tools and IDEs are often better at exploring history than command\n"
1521
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1522
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1523
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1524
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1525
msgstr ""
1526
1527
#: bzrlib/builtins.py:2357
1528
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1529
msgstr ""
1530
1531
#: bzrlib/builtins.py:2359
1532
msgid ""
1533
" [ALIASES]\n"
1534
" tip = log -r-1\n"
1535
" top = log -l10 --line\n"
1536
" show = log -v -p"
1537
msgstr ""
1538
1539
#: bzrlib/builtins.py:2364
1540
msgid ""
1541
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1542
" will show the last 10 mainline revisions. To see the details of a\n"
1543
" particular revision X, ``bzr show -rX``."
1544
msgstr ""
1545
1546
#: bzrlib/builtins.py:2368
1547
msgid ""
1548
" If you are interested in looking deeper into a particular merge X,\n"
1549
" use ``bzr log -n0 -rX``."
1550
msgstr ""
1551
1552
#: bzrlib/builtins.py:2371
1553
msgid ""
1554
" ``bzr log -v`` on a branch with lots of history is currently\n"
1555
" very slow. A fix for this issue is currently under development.\n"
1556
" With or without that fix, it is recommended that a revision range\n"
1557
" be given when using the -v option."
1558
msgstr ""
1559
1560
#: bzrlib/builtins.py:2376
1561
msgid ""
1562
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1563
" used to find revisions matching user names, commit messages, etc.\n"
1564
" Among other features, this plugin can find all revisions containing\n"
1565
" a list of words but not others."
1566
msgstr ""
1567
1568
#: bzrlib/builtins.py:2381
1569
msgid ""
1570
" When exploring non-mainline history on large projects with deep\n"
1571
" history, the performance of log can be greatly improved by installing\n"
1572
" the historycache plugin. This plugin buffers historical information\n"
1573
" trading disk space for faster speed."
1574
msgstr ""
1575
1576
# help of 'forward' option of 'log' command
1577
#: bzrlib/builtins.py:2390
1578
msgid "Show from oldest to newest."
1579
msgstr ""
1580
1581
# help of 'verbose' option of 'log' command
1582
#: bzrlib/builtins.py:2393
1583
msgid "Show files changed in each revision."
1584
msgstr ""
1585
1586
# help of 'change' option of 'log' command
1587
#: bzrlib/builtins.py:2399
1588
msgid "Show just the specified revision. See also \"help revisionspec\"."
1589
msgstr ""
1590
1591
# help of 'authors' option of 'log' command
1592
#: bzrlib/builtins.py:2403
1593
msgid "What names to list as authors - first, all or committer."
1594
msgstr ""
1595
1596
# title of 'authors' option of 'log' command
1597
#: bzrlib/builtins.py:2404
1598
msgid "Authors"
1599
msgstr ""
1600
1601
# help of 'levels' option of 'log' command
1602
#: bzrlib/builtins.py:2409
1603
msgid "Number of levels to display - 0 for all, 1 for flat."
1604
msgstr ""
1605
1606
# help of 'limit' option of 'log' command
1607
#: bzrlib/builtins.py:2419
1608
msgid "Limit the output to the first N revisions."
1609
msgstr ""
1610
1611
# help of 'show-diff' option of 'log' command
1612
#: bzrlib/builtins.py:2424
1613
msgid "Show changes made in each revision as a patch."
1614
msgstr ""
1615
1616
# help of 'include-merged' option of 'log' command
1617
#: bzrlib/builtins.py:2426
1618
msgid "Show merged revisions like --levels 0 does."
1619
msgstr ""
1620
1621
# help of 'omit-merges' option of 'log' command
1622
#: bzrlib/builtins.py:2430
1623
msgid "Do not report commits with more than one parent."
1624
msgstr ""
1625
1626
# help of 'exclude-common-ancestry' option of 'log' command
1627
#: bzrlib/builtins.py:2432
1628
msgid ""
1629
"Display only the revisions that are not part of both ancestries (require -"
1630
"rX..Y)"
1631
msgstr ""
1632
1633
# help of 'signatures' option of 'log' command
1634
#: bzrlib/builtins.py:2436
1635
msgid "Show digital signature validity"
1636
msgstr ""
1637
1638
# help of 'match' option of 'log' command
1639
#: bzrlib/builtins.py:2439
1640
msgid "Show revisions whose properties match this expression."
1641
msgstr ""
1642
1643
# help of 'match-message' option of 'log' command
1644
#: bzrlib/builtins.py:2443
1645
msgid "Show revisions whose message matches this expression."
1646
msgstr ""
1647
1648
# help of 'match-committer' option of 'log' command
1649
#: bzrlib/builtins.py:2447
1650
msgid "Show revisions whose committer matches this expression."
1651
msgstr ""
1652
1653
# help of 'match-author' option of 'log' command
1654
#: bzrlib/builtins.py:2451
1655
msgid "Show revisions whose authors match this expression."
1656
msgstr ""
1657
1658
# help of 'match-bugs' option of 'log' command
1659
#: bzrlib/builtins.py:2455
1660
msgid "Show revisions whose bugs match this expression."
1661
msgstr ""
1662
1663
#: bzrlib/builtins.py:2509
1664
msgid "--exclude-common-ancestry requires -r with two revisions"
1665
msgstr ""
1666
1667
#: bzrlib/builtins.py:2537
1668
#, python-format
1669
msgid "Path unknown at end or start of revision range: %s"
1670
msgstr ""
1671
1672
#: bzrlib/builtins.py:2654
1673
#, python-format
1674
msgid "bzr %s doesn't accept two revisions in different branches."
1675
msgstr ""
1676
1677
#: bzrlib/builtins.py:2670
1678
#, python-format
1679
msgid "bzr %s --revision takes one or two values."
1680
msgstr ""
1681
1682
#: bzrlib/builtins.py:2715
1683
msgid ""
1684
"List files in a tree.\n"
1685
" "
1686
msgstr ""
1687
1688
# help of 'recursive' option of 'ls' command
1689
#: bzrlib/builtins.py:2724
1690
msgid "Recurse into subdirectories."
1691
msgstr ""
1692
1693
# help of 'from-root' option of 'ls' command
1694
#: bzrlib/builtins.py:2726
1695
msgid "Print paths relative to the root of the branch."
1696
msgstr ""
1697
1698
# help of 'unknown' option of 'ls' command
1699
#: bzrlib/builtins.py:2728
1700
msgid "Print unknown files."
1701
msgstr ""
1702
1703
# help of 'versioned' option of 'ls' command
1704
#: bzrlib/builtins.py:2729
1705
msgid "Print versioned files."
1706
msgstr ""
1707
1708
# help of 'ignored' option of 'ls' command
1709
#: bzrlib/builtins.py:2732
1710
msgid "Print ignored files."
1711
msgstr ""
1712
1713
# help of 'kind' option of 'ls' command
1714
#: bzrlib/builtins.py:2734
1715
msgid "List entries of a particular kind: file, directory, symlink."
1716
msgstr ""
1717
1718
#: bzrlib/builtins.py:2747
1719
msgid "invalid kind specified"
1720
msgstr ""
1721
1722
#: bzrlib/builtins.py:2750
1723
msgid "Cannot set both --verbose and --null"
1724
msgstr ""
1725
1726
#: bzrlib/builtins.py:2759
1727
msgid "cannot specify both --from-root and PATH"
1728
msgstr ""
1729
1730
#: bzrlib/builtins.py:2846
1731
msgid "Ignore specified files or patterns."
1732
msgstr ""
1733
1734
#: bzrlib/builtins.py:2848
1735
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1736
msgstr ""
1737
1738
#: bzrlib/builtins.py:2850
1739
msgid ""
1740
"If a .bzrignore file does not exist, the ignore command\n"
1741
"will create one and add the specified files or patterns to the newly\n"
1742
"created file. The ignore command will also automatically add the \n"
1743
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1744
"the use of the ignore command will require an explicit add command."
1745
msgstr ""
1746
1747
#: bzrlib/builtins.py:2856
1748
msgid ""
1749
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1750
"After adding, editing or deleting that file either indirectly by\n"
1751
"using this command or directly by using an editor, be sure to commit\n"
1752
"it."
1753
msgstr ""
1754
1755
#: bzrlib/builtins.py:2861
1756
msgid ""
1757
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1758
"the global ignore file can be found in the application data directory as\n"
1759
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1760
"Global ignores are not touched by this command. The global ignore file\n"
1761
"can be edited directly using an editor."
1762
msgstr ""
1763
1764
#: bzrlib/builtins.py:2867
1765
msgid ""
1766
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1767
"precedence over regular ignores. Such exceptions are used to specify\n"
1768
"files that should be versioned which would otherwise be ignored."
1769
msgstr ""
1770
1771
#: bzrlib/builtins.py:2871
1772
msgid ""
1773
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1774
"precedence over the '!' exception patterns."
1775
msgstr ""
1776
1777
#: bzrlib/builtins.py:2874
1778
msgid ""
1779
":Notes: \n"
1780
" \n"
1781
"* Ignore patterns containing shell wildcards must be quoted from\n"
1782
" the shell on Unix."
1783
msgstr ""
1784
1785
#: bzrlib/builtins.py:2879
1786
msgid ""
1787
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1788
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1789
msgstr ""
1790
1791
#: bzrlib/builtins.py:2882
1792
msgid ""
1793
":Examples:\n"
1794
" Ignore the top level Makefile::"
1795
msgstr ""
1796
1797
#: bzrlib/builtins.py:2885
1798
msgid " bzr ignore ./Makefile"
1799
msgstr ""
1800
1801
#: bzrlib/builtins.py:2887
1802
msgid " Ignore .class files in all directories...::"
1803
msgstr ""
1804
1805
#: bzrlib/builtins.py:2889
1806
msgid " bzr ignore \"*.class\""
1807
msgstr ""
1808
1809
#: bzrlib/builtins.py:2891
1810
msgid " ...but do not ignore \"special.class\"::"
1811
msgstr ""
1812
1813
#: bzrlib/builtins.py:2893
1814
msgid " bzr ignore \"!special.class\""
1815
msgstr ""
1816
1817
#: bzrlib/builtins.py:2895
1818
msgid " Ignore files whose name begins with the \"#\" character::"
1819
msgstr ""
1820
1821
#: bzrlib/builtins.py:2897
1822
msgid " bzr ignore \"RE:^#\""
1823
msgstr ""
1824
1825
#: bzrlib/builtins.py:2899
1826
msgid " Ignore .o files under the lib directory::"
1827
msgstr ""
1828
1829
#: bzrlib/builtins.py:2901
1830
msgid " bzr ignore \"lib/**/*.o\""
1831
msgstr ""
1832
1833
#: bzrlib/builtins.py:2905
1834
msgid " bzr ignore \"RE:lib/.*\\.o\""
1835
msgstr ""
1836
1837
#: bzrlib/builtins.py:2907
1838
msgid " Ignore everything but the \"debian\" toplevel directory::"
1839
msgstr ""
1840
1841
#: bzrlib/builtins.py:2909
1842
msgid ""
1843
" bzr ignore \"RE:(?!debian/).*\"\n"
1844
" \n"
1845
" Ignore everything except the \"local\" toplevel directory,\n"
1846
" but always ignore autosave files ending in ~, even under local/::\n"
1847
" \n"
1848
" bzr ignore \"*\"\n"
1849
" bzr ignore \"!./local\"\n"
1850
" bzr ignore \"!!*~\""
1851
msgstr ""
1852
1853
# help of 'default-rules' option of 'ignore' command
1854
#: bzrlib/builtins.py:2923
1855
msgid "Display the default ignore rules that bzr uses."
1856
msgstr ""
1857
1858
#: bzrlib/builtins.py:2935
1859
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1860
msgstr ""
1861
1862
#: bzrlib/builtins.py:2946
1863
#, python-format
1864
msgid "Invalid ignore pattern found. %s"
1865
msgid_plural "Invalid ignore patterns found. %s"
1866
msgstr[0] ""
1867
msgstr[1] ""
1868
1869
#: bzrlib/builtins.py:2955
1870
msgid "NAME_PATTERN should not be an absolute path"
1871
msgstr ""
1872
1873
#: bzrlib/builtins.py:2968
1874
#, python-format
1875
msgid ""
1876
"Warning: the following files are version controlled and match your ignore "
1877
"pattern:\n"
1878
"%s\n"
1879
"These files will continue to be version controlled unless you 'bzr remove' "
1880
"them.\n"
1881
msgstr ""
1882
1883
#: bzrlib/builtins.py:2975
1884
msgid "List ignored files and the patterns that matched them."
1885
msgstr ""
1886
1887
#: bzrlib/builtins.py:2977
1888
msgid ""
1889
"List all the ignored files and the ignore pattern that caused the file to\n"
1890
"be ignored."
1891
msgstr ""
1892
1893
#: bzrlib/builtins.py:2980
1894
msgid "Alternatively, to list just the files::"
1895
msgstr ""
1896
1897
#: bzrlib/builtins.py:2982
1898
msgid " bzr ls --ignored"
1899
msgstr ""
1900
1901
#: bzrlib/builtins.py:3016
1902
#, python-format
1903
msgid "not a valid revision-number: %r"
1904
msgstr ""
1905
1906
#: bzrlib/builtins.py:3023
1907
msgid "Export current or past revision to a destination directory or archive."
1908
msgstr ""
1909
1910
#: bzrlib/builtins.py:3025
1911
msgid "If no revision is specified this exports the last committed revision."
1912
msgstr ""
1913
1914
#: bzrlib/builtins.py:3027
1915
msgid ""
1916
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1917
"given, try to find the format with the extension. If no extension\n"
1918
"is found exports to a directory (equivalent to --format=dir)."
1919
msgstr ""
1920
1921
#: bzrlib/builtins.py:3031
1922
msgid ""
1923
"If root is supplied, it will be used as the root directory inside\n"
1924
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1925
"to the exported filename. The root option has no effect for 'dir' format."
1926
msgstr ""
1927
1928
#: bzrlib/builtins.py:3035
1929
msgid ""
1930
"If branch is omitted then the branch containing the current working\n"
1931
"directory will be used."
1932
msgstr ""
1933
1934
#: bzrlib/builtins.py:3038
1935
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
1936
msgstr ""
1937
1938
#: bzrlib/builtins.py:3040
1939
msgid ""
1940
" ================= =========================\n"
1941
" Supported formats Autodetected by extension\n"
1942
" ================= =========================\n"
1943
" dir (none)\n"
1944
" tar .tar\n"
1945
" tbz2 .tar.bz2, .tbz2\n"
1946
" tgz .tar.gz, .tgz\n"
1947
" zip .zip\n"
1948
" ================= ========================="
1949
msgstr ""
1950
1951
# help of 'format' option of 'export' command
1952
#: bzrlib/builtins.py:3054
1953
msgid "Type of file to export to."
1954
msgstr ""
1955
1956
# help of 'filters' option of 'export' command
1957
#: bzrlib/builtins.py:3057
1958
msgid "Apply content filters to export the convenient form."
1959
msgstr ""
1960
1961
# help of 'root' option of 'export' command
1962
#: bzrlib/builtins.py:3061
1963
msgid "Name of the root directory inside the exported file."
1964
msgstr ""
1965
1966
# help of 'per-file-timestamps' option of 'export' command
1967
#: bzrlib/builtins.py:3063
1968
msgid ""
1969
"Set modification time of files to that of the last revision in which it was "
1970
"changed."
1971
msgstr ""
1972
1973
#: bzrlib/builtins.py:3083
1974
#, python-format
1975
msgid "Unsupported export format: %s"
1976
msgstr ""
1977
1978
#: bzrlib/builtins.py:3087
1979
msgid "Write the contents of a file as of a given revision to standard output."
1980
msgstr ""
1981
1982
#: bzrlib/builtins.py:3089
1983
msgid "If no revision is nominated, the last revision is used."
1984
msgstr ""
1985
1986
#: bzrlib/builtins.py:3091
1987
msgid ""
1988
"Note: Take care to redirect standard output when using this command on a\n"
1989
"binary file."
1990
msgstr ""
1991
1992
# help of 'filters' option of 'cat' command
1993
#: bzrlib/builtins.py:3098
1994
msgid "Apply content filters to display the convenience form."
1995
msgstr ""
1996
1997
#: bzrlib/builtins.py:3109
1998
msgid "bzr cat --revision takes exactly one revision specifier"
1999
msgstr ""
2000
2001
#: bzrlib/builtins.py:3134 bzrlib/builtins.py:3146
2002
msgid "{0!r} is not present in revision {1}"
2003
msgstr ""
2004
2005
#: bzrlib/builtins.py:3169
2006
msgid "Commit changes into a new revision."
2007
msgstr ""
2008
2009
#: bzrlib/builtins.py:3171
2010
msgid ""
2011
"An explanatory message needs to be given for each commit. This is\n"
2012
"often done by using the --message option (getting the message from the\n"
2013
"command line) or by using the --file option (getting the message from\n"
2014
"a file). If neither of these options is given, an editor is opened for\n"
2015
"the user to enter the message. To see the changed files in the\n"
2016
"boilerplate text loaded into the editor, use the --show-diff option."
2017
msgstr ""
2018
2019
#: bzrlib/builtins.py:3178
2020
msgid ""
2021
"By default, the entire tree is committed and the person doing the\n"
2022
"commit is assumed to be the author. These defaults can be overridden\n"
2023
"as explained below."
2024
msgstr ""
2025
2026
#: bzrlib/builtins.py:3182
2027
msgid ":Selective commits:"
2028
msgstr ""
2029
2030
#: bzrlib/builtins.py:3184
2031
msgid ""
2032
" If selected files are specified, only changes to those files are\n"
2033
" committed. If a directory is specified then the directory and\n"
2034
" everything within it is committed."
2035
msgstr ""
2036
2037
#: bzrlib/builtins.py:3188
2038
msgid ""
2039
" When excludes are given, they take precedence over selected files.\n"
2040
" For example, to commit only changes within foo, but not changes\n"
2041
" within foo/bar::"
2042
msgstr ""
2043
2044
#: bzrlib/builtins.py:3192
2045
msgid " bzr commit foo -x foo/bar"
2046
msgstr ""
2047
2048
#: bzrlib/builtins.py:3194
2049
msgid " A selective commit after a merge is not yet supported."
2050
msgstr ""
2051
2052
#: bzrlib/builtins.py:3196
2053
msgid ":Custom authors:"
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3198
2057
msgid ""
2058
" If the author of the change is not the same person as the committer,\n"
2059
" you can specify the author's name using the --author option. The\n"
2060
" name should be in the same format as a committer-id, e.g.\n"
2061
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2062
" the change you can specify the option multiple times, once for each\n"
2063
" author."
2064
msgstr ""
2065
2066
#: bzrlib/builtins.py:3205
2067
msgid ":Checks:"
2068
msgstr ""
2069
2070
#: bzrlib/builtins.py:3207
2071
msgid ""
2072
" A common mistake is to forget to add a new file or directory before\n"
2073
" running the commit command. The --strict option checks for unknown\n"
2074
" files and aborts the commit if any are found. More advanced pre-commit\n"
2075
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2076
" for details."
2077
msgstr ""
2078
2079
#: bzrlib/builtins.py:3213
2080
msgid ":Things to note:"
2081
msgstr ""
2082
2083
#: bzrlib/builtins.py:3215
2084
msgid ""
2085
" If you accidentially commit the wrong changes or make a spelling\n"
2086
" mistake in the commit message say, you can use the uncommit command\n"
2087
" to undo it. See ``bzr help uncommit`` for details."
2088
msgstr ""
2089
2090
#: bzrlib/builtins.py:3219
2091
msgid ""
2092
" Hooks can also be configured to run after a commit. This allows you\n"
2093
" to trigger updates to external systems like bug trackers. The --fixes\n"
2094
" option can be used to record the association between a revision and\n"
2095
" one or more bugs. See ``bzr help bugs`` for details."
2096
msgstr ""
2097
2098
# help of 'exclude' option of 'commit' command
2099
#: bzrlib/builtins.py:3229
2100
msgid "Do not consider changes made to a given path."
2101
msgstr ""
2102
2103
# help of 'message' option of 'commit' command
2104
#: bzrlib/builtins.py:3232
2105
msgid "Description of the new revision."
2106
msgstr ""
2107
2108
# help of 'unchanged' option of 'commit' command
2109
#: bzrlib/builtins.py:3235
2110
msgid "Commit even if nothing has changed."
2111
msgstr ""
2112
2113
# help of 'file' option of 'commit' command
2114
#: bzrlib/builtins.py:3239
2115
msgid "Take commit message from this file."
2116
msgstr ""
2117
2118
# help of 'strict' option of 'commit' command
2119
#: bzrlib/builtins.py:3241
2120
msgid "Refuse to commit if there are unknown files in the working tree."
2121
msgstr ""
2122
2123
# help of 'commit-time' option of 'commit' command
2124
#: bzrlib/builtins.py:3244
2125
msgid ""
2126
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2127
"08:00:00 +0100'."
2128
msgstr ""
2129
2130
# help of 'fixes' option of 'commit' command
2131
#: bzrlib/builtins.py:3247
2132
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2133
msgstr ""
2134
2135
# help of 'author' option of 'commit' command
2136
#: bzrlib/builtins.py:3250
2137
msgid "Set the author's name, if it's different from the committer."
2138
msgstr ""
2139
2140
# help of 'local' option of 'commit' command
2141
#: bzrlib/builtins.py:3253
2142
msgid ""
2143
"Perform a local commit in a bound branch. Local commits are not pushed to "
2144
"the master branch until a normal commit is performed."
2145
msgstr ""
2146
2147
# help of 'show-diff' option of 'commit' command
2148
#: bzrlib/builtins.py:3259
2149
msgid ""
2150
"When no message is supplied, show the diff along with the status summary in "
2151
"the message editor."
2152
msgstr ""
2153
2154
# help of 'lossy' option of 'commit' command
2155
#: bzrlib/builtins.py:3262
2156
msgid ""
2157
"When committing to a foreign version control system do not push data that "
2158
"can not be natively represented."
2159
msgstr ""
2160
2161
#: bzrlib/builtins.py:3280
2162
#, python-format
2163
msgid ""
2164
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2165
"default bug tracker using the `bugtracker` option.\n"
2166
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2167
msgstr ""
2168
2169
#: bzrlib/builtins.py:3289
2170
#, python-format
2171
msgid ""
2172
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2173
"for more information on this feature.\n"
2174
"Commit refused."
2175
msgstr ""
2176
2177
#: bzrlib/builtins.py:3298
2178
#, python-format
2179
msgid "Unrecognized bug %s. Commit refused."
2180
msgstr ""
2181
2182
#: bzrlib/builtins.py:3301
2183
#, python-format
2184
msgid ""
2185
"%s\n"
2186
"Commit refused."
2187
msgstr ""
2188
2189
#: bzrlib/builtins.py:3325
2190
msgid "Could not parse --commit-time: "
2191
msgstr ""
2192
2193
#: bzrlib/builtins.py:3365
2194
msgid "please specify either --message or --file"
2195
msgstr ""
2196
2197
#: bzrlib/builtins.py:3394
2198
msgid "please specify a commit message with either --message or --file"
2199
msgstr ""
2200
2201
#: bzrlib/builtins.py:3397
2202
msgid ""
2203
"Empty commit message specified. Please specify a commit message with either "
2204
"--message or --file or leave a blank message with --message \"\"."
2205
msgstr ""
2206
2207
#: bzrlib/builtins.py:3417
2208
msgid ""
2209
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2210
"--unchanged to force an empty commit."
2211
msgstr ""
2212
2213
#: bzrlib/builtins.py:3421
2214
msgid ""
2215
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2216
"resolve FILE\" to resolve."
2217
msgstr ""
2218
2219
#: bzrlib/builtins.py:3425
2220
msgid "Commit refused because there are unknown files in the working tree."
2221
msgstr ""
2222
2223
#: bzrlib/builtins.py:3428
2224
msgid ""
2225
"\n"
2226
"To commit to master branch, run update and then commit.\n"
2227
"You can also pass --local to commit to continue working disconnected."
2228
msgstr ""
2229
2230
#: bzrlib/builtins.py:3436
2231
msgid ""
2232
"Validate working tree structure, branch consistency and repository history."
2233
msgstr ""
2234
2235
#: bzrlib/builtins.py:3438
2236
msgid ""
2237
"This command checks various invariants about branch and repository storage\n"
2238
"to detect data corruption or bzr bugs."
2239
msgstr ""
2240
2241
#: bzrlib/builtins.py:3441
2242
msgid ""
2243
"The working tree and branch checks will only give output if a problem is\n"
2244
"detected. The output fields of the repository check are:"
2245
msgstr ""
2246
2247
#: bzrlib/builtins.py:3444
2248
msgid ""
2249
"revisions\n"
2250
" This is just the number of revisions checked. It doesn't\n"
2251
" indicate a problem."
2252
msgstr ""
2253
2254
#: bzrlib/builtins.py:3448
2255
msgid ""
2256
"versionedfiles\n"
2257
" This is just the number of versionedfiles checked. It\n"
2258
" doesn't indicate a problem."
2259
msgstr ""
2260
2261
#: bzrlib/builtins.py:3452
2262
msgid ""
2263
"unreferenced ancestors\n"
2264
" Texts that are ancestors of other texts, but\n"
2265
" are not properly referenced by the revision ancestry. This is a\n"
2266
" subtle problem that Bazaar can work around."
2267
msgstr ""
2268
2269
#: bzrlib/builtins.py:3457
2270
msgid ""
2271
"unique file texts\n"
2272
" This is the total number of unique file contents\n"
2273
" seen in the checked revisions. It does not indicate a problem."
2274
msgstr ""
2275
2276
#: bzrlib/builtins.py:3461
2277
msgid ""
2278
"repeated file texts\n"
2279
" This is the total number of repeated texts seen\n"
2280
" in the checked revisions. Texts can be repeated when their file\n"
2281
" entries are modified, but the file contents are not. It does not\n"
2282
" indicate a problem."
2283
msgstr ""
2284
2285
#: bzrlib/builtins.py:3467
2286
msgid ""
2287
"If no restrictions are specified, all Bazaar data that is found at the "
2288
"given\n"
2289
"location will be checked."
2290
msgstr ""
2291
2292
#: bzrlib/builtins.py:3470
2293
msgid ":Examples:"
2294
msgstr ""
2295
2296
#: bzrlib/builtins.py:3472
2297
msgid " Check the tree and branch at 'foo'::"
2298
msgstr ""
2299
2300
#: bzrlib/builtins.py:3474
2301
msgid " bzr check --tree --branch foo"
2302
msgstr ""
2303
2304
#: bzrlib/builtins.py:3476
2305
msgid " Check only the repository at 'bar'::"
2306
msgstr ""
2307
2308
#: bzrlib/builtins.py:3478
2309
msgid " bzr check --repo bar"
2310
msgstr ""
2311
2312
#: bzrlib/builtins.py:3480
2313
msgid " Check everything at 'baz'::"
2314
msgstr ""
2315
2316
#: bzrlib/builtins.py:3482
2317
msgid " bzr check baz"
2318
msgstr ""
2319
2320
# help of 'branch' option of 'check' command
2321
#: bzrlib/builtins.py:3488
2322
msgid "Check the branch related to the current directory."
2323
msgstr ""
2324
2325
# help of 'repo' option of 'check' command
2326
#: bzrlib/builtins.py:3490
2327
msgid "Check the repository related to the current directory."
2328
msgstr ""
2329
2330
# help of 'tree' option of 'check' command
2331
#: bzrlib/builtins.py:3492
2332
msgid "Check the working tree related to the current directory."
2333
msgstr ""
2334
2335
#: bzrlib/builtins.py:3506
2336
msgid "Upgrade a repository, branch or working tree to a newer format."
2337
msgstr ""
2338
2339
#: bzrlib/builtins.py:3508
2340
msgid ""
2341
"When the default format has changed after a major new release of\n"
2342
"Bazaar, you may be informed during certain operations that you\n"
2343
"should upgrade. Upgrading to a newer format may improve performance\n"
2344
"or make new features available. It may however limit interoperability\n"
2345
"with older repositories or with older versions of Bazaar."
2346
msgstr ""
2347
2348
#: bzrlib/builtins.py:3514
2349
msgid ""
2350
"If you wish to upgrade to a particular format rather than the\n"
2351
"current default, that can be specified using the --format option.\n"
2352
"As a consequence, you can use the upgrade command this way to\n"
2353
"\"downgrade\" to an earlier format, though some conversions are\n"
2354
"a one way process (e.g. changing from the 1.x default to the\n"
2355
"2.x default) so downgrading is not always possible."
2356
msgstr ""
2357
2358
#: bzrlib/builtins.py:3521
2359
msgid ""
2360
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2361
"process (where # is a number). By default, this is left there on\n"
2362
"completion. If the conversion fails, delete the new .bzr directory\n"
2363
"and rename this one back in its place. Use the --clean option to ask\n"
2364
"for the backup.bzr directory to be removed on successful conversion.\n"
2365
"Alternatively, you can delete it by hand if everything looks good\n"
2366
"afterwards."
2367
msgstr ""
2368
2369
#: bzrlib/builtins.py:3529
2370
msgid ""
2371
"If the location given is a shared repository, dependent branches\n"
2372
"are also converted provided the repository converts successfully.\n"
2373
"If the conversion of a branch fails, remaining branches are still\n"
2374
"tried."
2375
msgstr ""
2376
2377
#: bzrlib/builtins.py:3534
2378
msgid ""
2379
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2380
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2381
msgstr ""
2382
2383
# help of 'format' option of 'upgrade' command
2384
#: bzrlib/builtins.py:3542
2385
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2386
msgstr ""
2387
2388
# title of 'format' option of 'init' command
2389
#: bzrlib/builtins.py:3546
2390
msgid "Branch format"
2391
msgstr ""
2392
2393
# help of 'clean' option of 'upgrade' command
2394
#: bzrlib/builtins.py:3548
2395
msgid "Remove the backup.bzr directory if successful."
2396
msgstr ""
2397
2398
#: bzrlib/builtins.py:3565
2399
msgid "Show or set bzr user id."
2400
msgstr ""
2401
2402
#: bzrlib/builtins.py:3567
2403
msgid ""
2404
":Examples:\n"
2405
" Show the email of the current user::"
2406
msgstr ""
2407
2408
#: bzrlib/builtins.py:3570
2409
msgid " bzr whoami --email"
2410
msgstr ""
2411
2412
#: bzrlib/builtins.py:3572
2413
msgid " Set the current user::"
2414
msgstr ""
2415
2416
#: bzrlib/builtins.py:3574
2417
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2418
msgstr ""
2419
2420
# help of 'email' option of 'whoami' command
2421
#: bzrlib/builtins.py:3578
2422
msgid "Display email address only."
2423
msgstr ""
2424
2425
# help of 'branch' option of 'whoami' command
2426
#: bzrlib/builtins.py:3580
2427
msgid "Set identity for the current branch instead of globally."
2428
msgstr ""
2429
2430
#: bzrlib/builtins.py:3604
2431
msgid "--email can only be used to display existing identity"
2432
msgstr ""
2433
2434
#: bzrlib/builtins.py:3626
2435
msgid "Print or set the branch nickname."
2436
msgstr ""
2437
2438
#: bzrlib/builtins.py:3628
2439
msgid ""
2440
"If unset, the tree root directory name is used as the nickname.\n"
2441
"To print the current nickname, execute with no argument."
2442
msgstr ""
2443
2444
#: bzrlib/builtins.py:3631
2445
msgid ""
2446
"Bound branches use the nickname of its master branch unless it is set\n"
2447
"locally."
2448
msgstr ""
2449
2450
#: bzrlib/builtins.py:3651
2451
msgid "Set/unset and display aliases."
2452
msgstr ""
2453
2454
#: bzrlib/builtins.py:3653
2455
msgid ""
2456
":Examples:\n"
2457
" Show the current aliases::"
2458
msgstr ""
2459
2460
#: bzrlib/builtins.py:3656
2461
msgid " bzr alias"
2462
msgstr ""
2463
2464
#: bzrlib/builtins.py:3658
2465
msgid " Show the alias specified for 'll'::"
2466
msgstr ""
2467
2468
#: bzrlib/builtins.py:3660
2469
msgid " bzr alias ll"
2470
msgstr ""
2471
2472
#: bzrlib/builtins.py:3662
2473
msgid " Set an alias for 'll'::"
2474
msgstr ""
2475
2476
#: bzrlib/builtins.py:3664
2477
msgid " bzr alias ll=\"log --line -r-10..-1\""
2478
msgstr ""
2479
2480
#: bzrlib/builtins.py:3666
2481
msgid " To remove an alias for 'll'::"
2482
msgstr ""
2483
2484
#: bzrlib/builtins.py:3668
2485
msgid " bzr alias --remove ll"
2486
msgstr ""
2487
2488
# help of 'remove' option of 'alias' command
2489
#: bzrlib/builtins.py:3673
2490
msgid "Remove the alias."
2491
msgstr ""
2492
2493
#: bzrlib/builtins.py:3691
2494
msgid "bzr alias --remove expects an alias to remove."
2495
msgstr ""
2496
2497
#: bzrlib/builtins.py:3863
2498
msgid "subunit not available. subunit needs to be installed to use --subunit."
2499
msgstr ""
2500
2501
#: bzrlib/builtins.py:3880
2502
msgid ""
2503
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2504
msgstr ""
2505
2506
#: bzrlib/builtins.py:3927
2507
msgid "Show version of bzr."
2508
msgstr ""
2509
2510
# help of 'short' option of 'version' command
2511
#: bzrlib/builtins.py:3931
2512
msgid "Print just the version number."
2513
msgstr ""
2514
2515
#: bzrlib/builtins.py:3950
2516
msgid "It sure does!\n"
2517
msgstr ""
2518
2519
#: bzrlib/builtins.py:3974
2520
#, python-format
2521
msgid "merge base is revision %s\n"
2522
msgstr ""
2523
2524
#: bzrlib/builtins.py:3978
2525
msgid "Perform a three-way merge."
2526
msgstr ""
2527
2528
#: bzrlib/builtins.py:3980
2529
msgid ""
2530
"The source of the merge can be specified either in the form of a branch,\n"
2531
"or in the form of a path to a file containing a merge directive generated\n"
2532
"with bzr send. If neither is specified, the default is the upstream branch\n"
2533
"or the branch most recently merged using --remember. The source of the\n"
2534
"merge may also be specified in the form of a path to a file in another\n"
2535
"branch: in this case, only the modifications to that file are merged into\n"
2536
"the current working tree."
2537
msgstr ""
2538
2539
#: bzrlib/builtins.py:3988
2540
msgid ""
2541
"When merging from a branch, by default bzr will try to merge in all new\n"
2542
"work from the other branch, automatically determining an appropriate base\n"
2543
"revision. If this fails, you may need to give an explicit base."
2544
msgstr ""
2545
2546
#: bzrlib/builtins.py:3992
2547
msgid ""
2548
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2549
"try to merge in all new work up to and including revision OTHER."
2550
msgstr ""
2551
2552
#: bzrlib/builtins.py:3995
2553
msgid ""
2554
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2555
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2556
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2557
"not already contain revision BASE, such a merge is commonly referred to as\n"
2558
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2559
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2560
"changes from the other branch is not stored in the commit."
2561
msgstr ""
2562
2563
#: bzrlib/builtins.py:4003
2564
msgid "Revision numbers are always relative to the source branch."
2565
msgstr ""
2566
2567
#: bzrlib/builtins.py:4010
2568
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2569
msgstr ""
2570
2571
#: bzrlib/builtins.py:4012
2572
msgid ""
2573
"If there is no default branch set, the first merge will set it (use\n"
2574
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2575
"to use the default. To change the default, use --remember. The value will\n"
2576
"only be saved if the remote location can be accessed."
2577
msgstr ""
2578
2579
#: bzrlib/builtins.py:4017
2580
msgid ""
2581
"The results of the merge are placed into the destination working\n"
2582
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2583
"committed to record the result of the merge."
2584
msgstr ""
2585
2586
#: bzrlib/builtins.py:4021
2587
msgid ""
2588
"merge refuses to run if there are any uncommitted changes, unless\n"
2589
"--force is given. If --force is given, then the changes from the source \n"
2590
"will be merged with the current working tree, including any uncommitted\n"
2591
"changes in the tree. The --force option can also be used to create a\n"
2592
"merge revision which has more than two parents."
2593
msgstr ""
2594
2595
#: bzrlib/builtins.py:4027
2596
msgid ""
2597
"If one would like to merge changes from the working tree of the other\n"
2598
"branch without merging any committed revisions, the --uncommitted option\n"
2599
"can be given."
2600
msgstr ""
2601
2602
#: bzrlib/builtins.py:4031
2603
msgid ""
2604
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2605
"you to apply each diff hunk and file change, similar to \"shelve\"."
2606
msgstr ""
2607
2608
#: bzrlib/builtins.py:4034
2609
msgid ""
2610
":Examples:\n"
2611
" To merge all new revisions from bzr.dev::"
2612
msgstr ""
2613
2614
#: bzrlib/builtins.py:4037
2615
msgid " bzr merge ../bzr.dev"
2616
msgstr ""
2617
2618
#: bzrlib/builtins.py:4039
2619
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2620
msgstr ""
2621
2622
#: bzrlib/builtins.py:4041
2623
msgid " bzr merge -r 82 ../bzr.dev"
2624
msgstr ""
2625
2626
#: bzrlib/builtins.py:4043
2627
msgid " To merge the changes introduced by 82, without previous changes::"
2628
msgstr ""
2629
2630
#: bzrlib/builtins.py:4045
2631
msgid " bzr merge -r 81..82 ../bzr.dev"
2632
msgstr ""
2633
2634
#: bzrlib/builtins.py:4047
2635
msgid " To apply a merge directive contained in /tmp/merge::"
2636
msgstr ""
2637
2638
#: bzrlib/builtins.py:4049
2639
msgid " bzr merge /tmp/merge"
2640
msgstr ""
2641
2642
#: bzrlib/builtins.py:4051
2643
msgid ""
2644
" To create a merge revision with three parents from two branches\n"
2645
" feature1a and feature1b:"
2646
msgstr ""
2647
2648
#: bzrlib/builtins.py:4054
2649
msgid ""
2650
" bzr merge ../feature1a\n"
2651
" bzr merge ../feature1b --force\n"
2652
" bzr commit -m 'revision with three parents'"
2653
msgstr ""
2654
2655
# help of 'force' option of 'merge' command
2656
#: bzrlib/builtins.py:4066
2657
msgid "Merge even if the destination tree has uncommitted changes."
2658
msgstr ""
2659
2660
# help of 'uncommitted' option of 'merge' command
2661
#: bzrlib/builtins.py:4072
2662
msgid ""
2663
"Apply uncommitted changes from a working copy, instead of branch changes."
2664
msgstr ""
2665
2666
# help of 'pull' option of 'merge' command
2667
#: bzrlib/builtins.py:4074
2668
msgid ""
2669
"If the destination is already completely merged into the source, pull from "
2670
"the source rather than merging. When this happens, you do not need to "
2671
"commit the result."
2672
msgstr ""
2673
2674
# help of 'directory' option of 'merge' command
2675
#: bzrlib/builtins.py:4079
2676
msgid ""
2677
"Branch to merge into, rather than the one containing the working directory."
2678
msgstr ""
2679
2680
# help of 'preview' option of 'merge' command
2681
#: bzrlib/builtins.py:4081
2682
msgid "Instead of merging, show a diff of the merge."
2683
msgstr ""
2684
2685
# help of 'interactive' option of 'merge' command
2686
#: bzrlib/builtins.py:4083
2687
msgid "Select changes interactively."
2688
msgstr ""
2689
2690
#: bzrlib/builtins.py:4105
2691
msgid ""
2692
"Merging into empty branches not currently supported, https://bugs.launchpad."
2693
"net/bzr/+bug/308562"
2694
msgstr ""
2695
2696
#: bzrlib/builtins.py:4132
2697
msgid "Cannot use --uncommitted with bundles or merge directives."
2698
msgstr ""
2699
2700
#: bzrlib/builtins.py:4143
2701
msgid "Cannot use --uncommitted and --revision at the same time."
2702
msgstr ""
2703
2704
#: bzrlib/builtins.py:4163
2705
msgid "merger: "
2706
msgstr ""
2707
2708
#: bzrlib/builtins.py:4165 bzrlib/bundle/apply_bundle.py:67
2709
msgid "Nothing to do."
2710
msgstr ""
2711
2712
#: bzrlib/builtins.py:4169
2713
msgid "Cannot pull individual files"
2714
msgstr ""
2715
2716
#: bzrlib/builtins.py:4177
2717
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2718
msgstr ""
2719
2720
#: bzrlib/builtins.py:4235
2721
#, python-format
2722
msgid "Show-base is not supported for this merge type. %s"
2723
msgstr ""
2724
2725
#: bzrlib/builtins.py:4244
2726
#, python-format
2727
msgid "Conflict reduction is not supported for merge type %s."
2728
msgstr ""
2729
2730
#: bzrlib/builtins.py:4248
2731
msgid "Cannot do conflict reduction and show base."
2732
msgstr ""
2733
2734
#: bzrlib/builtins.py:4359
2735
msgid "No location specified or remembered"
2736
msgstr ""
2737
2738
#: bzrlib/builtins.py:4361
2739
msgid "{0} remembered {1} location {2}"
2740
msgstr ""
2741
2742
#: bzrlib/builtins.py:4367
2743
msgid "Redo a merge."
2744
msgstr ""
2745
2746
#: bzrlib/builtins.py:4369
2747
msgid ""
2748
"Use this if you want to try a different merge technique while resolving\n"
2749
"conflicts. Some merge techniques are better than others, and remerge\n"
2750
"lets you try different ones on different files."
2751
msgstr ""
2752
2753
#: bzrlib/builtins.py:4373
2754
msgid ""
2755
"The options for remerge have the same meaning and defaults as the ones for\n"
2756
"merge. The difference is that remerge can (only) be run when there is a\n"
2757
"pending merge, and it lets you specify particular files."
2758
msgstr ""
2759
2760
#: bzrlib/builtins.py:4377
2761
msgid ""
2762
":Examples:\n"
2763
" Re-do the merge of all conflicted files, and show the base text in\n"
2764
" conflict regions, in addition to the usual THIS and OTHER texts::"
2765
msgstr ""
2766
2767
#: bzrlib/builtins.py:4381
2768
msgid " bzr remerge --show-base"
2769
msgstr ""
2770
2771
#: bzrlib/builtins.py:4383
2772
msgid ""
2773
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2774
" additional processing to reduce the size of conflict regions::"
2775
msgstr ""
2776
2777
#: bzrlib/builtins.py:4386
2778
msgid " bzr remerge --merge-type weave --reprocess foobar"
2779
msgstr ""
2780
2781
# help of 'show-base' option of 'merge' command
2782
#: bzrlib/builtins.py:4393
2783
msgid "Show base revision text in conflicts."
2784
msgstr ""
2785
2786
#: bzrlib/builtins.py:4405
2787
msgid ""
2788
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2789
"merges."
2790
msgstr ""
2791
2792
#: bzrlib/builtins.py:4461
2793
msgid "Revert files to a previous revision."
2794
msgstr ""
2795
2796
#: bzrlib/builtins.py:4463
2797
msgid ""
2798
"Giving a list of files will revert only those files. Otherwise, all files\n"
2799
"will be reverted. If the revision is not specified with '--revision', the\n"
2800
"last committed revision is used."
2801
msgstr ""
2802
2803
#: bzrlib/builtins.py:4467
2804
msgid ""
2805
"To remove only some changes, without reverting to a prior version, use\n"
2806
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2807
"will remove the changes introduced by the second last commit (-2), without\n"
2808
"affecting the changes introduced by the last commit (-1). To remove\n"
2809
"certain changes on a hunk-by-hunk basis, see the shelve command."
2810
msgstr ""
2811
2812
#: bzrlib/builtins.py:4473
2813
msgid ""
2814
"By default, any files that have been manually changed will be backed up\n"
2815
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2816
"'.~#~' appended to their name, where # is a number."
2817
msgstr ""
2818
2819
#: bzrlib/builtins.py:4477
2820
msgid ""
2821
"When you provide files, you can use their current pathname or the pathname\n"
2822
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2823
"name. If you name a directory, all the contents of that directory will be\n"
2824
"reverted."
2825
msgstr ""
2826
2827
#: bzrlib/builtins.py:4482
2828
msgid ""
2829
"If you have newly added files since the target revision, they will be\n"
2830
"removed. If the files to be removed have been changed, backups will be\n"
2831
"created as above. Directories containing unknown files will not be\n"
2832
"deleted."
2833
msgstr ""
2834
2835
#: bzrlib/builtins.py:4487
2836
msgid ""
2837
"The working tree contains a list of revisions that have been merged but\n"
2838
"not yet committed. These revisions will be included as additional parents\n"
2839
"of the next commit. Normally, using revert clears that list as well as\n"
2840
"reverting the files. If any files are specified, revert leaves the list\n"
2841
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2842
".`` in the tree root to revert all files but keep the recorded merges,\n"
2843
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2844
"reverting any files."
2845
msgstr ""
2846
2847
#: bzrlib/builtins.py:4496
2848
msgid ""
2849
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2850
"changes from a branch in a single revision. To do this, perform the merge\n"
2851
"as desired. Then doing revert with the \"--forget-merges\" option will "
2852
"keep\n"
2853
"the content of the tree as it was, but it will clear the list of pending\n"
2854
"merges. The next commit will then contain all of the changes that are\n"
2855
"present in the other branch, but without any other parent revisions.\n"
2856
"Because this technique forgets where these changes originated, it may\n"
2857
"cause additional conflicts on later merges involving the same source and\n"
2858
"target branches."
2859
msgstr ""
2860
2861
# help of 'no-backup' option of 'revert' command
2862
#: bzrlib/builtins.py:4510
2863
msgid "Do not save backups of reverted files."
2864
msgstr ""
2865
2866
# help of 'forget-merges' option of 'revert' command
2867
#: bzrlib/builtins.py:4512
2868
msgid "Remove pending merge marker, without changing any files."
2869
msgstr ""
2870
2871
#: bzrlib/builtins.py:4543
2872
msgid ""
2873
"Show help on a command or other topic.\n"
2874
" "
2875
msgstr ""
2876
2877
# help of 'long' option of 'help' command
2878
#: bzrlib/builtins.py:4548
2879
msgid "Show help on all commands."
2880
msgstr ""
2881
2882
#: bzrlib/builtins.py:4577
2883
msgid "Show unmerged/unpulled revisions between two branches."
2884
msgstr ""
2885
2886
#: bzrlib/builtins.py:4579
2887
msgid "OTHER_BRANCH may be local or remote."
2888
msgstr ""
2889
2890
#: bzrlib/builtins.py:4581
2891
msgid ""
2892
"To filter on a range of revisions, you can use the command -r begin..end\n"
2893
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2894
"also valid.\n"
2895
" \n"
2896
":Exit values:\n"
2897
" 1 - some missing revisions\n"
2898
" 0 - no missing revisions"
2899
msgstr ""
2900
2901
#: bzrlib/builtins.py:4591
2902
msgid ""
2903
" Determine the missing revisions between this and the branch at the\n"
2904
" remembered pull location::"
2905
msgstr ""
2906
2907
#: bzrlib/builtins.py:4594
2908
msgid " bzr missing"
2909
msgstr ""
2910
2911
#: bzrlib/builtins.py:4596
2912
msgid " Determine the missing revisions between this and another branch::"
2913
msgstr ""
2914
2915
#: bzrlib/builtins.py:4598
2916
msgid " bzr missing http://server/branch"
2917
msgstr ""
2918
2919
#: bzrlib/builtins.py:4600
2920
msgid ""
2921
" Determine the missing revisions up to a specific revision on the other\n"
2922
" branch::"
2923
msgstr ""
2924
2925
#: bzrlib/builtins.py:4603
2926
msgid " bzr missing -r ..-10"
2927
msgstr ""
2928
2929
#: bzrlib/builtins.py:4605
2930
msgid ""
2931
" Determine the missing revisions up to a specific revision on this\n"
2932
" branch::"
2933
msgstr ""
2934
2935
#: bzrlib/builtins.py:4608
2936
msgid " bzr missing --my-revision ..-10"
2937
msgstr ""
2938
2939
# help of 'reverse' option of 'missing' command
2940
#: bzrlib/builtins.py:4615
2941
msgid "Reverse the order of revisions."
2942
msgstr ""
2943
2944
# help of 'mine-only' option of 'missing' command
2945
#: bzrlib/builtins.py:4617
2946
msgid "Display changes in the local branch only."
2947
msgstr ""
2948
2949
# help of 'this' option of 'missing' command
2950
#: bzrlib/builtins.py:4618
2951
msgid "Same as --mine-only."
2952
msgstr ""
2953
2954
# help of 'theirs-only' option of 'missing' command
2955
#: bzrlib/builtins.py:4620
2956
msgid "Display changes in the remote branch only."
2957
msgstr ""
2958
2959
# help of 'other' option of 'missing' command
2960
#: bzrlib/builtins.py:4621
2961
msgid "Same as --theirs-only."
2962
msgstr ""
2963
2964
# help of 'revision' option of 'missing' command
2965
#: bzrlib/builtins.py:4626
2966
msgid ""
2967
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
2968
"details."
2969
msgstr ""
2970
2971
# help of 'my-revision' option of 'missing' command
2972
#: bzrlib/builtins.py:4630
2973
msgid ""
2974
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
2975
"details."
2976
msgstr ""
2977
2978
# help of 'include-merged' option of 'missing' command
2979
#: bzrlib/builtins.py:4633
2980
msgid "Show all revisions in addition to the mainline ones."
2981
msgstr ""
2982
2983
#: bzrlib/builtins.py:4687
2984
msgid "No peer location known or specified."
2985
msgstr ""
2986
2987
#: bzrlib/builtins.py:4691
2988
msgid "Using saved parent location: {0}\n"
2989
msgstr ""
2990
2991
#: bzrlib/builtins.py:4724
2992
#, python-format
2993
msgid "You have %d extra revision:\n"
2994
msgid_plural "You have %d extra revisions:\n"
2995
msgstr[0] ""
2996
msgstr[1] ""
2997
2998
#: bzrlib/builtins.py:4740
2999
#, python-format
3000
msgid "You are missing %d revision:\n"
3001
msgid_plural "You are missing %d revisions:\n"
3002
msgstr[0] ""
3003
msgstr[1] ""
3004
3005
#: bzrlib/builtins.py:4752
3006
msgid "This branch has no new revisions.\n"
3007
msgstr ""
3008
3009
#: bzrlib/builtins.py:4755
3010
msgid "Other branch has no new revisions.\n"
3011
msgstr ""
3012
3013
#: bzrlib/builtins.py:4760
3014
msgid "Branches are up to date.\n"
3015
msgstr ""
3016
3017
#: bzrlib/builtins.py:4771
3018
msgid "Compress the data within a repository."
3019
msgstr ""
3020
3021
#: bzrlib/builtins.py:4773
3022
msgid ""
3023
"This operation compresses the data within a bazaar repository. As\n"
3024
"bazaar supports automatic packing of repository, this operation is\n"
3025
"normally not required to be done manually."
3026
msgstr ""
3027
3028
#: bzrlib/builtins.py:4777
3029
msgid ""
3030
"During the pack operation, bazaar takes a backup of existing repository\n"
3031
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3032
"automatically when it is safe to do so. To save disk space by removing\n"
3033
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3034
"used."
3035
msgstr ""
3036
3037
#: bzrlib/builtins.py:4783
3038
msgid ""
3039
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3040
"during or immediately after repacking, you may be left with a state\n"
3041
"where the deletion has been written to disk but the new packs have not\n"
3042
"been. In this case the repository may be unusable."
3043
msgstr ""
3044
3045
# help of 'clean-obsolete-packs' option of 'pack' command
3046
#: bzrlib/builtins.py:4792
3047
msgid "Delete obsolete packs to save disk space."
3048
msgstr ""
3049
3050
#: bzrlib/builtins.py:4806
3051
msgid "List the installed plugins."
3052
msgstr ""
3053
3054
#: bzrlib/builtins.py:4808
3055
msgid ""
3056
"This command displays the list of installed plugins including\n"
3057
"version of plugin and a short description of each."
3058
msgstr ""
3059
3060
#: bzrlib/builtins.py:4811
3061
msgid "--verbose shows the path where each plugin is located."
3062
msgstr ""
3063
3064
#: bzrlib/builtins.py:4813
3065
msgid ""
3066
"A plugin is an external component for Bazaar that extends the\n"
3067
"revision control system, by adding or replacing code in Bazaar.\n"
3068
"Plugins can do a variety of things, including overriding commands,\n"
3069
"adding new commands, providing additional network transports and\n"
3070
"customizing log output."
3071
msgstr ""
3072
3073
#: bzrlib/builtins.py:4819
3074
msgid ""
3075
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3076
"for further information on plugins including where to find them and how to\n"
3077
"install them. Instructions are also provided there on how to write new\n"
3078
"plugins using the Python programming language."
3079
msgstr ""
3080
3081
#: bzrlib/builtins.py:4835
3082
msgid "Show testament (signing-form) of a revision."
3083
msgstr ""
3084
3085
# help of 'long' option of 'testament' command
3086
#: bzrlib/builtins.py:4838
3087
msgid "Produce long-format testament."
3088
msgstr ""
3089
3090
# help of 'strict' option of 'testament' command
3091
#: bzrlib/builtins.py:4840
3092
msgid "Produce a strict-format testament."
3093
msgstr ""
3094
3095
#: bzrlib/builtins.py:4866
3096
msgid "Show the origin of each line in a file."
3097
msgstr ""
3098
3099
#: bzrlib/builtins.py:4868
3100
msgid ""
3101
"This prints out the given file with an annotation on the left side\n"
3102
"indicating which revision, author and date introduced the change."
3103
msgstr ""
3104
3105
#: bzrlib/builtins.py:4871
3106
msgid ""
3107
"If the origin is the same for a run of consecutive lines, it is\n"
3108
"shown only at the top, unless the --all option is given."
3109
msgstr ""
3110
3111
# help of 'all' option of 'annotate' command
3112
#: bzrlib/builtins.py:4879
3113
msgid "Show annotations on all lines."
3114
msgstr ""
3115
3116
# help of 'long' option of 'annotate' command
3117
#: bzrlib/builtins.py:4880
3118
msgid "Show commit date in annotations."
3119
msgstr ""
3120
3121
#: bzrlib/builtins.py:4967
3122
msgid "Cannot sign a range of non-revision-history revisions"
3123
msgstr ""
3124
3125
#: bzrlib/builtins.py:4979
3126
msgid "Please supply either one revision, or a range."
3127
msgstr ""
3128
3129
#: bzrlib/builtins.py:4983
3130
msgid ""
3131
"Convert the current branch into a checkout of the supplied branch.\n"
3132
"If no branch is supplied, rebind to the last bound location."
3133
msgstr ""
3134
3135
#: bzrlib/builtins.py:4986
3136
msgid ""
3137
"Once converted into a checkout, commits must succeed on the master branch\n"
3138
"before they will be applied to the local branch."
3139
msgstr ""
3140
3141
#: bzrlib/builtins.py:4989
3142
msgid ""
3143
"Bound branches use the nickname of its master branch unless it is set\n"
3144
"locally, in which case binding will update the local nickname to be\n"
3145
"that of the master."
3146
msgstr ""
3147
3148
#: bzrlib/builtins.py:5004
3149
msgid "No location supplied. This format does not remember old locations."
3150
msgstr ""
3151
3152
#: bzrlib/builtins.py:5009
3153
msgid "Branch is already bound"
3154
msgstr ""
3155
3156
#: bzrlib/builtins.py:5011
3157
msgid "No location supplied and no previous location known"
3158
msgstr ""
3159
3160
#: bzrlib/builtins.py:5017
3161
msgid "These branches have diverged. Try merging, and then bind again."
3162
msgstr ""
3163
3164
#: bzrlib/builtins.py:5024
3165
msgid "Convert the current checkout into a regular branch."
3166
msgstr ""
3167
3168
#: bzrlib/builtins.py:5026
3169
msgid ""
3170
"After unbinding, the local branch is considered independent and subsequent\n"
3171
"commits will be local only."
3172
msgstr ""
3173
3174
#: bzrlib/builtins.py:5037
3175
msgid "Local branch is not bound"
3176
msgstr ""
3177
3178
#: bzrlib/builtins.py:5041
3179
msgid "Remove the last committed revision."
3180
msgstr ""
3181
3182
#: bzrlib/builtins.py:5043
3183
msgid ""
3184
"--verbose will print out what is being removed.\n"
3185
"--dry-run will go through all the motions, but not actually\n"
3186
"remove anything."
3187
msgstr ""
3188
3189
#: bzrlib/builtins.py:5047
3190
msgid ""
3191
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3192
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3193
"branch at revision 15."
3194
msgstr ""
3195
3196
#: bzrlib/builtins.py:5051
3197
msgid ""
3198
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3199
"it may make is to restore any pending merges that were present before\n"
3200
"the commit."
3201
msgstr ""
3202
3203
# help of 'dry-run' option of 'uncommit' command
3204
#: bzrlib/builtins.py:5062
3205
msgid "Don't actually make changes."
3206
msgstr ""
3207
3208
# help of 'force' option of 'uncommit' command
3209
#: bzrlib/builtins.py:5063
3210
msgid "Say yes to all questions."
3211
msgstr ""
3212
3213
# help of 'keep-tags' option of 'uncommit' command
3214
#: bzrlib/builtins.py:5065
3215
msgid "Keep tags that point to removed revisions."
3216
msgstr ""
3217
3218
# help of 'local' option of 'uncommit' command
3219
#: bzrlib/builtins.py:5067
3220
msgid "Only remove the commits from the local branch when in a checkout."
3221
msgstr ""
3222
3223
#: bzrlib/builtins.py:5116
3224
msgid "No revisions to uncommit.\n"
3225
msgstr ""
3226
3227
#: bzrlib/builtins.py:5131
3228
msgid "Dry-run, pretending to remove the above revisions.\n"
3229
msgstr ""
3230
3231
#: bzrlib/builtins.py:5134
3232
msgid "The above revision(s) will be removed.\n"
3233
msgstr ""
3234
3235
#: bzrlib/builtins.py:5138
3236
msgid "Uncommit these revisions"
3237
msgstr ""
3238
3239
#: bzrlib/builtins.py:5141
3240
msgid "Canceled\n"
3241
msgstr ""
3242
3243
#: bzrlib/builtins.py:5148
3244
#, python-format
3245
msgid ""
3246
"You can restore the old tip by running:\n"
3247
" bzr pull . -r revid:%s\n"
3248
msgstr ""
3249
3250
#: bzrlib/builtins.py:5153
3251
msgid "Break a dead lock."
3252
msgstr ""
3253
3254
#: bzrlib/builtins.py:5155
3255
msgid ""
3256
"This command breaks a lock on a repository, branch, working directory or\n"
3257
"config file."
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:5158
3261
msgid ""
3262
"CAUTION: Locks should only be broken when you are sure that the process\n"
3263
"holding the lock has been stopped."
3264
msgstr ""
3265
3266
#: bzrlib/builtins.py:5161
3267
msgid ""
3268
"You can get information on what locks are open via the 'bzr info\n"
3269
"[location]' command."
3270
msgstr ""
3271
3272
#: bzrlib/builtins.py:5164
3273
msgid ""
3274
":Examples:\n"
3275
" bzr break-lock\n"
3276
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3277
" bzr break-lock --conf ~/.bazaar"
3278
msgstr ""
3279
3280
# help of 'config' option of 'break-lock' command
3281
#: bzrlib/builtins.py:5173
3282
msgid "LOCATION is the directory where the config lock is."
3283
msgstr ""
3284
3285
# help of 'force' option of 'break-lock' command
3286
#: bzrlib/builtins.py:5175
3287
msgid "Do not ask for confirmation before breaking the lock."
3288
msgstr ""
3289
3290
#: bzrlib/builtins.py:5211
3291
msgid "Run the bzr server."
3292
msgstr ""
3293
3294
# help of 'inet' option of 'serve' command
3295
#: bzrlib/builtins.py:5217
3296
msgid "Serve on stdin/out for use from inetd or sshd."
3297
msgstr ""
3298
3299
# title of 'protocol' option of 'serve' command
3300
#: bzrlib/builtins.py:5218
3301
msgid "protocol"
3302
msgstr ""
3303
3304
# help of 'protocol' option of 'serve' command
3305
#: bzrlib/builtins.py:5219
3306
msgid "Protocol to serve."
3307
msgstr ""
3308
3309
# help of 'port' option of 'serve' command
3310
#: bzrlib/builtins.py:5223
3311
msgid ""
3312
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3313
"Passing 0 as the port number will result in a dynamically allocated port. "
3314
"The default port depends on the protocol."
3315
msgstr ""
3316
3317
# help of 'directory' option of 'serve' command
3318
#: bzrlib/builtins.py:5229
3319
msgid "Serve contents of this directory."
3320
msgstr ""
3321
3322
# help of 'allow-writes' option of 'serve' command
3323
#: bzrlib/builtins.py:5231
3324
msgid ""
3325
"By default the server is a readonly server. Supplying --allow-writes "
3326
"enables write access to the contents of the served directory and below. "
3327
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3328
"of external authentication is arranged supplying this option leads to global "
3329
"uncontrolled write access to your file system."
3330
msgstr ""
3331
3332
#: bzrlib/builtins.py:5276
3333
msgid "Combine a tree into its containing tree."
3334
msgstr ""
3335
3336
#: bzrlib/builtins.py:5278
3337
msgid "This command requires the target tree to be in a rich-root format."
3338
msgstr ""
3339
3340
#: bzrlib/builtins.py:5280
3341
msgid ""
3342
"The TREE argument should be an independent tree, inside another tree, but\n"
3343
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3344
"running \"bzr branch\" with the target inside a tree.)"
3345
msgstr ""
3346
3347
#: bzrlib/builtins.py:5284
3348
msgid ""
3349
"The result is a combined tree, with the subtree no longer an independent\n"
3350
"part. This is marked as a merge of the subtree into the containing tree,\n"
3351
"and all history is preserved."
3352
msgstr ""
3353
3354
#: bzrlib/builtins.py:5302
3355
#, python-format
3356
msgid ""
3357
"Can't join trees because %s doesn't support rich root data.\n"
3358
"You can use bzr upgrade on the repository."
3359
msgstr ""
3360
3361
#: bzrlib/builtins.py:5312 bzrlib/builtins.py:5318
3362
msgid "Cannot join {0}. {1}"
3363
msgstr ""
3364
3365
#: bzrlib/builtins.py:5322
3366
msgid "Split a subdirectory of a tree into a separate tree."
3367
msgstr ""
3368
3369
#: bzrlib/builtins.py:5324
3370
msgid ""
3371
"This command will produce a target tree in a format that supports\n"
3372
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3373
"converted into earlier formats like 'dirstate-tags'."
3374
msgstr ""
3375
3376
#: bzrlib/builtins.py:5328
3377
msgid ""
3378
"The TREE argument should be a subdirectory of a working tree. That\n"
3379
"subdirectory will be converted into an independent tree, with its own\n"
3380
"branch. Commits in the top-level tree will not apply to the new subtree."
3381
msgstr ""
3382
3383
#: bzrlib/builtins.py:5408
3384
msgid "No submit branch specified or known"
3385
msgstr ""
3386
3387
#: bzrlib/builtins.py:5416 bzrlib/send.py:105
3388
msgid "No public branch specified or known"
3389
msgstr ""
3390
3391
#: bzrlib/builtins.py:5421
3392
msgid "bzr merge-directive takes at most two one revision identifiers"
3393
msgstr ""
3394
3395
#: bzrlib/builtins.py:5430
3396
msgid "No revisions to bundle."
3397
msgstr ""
3398
3399
#: bzrlib/builtins.py:5449
3400
msgid "Mail or create a merge-directive for submitting changes."
3401
msgstr ""
3402
3403
#: bzrlib/builtins.py:5451
3404
msgid "A merge directive provides many things needed for requesting merges:"
3405
msgstr ""
3406
3407
#: bzrlib/builtins.py:5453
3408
msgid "* A machine-readable description of the merge to perform"
3409
msgstr ""
3410
3411
#: bzrlib/builtins.py:5455
3412
msgid "* An optional patch that is a preview of the changes requested"
3413
msgstr ""
3414
3415
#: bzrlib/builtins.py:5457
3416
msgid ""
3417
"* An optional bundle of revision data, so that the changes can be applied\n"
3418
" directly from the merge directive, without retrieving data from a\n"
3419
" branch."
3420
msgstr ""
3421
3422
#: bzrlib/builtins.py:5461
3423
msgid ""
3424
"`bzr send` creates a compact data set that, when applied using bzr\n"
3425
"merge, has the same effect as merging from the source branch. "
3426
msgstr ""
3427
3428
#: bzrlib/builtins.py:5464
3429
msgid ""
3430
"By default the merge directive is self-contained and can be applied to any\n"
3431
"branch containing submit_branch in its ancestory without needing access to\n"
3432
"the source branch."
3433
msgstr ""
3434
3435
#: bzrlib/builtins.py:5468
3436
msgid ""
3437
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3438
"revisions, but only a structured request to merge from the\n"
3439
"public_location. In that case the public_branch is needed and it must be\n"
3440
"up-to-date and accessible to the recipient. The public_branch is always\n"
3441
"included if known, so that people can check it later."
3442
msgstr ""
3443
3444
#: bzrlib/builtins.py:5474
3445
msgid ""
3446
"The submit branch defaults to the parent of the source branch, but can be\n"
3447
"overridden. Both submit branch and public branch will be remembered in\n"
3448
"branch.conf the first time they are used for a particular branch. The\n"
3449
"source branch defaults to that containing the working directory, but can\n"
3450
"be changed using --from."
3451
msgstr ""
3452
3453
#: bzrlib/builtins.py:5480
3454
msgid ""
3455
"Both the submit branch and the public branch follow the usual behavior with\n"
3456
"respect to --remember: If there is no default location set, the first send\n"
3457
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3458
"omit the location to use the default. To change the default, use\n"
3459
"--remember. The value will only be saved if the location can be accessed."
3460
msgstr ""
3461
3462
#: bzrlib/builtins.py:5486
3463
msgid ""
3464
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3465
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3466
"If a public location is known for the submit_branch, that location is used\n"
3467
"in the merge directive."
3468
msgstr ""
3469
3470
#: bzrlib/builtins.py:5491
3471
msgid ""
3472
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3473
"given, in which case it is sent to a file."
3474
msgstr ""
3475
3476
#: bzrlib/builtins.py:5494
3477
msgid ""
3478
"Mail is sent using your preferred mail program. This should be transparent\n"
3479
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3480
"If the preferred client can't be found (or used), your editor will be used."
3481
msgstr ""
3482
3483
#: bzrlib/builtins.py:5498
3484
msgid ""
3485
"To use a specific mail program, set the mail_client configuration option.\n"
3486
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3487
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
3488
"\" (MacOS X's\n"
3489
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3490
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3491
"add\n"
3492
"supported clients."
3493
msgstr ""
3494
3495
#: bzrlib/builtins.py:5505
3496
msgid ""
3497
"If mail is being sent, a to address is required. This can be supplied\n"
3498
"either on the commandline, by setting the submit_to configuration\n"
3499
"option in the branch itself or the child_submit_to configuration option\n"
3500
"in the submit branch."
3501
msgstr ""
3502
3503
#: bzrlib/builtins.py:5510
3504
msgid ""
3505
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3506
"and\n"
3507
"merge directive format 2. It is significantly faster and smaller than\n"
3508
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3509
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3510
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3511
msgstr ""
3512
3513
#: bzrlib/builtins.py:5516
3514
msgid ""
3515
"The merge directives created by bzr send may be applied using bzr merge or\n"
3516
"bzr pull by specifying a file containing a merge directive as the location."
3517
msgstr ""
3518
3519
#: bzrlib/builtins.py:5519
3520
msgid ""
3521
"bzr send makes extensive use of public locations to map local locations "
3522
"into\n"
3523
"URLs that can be used by other people. See `bzr help configuration` to\n"
3524
"set them, and use `bzr info` to display them."
3525
msgstr ""
3526
3527
# help of 'output' option of 'send' command
3528
#: bzrlib/builtins.py:5543
3529
msgid "Write merge directive to this file or directory; use - for stdout."
3530
msgstr ""
3531
3532
# help of 'strict' option of 'send' command
3533
#: bzrlib/builtins.py:5547
3534
msgid ""
3535
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3536
"strict disables the check."
3537
msgstr ""
3538
3539
# help of 'mail-to' option of 'send' command
3540
#: bzrlib/builtins.py:5549
3541
msgid "Mail the request to this address."
3542
msgstr ""
3543
3544
# help of 'body' option of 'send' command
3545
#: bzrlib/builtins.py:5553
3546
msgid "Body for the email."
3547
msgstr ""
3548
3549
# help of 'no-bundle' option of 'send' command
3550
#: bzrlib/builtins.py:5606
3551
msgid "Do not include a bundle in the merge directive."
3552
msgstr ""
3553
3554
# help of 'no-patch' option of 'send' command
3555
#: bzrlib/builtins.py:5607
3556
msgid "Do not include a preview patch in the merge directive."
3557
msgstr ""
3558
3559
# help of 'remember' option of 'send' command
3560
#: bzrlib/builtins.py:5610
3561
msgid "Remember submit and public branch."
3562
msgstr ""
3563
3564
# help of 'from' option of 'send' command
3565
#: bzrlib/builtins.py:5612
3566
msgid ""
3567
"Branch to generate the submission from, rather than the one containing the "
3568
"working directory."
3569
msgstr ""
3570
3571
# title of 'format' option of 'send' command
3572
#: bzrlib/builtins.py:5622
3573
msgid "format"
3574
msgstr ""
3575
3576
# help of 'format' option of 'send' command
3577
#: bzrlib/builtins.py:5623
3578
msgid "Use the specified output format."
3579
msgstr ""
3580
3581
#: bzrlib/builtins.py:5645
3582
msgid "Create, remove or modify a tag naming a revision."
3583
msgstr ""
3584
3585
#: bzrlib/builtins.py:5647
3586
msgid ""
3587
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3588
"(--revision) option can be given -rtag:X, where X is any previously\n"
3589
"created tag."
3590
msgstr ""
3591
3592
#: bzrlib/builtins.py:5651
3593
msgid ""
3594
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3595
"along when you branch, push, pull or merge."
3596
msgstr ""
3597
3598
#: bzrlib/builtins.py:5654
3599
msgid ""
3600
"It is an error to give a tag name that already exists unless you pass\n"
3601
"--force, in which case the tag is moved to point to the new revision."
3602
msgstr ""
3603
3604
#: bzrlib/builtins.py:5657
3605
msgid ""
3606
"To rename a tag (change the name but keep it on the same revsion), run "
3607
"``bzr\n"
3608
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3609
msgstr ""
3610
3611
#: bzrlib/builtins.py:5660
3612
msgid ""
3613
"If no tag name is specified it will be determined through the \n"
3614
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3615
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3616
"details."
3617
msgstr ""
3618
3619
# help of 'delete' option of 'tag' command
3620
#: bzrlib/builtins.py:5670
3621
msgid "Delete this tag rather than placing it."
3622
msgstr ""
3623
3624
# help of 'directory' option of 'tag' command
3625
#: bzrlib/builtins.py:5673
3626
msgid "Branch in which to place the tag."
3627
msgstr ""
3628
3629
# help of 'force' option of 'tag' command
3630
#: bzrlib/builtins.py:5675
3631
msgid "Replace existing tags."
3632
msgstr ""
3633
3634
#: bzrlib/builtins.py:5690
3635
msgid "No tag specified to delete."
3636
msgstr ""
3637
3638
#: bzrlib/builtins.py:5692
3639
#, python-format
3640
msgid "Deleted tag %s."
3641
msgstr ""
3642
3643
#: bzrlib/builtins.py:5697
3644
msgid "Tags can only be placed on a single revision, not on a range"
3645
msgstr ""
3646
3647
#: bzrlib/builtins.py:5706
3648
msgid "Please specify a tag name."
3649
msgstr ""
3650
3651
#: bzrlib/builtins.py:5714
3652
#, python-format
3653
msgid "Tag %s already exists for that revision."
3654
msgstr ""
3655
3656
#: bzrlib/builtins.py:5718
3657
#, python-format
3658
msgid "Created tag %s."
3659
msgstr ""
3660
3661
#: bzrlib/builtins.py:5720
3662
#, python-format
3663
msgid "Updated tag %s."
3664
msgstr ""
3665
3666
#: bzrlib/builtins.py:5724
3667
msgid "List tags."
3668
msgstr ""
3669
3670
#: bzrlib/builtins.py:5726
3671
msgid ""
3672
"This command shows a table of tag names and the revisions they reference."
3673
msgstr ""
3674
3675
# help of 'directory' option of 'tags' command
3676
#: bzrlib/builtins.py:5732
3677
msgid "Branch whose tags should be displayed."
3678
msgstr ""
3679
3680
# help of 'sort' option of 'tags' command
3681
#: bzrlib/builtins.py:5734
3682
msgid "Sort tags by different criteria."
3683
msgstr ""
3684
3685
# title of 'sort' option of 'tags' command
3686
#: bzrlib/builtins.py:5734
3687
msgid "Sorting"
3688
msgstr ""
3689
3690
#: bzrlib/builtins.py:5779
3691
msgid "Reconfigure the type of a bzr directory."
3692
msgstr ""
3693
3694
#: bzrlib/builtins.py:5781
3695
msgid "A target configuration must be specified."
3696
msgstr ""
3697
3698
#: bzrlib/builtins.py:5783
3699
msgid ""
3700
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3701
"The order of preference is\n"
3702
"1. For a lightweight checkout, the current bound location.\n"
3703
"2. For branches that used to be checkouts, the previously-bound location.\n"
3704
"3. The push location.\n"
3705
"4. The parent location.\n"
3706
"If none of these is available, --bind-to must be specified."
3707
msgstr ""
3708
3709
# title of 'tree_type' option of 'reconfigure' command
3710
#: bzrlib/builtins.py:5797
3711
msgid "Tree type"
3712
msgstr ""
3713
3714
# help of 'tree_type' option of 'reconfigure' command
3715
#: bzrlib/builtins.py:5798
3716
msgid "The relation between branch and tree."
3717
msgstr ""
3718
3719
# title of 'repository_type' option of 'reconfigure' command
3720
#: bzrlib/builtins.py:5808
3721
msgid "Repository type"
3722
msgstr ""
3723
3724
# help of 'repository_type' option of 'reconfigure' command
3725
#: bzrlib/builtins.py:5809
3726
msgid "Location fo the repository."
3727
msgstr ""
3728
3729
# title of 'repository_trees' option of 'reconfigure' command
3730
#: bzrlib/builtins.py:5817
3731
msgid "Trees in Repository"
3732
msgstr ""
3733
3734
# help of 'repository_trees' option of 'reconfigure' command
3735
#: bzrlib/builtins.py:5818
3736
msgid "Whether new branches in the repository have trees."
3737
msgstr ""
3738
3739
# help of 'bind-to' option of 'reconfigure' command
3740
#: bzrlib/builtins.py:5825
3741
msgid "Branch to bind checkout to."
3742
msgstr ""
3743
3744
# help of 'force' option of 'reconfigure' command
3745
#: bzrlib/builtins.py:5827
3746
msgid "Perform reconfiguration even if local changes will be lost."
3747
msgstr ""
3748
3749
# help of 'stacked-on' option of 'reconfigure' command
3750
#: bzrlib/builtins.py:5830
3751
msgid "Reconfigure a branch to be stacked on another branch."
3752
msgstr ""
3753
3754
# help of 'unstacked' option of 'reconfigure' command
3755
#: bzrlib/builtins.py:5834
3756
msgid ""
3757
"Reconfigure a branch to be unstacked. This may require copying substantial "
3758
"data into it."
3759
msgstr ""
3760
3761
#: bzrlib/builtins.py:5844
3762
msgid "Can't use both --stacked-on and --unstacked"
3763
msgstr ""
3764
3765
#: bzrlib/builtins.py:5858
3766
msgid "No target configuration specified"
3767
msgstr ""
3768
3769
#: bzrlib/builtins.py:5893
3770
msgid "Set the branch of a checkout and update."
3771
msgstr ""
3772
3773
#: bzrlib/builtins.py:5895
3774
msgid ""
3775
"For lightweight checkouts, this changes the branch being referenced.\n"
3776
"For heavyweight checkouts, this checks that there are no local commits\n"
3777
"versus the current bound branch, then it makes the local branch a mirror\n"
3778
"of the new location and binds to it."
3779
msgstr ""
3780
3781
#: bzrlib/builtins.py:5900
3782
msgid ""
3783
"In both cases, the working tree is updated and uncommitted changes\n"
3784
"are merged. The user can commit or revert these as they desire."
3785
msgstr ""
3786
3787
#: bzrlib/builtins.py:5903
3788
msgid "Pending merges need to be committed or reverted before using switch."
3789
msgstr ""
3790
3791
#: bzrlib/builtins.py:5905
3792
msgid ""
3793
"The path to the branch to switch to can be specified relative to the parent\n"
3794
"directory of the current branch. For example, if you are currently in a\n"
3795
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3796
"/path/to/newbranch."
3797
msgstr ""
3798
3799
#: bzrlib/builtins.py:5910
3800
msgid ""
3801
"Bound branches use the nickname of its master branch unless it is set\n"
3802
"locally, in which case switching will update the local nickname to be\n"
3803
"that of the master."
3804
msgstr ""
3805
3806
# help of 'force' option of 'switch' command
3807
#: bzrlib/builtins.py:5918
3808
msgid "Switch even if local commits will be lost."
3809
msgstr ""
3810
3811
# help of 'create-branch' option of 'switch' command
3812
#: bzrlib/builtins.py:5921
3813
msgid "Create the target branch from this one before switching to it."
3814
msgstr ""
3815
3816
#: bzrlib/builtins.py:5933
3817
msgid "You must supply either a revision or a location"
3818
msgstr ""
3819
3820
#: bzrlib/builtins.py:5944
3821
msgid "cannot create branch without source branch"
3822
msgstr ""
3823
3824
#: bzrlib/builtins.py:5990
3825
msgid "Manage filtered views."
3826
msgstr ""
3827
3828
#: bzrlib/builtins.py:5992
3829
msgid ""
3830
"Views provide a mask over the tree so that users can focus on\n"
3831
"a subset of a tree when doing their work. After creating a view,\n"
3832
"commands that support a list of files - status, diff, commit, etc -\n"
3833
"effectively have that list of files implicitly given each time.\n"
3834
"An explicit list of files can still be given but those files\n"
3835
"must be within the current view."
3836
msgstr ""
3837
3838
#: bzrlib/builtins.py:5999
3839
msgid ""
3840
"In most cases, a view has a short life-span: it is created to make\n"
3841
"a selected change and is deleted once that change is committed.\n"
3842
"At other times, you may wish to create one or more named views\n"
3843
"and switch between them."
3844
msgstr ""
3845
3846
#: bzrlib/builtins.py:6004
3847
msgid ""
3848
"To disable the current view without deleting it, you can switch to\n"
3849
"the pseudo view called ``off``. This can be useful when you need\n"
3850
"to see the whole tree for an operation or two (e.g. merge) but\n"
3851
"want to switch back to your view after that."
3852
msgstr ""
3853
3854
#: bzrlib/builtins.py:6009
3855
msgid ""
3856
":Examples:\n"
3857
" To define the current view::"
3858
msgstr ""
3859
3860
#: bzrlib/builtins.py:6012
3861
msgid " bzr view file1 dir1 ..."
3862
msgstr ""
3863
3864
#: bzrlib/builtins.py:6014
3865
msgid " To list the current view::"
3866
msgstr ""
3867
3868
#: bzrlib/builtins.py:6016
3869
msgid " bzr view"
3870
msgstr ""
3871
3872
#: bzrlib/builtins.py:6018
3873
msgid " To delete the current view::"
3874
msgstr ""
3875
3876
#: bzrlib/builtins.py:6020
3877
msgid " bzr view --delete"
3878
msgstr ""
3879
3880
#: bzrlib/builtins.py:6022
3881
msgid " To disable the current view without deleting it::"
3882
msgstr ""
3883
3884
#: bzrlib/builtins.py:6024
3885
msgid " bzr view --switch off"
3886
msgstr ""
3887
3888
#: bzrlib/builtins.py:6026
3889
msgid " To define a named view and switch to it::"
3890
msgstr ""
3891
3892
#: bzrlib/builtins.py:6028
3893
msgid " bzr view --name view-name file1 dir1 ..."
3894
msgstr ""
3895
3896
#: bzrlib/builtins.py:6030
3897
msgid " To list a named view::"
3898
msgstr ""
3899
3900
#: bzrlib/builtins.py:6032
3901
msgid " bzr view --name view-name"
3902
msgstr ""
3903
3904
#: bzrlib/builtins.py:6034
3905
msgid " To delete a named view::"
3906
msgstr ""
3907
3908
#: bzrlib/builtins.py:6036
3909
msgid " bzr view --name view-name --delete"
3910
msgstr ""
3911
3912
#: bzrlib/builtins.py:6038
3913
msgid " To switch to a named view::"
3914
msgstr ""
3915
3916
#: bzrlib/builtins.py:6040
3917
msgid " bzr view --switch view-name"
3918
msgstr ""
3919
3920
#: bzrlib/builtins.py:6042
3921
msgid " To list all views defined::"
3922
msgstr ""
3923
3924
#: bzrlib/builtins.py:6044
3925
msgid " bzr view --all"
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:6046
3929
msgid " To delete all views::"
3930
msgstr ""
3931
3932
#: bzrlib/builtins.py:6048
3933
msgid " bzr view --delete --all"
3934
msgstr ""
3935
3936
# help of 'all' option of 'view' command
3937
#: bzrlib/builtins.py:6055
3938
msgid "Apply list or delete action to all views."
3939
msgstr ""
3940
3941
# help of 'delete' option of 'view' command
3942
#: bzrlib/builtins.py:6058
3943
msgid "Delete the view."
3944
msgstr ""
3945
3946
# help of 'name' option of 'view' command
3947
#: bzrlib/builtins.py:6061
3948
msgid "Name of the view to define, list or delete."
3949
msgstr ""
3950
3951
# help of 'switch' option of 'view' command
3952
#: bzrlib/builtins.py:6065
3953
msgid "Name of the view to switch to."
3954
msgstr ""
3955
3956
#: bzrlib/builtins.py:6084
3957
msgid "Both --delete and a file list specified"
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:6087
3961
msgid "Both --delete and --switch specified"
3962
msgstr ""
3963
3964
#: bzrlib/builtins.py:6090
3965
msgid "Deleted all views.\n"
3966
msgstr ""
3967
3968
#: bzrlib/builtins.py:6092
3969
msgid "No current view to delete"
3970
msgstr ""
3971
3972
#: bzrlib/builtins.py:6095
3973
#, python-format
3974
msgid "Deleted '%s' view.\n"
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:6099
3978
msgid "Both --switch and a file list specified"
3979
msgstr ""
3980
3981
#: bzrlib/builtins.py:6102
3982
msgid "Both --switch and --all specified"
3983
msgstr ""
3984
3985
#: bzrlib/builtins.py:6105
3986
msgid "No current view to disable"
3987
msgstr ""
3988
3989
#: bzrlib/builtins.py:6107
3990
#, python-format
3991
msgid "Disabled '%s' view.\n"
3992
msgstr ""
3993
3994
#: bzrlib/builtins.py:6111 bzrlib/builtins.py:6133
3995
msgid "Using '{0}' view: {1}\n"
3996
msgstr ""
3997
3998
#: bzrlib/builtins.py:6114
3999
msgid "Views defined:\n"
4000
msgstr ""
4001
4002
#: bzrlib/builtins.py:6123
4003
msgid "No views defined.\n"
4004
msgstr ""
4005
4006
#: bzrlib/builtins.py:6130
4007
msgid "Cannot change the 'off' pseudo view"
4008
msgstr ""
4009
4010
#: bzrlib/builtins.py:6138
4011
msgid "No current view.\n"
4012
msgstr ""
4013
4014
#: bzrlib/builtins.py:6141
4015
msgid "'{0}' view is: {1}\n"
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:6161
4019
msgid " <no hooks installed>\n"
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:6165
4023
msgid "Remove a branch."
4024
msgstr ""
4025
4026
#: bzrlib/builtins.py:6167
4027
msgid ""
4028
"This will remove the branch from the specified location but \n"
4029
"will keep any working tree or repository in place."
4030
msgstr ""
4031
4032
#: bzrlib/builtins.py:6172
4033
msgid " Remove the branch at repo/trunk::"
4034
msgstr ""
4035
4036
#: bzrlib/builtins.py:6174
4037
msgid " bzr remove-branch repo/trunk"
4038
msgstr ""
4039
4040
#: bzrlib/builtins.py:6190
4041
msgid "Temporarily set aside some changes from the current tree."
4042
msgstr ""
4043
4044
#: bzrlib/builtins.py:6192
4045
msgid ""
4046
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4047
"ie. out of the way, until a later time when you can bring them back from\n"
4048
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4049
"your working tree, and so they aren't propagated along with your branch nor\n"
4050
"will they survive its deletion."
4051
msgstr ""
4052
4053
#: bzrlib/builtins.py:6198
4054
msgid "If shelve --list is specified, previously-shelved changes are listed."
4055
msgstr ""
4056
4057
#: bzrlib/builtins.py:6200
4058
msgid ""
4059
"Shelve is intended to help separate several sets of changes that have\n"
4060
"been inappropriately mingled. If you just want to get rid of all changes\n"
4061
"and you don't need to restore them later, use revert. If you want to\n"
4062
"shelve all text changes at once, use shelve --all."
4063
msgstr ""
4064
4065
#: bzrlib/builtins.py:6205
4066
msgid ""
4067
"If filenames are specified, only the changes to those files will be\n"
4068
"shelved. Other files will be left untouched."
4069
msgstr ""
4070
4071
#: bzrlib/builtins.py:6208
4072
msgid ""
4073
"If a revision is specified, changes since that revision will be shelved."
4074
msgstr ""
4075
4076
#: bzrlib/builtins.py:6210
4077
msgid ""
4078
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4079
"restore the most recently shelved changes."
4080
msgstr ""
4081
4082
#: bzrlib/builtins.py:6213
4083
msgid ""
4084
"For complicated changes, it is possible to edit the changes in a separate\n"
4085
"editor program to decide what the file remaining in the working copy\n"
4086
"should look like. To do this, add the configuration option"
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:6217
4090
msgid " change_editor = PROGRAM @new_path @old_path"
4091
msgstr ""
4092
4093
#: bzrlib/builtins.py:6219
4094
msgid ""
4095
"where @new_path is replaced with the path of the new version of the \n"
4096
"file and @old_path is replaced with the path of the old version of \n"
4097
"the file. The PROGRAM should save the new file with the desired \n"
4098
"contents of the file in the working tree.\n"
4099
" "
4100
msgstr ""
4101
4102
# help of 'all' option of 'shelve' command
4103
#: bzrlib/builtins.py:6231
4104
msgid "Shelve all changes."
4105
msgstr ""
4106
4107
# help of 'writer' option of 'shelve' command
4108
#: bzrlib/builtins.py:6233
4109
msgid "Method to use for writing diffs."
4110
msgstr ""
4111
4112
# title of 'writer' option of 'shelve' command
4113
#: bzrlib/builtins.py:6233
4114
msgid "writer"
4115
msgstr ""
4116
4117
# help of 'list' option of 'shelve' command
4118
#: bzrlib/builtins.py:6237
4119
msgid "List shelved changes."
4120
msgstr ""
4121
4122
# help of 'destroy' option of 'shelve' command
4123
#: bzrlib/builtins.py:6239
4124
msgid "Destroy removed changes instead of shelving them."
4125
msgstr ""
4126
4127
#: bzrlib/builtins.py:6268
4128
msgid "No shelved changes."
4129
msgstr ""
4130
4131
#: bzrlib/builtins.py:6279
4132
msgid "Restore shelved changes."
4133
msgstr ""
4134
4135
#: bzrlib/builtins.py:6281
4136
msgid ""
4137
"By default, the most recently shelved changes are restored. However if you\n"
4138
"specify a shelf by id those changes will be restored instead. This works\n"
4139
"best when the changes don't depend on each other."
4140
msgstr ""
4141
4142
# help of 'action' option of 'unshelve' command
4143
#: bzrlib/builtins.py:6290
4144
msgid "The action to perform."
4145
msgstr ""
4146
4147
#: bzrlib/builtins.py:6312
4148
msgid "Remove unwanted files from working tree."
4149
msgstr ""
4150
4151
#: bzrlib/builtins.py:6314
4152
msgid ""
4153
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4154
"files are never deleted."
4155
msgstr ""
4156
4157
#: bzrlib/builtins.py:6317
4158
msgid ""
4159
"Another class is 'detritus', which includes files emitted by bzr during\n"
4160
"normal operations and selftests. (The value of these files decreases with\n"
4161
"time.)"
4162
msgstr ""
4163
4164
#: bzrlib/builtins.py:6321
4165
msgid ""
4166
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4167
"flags are respected, and may be combined."
4168
msgstr ""
4169
4170
#: bzrlib/builtins.py:6324
4171
msgid "To check what clean-tree will do, use --dry-run."
4172
msgstr ""
4173
4174
# help of 'ignored' option of 'clean-tree' command
4175
#: bzrlib/builtins.py:6327
4176
msgid "Delete all ignored files."
4177
msgstr ""
4178
4179
# help of 'detritus' option of 'clean-tree' command
4180
#: bzrlib/builtins.py:6328
4181
msgid ""
4182
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4183
msgstr ""
4184
4185
# help of 'unknown' option of 'clean-tree' command
4186
#: bzrlib/builtins.py:6331
4187
msgid "Delete files unknown to bzr (default)."
4188
msgstr ""
4189
4190
# help of 'dry-run' option of 'clean-tree' command
4191
#: bzrlib/builtins.py:6332
4192
msgid "Show files to delete instead of deleting them."
4193
msgstr ""
4194
4195
# help of 'force' option of 'clean-tree' command
4196
#: bzrlib/builtins.py:6334
4197
msgid "Do not prompt before deleting."
4198
msgstr ""
4199
4200
#: bzrlib/bundle/__init__.py:57
4201
msgid "A directory cannot be a bundle"
4202
msgstr ""
4203
4204
#: bzrlib/bundle/serializer/v4.py:326
4205
#, python-format
4206
msgid "Bundling %d revision."
4207
msgid_plural "Bundling %d revisions."
4208
msgstr[0] ""
4209
msgstr[1] ""
4210
4211
#: bzrlib/bzrdir.py:636
4212
msgid ""
4213
"making backup of {0}\n"
4214
" to {1}"
4215
msgstr ""
4216
4217
#: bzrlib/bzrdir.py:659
4218
msgid "renamed {0} to {1}"
4219
msgstr ""
4220
4221
#: bzrlib/bzrdir.py:851
4222
msgid "{0} is{1} redirected to {2}"
4223
msgstr ""
4224
4225
#: bzrlib/bzrdir.py:1727
4226
#, python-format
4227
msgid ""
4228
"Source repository format does not support stacking, using format:\n"
4229
" %s"
4230
msgstr ""
4231
4232
#: bzrlib/bzrdir.py:1747
4233
#, python-format
4234
msgid ""
4235
"Source branch format does not support stacking, using format:\n"
4236
" %s"
4237
msgstr ""
4238
4239
#: bzrlib/bzrdir.py:1858
4240
msgid "starting repository conversion"
4241
msgstr ""
4242
4243
#: bzrlib/check.py:106
4244
msgid "check"
4245
msgstr ""
4246
4247
#: bzrlib/check.py:108
4248
msgid "checking revisions"
4249
msgstr ""
4250
4251
#: bzrlib/check.py:110
4252
msgid "checking commit contents"
4253
msgstr ""
4254
4255
#: bzrlib/check.py:112
4256
msgid "checking file graphs"
4257
msgstr ""
4258
4259
#: bzrlib/check.py:116
4260
msgid "checking branches and trees"
4261
msgstr ""
4262
4263
#: bzrlib/check.py:203
4264
msgid "checked repository {0} format {1}"
4265
msgstr ""
4266
4267
#: bzrlib/check.py:206
4268
#, python-format
4269
msgid "%6d revisions"
4270
msgstr ""
4271
4272
#: bzrlib/check.py:207
4273
#, python-format
4274
msgid "%6d file-ids"
4275
msgstr ""
4276
4277
#: bzrlib/check.py:209
4278
#, python-format
4279
msgid "%6d unreferenced text versions"
4280
msgstr ""
4281
4282
#: bzrlib/check.py:213
4283
msgid "unreferenced version: {{{0}}} in {1}"
4284
msgstr ""
4285
4286
#: bzrlib/check.py:216
4287
#, python-format
4288
msgid "%6d revisions are missing inventory_sha1"
4289
msgstr ""
4290
4291
#: bzrlib/check.py:219
4292
#, python-format
4293
msgid "%6d revisions are mentioned but not present"
4294
msgstr ""
4295
4296
#: bzrlib/check.py:222
4297
#, python-format
4298
msgid "%6d ghost revisions"
4299
msgstr ""
4300
4301
#: bzrlib/check.py:227
4302
#, python-format
4303
msgid "%6d revisions missing parents in ancestry"
4304
msgstr ""
4305
4306
#: bzrlib/check.py:231
4307
#, python-format
4308
msgid " %s should be in the ancestry for:"
4309
msgstr ""
4310
4311
#: bzrlib/check.py:235
4312
#, python-format
4313
msgid "%6d inconsistent parents"
4314
msgstr ""
4315
4316
#: bzrlib/check.py:239
4317
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4318
msgstr ""
4319
4320
#: bzrlib/check.py:245
4321
#, python-format
4322
msgid "%6d revisions have incorrect parents in the revision index"
4323
msgstr ""
4324
4325
#: bzrlib/check.py:251
4326
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4327
msgstr ""
4328
4329
#: bzrlib/check.py:265
4330
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4331
msgstr ""
4332
4333
#: bzrlib/check.py:294
4334
msgid ""
4335
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4336
"{{{4}}}"
4337
msgstr ""
4338
4339
#: bzrlib/check.py:352
4340
#, python-format
4341
msgid "Checking branch at '%s'."
4342
msgstr ""
4343
4344
#: bzrlib/check.py:372
4345
#, python-format
4346
msgid "Checking working tree at '%s'."
4347
msgstr ""
4348
4349
#: bzrlib/check.py:425 bzrlib/check.py:439
4350
msgid "No branch found at specified location."
4351
msgstr ""
4352
4353
#: bzrlib/check.py:427 bzrlib/check.py:437
4354
msgid "No working tree found at specified location."
4355
msgstr ""
4356
4357
#: bzrlib/check.py:430
4358
#, python-format
4359
msgid "Checking repository at '%s'."
4360
msgstr ""
4361
4362
#: bzrlib/check.py:441
4363
msgid "No repository found at specified location."
4364
msgstr ""
4365
4366
#: bzrlib/clean_tree.py:62
4367
msgid "Nothing to delete."
4368
msgstr ""
4369
4370
#: bzrlib/clean_tree.py:108
4371
#, python-format
4372
msgid "unable to remove %s"
4373
msgstr ""
4374
4375
#: bzrlib/clean_tree.py:112
4376
msgid "deleting paths:"
4377
msgstr ""
4378
4379
#: bzrlib/clean_tree.py:126
4380
msgid "unable to remove \"{0}\": {1}."
4381
msgstr ""
4382
4383
#: bzrlib/clean_tree.py:131
4384
msgid "No files deleted."
4385
msgstr ""
4386
4387
#: bzrlib/cmd_version_info.py:45
4388
msgid "No known version info format {0}. Supported types are: {1}"
4389
msgstr ""
4390
4391
#: bzrlib/cmd_version_info.py:51
4392
msgid "Show version information about this tree."
4393
msgstr ""
4394
4395
#: bzrlib/cmd_version_info.py:53
4396
msgid ""
4397
"You can use this command to add information about version into\n"
4398
"source code of an application. The output can be in one of the\n"
4399
"supported formats or in a custom format based on a template."
4400
msgstr ""
4401
4402
#: bzrlib/cmd_version_info.py:57
4403
msgid "For example::"
4404
msgstr ""
4405
4406
#: bzrlib/cmd_version_info.py:59
4407
msgid ""
4408
" bzr version-info --custom \\\n"
4409
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4410
msgstr ""
4411
4412
#: bzrlib/cmd_version_info.py:62
4413
msgid ""
4414
"will produce a C header file with formatted string containing the\n"
4415
"current revision number. Other supported variables in templates are:"
4416
msgstr ""
4417
4418
#: bzrlib/cmd_version_info.py:65
4419
msgid ""
4420
" * {date} - date of the last revision\n"
4421
" * {build_date} - current date\n"
4422
" * {revno} - revision number\n"
4423
" * {revision_id} - revision id\n"
4424
" * {branch_nick} - branch nickname\n"
4425
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4426
" otherwise 1"
4427
msgstr ""
4428
4429
# help of 'format' option of 'version-info' command
4430
#: bzrlib/cmd_version_info.py:75
4431
msgid "Select the output format."
4432
msgstr ""
4433
4434
# help of 'all' option of 'version-info' command
4435
#: bzrlib/cmd_version_info.py:79
4436
msgid "Include all possible information."
4437
msgstr ""
4438
4439
# help of 'check-clean' option of 'version-info' command
4440
#: bzrlib/cmd_version_info.py:80
4441
msgid "Check if tree is clean."
4442
msgstr ""
4443
4444
# help of 'include-history' option of 'version-info' command
4445
#: bzrlib/cmd_version_info.py:82
4446
msgid "Include the revision-history."
4447
msgstr ""
4448
4449
# help of 'include-file-revisions' option of 'version-info' command
4450
#: bzrlib/cmd_version_info.py:84
4451
msgid "Include the last revision for each file."
4452
msgstr ""
4453
4454
# help of 'template' option of 'version-info' command
4455
#: bzrlib/cmd_version_info.py:85
4456
msgid "Template for the output."
4457
msgstr ""
4458
4459
#: bzrlib/commands.py:232
4460
#, python-format
4461
msgid "unknown command \"%s\""
4462
msgstr ""
4463
4464
#: bzrlib/commands.py:479
4465
msgid "No help for this command."
4466
msgstr ""
4467
4468
#: bzrlib/commands.py:492
4469
#, python-format
4470
msgid ":Purpose: %s\n"
4471
msgstr ""
4472
4473
#: bzrlib/commands.py:494
4474
#, python-format
4475
msgid ""
4476
":Usage:\n"
4477
"%s\n"
4478
msgstr ""
4479
4480
#: bzrlib/commands.py:496
4481
#, python-format
4482
msgid ":Usage: %s\n"
4483
msgstr ""
4484
4485
#: bzrlib/commands.py:515
4486
#, python-format
4487
msgid ":Options:%s"
4488
msgstr ""
4489
4490
#: bzrlib/commands.py:526
4491
#, python-format
4492
msgid ""
4493
":Description:\n"
4494
" %s\n"
4495
"\n"
4496
msgstr ""
4497
4498
#: bzrlib/commands.py:536
4499
#, python-format
4500
msgid ""
4501
"See bzr help %s for more details and examples.\n"
4502
"\n"
4503
msgstr ""
4504
4505
#: bzrlib/commands.py:541
4506
msgid ":Aliases: "
4507
msgstr ""
4508
4509
#: bzrlib/commands.py:545
4510
#, python-format
4511
msgid ":From: plugin \"%s\"\n"
4512
msgstr ""
4513
4514
#: bzrlib/commands.py:557
4515
msgid ":doc:`{0} <{1}-help>`"
4516
msgstr ""
4517
4518
#: bzrlib/commands.py:561
4519
#, python-format
4520
msgid ":See also: %s"
4521
msgstr ""
4522
4523
#: bzrlib/commands.py:819 bzrlib/gpg.py:317
4524
msgid "Only ASCII permitted in option names"
4525
msgstr ""
4526
4527
#: bzrlib/commands.py:844 bzrlib/commands.py:852
4528
msgid "command {0!r} needs one or more {1}"
4529
msgstr ""
4530
4531
#: bzrlib/commands.py:861
4532
msgid "command {0!r} requires argument {1}"
4533
msgstr ""
4534
4535
#: bzrlib/commands.py:868
4536
msgid "extra argument to command {0}: {1}"
4537
msgstr ""
4538
4539
#: bzrlib/commands.py:965
4540
#, python-format
4541
msgid "Profile data written to \"%s\"."
4542
msgstr ""
4543
4544
#: bzrlib/commit.py:116 bzrlib/commit.py:709
4545
msgid "added"
4546
msgstr ""
4547
4548
#: bzrlib/commit.py:116 bzrlib/commit.py:717
4549
msgid "modified"
4550
msgstr ""
4551
4552
#: bzrlib/commit.py:130
4553
#, python-format
4554
msgid "Committing%s"
4555
msgstr ""
4556
4557
#: bzrlib/commit.py:133
4558
#, python-format
4559
msgid "Committed revision %d."
4560
msgstr ""
4561
4562
#: bzrlib/commit.py:142
4563
#, python-format
4564
msgid "deleted %s"
4565
msgstr ""
4566
4567
#: bzrlib/commit.py:145
4568
#, python-format
4569
msgid "missing %s"
4570
msgstr ""
4571
4572
#: bzrlib/commit.py:471
4573
msgid ""
4574
"Conflicting tags in bound branch:\n"
4575
"{0}"
4576
msgstr ""
4577
4578
#: bzrlib/commit.py:711
4579
msgid "renamed"
4580
msgstr ""
4581
4582
#: bzrlib/commit.py:946
4583
msgid "unchanged"
4584
msgstr ""
4585
4586
#: bzrlib/commit.py:968
4587
msgid "{0} [{1}] - Stage"
4588
msgstr ""
4589
4590
#: bzrlib/commit.py:971
4591
#, python-format
4592
msgid "%s - Stage"
4593
msgstr ""
4594
4595
#: bzrlib/commit_signature_commands.py:34
4596
msgid "Sign all commits by a given committer."
4597
msgstr ""
4598
4599
#: bzrlib/commit_signature_commands.py:36
4600
msgid ""
4601
"If location is not specified the local tree is used.\n"
4602
"If committer is not specified the default committer is used."
4603
msgstr ""
4604
4605
#: bzrlib/commit_signature_commands.py:39
4606
msgid "This does not sign commits that already have signatures."
4607
msgstr ""
4608
4609
# help of 'dry-run' option of 'sign-my-commits' command
4610
#: bzrlib/commit_signature_commands.py:47
4611
msgid ""
4612
"Don't actually sign anything, just print the revisions that would be signed."
4613
msgstr ""
4614
4615
#: bzrlib/commit_signature_commands.py:101
4616
msgid "Verify all commit signatures."
4617
msgstr ""
4618
4619
#: bzrlib/commit_signature_commands.py:103
4620
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
4621
msgstr ""
4622
4623
# help of 'acceptable-keys' option of 'verify-signatures' command
4624
#: bzrlib/commit_signature_commands.py:108
4625
msgid ""
4626
"Comma separated list of GPG key patterns which are acceptable for "
4627
"verification."
4628
msgstr ""
4629
4630
#: bzrlib/commit_signature_commands.py:145
4631
msgid "Cannot verify a range of non-revision-history revisions"
4632
msgstr ""
4633
4634
#: bzrlib/commit_signature_commands.py:166
4635
msgid "All commits signed with verifiable keys"
4636
msgstr ""
4637
4638
#: bzrlib/config.py:448
4639
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4640
msgstr ""
4641
4642
#: bzrlib/config.py:3293
4643
msgid "Display, set or remove a configuration option."
4644
msgstr ""
4645
4646
#: bzrlib/config.py:3295
4647
msgid "Display the active value for a given option."
4648
msgstr ""
4649
4650
#: bzrlib/config.py:3297
4651
msgid ""
4652
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4653
"matching options are displayed mentioning their scope. The active value\n"
4654
"that bzr will take into account is the first one displayed for each option."
4655
msgstr ""
4656
4657
#: bzrlib/config.py:3301
4658
msgid "If no NAME is given, --all .* is implied."
4659
msgstr ""
4660
4661
#: bzrlib/config.py:3303
4662
msgid ""
4663
"Setting a value is achieved by using name=value without spaces. The value\n"
4664
"is set in the most relevant scope and can be checked by displaying the\n"
4665
"option again."
4666
msgstr ""
4667
4668
# help of 'scope' option of 'config' command
4669
#: bzrlib/config.py:3314
4670
msgid "Reduce the scope to the specified configuration file"
4671
msgstr ""
4672
4673
# help of 'all' option of 'config' command
4674
#: bzrlib/config.py:3318
4675
msgid "Display all the defined values for the matching options."
4676
msgstr ""
4677
4678
# help of 'remove' option of 'config' command
4679
#: bzrlib/config.py:3320
4680
msgid "Remove the option from the configuration file"
4681
msgstr ""
4682
4683
#: bzrlib/conflicts.py:48
4684
msgid "List files with conflicts."
4685
msgstr ""
4686
4687
#: bzrlib/conflicts.py:50
4688
msgid ""
4689
"Merge will do its best to combine the changes in two branches, but there\n"
4690
"are some kinds of problems only a human can fix. When it encounters those,\n"
4691
"it will mark a conflict. A conflict means that you need to fix something,\n"
4692
"before you should commit."
4693
msgstr ""
4694
4695
#: bzrlib/conflicts.py:55
4696
msgid ""
4697
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4698
"is supplied, the pathnames of files with text conflicts are listed,\n"
4699
"instead. (This is useful for editing all files with text conflicts.)"
4700
msgstr ""
4701
4702
#: bzrlib/conflicts.py:59
4703
msgid "Use bzr resolve when you have fixed a problem."
4704
msgstr ""
4705
4706
# help of 'text' option of 'conflicts' command
4707
#: bzrlib/conflicts.py:64
4708
msgid "List paths of files with text conflicts."
4709
msgstr ""
4710
4711
# help of 'action' option of 'resolve' command
4712
#: bzrlib/conflicts.py:96
4713
msgid "How to resolve the conflict."
4714
msgstr ""
4715
4716
#: bzrlib/conflicts.py:102
4717
msgid "Mark a conflict as resolved."
4718
msgstr ""
4719
4720
#: bzrlib/conflicts.py:109
4721
msgid ""
4722
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4723
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4724
"as\n"
4725
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4726
msgstr ""
4727
4728
# help of 'all' option of 'resolve' command
4729
#: bzrlib/conflicts.py:117
4730
msgid "Resolve all conflicts in this tree."
4731
msgstr ""
4732
4733
#: bzrlib/conflicts.py:124
4734
msgid "If --all is specified, no FILE may be provided"
4735
msgstr ""
4736
4737
#: bzrlib/conflicts.py:149
4738
#, python-format
4739
msgid "%d conflict auto-resolved."
4740
msgid_plural "%d conflicts auto-resolved."
4741
msgstr[0] ""
4742
msgstr[1] ""
4743
4744
#: bzrlib/conflicts.py:152
4745
msgid "Remaining conflicts:"
4746
msgstr ""
4747
4748
#: bzrlib/conflicts.py:157
4749
msgid "All conflicts resolved."
4750
msgstr ""
4751
4752
#: bzrlib/conflicts.py:166
4753
msgid "{0} conflict resolved, {1} remaining"
4754
msgid_plural "{0} conflicts resolved, {1} remaining"
4755
msgstr[0] ""
4756
msgstr[1] ""
4757
4758
# title of 'action' option of 'resolve' command
4759
#: bzrlib/conflicts.py:692
4760
msgid "action"
4761
msgstr ""
4762
4763
#: bzrlib/diff.py:397
4764
#, python-format
4765
msgid "*** Ignoring files outside view. View is %s"
4766
msgstr ""
4767
4768
#: bzrlib/errors.py:215
4769
msgid "The tree builder is already building a tree."
4770
msgstr ""
4771
4772
#: bzrlib/errors.py:236
4773
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4774
msgstr ""
4775
4776
#: bzrlib/errors.py:255
4777
msgid ""
4778
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4779
"versions \"%(minimum)s\" to \"%(current)s\"."
4780
msgstr ""
4781
4782
#: bzrlib/errors.py:267
4783
msgid "The transport '%(transport)s' is only accessible within this process."
4784
msgstr ""
4785
4786
#: bzrlib/errors.py:285
4787
msgid "Invalid revision number %(revno)s"
4788
msgstr ""
4789
4790
#: bzrlib/errors.py:294
4791
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4792
msgstr ""
4793
4794
#: bzrlib/errors.py:305
4795
msgid "Reserved revision-id {%(revision_id)s}"
4796
msgstr ""
4797
4798
#: bzrlib/errors.py:319
4799
msgid "There is no public branch set for \"%(branch_url)s\"."
4800
msgstr ""
4801
4802
#: bzrlib/errors.py:329
4803
msgid ""
4804
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4805
"obtain a list of topics."
4806
msgstr ""
4807
4808
#: bzrlib/errors.py:338
4809
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4810
msgstr ""
4811
4812
#: bzrlib/errors.py:348
4813
msgid ""
4814
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4815
msgstr ""
4816
4817
#: bzrlib/errors.py:357
4818
msgid "The branch '%(branch)s' is not stacked."
4819
msgstr ""
4820
4821
#: bzrlib/errors.py:371
4822
msgid "No WorkingTree exists for \"%(base)s\"."
4823
msgstr ""
4824
4825
#: bzrlib/errors.py:380
4826
msgid "Not currently building a tree."
4827
msgstr ""
4828
4829
#: bzrlib/errors.py:385
4830
msgid "%(url)s is not a local path."
4831
msgstr ""
4832
4833
#: bzrlib/errors.py:413
4834
msgid "%(not_locked)r is not write locked but needs to be."
4835
msgstr ""
4836
4837
#: bzrlib/errors.py:421
4838
msgid "Error in command line options"
4839
msgstr ""
4840
4841
#: bzrlib/errors.py:426
4842
msgid "%(value)s is not an index of type %(_type)s."
4843
msgstr ""
4844
4845
#: bzrlib/errors.py:436
4846
msgid "Error in data for index %(value)s."
4847
msgstr ""
4848
4849
#: bzrlib/errors.py:445
4850
msgid "The key '%(key)s' is already in index '%(index)s'."
4851
msgstr ""
4852
4853
#: bzrlib/errors.py:455
4854
msgid "The key '%(key)s' is not a valid key."
4855
msgstr ""
4856
4857
#: bzrlib/errors.py:464
4858
msgid "Could not parse options for index %(value)s."
4859
msgstr ""
4860
4861
#: bzrlib/errors.py:473
4862
msgid "The value '%(value)s' is not a valid value."
4863
msgstr ""
4864
4865
#: bzrlib/errors.py:501
4866
msgid "Generic path error: %(path)r%(extra)s)"
4867
msgstr ""
4868
4869
#: bzrlib/errors.py:514
4870
msgid "No such file: %(path)r%(extra)s"
4871
msgstr ""
4872
4873
#: bzrlib/errors.py:519
4874
msgid "File exists: %(path)r%(extra)s"
4875
msgstr ""
4876
4877
#: bzrlib/errors.py:525
4878
msgid ""
4879
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
4880
"after to tell bzr about a rename that has already happened)%(extra)s"
4881
msgstr ""
4882
4883
#: bzrlib/errors.py:541
4884
msgid "\"%(path)s\" is not a directory %(extra)s"
4885
msgstr ""
4886
4887
#: bzrlib/errors.py:546
4888
msgid "\"%(path)s\" is not in the working directory %(extra)s"
4889
msgstr ""
4890
4891
#: bzrlib/errors.py:551
4892
msgid "Directory not empty: \"%(path)s\"%(extra)s"
4893
msgstr ""
4894
4895
#: bzrlib/errors.py:556
4896
msgid "Hard-linking \"%(path)s\" is not supported"
4897
msgstr ""
4898
4899
#: bzrlib/errors.py:571
4900
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
4901
msgstr ""
4902
4903
#: bzrlib/errors.py:576
4904
msgid "Permission denied: \"%(path)s\"%(extra)s"
4905
msgstr ""
4906
4907
#: bzrlib/errors.py:581
4908
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
4909
msgstr ""
4910
4911
#: bzrlib/errors.py:586
4912
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
4913
msgstr ""
4914
4915
#: bzrlib/errors.py:597
4916
msgid "URLs differ by more than path: %(from_)r and %(to)r"
4917
msgstr ""
4918
4919
#: bzrlib/errors.py:619
4920
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
4921
msgstr ""
4922
4923
#: bzrlib/errors.py:629
4924
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
4925
msgstr ""
4926
4927
#: bzrlib/errors.py:637
4928
msgid ""
4929
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
4930
"upgrade the branch to permit branch stacking."
4931
msgstr ""
4932
4933
#: bzrlib/errors.py:648
4934
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
4935
msgstr ""
4936
4937
#: bzrlib/errors.py:658
4938
msgid ""
4939
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
4940
"need to upgrade the repository to permit branch stacking."
4941
msgstr ""
4942
4943
#: bzrlib/errors.py:669
4944
msgid "Error reading from %(path)r."
4945
msgstr ""
4946
4947
#: bzrlib/errors.py:688
4948
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
4949
msgstr ""
4950
4951
#: bzrlib/errors.py:704
4952
msgid "Path \"%(path)s\" is not unicode normalized"
4953
msgstr ""
4954
4955
#: bzrlib/errors.py:712
4956
msgid "Not a branch: \"%(path)s\"%(detail)s."
4957
msgstr ""
4958
4959
#: bzrlib/errors.py:754
4960
msgid "No submit branch available for branch \"%(path)s\""
4961
msgstr ""
4962
4963
#: bzrlib/errors.py:763
4964
msgid "Already a branch: \"%(path)s\"."
4965
msgstr ""
4966
4967
#: bzrlib/errors.py:769
4968
msgid ""
4969
"Directory contains a branch, but no working tree (use bzr checkout if you "
4970
"wish to build a working tree): \"%(path)s\""
4971
msgstr ""
4972
4973
#: bzrlib/errors.py:774
4974
msgid ""
4975
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
4976
msgstr ""
4977
4978
#: bzrlib/errors.py:784
4979
msgid ""
4980
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
4981
msgstr ""
4982
4983
#: bzrlib/errors.py:794
4984
msgid "No repository present: \"%(path)s\""
4985
msgstr ""
4986
4987
#: bzrlib/errors.py:802
4988
msgid "File \"%(path)s\" is not in branch %(branch_base)s."
4989
msgstr ""
4990
4991
#: bzrlib/errors.py:814
4992
msgid ""
4993
"Unsupported branch format: %(format)s\n"
4994
"Please run 'bzr upgrade'"
4995
msgstr ""
4996
4997
#: bzrlib/errors.py:820
4998
msgid "Unknown %(kind)s format: %(format)r"
4999
msgstr ""
5000
5001
#: bzrlib/errors.py:829
5002
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5003
msgstr ""
5004
5005
#: bzrlib/errors.py:842
5006
msgid ""
5007
"%(target)s\n"
5008
"is not compatible with\n"
5009
"%(source)s\n"
5010
"%(details)s"
5011
msgstr ""
5012
5013
#: bzrlib/errors.py:858
5014
msgid "Revision is not compatible with %(repo_format)s"
5015
msgstr ""
5016
5017
#: bzrlib/errors.py:868
5018
msgid "%(context_info)s%(path)s is already versioned."
5019
msgstr ""
5020
5021
#: bzrlib/errors.py:889
5022
msgid "%(context_info)s%(path)s is not versioned."
5023
msgstr ""
5024
5025
#: bzrlib/errors.py:910
5026
msgid "Path(s) are not versioned: %(paths_as_string)s"
5027
msgstr ""
5028
5029
#: bzrlib/errors.py:921
5030
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5031
msgstr ""
5032
5033
#: bzrlib/errors.py:940
5034
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5035
msgstr ""
5036
5037
#: bzrlib/errors.py:948
5038
msgid ""
5039
"Filename %(filename)r is not valid in your current filesystem encoding "
5040
"%(fs_encoding)s"
5041
msgstr ""
5042
5043
#: bzrlib/errors.py:959
5044
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5045
msgstr ""
5046
5047
#: bzrlib/errors.py:977
5048
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5049
msgstr ""
5050
5051
#: bzrlib/errors.py:1016
5052
msgid "Cannot lock %(lock)s: %(why)s"
5053
msgstr ""
5054
5055
#: bzrlib/errors.py:1026
5056
msgid ""
5057
"A transaction related operation was attempted after the transaction finished."
5058
msgstr ""
5059
5060
#: bzrlib/errors.py:1053
5061
msgid "Cannot lock: transport is read only: %(transport)s"
5062
msgstr ""
5063
5064
#: bzrlib/errors.py:1061
5065
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5066
msgstr ""
5067
5068
#: bzrlib/errors.py:1072
5069
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5070
msgstr ""
5071
5072
#: bzrlib/errors.py:1083
5073
msgid ""
5074
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5075
"%(holder)r, wanted to break %(target)r"
5076
msgstr ""
5077
5078
#: bzrlib/errors.py:1095
5079
msgid ""
5080
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5081
"Use 'bzr break-lock' to clear it"
5082
msgstr ""
5083
5084
#: bzrlib/errors.py:1108
5085
msgid "Lock not held: %(lock)s"
5086
msgstr ""
5087
5088
#: bzrlib/errors.py:1137
5089
msgid "No changes to commit"
5090
msgstr ""
5091
5092
#: bzrlib/errors.py:1142
5093
msgid ""
5094
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5095
msgstr ""
5096
5097
#: bzrlib/errors.py:1152
5098
msgid ""
5099
"Excluding paths during commit is not supported by repository at %(repository)"
5100
"r."
5101
msgstr ""
5102
5103
#: bzrlib/errors.py:1161
5104
msgid ""
5105
"The specified commit message contains characters unsupported by the current "
5106
"encoding."
5107
msgstr ""
5108
5109
#: bzrlib/errors.py:1167
5110
msgid "Upgrade URL cannot work with readonly URLs."
5111
msgstr ""
5112
5113
#: bzrlib/errors.py:1172
5114
msgid "The branch format %(format)s is already at the most recent format."
5115
msgstr ""
5116
5117
#: bzrlib/errors.py:1195
5118
msgid "Option --change does not accept revision ranges"
5119
msgstr ""
5120
5121
#: bzrlib/errors.py:1200
5122
msgid "No namespace registered for string: %(spec)r"
5123
msgstr ""
5124
5125
#: bzrlib/errors.py:1219
5126
msgid ""
5127
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5128
"%(extra)s"
5129
msgstr ""
5130
5131
#: bzrlib/errors.py:1233
5132
msgid "%(branch)s is missing %(object_type)s {%(object_id)s}"
5133
msgstr ""
5134
5135
#: bzrlib/errors.py:1238
5136
msgid ""
5137
"Operation denied because it would change the main history, which is not "
5138
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5139
msgstr ""
5140
5141
#: bzrlib/errors.py:1249
5142
msgid ""
5143
"These branches have diverged. Use the missing command to see how.\n"
5144
"Use the merge command to reconcile them."
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:1269
5148
msgid ""
5149
"Branches have no common ancestor, and no merge base revision was specified."
5150
msgstr ""
5151
5152
#: bzrlib/errors.py:1275
5153
msgid ""
5154
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5155
msgstr ""
5156
5157
#: bzrlib/errors.py:1281
5158
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5159
msgstr ""
5160
5161
#: bzrlib/errors.py:1290
5162
msgid ""
5163
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5164
msgstr ""
5165
5166
#: bzrlib/errors.py:1299
5167
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5168
msgstr ""
5169
5170
#: bzrlib/errors.py:1319
5171
msgid "Branch %(branch)s has no commits."
5172
msgstr ""
5173
5174
#: bzrlib/errors.py:1337
5175
msgid ""
5176
"Bound branch %(branch)s is out of date with master branch %(master)s."
5177
"%(extra_help)s"
5178
msgstr ""
5179
5180
#: bzrlib/errors.py:1349
5181
msgid ""
5182
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5183
"bound to %(remote)s."
5184
msgstr ""
5185
5186
#: bzrlib/errors.py:1361
5187
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5188
msgstr ""
5189
5190
#: bzrlib/errors.py:1370
5191
msgid ""
5192
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5193
"%(error)s"
5194
msgstr ""
5195
5196
#: bzrlib/errors.py:1382
5197
msgid "Error in processing weave: %(msg)s"
5198
msgstr ""
5199
5200
#: bzrlib/errors.py:1391
5201
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5202
msgstr ""
5203
5204
#: bzrlib/errors.py:1402
5205
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5206
msgstr ""
5207
5208
#: bzrlib/errors.py:1412
5209
msgid "Weave invariant violated: %(what)s"
5210
msgstr ""
5211
5212
#: bzrlib/errors.py:1421
5213
msgid "Parents are mismatched between two revisions. %(msg)s"
5214
msgstr ""
5215
5216
#: bzrlib/errors.py:1443
5217
msgid ""
5218
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5219
"%(weave_b)s"
5220
msgstr ""
5221
5222
#: bzrlib/errors.py:1455
5223
msgid "Versioned file error"
5224
msgstr ""
5225
5226
#: bzrlib/errors.py:1460
5227
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5228
msgstr ""
5229
5230
#: bzrlib/errors.py:1470
5231
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5232
msgstr ""
5233
5234
#: bzrlib/errors.py:1480
5235
msgid "Text did not match its checksum: %(msg)s"
5236
msgstr ""
5237
5238
#: bzrlib/errors.py:1605
5239
msgid "Export format %(format)r not supported"
5240
msgstr ""
5241
5242
#: bzrlib/errors.py:1614
5243
msgid "Transport error: %(msg)s %(orig_error)s"
5244
msgstr ""
5245
5246
#: bzrlib/errors.py:1640
5247
msgid "Generic bzr smart protocol error: %(details)s"
5248
msgstr ""
5249
5250
#: bzrlib/errors.py:1648
5251
msgid "Received bad protocol version marker: %(marker)r"
5252
msgstr ""
5253
5254
#: bzrlib/errors.py:1679
5255
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5256
msgstr ""
5257
5258
#: bzrlib/errors.py:1684
5259
msgid "Connection error: %(msg)s %(orig_error)s"
5260
msgstr ""
5261
5262
#: bzrlib/errors.py:1689
5263
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5264
msgstr ""
5265
5266
#: bzrlib/errors.py:1710
5267
msgid "Connection closed: %(msg)s %(orig_error)s"
5268
msgstr ""
5269
5270
#: bzrlib/errors.py:1715
5271
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5272
msgstr ""
5273
5274
#: bzrlib/errors.py:1725
5275
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5276
msgstr ""
5277
5278
#: bzrlib/errors.py:1740
5279
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5280
msgstr ""
5281
5282
#: bzrlib/errors.py:1754
5283
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5284
msgstr ""
5285
5286
#: bzrlib/errors.py:1762
5287
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5288
msgstr ""
5289
5290
#: bzrlib/errors.py:1771
5291
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5292
msgstr ""
5293
5294
#: bzrlib/errors.py:1785
5295
msgid "Too many redirections"
5296
msgstr ""
5297
5298
#: bzrlib/errors.py:1790
5299
msgid "Working tree has conflicts."
5300
msgstr ""
5301
5302
#: bzrlib/errors.py:1794
5303
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5304
msgstr ""
5305
5306
#: bzrlib/errors.py:1803
5307
msgid ""
5308
"Error(s) parsing config file %(filename)s:\n"
5309
"%(errors)s"
5310
msgstr ""
5311
5312
#: bzrlib/errors.py:1814
5313
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5314
msgstr ""
5315
5316
#: bzrlib/errors.py:1822
5317
msgid "%(username)r does not seem to contain a reasonable email address"
5318
msgstr ""
5319
5320
#: bzrlib/errors.py:1831
5321
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:1839
5325
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5326
msgstr ""
5327
5328
#: bzrlib/errors.py:1847
5329
msgid "Unable to import library \"%(library)s\": %(error)s"
5330
msgstr ""
5331
5332
#: bzrlib/errors.py:1855
5333
msgid "python-gpgme is not installed, it is needed to verify signatures"
5334
msgstr ""
5335
5336
#: bzrlib/errors.py:1863
5337
msgid ""
5338
"The working tree for %(basedir)s has changed since the last commit, but "
5339
"weave merge requires that it be unchanged"
5340
msgstr ""
5341
5342
#: bzrlib/errors.py:1873
5343
msgid ""
5344
"Can't reprocess and show base, because reprocessing obscures the "
5345
"relationship of conflicting lines to the base"
5346
msgstr ""
5347
5348
#: bzrlib/errors.py:1879
5349
msgid "Cycle in graph %(graph)r"
5350
msgstr ""
5351
5352
#: bzrlib/errors.py:1907
5353
msgid "File %(filename)s is not conflicted."
5354
msgstr ""
5355
5356
#: bzrlib/errors.py:1929
5357
msgid "No bundle was found in \"%(filename)s\"."
5358
msgstr ""
5359
5360
#: bzrlib/errors.py:1938
5361
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5362
msgstr ""
5363
5364
#: bzrlib/errors.py:1948
5365
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5366
msgstr ""
5367
5368
#: bzrlib/errors.py:1961
5369
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5370
msgstr ""
5371
5372
#: bzrlib/errors.py:1971
5373
msgid "Key %(key)s is already present in map"
5374
msgstr ""
5375
5376
#: bzrlib/errors.py:1976
5377
msgid "The prefix %(prefix)s is in the help search path twice."
5378
msgstr ""
5379
5380
#: bzrlib/errors.py:1984
5381
msgid "Tree transform is malformed %(conflicts)r"
5382
msgstr ""
5383
5384
#: bzrlib/errors.py:1986
5385
msgid ""
5386
"No final name for trans_id %(trans_id)r\n"
5387
"file-id: %(file_id)r\n"
5388
"root trans-id: %(root_trans_id)r\n"
5389
msgstr ""
5390
5391
#: bzrlib/errors.py:2018
5392
msgid "Attempt to reuse a transform that has already been applied."
5393
msgstr ""
5394
5395
#: bzrlib/errors.py:2023
5396
msgid "Moving the root directory is not supported at this time"
5397
msgstr ""
5398
5399
#: bzrlib/errors.py:2028
5400
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5401
msgstr ""
5402
5403
#: bzrlib/errors.py:2039
5404
msgid ""
5405
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5406
msgstr ""
5407
5408
#: bzrlib/errors.py:2075
5409
msgid ""
5410
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5411
msgstr ""
5412
5413
#: bzrlib/errors.py:2084
5414
msgid ""
5415
"Can't safely remove modified or unknown files:\n"
5416
"%(changes_as_text)sUse --keep to not delete them, or --force to delete them "
5417
"regardless."
5418
msgstr ""
5419
5420
#: bzrlib/errors.py:2121
5421
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5422
msgstr ""
5423
5424
#: bzrlib/errors.py:2129
5425
msgid "Nothing to merge."
5426
msgstr ""
5427
5428
#: bzrlib/errors.py:2134
5429
msgid "Format %(format)s cannot be initialised by this version of bzr."
5430
msgstr ""
5431
5432
#: bzrlib/errors.py:2143
5433
msgid ""
5434
"Cannot convert from format %(from_format)s to format %(format)s. "
5435
"%(problem)s"
5436
msgstr ""
5437
5438
#: bzrlib/errors.py:2155
5439
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5440
msgstr ""
5441
5442
#: bzrlib/errors.py:2163
5443
msgid "%(exe_name)s could not be found on this machine"
5444
msgstr ""
5445
5446
#: bzrlib/errors.py:2171
5447
msgid "Diff is not installed on this machine: %(msg)s"
5448
msgstr ""
5449
5450
#: bzrlib/errors.py:2179
5451
msgid "Diff3 is not installed on this machine."
5452
msgstr ""
5453
5454
#: bzrlib/errors.py:2185
5455
msgid "The content being inserted is already present."
5456
msgstr ""
5457
5458
#: bzrlib/errors.py:2190
5459
msgid ""
5460
"This tree contains left-over files from a failed operation.\n"
5461
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5462
"to\n"
5463
" keep, and delete it when you are done."
5464
msgstr ""
5465
5466
#: bzrlib/errors.py:2201
5467
msgid ""
5468
"This tree contains left-over files from a failed operation.\n"
5469
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5470
" wish to keep, and delete it when you are done."
5471
msgstr ""
5472
5473
#: bzrlib/errors.py:2211
5474
msgid ""
5475
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5476
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5477
"to\n"
5478
" keep, and delete it when you are done."
5479
msgstr ""
5480
5481
#: bzrlib/errors.py:2222
5482
msgid ""
5483
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5484
"examine %(pending_deletion)s to see if it contains any files you wish to "
5485
"keep, and delete it when you are done."
5486
msgstr ""
5487
5488
#: bzrlib/errors.py:2232
5489
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5490
msgstr ""
5491
5492
#: bzrlib/errors.py:2246
5493
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5494
msgstr ""
5495
5496
#: bzrlib/errors.py:2259
5497
msgid "Error in merge modified format"
5498
msgstr ""
5499
5500
#: bzrlib/errors.py:2264
5501
msgid "Format error in conflict listings"
5502
msgstr ""
5503
5504
#: bzrlib/errors.py:2268
5505
msgid ""
5506
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5507
"Error: %(description)s"
5508
msgstr ""
5509
5510
#: bzrlib/errors.py:2279
5511
msgid ""
5512
"An error has been detected in the repository %(repo_path)s.\n"
5513
"Please run bzr reconcile on this repository."
5514
msgstr ""
5515
5516
#: bzrlib/errors.py:2290
5517
msgid ""
5518
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5519
"reason: %(reason)s"
5520
msgstr ""
5521
5522
#: bzrlib/errors.py:2303
5523
msgid ""
5524
"An inconsistent delta was supplied: %(delta)r\n"
5525
"reason: %(reason)s"
5526
msgstr ""
5527
5528
#: bzrlib/errors.py:2315
5529
msgid "To use this feature you must upgrade your branch at %(path)s."
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:2324
5533
msgid "To use this feature you must upgrade your repository at %(path)s."
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:2329
5537
msgid ""
5538
"To use this feature you must upgrade your branch at %(path)s to a format "
5539
"which supports rich roots."
5540
msgstr ""
5541
5542
#: bzrlib/errors.py:2335
5543
msgid "Cannot perform local-only commits on unbound branches."
5544
msgstr ""
5545
5546
#: bzrlib/errors.py:2340
5547
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5548
msgstr ""
5549
5550
#: bzrlib/errors.py:2361
5551
msgid "Ghost tags not supported by format %(format)r."
5552
msgstr ""
5553
5554
#: bzrlib/errors.py:2369
5555
msgid "File is binary but should be text."
5556
msgstr ""
5557
5558
#: bzrlib/errors.py:2374
5559
msgid "The path %(path)s is not permitted on this platform"
5560
msgstr ""
5561
5562
#: bzrlib/errors.py:2383
5563
msgid ""
5564
"Testament did not match expected value.\n"
5565
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5566
" {%(measured)s}"
5567
msgstr ""
5568
5569
#: bzrlib/errors.py:2395
5570
msgid "Not a bzr revision-bundle: %(text)r"
5571
msgstr ""
5572
5573
#: bzrlib/errors.py:2404
5574
msgid "Bad bzr revision-bundle: %(text)r"
5575
msgstr ""
5576
5577
#: bzrlib/errors.py:2413
5578
msgid "Malformed bzr revision-bundle header: %(text)r"
5579
msgstr ""
5580
5581
#: bzrlib/errors.py:2418
5582
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5583
msgstr ""
5584
5585
#: bzrlib/errors.py:2423
5586
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5587
msgstr ""
5588
5589
#: bzrlib/errors.py:2428
5590
msgid "End of line marker was not \\n in bzr revision-bundle"
5591
msgstr ""
5592
5593
#: bzrlib/errors.py:2438
5594
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5595
msgstr ""
5596
5597
#: bzrlib/errors.py:2448
5598
msgid "Root class for inventory serialization errors"
5599
msgstr ""
5600
5601
#: bzrlib/errors.py:2452
5602
msgid ""
5603
"The inventory was not in the expected format:\n"
5604
" %(msg)s"
5605
msgstr ""
5606
5607
#: bzrlib/errors.py:2461
5608
msgid "This operation requires rich root data storage"
5609
msgstr ""
5610
5611
#: bzrlib/errors.py:2474
5612
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5613
msgstr ""
5614
5615
#: bzrlib/errors.py:2483
5616
msgid ""
5617
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5618
"variable."
5619
msgstr ""
5620
5621
#: bzrlib/errors.py:2490
5622
msgid ""
5623
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5624
"ghost at {%(ghost_revision_id)s}"
5625
msgstr ""
5626
5627
#: bzrlib/errors.py:2500
5628
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5629
msgstr ""
5630
5631
#: bzrlib/errors.py:2551
5632
msgid ""
5633
"A merge directive must provide either a bundle or a public branch location."
5634
msgstr ""
5635
5636
#: bzrlib/errors.py:2558
5637
msgid "Bad merge directive payload %(start)r"
5638
msgstr ""
5639
5640
#: bzrlib/errors.py:2568
5641
msgid "Preview patch does not match requested changes."
5642
msgstr ""
5643
5644
#: bzrlib/errors.py:2574
5645
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5646
msgstr ""
5647
5648
#: bzrlib/errors.py:2584
5649
msgid ""
5650
"Your branch does not have all of the revisions required in order to merge "
5651
"this merge directive and the target location specified in the merge "
5652
"directive is not a branch: %(location)s."
5653
msgstr ""
5654
5655
#: bzrlib/errors.py:2596
5656
msgid "Unsupported entry kind %(kind)s"
5657
msgstr ""
5658
5659
#: bzrlib/errors.py:2604
5660
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5661
msgstr ""
5662
5663
#: bzrlib/errors.py:2614
5664
msgid "Subsume target %(other_tree)s needs to be upgraded."
5665
msgstr ""
5666
5667
#: bzrlib/errors.py:2633
5668
msgid "No such tag: %(tag_name)s"
5669
msgstr ""
5670
5671
#: bzrlib/errors.py:2641
5672
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5673
msgstr ""
5674
5675
#: bzrlib/errors.py:2650
5676
msgid "Tag %(tag_name)s already exists."
5677
msgstr ""
5678
5679
#: bzrlib/errors.py:2658
5680
msgid ""
5681
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
5682
"\" for more information on this feature."
5683
msgstr ""
5684
5685
#: bzrlib/errors.py:2668
5686
msgid ""
5687
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5688
msgstr ""
5689
5690
#: bzrlib/errors.py:2678
5691
msgid ""
5692
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5693
msgstr ""
5694
5695
#: bzrlib/errors.py:2688
5696
msgid "Invalid line in bugs property: '%(line)s'"
5697
msgstr ""
5698
5699
#: bzrlib/errors.py:2696
5700
msgid "Invalid bug status: '%(status)s'"
5701
msgstr ""
5702
5703
#: bzrlib/errors.py:2704
5704
msgid "Could not understand response from smart server: %(response_tuple)r"
5705
msgstr ""
5706
5707
#: bzrlib/errors.py:2743
5708
msgid "Server sent an unexpected error: %(error_tuple)r"
5709
msgstr ""
5710
5711
#: bzrlib/errors.py:2762
5712
msgid "Unrecognised container format: %(container_format)r"
5713
msgstr ""
5714
5715
#: bzrlib/errors.py:2770
5716
msgid "Unexpected end of container stream"
5717
msgstr ""
5718
5719
#: bzrlib/errors.py:2775
5720
msgid "Unknown record type: %(record_type)r"
5721
msgstr ""
5722
5723
#: bzrlib/errors.py:2783
5724
msgid "Invalid record: %(reason)s"
5725
msgstr ""
5726
5727
#: bzrlib/errors.py:2791
5728
msgid "Container has data after end marker: %(excess)r"
5729
msgstr ""
5730
5731
#: bzrlib/errors.py:2799
5732
msgid "Container has multiple records with the same name: %(name)s"
5733
msgstr ""
5734
5735
#: bzrlib/errors.py:2812
5736
msgid "Corrupt or incompatible data stream: %(reason)s"
5737
msgstr ""
5738
5739
#: bzrlib/errors.py:2820
5740
msgid "SMTP error: %(error)s"
5741
msgstr ""
5742
5743
#: bzrlib/errors.py:2828
5744
msgid "No message supplied."
5745
msgstr ""
5746
5747
#: bzrlib/errors.py:2833
5748
msgid "No mail-to address (--mail-to) or output (-o) specified."
5749
msgstr ""
5750
5751
#: bzrlib/errors.py:2838
5752
msgid "Unknown mail client: %(mail_client)s"
5753
msgstr ""
5754
5755
#: bzrlib/errors.py:2846
5756
msgid ""
5757
"Unable to find mail client with the following names: "
5758
"%(mail_command_list_string)s"
5759
msgstr ""
5760
5761
#: bzrlib/errors.py:2856
5762
msgid "SMTP connection to %(host)s refused"
5763
msgstr ""
5764
5765
#: bzrlib/errors.py:2865
5766
msgid "Please specify smtp_server. No server at default %(host)s."
5767
msgstr ""
5768
5769
#: bzrlib/errors.py:2879
5770
msgid ""
5771
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5772
"reconfigure."
5773
msgstr ""
5774
5775
#: bzrlib/errors.py:2891
5776
msgid "'%(display_url)s' is already a branch."
5777
msgstr ""
5778
5779
#: bzrlib/errors.py:2896
5780
msgid "'%(display_url)s' is already a tree."
5781
msgstr ""
5782
5783
#: bzrlib/errors.py:2901
5784
msgid "'%(display_url)s' is already a checkout."
5785
msgstr ""
5786
5787
#: bzrlib/errors.py:2906
5788
msgid "'%(display_url)s' is already a lightweight checkout."
5789
msgstr ""
5790
5791
#: bzrlib/errors.py:2911
5792
msgid "'%(display_url)s' is already using a shared repository."
5793
msgstr ""
5794
5795
#: bzrlib/errors.py:2916
5796
msgid "'%(display_url)s' is already standalone."
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:2921
5800
msgid "Shared repository '%(display_url)s' already creates working trees."
5801
msgstr ""
5802
5803
#: bzrlib/errors.py:2927
5804
msgid ""
5805
"Shared repository '%(display_url)s' already doesn't create working trees."
5806
msgstr ""
5807
5808
#: bzrlib/errors.py:2933
5809
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5810
msgstr ""
5811
5812
#: bzrlib/errors.py:2938
5813
msgid "No location could be found to bind to at %(display_url)s."
5814
msgstr ""
5815
5816
#: bzrlib/errors.py:2943
5817
msgid ""
5818
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
5819
"%(more)s"
5820
msgstr ""
5821
5822
#: bzrlib/errors.py:2962
5823
msgid ""
5824
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
5825
"%(more)s"
5826
msgstr ""
5827
5828
#: bzrlib/errors.py:2968
5829
msgid "Variable {%(name)s} is not available."
5830
msgstr ""
5831
5832
#: bzrlib/errors.py:2976
5833
msgid "No template specified."
5834
msgstr ""
5835
5836
#: bzrlib/errors.py:2981
5837
msgid "Unable to create symlink %(path_str)son this platform"
5838
msgstr ""
5839
5840
#: bzrlib/errors.py:2996
5841
msgid ""
5842
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
5843
"\", \"local\"."
5844
msgstr ""
5845
5846
#: bzrlib/errors.py:3030
5847
msgid ""
5848
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5849
msgstr ""
5850
5851
#: bzrlib/errors.py:3042
5852
msgid "The \"%(config_id)s\" configuration does not exist."
5853
msgstr ""
5854
5855
#: bzrlib/errors.py:3050
5856
msgid "The \"%(option_name)s\" configuration option does not exist."
5857
msgstr ""
5858
5859
#: bzrlib/errors.py:3058
5860
msgid "The alias \"%(alias_name)s\" does not exist."
5861
msgstr ""
5862
5863
#: bzrlib/errors.py:3072
5864
msgid "\"%(alias_name)s\" is not a valid location alias."
5865
msgstr ""
5866
5867
#: bzrlib/errors.py:3080
5868
msgid "No %(alias_name)s location assigned."
5869
msgstr ""
5870
5871
#: bzrlib/errors.py:3088
5872
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
5873
msgstr ""
5874
5875
#: bzrlib/errors.py:3098
5876
msgid "Unknown rules detected: %(unknowns_str)s."
5877
msgstr ""
5878
5879
#: bzrlib/errors.py:3111
5880
msgid ""
5881
"Hook '%(hook_name)s' during %(hook_stage)s failed:\n"
5882
"%(traceback_text)s%(exc_value)s"
5883
msgstr ""
5884
5885
#: bzrlib/errors.py:3134
5886
msgid "Tip change rejected: %(msg)s"
5887
msgstr ""
5888
5889
#: bzrlib/errors.py:3142
5890
msgid "Shelf corrupt."
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:3147
5894
msgid "Corruption while decompressing repository file%(orig_error)s"
5895
msgstr ""
5896
5897
#: bzrlib/errors.py:3159
5898
msgid "No changes are shelved with id \"%(shelf_id)d\"."
5899
msgstr ""
5900
5901
#: bzrlib/errors.py:3167
5902
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
5903
msgstr ""
5904
5905
#: bzrlib/errors.py:3175
5906
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
5907
msgstr ""
5908
5909
#: bzrlib/errors.py:3183
5910
msgid "The user aborted the operation."
5911
msgstr ""
5912
5913
#: bzrlib/errors.py:3188
5914
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
5915
msgstr ""
5916
5917
#: bzrlib/errors.py:3198
5918
msgid "No such view: %(view_name)s."
5919
msgstr ""
5920
5921
#: bzrlib/errors.py:3208
5922
msgid ""
5923
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
5924
"to a later format."
5925
msgstr ""
5926
5927
#: bzrlib/errors.py:3217
5928
msgid ""
5929
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:3284
5933
msgid "%(bzrdir)r does not support co-located branches."
5934
msgstr ""
5935
5936
#: bzrlib/errors.py:3290
5937
msgid ""
5938
"Unable to determine your name.\n"
5939
"Please, set your name with the 'whoami' command.\n"
5940
"E.g. bzr whoami \"Your Name <name@example.com>\""
5941
msgstr ""
5942
5943
#: bzrlib/errors.py:3299
5944
msgid "Invalid pattern(s) found. %(msg)s"
5945
msgstr ""
5946
5947
#: bzrlib/errors.py:3307
5948
msgid ""
5949
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
5950
"unbind` to fix."
5951
msgstr ""
5952
5953
#: bzrlib/errors.py:3318
5954
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
5955
msgstr ""
5956
5957
#: bzrlib/errors.py:3327
5958
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
5959
msgstr ""
5960
5961
#: bzrlib/errors.py:3336
5962
msgid ""
5963
"No compatible object available for operations from %(source)r to %(target)r."
5964
msgstr ""
5965
5966
#: bzrlib/errors.py:3346
5967
msgid ""
5968
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
5969
"%(arguments)s."
5970
msgstr ""
5971
5972
#: bzrlib/export_pot.py:123 bzrlib/export_pot.py:129
5973
#, python-format
5974
msgid "%r is not found in bzrlib/option.py"
5975
msgstr ""
5976
5977
#: bzrlib/export_pot.py:185
5978
#, python-format
5979
msgid "Exporting messages from builtin command: %s"
5980
msgstr ""
5981
5982
#: bzrlib/export_pot.py:201
5983
msgid "Exporting messages from plugin command: {0} in {1}"
5984
msgstr ""
5985
5986
#: bzrlib/export_pot.py:226
5987
#, python-format
5988
msgid "Exporting message from error: %s"
5989
msgstr ""
5990
5991
#: bzrlib/fetch.py:97
5992
msgid "Finding revisions"
5993
msgstr ""
5994
5995
#: bzrlib/fetch.py:102
5996
msgid "Fetching revisions"
5997
msgstr ""
5998
5999
#: bzrlib/foreign.py:311
6000
#, python-format
6001
msgid "Using saved location: %s\n"
6002
msgstr ""
6003
6004
#: bzrlib/foreign.py:321
6005
msgid ""
6006
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6007
"regular push."
6008
msgstr ""
6009
6010
#: bzrlib/gpg.py:116 bzrlib/gpg.py:454
6011
msgid "{0} commits with valid signatures"
6012
msgstr ""
6013
6014
#: bzrlib/gpg.py:120 bzrlib/gpg.py:459
6015
msgid "{0} commit with unknown key"
6016
msgid_plural "{0} commits with unknown keys"
6017
msgstr[0] ""
6018
msgstr[1] ""
6019
6020
#: bzrlib/gpg.py:126 bzrlib/gpg.py:466
6021
msgid "{0} commit not valid"
6022
msgid_plural "{0} commits not valid"
6023
msgstr[0] ""
6024
msgstr[1] ""
6025
6026
#: bzrlib/gpg.py:132 bzrlib/gpg.py:473
6027
msgid "{0} commit not signed"
6028
msgid_plural "{0} commits not signed"
6029
msgstr[0] ""
6030
msgstr[1] ""
6031
6032
#: bzrlib/gpg.py:138 bzrlib/gpg.py:480
6033
msgid "{0} commit with key now expired"
6034
msgid_plural "{0} commits with key now expired"
6035
msgstr[0] ""
6036
msgstr[1] ""
6037
6038
#: bzrlib/gpg.py:336
6039
msgid "No GnuPG key results for pattern: {0}"
6040
msgstr ""
6041
6042
#: bzrlib/gpg.py:379
6043
msgid "{0} signed {1} commit"
6044
msgid_plural "{0} signed {1} commits"
6045
msgstr[0] ""
6046
msgstr[1] ""
6047
6048
#: bzrlib/gpg.py:396 bzrlib/gpg.py:412
6049
msgid "{0} commit by author {1}"
6050
msgid_plural "{0} commits by author {1}"
6051
msgstr[0] ""
6052
msgstr[1] ""
6053
6054
#: bzrlib/gpg.py:426
6055
msgid "Unknown key {0} signed {1} commit"
6056
msgid_plural "Unknown key {0} signed {1} commits"
6057
msgstr[0] ""
6058
msgstr[1] ""
6059
6060
#: bzrlib/gpg.py:444
6061
msgid "{0} commit by author {1} with key {2} now expired"
6062
msgid_plural "{0} commits by author {1} with key {2} now expired"
6063
msgstr[0] ""
6064
msgstr[1] ""
6065
6066
#: bzrlib/groupcompress.py:1758
6067
#, python-format
6068
msgid "Insert claimed random_id=True, but then inserted %r two times"
6069
msgstr ""
6070
6071
#: bzrlib/knit.py:1764 bzrlib/knit.py:1800
6072
msgid "Walking content"
6073
msgstr ""
6074
6075
#: bzrlib/knit.py:3467
6076
msgid "annotating"
6077
msgstr ""
6078
6079
#: bzrlib/lock.py:547
6080
msgid "{0!r} was {1} locked again"
6081
msgstr ""
6082
6083
#: bzrlib/log.py:569
6084
msgid "--exclude-common-ancestry requires two different revisions"
6085
msgstr ""
6086
6087
#: bzrlib/log.py:571
6088
#, python-format
6089
msgid "invalid direction %r"
6090
msgstr ""
6091
6092
#: bzrlib/log.py:618
6093
msgid "Start revision not found in left-hand history of end revision."
6094
msgstr ""
6095
6096
#: bzrlib/log.py:664
6097
msgid "Start revision not found in history of end revision."
6098
msgstr ""
6099
6100
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6101
msgid "Logging revision 0 is invalid."
6102
msgstr ""
6103
6104
#: bzrlib/log.py:1084 bzrlib/log.py:1142
6105
msgid "Start revision must be older than the end revision."
6106
msgstr ""
6107
6108
#: bzrlib/log.py:1828
6109
#, python-format
6110
msgid "unknown log formatter: %r"
6111
msgstr ""
6112
6113
#: bzrlib/log.py:2123
6114
msgid "fixes bug"
6115
msgid_plural "fixes bugs"
6116
msgstr[0] ""
6117
msgstr[1] ""
6118
6119
#: bzrlib/merge.py:715
6120
msgid "All changes applied successfully."
6121
msgstr ""
6122
6123
#: bzrlib/merge.py:717
6124
#, python-format
6125
msgid "%d conflicts encountered."
6126
msgstr ""
6127
6128
#: bzrlib/merge.py:862 bzrlib/merge.py:1910
6129
msgid "Preparing file merge"
6130
msgstr ""
6131
6132
#: bzrlib/multiparent.py:424
6133
msgid "Importing revisions"
6134
msgstr ""
6135
6136
# help of 'help' option
6137
#: bzrlib/option.py:530
6138
msgid "Show help message."
6139
msgstr ""
6140
6141
# help of 'usage' option
6142
#: bzrlib/option.py:532
6143
msgid "Show usage message and options."
6144
msgstr ""
6145
6146
# help of 'verbose' option
6147
#: bzrlib/option.py:534
6148
msgid "Display more information."
6149
msgstr ""
6150
6151
# help of 'quiet' option
6152
#: bzrlib/option.py:537
6153
msgid "Only display errors and warnings."
6154
msgstr ""
6155
6156
# help of 'overwrite' option
6157
#: bzrlib/option.py:542
6158
msgid "Ignore differences between branches and overwrite unconditionally."
6159
msgstr ""
6160
6161
# help of 'message' option
6162
#: bzrlib/option.py:553
6163
msgid "Message string."
6164
msgstr ""
6165
6166
# help of 'null' option
6167
#: bzrlib/option.py:556
6168
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6169
msgstr ""
6170
6171
# help of 'profile' option
6172
#: bzrlib/option.py:559
6173
msgid "Show performance profiling information."
6174
msgstr ""
6175
6176
# help of 'revision' option
6177
#: bzrlib/option.py:563
6178
msgid "See \"help revisionspec\" for details."
6179
msgstr ""
6180
6181
# help of 'change' option
6182
#: bzrlib/option.py:568
6183
msgid ""
6184
"Select changes introduced by the specified revision. See also \"help "
6185
"revisionspec\"."
6186
msgstr ""
6187
6188
# help of 'show-ids' option
6189
#: bzrlib/option.py:570
6190
msgid "Show internal object ids."
6191
msgstr ""
6192
6193
# help of 'timezone' option
6194
#: bzrlib/option.py:573
6195
msgid "Display timezone as local, original, or utc."
6196
msgstr ""
6197
6198
# help of 'log-format' option
6199
#: bzrlib/option.py:578
6200
msgid "Use specified log format."
6201
msgstr ""
6202
6203
# title of 'log-format' option
6204
#: bzrlib/option.py:580
6205
msgid "Log format"
6206
msgstr ""
6207
6208
# help of 'long' option
6209
#: bzrlib/option.py:582
6210
msgid "Use detailed log format. Same as --log-format long"
6211
msgstr ""
6212
6213
# help of 'short' option
6214
#: bzrlib/option.py:584
6215
msgid "Use moderately short log format. Same as --log-format short"
6216
msgstr ""
6217
6218
# help of 'line' option
6219
#: bzrlib/option.py:585
6220
msgid "Use log format with one line per revision. Same as --log-format line"
6221
msgstr ""
6222
6223
# help of 'merge-type' option
6224
#: bzrlib/option.py:588
6225
msgid "Select a particular merge algorithm."
6226
msgstr ""
6227
6228
# title of 'merge-type' option
6229
#: bzrlib/option.py:590
6230
msgid "Merge algorithm"
6231
msgstr ""
6232
6233
# help of 'remember' option
6234
#: bzrlib/option.py:592
6235
msgid "Remember the specified location as a default."
6236
msgstr ""
6237
6238
# help of 'reprocess' option
6239
#: bzrlib/option.py:594
6240
msgid "Reprocess to reduce spurious conflicts."
6241
msgstr ""
6242
6243
# help of 'dry-run' option
6244
#: bzrlib/option.py:597
6245
msgid "Show what would be done, but don't actually do anything."
6246
msgstr ""
6247
6248
# help of 'name-from-revision' option
6249
#: bzrlib/option.py:598
6250
msgid "The path name in the old tree."
6251
msgstr ""
6252
6253
# help of 'directory' option
6254
#: bzrlib/option.py:600
6255
msgid "Branch to operate on, instead of working directory"
6256
msgstr ""
6257
6258
#: bzrlib/osutils.py:93
6259
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6260
msgstr ""
6261
6262
#: bzrlib/osutils.py:194
6263
msgid "lstat/stat of ({0!r}): {1!r}"
6264
msgstr ""
6265
6266
#: bzrlib/osutils.py:929 bzrlib/osutils.py:940
6267
#, python-format
6268
msgid "sorry, %r not allowed in path"
6269
msgstr ""
6270
6271
#: bzrlib/osutils.py:1158
6272
#, python-format
6273
msgid "%r is too short to calculate a relative path"
6274
msgstr ""
6275
6276
# help of 'plugin' option of 'bash-completion' command
6277
#: bzrlib/plugins/bash_completion/bashcomp.py:407
6278
msgid "Enable completions for the selected plugin (default: all plugins)"
6279
msgstr ""
6280
6281
#: bzrlib/plugins/bash_completion/bashcomp.py:409
6282
msgid "Generate a shell function for bash command line completion."
6283
msgstr ""
6284
6285
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6286
msgid ""
6287
"This command generates a shell function which can be used by bash to\n"
6288
"automatically complete the currently typed command when the user presses\n"
6289
"the completion key (usually tab)."
6290
msgstr ""
6291
6292
#: bzrlib/plugins/bash_completion/bashcomp.py:415
6293
msgid ""
6294
"Commonly used like this:\n"
6295
" eval \"`bzr bash-completion`\""
6296
msgstr ""
6297
6298
# help of 'function-name' option of 'bash-completion' command
6299
#: bzrlib/plugins/bash_completion/bashcomp.py:421
6300
msgid "Name of the generated function (default: _bzr)"
6301
msgstr ""
6302
6303
# help of 'function-only' option of 'bash-completion' command
6304
#: bzrlib/plugins/bash_completion/bashcomp.py:423
6305
msgid "Generate only the shell function, don't enable it"
6306
msgstr ""
6307
6308
#: bzrlib/plugins/launchpad/__init__.py:78
6309
msgid "Register a branch with launchpad.net."
6310
msgstr ""
6311
6312
#: bzrlib/plugins/launchpad/__init__.py:80
6313
msgid ""
6314
"This command lists a bzr branch in the directory of branches on\n"
6315
"launchpad.net. Registration allows the branch to be associated with\n"
6316
"bugs or specifications."
6317
msgstr ""
6318
6319
#: bzrlib/plugins/launchpad/__init__.py:84
6320
msgid ""
6321
"Before using this command you must register the project to which the\n"
6322
"branch belongs, and create an account for yourself on launchpad.net."
6323
msgstr ""
6324
6325
#: bzrlib/plugins/launchpad/__init__.py:87
6326
msgid ""
6327
"arguments:\n"
6328
" public_url: The publicly visible url for the branch to register.\n"
6329
" This must be an http or https url (which Launchpad can read\n"
6330
" from to access the branch). Local file urls, SFTP urls, and\n"
6331
" bzr+ssh urls will not work.\n"
6332
" If no public_url is provided, bzr will use the configured\n"
6333
" public_url if there is one for the current branch, and\n"
6334
" otherwise error."
6335
msgstr ""
6336
6337
#: bzrlib/plugins/launchpad/__init__.py:96
6338
msgid ""
6339
"example:\n"
6340
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6341
" --project fooproject"
6342
msgstr ""
6343
6344
# help of 'project' option of 'register-branch' command
6345
#: bzrlib/plugins/launchpad/__init__.py:103
6346
msgid "Launchpad project short name to associate with the branch."
6347
msgstr ""
6348
6349
# help of 'branch-name' option of 'register-branch' command
6350
#: bzrlib/plugins/launchpad/__init__.py:110
6351
msgid ""
6352
"Short name for the branch; by default taken from the last component of the "
6353
"url."
6354
msgstr ""
6355
6356
# help of 'branch-title' option of 'register-branch' command
6357
#: bzrlib/plugins/launchpad/__init__.py:114
6358
msgid "One-sentence description of the branch."
6359
msgstr ""
6360
6361
# help of 'branch-description' option of 'register-branch' command
6362
#: bzrlib/plugins/launchpad/__init__.py:117
6363
msgid "Longer description of the purpose or contents of the branch."
6364
msgstr ""
6365
6366
# help of 'author' option of 'register-branch' command
6367
#: bzrlib/plugins/launchpad/__init__.py:120
6368
msgid "Branch author's email address, if not yourself."
6369
msgstr ""
6370
6371
# help of 'link-bug' option of 'register-branch' command
6372
#: bzrlib/plugins/launchpad/__init__.py:123
6373
msgid "The bug this branch fixes."
6374
msgstr ""
6375
6376
# help of 'dry-run' option of 'register-branch' command
6377
#: bzrlib/plugins/launchpad/__init__.py:126
6378
msgid "Prepare the request but don't actually send it."
6379
msgstr ""
6380
6381
#: bzrlib/plugins/launchpad/__init__.py:186
6382
msgid "Open a Launchpad branch page in your web browser."
6383
msgstr ""
6384
6385
# help of 'dry-run' option of 'launchpad-open' command
6386
#: bzrlib/plugins/launchpad/__init__.py:191
6387
msgid "Do not actually open the browser. Just say the URL we would use."
6388
msgstr ""
6389
6390
#: bzrlib/plugins/launchpad/__init__.py:236
6391
msgid "Show or set the Launchpad user ID."
6392
msgstr ""
6393
6394
#: bzrlib/plugins/launchpad/__init__.py:238
6395
msgid ""
6396
"When communicating with Launchpad, some commands need to know your\n"
6397
"Launchpad user ID. This command can be used to set or show the\n"
6398
"user ID that Bazaar will use for such communication."
6399
msgstr ""
6400
6401
#: bzrlib/plugins/launchpad/__init__.py:242
6402
msgid ""
6403
":Examples:\n"
6404
" Show the Launchpad ID of the current user::"
6405
msgstr ""
6406
6407
#: bzrlib/plugins/launchpad/__init__.py:245
6408
msgid " bzr launchpad-login"
6409
msgstr ""
6410
6411
#: bzrlib/plugins/launchpad/__init__.py:247
6412
msgid " Set the Launchpad ID of the current user to 'bob'::"
6413
msgstr ""
6414
6415
#: bzrlib/plugins/launchpad/__init__.py:249
6416
msgid " bzr launchpad-login bob"
6417
msgstr ""
6418
6419
# help of 'no-check' option of 'launchpad-login' command
6420
#: bzrlib/plugins/launchpad/__init__.py:256
6421
msgid "Don't check that the user name is valid."
6422
msgstr ""
6423
6424
#: bzrlib/plugins/launchpad/__init__.py:292
6425
msgid "Ask Launchpad to mirror a branch now."
6426
msgstr ""
6427
6428
#: bzrlib/plugins/launchpad/__init__.py:312
6429
msgid "Propose merging a branch on Launchpad."
6430
msgstr ""
6431
6432
#: bzrlib/plugins/launchpad/__init__.py:314
6433
msgid ""
6434
"This will open your usual editor to provide the initial comment. When it\n"
6435
"has created the proposal, it will open it in your default web browser."
6436
msgstr ""
6437
6438
#: bzrlib/plugins/launchpad/__init__.py:317
6439
msgid ""
6440
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6441
"is not supplied, the remembered submit branch will be used. If no submit\n"
6442
"branch is remembered, the development focus will be used."
6443
msgstr ""
6444
6445
#: bzrlib/plugins/launchpad/__init__.py:321
6446
msgid ""
6447
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6448
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6449
"The parameter the launchpad account name of the desired reviewer. This\n"
6450
"may optionally be followed by '=' and the review type. For example:"
6451
msgstr ""
6452
6453
#: bzrlib/plugins/launchpad/__init__.py:326
6454
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6455
msgstr ""
6456
6457
#: bzrlib/plugins/launchpad/__init__.py:328
6458
msgid ""
6459
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6460
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6461
msgstr ""
6462
6463
# help of 'staging' option of 'lp-propose-merge' command
6464
#: bzrlib/plugins/launchpad/__init__.py:333
6465
msgid "Propose the merge on staging."
6466
msgstr ""
6467
6468
# help of 'message' option of 'lp-propose-merge' command
6469
#: bzrlib/plugins/launchpad/__init__.py:335
6470
msgid "Commit message."
6471
msgstr ""
6472
6473
# help of 'approve' option of 'lp-propose-merge' command
6474
#: bzrlib/plugins/launchpad/__init__.py:337
6475
msgid "Mark the proposal as approved immediately."
6476
msgstr ""
6477
6478
# help of 'review' option of 'lp-propose-merge' command
6479
#: bzrlib/plugins/launchpad/__init__.py:339
6480
msgid "Requested reviewer and optional type."
6481
msgstr ""
6482
6483
#: bzrlib/plugins/launchpad/__init__.py:376
6484
msgid "Find the proposal to merge this revision."
6485
msgstr ""
6486
6487
#: bzrlib/plugins/launchpad/__init__.py:378
6488
msgid ""
6489
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6490
"This works only if the selected branch was the merge proposal target, and\n"
6491
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6492
"are opened in a web browser."
6493
msgstr ""
6494
6495
#: bzrlib/plugins/launchpad/__init__.py:383
6496
msgid ""
6497
"Any revision involved in the merge may be specified-- the revision in\n"
6498
"which the merge was performed, or one of the revisions that was merged."
6499
msgstr ""
6500
6501
#: bzrlib/plugins/launchpad/__init__.py:386
6502
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6503
msgstr ""
6504
6505
#: bzrlib/plugins/launchpad/__init__.py:388
6506
msgid " bzr lp-find-proposal -r annotate:README:1"
6507
msgstr ""
6508
6509
#: bzrlib/push.py:54
6510
msgid "Created new branch."
6511
msgstr ""
6512
6513
#: bzrlib/push.py:96
6514
#, python-format
6515
msgid ""
6516
"Target directory %s already contains a .bzr directory, but it is not valid."
6517
msgstr ""
6518
6519
#: bzrlib/push.py:99
6520
#, python-format
6521
msgid ""
6522
"Target directory %s already exists, but does not have a .bzr directory. "
6523
"Supply --use-existing-dir to push there anyway."
6524
msgstr ""
6525
6526
#: bzrlib/push.py:120
6527
#, python-format
6528
msgid "Too many redirections trying to make %s."
6529
msgstr ""
6530
6531
#: bzrlib/push.py:145
6532
msgid ""
6533
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6534
"information."
6535
msgstr ""
6536
6537
#: bzrlib/push.py:149
6538
#, python-format
6539
msgid ""
6540
"It is not possible to losslessly push to %s. You may want to use dpush "
6541
"instead."
6542
msgstr ""
6543
6544
#: bzrlib/push.py:155
6545
#, python-format
6546
msgid ""
6547
"At %s you have a valid .bzr control directory, but not a branch or "
6548
"repository. This is an unsupported configuration. Please move the target "
6549
"directory out of the way and try again."
6550
msgstr ""
6551
6552
#: bzrlib/reconcile.py:96
6553
#, python-format
6554
msgid "Reconciling branch %s"
6555
msgstr ""
6556
6557
#: bzrlib/reconcile.py:102
6558
#, python-format
6559
msgid "Reconciling repository %s"
6560
msgstr ""
6561
6562
#: bzrlib/reconcile.py:104
6563
msgid "Reconciling repository"
6564
msgstr ""
6565
6566
#: bzrlib/reconcile.py:110
6567
#, python-format
6568
msgid "%s cannot canonicalize CHKs."
6569
msgstr ""
6570
6571
#: bzrlib/reconcile.py:118
6572
msgid "Reconcile aborted: revision index has inconsistent parents."
6573
msgstr ""
6574
6575
#: bzrlib/reconcile.py:120
6576
msgid "Run \"bzr check\" for more details."
6577
msgstr ""
6578
6579
#: bzrlib/reconcile.py:122
6580
msgid "Reconciliation complete."
6581
msgstr ""
6582
6583
#: bzrlib/reconcile.py:165
6584
msgid "Fixing last revision info {0} => {1}"
6585
msgstr ""
6586
6587
#: bzrlib/reconcile.py:172
6588
msgid "revision_history ok."
6589
msgstr ""
6590
6591
#: bzrlib/reconcile.py:233
6592
msgid "Reading inventory data"
6593
msgstr ""
6594
6595
#: bzrlib/reconcile.py:253 bzrlib/reconcile.py:383
6596
msgid "Inventory ok."
6597
msgstr ""
6598
6599
#: bzrlib/reconcile.py:255 bzrlib/reconcile.py:385
6600
msgid "Backing up inventory"
6601
msgstr ""
6602
6603
#: bzrlib/reconcile.py:257
6604
msgid "Backup inventory created."
6605
msgstr ""
6606
6607
#: bzrlib/reconcile.py:273 bzrlib/reconcile.py:404
6608
msgid "Writing weave"
6609
msgstr ""
6610
6611
#: bzrlib/reconcile.py:276 bzrlib/reconcile.py:407
6612
msgid "Inventory regenerated."
6613
msgstr ""
6614
6615
#: bzrlib/reconcile.py:370 bzrlib/reconcile.py:372 bzrlib/reconcile.py:375
6616
msgid "Reading indexes"
6617
msgstr ""
6618
6619
#: bzrlib/reconcile.py:379 bzrlib/reconcile.py:381
6620
msgid "Checking unused inventories"
6621
msgstr ""
6622
6623
#: bzrlib/reconcile.py:387
6624
msgid "Backup Inventory created"
6625
msgstr ""
6626
6627
#: bzrlib/reconcile.py:445
6628
msgid "Fixing text parents"
6629
msgstr ""
6630
6631
#: bzrlib/reconfigure.py:52
6632
msgid "{0} is now stacked on {1}\n"
6633
msgstr ""
6634
6635
#: bzrlib/reconfigure.py:67
6636
#, python-format
6637
msgid "%s is now not stacked\n"
6638
msgstr ""
6639
6640
#: bzrlib/remote.py:1886
6641
msgid "Copying repository content as tarball..."
6642
msgstr ""
6643
6644
#: bzrlib/rename_map.py:68
6645
msgid "Calculating hashes"
6646
msgstr ""
6647
6648
#: bzrlib/rename_map.py:106
6649
msgid "Determining hash hits"
6650
msgstr ""
6651
6652
#: bzrlib/rename_map.py:241
6653
msgid "{0} => {1}"
6654
msgstr ""
6655
6656
#: bzrlib/repository.py:284
6657
#, python-format
6658
msgid "bzr: ERROR (ignored): %s"
6659
msgstr ""
6660
6661
#: bzrlib/repository.py:1806
6662
msgid "Moving repository to repository.backup"
6663
msgstr ""
6664
6665
#: bzrlib/repository.py:1813
6666
msgid "Creating new repository"
6667
msgstr ""
6668
6669
#: bzrlib/repository.py:1818
6670
msgid "Copying content"
6671
msgstr ""
6672
6673
#: bzrlib/repository.py:1822
6674
msgid "Deleting old repository content"
6675
msgstr ""
6676
6677
#: bzrlib/repository.py:1824
6678
msgid "repository converted"
6679
msgstr ""
6680
6681
#: bzrlib/revisionspec.py:914
6682
msgid "Using {0} {1}"
6683
msgstr ""
6684
6685
#: bzrlib/send.py:56
6686
#, python-format
6687
msgid "Mail client \"%s\" does not support specifying body"
6688
msgstr ""
6689
6690
#: bzrlib/send.py:60
6691
msgid "--remember requires a branch to be specified."
6692
msgstr ""
6693
6694
#: bzrlib/send.py:74
6695
msgid "No submit branch known or specified"
6696
msgstr ""
6697
6698
#: bzrlib/send.py:77
6699
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
6700
msgstr ""
6701
6702
#: bzrlib/send.py:94
6703
#, python-format
6704
msgid "No such send format '%s'."
6705
msgstr ""
6706
6707
#: bzrlib/send.py:111
6708
msgid "bzr send takes at most two one revision identifiers"
6709
msgstr ""
6710
6711
#: bzrlib/send.py:124
6712
msgid "No revisions to submit."
6713
msgstr ""
6714
6715
#: bzrlib/send.py:135
6716
msgid ""
6717
"- not supported for merge directives that use more than one output file."
6718
msgstr ""
6719
6720
#: bzrlib/send.py:177
6721
msgid "Format 0.9 does not permit bundle with no patch"
6722
msgstr ""
6723
6724
#: bzrlib/shelf_ui.py:45
6725
#, python-format
6726
msgid "Shelve adding file \"%(path)s\"?"
6727
msgstr ""
6728
6729
#: bzrlib/shelf_ui.py:46
6730
msgid "Shelve binary changes?"
6731
msgstr ""
6732
6733
#: bzrlib/shelf_ui.py:47
6734
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
6735
msgstr ""
6736
6737
#: bzrlib/shelf_ui.py:49
6738
#, python-format
6739
msgid "Shelve removing file \"%(path)s\"?"
6740
msgstr ""
6741
6742
#: bzrlib/shelf_ui.py:50
6743
#, python-format
6744
msgid "Shelve %d change(s)?"
6745
msgstr ""
6746
6747
#: bzrlib/shelf_ui.py:51
6748
msgid "Shelve?"
6749
msgstr ""
6750
6751
#: bzrlib/shelf_ui.py:52
6752
#, python-format
6753
msgid ""
6754
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
6755
msgstr ""
6756
6757
#: bzrlib/shelf_ui.py:54
6758
#, python-format
6759
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
6760
msgstr ""
6761
6762
#: bzrlib/shelf_ui.py:69
6763
#, python-format
6764
msgid "Changes shelved with id \"%d\"."
6765
msgstr ""
6766
6767
#: bzrlib/shelf_ui.py:73
6768
msgid "Selected changes destroyed."
6769
msgstr ""
6770
6771
#: bzrlib/shelf_ui.py:77
6772
msgid "Selected changes:"
6773
msgstr ""
6774
6775
#: bzrlib/shelf_ui.py:97
6776
#, python-format
6777
msgid "Delete file \"%(path)s\"?"
6778
msgstr ""
6779
6780
#: bzrlib/shelf_ui.py:98
6781
msgid "Apply binary changes?"
6782
msgstr ""
6783
6784
#: bzrlib/shelf_ui.py:99
6785
#, python-format
6786
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
6787
msgstr ""
6788
6789
#: bzrlib/shelf_ui.py:101
6790
#, python-format
6791
msgid "Add file \"%(path)s\"?"
6792
msgstr ""
6793
6794
#: bzrlib/shelf_ui.py:102
6795
#, python-format
6796
msgid "Apply %d change(s)?"
6797
msgstr ""
6798
6799
#: bzrlib/shelf_ui.py:103
6800
msgid "Apply change?"
6801
msgstr ""
6802
6803
#: bzrlib/shelf_ui.py:104
6804
#, python-format
6805
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
6806
msgstr ""
6807
6808
#: bzrlib/shelf_ui.py:106
6809
#, python-format
6810
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
6811
msgstr ""
6812
6813
#: bzrlib/shelf_ui.py:265
6814
msgid "You need a controlling terminal."
6815
msgstr ""
6816
6817
#: bzrlib/shelf_ui.py:415
6818
msgid "No changes are shelved."
6819
msgstr ""
6820
6821
#: bzrlib/shelf_ui.py:473
6822
#, python-format
6823
msgid "Using changes with id \"%d\"."
6824
msgstr ""
6825
6826
#: bzrlib/shelf_ui.py:477
6827
#, python-format
6828
msgid "Message: %s"
6829
msgstr ""
6830
6831
#: bzrlib/shelf_ui.py:489
6832
#, python-format
6833
msgid "Deleted changes with id \"%d\"."
6834
msgstr ""
6835
6836
#: bzrlib/smart/medium.py:565
6837
msgid "HPSS calls: {0} ({1} vfs) {2}"
6838
msgstr ""
6839
6840
#: bzrlib/smart/server.py:355
6841
#, python-format
6842
msgid "listening on port: %s"
6843
msgstr ""
6844
6845
#: bzrlib/switch.py:67
6846
msgid "Pending merges must be committed or reverted before using switch."
6847
msgstr ""
6848
6849
#: bzrlib/switch.py:94
6850
msgid ""
6851
"Cannot switch as local commits found in the checkout. Commit these to the "
6852
"bound branch or use --force to throw them away."
6853
msgstr ""
6854
6855
#: bzrlib/switch.py:99
6856
#, python-format
6857
msgid ""
6858
"Unable to connect to current master branch %(target)s: %(error)s To switch "
6859
"anyway, use --force."
6860
msgstr ""
6861
6862
#: bzrlib/switch.py:108
6863
msgid "Cannot switch a branch, only a checkout."
6864
msgstr ""
6865
6866
#: bzrlib/switch.py:144
6867
#, python-format
6868
msgid "Tree is up to date at revision %d."
6869
msgstr ""
6870
6871
#: bzrlib/switch.py:150
6872
#, python-format
6873
msgid "Updated to revision %d."
6874
msgstr ""
6875
6876
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
6877
msgid "Apply phase"
6878
msgstr ""
6879
6880
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
6881
msgid "removing file"
6882
msgstr ""
6883
6884
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
6885
msgid "adding file"
6886
msgstr ""
6887
6888
#: bzrlib/transform.py:2587
6889
msgid "Building tree"
6890
msgstr ""
6891
6892
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
6893
msgid "Adding file contents"
6894
msgstr ""
6895
6896
#: bzrlib/transform.py:3051
6897
msgid "Resolution pass"
6898
msgstr ""
6899
6900
#: bzrlib/tree.py:635
6901
msgid "*** {0} content-filter: {1} => {2!r}"
6902
msgstr ""
6903
6904
#: bzrlib/upgrade.py:76
6905
#, python-format
6906
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
6907
msgstr ""
6908
6909
#: bzrlib/upgrade.py:99
6910
#, python-format
6911
msgid "cannot upgrade from bzrdir format %s"
6912
msgstr ""
6913
6914
#: bzrlib/upgrade.py:102
6915
#, python-format
6916
msgid "starting upgrade of %s"
6917
msgstr ""
6918
6919
#: bzrlib/upgrade.py:109
6920
msgid "finished"
6921
msgstr ""
6922
6923
#: bzrlib/upgrade.py:119
6924
msgid "Deleting backup.bzr"
6925
msgstr ""
6926
6927
#: bzrlib/upgrade.py:150
6928
msgid ""
6929
"\n"
6930
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
6931
msgstr ""
6932
6933
#: bzrlib/upgrade.py:207
6934
#, python-format
6935
msgid "Found %d dependent branches - upgrading ..."
6936
msgstr ""
6937
6938
#: bzrlib/upgrade.py:275
6939
msgid "Upgrading bzrdirs"
6940
msgstr ""
6941
6942
#: bzrlib/upgrade.py:281
6943
#, python-format
6944
msgid "Upgrading %s"
6945
msgstr ""
6946
6947
#: bzrlib/upgrade.py:282
6948
msgid "Upgrading {0} {1} ..."
6949
msgstr ""
6950
6951
#: bzrlib/upgrade.py:296
6952
msgid "Removing backup ..."
6953
msgstr ""
6954
6955
#: bzrlib/upgrade.py:300
6956
msgid "failed to clean-up {0}: {1}"
6957
msgstr ""
6958
6959
#: bzrlib/vf_repository.py:1091
6960
msgid "inventories"
6961
msgstr ""
6962
6963
#: bzrlib/vf_repository.py:1117
6964
msgid "texts"
6965
msgstr ""
6966
6967
#: bzrlib/vf_repository.py:1572 bzrlib/vf_repository.py:1581
6968
msgid "Calculating text parents"
6969
msgstr ""
6970
6971
#: bzrlib/vf_repository.py:1657
6972
msgid "Fetch texts"
6973
msgstr ""
6974
6975
#: bzrlib/vf_repository.py:2468
6976
msgid "loading text store"
6977
msgstr ""
6978
6979
#: bzrlib/vf_repository.py:2474
6980
msgid "checking text graph"
6981
msgstr ""
6982
6983
#: bzrlib/vf_repository.py:2924 bzrlib/vf_repository.py:2938
6984
#: bzrlib/vf_repository.py:3053
6985
msgid "Transferring revisions"
6986
msgstr ""
6987
6988
#: bzrlib/win32utils.py:132
6989
msgid "Failed to GetProcessMemoryInfo()"
6990
msgstr ""
6991
6992
#: bzrlib/win32utils.py:153
6993
msgid "Cannot debug memory on win32 without ctypes or win32process"
6994
msgstr ""
6995
6996
#: bzrlib/win32utils.py:158
6997
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
6998
msgstr ""
6999
7000
#: bzrlib/win32utils.py:166
7001
#, python-format
7002
msgid "WorkingSize %8d KiB"
7003
msgstr ""
7004
7005
#: bzrlib/win32utils.py:167
7006
#, python-format
7007
msgid "PeakWorking %8d KiB"
7008
msgstr ""
7009
7010
#: bzrlib/win32utils.py:168
7011
#, python-format
7012
msgid "PagefileUsage %8d KiB"
7013
msgstr ""
7014
7015
#: bzrlib/win32utils.py:169
7016
#, python-format
7017
msgid "PeakPagefileUsage %8d KiB"
7018
msgstr ""
7019
7020
#: bzrlib/win32utils.py:171
7021
#, python-format
7022
msgid "PrivateUsage %8d KiB"
7023
msgstr ""
7024
7025
#: bzrlib/win32utils.py:172
7026
#, python-format
7027
msgid "PageFaultCount %8d"
7028
msgstr ""
7029
7030
#: bzrlib/workingtree.py:1502
7031
msgid "Rerun update after fixing the conflicts."
7032
msgstr ""
7033
7034
#: dummy/help_topics/authentication/summary.txt:1
7035
msgid "Information on configuring authentication"
7036
msgstr ""
7037
7038
#: dummy/help_topics/basic/detail.txt:1
7039
msgid ""
7040
"Bazaar 2.5.0dev2 -- a free distributed version-control tool\n"
7041
"http://bazaar.canonical.com/"
7042
msgstr ""
7043
7044
#: dummy/help_topics/basic/detail.txt:4
7045
msgid ""
7046
"Basic commands:\n"
7047
" bzr init makes this directory a versioned branch\n"
7048
" bzr branch make a copy of another branch"
7049
msgstr ""
7050
7051
#: dummy/help_topics/basic/detail.txt:8
7052
msgid ""
7053
" bzr add make files or directories versioned\n"
7054
" bzr ignore ignore a file or pattern\n"
7055
" bzr mv move or rename a versioned file"
7056
msgstr ""
7057
7058
#: dummy/help_topics/basic/detail.txt:12
7059
msgid ""
7060
" bzr status summarize changes in working copy\n"
7061
" bzr diff show detailed diffs"
7062
msgstr ""
7063
7064
#: dummy/help_topics/basic/detail.txt:15
7065
msgid ""
7066
" bzr merge pull in changes from another branch\n"
7067
" bzr commit save some or all changes\n"
7068
" bzr send send changes via email"
7069
msgstr ""
7070
7071
#: dummy/help_topics/basic/detail.txt:19
7072
msgid ""
7073
" bzr log show history of changes\n"
7074
" bzr check validate storage"
7075
msgstr ""
7076
7077
#: dummy/help_topics/basic/detail.txt:22
7078
msgid ""
7079
" bzr help init more help on e.g. init command\n"
7080
" bzr help commands list all commands\n"
7081
" bzr help topics list all help topics\n"
7082
msgstr ""
7083
7084
#: dummy/help_topics/basic/summary.txt:1
7085
msgid "Basic commands"
7086
msgstr ""
7087
7088
#: dummy/help_topics/branches/detail.txt:1
7089
msgid "Branches"
7090
msgstr ""
7091
7092
#: dummy/help_topics/branches/detail.txt:3
7093
msgid ""
7094
"A branch consists of the state of a project, including all of its\n"
7095
"history. All branches have a repository associated (which is where the\n"
7096
"branch history is stored), but multiple branches may share the same\n"
7097
"repository (a shared repository). Branches can be copied and merged."
7098
msgstr ""
7099
7100
#: dummy/help_topics/branches/detail.txt:8
7101
msgid ""
7102
"In addition, one branch may be bound to another one. Binding to another\n"
7103
"branch indicates that commits which happen in this branch must also \n"
7104
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7105
"commits when the two branches are out of date. In order for a commit \n"
7106
"to succeed, it may be necessary to update the current branch using \n"
7107
"``bzr update``."
7108
msgstr ""
7109
7110
#: dummy/help_topics/branches/detail.txt:15
7111
msgid "Related commands::"
7112
msgstr ""
7113
7114
#: dummy/help_topics/branches/detail.txt:17
7115
msgid ""
7116
" init Change a directory into a versioned branch.\n"
7117
" branch Create a new branch that is a copy of an existing branch.\n"
7118
" merge Perform a three-way merge.\n"
7119
" bind Bind a branch to another one.\n"
7120
msgstr ""
7121
7122
#: dummy/help_topics/branches/summary.txt:1
7123
msgid "Information on what a branch is"
7124
msgstr ""
7125
7126
#: dummy/help_topics/bugs/summary.txt:1
7127
msgid "Bug tracker settings"
7128
msgstr ""
7129
7130
#: dummy/help_topics/checkouts/detail.txt:1
7131
msgid "Checkouts"
7132
msgstr ""
7133
7134
#: dummy/help_topics/checkouts/detail.txt:3
7135
msgid ""
7136
"Checkouts are source trees that are connected to a branch, so that when\n"
7137
"you commit in the source tree, the commit goes into that branch. They\n"
7138
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7139
"Bazaar's decentralized features until you want them. Using checkouts\n"
7140
"with shared repositories is very similar to working with SVN or CVS, but\n"
7141
"doesn't have the same restrictions. And using checkouts still allows\n"
7142
"others working on the project to use whatever workflow they like."
7143
msgstr ""
7144
7145
#: dummy/help_topics/checkouts/detail.txt:11
7146
msgid ""
7147
"A checkout is created with the bzr checkout command (see \"help checkout"
7148
"\").\n"
7149
"You pass it a reference to another branch, and it will create a local copy\n"
7150
"for you that still contains a reference to the branch you created the\n"
7151
"checkout from (the master branch). Then if you make any commits they will "
7152
"be\n"
7153
"made on the other branch first. This creates an instant mirror of your work, "
7154
"or\n"
7155
"facilitates lockstep development, where each developer is working together,\n"
7156
"continuously integrating the changes of others."
7157
msgstr ""
7158
7159
#: dummy/help_topics/checkouts/detail.txt:19
7160
msgid ""
7161
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7162
"you have the full history locally. As you have a first class branch you "
7163
"can\n"
7164
"also commit locally if you want, for instance due to the temporary loss af "
7165
"a\n"
7166
"network connection. Use the --local option to commit to do this. All the "
7167
"local\n"
7168
"commits will then be made on the master branch the next time you do a non-"
7169
"local\n"
7170
"commit."
7171
msgstr ""
7172
7173
#: dummy/help_topics/checkouts/detail.txt:26
7174
msgid ""
7175
"If you are using a checkout from a shared branch you will periodically want "
7176
"to\n"
7177
"pull in all the changes made by others. This is done using the \"update\"\n"
7178
"command. The changes need to be applied before any non-local commit, but\n"
7179
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7180
"command when needed."
7181
msgstr ""
7182
7183
#: dummy/help_topics/checkouts/detail.txt:32
7184
msgid ""
7185
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7186
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7187
"SVN checkout in that it is not a first class branch, it mainly consists of "
7188
"the\n"
7189
"working tree. This means that any history operations must query the master\n"
7190
"branch, which could be slow if a network connection is involved. Also, as "
7191
"you\n"
7192
"don't have a local branch, then you cannot commit locally."
7193
msgstr ""
7194
7195
#: dummy/help_topics/checkouts/detail.txt:39
7196
msgid ""
7197
"Lightweight checkouts work best when you have fast reliable access to the\n"
7198
"master branch. This means that if the master branch is on the same disk or "
7199
"LAN\n"
7200
"a lightweight checkout will be faster than a heavyweight one for any "
7201
"commands\n"
7202
"that modify the revision history (as only one copy of the branch needs to\n"
7203
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7204
"that uses the history but does not change it, but if the master branch is "
7205
"on\n"
7206
"the same disk then there won't be a noticeable difference."
7207
msgstr ""
7208
7209
#: dummy/help_topics/checkouts/detail.txt:47
7210
msgid ""
7211
"Another possible use for a checkout is to use it with a treeless repository\n"
7212
"containing your branches, where you maintain only one working tree by\n"
7213
"switching the master branch that the checkout points to when you want to\n"
7214
"work on a different branch."
7215
msgstr ""
7216
7217
#: dummy/help_topics/checkouts/detail.txt:52
7218
msgid ""
7219
"Obviously to commit on a checkout you need to be able to write to the "
7220
"master\n"
7221
"branch. This means that the master branch must be accessible over a "
7222
"writeable\n"
7223
"protocol , such as sftp://, and that you have write permissions at the "
7224
"other\n"
7225
"end. Checkouts also work on the local file system, so that all that matters "
7226
"is\n"
7227
"file permissions."
7228
msgstr ""
7229
7230
#: dummy/help_topics/checkouts/detail.txt:58
7231
msgid ""
7232
"You can change the master of a checkout by using the \"switch\" command "
7233
"(see\n"
7234
"\"help switch\"). This will change the location that the commits are sent "
7235
"to.\n"
7236
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7237
"checkout. If you would like to convert your heavy checkout into a normal\n"
7238
"branch so that every commit is local, you can use the \"unbind\" command. To "
7239
"see\n"
7240
"whether or not a branch is bound or not you can use the \"info\" command. If "
7241
"the\n"
7242
"branch is bound it will tell you the location of the bound branch."
7243
msgstr ""
7244
7245
#: dummy/help_topics/checkouts/detail.txt:68
7246
msgid ""
7247
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7248
" checkout\n"
7249
" update Pull any changes in the master branch in to your checkout\n"
7250
" commit Make a commit that is sent to the master branch. If you have\n"
7251
" a heavy checkout then the --local option will commit to the\n"
7252
" checkout without sending the commit to the master\n"
7253
" switch Change the master branch that the commits in the checkout "
7254
"will\n"
7255
" be sent to\n"
7256
" bind Turn a standalone branch into a heavy checkout so that any\n"
7257
" commits will be sent to the master branch\n"
7258
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7259
" commits are only made locally\n"
7260
" info Displays whether a branch is bound or unbound. If the branch "
7261
"is\n"
7262
" bound, then it will also display the location of the bound "
7263
"branch\n"
7264
msgstr ""
7265
7266
#: dummy/help_topics/checkouts/summary.txt:1
7267
msgid "Information on what a checkout is"
7268
msgstr ""
7269
7270
#: dummy/help_topics/commands/summary.txt:1
7271
msgid "Basic help for all commands"
7272
msgstr ""
7273
7274
#: dummy/help_topics/configuration/summary.txt:1
7275
msgid "Details on the configuration settings available"
7276
msgstr ""
7277
7278
#: dummy/help_topics/conflict-types/summary.txt:1
7279
msgid "Types of conflicts and what to do about them"
7280
msgstr ""
7281
7282
#: dummy/help_topics/content-filters/summary.txt:1
7283
msgid "Conversion of content into/from working trees"
7284
msgstr ""
7285
7286
#: dummy/help_topics/criss-cross/detail.txt:1
7287
msgid "Criss-Cross"
7288
msgstr ""
7289
7290
#: dummy/help_topics/criss-cross/detail.txt:3
7291
msgid ""
7292
"A criss-cross in the branch history can cause the default merge technique\n"
7293
"to emit more conflicts than would normally be expected."
7294
msgstr ""
7295
7296
#: dummy/help_topics/criss-cross/detail.txt:6
7297
msgid ""
7298
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7299
"give\n"
7300
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7301
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7302
msgstr ""
7303
7304
#: dummy/help_topics/criss-cross/detail.txt:10
7305
msgid ""
7306
"Criss-crosses occur in a branch's history if two branches merge the same "
7307
"thing\n"
7308
"and then merge one another, or if two branches merge one another at the "
7309
"same\n"
7310
"time. They can be avoided by having each branch only merge from or into a\n"
7311
"designated central branch (a \"star topology\")."
7312
msgstr ""
7313
7314
#: dummy/help_topics/criss-cross/detail.txt:15
7315
msgid ""
7316
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7317
"default\n"
7318
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7319
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7320
"differences between THIS and OTHER are due to one side adding lines, or\n"
7321
"from another side removing lines."
7322
msgstr ""
7323
7324
#: dummy/help_topics/criss-cross/detail.txt:21
7325
msgid ""
7326
"Criss-crosses mean there is no good choice for a base. Selecting the "
7327
"recent\n"
7328
"merge points could cause one side's changes to be silently discarded.\n"
7329
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7330
"are emitted."
7331
msgstr ""
7332
7333
#: dummy/help_topics/criss-cross/detail.txt:26
7334
msgid ""
7335
"The ``weave`` merge type is not affected by this problem because it uses\n"
7336
"line-origin detection instead of a basis revision to determine the cause of\n"
7337
"differences.\n"
7338
msgstr ""
7339
7340
#: dummy/help_topics/criss-cross/summary.txt:1
7341
msgid "Information on criss-cross merging"
7342
msgstr ""
7343
7344
#: dummy/help_topics/current-formats/summary.txt:1
7345
msgid "Current storage formats"
7346
msgstr ""
7347
7348
#: dummy/help_topics/debug-flags/summary.txt:1
7349
msgid "Options to show or record debug information"
7350
msgstr ""
7351
7352
#: dummy/help_topics/diverged-branches/summary.txt:1
7353
msgid "How to fix diverged branches"
7354
msgstr ""
7355
7356
#: dummy/help_topics/env-variables/detail.txt:1
7357
msgid "Environment Variables"
7358
msgstr ""
7359
7360
#: dummy/help_topics/env-variables/detail.txt:3
7361
msgid ""
7362
"=================== "
7363
"===========================================================\n"
7364
"BZRPATH Path where bzr is to look for shell plugin external\n"
7365
" commands.\n"
7366
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7367
"EMAIL E-Mail address of the user.\n"
7368
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7369
"EDITOR Editor for editing commit messages.\n"
7370
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7371
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7372
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7373
"BZR_PLUGIN_PATH.\n"
7374
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7375
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7376
"and\n"
7377
" HOME.\n"
7378
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7379
"URLs).\n"
7380
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7381
"sshcorp,\n"
7382
" plink or lsh.\n"
7383
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7384
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7385
"BZR_COLUMNS Override implicit terminal width.\n"
7386
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7387
"(selftest)\n"
7388
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7389
"'text'.\n"
7390
"BZR_PDB Control whether to launch a debugger on error.\n"
7391
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7392
" breakin debugger.\n"
7393
"=================== "
7394
"===========================================================\n"
7395
msgstr ""
7396
7397
#: dummy/help_topics/env-variables/summary.txt:1
7398
msgid "Environment variable names and values"
7399
msgstr ""
7400
7401
#: dummy/help_topics/eol/summary.txt:1
7402
msgid "Information on end-of-line handling"
7403
msgstr ""
7404
7405
#: dummy/help_topics/files/detail.txt:1
7406
msgid "Files"
7407
msgstr ""
7408
7409
#: dummy/help_topics/files/detail.txt:3
7410
msgid ""
7411
":On Unix: ~/.bazaar/bazaar.conf\n"
7412
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
7413
"\\bazaar\\\\2.0\\\\bazaar.conf"
7414
msgstr ""
7415
7416
#: dummy/help_topics/files/detail.txt:6
7417
msgid ""
7418
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7419
"used to define general configuration that will be applied everywhere.\n"
7420
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7421
"commonly used options."
7422
msgstr ""
7423
7424
#: dummy/help_topics/files/detail.txt:11
7425
msgid "A typical config file might look something like::"
7426
msgstr ""
7427
7428
#: dummy/help_topics/files/detail.txt:13
7429
msgid ""
7430
" [DEFAULT]\n"
7431
" email=John Doe <jdoe@isp.com>"
7432
msgstr ""
7433
7434
#: dummy/help_topics/files/detail.txt:16
7435
msgid ""
7436
" [ALIASES]\n"
7437
" commit = commit --strict\n"
7438
" log10 = log --short -r -10..-1\n"
7439
msgstr ""
7440
7441
#: dummy/help_topics/files/summary.txt:1
7442
msgid "Information on configuration and log files"
7443
msgstr ""
7444
7445
#: dummy/help_topics/formats/detail.txt:1
7446
msgid "Storage Formats"
7447
msgstr ""
7448
7449
#: dummy/help_topics/formats/detail.txt:3
7450
msgid ""
7451
"To ensure that older clients do not access data incorrectly,\n"
7452
"Bazaar's policy is to introduce a new storage format whenever\n"
7453
"new features requiring new metadata are added. New storage\n"
7454
"formats may also be introduced to improve performance and\n"
7455
"scalability."
7456
msgstr ""
7457
7458
#: dummy/help_topics/formats/detail.txt:9
7459
msgid ""
7460
"The newest format, 2a, is highly recommended. If your\n"
7461
"project is not using 2a, then you should suggest to the\n"
7462
"project owner to upgrade."
7463
msgstr ""
7464
7465
#: dummy/help_topics/formats/detail.txt:13
7466
msgid ""
7467
"\n"
7468
".. note::"
7469
msgstr ""
7470
7471
#: dummy/help_topics/formats/detail.txt:16
7472
msgid ""
7473
" Some of the older formats have two variants:\n"
7474
" a plain one and a rich-root one. The latter include an additional\n"
7475
" field about the root of the tree. There is no performance cost\n"
7476
" for using a rich-root format but you cannot easily merge changes\n"
7477
" from a rich-root format into a plain format. As a consequence,\n"
7478
" moving a project to a rich-root format takes some co-ordination\n"
7479
" in that all contributors need to upgrade their repositories\n"
7480
" around the same time. 2a and all future formats will be\n"
7481
" implicitly rich-root."
7482
msgstr ""
7483
7484
#: dummy/help_topics/formats/detail.txt:26
7485
msgid ""
7486
"See :doc:`current-formats-help` for the complete list of\n"
7487
"currently supported formats. See :doc:`other-formats-help` for\n"
7488
"descriptions of any available experimental and deprecated formats.\n"
7489
msgstr ""
7490
7491
#: dummy/help_topics/formats/summary.txt:1
7492
msgid "Information on choosing a storage format"
7493
msgstr ""
7494
7495
#: dummy/help_topics/global-options/detail.txt:1
7496
msgid "Global Options"
7497
msgstr ""
7498
7499
#: dummy/help_topics/global-options/detail.txt:3
7500
msgid ""
7501
"These options may be used with any command, and may appear in front of any\n"
7502
"command. (e.g. ``bzr --profile help``)."
7503
msgstr ""
7504
7505
#: dummy/help_topics/global-options/detail.txt:6
7506
msgid ""
7507
"--version Print the version number. Must be supplied before the "
7508
"command.\n"
7509
"--no-aliases Do not process command aliases when running this command.\n"
7510
"--builtin Use the built-in version of a command, not the plugin "
7511
"version.\n"
7512
" This does not suppress other plugin effects.\n"
7513
"--no-plugins Do not process any plugins.\n"
7514
"--no-l10n Do not translate messages.\n"
7515
"--concurrency Number of processes that can be run concurrently (selftest)."
7516
msgstr ""
7517
7518
#: dummy/help_topics/global-options/detail.txt:14
7519
msgid ""
7520
"--profile Profile execution using the hotshot profiler.\n"
7521
"--lsprof Profile execution using the lsprof profiler.\n"
7522
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7523
" results to a specified file. If the filename ends with \".txt"
7524
"\",\n"
7525
" text format will be used. If the filename either starts "
7526
"with\n"
7527
" \"callgrind.out\" or end with \".callgrind\", the output will "
7528
"be\n"
7529
" formatted for use with KCacheGrind. Otherwise, the output\n"
7530
" will be a pickle.\n"
7531
"--coverage Generate line coverage report in the specified directory."
7532
msgstr ""
7533
7534
#: dummy/help_topics/global-options/detail.txt:24
7535
msgid ""
7536
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7537
"information on profiling."
7538
msgstr ""
7539
7540
#: dummy/help_topics/global-options/detail.txt:27
7541
msgid ""
7542
"A number of debug flags are also available to assist troubleshooting and\n"
7543
"development. See :doc:`debug-flags-help`.\n"
7544
msgstr ""
7545
7546
#: dummy/help_topics/global-options/summary.txt:1
7547
msgid "Options that control how Bazaar runs"
7548
msgstr ""
7549
7550
#: dummy/help_topics/hidden-commands/summary.txt:1
7551
msgid "All hidden commands"
7552
msgstr ""
7553
7554
#: dummy/help_topics/hooks/summary.txt:1
7555
msgid "Points at which custom processing can be added"
7556
msgstr ""
7557
7558
#: dummy/help_topics/launchpad/detail.txt:1
7559
msgid "Integration with Launchpad.net"
7560
msgstr ""
7561
7562
#: dummy/help_topics/launchpad/detail.txt:3
7563
msgid ""
7564
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
7565
"specification tracking."
7566
msgstr ""
7567
7568
#: dummy/help_topics/launchpad/detail.txt:6
7569
msgid ""
7570
"The bzr client (through the plugin called 'launchpad') has special\n"
7571
"features to communicate with Launchpad:"
7572
msgstr ""
7573
7574
#: dummy/help_topics/launchpad/detail.txt:9
7575
msgid ""
7576
" * The launchpad-login command tells Bazaar your Launchpad user name. "
7577
"This\n"
7578
" is then used by the 'lp:' transport to download your branches using\n"
7579
" bzr+ssh://."
7580
msgstr ""
7581
7582
#: dummy/help_topics/launchpad/detail.txt:13
7583
msgid ""
7584
" * The 'lp:' transport uses Launchpad as a directory service: for "
7585
"example\n"
7586
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
7587
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
7588
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
7589
msgstr ""
7590
7591
#: dummy/help_topics/launchpad/detail.txt:18
7592
msgid ""
7593
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
7594
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
7595
"lp:12345'\n"
7596
" will record a revision property that marks that revision as fixing\n"
7597
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
7598
" automatically be linked to the bug report."
7599
msgstr ""
7600
7601
#: dummy/help_topics/launchpad/detail.txt:24
7602
msgid ""
7603
" * The register-branch command tells Launchpad about the url of a\n"
7604
" public branch. Launchpad will then mirror the branch, display\n"
7605
" its contents and allow it to be attached to bugs and other\n"
7606
" objects."
7607
msgstr ""
7608
7609
#: dummy/help_topics/launchpad/detail.txt:29
7610
msgid "For more information see http://help.launchpad.net/\n"
7611
msgstr ""
7612
7613
#: dummy/help_topics/launchpad/summary.txt:1
7614
msgid "Using Bazaar with Launchpad.net"
7615
msgstr ""
7616
7617
#: dummy/help_topics/location-alias/summary.txt:1
7618
msgid "Aliases for remembered locations"
7619
msgstr ""
7620
7621
#: dummy/help_topics/log-formats/summary.txt:1
7622
msgid "Details on the logging formats available"
7623
msgstr ""
7624
7625
#: dummy/help_topics/other-formats/summary.txt:1
7626
msgid "Experimental and deprecated storage formats"
7627
msgstr ""
7628
7629
#: dummy/help_topics/patterns/summary.txt:1
7630
msgid "Information on the pattern syntax"
7631
msgstr ""
7632
7633
#: dummy/help_topics/repositories/detail.txt:1
7634
msgid "Repositories"
7635
msgstr ""
7636
7637
#: dummy/help_topics/repositories/detail.txt:3
7638
msgid ""
7639
"Repositories in Bazaar are where committed information is stored. There is\n"
7640
"a repository associated with every branch."
7641
msgstr ""
7642
7643
#: dummy/help_topics/repositories/detail.txt:6
7644
msgid ""
7645
"Repositories are a form of database. Bzr will usually maintain this for\n"
7646
"good performance automatically, but in some situations (e.g. when doing\n"
7647
"very many commits in a short time period) you may want to ask bzr to\n"
7648
"optimise the database indices. This can be done by the 'bzr pack' command."
7649
msgstr ""
7650
7651
#: dummy/help_topics/repositories/detail.txt:11
7652
msgid ""
7653
"By default just running 'bzr init' will create a repository within the new\n"
7654
"branch but it is possible to create a shared repository which allows "
7655
"multiple\n"
7656
"branches to share their information in the same location. When a new branch "
7657
"is\n"
7658
"created it will first look to see if there is a containing shared repository "
7659
"it\n"
7660
"can use."
7661
msgstr ""
7662
7663
#: dummy/help_topics/repositories/detail.txt:17
7664
msgid ""
7665
"When two branches of the same project share a repository, there is\n"
7666
"generally a large space saving. For some operations (e.g. branching\n"
7667
"within the repository) this translates in to a large time saving."
7668
msgstr ""
7669
7670
#: dummy/help_topics/repositories/detail.txt:21
7671
msgid ""
7672
"To create a shared repository use the init-repository command (or the alias\n"
7673
"init-repo). This command takes the location of the repository to create. "
7674
"This\n"
7675
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
7676
"which contains a shared repository. Any new branches that are created in "
7677
"this\n"
7678
"directory will then use it for storage."
7679
msgstr ""
7680
7681
#: dummy/help_topics/repositories/detail.txt:27
7682
msgid ""
7683
"It is a good idea to create a repository whenever you might create more\n"
7684
"than one branch of a project. This is true for both working areas where you\n"
7685
"are doing the development, and any server areas that you use for hosting\n"
7686
"projects. In the latter case, it is common to want branches without working\n"
7687
"trees. Since the files in the branch will not be edited directly there is "
7688
"no\n"
7689
"need to use up disk space for a working tree. To create a repository in "
7690
"which\n"
7691
"the branches will not have working trees pass the '--no-trees' option to\n"
7692
"'init-repository'."
7693
msgstr ""
7694
7695
#: dummy/help_topics/repositories/detail.txt:38
7696
msgid ""
7697
" init-repository Create a shared repository. Use --no-trees to create "
7698
"one\n"
7699
" in which new branches won't get a working tree.\n"
7700
msgstr ""
7701
7702
#: dummy/help_topics/repositories/summary.txt:1
7703
msgid "Basic information on shared repositories."
7704
msgstr ""
7705
7706
#: dummy/help_topics/revisionspec/summary.txt:1
7707
msgid "Explain how to use --revision"
7708
msgstr ""
7709
7710
#: dummy/help_topics/rules/summary.txt:1
7711
msgid "Information on defining rule-based preferences"
7712
msgstr ""
7713
7714
#: dummy/help_topics/standalone-trees/detail.txt:1
7715
msgid "Standalone Trees"
7716
msgstr ""
7717
7718
#: dummy/help_topics/standalone-trees/detail.txt:3
7719
msgid ""
7720
"A standalone tree is a working tree with an associated repository. It\n"
7721
"is an independently usable branch, with no dependencies on any other.\n"
7722
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
7723
"an existing project under version control."
7724
msgstr ""
7725
7726
#: dummy/help_topics/standalone-trees/detail.txt:8
7727
msgid "Related Commands::"
7728
msgstr ""
7729
7730
#: dummy/help_topics/standalone-trees/detail.txt:10
7731
msgid " init Make a directory into a versioned branch.\n"
7732
msgstr ""
7733
7734
#: dummy/help_topics/standalone-trees/summary.txt:1
7735
msgid "Information on what a standalone tree is"
7736
msgstr ""
7737
7738
#: dummy/help_topics/standard-options/detail.txt:1
7739
msgid "Standard Options"
7740
msgstr ""
7741
7742
#: dummy/help_topics/standard-options/detail.txt:3
7743
msgid "Standard options are legal for all commands."
7744
msgstr ""
7745
7746
#: dummy/help_topics/standard-options/detail.txt:5
7747
msgid ""
7748
"--help, -h Show help message.\n"
7749
"--verbose, -v Display more information.\n"
7750
"--quiet, -q Only display errors and warnings."
7751
msgstr ""
7752
7753
#: dummy/help_topics/standard-options/detail.txt:9
7754
msgid "Unlike global options, standard options can be used in aliases.\n"
7755
msgstr ""
7756
7757
#: dummy/help_topics/standard-options/summary.txt:1
7758
msgid "Options that can be used with any command"
7759
msgstr ""
7760
7761
#: dummy/help_topics/status-flags/detail.txt:1
7762
msgid "Status Flags"
7763
msgstr ""
7764
7765
#: dummy/help_topics/status-flags/detail.txt:3
7766
msgid ""
7767
"Status flags are used to summarise changes to the working tree in a concise\n"
7768
"manner. They are in the form::"
7769
msgstr ""
7770
7771
#: dummy/help_topics/status-flags/detail.txt:6
7772
msgid " xxx <filename>"
7773
msgstr ""
7774
7775
#: dummy/help_topics/status-flags/detail.txt:8
7776
msgid "where the columns' meanings are as follows."
7777
msgstr ""
7778
7779
#: dummy/help_topics/status-flags/detail.txt:10
7780
msgid "Column 1 - versioning/renames::"
7781
msgstr ""
7782
7783
#: dummy/help_topics/status-flags/detail.txt:12
7784
msgid ""
7785
" + File versioned\n"
7786
" - File unversioned\n"
7787
" R File renamed\n"
7788
" ? File unknown\n"
7789
" X File nonexistent (and unknown to bzr)\n"
7790
" C File has conflicts\n"
7791
" P Entry for a pending merge (not a file)"
7792
msgstr ""
7793
7794
#: dummy/help_topics/status-flags/detail.txt:20
7795
msgid "Column 2 - contents::"
7796
msgstr ""
7797
7798
#: dummy/help_topics/status-flags/detail.txt:22
7799
msgid ""
7800
" N File created\n"
7801
" D File deleted\n"
7802
" K File kind changed\n"
7803
" M File modified"
7804
msgstr ""
7805
7806
#: dummy/help_topics/status-flags/detail.txt:27
7807
msgid "Column 3 - execute::"
7808
msgstr ""
7809
7810
#: dummy/help_topics/status-flags/detail.txt:29
7811
msgid " * The execute bit was changed\n"
7812
msgstr ""
7813
7814
#: dummy/help_topics/status-flags/summary.txt:1
7815
msgid "Help on status flags"
7816
msgstr ""
7817
7818
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
7819
msgid "Branches Out of Sync"
7820
msgstr ""
7821
7822
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
7823
msgid ""
7824
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
7825
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
7826
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
7827
"have the same last revision as the new reference branch for the lightweight\n"
7828
"checkout, data could be lost, so Bazaar refuses."
7829
msgstr ""
7830
7831
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
7832
msgid "How you deal with this depends on *why* the branches are out of sync."
7833
msgstr ""
7834
7835
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
7836
msgid ""
7837
"If you have a checkout and have done local commits, you can get back in "
7838
"sync\n"
7839
"by running \"bzr update\" (and possibly \"bzr commit\")."
7840
msgstr ""
7841
7842
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
7843
msgid ""
7844
"If you have a branch and the remote branch is out-of-date, you can push\n"
7845
"the local changes using \"bzr push\". If the local branch is out of date, "
7846
"you\n"
7847
"can do \"bzr pull\". If both branches have had changes, you can merge, "
7848
"commit\n"
7849
"and then push your changes. If you decide that some of the changes aren't\n"
7850
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
7851
msgstr ""
7852
7853
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
7854
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
7855
msgstr ""
7856
7857
#: dummy/help_topics/topics/summary.txt:1
7858
msgid "Topics list"
7859
msgstr ""
7860
7861
#: dummy/help_topics/url-special-chars/summary.txt:1
7862
msgid "Special character handling in URLs"
7863
msgstr ""
7864
7865
#: dummy/help_topics/urlspec/summary.txt:1
7866
msgid "Supported transport protocols"
7867
msgstr ""
7868
7869
#: dummy/help_topics/working-trees/detail.txt:1
7870
msgid "Working Trees"
7871
msgstr ""
7872
7873
#: dummy/help_topics/working-trees/detail.txt:3
7874
msgid ""
7875
"A working tree is the contents of a branch placed on disk so that you can\n"
7876
"see the files and edit them. The working tree is where you make changes to "
7877
"a\n"
7878
"branch, and when you commit the current state of the working tree is the\n"
7879
"snapshot that is recorded in the commit."
7880
msgstr ""
7881
7882
#: dummy/help_topics/working-trees/detail.txt:8
7883
msgid ""
7884
"When you push a branch to a remote system, a working tree will not be\n"
7885
"created. If one is already present the files will not be updated. The\n"
7886
"branch information will be updated and the working tree will be marked\n"
7887
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
7888
"may be uncommitted changes or the update may cause content conflicts that "
7889
"are\n"
7890
"difficult to deal with remotely."
7891
msgstr ""
7892
7893
#: dummy/help_topics/working-trees/detail.txt:15
7894
msgid ""
7895
"If you have a branch with no working tree you can use the 'checkout' "
7896
"command\n"
7897
"to create a working tree. If you run 'bzr checkout .' from the branch it "
7898
"will\n"
7899
"create the working tree. If the branch is updated remotely, you can update "
7900
"the\n"
7901
"working tree by running 'bzr update' in that directory."
7902
msgstr ""
7903
7904
#: dummy/help_topics/working-trees/detail.txt:20
7905
msgid ""
7906
"If you have a branch with a working tree that you do not want the 'remove-"
7907
"tree'\n"
7908
"command will remove the tree if it is safe. This can be done to avoid the\n"
7909
"warning about the remote working tree not being updated when pushing to the\n"
7910
"branch. It can also be useful when working with a '--no-trees' repository\n"
7911
"(see 'bzr help repositories')."
7912
msgstr ""
7913
7914
#: dummy/help_topics/working-trees/detail.txt:26
7915
msgid ""
7916
"If you want to have a working tree on a remote machine that you push to you\n"
7917
"can either run 'bzr update' in the remote branch after each push, or use "
7918
"some\n"
7919
"other method to update the tree during the push. There is an 'rspush' "
7920
"plugin\n"
7921
"that will update the working tree using rsync as well as doing a push. "
7922
"There\n"
7923
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
7924
"SSH\n"
7925
"after each push."
7926
msgstr ""
7927
7928
#: dummy/help_topics/working-trees/detail.txt:33
7929
msgid "Useful commands::"
7930
msgstr ""
7931
7932
#: dummy/help_topics/working-trees/detail.txt:35
7933
msgid ""
7934
" checkout Create a working tree when a branch does not have one.\n"
7935
" remove-tree Removes the working tree from a branch when it is safe to do "
7936
"so.\n"
7937
" update When a working tree is out of sync with its associated "
7938
"branch\n"
7939
" this will update the tree to match the branch.\n"
7940
msgstr ""
7941
7942
#: dummy/help_topics/working-trees/summary.txt:1
7943
msgid "Information on working trees"
7944
msgstr ""
7945
7946
#: en/help_topics/authentication.txt:1
7947
msgid ""
7948
"Authentication Settings\n"
7949
"======================="
7950
msgstr ""
7951
7952
#: en/help_topics/authentication.txt:4
7953
msgid ""
7954
"\n"
7955
"Intent\n"
7956
"------"
7957
msgstr ""
7958
7959
#: en/help_topics/authentication.txt:8
7960
msgid ""
7961
"Many different authentication policies can be described in the\n"
7962
"``authentication.conf`` file but a particular user should need only a few\n"
7963
"definitions to cover his needs without having to specify a user and a "
7964
"password\n"
7965
"for every branch he uses."
7966
msgstr ""
7967
7968
#: en/help_topics/authentication.txt:13
7969
msgid ""
7970
"The definitions found in this file are used to find the credentials to use "
7971
"for\n"
7972
"a given url. The same credentials can generally be used for as many branches "
7973
"as\n"
7974
"possible by grouping their declaration around the remote servers that need\n"
7975
"them. It's even possible to declare credentials that will be used by "
7976
"different\n"
7977
"servers."
7978
msgstr ""
7979
7980
#: en/help_topics/authentication.txt:19
7981
msgid ""
7982
"The intent is to make this file as small as possible to minimize maintenance."
7983
msgstr ""
7984
7985
#: en/help_topics/authentication.txt:21
7986
msgid ""
7987
"Once the relevant credentials are declared in this file you may use branch "
7988
"urls\n"
7989
"without embedding passwords (security hazard) or even users (enabling "
7990
"sharing\n"
7991
"of your urls with others)."
7992
msgstr ""
7993
7994
#: en/help_topics/authentication.txt:25
7995
msgid "Instead of using::"
7996
msgstr ""
7997
7998
#: en/help_topics/authentication.txt:27
7999
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8000
msgstr ""
8001
8002
#: en/help_topics/authentication.txt:29
8003
msgid "you simply use::"
8004
msgstr ""
8005
8006
#: en/help_topics/authentication.txt:31
8007
msgid " bzr branch ftp://host.com/path/to/my/branch"
8008
msgstr ""
8009
8010
#: en/help_topics/authentication.txt:33
8011
msgid "provided you have created the following ``authentication.conf`` file::"
8012
msgstr ""
8013
8014
#: en/help_topics/authentication.txt:35
8015
msgid ""
8016
" [myprojects]\n"
8017
" scheme=ftp\n"
8018
" host=host.com\n"
8019
" user=joe\n"
8020
" password=secret\n"
8021
" "
8022
msgstr ""
8023
8024
#: en/help_topics/authentication.txt:42
8025
msgid ""
8026
"Authentication definitions\n"
8027
"--------------------------"
8028
msgstr ""
8029
8030
#: en/help_topics/authentication.txt:45
8031
msgid ""
8032
"There are two kinds of authentication used by the various schemes supported "
8033
"by\n"
8034
"bzr:"
8035
msgstr ""
8036
8037
#: en/help_topics/authentication.txt:48
8038
msgid "1. user and password"
8039
msgstr ""
8040
8041
#: en/help_topics/authentication.txt:50
8042
msgid ""
8043
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8044
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8045
"ssh agents are a better, more secure solution. So we have chosen to not "
8046
"provide\n"
8047
"our own less secure method."
8048
msgstr ""
8049
8050
#: en/help_topics/authentication.txt:55
8051
msgid "2. user, realm and password"
8052
msgstr ""
8053
8054
#: en/help_topics/authentication.txt:57
8055
msgid ""
8056
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8057
"against a host. But, by using ``.htaccess`` files, for example, it is "
8058
"possible\n"
8059
"to define several (``user, realm, password``) for a given ``host``. So what "
8060
"is\n"
8061
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8062
"is\n"
8063
"not taken into account in the definitions, but will displayed if bzr "
8064
"prompts\n"
8065
"you for a password."
8066
msgstr ""
8067
8068
#: en/help_topics/authentication.txt:64
8069
msgid ""
8070
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8071
"specifying the appropriate port."
8072
msgstr ""
8073
8074
#: en/help_topics/authentication.txt:67
8075
msgid ""
8076
"To take all schemes into account, the password will be deduced from a set "
8077
"of\n"
8078
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8079
"``user``,\n"
8080
"``password``)."
8081
msgstr ""
8082
8083
#: en/help_topics/authentication.txt:71
8084
msgid ""
8085
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8086
"used\n"
8087
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8088
"``ssh``\n"
8089
" should be used instead since this is the real scheme regarding\n"
8090
" authentication,"
8091
msgstr ""
8092
8093
#: en/help_topics/authentication.txt:76
8094
msgid " * ``host``: can be empty (to act as a default for any host),"
8095
msgstr ""
8096
8097
#: en/help_topics/authentication.txt:78
8098
msgid ""
8099
" * ``port`` can be empty (useful when an host provides several servers for "
8100
"the\n"
8101
" same scheme), only numerical values are allowed, this should be used "
8102
"only\n"
8103
" when the server uses a port different than the scheme standard port,"
8104
msgstr ""
8105
8106
#: en/help_topics/authentication.txt:82
8107
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8108
msgstr ""
8109
8110
#: en/help_topics/authentication.txt:84
8111
msgid ""
8112
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8113
" ``getpass.get_user()``),"
8114
msgstr ""
8115
8116
#: en/help_topics/authentication.txt:87
8117
msgid ""
8118
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8119
" password."
8120
msgstr ""
8121
8122
#: en/help_topics/authentication.txt:90
8123
msgid ""
8124
"Multiple definitions can be provided and, for a given URL, bzr will select "
8125
"a\n"
8126
"(``user`` [, ``password``]) based on the following rules :"
8127
msgstr ""
8128
8129
#: en/help_topics/authentication.txt:93
8130
msgid " 1. the first match wins,"
8131
msgstr ""
8132
8133
#: en/help_topics/authentication.txt:95
8134
msgid " 2. empty fields match everything,"
8135
msgstr ""
8136
8137
#: en/help_topics/authentication.txt:97
8138
msgid ""
8139
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8140
msgstr ""
8141
8142
#: en/help_topics/authentication.txt:99
8143
msgid ""
8144
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8145
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
8146
"net``\n"
8147
" will not match ``bzr.sf.net``)."
8148
msgstr ""
8149
8150
#: en/help_topics/authentication.txt:103
8151
msgid ""
8152
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8153
msgstr ""
8154
8155
#: en/help_topics/authentication.txt:105
8156
msgid ""
8157
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8158
"above,\n"
8159
" empty paths will match any provided path)."
8160
msgstr ""
8161
8162
#: en/help_topics/authentication.txt:110
8163
msgid ""
8164
"File format\n"
8165
"-----------"
8166
msgstr ""
8167
8168
#: en/help_topics/authentication.txt:113
8169
msgid ""
8170
"The general rules for :doc:`configuration files <configuration-help>`\n"
8171
"apply except for the variable policies."
8172
msgstr ""
8173
8174
#: en/help_topics/authentication.txt:116
8175
msgid "Each section describes an authentication definition."
8176
msgstr ""
8177
8178
#: en/help_topics/authentication.txt:118
8179
msgid ""
8180
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8181
"reserved\n"
8182
"and should appear as the *last* section."
8183
msgstr ""
8184
8185
#: en/help_topics/authentication.txt:121
8186
msgid "Each section should define:"
8187
msgstr ""
8188
8189
#: en/help_topics/authentication.txt:123
8190
msgid "* ``user``: the login to be used,"
8191
msgstr ""
8192
8193
#: en/help_topics/authentication.txt:125
8194
msgid "Each section could define:"
8195
msgstr ""
8196
8197
#: en/help_topics/authentication.txt:127
8198
msgid "* ``host``: the remote server,"
8199
msgstr ""
8200
8201
#: en/help_topics/authentication.txt:129
8202
msgid "* ``port``: the port the server is listening,"
8203
msgstr ""
8204
8205
#: en/help_topics/authentication.txt:131
8206
msgid "* ``path``: the branch location,"
8207
msgstr ""
8208
8209
#: en/help_topics/authentication.txt:133
8210
msgid "* ``password``: the password."
8211
msgstr ""
8212
8213
#: en/help_topics/authentication.txt:135
8214
msgid ""
8215
"\n"
8216
"Examples\n"
8217
"--------"
8218
msgstr ""
8219
8220
#: en/help_topics/authentication.txt:139
8221
msgid ""
8222
"\n"
8223
"Personal projects hosted outside\n"
8224
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8225
msgstr ""
8226
8227
#: en/help_topics/authentication.txt:143
8228
msgid ""
8229
"All connections are done with the same ``user`` (the remote one for which "
8230
"the\n"
8231
"default bzr one is not appropriate) and the password is always prompted "
8232
"with\n"
8233
"some exceptions::"
8234
msgstr ""
8235
8236
#: en/help_topics/authentication.txt:147
8237
msgid ""
8238
" # Pet projects on hobby.net\n"
8239
" [hobby]\n"
8240
" host=r.hobby.net\n"
8241
" user=jim\n"
8242
" password=obvious1234\n"
8243
" \n"
8244
" # Home server\n"
8245
" [home]\n"
8246
" scheme=https\n"
8247
" host=home.net\n"
8248
" user=joe\n"
8249
" password=1essobV10us\n"
8250
" \n"
8251
" [DEFAULT]\n"
8252
" # Our local user is barbaz, on all remote sites we're known as "
8253
"foobar\n"
8254
" user=foobar"
8255
msgstr ""
8256
8257
#: en/help_topics/authentication.txt:164
8258
msgid ""
8259
"\n"
8260
"Source hosting provider\n"
8261
"~~~~~~~~~~~~~~~~~~~~~~~"
8262
msgstr ""
8263
8264
#: en/help_topics/authentication.txt:168
8265
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8266
msgstr ""
8267
8268
#: en/help_topics/authentication.txt:170
8269
msgid ""
8270
" [shpnet domain]\n"
8271
" # we use sftp, but ssh is the scheme used for authentication\n"
8272
" scheme=ssh\n"
8273
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8274
" host=.shp.net\n"
8275
" user=joe\n"
8276
" # bzr don't support supplying a password for sftp,\n"
8277
" # consider using an ssh agent if you don't want to supply\n"
8278
" # a password interactively. (pageant, ssh-agent, etc)"
8279
msgstr ""
8280
8281
#: en/help_topics/authentication.txt:180
8282
msgid ""
8283
"HTTPS, SFTP servers and their proxy\n"
8284
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8285
msgstr ""
8286
8287
#: en/help_topics/authentication.txt:183
8288
msgid ""
8289
"At company.com, the server hosting release and integration branches is "
8290
"behind a\n"
8291
"proxy, and the two branches use different authentication policies::"
8292
msgstr ""
8293
8294
#: en/help_topics/authentication.txt:186
8295
msgid ""
8296
" [reference code]\n"
8297
" scheme=https\n"
8298
" host=dev.company.com\n"
8299
" path=/dev\n"
8300
" user=user1\n"
8301
" password=pass1"
8302
msgstr ""
8303
8304
#: en/help_topics/authentication.txt:193
8305
msgid ""
8306
" # development branches on dev server\n"
8307
" [dev]\n"
8308
" scheme=ssh # bzr+ssh and sftp are available here\n"
8309
" host=dev.company.com\n"
8310
" path=/dev/integration\n"
8311
" user=user2\n"
8312
" \n"
8313
" # proxy\n"
8314
" [proxy]\n"
8315
" scheme=http\n"
8316
" host=proxy.company.com\n"
8317
" port=3128\n"
8318
" user=proxyuser1\n"
8319
" password=proxypass1"
8320
msgstr ""
8321
8322
#: en/help_topics/authentication.txt:208
8323
msgid ""
8324
"\n"
8325
"Planned enhancements\n"
8326
"--------------------"
8327
msgstr ""
8328
8329
#: en/help_topics/authentication.txt:212
8330
msgid ""
8331
"The following are not yet implemented but planned as parts of a work in\n"
8332
"progress:"
8333
msgstr ""
8334
8335
#: en/help_topics/authentication.txt:215
8336
msgid "* add a ``password_encoding`` field allowing:"
8337
msgstr ""
8338
8339
#: en/help_topics/authentication.txt:217
8340
msgid ""
8341
" - storing the passwords in various obfuscating encodings (base64 for one),"
8342
msgstr ""
8343
8344
#: en/help_topics/authentication.txt:219
8345
msgid " - delegate password storage to plugins (.netrc for example)."
8346
msgstr ""
8347
8348
#: en/help_topics/authentication.txt:221
8349
msgid ""
8350
"* update the credentials when the user is prompted for user or password,"
8351
msgstr ""
8352
8353
#: en/help_topics/authentication.txt:223
8354
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8355
msgstr ""
8356
8357
#: en/help_topics/authentication.txt:225
8358
msgid ""
8359
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8360
"but\n"
8361
"ignored in the actual implementation.\n"
8362
msgstr ""
8363
8364
#: en/help_topics/bugs.txt:1
8365
msgid "Bug Tracker Settings"
8366
msgstr ""
8367
8368
#: en/help_topics/bugs.txt:3
8369
msgid ""
8370
"When making a commit, metadata about bugs fixed by that change can be\n"
8371
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8372
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8373
"(The only ``status`` value currently supported is ``fixed.``)"
8374
msgstr ""
8375
8376
#: en/help_topics/bugs.txt:8
8377
msgid ""
8378
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8379
"identifier\n"
8380
"rather than a full URL. This looks like::"
8381
msgstr ""
8382
8383
#: en/help_topics/bugs.txt:11
8384
msgid " bzr commit --fixes <tracker>:<id>"
8385
msgstr ""
8386
8387
#: en/help_topics/bugs.txt:13
8388
msgid "or::"
8389
msgstr ""
8390
8391
#: en/help_topics/bugs.txt:15
8392
msgid " bzr commit --fixes <id>"
8393
msgstr ""
8394
8395
#: en/help_topics/bugs.txt:17
8396
msgid ""
8397
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8398
"the\n"
8399
"identifier for that bug within the bugtracker, usually the bug number.\n"
8400
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8401
"or global configuration is used."
8402
msgstr ""
8403
8404
#: en/help_topics/bugs.txt:22
8405
msgid ""
8406
"Bazaar knows about a few bug trackers that have many users. If\n"
8407
"you use one of these bug trackers then there is no setup required to\n"
8408
"use this feature, you just need to know the tracker identifier to use.\n"
8409
"These are the bugtrackers that are built in:"
8410
msgstr ""
8411
8412
#: en/help_topics/bugs.txt:27
8413
msgid ""
8414
" ============================ ============ ============\n"
8415
" URL Abbreviation Example\n"
8416
" ============================ ============ ============\n"
8417
" https://bugs.launchpad.net/ lp lp:12345\n"
8418
" http://bugs.debian.org/ deb deb:12345\n"
8419
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8420
" ============================ ============ ============"
8421
msgstr ""
8422
8423
#: en/help_topics/bugs.txt:35
8424
msgid ""
8425
"For the bug trackers not listed above configuration is required.\n"
8426
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8427
"is built in, along with a template mechanism for other bugtrackers with\n"
8428
"simple URL schemes. If your bug tracker can't be described by one\n"
8429
"of the schemes described below then you can write a plugin to support\n"
8430
"it."
8431
msgstr ""
8432
8433
#: en/help_topics/bugs.txt:42
8434
msgid ""
8435
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8436
"variable which contains the base URL of the bug tracker. These options\n"
8437
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8438
"configuration section in ``locations.conf``. You can set up these values\n"
8439
"for each of the projects you work on."
8440
msgstr ""
8441
8442
#: en/help_topics/bugs.txt:48
8443
msgid ""
8444
"Note: As you provide a short name for each tracker, you can specify one or\n"
8445
"more bugs in one or more trackers at commit time if you wish."
8446
msgstr ""
8447
8448
#: en/help_topics/bugs.txt:51
8449
msgid ""
8450
"Launchpad\n"
8451
"---------"
8452
msgstr ""
8453
8454
#: en/help_topics/bugs.txt:54
8455
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8456
msgstr ""
8457
8458
#: en/help_topics/bugs.txt:56
8459
msgid ""
8460
"bugzilla_<tracker>_url\n"
8461
"----------------------"
8462
msgstr ""
8463
8464
#: en/help_topics/bugs.txt:59
8465
msgid ""
8466
"If present, the location of the Bugzilla bug tracker referred to by\n"
8467
"<tracker>. This option can then be used together with ``bzr commit\n"
8468
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8469
"example::"
8470
msgstr ""
8471
8472
#: en/help_topics/bugs.txt:64
8473
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8474
msgstr ""
8475
8476
#: en/help_topics/bugs.txt:66
8477
msgid ""
8478
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8479
"fixed."
8480
msgstr ""
8481
8482
#: en/help_topics/bugs.txt:69
8483
msgid ""
8484
"trac_<tracker>_url\n"
8485
"------------------"
8486
msgstr ""
8487
8488
#: en/help_topics/bugs.txt:72
8489
msgid ""
8490
"If present, the location of the Trac instance referred to by\n"
8491
"<tracker>. This option can then be used together with ``bzr commit\n"
8492
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8493
"example::"
8494
msgstr ""
8495
8496
#: en/help_topics/bugs.txt:77
8497
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8498
msgstr ""
8499
8500
#: en/help_topics/bugs.txt:79
8501
msgid ""
8502
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8503
"as\n"
8504
"fixed."
8505
msgstr ""
8506
8507
#: en/help_topics/bugs.txt:82
8508
msgid ""
8509
"bugtracker_<tracker>_url\n"
8510
"------------------------"
8511
msgstr ""
8512
8513
#: en/help_topics/bugs.txt:85
8514
msgid ""
8515
"If present, the location of a generic bug tracker instance referred to by\n"
8516
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8517
"which will be replaced by a specific bug ID. This option can then be used\n"
8518
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8519
"fixed by that commit. For example::"
8520
msgstr ""
8521
8522
#: en/help_topics/bugs.txt:91
8523
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8524
msgstr ""
8525
8526
#: en/help_topics/bugs.txt:93
8527
msgid ""
8528
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8529
"Roundup bug tracker as fixed, or::"
8530
msgstr ""
8531
8532
#: en/help_topics/bugs.txt:96
8533
msgid ""
8534
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8535
msgstr ""
8536
8537
#: en/help_topics/bugs.txt:98
8538
msgid ""
8539
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8540
"RT bug tracker as fixed, or::"
8541
msgstr ""
8542
8543
#: en/help_topics/bugs.txt:101
8544
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8545
msgstr ""
8546
8547
#: en/help_topics/bugs.txt:103
8548
msgid ""
8549
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
8550
"HUDSON-1234\n"
8551
"in Hudson's JIRA bug tracker as fixed.\n"
8552
msgstr ""
8553
8554
#: en/help_topics/commands.txt:1
8555
msgid ""
8556
"add Add specified files or directories.\n"
8557
"alias Set/unset and display aliases.\n"
8558
"annotate Show the origin of each line in a file.\n"
8559
"bash-completion Generate a shell function for bash command line "
8560
"completion.\n"
8561
" [bash_completion]\n"
8562
"bd-do Run a command in an exported package, copying the result\n"
8563
" back. [builddeb]\n"
8564
"bind Convert the current branch into a checkout of the "
8565
"supplied\n"
8566
" branch.\n"
8567
"branch Create a new branch that is a copy of an existing "
8568
"branch.\n"
8569
"branch-history Display the development history of a branch. [bzrtools]\n"
8570
"branches Scan a location for branches [bzrtools]\n"
8571
"break-lock Break a dead lock.\n"
8572
"bug-url Print full URL to a specific bug, or open it in your\n"
8573
" browser. [qbzr]\n"
8574
"builddeb Builds a Debian package from a branch. [builddeb]\n"
8575
"cat Write the contents of a file as of a given revision to\n"
8576
" standard output.\n"
8577
"cbranch Create a new checkout, associated with a new repository\n"
8578
" branch. [bzrtools]\n"
8579
"cdiff A color version of bzr's diff [bzrtools]\n"
8580
"check Validate working tree structure, branch consistency and\n"
8581
" repository history.\n"
8582
"checkout Create a new checkout of an existing branch.\n"
8583
"clean-tree Remove unwanted files from working tree.\n"
8584
"commit Commit changes into a new revision.\n"
8585
"config Display, set or remove a configuration option.\n"
8586
"conflict-diff Compare a conflicted file against BASE. [bzrtools]\n"
8587
"conflicts List files with conflicts.\n"
8588
"create-mirror Create a mirror of another branch. [bzrtools]\n"
8589
"deleted List files deleted in the working tree.\n"
8590
"dep3-patch Format the changes in a branch as a DEP-3 patch. "
8591
"[builddeb]\n"
8592
"dh-make Helps you create a new package. [builddeb]\n"
8593
"diff Show differences in the working tree, between revisions "
8594
"or\n"
8595
" branches.\n"
8596
"explorer Desktop application for Bazaar. [explorer]\n"
8597
"export Export current or past revision to a destination "
8598
"directory\n"
8599
" or archive.\n"
8600
"fetch-ghosts Attempt to retrieve ghosts from another branch. "
8601
"[bzrtools]\n"
8602
"graph-ancestry Produce ancestry graphs using dot. [bzrtools]\n"
8603
"heads Show all revisions in a repository not having "
8604
"descendants.\n"
8605
" [bzrtools]\n"
8606
"help Show help on a command or other topic.\n"
8607
"ignore Ignore specified files or patterns.\n"
8608
"ignored List ignored files and the patterns that matched them.\n"
8609
"import Import sources from a directory, tarball or zip file\n"
8610
" [bzrtools]\n"
8611
"import-dsc Import a series of source packages. [builddeb]\n"
8612
"import-upstream Imports an upstream tarball. [builddeb]\n"
8613
"info Show information about a working tree, branch or "
8614
"repository.\n"
8615
"init Make a directory into a versioned branch.\n"
8616
"init-repository Create a shared repository for branches to share storage\n"
8617
" space.\n"
8618
"init-workspace Start a new workspace. [explorer]\n"
8619
"join Combine a tree into its containing tree.\n"
8620
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
8621
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
8622
"launchpad-open Open a Launchpad branch page in your web browser.\n"
8623
" [launchpad]\n"
8624
"link-tree Hardlink matching files to another tree. [bzrtools]\n"
8625
"log Show historical log for a branch or subset of a branch.\n"
8626
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
8627
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
8628
"ls List files in a tree.\n"
8629
"mark-uploaded Mark that this branch has been uploaded, prior to "
8630
"pushing\n"
8631
" it. [builddeb]\n"
8632
"merge Perform a three-way merge.\n"
8633
"merge-package Merges source packaging branch into target packaging "
8634
"branch.\n"
8635
" [builddeb]\n"
8636
"merge-upstream Merges a new upstream version into the current branch.\n"
8637
" [builddeb]\n"
8638
"missing Show unmerged/unpulled revisions between two branches.\n"
8639
"mkdir Create a new versioned directory.\n"
8640
"multi-pull Pull all the branches under a location, e.g. a "
8641
"repository.\n"
8642
" [bzrtools]\n"
8643
"mv Move or rename a file.\n"
8644
"nick Print or set the branch nickname.\n"
8645
"pack Compress the data within a repository.\n"
8646
"patch Apply a named patch to the current tree. [bzrtools]\n"
8647
"plugins List the installed plugins.\n"
8648
"pull Turn this branch into a mirror of another branch.\n"
8649
"push Update a mirror of this branch.\n"
8650
"qadd GUI for adding files or directories. [qbzr]\n"
8651
"qannotate Show the origin of each line in a file. [qbzr]\n"
8652
"qbind Convert the current branch into a checkout of the "
8653
"supplied\n"
8654
" branch. [qbzr]\n"
8655
"qbranch Create a new copy of a branch. [qbzr]\n"
8656
"qbrowse Show inventory or working tree. [qbzr]\n"
8657
"qcat View the contents of a file as of a given revision. "
8658
"[qbzr]\n"
8659
"qcommit GUI for committing revisions. [qbzr]\n"
8660
"qconfig Configure Bazaar and QBzr. [qbzr]\n"
8661
"qconflicts Show conflicts. [qbzr]\n"
8662
"qdiff Show differences in working tree in a GUI window. [qbzr]\n"
8663
"qexport Export current or past revision to a destination "
8664
"directory\n"
8665
" or archive. [qbzr]\n"
8666
"qgetnew Creates a new working tree (either a checkout or full\n"
8667
" branch). [qbzr]\n"
8668
"qgetupdates Fetches external changes into the working tree. [qbzr]\n"
8669
"qinfo Shows information about the current location. [qbzr]\n"
8670
"qinit Initializes a new branch or shared repository. [qbzr]\n"
8671
"qinit-workspace Start a new workspace using a GUI. [explorer]\n"
8672
"qlog Show log of a repository, branch, file, or directory in a "
8673
"Qt\n"
8674
" window. [qbzr]\n"
8675
"qmerge Perform a three-way merge. [qbzr]\n"
8676
"qplugins Show information about installed plugins. [qbzr]\n"
8677
"qpull Turn this branch into a mirror of another branch. [qbzr]\n"
8678
"qpush Update a mirror of this branch. [qbzr]\n"
8679
"qrevert Revert changes files. [qbzr]\n"
8680
"qrun Run arbitrary bzr command. [qbzr]\n"
8681
"qsend Mail or create a merge-directive for submitting changes.\n"
8682
" [qbzr]\n"
8683
"qshelve Shelve selected changes away. [qbzr]\n"
8684
"qswitch Set the branch of a checkout and update. [qbzr]\n"
8685
"qtag Edit tags. [qbzr]\n"
8686
"qunbind Convert the current checkout into a regular branch. "
8687
"[qbzr]\n"
8688
"quncommit Move the tip of a branch to an earlier revision. [qbzr]\n"
8689
"qunshelve Restore shalved changes. [qbzr]\n"
8690
"qupdate Update working tree with latest changes in the branch.\n"
8691
" [qbzr]\n"
8692
"qverify-signatures Shows digital signature statuses for branch commits "
8693
"[qbzr]\n"
8694
"qversion Show version/system information. [qbzr]\n"
8695
"qviewer Simple file viewer. [qbzr]\n"
8696
"reconcile Reconcile bzr metadata in a branch.\n"
8697
"reconfigure Reconfigure the type of a bzr directory.\n"
8698
"register-branch Register a branch with launchpad.net. [launchpad]\n"
8699
"remerge Redo a merge.\n"
8700
"remove Remove files or directories.\n"
8701
"remove-branch Remove a branch.\n"
8702
"remove-tree Remove the working tree from a given branch/checkout.\n"
8703
"renames Show list of renamed files.\n"
8704
"resolve Mark a conflict as resolved.\n"
8705
"revert Revert files to a previous revision.\n"
8706
"revno Show current revision number.\n"
8707
"root Show the tree root directory.\n"
8708
"rspush Upload this branch to another location using rsync.\n"
8709
" [bzrtools]\n"
8710
"send Mail or create a merge-directive for submitting changes.\n"
8711
"serve Run the bzr server.\n"
8712
"shelf1 Perform various operations on your shelved patches. See "
8713
"also\n"
8714
" shelve1. [bzrtools]\n"
8715
"shell Begin an interactive shell tailored for bzr. [bzrtools]\n"
8716
"shelve Temporarily set aside some changes from the current "
8717
"tree.\n"
8718
"shelve1 Temporarily set aside some changes from the current "
8719
"tree.\n"
8720
" [bzrtools]\n"
8721
"sign-my-commits Sign all commits by a given committer.\n"
8722
"split Split a subdirectory of a tree into a separate tree.\n"
8723
"status Display status summary.\n"
8724
"switch Set the branch of a checkout and update.\n"
8725
"tag Create, remove or modify a tag naming a revision.\n"
8726
"tags List tags.\n"
8727
"testament Show testament (signing-form) of a revision.\n"
8728
"trees Scan a location for trees [bzrtools]\n"
8729
"unbind Convert the current checkout into a regular branch.\n"
8730
"uncommit Remove the last committed revision.\n"
8731
"unshelve Restore shelved changes.\n"
8732
"unshelve1 Restore shelved changes. [bzrtools]\n"
8733
"update Update a tree to have the latest code committed to its\n"
8734
" branch.\n"
8735
"upgrade Upgrade a repository, branch or working tree to a newer\n"
8736
" format.\n"
8737
"verify-signatures Verify all commit signatures.\n"
8738
"version Show version of bzr.\n"
8739
"version-info Show version information about this tree.\n"
8740
"view Manage filtered views.\n"
8741
"whoami Show or set bzr user id.\n"
8742
"zap Remove a lightweight checkout, if it can be done safely.\n"
8743
" [bzrtools]\n"
8744
msgstr ""
8745
8746
#: en/help_topics/configuration.txt:1
8747
msgid ""
8748
"Configuration Settings\n"
8749
"======================="
8750
msgstr ""
8751
8752
#: en/help_topics/configuration.txt:4
8753
msgid ""
8754
"Environment settings\n"
8755
"---------------------"
8756
msgstr ""
8757
8758
#: en/help_topics/configuration.txt:7
8759
msgid ""
8760
"While most configuration is handled by configuration files, some options\n"
8761
"which may be semi-permanent can also be controlled through the environment."
8762
msgstr ""
8763
8764
#: en/help_topics/configuration.txt:10
8765
msgid ""
8766
"BZR_EMAIL\n"
8767
"~~~~~~~~~"
8768
msgstr ""
8769
8770
#: en/help_topics/configuration.txt:13
8771
msgid "Override the email id used by Bazaar. Typical format::"
8772
msgstr ""
8773
8774
#: en/help_topics/configuration.txt:15
8775
msgid " \"John Doe <jdoe@example.com>\""
8776
msgstr ""
8777
8778
#: en/help_topics/configuration.txt:17
8779
msgid "See also the ``email`` configuration option."
8780
msgstr ""
8781
8782
#: en/help_topics/configuration.txt:19
8783
msgid ""
8784
"BZR_PROGRESS_BAR\n"
8785
"~~~~~~~~~~~~~~~~"
8786
msgstr ""
8787
8788
#: en/help_topics/configuration.txt:22
8789
msgid ""
8790
"Override the progress display. Possible values are \"none\" or \"text\". "
8791
"If\n"
8792
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
8793
"draws\n"
8794
"the ordinary command line progress bar."
8795
msgstr ""
8796
8797
#: en/help_topics/configuration.txt:26
8798
msgid ""
8799
"BZR_SIGQUIT_PDB\n"
8800
"~~~~~~~~~~~~~~~"
8801
msgstr ""
8802
8803
#: en/help_topics/configuration.txt:29
8804
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
8805
msgstr ""
8806
8807
#: en/help_topics/configuration.txt:31
8808
msgid ""
8809
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
8810
"* 1 = Invoke breakin debugger (default)"
8811
msgstr ""
8812
8813
#: en/help_topics/configuration.txt:34
8814
msgid ""
8815
"BZR_HOME\n"
8816
"~~~~~~~~"
8817
msgstr ""
8818
8819
#: en/help_topics/configuration.txt:37
8820
msgid "Override the home directory used by Bazaar."
8821
msgstr ""
8822
8823
#: en/help_topics/configuration.txt:39
8824
msgid ""
8825
"BZR_SSH\n"
8826
"~~~~~~~"
8827
msgstr ""
8828
8829
#: en/help_topics/configuration.txt:42
8830
msgid "Select a different SSH implementation."
8831
msgstr ""
8832
8833
#: en/help_topics/configuration.txt:44
8834
msgid ""
8835
"BZR_PDB\n"
8836
"~~~~~~~"
8837
msgstr ""
8838
8839
#: en/help_topics/configuration.txt:47
8840
msgid "Control whether to launch a debugger on error."
8841
msgstr ""
8842
8843
#: en/help_topics/configuration.txt:49
8844
msgid ""
8845
"* 0 = Standard behavior\n"
8846
"* 1 = Launch debugger"
8847
msgstr ""
8848
8849
#: en/help_topics/configuration.txt:52
8850
msgid ""
8851
"BZR_REMOTE_PATH\n"
8852
"~~~~~~~~~~~~~~~"
8853
msgstr ""
8854
8855
#: en/help_topics/configuration.txt:55
8856
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
8857
msgstr ""
8858
8859
#: en/help_topics/configuration.txt:57
8860
msgid "See also the ``bzr_remote_path`` configuration option."
8861
msgstr ""
8862
8863
#: en/help_topics/configuration.txt:59
8864
msgid ""
8865
"BZR_EDITOR\n"
8866
"~~~~~~~~~~"
8867
msgstr ""
8868
8869
#: en/help_topics/configuration.txt:62
8870
msgid "Path to the editor Bazaar should use for commit messages, etc."
8871
msgstr ""
8872
8873
#: en/help_topics/configuration.txt:64
8874
msgid ""
8875
"BZR_LOG\n"
8876
"~~~~~~~"
8877
msgstr ""
8878
8879
#: en/help_topics/configuration.txt:67
8880
msgid ""
8881
"Location of the Bazaar log file. You can check the current location by\n"
8882
"running ``bzr version``."
8883
msgstr ""
8884
8885
#: en/help_topics/configuration.txt:70
8886
msgid ""
8887
"The log file contains debug information that is useful for diagnosing or\n"
8888
"reporting problems with Bazaar."
8889
msgstr ""
8890
8891
#: en/help_topics/configuration.txt:73
8892
msgid ""
8893
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
8894
"will disable logging."
8895
msgstr ""
8896
8897
#: en/help_topics/configuration.txt:76
8898
msgid ""
8899
"\n"
8900
"BZR_PLUGIN_PATH\n"
8901
"~~~~~~~~~~~~~~~"
8902
msgstr ""
8903
8904
#: en/help_topics/configuration.txt:80
8905
msgid ""
8906
"The path to the plugins directory that Bazaar should use.\n"
8907
"If not set, Bazaar will search for plugins in:"
8908
msgstr ""
8909
8910
#: en/help_topics/configuration.txt:83
8911
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
8912
msgstr ""
8913
8914
#: en/help_topics/configuration.txt:85
8915
msgid "* the bzrlib directory (containing the ``core`` plugins),"
8916
msgstr ""
8917
8918
#: en/help_topics/configuration.txt:87
8919
msgid ""
8920
"* the site specific plugin directory if applicable (containing\n"
8921
" the ``site`` plugins)."
8922
msgstr ""
8923
8924
#: en/help_topics/configuration.txt:90
8925
msgid ""
8926
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
8927
"the way the plugin are searched. "
8928
msgstr ""
8929
8930
#: en/help_topics/configuration.txt:93
8931
msgid ""
8932
"As for the ``PATH`` variables, if multiple directories are\n"
8933
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
8934
"platform specific appropriate character (':' on Unix,\n"
8935
"';' on windows)"
8936
msgstr ""
8937
8938
#: en/help_topics/configuration.txt:98
8939
msgid ""
8940
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
8941
"in ``user``. However it will continue to search in ``core`` and\n"
8942
"``site`` unless they are explicitly removed."
8943
msgstr ""
8944
8945
#: en/help_topics/configuration.txt:102
8946
msgid ""
8947
"If you need to change the order or remove one of these\n"
8948
"directories, you should use special values:"
8949
msgstr ""
8950
8951
#: en/help_topics/configuration.txt:105
8952
msgid ""
8953
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
8954
" path from the default values,"
8955
msgstr ""
8956
8957
#: en/help_topics/configuration.txt:108
8958
msgid ""
8959
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
8960
" before the remaining default values (and also remove it from\n"
8961
" the default values)."
8962
msgstr ""
8963
8964
#: en/help_topics/configuration.txt:112
8965
msgid ""
8966
"Note that the special values 'user', 'core' and 'site' should be\n"
8967
"used literally, they will be substituted by the corresponding,\n"
8968
"platform specific, values."
8969
msgstr ""
8970
8971
#: en/help_topics/configuration.txt:116
8972
msgid ""
8973
"The examples below use ':' as the separator, windows users\n"
8974
"should use ';'."
8975
msgstr ""
8976
8977
#: en/help_topics/configuration.txt:119
8978
msgid "Overriding the default user plugin directory::"
8979
msgstr ""
8980
8981
#: en/help_topics/configuration.txt:121
8982
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
8983
msgstr ""
8984
8985
#: en/help_topics/configuration.txt:123
8986
msgid "Disabling the site directory while retaining the user directory::"
8987
msgstr ""
8988
8989
#: en/help_topics/configuration.txt:125
8990
msgid " BZR_PLUGIN_PATH='-site:+user'"
8991
msgstr ""
8992
8993
#: en/help_topics/configuration.txt:127
8994
msgid "Disabling all plugins (better achieved with --no-plugins)::"
8995
msgstr ""
8996
8997
#: en/help_topics/configuration.txt:129
8998
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
8999
msgstr ""
9000
9001
#: en/help_topics/configuration.txt:131
9002
msgid "Overriding the default site plugin directory::"
9003
msgstr ""
9004
9005
#: en/help_topics/configuration.txt:133
9006
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9007
msgstr ""
9008
9009
#: en/help_topics/configuration.txt:135
9010
msgid ""
9011
"BZR_DISABLE_PLUGINS\n"
9012
"~~~~~~~~~~~~~~~~~~~"
9013
msgstr ""
9014
9015
#: en/help_topics/configuration.txt:138
9016
msgid ""
9017
"Under special circumstances (mostly when trying to diagnose a\n"
9018
"bug), it's better to disable a plugin (or several) rather than\n"
9019
"uninstalling them completely. Such plugins can be specified in\n"
9020
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9021
msgstr ""
9022
9023
#: en/help_topics/configuration.txt:143
9024
msgid ""
9025
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9026
"will raise an import error if they are explicitly imported (by\n"
9027
"another plugin that depends on them for example)."
9028
msgstr ""
9029
9030
#: en/help_topics/configuration.txt:147
9031
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9032
msgstr ""
9033
9034
#: en/help_topics/configuration.txt:149
9035
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9036
msgstr ""
9037
9038
#: en/help_topics/configuration.txt:151
9039
msgid ""
9040
"BZR_PLUGINS_AT\n"
9041
"~~~~~~~~~~~~~~"
9042
msgstr ""
9043
9044
#: en/help_topics/configuration.txt:154
9045
msgid ""
9046
"When adding a new feature or working on a bug in a plugin,\n"
9047
"developers often need to use a specific version of a given\n"
9048
"plugin. Since python requires that the directory containing the\n"
9049
"code is named like the plugin itself this make it impossible to\n"
9050
"use arbitrary directory names (using a two-level directory scheme\n"
9051
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9052
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9053
msgstr ""
9054
9055
#: en/help_topics/configuration.txt:162
9056
msgid ""
9057
"Plugins specified in this environment variable takes precedence\n"
9058
"over the ones in ``BZR_PLUGIN_PATH``."
9059
msgstr ""
9060
9061
#: en/help_topics/configuration.txt:165
9062
msgid ""
9063
"The variable specified a list of ``plugin_name@plugin path``,\n"
9064
"``plugin_name`` being the name of the plugin as it appears in\n"
9065
"python module paths, ``plugin_path`` being the path to the\n"
9066
"directory containing the plugin code itself\n"
9067
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9068
"separator, use ';' on windows."
9069
msgstr ""
9070
9071
#: en/help_topics/configuration.txt:172
9072
msgid ""
9073
"Example:\n"
9074
"~~~~~~~~"
9075
msgstr ""
9076
9077
#: en/help_topics/configuration.txt:175
9078
msgid ""
9079
"Using a specific version of ``myplugin``:\n"
9080
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9081
msgstr ""
9082
9083
#: en/help_topics/configuration.txt:178
9084
msgid ""
9085
"BZRPATH\n"
9086
"~~~~~~~"
9087
msgstr ""
9088
9089
#: en/help_topics/configuration.txt:181
9090
msgid "The path where Bazaar should look for shell plugin external commands."
9091
msgstr ""
9092
9093
#: en/help_topics/configuration.txt:183
9094
msgid ""
9095
"\n"
9096
"http_proxy, https_proxy\n"
9097
"~~~~~~~~~~~~~~~~~~~~~~~"
9098
msgstr ""
9099
9100
#: en/help_topics/configuration.txt:187
9101
msgid "Specifies the network proxy for outgoing connections, for example::"
9102
msgstr ""
9103
9104
#: en/help_topics/configuration.txt:189
9105
msgid ""
9106
" http_proxy=http://proxy.example.com:3128/ \n"
9107
" https_proxy=http://proxy.example.com:3128/"
9108
msgstr ""
9109
9110
#: en/help_topics/configuration.txt:192
9111
msgid ""
9112
"\n"
9113
"Configuration files\n"
9114
"-------------------"
9115
msgstr ""
9116
9117
#: en/help_topics/configuration.txt:196
9118
msgid ""
9119
"Location\n"
9120
"~~~~~~~~"
9121
msgstr ""
9122
9123
#: en/help_topics/configuration.txt:199
9124
msgid ""
9125
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9126
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9127
"on\n"
9128
"Windows. (You can check the location for your system by using\n"
9129
"``bzr version``.)"
9130
msgstr ""
9131
9132
#: en/help_topics/configuration.txt:204
9133
msgid "There are three primary configuration files in this location:"
9134
msgstr ""
9135
9136
#: en/help_topics/configuration.txt:206
9137
msgid "* ``bazaar.conf`` describes default configuration options,"
9138
msgstr ""
9139
9140
#: en/help_topics/configuration.txt:208
9141
msgid ""
9142
"* ``locations.conf`` describes configuration information for\n"
9143
" specific branch locations,"
9144
msgstr ""
9145
9146
#: en/help_topics/configuration.txt:211
9147
msgid ""
9148
"* ``authentication.conf`` describes credential information for\n"
9149
" remote servers."
9150
msgstr ""
9151
9152
#: en/help_topics/configuration.txt:214
9153
msgid ""
9154
"Each branch can also contain a configuration file that sets values specific\n"
9155
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9156
"the\n"
9157
"branch. This file is visible to all users of a branch, if you wish to "
9158
"override\n"
9159
"one of the values for a branch with a setting that is specific to you then "
9160
"you\n"
9161
"can do so in ``locations.conf``."
9162
msgstr ""
9163
9164
#: en/help_topics/configuration.txt:220
9165
msgid ""
9166
"General format\n"
9167
"~~~~~~~~~~~~~~"
9168
msgstr ""
9169
9170
#: en/help_topics/configuration.txt:223
9171
msgid ""
9172
"An ini file has three types of contructs: section headers, section\n"
9173
"variables and comments."
9174
msgstr ""
9175
9176
#: en/help_topics/configuration.txt:226
9177
msgid ""
9178
"Comments\n"
9179
"^^^^^^^^"
9180
msgstr ""
9181
9182
#: en/help_topics/configuration.txt:229
9183
msgid ""
9184
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9185
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9186
"Bazaar when parsing ini files."
9187
msgstr ""
9188
9189
#: en/help_topics/configuration.txt:233
9190
msgid ""
9191
"Section headers\n"
9192
"^^^^^^^^^^^^^^^"
9193
msgstr ""
9194
9195
#: en/help_topics/configuration.txt:236
9196
msgid ""
9197
"A section header is a word enclosed in brackets that starts at the begining\n"
9198
"of a line. A typical section header looks like this::"
9199
msgstr ""
9200
9201
#: en/help_topics/configuration.txt:239
9202
msgid " [DEFAULT]"
9203
msgstr ""
9204
9205
#: en/help_topics/configuration.txt:241
9206
msgid ""
9207
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9208
"[ALIASES]. Section headers are case sensitive. The default section provides "
9209
"for\n"
9210
"setting variables which can be overridden with the branch config file."
9211
msgstr ""
9212
9213
#: en/help_topics/configuration.txt:245
9214
msgid ""
9215
"For ``locations.conf``, the variables from the section with the\n"
9216
"longest matching section header are used to the exclusion of other\n"
9217
"potentially valid section headers. A section header uses the path for\n"
9218
"the branch as the section header. Some examples include::"
9219
msgstr ""
9220
9221
#: en/help_topics/configuration.txt:250
9222
msgid ""
9223
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9224
" [/home/jdoe/branches/]"
9225
msgstr ""
9226
9227
#: en/help_topics/configuration.txt:253
9228
msgid ""
9229
"\n"
9230
"Section variables\n"
9231
"^^^^^^^^^^^^^^^^^"
9232
msgstr ""
9233
9234
#: en/help_topics/configuration.txt:257
9235
msgid ""
9236
"A section variable resides within a section. A section variable contains a\n"
9237
"variable name, an equals sign and a value. For example::"
9238
msgstr ""
9239
9240
#: en/help_topics/configuration.txt:260
9241
msgid ""
9242
" email = John Doe <jdoe@isp.com>\n"
9243
" gpg_signing_key = Amy Pond <amy@example.com>"
9244
msgstr ""
9245
9246
#: en/help_topics/configuration.txt:263
9247
msgid ""
9248
"A variable can reference other variables **in the same configuration file** "
9249
"by\n"
9250
"enclosing them in curly brackets::"
9251
msgstr ""
9252
9253
#: en/help_topics/configuration.txt:266
9254
msgid ""
9255
" my_branch_name = feature_x\n"
9256
" my_server = bzr+ssh://example.com\n"
9257
" push_location = {my_server}/project/{my_branch_name}"
9258
msgstr ""
9259
9260
#: en/help_topics/configuration.txt:270
9261
msgid ""
9262
"\n"
9263
"Variable policies\n"
9264
"^^^^^^^^^^^^^^^^^"
9265
msgstr ""
9266
9267
#: en/help_topics/configuration.txt:274
9268
msgid ""
9269
"Variables defined in a section affect the named directory or URL plus\n"
9270
"any locations they contain. Policies can be used to change how a\n"
9271
"variable value is interpreted for contained locations. Currently\n"
9272
"there are three policies available:"
9273
msgstr ""
9274
9275
#: en/help_topics/configuration.txt:279
9276
msgid ""
9277
" none:\n"
9278
" the value is interpreted the same for contained locations. This is\n"
9279
" the default behaviour.\n"
9280
" norecurse:\n"
9281
" the value is only used for the exact location specified by the\n"
9282
" section name.\n"
9283
" appendpath:\n"
9284
" for contained locations, any additional path components are\n"
9285
" appended to the value."
9286
msgstr ""
9287
9288
#: en/help_topics/configuration.txt:289
9289
msgid ""
9290
"Policies are specified by keys with names of the form \"$var:policy\".\n"
9291
"For example, to define the push location for a tree of branches, the\n"
9292
"following could be used::"
9293
msgstr ""
9294
9295
#: en/help_topics/configuration.txt:293
9296
msgid ""
9297
" [/top/location]\n"
9298
" push_location = sftp://example.com/location\n"
9299
" push_location:policy = appendpath"
9300
msgstr ""
9301
9302
#: en/help_topics/configuration.txt:297
9303
msgid ""
9304
"With this configuration, the push location for ``/top/location/branch1``\n"
9305
"would be ``sftp://example.com/location/branch1``."
9306
msgstr ""
9307
9308
#: en/help_topics/configuration.txt:300
9309
msgid ""
9310
"\n"
9311
"The main configuration file, bazaar.conf\n"
9312
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9313
msgstr ""
9314
9315
#: en/help_topics/configuration.txt:304
9316
msgid ""
9317
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9318
"The default section contains the default\n"
9319
"configuration options for all branches. The default section can be\n"
9320
"overriden by providing a branch-specific section in ``locations.conf``."
9321
msgstr ""
9322
9323
#: en/help_topics/configuration.txt:309
9324
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9325
msgstr ""
9326
9327
#: en/help_topics/configuration.txt:311
9328
msgid ""
9329
" [DEFAULT]\n"
9330
" email = John Doe <jdoe@isp.com>\n"
9331
" editor = /usr/bin/vim\n"
9332
" create_signatures = when-required"
9333
msgstr ""
9334
9335
#: en/help_topics/configuration.txt:316
9336
msgid ""
9337
"\n"
9338
"The branch location configuration file, locations.conf\n"
9339
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9340
msgstr ""
9341
9342
#: en/help_topics/configuration.txt:320
9343
msgid ""
9344
"``locations.conf`` allows one to specify overriding settings for\n"
9345
"a specific branch. The format is almost identical to the default section in\n"
9346
"bazaar.conf with one significant change: The section header, instead of "
9347
"saying\n"
9348
"default, will be the path to a branch that you wish to override a value\n"
9349
"for. The '?' and '*' wildcards are supported::"
9350
msgstr ""
9351
9352
#: en/help_topics/configuration.txt:326
9353
msgid ""
9354
" [/home/jdoe/branches/nethack]\n"
9355
" email = Nethack Admin <nethack@nethack.com>"
9356
msgstr ""
9357
9358
#: en/help_topics/configuration.txt:329
9359
msgid ""
9360
" [http://hypothetical.site.com/branches/devel-branch]\n"
9361
" create_signatures = always"
9362
msgstr ""
9363
9364
#: en/help_topics/configuration.txt:332
9365
msgid ""
9366
"The authentication configuration file, authentication.conf\n"
9367
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9368
msgstr ""
9369
9370
#: en/help_topics/configuration.txt:335
9371
msgid ""
9372
"``authentication.conf`` allows one to specify credentials for\n"
9373
"remote servers. This can be used for all the supported transports and any "
9374
"part\n"
9375
"of bzr that requires authentication (smtp for example)."
9376
msgstr ""
9377
9378
#: en/help_topics/configuration.txt:339
9379
msgid ""
9380
"The syntax of the file obeys the same rules as the others except for the\n"
9381
"variable policies which don't apply."
9382
msgstr ""
9383
9384
#: en/help_topics/configuration.txt:342
9385
msgid ""
9386
"For more information on the possible uses of the authentication "
9387
"configuration\n"
9388
"file see :doc:`authentication-help`."
9389
msgstr ""
9390
9391
#: en/help_topics/configuration.txt:345
9392
msgid ""
9393
"\n"
9394
"Common variable options\n"
9395
"-----------------------"
9396
msgstr ""
9397
9398
#: en/help_topics/configuration.txt:349
9399
msgid ""
9400
"debug_flags\n"
9401
"~~~~~~~~~~~"
9402
msgstr ""
9403
9404
#: en/help_topics/configuration.txt:352
9405
msgid ""
9406
"A comma-separated list of debugging options to turn on. The same values\n"
9407
"can be used as with the -D command-line option (see `help global-options`).\n"
9408
"For example::"
9409
msgstr ""
9410
9411
#: en/help_topics/configuration.txt:356
9412
msgid " debug_flags = hpss"
9413
msgstr ""
9414
9415
#: en/help_topics/configuration.txt:360
9416
msgid " debug_flags = hpss,evil"
9417
msgstr ""
9418
9419
#: en/help_topics/configuration.txt:362
9420
msgid ""
9421
"email\n"
9422
"~~~~~"
9423
msgstr ""
9424
9425
#: en/help_topics/configuration.txt:365
9426
msgid ""
9427
"The email address to use when committing a branch. Typically takes the form\n"
9428
"of::"
9429
msgstr ""
9430
9431
#: en/help_topics/configuration.txt:368
9432
msgid " email = Full Name <account@hostname.tld>"
9433
msgstr ""
9434
9435
#: en/help_topics/configuration.txt:370
9436
msgid ""
9437
"editor\n"
9438
"~~~~~~"
9439
msgstr ""
9440
9441
#: en/help_topics/configuration.txt:373
9442
msgid ""
9443
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9444
"a commit message. This setting is trumped by the environment variable\n"
9445
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9446
"variables."
9447
msgstr ""
9448
9449
#: en/help_topics/configuration.txt:378
9450
msgid ""
9451
"log_format\n"
9452
"~~~~~~~~~~"
9453
msgstr ""
9454
9455
#: en/help_topics/configuration.txt:381
9456
msgid ""
9457
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9458
"and ``line``. Additional formats may be provided by plugins. The default\n"
9459
"value is ``long``."
9460
msgstr ""
9461
9462
#: en/help_topics/configuration.txt:385
9463
msgid ""
9464
"check_signatures\n"
9465
"~~~~~~~~~~~~~~~~"
9466
msgstr ""
9467
9468
#: en/help_topics/configuration.txt:388
9469
msgid ""
9470
"Reserved for future use. These options will allow a policy for branches to\n"
9471
"require signatures."
9472
msgstr ""
9473
9474
#: en/help_topics/configuration.txt:391
9475
msgid ""
9476
"require\n"
9477
" The gnupg signature for revisions must be present and must be valid."
9478
msgstr ""
9479
9480
#: en/help_topics/configuration.txt:394
9481
msgid ""
9482
"ignore\n"
9483
" Do not check gnupg signatures of revisions."
9484
msgstr ""
9485
9486
#: en/help_topics/configuration.txt:397
9487
msgid ""
9488
"check-available\n"
9489
" (default) If gnupg signatures for revisions are present, check them.\n"
9490
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9491
" no signature is present."
9492
msgstr ""
9493
9494
#: en/help_topics/configuration.txt:402
9495
msgid ""
9496
"create_signatures\n"
9497
"~~~~~~~~~~~~~~~~~"
9498
msgstr ""
9499
9500
#: en/help_topics/configuration.txt:405
9501
msgid ""
9502
"Defines the behaviour of signing revisions on commits. By default bzr will "
9503
"not\n"
9504
"sign new commits."
9505
msgstr ""
9506
9507
#: en/help_topics/configuration.txt:408
9508
msgid ""
9509
"always\n"
9510
" Sign every new revision that is committed. If the signing fails then "
9511
"the\n"
9512
" commit will not be made."
9513
msgstr ""
9514
9515
#: en/help_topics/configuration.txt:412
9516
msgid ""
9517
"when-required\n"
9518
" Reserved for future use."
9519
msgstr ""
9520
9521
#: en/help_topics/configuration.txt:415
9522
msgid ""
9523
"never\n"
9524
" Reserved for future use."
9525
msgstr ""
9526
9527
#: en/help_topics/configuration.txt:418
9528
msgid ""
9529
"In future it is planned that ``when-required`` will sign newly\n"
9530
"committed revisions only when the branch requires them. ``never`` will "
9531
"refuse\n"
9532
"to sign newly committed revisions, even if the branch requires signatures."
9533
msgstr ""
9534
9535
#: en/help_topics/configuration.txt:422
9536
msgid ""
9537
"dirstate.fdatasync\n"
9538
"~~~~~~~~~~~~~~~~~~"
9539
msgstr ""
9540
9541
#: en/help_topics/configuration.txt:425
9542
msgid ""
9543
"If true (default), working tree metadata changes are flushed through the\n"
9544
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9545
"should not be lost if the machine crashes. See also repository.fdatasync."
9546
msgstr ""
9547
9548
#: en/help_topics/configuration.txt:429
9549
msgid ""
9550
"gpg_signing_key\n"
9551
"~~~~~~~~~~~~~~~"
9552
msgstr ""
9553
9554
#: en/help_topics/configuration.txt:432
9555
msgid ""
9556
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9557
"address, key fingerprint or full key ID. When unset or when set to\n"
9558
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9559
msgstr ""
9560
9561
#: en/help_topics/configuration.txt:436
9562
msgid ""
9563
"recurse\n"
9564
"~~~~~~~"
9565
msgstr ""
9566
9567
#: en/help_topics/configuration.txt:439
9568
msgid ""
9569
"Only useful in ``locations.conf``. Defines whether or not the\n"
9570
"configuration for this section applies to subdirectories:"
9571
msgstr ""
9572
9573
#: en/help_topics/configuration.txt:442
9574
msgid ""
9575
"true\n"
9576
" (default) This section applies to subdirectories as well."
9577
msgstr ""
9578
9579
#: en/help_topics/configuration.txt:445
9580
msgid ""
9581
"false\n"
9582
" This section only applies to the branch at this directory and not\n"
9583
" branches below it."
9584
msgstr ""
9585
9586
#: en/help_topics/configuration.txt:449
9587
msgid ""
9588
"gpg_signing_command\n"
9589
"~~~~~~~~~~~~~~~~~~~"
9590
msgstr ""
9591
9592
#: en/help_topics/configuration.txt:452
9593
msgid ""
9594
"(Default: \"gpg\"). Which program should be used to sign and check "
9595
"revisions.\n"
9596
"For example::"
9597
msgstr ""
9598
9599
#: en/help_topics/configuration.txt:455
9600
msgid " gpg_signing_command = /usr/bin/gnpg"
9601
msgstr ""
9602
9603
#: en/help_topics/configuration.txt:457
9604
msgid ""
9605
"The specified command must accept the options \"--clearsign\" and \"-u "
9606
"<email>\"."
9607
msgstr ""
9608
9609
#: en/help_topics/configuration.txt:459
9610
msgid ""
9611
"bzr_remote_path\n"
9612
"~~~~~~~~~~~~~~~"
9613
msgstr ""
9614
9615
#: en/help_topics/configuration.txt:462
9616
msgid ""
9617
"(Default: \"bzr\"). The path to the command that should be used to run the "
9618
"smart\n"
9619
"server for bzr. This value may only be specified in locations.conf, because:"
9620
msgstr ""
9621
9622
#: en/help_topics/configuration.txt:465
9623
msgid ""
9624
"- it's needed before branch.conf is accessible\n"
9625
"- allowing remote branch.conf files to specify commands would be a security\n"
9626
" risk"
9627
msgstr ""
9628
9629
#: en/help_topics/configuration.txt:469
9630
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
9631
msgstr ""
9632
9633
#: en/help_topics/configuration.txt:471
9634
msgid ""
9635
"smtp_server\n"
9636
"~~~~~~~~~~~"
9637
msgstr ""
9638
9639
#: en/help_topics/configuration.txt:474
9640
msgid ""
9641
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
9642
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
9643
msgstr ""
9644
9645
#: en/help_topics/configuration.txt:477
9646
msgid ""
9647
"smtp_username, smtp_password\n"
9648
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9649
msgstr ""
9650
9651
#: en/help_topics/configuration.txt:480
9652
msgid ""
9653
"User and password to authenticate to the SMTP server. If smtp_username\n"
9654
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
9655
"These settings are only needed if the SMTP server requires authentication\n"
9656
"to send mail."
9657
msgstr ""
9658
9659
#: en/help_topics/configuration.txt:485
9660
msgid ""
9661
"locks.steal_dead\n"
9662
"~~~~~~~~~~~~~~~~"
9663
msgstr ""
9664
9665
#: en/help_topics/configuration.txt:488
9666
msgid ""
9667
"If set to true, bzr will automatically break locks held by processes from\n"
9668
"the same machine and user that are no longer alive. Otherwise, it will\n"
9669
"print a message and you can break the lock manually, if you are satisfied\n"
9670
"the object is no longer in use."
9671
msgstr ""
9672
9673
#: en/help_topics/configuration.txt:493
9674
msgid ""
9675
"mail_client\n"
9676
"~~~~~~~~~~~"
9677
msgstr ""
9678
9679
#: en/help_topics/configuration.txt:496
9680
msgid ""
9681
"A mail client to use for sending merge requests.\n"
9682
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
9683
"it\n"
9684
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
9685
"``editor``."
9686
msgstr ""
9687
9688
#: en/help_topics/configuration.txt:501
9689
msgid "Supported values for specific clients:"
9690
msgstr ""
9691
9692
#: en/help_topics/configuration.txt:503
9693
msgid ""
9694
":claws: Use Claws. This skips a dialog for attaching files.\n"
9695
":evolution: Use Evolution.\n"
9696
":kmail: Use KMail.\n"
9697
":mutt: Use Mutt.\n"
9698
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
9699
"1.5,\n"
9700
" this works around some bugs that xdg-email doesn't handle."
9701
msgstr ""
9702
9703
#: en/help_topics/configuration.txt:510
9704
msgid "Supported generic values are:"
9705
msgstr ""
9706
9707
#: en/help_topics/configuration.txt:512
9708
msgid ""
9709
":default: See above.\n"
9710
":editor: Use your editor to compose the merge request. This also uses\n"
9711
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
9712
" smtp_username and smtp_password.\n"
9713
":mapi: Use your preferred e-mail client on Windows.\n"
9714
":xdg-email: Use xdg-email to run your preferred mail program"
9715
msgstr ""
9716
9717
#: en/help_topics/configuration.txt:519
9718
msgid ""
9719
"repository.fdatasync\n"
9720
"~~~~~~~~~~~~~~~~~~~~"
9721
msgstr ""
9722
9723
#: en/help_topics/configuration.txt:522
9724
msgid ""
9725
"If true (default), repository changes are flushed through the OS buffers\n"
9726
"to physical disk. This is somewhat slower, but means data should not be\n"
9727
"lost if the machine crashes. See also dirstate.fdatasync."
9728
msgstr ""
9729
9730
#: en/help_topics/configuration.txt:526
9731
msgid ""
9732
"submit_branch\n"
9733
"~~~~~~~~~~~~~"
9734
msgstr ""
9735
9736
#: en/help_topics/configuration.txt:529
9737
msgid ""
9738
"The branch you intend to submit your current work to. This is "
9739
"automatically\n"
9740
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
9741
"This\n"
9742
"should usually be set on a per-branch or per-location basis."
9743
msgstr ""
9744
9745
#: en/help_topics/configuration.txt:533
9746
msgid ""
9747
"public_branch\n"
9748
"~~~~~~~~~~~~~"
9749
msgstr ""
9750
9751
#: en/help_topics/configuration.txt:536
9752
msgid ""
9753
"A publically-accessible version of this branch (implying that this version "
9754
"is\n"
9755
"not publically-accessible). Used (and set) by ``bzr send``."
9756
msgstr ""
9757
9758
#: en/help_topics/configuration.txt:539
9759
msgid ""
9760
"suppress_warnings\n"
9761
"~~~~~~~~~~~~~~~~~"
9762
msgstr ""
9763
9764
#: en/help_topics/configuration.txt:542
9765
msgid ""
9766
"A list of strings, each string represent a warning that can be emitted by\n"
9767
"bzr. Mentioning a warning in this list tells bzr to not emit it."
9768
msgstr ""
9769
9770
#: en/help_topics/configuration.txt:545
9771
msgid "Valid values:"
9772
msgstr ""
9773
9774
#: en/help_topics/configuration.txt:547
9775
msgid ""
9776
"* ``format_deprecation``:\n"
9777
" whether the format deprecation warning is shown on repositories that "
9778
"are\n"
9779
" using deprecated formats."
9780
msgstr ""
9781
9782
#: en/help_topics/configuration.txt:551
9783
msgid ""
9784
"default_format\n"
9785
"~~~~~~~~~~~~~~"
9786
msgstr ""
9787
9788
#: en/help_topics/configuration.txt:554
9789
msgid ""
9790
"A format name for the default format used when creating branches. See "
9791
"``bzr\n"
9792
"help formats`` for possible values."
9793
msgstr ""
9794
9795
#: en/help_topics/configuration.txt:557
9796
msgid ""
9797
"\n"
9798
"Unicode options\n"
9799
"---------------"
9800
msgstr ""
9801
9802
#: en/help_topics/configuration.txt:561
9803
msgid ""
9804
"output_encoding\n"
9805
"~~~~~~~~~~~~~~~"
9806
msgstr ""
9807
9808
#: en/help_topics/configuration.txt:564
9809
msgid ""
9810
"A Python unicode encoding name for text output from bzr, such as log\n"
9811
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
9812
"is the terminal encoding prefered by the operating system."
9813
msgstr ""
9814
9815
#: en/help_topics/configuration.txt:568
9816
msgid ""
9817
"\n"
9818
"Branch type specific options\n"
9819
"----------------------------"
9820
msgstr ""
9821
9822
#: en/help_topics/configuration.txt:572
9823
msgid ""
9824
"These options apply only to branches that use the ``dirstate-tags`` or\n"
9825
"later format. They\n"
9826
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
9827
"manually set in ``locations.conf`` or ``bazaar.conf``."
9828
msgstr ""
9829
9830
#: en/help_topics/configuration.txt:577
9831
msgid ""
9832
"append_revisions_only\n"
9833
"~~~~~~~~~~~~~~~~~~~~~"
9834
msgstr ""
9835
9836
#: en/help_topics/configuration.txt:580
9837
msgid ""
9838
"If set to \"True\" then revisions can only be appended to the log, not\n"
9839
"removed. A branch with this setting enabled can only pull from another\n"
9840
"branch if the other branch's log is a longer version of its own. This is\n"
9841
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
9842
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
9843
"compatibility with previous bzr versions (older than 2.2)."
9844
msgstr ""
9845
9846
#: en/help_topics/configuration.txt:587
9847
msgid ""
9848
"parent_location\n"
9849
"~~~~~~~~~~~~~~~"
9850
msgstr ""
9851
9852
#: en/help_topics/configuration.txt:590
9853
msgid ""
9854
"If present, the location of the default branch for pull or merge. This "
9855
"option\n"
9856
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
9857
"--remember``."
9858
msgstr ""
9859
9860
#: en/help_topics/configuration.txt:594
9861
msgid ""
9862
"push_location\n"
9863
"~~~~~~~~~~~~~"
9864
msgstr ""
9865
9866
#: en/help_topics/configuration.txt:597
9867
msgid ""
9868
"If present, the location of the default branch for push. This option\n"
9869
"is normally set by the first ``push`` or ``push --remember``."
9870
msgstr ""
9871
9872
#: en/help_topics/configuration.txt:600
9873
msgid ""
9874
"push_strict\n"
9875
"~~~~~~~~~~~"
9876
msgstr ""
9877
9878
#: en/help_topics/configuration.txt:603
9879
msgid ""
9880
"If present, defines the ``--strict`` option default value for checking\n"
9881
"uncommitted changes before pushing."
9882
msgstr ""
9883
9884
#: en/help_topics/configuration.txt:606
9885
msgid ""
9886
"dpush_strict\n"
9887
"~~~~~~~~~~~~"
9888
msgstr ""
9889
9890
#: en/help_topics/configuration.txt:609
9891
msgid ""
9892
"If present, defines the ``--strict`` option default value for checking\n"
9893
"uncommitted changes before pushing into a different VCS without any\n"
9894
"custom bzr metadata."
9895
msgstr ""
9896
9897
#: en/help_topics/configuration.txt:613
9898
msgid ""
9899
"bound_location\n"
9900
"~~~~~~~~~~~~~~"
9901
msgstr ""
9902
9903
#: en/help_topics/configuration.txt:616
9904
msgid ""
9905
"The location that commits should go to when acting as a checkout.\n"
9906
"This option is normally set by ``bind``."
9907
msgstr ""
9908
9909
#: en/help_topics/configuration.txt:619
9910
msgid ""
9911
"bound\n"
9912
"~~~~~"
9913
msgstr ""
9914
9915
#: en/help_topics/configuration.txt:622
9916
msgid ""
9917
"If set to \"True\", the branch should act as a checkout, and push each "
9918
"commit to\n"
9919
"the bound_location. This option is normally set by ``bind``/``unbind``."
9920
msgstr ""
9921
9922
#: en/help_topics/configuration.txt:625
9923
msgid ""
9924
"send_strict\n"
9925
"~~~~~~~~~~~"
9926
msgstr ""
9927
9928
#: en/help_topics/configuration.txt:628
9929
msgid ""
9930
"If present, defines the ``--strict`` option default value for checking\n"
9931
"uncommitted changes before sending a merge directive."
9932
msgstr ""
9933
9934
#: en/help_topics/configuration.txt:631
9935
msgid ""
9936
"add.maximum_file_size\n"
9937
"~~~~~~~~~~~~~~~~~~~~~"
9938
msgstr ""
9939
9940
#: en/help_topics/configuration.txt:634
9941
msgid ""
9942
"Defines the maximum file size the command line \"add\" operation will allow\n"
9943
"in recursive mode, with files larger than this value being skipped. You "
9944
"may \n"
9945
"specify this value as an integer (in which case it is interpreted as "
9946
"bytes), \n"
9947
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
9948
"0 \n"
9949
"will disable skipping."
9950
msgstr ""
9951
9952
#: en/help_topics/configuration.txt:640
9953
msgid ""
9954
"External Merge Tools\n"
9955
"--------------------"
9956
msgstr ""
9957
9958
#: en/help_topics/configuration.txt:643
9959
msgid ""
9960
"bzr.mergetool.<name>\n"
9961
"~~~~~~~~~~~~~~~~~~~~"
9962
msgstr ""
9963
9964
#: en/help_topics/configuration.txt:646
9965
msgid ""
9966
"Defines an external merge tool called <name> with the given command-line.\n"
9967
"Arguments containing spaces should be quoted using single or double quotes. "
9968
"The\n"
9969
"executable may omit its path if it can be found on the PATH."
9970
msgstr ""
9971
9972
#: en/help_topics/configuration.txt:650
9973
msgid ""
9974
"The following markers can be used in the command-line to substitute "
9975
"filenames\n"
9976
"involved in the merge conflict::"
9977
msgstr ""
9978
9979
#: en/help_topics/configuration.txt:653
9980
msgid ""
9981
" {base} file.BASE\n"
9982
" {this} file.THIS\n"
9983
" {other} file.OTHER\n"
9984
" {result} output file\n"
9985
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
9986
"merge\n"
9987
" succeeds."
9988
msgstr ""
9989
9990
#: en/help_topics/configuration.txt:662
9991
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
9992
msgstr ""
9993
9994
#: en/help_topics/configuration.txt:664
9995
msgid ""
9996
"bzr.default_mergetool\n"
9997
"~~~~~~~~~~~~~~~~~~~~~"
9998
msgstr ""
9999
10000
#: en/help_topics/configuration.txt:667
10001
msgid ""
10002
"Specifies which external merge tool (as defined above) should be selected "
10003
"by\n"
10004
"default in tools such as ``bzr qconflicts``."
10005
msgstr ""
10006
10007
#: en/help_topics/configuration.txt:672
10008
msgid " bzr.default_mergetool = kdiff3\n"
10009
msgstr ""
10010
10011
#: en/help_topics/conflict-types.txt:1
10012
msgid ""
10013
"Conflict Types\n"
10014
"=============="
10015
msgstr ""
10016
10017
#: en/help_topics/conflict-types.txt:4
10018
msgid ""
10019
"Some operations, like merge, revert and pull, modify the contents of your\n"
10020
"working tree. These modifications are programmatically generated, and so "
10021
"they\n"
10022
"may conflict with the current state of your working tree. "
10023
msgstr ""
10024
10025
#: en/help_topics/conflict-types.txt:8
10026
msgid ""
10027
"When conflicts are present in your working tree (as shown by ``bzr\n"
10028
"conflicts``), you should resolve them and then inform bzr that the "
10029
"conflicts\n"
10030
"have been resolved."
10031
msgstr ""
10032
10033
#: en/help_topics/conflict-types.txt:12
10034
msgid ""
10035
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10036
"should resolve them is not the one responsible for their occurrence, as is "
10037
"the\n"
10038
"case when merging other people's work or because some conflicts are "
10039
"presented\n"
10040
"in a way that is not easy to understand."
10041
msgstr ""
10042
10043
#: en/help_topics/conflict-types.txt:17
10044
msgid ""
10045
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10046
"conflict if and only if there's an actual conceptual conflict in the source\n"
10047
"tree. Because Bazaar doesn't understand the real meaning of the files "
10048
"being\n"
10049
"versioned, it can, when faced with ambiguities, fall short in either "
10050
"direction\n"
10051
"trying to resolve the conflict itself. Many kinds of changes can be "
10052
"combined\n"
10053
"programmatically, but sometimes only a human can determine the right thing "
10054
"to\n"
10055
"do."
10056
msgstr ""
10057
10058
#: en/help_topics/conflict-types.txt:25
10059
msgid ""
10060
"When Bazaar generates a conflict, it adds information into the working tree "
10061
"to\n"
10062
"present the conflicting versions, and it's up to you to find the correct\n"
10063
"resolution."
10064
msgstr ""
10065
10066
#: en/help_topics/conflict-types.txt:29
10067
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10068
msgstr ""
10069
10070
#: en/help_topics/conflict-types.txt:31
10071
msgid ""
10072
"1. Modify the working tree content so that the conflicted item is now in "
10073
"the\n"
10074
" state you want to keep, then"
10075
msgstr ""
10076
10077
#: en/help_topics/conflict-types.txt:34
10078
msgid ""
10079
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10080
" remaining generated information (``bzr resolve <item>``)."
10081
msgstr ""
10082
10083
#: en/help_topics/conflict-types.txt:37
10084
msgid ""
10085
"For most conflict types, there are some obvious ways to modify the working\n"
10086
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10087
"itself already made a choice, when possible."
10088
msgstr ""
10089
10090
#: en/help_topics/conflict-types.txt:41
10091
msgid ""
10092
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10093
"different ways to resolve the conflict."
10094
msgstr ""
10095
10096
#: en/help_topics/conflict-types.txt:44
10097
msgid ""
10098
"Each type of conflict is explained below, and the action which must be done "
10099
"to\n"
10100
"resolve the conflict is outlined."
10101
msgstr ""
10102
10103
#: en/help_topics/conflict-types.txt:47
10104
msgid ""
10105
"Various actions are available depending on the kind of conflict, for some "
10106
"of\n"
10107
"these actions, Bazaar can provide some help. In the end you should at least\n"
10108
"inform Bazaar that you're done with the conflict with::"
10109
msgstr ""
10110
10111
#: en/help_topics/conflict-types.txt:51
10112
msgid " ``bzr resolve FILE --action=done'"
10113
msgstr ""
10114
10115
#: en/help_topics/conflict-types.txt:53
10116
msgid ""
10117
"Note that this is the default action when a single file is involved so you "
10118
"can\n"
10119
"simply use::"
10120
msgstr ""
10121
10122
#: en/help_topics/conflict-types.txt:56
10123
msgid " ``bzr resolve FILE``"
10124
msgstr ""
10125
10126
#: en/help_topics/conflict-types.txt:58
10127
msgid "See ``bzr help resolve`` for more details."
10128
msgstr ""
10129
10130
#: en/help_topics/conflict-types.txt:60
10131
msgid ""
10132
"Text conflicts\n"
10133
"--------------"
10134
msgstr ""
10135
10136
#: en/help_topics/conflict-types.txt:63
10137
msgid "Typical message::"
10138
msgstr ""
10139
10140
#: en/help_topics/conflict-types.txt:65
10141
msgid " Text conflict in FILE"
10142
msgstr ""
10143
10144
#: en/help_topics/conflict-types.txt:67
10145
msgid ""
10146
"These are produced when a text merge cannot completely reconcile two sets "
10147
"of\n"
10148
"text changes. Bazaar will emit files for each version with the extensions\n"
10149
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10150
"tree,\n"
10151
"i.e. the tree that you are merging changes into. OTHER is the version that "
10152
"you\n"
10153
"are merging into the target. BASE is an older version that is used as a "
10154
"basis\n"
10155
"for comparison."
10156
msgstr ""
10157
10158
#: en/help_topics/conflict-types.txt:74
10159
msgid ""
10160
"In the main copy of the file, Bazaar will include all the changes that it\n"
10161
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10162
"\"herringbone\" markers like ``<<<<<<<``."
10163
msgstr ""
10164
10165
#: en/help_topics/conflict-types.txt:78
10166
msgid ""
10167
"Say the initial text is \"The project leader released it.\", and THIS "
10168
"modifies it\n"
10169
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10170
"leader\n"
10171
"released Bazaar.\" A conflict would look like this::"
10172
msgstr ""
10173
10174
#: en/help_topics/conflict-types.txt:82
10175
msgid ""
10176
" <<<<<<< TREE\n"
10177
" Martin Pool released it.\n"
10178
" =======\n"
10179
" The project leader released Bazaar.\n"
10180
" >>>>>>> MERGE-SOURCE"
10181
msgstr ""
10182
10183
#: en/help_topics/conflict-types.txt:88
10184
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10185
msgstr ""
10186
10187
#: en/help_topics/conflict-types.txt:90
10188
msgid ""
10189
"You can handle text conflicts either by editing the main copy of the file,\n"
10190
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10191
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10192
"set of changes over the other (but see below when you encounter these\n"
10193
"cases). More often, the two sets of changes must be intelligently combined."
10194
msgstr ""
10195
10196
#: en/help_topics/conflict-types.txt:96
10197
msgid ""
10198
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10199
"you are done editing, the file should look like it never had a conflict, and "
10200
"be\n"
10201
"ready to commit."
10202
msgstr ""
10203
10204
#: en/help_topics/conflict-types.txt:100
10205
msgid ""
10206
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10207
"Bazaar will auto-detect which conflicts you have resolved."
10208
msgstr ""
10209
10210
#: en/help_topics/conflict-types.txt:103
10211
msgid ""
10212
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10213
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10214
"working tree."
10215
msgstr ""
10216
10217
#: en/help_topics/conflict-types.txt:107
10218
msgid ""
10219
"\n"
10220
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10221
"resolve`` with one of the following actions:"
10222
msgstr ""
10223
10224
#: en/help_topics/conflict-types.txt:111
10225
msgid ""
10226
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10227
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10228
msgstr ""
10229
10230
#: en/help_topics/conflict-types.txt:114
10231
msgid ""
10232
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10233
"modifications will be taken into account."
10234
msgstr ""
10235
10236
#: en/help_topics/conflict-types.txt:117
10237
msgid ""
10238
"Content conflicts\n"
10239
"-----------------"
10240
msgstr ""
10241
10242
#: en/help_topics/conflict-types.txt:122
10243
msgid " Contents conflict in FILE"
10244
msgstr ""
10245
10246
#: en/help_topics/conflict-types.txt:124
10247
msgid ""
10248
"This conflict happens when there are conflicting changes in the working "
10249
"tree\n"
10250
"and the merge source, but the conflicted items are not text files. They "
10251
"may\n"
10252
"be binary files, or symlinks, or directories. It can even happen with "
10253
"files\n"
10254
"that are deleted on one side, and modified on the other."
10255
msgstr ""
10256
10257
#: en/help_topics/conflict-types.txt:129
10258
msgid ""
10259
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10260
"be\n"
10261
"regular files, symlinks or directories). But it will not include a \"main "
10262
"copy\"\n"
10263
"of the file with herringbone conflict markers. It will appear that the "
10264
"\"main\n"
10265
"copy\" has been renamed to THIS or OTHER."
10266
msgstr ""
10267
10268
#: en/help_topics/conflict-types.txt:134
10269
msgid ""
10270
"To resolve that kind of conflict, you should rebuild FILE from either "
10271
"version\n"
10272
"or a combination of both."
10273
msgstr ""
10274
10275
#: en/help_topics/conflict-types.txt:137
10276
msgid "``bzr resolve`` recognizes the following actions:"
10277
msgstr ""
10278
10279
#: en/help_topics/conflict-types.txt:139
10280
msgid ""
10281
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10282
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10283
"* ``--action=done`` will just mark the conflict as resolved."
10284
msgstr ""
10285
10286
#: en/help_topics/conflict-types.txt:143
10287
msgid ""
10288
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10289
"and\n"
10290
"``.OTHER`` files if they are still present in the working tree."
10291
msgstr ""
10292
10293
#: en/help_topics/conflict-types.txt:146
10294
msgid ""
10295
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10296
msgstr ""
10297
10298
#: en/help_topics/conflict-types.txt:148
10299
msgid ""
10300
"Tag conflicts\n"
10301
"-------------"
10302
msgstr ""
10303
10304
#: en/help_topics/conflict-types.txt:153
10305
msgid ""
10306
" Conflicting tags:\n"
10307
" version-0.1"
10308
msgstr ""
10309
10310
#: en/help_topics/conflict-types.txt:156
10311
msgid ""
10312
"When pulling from or pushing to another branch, Bazaar informs you about "
10313
"tags\n"
10314
"that conflict between the two branches; that is the same tag points to two\n"
10315
"different revisions. You need not resolve these conflicts, but subsequent\n"
10316
"uses of pull or push will result in the same message."
10317
msgstr ""
10318
10319
#: en/help_topics/conflict-types.txt:161
10320
msgid ""
10321
"To resolve the conflict, you must apply the correct tags to either the "
10322
"target\n"
10323
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10324
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10325
"target branch's tags match the source branch, then in the target branch do\n"
10326
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10327
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10328
"source\n"
10329
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10330
"favor of the target branch, you need to similarly use ``tag --force`` in "
10331
"the\n"
10332
"source branch. (Note that pulling or pushing using --overwrite will "
10333
"overwrite\n"
10334
"all tags as well.)"
10335
msgstr ""
10336
10337
#: en/help_topics/conflict-types.txt:172
10338
msgid ""
10339
"Duplicate paths\n"
10340
"---------------"
10341
msgstr ""
10342
10343
#: en/help_topics/conflict-types.txt:177
10344
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10345
msgstr ""
10346
10347
#: en/help_topics/conflict-types.txt:179
10348
msgid ""
10349
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10350
"already been used. The existing file will be renamed to \"FILE.moved\". "
10351
msgstr ""
10352
10353
#: en/help_topics/conflict-types.txt:187
10354
msgid ""
10355
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10356
"FILE``,\n"
10357
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10358
"* ``--action=done`` will just mark the conflict as resolved."
10359
msgstr ""
10360
10361
#: en/help_topics/conflict-types.txt:191
10362
msgid ""
10363
"Note that you must get rid of FILE.moved before using ``--action=done``."
10364
msgstr ""
10365
10366
#: en/help_topics/conflict-types.txt:195
10367
msgid ""
10368
"Unversioned parent\n"
10369
"------------------"
10370
msgstr ""
10371
10372
#: en/help_topics/conflict-types.txt:200
10373
msgid " Conflict because FILE is not versioned, but has versioned children."
10374
msgstr ""
10375
10376
#: en/help_topics/conflict-types.txt:202
10377
msgid ""
10378
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10379
"not\n"
10380
"versioned. This happens when the directory has been deleted in the target,\n"
10381
"but has a new child in the source, or vice versa. In this situation, "
10382
"Bazaar\n"
10383
"will version the parent directory as well. Resolving this issue depends\n"
10384
"very much on the particular scenario. You may wish to rename or delete "
10385
"either\n"
10386
"the file or the directory. When you are satisfied, you can run \"bzr "
10387
"resolve\n"
10388
"FILE\" to mark the conflict as resolved."
10389
msgstr ""
10390
10391
#: en/help_topics/conflict-types.txt:210
10392
msgid ""
10393
"Missing parent\n"
10394
"--------------"
10395
msgstr ""
10396
10397
#: en/help_topics/conflict-types.txt:215
10398
msgid " Conflict adding files to FILE. Created directory."
10399
msgstr ""
10400
10401
#: en/help_topics/conflict-types.txt:217
10402
msgid ""
10403
"This happens when a directory has been deleted in the target, but has new\n"
10404
"children in the source. This is similar to the \"unversioned parent\" "
10405
"conflict,\n"
10406
"except that the parent directory does not *exist*, instead of just being\n"
10407
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10408
"Resolving this issue depends very much on the particular scenario."
10409
msgstr ""
10410
10411
#: en/help_topics/conflict-types.txt:223
10412
msgid ""
10413
"To resolve that kind of conflict, you should either remove or rename the\n"
10414
"children or the directory or a combination of both."
10415
msgstr ""
10416
10417
#: en/help_topics/conflict-types.txt:228
10418
msgid ""
10419
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10420
" children,\n"
10421
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10422
"children\n"
10423
" and restoring the directory,\n"
10424
"* ``--action=done`` will just mark the conflict as resolved."
10425
msgstr ""
10426
10427
#: en/help_topics/conflict-types.txt:236
10428
msgid ""
10429
"Deleting parent\n"
10430
"---------------"
10431
msgstr ""
10432
10433
#: en/help_topics/conflict-types.txt:241
10434
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10435
msgstr ""
10436
10437
#: en/help_topics/conflict-types.txt:243
10438
msgid ""
10439
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10440
"source, but has new children in the target (either because a directory\n"
10441
"deletion is merged or because the merge introduce new children). Bazaar\n"
10442
"will retain the directory. Resolving this issue depends very much on the\n"
10443
"particular scenario."
10444
msgstr ""
10445
10446
#: en/help_topics/conflict-types.txt:254
10447
msgid ""
10448
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10449
"directory,"
10450
msgstr ""
10451
10452
#: en/help_topics/conflict-types.txt:256
10453
msgid ""
10454
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10455
" children,"
10456
msgstr ""
10457
10458
#: en/help_topics/conflict-types.txt:259
10459
msgid "* ``--action=done`` will just mark the conflict as resolved."
10460
msgstr ""
10461
10462
#: en/help_topics/conflict-types.txt:261
10463
msgid ""
10464
"Note that when merging a directory deletion, if unversioned files are\n"
10465
"present, they become potential orphans has they don't have a directory\n"
10466
"parent anymore."
10467
msgstr ""
10468
10469
#: en/help_topics/conflict-types.txt:265
10470
msgid ""
10471
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10472
"setting the ``bzr.transform.orphan_policy`` configuration option."
10473
msgstr ""
10474
10475
#: en/help_topics/conflict-types.txt:268
10476
msgid "There are two possible values for this option:"
10477
msgstr ""
10478
10479
#: en/help_topics/conflict-types.txt:270
10480
msgid ""
10481
"* ``conflict`` (the default): will leave the orphans in place and\n"
10482
" generate a conflicts,"
10483
msgstr ""
10484
10485
#: en/help_topics/conflict-types.txt:273
10486
msgid ""
10487
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10488
"root\n"
10489
" of the working tree with names like ``<file>.~#~``."
10490
msgstr ""
10491
10492
#: en/help_topics/conflict-types.txt:278
10493
msgid ""
10494
"Path conflict\n"
10495
"-------------"
10496
msgstr ""
10497
10498
#: en/help_topics/conflict-types.txt:283
10499
msgid " Path conflict: PATH1 / PATH2"
10500
msgstr ""
10501
10502
#: en/help_topics/conflict-types.txt:285
10503
msgid ""
10504
"This happens when the source and target have each modified the name or "
10505
"parent\n"
10506
"directory of a file. Bazaar will use the path elements from the source."
10507
msgstr ""
10508
10509
#: en/help_topics/conflict-types.txt:288
10510
msgid ""
10511
"To resolve that kind of conflict, you just have to decide what name should "
10512
"be\n"
10513
"retained for the file involved."
10514
msgstr ""
10515
10516
#: en/help_topics/conflict-types.txt:293
10517
msgid ""
10518
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10519
" issuing ``bzr mv PATH2 PATH1``,\n"
10520
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10521
"``PATH2``,\n"
10522
"* ``--action=done`` will just mark the conflict as resolved."
10523
msgstr ""
10524
10525
#: en/help_topics/conflict-types.txt:300
10526
msgid ""
10527
"Parent loop\n"
10528
"-----------"
10529
msgstr ""
10530
10531
#: en/help_topics/conflict-types.txt:305
10532
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10533
msgstr ""
10534
10535
#: en/help_topics/conflict-types.txt:307
10536
msgid ""
10537
"This happens when the source and the target have each moved directories, so\n"
10538
"that, if the change could be applied, a directory would be contained by "
10539
"itself.\n"
10540
"For example::"
10541
msgstr ""
10542
10543
#: en/help_topics/conflict-types.txt:311
10544
msgid ""
10545
" $ bzr init\n"
10546
" $ bzr mkdir white\n"
10547
" $ bzr mkdir black\n"
10548
" $ bzr commit -m \"BASE\"\n"
10549
" $ bzr branch . ../other\n"
10550
" $ bzr mv white black\n"
10551
" $ bzr commit -m \"THIS\"\n"
10552
" $ bzr mv ../other/black ../other/white\n"
10553
" $ bzr commit ../other -m \"OTHER\"\n"
10554
" $ bzr merge ../other"
10555
msgstr ""
10556
10557
#: en/help_topics/conflict-types.txt:322
10558
msgid ""
10559
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
10560
"``black``. To resolve that kind of conflict, you just have to decide what\n"
10561
"name should be retained for the directories involved."
10562
msgstr ""
10563
10564
#: en/help_topics/conflict-types.txt:328
10565
msgid ""
10566
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
10567
"``white`` \n"
10568
" in ``black``,\n"
10569
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
10570
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
10571
"* ``--action=done`` will just mark the conflict as resolved."
10572
msgstr ""
10573
10574
#: en/help_topics/conflict-types.txt:336
10575
msgid ""
10576
"Non-directory parent\n"
10577
"--------------------"
10578
msgstr ""
10579
10580
#: en/help_topics/conflict-types.txt:341
10581
msgid ""
10582
" Conflict: foo.new is not a directory, but has files in it.\n"
10583
" Created directory."
10584
msgstr ""
10585
10586
#: en/help_topics/conflict-types.txt:344
10587
msgid ""
10588
"This happens when one side has added files to a directory, and the other "
10589
"side\n"
10590
"has changed the directory into a file or symlink. For example::"
10591
msgstr ""
10592
10593
#: en/help_topics/conflict-types.txt:347
10594
msgid ""
10595
" $ bzr init\n"
10596
" $ bzr mkdir foo\n"
10597
" $ bzr commit -m \"BASE\"\n"
10598
" $ bzr branch . ../other\n"
10599
" $ rmdir foo\n"
10600
" $ touch foo\n"
10601
" $ bzr commit -m \"THIS\"\n"
10602
" $ bzr mkdir ../other/foo/bar\n"
10603
" $ bzr commit ../other -m \"OTHER\"\n"
10604
" $ bzr merge ../other"
10605
msgstr ""
10606
10607
#: en/help_topics/conflict-types.txt:358
10608
msgid ""
10609
"To resolve that kind of conflict, you have to decide what name should be\n"
10610
"retained for the file, directory or symlink involved."
10611
msgstr ""
10612
10613
#: en/help_topics/conflict-types.txt:363
10614
msgid ""
10615
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
10616
" ``bzr add foo``,\n"
10617
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
10618
" ``bzr mv foo.new foo``,\n"
10619
"* ``--action=done`` will just mark the conflict as resolved."
10620
msgstr ""
10621
10622
#: en/help_topics/conflict-types.txt:371
10623
msgid ""
10624
"MalformedTransform\n"
10625
"------------------"
10626
msgstr ""
10627
10628
#: en/help_topics/conflict-types.txt:374
10629
msgid ""
10630
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
10631
"exception. This means that Bazaar encountered a filesystem conflict that it "
10632
"was\n"
10633
"unable to resolve. This usually indicates a bug. Please let us know if "
10634
"you\n"
10635
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
10636
msgstr ""
10637
10638
#: en/help_topics/content-filters.txt:1
10639
msgid ""
10640
"Content Filters\n"
10641
"==============="
10642
msgstr ""
10643
10644
#: en/help_topics/content-filters.txt:4
10645
msgid ""
10646
"Content formats\n"
10647
"---------------"
10648
msgstr ""
10649
10650
#: en/help_topics/content-filters.txt:7
10651
msgid ""
10652
"Bazaar's content filtering allows you to store files in a different\n"
10653
"format from the copy in your working tree. This lets you, or your\n"
10654
"co-developers, use Windows development tools that expect CRLF files\n"
10655
"on projects that use other line-ending conventions. Among other things,\n"
10656
"content filters also let Unix developers more easily work on projects\n"
10657
"using Windows line-ending conventions, keyword expansion/compression,\n"
10658
"and trailing spaces on lines in text files to be implicitly stripped\n"
10659
"when committed."
10660
msgstr ""
10661
10662
#: en/help_topics/content-filters.txt:16
10663
msgid "To generalize, there are two content formats supported by Bazaar:"
10664
msgstr ""
10665
10666
#: en/help_topics/content-filters.txt:18
10667
msgid ""
10668
"* a canonical format - how files are stored internally\n"
10669
"* a convenience format - how files are created in a working tree."
10670
msgstr ""
10671
10672
#: en/help_topics/content-filters.txt:21
10673
msgid ""
10674
"\n"
10675
"Format conversion\n"
10676
"-----------------"
10677
msgstr ""
10678
10679
#: en/help_topics/content-filters.txt:25
10680
msgid ""
10681
"The conversion between these formats is done by content filters.\n"
10682
"A content filter has two parts:"
10683
msgstr ""
10684
10685
#: en/help_topics/content-filters.txt:28
10686
msgid ""
10687
"* a read converter - converts from convenience to canonical format\n"
10688
"* a write converter - converts from canonical to convenience format."
10689
msgstr ""
10690
10691
#: en/help_topics/content-filters.txt:31
10692
msgid ""
10693
"Many of these converters will provide *round-trip* conversion,\n"
10694
"i.e. applying the read converter followed by the write converter\n"
10695
"gives back the original content. However, others may provide an\n"
10696
"asymmetric conversion. For example, a read converter might strip\n"
10697
"trailing whitespace off lines in source code while the matching\n"
10698
"write converter might pass content through unchanged."
10699
msgstr ""
10700
10701
#: en/help_topics/content-filters.txt:38
10702
msgid ""
10703
"\n"
10704
"Enabling content filters\n"
10705
"------------------------"
10706
msgstr ""
10707
10708
#: en/help_topics/content-filters.txt:42
10709
msgid ""
10710
"Content filters are typically provided by plugins, so the first step\n"
10711
"in using them is to install the relevant plugins and read their\n"
10712
"documentation. Some plugins may be very specific about which files\n"
10713
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
10714
"In other cases, the plugin may leave it in the user's hands to\n"
10715
"define which files are to be filtered. This is typically done\n"
10716
"using rule-based preferences. See ``bzr help rules`` for general\n"
10717
"information about defining these."
10718
msgstr ""
10719
10720
#: en/help_topics/content-filters.txt:51
10721
msgid ""
10722
"\n"
10723
"Impact on commands\n"
10724
"------------------"
10725
msgstr ""
10726
10727
#: en/help_topics/content-filters.txt:55
10728
msgid ""
10729
"Read converters are only applied to commands that read content from\n"
10730
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
10731
"will apply read converters to files in the working tree, then compare\n"
10732
"the results to the content last committed."
10733
msgstr ""
10734
10735
#: en/help_topics/content-filters.txt:60
10736
msgid ""
10737
"Write converters are only applied by commands that **create files in a\n"
10738
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
10739
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
10740
"respectively."
10741
msgstr ""
10742
10743
#: en/help_topics/content-filters.txt:65
10744
msgid ""
10745
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
10746
"comitting files. If this makes sense for a given plugin providing\n"
10747
"a content filter, the plugin can usually achieve this effect by using a\n"
10748
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
10749
"for more information on hooks."
10750
msgstr ""
10751
10752
#: en/help_topics/content-filters.txt:71
10753
msgid ""
10754
"\n"
10755
"Refreshing your working tree\n"
10756
"----------------------------"
10757
msgstr ""
10758
10759
#: en/help_topics/content-filters.txt:75
10760
msgid ""
10761
"For performance reasons, Bazaar caches the timestamps of files in\n"
10762
"a working tree, and assumes files are unchanged if their timestamps\n"
10763
"match the cached values. As a consequence, there are times when\n"
10764
"you may need to explicitly ask for content filtering to be reapplied\n"
10765
"in one or both directions, e.g. after installing or reconfiguring\n"
10766
"plugins providing it."
10767
msgstr ""
10768
10769
#: en/help_topics/content-filters.txt:82
10770
msgid "Here are some general guidelines for doing this:"
10771
msgstr ""
10772
10773
#: en/help_topics/content-filters.txt:84
10774
msgid ""
10775
" * To reapply read converters, ``touch`` files, i.e. update their\n"
10776
" timestamp. Operations like ``bzr status`` should then reapply the\n"
10777
" relevant read converters and compare the end result with the\n"
10778
" canonical format."
10779
msgstr ""
10780
10781
#: en/help_topics/content-filters.txt:89
10782
msgid ""
10783
" * To reapply write converters, ensure there are no local changes,\n"
10784
" delete the relevant files and run ``bzr revert`` on those files."
10785
msgstr ""
10786
10787
#: en/help_topics/content-filters.txt:92
10788
msgid ""
10789
"Note: In the future, it is likely that additional options will be added\n"
10790
"to commands to make this refreshing process faster and safer.\n"
10791
msgstr ""
10792
10793
#: en/help_topics/current-formats.txt:1
10794
msgid "Current Storage Formats"
10795
msgstr ""
10796
10797
#: en/help_topics/current-formats.txt:3
10798
msgid ""
10799
":2a:\n"
10800
" (native) (default) First format for bzr 2.0 series. Uses group-\n"
10801
" compress storage. Provides rich roots which are a one-way\n"
10802
" transition."
10803
msgstr ""
10804
10805
#: en/help_topics/current-formats.txt:8
10806
msgid ""
10807
":pack-0.92:\n"
10808
" (native) New in 0.92: Pack-based format with data compatible with\n"
10809
" dirstate-tags format repositories. Interoperates with bzr\n"
10810
" repositories before 0.92 but cannot be read by bzr < 0.92."
10811
msgstr ""
10812
10813
#: en/help_topics/current-formats.txt:13
10814
msgid ""
10815
":1.14:\n"
10816
" (native) A working-tree format that supports content filtering."
10817
msgstr ""
10818
10819
#: en/help_topics/current-formats.txt:16
10820
msgid ""
10821
":1.14-rich-root:\n"
10822
" (native) A variant of 1.14 that supports rich-root data (needed\n"
10823
" for bzr-svn and bzr-git)."
10824
msgstr ""
10825
10826
#: en/help_topics/current-formats.txt:20
10827
msgid ""
10828
"\n"
10829
"See :doc:`formats-help` for more about storage formats."
10830
msgstr ""
10831
10832
#: en/help_topics/debug-flags.txt:1
10833
msgid ""
10834
"Debug Flags\n"
10835
"==========="
10836
msgstr ""
10837
10838
#: en/help_topics/debug-flags.txt:4
10839
msgid ""
10840
"These flags can be passed on the bzr command line or (without the ``-D``\n"
10841
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
10842
msgstr ""
10843
10844
#: en/help_topics/debug-flags.txt:7
10845
msgid ""
10846
"-Dauth Trace authentication sections used.\n"
10847
"-Dbytes Print out how many bytes were transferred\n"
10848
"-Ddirstate Trace dirstate activity (verbose!)\n"
10849
"-Derror Instead of normal error handling, always print a "
10850
"traceback\n"
10851
" on error.\n"
10852
"-Devil Capture call sites that do expensive or badly-scaling\n"
10853
" operations.\n"
10854
"-Dfetch Trace history copying between repositories.\n"
10855
"-Dfilters Emit information for debugging content filtering.\n"
10856
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
10857
"fetch.\n"
10858
"-Dgraph Trace graph traversal.\n"
10859
"-Dhashcache Log every time a working file is read to determine its "
10860
"hash.\n"
10861
"-Dhooks Trace hook execution.\n"
10862
"-Dhpss Trace smart protocol requests and responses.\n"
10863
"-Dhpssdetail More hpss details.\n"
10864
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
10865
"-Dhttp Trace http connections, requests and responses.\n"
10866
"-Dindex Trace major index operations.\n"
10867
"-Dknit Trace knit operations.\n"
10868
"-Dlock Trace when lockdir locks are taken or released.\n"
10869
"-Dprogress Trace progress bar operations.\n"
10870
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
10871
"-Dmerge Emit information for debugging merges.\n"
10872
"-Dno_apport Don't use apport to report crashes.\n"
10873
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
10874
"-Dpack Emit information about pack operations.\n"
10875
"-Drelock Emit a message every time a branch or repository object "
10876
"is\n"
10877
" unlocked then relocked the same way.\n"
10878
"-Dsftp Trace SFTP internals.\n"
10879
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
10880
"expected\n"
10881
"-Dstream Trace fetch streams.\n"
10882
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
10883
"portable\n"
10884
" manner.\n"
10885
"-Dunlock Some errors during unlock are treated as warnings.\n"
10886
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
10887
"-DIDS_always Always use InterDifferingSerializer to fetch if "
10888
"appropriate\n"
10889
" for the format, even for non-local fetches.\n"
10890
msgstr ""
10891
10892
#: en/help_topics/diverged-branches.txt:1
10893
msgid ""
10894
"Diverged Branches\n"
10895
"================="
10896
msgstr ""
10897
10898
#: en/help_topics/diverged-branches.txt:4
10899
msgid ""
10900
"When Bazaar tries to push one branch onto another, it requires that the\n"
10901
"destination branch must be ready to receive the source branch. If this "
10902
"isn't\n"
10903
"the case, then we say that the branches have ``diverged``. Branches are\n"
10904
"considered diverged if the destination branch's most recent commit is one "
10905
"that\n"
10906
"has not been merged (directly or indirectly) by the source branch. To "
10907
"recover\n"
10908
"from diverged branches, one must merge the missing revisions into the "
10909
"source\n"
10910
"branch."
10911
msgstr ""
10912
10913
#: en/help_topics/diverged-branches.txt:12
10914
msgid ""
10915
"This situation commonly arises when using a centralized workflow with local\n"
10916
"commits. If someone else has committed new work to the mainline since your\n"
10917
"last pull and you have local commits that have not yet been pushed to the\n"
10918
"mainline, then your local branch and the mainline have diverged."
10919
msgstr ""
10920
10921
#: en/help_topics/diverged-branches.txt:17
10922
msgid ""
10923
"Discovering What Has Diverged\n"
10924
"-----------------------------"
10925
msgstr ""
10926
10927
#: en/help_topics/diverged-branches.txt:20
10928
msgid ""
10929
"The ``bzr missing`` command is used to find out what revisions are in "
10930
"another\n"
10931
"branch that are not present in the current branch, and vice-versa. It shows "
10932
"a\n"
10933
"summary of which extra revisions exist in each branch. If you want to see "
10934
"the\n"
10935
"precise effects of those revisions, you can use ``bzr diff --"
10936
"old=other_branch``\n"
10937
"to show the differences between other_branch and your current branch."
10938
msgstr ""
10939
10940
#: en/help_topics/diverged-branches.txt:26
10941
msgid ""
10942
"A Solution\n"
10943
"----------"
10944
msgstr ""
10945
10946
#: en/help_topics/diverged-branches.txt:29
10947
msgid ""
10948
"The solution is to merge the revisions from the mainline into your local\n"
10949
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
10950
"mainline. This merge may result in conflicts if the other developer's "
10951
"changes\n"
10952
"overlap with your changes. These conflicts should be resolved before\n"
10953
"continuing. After any conflicts have been resolved, or even if there were "
10954
"no\n"
10955
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
10956
"to your local branch. This requirement gives you an opportunity to test "
10957
"the\n"
10958
"resulting working tree for correctness, since the merged revisions could "
10959
"have\n"
10960
"made arbitrary changes. After testing, you should commit the merge using\n"
10961
"``bzr commit``. This clears up the diverged branches situation. Your "
10962
"local\n"
10963
"branch can now be pushed to the mainline.\n"
10964
msgstr ""
10965
10966
#: en/help_topics/eol.txt:1
10967
msgid ""
10968
"End of Line Conversion\n"
10969
"======================"
10970
msgstr ""
10971
10972
#: en/help_topics/eol.txt:4
10973
msgid ""
10974
"EOL conversion is provided as a content filter where Bazaar internally\n"
10975
"stores a canonical format but outputs a convenience format. See\n"
10976
"``bzr help content-filters`` for general information about using these."
10977
msgstr ""
10978
10979
#: en/help_topics/eol.txt:8
10980
msgid ""
10981
"Note: Content filtering is only supported in recently added formats,\n"
10982
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
10983
"in a recent format. (Just setting the format on the repository\n"
10984
"is not enough.) If content filtering does not appear to be working, use\n"
10985
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
10986
"or later."
10987
msgstr ""
10988
10989
#: en/help_topics/eol.txt:15
10990
msgid ""
10991
"EOL conversion needs to be enabled for selected file patterns using\n"
10992
"rules. See ``bzr help rules`` for general information on defining rules.\n"
10993
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
10994
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
10995
"supported in a future verison of Bazaar."
10996
msgstr ""
10997
10998
#: en/help_topics/eol.txt:21
10999
msgid ""
11000
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11001
"(If a value is not set, ``exact`` is the default.)"
11002
msgstr ""
11003
11004
#: en/help_topics/eol.txt:24
11005
msgid ""
11006
" ========== ===================================== ======================\n"
11007
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11008
" ========== ===================================== ======================\n"
11009
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11010
" ---------- ------------------------------------- ----------------------\n"
11011
" ``lf`` ``lf`` ``lf``\n"
11012
" ---------- ------------------------------------- ----------------------\n"
11013
" ``crlf`` ``crlf`` ``lf``\n"
11014
" ---------- ------------------------------------- ----------------------\n"
11015
" ``exact`` No conversion Exactly as in file\n"
11016
" ========== ===================================== ======================"
11017
msgstr ""
11018
11019
#: en/help_topics/eol.txt:36
11020
msgid ""
11021
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11022
"byte is detected in the file."
11023
msgstr ""
11024
11025
#: en/help_topics/eol.txt:39
11026
msgid ""
11027
"For users working on a cross-platform project, here is a suggested rule\n"
11028
"to use as a starting point::"
11029
msgstr ""
11030
11031
#: en/help_topics/eol.txt:42
11032
msgid ""
11033
" [name *]\n"
11034
" eol = native"
11035
msgstr ""
11036
11037
#: en/help_topics/eol.txt:45
11038
msgid ""
11039
"If you have binary files that do not contain a null byte though, be\n"
11040
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11041
"by giving more explicit patterns earlier in the rules file. For example::"
11042
msgstr ""
11043
11044
#: en/help_topics/eol.txt:49
11045
msgid ""
11046
" [name *.png]\n"
11047
" eol = exact"
11048
msgstr ""
11049
11050
#: en/help_topics/eol.txt:55
11051
msgid ""
11052
"If your working tree is on a network drive shared by users on different\n"
11053
"operating systems, you typically want to force certain conventions for\n"
11054
"certain files. In that way, if a file is created with the wrong line\n"
11055
"endings or line endings get mixed during editing, it gets committed\n"
11056
"correctly and gets checked out correctly. For example::"
11057
msgstr ""
11058
11059
#: en/help_topics/eol.txt:61
11060
msgid ""
11061
" [name *.bat]\n"
11062
" eol = crlf"
11063
msgstr ""
11064
11065
#: en/help_topics/eol.txt:64
11066
msgid ""
11067
" [name *.sh]\n"
11068
" eol = lf"
11069
msgstr ""
11070
11071
#: en/help_topics/eol.txt:70
11072
msgid ""
11073
"If you take the care to create files with their required endings, you can\n"
11074
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11075
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11076
"introducing mixed line endings will be corrected during commit for files\n"
11077
"with those settings."
11078
msgstr ""
11079
11080
#: en/help_topics/eol.txt:76
11081
msgid ""
11082
"If you have sample test data that deliberately has text files with mixed\n"
11083
"newline conventions, you can ask for those to be left alone like this::"
11084
msgstr ""
11085
11086
#: en/help_topics/eol.txt:79
11087
msgid ""
11088
" [name test_data/]\n"
11089
" eol = exact"
11090
msgstr ""
11091
11092
#: en/help_topics/eol.txt:85
11093
msgid ""
11094
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11095
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11096
"of content analysis to detect binary files for commands like ``diff``.\n"
11097
"In the future, a ``binary = true`` rule may be added but it is not\n"
11098
"supported yet.)"
11099
msgstr ""
11100
11101
#: en/help_topics/eol.txt:91
11102
msgid ""
11103
"If you have an existing repository with text files already stored using\n"
11104
"Windows newline conventions (``crlf``), then you may want to keep using "
11105
"that\n"
11106
"convention in the repository. Forcing certain files to this convention\n"
11107
"may also help users who do not have rules configured. To do this, set\n"
11108
"``eol`` to one of the values below."
11109
msgstr ""
11110
11111
#: en/help_topics/eol.txt:97
11112
msgid ""
11113
" ============================ ======================== "
11114
"======================\n"
11115
" Value Checkout end-of-lines as Commit end-of-lines "
11116
"as\n"
11117
" ============================ ======================== "
11118
"======================\n"
11119
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11120
" ``lf`` otherwise\n"
11121
" ---------------------------- ------------------------ "
11122
"----------------------\n"
11123
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11124
" ---------------------------- ------------------------ "
11125
"----------------------\n"
11126
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11127
" ============================ ======================== ======================"
11128
msgstr ""
11129
11130
#: en/help_topics/eol.txt:108
11131
msgid ""
11132
"For users working on an existing project that uses Windows newline\n"
11133
"conventions in their Bazaar repository, this rule is suggested as a\n"
11134
"starting point::"
11135
msgstr ""
11136
11137
#: en/help_topics/eol.txt:112
11138
msgid ""
11139
" [name *]\n"
11140
" eol = native-with-crlf-in-repo"
11141
msgstr ""
11142
11143
#: en/help_topics/eol.txt:115
11144
msgid ""
11145
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11146
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11147
"``crlf`` and ``exact``."
11148
msgstr ""
11149
11150
#: en/help_topics/eol.txt:119
11151
msgid ""
11152
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11153
"never reject files because a given line ending or mixed line endings\n"
11154
"are found. A precommit hook should be used if you wish to validate\n"
11155
"(and not just convert) content before committing.\n"
11156
msgstr ""
11157
11158
#: en/help_topics/hidden-commands.txt:1
11159
msgid ""
11160
"added List files added in working tree.\n"
11161
"ancestry List all revisions merged into this branch.\n"
11162
"assert-fail Test reporting of assertion failures\n"
11163
"bundle-info Output interesting stats about a bundle\n"
11164
"bundle-revisions Create a merge-directive for submitting changes.\n"
11165
"cat-revision Write out metadata for a revision.\n"
11166
"dpush Push into a different VCS without any custom bzr\n"
11167
" metadata.\n"
11168
"dump-btree Dump the contents of a btree index file to stdout.\n"
11169
"export-pot Export command helps and error messages in po "
11170
"format.\n"
11171
"file-id Print file_id of a particular file or directory.\n"
11172
"file-path Print path of file_ids to a file or directory.\n"
11173
"find-merge-base Find and print a base revision for merging two "
11174
"branches.\n"
11175
"hooks Show hooks.\n"
11176
"inventory Show inventory of the current working copy or a\n"
11177
" revision.\n"
11178
"is-ignored Check if a path is ignored. [qbzr]\n"
11179
"is-versioned Check if a path is versioned. [qbzr]\n"
11180
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11181
"lookup-revision Lookup the revision-id from a revision-number\n"
11182
"merge-directive Generate a merge directive for auto-merge tools.\n"
11183
"modified List files modified in working tree.\n"
11184
"qcheckout-ala-explorer Checkout a branch. The checkout is always "
11185
"lightweight.\n"
11186
" [explorer]\n"
11187
"qhelp Shows a help window [qbzr]\n"
11188
"qmain The QBzr main application. [qbzr]\n"
11189
"qsubprocess Run some bzr command as subprocess. [qbzr]\n"
11190
"re-sign Create a digital signature for an existing revision.\n"
11191
"reference list, view and set branch locations for nested "
11192
"trees.\n"
11193
"relpath Show path of a file relative to root\n"
11194
"repair-workingtree Reset the working tree state file.\n"
11195
"revision-history Display the list of revision ids on a branch.\n"
11196
"revision-info Show revision number and revision id for a given\n"
11197
" revision identifier.\n"
11198
"rocks Statement of optimism.\n"
11199
"selftest Run internal test suite.\n"
11200
"shell-complete Show appropriate completions for context.\n"
11201
"test-script Run a shell-like test from a file.\n"
11202
"touching-revisions Return revision-ids which affected a particular "
11203
"file.\n"
11204
"unknowns List unknown files.\n"
11205
"wait-until-signalled Test helper for\n"
11206
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11207
msgstr ""
11208
11209
#: en/help_topics/hooks.txt:1
11210
msgid ""
11211
"\n"
11212
"Hooks\n"
11213
"====="
11214
msgstr ""
11215
11216
#: en/help_topics/hooks.txt:5
11217
msgid ""
11218
"Introduction\n"
11219
"------------"
11220
msgstr ""
11221
11222
#: en/help_topics/hooks.txt:8
11223
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11224
msgstr ""
11225
11226
#: en/help_topics/hooks.txt:10
11227
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11228
msgstr ""
11229
11230
#: en/help_topics/hooks.txt:12
11231
msgid ""
11232
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11233
msgstr ""
11234
11235
#: en/help_topics/hooks.txt:14
11236
msgid ""
11237
"The class that contains each hook is given before the hooks it supplies. "
11238
"For\n"
11239
"instance, BranchHooks as the class is the hooks class for\n"
11240
"`bzrlib.branch.Branch.hooks`."
11241
msgstr ""
11242
11243
#: en/help_topics/hooks.txt:18
11244
msgid ""
11245
"Each description also indicates whether the hook runs on the client (the\n"
11246
"machine where bzr was invoked) or the server (the machine addressed by\n"
11247
"the branch URL). These may be, but are not necessarily, the same machine."
11248
msgstr ""
11249
11250
#: en/help_topics/hooks.txt:22
11251
msgid ""
11252
"Plugins (including hooks) are run on the server if all of these is true:"
11253
msgstr ""
11254
11255
#: en/help_topics/hooks.txt:24
11256
msgid ""
11257
" * The connection is via a smart server (accessed with a URL starting with\n"
11258
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11259
"\"http://\"\n"
11260
" URL when a smart server is available via HTTP)."
11261
msgstr ""
11262
11263
#: en/help_topics/hooks.txt:28
11264
msgid ""
11265
" * The hook is either server specific or part of general infrastructure "
11266
"rather\n"
11267
" than client specific code (such as commit)."
11268
msgstr ""
11269
11270
#: en/help_topics/hooks.txt:31
11271
msgid ""
11272
"\n"
11273
"BranchHooks\n"
11274
"-----------"
11275
msgstr ""
11276
11277
#: en/help_topics/hooks.txt:35
11278
msgid ""
11279
"automatic_tag_name\n"
11280
"~~~~~~~~~~~~~~~~~~"
11281
msgstr ""
11282
11283
#: en/help_topics/hooks.txt:38
11284
msgid "Introduced in: 2.2"
11285
msgstr ""
11286
11287
#: en/help_topics/hooks.txt:40
11288
msgid ""
11289
"Called to determine an automatic tag name for a revision.\n"
11290
"automatic_tag_name is called with (branch, revision_id) and should\n"
11291
"return a tag name or None if no tag name could be determined. The\n"
11292
"first non-None tag name returned will be used."
11293
msgstr ""
11294
11295
#: en/help_topics/hooks.txt:45
11296
msgid ""
11297
"open\n"
11298
"~~~~"
11299
msgstr ""
11300
11301
#: en/help_topics/hooks.txt:48
11302
msgid "Introduced in: 1.8"
11303
msgstr ""
11304
11305
#: en/help_topics/hooks.txt:50
11306
msgid ""
11307
"Called with the Branch object that has been opened after a branch is\n"
11308
"opened."
11309
msgstr ""
11310
11311
#: en/help_topics/hooks.txt:53
11312
msgid ""
11313
"post_branch_init\n"
11314
"~~~~~~~~~~~~~~~~"
11315
msgstr ""
11316
11317
#: en/help_topics/hooks.txt:58
11318
msgid ""
11319
"Called after new branch initialization completes. post_branch_init is\n"
11320
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11321
"branch and checkout (both heavyweight and lightweight) will all\n"
11322
"trigger this hook."
11323
msgstr ""
11324
11325
#: en/help_topics/hooks.txt:63
11326
msgid ""
11327
"post_change_branch_tip\n"
11328
"~~~~~~~~~~~~~~~~~~~~~~"
11329
msgstr ""
11330
11331
#: en/help_topics/hooks.txt:66
11332
msgid "Introduced in: 1.4"
11333
msgstr ""
11334
11335
#: en/help_topics/hooks.txt:68
11336
msgid ""
11337
"Called in bzr client and server after a change to the tip of a branch\n"
11338
"is made. post_change_branch_tip is called with a\n"
11339
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11340
"uncommit will all trigger this hook."
11341
msgstr ""
11342
11343
#: en/help_topics/hooks.txt:73
11344
msgid ""
11345
"post_commit\n"
11346
"~~~~~~~~~~~"
11347
msgstr ""
11348
11349
#: en/help_topics/hooks.txt:76
11350
msgid "Introduced in: 0.15"
11351
msgstr ""
11352
11353
#: en/help_topics/hooks.txt:78
11354
msgid ""
11355
"Called in the bzr client after a commit has completed. post_commit is\n"
11356
"called with (local, master, old_revno, old_revid, new_revno,\n"
11357
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11358
"branch."
11359
msgstr ""
11360
11361
#: en/help_topics/hooks.txt:83
11362
msgid ""
11363
"post_pull\n"
11364
"~~~~~~~~~"
11365
msgstr ""
11366
11367
#: en/help_topics/hooks.txt:88
11368
msgid ""
11369
"Called after a pull operation completes. post_pull is called with a\n"
11370
"bzrlib.branch.PullResult object and only runs in the bzr client."
11371
msgstr ""
11372
11373
#: en/help_topics/hooks.txt:91
11374
msgid ""
11375
"post_push\n"
11376
"~~~~~~~~~"
11377
msgstr ""
11378
11379
#: en/help_topics/hooks.txt:96
11380
msgid ""
11381
"Called after a push operation completes. post_push is called with a\n"
11382
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11383
msgstr ""
11384
11385
#: en/help_topics/hooks.txt:99
11386
msgid ""
11387
"post_switch\n"
11388
"~~~~~~~~~~~"
11389
msgstr ""
11390
11391
#: en/help_topics/hooks.txt:104
11392
msgid ""
11393
"Called after a checkout switches branch. post_switch is called with a\n"
11394
"bzrlib.branch.SwitchHookParams."
11395
msgstr ""
11396
11397
#: en/help_topics/hooks.txt:107
11398
msgid ""
11399
"post_uncommit\n"
11400
"~~~~~~~~~~~~~"
11401
msgstr ""
11402
11403
#: en/help_topics/hooks.txt:112
11404
msgid ""
11405
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11406
"called with (local, master, old_revno, old_revid, new_revno,\n"
11407
"new_revid) where local is the local branch or None, master is the\n"
11408
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11409
"of None."
11410
msgstr ""
11411
11412
#: en/help_topics/hooks.txt:118
11413
msgid ""
11414
"pre_change_branch_tip\n"
11415
"~~~~~~~~~~~~~~~~~~~~~"
11416
msgstr ""
11417
11418
#: en/help_topics/hooks.txt:121
11419
msgid "Introduced in: 1.6"
11420
msgstr ""
11421
11422
#: en/help_topics/hooks.txt:123
11423
msgid ""
11424
"Called in bzr client and server before a change to the tip of a branch\n"
11425
"is made. pre_change_branch_tip is called with a\n"
11426
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11427
"uncommit will all trigger this hook."
11428
msgstr ""
11429
11430
#: en/help_topics/hooks.txt:128
11431
msgid ""
11432
"pre_commit\n"
11433
"~~~~~~~~~~"
11434
msgstr ""
11435
11436
#: en/help_topics/hooks.txt:131
11437
msgid "Introduced in: 0.91"
11438
msgstr ""
11439
11440
#: en/help_topics/hooks.txt:133
11441
msgid ""
11442
"Called after a commit is calculated but before it is completed.\n"
11443
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11444
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11445
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11446
"TreeDelta object describing changes from the basis revision. hooks\n"
11447
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11448
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11449
"tree."
11450
msgstr ""
11451
11452
#: en/help_topics/hooks.txt:142
11453
msgid ""
11454
"set_rh\n"
11455
"~~~~~~"
11456
msgstr ""
11457
11458
#: en/help_topics/hooks.txt:147
11459
msgid ""
11460
"Invoked whenever the revision history has been set via\n"
11461
"set_revision_history. The api signature is (branch, revision_history),\n"
11462
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11463
"for bzr to trigger, a better hook to use is\n"
11464
"Branch.post_change_branch_tip."
11465
msgstr ""
11466
11467
#: en/help_topics/hooks.txt:153
11468
msgid ""
11469
"transform_fallback_location\n"
11470
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11471
msgstr ""
11472
11473
#: en/help_topics/hooks.txt:156
11474
msgid "Introduced in: 1.9"
11475
msgstr ""
11476
11477
#: en/help_topics/hooks.txt:158
11478
msgid ""
11479
"Called when a stacked branch is activating its fallback locations.\n"
11480
"transform_fallback_location is called with (branch, url), and should\n"
11481
"return a new url. Returning the same url allows it to be used as-is,\n"
11482
"returning a different one can be used to cause the branch to stack on\n"
11483
"a closer copy of that fallback_location. Note that the branch cannot\n"
11484
"have history accessing methods called on it during this hook because\n"
11485
"the fallback locations have not been activated. When there are\n"
11486
"multiple hooks installed for transform_fallback_location, all are\n"
11487
"called with the url returned from the previous hook.The order is\n"
11488
"however undefined."
11489
msgstr ""
11490
11491
#: en/help_topics/hooks.txt:169
11492
msgid ""
11493
"BzrDirHooks\n"
11494
"-----------"
11495
msgstr ""
11496
11497
#: en/help_topics/hooks.txt:172
11498
msgid ""
11499
"post_repo_init\n"
11500
"~~~~~~~~~~~~~~"
11501
msgstr ""
11502
11503
#: en/help_topics/hooks.txt:177
11504
msgid ""
11505
"Invoked after a repository has been initialized. post_repo_init is\n"
11506
"called with a bzrlib.bzrdir.RepoInitHookParams."
11507
msgstr ""
11508
11509
#: en/help_topics/hooks.txt:180
11510
msgid ""
11511
"pre_open\n"
11512
"~~~~~~~~"
11513
msgstr ""
11514
11515
#: en/help_topics/hooks.txt:183
11516
msgid "Introduced in: 1.14"
11517
msgstr ""
11518
11519
#: en/help_topics/hooks.txt:185
11520
msgid ""
11521
"Invoked before attempting to open a BzrDir with the transport that the\n"
11522
"open will use."
11523
msgstr ""
11524
11525
#: en/help_topics/hooks.txt:188
11526
msgid ""
11527
"CommandHooks\n"
11528
"------------"
11529
msgstr ""
11530
11531
#: en/help_topics/hooks.txt:191
11532
msgid ""
11533
"extend_command\n"
11534
"~~~~~~~~~~~~~~"
11535
msgstr ""
11536
11537
#: en/help_topics/hooks.txt:194
11538
msgid "Introduced in: 1.13"
11539
msgstr ""
11540
11541
#: en/help_topics/hooks.txt:196
11542
msgid ""
11543
"Called after creating a command object to allow modifications such as\n"
11544
"adding or removing options, docs etc. Called with the new\n"
11545
"bzrlib.commands.Command object."
11546
msgstr ""
11547
11548
#: en/help_topics/hooks.txt:200
11549
msgid ""
11550
"get_command\n"
11551
"~~~~~~~~~~~"
11552
msgstr ""
11553
11554
#: en/help_topics/hooks.txt:203
11555
msgid "Introduced in: 1.17"
11556
msgstr ""
11557
11558
#: en/help_topics/hooks.txt:205
11559
msgid ""
11560
"Called when creating a single command. Called with (cmd_or_None,\n"
11561
"command_name). get_command should either return the cmd_or_None\n"
11562
"parameter, or a replacement Command object that should be used for the\n"
11563
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11564
"Many users will prefer to use bzrlib.commands.register_command or\n"
11565
"plugin_cmds.register_lazy."
11566
msgstr ""
11567
11568
#: en/help_topics/hooks.txt:212
11569
msgid ""
11570
"get_missing_command\n"
11571
"~~~~~~~~~~~~~~~~~~~"
11572
msgstr ""
11573
11574
#: en/help_topics/hooks.txt:217
11575
msgid ""
11576
"Called when creating a single command if no command could be found.\n"
11577
"Called with (command_name). get_missing_command should either return\n"
11578
"None, or a Command object to be used for the command."
11579
msgstr ""
11580
11581
#: en/help_topics/hooks.txt:221
11582
msgid ""
11583
"list_commands\n"
11584
"~~~~~~~~~~~~~"
11585
msgstr ""
11586
11587
#: en/help_topics/hooks.txt:226
11588
msgid ""
11589
"Called when enumerating commands. Called with a set of cmd_name\n"
11590
"strings for all the commands found so far. This set is safe to mutate\n"
11591
"- e.g. to remove a command. list_commands should return the updated\n"
11592
"set of command names."
11593
msgstr ""
11594
11595
#: en/help_topics/hooks.txt:231
11596
msgid ""
11597
"_ConfigHooks\n"
11598
"------------"
11599
msgstr ""
11600
11601
#: en/help_topics/hooks.txt:234
11602
msgid ""
11603
"get\n"
11604
"~~~"
11605
msgstr ""
11606
11607
#: en/help_topics/hooks.txt:237
11608
msgid "Introduced in: 2.4"
11609
msgstr ""
11610
11611
#: en/help_topics/hooks.txt:239
11612
msgid ""
11613
"Invoked when a config option is read. The signature is (stack, name,\n"
11614
"value)."
11615
msgstr ""
11616
11617
#: en/help_topics/hooks.txt:242
11618
msgid ""
11619
"load\n"
11620
"~~~~"
11621
msgstr ""
11622
11623
#: en/help_topics/hooks.txt:247
11624
msgid "Invoked when a config store is loaded. The signature is (store)."
11625
msgstr ""
11626
11627
#: en/help_topics/hooks.txt:249
11628
msgid ""
11629
"remove\n"
11630
"~~~~~~"
11631
msgstr ""
11632
11633
#: en/help_topics/hooks.txt:254
11634
msgid ""
11635
"Invoked when a config option is removed. The signature is (stack,\n"
11636
"name)."
11637
msgstr ""
11638
11639
#: en/help_topics/hooks.txt:257
11640
msgid ""
11641
"save\n"
11642
"~~~~"
11643
msgstr ""
11644
11645
#: en/help_topics/hooks.txt:262
11646
msgid "Invoked when a config store is saved. The signature is (store)."
11647
msgstr ""
11648
11649
#: en/help_topics/hooks.txt:264
11650
msgid ""
11651
"set\n"
11652
"~~~"
11653
msgstr ""
11654
11655
#: en/help_topics/hooks.txt:269
11656
msgid ""
11657
"Invoked when a config option is set. The signature is (stack, name,\n"
11658
"value)."
11659
msgstr ""
11660
11661
#: en/help_topics/hooks.txt:272
11662
msgid ""
11663
"InfoHooks\n"
11664
"---------"
11665
msgstr ""
11666
11667
#: en/help_topics/hooks.txt:275
11668
msgid ""
11669
"repository\n"
11670
"~~~~~~~~~~"
11671
msgstr ""
11672
11673
#: en/help_topics/hooks.txt:278
11674
msgid "Introduced in: 1.15"
11675
msgstr ""
11676
11677
#: en/help_topics/hooks.txt:280
11678
msgid ""
11679
"Invoked when displaying the statistics for a repository. repository is\n"
11680
"called with a statistics dictionary as returned by the repository and\n"
11681
"a file-like object to write to."
11682
msgstr ""
11683
11684
#: en/help_topics/hooks.txt:284
11685
msgid ""
11686
"LockHooks\n"
11687
"---------"
11688
msgstr ""
11689
11690
#: en/help_topics/hooks.txt:287
11691
msgid ""
11692
"lock_acquired\n"
11693
"~~~~~~~~~~~~~"
11694
msgstr ""
11695
11696
#: en/help_topics/hooks.txt:292
11697
msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."
11698
msgstr ""
11699
11700
#: en/help_topics/hooks.txt:294
11701
msgid ""
11702
"lock_broken\n"
11703
"~~~~~~~~~~~"
11704
msgstr ""
11705
11706
#: en/help_topics/hooks.txt:299
11707
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
11708
msgstr ""
11709
11710
#: en/help_topics/hooks.txt:301
11711
msgid ""
11712
"lock_released\n"
11713
"~~~~~~~~~~~~~"
11714
msgstr ""
11715
11716
#: en/help_topics/hooks.txt:306
11717
msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."
11718
msgstr ""
11719
11720
#: en/help_topics/hooks.txt:308
11721
msgid ""
11722
"MergeHooks\n"
11723
"----------"
11724
msgstr ""
11725
11726
#: en/help_topics/hooks.txt:311
11727
msgid ""
11728
"merge_file_content\n"
11729
"~~~~~~~~~~~~~~~~~~"
11730
msgstr ""
11731
11732
#: en/help_topics/hooks.txt:314
11733
msgid "Introduced in: 2.1"
11734
msgstr ""
11735
11736
#: en/help_topics/hooks.txt:316
11737
msgid ""
11738
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
11739
"object when starting a merge. Should return either None or a subclass\n"
11740
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
11741
"called per file that needs to be merged (including when one side has\n"
11742
"deleted the file and the other has changed it). See the\n"
11743
"AbstractPerFileMerger API docs for details on how it is used by merge."
11744
msgstr ""
11745
11746
#: en/help_topics/hooks.txt:323
11747
msgid ""
11748
"MergeDirectiveHooks\n"
11749
"-------------------"
11750
msgstr ""
11751
11752
#: en/help_topics/hooks.txt:326
11753
msgid ""
11754
"merge_request_body\n"
11755
"~~~~~~~~~~~~~~~~~~"
11756
msgstr ""
11757
11758
#: en/help_topics/hooks.txt:329
11759
msgid "Introduced in: 1.15.0"
11760
msgstr ""
11761
11762
#: en/help_topics/hooks.txt:331
11763
msgid ""
11764
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
11765
"request. Callbacks must return a body. If more than one callback is\n"
11766
"registered, the output of one callback is provided to the next."
11767
msgstr ""
11768
11769
#: en/help_topics/hooks.txt:335
11770
msgid ""
11771
"MessageEditorHooks\n"
11772
"------------------"
11773
msgstr ""
11774
11775
#: en/help_topics/hooks.txt:338
11776
msgid ""
11777
"commit_message_template\n"
11778
"~~~~~~~~~~~~~~~~~~~~~~~"
11779
msgstr ""
11780
11781
#: en/help_topics/hooks.txt:341
11782
msgid "Introduced in: 1.10"
11783
msgstr ""
11784
11785
#: en/help_topics/hooks.txt:343
11786
msgid ""
11787
"Called when a commit message is being generated.\n"
11788
"commit_message_template is called with the bzrlib.commit.Commit object\n"
11789
"and the message that is known so far. commit_message_template must\n"
11790
"return a new message to use (which could be the same as it was given).\n"
11791
"When there are multiple hooks registered for commit_message_template,\n"
11792
"they are chained with the result from the first passed into the\n"
11793
"second, and so on."
11794
msgstr ""
11795
11796
#: en/help_topics/hooks.txt:351
11797
msgid ""
11798
"set_commit_message\n"
11799
"~~~~~~~~~~~~~~~~~~"
11800
msgstr ""
11801
11802
#: en/help_topics/hooks.txt:356
11803
msgid ""
11804
"Set a fixed commit message. set_commit_message is called with the\n"
11805
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
11806
"properties by editing commit.builder._revprops) and the message so\n"
11807
"far. set_commit_message must return the message to use or None if it\n"
11808
"should use the message editor as normal."
11809
msgstr ""
11810
11811
#: en/help_topics/hooks.txt:362
11812
msgid ""
11813
"MutableTreeHooks\n"
11814
"----------------"
11815
msgstr ""
11816
11817
#: en/help_topics/hooks.txt:368
11818
msgid "Introduced in: 2.0"
11819
msgstr ""
11820
11821
#: en/help_topics/hooks.txt:370
11822
msgid ""
11823
"Called after a commit is performed on a tree. The hook is called with\n"
11824
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
11825
"commit was performed on is available via the mutable_tree attribute of\n"
11826
"that object."
11827
msgstr ""
11828
11829
#: en/help_topics/hooks.txt:375
11830
msgid ""
11831
"start_commit\n"
11832
"~~~~~~~~~~~~"
11833
msgstr ""
11834
11835
#: en/help_topics/hooks.txt:380
11836
msgid ""
11837
"Called before a commit is performed on a tree. The start commit hook\n"
11838
"is able to change the tree before the commit takes place. start_commit\n"
11839
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
11840
"being performed on."
11841
msgstr ""
11842
11843
#: en/help_topics/hooks.txt:385
11844
msgid ""
11845
"SmartClientHooks\n"
11846
"----------------"
11847
msgstr ""
11848
11849
#: en/help_topics/hooks.txt:388
11850
msgid ""
11851
"call\n"
11852
"~~~~"
11853
msgstr ""
11854
11855
#: en/help_topics/hooks.txt:391
11856
msgid "Introduced in: unknown"
11857
msgstr ""
11858
11859
#: en/help_topics/hooks.txt:393
11860
msgid ""
11861
"Called when the smart client is submitting a request to the smart\n"
11862
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
11863
"Streaming request bodies, and responses, are not accessible."
11864
msgstr ""
11865
11866
#: en/help_topics/hooks.txt:397
11867
msgid ""
11868
"SmartServerHooks\n"
11869
"----------------"
11870
msgstr ""
11871
11872
#: en/help_topics/hooks.txt:400
11873
msgid ""
11874
"server_exception\n"
11875
"~~~~~~~~~~~~~~~~"
11876
msgstr ""
11877
11878
#: en/help_topics/hooks.txt:405
11879
msgid ""
11880
"Called by the bzr server when an exception occurs. server_exception is\n"
11881
"called with the sys.exc_info() tuple return true for the hook if the\n"
11882
"exception has been handled, in which case the server will exit\n"
11883
"normally."
11884
msgstr ""
11885
11886
#: en/help_topics/hooks.txt:410
11887
msgid ""
11888
"server_started\n"
11889
"~~~~~~~~~~~~~~"
11890
msgstr ""
11891
11892
#: en/help_topics/hooks.txt:413
11893
msgid "Introduced in: 0.16"
11894
msgstr ""
11895
11896
#: en/help_topics/hooks.txt:415
11897
msgid ""
11898
"Called by the bzr server when it starts serving a directory.\n"
11899
"server_started is called with (backing urls, public url), where\n"
11900
"backing_url is a list of URLs giving the server-specific directory\n"
11901
"locations, and public_url is the public URL for the directory being\n"
11902
"served."
11903
msgstr ""
11904
11905
#: en/help_topics/hooks.txt:421
11906
msgid ""
11907
"server_started_ex\n"
11908
"~~~~~~~~~~~~~~~~~"
11909
msgstr ""
11910
11911
#: en/help_topics/hooks.txt:426
11912
msgid ""
11913
"Called by the bzr server when it starts serving a directory.\n"
11914
"server_started is called with (backing_urls, server_obj)."
11915
msgstr ""
11916
11917
#: en/help_topics/hooks.txt:429
11918
msgid ""
11919
"server_stopped\n"
11920
"~~~~~~~~~~~~~~"
11921
msgstr ""
11922
11923
#: en/help_topics/hooks.txt:434
11924
msgid ""
11925
"Called by the bzr server when it stops serving a directory.\n"
11926
"server_stopped is called with the same parameters as the\n"
11927
"server_started hook: (backing_urls, public_url)."
11928
msgstr ""
11929
11930
#: en/help_topics/hooks.txt:438
11931
msgid ""
11932
"StatusHooks\n"
11933
"-----------"
11934
msgstr ""
11935
11936
#: en/help_topics/hooks.txt:441
11937
msgid ""
11938
"post_status\n"
11939
"~~~~~~~~~~~"
11940
msgstr ""
11941
11942
#: en/help_topics/hooks.txt:444
11943
msgid "Introduced in: 2.3"
11944
msgstr ""
11945
11946
#: en/help_topics/hooks.txt:446
11947
msgid ""
11948
"Called with argument StatusHookParams after Bazaar has displayed the\n"
11949
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
11950
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
11951
"correspond to the command line options specified by the user for the\n"
11952
"status command. to_file is the output stream for writing."
11953
msgstr ""
11954
11955
#: en/help_topics/hooks.txt:452
11956
msgid ""
11957
"pre_status\n"
11958
"~~~~~~~~~~"
11959
msgstr ""
11960
11961
#: en/help_topics/hooks.txt:457
11962
msgid ""
11963
"Called with argument StatusHookParams before Bazaar displays the\n"
11964
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
11965
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
11966
"correspond to the command line options specified by the user for the\n"
11967
"status command. to_file is the output stream for writing."
11968
msgstr ""
11969
11970
#: en/help_topics/hooks.txt:463
11971
msgid ""
11972
"RioVersionInfoBuilderHooks\n"
11973
"--------------------------"
11974
msgstr ""
11975
11976
#: en/help_topics/hooks.txt:466
11977
msgid ""
11978
"revision\n"
11979
"~~~~~~~~"
11980
msgstr ""
11981
11982
#: en/help_topics/hooks.txt:471
11983
msgid ""
11984
"Invoked when adding information about a revision to the RIO stanza\n"
11985
"that is printed. revision is called with a revision object and a RIO\n"
11986
"stanza.\n"
11987
msgstr ""
11988
11989
#: en/help_topics/location-alias.txt:1
11990
msgid ""
11991
"Location aliases\n"
11992
"================"
11993
msgstr ""
11994
11995
#: en/help_topics/location-alias.txt:4
11996
msgid ""
11997
"Bazaar defines several aliases for locations associated with a branch. "
11998
"These\n"
11999
"can be used with most commands that expect a location, such as `bzr push`."
12000
msgstr ""
12001
12002
#: en/help_topics/location-alias.txt:7
12003
msgid "The aliases are::"
12004
msgstr ""
12005
12006
#: en/help_topics/location-alias.txt:9
12007
msgid ""
12008
" :parent the parent of this branch\n"
12009
" :submit the submit branch for this branch\n"
12010
" :public the public location of this branch\n"
12011
" :bound the branch this branch is bound to, for bound branches\n"
12012
" :push the saved location used for `bzr push` with no arguments\n"
12013
" :this this branch"
12014
msgstr ""
12015
12016
#: en/help_topics/location-alias.txt:16
12017
msgid "For example, to push to the parent location::"
12018
msgstr ""
12019
12020
#: en/help_topics/location-alias.txt:18
12021
msgid " bzr push :parent"
12022
msgstr ""
12023
12024
#: en/help_topics/log-formats.txt:1
12025
msgid ""
12026
"Log Formats\n"
12027
"==========="
12028
msgstr ""
12029
12030
#: en/help_topics/log-formats.txt:4
12031
msgid ""
12032
"A log format controls how information about each revision is displayed.\n"
12033
"The standard log formats are compared below::"
12034
msgstr ""
12035
12036
#: en/help_topics/log-formats.txt:7
12037
msgid ""
12038
" Feature long short line\n"
12039
" ---------------------- ------------- ------------ -------------------\n"
12040
" design goal detailed view concise view 1 revision per line\n"
12041
" committer name+email name only name only\n"
12042
" author name+email - -\n"
12043
" date-time format full date only date only\n"
12044
" commit message full full top line\n"
12045
" tags yes yes yes\n"
12046
" merges indicator - yes -\n"
12047
" status/delta optional optional -\n"
12048
" diff/patch optional optional -\n"
12049
" revision-id optional optional -\n"
12050
" branch nick yes - -\n"
12051
" foreign vcs properties yes yes -\n"
12052
" preferred levels all 1 1\n"
12053
" digital signature optional - -"
12054
msgstr ""
12055
12056
#: en/help_topics/log-formats.txt:24
12057
msgid ""
12058
"The default format is ``long``. To change this, define the ``log_format``\n"
12059
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12060
msgstr ""
12061
12062
#: en/help_topics/log-formats.txt:27
12063
msgid ""
12064
" [DEFAULT]\n"
12065
" log_format = short"
12066
msgstr ""
12067
12068
#: en/help_topics/log-formats.txt:30
12069
msgid ""
12070
"Alternatively, to change the log format used for a given query, use the\n"
12071
"--long, --short or --line options."
12072
msgstr ""
12073
12074
#: en/help_topics/log-formats.txt:33
12075
msgid ""
12076
"If one of the standard log formats does not meet your needs, additional\n"
12077
"formats can be provided by plugins.\n"
12078
msgstr ""
12079
12080
#: en/help_topics/other-formats.txt:1
12081
msgid "Other Storage Formats"
12082
msgstr ""
12083
12084
#: en/help_topics/other-formats.txt:3
12085
msgid "No experimental formats are available."
12086
msgstr ""
12087
12088
#: en/help_topics/other-formats.txt:5
12089
msgid ""
12090
"\n"
12091
"No deprecated formats are available."
12092
msgstr ""
12093
12094
#: en/help_topics/patterns.txt:1
12095
msgid ""
12096
"Patterns\n"
12097
"========"
12098
msgstr ""
12099
12100
#: en/help_topics/patterns.txt:4
12101
msgid ""
12102
"Bazaar uses patterns to match files at various times. For example,\n"
12103
"the ``add`` command skips over files that match ignore patterns\n"
12104
"and preferences can be associated with files using rule patterns.\n"
12105
"The pattern syntax is described below."
12106
msgstr ""
12107
12108
#: en/help_topics/patterns.txt:9
12109
msgid ""
12110
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12111
"slash or is a regular expression, it is compared to the whole path\n"
12112
"from the branch root. Otherwise, it is compared to only the last\n"
12113
"component of the path. To match a file only in the root directory,\n"
12114
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12115
msgstr ""
12116
12117
#: en/help_topics/patterns.txt:15
12118
msgid "Patterns may include globbing wildcards such as::"
12119
msgstr ""
12120
12121
#: en/help_topics/patterns.txt:17
12122
msgid ""
12123
" ? - Matches any single character except '/'\n"
12124
" * - Matches 0 or more characters except '/'\n"
12125
" /**/ - Matches 0 or more directories in a path\n"
12126
" [a-z] - Matches a single character from within a group of characters"
12127
msgstr ""
12128
12129
#: en/help_topics/patterns.txt:22
12130
msgid ""
12131
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12132
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12133
"expression. Regular expression patterns may not include named or\n"
12134
"numbered groups."
12135
msgstr ""
12136
12137
#: en/help_topics/patterns.txt:27
12138
msgid ""
12139
"Case insensitive ignore patterns can be specified with regular expressions\n"
12140
"by using the ``i`` (for ignore case) flag in the pattern."
12141
msgstr ""
12142
12143
#: en/help_topics/patterns.txt:30
12144
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
12145
msgstr ""
12146
12147
#: en/help_topics/patterns.txt:32
12148
msgid " RE:(?i)foo"
12149
msgstr ""
12150
12151
#: en/help_topics/patterns.txt:34
12152
msgid ""
12153
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12154
"matched by that pattern will not be ignored."
12155
msgstr ""
12156
12157
#: en/help_topics/patterns.txt:37
12158
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
12159
msgstr ""
12160
12161
#: en/help_topics/revisionspec.txt:1
12162
msgid "Revision Identifiers"
12163
msgstr ""
12164
12165
#: en/help_topics/revisionspec.txt:3
12166
msgid ""
12167
"A revision identifier refers to a specific state of a branch's history. It\n"
12168
"can be expressed in several ways. It can begin with a keyword to\n"
12169
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12170
"'before:yesterday' and 'submit:'."
12171
msgstr ""
12172
12173
#: en/help_topics/revisionspec.txt:8
12174
msgid ""
12175
"Alternately, it can be given without a keyword, in which case it will be\n"
12176
"checked as a revision number, a tag, a revision id, a date specification, or "
12177
"a\n"
12178
"branch specification, in that order. For example, 'date:today' could be\n"
12179
"written as simply 'today', though if you have a tag called 'today' that "
12180
"will\n"
12181
"be found first."
12182
msgstr ""
12183
12184
#: en/help_topics/revisionspec.txt:14
12185
msgid ""
12186
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12187
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12188
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12189
"or\n"
12190
"spaces around the '..')."
12191
msgstr ""
12192
12193
#: en/help_topics/revisionspec.txt:19
12194
msgid ""
12195
"Ranges are interpreted differently by different commands. To the \"log\" "
12196
"command,\n"
12197
"a range is a sequence of log messages, but to the \"diff\" command, the "
12198
"range\n"
12199
"denotes a change between revisions (and not a sequence of changes). In\n"
12200
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12201
"consider it\n"
12202
"to be open-ended, that is, they include one end but not the other. For "
12203
"example:\n"
12204
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12205
"3649,\n"
12206
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12207
"and\n"
12208
"3649, but not 3647."
12209
msgstr ""
12210
12211
#: en/help_topics/revisionspec.txt:28
12212
msgid "The keywords used as revision selection methods are the following:"
12213
msgstr ""
12214
12215
#: en/help_topics/revisionspec.txt:30
12216
msgid ""
12217
":revid:\n"
12218
"\tSelects a revision using the revision id.\n"
12219
":submit:\n"
12220
"\tSelects a common ancestor with the submit branch.\n"
12221
":ancestor:\n"
12222
"\tSelects a common ancestor with a second branch.\n"
12223
":date:\n"
12224
"\tSelects a revision on the basis of a datestamp.\n"
12225
":branch:\n"
12226
"\tSelects the last revision of a specified branch.\n"
12227
":tag:\n"
12228
"\tSelects a revision identified by a tag name.\n"
12229
":package:\n"
12230
"\tSelects the revision corresponding to a version of a package.\n"
12231
":revno:\n"
12232
"\tSelects a revision using a number.\n"
12233
":before:\n"
12234
"\tSelects the parent of the revision specified.\n"
12235
":annotate:\n"
12236
"\tSelect the revision that last modified the specified line.\n"
12237
":mainline:\n"
12238
"\tSelect mainline revision that merged the specified revision.\n"
12239
":last:\n"
12240
"\tSelects the nth revision from the end."
12241
msgstr ""
12242
12243
#: en/help_topics/revisionspec.txt:55
12244
msgid "In addition, plugins can provide other keywords."
12245
msgstr ""
12246
12247
#: en/help_topics/revisionspec.txt:57
12248
msgid "A detailed description of each keyword is given below."
12249
msgstr ""
12250
12251
#: en/help_topics/revisionspec.txt:59
12252
msgid ":revid:"
12253
msgstr ""
12254
12255
#: en/help_topics/revisionspec.txt:61
12256
msgid ""
12257
" Supply a specific revision id, that can be used to specify any\n"
12258
" revision id in the ancestry of the branch.\n"
12259
" Including merges, and pending merges.\n"
12260
" Examples::"
12261
msgstr ""
12262
12263
#: en/help_topics/revisionspec.txt:66
12264
msgid ""
12265
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12266
msgstr ""
12267
12268
#: en/help_topics/revisionspec.txt:68
12269
msgid ":submit:"
12270
msgstr ""
12271
12272
#: en/help_topics/revisionspec.txt:70
12273
msgid ""
12274
" Diffing against this shows all the changes that were made in this "
12275
"branch,\n"
12276
" and is a good predictor of what merge will do. The submit branch is\n"
12277
" used by the bundle and merge directive commands. If no submit branch\n"
12278
" is specified, the parent branch is used instead."
12279
msgstr ""
12280
12281
#: en/help_topics/revisionspec.txt:75
12282
msgid ""
12283
" The common ancestor is the last revision that existed in both\n"
12284
" branches. Usually this is the branch point, but it could also be\n"
12285
" a revision that was merged."
12286
msgstr ""
12287
12288
#: en/help_topics/revisionspec.txt:79
12289
msgid " Examples::"
12290
msgstr ""
12291
12292
#: en/help_topics/revisionspec.txt:81
12293
msgid " $ bzr diff -r submit:"
12294
msgstr ""
12295
12296
#: en/help_topics/revisionspec.txt:83
12297
msgid ":ancestor:"
12298
msgstr ""
12299
12300
#: en/help_topics/revisionspec.txt:85
12301
msgid " Supply the path to a branch to select the common ancestor."
12302
msgstr ""
12303
12304
#: en/help_topics/revisionspec.txt:91
12305
msgid ""
12306
" This is frequently used with 'diff' to return all of the changes\n"
12307
" that your branch introduces, while excluding the changes that you\n"
12308
" have not merged from the remote branch."
12309
msgstr ""
12310
12311
#: en/help_topics/revisionspec.txt:97
12312
msgid ""
12313
" ancestor:/path/to/branch\n"
12314
" $ bzr diff -r ancestor:../../mainline/branch"
12315
msgstr ""
12316
12317
#: en/help_topics/revisionspec.txt:100
12318
msgid ":date:"
12319
msgstr ""
12320
12321
#: en/help_topics/revisionspec.txt:102
12322
msgid ""
12323
" Supply a datestamp to select the first revision that matches the date.\n"
12324
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12325
" Matches the first entry after a given date (either at midnight or\n"
12326
" at a specified time)."
12327
msgstr ""
12328
12329
#: en/help_topics/revisionspec.txt:107
12330
msgid " One way to display all the changes since yesterday would be::"
12331
msgstr ""
12332
12333
#: en/help_topics/revisionspec.txt:109
12334
msgid " bzr log -r date:yesterday.."
12335
msgstr ""
12336
12337
#: en/help_topics/revisionspec.txt:113
12338
msgid ""
12339
" date:yesterday -> select the first revision since "
12340
"yesterday\n"
12341
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12342
" August 14th, 2006 at 5:10pm."
12343
msgstr ""
12344
12345
#: en/help_topics/revisionspec.txt:117
12346
msgid ":branch:"
12347
msgstr ""
12348
12349
#: en/help_topics/revisionspec.txt:119
12350
msgid " Supply the path to a branch to select its last revision."
12351
msgstr ""
12352
12353
#: en/help_topics/revisionspec.txt:123
12354
msgid " branch:/path/to/branch"
12355
msgstr ""
12356
12357
#: en/help_topics/revisionspec.txt:125
12358
msgid ":tag:"
12359
msgstr ""
12360
12361
#: en/help_topics/revisionspec.txt:127
12362
msgid " Tags are stored in the branch and created by the 'tag' command."
12363
msgstr ""
12364
12365
#: en/help_topics/revisionspec.txt:129
12366
msgid ":package:"
12367
msgstr ""
12368
12369
#: en/help_topics/revisionspec.txt:131
12370
msgid ""
12371
" Given a package version number this revision specifier will allow you\n"
12372
" specify the revision corresponding to the upload of that version of\n"
12373
" the package."
12374
msgstr ""
12375
12376
#: en/help_topics/revisionspec.txt:135
12377
msgid ":revno:"
12378
msgstr ""
12379
12380
#: en/help_topics/revisionspec.txt:137
12381
msgid ""
12382
" Use an integer to specify a revision in the history of the branch.\n"
12383
" Optionally a branch can be specified. A negative number will count\n"
12384
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12385
" one). If the negative number is larger than the branch's history, the\n"
12386
" first revision is returned.\n"
12387
" Examples::"
12388
msgstr ""
12389
12390
#: en/help_topics/revisionspec.txt:144
12391
msgid ""
12392
" revno:1 -> return the first revision of this branch\n"
12393
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12394
" the branch '/path/to/branch'\n"
12395
" revno:-1 -> The last revision in a branch.\n"
12396
" -2:http://other/branch -> The second to last revision in the\n"
12397
" remote branch.\n"
12398
" -1000000 -> Most likely the first revision, unless\n"
12399
" your history is very long."
12400
msgstr ""
12401
12402
#: en/help_topics/revisionspec.txt:153
12403
msgid ":before:"
12404
msgstr ""
12405
12406
#: en/help_topics/revisionspec.txt:155
12407
msgid ""
12408
" Supply any revision spec to return the parent of that revision. This "
12409
"is\n"
12410
" mostly useful when inspecting revisions that are not in the revision "
12411
"history\n"
12412
" of a branch."
12413
msgstr ""
12414
12415
#: en/help_topics/revisionspec.txt:159
12416
msgid ""
12417
" It is an error to request the parent of the null revision (before:0)."
12418
msgstr ""
12419
12420
#: en/help_topics/revisionspec.txt:163
12421
msgid ""
12422
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12423
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12424
" aaaa@bbbb-1234567890\n"
12425
" bzr diff -r before:1913..1913\n"
12426
" -> Find the changes between revision 1913 and its parent "
12427
"(1912).\n"
12428
" (What changes did revision 1913 introduce).\n"
12429
" This is equivalent to: bzr diff -c 1913"
12430
msgstr ""
12431
12432
#: en/help_topics/revisionspec.txt:171
12433
msgid ":annotate:"
12434
msgstr ""
12435
12436
#: en/help_topics/revisionspec.txt:173
12437
msgid ""
12438
" Select the revision that last modified the specified line. Line is\n"
12439
" specified as path:number. Path is a relative path to the file. "
12440
"Numbers\n"
12441
" start at 1, and are relative to the current version, not the last-\n"
12442
" committed version of the file."
12443
msgstr ""
12444
12445
#: en/help_topics/revisionspec.txt:178
12446
msgid ":mainline:"
12447
msgstr ""
12448
12449
#: en/help_topics/revisionspec.txt:180
12450
msgid ""
12451
" Select the revision that merged the specified revision into mainline."
12452
msgstr ""
12453
12454
#: en/help_topics/revisionspec.txt:182
12455
msgid ":last:"
12456
msgstr ""
12457
12458
#: en/help_topics/revisionspec.txt:184
12459
msgid ""
12460
" Supply a positive number to get the nth revision from the end.\n"
12461
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12462
" Examples::"
12463
msgstr ""
12464
12465
#: en/help_topics/revisionspec.txt:188
12466
msgid ""
12467
" last:1 -> return the last revision\n"
12468
" last:3 -> return the revision 2 before the end.\n"
12469
msgstr ""
12470
12471
#: en/help_topics/rules.txt:1
12472
msgid ""
12473
"Rules\n"
12474
"====="
12475
msgstr ""
12476
12477
#: en/help_topics/rules.txt:7
12478
msgid ""
12479
"Rules are defined in ini file format where the sections are file glob\n"
12480
"patterns and the contents of each section are the preferences for files\n"
12481
"matching that pattern(s). For example::"
12482
msgstr ""
12483
12484
#: en/help_topics/rules.txt:11
12485
msgid ""
12486
" [name *.bat]\n"
12487
" eol = native"
12488
msgstr ""
12489
12490
#: en/help_topics/rules.txt:14
12491
msgid ""
12492
" [name *.html *.xml]\n"
12493
" keywords = xml_escape"
12494
msgstr ""
12495
12496
#: en/help_topics/rules.txt:17
12497
msgid ""
12498
"Preferences like these are useful for commands and plugins wishing to\n"
12499
"provide custom behaviour for selected files. For more information on \n"
12500
"end of line conversion see :doc:`eol-help`.\n"
12501
"Keyword support is provided by the `keywords plugin\n"
12502
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
12503
msgstr ""
12504
12505
#: en/help_topics/rules.txt:23
12506
msgid ""
12507
"Files\n"
12508
"-----"
12509
msgstr ""
12510
12511
#: en/help_topics/rules.txt:26
12512
msgid ""
12513
"Default rules for all branches are defined in the optional file\n"
12514
"``BZR_HOME/rules``. "
12515
msgstr ""
12516
12517
#: en/help_topics/rules.txt:29
12518
msgid ""
12519
"Rule Patterns\n"
12520
"-------------"
12521
msgstr ""
12522
12523
#: en/help_topics/rules.txt:32
12524
msgid ""
12525
"Patterns are ordered and searching stops as soon as one matches.\n"
12526
"As a consequence, more explicit patterns should be placed towards\n"
12527
"the top of the file. Rule patterns use exactly the same conventions\n"
12528
"as ignore patterns. See :doc:`patterns-help` for details."
12529
msgstr ""
12530
12531
#: en/help_topics/rules.txt:37
12532
msgid ".. note::"
12533
msgstr ""
12534
12535
#: en/help_topics/rules.txt:39
12536
msgid ""
12537
" Patterns containing square brackets or spaces should be\n"
12538
" surrounded in quotes to ensure they are correctly parsed.\n"
12539
msgstr ""
12540
12541
#: en/help_topics/topics.txt:1
12542
msgid ""
12543
"authentication Information on configuring authentication\n"
12544
"basic Basic commands\n"
12545
"branches Information on what a branch is\n"
12546
"bugs Bug tracker settings\n"
12547
"checkouts Information on what a checkout is\n"
12548
"commands Basic help for all commands\n"
12549
"configuration Details on the configuration settings available\n"
12550
"conflict-types Types of conflicts and what to do about them\n"
12551
"content-filters Conversion of content into/from working trees\n"
12552
"criss-cross Information on criss-cross merging\n"
12553
"current-formats Current storage formats\n"
12554
"debug-flags Options to show or record debug information\n"
12555
"diverged-branches How to fix diverged branches\n"
12556
"env-variables Environment variable names and values\n"
12557
"eol Information on end-of-line handling\n"
12558
"files Information on configuration and log files\n"
12559
"formats Information on choosing a storage format\n"
12560
"global-options Options that control how Bazaar runs\n"
12561
"hidden-commands All hidden commands\n"
12562
"hooks Points at which custom processing can be added\n"
12563
"launchpad Using Bazaar with Launchpad.net\n"
12564
"location-alias Aliases for remembered locations\n"
12565
"log-formats Details on the logging formats available\n"
12566
"other-formats Experimental and deprecated storage formats\n"
12567
"patterns Information on the pattern syntax\n"
12568
"repositories Basic information on shared repositories.\n"
12569
"revisionspec Explain how to use --revision\n"
12570
"rules Information on defining rule-based preferences\n"
12571
"standalone-trees Information on what a standalone tree is\n"
12572
"standard-options Options that can be used with any command\n"
12573
"status-flags Help on status flags\n"
12574
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
12575
"topics Topics list\n"
12576
"url-special-chars Special character handling in URLs\n"
12577
"urlspec Supported transport protocols\n"
12578
"working-trees Information on working trees\n"
12579
msgstr ""
12580
12581
#: en/help_topics/url-special-chars.txt:1
12582
msgid ""
12583
"Special character handling in URLs\n"
12584
"=================================="
12585
msgstr ""
12586
12587
#: en/help_topics/url-special-chars.txt:4
12588
msgid "Bazaar allows locations to be specified in multiple ways, either:"
12589
msgstr ""
12590
12591
#: en/help_topics/url-special-chars.txt:6
12592
msgid " * Fully qualified URLs"
12593
msgstr ""
12594
12595
#: en/help_topics/url-special-chars.txt:8
12596
msgid " * File system paths, relative or absolute"
12597
msgstr ""
12598
12599
#: en/help_topics/url-special-chars.txt:10
12600
msgid ""
12601
"Internally bzr treats all locations as URLs. For any file system paths\n"
12602
"that are specified it will automatically determine the appropriate URL\n"
12603
"representation, and escape special characters where necessary."
12604
msgstr ""
12605
12606
#: en/help_topics/url-special-chars.txt:14
12607
msgid ""
12608
"There are a few characters which have special meaning in URLs and need "
12609
"careful\n"
12610
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
12611
"value in URLs. Any non-ASCII characters in a file path will automatically "
12612
"be\n"
12613
"urlencoded when the path is converted to a URL."
12614
msgstr ""
12615
12616
#: en/help_topics/url-special-chars.txt:19
12617
msgid ""
12618
"URLs represent non-ASCII characters in an encoding defined by the server, "
12619
"but\n"
12620
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
12621
"be\n"
12622
"generous in what it accepts as a URL and to print them in a way that\n"
12623
"will be readable."
12624
msgstr ""
12625
12626
#: en/help_topics/url-special-chars.txt:24
12627
msgid ""
12628
"For example, if you have a directory named '/tmp/%2False' these are all "
12629
"valid\n"
12630
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
12631
"slash)::"
12632
msgstr ""
12633
12634
#: en/help_topics/url-special-chars.txt:27
12635
msgid ""
12636
" cd /tmp\n"
12637
" bzr log /tmp/%2False\n"
12638
" bzr log %2False\n"
12639
" bzr log file:///tmp/%252False\n"
12640
" bzr log file://localhost/tmp/%252False\n"
12641
" bzr log file:%252False"
12642
msgstr ""
12643
12644
#: en/help_topics/url-special-chars.txt:34
12645
msgid "These are valid but do not refer to the same file::"
12646
msgstr ""
12647
12648
#: en/help_topics/url-special-chars.txt:36
12649
msgid ""
12650
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
12651
" bzr log %252False (refers to a file called /tmp/%252False)"
12652
msgstr ""
12653
12654
#: en/help_topics/url-special-chars.txt:39
12655
msgid ""
12656
"Comma also has special meaning in URLs, because it denotes `segment "
12657
"parameters`_"
12658
msgstr ""
12659
12660
#: en/help_topics/url-special-chars.txt:41
12661
msgid ""
12662
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
12663
msgstr ""
12664
12665
#: en/help_topics/url-special-chars.txt:43
12666
msgid ""
12667
"Comma is also special in any file system paths that are specified. To use a "
12668
"literal\n"
12669
"comma in a file system path, specify a URL and URL encode the comma::"
12670
msgstr ""
12671
12672
#: en/help_topics/url-special-chars.txt:46
12673
msgid ""
12674
" bzr log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
12675
"\" set to \"bla\"\n"
12676
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
12677
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
12678
"\" set to \"bla\"\n"
12679
msgstr ""
12680
12681
#: en/help_topics/urlspec.txt:1
12682
msgid "URL Identifiers"
12683
msgstr ""
12684
12685
#: en/help_topics/urlspec.txt:3
12686
msgid "Supported URL prefixes::"
12687
msgstr ""
12688
12689
#: en/help_topics/urlspec.txt:5
12690
msgid ""
12691
" aftp:// Access using active FTP.\n"
12692
" bzr:// Fast access using the Bazaar smart server.\n"
12693
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
12694
" file:// Access using the standard filesystem (default)\n"
12695
" ftp:// Access using passive FTP.\n"
12696
" http:// Read-only access of branches exported on the web.\n"
12697
" https:// Read-only access of branches exported on the web using "
12698
"SSL.\n"
12699
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
12700
msgstr ""
12701
12702
#: en/help_topics/urlspec.txt:14
12703
msgid "Supported modifiers::"
12704
msgstr ""
12705
12706
#: en/help_topics/urlspec.txt:16
12707
msgid " gio+ Access using any GIO supported protocols."
12708
msgstr ""
12709
12710
#: en/help_topics/urlspec.txt:18
12711
msgid "Bazaar supports all of the standard parts within the URL::"
12712
msgstr ""
12713
12714
#: en/help_topics/urlspec.txt:20
12715
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
12716
msgstr ""
12717
12718
#: en/help_topics/urlspec.txt:22
12719
msgid "allowing URLs such as::"
12720
msgstr ""
12721
12722
#: en/help_topics/urlspec.txt:24
12723
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
12724
msgstr ""
12725
12726
#: en/help_topics/urlspec.txt:26
12727
msgid ""
12728
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
12729
"with '~' as meaning that the rest of the path should be interpreted\n"
12730
"relative to the remote user's home directory. For example if the user\n"
12731
"``remote`` has a home directory of ``/home/remote`` on the server\n"
12732
"shell.example.com, then::"
12733
msgstr ""
12734
12735
#: en/help_topics/urlspec.txt:32
12736
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
12737
msgstr ""
12738
12739
#: en/help_topics/urlspec.txt:34
12740
msgid "would refer to ``/home/remote/myproject/trunk``."
12741
msgstr ""
12742
12743
#: en/help_topics/urlspec.txt:36
12744
msgid ""
12745
"Many commands that accept URLs also accept location aliases too.\n"
12746
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
12747
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1