« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 5452
- compare with another revision
- download diff
- download tarball
- view history from revision 5452
- Committer: Canonical.com Patch Queue Manager
- Date: 2010-09-29 22:03:03 UTC
- mfrom: (5416.2.6 jam-integration)
- Revision ID: pqm@pqm.ubuntu.com-20100929220303-cr95h8iwtggco721
(mbp) Add 'break-lock --force'
- files added:
- bzrlib/deprecated_graph.py
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files removed:
- NEWS
- bzrlib/branchfmt
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_repository_vf
- po
- files renamed:
- doc/en/release-notes/bzr-2.3.txt => NEWS
- doc/en/release-notes/release-template.txt => NEWS-template.txt
- bzrlib/plugins/weave_fmt/repository.py => bzrlib/repofmt/weaverepo.py
- bzrlib/commit_signature_commands.py => bzrlib/sign_my_commits.py
- bzrlib/tests/per_repository_vf/helpers.py => bzrlib/tests/per_repository/helpers.py
- bzrlib/tests/per_repository_vf/test__generate_text_key_index.py => bzrlib/tests/per_repository/test__generate_text_key_index.py
- bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py => bzrlib/tests/per_repository/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository_vf/test_check_reconcile.py => bzrlib/tests/per_repository/test_check_reconcile.py
- bzrlib/tests/per_repository_vf/test_find_text_key_references.py => bzrlib/tests/per_repository/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_locking.py => bzrlib/tests/per_repository/test_is_write_locked.py
- bzrlib/tests/per_repository_vf/test_merge_directive.py => bzrlib/tests/per_repository/test_merge_directive.py
- bzrlib/plugins/weave_fmt/xml4.py => bzrlib/xml4.py
- 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: 2012-07-10 11:35+0200\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:93
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:854
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:2955
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:2957
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:2960
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:2962
46
msgid "No new revisions to push."
47
msgstr ""
48
49
#: bzrlib/branch.py:2982
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:2985
54
#, python-format
55
msgid "found error:%s"
56
msgstr ""
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:260
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:315
69
msgid "Display status summary."
70
msgstr ""
71
72
#: bzrlib/builtins.py:317
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:320
79
msgid ""
80
"added\n"
81
" Versioned in the working copy but not in the previous revision."
82
msgstr ""
83
84
#: bzrlib/builtins.py:323
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:327
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:332
100
msgid ""
101
"modified\n"
102
" Text has changed since the previous revision."
103
msgstr ""
104
105
#: bzrlib/builtins.py:335
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:338
112
msgid ""
113
"unknown\n"
114
" Not versioned and not matching an ignore pattern."
115
msgstr ""
116
117
#: bzrlib/builtins.py:341
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:346
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:349
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:353
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:358
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:363
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:366
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:375
169
msgid "Use short status indicators."
170
msgstr ""
171
172
# help of 'versioned' option of 'status' command
173
#: bzrlib/builtins.py:377
174
msgid "Only show versioned files."
175
msgstr ""
176
177
# help of 'no-pending' option of 'status' command
178
#: bzrlib/builtins.py:379
179
msgid "Don't show pending merges."
180
msgstr ""
181
182
# help of 'no-classify' option of 'status' command
183
#: bzrlib/builtins.py:382
184
msgid "Do not mark object type using indicator."
185
msgstr ""
186
187
#: bzrlib/builtins.py:397
188
msgid "bzr status --revision takes exactly one or two revision specifiers"
189
msgstr ""
190
191
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
192
msgid "You can only supply one of revision_id or --revision"
193
msgstr ""
194
195
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
196
msgid "You must supply either --revision or a revision_id"
197
msgstr ""
198
199
#: bzrlib/builtins.py:451
200
#, python-format
201
msgid "Repository %r does not support access to raw revision texts"
202
msgstr ""
203
204
#: bzrlib/builtins.py:462
205
msgid "The repository {0} contains no revision {1}."
206
msgstr ""
207
208
#: bzrlib/builtins.py:469
209
msgid "You cannot specify a NULL revision."
210
msgstr ""
211
212
#: bzrlib/builtins.py:561
213
msgid "Remove the working tree from a given branch/checkout."
214
msgstr ""
215
216
#: bzrlib/builtins.py:563
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:566
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:572
228
msgid "Remove the working tree even if it has uncommitted or shelved changes."
229
msgstr ""
230
231
#: bzrlib/builtins.py:586
232
msgid "No working tree to remove"
233
msgstr ""
234
235
#: bzrlib/builtins.py:588
236
msgid "You cannot remove the working tree of a remote path"
237
msgstr ""
238
239
#: bzrlib/builtins.py:597
240
msgid "You cannot remove the working tree from a lightweight checkout"
241
msgstr ""
242
243
#: bzrlib/builtins.py:637
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:648
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:652
256
msgid "failed to reset the tree state{0}"
257
msgstr ""
258
259
#: bzrlib/builtins.py:656
260
msgid "Show current revision number."
261
msgstr ""
262
263
#: bzrlib/builtins.py:658
264
msgid "This is equal to the number of revisions on this branch."
265
msgstr ""
266
267
#: bzrlib/builtins.py:671
268
msgid "--tree and --revision can not be used together"
269
msgstr ""
270
271
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
272
msgid "Tags can only be placed on a single revision, not on a range"
273
msgstr ""
274
275
# help of 'tree' option of 'revno' command
276
#: bzrlib/builtins.py:712
277
msgid "Show revno of working tree."
278
msgstr ""
279
280
#: bzrlib/builtins.py:760
281
msgid "Add specified files or directories."
282
msgstr ""
283
284
#: bzrlib/builtins.py:762
285
msgid ""
286
"In non-recursive mode, all the named items are added, regardless\n"
287
"of whether they were previously ignored. A warning is given if\n"
288
"any of the named files are already versioned."
289
msgstr ""
290
291
#: bzrlib/builtins.py:766
292
msgid ""
293
"In recursive mode (the default), files are treated the same way\n"
294
"but the behaviour for directories is different. Directories that\n"
295
"are already versioned do not give a warning. All directories,\n"
296
"whether already versioned or not, are searched for files or\n"
297
"subdirectories that are neither versioned or ignored, and these\n"
298
"are added. This search proceeds recursively into versioned\n"
299
"directories. If no names are given '.' is assumed."
300
msgstr ""
301
302
#: bzrlib/builtins.py:774
303
msgid ""
304
"A warning will be printed when nested trees are encountered,\n"
305
"unless they are explicitly ignored."
306
msgstr ""
307
308
#: bzrlib/builtins.py:777
309
msgid ""
310
"Therefore simply saying 'bzr add' will version all files that\n"
311
"are currently unknown."
312
msgstr ""
313
314
#: bzrlib/builtins.py:780
315
msgid ""
316
"Adding a file whose parent directory is not versioned will\n"
317
"implicitly add the parent, and so on up to the root. This means\n"
318
"you should never need to explicitly add a directory, they'll just\n"
319
"get added when you add a file in the directory."
320
msgstr ""
321
322
#: bzrlib/builtins.py:785
323
msgid ""
324
"--dry-run will show which files would be added, but not actually\n"
325
"add them."
326
msgstr ""
327
328
#: bzrlib/builtins.py:788
329
msgid ""
330
"--file-ids-from will try to use the file ids from the supplied path.\n"
331
"It looks up ids trying to find a matching parent directory with the\n"
332
"same filename, and then by pure path. This option is rarely needed\n"
333
"but can be useful when adding the same logical file into two\n"
334
"branches that will be merged later (without showing the two different\n"
335
"adds as a conflict). It is also useful when merging another project\n"
336
"into a subdirectory of this one."
337
msgstr ""
338
339
#: bzrlib/builtins.py:796
340
msgid ""
341
"Any files matching patterns in the ignore list will not be added\n"
342
"unless they are explicitly mentioned."
343
msgstr ""
344
345
#: bzrlib/builtins.py:799
346
msgid ""
347
"In recursive mode, files larger than the configuration option \n"
348
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
349
"to file size."
350
msgstr ""
351
352
# help of 'no-recurse' option of 'add' command
353
#: bzrlib/builtins.py:806
354
msgid "Don't recursively add the contents of directories."
355
msgstr ""
356
357
# help of 'file-ids-from' option of 'add' command
358
#: bzrlib/builtins.py:813
359
msgid "Lookup file ids from this tree."
360
msgstr ""
361
362
#: bzrlib/builtins.py:849
363
msgid "ignored {0} matching \"{1}\"\n"
364
msgstr ""
365
366
#: bzrlib/builtins.py:854
367
msgid "Create a new versioned directory."
368
msgstr ""
369
370
#: bzrlib/builtins.py:856
371
msgid "This is equivalent to creating the directory and then adding it."
372
msgstr ""
373
374
# help of 'parents' option of 'mkdir' command
375
#: bzrlib/builtins.py:863
376
msgid "No error if existing, make parent directories as needed."
377
msgstr ""
378
379
#: bzrlib/builtins.py:897
380
#, python-format
381
msgid "added %s\n"
382
msgstr ""
383
384
#: bzrlib/builtins.py:939
385
#, python-format
386
msgid "invalid kind %r specified"
387
msgstr ""
388
389
#: bzrlib/builtins.py:976
390
msgid "Move or rename a file."
391
msgstr ""
392
393
#: bzrlib/builtins.py:978
394
msgid " bzr mv SOURCE... DESTINATION"
395
msgstr ""
396
397
#: bzrlib/builtins.py:980
398
msgid ""
399
"If the last argument is a versioned directory, all the other names\n"
400
"are moved into it. Otherwise, there must be exactly two arguments\n"
401
"and the file is changed to a new name."
402
msgstr ""
403
404
#: bzrlib/builtins.py:984
405
msgid ""
406
"If OLDNAME does not exist on the filesystem but is versioned and\n"
407
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
408
"assumes that the file has been manually moved and only updates\n"
409
"its internal inventory to reflect that change.\n"
410
"The same is valid when moving many SOURCE files to a DESTINATION."
411
msgstr ""
412
413
#: bzrlib/builtins.py:990
414
msgid "Files cannot be moved between branches."
415
msgstr ""
416
417
# help of 'after' option of 'mv' command
418
#: bzrlib/builtins.py:997
419
msgid ""
420
"Move only the bzr identifier of the file, because the file has already been "
421
"moved."
422
msgstr ""
423
424
# help of 'auto' option of 'mv' command
425
#: bzrlib/builtins.py:999
426
msgid "Automatically guess renames."
427
msgstr ""
428
429
# help of 'dry-run' option of 'mv' command
430
#: bzrlib/builtins.py:1000
431
msgid "Avoid making changes when guessing renames."
432
msgstr ""
433
434
#: bzrlib/builtins.py:1009
435
msgid "--dry-run requires --auto."
436
msgstr ""
437
438
#: bzrlib/builtins.py:1013
439
msgid "missing file argument"
440
msgstr ""
441
442
#: bzrlib/builtins.py:1017
443
msgid "can not move root of branch"
444
msgstr ""
445
446
#: bzrlib/builtins.py:1023
447
msgid "Only one path may be specified to --auto."
448
msgstr ""
449
450
#: bzrlib/builtins.py:1026
451
msgid "--after cannot be specified with --auto."
452
msgstr ""
453
454
#: bzrlib/builtins.py:1062
455
msgid "to mv multiple files the destination must be a versioned directory"
456
msgstr ""
457
458
#: bzrlib/builtins.py:1114
459
msgid "Turn this branch into a mirror of another branch."
460
msgstr ""
461
462
#: bzrlib/builtins.py:1116
463
msgid ""
464
"By default, this command only works on branches that have not diverged.\n"
465
"Branches are considered diverged if the destination branch's most recent \n"
466
"commit is one that has not been merged (directly or indirectly) into the \n"
467
"parent."
468
msgstr ""
469
470
#: bzrlib/builtins.py:1121
471
msgid ""
472
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
473
"from one into the other. Once one branch has merged, the other should\n"
474
"be able to pull it again."
475
msgstr ""
476
477
#: bzrlib/builtins.py:1125
478
msgid ""
479
"If you want to replace your local changes and just want your branch to\n"
480
"match the remote one, use pull --overwrite. This will work even if the two\n"
481
"branches have diverged."
482
msgstr ""
483
484
#: bzrlib/builtins.py:1129
485
msgid ""
486
"If there is no default location set, the first pull will set it (use\n"
487
"--no-remember to avoid setting it). After that, you can omit the\n"
488
"location to use the default. To change the default, use --remember. The\n"
489
"value will only be saved if the remote location can be accessed."
490
msgstr ""
491
492
#: bzrlib/builtins.py:1134
493
msgid ""
494
"The --verbose option will display the revisions pulled using the log_format\n"
495
"configuration option. You can use a different format by overriding it with\n"
496
"-Olog_format=<other_format>."
497
msgstr ""
498
499
#: bzrlib/builtins.py:1138
500
msgid ""
501
"Note: The location can be specified either in the form of a branch,\n"
502
"or in the form of a path to a file containing a merge directive generated\n"
503
"with bzr send."
504
msgstr ""
505
506
# help of 'verbose' option of 'pull' command
507
#: bzrlib/builtins.py:1146
508
msgid "Show logs of pulled revisions."
509
msgstr ""
510
511
# help of 'directory' option of 'pull' command
512
#: bzrlib/builtins.py:1148
513
msgid ""
514
"Branch to pull into, rather than the one containing the working directory."
515
msgstr ""
516
517
# help of 'local' option of 'pull' command
518
#: bzrlib/builtins.py:1151
519
msgid ""
520
"Perform a local pull in a bound branch. Local pulls are not applied to the "
521
"master branch."
522
msgstr ""
523
524
#: bzrlib/builtins.py:1189
525
msgid "Need working tree for --show-base."
526
msgstr ""
527
528
#: bzrlib/builtins.py:1205
529
msgid "No pull location known or specified."
530
msgstr ""
531
532
#: bzrlib/builtins.py:1211
533
#, python-format
534
msgid "Using saved parent location: %s\n"
535
msgstr ""
536
537
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
538
msgid "Cannot use -r with merge directives or bundles"
539
msgstr ""
540
541
#: bzrlib/builtins.py:1261
542
msgid "Update a mirror of this branch."
543
msgstr ""
544
545
#: bzrlib/builtins.py:1263
546
msgid ""
547
"The target branch will not have its working tree populated because this\n"
548
"is both expensive, and is not supported on remote file systems."
549
msgstr ""
550
551
#: bzrlib/builtins.py:1266
552
msgid ""
553
"Some smart servers or protocols *may* put the working tree in place in\n"
554
"the future."
555
msgstr ""
556
557
#: bzrlib/builtins.py:1269
558
msgid ""
559
"This command only works on branches that have not diverged. Branches are\n"
560
"considered diverged if the destination branch's most recent commit is one\n"
561
"that has not been merged (directly or indirectly) by the source branch."
562
msgstr ""
563
564
#: bzrlib/builtins.py:1273
565
msgid ""
566
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
567
"the other branch completely, discarding its unmerged changes."
568
msgstr ""
569
570
#: bzrlib/builtins.py:1276
571
msgid ""
572
"If you want to ensure you have the different changes in the other branch,\n"
573
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
574
"After that you will be able to do a push without '--overwrite'."
575
msgstr ""
576
577
#: bzrlib/builtins.py:1280
578
msgid ""
579
"If there is no default push location set, the first push will set it (use\n"
580
"--no-remember to avoid setting it). After that, you can omit the\n"
581
"location to use the default. To change the default, use --remember. The\n"
582
"value will only be saved if the remote location can be accessed."
583
msgstr ""
584
585
#: bzrlib/builtins.py:1285
586
msgid ""
587
"The --verbose option will display the revisions pushed using the log_format\n"
588
"configuration option. You can use a different format by overriding it with\n"
589
"-Olog_format=<other_format>."
590
msgstr ""
591
592
# help of 'directory' option of 'dpush' command
593
# help of 'directory' option of 'push' command
594
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
595
msgid ""
596
"Branch to push from, rather than the one containing the working directory."
597
msgstr ""
598
599
# help of 'use-existing-dir' option of 'push' command
600
#: bzrlib/builtins.py:1299
601
msgid ""
602
"By default push will fail if the target directory exists, but does not "
603
"already have a control directory. This flag will allow push to proceed."
604
msgstr ""
605
606
# help of 'stacked' option of 'push' command
607
#: bzrlib/builtins.py:1304
608
msgid ""
609
"Create a stacked branch that references the public location of the parent "
610
"branch."
611
msgstr ""
612
613
# help of 'stacked-on' option of 'push' command
614
#: bzrlib/builtins.py:1307
615
msgid ""
616
"Create a stacked branch that refers to another branch for the commit "
617
"history. Only the work not present in the referenced branch is included in "
618
"the branch created."
619
msgstr ""
620
621
# help of 'strict' option of 'dpush' command
622
# help of 'strict' option of 'push' command
623
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
624
msgid ""
625
"Refuse to push if there are uncommitted changes in the working tree, --no-"
626
"strict disables the check."
627
msgstr ""
628
629
# help of 'no-tree' option of 'push' command
630
#: bzrlib/builtins.py:1315
631
msgid "Don't populate the working tree, even for protocols that support it."
632
msgstr ""
633
634
# help of 'overwrite-tags' option of 'pull' command
635
# help of 'overwrite-tags' option of 'push' command
636
#: bzrlib/builtins.py:1318
637
msgid "Overwrite tags only."
638
msgstr ""
639
640
#: bzrlib/builtins.py:1369
641
msgid "Could not determine branch to refer to."
642
msgstr ""
643
644
#: bzrlib/builtins.py:1378
645
#, python-format
646
msgid ""
647
"No push location known or specified. To push to the parent branch (at %s), "
648
"use 'bzr push :parent'."
649
msgstr ""
650
651
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
652
msgid "No push location known or specified."
653
msgstr ""
654
655
#: bzrlib/builtins.py:1388
656
#, python-format
657
msgid "Using saved push location: %s"
658
msgstr ""
659
660
#: bzrlib/builtins.py:1398
661
msgid "Create a new branch that is a copy of an existing branch."
662
msgstr ""
663
664
#: bzrlib/builtins.py:1400
665
msgid ""
666
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
667
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
668
"bar.\n"
669
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
670
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
671
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
672
"create ./foo-bar."
673
msgstr ""
674
675
#: bzrlib/builtins.py:1407
676
msgid ""
677
"To retrieve the branch as of a particular revision, supply the --revision\n"
678
"parameter, as in \"branch foo/bar -r 5\"."
679
msgstr ""
680
681
#: bzrlib/builtins.py:1410
682
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
683
msgstr ""
684
685
# help of 'no-tree' option of 'branch' command
686
#: bzrlib/builtins.py:1420
687
msgid "Create a branch without a working-tree."
688
msgstr ""
689
690
# help of 'switch' option of 'branch' command
691
#: bzrlib/builtins.py:1422
692
msgid "Switch the checkout in the current directory to the new branch."
693
msgstr ""
694
695
# help of 'stacked' option of 'branch' command
696
#: bzrlib/builtins.py:1425
697
msgid ""
698
"Create a stacked branch referring to the source branch. The new branch will "
699
"depend on the availability of the source branch for all operations."
700
msgstr ""
701
702
# help of 'standalone' option of 'branch' command
703
#: bzrlib/builtins.py:1429
704
msgid "Do not use a shared repository, even if available."
705
msgstr ""
706
707
# help of 'use-existing-dir' option of 'branch' command
708
#: bzrlib/builtins.py:1431
709
msgid ""
710
"By default branch will fail if the target directory exists, but does not "
711
"already have a control directory. This flag will allow branch to proceed."
712
msgstr ""
713
714
# help of 'bind' option of 'branch' command
715
#: bzrlib/builtins.py:1436
716
msgid "Bind new branch to from location."
717
msgstr ""
718
719
#: bzrlib/builtins.py:1483
720
#, python-format
721
msgid "Target directory \"%s\" already exists."
722
msgstr ""
723
724
#: bzrlib/builtins.py:1495
725
#, python-format
726
msgid "Parent of \"%s\" does not exist."
727
msgstr ""
728
729
#: bzrlib/builtins.py:1514
730
msgid "The branch {0} has no revision {1}."
731
msgstr ""
732
733
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
734
#, python-format
735
msgid "Created new stacked branch referring to %s."
736
msgstr ""
737
738
#: bzrlib/builtins.py:1533
739
#, python-format
740
msgid "Branched %d revision."
741
msgid_plural "Branched %d revisions."
742
msgstr[0] ""
743
msgstr[1] ""
744
745
#: bzrlib/builtins.py:1538
746
#, python-format
747
msgid "New branch bound to %s"
748
msgstr ""
749
750
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
751
#, python-format
752
msgid "Switched to branch: %s"
753
msgstr ""
754
755
#: bzrlib/builtins.py:1548
756
msgid "List the branches available at the current location."
757
msgstr ""
758
759
#: bzrlib/builtins.py:1550
760
msgid ""
761
"This command will print the names of all the branches at the current\n"
762
"location."
763
msgstr ""
764
765
# help of 'recursive' option of 'branches' command
766
#: bzrlib/builtins.py:1557
767
msgid ""
768
"Recursively scan for branches rather than just looking in the specified "
769
"location."
770
msgstr ""
771
772
#: bzrlib/builtins.py:1586
773
msgid "(default)"
774
msgstr ""
775
776
#: bzrlib/builtins.py:1598
777
msgid "Create a new checkout of an existing branch."
778
msgstr ""
779
780
#: bzrlib/builtins.py:1600
781
msgid ""
782
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
783
"for\n"
784
"the branch found in '.'. This is useful if you have removed the working "
785
"tree\n"
786
"or if it was never created - i.e. if you pushed the branch to its current\n"
787
"location using SFTP."
788
msgstr ""
789
790
#: bzrlib/builtins.py:1605
791
msgid ""
792
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
793
"will\n"
794
"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./"
795
"bar.\n"
796
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
797
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
798
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
799
"create ./foo-bar."
800
msgstr ""
801
802
#: bzrlib/builtins.py:1612
803
msgid ""
804
"To retrieve the branch as of a particular revision, supply the --revision\n"
805
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
806
"immediately\n"
807
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
808
"old\n"
809
"code.)"
810
msgstr ""
811
812
# help of 'lightweight' option of 'checkout' command
813
#: bzrlib/builtins.py:1622
814
msgid ""
815
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
816
"the branch for every operation. Normal checkouts can perform common "
817
"operations like diff and status without such access, and also support local "
818
"commits."
819
msgstr ""
820
821
# help of 'files-from' option of 'branch' command
822
# help of 'files-from' option of 'checkout' command
823
#: bzrlib/builtins.py:1629
824
msgid "Get file contents from this tree."
825
msgstr ""
826
827
# help of 'hardlink' option of 'branch' command
828
# help of 'hardlink' option of 'checkout' command
829
#: bzrlib/builtins.py:1631
830
msgid "Hard-link working tree files where possible."
831
msgstr ""
832
833
#: bzrlib/builtins.py:1672
834
msgid ""
835
"Show list of renamed files.\n"
836
" "
837
msgstr ""
838
839
#: bzrlib/builtins.py:1700
840
msgid "Update a working tree to a new revision."
841
msgstr ""
842
843
#: bzrlib/builtins.py:1702
844
msgid ""
845
"This will perform a merge of the destination revision (the tip of the\n"
846
"branch, or the specified revision) into the working tree, and then make\n"
847
"that revision the basis revision for the working tree. "
848
msgstr ""
849
850
#: bzrlib/builtins.py:1706
851
msgid ""
852
"You can use this to visit an older revision, or to update a working tree\n"
853
"that is out of date from its branch."
854
msgstr ""
855
856
#: bzrlib/builtins.py:1709
857
msgid ""
858
"If there are any uncommitted changes in the tree, they will be carried\n"
859
"across and remain as uncommitted changes after the update. To discard\n"
860
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
861
"with the changes brought in by the change in basis revision."
862
msgstr ""
863
864
#: bzrlib/builtins.py:1714
865
msgid ""
866
"If the tree's branch is bound to a master branch, bzr will also update\n"
867
"the branch from the master."
868
msgstr ""
869
870
#: bzrlib/builtins.py:1717
871
msgid ""
872
"You cannot update just a single file or directory, because each Bazaar\n"
873
"working tree has just a single basis revision. If you want to restore a\n"
874
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
875
"update'. If you want to restore a file to its state in a previous\n"
876
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
877
"out the old content of that file to a new location."
878
msgstr ""
879
880
#: bzrlib/builtins.py:1724
881
msgid ""
882
"The 'dir' argument, if given, must be the location of the root of a\n"
883
"working tree to update. By default, the working tree that contains the \n"
884
"current working directory is used."
885
msgstr ""
886
887
#: bzrlib/builtins.py:1740
888
msgid "bzr update --revision takes exactly one revision"
889
msgstr ""
890
891
#: bzrlib/builtins.py:1748
892
msgid "bzr update can only update a whole tree, not a file or subdirectory"
893
msgstr ""
894
895
#: bzrlib/builtins.py:1779
896
msgid "Tree is up to date at revision {0} of branch {1}"
897
msgstr ""
898
899
#: bzrlib/builtins.py:1795
900
#, python-format
901
msgid ""
902
"branch has no revision %s\n"
903
"bzr update --revision only works for a revision in the branch history"
904
msgstr ""
905
906
#: bzrlib/builtins.py:1801
907
msgid "Updated to revision {0} of branch {1}"
908
msgstr ""
909
910
#: bzrlib/builtins.py:1805
911
msgid ""
912
"Your local commits will now show as pending merges with 'bzr status', and "
913
"can be committed with 'bzr commit'."
914
msgstr ""
915
916
#: bzrlib/builtins.py:1814
917
msgid "Show information about a working tree, branch or repository."
918
msgstr ""
919
920
#: bzrlib/builtins.py:1816
921
msgid ""
922
"This command will show all known locations and formats associated to the\n"
923
"tree, branch or repository."
924
msgstr ""
925
926
#: bzrlib/builtins.py:1819
927
msgid ""
928
"In verbose mode, statistical information is included with each report.\n"
929
"To see extended statistic information, use a verbosity level of 2 or\n"
930
"higher by specifying the verbose option multiple times, e.g. -vv."
931
msgstr ""
932
933
#: bzrlib/builtins.py:1823
934
msgid "Branches and working trees will also report any missing revisions."
935
msgstr ""
936
937
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
938
#: bzrlib/builtins.py:6466
939
msgid ":Examples:"
940
msgstr ""
941
942
#: bzrlib/builtins.py:1827
943
msgid " Display information on the format and related locations:"
944
msgstr ""
945
946
#: bzrlib/builtins.py:1829
947
msgid " bzr info"
948
msgstr ""
949
950
#: bzrlib/builtins.py:1831
951
msgid ""
952
" Display the above together with extended format information and\n"
953
" basic statistics (like the number of files in the working tree and\n"
954
" number of revisions in the branch and repository):"
955
msgstr ""
956
957
#: bzrlib/builtins.py:1835
958
msgid " bzr info -v"
959
msgstr ""
960
961
#: bzrlib/builtins.py:1837
962
msgid " Display the above together with number of committers to the branch:"
963
msgstr ""
964
965
#: bzrlib/builtins.py:1839
966
msgid " bzr info -vv"
967
msgstr ""
968
969
#: bzrlib/builtins.py:1858
970
msgid "Remove files or directories."
971
msgstr ""
972
973
#: bzrlib/builtins.py:1860
974
msgid ""
975
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
976
"delete them if they can easily be recovered using revert otherwise they\n"
977
"will be backed up (adding an extension of the form .~#~). If no options or\n"
978
"parameters are given Bazaar will scan for files that are being tracked by\n"
979
"Bazaar but missing in your tree and stop tracking them for you."
980
msgstr ""
981
982
# help of 'new' option of 'remove' command
983
#: bzrlib/builtins.py:1868
984
msgid "Only remove files that have never been committed."
985
msgstr ""
986
987
# help of 'file-deletion-strategy' option of 'remove' command
988
#: bzrlib/builtins.py:1870
989
msgid "The file deletion mode to be used."
990
msgstr ""
991
992
# title of 'file-deletion-strategy' option of 'remove' command
993
#: bzrlib/builtins.py:1871
994
msgid "Deletion Strategy"
995
msgstr ""
996
997
# help of 'file-deletion-strategy=safe' option of 'remove' command
998
#: bzrlib/builtins.py:1872
999
msgid "Backup changed files (default)."
1000
msgstr ""
1001
1002
# help of 'file-deletion-strategy=keep' option of 'remove' command
1003
#: bzrlib/builtins.py:1873
1004
msgid "Delete from bzr but leave the working copy."
1005
msgstr ""
1006
1007
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
1008
#: bzrlib/builtins.py:1874
1009
msgid "Don't backup changed files."
1010
msgstr ""
1011
1012
# help of 'file-deletion-strategy=force' option of 'remove' command
1013
#: bzrlib/builtins.py:1875
1014
msgid ""
1015
"Delete all the specified files, even if they can not be recovered and even "
1016
"if they are non-empty directories. (deprecated, use no-backup)"
1017
msgstr ""
1018
1019
#: bzrlib/builtins.py:1884
1020
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1021
msgstr ""
1022
1023
#: bzrlib/builtins.py:1901
1024
msgid "No matching files."
1025
msgstr ""
1026
1027
#: bzrlib/builtins.py:1962
1028
msgid "Reconcile bzr metadata in a branch."
1029
msgstr ""
1030
1031
#: bzrlib/builtins.py:1964
1032
msgid ""
1033
"This can correct data mismatches that may have been caused by\n"
1034
"previous ghost operations or bzr upgrades. You should only\n"
1035
"need to run this command if 'bzr check' or a bzr developer\n"
1036
"advises you to run it."
1037
msgstr ""
1038
1039
#: bzrlib/builtins.py:1969
1040
msgid ""
1041
"If a second branch is provided, cross-branch reconciliation is\n"
1042
"also attempted, which will check that data like the tree root\n"
1043
"id which was not present in very early bzr versions is represented\n"
1044
"correctly in both branches."
1045
msgstr ""
1046
1047
#: bzrlib/builtins.py:1974
1048
msgid ""
1049
"At the same time it is run it may recompress data resulting in\n"
1050
"a potential saving in disk space or performance gain."
1051
msgstr ""
1052
1053
#: bzrlib/builtins.py:1977
1054
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1055
msgstr ""
1056
1057
# help of 'format=2a' option of 'init' command
1058
# help of 'format=default' option of 'init' command
1059
# help of 'format=2a' option of 'init-repository' command
1060
# help of 'format=default' option of 'init-repository' command
1061
# help of 'format=2a' option of 'upgrade' command
1062
# help of 'format=default' option of 'upgrade' command
1063
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1064
msgid ""
1065
"Format for the bzr 2.0 series.\n"
1066
"Uses group-compress storage.\n"
1067
"Provides rich roots which are a one-way transition.\n"
1068
msgstr ""
1069
1070
# help of 'format=pack-0.92' option of 'init' command
1071
# help of 'format=pack-0.92' option of 'init-repository' command
1072
# help of 'format=pack-0.92' option of 'upgrade' command
1073
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1074
msgid ""
1075
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1076
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1077
msgstr ""
1078
1079
# help of 'format=development-colo' option of 'init' command
1080
# help of 'format=development-colo' option of 'init-repository' command
1081
# help of 'format=development-colo' option of 'upgrade' command
1082
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1083
msgid "The 2a format with experimental support for colocated branches.\n"
1084
msgstr ""
1085
1086
#: bzrlib/builtins.py:2045
1087
msgid "Make a directory into a versioned branch."
1088
msgstr ""
1089
1090
#: bzrlib/builtins.py:2047
1091
msgid ""
1092
"Use this to create an empty branch, or before importing an\n"
1093
"existing project."
1094
msgstr ""
1095
1096
#: bzrlib/builtins.py:2050
1097
msgid ""
1098
"If there is a repository in a parent directory of the location, then\n"
1099
"the history of the branch will be stored in the repository. Otherwise\n"
1100
"init creates a standalone branch which carries its own history\n"
1101
"in the .bzr directory."
1102
msgstr ""
1103
1104
#: bzrlib/builtins.py:2055
1105
msgid ""
1106
"If there is already a branch at the location but it has no working tree,\n"
1107
"the tree can be populated with 'bzr checkout'."
1108
msgstr ""
1109
1110
#: bzrlib/builtins.py:2058
1111
msgid "Recipe for importing a tree of files::"
1112
msgstr ""
1113
1114
#: bzrlib/builtins.py:2060
1115
msgid ""
1116
" cd ~/project\n"
1117
" bzr init\n"
1118
" bzr add .\n"
1119
" bzr status\n"
1120
" bzr commit -m \"imported project\""
1121
msgstr ""
1122
1123
# help of 'create-prefix' option of 'init' command
1124
# help of 'create-prefix' option of 'push' command
1125
#: bzrlib/builtins.py:2071
1126
msgid "Create the path leading up to the branch if it does not already exist."
1127
msgstr ""
1128
1129
# help of 'format' option of 'init' command
1130
#: bzrlib/builtins.py:2074
1131
msgid "Specify a format for this branch. See \"help formats\"."
1132
msgstr ""
1133
1134
# help of 'append-revisions-only' option of 'init' command
1135
#: bzrlib/builtins.py:2082
1136
msgid "Never change revnos or the existing log. Append revisions to it only."
1137
msgstr ""
1138
1139
# help of 'no-tree' option of 'init' command
1140
#: bzrlib/builtins.py:2085
1141
msgid "Create a branch without a working tree."
1142
msgstr ""
1143
1144
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1145
#, python-format
1146
msgid ""
1147
"Parent directory of %s does not exist.\n"
1148
"You may supply --create-prefix to create all leading parent directories."
1149
msgstr ""
1150
1151
#: bzrlib/builtins.py:2139
1152
msgid ""
1153
"This branch format cannot be set to append-revisions-only. Try --default."
1154
msgstr ""
1155
1156
#: bzrlib/builtins.py:2150
1157
msgid "Created a {0} (format: {1})\n"
1158
msgstr ""
1159
1160
#: bzrlib/builtins.py:2159
1161
#, python-format
1162
msgid "Using shared repository: %s\n"
1163
msgstr ""
1164
1165
#: bzrlib/builtins.py:2163
1166
msgid "Create a shared repository for branches to share storage space."
1167
msgstr ""
1168
1169
#: bzrlib/builtins.py:2165
1170
msgid ""
1171
"New branches created under the repository directory will store their\n"
1172
"revisions in the repository, not in the branch directory. For branches\n"
1173
"with shared history, this reduces the amount of storage needed and \n"
1174
"speeds up the creation of new branches."
1175
msgstr ""
1176
1177
#: bzrlib/builtins.py:2170
1178
msgid ""
1179
"If the --no-trees option is given then the branches in the repository\n"
1180
"will not have working trees by default. They will still exist as \n"
1181
"directories on disk, but they will not have separate copies of the \n"
1182
"files at a certain revision. This can be useful for repositories that\n"
1183
"store branches which are interacted with through checkouts or remote\n"
1184
"branches, such as on a server."
1185
msgstr ""
1186
1187
#: bzrlib/builtins.py:2177
1188
msgid ""
1189
":Examples:\n"
1190
" Create a shared repository holding just branches::"
1191
msgstr ""
1192
1193
#: bzrlib/builtins.py:2180
1194
msgid ""
1195
" bzr init-repo --no-trees repo\n"
1196
" bzr init repo/trunk"
1197
msgstr ""
1198
1199
#: bzrlib/builtins.py:2183
1200
msgid " Make a lightweight checkout elsewhere::"
1201
msgstr ""
1202
1203
#: bzrlib/builtins.py:2185
1204
msgid ""
1205
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1206
" cd trunk-checkout\n"
1207
" (add files here)"
1208
msgstr ""
1209
1210
# help of 'format' option of 'init-repository' command
1211
#: bzrlib/builtins.py:2193
1212
msgid ""
1213
"Specify a format for this repository. See \"bzr help formats\" for details."
1214
msgstr ""
1215
1216
# title of 'format' option of 'init-repository' command
1217
#: bzrlib/builtins.py:2197
1218
msgid "Repository format"
1219
msgstr ""
1220
1221
# help of 'no-trees' option of 'init-repository' command
1222
#: bzrlib/builtins.py:2199
1223
msgid "Branches in the repository will default to not having a working tree."
1224
msgstr ""
1225
1226
#: bzrlib/builtins.py:2225
1227
msgid "Show differences in the working tree, between revisions or branches."
1228
msgstr ""
1229
1230
#: bzrlib/builtins.py:2227
1231
msgid ""
1232
"If no arguments are given, all changes for the current tree are listed.\n"
1233
"If files are given, only the changes in those files are listed.\n"
1234
"Remote and multiple branches can be compared by using the --old and\n"
1235
"--new options. If not provided, the default for both is derived from\n"
1236
"the first argument, if any, or the current tree if no arguments are\n"
1237
"given."
1238
msgstr ""
1239
1240
#: bzrlib/builtins.py:2234
1241
msgid ""
1242
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1243
"produces patches suitable for \"patch -p1\"."
1244
msgstr ""
1245
1246
#: bzrlib/builtins.py:2237
1247
msgid ""
1248
"Note that when using the -r argument with a range of revisions, the\n"
1249
"differences are computed between the two specified revisions. That\n"
1250
"is, the command does not show the changes introduced by the first \n"
1251
"revision in the range. This differs from the interpretation of \n"
1252
"revision ranges used by \"bzr log\" which includes the first revision\n"
1253
"in the range."
1254
msgstr ""
1255
1256
#: bzrlib/builtins.py:2244
1257
msgid ""
1258
":Exit values:\n"
1259
" 1 - changed\n"
1260
" 2 - unrepresentable changes\n"
1261
" 3 - error\n"
1262
" 0 - no change"
1263
msgstr ""
1264
1265
#: bzrlib/builtins.py:2250
1266
msgid ""
1267
":Examples:\n"
1268
" Shows the difference in the working tree versus the last commit::"
1269
msgstr ""
1270
1271
#: bzrlib/builtins.py:2253
1272
msgid " bzr diff"
1273
msgstr ""
1274
1275
#: bzrlib/builtins.py:2255
1276
msgid " Difference between the working tree and revision 1::"
1277
msgstr ""
1278
1279
#: bzrlib/builtins.py:2257
1280
msgid " bzr diff -r1"
1281
msgstr ""
1282
1283
#: bzrlib/builtins.py:2259
1284
msgid " Difference between revision 3 and revision 1::"
1285
msgstr ""
1286
1287
#: bzrlib/builtins.py:2261
1288
msgid " bzr diff -r1..3"
1289
msgstr ""
1290
1291
#: bzrlib/builtins.py:2263
1292
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1293
msgstr ""
1294
1295
#: bzrlib/builtins.py:2265
1296
msgid " bzr diff -r1..3 xxx"
1297
msgstr ""
1298
1299
#: bzrlib/builtins.py:2267
1300
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1301
msgstr ""
1302
1303
#: bzrlib/builtins.py:2269
1304
msgid " bzr diff -c2"
1305
msgstr ""
1306
1307
#: bzrlib/builtins.py:2271
1308
msgid ""
1309
" To see the changes introduced by revision X::\n"
1310
" \n"
1311
" bzr diff -cX"
1312
msgstr ""
1313
1314
#: bzrlib/builtins.py:2275
1315
msgid ""
1316
" Note that in the case of a merge, the -c option shows the changes\n"
1317
" compared to the left hand parent. To see the changes against\n"
1318
" another parent, use::"
1319
msgstr ""
1320
1321
#: bzrlib/builtins.py:2279
1322
msgid " bzr diff -r<chosen_parent>..X"
1323
msgstr ""
1324
1325
#: bzrlib/builtins.py:2281
1326
msgid ""
1327
" The changes between the current revision and the previous revision\n"
1328
" (equivalent to -c-1 and -r-2..-1)"
1329
msgstr ""
1330
1331
#: bzrlib/builtins.py:2284
1332
msgid " bzr diff -r-2.."
1333
msgstr ""
1334
1335
#: bzrlib/builtins.py:2286
1336
msgid " Show just the differences for file NEWS::"
1337
msgstr ""
1338
1339
#: bzrlib/builtins.py:2288
1340
msgid " bzr diff NEWS"
1341
msgstr ""
1342
1343
#: bzrlib/builtins.py:2290
1344
msgid " Show the differences in working tree xxx for file NEWS::"
1345
msgstr ""
1346
1347
#: bzrlib/builtins.py:2292
1348
msgid " bzr diff xxx/NEWS"
1349
msgstr ""
1350
1351
#: bzrlib/builtins.py:2294
1352
msgid " Show the differences from branch xxx to this working tree:"
1353
msgstr ""
1354
1355
#: bzrlib/builtins.py:2296
1356
msgid " bzr diff --old xxx"
1357
msgstr ""
1358
1359
#: bzrlib/builtins.py:2298
1360
msgid " Show the differences between two branches for file NEWS::"
1361
msgstr ""
1362
1363
#: bzrlib/builtins.py:2300
1364
msgid " bzr diff --old xxx --new yyy NEWS"
1365
msgstr ""
1366
1367
#: bzrlib/builtins.py:2302
1368
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1369
msgstr ""
1370
1371
#: bzrlib/builtins.py:2304
1372
msgid ""
1373
" bzr diff --prefix old/:new/\n"
1374
" \n"
1375
" Show the differences using a custom diff program with options::\n"
1376
" \n"
1377
" bzr diff --using /usr/bin/diff --diff-options -wu"
1378
msgstr ""
1379
1380
# help of 'diff-options' option of 'diff' command
1381
#: bzrlib/builtins.py:2314
1382
msgid "Pass these options to the external diff program."
1383
msgstr ""
1384
1385
# help of 'prefix' option of 'diff' command
1386
#: bzrlib/builtins.py:2317
1387
msgid ""
1388
"Set prefixes added to old and new filenames, as two values separated by a "
1389
"colon. (eg \"old/:new/\")."
1390
msgstr ""
1391
1392
# help of 'old' option of 'diff' command
1393
#: bzrlib/builtins.py:2320
1394
msgid "Branch/tree to compare from."
1395
msgstr ""
1396
1397
# help of 'new' option of 'diff' command
1398
#: bzrlib/builtins.py:2324
1399
msgid "Branch/tree to compare to."
1400
msgstr ""
1401
1402
# help of 'using' option of 'diff' command
1403
#: bzrlib/builtins.py:2330
1404
msgid "Use this command to compare files."
1405
msgstr ""
1406
1407
# help of 'format' option of 'diff' command
1408
#: bzrlib/builtins.py:2335
1409
msgid "Diff format to use."
1410
msgstr ""
1411
1412
# title of 'format' option of 'diff' command
1413
#: bzrlib/builtins.py:2337
1414
msgid "Diff format"
1415
msgstr ""
1416
1417
#: bzrlib/builtins.py:2359
1418
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1419
msgstr ""
1420
1421
#: bzrlib/builtins.py:2363
1422
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1423
msgstr ""
1424
1425
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1426
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1427
msgid "{0} and {1} are mutually exclusive"
1428
msgstr ""
1429
1430
#: bzrlib/builtins.py:2388
1431
msgid ""
1432
"List files deleted in the working tree.\n"
1433
" "
1434
msgstr ""
1435
1436
#: bzrlib/builtins.py:2465
1437
msgid "Show the tree root directory."
1438
msgstr ""
1439
1440
#: bzrlib/builtins.py:2467
1441
msgid ""
1442
"The root is the nearest enclosing directory with a .bzr control\n"
1443
"directory."
1444
msgstr ""
1445
1446
#: bzrlib/builtins.py:2482
1447
msgid "The limit argument must be an integer."
1448
msgstr ""
1449
1450
#: bzrlib/builtins.py:2490
1451
msgid "The levels argument must be an integer."
1452
msgstr ""
1453
1454
#: bzrlib/builtins.py:2495
1455
msgid "Show historical log for a branch or subset of a branch."
1456
msgstr ""
1457
1458
#: bzrlib/builtins.py:2497
1459
msgid ""
1460
"log is bzr's default tool for exploring the history of a branch.\n"
1461
"The branch to use is taken from the first parameter. If no parameters\n"
1462
"are given, the branch containing the working directory is logged.\n"
1463
"Here are some simple examples::"
1464
msgstr ""
1465
1466
#: bzrlib/builtins.py:2502
1467
msgid ""
1468
" bzr log log the current branch\n"
1469
" bzr log foo.py log a file in its branch\n"
1470
" bzr log http://server/branch log a branch on a server"
1471
msgstr ""
1472
1473
#: bzrlib/builtins.py:2506
1474
msgid ""
1475
"The filtering, ordering and information shown for each revision can\n"
1476
"be controlled as explained below. By default, all revisions are\n"
1477
"shown sorted (topologically) so that newer revisions appear before\n"
1478
"older ones and descendants always appear before ancestors. If displayed,\n"
1479
"merged revisions are shown indented under the revision in which they\n"
1480
"were merged."
1481
msgstr ""
1482
1483
#: bzrlib/builtins.py:2513
1484
msgid ":Output control:"
1485
msgstr ""
1486
1487
#: bzrlib/builtins.py:2515
1488
msgid ""
1489
" The log format controls how information about each revision is\n"
1490
" displayed. The standard log formats are called ``long``, ``short``\n"
1491
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1492
" for more details on log formats."
1493
msgstr ""
1494
1495
#: bzrlib/builtins.py:2520
1496
msgid ""
1497
" The following options can be used to control what information is\n"
1498
" displayed::"
1499
msgstr ""
1500
1501
#: bzrlib/builtins.py:2523
1502
msgid ""
1503
" -l N display a maximum of N revisions\n"
1504
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1505
" -v display a status summary (delta) for each revision\n"
1506
" -p display a diff (patch) for each revision\n"
1507
" --show-ids display revision-ids (and file-ids), not just revnos"
1508
msgstr ""
1509
1510
#: bzrlib/builtins.py:2529
1511
msgid ""
1512
" Note that the default number of levels to display is a function of the\n"
1513
" log format. If the -n option is not used, the standard log formats show\n"
1514
" just the top level (mainline)."
1515
msgstr ""
1516
1517
#: bzrlib/builtins.py:2533
1518
msgid ""
1519
" Status summaries are shown using status flags like A, M, etc. To see\n"
1520
" the changes explained using words like ``added`` and ``modified``\n"
1521
" instead, use the -vv option."
1522
msgstr ""
1523
1524
#: bzrlib/builtins.py:2537
1525
msgid ":Ordering control:"
1526
msgstr ""
1527
1528
#: bzrlib/builtins.py:2539
1529
msgid ""
1530
" To display revisions from oldest to newest, use the --forward option.\n"
1531
" In most cases, using this option will have little impact on the total\n"
1532
" time taken to produce a log, though --forward does not incrementally\n"
1533
" display revisions like --reverse does when it can."
1534
msgstr ""
1535
1536
#: bzrlib/builtins.py:2544
1537
msgid ":Revision filtering:"
1538
msgstr ""
1539
1540
#: bzrlib/builtins.py:2546
1541
msgid ""
1542
" The -r option can be used to specify what revision or range of revisions\n"
1543
" to filter against. The various forms are shown below::"
1544
msgstr ""
1545
1546
#: bzrlib/builtins.py:2549
1547
msgid ""
1548
" -rX display revision X\n"
1549
" -rX.. display revision X and later\n"
1550
" -r..Y display up to and including revision Y\n"
1551
" -rX..Y display from X to Y inclusive"
1552
msgstr ""
1553
1554
#: bzrlib/builtins.py:2554
1555
msgid ""
1556
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1557
" Some common examples are given below::"
1558
msgstr ""
1559
1560
#: bzrlib/builtins.py:2557
1561
msgid ""
1562
" -r-1 show just the tip\n"
1563
" -r-10.. show the last 10 mainline revisions\n"
1564
" -rsubmit:.. show what's new on this branch\n"
1565
" -rancestor:path.. show changes since the common ancestor of this\n"
1566
" branch and the one at location path\n"
1567
" -rdate:yesterday.. show changes since yesterday"
1568
msgstr ""
1569
1570
#: bzrlib/builtins.py:2564
1571
msgid ""
1572
" When logging a range of revisions using -rX..Y, log starts at\n"
1573
" revision Y and searches back in history through the primary\n"
1574
" (\"left-hand\") parents until it finds X. When logging just the\n"
1575
" top level (using -n1), an error is reported if X is not found\n"
1576
" along the way. If multi-level logging is used (-n0), X may be\n"
1577
" a nested merge revision and the log will be truncated accordingly."
1578
msgstr ""
1579
1580
#: bzrlib/builtins.py:2571
1581
msgid ":Path filtering:"
1582
msgstr ""
1583
1584
#: bzrlib/builtins.py:2573
1585
msgid ""
1586
" If parameters are given and the first one is not a branch, the log\n"
1587
" will be filtered to show only those revisions that changed the\n"
1588
" nominated files or directories."
1589
msgstr ""
1590
1591
#: bzrlib/builtins.py:2577
1592
msgid ""
1593
" Filenames are interpreted within their historical context. To log a\n"
1594
" deleted file, specify a revision range so that the file existed at\n"
1595
" the end or start of the range."
1596
msgstr ""
1597
1598
#: bzrlib/builtins.py:2581
1599
msgid ""
1600
" Historical context is also important when interpreting pathnames of\n"
1601
" renamed files/directories. Consider the following example:"
1602
msgstr ""
1603
1604
#: bzrlib/builtins.py:2584
1605
msgid ""
1606
" * revision 1: add tutorial.txt\n"
1607
" * revision 2: modify tutorial.txt\n"
1608
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1609
msgstr ""
1610
1611
#: bzrlib/builtins.py:2588
1612
msgid " In this case:"
1613
msgstr ""
1614
1615
#: bzrlib/builtins.py:2590
1616
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1617
msgstr ""
1618
1619
#: bzrlib/builtins.py:2592
1620
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1621
msgstr ""
1622
1623
#: bzrlib/builtins.py:2594
1624
msgid ""
1625
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1626
" the original file in revision 2."
1627
msgstr ""
1628
1629
#: bzrlib/builtins.py:2597
1630
msgid ""
1631
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1632
" was no file called guide.txt in revision 2."
1633
msgstr ""
1634
1635
#: bzrlib/builtins.py:2600
1636
msgid ""
1637
" Renames are always followed by log. By design, there is no need to\n"
1638
" explicitly ask for this (and no way to stop logging a file back\n"
1639
" until it was last renamed)."
1640
msgstr ""
1641
1642
#: bzrlib/builtins.py:2604
1643
msgid ":Other filtering:"
1644
msgstr ""
1645
1646
#: bzrlib/builtins.py:2606
1647
msgid ""
1648
" The --match option can be used for finding revisions that match a\n"
1649
" regular expression in a commit message, committer, author or bug.\n"
1650
" Specifying the option several times will match any of the supplied\n"
1651
" expressions. --match-author, --match-bugs, --match-committer and\n"
1652
" --match-message can be used to only match a specific field."
1653
msgstr ""
1654
1655
#: bzrlib/builtins.py:2612
1656
msgid ":Tips & tricks:"
1657
msgstr ""
1658
1659
#: bzrlib/builtins.py:2614
1660
msgid ""
1661
" GUI tools and IDEs are often better at exploring history than command\n"
1662
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1663
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1664
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1665
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1666
msgstr ""
1667
1668
#: bzrlib/builtins.py:2620
1669
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1670
msgstr ""
1671
1672
#: bzrlib/builtins.py:2622
1673
msgid ""
1674
" [ALIASES]\n"
1675
" tip = log -r-1\n"
1676
" top = log -l10 --line\n"
1677
" show = log -v -p"
1678
msgstr ""
1679
1680
#: bzrlib/builtins.py:2627
1681
msgid ""
1682
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1683
" will show the last 10 mainline revisions. To see the details of a\n"
1684
" particular revision X, ``bzr show -rX``."
1685
msgstr ""
1686
1687
#: bzrlib/builtins.py:2631
1688
msgid ""
1689
" If you are interested in looking deeper into a particular merge X,\n"
1690
" use ``bzr log -n0 -rX``."
1691
msgstr ""
1692
1693
#: bzrlib/builtins.py:2634
1694
msgid ""
1695
" ``bzr log -v`` on a branch with lots of history is currently\n"
1696
" very slow. A fix for this issue is currently under development.\n"
1697
" With or without that fix, it is recommended that a revision range\n"
1698
" be given when using the -v option."
1699
msgstr ""
1700
1701
#: bzrlib/builtins.py:2639
1702
msgid ""
1703
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1704
" used to find revisions matching user names, commit messages, etc.\n"
1705
" Among other features, this plugin can find all revisions containing\n"
1706
" a list of words but not others."
1707
msgstr ""
1708
1709
#: bzrlib/builtins.py:2644
1710
msgid ""
1711
" When exploring non-mainline history on large projects with deep\n"
1712
" history, the performance of log can be greatly improved by installing\n"
1713
" the historycache plugin. This plugin buffers historical information\n"
1714
" trading disk space for faster speed."
1715
msgstr ""
1716
1717
# help of 'forward' option of 'log' command
1718
#: bzrlib/builtins.py:2653
1719
msgid "Show from oldest to newest."
1720
msgstr ""
1721
1722
# help of 'verbose' option of 'log' command
1723
#: bzrlib/builtins.py:2656
1724
msgid "Show files changed in each revision."
1725
msgstr ""
1726
1727
# help of 'change' option of 'log' command
1728
#: bzrlib/builtins.py:2662
1729
msgid "Show just the specified revision. See also \"help revisionspec\"."
1730
msgstr ""
1731
1732
# help of 'authors' option of 'log' command
1733
#: bzrlib/builtins.py:2666
1734
msgid "What names to list as authors - first, all or committer."
1735
msgstr ""
1736
1737
# title of 'authors' option of 'log' command
1738
#: bzrlib/builtins.py:2667
1739
msgid "Authors"
1740
msgstr ""
1741
1742
# help of 'levels' option of 'log' command
1743
#: bzrlib/builtins.py:2672
1744
msgid "Number of levels to display - 0 for all, 1 for flat."
1745
msgstr ""
1746
1747
# help of 'limit' option of 'log' command
1748
#: bzrlib/builtins.py:2682
1749
msgid "Limit the output to the first N revisions."
1750
msgstr ""
1751
1752
# help of 'show-diff' option of 'log' command
1753
#: bzrlib/builtins.py:2687
1754
msgid "Show changes made in each revision as a patch."
1755
msgstr ""
1756
1757
# help of 'include-merged' option of 'log' command
1758
#: bzrlib/builtins.py:2689
1759
msgid "Show merged revisions like --levels 0 does."
1760
msgstr ""
1761
1762
# help of 'omit-merges' option of 'log' command
1763
#: bzrlib/builtins.py:2693
1764
msgid "Do not report commits with more than one parent."
1765
msgstr ""
1766
1767
# help of 'exclude-common-ancestry' option of 'log' command
1768
#: bzrlib/builtins.py:2695
1769
msgid ""
1770
"Display only the revisions that are not part of both ancestries (require -"
1771
"rX..Y)."
1772
msgstr ""
1773
1774
# help of 'signatures' option of 'log' command
1775
#: bzrlib/builtins.py:2699
1776
msgid "Show digital signature validity."
1777
msgstr ""
1778
1779
# help of 'match' option of 'log' command
1780
#: bzrlib/builtins.py:2702
1781
msgid "Show revisions whose properties match this expression."
1782
msgstr ""
1783
1784
# help of 'match-message' option of 'log' command
1785
#: bzrlib/builtins.py:2706
1786
msgid "Show revisions whose message matches this expression."
1787
msgstr ""
1788
1789
# help of 'match-committer' option of 'log' command
1790
#: bzrlib/builtins.py:2710
1791
msgid "Show revisions whose committer matches this expression."
1792
msgstr ""
1793
1794
# help of 'match-author' option of 'log' command
1795
#: bzrlib/builtins.py:2714
1796
msgid "Show revisions whose authors match this expression."
1797
msgstr ""
1798
1799
# help of 'match-bugs' option of 'log' command
1800
#: bzrlib/builtins.py:2718
1801
msgid "Show revisions whose bugs match this expression."
1802
msgstr ""
1803
1804
#: bzrlib/builtins.py:2772
1805
msgid "--exclude-common-ancestry requires -r with two revisions"
1806
msgstr ""
1807
1808
#: bzrlib/builtins.py:2800
1809
#, python-format
1810
msgid "Path unknown at end or start of revision range: %s"
1811
msgstr ""
1812
1813
#: bzrlib/builtins.py:2917
1814
#, python-format
1815
msgid "bzr %s doesn't accept two revisions in different branches."
1816
msgstr ""
1817
1818
#: bzrlib/builtins.py:2933
1819
#, python-format
1820
msgid "bzr %s --revision takes one or two values."
1821
msgstr ""
1822
1823
#: bzrlib/builtins.py:2978
1824
msgid ""
1825
"List files in a tree.\n"
1826
" "
1827
msgstr ""
1828
1829
# help of 'recursive' option of 'ls' command
1830
#: bzrlib/builtins.py:2987
1831
msgid "Recurse into subdirectories."
1832
msgstr ""
1833
1834
# help of 'from-root' option of 'ls' command
1835
#: bzrlib/builtins.py:2989
1836
msgid "Print paths relative to the root of the branch."
1837
msgstr ""
1838
1839
# help of 'unknown' option of 'ls' command
1840
#: bzrlib/builtins.py:2991
1841
msgid "Print unknown files."
1842
msgstr ""
1843
1844
# help of 'versioned' option of 'ls' command
1845
#: bzrlib/builtins.py:2992
1846
msgid "Print versioned files."
1847
msgstr ""
1848
1849
# help of 'ignored' option of 'ls' command
1850
#: bzrlib/builtins.py:2995
1851
msgid "Print ignored files."
1852
msgstr ""
1853
1854
# help of 'kind' option of 'ls' command
1855
#: bzrlib/builtins.py:2997
1856
msgid "List entries of a particular kind: file, directory, symlink."
1857
msgstr ""
1858
1859
#: bzrlib/builtins.py:3010
1860
msgid "invalid kind specified"
1861
msgstr ""
1862
1863
#: bzrlib/builtins.py:3013
1864
msgid "Cannot set both --verbose and --null"
1865
msgstr ""
1866
1867
#: bzrlib/builtins.py:3022
1868
msgid "cannot specify both --from-root and PATH"
1869
msgstr ""
1870
1871
#: bzrlib/builtins.py:3109
1872
msgid "Ignore specified files or patterns."
1873
msgstr ""
1874
1875
#: bzrlib/builtins.py:3111
1876
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1877
msgstr ""
1878
1879
#: bzrlib/builtins.py:3113
1880
msgid ""
1881
"If a .bzrignore file does not exist, the ignore command\n"
1882
"will create one and add the specified files or patterns to the newly\n"
1883
"created file. The ignore command will also automatically add the \n"
1884
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1885
"the use of the ignore command will require an explicit add command."
1886
msgstr ""
1887
1888
#: bzrlib/builtins.py:3119
1889
msgid ""
1890
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1891
"After adding, editing or deleting that file either indirectly by\n"
1892
"using this command or directly by using an editor, be sure to commit\n"
1893
"it."
1894
msgstr ""
1895
1896
#: bzrlib/builtins.py:3124
1897
msgid ""
1898
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1899
"the global ignore file can be found in the application data directory as\n"
1900
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1901
"Global ignores are not touched by this command. The global ignore file\n"
1902
"can be edited directly using an editor."
1903
msgstr ""
1904
1905
#: bzrlib/builtins.py:3130
1906
msgid ""
1907
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1908
"precedence over regular ignores. Such exceptions are used to specify\n"
1909
"files that should be versioned which would otherwise be ignored."
1910
msgstr ""
1911
1912
#: bzrlib/builtins.py:3134
1913
msgid ""
1914
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1915
"precedence over the '!' exception patterns."
1916
msgstr ""
1917
1918
#: bzrlib/builtins.py:3137
1919
msgid ""
1920
":Notes: \n"
1921
" \n"
1922
"* Ignore patterns containing shell wildcards must be quoted from\n"
1923
" the shell on Unix."
1924
msgstr ""
1925
1926
#: bzrlib/builtins.py:3142
1927
msgid ""
1928
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1929
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1930
msgstr ""
1931
1932
#: bzrlib/builtins.py:3145
1933
msgid ""
1934
":Examples:\n"
1935
" Ignore the top level Makefile::"
1936
msgstr ""
1937
1938
#: bzrlib/builtins.py:3148
1939
msgid " bzr ignore ./Makefile"
1940
msgstr ""
1941
1942
#: bzrlib/builtins.py:3150
1943
msgid " Ignore .class files in all directories...::"
1944
msgstr ""
1945
1946
#: bzrlib/builtins.py:3152
1947
msgid " bzr ignore \"*.class\""
1948
msgstr ""
1949
1950
#: bzrlib/builtins.py:3154
1951
msgid " ...but do not ignore \"special.class\"::"
1952
msgstr ""
1953
1954
#: bzrlib/builtins.py:3156
1955
msgid " bzr ignore \"!special.class\""
1956
msgstr ""
1957
1958
#: bzrlib/builtins.py:3158
1959
msgid " Ignore files whose name begins with the \"#\" character::"
1960
msgstr ""
1961
1962
#: bzrlib/builtins.py:3160
1963
msgid " bzr ignore \"RE:^#\""
1964
msgstr ""
1965
1966
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1967
msgid " Ignore .o files under the lib directory::"
1968
msgstr ""
1969
1970
#: bzrlib/builtins.py:3164
1971
msgid " bzr ignore \"lib/**/*.o\""
1972
msgstr ""
1973
1974
#: bzrlib/builtins.py:3168
1975
msgid " bzr ignore \"RE:lib/.*\\.o\""
1976
msgstr ""
1977
1978
#: bzrlib/builtins.py:3170
1979
msgid " Ignore everything but the \"debian\" toplevel directory::"
1980
msgstr ""
1981
1982
#: bzrlib/builtins.py:3172
1983
msgid ""
1984
" bzr ignore \"RE:(?!debian/).*\"\n"
1985
" \n"
1986
" Ignore everything except the \"local\" toplevel directory,\n"
1987
" but always ignore autosave files ending in ~, even under local/::\n"
1988
" \n"
1989
" bzr ignore \"*\"\n"
1990
" bzr ignore \"!./local\"\n"
1991
" bzr ignore \"!!*~\""
1992
msgstr ""
1993
1994
# help of 'default-rules' option of 'ignore' command
1995
#: bzrlib/builtins.py:3186
1996
msgid "Display the default ignore rules that bzr uses."
1997
msgstr ""
1998
1999
#: bzrlib/builtins.py:3198
2000
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2001
msgstr ""
2002
2003
#: bzrlib/builtins.py:3209
2004
#, python-format
2005
msgid "Invalid ignore pattern found. %s"
2006
msgid_plural "Invalid ignore patterns found. %s"
2007
msgstr[0] ""
2008
msgstr[1] ""
2009
2010
#: bzrlib/builtins.py:3218
2011
msgid "NAME_PATTERN should not be an absolute path"
2012
msgstr ""
2013
2014
#: bzrlib/builtins.py:3231
2015
#, python-format
2016
msgid ""
2017
"Warning: the following files are version controlled and match your ignore "
2018
"pattern:\n"
2019
"%s\n"
2020
"These files will continue to be version controlled unless you 'bzr remove' "
2021
"them.\n"
2022
msgstr ""
2023
2024
#: bzrlib/builtins.py:3238
2025
msgid "List ignored files and the patterns that matched them."
2026
msgstr ""
2027
2028
#: bzrlib/builtins.py:3240
2029
msgid ""
2030
"List all the ignored files and the ignore pattern that caused the file to\n"
2031
"be ignored."
2032
msgstr ""
2033
2034
#: bzrlib/builtins.py:3243
2035
msgid "Alternatively, to list just the files::"
2036
msgstr ""
2037
2038
#: bzrlib/builtins.py:3245
2039
msgid " bzr ls --ignored"
2040
msgstr ""
2041
2042
#: bzrlib/builtins.py:3279
2043
#, python-format
2044
msgid "not a valid revision-number: %r"
2045
msgstr ""
2046
2047
#: bzrlib/builtins.py:3286
2048
msgid "Export current or past revision to a destination directory or archive."
2049
msgstr ""
2050
2051
#: bzrlib/builtins.py:3288
2052
msgid "If no revision is specified this exports the last committed revision."
2053
msgstr ""
2054
2055
#: bzrlib/builtins.py:3290
2056
msgid ""
2057
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2058
"given, try to find the format with the extension. If no extension\n"
2059
"is found exports to a directory (equivalent to --format=dir)."
2060
msgstr ""
2061
2062
#: bzrlib/builtins.py:3294
2063
msgid ""
2064
"If root is supplied, it will be used as the root directory inside\n"
2065
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2066
"to the exported filename. The root option has no effect for 'dir' format."
2067
msgstr ""
2068
2069
#: bzrlib/builtins.py:3298
2070
msgid ""
2071
"If branch is omitted then the branch containing the current working\n"
2072
"directory will be used."
2073
msgstr ""
2074
2075
#: bzrlib/builtins.py:3301
2076
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2077
msgstr ""
2078
2079
#: bzrlib/builtins.py:3303
2080
msgid ""
2081
" ================= =========================\n"
2082
" Supported formats Autodetected by extension\n"
2083
" ================= =========================\n"
2084
" dir (none)\n"
2085
" tar .tar\n"
2086
" tbz2 .tar.bz2, .tbz2\n"
2087
" tgz .tar.gz, .tgz\n"
2088
" zip .zip\n"
2089
" ================= ========================="
2090
msgstr ""
2091
2092
# help of 'format' option of 'export' command
2093
#: bzrlib/builtins.py:3317
2094
msgid "Type of file to export to."
2095
msgstr ""
2096
2097
# help of 'filters' option of 'export' command
2098
#: bzrlib/builtins.py:3320
2099
msgid "Apply content filters to export the convenient form."
2100
msgstr ""
2101
2102
# help of 'root' option of 'export' command
2103
#: bzrlib/builtins.py:3324
2104
msgid "Name of the root directory inside the exported file."
2105
msgstr ""
2106
2107
# help of 'per-file-timestamps' option of 'export' command
2108
#: bzrlib/builtins.py:3326
2109
msgid ""
2110
"Set modification time of files to that of the last revision in which it was "
2111
"changed."
2112
msgstr ""
2113
2114
# help of 'uncommitted' option of 'export' command
2115
#: bzrlib/builtins.py:3329
2116
msgid "Export the working tree contents rather than that of the last revision."
2117
msgstr ""
2118
2119
#: bzrlib/builtins.py:3348
2120
msgid "--uncommitted requires a working tree"
2121
msgstr ""
2122
2123
#: bzrlib/builtins.py:3357
2124
#, python-format
2125
msgid "Unsupported export format: %s"
2126
msgstr ""
2127
2128
#: bzrlib/builtins.py:3361
2129
msgid "Write the contents of a file as of a given revision to standard output."
2130
msgstr ""
2131
2132
#: bzrlib/builtins.py:3363
2133
msgid "If no revision is nominated, the last revision is used."
2134
msgstr ""
2135
2136
#: bzrlib/builtins.py:3365
2137
msgid ""
2138
"Note: Take care to redirect standard output when using this command on a\n"
2139
"binary file."
2140
msgstr ""
2141
2142
# help of 'name-from-revision' option of 'cat' command
2143
#: bzrlib/builtins.py:3371
2144
msgid "The path name in the old tree."
2145
msgstr ""
2146
2147
# help of 'filters' option of 'cat' command
2148
#: bzrlib/builtins.py:3372
2149
msgid "Apply content filters to display the convenience form."
2150
msgstr ""
2151
2152
#: bzrlib/builtins.py:3383
2153
msgid "bzr cat --revision takes exactly one revision specifier"
2154
msgstr ""
2155
2156
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2157
msgid "{0!r} is not present in revision {1}"
2158
msgstr ""
2159
2160
#: bzrlib/builtins.py:3443
2161
msgid "Commit changes into a new revision."
2162
msgstr ""
2163
2164
#: bzrlib/builtins.py:3445
2165
msgid ""
2166
"An explanatory message needs to be given for each commit. This is\n"
2167
"often done by using the --message option (getting the message from the\n"
2168
"command line) or by using the --file option (getting the message from\n"
2169
"a file). If neither of these options is given, an editor is opened for\n"
2170
"the user to enter the message. To see the changed files in the\n"
2171
"boilerplate text loaded into the editor, use the --show-diff option."
2172
msgstr ""
2173
2174
#: bzrlib/builtins.py:3452
2175
msgid ""
2176
"By default, the entire tree is committed and the person doing the\n"
2177
"commit is assumed to be the author. These defaults can be overridden\n"
2178
"as explained below."
2179
msgstr ""
2180
2181
#: bzrlib/builtins.py:3456
2182
msgid ":Selective commits:"
2183
msgstr ""
2184
2185
#: bzrlib/builtins.py:3458
2186
msgid ""
2187
" If selected files are specified, only changes to those files are\n"
2188
" committed. If a directory is specified then the directory and\n"
2189
" everything within it is committed."
2190
msgstr ""
2191
2192
#: bzrlib/builtins.py:3462
2193
msgid ""
2194
" When excludes are given, they take precedence over selected files.\n"
2195
" For example, to commit only changes within foo, but not changes\n"
2196
" within foo/bar::"
2197
msgstr ""
2198
2199
#: bzrlib/builtins.py:3466
2200
msgid " bzr commit foo -x foo/bar"
2201
msgstr ""
2202
2203
#: bzrlib/builtins.py:3468
2204
msgid " A selective commit after a merge is not yet supported."
2205
msgstr ""
2206
2207
#: bzrlib/builtins.py:3470
2208
msgid ":Custom authors:"
2209
msgstr ""
2210
2211
#: bzrlib/builtins.py:3472
2212
msgid ""
2213
" If the author of the change is not the same person as the committer,\n"
2214
" you can specify the author's name using the --author option. The\n"
2215
" name should be in the same format as a committer-id, e.g.\n"
2216
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2217
" the change you can specify the option multiple times, once for each\n"
2218
" author."
2219
msgstr ""
2220
2221
#: bzrlib/builtins.py:3479
2222
msgid ":Checks:"
2223
msgstr ""
2224
2225
#: bzrlib/builtins.py:3481
2226
msgid ""
2227
" A common mistake is to forget to add a new file or directory before\n"
2228
" running the commit command. The --strict option checks for unknown\n"
2229
" files and aborts the commit if any are found. More advanced pre-commit\n"
2230
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2231
" for details."
2232
msgstr ""
2233
2234
#: bzrlib/builtins.py:3487
2235
msgid ":Things to note:"
2236
msgstr ""
2237
2238
#: bzrlib/builtins.py:3489
2239
msgid ""
2240
" If you accidentially commit the wrong changes or make a spelling\n"
2241
" mistake in the commit message say, you can use the uncommit command\n"
2242
" to undo it. See ``bzr help uncommit`` for details."
2243
msgstr ""
2244
2245
#: bzrlib/builtins.py:3493
2246
msgid ""
2247
" Hooks can also be configured to run after a commit. This allows you\n"
2248
" to trigger updates to external systems like bug trackers. The --fixes\n"
2249
" option can be used to record the association between a revision and\n"
2250
" one or more bugs. See ``bzr help bugs`` for details."
2251
msgstr ""
2252
2253
# help of 'exclude' option of 'commit' command
2254
#: bzrlib/builtins.py:3503
2255
msgid "Do not consider changes made to a given path."
2256
msgstr ""
2257
2258
# help of 'message' option of 'commit' command
2259
#: bzrlib/builtins.py:3506
2260
msgid "Description of the new revision."
2261
msgstr ""
2262
2263
# help of 'unchanged' option of 'commit' command
2264
#: bzrlib/builtins.py:3509
2265
msgid "Commit even if nothing has changed."
2266
msgstr ""
2267
2268
# help of 'file' option of 'commit' command
2269
#: bzrlib/builtins.py:3513
2270
msgid "Take commit message from this file."
2271
msgstr ""
2272
2273
# help of 'strict' option of 'commit' command
2274
#: bzrlib/builtins.py:3515
2275
msgid "Refuse to commit if there are unknown files in the working tree."
2276
msgstr ""
2277
2278
# help of 'commit-time' option of 'commit' command
2279
#: bzrlib/builtins.py:3518
2280
msgid ""
2281
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2282
"08:00:00 +0100'."
2283
msgstr ""
2284
2285
# help of 'fixes' option of 'commit' command
2286
#: bzrlib/builtins.py:3521
2287
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2288
msgstr ""
2289
2290
# help of 'author' option of 'commit' command
2291
#: bzrlib/builtins.py:3524
2292
msgid "Set the author's name, if it's different from the committer."
2293
msgstr ""
2294
2295
# help of 'local' option of 'commit' command
2296
#: bzrlib/builtins.py:3527
2297
msgid ""
2298
"Perform a local commit in a bound branch. Local commits are not pushed to "
2299
"the master branch until a normal commit is performed."
2300
msgstr ""
2301
2302
# help of 'show-diff' option of 'commit' command
2303
#: bzrlib/builtins.py:3533
2304
msgid ""
2305
"When no message is supplied, show the diff along with the status summary in "
2306
"the message editor."
2307
msgstr ""
2308
2309
# help of 'lossy' option of 'commit' command
2310
#: bzrlib/builtins.py:3536
2311
msgid ""
2312
"When committing to a foreign version control system do not push data that "
2313
"can not be natively represented."
2314
msgstr ""
2315
2316
#: bzrlib/builtins.py:3554
2317
#, python-format
2318
msgid ""
2319
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2320
"default bug tracker using the `bugtracker` option.\n"
2321
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2322
msgstr ""
2323
2324
#: bzrlib/builtins.py:3563
2325
#, python-format
2326
msgid ""
2327
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2328
"for more information on this feature.\n"
2329
"Commit refused."
2330
msgstr ""
2331
2332
#: bzrlib/builtins.py:3572
2333
#, python-format
2334
msgid "Unrecognized bug %s. Commit refused."
2335
msgstr ""
2336
2337
#: bzrlib/builtins.py:3575
2338
#, python-format
2339
msgid ""
2340
"%s\n"
2341
"Commit refused."
2342
msgstr ""
2343
2344
#: bzrlib/builtins.py:3599
2345
msgid "Could not parse --commit-time: "
2346
msgstr ""
2347
2348
#: bzrlib/builtins.py:3639
2349
msgid "please specify either --message or --file"
2350
msgstr ""
2351
2352
#: bzrlib/builtins.py:3668
2353
msgid "please specify a commit message with either --message or --file"
2354
msgstr ""
2355
2356
#: bzrlib/builtins.py:3671
2357
msgid ""
2358
"Empty commit message specified. Please specify a commit message with either "
2359
"--message or --file or leave a blank message with --message \"\"."
2360
msgstr ""
2361
2362
#: bzrlib/builtins.py:3691
2363
msgid ""
2364
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2365
"--unchanged to force an empty commit."
2366
msgstr ""
2367
2368
#: bzrlib/builtins.py:3695
2369
msgid ""
2370
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2371
"resolve FILE\" to resolve."
2372
msgstr ""
2373
2374
#: bzrlib/builtins.py:3699
2375
msgid "Commit refused because there are unknown files in the working tree."
2376
msgstr ""
2377
2378
#: bzrlib/builtins.py:3702
2379
msgid ""
2380
"\n"
2381
"To commit to master branch, run update and then commit.\n"
2382
"You can also pass --local to commit to continue working disconnected."
2383
msgstr ""
2384
2385
#: bzrlib/builtins.py:3710
2386
msgid ""
2387
"Validate working tree structure, branch consistency and repository history."
2388
msgstr ""
2389
2390
#: bzrlib/builtins.py:3712
2391
msgid ""
2392
"This command checks various invariants about branch and repository storage\n"
2393
"to detect data corruption or bzr bugs."
2394
msgstr ""
2395
2396
#: bzrlib/builtins.py:3715
2397
msgid ""
2398
"The working tree and branch checks will only give output if a problem is\n"
2399
"detected. The output fields of the repository check are:"
2400
msgstr ""
2401
2402
#: bzrlib/builtins.py:3718
2403
msgid ""
2404
"revisions\n"
2405
" This is just the number of revisions checked. It doesn't\n"
2406
" indicate a problem."
2407
msgstr ""
2408
2409
#: bzrlib/builtins.py:3722
2410
msgid ""
2411
"versionedfiles\n"
2412
" This is just the number of versionedfiles checked. It\n"
2413
" doesn't indicate a problem."
2414
msgstr ""
2415
2416
#: bzrlib/builtins.py:3726
2417
msgid ""
2418
"unreferenced ancestors\n"
2419
" Texts that are ancestors of other texts, but\n"
2420
" are not properly referenced by the revision ancestry. This is a\n"
2421
" subtle problem that Bazaar can work around."
2422
msgstr ""
2423
2424
#: bzrlib/builtins.py:3731
2425
msgid ""
2426
"unique file texts\n"
2427
" This is the total number of unique file contents\n"
2428
" seen in the checked revisions. It does not indicate a problem."
2429
msgstr ""
2430
2431
#: bzrlib/builtins.py:3735
2432
msgid ""
2433
"repeated file texts\n"
2434
" This is the total number of repeated texts seen\n"
2435
" in the checked revisions. Texts can be repeated when their file\n"
2436
" entries are modified, but the file contents are not. It does not\n"
2437
" indicate a problem."
2438
msgstr ""
2439
2440
#: bzrlib/builtins.py:3741
2441
msgid ""
2442
"If no restrictions are specified, all Bazaar data that is found at the "
2443
"given\n"
2444
"location will be checked."
2445
msgstr ""
2446
2447
#: bzrlib/builtins.py:3746
2448
msgid " Check the tree and branch at 'foo'::"
2449
msgstr ""
2450
2451
#: bzrlib/builtins.py:3748
2452
msgid " bzr check --tree --branch foo"
2453
msgstr ""
2454
2455
#: bzrlib/builtins.py:3750
2456
msgid " Check only the repository at 'bar'::"
2457
msgstr ""
2458
2459
#: bzrlib/builtins.py:3752
2460
msgid " bzr check --repo bar"
2461
msgstr ""
2462
2463
#: bzrlib/builtins.py:3754
2464
msgid " Check everything at 'baz'::"
2465
msgstr ""
2466
2467
#: bzrlib/builtins.py:3756
2468
msgid " bzr check baz"
2469
msgstr ""
2470
2471
# help of 'branch' option of 'check' command
2472
#: bzrlib/builtins.py:3762
2473
msgid "Check the branch related to the current directory."
2474
msgstr ""
2475
2476
# help of 'repo' option of 'check' command
2477
#: bzrlib/builtins.py:3764
2478
msgid "Check the repository related to the current directory."
2479
msgstr ""
2480
2481
# help of 'tree' option of 'check' command
2482
#: bzrlib/builtins.py:3766
2483
msgid "Check the working tree related to the current directory."
2484
msgstr ""
2485
2486
#: bzrlib/builtins.py:3780
2487
msgid "Upgrade a repository, branch or working tree to a newer format."
2488
msgstr ""
2489
2490
#: bzrlib/builtins.py:3782
2491
msgid ""
2492
"When the default format has changed after a major new release of\n"
2493
"Bazaar, you may be informed during certain operations that you\n"
2494
"should upgrade. Upgrading to a newer format may improve performance\n"
2495
"or make new features available. It may however limit interoperability\n"
2496
"with older repositories or with older versions of Bazaar."
2497
msgstr ""
2498
2499
#: bzrlib/builtins.py:3788
2500
msgid ""
2501
"If you wish to upgrade to a particular format rather than the\n"
2502
"current default, that can be specified using the --format option.\n"
2503
"As a consequence, you can use the upgrade command this way to\n"
2504
"\"downgrade\" to an earlier format, though some conversions are\n"
2505
"a one way process (e.g. changing from the 1.x default to the\n"
2506
"2.x default) so downgrading is not always possible."
2507
msgstr ""
2508
2509
#: bzrlib/builtins.py:3795
2510
msgid ""
2511
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2512
"process (where # is a number). By default, this is left there on\n"
2513
"completion. If the conversion fails, delete the new .bzr directory\n"
2514
"and rename this one back in its place. Use the --clean option to ask\n"
2515
"for the backup.bzr directory to be removed on successful conversion.\n"
2516
"Alternatively, you can delete it by hand if everything looks good\n"
2517
"afterwards."
2518
msgstr ""
2519
2520
#: bzrlib/builtins.py:3803
2521
msgid ""
2522
"If the location given is a shared repository, dependent branches\n"
2523
"are also converted provided the repository converts successfully.\n"
2524
"If the conversion of a branch fails, remaining branches are still\n"
2525
"tried."
2526
msgstr ""
2527
2528
#: bzrlib/builtins.py:3808
2529
msgid ""
2530
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2531
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2532
msgstr ""
2533
2534
# help of 'format' option of 'upgrade' command
2535
#: bzrlib/builtins.py:3816
2536
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2537
msgstr ""
2538
2539
# title of 'format' option of 'init' command
2540
# title of 'format' option of 'upgrade' command
2541
#: bzrlib/builtins.py:3820
2542
msgid "Branch format"
2543
msgstr ""
2544
2545
# help of 'clean' option of 'upgrade' command
2546
#: bzrlib/builtins.py:3822
2547
msgid "Remove the backup.bzr directory if successful."
2548
msgstr ""
2549
2550
# help of 'dry-run' option of 'add' command
2551
# help of 'dry-run' option of 'upgrade' command
2552
#: bzrlib/builtins.py:3824
2553
msgid "Show what would be done, but don't actually do anything."
2554
msgstr ""
2555
2556
#: bzrlib/builtins.py:3839
2557
msgid "Show or set bzr user id."
2558
msgstr ""
2559
2560
#: bzrlib/builtins.py:3841
2561
msgid ""
2562
":Examples:\n"
2563
" Show the email of the current user::"
2564
msgstr ""
2565
2566
#: bzrlib/builtins.py:3844
2567
msgid " bzr whoami --email"
2568
msgstr ""
2569
2570
#: bzrlib/builtins.py:3846
2571
msgid " Set the current user::"
2572
msgstr ""
2573
2574
#: bzrlib/builtins.py:3848
2575
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2576
msgstr ""
2577
2578
# help of 'email' option of 'whoami' command
2579
#: bzrlib/builtins.py:3852
2580
msgid "Display email address only."
2581
msgstr ""
2582
2583
# help of 'branch' option of 'whoami' command
2584
#: bzrlib/builtins.py:3854
2585
msgid "Set identity for the current branch instead of globally."
2586
msgstr ""
2587
2588
#: bzrlib/builtins.py:3880
2589
msgid "--email can only be used to display existing identity"
2590
msgstr ""
2591
2592
#: bzrlib/builtins.py:3904
2593
msgid "Print or set the branch nickname."
2594
msgstr ""
2595
2596
#: bzrlib/builtins.py:3906
2597
msgid ""
2598
"If unset, the colocated branch name is used for colocated branches, and\n"
2599
"the branch directory name is used for other branches. To print the\n"
2600
"current nickname, execute with no argument."
2601
msgstr ""
2602
2603
#: bzrlib/builtins.py:3910
2604
msgid ""
2605
"Bound branches use the nickname of its master branch unless it is set\n"
2606
"locally."
2607
msgstr ""
2608
2609
#: bzrlib/builtins.py:3930
2610
msgid "Set/unset and display aliases."
2611
msgstr ""
2612
2613
#: bzrlib/builtins.py:3932
2614
msgid ""
2615
":Examples:\n"
2616
" Show the current aliases::"
2617
msgstr ""
2618
2619
#: bzrlib/builtins.py:3935
2620
msgid " bzr alias"
2621
msgstr ""
2622
2623
#: bzrlib/builtins.py:3937
2624
msgid " Show the alias specified for 'll'::"
2625
msgstr ""
2626
2627
#: bzrlib/builtins.py:3939
2628
msgid " bzr alias ll"
2629
msgstr ""
2630
2631
#: bzrlib/builtins.py:3941
2632
msgid " Set an alias for 'll'::"
2633
msgstr ""
2634
2635
#: bzrlib/builtins.py:3943
2636
msgid " bzr alias ll=\"log --line -r-10..-1\""
2637
msgstr ""
2638
2639
#: bzrlib/builtins.py:3945
2640
msgid " To remove an alias for 'll'::"
2641
msgstr ""
2642
2643
#: bzrlib/builtins.py:3947
2644
msgid " bzr alias --remove ll"
2645
msgstr ""
2646
2647
# help of 'remove' option of 'alias' command
2648
#: bzrlib/builtins.py:3952
2649
msgid "Remove the alias."
2650
msgstr ""
2651
2652
#: bzrlib/builtins.py:3970
2653
msgid "bzr alias --remove expects an alias to remove."
2654
msgstr ""
2655
2656
#: bzrlib/builtins.py:4151
2657
msgid "subunit not available. subunit needs to be installed to use --subunit."
2658
msgstr ""
2659
2660
#: bzrlib/builtins.py:4168
2661
msgid ""
2662
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2663
msgstr ""
2664
2665
#: bzrlib/builtins.py:4215
2666
msgid "Show version of bzr."
2667
msgstr ""
2668
2669
# help of 'short' option of 'version' command
2670
#: bzrlib/builtins.py:4219
2671
msgid "Print just the version number."
2672
msgstr ""
2673
2674
#: bzrlib/builtins.py:4238
2675
msgid "It sure does!\n"
2676
msgstr ""
2677
2678
#: bzrlib/builtins.py:4262
2679
#, python-format
2680
msgid "merge base is revision %s\n"
2681
msgstr ""
2682
2683
#: bzrlib/builtins.py:4266
2684
msgid "Perform a three-way merge."
2685
msgstr ""
2686
2687
#: bzrlib/builtins.py:4268
2688
msgid ""
2689
"The source of the merge can be specified either in the form of a branch,\n"
2690
"or in the form of a path to a file containing a merge directive generated\n"
2691
"with bzr send. If neither is specified, the default is the upstream branch\n"
2692
"or the branch most recently merged using --remember. The source of the\n"
2693
"merge may also be specified in the form of a path to a file in another\n"
2694
"branch: in this case, only the modifications to that file are merged into\n"
2695
"the current working tree."
2696
msgstr ""
2697
2698
#: bzrlib/builtins.py:4276
2699
msgid ""
2700
"When merging from a branch, by default bzr will try to merge in all new\n"
2701
"work from the other branch, automatically determining an appropriate base\n"
2702
"revision. If this fails, you may need to give an explicit base."
2703
msgstr ""
2704
2705
#: bzrlib/builtins.py:4280
2706
msgid ""
2707
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2708
"try to merge in all new work up to and including revision OTHER."
2709
msgstr ""
2710
2711
#: bzrlib/builtins.py:4283
2712
msgid ""
2713
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2714
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2715
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2716
"not already contain revision BASE, such a merge is commonly referred to as\n"
2717
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2718
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2719
"changes from the other branch is not stored in the commit."
2720
msgstr ""
2721
2722
#: bzrlib/builtins.py:4291
2723
msgid "Revision numbers are always relative to the source branch."
2724
msgstr ""
2725
2726
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2727
msgid ""
2728
"Merge will do its best to combine the changes in two branches, but there\n"
2729
"are some kinds of problems only a human can fix. When it encounters those,\n"
2730
"it will mark a conflict. A conflict means that you need to fix something,\n"
2731
"before you can commit."
2732
msgstr ""
2733
2734
#: bzrlib/builtins.py:4298
2735
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2736
msgstr ""
2737
2738
#: bzrlib/builtins.py:4300
2739
msgid ""
2740
"If there is no default branch set, the first merge will set it (use\n"
2741
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2742
"to use the default. To change the default, use --remember. The value will\n"
2743
"only be saved if the remote location can be accessed."
2744
msgstr ""
2745
2746
#: bzrlib/builtins.py:4305
2747
msgid ""
2748
"The results of the merge are placed into the destination working\n"
2749
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2750
"committed to record the result of the merge."
2751
msgstr ""
2752
2753
#: bzrlib/builtins.py:4309
2754
msgid ""
2755
"merge refuses to run if there are any uncommitted changes, unless\n"
2756
"--force is given. If --force is given, then the changes from the source \n"
2757
"will be merged with the current working tree, including any uncommitted\n"
2758
"changes in the tree. The --force option can also be used to create a\n"
2759
"merge revision which has more than two parents."
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4315
2763
msgid ""
2764
"If one would like to merge changes from the working tree of the other\n"
2765
"branch without merging any committed revisions, the --uncommitted option\n"
2766
"can be given."
2767
msgstr ""
2768
2769
#: bzrlib/builtins.py:4319
2770
msgid ""
2771
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2772
"you to apply each diff hunk and file change, similar to \"shelve\"."
2773
msgstr ""
2774
2775
#: bzrlib/builtins.py:4322
2776
msgid ""
2777
":Examples:\n"
2778
" To merge all new revisions from bzr.dev::"
2779
msgstr ""
2780
2781
#: bzrlib/builtins.py:4325
2782
msgid " bzr merge ../bzr.dev"
2783
msgstr ""
2784
2785
#: bzrlib/builtins.py:4327
2786
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2787
msgstr ""
2788
2789
#: bzrlib/builtins.py:4329
2790
msgid " bzr merge -r 82 ../bzr.dev"
2791
msgstr ""
2792
2793
#: bzrlib/builtins.py:4331
2794
msgid " To merge the changes introduced by 82, without previous changes::"
2795
msgstr ""
2796
2797
#: bzrlib/builtins.py:4333
2798
msgid " bzr merge -r 81..82 ../bzr.dev"
2799
msgstr ""
2800
2801
#: bzrlib/builtins.py:4335
2802
msgid " To apply a merge directive contained in /tmp/merge::"
2803
msgstr ""
2804
2805
#: bzrlib/builtins.py:4337
2806
msgid " bzr merge /tmp/merge"
2807
msgstr ""
2808
2809
#: bzrlib/builtins.py:4339
2810
msgid ""
2811
" To create a merge revision with three parents from two branches\n"
2812
" feature1a and feature1b:"
2813
msgstr ""
2814
2815
#: bzrlib/builtins.py:4342
2816
msgid ""
2817
" bzr merge ../feature1a\n"
2818
" bzr merge ../feature1b --force\n"
2819
" bzr commit -m 'revision with three parents'"
2820
msgstr ""
2821
2822
# help of 'force' option of 'merge' command
2823
#: bzrlib/builtins.py:4354
2824
msgid "Merge even if the destination tree has uncommitted changes."
2825
msgstr ""
2826
2827
# help of 'uncommitted' option of 'merge' command
2828
#: bzrlib/builtins.py:4360
2829
msgid ""
2830
"Apply uncommitted changes from a working copy, instead of branch changes."
2831
msgstr ""
2832
2833
# help of 'pull' option of 'merge' command
2834
#: bzrlib/builtins.py:4362
2835
msgid ""
2836
"If the destination is already completely merged into the source, pull from "
2837
"the source rather than merging. When this happens, you do not need to "
2838
"commit the result."
2839
msgstr ""
2840
2841
# help of 'directory' option of 'merge' command
2842
#: bzrlib/builtins.py:4367
2843
msgid ""
2844
"Branch to merge into, rather than the one containing the working directory."
2845
msgstr ""
2846
2847
# help of 'preview' option of 'merge' command
2848
#: bzrlib/builtins.py:4369
2849
msgid "Instead of merging, show a diff of the merge."
2850
msgstr ""
2851
2852
# help of 'interactive' option of 'merge' command
2853
#: bzrlib/builtins.py:4371
2854
msgid "Select changes interactively."
2855
msgstr ""
2856
2857
#: bzrlib/builtins.py:4393
2858
msgid ""
2859
"Merging into empty branches not currently supported, https://bugs.launchpad."
2860
"net/bzr/+bug/308562"
2861
msgstr ""
2862
2863
#: bzrlib/builtins.py:4420
2864
msgid "Cannot use --uncommitted with bundles or merge directives."
2865
msgstr ""
2866
2867
#: bzrlib/builtins.py:4431
2868
msgid "Cannot use --uncommitted and --revision at the same time."
2869
msgstr ""
2870
2871
#: bzrlib/builtins.py:4451
2872
msgid "merger: "
2873
msgstr ""
2874
2875
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2876
msgid "Nothing to do."
2877
msgstr ""
2878
2879
#: bzrlib/builtins.py:4457
2880
msgid "Cannot pull individual files"
2881
msgstr ""
2882
2883
#: bzrlib/builtins.py:4465
2884
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2885
msgstr ""
2886
2887
#: bzrlib/builtins.py:4523
2888
#, python-format
2889
msgid "Show-base is not supported for this merge type. %s"
2890
msgstr ""
2891
2892
#: bzrlib/builtins.py:4532
2893
#, python-format
2894
msgid "Conflict reduction is not supported for merge type %s."
2895
msgstr ""
2896
2897
#: bzrlib/builtins.py:4536
2898
msgid "Cannot do conflict reduction and show base."
2899
msgstr ""
2900
2901
#: bzrlib/builtins.py:4647
2902
msgid "No location specified or remembered"
2903
msgstr ""
2904
2905
#: bzrlib/builtins.py:4649
2906
msgid "{0} remembered {1} location {2}"
2907
msgstr ""
2908
2909
#: bzrlib/builtins.py:4655
2910
msgid "Redo a merge."
2911
msgstr ""
2912
2913
#: bzrlib/builtins.py:4657
2914
msgid ""
2915
"Use this if you want to try a different merge technique while resolving\n"
2916
"conflicts. Some merge techniques are better than others, and remerge\n"
2917
"lets you try different ones on different files."
2918
msgstr ""
2919
2920
#: bzrlib/builtins.py:4661
2921
msgid ""
2922
"The options for remerge have the same meaning and defaults as the ones for\n"
2923
"merge. The difference is that remerge can (only) be run when there is a\n"
2924
"pending merge, and it lets you specify particular files."
2925
msgstr ""
2926
2927
#: bzrlib/builtins.py:4665
2928
msgid ""
2929
":Examples:\n"
2930
" Re-do the merge of all conflicted files, and show the base text in\n"
2931
" conflict regions, in addition to the usual THIS and OTHER texts::"
2932
msgstr ""
2933
2934
#: bzrlib/builtins.py:4669
2935
msgid " bzr remerge --show-base"
2936
msgstr ""
2937
2938
#: bzrlib/builtins.py:4671
2939
msgid ""
2940
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2941
" additional processing to reduce the size of conflict regions::"
2942
msgstr ""
2943
2944
#: bzrlib/builtins.py:4674
2945
msgid " bzr remerge --merge-type weave --reprocess foobar"
2946
msgstr ""
2947
2948
# help of 'show-base' option of 'merge' command
2949
# help of 'show-base' option of 'pull' command
2950
# help of 'show-base' option of 'remerge' command
2951
# help of 'show-base' option of 'update' command
2952
#: bzrlib/builtins.py:4681
2953
msgid "Show base revision text in conflicts."
2954
msgstr ""
2955
2956
#: bzrlib/builtins.py:4693
2957
msgid ""
2958
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2959
"merges."
2960
msgstr ""
2961
2962
#: bzrlib/builtins.py:4751
2963
msgid ""
2964
"Set files in the working tree back to the contents of a previous revision."
2965
msgstr ""
2966
2967
#: bzrlib/builtins.py:4753
2968
msgid ""
2969
"Giving a list of files will revert only those files. Otherwise, all files\n"
2970
"will be reverted. If the revision is not specified with '--revision', the\n"
2971
"working tree basis revision is used. A revert operation affects only the\n"
2972
"working tree, not any revision history like the branch and repository or\n"
2973
"the working tree basis revision."
2974
msgstr ""
2975
2976
#: bzrlib/builtins.py:4759
2977
msgid ""
2978
"To remove only some changes, without reverting to a prior version, use\n"
2979
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2980
"will remove the changes introduced by the second last commit (-2), without\n"
2981
"affecting the changes introduced by the last commit (-1). To remove\n"
2982
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2983
"To update the branch to a specific revision or the latest revision and\n"
2984
"update the working tree accordingly while preserving local changes, see the\n"
2985
"update command."
2986
msgstr ""
2987
2988
#: bzrlib/builtins.py:4768
2989
msgid ""
2990
"Uncommitted changes to files that are reverted will be discarded.\n"
2991
"Howver, by default, any files that have been manually changed will be\n"
2992
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2993
"files have '.~#~' appended to their name, where # is a number."
2994
msgstr ""
2995
2996
#: bzrlib/builtins.py:4773
2997
msgid ""
2998
"When you provide files, you can use their current pathname or the pathname\n"
2999
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3000
"name. If you name a directory, all the contents of that directory will be\n"
3001
"reverted."
3002
msgstr ""
3003
3004
#: bzrlib/builtins.py:4778
3005
msgid ""
3006
"If you have newly added files since the target revision, they will be\n"
3007
"removed. If the files to be removed have been changed, backups will be\n"
3008
"created as above. Directories containing unknown files will not be\n"
3009
"deleted."
3010
msgstr ""
3011
3012
#: bzrlib/builtins.py:4783
3013
msgid ""
3014
"The working tree contains a list of revisions that have been merged but\n"
3015
"not yet committed. These revisions will be included as additional parents\n"
3016
"of the next commit. Normally, using revert clears that list as well as\n"
3017
"reverting the files. If any files are specified, revert leaves the list\n"
3018
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3019
".`` in the tree root to revert all files but keep the recorded merges,\n"
3020
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3021
"reverting any files."
3022
msgstr ""
3023
3024
#: bzrlib/builtins.py:4792
3025
msgid ""
3026
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3027
"changes from a branch in a single revision. To do this, perform the merge\n"
3028
"as desired. Then doing revert with the \"--forget-merges\" option will "
3029
"keep\n"
3030
"the content of the tree as it was, but it will clear the list of pending\n"
3031
"merges. The next commit will then contain all of the changes that are\n"
3032
"present in the other branch, but without any other parent revisions.\n"
3033
"Because this technique forgets where these changes originated, it may\n"
3034
"cause additional conflicts on later merges involving the same source and\n"
3035
"target branches."
3036
msgstr ""
3037
3038
# help of 'no-backup' option of 'revert' command
3039
#: bzrlib/builtins.py:4806
3040
msgid "Do not save backups of reverted files."
3041
msgstr ""
3042
3043
# help of 'forget-merges' option of 'revert' command
3044
#: bzrlib/builtins.py:4808
3045
msgid "Remove pending merge marker, without changing any files."
3046
msgstr ""
3047
3048
#: bzrlib/builtins.py:4839
3049
msgid ""
3050
"Show help on a command or other topic.\n"
3051
" "
3052
msgstr ""
3053
3054
# help of 'long' option of 'help' command
3055
#: bzrlib/builtins.py:4844
3056
msgid "Show help on all commands."
3057
msgstr ""
3058
3059
#: bzrlib/builtins.py:4873
3060
msgid "Show unmerged/unpulled revisions between two branches."
3061
msgstr ""
3062
3063
#: bzrlib/builtins.py:4875
3064
msgid "OTHER_BRANCH may be local or remote."
3065
msgstr ""
3066
3067
#: bzrlib/builtins.py:4877
3068
msgid ""
3069
"To filter on a range of revisions, you can use the command -r begin..end\n"
3070
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3071
"also valid.\n"
3072
" \n"
3073
":Exit values:\n"
3074
" 1 - some missing revisions\n"
3075
" 0 - no missing revisions"
3076
msgstr ""
3077
3078
#: bzrlib/builtins.py:4887
3079
msgid ""
3080
" Determine the missing revisions between this and the branch at the\n"
3081
" remembered pull location::"
3082
msgstr ""
3083
3084
#: bzrlib/builtins.py:4890
3085
msgid " bzr missing"
3086
msgstr ""
3087
3088
#: bzrlib/builtins.py:4892
3089
msgid " Determine the missing revisions between this and another branch::"
3090
msgstr ""
3091
3092
#: bzrlib/builtins.py:4894
3093
msgid " bzr missing http://server/branch"
3094
msgstr ""
3095
3096
#: bzrlib/builtins.py:4896
3097
msgid ""
3098
" Determine the missing revisions up to a specific revision on the other\n"
3099
" branch::"
3100
msgstr ""
3101
3102
#: bzrlib/builtins.py:4899
3103
msgid " bzr missing -r ..-10"
3104
msgstr ""
3105
3106
#: bzrlib/builtins.py:4901
3107
msgid ""
3108
" Determine the missing revisions up to a specific revision on this\n"
3109
" branch::"
3110
msgstr ""
3111
3112
#: bzrlib/builtins.py:4904
3113
msgid " bzr missing --my-revision ..-10"
3114
msgstr ""
3115
3116
# help of 'reverse' option of 'missing' command
3117
#: bzrlib/builtins.py:4911
3118
msgid "Reverse the order of revisions."
3119
msgstr ""
3120
3121
# help of 'mine-only' option of 'missing' command
3122
#: bzrlib/builtins.py:4913
3123
msgid "Display changes in the local branch only."
3124
msgstr ""
3125
3126
# help of 'this' option of 'missing' command
3127
#: bzrlib/builtins.py:4914
3128
msgid "Same as --mine-only."
3129
msgstr ""
3130
3131
# help of 'theirs-only' option of 'missing' command
3132
#: bzrlib/builtins.py:4916
3133
msgid "Display changes in the remote branch only."
3134
msgstr ""
3135
3136
# help of 'other' option of 'missing' command
3137
#: bzrlib/builtins.py:4917
3138
msgid "Same as --theirs-only."
3139
msgstr ""
3140
3141
# help of 'revision' option of 'missing' command
3142
#: bzrlib/builtins.py:4922
3143
msgid ""
3144
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3145
"details."
3146
msgstr ""
3147
3148
# help of 'my-revision' option of 'missing' command
3149
#: bzrlib/builtins.py:4926
3150
msgid ""
3151
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3152
"details."
3153
msgstr ""
3154
3155
# help of 'include-merged' option of 'missing' command
3156
#: bzrlib/builtins.py:4929
3157
msgid "Show all revisions in addition to the mainline ones."
3158
msgstr ""
3159
3160
#: bzrlib/builtins.py:4983
3161
msgid "No peer location known or specified."
3162
msgstr ""
3163
3164
#: bzrlib/builtins.py:4987
3165
msgid "Using saved parent location: {0}\n"
3166
msgstr ""
3167
3168
#: bzrlib/builtins.py:5020
3169
#, python-format
3170
msgid "You have %d extra revision:\n"
3171
msgid_plural "You have %d extra revisions:\n"
3172
msgstr[0] ""
3173
msgstr[1] ""
3174
3175
#: bzrlib/builtins.py:5040
3176
#, python-format
3177
msgid "You are missing %d revision:\n"
3178
msgid_plural "You are missing %d revisions:\n"
3179
msgstr[0] ""
3180
msgstr[1] ""
3181
3182
#: bzrlib/builtins.py:5055
3183
msgid "This branch has no new revisions.\n"
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:5058
3187
msgid "Other branch has no new revisions.\n"
3188
msgstr ""
3189
3190
#: bzrlib/builtins.py:5063
3191
msgid "Branches are up to date.\n"
3192
msgstr ""
3193
3194
#: bzrlib/builtins.py:5074
3195
msgid "Compress the data within a repository."
3196
msgstr ""
3197
3198
#: bzrlib/builtins.py:5076
3199
msgid ""
3200
"This operation compresses the data within a bazaar repository. As\n"
3201
"bazaar supports automatic packing of repository, this operation is\n"
3202
"normally not required to be done manually."
3203
msgstr ""
3204
3205
#: bzrlib/builtins.py:5080
3206
msgid ""
3207
"During the pack operation, bazaar takes a backup of existing repository\n"
3208
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3209
"automatically when it is safe to do so. To save disk space by removing\n"
3210
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3211
"used."
3212
msgstr ""
3213
3214
#: bzrlib/builtins.py:5086
3215
msgid ""
3216
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3217
"during or immediately after repacking, you may be left with a state\n"
3218
"where the deletion has been written to disk but the new packs have not\n"
3219
"been. In this case the repository may be unusable."
3220
msgstr ""
3221
3222
# help of 'clean-obsolete-packs' option of 'pack' command
3223
#: bzrlib/builtins.py:5095
3224
msgid "Delete obsolete packs to save disk space."
3225
msgstr ""
3226
3227
#: bzrlib/builtins.py:5109
3228
msgid "List the installed plugins."
3229
msgstr ""
3230
3231
#: bzrlib/builtins.py:5111
3232
msgid ""
3233
"This command displays the list of installed plugins including\n"
3234
"version of plugin and a short description of each."
3235
msgstr ""
3236
3237
#: bzrlib/builtins.py:5114
3238
msgid "--verbose shows the path where each plugin is located."
3239
msgstr ""
3240
3241
#: bzrlib/builtins.py:5116
3242
msgid ""
3243
"A plugin is an external component for Bazaar that extends the\n"
3244
"revision control system, by adding or replacing code in Bazaar.\n"
3245
"Plugins can do a variety of things, including overriding commands,\n"
3246
"adding new commands, providing additional network transports and\n"
3247
"customizing log output."
3248
msgstr ""
3249
3250
#: bzrlib/builtins.py:5122
3251
msgid ""
3252
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3253
"for further information on plugins including where to find them and how to\n"
3254
"install them. Instructions are also provided there on how to write new\n"
3255
"plugins using the Python programming language."
3256
msgstr ""
3257
3258
#: bzrlib/builtins.py:5138
3259
msgid "Show testament (signing-form) of a revision."
3260
msgstr ""
3261
3262
# help of 'long' option of 'testament' command
3263
#: bzrlib/builtins.py:5141
3264
msgid "Produce long-format testament."
3265
msgstr ""
3266
3267
# help of 'strict' option of 'testament' command
3268
#: bzrlib/builtins.py:5143
3269
msgid "Produce a strict-format testament."
3270
msgstr ""
3271
3272
#: bzrlib/builtins.py:5169
3273
msgid "Show the origin of each line in a file."
3274
msgstr ""
3275
3276
#: bzrlib/builtins.py:5171
3277
msgid ""
3278
"This prints out the given file with an annotation on the left side\n"
3279
"indicating which revision, author and date introduced the change."
3280
msgstr ""
3281
3282
#: bzrlib/builtins.py:5174
3283
msgid ""
3284
"If the origin is the same for a run of consecutive lines, it is\n"
3285
"shown only at the top, unless the --all option is given."
3286
msgstr ""
3287
3288
# help of 'all' option of 'annotate' command
3289
#: bzrlib/builtins.py:5182
3290
msgid "Show annotations on all lines."
3291
msgstr ""
3292
3293
# help of 'long' option of 'annotate' command
3294
#: bzrlib/builtins.py:5183
3295
msgid "Show commit date in annotations."
3296
msgstr ""
3297
3298
#: bzrlib/builtins.py:5270
3299
msgid "Cannot sign a range of non-revision-history revisions"
3300
msgstr ""
3301
3302
#: bzrlib/builtins.py:5282
3303
msgid "Please supply either one revision, or a range."
3304
msgstr ""
3305
3306
#: bzrlib/builtins.py:5286
3307
msgid ""
3308
"Convert the current branch into a checkout of the supplied branch.\n"
3309
"If no branch is supplied, rebind to the last bound location."
3310
msgstr ""
3311
3312
#: bzrlib/builtins.py:5289
3313
msgid ""
3314
"Once converted into a checkout, commits must succeed on the master branch\n"
3315
"before they will be applied to the local branch."
3316
msgstr ""
3317
3318
#: bzrlib/builtins.py:5292
3319
msgid ""
3320
"Bound branches use the nickname of its master branch unless it is set\n"
3321
"locally, in which case binding will update the local nickname to be\n"
3322
"that of the master."
3323
msgstr ""
3324
3325
#: bzrlib/builtins.py:5307
3326
msgid "No location supplied. This format does not remember old locations."
3327
msgstr ""
3328
3329
#: bzrlib/builtins.py:5313
3330
msgid "Branch is already bound"
3331
msgstr ""
3332
3333
#: bzrlib/builtins.py:5316
3334
msgid "No location supplied and no previous location known"
3335
msgstr ""
3336
3337
#: bzrlib/builtins.py:5322
3338
msgid "These branches have diverged. Try merging, and then bind again."
3339
msgstr ""
3340
3341
#: bzrlib/builtins.py:5329
3342
msgid "Convert the current checkout into a regular branch."
3343
msgstr ""
3344
3345
#: bzrlib/builtins.py:5331
3346
msgid ""
3347
"After unbinding, the local branch is considered independent and subsequent\n"
3348
"commits will be local only."
3349
msgstr ""
3350
3351
#: bzrlib/builtins.py:5342
3352
msgid "Local branch is not bound"
3353
msgstr ""
3354
3355
#: bzrlib/builtins.py:5346
3356
msgid "Remove the last committed revision."
3357
msgstr ""
3358
3359
#: bzrlib/builtins.py:5348
3360
msgid ""
3361
"--verbose will print out what is being removed.\n"
3362
"--dry-run will go through all the motions, but not actually\n"
3363
"remove anything."
3364
msgstr ""
3365
3366
#: bzrlib/builtins.py:5352
3367
msgid ""
3368
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3369
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3370
"branch at revision 15."
3371
msgstr ""
3372
3373
#: bzrlib/builtins.py:5356
3374
msgid ""
3375
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3376
"it may make is to restore any pending merges that were present before\n"
3377
"the commit."
3378
msgstr ""
3379
3380
# help of 'dry-run' option of 'uncommit' command
3381
#: bzrlib/builtins.py:5367
3382
msgid "Don't actually make changes."
3383
msgstr ""
3384
3385
# help of 'force' option of 'uncommit' command
3386
#: bzrlib/builtins.py:5368
3387
msgid "Say yes to all questions."
3388
msgstr ""
3389
3390
# help of 'keep-tags' option of 'uncommit' command
3391
#: bzrlib/builtins.py:5370
3392
msgid "Keep tags that point to removed revisions."
3393
msgstr ""
3394
3395
# help of 'local' option of 'uncommit' command
3396
#: bzrlib/builtins.py:5372
3397
msgid "Only remove the commits from the local branch when in a checkout."
3398
msgstr ""
3399
3400
#: bzrlib/builtins.py:5421
3401
msgid "No revisions to uncommit.\n"
3402
msgstr ""
3403
3404
#: bzrlib/builtins.py:5436
3405
msgid "Dry-run, pretending to remove the above revisions.\n"
3406
msgstr ""
3407
3408
#: bzrlib/builtins.py:5439
3409
msgid "The above revision(s) will be removed.\n"
3410
msgstr ""
3411
3412
#: bzrlib/builtins.py:5443
3413
msgid "Uncommit these revisions"
3414
msgstr ""
3415
3416
#: bzrlib/builtins.py:5446
3417
msgid "Canceled\n"
3418
msgstr ""
3419
3420
#: bzrlib/builtins.py:5453
3421
#, python-format
3422
msgid ""
3423
"You can restore the old tip by running:\n"
3424
" bzr pull . -r revid:%s\n"
3425
msgstr ""
3426
3427
#: bzrlib/builtins.py:5458
3428
msgid "Break a dead lock."
3429
msgstr ""
3430
3431
#: bzrlib/builtins.py:5460
3432
msgid ""
3433
"This command breaks a lock on a repository, branch, working directory or\n"
3434
"config file."
3435
msgstr ""
3436
3437
#: bzrlib/builtins.py:5463
3438
msgid ""
3439
"CAUTION: Locks should only be broken when you are sure that the process\n"
3440
"holding the lock has been stopped."
3441
msgstr ""
3442
3443
#: bzrlib/builtins.py:5466
3444
msgid ""
3445
"You can get information on what locks are open via the 'bzr info\n"
3446
"[location]' command."
3447
msgstr ""
3448
3449
#: bzrlib/builtins.py:5469
3450
msgid ""
3451
":Examples:\n"
3452
" bzr break-lock\n"
3453
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3454
" bzr break-lock --conf ~/.bazaar"
3455
msgstr ""
3456
3457
# help of 'config' option of 'break-lock' command
3458
#: bzrlib/builtins.py:5478
3459
msgid "LOCATION is the directory where the config lock is."
3460
msgstr ""
3461
3462
# help of 'force' option of 'break-lock' command
3463
#: bzrlib/builtins.py:5480
3464
msgid "Do not ask for confirmation before breaking the lock."
3465
msgstr ""
3466
3467
# help of 'protocol=bzr' option of 'serve' command
3468
#: bzrlib/builtins.py:5515
3469
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3470
msgstr ""
3471
3472
#: bzrlib/builtins.py:5516
3473
msgid "Run the bzr server."
3474
msgstr ""
3475
3476
# help of 'inet' option of 'serve' command
3477
#: bzrlib/builtins.py:5522
3478
msgid "Serve on stdin/out for use from inetd or sshd."
3479
msgstr ""
3480
3481
# title of 'protocol' option of 'serve' command
3482
#: bzrlib/builtins.py:5523
3483
msgid "protocol"
3484
msgstr ""
3485
3486
# help of 'protocol' option of 'serve' command
3487
#: bzrlib/builtins.py:5524
3488
msgid "Protocol to serve."
3489
msgstr ""
3490
3491
# help of 'listen' option of 'serve' command
3492
#: bzrlib/builtins.py:5528
3493
msgid "Listen for connections on nominated address."
3494
msgstr ""
3495
3496
# help of 'port' option of 'serve' command
3497
#: bzrlib/builtins.py:5530
3498
msgid ""
3499
"Listen for connections on nominated port. Passing 0 as the port number will "
3500
"result in a dynamically allocated port. The default port depends on the "
3501
"protocol."
3502
msgstr ""
3503
3504
# help of 'directory' option of 'serve' command
3505
#: bzrlib/builtins.py:5535
3506
msgid "Serve contents of this directory."
3507
msgstr ""
3508
3509
# help of 'allow-writes' option of 'serve' command
3510
#: bzrlib/builtins.py:5537
3511
msgid ""
3512
"By default the server is a readonly server. Supplying --allow-writes "
3513
"enables write access to the contents of the served directory and below. "
3514
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3515
"of external authentication is arranged supplying this option leads to global "
3516
"uncontrolled write access to your file system."
3517
msgstr ""
3518
3519
# help of 'client-timeout' option of 'serve' command
3520
#: bzrlib/builtins.py:5546
3521
msgid "Override the default idle client timeout (5min)."
3522
msgstr ""
3523
3524
#: bzrlib/builtins.py:5564
3525
msgid "Combine a tree into its containing tree."
3526
msgstr ""
3527
3528
#: bzrlib/builtins.py:5566
3529
msgid "This command requires the target tree to be in a rich-root format."
3530
msgstr ""
3531
3532
#: bzrlib/builtins.py:5568
3533
msgid ""
3534
"The TREE argument should be an independent tree, inside another tree, but\n"
3535
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3536
"running \"bzr branch\" with the target inside a tree.)"
3537
msgstr ""
3538
3539
#: bzrlib/builtins.py:5572
3540
msgid ""
3541
"The result is a combined tree, with the subtree no longer an independent\n"
3542
"part. This is marked as a merge of the subtree into the containing tree,\n"
3543
"and all history is preserved."
3544
msgstr ""
3545
3546
#: bzrlib/builtins.py:5590
3547
#, python-format
3548
msgid ""
3549
"Can't join trees because %s doesn't support rich root data.\n"
3550
"You can use bzr upgrade on the repository."
3551
msgstr ""
3552
3553
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3554
msgid "Cannot join {0}. {1}"
3555
msgstr ""
3556
3557
#: bzrlib/builtins.py:5610
3558
msgid "Split a subdirectory of a tree into a separate tree."
3559
msgstr ""
3560
3561
#: bzrlib/builtins.py:5612
3562
msgid ""
3563
"This command will produce a target tree in a format that supports\n"
3564
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3565
"converted into earlier formats like 'dirstate-tags'."
3566
msgstr ""
3567
3568
#: bzrlib/builtins.py:5616
3569
msgid ""
3570
"The TREE argument should be a subdirectory of a working tree. That\n"
3571
"subdirectory will be converted into an independent tree, with its own\n"
3572
"branch. Commits in the top-level tree will not apply to the new subtree."
3573
msgstr ""
3574
3575
#: bzrlib/builtins.py:5696
3576
msgid "No submit branch specified or known"
3577
msgstr ""
3578
3579
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3580
msgid "No public branch specified or known"
3581
msgstr ""
3582
3583
#: bzrlib/builtins.py:5710
3584
msgid "bzr merge-directive takes at most two one revision identifiers"
3585
msgstr ""
3586
3587
#: bzrlib/builtins.py:5719
3588
msgid "No revisions to bundle."
3589
msgstr ""
3590
3591
#: bzrlib/builtins.py:5738
3592
msgid "Mail or create a merge-directive for submitting changes."
3593
msgstr ""
3594
3595
#: bzrlib/builtins.py:5740
3596
msgid "A merge directive provides many things needed for requesting merges:"
3597
msgstr ""
3598
3599
#: bzrlib/builtins.py:5742
3600
msgid "* A machine-readable description of the merge to perform"
3601
msgstr ""
3602
3603
#: bzrlib/builtins.py:5744
3604
msgid "* An optional patch that is a preview of the changes requested"
3605
msgstr ""
3606
3607
#: bzrlib/builtins.py:5746
3608
msgid ""
3609
"* An optional bundle of revision data, so that the changes can be applied\n"
3610
" directly from the merge directive, without retrieving data from a\n"
3611
" branch."
3612
msgstr ""
3613
3614
#: bzrlib/builtins.py:5750
3615
msgid ""
3616
"`bzr send` creates a compact data set that, when applied using bzr\n"
3617
"merge, has the same effect as merging from the source branch. "
3618
msgstr ""
3619
3620
#: bzrlib/builtins.py:5753
3621
msgid ""
3622
"By default the merge directive is self-contained and can be applied to any\n"
3623
"branch containing submit_branch in its ancestory without needing access to\n"
3624
"the source branch."
3625
msgstr ""
3626
3627
#: bzrlib/builtins.py:5757
3628
msgid ""
3629
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3630
"revisions, but only a structured request to merge from the\n"
3631
"public_location. In that case the public_branch is needed and it must be\n"
3632
"up-to-date and accessible to the recipient. The public_branch is always\n"
3633
"included if known, so that people can check it later."
3634
msgstr ""
3635
3636
#: bzrlib/builtins.py:5763
3637
msgid ""
3638
"The submit branch defaults to the parent of the source branch, but can be\n"
3639
"overridden. Both submit branch and public branch will be remembered in\n"
3640
"branch.conf the first time they are used for a particular branch. The\n"
3641
"source branch defaults to that containing the working directory, but can\n"
3642
"be changed using --from."
3643
msgstr ""
3644
3645
#: bzrlib/builtins.py:5769
3646
msgid ""
3647
"Both the submit branch and the public branch follow the usual behavior with\n"
3648
"respect to --remember: If there is no default location set, the first send\n"
3649
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3650
"omit the location to use the default. To change the default, use\n"
3651
"--remember. The value will only be saved if the location can be accessed."
3652
msgstr ""
3653
3654
#: bzrlib/builtins.py:5775
3655
msgid ""
3656
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3657
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3658
"If a public location is known for the submit_branch, that location is used\n"
3659
"in the merge directive."
3660
msgstr ""
3661
3662
#: bzrlib/builtins.py:5780
3663
msgid ""
3664
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3665
"given, in which case it is sent to a file."
3666
msgstr ""
3667
3668
#: bzrlib/builtins.py:5783
3669
msgid ""
3670
"Mail is sent using your preferred mail program. This should be transparent\n"
3671
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3672
"If the preferred client can't be found (or used), your editor will be used."
3673
msgstr ""
3674
3675
#: bzrlib/builtins.py:5787
3676
msgid ""
3677
"To use a specific mail program, set the mail_client configuration option.\n"
3678
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3679
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
3680
"\" (MacOS X's\n"
3681
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3682
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3683
"add\n"
3684
"supported clients."
3685
msgstr ""
3686
3687
#: bzrlib/builtins.py:5794
3688
msgid ""
3689
"If mail is being sent, a to address is required. This can be supplied\n"
3690
"either on the commandline, by setting the submit_to configuration\n"
3691
"option in the branch itself or the child_submit_to configuration option\n"
3692
"in the submit branch."
3693
msgstr ""
3694
3695
#: bzrlib/builtins.py:5799
3696
msgid ""
3697
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3698
"and\n"
3699
"merge directive format 2. It is significantly faster and smaller than\n"
3700
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3701
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3702
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3703
msgstr ""
3704
3705
#: bzrlib/builtins.py:5805
3706
msgid ""
3707
"The merge directives created by bzr send may be applied using bzr merge or\n"
3708
"bzr pull by specifying a file containing a merge directive as the location."
3709
msgstr ""
3710
3711
#: bzrlib/builtins.py:5808
3712
msgid ""
3713
"bzr send makes extensive use of public locations to map local locations "
3714
"into\n"
3715
"URLs that can be used by other people. See `bzr help configuration` to\n"
3716
"set them, and use `bzr info` to display them."
3717
msgstr ""
3718
3719
# help of 'output' option of 'send' command
3720
#: bzrlib/builtins.py:5832
3721
msgid "Write merge directive to this file or directory; use - for stdout."
3722
msgstr ""
3723
3724
# help of 'strict' option of 'send' command
3725
#: bzrlib/builtins.py:5836
3726
msgid ""
3727
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3728
"strict disables the check."
3729
msgstr ""
3730
3731
# help of 'mail-to' option of 'send' command
3732
#: bzrlib/builtins.py:5838
3733
msgid "Mail the request to this address."
3734
msgstr ""
3735
3736
# help of 'body' option of 'send' command
3737
#: bzrlib/builtins.py:5842
3738
msgid "Body for the email."
3739
msgstr ""
3740
3741
# help of 'no-bundle' option of 'send' command
3742
#: bzrlib/builtins.py:5895
3743
msgid "Do not include a bundle in the merge directive."
3744
msgstr ""
3745
3746
# help of 'no-patch' option of 'send' command
3747
#: bzrlib/builtins.py:5896
3748
msgid "Do not include a preview patch in the merge directive."
3749
msgstr ""
3750
3751
# help of 'remember' option of 'send' command
3752
#: bzrlib/builtins.py:5899
3753
msgid "Remember submit and public branch."
3754
msgstr ""
3755
3756
# help of 'from' option of 'send' command
3757
#: bzrlib/builtins.py:5901
3758
msgid ""
3759
"Branch to generate the submission from, rather than the one containing the "
3760
"working directory."
3761
msgstr ""
3762
3763
# title of 'format' option of 'send' command
3764
# title of 'format' option of 'version-info' command
3765
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3766
msgid "format"
3767
msgstr ""
3768
3769
# help of 'format' option of 'send' command
3770
#: bzrlib/builtins.py:5912
3771
msgid "Use the specified output format."
3772
msgstr ""
3773
3774
#: bzrlib/builtins.py:5934
3775
msgid "Create, remove or modify a tag naming a revision."
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:5936
3779
msgid ""
3780
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3781
"(--revision) option can be given -rtag:X, where X is any previously\n"
3782
"created tag."
3783
msgstr ""
3784
3785
#: bzrlib/builtins.py:5940
3786
msgid ""
3787
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3788
"along when you branch, push, pull or merge."
3789
msgstr ""
3790
3791
#: bzrlib/builtins.py:5943
3792
msgid ""
3793
"It is an error to give a tag name that already exists unless you pass\n"
3794
"--force, in which case the tag is moved to point to the new revision."
3795
msgstr ""
3796
3797
#: bzrlib/builtins.py:5946
3798
msgid ""
3799
"To rename a tag (change the name but keep it on the same revsion), run "
3800
"``bzr\n"
3801
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3802
msgstr ""
3803
3804
#: bzrlib/builtins.py:5949
3805
msgid ""
3806
"If no tag name is specified it will be determined through the \n"
3807
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3808
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3809
"details."
3810
msgstr ""
3811
3812
# help of 'delete' option of 'tag' command
3813
#: bzrlib/builtins.py:5959
3814
msgid "Delete this tag rather than placing it."
3815
msgstr ""
3816
3817
# help of 'directory' option of 'tag' command
3818
#: bzrlib/builtins.py:5962
3819
msgid "Branch in which to place the tag."
3820
msgstr ""
3821
3822
# help of 'force' option of 'tag' command
3823
#: bzrlib/builtins.py:5964
3824
msgid "Replace existing tags."
3825
msgstr ""
3826
3827
#: bzrlib/builtins.py:5979
3828
msgid "No tag specified to delete."
3829
msgstr ""
3830
3831
#: bzrlib/builtins.py:5981
3832
#, python-format
3833
msgid "Deleted tag %s."
3834
msgstr ""
3835
3836
#: bzrlib/builtins.py:5995
3837
msgid "Please specify a tag name."
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:6003
3841
#, python-format
3842
msgid "Tag %s already exists for that revision."
3843
msgstr ""
3844
3845
#: bzrlib/builtins.py:6007
3846
#, python-format
3847
msgid "Created tag %s."
3848
msgstr ""
3849
3850
#: bzrlib/builtins.py:6009
3851
#, python-format
3852
msgid "Updated tag %s."
3853
msgstr ""
3854
3855
#: bzrlib/builtins.py:6013
3856
msgid "List tags."
3857
msgstr ""
3858
3859
#: bzrlib/builtins.py:6015
3860
msgid ""
3861
"This command shows a table of tag names and the revisions they reference."
3862
msgstr ""
3863
3864
# help of 'directory' option of 'tags' command
3865
#: bzrlib/builtins.py:6021
3866
msgid "Branch whose tags should be displayed."
3867
msgstr ""
3868
3869
# help of 'sort' option of 'tags' command
3870
#: bzrlib/builtins.py:6023
3871
msgid "Sort tags by different criteria."
3872
msgstr ""
3873
3874
# title of 'sort' option of 'tags' command
3875
#: bzrlib/builtins.py:6023
3876
msgid "Sorting"
3877
msgstr ""
3878
3879
#: bzrlib/builtins.py:6092
3880
msgid "Reconfigure the type of a bzr directory."
3881
msgstr ""
3882
3883
#: bzrlib/builtins.py:6094
3884
msgid "A target configuration must be specified."
3885
msgstr ""
3886
3887
#: bzrlib/builtins.py:6096
3888
msgid ""
3889
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3890
"The order of preference is\n"
3891
"1. For a lightweight checkout, the current bound location.\n"
3892
"2. For branches that used to be checkouts, the previously-bound location.\n"
3893
"3. The push location.\n"
3894
"4. The parent location.\n"
3895
"If none of these is available, --bind-to must be specified."
3896
msgstr ""
3897
3898
# title of 'tree_type' option of 'reconfigure' command
3899
#: bzrlib/builtins.py:6110
3900
msgid "Tree type"
3901
msgstr ""
3902
3903
# help of 'tree_type' option of 'reconfigure' command
3904
#: bzrlib/builtins.py:6111
3905
msgid "The relation between branch and tree."
3906
msgstr ""
3907
3908
# help of 'tree_type=branch' option of 'reconfigure' command
3909
#: bzrlib/builtins.py:6113
3910
msgid "Reconfigure to be an unbound branch with no working tree."
3911
msgstr ""
3912
3913
# help of 'tree_type=tree' option of 'reconfigure' command
3914
#: bzrlib/builtins.py:6114
3915
msgid "Reconfigure to be an unbound branch with a working tree."
3916
msgstr ""
3917
3918
# help of 'tree_type=checkout' option of 'reconfigure' command
3919
#: bzrlib/builtins.py:6115
3920
msgid "Reconfigure to be a bound branch with a working tree."
3921
msgstr ""
3922
3923
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3924
#: bzrlib/builtins.py:6116
3925
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3926
msgstr ""
3927
3928
# title of 'repository_type' option of 'reconfigure' command
3929
#: bzrlib/builtins.py:6121
3930
msgid "Repository type"
3931
msgstr ""
3932
3933
# help of 'repository_type' option of 'reconfigure' command
3934
#: bzrlib/builtins.py:6122
3935
msgid "Location fo the repository."
3936
msgstr ""
3937
3938
# help of 'repository_type=standalone' option of 'reconfigure' command
3939
#: bzrlib/builtins.py:6124
3940
msgid ""
3941
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3942
msgstr ""
3943
3944
# help of 'repository_type=use-shared' option of 'reconfigure' command
3945
#: bzrlib/builtins.py:6126
3946
msgid "Reconfigure to use a shared repository."
3947
msgstr ""
3948
3949
# title of 'repository_trees' option of 'reconfigure' command
3950
#: bzrlib/builtins.py:6130
3951
msgid "Trees in Repository"
3952
msgstr ""
3953
3954
# help of 'repository_trees' option of 'reconfigure' command
3955
#: bzrlib/builtins.py:6131
3956
msgid "Whether new branches in the repository have trees."
3957
msgstr ""
3958
3959
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3960
#: bzrlib/builtins.py:6133
3961
msgid "Reconfigure repository to create working trees on branches by default."
3962
msgstr ""
3963
3964
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3965
#: bzrlib/builtins.py:6135
3966
msgid ""
3967
"Reconfigure repository to not create working trees on branches by default."
3968
msgstr ""
3969
3970
# help of 'bind-to' option of 'reconfigure' command
3971
#: bzrlib/builtins.py:6138
3972
msgid "Branch to bind checkout to."
3973
msgstr ""
3974
3975
# help of 'force' option of 'reconfigure' command
3976
#: bzrlib/builtins.py:6140
3977
msgid "Perform reconfiguration even if local changes will be lost."
3978
msgstr ""
3979
3980
# help of 'stacked-on' option of 'reconfigure' command
3981
#: bzrlib/builtins.py:6143
3982
msgid "Reconfigure a branch to be stacked on another branch."
3983
msgstr ""
3984
3985
# help of 'unstacked' option of 'reconfigure' command
3986
#: bzrlib/builtins.py:6147
3987
msgid ""
3988
"Reconfigure a branch to be unstacked. This may require copying substantial "
3989
"data into it."
3990
msgstr ""
3991
3992
#: bzrlib/builtins.py:6157
3993
msgid "Can't use both --stacked-on and --unstacked"
3994
msgstr ""
3995
3996
#: bzrlib/builtins.py:6171
3997
msgid "No target configuration specified"
3998
msgstr ""
3999
4000
#: bzrlib/builtins.py:6206
4001
msgid "Set the branch of a checkout and update."
4002
msgstr ""
4003
4004
#: bzrlib/builtins.py:6208
4005
msgid ""
4006
"For lightweight checkouts, this changes the branch being referenced.\n"
4007
"For heavyweight checkouts, this checks that there are no local commits\n"
4008
"versus the current bound branch, then it makes the local branch a mirror\n"
4009
"of the new location and binds to it."
4010
msgstr ""
4011
4012
#: bzrlib/builtins.py:6213
4013
msgid ""
4014
"In both cases, the working tree is updated and uncommitted changes\n"
4015
"are merged. The user can commit or revert these as they desire."
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:6216
4019
msgid "Pending merges need to be committed or reverted before using switch."
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:6218
4023
msgid ""
4024
"The path to the branch to switch to can be specified relative to the parent\n"
4025
"directory of the current branch. For example, if you are currently in a\n"
4026
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4027
"/path/to/newbranch."
4028
msgstr ""
4029
4030
#: bzrlib/builtins.py:6223
4031
msgid ""
4032
"Bound branches use the nickname of its master branch unless it is set\n"
4033
"locally, in which case switching will update the local nickname to be\n"
4034
"that of the master."
4035
msgstr ""
4036
4037
# help of 'force' option of 'switch' command
4038
#: bzrlib/builtins.py:6231
4039
msgid "Switch even if local commits will be lost."
4040
msgstr ""
4041
4042
# help of 'create-branch' option of 'switch' command
4043
#: bzrlib/builtins.py:6234
4044
msgid "Create the target branch from this one before switching to it."
4045
msgstr ""
4046
4047
#: bzrlib/builtins.py:6248
4048
msgid "You must supply either a revision or a location"
4049
msgstr ""
4050
4051
#: bzrlib/builtins.py:6261
4052
msgid "cannot create branch without source branch"
4053
msgstr ""
4054
4055
#: bzrlib/builtins.py:6286
4056
msgid "Manage filtered views."
4057
msgstr ""
4058
4059
#: bzrlib/builtins.py:6288
4060
msgid ""
4061
"Views provide a mask over the tree so that users can focus on\n"
4062
"a subset of a tree when doing their work. After creating a view,\n"
4063
"commands that support a list of files - status, diff, commit, etc -\n"
4064
"effectively have that list of files implicitly given each time.\n"
4065
"An explicit list of files can still be given but those files\n"
4066
"must be within the current view."
4067
msgstr ""
4068
4069
#: bzrlib/builtins.py:6295
4070
msgid ""
4071
"In most cases, a view has a short life-span: it is created to make\n"
4072
"a selected change and is deleted once that change is committed.\n"
4073
"At other times, you may wish to create one or more named views\n"
4074
"and switch between them."
4075
msgstr ""
4076
4077
#: bzrlib/builtins.py:6300
4078
msgid ""
4079
"To disable the current view without deleting it, you can switch to\n"
4080
"the pseudo view called ``off``. This can be useful when you need\n"
4081
"to see the whole tree for an operation or two (e.g. merge) but\n"
4082
"want to switch back to your view after that."
4083
msgstr ""
4084
4085
#: bzrlib/builtins.py:6305
4086
msgid ""
4087
":Examples:\n"
4088
" To define the current view::"
4089
msgstr ""
4090
4091
#: bzrlib/builtins.py:6308
4092
msgid " bzr view file1 dir1 ..."
4093
msgstr ""
4094
4095
#: bzrlib/builtins.py:6310
4096
msgid " To list the current view::"
4097
msgstr ""
4098
4099
#: bzrlib/builtins.py:6312
4100
msgid " bzr view"
4101
msgstr ""
4102
4103
#: bzrlib/builtins.py:6314
4104
msgid " To delete the current view::"
4105
msgstr ""
4106
4107
#: bzrlib/builtins.py:6316
4108
msgid " bzr view --delete"
4109
msgstr ""
4110
4111
#: bzrlib/builtins.py:6318
4112
msgid " To disable the current view without deleting it::"
4113
msgstr ""
4114
4115
#: bzrlib/builtins.py:6320
4116
msgid " bzr view --switch off"
4117
msgstr ""
4118
4119
#: bzrlib/builtins.py:6322
4120
msgid " To define a named view and switch to it::"
4121
msgstr ""
4122
4123
#: bzrlib/builtins.py:6324
4124
msgid " bzr view --name view-name file1 dir1 ..."
4125
msgstr ""
4126
4127
#: bzrlib/builtins.py:6326
4128
msgid " To list a named view::"
4129
msgstr ""
4130
4131
#: bzrlib/builtins.py:6328
4132
msgid " bzr view --name view-name"
4133
msgstr ""
4134
4135
#: bzrlib/builtins.py:6330
4136
msgid " To delete a named view::"
4137
msgstr ""
4138
4139
#: bzrlib/builtins.py:6332
4140
msgid " bzr view --name view-name --delete"
4141
msgstr ""
4142
4143
#: bzrlib/builtins.py:6334
4144
msgid " To switch to a named view::"
4145
msgstr ""
4146
4147
#: bzrlib/builtins.py:6336
4148
msgid " bzr view --switch view-name"
4149
msgstr ""
4150
4151
#: bzrlib/builtins.py:6338
4152
msgid " To list all views defined::"
4153
msgstr ""
4154
4155
#: bzrlib/builtins.py:6340
4156
msgid " bzr view --all"
4157
msgstr ""
4158
4159
#: bzrlib/builtins.py:6342
4160
msgid " To delete all views::"
4161
msgstr ""
4162
4163
#: bzrlib/builtins.py:6344
4164
msgid " bzr view --delete --all"
4165
msgstr ""
4166
4167
# help of 'all' option of 'view' command
4168
#: bzrlib/builtins.py:6351
4169
msgid "Apply list or delete action to all views."
4170
msgstr ""
4171
4172
# help of 'delete' option of 'view' command
4173
#: bzrlib/builtins.py:6354
4174
msgid "Delete the view."
4175
msgstr ""
4176
4177
# help of 'name' option of 'view' command
4178
#: bzrlib/builtins.py:6357
4179
msgid "Name of the view to define, list or delete."
4180
msgstr ""
4181
4182
# help of 'switch' option of 'view' command
4183
#: bzrlib/builtins.py:6361
4184
msgid "Name of the view to switch to."
4185
msgstr ""
4186
4187
#: bzrlib/builtins.py:6380
4188
msgid "Both --delete and a file list specified"
4189
msgstr ""
4190
4191
#: bzrlib/builtins.py:6383
4192
msgid "Both --delete and --switch specified"
4193
msgstr ""
4194
4195
#: bzrlib/builtins.py:6386
4196
msgid "Deleted all views.\n"
4197
msgstr ""
4198
4199
#: bzrlib/builtins.py:6388
4200
msgid "No current view to delete"
4201
msgstr ""
4202
4203
#: bzrlib/builtins.py:6391
4204
#, python-format
4205
msgid "Deleted '%s' view.\n"
4206
msgstr ""
4207
4208
#: bzrlib/builtins.py:6395
4209
msgid "Both --switch and a file list specified"
4210
msgstr ""
4211
4212
#: bzrlib/builtins.py:6398
4213
msgid "Both --switch and --all specified"
4214
msgstr ""
4215
4216
#: bzrlib/builtins.py:6401
4217
msgid "No current view to disable"
4218
msgstr ""
4219
4220
#: bzrlib/builtins.py:6403
4221
#, python-format
4222
msgid "Disabled '%s' view.\n"
4223
msgstr ""
4224
4225
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4226
msgid "Using '{0}' view: {1}\n"
4227
msgstr ""
4228
4229
#: bzrlib/builtins.py:6410
4230
msgid "Views defined:\n"
4231
msgstr ""
4232
4233
#: bzrlib/builtins.py:6419
4234
msgid "No views defined.\n"
4235
msgstr ""
4236
4237
#: bzrlib/builtins.py:6426
4238
msgid "Cannot change the 'off' pseudo view"
4239
msgstr ""
4240
4241
#: bzrlib/builtins.py:6434
4242
msgid "No current view.\n"
4243
msgstr ""
4244
4245
#: bzrlib/builtins.py:6437
4246
msgid "'{0}' view is: {1}\n"
4247
msgstr ""
4248
4249
#: bzrlib/builtins.py:6457
4250
msgid " <no hooks installed>\n"
4251
msgstr ""
4252
4253
#: bzrlib/builtins.py:6461
4254
msgid "Remove a branch."
4255
msgstr ""
4256
4257
#: bzrlib/builtins.py:6463
4258
msgid ""
4259
"This will remove the branch from the specified location but \n"
4260
"will keep any working tree or repository in place."
4261
msgstr ""
4262
4263
#: bzrlib/builtins.py:6468
4264
msgid " Remove the branch at repo/trunk::"
4265
msgstr ""
4266
4267
#: bzrlib/builtins.py:6470
4268
msgid " bzr remove-branch repo/trunk"
4269
msgstr ""
4270
4271
# help of 'force' option of 'remove-branch' command
4272
#: bzrlib/builtins.py:6477
4273
msgid "Remove branch even if it is the active branch."
4274
msgstr ""
4275
4276
#: bzrlib/builtins.py:6491
4277
msgid "Branch is active. Use --force to remove it."
4278
msgstr ""
4279
4280
# help of 'writer=plain' option of 'shelve' command
4281
#: bzrlib/builtins.py:6495
4282
msgid "Plaintext diff output."
4283
msgstr ""
4284
4285
#: bzrlib/builtins.py:6496
4286
msgid "Temporarily set aside some changes from the current tree."
4287
msgstr ""
4288
4289
#: bzrlib/builtins.py:6498
4290
msgid ""
4291
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4292
"ie. out of the way, until a later time when you can bring them back from\n"
4293
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4294
"your working tree, and so they aren't propagated along with your branch nor\n"
4295
"will they survive its deletion."
4296
msgstr ""
4297
4298
#: bzrlib/builtins.py:6504
4299
msgid "If shelve --list is specified, previously-shelved changes are listed."
4300
msgstr ""
4301
4302
#: bzrlib/builtins.py:6506
4303
msgid ""
4304
"Shelve is intended to help separate several sets of changes that have\n"
4305
"been inappropriately mingled. If you just want to get rid of all changes\n"
4306
"and you don't need to restore them later, use revert. If you want to\n"
4307
"shelve all text changes at once, use shelve --all."
4308
msgstr ""
4309
4310
#: bzrlib/builtins.py:6511
4311
msgid ""
4312
"If filenames are specified, only the changes to those files will be\n"
4313
"shelved. Other files will be left untouched."
4314
msgstr ""
4315
4316
#: bzrlib/builtins.py:6514
4317
msgid ""
4318
"If a revision is specified, changes since that revision will be shelved."
4319
msgstr ""
4320
4321
#: bzrlib/builtins.py:6516
4322
msgid ""
4323
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4324
"restore the most recently shelved changes."
4325
msgstr ""
4326
4327
#: bzrlib/builtins.py:6519
4328
msgid ""
4329
"For complicated changes, it is possible to edit the changes in a separate\n"
4330
"editor program to decide what the file remaining in the working copy\n"
4331
"should look like. To do this, add the configuration option"
4332
msgstr ""
4333
4334
#: bzrlib/builtins.py:6523
4335
msgid " change_editor = PROGRAM @new_path @old_path"
4336
msgstr ""
4337
4338
#: bzrlib/builtins.py:6525
4339
msgid ""
4340
"where @new_path is replaced with the path of the new version of the \n"
4341
"file and @old_path is replaced with the path of the old version of \n"
4342
"the file. The PROGRAM should save the new file with the desired \n"
4343
"contents of the file in the working tree.\n"
4344
" "
4345
msgstr ""
4346
4347
# help of 'all' option of 'shelve' command
4348
#: bzrlib/builtins.py:6537
4349
msgid "Shelve all changes."
4350
msgstr ""
4351
4352
# help of 'writer' option of 'shelve' command
4353
#: bzrlib/builtins.py:6539
4354
msgid "Method to use for writing diffs."
4355
msgstr ""
4356
4357
# title of 'writer' option of 'shelve' command
4358
#: bzrlib/builtins.py:6539
4359
msgid "writer"
4360
msgstr ""
4361
4362
# help of 'list' option of 'shelve' command
4363
#: bzrlib/builtins.py:6543
4364
msgid "List shelved changes."
4365
msgstr ""
4366
4367
# help of 'destroy' option of 'shelve' command
4368
#: bzrlib/builtins.py:6545
4369
msgid "Destroy removed changes instead of shelving them."
4370
msgstr ""
4371
4372
#: bzrlib/builtins.py:6574
4373
msgid "No shelved changes."
4374
msgstr ""
4375
4376
#: bzrlib/builtins.py:6585
4377
msgid "Restore shelved changes."
4378
msgstr ""
4379
4380
#: bzrlib/builtins.py:6587
4381
msgid ""
4382
"By default, the most recently shelved changes are restored. However if you\n"
4383
"specify a shelf by id those changes will be restored instead. This works\n"
4384
"best when the changes don't depend on each other."
4385
msgstr ""
4386
4387
# help of 'action' option of 'unshelve' command
4388
#: bzrlib/builtins.py:6596
4389
msgid "The action to perform."
4390
msgstr ""
4391
4392
# title of 'action' option of 'resolve' command
4393
# title of 'action' option of 'unshelve' command
4394
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4395
msgid "action"
4396
msgstr ""
4397
4398
# help of 'action=apply' option of 'unshelve' command
4399
#: bzrlib/builtins.py:6598
4400
msgid "Apply changes and remove from the shelf."
4401
msgstr ""
4402
4403
# help of 'action=dry-run' option of 'unshelve' command
4404
#: bzrlib/builtins.py:6599
4405
msgid "Show changes, but do not apply or remove them."
4406
msgstr ""
4407
4408
# help of 'action=preview' option of 'unshelve' command
4409
#: bzrlib/builtins.py:6600
4410
msgid ""
4411
"Instead of unshelving the changes, show the diff that would result from "
4412
"unshelving."
4413
msgstr ""
4414
4415
# help of 'action=delete-only' option of 'unshelve' command
4416
#: bzrlib/builtins.py:6602
4417
msgid "Delete changes without applying them."
4418
msgstr ""
4419
4420
# help of 'action=keep' option of 'unshelve' command
4421
#: bzrlib/builtins.py:6603
4422
msgid "Apply changes but don't delete them."
4423
msgstr ""
4424
4425
#: bzrlib/builtins.py:6618
4426
msgid "Remove unwanted files from working tree."
4427
msgstr ""
4428
4429
#: bzrlib/builtins.py:6620
4430
msgid ""
4431
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4432
"files are never deleted."
4433
msgstr ""
4434
4435
#: bzrlib/builtins.py:6623
4436
msgid ""
4437
"Another class is 'detritus', which includes files emitted by bzr during\n"
4438
"normal operations and selftests. (The value of these files decreases with\n"
4439
"time.)"
4440
msgstr ""
4441
4442
#: bzrlib/builtins.py:6627
4443
msgid ""
4444
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4445
"flags are respected, and may be combined."
4446
msgstr ""
4447
4448
#: bzrlib/builtins.py:6630
4449
msgid "To check what clean-tree will do, use --dry-run."
4450
msgstr ""
4451
4452
# help of 'ignored' option of 'clean-tree' command
4453
#: bzrlib/builtins.py:6633
4454
msgid "Delete all ignored files."
4455
msgstr ""
4456
4457
# help of 'detritus' option of 'clean-tree' command
4458
#: bzrlib/builtins.py:6634
4459
msgid ""
4460
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4461
msgstr ""
4462
4463
# help of 'unknown' option of 'clean-tree' command
4464
#: bzrlib/builtins.py:6637
4465
msgid "Delete files unknown to bzr (default)."
4466
msgstr ""
4467
4468
# help of 'dry-run' option of 'clean-tree' command
4469
#: bzrlib/builtins.py:6638
4470
msgid "Show files to delete instead of deleting them."
4471
msgstr ""
4472
4473
# help of 'force' option of 'clean-tree' command
4474
#: bzrlib/builtins.py:6640
4475
msgid "Do not prompt before deleting."
4476
msgstr ""
4477
4478
#: bzrlib/bundle/__init__.py:59
4479
msgid "A directory cannot be a bundle"
4480
msgstr ""
4481
4482
#: bzrlib/bundle/apply_bundle.py:40
4483
msgid "Install revisions"
4484
msgstr ""
4485
4486
#: bzrlib/bundle/commands.py:64
4487
msgid "--verbose requires a merge directive"
4488
msgstr ""
4489
4490
#: bzrlib/bundle/commands.py:67
4491
msgid "Bundle format not supported"
4492
msgstr ""
4493
4494
#: bzrlib/bundle/commands.py:77
4495
msgid "Records\n"
4496
msgstr ""
4497
4498
#: bzrlib/bundle/commands.py:81
4499
msgid "{0}: {1} ({2} multiparent)\n"
4500
msgstr ""
4501
4502
#: bzrlib/bundle/commands.py:83
4503
#, python-format
4504
msgid "unique files: %d\n"
4505
msgstr ""
4506
4507
#: bzrlib/bundle/commands.py:92
4508
msgid "Revisions\n"
4509
msgstr ""
4510
4511
#: bzrlib/bundle/commands.py:93
4512
#, python-format
4513
msgid "nicks: %s\n"
4514
msgstr ""
4515
4516
#: bzrlib/bundle/commands.py:95
4517
#, python-format
4518
msgid ""
4519
"committers: \n"
4520
"%s\n"
4521
msgstr ""
4522
4523
#: bzrlib/bundle/commands.py:103
4524
msgid "Decoded contents\n"
4525
msgstr ""
4526
4527
#: bzrlib/bundle/serializer/v4.py:327
4528
#, python-format
4529
msgid "Bundling %d revision."
4530
msgid_plural "Bundling %d revisions."
4531
msgstr[0] ""
4532
msgstr[1] ""
4533
4534
#: bzrlib/bzrdir.py:487
4535
msgid ""
4536
"making backup of {0}\n"
4537
" to {1}"
4538
msgstr ""
4539
4540
#: bzrlib/bzrdir.py:510
4541
msgid "renamed {0} to {1}"
4542
msgstr ""
4543
4544
#: bzrlib/bzrdir.py:1639
4545
#, python-format
4546
msgid ""
4547
"Source repository format does not support stacking, using format:\n"
4548
" %s"
4549
msgstr ""
4550
4551
#: bzrlib/bzrdir.py:1659
4552
#, python-format
4553
msgid ""
4554
"Source branch format does not support stacking, using format:\n"
4555
" %s"
4556
msgstr ""
4557
4558
#: bzrlib/bzrdir.py:1805
4559
msgid "starting repository conversion"
4560
msgstr ""
4561
4562
#: bzrlib/bzrdir.py:2026
4563
msgid "Using default stacking branch {0} at {1}"
4564
msgstr ""
4565
4566
#: bzrlib/check.py:108
4567
msgid "check"
4568
msgstr ""
4569
4570
#: bzrlib/check.py:110
4571
msgid "checking revisions"
4572
msgstr ""
4573
4574
#: bzrlib/check.py:112
4575
msgid "checking commit contents"
4576
msgstr ""
4577
4578
#: bzrlib/check.py:114
4579
msgid "checking file graphs"
4580
msgstr ""
4581
4582
#: bzrlib/check.py:118
4583
msgid "checking branches and trees"
4584
msgstr ""
4585
4586
#: bzrlib/check.py:205
4587
msgid "checked repository {0} format {1}"
4588
msgstr ""
4589
4590
#: bzrlib/check.py:208
4591
#, python-format
4592
msgid "%6d revisions"
4593
msgstr ""
4594
4595
#: bzrlib/check.py:209
4596
#, python-format
4597
msgid "%6d file-ids"
4598
msgstr ""
4599
4600
#: bzrlib/check.py:211
4601
#, python-format
4602
msgid "%6d unreferenced text versions"
4603
msgstr ""
4604
4605
#: bzrlib/check.py:215
4606
msgid "unreferenced version: {{{0}}} in {1}"
4607
msgstr ""
4608
4609
#: bzrlib/check.py:218
4610
#, python-format
4611
msgid "%6d revisions are missing inventory_sha1"
4612
msgstr ""
4613
4614
#: bzrlib/check.py:221
4615
#, python-format
4616
msgid "%6d revisions are mentioned but not present"
4617
msgstr ""
4618
4619
#: bzrlib/check.py:224
4620
#, python-format
4621
msgid "%6d ghost revisions"
4622
msgstr ""
4623
4624
#: bzrlib/check.py:229
4625
#, python-format
4626
msgid "%6d revisions missing parents in ancestry"
4627
msgstr ""
4628
4629
#: bzrlib/check.py:233
4630
#, python-format
4631
msgid " %s should be in the ancestry for:"
4632
msgstr ""
4633
4634
#: bzrlib/check.py:237
4635
#, python-format
4636
msgid "%6d inconsistent parents"
4637
msgstr ""
4638
4639
#: bzrlib/check.py:241
4640
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4641
msgstr ""
4642
4643
#: bzrlib/check.py:247
4644
#, python-format
4645
msgid "%6d revisions have incorrect parents in the revision index"
4646
msgstr ""
4647
4648
#: bzrlib/check.py:253
4649
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4650
msgstr ""
4651
4652
#: bzrlib/check.py:267
4653
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4654
msgstr ""
4655
4656
#: bzrlib/check.py:296
4657
msgid ""
4658
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4659
"{{{4}}}"
4660
msgstr ""
4661
4662
#: bzrlib/check.py:354
4663
#, python-format
4664
msgid "Checking branch at '%s'."
4665
msgstr ""
4666
4667
#: bzrlib/check.py:374
4668
#, python-format
4669
msgid "Checking working tree at '%s'."
4670
msgstr ""
4671
4672
#: bzrlib/check.py:427 bzrlib/check.py:441
4673
msgid "No branch found at specified location."
4674
msgstr ""
4675
4676
#: bzrlib/check.py:429 bzrlib/check.py:439
4677
msgid "No working tree found at specified location."
4678
msgstr ""
4679
4680
#: bzrlib/check.py:432
4681
#, python-format
4682
msgid "Checking repository at '%s'."
4683
msgstr ""
4684
4685
#: bzrlib/check.py:443
4686
msgid "No repository found at specified location."
4687
msgstr ""
4688
4689
#: bzrlib/clean_tree.py:63
4690
msgid "Nothing to delete."
4691
msgstr ""
4692
4693
#: bzrlib/clean_tree.py:68
4694
msgid "Are you sure you wish to delete these"
4695
msgstr ""
4696
4697
#: bzrlib/clean_tree.py:70
4698
msgid "Canceled"
4699
msgstr ""
4700
4701
#: bzrlib/clean_tree.py:107
4702
#, python-format
4703
msgid "unable to remove %s"
4704
msgstr ""
4705
4706
#: bzrlib/clean_tree.py:111
4707
msgid "deleting paths:"
4708
msgstr ""
4709
4710
#: bzrlib/clean_tree.py:125
4711
msgid "unable to remove \"{0}\": {1}."
4712
msgstr ""
4713
4714
#: bzrlib/clean_tree.py:130
4715
msgid "No files deleted."
4716
msgstr ""
4717
4718
#: bzrlib/cmd_version_info.py:47
4719
msgid "No known version info format {0}. Supported types are: {1}"
4720
msgstr ""
4721
4722
# help of 'format=custom' option of 'version-info' command
4723
#: bzrlib/cmd_version_info.py:52
4724
msgid "Version info in Custom template-based format."
4725
msgstr ""
4726
4727
# help of 'format=python' option of 'version-info' command
4728
#: bzrlib/cmd_version_info.py:52
4729
msgid "Version info in Python format."
4730
msgstr ""
4731
4732
# help of 'format=rio' option of 'version-info' command
4733
#: bzrlib/cmd_version_info.py:52
4734
msgid "Version info in RIO (simple text) format (default)."
4735
msgstr ""
4736
4737
#: bzrlib/cmd_version_info.py:53
4738
msgid "Show version information about this tree."
4739
msgstr ""
4740
4741
#: bzrlib/cmd_version_info.py:55
4742
msgid ""
4743
"You can use this command to add information about version into\n"
4744
"source code of an application. The output can be in one of the\n"
4745
"supported formats or in a custom format based on a template."
4746
msgstr ""
4747
4748
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4749
#: en/help_topics/configuration.txt:722
4750
msgid "For example::"
4751
msgstr ""
4752
4753
#: bzrlib/cmd_version_info.py:61
4754
msgid ""
4755
" bzr version-info --custom \\\n"
4756
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4757
msgstr ""
4758
4759
#: bzrlib/cmd_version_info.py:64
4760
msgid ""
4761
"will produce a C header file with formatted string containing the\n"
4762
"current revision number. Other supported variables in templates are:"
4763
msgstr ""
4764
4765
#: bzrlib/cmd_version_info.py:67
4766
msgid ""
4767
" * {date} - date of the last revision\n"
4768
" * {build_date} - current date\n"
4769
" * {revno} - revision number\n"
4770
" * {revision_id} - revision id\n"
4771
" * {branch_nick} - branch nickname\n"
4772
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4773
" otherwise 1"
4774
msgstr ""
4775
4776
# help of 'format' option of 'version-info' command
4777
#: bzrlib/cmd_version_info.py:77
4778
msgid "Select the output format."
4779
msgstr ""
4780
4781
# help of 'all' option of 'version-info' command
4782
#: bzrlib/cmd_version_info.py:81
4783
msgid "Include all possible information."
4784
msgstr ""
4785
4786
# help of 'check-clean' option of 'version-info' command
4787
#: bzrlib/cmd_version_info.py:82
4788
msgid "Check if tree is clean."
4789
msgstr ""
4790
4791
# help of 'include-history' option of 'version-info' command
4792
#: bzrlib/cmd_version_info.py:84
4793
msgid "Include the revision-history."
4794
msgstr ""
4795
4796
# help of 'include-file-revisions' option of 'version-info' command
4797
#: bzrlib/cmd_version_info.py:86
4798
msgid "Include the last revision for each file."
4799
msgstr ""
4800
4801
# help of 'template' option of 'version-info' command
4802
#: bzrlib/cmd_version_info.py:87
4803
msgid "Template for the output."
4804
msgstr ""
4805
4806
#: bzrlib/cmd_version_info.py:101
4807
msgid "bzr version-info --revision takes exactly one revision specifier"
4808
msgstr ""
4809
4810
#: bzrlib/commands.py:229
4811
#, python-format
4812
msgid "unknown command \"%s\""
4813
msgstr ""
4814
4815
#: bzrlib/commands.py:476
4816
msgid "No help for this command."
4817
msgstr ""
4818
4819
#: bzrlib/commands.py:489
4820
#, python-format
4821
msgid ":Purpose: %s\n"
4822
msgstr ""
4823
4824
#: bzrlib/commands.py:491
4825
#, python-format
4826
msgid ""
4827
":Usage:\n"
4828
"%s\n"
4829
msgstr ""
4830
4831
#: bzrlib/commands.py:493
4832
#, python-format
4833
msgid ":Usage: %s\n"
4834
msgstr ""
4835
4836
#: bzrlib/commands.py:512
4837
#, python-format
4838
msgid ":Options:%s"
4839
msgstr ""
4840
4841
#: bzrlib/commands.py:523
4842
#, python-format
4843
msgid ""
4844
":Description:\n"
4845
" %s\n"
4846
"\n"
4847
msgstr ""
4848
4849
#: bzrlib/commands.py:533
4850
#, python-format
4851
msgid ""
4852
"See bzr help %s for more details and examples.\n"
4853
"\n"
4854
msgstr ""
4855
4856
#: bzrlib/commands.py:538
4857
msgid ":Aliases: "
4858
msgstr ""
4859
4860
#: bzrlib/commands.py:542
4861
#, python-format
4862
msgid ":From: plugin \"%s\"\n"
4863
msgstr ""
4864
4865
#: bzrlib/commands.py:554
4866
msgid ":doc:`{0} <{1}-help>`"
4867
msgstr ""
4868
4869
#: bzrlib/commands.py:558
4870
#, python-format
4871
msgid ":See also: %s"
4872
msgstr ""
4873
4874
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4875
msgid "Only ASCII permitted in option names"
4876
msgstr ""
4877
4878
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4879
msgid "command {0!r} needs one or more {1}"
4880
msgstr ""
4881
4882
#: bzrlib/commands.py:868
4883
msgid "command {0!r} requires argument {1}"
4884
msgstr ""
4885
4886
#: bzrlib/commands.py:875
4887
msgid "extra argument to command {0}: {1}"
4888
msgstr ""
4889
4890
#: bzrlib/commands.py:972
4891
#, python-format
4892
msgid "Profile data written to \"%s\"."
4893
msgstr ""
4894
4895
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4896
msgid "added"
4897
msgstr ""
4898
4899
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4900
msgid "modified"
4901
msgstr ""
4902
4903
#: bzrlib/commit.py:131
4904
#, python-format
4905
msgid "Committing%s"
4906
msgstr ""
4907
4908
#: bzrlib/commit.py:134
4909
#, python-format
4910
msgid "Committed revision %d."
4911
msgstr ""
4912
4913
#: bzrlib/commit.py:143
4914
#, python-format
4915
msgid "deleted %s"
4916
msgstr ""
4917
4918
#: bzrlib/commit.py:146
4919
#, python-format
4920
msgid "missing %s"
4921
msgstr ""
4922
4923
#: bzrlib/commit.py:511
4924
msgid ""
4925
"Conflicting tags in bound branch:\n"
4926
"{0}"
4927
msgstr ""
4928
4929
#: bzrlib/commit.py:742
4930
msgid "renamed"
4931
msgstr ""
4932
4933
#: bzrlib/commit.py:976
4934
msgid "unchanged"
4935
msgstr ""
4936
4937
#: bzrlib/commit.py:998
4938
msgid "{0} [{1}] - Stage"
4939
msgstr ""
4940
4941
#: bzrlib/commit.py:1001
4942
#, python-format
4943
msgid "%s - Stage"
4944
msgstr ""
4945
4946
#: bzrlib/commit_signature_commands.py:34
4947
msgid "Sign all commits by a given committer."
4948
msgstr ""
4949
4950
#: bzrlib/commit_signature_commands.py:36
4951
msgid ""
4952
"If location is not specified the local tree is used.\n"
4953
"If committer is not specified the default committer is used."
4954
msgstr ""
4955
4956
#: bzrlib/commit_signature_commands.py:39
4957
msgid "This does not sign commits that already have signatures."
4958
msgstr ""
4959
4960
# help of 'dry-run' option of 'sign-my-commits' command
4961
#: bzrlib/commit_signature_commands.py:47
4962
msgid ""
4963
"Don't actually sign anything, just print the revisions that would be signed."
4964
msgstr ""
4965
4966
#: bzrlib/commit_signature_commands.py:98
4967
#, python-format
4968
msgid "Signed %d revision.\n"
4969
msgid_plural "Signed %d revisions.\n"
4970
msgstr[0] ""
4971
msgstr[1] ""
4972
4973
#: bzrlib/commit_signature_commands.py:103
4974
msgid "Verify all commit signatures."
4975
msgstr ""
4976
4977
#: bzrlib/commit_signature_commands.py:105
4978
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
4979
msgstr ""
4980
4981
# help of 'acceptable-keys' option of 'verify-signatures' command
4982
#: bzrlib/commit_signature_commands.py:110
4983
msgid ""
4984
"Comma separated list of GPG key patterns which are acceptable for "
4985
"verification."
4986
msgstr ""
4987
4988
#: bzrlib/commit_signature_commands.py:148
4989
msgid "Cannot verify a range of non-revision-history revisions"
4990
msgstr ""
4991
4992
#: bzrlib/commit_signature_commands.py:166
4993
msgid "All commits signed with verifiable keys"
4994
msgstr ""
4995
4996
#: bzrlib/config.py:436
4997
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4998
msgstr ""
4999
5000
#: bzrlib/config.py:2452
5001
msgid "{0} is not an SI unit."
5002
msgstr ""
5003
5004
#: bzrlib/config.py:2971
5005
msgid ""
5006
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5007
"will be saved."
5008
msgstr ""
5009
5010
#: bzrlib/config.py:3116
5011
#, python-format
5012
msgid "Invalid '%s', should be of the form 'name=value'"
5013
msgstr ""
5014
5015
#: bzrlib/config.py:4018
5016
msgid "Display, set or remove a configuration option."
5017
msgstr ""
5018
5019
#: bzrlib/config.py:4020
5020
msgid "Display the active value for a given option."
5021
msgstr ""
5022
5023
#: bzrlib/config.py:4022
5024
msgid ""
5025
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5026
"matching options are displayed mentioning their scope. The active value\n"
5027
"that bzr will take into account is the first one displayed for each option."
5028
msgstr ""
5029
5030
#: bzrlib/config.py:4026
5031
msgid "If no NAME is given, --all .* is implied."
5032
msgstr ""
5033
5034
#: bzrlib/config.py:4028
5035
msgid ""
5036
"Setting a value is achieved by using name=value without spaces. The value\n"
5037
"is set in the most relevant scope and can be checked by displaying the\n"
5038
"option again."
5039
msgstr ""
5040
5041
# help of 'scope' option of 'config' command
5042
#: bzrlib/config.py:4040
5043
msgid "Reduce the scope to the specified configuration file."
5044
msgstr ""
5045
5046
# help of 'all' option of 'config' command
5047
#: bzrlib/config.py:4044
5048
msgid "Display all the defined values for the matching options."
5049
msgstr ""
5050
5051
# help of 'remove' option of 'config' command
5052
#: bzrlib/config.py:4046
5053
msgid "Remove the option from the configuration file."
5054
msgstr ""
5055
5056
#: bzrlib/conflicts.py:50
5057
msgid "List files with conflicts."
5058
msgstr ""
5059
5060
#: bzrlib/conflicts.py:57
5061
msgid ""
5062
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5063
"is supplied, the pathnames of files with text conflicts are listed,\n"
5064
"instead. (This is useful for editing all files with text conflicts.)"
5065
msgstr ""
5066
5067
#: bzrlib/conflicts.py:61
5068
msgid "Use bzr resolve when you have fixed a problem."
5069
msgstr ""
5070
5071
# help of 'text' option of 'conflicts' command
5072
#: bzrlib/conflicts.py:66
5073
msgid "List paths of files with text conflicts."
5074
msgstr ""
5075
5076
# help of 'action=done' option of 'resolve' command
5077
#: bzrlib/conflicts.py:85
5078
msgid "Marks the conflict as resolved."
5079
msgstr ""
5080
5081
# help of 'action=take-this' option of 'resolve' command
5082
#: bzrlib/conflicts.py:88
5083
msgid "Resolve the conflict preserving the version in the working tree."
5084
msgstr ""
5085
5086
# help of 'action=take-other' option of 'resolve' command
5087
#: bzrlib/conflicts.py:91
5088
msgid "Resolve the conflict taking the merged version into account."
5089
msgstr ""
5090
5091
# help of 'action' option of 'resolve' command
5092
#: bzrlib/conflicts.py:98
5093
msgid "How to resolve the conflict."
5094
msgstr ""
5095
5096
#: bzrlib/conflicts.py:104
5097
msgid "Mark a conflict as resolved."
5098
msgstr ""
5099
5100
#: bzrlib/conflicts.py:111
5101
msgid ""
5102
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5103
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5104
"as\n"
5105
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5106
msgstr ""
5107
5108
# help of 'all' option of 'resolve' command
5109
#: bzrlib/conflicts.py:119
5110
msgid "Resolve all conflicts in this tree."
5111
msgstr ""
5112
5113
#: bzrlib/conflicts.py:126
5114
msgid "If --all is specified, no FILE may be provided"
5115
msgstr ""
5116
5117
#: bzrlib/conflicts.py:151
5118
#, python-format
5119
msgid "%d conflict auto-resolved."
5120
msgid_plural "%d conflicts auto-resolved."
5121
msgstr[0] ""
5122
msgstr[1] ""
5123
5124
#: bzrlib/conflicts.py:154
5125
msgid "Remaining conflicts:"
5126
msgstr ""
5127
5128
#: bzrlib/conflicts.py:159
5129
msgid "All conflicts resolved."
5130
msgstr ""
5131
5132
#: bzrlib/conflicts.py:168
5133
msgid "{0} conflict resolved, {1} remaining"
5134
msgid_plural "{0} conflicts resolved, {1} remaining"
5135
msgstr[0] ""
5136
msgstr[1] ""
5137
5138
#: bzrlib/controldir.py:712
5139
msgid "{0} is{1} redirected to {2}"
5140
msgstr ""
5141
5142
#: bzrlib/diff.py:399
5143
#, python-format
5144
msgid "*** Ignoring files outside view. View is %s"
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:157
5148
msgid "The tree builder is already building a tree."
5149
msgstr ""
5150
5151
#: bzrlib/errors.py:178
5152
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5153
msgstr ""
5154
5155
#: bzrlib/errors.py:197
5156
msgid ""
5157
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5158
"versions \"%(minimum)s\" to \"%(current)s\"."
5159
msgstr ""
5160
5161
#: bzrlib/errors.py:209
5162
msgid "The transport '%(transport)s' is only accessible within this process."
5163
msgstr ""
5164
5165
#: bzrlib/errors.py:227
5166
msgid "Invalid revision number %(revno)s"
5167
msgstr ""
5168
5169
#: bzrlib/errors.py:236
5170
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5171
msgstr ""
5172
5173
#: bzrlib/errors.py:247
5174
msgid "Reserved revision-id {%(revision_id)s}"
5175
msgstr ""
5176
5177
#: bzrlib/errors.py:261
5178
msgid "There is no public branch set for \"%(branch_url)s\"."
5179
msgstr ""
5180
5181
#: bzrlib/errors.py:271
5182
msgid ""
5183
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5184
"obtain a list of topics."
5185
msgstr ""
5186
5187
#: bzrlib/errors.py:280
5188
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5189
msgstr ""
5190
5191
#: bzrlib/errors.py:290
5192
msgid ""
5193
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5194
msgstr ""
5195
5196
#: bzrlib/errors.py:299
5197
msgid "The branch '%(branch)s' is not stacked."
5198
msgstr ""
5199
5200
#: bzrlib/errors.py:313
5201
msgid "No WorkingTree exists for \"%(base)s\"."
5202
msgstr ""
5203
5204
#: bzrlib/errors.py:322
5205
msgid "Not currently building a tree."
5206
msgstr ""
5207
5208
#: bzrlib/errors.py:327
5209
msgid "%(url)s is not a local path."
5210
msgstr ""
5211
5212
#: bzrlib/errors.py:355
5213
msgid "%(not_locked)r is not write locked but needs to be."
5214
msgstr ""
5215
5216
#: bzrlib/errors.py:363
5217
msgid "Error in command line options"
5218
msgstr ""
5219
5220
#: bzrlib/errors.py:368
5221
msgid "%(value)s is not an index of type %(_type)s."
5222
msgstr ""
5223
5224
#: bzrlib/errors.py:378
5225
msgid "Error in data for index %(value)s."
5226
msgstr ""
5227
5228
#: bzrlib/errors.py:387
5229
msgid "The key '%(key)s' is already in index '%(index)s'."
5230
msgstr ""
5231
5232
#: bzrlib/errors.py:397
5233
msgid "The key '%(key)s' is not a valid key."
5234
msgstr ""
5235
5236
#: bzrlib/errors.py:406
5237
msgid "Could not parse options for index %(value)s."
5238
msgstr ""
5239
5240
#: bzrlib/errors.py:415
5241
msgid "The value '%(value)s' is not a valid value."
5242
msgstr ""
5243
5244
#: bzrlib/errors.py:424
5245
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5246
msgstr ""
5247
5248
#: bzrlib/errors.py:443
5249
msgid "Generic path error: %(path)r%(extra)s)"
5250
msgstr ""
5251
5252
#: bzrlib/errors.py:456
5253
msgid "No such file: %(path)r%(extra)s"
5254
msgstr ""
5255
5256
#: bzrlib/errors.py:461
5257
msgid "File exists: %(path)r%(extra)s"
5258
msgstr ""
5259
5260
#: bzrlib/errors.py:467
5261
msgid ""
5262
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5263
"after to tell bzr about a rename that has already happened)%(extra)s"
5264
msgstr ""
5265
5266
#: bzrlib/errors.py:483
5267
msgid "\"%(path)s\" is not a directory %(extra)s"
5268
msgstr ""
5269
5270
#: bzrlib/errors.py:488
5271
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5272
msgstr ""
5273
5274
#: bzrlib/errors.py:493
5275
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5276
msgstr ""
5277
5278
#: bzrlib/errors.py:498
5279
msgid "Hard-linking \"%(path)s\" is not supported"
5280
msgstr ""
5281
5282
#: bzrlib/errors.py:513
5283
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5284
msgstr ""
5285
5286
#: bzrlib/errors.py:518
5287
msgid "Permission denied: \"%(path)s\"%(extra)s"
5288
msgstr ""
5289
5290
#: bzrlib/errors.py:523
5291
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5292
msgstr ""
5293
5294
#: bzrlib/errors.py:528
5295
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5296
msgstr ""
5297
5298
#: bzrlib/errors.py:539
5299
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5300
msgstr ""
5301
5302
#: bzrlib/errors.py:561
5303
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5304
msgstr ""
5305
5306
#: bzrlib/errors.py:571
5307
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5308
msgstr ""
5309
5310
#: bzrlib/errors.py:579
5311
msgid ""
5312
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5313
"upgrade the branch to permit branch stacking."
5314
msgstr ""
5315
5316
#: bzrlib/errors.py:590
5317
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5318
msgstr ""
5319
5320
#: bzrlib/errors.py:600
5321
msgid ""
5322
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5323
"need to upgrade the repository to permit branch stacking."
5324
msgstr ""
5325
5326
#: bzrlib/errors.py:611
5327
msgid "Error reading from %(path)r."
5328
msgstr ""
5329
5330
#: bzrlib/errors.py:630
5331
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5332
msgstr ""
5333
5334
#: bzrlib/errors.py:646
5335
msgid "Path \"%(path)s\" is not unicode normalized"
5336
msgstr ""
5337
5338
#: bzrlib/errors.py:654
5339
msgid "Not a branch: \"%(path)s\"%(detail)s."
5340
msgstr ""
5341
5342
#: bzrlib/errors.py:696
5343
msgid "No submit branch available for branch \"%(path)s\""
5344
msgstr ""
5345
5346
#: bzrlib/errors.py:705
5347
msgid "A control directory already exists: \"%(path)s\"."
5348
msgstr ""
5349
5350
#: bzrlib/errors.py:710
5351
msgid "Already a branch: \"%(path)s\"."
5352
msgstr ""
5353
5354
#: bzrlib/errors.py:715
5355
msgid "Invalid branch name: %(name)s"
5356
msgstr ""
5357
5358
#: bzrlib/errors.py:724
5359
msgid "Parent branch already exists: \"%(path)s\"."
5360
msgstr ""
5361
5362
#: bzrlib/errors.py:730
5363
msgid ""
5364
"Directory contains a branch, but no working tree (use bzr checkout if you "
5365
"wish to build a working tree): \"%(path)s\""
5366
msgstr ""
5367
5368
#: bzrlib/errors.py:735
5369
msgid ""
5370
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5371
msgstr ""
5372
5373
#: bzrlib/errors.py:745
5374
msgid ""
5375
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5376
msgstr ""
5377
5378
#: bzrlib/errors.py:755
5379
msgid "No repository present: \"%(path)s\""
5380
msgstr ""
5381
5382
#: bzrlib/errors.py:762
5383
msgid ""
5384
"Unsupported branch format: %(format)s\n"
5385
"Please run 'bzr upgrade'"
5386
msgstr ""
5387
5388
#: bzrlib/errors.py:768
5389
msgid "Unknown %(kind)s format: %(format)r"
5390
msgstr ""
5391
5392
#: bzrlib/errors.py:777
5393
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5394
msgstr ""
5395
5396
#: bzrlib/errors.py:787
5397
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5398
msgstr ""
5399
5400
#: bzrlib/errors.py:802
5401
msgid ""
5402
"%(target)s\n"
5403
"is not compatible with\n"
5404
"%(source)s\n"
5405
"%(details)s"
5406
msgstr ""
5407
5408
#: bzrlib/errors.py:818
5409
msgid "Revision is not compatible with %(repo_format)s"
5410
msgstr ""
5411
5412
#: bzrlib/errors.py:828
5413
msgid "%(context_info)s%(path)s is already versioned."
5414
msgstr ""
5415
5416
#: bzrlib/errors.py:849
5417
msgid "%(context_info)s%(path)s is not versioned."
5418
msgstr ""
5419
5420
#: bzrlib/errors.py:870
5421
msgid "Path(s) are not versioned: %(paths_as_string)s"
5422
msgstr ""
5423
5424
#: bzrlib/errors.py:881
5425
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5426
msgstr ""
5427
5428
#: bzrlib/errors.py:900
5429
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5430
msgstr ""
5431
5432
#: bzrlib/errors.py:908
5433
msgid ""
5434
"Filename %(filename)r is not valid in your current filesystem encoding "
5435
"%(fs_encoding)s"
5436
msgstr ""
5437
5438
#: bzrlib/errors.py:919
5439
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5440
msgstr ""
5441
5442
#: bzrlib/errors.py:937
5443
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5444
msgstr ""
5445
5446
#: bzrlib/errors.py:976
5447
msgid "Cannot lock %(lock)s: %(why)s"
5448
msgstr ""
5449
5450
#: bzrlib/errors.py:986
5451
msgid ""
5452
"A transaction related operation was attempted after the transaction finished."
5453
msgstr ""
5454
5455
#: bzrlib/errors.py:1013
5456
msgid "Cannot lock: transport is read only: %(transport)s"
5457
msgstr ""
5458
5459
#: bzrlib/errors.py:1021
5460
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5461
msgstr ""
5462
5463
#: bzrlib/errors.py:1032
5464
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5465
msgstr ""
5466
5467
#: bzrlib/errors.py:1043
5468
msgid ""
5469
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5470
"%(holder)r, wanted to break %(target)r"
5471
msgstr ""
5472
5473
#: bzrlib/errors.py:1055
5474
msgid ""
5475
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5476
"Use 'bzr break-lock' to clear it"
5477
msgstr ""
5478
5479
#: bzrlib/errors.py:1068
5480
msgid "Lock not held: %(lock)s"
5481
msgstr ""
5482
5483
#: bzrlib/errors.py:1097
5484
msgid "No changes to commit"
5485
msgstr ""
5486
5487
#: bzrlib/errors.py:1102
5488
msgid ""
5489
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5490
msgstr ""
5491
5492
#: bzrlib/errors.py:1112
5493
msgid ""
5494
"Excluding paths during commit is not supported by repository at %(repository)"
5495
"r."
5496
msgstr ""
5497
5498
#: bzrlib/errors.py:1121
5499
msgid ""
5500
"The specified commit message contains characters unsupported by the current "
5501
"encoding."
5502
msgstr ""
5503
5504
#: bzrlib/errors.py:1127
5505
msgid "Upgrade URL cannot work with readonly URLs."
5506
msgstr ""
5507
5508
#: bzrlib/errors.py:1132
5509
msgid "The branch format %(format)s is already at the most recent format."
5510
msgstr ""
5511
5512
#: bzrlib/errors.py:1155
5513
msgid "Option --change does not accept revision ranges"
5514
msgstr ""
5515
5516
#: bzrlib/errors.py:1160
5517
msgid "No namespace registered for string: %(spec)r"
5518
msgstr ""
5519
5520
#: bzrlib/errors.py:1179
5521
msgid ""
5522
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5523
"%(extra)s"
5524
msgstr ""
5525
5526
#: bzrlib/errors.py:1193
5527
msgid ""
5528
"Operation denied because it would change the main history, which is not "
5529
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:1204
5533
msgid ""
5534
"These branches have diverged. Use the missing command to see how.\n"
5535
"Use the merge command to reconcile them."
5536
msgstr ""
5537
5538
#: bzrlib/errors.py:1224
5539
msgid ""
5540
"Branches have no common ancestor, and no merge base revision was specified."
5541
msgstr ""
5542
5543
#: bzrlib/errors.py:1230
5544
msgid ""
5545
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5546
msgstr ""
5547
5548
#: bzrlib/errors.py:1236
5549
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5550
msgstr ""
5551
5552
#: bzrlib/errors.py:1245
5553
msgid ""
5554
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5555
msgstr ""
5556
5557
#: bzrlib/errors.py:1254
5558
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5559
msgstr ""
5560
5561
#: bzrlib/errors.py:1263
5562
msgid "Branch %(branch)s has no commits."
5563
msgstr ""
5564
5565
#: bzrlib/errors.py:1281
5566
msgid ""
5567
"Bound branch %(branch)s is out of date with master branch %(master)s."
5568
"%(extra_help)s"
5569
msgstr ""
5570
5571
#: bzrlib/errors.py:1293
5572
msgid ""
5573
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5574
"bound to %(remote)s."
5575
msgstr ""
5576
5577
#: bzrlib/errors.py:1305
5578
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5579
msgstr ""
5580
5581
#: bzrlib/errors.py:1314
5582
msgid ""
5583
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5584
"%(error)s"
5585
msgstr ""
5586
5587
#: bzrlib/errors.py:1326
5588
msgid "Error in processing weave: %(msg)s"
5589
msgstr ""
5590
5591
#: bzrlib/errors.py:1335
5592
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5593
msgstr ""
5594
5595
#: bzrlib/errors.py:1346
5596
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5597
msgstr ""
5598
5599
#: bzrlib/errors.py:1356
5600
msgid "Weave invariant violated: %(what)s"
5601
msgstr ""
5602
5603
#: bzrlib/errors.py:1365
5604
msgid "Parents are mismatched between two revisions. %(msg)s"
5605
msgstr ""
5606
5607
#: bzrlib/errors.py:1387
5608
msgid ""
5609
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5610
"%(weave_b)s"
5611
msgstr ""
5612
5613
#: bzrlib/errors.py:1399
5614
msgid "Versioned file error"
5615
msgstr ""
5616
5617
#: bzrlib/errors.py:1404
5618
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5619
msgstr ""
5620
5621
#: bzrlib/errors.py:1414
5622
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5623
msgstr ""
5624
5625
#: bzrlib/errors.py:1424
5626
msgid "Text did not match its checksum: %(msg)s"
5627
msgstr ""
5628
5629
#: bzrlib/errors.py:1550
5630
msgid "Export format %(format)r not supported"
5631
msgstr ""
5632
5633
#: bzrlib/errors.py:1559
5634
msgid "Transport error: %(msg)s %(orig_error)s"
5635
msgstr ""
5636
5637
#: bzrlib/errors.py:1585
5638
msgid "Generic bzr smart protocol error: %(details)s"
5639
msgstr ""
5640
5641
#: bzrlib/errors.py:1593
5642
msgid "Received bad protocol version marker: %(marker)r"
5643
msgstr ""
5644
5645
#: bzrlib/errors.py:1625
5646
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5647
msgstr ""
5648
5649
#: bzrlib/errors.py:1630
5650
msgid "Connection error: %(msg)s %(orig_error)s"
5651
msgstr ""
5652
5653
#: bzrlib/errors.py:1635
5654
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5655
msgstr ""
5656
5657
#: bzrlib/errors.py:1656
5658
msgid "Connection closed: %(msg)s %(orig_error)s"
5659
msgstr ""
5660
5661
#: bzrlib/errors.py:1661
5662
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5663
msgstr ""
5664
5665
#: bzrlib/errors.py:1666
5666
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5667
msgstr ""
5668
5669
#: bzrlib/errors.py:1676
5670
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5671
msgstr ""
5672
5673
#: bzrlib/errors.py:1691
5674
msgid "Certificate error: %(error)s"
5675
msgstr ""
5676
5677
#: bzrlib/errors.py:1699
5678
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5679
msgstr ""
5680
5681
#: bzrlib/errors.py:1713
5682
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5683
msgstr ""
5684
5685
#: bzrlib/errors.py:1721
5686
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5687
msgstr ""
5688
5689
#: bzrlib/errors.py:1730
5690
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5691
msgstr ""
5692
5693
#: bzrlib/errors.py:1744
5694
msgid "Too many redirections"
5695
msgstr ""
5696
5697
#: bzrlib/errors.py:1749
5698
msgid "Working tree has conflicts."
5699
msgstr ""
5700
5701
#: bzrlib/errors.py:1753
5702
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5703
msgstr ""
5704
5705
#: bzrlib/errors.py:1762
5706
msgid ""
5707
"Error(s) parsing config file %(filename)s:\n"
5708
"%(errors)s"
5709
msgstr ""
5710
5711
#: bzrlib/errors.py:1772
5712
msgid ""
5713
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5714
"See ``bzr help %(name)s``"
5715
msgstr ""
5716
5717
#: bzrlib/errors.py:1782
5718
msgid "%(username)r does not seem to contain a reasonable email address"
5719
msgstr ""
5720
5721
#: bzrlib/errors.py:1791
5722
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5723
msgstr ""
5724
5725
#: bzrlib/errors.py:1799
5726
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5727
msgstr ""
5728
5729
#: bzrlib/errors.py:1807
5730
msgid "Unable to import library \"%(library)s\": %(error)s"
5731
msgstr ""
5732
5733
#: bzrlib/errors.py:1815
5734
msgid "python-gpgme is not installed, it is needed to verify signatures"
5735
msgstr ""
5736
5737
#: bzrlib/errors.py:1823
5738
msgid ""
5739
"The working tree for %(basedir)s has changed since the last commit, but "
5740
"weave merge requires that it be unchanged"
5741
msgstr ""
5742
5743
#: bzrlib/errors.py:1833
5744
msgid ""
5745
"Can't reprocess and show base, because reprocessing obscures the "
5746
"relationship of conflicting lines to the base"
5747
msgstr ""
5748
5749
#: bzrlib/errors.py:1839
5750
msgid "Cycle in graph %(graph)r"
5751
msgstr ""
5752
5753
#: bzrlib/errors.py:1867
5754
msgid "File %(filename)s is not conflicted."
5755
msgstr ""
5756
5757
#: bzrlib/errors.py:1889
5758
msgid "No bundle was found in \"%(filename)s\"."
5759
msgstr ""
5760
5761
#: bzrlib/errors.py:1898
5762
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5763
msgstr ""
5764
5765
#: bzrlib/errors.py:1908
5766
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5767
msgstr ""
5768
5769
#: bzrlib/errors.py:1921
5770
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5771
msgstr ""
5772
5773
#: bzrlib/errors.py:1931
5774
msgid "Key %(key)s is already present in map"
5775
msgstr ""
5776
5777
#: bzrlib/errors.py:1936
5778
msgid "The prefix %(prefix)s is in the help search path twice."
5779
msgstr ""
5780
5781
#: bzrlib/errors.py:1946
5782
msgid ""
5783
"No final name for trans_id %(trans_id)r\n"
5784
"file-id: %(file_id)r\n"
5785
"root trans-id: %(root_trans_id)r\n"
5786
msgstr ""
5787
5788
#: bzrlib/errors.py:1978
5789
msgid "Attempt to reuse a transform that has already been applied."
5790
msgstr ""
5791
5792
#: bzrlib/errors.py:1983
5793
msgid "Moving the root directory is not supported at this time"
5794
msgstr ""
5795
5796
#: bzrlib/errors.py:1988
5797
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5798
msgstr ""
5799
5800
#: bzrlib/errors.py:1999
5801
msgid ""
5802
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5803
msgstr ""
5804
5805
#: bzrlib/errors.py:2035
5806
msgid ""
5807
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5808
msgstr ""
5809
5810
#: bzrlib/errors.py:2065
5811
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5812
msgstr ""
5813
5814
#: bzrlib/errors.py:2073
5815
msgid "Nothing to merge."
5816
msgstr ""
5817
5818
#: bzrlib/errors.py:2078
5819
msgid "Format %(format)s cannot be initialised by this version of bzr."
5820
msgstr ""
5821
5822
#: bzrlib/errors.py:2087
5823
msgid ""
5824
"Cannot convert from format %(from_format)s to format %(format)s. "
5825
"%(problem)s"
5826
msgstr ""
5827
5828
#: bzrlib/errors.py:2099
5829
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5830
msgstr ""
5831
5832
#: bzrlib/errors.py:2107
5833
msgid "%(exe_name)s could not be found on this machine"
5834
msgstr ""
5835
5836
#: bzrlib/errors.py:2115
5837
msgid "Diff is not installed on this machine: %(msg)s"
5838
msgstr ""
5839
5840
#: bzrlib/errors.py:2123
5841
msgid "Diff3 is not installed on this machine."
5842
msgstr ""
5843
5844
#: bzrlib/errors.py:2129
5845
msgid "The content being inserted is already present."
5846
msgstr ""
5847
5848
#: bzrlib/errors.py:2134
5849
msgid ""
5850
"This tree contains left-over files from a failed operation.\n"
5851
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5852
"to\n"
5853
" keep, and delete it when you are done."
5854
msgstr ""
5855
5856
#: bzrlib/errors.py:2145
5857
msgid ""
5858
"This tree contains left-over files from a failed operation.\n"
5859
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5860
" wish to keep, and delete it when you are done."
5861
msgstr ""
5862
5863
#: bzrlib/errors.py:2155
5864
msgid ""
5865
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5866
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5867
"to\n"
5868
" keep, and delete it when you are done."
5869
msgstr ""
5870
5871
#: bzrlib/errors.py:2166
5872
msgid ""
5873
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5874
"examine %(pending_deletion)s to see if it contains any files you wish to "
5875
"keep, and delete it when you are done."
5876
msgstr ""
5877
5878
#: bzrlib/errors.py:2176
5879
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5880
msgstr ""
5881
5882
#: bzrlib/errors.py:2190
5883
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5884
msgstr ""
5885
5886
#: bzrlib/errors.py:2203
5887
msgid "Error in merge modified format"
5888
msgstr ""
5889
5890
#: bzrlib/errors.py:2208
5891
msgid "Format error in conflict listings"
5892
msgstr ""
5893
5894
#: bzrlib/errors.py:2212
5895
msgid ""
5896
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5897
"Error: %(description)s"
5898
msgstr ""
5899
5900
#: bzrlib/errors.py:2223
5901
msgid ""
5902
"An error has been detected in the repository %(repo_path)s.\n"
5903
"Please run bzr reconcile on this repository."
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:2234
5907
msgid ""
5908
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5909
"reason: %(reason)s"
5910
msgstr ""
5911
5912
#: bzrlib/errors.py:2247
5913
msgid ""
5914
"An inconsistent delta was supplied: %(delta)r\n"
5915
"reason: %(reason)s"
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:2259
5919
msgid "To use this feature you must upgrade your branch at %(path)s."
5920
msgstr ""
5921
5922
#: bzrlib/errors.py:2268
5923
msgid "To use this feature you must upgrade your repository at %(path)s."
5924
msgstr ""
5925
5926
#: bzrlib/errors.py:2273
5927
msgid ""
5928
"To use this feature you must upgrade your branch at %(path)s to a format "
5929
"which supports rich roots."
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:2279
5933
msgid "Cannot perform local-only commits on unbound branches."
5934
msgstr ""
5935
5936
#: bzrlib/errors.py:2284
5937
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5938
msgstr ""
5939
5940
#: bzrlib/errors.py:2305
5941
msgid "Ghost tags not supported by format %(format)r."
5942
msgstr ""
5943
5944
#: bzrlib/errors.py:2313
5945
msgid "File is binary but should be text."
5946
msgstr ""
5947
5948
#: bzrlib/errors.py:2318
5949
msgid "The path %(path)s is not permitted on this platform"
5950
msgstr ""
5951
5952
#: bzrlib/errors.py:2327
5953
msgid ""
5954
"Testament did not match expected value.\n"
5955
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5956
" {%(measured)s}"
5957
msgstr ""
5958
5959
#: bzrlib/errors.py:2339
5960
msgid "Not a bzr revision-bundle: %(text)r"
5961
msgstr ""
5962
5963
#: bzrlib/errors.py:2348
5964
msgid "Bad bzr revision-bundle: %(text)r"
5965
msgstr ""
5966
5967
#: bzrlib/errors.py:2357
5968
msgid "Malformed bzr revision-bundle header: %(text)r"
5969
msgstr ""
5970
5971
#: bzrlib/errors.py:2362
5972
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5973
msgstr ""
5974
5975
#: bzrlib/errors.py:2367
5976
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5977
msgstr ""
5978
5979
#: bzrlib/errors.py:2372
5980
msgid "End of line marker was not \\n in bzr revision-bundle"
5981
msgstr ""
5982
5983
#: bzrlib/errors.py:2382
5984
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5985
msgstr ""
5986
5987
#: bzrlib/errors.py:2392
5988
msgid "Root class for inventory serialization errors"
5989
msgstr ""
5990
5991
#: bzrlib/errors.py:2396
5992
msgid ""
5993
"The inventory was not in the expected format:\n"
5994
" %(msg)s"
5995
msgstr ""
5996
5997
#: bzrlib/errors.py:2405
5998
msgid "This operation requires rich root data storage"
5999
msgstr ""
6000
6001
#: bzrlib/errors.py:2418
6002
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6003
msgstr ""
6004
6005
#: bzrlib/errors.py:2427
6006
msgid ""
6007
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6008
"variable."
6009
msgstr ""
6010
6011
#: bzrlib/errors.py:2434
6012
msgid ""
6013
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6014
"ghost at {%(ghost_revision_id)s}"
6015
msgstr ""
6016
6017
#: bzrlib/errors.py:2444
6018
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6019
msgstr ""
6020
6021
#: bzrlib/errors.py:2495
6022
msgid ""
6023
"A merge directive must provide either a bundle or a public branch location."
6024
msgstr ""
6025
6026
#: bzrlib/errors.py:2502
6027
msgid "Bad merge directive payload %(start)r"
6028
msgstr ""
6029
6030
#: bzrlib/errors.py:2512
6031
msgid "Preview patch does not match requested changes."
6032
msgstr ""
6033
6034
#: bzrlib/errors.py:2518
6035
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6036
msgstr ""
6037
6038
#: bzrlib/errors.py:2528
6039
msgid ""
6040
"Your branch does not have all of the revisions required in order to merge "
6041
"this merge directive and the target location specified in the merge "
6042
"directive is not a branch: %(location)s."
6043
msgstr ""
6044
6045
#: bzrlib/errors.py:2540
6046
msgid "Unsupported entry kind %(kind)s"
6047
msgstr ""
6048
6049
#: bzrlib/errors.py:2548
6050
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6051
msgstr ""
6052
6053
#: bzrlib/errors.py:2558
6054
msgid "Subsume target %(other_tree)s needs to be upgraded."
6055
msgstr ""
6056
6057
#: bzrlib/errors.py:2577
6058
msgid "No such tag: %(tag_name)s"
6059
msgstr ""
6060
6061
#: bzrlib/errors.py:2585
6062
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6063
msgstr ""
6064
6065
#: bzrlib/errors.py:2594
6066
msgid "Tag %(tag_name)s already exists."
6067
msgstr ""
6068
6069
#: bzrlib/errors.py:2602
6070
msgid ""
6071
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
6072
"\" for more information on this feature."
6073
msgstr ""
6074
6075
#: bzrlib/errors.py:2612
6076
msgid ""
6077
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6078
msgstr ""
6079
6080
#: bzrlib/errors.py:2622
6081
msgid ""
6082
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6083
msgstr ""
6084
6085
#: bzrlib/errors.py:2632
6086
msgid "Invalid line in bugs property: '%(line)s'"
6087
msgstr ""
6088
6089
#: bzrlib/errors.py:2640
6090
msgid "Invalid bug status: '%(status)s'"
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:2648
6094
msgid "Could not understand response from smart server: %(response_tuple)r"
6095
msgstr ""
6096
6097
#: bzrlib/errors.py:2687
6098
msgid "Server sent an unexpected error: %(error_tuple)r"
6099
msgstr ""
6100
6101
#: bzrlib/errors.py:2706
6102
msgid "Unrecognised container format: %(container_format)r"
6103
msgstr ""
6104
6105
#: bzrlib/errors.py:2714
6106
msgid "Unexpected end of container stream"
6107
msgstr ""
6108
6109
#: bzrlib/errors.py:2719
6110
msgid "Unknown record type: %(record_type)r"
6111
msgstr ""
6112
6113
#: bzrlib/errors.py:2727
6114
msgid "Invalid record: %(reason)s"
6115
msgstr ""
6116
6117
#: bzrlib/errors.py:2735
6118
msgid "Container has data after end marker: %(excess)r"
6119
msgstr ""
6120
6121
#: bzrlib/errors.py:2743
6122
msgid "Container has multiple records with the same name: %(name)s"
6123
msgstr ""
6124
6125
#: bzrlib/errors.py:2756
6126
msgid "Corrupt or incompatible data stream: %(reason)s"
6127
msgstr ""
6128
6129
#: bzrlib/errors.py:2764
6130
msgid "SMTP error: %(error)s"
6131
msgstr ""
6132
6133
#: bzrlib/errors.py:2772
6134
msgid "No message supplied."
6135
msgstr ""
6136
6137
#: bzrlib/errors.py:2777
6138
msgid "No mail-to address (--mail-to) or output (-o) specified."
6139
msgstr ""
6140
6141
#: bzrlib/errors.py:2782
6142
msgid ""
6143
"Unable to find mail client with the following names: "
6144
"%(mail_command_list_string)s"
6145
msgstr ""
6146
6147
#: bzrlib/errors.py:2792
6148
msgid "SMTP connection to %(host)s refused"
6149
msgstr ""
6150
6151
#: bzrlib/errors.py:2801
6152
msgid "Please specify smtp_server. No server at default %(host)s."
6153
msgstr ""
6154
6155
#: bzrlib/errors.py:2815
6156
msgid ""
6157
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6158
"reconfigure."
6159
msgstr ""
6160
6161
#: bzrlib/errors.py:2827
6162
msgid "'%(display_url)s' is already a branch."
6163
msgstr ""
6164
6165
#: bzrlib/errors.py:2832
6166
msgid "'%(display_url)s' is already a tree."
6167
msgstr ""
6168
6169
#: bzrlib/errors.py:2837
6170
msgid "'%(display_url)s' is already a checkout."
6171
msgstr ""
6172
6173
#: bzrlib/errors.py:2842
6174
msgid "'%(display_url)s' is already a lightweight checkout."
6175
msgstr ""
6176
6177
#: bzrlib/errors.py:2847
6178
msgid "'%(display_url)s' is already using a shared repository."
6179
msgstr ""
6180
6181
#: bzrlib/errors.py:2852
6182
msgid "'%(display_url)s' is already standalone."
6183
msgstr ""
6184
6185
#: bzrlib/errors.py:2857
6186
msgid "Shared repository '%(display_url)s' already creates working trees."
6187
msgstr ""
6188
6189
#: bzrlib/errors.py:2863
6190
msgid ""
6191
"Shared repository '%(display_url)s' already doesn't create working trees."
6192
msgstr ""
6193
6194
#: bzrlib/errors.py:2869
6195
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6196
msgstr ""
6197
6198
#: bzrlib/errors.py:2874
6199
msgid "No location could be found to bind to at %(display_url)s."
6200
msgstr ""
6201
6202
#: bzrlib/errors.py:2879
6203
msgid ""
6204
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
6205
"%(more)s"
6206
msgstr ""
6207
6208
#: bzrlib/errors.py:2898
6209
msgid ""
6210
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
6211
"%(more)s"
6212
msgstr ""
6213
6214
#: bzrlib/errors.py:2904
6215
msgid "Variable {%(name)s} is not available."
6216
msgstr ""
6217
6218
#: bzrlib/errors.py:2912
6219
msgid "No template specified."
6220
msgstr ""
6221
6222
#: bzrlib/errors.py:2917
6223
msgid "Unable to create symlink %(path_str)son this platform"
6224
msgstr ""
6225
6226
#: bzrlib/errors.py:2932
6227
msgid ""
6228
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6229
"\", \"local\"."
6230
msgstr ""
6231
6232
#: bzrlib/errors.py:2966
6233
msgid ""
6234
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6235
msgstr ""
6236
6237
#: bzrlib/errors.py:2978
6238
msgid "The \"%(config_id)s\" configuration does not exist."
6239
msgstr ""
6240
6241
#: bzrlib/errors.py:2986
6242
msgid "The \"%(option_name)s\" configuration option does not exist."
6243
msgstr ""
6244
6245
#: bzrlib/errors.py:2994
6246
msgid "The alias \"%(alias_name)s\" does not exist."
6247
msgstr ""
6248
6249
#: bzrlib/errors.py:3008
6250
msgid "\"%(alias_name)s\" is not a valid location alias."
6251
msgstr ""
6252
6253
#: bzrlib/errors.py:3016
6254
msgid "No %(alias_name)s location assigned."
6255
msgstr ""
6256
6257
#: bzrlib/errors.py:3024
6258
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6259
msgstr ""
6260
6261
#: bzrlib/errors.py:3034
6262
msgid "Unknown rules detected: %(unknowns_str)s."
6263
msgstr ""
6264
6265
#: bzrlib/errors.py:3045
6266
msgid "Tip change rejected: %(msg)s"
6267
msgstr ""
6268
6269
#: bzrlib/errors.py:3053
6270
msgid "Shelf corrupt."
6271
msgstr ""
6272
6273
#: bzrlib/errors.py:3058
6274
msgid "Corruption while decompressing repository file%(orig_error)s"
6275
msgstr ""
6276
6277
#: bzrlib/errors.py:3070
6278
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6279
msgstr ""
6280
6281
#: bzrlib/errors.py:3078
6282
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6283
msgstr ""
6284
6285
#: bzrlib/errors.py:3086
6286
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6287
msgstr ""
6288
6289
#: bzrlib/errors.py:3094
6290
msgid "The user aborted the operation."
6291
msgstr ""
6292
6293
#: bzrlib/errors.py:3099
6294
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6295
msgstr ""
6296
6297
#: bzrlib/errors.py:3109
6298
msgid "No such view: %(view_name)s."
6299
msgstr ""
6300
6301
#: bzrlib/errors.py:3119
6302
msgid ""
6303
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6304
"to a later format."
6305
msgstr ""
6306
6307
#: bzrlib/errors.py:3128
6308
msgid ""
6309
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6310
msgstr ""
6311
6312
#: bzrlib/errors.py:3195
6313
msgid "%(bzrdir)r does not support co-located branches."
6314
msgstr ""
6315
6316
#: bzrlib/errors.py:3201
6317
msgid ""
6318
"Unable to determine your name.\n"
6319
"Please, set your name with the 'whoami' command.\n"
6320
"E.g. bzr whoami \"Your Name <name@example.com>\""
6321
msgstr ""
6322
6323
#: bzrlib/errors.py:3210
6324
msgid "Invalid pattern(s) found. %(msg)s"
6325
msgstr ""
6326
6327
#: bzrlib/errors.py:3218
6328
msgid ""
6329
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6330
"unbind` to fix."
6331
msgstr ""
6332
6333
#: bzrlib/errors.py:3229
6334
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6335
msgstr ""
6336
6337
#: bzrlib/errors.py:3238
6338
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6339
msgstr ""
6340
6341
#: bzrlib/errors.py:3247
6342
msgid ""
6343
"No compatible object available for operations from %(source)r to %(target)r."
6344
msgstr ""
6345
6346
#: bzrlib/errors.py:3257
6347
msgid ""
6348
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6349
"%(arguments)s."
6350
msgstr ""
6351
6352
#: bzrlib/errors.py:3267
6353
msgid ""
6354
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6355
"format %(format)r"
6356
msgstr ""
6357
6358
#: bzrlib/errors.py:3279
6359
msgid ""
6360
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6361
"plugin."
6362
msgstr ""
6363
6364
#: bzrlib/errors.py:3292
6365
msgid "Binary files section encountered."
6366
msgstr ""
6367
6368
#: bzrlib/errors.py:3300
6369
msgid ""
6370
"Malformed patch header. %(desc)s\n"
6371
"%(line)r"
6372
msgstr ""
6373
6374
#: bzrlib/errors.py:3309
6375
msgid ""
6376
"Malformed hunk header. %(desc)s\n"
6377
"%(line)r"
6378
msgstr ""
6379
6380
#: bzrlib/errors.py:3318
6381
msgid ""
6382
"Malformed line. %(desc)s\n"
6383
"%(line)r"
6384
msgstr ""
6385
6386
#: bzrlib/errors.py:3328
6387
msgid ""
6388
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6389
"but patch says it should be \"%(patch_line)s\""
6390
msgstr ""
6391
6392
#: bzrlib/errors.py:3339
6393
msgid "The feature %(feature)s has already been registered."
6394
msgstr ""
6395
6396
#: bzrlib/export_pot.py:252
6397
#, python-format
6398
msgid "Exporting messages from builtin command: %s"
6399
msgstr ""
6400
6401
#: bzrlib/export_pot.py:271
6402
msgid "Exporting messages from plugin command: {0} in {1}"
6403
msgstr ""
6404
6405
#: bzrlib/export_pot.py:292
6406
#, python-format
6407
msgid "Exporting message from error: %s"
6408
msgstr ""
6409
6410
#: bzrlib/fetch.py:98
6411
msgid "Finding revisions"
6412
msgstr ""
6413
6414
#: bzrlib/fetch.py:103
6415
msgid "Fetching revisions"
6416
msgstr ""
6417
6418
#: bzrlib/foreign.py:262
6419
msgid "Push into a different VCS without any custom bzr metadata."
6420
msgstr ""
6421
6422
#: bzrlib/foreign.py:264
6423
msgid ""
6424
"This will afterwards rebase the local branch on the remote\n"
6425
"branch unless the --no-rebase option is used, in which case \n"
6426
"the two branches will be out of sync after the push. "
6427
msgstr ""
6428
6429
# help of 'no-rebase' option of 'dpush' command
6430
#: bzrlib/foreign.py:277
6431
msgid "Do not rebase after push."
6432
msgstr ""
6433
6434
#: bzrlib/foreign.py:311
6435
#, python-format
6436
msgid "Using saved location: %s\n"
6437
msgstr ""
6438
6439
#: bzrlib/foreign.py:321
6440
msgid ""
6441
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6442
"regular push."
6443
msgstr ""
6444
6445
#: bzrlib/gpg.py:366
6446
msgid "No GnuPG key results for pattern: {0}"
6447
msgstr ""
6448
6449
#: bzrlib/gpg.py:439
6450
msgid "{0} commits with valid signatures"
6451
msgstr ""
6452
6453
#: bzrlib/gpg.py:445
6454
msgid "{0} commit with unknown key"
6455
msgid_plural "{0} commits with unknown keys"
6456
msgstr[0] ""
6457
msgstr[1] ""
6458
6459
#: bzrlib/gpg.py:453
6460
msgid "{0} commit not valid"
6461
msgid_plural "{0} commits not valid"
6462
msgstr[0] ""
6463
msgstr[1] ""
6464
6465
#: bzrlib/gpg.py:461
6466
msgid "{0} commit not signed"
6467
msgid_plural "{0} commits not signed"
6468
msgstr[0] ""
6469
msgstr[1] ""
6470
6471
#: bzrlib/gpg.py:469
6472
msgid "{0} commit with key now expired"
6473
msgid_plural "{0} commits with key now expired"
6474
msgstr[0] ""
6475
msgstr[1] ""
6476
6477
#: bzrlib/gpg.py:489
6478
msgid "{0} commit by author {1} with key {2} now expired"
6479
msgid_plural "{0} commits by author {1} with key {2} now expired"
6480
msgstr[0] ""
6481
msgstr[1] ""
6482
6483
#: bzrlib/gpg.py:505
6484
msgid "{0} signed {1} commit"
6485
msgid_plural "{0} signed {1} commits"
6486
msgstr[0] ""
6487
msgstr[1] ""
6488
6489
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6490
msgid "{0} commit by author {1}"
6491
msgid_plural "{0} commits by author {1}"
6492
msgstr[0] ""
6493
msgstr[1] ""
6494
6495
#: bzrlib/gpg.py:554
6496
msgid "Unknown key {0} signed {1} commit"
6497
msgid_plural "Unknown key {0} signed {1} commits"
6498
msgstr[0] ""
6499
msgstr[1] ""
6500
6501
#: bzrlib/groupcompress.py:1739
6502
#, python-format
6503
msgid "Insert claimed random_id=True, but then inserted %r two times"
6504
msgstr ""
6505
6506
#: bzrlib/hooks.py:313
6507
#, python-format
6508
msgid "Introduced in: %s"
6509
msgstr ""
6510
6511
#: bzrlib/hooks.py:316
6512
#, python-format
6513
msgid "Deprecated in: %s"
6514
msgstr ""
6515
6516
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6517
msgid "Walking content"
6518
msgstr ""
6519
6520
#: bzrlib/knit.py:3330
6521
msgid "annotating"
6522
msgstr ""
6523
6524
#: bzrlib/lock.py:548
6525
msgid "{0!r} was {1} locked again"
6526
msgstr ""
6527
6528
#: bzrlib/lockdir.py:321
6529
#, python-format
6530
msgid "error removing pending lock: %s"
6531
msgstr ""
6532
6533
#: bzrlib/lockdir.py:616
6534
msgid "Unable to obtain"
6535
msgstr ""
6536
6537
#: bzrlib/lockdir.py:618
6538
msgid "Lock owner changed for"
6539
msgstr ""
6540
6541
#: bzrlib/lockdir.py:620
6542
msgid "{0} lock {1} {2}."
6543
msgstr ""
6544
6545
#: bzrlib/lockdir.py:627
6546
#, python-format
6547
msgid "Will continue to try until %s, unless you press Ctrl-C."
6548
msgstr ""
6549
6550
#: bzrlib/lockdir.py:629
6551
msgid "See \"bzr help break-lock\" for more."
6552
msgstr ""
6553
6554
#: bzrlib/lockdir.py:739
6555
#, python-format
6556
msgid ""
6557
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6558
msgstr ""
6559
6560
#: bzrlib/log.py:563
6561
msgid "--exclude-common-ancestry requires two different revisions"
6562
msgstr ""
6563
6564
#: bzrlib/log.py:565
6565
#, python-format
6566
msgid "invalid direction %r"
6567
msgstr ""
6568
6569
#: bzrlib/log.py:653
6570
msgid "Start revision not found in history of end revision."
6571
msgstr ""
6572
6573
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6574
msgid "Logging revision 0 is invalid."
6575
msgstr ""
6576
6577
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6578
msgid "Start revision must be older than the end revision."
6579
msgstr ""
6580
6581
#: bzrlib/log.py:1818
6582
#, python-format
6583
msgid "unknown log formatter: %r"
6584
msgstr ""
6585
6586
#: bzrlib/log.py:2114
6587
msgid "fixes bug"
6588
msgid_plural "fixes bugs"
6589
msgstr[0] ""
6590
msgstr[1] ""
6591
6592
#: bzrlib/merge.py:689
6593
msgid "All changes applied successfully."
6594
msgstr ""
6595
6596
#: bzrlib/merge.py:691
6597
#, python-format
6598
msgid "%d conflicts encountered."
6599
msgstr ""
6600
6601
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6602
msgid "Preparing file merge"
6603
msgstr ""
6604
6605
#: bzrlib/multiparent.py:426
6606
msgid "Importing revisions"
6607
msgstr ""
6608
6609
# help of 'help' option
6610
#: bzrlib/option.py:526
6611
msgid "Show help message."
6612
msgstr ""
6613
6614
# help of 'quiet' option
6615
#: bzrlib/option.py:528
6616
msgid "Only display errors and warnings."
6617
msgstr ""
6618
6619
# help of 'usage' option
6620
#: bzrlib/option.py:531
6621
msgid "Show usage message and options."
6622
msgstr ""
6623
6624
# help of 'verbose' option
6625
#: bzrlib/option.py:533
6626
msgid "Display more information."
6627
msgstr ""
6628
6629
# help of 'change' option
6630
#: bzrlib/option.py:541
6631
msgid ""
6632
"Select changes introduced by the specified revision. See also \"help "
6633
"revisionspec\"."
6634
msgstr ""
6635
6636
# help of 'directory' option
6637
#: bzrlib/option.py:543
6638
msgid "Branch to operate on, instead of working directory."
6639
msgstr ""
6640
6641
# help of 'log-format=long' option
6642
#: bzrlib/option.py:545
6643
msgid "Detailed log format."
6644
msgstr ""
6645
6646
# help of 'log-format=gnu-changelog' option
6647
#: bzrlib/option.py:545
6648
msgid "Format used by GNU ChangeLog files."
6649
msgstr ""
6650
6651
# help of 'log-format=line' option
6652
#: bzrlib/option.py:545
6653
msgid "Log format with one line per revision."
6654
msgstr ""
6655
6656
# help of 'log-format=short' option
6657
#: bzrlib/option.py:545
6658
msgid "Moderately short log format."
6659
msgstr ""
6660
6661
# help of 'log-format' option
6662
#: bzrlib/option.py:545
6663
msgid "Use specified log format."
6664
msgstr ""
6665
6666
# title of 'log-format' option
6667
#: bzrlib/option.py:547
6668
msgid "Log format"
6669
msgstr ""
6670
6671
# help of 'merge-type=lca' option
6672
#: bzrlib/option.py:549
6673
msgid "LCA-newness merge."
6674
msgstr ""
6675
6676
# help of 'merge-type=diff3' option
6677
#: bzrlib/option.py:549
6678
msgid "Merge using external diff3."
6679
msgstr ""
6680
6681
# help of 'merge-type=merge3' option
6682
#: bzrlib/option.py:549
6683
msgid "Native diff3-style merge."
6684
msgstr ""
6685
6686
# help of 'merge-type' option
6687
#: bzrlib/option.py:549
6688
msgid "Select a particular merge algorithm."
6689
msgstr ""
6690
6691
# help of 'merge-type=weave' option
6692
#: bzrlib/option.py:549
6693
msgid "Weave-based merge."
6694
msgstr ""
6695
6696
# title of 'merge-type' option
6697
#: bzrlib/option.py:551
6698
msgid "Merge algorithm"
6699
msgstr ""
6700
6701
# help of 'message' option
6702
#: bzrlib/option.py:554
6703
msgid "Message string."
6704
msgstr ""
6705
6706
# help of 'null' option
6707
#: bzrlib/option.py:556
6708
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6709
msgstr ""
6710
6711
# help of 'overwrite' option
6712
#: bzrlib/option.py:558
6713
msgid "Ignore differences between branches and overwrite unconditionally."
6714
msgstr ""
6715
6716
# help of 'remember' option
6717
#: bzrlib/option.py:560
6718
msgid "Remember the specified location as a default."
6719
msgstr ""
6720
6721
# help of 'reprocess' option
6722
#: bzrlib/option.py:562
6723
msgid "Reprocess to reduce spurious conflicts."
6724
msgstr ""
6725
6726
# help of 'revision' option
6727
#: bzrlib/option.py:566
6728
msgid "See \"help revisionspec\" for details."
6729
msgstr ""
6730
6731
# help of 'show-ids' option
6732
#: bzrlib/option.py:568
6733
msgid "Show internal object ids."
6734
msgstr ""
6735
6736
# help of 'timezone' option
6737
#: bzrlib/option.py:571
6738
msgid "Display timezone as local, original, or utc."
6739
msgstr ""
6740
6741
#: bzrlib/osutils.py:100
6742
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6743
msgstr ""
6744
6745
#: bzrlib/osutils.py:220
6746
msgid "lstat/stat of ({0!r}): {1!r}"
6747
msgstr ""
6748
6749
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6750
#, python-format
6751
msgid "sorry, %r not allowed in path"
6752
msgstr ""
6753
6754
#: bzrlib/osutils.py:1259
6755
#, python-format
6756
msgid "%r is too short to calculate a relative path"
6757
msgstr ""
6758
6759
#: bzrlib/plugin.py:143
6760
#, python-format
6761
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6762
msgstr ""
6763
6764
# help of 'plugin' option of 'bash-completion' command
6765
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6766
msgid "Enable completions for the selected plugin (default: all plugins)"
6767
msgstr ""
6768
6769
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6770
msgid "Generate a shell function for bash command line completion."
6771
msgstr ""
6772
6773
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6774
msgid ""
6775
"This command generates a shell function which can be used by bash to\n"
6776
"automatically complete the currently typed command when the user presses\n"
6777
"the completion key (usually tab)."
6778
msgstr ""
6779
6780
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6781
msgid ""
6782
"Commonly used like this:\n"
6783
" eval \"`bzr bash-completion`\""
6784
msgstr ""
6785
6786
# help of 'function-name' option of 'bash-completion' command
6787
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6788
msgid "Name of the generated function (default: _bzr)"
6789
msgstr ""
6790
6791
# help of 'function-only' option of 'bash-completion' command
6792
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6793
msgid "Generate only the shell function, don't enable it"
6794
msgstr ""
6795
6796
#: bzrlib/plugins/launchpad/account.py:66
6797
msgid "Setting ssh/sftp usernames for launchpad.net."
6798
msgstr ""
6799
6800
#: bzrlib/plugins/launchpad/cmds.py:44
6801
msgid "Register a branch with launchpad.net."
6802
msgstr ""
6803
6804
#: bzrlib/plugins/launchpad/cmds.py:46
6805
msgid ""
6806
"This command lists a bzr branch in the directory of branches on\n"
6807
"launchpad.net. Registration allows the branch to be associated with\n"
6808
"bugs or specifications."
6809
msgstr ""
6810
6811
#: bzrlib/plugins/launchpad/cmds.py:50
6812
msgid ""
6813
"Before using this command you must register the project to which the\n"
6814
"branch belongs, and create an account for yourself on launchpad.net."
6815
msgstr ""
6816
6817
#: bzrlib/plugins/launchpad/cmds.py:53
6818
msgid ""
6819
"arguments:\n"
6820
" public_url: The publicly visible url for the branch to register.\n"
6821
" This must be an http or https url (which Launchpad can read\n"
6822
" from to access the branch). Local file urls, SFTP urls, and\n"
6823
" bzr+ssh urls will not work.\n"
6824
" If no public_url is provided, bzr will use the configured\n"
6825
" public_url if there is one for the current branch, and\n"
6826
" otherwise error."
6827
msgstr ""
6828
6829
#: bzrlib/plugins/launchpad/cmds.py:62
6830
msgid ""
6831
"example:\n"
6832
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6833
" --project fooproject"
6834
msgstr ""
6835
6836
# help of 'project' option of 'register-branch' command
6837
#: bzrlib/plugins/launchpad/cmds.py:69
6838
msgid "Launchpad project short name to associate with the branch."
6839
msgstr ""
6840
6841
# help of 'branch-name' option of 'register-branch' command
6842
#: bzrlib/plugins/launchpad/cmds.py:76
6843
msgid ""
6844
"Short name for the branch; by default taken from the last component of the "
6845
"url."
6846
msgstr ""
6847
6848
# help of 'branch-title' option of 'register-branch' command
6849
#: bzrlib/plugins/launchpad/cmds.py:80
6850
msgid "One-sentence description of the branch."
6851
msgstr ""
6852
6853
# help of 'branch-description' option of 'register-branch' command
6854
#: bzrlib/plugins/launchpad/cmds.py:83
6855
msgid "Longer description of the purpose or contents of the branch."
6856
msgstr ""
6857
6858
# help of 'author' option of 'register-branch' command
6859
#: bzrlib/plugins/launchpad/cmds.py:86
6860
msgid "Branch author's email address, if not yourself."
6861
msgstr ""
6862
6863
# help of 'link-bug' option of 'register-branch' command
6864
#: bzrlib/plugins/launchpad/cmds.py:89
6865
msgid "The bug this branch fixes."
6866
msgstr ""
6867
6868
# help of 'dry-run' option of 'register-branch' command
6869
#: bzrlib/plugins/launchpad/cmds.py:92
6870
msgid "Prepare the request but don't actually send it."
6871
msgstr ""
6872
6873
#: bzrlib/plugins/launchpad/cmds.py:114
6874
msgid ""
6875
"register-branch requires a public branch url - see bzr help register-branch."
6876
msgstr ""
6877
6878
#: bzrlib/plugins/launchpad/cmds.py:122
6879
msgid "--product is deprecated; please use --project."
6880
msgstr ""
6881
6882
#: bzrlib/plugins/launchpad/cmds.py:152
6883
msgid "Open a Launchpad branch page in your web browser."
6884
msgstr ""
6885
6886
# help of 'dry-run' option of 'launchpad-open' command
6887
#: bzrlib/plugins/launchpad/cmds.py:157
6888
msgid "Do not actually open the browser. Just say the URL we would use."
6889
msgstr ""
6890
6891
#: bzrlib/plugins/launchpad/cmds.py:192
6892
#, python-format
6893
msgid "Opening %s in web browser"
6894
msgstr ""
6895
6896
#: bzrlib/plugins/launchpad/cmds.py:200
6897
msgid "Show or set the Launchpad user ID."
6898
msgstr ""
6899
6900
#: bzrlib/plugins/launchpad/cmds.py:202
6901
msgid ""
6902
"When communicating with Launchpad, some commands need to know your\n"
6903
"Launchpad user ID. This command can be used to set or show the\n"
6904
"user ID that Bazaar will use for such communication."
6905
msgstr ""
6906
6907
#: bzrlib/plugins/launchpad/cmds.py:206
6908
msgid ""
6909
":Examples:\n"
6910
" Show the Launchpad ID of the current user::"
6911
msgstr ""
6912
6913
#: bzrlib/plugins/launchpad/cmds.py:209
6914
msgid " bzr launchpad-login"
6915
msgstr ""
6916
6917
#: bzrlib/plugins/launchpad/cmds.py:211
6918
msgid " Set the Launchpad ID of the current user to 'bob'::"
6919
msgstr ""
6920
6921
#: bzrlib/plugins/launchpad/cmds.py:213
6922
msgid " bzr launchpad-login bob"
6923
msgstr ""
6924
6925
# help of 'no-check' option of 'launchpad-login' command
6926
#: bzrlib/plugins/launchpad/cmds.py:220
6927
msgid "Don't check that the user name is valid."
6928
msgstr ""
6929
6930
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6931
msgid "Launchpad user ID exists and has SSH keys.\n"
6932
msgstr ""
6933
6934
#: bzrlib/plugins/launchpad/cmds.py:238
6935
msgid "No Launchpad user ID configured.\n"
6936
msgstr ""
6937
6938
#: bzrlib/plugins/launchpad/cmds.py:249
6939
#, python-format
6940
msgid "Launchpad user ID set to '%s'.\n"
6941
msgstr ""
6942
6943
#: bzrlib/plugins/launchpad/cmds.py:255
6944
msgid "Ask Launchpad to mirror a branch now."
6945
msgstr ""
6946
6947
#: bzrlib/plugins/launchpad/cmds.py:272
6948
msgid "Propose merging a branch on Launchpad."
6949
msgstr ""
6950
6951
#: bzrlib/plugins/launchpad/cmds.py:274
6952
msgid ""
6953
"This will open your usual editor to provide the initial comment. When it\n"
6954
"has created the proposal, it will open it in your default web browser."
6955
msgstr ""
6956
6957
#: bzrlib/plugins/launchpad/cmds.py:277
6958
msgid ""
6959
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6960
"is not supplied, the remembered submit branch will be used. If no submit\n"
6961
"branch is remembered, the development focus will be used."
6962
msgstr ""
6963
6964
#: bzrlib/plugins/launchpad/cmds.py:281
6965
msgid ""
6966
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6967
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6968
"The parameter the launchpad account name of the desired reviewer. This\n"
6969
"may optionally be followed by '=' and the review type. For example:"
6970
msgstr ""
6971
6972
#: bzrlib/plugins/launchpad/cmds.py:286
6973
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6974
msgstr ""
6975
6976
#: bzrlib/plugins/launchpad/cmds.py:288
6977
msgid ""
6978
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6979
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6980
msgstr ""
6981
6982
# help of 'staging' option of 'lp-propose-merge' command
6983
#: bzrlib/plugins/launchpad/cmds.py:293
6984
msgid "Propose the merge on staging."
6985
msgstr ""
6986
6987
# help of 'message' option of 'lp-propose-merge' command
6988
#: bzrlib/plugins/launchpad/cmds.py:295
6989
msgid "Commit message."
6990
msgstr ""
6991
6992
# help of 'approve' option of 'lp-propose-merge' command
6993
#: bzrlib/plugins/launchpad/cmds.py:297
6994
msgid "Mark the proposal as approved immediately."
6995
msgstr ""
6996
6997
# help of 'fixes' option of 'lp-propose-merge' command
6998
#: bzrlib/plugins/launchpad/cmds.py:298
6999
msgid "The bug this proposal fixes."
7000
msgstr ""
7001
7002
# help of 'review' option of 'lp-propose-merge' command
7003
#: bzrlib/plugins/launchpad/cmds.py:300
7004
msgid "Requested reviewer and optional type."
7005
msgstr ""
7006
7007
#: bzrlib/plugins/launchpad/cmds.py:335
7008
msgid "Find the proposal to merge this revision."
7009
msgstr ""
7010
7011
#: bzrlib/plugins/launchpad/cmds.py:337
7012
msgid ""
7013
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7014
"This works only if the selected branch was the merge proposal target, and\n"
7015
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7016
"are opened in a web browser."
7017
msgstr ""
7018
7019
#: bzrlib/plugins/launchpad/cmds.py:342
7020
msgid ""
7021
"Any revision involved in the merge may be specified-- the revision in\n"
7022
"which the merge was performed, or one of the revisions that was merged."
7023
msgstr ""
7024
7025
#: bzrlib/plugins/launchpad/cmds.py:345
7026
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7027
msgstr ""
7028
7029
#: bzrlib/plugins/launchpad/cmds.py:347
7030
msgid " bzr lp-find-proposal -r annotate:README:1"
7031
msgstr ""
7032
7033
#: bzrlib/plugins/launchpad/cmds.py:363
7034
msgid "No review found."
7035
msgstr ""
7036
7037
#: bzrlib/plugins/launchpad/cmds.py:364
7038
#, python-format
7039
msgid "%d proposals(s) found."
7040
msgstr ""
7041
7042
#: bzrlib/plugins/launchpad/cmds.py:374
7043
msgid "Finding revision-id"
7044
msgstr ""
7045
7046
#: bzrlib/plugins/launchpad/cmds.py:381
7047
msgid "Finding merge"
7048
msgstr ""
7049
7050
#: bzrlib/plugins/launchpad/cmds.py:386
7051
msgid "Finding revno"
7052
msgstr ""
7053
7054
#: bzrlib/plugins/launchpad/cmds.py:392
7055
msgid "Finding Launchpad branch"
7056
msgstr ""
7057
7058
#: bzrlib/plugins/launchpad/cmds.py:395
7059
msgid "Finding proposals"
7060
msgstr ""
7061
7062
#: bzrlib/plugins/launchpad/lp_api.py:241
7063
#: bzrlib/plugins/launchpad/lp_api.py:246
7064
#, python-format
7065
msgid "%s is not registered on Launchpad"
7066
msgstr ""
7067
7068
#: bzrlib/plugins/launchpad/lp_api.py:256
7069
#, python-format
7070
msgid "%s has no development focus."
7071
msgstr ""
7072
7073
#: bzrlib/plugins/launchpad/lp_api.py:261
7074
#, python-format
7075
msgid "development focus %s has no branch."
7076
msgstr ""
7077
7078
#: bzrlib/plugins/launchpad/lp_api.py:266
7079
#, python-format
7080
msgid "source package %s has no branch."
7081
msgstr ""
7082
7083
#: bzrlib/plugins/launchpad/lp_api.py:270
7084
#, python-format
7085
msgid "%s has no associated product or source package."
7086
msgstr ""
7087
7088
#: bzrlib/plugins/launchpad/lp_api.py:282
7089
#, python-format
7090
msgid "%s is already up-to-date."
7091
msgstr ""
7092
7093
#: bzrlib/plugins/launchpad/lp_api.py:289
7094
#, python-format
7095
msgid "Pushing to %s"
7096
msgstr ""
7097
7098
#: bzrlib/plugins/launchpad/lp_directory.py:170
7099
msgid ""
7100
"resolution for {0}\n"
7101
" local: {1}\n"
7102
" remote: {2}"
7103
msgstr ""
7104
7105
#: bzrlib/plugins/launchpad/lp_propose.py:150
7106
#, python-format
7107
msgid "There is already a branch merge proposal: %s"
7108
msgstr ""
7109
7110
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7111
msgid "pb parameter to convert() is deprecated"
7112
msgstr ""
7113
7114
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7115
msgid "starting upgrade from format 4 to 5"
7116
msgstr ""
7117
7118
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7119
msgid "note: upgrade may be faster if all store files are ungzipped first"
7120
msgstr ""
7121
7122
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7123
msgid "converting revision"
7124
msgstr ""
7125
7126
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7127
msgid "upgraded to weaves:"
7128
msgstr ""
7129
7130
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7131
#, python-format
7132
msgid "%6d revisions and inventories"
7133
msgstr ""
7134
7135
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7136
#, python-format
7137
msgid "%6d revisions not present"
7138
msgstr ""
7139
7140
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7141
#, python-format
7142
msgid "%6d texts"
7143
msgstr ""
7144
7145
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7146
msgid "writing weave"
7147
msgstr ""
7148
7149
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7150
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7151
msgid "inventory"
7152
msgstr ""
7153
7154
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7155
msgid "write revision"
7156
msgstr ""
7157
7158
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7159
msgid "loading revision"
7160
msgstr ""
7161
7162
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7163
#, python-format
7164
msgid "revision {%s} not present in branch; will be converted as a ghost"
7165
msgstr ""
7166
7167
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7168
msgid "starting upgrade from format 5 to 6"
7169
msgstr ""
7170
7171
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7172
#, python-format
7173
msgid "adding prefixes to %s"
7174
msgstr ""
7175
7176
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7177
msgid "starting upgrade from format 6 to metadir"
7178
msgstr ""
7179
7180
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7181
msgid "Removing ancestry.weave"
7182
msgstr ""
7183
7184
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7185
msgid "Finding branch files"
7186
msgstr ""
7187
7188
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7189
msgid "Upgrading repository"
7190
msgstr ""
7191
7192
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7193
msgid "Upgrading branch"
7194
msgstr ""
7195
7196
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7197
msgid "No working tree."
7198
msgstr ""
7199
7200
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7201
msgid "Upgrading working tree"
7202
msgstr ""
7203
7204
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7205
#, python-format
7206
msgid "Make %s lock"
7207
msgstr ""
7208
7209
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7210
#, python-format
7211
msgid "Moving %s"
7212
msgstr ""
7213
7214
#: bzrlib/push.py:56
7215
msgid "Created new branch."
7216
msgstr ""
7217
7218
#: bzrlib/push.py:97
7219
#, python-format
7220
msgid ""
7221
"Target directory %s already contains a .bzr directory, but it is not valid."
7222
msgstr ""
7223
7224
#: bzrlib/push.py:101
7225
#, python-format
7226
msgid ""
7227
"Target directory %s already exists, but does not have a .bzr directory. "
7228
"Supply --use-existing-dir to push there anyway."
7229
msgstr ""
7230
7231
#: bzrlib/push.py:122
7232
#, python-format
7233
msgid "Too many redirections trying to make %s."
7234
msgstr ""
7235
7236
#: bzrlib/push.py:148
7237
msgid ""
7238
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7239
"information."
7240
msgstr ""
7241
7242
#: bzrlib/push.py:152
7243
#, python-format
7244
msgid ""
7245
"It is not possible to losslessly push to %s. You may want to use dpush "
7246
"instead."
7247
msgstr ""
7248
7249
#: bzrlib/push.py:158
7250
#, python-format
7251
msgid ""
7252
"At %s you have a valid .bzr control directory, but not a branch or "
7253
"repository. This is an unsupported configuration. Please move the target "
7254
"directory out of the way and try again."
7255
msgstr ""
7256
7257
#: bzrlib/reconcile.py:97
7258
#, python-format
7259
msgid "Reconciling branch %s"
7260
msgstr ""
7261
7262
#: bzrlib/reconcile.py:103
7263
#, python-format
7264
msgid "Reconciling repository %s"
7265
msgstr ""
7266
7267
#: bzrlib/reconcile.py:105
7268
msgid "Reconciling repository"
7269
msgstr ""
7270
7271
#: bzrlib/reconcile.py:111
7272
#, python-format
7273
msgid "%s cannot canonicalize CHKs."
7274
msgstr ""
7275
7276
#: bzrlib/reconcile.py:119
7277
msgid "Reconcile aborted: revision index has inconsistent parents."
7278
msgstr ""
7279
7280
#: bzrlib/reconcile.py:121
7281
msgid "Run \"bzr check\" for more details."
7282
msgstr ""
7283
7284
#: bzrlib/reconcile.py:123
7285
msgid "Reconciliation complete."
7286
msgstr ""
7287
7288
#: bzrlib/reconcile.py:166
7289
msgid "Fixing last revision info {0} => {1}"
7290
msgstr ""
7291
7292
#: bzrlib/reconcile.py:173
7293
msgid "revision_history ok."
7294
msgstr ""
7295
7296
#: bzrlib/reconcile.py:234
7297
msgid "Reading inventory data"
7298
msgstr ""
7299
7300
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7301
msgid "Inventory ok."
7302
msgstr ""
7303
7304
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7305
msgid "Backing up inventory"
7306
msgstr ""
7307
7308
#: bzrlib/reconcile.py:258
7309
msgid "Backup inventory created."
7310
msgstr ""
7311
7312
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7313
msgid "Writing weave"
7314
msgstr ""
7315
7316
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7317
msgid "Inventory regenerated."
7318
msgstr ""
7319
7320
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7321
msgid "Reading indexes"
7322
msgstr ""
7323
7324
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7325
msgid "Checking unused inventories"
7326
msgstr ""
7327
7328
#: bzrlib/reconcile.py:388
7329
msgid "Backup Inventory created"
7330
msgstr ""
7331
7332
#: bzrlib/reconcile.py:446
7333
msgid "Fixing text parents"
7334
msgstr ""
7335
7336
#: bzrlib/reconfigure.py:54
7337
msgid "{0} is now stacked on {1}\n"
7338
msgstr ""
7339
7340
#: bzrlib/reconfigure.py:69
7341
#, python-format
7342
msgid "%s is now not stacked\n"
7343
msgstr ""
7344
7345
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7346
#, python-format
7347
msgid "bzr: ERROR (ignored): %s"
7348
msgstr ""
7349
7350
#: bzrlib/remote.py:2534
7351
msgid "Copying repository content as tarball..."
7352
msgstr ""
7353
7354
#: bzrlib/rename_map.py:69
7355
msgid "Calculating hashes"
7356
msgstr ""
7357
7358
#: bzrlib/rename_map.py:107
7359
msgid "Determining hash hits"
7360
msgstr ""
7361
7362
#: bzrlib/rename_map.py:242
7363
msgid "{0} => {1}"
7364
msgstr ""
7365
7366
#: bzrlib/repository.py:1738
7367
msgid "Moving repository to repository.backup"
7368
msgstr ""
7369
7370
#: bzrlib/repository.py:1745
7371
msgid "Creating new repository"
7372
msgstr ""
7373
7374
#: bzrlib/repository.py:1750
7375
msgid "Copying content"
7376
msgstr ""
7377
7378
#: bzrlib/repository.py:1754
7379
msgid "Deleting old repository content"
7380
msgstr ""
7381
7382
#: bzrlib/repository.py:1756
7383
msgid "repository converted"
7384
msgstr ""
7385
7386
#: bzrlib/revisionspec.py:903
7387
msgid "Using {0} {1}"
7388
msgstr ""
7389
7390
#: bzrlib/send.py:59
7391
#, python-format
7392
msgid "Mail client \"%s\" does not support specifying body"
7393
msgstr ""
7394
7395
#: bzrlib/send.py:63
7396
msgid "--remember requires a branch to be specified."
7397
msgstr ""
7398
7399
#: bzrlib/send.py:78
7400
msgid "No submit branch known or specified"
7401
msgstr ""
7402
7403
#: bzrlib/send.py:81
7404
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7405
msgstr ""
7406
7407
#: bzrlib/send.py:99
7408
#, python-format
7409
msgid "No such send format '%s'."
7410
msgstr ""
7411
7412
#: bzrlib/send.py:115
7413
msgid "bzr send takes at most two one revision identifiers"
7414
msgstr ""
7415
7416
#: bzrlib/send.py:128
7417
msgid "No revisions to submit."
7418
msgstr ""
7419
7420
#: bzrlib/send.py:140
7421
msgid ""
7422
"- not supported for merge directives that use more than one output file."
7423
msgstr ""
7424
7425
#: bzrlib/send.py:186
7426
msgid "Format 0.9 does not permit bundle with no patch"
7427
msgstr ""
7428
7429
#: bzrlib/shelf_ui.py:46
7430
#, python-format
7431
msgid "Shelve adding file \"%(path)s\"?"
7432
msgstr ""
7433
7434
#: bzrlib/shelf_ui.py:47
7435
msgid "Shelve binary changes?"
7436
msgstr ""
7437
7438
#: bzrlib/shelf_ui.py:48
7439
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7440
msgstr ""
7441
7442
#: bzrlib/shelf_ui.py:50
7443
#, python-format
7444
msgid "Shelve removing file \"%(path)s\"?"
7445
msgstr ""
7446
7447
#: bzrlib/shelf_ui.py:51
7448
#, python-format
7449
msgid "Shelve %d change(s)?"
7450
msgstr ""
7451
7452
#: bzrlib/shelf_ui.py:52
7453
msgid "Shelve?"
7454
msgstr ""
7455
7456
#: bzrlib/shelf_ui.py:53
7457
#, python-format
7458
msgid ""
7459
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7460
msgstr ""
7461
7462
#: bzrlib/shelf_ui.py:55
7463
#, python-format
7464
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7465
msgstr ""
7466
7467
#: bzrlib/shelf_ui.py:70
7468
#, python-format
7469
msgid "Changes shelved with id \"%d\"."
7470
msgstr ""
7471
7472
#: bzrlib/shelf_ui.py:74
7473
msgid "Selected changes destroyed."
7474
msgstr ""
7475
7476
#: bzrlib/shelf_ui.py:78
7477
msgid "Selected changes:"
7478
msgstr ""
7479
7480
#: bzrlib/shelf_ui.py:98
7481
#, python-format
7482
msgid "Delete file \"%(path)s\"?"
7483
msgstr ""
7484
7485
#: bzrlib/shelf_ui.py:99
7486
msgid "Apply binary changes?"
7487
msgstr ""
7488
7489
#: bzrlib/shelf_ui.py:100
7490
#, python-format
7491
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7492
msgstr ""
7493
7494
#: bzrlib/shelf_ui.py:102
7495
#, python-format
7496
msgid "Add file \"%(path)s\"?"
7497
msgstr ""
7498
7499
#: bzrlib/shelf_ui.py:103
7500
#, python-format
7501
msgid "Apply %d change(s)?"
7502
msgstr ""
7503
7504
#: bzrlib/shelf_ui.py:104
7505
msgid "Apply change?"
7506
msgstr ""
7507
7508
#: bzrlib/shelf_ui.py:105
7509
#, python-format
7510
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7511
msgstr ""
7512
7513
#: bzrlib/shelf_ui.py:107
7514
#, python-format
7515
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7516
msgstr ""
7517
7518
#: bzrlib/shelf_ui.py:402
7519
msgid "No changes are shelved."
7520
msgstr ""
7521
7522
#: bzrlib/shelf_ui.py:460
7523
#, python-format
7524
msgid "Using changes with id \"%d\"."
7525
msgstr ""
7526
7527
#: bzrlib/shelf_ui.py:464
7528
#, python-format
7529
msgid "Message: %s"
7530
msgstr ""
7531
7532
#: bzrlib/shelf_ui.py:476
7533
#, python-format
7534
msgid "Deleted changes with id \"%d\"."
7535
msgstr ""
7536
7537
#: bzrlib/smart/medium.py:714
7538
msgid "HPSS calls: {0} ({1} vfs) {2}"
7539
msgstr ""
7540
7541
#: bzrlib/smart/server.py:169
7542
msgid "Requested to stop gracefully"
7543
msgstr ""
7544
7545
#: bzrlib/smart/server.py:179
7546
#, python-format
7547
msgid "Waiting for %d client(s) to finish"
7548
msgstr ""
7549
7550
#: bzrlib/smart/server.py:185
7551
#, python-format
7552
msgid "Still waiting for %d client(s) to finish"
7553
msgstr ""
7554
7555
#: bzrlib/smart/server.py:219
7556
#, python-format
7557
msgid "listening socket error: %s"
7558
msgstr ""
7559
7560
#: bzrlib/smart/server.py:452
7561
#, python-format
7562
msgid "listening on port: %s"
7563
msgstr ""
7564
7565
#: bzrlib/switch.py:73
7566
msgid "Pending merges must be committed or reverted before using switch."
7567
msgstr ""
7568
7569
#: bzrlib/switch.py:100
7570
msgid ""
7571
"Cannot switch as local commits found in the checkout. Commit these to the "
7572
"bound branch or use --force to throw them away."
7573
msgstr ""
7574
7575
#: bzrlib/switch.py:105
7576
#, python-format
7577
msgid ""
7578
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7579
"anyway, use --force."
7580
msgstr ""
7581
7582
#: bzrlib/switch.py:129
7583
msgid "Cannot switch a branch, only a checkout."
7584
msgstr ""
7585
7586
#: bzrlib/switch.py:167
7587
#, python-format
7588
msgid "Tree is up to date at revision %d."
7589
msgstr ""
7590
7591
#: bzrlib/switch.py:173
7592
#, python-format
7593
msgid "Updated to revision %d."
7594
msgstr ""
7595
7596
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7597
msgid "Apply phase"
7598
msgstr ""
7599
7600
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7601
msgid "removing file"
7602
msgstr ""
7603
7604
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7605
msgid "adding file"
7606
msgstr ""
7607
7608
#: bzrlib/transform.py:2598
7609
msgid "Building tree"
7610
msgstr ""
7611
7612
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7613
msgid "Adding file contents"
7614
msgstr ""
7615
7616
#: bzrlib/transform.py:3017
7617
msgid "Resolution pass"
7618
msgstr ""
7619
7620
#: bzrlib/transport/ftp/_gssapi.py:88
7621
#, python-format
7622
msgid "Authenticated as %s"
7623
msgstr ""
7624
7625
#: bzrlib/tree.py:647
7626
msgid "*** {0} content-filter: {1} => {2!r}"
7627
msgstr ""
7628
7629
#: bzrlib/upgrade.py:77
7630
#, python-format
7631
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7632
msgstr ""
7633
7634
#: bzrlib/upgrade.py:100
7635
#, python-format
7636
msgid "cannot upgrade from bzrdir format %s"
7637
msgstr ""
7638
7639
#: bzrlib/upgrade.py:103
7640
#, python-format
7641
msgid "starting upgrade of %s"
7642
msgstr ""
7643
7644
#: bzrlib/upgrade.py:110
7645
msgid "finished"
7646
msgstr ""
7647
7648
#: bzrlib/upgrade.py:120
7649
msgid "Deleting backup.bzr"
7650
msgstr ""
7651
7652
#: bzrlib/upgrade.py:151
7653
msgid ""
7654
"\n"
7655
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7656
msgstr ""
7657
7658
#: bzrlib/upgrade.py:208
7659
#, python-format
7660
msgid "Found %d dependent branches - upgrading ..."
7661
msgstr ""
7662
7663
#: bzrlib/upgrade.py:276
7664
msgid "Upgrading bzrdirs"
7665
msgstr ""
7666
7667
#: bzrlib/upgrade.py:282
7668
#, python-format
7669
msgid "Upgrading %s"
7670
msgstr ""
7671
7672
#: bzrlib/upgrade.py:283
7673
msgid "Upgrading {0} {1} ..."
7674
msgstr ""
7675
7676
#: bzrlib/upgrade.py:301
7677
msgid "Removing backup ..."
7678
msgstr ""
7679
7680
#: bzrlib/upgrade.py:305
7681
msgid "failed to clean-up {0}: {1}"
7682
msgstr ""
7683
7684
#: bzrlib/vf_repository.py:1091
7685
msgid "inventories"
7686
msgstr ""
7687
7688
#: bzrlib/vf_repository.py:1117
7689
msgid "texts"
7690
msgstr ""
7691
7692
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7693
msgid "Calculating text parents"
7694
msgstr ""
7695
7696
#: bzrlib/vf_repository.py:1707
7697
msgid "Fetch texts"
7698
msgstr ""
7699
7700
#: bzrlib/vf_repository.py:2536
7701
msgid "loading text store"
7702
msgstr ""
7703
7704
#: bzrlib/vf_repository.py:2542
7705
msgid "checking text graph"
7706
msgstr ""
7707
7708
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7709
#: bzrlib/vf_repository.py:3127
7710
msgid "Transferring revisions"
7711
msgstr ""
7712
7713
#: bzrlib/win32utils.py:146
7714
msgid "Failed to GetProcessMemoryInfo()"
7715
msgstr ""
7716
7717
#: bzrlib/win32utils.py:167
7718
msgid "Cannot debug memory on win32 without ctypes or win32process"
7719
msgstr ""
7720
7721
#: bzrlib/win32utils.py:172
7722
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7723
msgstr ""
7724
7725
#: bzrlib/win32utils.py:180
7726
#, python-format
7727
msgid "WorkingSize %8d KiB"
7728
msgstr ""
7729
7730
#: bzrlib/win32utils.py:181
7731
#, python-format
7732
msgid "PeakWorking %8d KiB"
7733
msgstr ""
7734
7735
#: bzrlib/win32utils.py:182
7736
#, python-format
7737
msgid "PagefileUsage %8d KiB"
7738
msgstr ""
7739
7740
#: bzrlib/win32utils.py:183
7741
#, python-format
7742
msgid "PeakPagefileUsage %8d KiB"
7743
msgstr ""
7744
7745
#: bzrlib/win32utils.py:185
7746
#, python-format
7747
msgid "PrivateUsage %8d KiB"
7748
msgstr ""
7749
7750
#: bzrlib/win32utils.py:186
7751
#, python-format
7752
msgid "PageFaultCount %8d"
7753
msgstr ""
7754
7755
#: bzrlib/workingtree.py:1482
7756
msgid "Rerun update after fixing the conflicts."
7757
msgstr ""
7758
7759
#: dummy/help_topics/authentication/summary.txt:1
7760
msgid "Information on configuring authentication"
7761
msgstr ""
7762
7763
#: dummy/help_topics/basic/detail.txt:1
7764
msgid ""
7765
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7766
"http://bazaar.canonical.com/"
7767
msgstr ""
7768
7769
#: dummy/help_topics/basic/detail.txt:4
7770
msgid ""
7771
"Basic commands:\n"
7772
" bzr init makes this directory a versioned branch\n"
7773
" bzr branch make a copy of another branch"
7774
msgstr ""
7775
7776
#: dummy/help_topics/basic/detail.txt:8
7777
msgid ""
7778
" bzr add make files or directories versioned\n"
7779
" bzr ignore ignore a file or pattern\n"
7780
" bzr mv move or rename a versioned file"
7781
msgstr ""
7782
7783
#: dummy/help_topics/basic/detail.txt:12
7784
msgid ""
7785
" bzr status summarize changes in working copy\n"
7786
" bzr diff show detailed diffs"
7787
msgstr ""
7788
7789
#: dummy/help_topics/basic/detail.txt:15
7790
msgid ""
7791
" bzr merge pull in changes from another branch\n"
7792
" bzr commit save some or all changes\n"
7793
" bzr send send changes via email"
7794
msgstr ""
7795
7796
#: dummy/help_topics/basic/detail.txt:19
7797
msgid ""
7798
" bzr log show history of changes\n"
7799
" bzr check validate storage"
7800
msgstr ""
7801
7802
#: dummy/help_topics/basic/detail.txt:22
7803
msgid ""
7804
" bzr help init more help on e.g. init command\n"
7805
" bzr help commands list all commands\n"
7806
" bzr help topics list all help topics\n"
7807
msgstr ""
7808
7809
#: dummy/help_topics/basic/summary.txt:1
7810
msgid "Basic commands"
7811
msgstr ""
7812
7813
#: dummy/help_topics/branches/detail.txt:1
7814
msgid "Branches"
7815
msgstr ""
7816
7817
#: dummy/help_topics/branches/detail.txt:3
7818
msgid ""
7819
"A branch consists of the state of a project, including all of its\n"
7820
"history. All branches have a repository associated (which is where the\n"
7821
"branch history is stored), but multiple branches may share the same\n"
7822
"repository (a shared repository). Branches can be copied and merged."
7823
msgstr ""
7824
7825
#: dummy/help_topics/branches/detail.txt:8
7826
msgid ""
7827
"In addition, one branch may be bound to another one. Binding to another\n"
7828
"branch indicates that commits which happen in this branch must also \n"
7829
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7830
"commits when the two branches are out of date. In order for a commit \n"
7831
"to succeed, it may be necessary to update the current branch using \n"
7832
"``bzr update``."
7833
msgstr ""
7834
7835
#: dummy/help_topics/branches/detail.txt:15
7836
#: dummy/help_topics/checkouts/detail.txt:66
7837
#: dummy/help_topics/repositories/detail.txt:36
7838
msgid "Related commands::"
7839
msgstr ""
7840
7841
#: dummy/help_topics/branches/detail.txt:17
7842
msgid ""
7843
" init Change a directory into a versioned branch.\n"
7844
" branch Create a new branch that is a copy of an existing branch.\n"
7845
" merge Perform a three-way merge.\n"
7846
" bind Bind a branch to another one.\n"
7847
msgstr ""
7848
7849
#: dummy/help_topics/branches/summary.txt:1
7850
msgid "Information on what a branch is"
7851
msgstr ""
7852
7853
#: dummy/help_topics/bugs/summary.txt:1
7854
msgid "Bug tracker settings"
7855
msgstr ""
7856
7857
#: dummy/help_topics/checkouts/detail.txt:1
7858
msgid "Checkouts"
7859
msgstr ""
7860
7861
#: dummy/help_topics/checkouts/detail.txt:3
7862
msgid ""
7863
"Checkouts are source trees that are connected to a branch, so that when\n"
7864
"you commit in the source tree, the commit goes into that branch. They\n"
7865
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7866
"Bazaar's decentralized features until you want them. Using checkouts\n"
7867
"with shared repositories is very similar to working with SVN or CVS, but\n"
7868
"doesn't have the same restrictions. And using checkouts still allows\n"
7869
"others working on the project to use whatever workflow they like."
7870
msgstr ""
7871
7872
#: dummy/help_topics/checkouts/detail.txt:11
7873
msgid ""
7874
"A checkout is created with the bzr checkout command (see \"help checkout"
7875
"\").\n"
7876
"You pass it a reference to another branch, and it will create a local copy\n"
7877
"for you that still contains a reference to the branch you created the\n"
7878
"checkout from (the master branch). Then if you make any commits they will "
7879
"be\n"
7880
"made on the other branch first. This creates an instant mirror of your work, "
7881
"or\n"
7882
"facilitates lockstep development, where each developer is working together,\n"
7883
"continuously integrating the changes of others."
7884
msgstr ""
7885
7886
#: dummy/help_topics/checkouts/detail.txt:19
7887
msgid ""
7888
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7889
"you have the full history locally. As you have a first class branch you "
7890
"can\n"
7891
"also commit locally if you want, for instance due to the temporary loss af "
7892
"a\n"
7893
"network connection. Use the --local option to commit to do this. All the "
7894
"local\n"
7895
"commits will then be made on the master branch the next time you do a non-"
7896
"local\n"
7897
"commit."
7898
msgstr ""
7899
7900
#: dummy/help_topics/checkouts/detail.txt:26
7901
msgid ""
7902
"If you are using a checkout from a shared branch you will periodically want "
7903
"to\n"
7904
"pull in all the changes made by others. This is done using the \"update\"\n"
7905
"command. The changes need to be applied before any non-local commit, but\n"
7906
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7907
"command when needed."
7908
msgstr ""
7909
7910
#: dummy/help_topics/checkouts/detail.txt:32
7911
msgid ""
7912
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7913
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7914
"SVN checkout in that it is not a first class branch, it mainly consists of "
7915
"the\n"
7916
"working tree. This means that any history operations must query the master\n"
7917
"branch, which could be slow if a network connection is involved. Also, as "
7918
"you\n"
7919
"don't have a local branch, then you cannot commit locally."
7920
msgstr ""
7921
7922
#: dummy/help_topics/checkouts/detail.txt:39
7923
msgid ""
7924
"Lightweight checkouts work best when you have fast reliable access to the\n"
7925
"master branch. This means that if the master branch is on the same disk or "
7926
"LAN\n"
7927
"a lightweight checkout will be faster than a heavyweight one for any "
7928
"commands\n"
7929
"that modify the revision history (as only one copy of the branch needs to\n"
7930
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7931
"that uses the history but does not change it, but if the master branch is "
7932
"on\n"
7933
"the same disk then there won't be a noticeable difference."
7934
msgstr ""
7935
7936
#: dummy/help_topics/checkouts/detail.txt:47
7937
msgid ""
7938
"Another possible use for a checkout is to use it with a treeless repository\n"
7939
"containing your branches, where you maintain only one working tree by\n"
7940
"switching the master branch that the checkout points to when you want to\n"
7941
"work on a different branch."
7942
msgstr ""
7943
7944
#: dummy/help_topics/checkouts/detail.txt:52
7945
msgid ""
7946
"Obviously to commit on a checkout you need to be able to write to the "
7947
"master\n"
7948
"branch. This means that the master branch must be accessible over a "
7949
"writeable\n"
7950
"protocol , such as sftp://, and that you have write permissions at the "
7951
"other\n"
7952
"end. Checkouts also work on the local file system, so that all that matters "
7953
"is\n"
7954
"file permissions."
7955
msgstr ""
7956
7957
#: dummy/help_topics/checkouts/detail.txt:58
7958
msgid ""
7959
"You can change the master of a checkout by using the \"switch\" command "
7960
"(see\n"
7961
"\"help switch\"). This will change the location that the commits are sent "
7962
"to.\n"
7963
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7964
"checkout. If you would like to convert your heavy checkout into a normal\n"
7965
"branch so that every commit is local, you can use the \"unbind\" command. To "
7966
"see\n"
7967
"whether or not a branch is bound or not you can use the \"info\" command. If "
7968
"the\n"
7969
"branch is bound it will tell you the location of the bound branch."
7970
msgstr ""
7971
7972
#: dummy/help_topics/checkouts/detail.txt:68
7973
msgid ""
7974
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7975
" checkout\n"
7976
" update Pull any changes in the master branch in to your checkout\n"
7977
" commit Make a commit that is sent to the master branch. If you have\n"
7978
" a heavy checkout then the --local option will commit to the\n"
7979
" checkout without sending the commit to the master\n"
7980
" switch Change the master branch that the commits in the checkout "
7981
"will\n"
7982
" be sent to\n"
7983
" bind Turn a standalone branch into a heavy checkout so that any\n"
7984
" commits will be sent to the master branch\n"
7985
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7986
" commits are only made locally\n"
7987
" info Displays whether a branch is bound or unbound. If the branch "
7988
"is\n"
7989
" bound, then it will also display the location of the bound "
7990
"branch\n"
7991
msgstr ""
7992
7993
#: dummy/help_topics/checkouts/summary.txt:1
7994
msgid "Information on what a checkout is"
7995
msgstr ""
7996
7997
#: dummy/help_topics/commands/summary.txt:1
7998
msgid "Basic help for all commands"
7999
msgstr ""
8000
8001
#: dummy/help_topics/configuration/summary.txt:1
8002
msgid "Details on the configuration settings available"
8003
msgstr ""
8004
8005
#: dummy/help_topics/conflict-types/summary.txt:1
8006
msgid "Types of conflicts and what to do about them"
8007
msgstr ""
8008
8009
#: dummy/help_topics/content-filters/summary.txt:1
8010
msgid "Conversion of content into/from working trees"
8011
msgstr ""
8012
8013
#: dummy/help_topics/criss-cross/detail.txt:1
8014
msgid "Criss-Cross"
8015
msgstr ""
8016
8017
#: dummy/help_topics/criss-cross/detail.txt:3
8018
msgid ""
8019
"A criss-cross in the branch history can cause the default merge technique\n"
8020
"to emit more conflicts than would normally be expected."
8021
msgstr ""
8022
8023
#: dummy/help_topics/criss-cross/detail.txt:6
8024
msgid ""
8025
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
8026
"give\n"
8027
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
8028
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
8029
msgstr ""
8030
8031
#: dummy/help_topics/criss-cross/detail.txt:10
8032
msgid ""
8033
"Criss-crosses occur in a branch's history if two branches merge the same "
8034
"thing\n"
8035
"and then merge one another, or if two branches merge one another at the "
8036
"same\n"
8037
"time. They can be avoided by having each branch only merge from or into a\n"
8038
"designated central branch (a \"star topology\")."
8039
msgstr ""
8040
8041
#: dummy/help_topics/criss-cross/detail.txt:15
8042
msgid ""
8043
"Criss-crosses cause problems because of the way merge works. Bazaar's "
8044
"default\n"
8045
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8046
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
8047
"differences between THIS and OTHER are due to one side adding lines, or\n"
8048
"from another side removing lines."
8049
msgstr ""
8050
8051
#: dummy/help_topics/criss-cross/detail.txt:21
8052
msgid ""
8053
"Criss-crosses mean there is no good choice for a base. Selecting the "
8054
"recent\n"
8055
"merge points could cause one side's changes to be silently discarded.\n"
8056
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8057
"are emitted."
8058
msgstr ""
8059
8060
#: dummy/help_topics/criss-cross/detail.txt:26
8061
msgid ""
8062
"The ``weave`` merge type is not affected by this problem because it uses\n"
8063
"line-origin detection instead of a basis revision to determine the cause of\n"
8064
"differences.\n"
8065
msgstr ""
8066
8067
#: dummy/help_topics/criss-cross/summary.txt:1
8068
msgid "Information on criss-cross merging"
8069
msgstr ""
8070
8071
#: dummy/help_topics/current-formats/summary.txt:1
8072
msgid "Current storage formats"
8073
msgstr ""
8074
8075
#: dummy/help_topics/debug-flags/summary.txt:1
8076
msgid "Options to show or record debug information"
8077
msgstr ""
8078
8079
#: dummy/help_topics/diverged-branches/summary.txt:1
8080
msgid "How to fix diverged branches"
8081
msgstr ""
8082
8083
#: dummy/help_topics/env-variables/summary.txt:1
8084
msgid "Environment variable names and values"
8085
msgstr ""
8086
8087
#: dummy/help_topics/eol/summary.txt:1
8088
msgid "Information on end-of-line handling"
8089
msgstr ""
8090
8091
#: dummy/help_topics/files/detail.txt:1
8092
msgid "Files"
8093
msgstr ""
8094
8095
#: dummy/help_topics/files/detail.txt:3
8096
msgid ""
8097
":On Unix: ~/.bazaar/bazaar.conf\n"
8098
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
8099
"\\bazaar\\\\2.0\\\\bazaar.conf"
8100
msgstr ""
8101
8102
#: dummy/help_topics/files/detail.txt:6
8103
msgid ""
8104
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8105
"used to define general configuration that will be applied everywhere.\n"
8106
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8107
"commonly used options."
8108
msgstr ""
8109
8110
#: dummy/help_topics/files/detail.txt:11
8111
msgid "A typical config file might look something like::"
8112
msgstr ""
8113
8114
#: dummy/help_topics/files/detail.txt:13
8115
msgid ""
8116
" [DEFAULT]\n"
8117
" email=John Doe <jdoe@isp.com>"
8118
msgstr ""
8119
8120
#: dummy/help_topics/files/detail.txt:16
8121
msgid ""
8122
" [ALIASES]\n"
8123
" commit = commit --strict\n"
8124
" log10 = log --short -r -10..-1\n"
8125
msgstr ""
8126
8127
#: dummy/help_topics/files/summary.txt:1
8128
msgid "Information on configuration and log files"
8129
msgstr ""
8130
8131
#: dummy/help_topics/formats/detail.txt:1
8132
msgid "Storage Formats"
8133
msgstr ""
8134
8135
#: dummy/help_topics/formats/detail.txt:3
8136
msgid ""
8137
"To ensure that older clients do not access data incorrectly,\n"
8138
"Bazaar's policy is to introduce a new storage format whenever\n"
8139
"new features requiring new metadata are added. New storage\n"
8140
"formats may also be introduced to improve performance and\n"
8141
"scalability."
8142
msgstr ""
8143
8144
#: dummy/help_topics/formats/detail.txt:9
8145
msgid ""
8146
"The newest format, 2a, is highly recommended. If your\n"
8147
"project is not using 2a, then you should suggest to the\n"
8148
"project owner to upgrade."
8149
msgstr ""
8150
8151
#: dummy/help_topics/formats/detail.txt:13
8152
msgid ""
8153
"\n"
8154
".. note::"
8155
msgstr ""
8156
8157
#: dummy/help_topics/formats/detail.txt:16
8158
msgid ""
8159
" Some of the older formats have two variants:\n"
8160
" a plain one and a rich-root one. The latter include an additional\n"
8161
" field about the root of the tree. There is no performance cost\n"
8162
" for using a rich-root format but you cannot easily merge changes\n"
8163
" from a rich-root format into a plain format. As a consequence,\n"
8164
" moving a project to a rich-root format takes some co-ordination\n"
8165
" in that all contributors need to upgrade their repositories\n"
8166
" around the same time. 2a and all future formats will be\n"
8167
" implicitly rich-root."
8168
msgstr ""
8169
8170
#: dummy/help_topics/formats/detail.txt:26
8171
msgid ""
8172
"See :doc:`current-formats-help` for the complete list of\n"
8173
"currently supported formats. See :doc:`other-formats-help` for\n"
8174
"descriptions of any available experimental and deprecated formats.\n"
8175
msgstr ""
8176
8177
#: dummy/help_topics/formats/summary.txt:1
8178
msgid "Information on choosing a storage format"
8179
msgstr ""
8180
8181
#: dummy/help_topics/global-options/detail.txt:1
8182
msgid "Global Options"
8183
msgstr ""
8184
8185
#: dummy/help_topics/global-options/detail.txt:3
8186
msgid ""
8187
"These options may be used with any command, and may appear in front of any\n"
8188
"command. (e.g. ``bzr --profile help``)."
8189
msgstr ""
8190
8191
#: dummy/help_topics/global-options/detail.txt:6
8192
msgid ""
8193
"--version Print the version number. Must be supplied before the "
8194
"command.\n"
8195
"--no-aliases Do not process command aliases when running this command.\n"
8196
"--builtin Use the built-in version of a command, not the plugin "
8197
"version.\n"
8198
" This does not suppress other plugin effects.\n"
8199
"--no-plugins Do not process any plugins.\n"
8200
"--no-l10n Do not translate messages.\n"
8201
"--concurrency Number of processes that can be run concurrently (selftest)."
8202
msgstr ""
8203
8204
#: dummy/help_topics/global-options/detail.txt:14
8205
msgid ""
8206
"--profile Profile execution using the hotshot profiler.\n"
8207
"--lsprof Profile execution using the lsprof profiler.\n"
8208
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8209
" results to a specified file. If the filename ends with \".txt"
8210
"\",\n"
8211
" text format will be used. If the filename either starts "
8212
"with\n"
8213
" \"callgrind.out\" or end with \".callgrind\", the output will "
8214
"be\n"
8215
" formatted for use with KCacheGrind. Otherwise, the output\n"
8216
" will be a pickle.\n"
8217
"--coverage Generate line coverage report in the specified directory."
8218
msgstr ""
8219
8220
#: dummy/help_topics/global-options/detail.txt:24
8221
msgid ""
8222
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8223
"for\n"
8224
" the duration of the command. This can be used multiple times "
8225
"if\n"
8226
" several options need to be overridden."
8227
msgstr ""
8228
8229
#: dummy/help_topics/global-options/detail.txt:28
8230
msgid ""
8231
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8232
"information on profiling."
8233
msgstr ""
8234
8235
#: dummy/help_topics/global-options/detail.txt:31
8236
msgid ""
8237
"A number of debug flags are also available to assist troubleshooting and\n"
8238
"development. See :doc:`debug-flags-help`.\n"
8239
msgstr ""
8240
8241
#: dummy/help_topics/global-options/summary.txt:1
8242
msgid "Options that control how Bazaar runs"
8243
msgstr ""
8244
8245
#: dummy/help_topics/hidden-commands/summary.txt:1
8246
msgid "All hidden commands"
8247
msgstr ""
8248
8249
#: dummy/help_topics/hooks/summary.txt:1
8250
msgid "Points at which custom processing can be added"
8251
msgstr ""
8252
8253
#: dummy/help_topics/launchpad/detail.txt:1
8254
msgid "Integration with Launchpad.net"
8255
msgstr ""
8256
8257
#: dummy/help_topics/launchpad/detail.txt:3
8258
msgid ""
8259
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8260
"specification tracking."
8261
msgstr ""
8262
8263
#: dummy/help_topics/launchpad/detail.txt:6
8264
msgid ""
8265
"The bzr client (through the plugin called 'launchpad') has special\n"
8266
"features to communicate with Launchpad:"
8267
msgstr ""
8268
8269
#: dummy/help_topics/launchpad/detail.txt:9
8270
msgid ""
8271
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8272
"This\n"
8273
" is then used by the 'lp:' transport to download your branches using\n"
8274
" bzr+ssh://."
8275
msgstr ""
8276
8277
#: dummy/help_topics/launchpad/detail.txt:13
8278
msgid ""
8279
" * The 'lp:' transport uses Launchpad as a directory service: for "
8280
"example\n"
8281
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8282
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8283
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8284
msgstr ""
8285
8286
#: dummy/help_topics/launchpad/detail.txt:18
8287
msgid ""
8288
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8289
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8290
"lp:12345'\n"
8291
" will record a revision property that marks that revision as fixing\n"
8292
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8293
" automatically be linked to the bug report."
8294
msgstr ""
8295
8296
#: dummy/help_topics/launchpad/detail.txt:24
8297
msgid ""
8298
" * The register-branch command tells Launchpad about the url of a\n"
8299
" public branch. Launchpad will then mirror the branch, display\n"
8300
" its contents and allow it to be attached to bugs and other\n"
8301
" objects."
8302
msgstr ""
8303
8304
#: dummy/help_topics/launchpad/detail.txt:29
8305
msgid "For more information see http://help.launchpad.net/\n"
8306
msgstr ""
8307
8308
#: dummy/help_topics/launchpad/summary.txt:1
8309
msgid "Using Bazaar with Launchpad.net"
8310
msgstr ""
8311
8312
#: dummy/help_topics/location-alias/summary.txt:1
8313
msgid "Aliases for remembered locations"
8314
msgstr ""
8315
8316
#: dummy/help_topics/log-formats/summary.txt:1
8317
msgid "Details on the logging formats available"
8318
msgstr ""
8319
8320
#: dummy/help_topics/other-formats/summary.txt:1
8321
msgid "Experimental and deprecated storage formats"
8322
msgstr ""
8323
8324
#: dummy/help_topics/patterns/summary.txt:1
8325
msgid "Information on the pattern syntax"
8326
msgstr ""
8327
8328
#: dummy/help_topics/repositories/detail.txt:1
8329
msgid "Repositories"
8330
msgstr ""
8331
8332
#: dummy/help_topics/repositories/detail.txt:3
8333
msgid ""
8334
"Repositories in Bazaar are where committed information is stored. There is\n"
8335
"a repository associated with every branch."
8336
msgstr ""
8337
8338
#: dummy/help_topics/repositories/detail.txt:6
8339
msgid ""
8340
"Repositories are a form of database. Bzr will usually maintain this for\n"
8341
"good performance automatically, but in some situations (e.g. when doing\n"
8342
"very many commits in a short time period) you may want to ask bzr to\n"
8343
"optimise the database indices. This can be done by the 'bzr pack' command."
8344
msgstr ""
8345
8346
#: dummy/help_topics/repositories/detail.txt:11
8347
msgid ""
8348
"By default just running 'bzr init' will create a repository within the new\n"
8349
"branch but it is possible to create a shared repository which allows "
8350
"multiple\n"
8351
"branches to share their information in the same location. When a new branch "
8352
"is\n"
8353
"created it will first look to see if there is a containing shared repository "
8354
"it\n"
8355
"can use."
8356
msgstr ""
8357
8358
#: dummy/help_topics/repositories/detail.txt:17
8359
msgid ""
8360
"When two branches of the same project share a repository, there is\n"
8361
"generally a large space saving. For some operations (e.g. branching\n"
8362
"within the repository) this translates in to a large time saving."
8363
msgstr ""
8364
8365
#: dummy/help_topics/repositories/detail.txt:21
8366
msgid ""
8367
"To create a shared repository use the init-repository command (or the alias\n"
8368
"init-repo). This command takes the location of the repository to create. "
8369
"This\n"
8370
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8371
"which contains a shared repository. Any new branches that are created in "
8372
"this\n"
8373
"directory will then use it for storage."
8374
msgstr ""
8375
8376
#: dummy/help_topics/repositories/detail.txt:27
8377
msgid ""
8378
"It is a good idea to create a repository whenever you might create more\n"
8379
"than one branch of a project. This is true for both working areas where you\n"
8380
"are doing the development, and any server areas that you use for hosting\n"
8381
"projects. In the latter case, it is common to want branches without working\n"
8382
"trees. Since the files in the branch will not be edited directly there is "
8383
"no\n"
8384
"need to use up disk space for a working tree. To create a repository in "
8385
"which\n"
8386
"the branches will not have working trees pass the '--no-trees' option to\n"
8387
"'init-repository'."
8388
msgstr ""
8389
8390
#: dummy/help_topics/repositories/detail.txt:38
8391
msgid ""
8392
" init-repository Create a shared repository. Use --no-trees to create "
8393
"one\n"
8394
" in which new branches won't get a working tree.\n"
8395
msgstr ""
8396
8397
#: dummy/help_topics/repositories/summary.txt:1
8398
msgid "Basic information on shared repositories."
8399
msgstr ""
8400
8401
#: dummy/help_topics/revisionspec/summary.txt:1
8402
msgid "Explain how to use --revision"
8403
msgstr ""
8404
8405
#: dummy/help_topics/rules/summary.txt:1
8406
msgid "Information on defining rule-based preferences"
8407
msgstr ""
8408
8409
#: dummy/help_topics/standalone-trees/detail.txt:1
8410
msgid "Standalone Trees"
8411
msgstr ""
8412
8413
#: dummy/help_topics/standalone-trees/detail.txt:3
8414
msgid ""
8415
"A standalone tree is a working tree with an associated repository. It\n"
8416
"is an independently usable branch, with no dependencies on any other.\n"
8417
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8418
"an existing project under version control."
8419
msgstr ""
8420
8421
#: dummy/help_topics/standalone-trees/detail.txt:8
8422
msgid "Related Commands::"
8423
msgstr ""
8424
8425
#: dummy/help_topics/standalone-trees/detail.txt:10
8426
msgid " init Make a directory into a versioned branch.\n"
8427
msgstr ""
8428
8429
#: dummy/help_topics/standalone-trees/summary.txt:1
8430
msgid "Information on what a standalone tree is"
8431
msgstr ""
8432
8433
#: dummy/help_topics/standard-options/detail.txt:1
8434
msgid "Standard Options"
8435
msgstr ""
8436
8437
#: dummy/help_topics/standard-options/detail.txt:3
8438
msgid "Standard options are legal for all commands."
8439
msgstr ""
8440
8441
#: dummy/help_topics/standard-options/detail.txt:5
8442
msgid ""
8443
"--help, -h Show help message.\n"
8444
"--verbose, -v Display more information.\n"
8445
"--quiet, -q Only display errors and warnings."
8446
msgstr ""
8447
8448
#: dummy/help_topics/standard-options/detail.txt:9
8449
msgid "Unlike global options, standard options can be used in aliases.\n"
8450
msgstr ""
8451
8452
#: dummy/help_topics/standard-options/summary.txt:1
8453
msgid "Options that can be used with any command"
8454
msgstr ""
8455
8456
#: dummy/help_topics/status-flags/detail.txt:1
8457
msgid "Status Flags"
8458
msgstr ""
8459
8460
#: dummy/help_topics/status-flags/detail.txt:3
8461
msgid ""
8462
"Status flags are used to summarise changes to the working tree in a concise\n"
8463
"manner. They are in the form::"
8464
msgstr ""
8465
8466
#: dummy/help_topics/status-flags/detail.txt:6
8467
msgid " xxx <filename>"
8468
msgstr ""
8469
8470
#: dummy/help_topics/status-flags/detail.txt:8
8471
msgid "where the columns' meanings are as follows."
8472
msgstr ""
8473
8474
#: dummy/help_topics/status-flags/detail.txt:10
8475
msgid "Column 1 - versioning/renames::"
8476
msgstr ""
8477
8478
#: dummy/help_topics/status-flags/detail.txt:12
8479
msgid ""
8480
" + File versioned\n"
8481
" - File unversioned\n"
8482
" R File renamed\n"
8483
" ? File unknown\n"
8484
" X File nonexistent (and unknown to bzr)\n"
8485
" C File has conflicts\n"
8486
" P Entry for a pending merge (not a file)"
8487
msgstr ""
8488
8489
#: dummy/help_topics/status-flags/detail.txt:20
8490
msgid "Column 2 - contents::"
8491
msgstr ""
8492
8493
#: dummy/help_topics/status-flags/detail.txt:22
8494
msgid ""
8495
" N File created\n"
8496
" D File deleted\n"
8497
" K File kind changed\n"
8498
" M File modified"
8499
msgstr ""
8500
8501
#: dummy/help_topics/status-flags/detail.txt:27
8502
msgid "Column 3 - execute::"
8503
msgstr ""
8504
8505
#: dummy/help_topics/status-flags/detail.txt:29
8506
msgid " * The execute bit was changed\n"
8507
msgstr ""
8508
8509
#: dummy/help_topics/status-flags/summary.txt:1
8510
msgid "Help on status flags"
8511
msgstr ""
8512
8513
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8514
msgid "Branches Out of Sync"
8515
msgstr ""
8516
8517
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8518
msgid ""
8519
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8520
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8521
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8522
"have the same last revision as the new reference branch for the lightweight\n"
8523
"checkout, data could be lost, so Bazaar refuses."
8524
msgstr ""
8525
8526
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8527
msgid "How you deal with this depends on *why* the branches are out of sync."
8528
msgstr ""
8529
8530
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8531
msgid ""
8532
"If you have a checkout and have done local commits, you can get back in "
8533
"sync\n"
8534
"by running \"bzr update\" (and possibly \"bzr commit\")."
8535
msgstr ""
8536
8537
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8538
msgid ""
8539
"If you have a branch and the remote branch is out-of-date, you can push\n"
8540
"the local changes using \"bzr push\". If the local branch is out of date, "
8541
"you\n"
8542
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8543
"commit\n"
8544
"and then push your changes. If you decide that some of the changes aren't\n"
8545
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8546
msgstr ""
8547
8548
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8549
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8550
msgstr ""
8551
8552
#: dummy/help_topics/topics/summary.txt:1
8553
msgid "Topics list"
8554
msgstr ""
8555
8556
#: dummy/help_topics/url-special-chars/summary.txt:1
8557
msgid "Special character handling in URLs"
8558
msgstr ""
8559
8560
#: dummy/help_topics/urlspec/summary.txt:1
8561
msgid "Supported transport protocols"
8562
msgstr ""
8563
8564
#: dummy/help_topics/working-trees/detail.txt:1
8565
msgid "Working Trees"
8566
msgstr ""
8567
8568
#: dummy/help_topics/working-trees/detail.txt:3
8569
msgid ""
8570
"A working tree is the contents of a branch placed on disk so that you can\n"
8571
"see the files and edit them. The working tree is where you make changes to "
8572
"a\n"
8573
"branch, and when you commit the current state of the working tree is the\n"
8574
"snapshot that is recorded in the commit."
8575
msgstr ""
8576
8577
#: dummy/help_topics/working-trees/detail.txt:8
8578
msgid ""
8579
"When you push a branch to a remote system, a working tree will not be\n"
8580
"created. If one is already present the files will not be updated. The\n"
8581
"branch information will be updated and the working tree will be marked\n"
8582
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8583
"may be uncommitted changes or the update may cause content conflicts that "
8584
"are\n"
8585
"difficult to deal with remotely."
8586
msgstr ""
8587
8588
#: dummy/help_topics/working-trees/detail.txt:15
8589
msgid ""
8590
"If you have a branch with no working tree you can use the 'checkout' "
8591
"command\n"
8592
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8593
"will\n"
8594
"create the working tree. If the branch is updated remotely, you can update "
8595
"the\n"
8596
"working tree by running 'bzr update' in that directory."
8597
msgstr ""
8598
8599
#: dummy/help_topics/working-trees/detail.txt:20
8600
msgid ""
8601
"If you have a branch with a working tree that you do not want the 'remove-"
8602
"tree'\n"
8603
"command will remove the tree if it is safe. This can be done to avoid the\n"
8604
"warning about the remote working tree not being updated when pushing to the\n"
8605
"branch. It can also be useful when working with a '--no-trees' repository\n"
8606
"(see 'bzr help repositories')."
8607
msgstr ""
8608
8609
#: dummy/help_topics/working-trees/detail.txt:26
8610
msgid ""
8611
"If you want to have a working tree on a remote machine that you push to you\n"
8612
"can either run 'bzr update' in the remote branch after each push, or use "
8613
"some\n"
8614
"other method to update the tree during the push. There is an 'rspush' "
8615
"plugin\n"
8616
"that will update the working tree using rsync as well as doing a push. "
8617
"There\n"
8618
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8619
"SSH\n"
8620
"after each push."
8621
msgstr ""
8622
8623
#: dummy/help_topics/working-trees/detail.txt:33
8624
msgid "Useful commands::"
8625
msgstr ""
8626
8627
#: dummy/help_topics/working-trees/detail.txt:35
8628
msgid ""
8629
" checkout Create a working tree when a branch does not have one.\n"
8630
" remove-tree Removes the working tree from a branch when it is safe to do "
8631
"so.\n"
8632
" update When a working tree is out of sync with its associated "
8633
"branch\n"
8634
" this will update the tree to match the branch.\n"
8635
msgstr ""
8636
8637
#: dummy/help_topics/working-trees/summary.txt:1
8638
msgid "Information on working trees"
8639
msgstr ""
8640
8641
#: en/help_topics/authentication.txt:1
8642
msgid ""
8643
"Authentication Settings\n"
8644
"======================="
8645
msgstr ""
8646
8647
#: en/help_topics/authentication.txt:4
8648
msgid ""
8649
"\n"
8650
"Intent\n"
8651
"------"
8652
msgstr ""
8653
8654
#: en/help_topics/authentication.txt:8
8655
msgid ""
8656
"Many different authentication policies can be described in the\n"
8657
"``authentication.conf`` file but a particular user should need only a few\n"
8658
"definitions to cover his needs without having to specify a user and a "
8659
"password\n"
8660
"for every branch he uses."
8661
msgstr ""
8662
8663
#: en/help_topics/authentication.txt:13
8664
msgid ""
8665
"The definitions found in this file are used to find the credentials to use "
8666
"for\n"
8667
"a given url. The same credentials can generally be used for as many branches "
8668
"as\n"
8669
"possible by grouping their declaration around the remote servers that need\n"
8670
"them. It's even possible to declare credentials that will be used by "
8671
"different\n"
8672
"servers."
8673
msgstr ""
8674
8675
#: en/help_topics/authentication.txt:19
8676
msgid ""
8677
"The intent is to make this file as small as possible to minimize maintenance."
8678
msgstr ""
8679
8680
#: en/help_topics/authentication.txt:21
8681
msgid ""
8682
"Once the relevant credentials are declared in this file you may use branch "
8683
"urls\n"
8684
"without embedding passwords (security hazard) or even users (enabling "
8685
"sharing\n"
8686
"of your urls with others)."
8687
msgstr ""
8688
8689
#: en/help_topics/authentication.txt:25
8690
msgid "Instead of using::"
8691
msgstr ""
8692
8693
#: en/help_topics/authentication.txt:27
8694
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8695
msgstr ""
8696
8697
#: en/help_topics/authentication.txt:29
8698
msgid "you simply use::"
8699
msgstr ""
8700
8701
#: en/help_topics/authentication.txt:31
8702
msgid " bzr branch ftp://host.com/path/to/my/branch"
8703
msgstr ""
8704
8705
#: en/help_topics/authentication.txt:33
8706
msgid "provided you have created the following ``authentication.conf`` file::"
8707
msgstr ""
8708
8709
#: en/help_topics/authentication.txt:35
8710
msgid ""
8711
" [myprojects]\n"
8712
" scheme=ftp\n"
8713
" host=host.com\n"
8714
" user=joe\n"
8715
" password=secret\n"
8716
" "
8717
msgstr ""
8718
8719
#: en/help_topics/authentication.txt:42
8720
msgid ""
8721
"Authentication definitions\n"
8722
"--------------------------"
8723
msgstr ""
8724
8725
#: en/help_topics/authentication.txt:45
8726
msgid ""
8727
"There are two kinds of authentication used by the various schemes supported "
8728
"by\n"
8729
"bzr:"
8730
msgstr ""
8731
8732
#: en/help_topics/authentication.txt:48
8733
msgid "1. user and password"
8734
msgstr ""
8735
8736
#: en/help_topics/authentication.txt:50
8737
msgid ""
8738
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8739
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8740
"ssh agents are a better, more secure solution. So we have chosen to not "
8741
"provide\n"
8742
"our own less secure method."
8743
msgstr ""
8744
8745
#: en/help_topics/authentication.txt:55
8746
msgid "2. user, realm and password"
8747
msgstr ""
8748
8749
#: en/help_topics/authentication.txt:57
8750
msgid ""
8751
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8752
"against a host. But, by using ``.htaccess`` files, for example, it is "
8753
"possible\n"
8754
"to define several (``user, realm, password``) for a given ``host``. So what "
8755
"is\n"
8756
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8757
"is\n"
8758
"not taken into account in the definitions, but will displayed if bzr "
8759
"prompts\n"
8760
"you for a password."
8761
msgstr ""
8762
8763
#: en/help_topics/authentication.txt:64
8764
msgid ""
8765
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8766
"specifying the appropriate port."
8767
msgstr ""
8768
8769
#: en/help_topics/authentication.txt:67
8770
msgid ""
8771
"To take all schemes into account, the password will be deduced from a set "
8772
"of\n"
8773
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8774
"``user``,\n"
8775
"``password``)."
8776
msgstr ""
8777
8778
#: en/help_topics/authentication.txt:71
8779
msgid ""
8780
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8781
"used\n"
8782
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8783
"``ssh``\n"
8784
" should be used instead since this is the real scheme regarding\n"
8785
" authentication,"
8786
msgstr ""
8787
8788
#: en/help_topics/authentication.txt:76
8789
msgid " * ``host``: can be empty (to act as a default for any host),"
8790
msgstr ""
8791
8792
#: en/help_topics/authentication.txt:78
8793
msgid ""
8794
" * ``port`` can be empty (useful when an host provides several servers for "
8795
"the\n"
8796
" same scheme), only numerical values are allowed, this should be used "
8797
"only\n"
8798
" when the server uses a port different than the scheme standard port,"
8799
msgstr ""
8800
8801
#: en/help_topics/authentication.txt:82
8802
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8803
msgstr ""
8804
8805
#: en/help_topics/authentication.txt:84
8806
msgid ""
8807
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8808
" ``getpass.get_user()``),"
8809
msgstr ""
8810
8811
#: en/help_topics/authentication.txt:87
8812
msgid ""
8813
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8814
" password."
8815
msgstr ""
8816
8817
#: en/help_topics/authentication.txt:90
8818
msgid ""
8819
"Multiple definitions can be provided and, for a given URL, bzr will select "
8820
"a\n"
8821
"(``user`` [, ``password``]) based on the following rules :"
8822
msgstr ""
8823
8824
#: en/help_topics/authentication.txt:93
8825
msgid " 1. the first match wins,"
8826
msgstr ""
8827
8828
#: en/help_topics/authentication.txt:95
8829
msgid " 2. empty fields match everything,"
8830
msgstr ""
8831
8832
#: en/help_topics/authentication.txt:97
8833
msgid ""
8834
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8835
msgstr ""
8836
8837
#: en/help_topics/authentication.txt:99
8838
msgid ""
8839
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8840
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
8841
"net``\n"
8842
" will not match ``bzr.sf.net``)."
8843
msgstr ""
8844
8845
#: en/help_topics/authentication.txt:103
8846
msgid ""
8847
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8848
msgstr ""
8849
8850
#: en/help_topics/authentication.txt:105
8851
msgid ""
8852
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8853
"above,\n"
8854
" empty paths will match any provided path)."
8855
msgstr ""
8856
8857
#: en/help_topics/authentication.txt:110
8858
msgid ""
8859
"File format\n"
8860
"-----------"
8861
msgstr ""
8862
8863
#: en/help_topics/authentication.txt:113
8864
msgid ""
8865
"The general rules for :doc:`configuration files <configuration-help>`\n"
8866
"apply except for the variable policies."
8867
msgstr ""
8868
8869
#: en/help_topics/authentication.txt:116
8870
msgid "Each section describes an authentication definition."
8871
msgstr ""
8872
8873
#: en/help_topics/authentication.txt:118
8874
msgid ""
8875
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8876
"reserved\n"
8877
"and should appear as the *last* section."
8878
msgstr ""
8879
8880
#: en/help_topics/authentication.txt:121
8881
msgid "Each section should define:"
8882
msgstr ""
8883
8884
#: en/help_topics/authentication.txt:123
8885
msgid "* ``user``: the login to be used,"
8886
msgstr ""
8887
8888
#: en/help_topics/authentication.txt:125
8889
msgid "Each section could define:"
8890
msgstr ""
8891
8892
#: en/help_topics/authentication.txt:127
8893
msgid "* ``host``: the remote server,"
8894
msgstr ""
8895
8896
#: en/help_topics/authentication.txt:129
8897
msgid "* ``port``: the port the server is listening,"
8898
msgstr ""
8899
8900
#: en/help_topics/authentication.txt:131
8901
msgid "* ``path``: the branch location,"
8902
msgstr ""
8903
8904
#: en/help_topics/authentication.txt:133
8905
msgid "* ``password``: the password."
8906
msgstr ""
8907
8908
#: en/help_topics/authentication.txt:135
8909
msgid ""
8910
"\n"
8911
"Examples\n"
8912
"--------"
8913
msgstr ""
8914
8915
#: en/help_topics/authentication.txt:139
8916
msgid ""
8917
"\n"
8918
"Personal projects hosted outside\n"
8919
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8920
msgstr ""
8921
8922
#: en/help_topics/authentication.txt:143
8923
msgid ""
8924
"All connections are done with the same ``user`` (the remote one for which "
8925
"the\n"
8926
"default bzr one is not appropriate) and the password is always prompted "
8927
"with\n"
8928
"some exceptions::"
8929
msgstr ""
8930
8931
#: en/help_topics/authentication.txt:147
8932
msgid ""
8933
" # Pet projects on hobby.net\n"
8934
" [hobby]\n"
8935
" host=r.hobby.net\n"
8936
" user=jim\n"
8937
" password=obvious1234\n"
8938
" \n"
8939
" # Home server\n"
8940
" [home]\n"
8941
" scheme=https\n"
8942
" host=home.net\n"
8943
" user=joe\n"
8944
" password=1essobV10us\n"
8945
" \n"
8946
" [DEFAULT]\n"
8947
" # Our local user is barbaz, on all remote sites we're known as "
8948
"foobar\n"
8949
" user=foobar"
8950
msgstr ""
8951
8952
#: en/help_topics/authentication.txt:164
8953
msgid ""
8954
"\n"
8955
"Source hosting provider\n"
8956
"~~~~~~~~~~~~~~~~~~~~~~~"
8957
msgstr ""
8958
8959
#: en/help_topics/authentication.txt:168
8960
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8961
msgstr ""
8962
8963
#: en/help_topics/authentication.txt:170
8964
msgid ""
8965
" [shpnet domain]\n"
8966
" # we use sftp, but ssh is the scheme used for authentication\n"
8967
" scheme=ssh\n"
8968
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8969
" host=.shp.net\n"
8970
" user=joe\n"
8971
" # bzr don't support supplying a password for sftp,\n"
8972
" # consider using an ssh agent if you don't want to supply\n"
8973
" # a password interactively. (pageant, ssh-agent, etc)"
8974
msgstr ""
8975
8976
#: en/help_topics/authentication.txt:180
8977
msgid ""
8978
"HTTPS, SFTP servers and their proxy\n"
8979
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8980
msgstr ""
8981
8982
#: en/help_topics/authentication.txt:183
8983
msgid ""
8984
"At company.com, the server hosting release and integration branches is "
8985
"behind a\n"
8986
"proxy, and the two branches use different authentication policies::"
8987
msgstr ""
8988
8989
#: en/help_topics/authentication.txt:186
8990
msgid ""
8991
" [reference code]\n"
8992
" scheme=https\n"
8993
" host=dev.company.com\n"
8994
" path=/dev\n"
8995
" user=user1\n"
8996
" password=pass1"
8997
msgstr ""
8998
8999
#: en/help_topics/authentication.txt:193
9000
msgid ""
9001
" # development branches on dev server\n"
9002
" [dev]\n"
9003
" scheme=ssh # bzr+ssh and sftp are available here\n"
9004
" host=dev.company.com\n"
9005
" path=/dev/integration\n"
9006
" user=user2\n"
9007
" \n"
9008
" # proxy\n"
9009
" [proxy]\n"
9010
" scheme=http\n"
9011
" host=proxy.company.com\n"
9012
" port=3128\n"
9013
" user=proxyuser1\n"
9014
" password=proxypass1"
9015
msgstr ""
9016
9017
#: en/help_topics/authentication.txt:208
9018
msgid ""
9019
"\n"
9020
"Planned enhancements\n"
9021
"--------------------"
9022
msgstr ""
9023
9024
#: en/help_topics/authentication.txt:212
9025
msgid ""
9026
"The following are not yet implemented but planned as parts of a work in\n"
9027
"progress:"
9028
msgstr ""
9029
9030
#: en/help_topics/authentication.txt:215
9031
msgid "* add a ``password_encoding`` field allowing:"
9032
msgstr ""
9033
9034
#: en/help_topics/authentication.txt:217
9035
msgid ""
9036
" - storing the passwords in various obfuscating encodings (base64 for one),"
9037
msgstr ""
9038
9039
#: en/help_topics/authentication.txt:219
9040
msgid " - delegate password storage to plugins (.netrc for example)."
9041
msgstr ""
9042
9043
#: en/help_topics/authentication.txt:221
9044
msgid ""
9045
"* update the credentials when the user is prompted for user or password,"
9046
msgstr ""
9047
9048
#: en/help_topics/authentication.txt:223
9049
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9050
msgstr ""
9051
9052
#: en/help_topics/authentication.txt:225
9053
msgid ""
9054
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9055
"but\n"
9056
"ignored in the actual implementation.\n"
9057
msgstr ""
9058
9059
#: en/help_topics/bugs.txt:1
9060
msgid "Bug Tracker Settings"
9061
msgstr ""
9062
9063
#: en/help_topics/bugs.txt:3
9064
msgid ""
9065
"When making a commit, metadata about bugs fixed by that change can be\n"
9066
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9067
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9068
"(The only ``status`` value currently supported is ``fixed.``)"
9069
msgstr ""
9070
9071
#: en/help_topics/bugs.txt:8
9072
msgid ""
9073
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9074
"identifier\n"
9075
"rather than a full URL. This looks like::"
9076
msgstr ""
9077
9078
#: en/help_topics/bugs.txt:11
9079
msgid " bzr commit --fixes <tracker>:<id>"
9080
msgstr ""
9081
9082
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9083
msgid "or::"
9084
msgstr ""
9085
9086
#: en/help_topics/bugs.txt:15
9087
msgid " bzr commit --fixes <id>"
9088
msgstr ""
9089
9090
#: en/help_topics/bugs.txt:17
9091
msgid ""
9092
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9093
"the\n"
9094
"identifier for that bug within the bugtracker, usually the bug number.\n"
9095
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9096
"or global configuration is used."
9097
msgstr ""
9098
9099
#: en/help_topics/bugs.txt:22
9100
msgid ""
9101
"Bazaar knows about a few bug trackers that have many users. If\n"
9102
"you use one of these bug trackers then there is no setup required to\n"
9103
"use this feature, you just need to know the tracker identifier to use.\n"
9104
"These are the bugtrackers that are built in:"
9105
msgstr ""
9106
9107
#: en/help_topics/bugs.txt:27
9108
msgid ""
9109
" ============================ ============ ============\n"
9110
" URL Abbreviation Example\n"
9111
" ============================ ============ ============\n"
9112
" https://bugs.launchpad.net/ lp lp:12345\n"
9113
" http://bugs.debian.org/ deb deb:12345\n"
9114
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9115
" ============================ ============ ============"
9116
msgstr ""
9117
9118
#: en/help_topics/bugs.txt:35
9119
msgid ""
9120
"For the bug trackers not listed above configuration is required.\n"
9121
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9122
"is built in, along with a template mechanism for other bugtrackers with\n"
9123
"simple URL schemes. If your bug tracker can't be described by one\n"
9124
"of the schemes described below then you can write a plugin to support\n"
9125
"it."
9126
msgstr ""
9127
9128
#: en/help_topics/bugs.txt:42
9129
msgid ""
9130
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9131
"variable which contains the base URL of the bug tracker. These options\n"
9132
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9133
"configuration section in ``locations.conf``. You can set up these values\n"
9134
"for each of the projects you work on."
9135
msgstr ""
9136
9137
#: en/help_topics/bugs.txt:48
9138
msgid ""
9139
"Note: As you provide a short name for each tracker, you can specify one or\n"
9140
"more bugs in one or more trackers at commit time if you wish."
9141
msgstr ""
9142
9143
#: en/help_topics/bugs.txt:51
9144
msgid ""
9145
"Launchpad\n"
9146
"---------"
9147
msgstr ""
9148
9149
#: en/help_topics/bugs.txt:54
9150
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9151
msgstr ""
9152
9153
#: en/help_topics/bugs.txt:56
9154
msgid ""
9155
"bugzilla_<tracker>_url\n"
9156
"----------------------"
9157
msgstr ""
9158
9159
#: en/help_topics/bugs.txt:59
9160
msgid ""
9161
"If present, the location of the Bugzilla bug tracker referred to by\n"
9162
"<tracker>. This option can then be used together with ``bzr commit\n"
9163
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9164
"example::"
9165
msgstr ""
9166
9167
#: en/help_topics/bugs.txt:64
9168
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9169
msgstr ""
9170
9171
#: en/help_topics/bugs.txt:66
9172
msgid ""
9173
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9174
"fixed."
9175
msgstr ""
9176
9177
#: en/help_topics/bugs.txt:69
9178
msgid ""
9179
"trac_<tracker>_url\n"
9180
"------------------"
9181
msgstr ""
9182
9183
#: en/help_topics/bugs.txt:72
9184
msgid ""
9185
"If present, the location of the Trac instance referred to by\n"
9186
"<tracker>. This option can then be used together with ``bzr commit\n"
9187
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9188
"example::"
9189
msgstr ""
9190
9191
#: en/help_topics/bugs.txt:77
9192
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9193
msgstr ""
9194
9195
#: en/help_topics/bugs.txt:79
9196
msgid ""
9197
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9198
"as\n"
9199
"fixed."
9200
msgstr ""
9201
9202
#: en/help_topics/bugs.txt:82
9203
msgid ""
9204
"bugtracker_<tracker>_url\n"
9205
"------------------------"
9206
msgstr ""
9207
9208
#: en/help_topics/bugs.txt:85
9209
msgid ""
9210
"If present, the location of a generic bug tracker instance referred to by\n"
9211
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9212
"which will be replaced by a specific bug ID. This option can then be used\n"
9213
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9214
"fixed by that commit. For example::"
9215
msgstr ""
9216
9217
#: en/help_topics/bugs.txt:91
9218
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9219
msgstr ""
9220
9221
#: en/help_topics/bugs.txt:93
9222
msgid ""
9223
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9224
"Roundup bug tracker as fixed, or::"
9225
msgstr ""
9226
9227
#: en/help_topics/bugs.txt:96
9228
msgid ""
9229
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9230
msgstr ""
9231
9232
#: en/help_topics/bugs.txt:98
9233
msgid ""
9234
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9235
"RT bug tracker as fixed, or::"
9236
msgstr ""
9237
9238
#: en/help_topics/bugs.txt:101
9239
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9240
msgstr ""
9241
9242
#: en/help_topics/bugs.txt:103
9243
msgid ""
9244
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
9245
"HUDSON-1234\n"
9246
"in Hudson's JIRA bug tracker as fixed.\n"
9247
msgstr ""
9248
9249
#: en/help_topics/commands.txt:1
9250
msgid ""
9251
"add Add specified files or directories.\n"
9252
"alias Set/unset and display aliases.\n"
9253
"annotate Show the origin of each line in a file.\n"
9254
"bash-completion Generate a shell function for bash command line "
9255
"completion.\n"
9256
" [bash_completion]\n"
9257
"bind Convert the current branch into a checkout of the "
9258
"supplied\n"
9259
" branch.\n"
9260
"branch Create a new branch that is a copy of an existing branch.\n"
9261
"branches List the branches available at the current location.\n"
9262
"break-lock Break a dead lock.\n"
9263
"cat Write the contents of a file as of a given revision to\n"
9264
" standard output.\n"
9265
"check Validate working tree structure, branch consistency and\n"
9266
" repository history.\n"
9267
"checkout Create a new checkout of an existing branch.\n"
9268
"clean-tree Remove unwanted files from working tree.\n"
9269
"commit Commit changes into a new revision.\n"
9270
"config Display, set or remove a configuration option.\n"
9271
"conflicts List files with conflicts.\n"
9272
"deleted List files deleted in the working tree.\n"
9273
"diff Show differences in the working tree, between revisions "
9274
"or\n"
9275
" branches.\n"
9276
"dpush Push into a different VCS without any custom bzr "
9277
"metadata.\n"
9278
"export Export current or past revision to a destination directory "
9279
"or\n"
9280
" archive.\n"
9281
"help Show help on a command or other topic.\n"
9282
"ignore Ignore specified files or patterns.\n"
9283
"ignored List ignored files and the patterns that matched them.\n"
9284
"info Show information about a working tree, branch or "
9285
"repository.\n"
9286
"init Make a directory into a versioned branch.\n"
9287
"init-repository Create a shared repository for branches to share storage\n"
9288
" space.\n"
9289
"join Combine a tree into its containing tree.\n"
9290
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9291
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9292
"launchpad-open Open a Launchpad branch page in your web browser. "
9293
"[launchpad]\n"
9294
"log Show historical log for a branch or subset of a branch.\n"
9295
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9296
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9297
"ls List files in a tree.\n"
9298
"merge Perform a three-way merge.\n"
9299
"missing Show unmerged/unpulled revisions between two branches.\n"
9300
"mkdir Create a new versioned directory.\n"
9301
"mv Move or rename a file.\n"
9302
"nick Print or set the branch nickname.\n"
9303
"pack Compress the data within a repository.\n"
9304
"plugins List the installed plugins.\n"
9305
"pull Turn this branch into a mirror of another branch.\n"
9306
"push Update a mirror of this branch.\n"
9307
"reconcile Reconcile bzr metadata in a branch.\n"
9308
"reconfigure Reconfigure the type of a bzr directory.\n"
9309
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9310
"remerge Redo a merge.\n"
9311
"remove Remove files or directories.\n"
9312
"remove-branch Remove a branch.\n"
9313
"remove-tree Remove the working tree from a given branch/checkout.\n"
9314
"renames Show list of renamed files.\n"
9315
"resolve Mark a conflict as resolved.\n"
9316
"revert Set files in the working tree back to the contents of a\n"
9317
" previous revision.\n"
9318
"revno Show current revision number.\n"
9319
"root Show the tree root directory.\n"
9320
"send Mail or create a merge-directive for submitting changes.\n"
9321
"serve Run the bzr server.\n"
9322
"shelve Temporarily set aside some changes from the current tree.\n"
9323
"sign-my-commits Sign all commits by a given committer.\n"
9324
"split Split a subdirectory of a tree into a separate tree.\n"
9325
"status Display status summary.\n"
9326
"switch Set the branch of a checkout and update.\n"
9327
"tag Create, remove or modify a tag naming a revision.\n"
9328
"tags List tags.\n"
9329
"testament Show testament (signing-form) of a revision.\n"
9330
"unbind Convert the current checkout into a regular branch.\n"
9331
"uncommit Remove the last committed revision.\n"
9332
"unshelve Restore shelved changes.\n"
9333
"update Update a working tree to a new revision.\n"
9334
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9335
" format.\n"
9336
"verify-signatures Verify all commit signatures.\n"
9337
"version Show version of bzr.\n"
9338
"version-info Show version information about this tree.\n"
9339
"view Manage filtered views.\n"
9340
"whoami Show or set bzr user id.\n"
9341
msgstr ""
9342
9343
#: en/help_topics/configuration.txt:1
9344
msgid ""
9345
"Configuration Settings\n"
9346
"======================="
9347
msgstr ""
9348
9349
#: en/help_topics/configuration.txt:4
9350
msgid ""
9351
"Environment settings\n"
9352
"---------------------"
9353
msgstr ""
9354
9355
#: en/help_topics/configuration.txt:7
9356
msgid ""
9357
"While most configuration is handled by configuration files, some options\n"
9358
"which may be semi-permanent can also be controlled through the environment."
9359
msgstr ""
9360
9361
#: en/help_topics/configuration.txt:10
9362
msgid ""
9363
"BZR_EMAIL\n"
9364
"~~~~~~~~~"
9365
msgstr ""
9366
9367
#: en/help_topics/configuration.txt:13
9368
msgid "Override the email id used by Bazaar. Typical format::"
9369
msgstr ""
9370
9371
#: en/help_topics/configuration.txt:15
9372
msgid " \"John Doe <jdoe@example.com>\""
9373
msgstr ""
9374
9375
#: en/help_topics/configuration.txt:17
9376
msgid "See also the ``email`` configuration option."
9377
msgstr ""
9378
9379
#: en/help_topics/configuration.txt:19
9380
msgid ""
9381
"BZR_PROGRESS_BAR\n"
9382
"~~~~~~~~~~~~~~~~"
9383
msgstr ""
9384
9385
#: en/help_topics/configuration.txt:22
9386
msgid ""
9387
"Override the progress display. Possible values are \"none\" or \"text\". "
9388
"If\n"
9389
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9390
"draws\n"
9391
"the ordinary command line progress bar."
9392
msgstr ""
9393
9394
#: en/help_topics/configuration.txt:26
9395
msgid ""
9396
"BZR_SIGQUIT_PDB\n"
9397
"~~~~~~~~~~~~~~~"
9398
msgstr ""
9399
9400
#: en/help_topics/configuration.txt:29
9401
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9402
msgstr ""
9403
9404
#: en/help_topics/configuration.txt:31
9405
msgid ""
9406
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9407
"* 1 = Invoke breakin debugger (default)"
9408
msgstr ""
9409
9410
#: en/help_topics/configuration.txt:34
9411
msgid ""
9412
"BZR_HOME\n"
9413
"~~~~~~~~"
9414
msgstr ""
9415
9416
#: en/help_topics/configuration.txt:37
9417
msgid "Override the home directory used by Bazaar."
9418
msgstr ""
9419
9420
#: en/help_topics/configuration.txt:39
9421
msgid ""
9422
"BZR_SSH\n"
9423
"~~~~~~~"
9424
msgstr ""
9425
9426
#: en/help_topics/configuration.txt:42
9427
msgid "Select a different SSH implementation."
9428
msgstr ""
9429
9430
#: en/help_topics/configuration.txt:44
9431
msgid ""
9432
"BZR_PDB\n"
9433
"~~~~~~~"
9434
msgstr ""
9435
9436
#: en/help_topics/configuration.txt:47
9437
msgid "Control whether to launch a debugger on error."
9438
msgstr ""
9439
9440
#: en/help_topics/configuration.txt:49
9441
msgid ""
9442
"* 0 = Standard behavior\n"
9443
"* 1 = Launch debugger"
9444
msgstr ""
9445
9446
#: en/help_topics/configuration.txt:52
9447
msgid ""
9448
"BZR_REMOTE_PATH\n"
9449
"~~~~~~~~~~~~~~~"
9450
msgstr ""
9451
9452
#: en/help_topics/configuration.txt:55
9453
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9454
msgstr ""
9455
9456
#: en/help_topics/configuration.txt:57
9457
msgid "See also the ``bzr_remote_path`` configuration option."
9458
msgstr ""
9459
9460
#: en/help_topics/configuration.txt:59
9461
msgid ""
9462
"BZR_EDITOR\n"
9463
"~~~~~~~~~~"
9464
msgstr ""
9465
9466
#: en/help_topics/configuration.txt:62
9467
msgid "Path to the editor Bazaar should use for commit messages, etc."
9468
msgstr ""
9469
9470
#: en/help_topics/configuration.txt:64
9471
msgid ""
9472
"BZR_LOG\n"
9473
"~~~~~~~"
9474
msgstr ""
9475
9476
#: en/help_topics/configuration.txt:67
9477
msgid ""
9478
"Location of the Bazaar log file. You can check the current location by\n"
9479
"running ``bzr version``."
9480
msgstr ""
9481
9482
#: en/help_topics/configuration.txt:70
9483
msgid ""
9484
"The log file contains debug information that is useful for diagnosing or\n"
9485
"reporting problems with Bazaar."
9486
msgstr ""
9487
9488
#: en/help_topics/configuration.txt:73
9489
msgid ""
9490
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9491
"will disable logging."
9492
msgstr ""
9493
9494
#: en/help_topics/configuration.txt:76
9495
msgid ""
9496
"\n"
9497
"BZR_PLUGIN_PATH\n"
9498
"~~~~~~~~~~~~~~~"
9499
msgstr ""
9500
9501
#: en/help_topics/configuration.txt:80
9502
msgid ""
9503
"The path to the plugins directory that Bazaar should use.\n"
9504
"If not set, Bazaar will search for plugins in:"
9505
msgstr ""
9506
9507
#: en/help_topics/configuration.txt:83
9508
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
9509
msgstr ""
9510
9511
#: en/help_topics/configuration.txt:85
9512
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9513
msgstr ""
9514
9515
#: en/help_topics/configuration.txt:87
9516
msgid ""
9517
"* the site specific plugin directory if applicable (containing\n"
9518
" the ``site`` plugins)."
9519
msgstr ""
9520
9521
#: en/help_topics/configuration.txt:90
9522
msgid ""
9523
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9524
"the way the plugin are searched. "
9525
msgstr ""
9526
9527
#: en/help_topics/configuration.txt:93
9528
msgid ""
9529
"As for the ``PATH`` variables, if multiple directories are\n"
9530
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9531
"platform specific appropriate character (':' on Unix,\n"
9532
"';' on windows)"
9533
msgstr ""
9534
9535
#: en/help_topics/configuration.txt:98
9536
msgid ""
9537
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9538
"in ``user``. However it will continue to search in ``core`` and\n"
9539
"``site`` unless they are explicitly removed."
9540
msgstr ""
9541
9542
#: en/help_topics/configuration.txt:102
9543
msgid ""
9544
"If you need to change the order or remove one of these\n"
9545
"directories, you should use special values:"
9546
msgstr ""
9547
9548
#: en/help_topics/configuration.txt:105
9549
msgid ""
9550
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9551
" path from the default values,"
9552
msgstr ""
9553
9554
#: en/help_topics/configuration.txt:108
9555
msgid ""
9556
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9557
" before the remaining default values (and also remove it from\n"
9558
" the default values)."
9559
msgstr ""
9560
9561
#: en/help_topics/configuration.txt:112
9562
msgid ""
9563
"Note that the special values 'user', 'core' and 'site' should be\n"
9564
"used literally, they will be substituted by the corresponding,\n"
9565
"platform specific, values."
9566
msgstr ""
9567
9568
#: en/help_topics/configuration.txt:116
9569
msgid ""
9570
"The examples below use ':' as the separator, windows users\n"
9571
"should use ';'."
9572
msgstr ""
9573
9574
#: en/help_topics/configuration.txt:119
9575
msgid "Overriding the default user plugin directory::"
9576
msgstr ""
9577
9578
#: en/help_topics/configuration.txt:121
9579
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9580
msgstr ""
9581
9582
#: en/help_topics/configuration.txt:123
9583
msgid "Disabling the site directory while retaining the user directory::"
9584
msgstr ""
9585
9586
#: en/help_topics/configuration.txt:125
9587
msgid " BZR_PLUGIN_PATH='-site:+user'"
9588
msgstr ""
9589
9590
#: en/help_topics/configuration.txt:127
9591
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9592
msgstr ""
9593
9594
#: en/help_topics/configuration.txt:129
9595
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9596
msgstr ""
9597
9598
#: en/help_topics/configuration.txt:131
9599
msgid "Overriding the default site plugin directory::"
9600
msgstr ""
9601
9602
#: en/help_topics/configuration.txt:133
9603
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9604
msgstr ""
9605
9606
#: en/help_topics/configuration.txt:135
9607
msgid ""
9608
"BZR_DISABLE_PLUGINS\n"
9609
"~~~~~~~~~~~~~~~~~~~"
9610
msgstr ""
9611
9612
#: en/help_topics/configuration.txt:138
9613
msgid ""
9614
"Under special circumstances (mostly when trying to diagnose a\n"
9615
"bug), it's better to disable a plugin (or several) rather than\n"
9616
"uninstalling them completely. Such plugins can be specified in\n"
9617
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9618
msgstr ""
9619
9620
#: en/help_topics/configuration.txt:143
9621
msgid ""
9622
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9623
"will raise an import error if they are explicitly imported (by\n"
9624
"another plugin that depends on them for example)."
9625
msgstr ""
9626
9627
#: en/help_topics/configuration.txt:147
9628
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9629
msgstr ""
9630
9631
#: en/help_topics/configuration.txt:149
9632
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9633
msgstr ""
9634
9635
#: en/help_topics/configuration.txt:151
9636
msgid ""
9637
"BZR_PLUGINS_AT\n"
9638
"~~~~~~~~~~~~~~"
9639
msgstr ""
9640
9641
#: en/help_topics/configuration.txt:154
9642
msgid ""
9643
"When adding a new feature or working on a bug in a plugin,\n"
9644
"developers often need to use a specific version of a given\n"
9645
"plugin. Since python requires that the directory containing the\n"
9646
"code is named like the plugin itself this make it impossible to\n"
9647
"use arbitrary directory names (using a two-level directory scheme\n"
9648
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9649
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9650
msgstr ""
9651
9652
#: en/help_topics/configuration.txt:162
9653
msgid ""
9654
"Plugins specified in this environment variable takes precedence\n"
9655
"over the ones in ``BZR_PLUGIN_PATH``."
9656
msgstr ""
9657
9658
#: en/help_topics/configuration.txt:165
9659
msgid ""
9660
"The variable specified a list of ``plugin_name@plugin path``,\n"
9661
"``plugin_name`` being the name of the plugin as it appears in\n"
9662
"python module paths, ``plugin_path`` being the path to the\n"
9663
"directory containing the plugin code itself\n"
9664
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9665
"separator, use ';' on windows."
9666
msgstr ""
9667
9668
#: en/help_topics/configuration.txt:172
9669
msgid ""
9670
"Example:\n"
9671
"~~~~~~~~"
9672
msgstr ""
9673
9674
#: en/help_topics/configuration.txt:175
9675
msgid ""
9676
"Using a specific version of ``myplugin``:\n"
9677
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9678
msgstr ""
9679
9680
#: en/help_topics/configuration.txt:178
9681
msgid ""
9682
"BZRPATH\n"
9683
"~~~~~~~"
9684
msgstr ""
9685
9686
#: en/help_topics/configuration.txt:181
9687
msgid "The path where Bazaar should look for shell plugin external commands."
9688
msgstr ""
9689
9690
#: en/help_topics/configuration.txt:183
9691
msgid ""
9692
"\n"
9693
"http_proxy, https_proxy\n"
9694
"~~~~~~~~~~~~~~~~~~~~~~~"
9695
msgstr ""
9696
9697
#: en/help_topics/configuration.txt:187
9698
msgid "Specifies the network proxy for outgoing connections, for example::"
9699
msgstr ""
9700
9701
#: en/help_topics/configuration.txt:189
9702
msgid ""
9703
" http_proxy=http://proxy.example.com:3128/ \n"
9704
" https_proxy=http://proxy.example.com:3128/"
9705
msgstr ""
9706
9707
#: en/help_topics/configuration.txt:192
9708
msgid ""
9709
"\n"
9710
"Configuration files\n"
9711
"-------------------"
9712
msgstr ""
9713
9714
#: en/help_topics/configuration.txt:196
9715
msgid ""
9716
"Location\n"
9717
"~~~~~~~~"
9718
msgstr ""
9719
9720
#: en/help_topics/configuration.txt:199
9721
msgid ""
9722
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9723
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9724
"on\n"
9725
"Windows. (You can check the location for your system by using\n"
9726
"``bzr version``.)"
9727
msgstr ""
9728
9729
#: en/help_topics/configuration.txt:204
9730
msgid "There are three primary configuration files in this location:"
9731
msgstr ""
9732
9733
#: en/help_topics/configuration.txt:206
9734
msgid "* ``bazaar.conf`` describes default configuration options,"
9735
msgstr ""
9736
9737
#: en/help_topics/configuration.txt:208
9738
msgid ""
9739
"* ``locations.conf`` describes configuration information for\n"
9740
" specific branch locations,"
9741
msgstr ""
9742
9743
#: en/help_topics/configuration.txt:211
9744
msgid ""
9745
"* ``authentication.conf`` describes credential information for\n"
9746
" remote servers."
9747
msgstr ""
9748
9749
#: en/help_topics/configuration.txt:214
9750
msgid ""
9751
"Each branch can also contain a configuration file that sets values specific\n"
9752
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9753
"the\n"
9754
"branch. This file is visible to all users of a branch, if you wish to "
9755
"override\n"
9756
"one of the values for a branch with a setting that is specific to you then "
9757
"you\n"
9758
"can do so in ``locations.conf``."
9759
msgstr ""
9760
9761
#: en/help_topics/configuration.txt:220
9762
msgid ""
9763
"General format\n"
9764
"~~~~~~~~~~~~~~"
9765
msgstr ""
9766
9767
#: en/help_topics/configuration.txt:223
9768
msgid ""
9769
"An ini file has three types of contructs: section headers, section\n"
9770
"options and comments."
9771
msgstr ""
9772
9773
#: en/help_topics/configuration.txt:226
9774
msgid ""
9775
"Comments\n"
9776
"^^^^^^^^"
9777
msgstr ""
9778
9779
#: en/help_topics/configuration.txt:229
9780
msgid ""
9781
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9782
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9783
"Bazaar when parsing ini files."
9784
msgstr ""
9785
9786
#: en/help_topics/configuration.txt:233
9787
msgid ""
9788
"Section headers\n"
9789
"^^^^^^^^^^^^^^^"
9790
msgstr ""
9791
9792
#: en/help_topics/configuration.txt:236
9793
msgid ""
9794
"A section header is a word enclosed in brackets that starts at the begining\n"
9795
"of a line. A typical section header looks like this::"
9796
msgstr ""
9797
9798
#: en/help_topics/configuration.txt:239
9799
msgid " [DEFAULT]"
9800
msgstr ""
9801
9802
#: en/help_topics/configuration.txt:241
9803
msgid ""
9804
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9805
"[ALIASES]. Section headers are case sensitive. The default section provides "
9806
"for\n"
9807
"setting options which can be overridden with the branch config file."
9808
msgstr ""
9809
9810
#: en/help_topics/configuration.txt:245
9811
msgid ""
9812
"For ``locations.conf``, the options from the section with the\n"
9813
"longest matching section header are used to the exclusion of other\n"
9814
"potentially valid section headers. A section header uses the path for\n"
9815
"the branch as the section header. Some examples include::"
9816
msgstr ""
9817
9818
#: en/help_topics/configuration.txt:250
9819
msgid ""
9820
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9821
" [/home/jdoe/branches/]"
9822
msgstr ""
9823
9824
#: en/help_topics/configuration.txt:253
9825
msgid ""
9826
"\n"
9827
"Section options\n"
9828
"^^^^^^^^^^^^^^^"
9829
msgstr ""
9830
9831
#: en/help_topics/configuration.txt:257
9832
msgid ""
9833
"A section option resides within a section. A section option contains an\n"
9834
"option name, an equals sign and a value. For example::"
9835
msgstr ""
9836
9837
#: en/help_topics/configuration.txt:260
9838
msgid ""
9839
" email = John Doe <jdoe@isp.com>\n"
9840
" gpg_signing_key = Amy Pond <amy@example.com>"
9841
msgstr ""
9842
9843
#: en/help_topics/configuration.txt:263
9844
msgid ""
9845
"A option can reference other options by enclosing them in curly brackets::"
9846
msgstr ""
9847
9848
#: en/help_topics/configuration.txt:265
9849
msgid ""
9850
" my_branch_name = feature_x\n"
9851
" my_server = bzr+ssh://example.com\n"
9852
" push_location = {my_server}/project/{my_branch_name}"
9853
msgstr ""
9854
9855
#: en/help_topics/configuration.txt:269
9856
msgid ""
9857
"Option policies\n"
9858
"^^^^^^^^^^^^^^^"
9859
msgstr ""
9860
9861
#: en/help_topics/configuration.txt:272
9862
msgid ""
9863
"Options defined in a section affect the named directory or URL plus\n"
9864
"any locations they contain. Policies can be used to change how an\n"
9865
"option value is interpreted for contained locations. Currently\n"
9866
"there are three policies available:"
9867
msgstr ""
9868
9869
#: en/help_topics/configuration.txt:277
9870
msgid ""
9871
" none:\n"
9872
" the value is interpreted the same for contained locations. This is\n"
9873
" the default behaviour.\n"
9874
" norecurse:\n"
9875
" the value is only used for the exact location specified by the\n"
9876
" section name.\n"
9877
" appendpath:\n"
9878
" for contained locations, any additional path components are\n"
9879
" appended to the value."
9880
msgstr ""
9881
9882
#: en/help_topics/configuration.txt:287
9883
msgid ""
9884
"Policies are specified by keys with names of the form \"<option_name>:policy"
9885
"\".\n"
9886
"For example, to define the push location for a tree of branches, the\n"
9887
"following could be used::"
9888
msgstr ""
9889
9890
#: en/help_topics/configuration.txt:291
9891
msgid ""
9892
" [/top/location]\n"
9893
" push_location = sftp://example.com/location\n"
9894
" push_location:policy = appendpath"
9895
msgstr ""
9896
9897
#: en/help_topics/configuration.txt:295
9898
msgid ""
9899
"With this configuration, the push location for ``/top/location/branch1``\n"
9900
"would be ``sftp://example.com/location/branch1``."
9901
msgstr ""
9902
9903
#: en/help_topics/configuration.txt:298
9904
msgid ""
9905
"Section local options\n"
9906
"^^^^^^^^^^^^^^^^^^^^^"
9907
msgstr ""
9908
9909
#: en/help_topics/configuration.txt:301
9910
msgid ""
9911
"Some options are defined automatically inside a given section and can be\n"
9912
"refered to in this section only. "
9913
msgstr ""
9914
9915
#: en/help_topics/configuration.txt:304
9916
msgid "For example, the ``appendpath`` policy can be used like this::"
9917
msgstr ""
9918
9919
#: en/help_topics/configuration.txt:306
9920
msgid ""
9921
" [/home/vila/src/bzr/bugs]\n"
9922
" mypush = lp:~vila/bzr\n"
9923
" mypush:policy=appendpath"
9924
msgstr ""
9925
9926
#: en/help_topics/configuration.txt:310
9927
msgid "Using ``relpath`` to achieve the same result is done like this::"
9928
msgstr ""
9929
9930
#: en/help_topics/configuration.txt:312
9931
msgid ""
9932
" [/home/vila/src/bzr/bugs]\n"
9933
" mypush = lp:~vila/bzr/{relpath}"
9934
msgstr ""
9935
9936
#: en/help_topics/configuration.txt:315
9937
msgid ""
9938
"In both cases, when used in a directory like\n"
9939
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9940
msgstr ""
9941
9942
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9943
msgid ""
9944
" $ bzr config mypush\n"
9945
" lp:~vila/bzr/832013-expand-in-stack"
9946
msgstr ""
9947
9948
#: en/help_topics/configuration.txt:321
9949
msgid "Another such option is ``basename`` which can be used like this::"
9950
msgstr ""
9951
9952
#: en/help_topics/configuration.txt:323
9953
msgid ""
9954
" [/home/vila/src/bzr]\n"
9955
" mypush = lp:~vila/bzr/{basename}"
9956
msgstr ""
9957
9958
#: en/help_topics/configuration.txt:326
9959
msgid ""
9960
"When used in a directory like\n"
9961
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9962
msgstr ""
9963
9964
#: en/help_topics/configuration.txt:332
9965
msgid ""
9966
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9967
"itself is defined as the relative path between the section name and the\n"
9968
"location it matches."
9969
msgstr ""
9970
9971
#: en/help_topics/configuration.txt:336
9972
msgid ""
9973
"Another such option is ``branchname``, which refers to the name of a "
9974
"colocated\n"
9975
"branch. For non-colocated branches, it behaves like basename. It can be "
9976
"used\n"
9977
"like this::"
9978
msgstr ""
9979
9980
#: en/help_topics/configuration.txt:340
9981
msgid ""
9982
" [/home/vila/src/bzr/bugs]\n"
9983
" mypush = lp:~vila/bzr/{branchname}"
9984
msgstr ""
9985
9986
#: en/help_topics/configuration.txt:343
9987
msgid ""
9988
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9989
"get::"
9990
msgstr ""
9991
9992
#: en/help_topics/configuration.txt:345
9993
msgid ""
9994
" bzr config mypush\n"
9995
" lp:~vila/bzr/832013-expand-in-stack"
9996
msgstr ""
9997
9998
#: en/help_topics/configuration.txt:348
9999
msgid ""
10000
"When an option is local to a Section, it cannot be referred to from option\n"
10001
"values in any other section from the same ``Store`` nor from any other\n"
10002
"``Store``."
10003
msgstr ""
10004
10005
#: en/help_topics/configuration.txt:352
10006
msgid ""
10007
"\n"
10008
"The main configuration file, bazaar.conf\n"
10009
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10010
msgstr ""
10011
10012
#: en/help_topics/configuration.txt:356
10013
msgid ""
10014
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10015
"The default section contains the default\n"
10016
"configuration options for all branches. The default section can be\n"
10017
"overriden by providing a branch-specific section in ``locations.conf``."
10018
msgstr ""
10019
10020
#: en/help_topics/configuration.txt:361
10021
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10022
msgstr ""
10023
10024
#: en/help_topics/configuration.txt:363
10025
msgid ""
10026
" [DEFAULT]\n"
10027
" email = John Doe <jdoe@isp.com>\n"
10028
" editor = /usr/bin/vim\n"
10029
" create_signatures = when-required"
10030
msgstr ""
10031
10032
#: en/help_topics/configuration.txt:368
10033
msgid ""
10034
"\n"
10035
"The branch location configuration file, locations.conf\n"
10036
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10037
msgstr ""
10038
10039
#: en/help_topics/configuration.txt:372
10040
msgid ""
10041
"``locations.conf`` allows one to specify overriding settings for\n"
10042
"a specific branch. The format is almost identical to the default section in\n"
10043
"bazaar.conf with one significant change: The section header, instead of "
10044
"saying\n"
10045
"default, will be the path to a branch that you wish to override a value\n"
10046
"for. The '?' and '*' wildcards are supported::"
10047
msgstr ""
10048
10049
#: en/help_topics/configuration.txt:378
10050
msgid ""
10051
" [/home/jdoe/branches/nethack]\n"
10052
" email = Nethack Admin <nethack@nethack.com>"
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:381
10056
msgid ""
10057
" [http://hypothetical.site.com/branches/devel-branch]\n"
10058
" create_signatures = always"
10059
msgstr ""
10060
10061
#: en/help_topics/configuration.txt:384
10062
msgid ""
10063
"The authentication configuration file, authentication.conf\n"
10064
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10065
msgstr ""
10066
10067
#: en/help_topics/configuration.txt:387
10068
msgid ""
10069
"``authentication.conf`` allows one to specify credentials for\n"
10070
"remote servers. This can be used for all the supported transports and any "
10071
"part\n"
10072
"of bzr that requires authentication (smtp for example)."
10073
msgstr ""
10074
10075
#: en/help_topics/configuration.txt:391
10076
msgid ""
10077
"The syntax of the file obeys the same rules as the others except for the\n"
10078
"option policies which don't apply."
10079
msgstr ""
10080
10081
#: en/help_topics/configuration.txt:394
10082
msgid ""
10083
"For more information on the possible uses of the authentication "
10084
"configuration\n"
10085
"file see :doc:`authentication-help`."
10086
msgstr ""
10087
10088
#: en/help_topics/configuration.txt:397
10089
msgid ""
10090
"\n"
10091
"Common options\n"
10092
"--------------"
10093
msgstr ""
10094
10095
#: en/help_topics/configuration.txt:401
10096
msgid ""
10097
"debug_flags\n"
10098
"~~~~~~~~~~~"
10099
msgstr ""
10100
10101
#: en/help_topics/configuration.txt:404
10102
msgid ""
10103
"A comma-separated list of debugging options to turn on. The same values\n"
10104
"can be used as with the -D command-line option (see `help global-options`).\n"
10105
"For example::"
10106
msgstr ""
10107
10108
#: en/help_topics/configuration.txt:408
10109
msgid " debug_flags = hpss"
10110
msgstr ""
10111
10112
#: en/help_topics/configuration.txt:412
10113
msgid " debug_flags = hpss,evil"
10114
msgstr ""
10115
10116
#: en/help_topics/configuration.txt:414
10117
msgid ""
10118
"email\n"
10119
"~~~~~"
10120
msgstr ""
10121
10122
#: en/help_topics/configuration.txt:417
10123
msgid ""
10124
"The email address to use when committing a branch. Typically takes the form\n"
10125
"of::"
10126
msgstr ""
10127
10128
#: en/help_topics/configuration.txt:420
10129
msgid " email = Full Name <account@hostname.tld>"
10130
msgstr ""
10131
10132
#: en/help_topics/configuration.txt:422
10133
msgid ""
10134
"editor\n"
10135
"~~~~~~"
10136
msgstr ""
10137
10138
#: en/help_topics/configuration.txt:425
10139
msgid ""
10140
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10141
"a commit message. This setting is trumped by the environment variable\n"
10142
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10143
"variables."
10144
msgstr ""
10145
10146
#: en/help_topics/configuration.txt:430
10147
msgid ""
10148
"log_format\n"
10149
"~~~~~~~~~~"
10150
msgstr ""
10151
10152
#: en/help_topics/configuration.txt:433
10153
msgid ""
10154
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10155
"and ``line``. Additional formats may be provided by plugins. The default\n"
10156
"value is ``long``."
10157
msgstr ""
10158
10159
#: en/help_topics/configuration.txt:437
10160
msgid ""
10161
"check_signatures\n"
10162
"~~~~~~~~~~~~~~~~"
10163
msgstr ""
10164
10165
#: en/help_topics/configuration.txt:440
10166
msgid ""
10167
"Reserved for future use. These options will allow a policy for branches to\n"
10168
"require signatures."
10169
msgstr ""
10170
10171
#: en/help_topics/configuration.txt:443
10172
msgid ""
10173
"require\n"
10174
" The gnupg signature for revisions must be present and must be valid."
10175
msgstr ""
10176
10177
#: en/help_topics/configuration.txt:446
10178
msgid ""
10179
"ignore\n"
10180
" Do not check gnupg signatures of revisions."
10181
msgstr ""
10182
10183
#: en/help_topics/configuration.txt:449
10184
msgid ""
10185
"check-available\n"
10186
" (default) If gnupg signatures for revisions are present, check them.\n"
10187
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10188
" no signature is present."
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:454
10192
msgid ""
10193
"create_signatures\n"
10194
"~~~~~~~~~~~~~~~~~"
10195
msgstr ""
10196
10197
#: en/help_topics/configuration.txt:457
10198
msgid ""
10199
"Defines the behaviour of signing revisions on commits. By default bzr will "
10200
"not\n"
10201
"sign new commits."
10202
msgstr ""
10203
10204
#: en/help_topics/configuration.txt:460
10205
msgid ""
10206
"always\n"
10207
" Sign every new revision that is committed. If the signing fails then "
10208
"the\n"
10209
" commit will not be made."
10210
msgstr ""
10211
10212
#: en/help_topics/configuration.txt:464
10213
msgid ""
10214
"when-required\n"
10215
" Reserved for future use."
10216
msgstr ""
10217
10218
#: en/help_topics/configuration.txt:467
10219
msgid ""
10220
"never\n"
10221
" Reserved for future use."
10222
msgstr ""
10223
10224
#: en/help_topics/configuration.txt:470
10225
msgid ""
10226
"In future it is planned that ``when-required`` will sign newly\n"
10227
"committed revisions only when the branch requires them. ``never`` will "
10228
"refuse\n"
10229
"to sign newly committed revisions, even if the branch requires signatures."
10230
msgstr ""
10231
10232
#: en/help_topics/configuration.txt:474
10233
msgid ""
10234
"dirstate.fdatasync\n"
10235
"~~~~~~~~~~~~~~~~~~"
10236
msgstr ""
10237
10238
#: en/help_topics/configuration.txt:477
10239
msgid ""
10240
"If true (default), working tree metadata changes are flushed through the\n"
10241
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10242
"should not be lost if the machine crashes. See also repository.fdatasync."
10243
msgstr ""
10244
10245
#: en/help_topics/configuration.txt:481
10246
msgid ""
10247
"gpg_signing_key\n"
10248
"~~~~~~~~~~~~~~~"
10249
msgstr ""
10250
10251
#: en/help_topics/configuration.txt:484
10252
msgid ""
10253
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10254
"address, key fingerprint or full key ID. When unset or when set to\n"
10255
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10256
msgstr ""
10257
10258
#: en/help_topics/configuration.txt:488
10259
msgid ""
10260
"recurse\n"
10261
"~~~~~~~"
10262
msgstr ""
10263
10264
#: en/help_topics/configuration.txt:491
10265
msgid ""
10266
"Only useful in ``locations.conf``. Defines whether or not the\n"
10267
"configuration for this section applies to subdirectories:"
10268
msgstr ""
10269
10270
#: en/help_topics/configuration.txt:494
10271
msgid ""
10272
"true\n"
10273
" (default) This section applies to subdirectories as well."
10274
msgstr ""
10275
10276
#: en/help_topics/configuration.txt:497
10277
msgid ""
10278
"false\n"
10279
" This section only applies to the branch at this directory and not\n"
10280
" branches below it."
10281
msgstr ""
10282
10283
#: en/help_topics/configuration.txt:501
10284
msgid ""
10285
"gpg_signing_command\n"
10286
"~~~~~~~~~~~~~~~~~~~"
10287
msgstr ""
10288
10289
#: en/help_topics/configuration.txt:504
10290
msgid ""
10291
"(Default: \"gpg\"). Which program should be used to sign and check "
10292
"revisions.\n"
10293
"For example::"
10294
msgstr ""
10295
10296
#: en/help_topics/configuration.txt:507
10297
msgid " gpg_signing_command = /usr/bin/gnpg"
10298
msgstr ""
10299
10300
#: en/help_topics/configuration.txt:509
10301
msgid ""
10302
"The specified command must accept the options \"--clearsign\" and \"-u "
10303
"<email>\"."
10304
msgstr ""
10305
10306
#: en/help_topics/configuration.txt:511
10307
msgid ""
10308
"bzr_remote_path\n"
10309
"~~~~~~~~~~~~~~~"
10310
msgstr ""
10311
10312
#: en/help_topics/configuration.txt:514
10313
msgid ""
10314
"(Default: \"bzr\"). The path to the command that should be used to run the "
10315
"smart\n"
10316
"server for bzr. This value may only be specified in locations.conf, because:"
10317
msgstr ""
10318
10319
#: en/help_topics/configuration.txt:517
10320
msgid ""
10321
"- it's needed before branch.conf is accessible\n"
10322
"- allowing remote branch.conf files to specify commands would be a security\n"
10323
" risk"
10324
msgstr ""
10325
10326
#: en/help_topics/configuration.txt:521
10327
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10328
msgstr ""
10329
10330
#: en/help_topics/configuration.txt:523
10331
msgid ""
10332
"smtp_server\n"
10333
"~~~~~~~~~~~"
10334
msgstr ""
10335
10336
#: en/help_topics/configuration.txt:526
10337
msgid ""
10338
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10339
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10340
msgstr ""
10341
10342
#: en/help_topics/configuration.txt:529
10343
msgid ""
10344
"smtp_username, smtp_password\n"
10345
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10346
msgstr ""
10347
10348
#: en/help_topics/configuration.txt:532
10349
msgid ""
10350
"User and password to authenticate to the SMTP server. If smtp_username\n"
10351
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10352
"These settings are only needed if the SMTP server requires authentication\n"
10353
"to send mail."
10354
msgstr ""
10355
10356
#: en/help_topics/configuration.txt:537
10357
msgid ""
10358
"locks.steal_dead\n"
10359
"~~~~~~~~~~~~~~~~"
10360
msgstr ""
10361
10362
#: en/help_topics/configuration.txt:540
10363
msgid ""
10364
"If set to true, bzr will automatically break locks held by processes from\n"
10365
"the same machine and user that are no longer alive. Otherwise, it will\n"
10366
"print a message and you can break the lock manually, if you are satisfied\n"
10367
"the object is no longer in use."
10368
msgstr ""
10369
10370
#: en/help_topics/configuration.txt:545
10371
msgid ""
10372
"mail_client\n"
10373
"~~~~~~~~~~~"
10374
msgstr ""
10375
10376
#: en/help_topics/configuration.txt:548
10377
msgid ""
10378
"A mail client to use for sending merge requests.\n"
10379
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10380
"it\n"
10381
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10382
"``editor``."
10383
msgstr ""
10384
10385
#: en/help_topics/configuration.txt:553
10386
msgid "Supported values for specific clients:"
10387
msgstr ""
10388
10389
#: en/help_topics/configuration.txt:555
10390
msgid ""
10391
":claws: Use Claws. This skips a dialog for attaching files.\n"
10392
":evolution: Use Evolution.\n"
10393
":kmail: Use KMail.\n"
10394
":mutt: Use Mutt.\n"
10395
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10396
"1.5,\n"
10397
" this works around some bugs that xdg-email doesn't handle."
10398
msgstr ""
10399
10400
#: en/help_topics/configuration.txt:562
10401
msgid "Supported generic values are:"
10402
msgstr ""
10403
10404
#: en/help_topics/configuration.txt:564
10405
msgid ""
10406
":default: See above.\n"
10407
":editor: Use your editor to compose the merge request. This also uses\n"
10408
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10409
" smtp_username and smtp_password.\n"
10410
":mapi: Use your preferred e-mail client on Windows.\n"
10411
":xdg-email: Use xdg-email to run your preferred mail program"
10412
msgstr ""
10413
10414
#: en/help_topics/configuration.txt:571
10415
msgid ""
10416
"repository.fdatasync\n"
10417
"~~~~~~~~~~~~~~~~~~~~"
10418
msgstr ""
10419
10420
#: en/help_topics/configuration.txt:574
10421
msgid ""
10422
"If true (default), repository changes are flushed through the OS buffers\n"
10423
"to physical disk. This is somewhat slower, but means data should not be\n"
10424
"lost if the machine crashes. See also dirstate.fdatasync."
10425
msgstr ""
10426
10427
#: en/help_topics/configuration.txt:578
10428
msgid ""
10429
"submit_branch\n"
10430
"~~~~~~~~~~~~~"
10431
msgstr ""
10432
10433
#: en/help_topics/configuration.txt:581
10434
msgid ""
10435
"The branch you intend to submit your current work to. This is "
10436
"automatically\n"
10437
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10438
"This\n"
10439
"should usually be set on a per-branch or per-location basis."
10440
msgstr ""
10441
10442
#: en/help_topics/configuration.txt:585
10443
msgid ""
10444
"public_branch\n"
10445
"~~~~~~~~~~~~~"
10446
msgstr ""
10447
10448
#: en/help_topics/configuration.txt:588
10449
msgid ""
10450
"A publically-accessible version of this branch (implying that this version "
10451
"is\n"
10452
"not publically-accessible). Used (and set) by ``bzr send``."
10453
msgstr ""
10454
10455
#: en/help_topics/configuration.txt:591
10456
msgid ""
10457
"suppress_warnings\n"
10458
"~~~~~~~~~~~~~~~~~"
10459
msgstr ""
10460
10461
#: en/help_topics/configuration.txt:594
10462
msgid ""
10463
"A list of strings, each string represent a warning that can be emitted by\n"
10464
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10465
msgstr ""
10466
10467
#: en/help_topics/configuration.txt:597
10468
msgid "Valid values:"
10469
msgstr ""
10470
10471
#: en/help_topics/configuration.txt:599
10472
msgid ""
10473
"* ``format_deprecation``:\n"
10474
" whether the format deprecation warning is shown on repositories that "
10475
"are\n"
10476
" using deprecated formats."
10477
msgstr ""
10478
10479
#: en/help_topics/configuration.txt:603
10480
msgid ""
10481
"default_format\n"
10482
"~~~~~~~~~~~~~~"
10483
msgstr ""
10484
10485
#: en/help_topics/configuration.txt:606
10486
msgid ""
10487
"A format name for the default format used when creating branches. See "
10488
"``bzr\n"
10489
"help formats`` for possible values."
10490
msgstr ""
10491
10492
#: en/help_topics/configuration.txt:609
10493
msgid ""
10494
"\n"
10495
"Unicode options\n"
10496
"---------------"
10497
msgstr ""
10498
10499
#: en/help_topics/configuration.txt:613
10500
msgid ""
10501
"output_encoding\n"
10502
"~~~~~~~~~~~~~~~"
10503
msgstr ""
10504
10505
#: en/help_topics/configuration.txt:616
10506
msgid ""
10507
"A Python unicode encoding name for text output from bzr, such as log\n"
10508
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10509
"is the terminal encoding prefered by the operating system."
10510
msgstr ""
10511
10512
#: en/help_topics/configuration.txt:620
10513
msgid ""
10514
"\n"
10515
"Branch type specific options\n"
10516
"----------------------------"
10517
msgstr ""
10518
10519
#: en/help_topics/configuration.txt:624
10520
msgid ""
10521
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10522
"later format. They\n"
10523
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10524
"manually set in ``locations.conf`` or ``bazaar.conf``."
10525
msgstr ""
10526
10527
#: en/help_topics/configuration.txt:629
10528
msgid ""
10529
"append_revisions_only\n"
10530
"~~~~~~~~~~~~~~~~~~~~~"
10531
msgstr ""
10532
10533
#: en/help_topics/configuration.txt:632
10534
msgid ""
10535
"If set to \"True\" then revisions can only be appended to the log, not\n"
10536
"removed. A branch with this setting enabled can only pull from another\n"
10537
"branch if the other branch's log is a longer version of its own. This is\n"
10538
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10539
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10540
"compatibility with previous bzr versions (older than 2.2)."
10541
msgstr ""
10542
10543
#: en/help_topics/configuration.txt:639
10544
msgid ""
10545
"parent_location\n"
10546
"~~~~~~~~~~~~~~~"
10547
msgstr ""
10548
10549
#: en/help_topics/configuration.txt:642
10550
msgid ""
10551
"If present, the location of the default branch for pull or merge. This "
10552
"option\n"
10553
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10554
"--remember``."
10555
msgstr ""
10556
10557
#: en/help_topics/configuration.txt:646
10558
msgid ""
10559
"push_location\n"
10560
"~~~~~~~~~~~~~"
10561
msgstr ""
10562
10563
#: en/help_topics/configuration.txt:649
10564
msgid ""
10565
"If present, the location of the default branch for push. This option\n"
10566
"is normally set by the first ``push`` or ``push --remember``."
10567
msgstr ""
10568
10569
#: en/help_topics/configuration.txt:652
10570
msgid ""
10571
"push_strict\n"
10572
"~~~~~~~~~~~"
10573
msgstr ""
10574
10575
#: en/help_topics/configuration.txt:655
10576
msgid ""
10577
"If present, defines the ``--strict`` option default value for checking\n"
10578
"uncommitted changes before pushing."
10579
msgstr ""
10580
10581
#: en/help_topics/configuration.txt:658
10582
msgid ""
10583
"dpush_strict\n"
10584
"~~~~~~~~~~~~"
10585
msgstr ""
10586
10587
#: en/help_topics/configuration.txt:661
10588
msgid ""
10589
"If present, defines the ``--strict`` option default value for checking\n"
10590
"uncommitted changes before pushing into a different VCS without any\n"
10591
"custom bzr metadata."
10592
msgstr ""
10593
10594
#: en/help_topics/configuration.txt:665
10595
msgid ""
10596
"bound_location\n"
10597
"~~~~~~~~~~~~~~"
10598
msgstr ""
10599
10600
#: en/help_topics/configuration.txt:668
10601
msgid ""
10602
"The location that commits should go to when acting as a checkout.\n"
10603
"This option is normally set by ``bind``."
10604
msgstr ""
10605
10606
#: en/help_topics/configuration.txt:671
10607
msgid ""
10608
"bound\n"
10609
"~~~~~"
10610
msgstr ""
10611
10612
#: en/help_topics/configuration.txt:674
10613
msgid ""
10614
"If set to \"True\", the branch should act as a checkout, and push each "
10615
"commit to\n"
10616
"the bound_location. This option is normally set by ``bind``/``unbind``."
10617
msgstr ""
10618
10619
#: en/help_topics/configuration.txt:677
10620
msgid ""
10621
"send_strict\n"
10622
"~~~~~~~~~~~"
10623
msgstr ""
10624
10625
#: en/help_topics/configuration.txt:680
10626
msgid ""
10627
"If present, defines the ``--strict`` option default value for checking\n"
10628
"uncommitted changes before sending a merge directive."
10629
msgstr ""
10630
10631
#: en/help_topics/configuration.txt:683
10632
msgid ""
10633
"add.maximum_file_size\n"
10634
"~~~~~~~~~~~~~~~~~~~~~"
10635
msgstr ""
10636
10637
#: en/help_topics/configuration.txt:686
10638
msgid ""
10639
"Defines the maximum file size the command line \"add\" operation will allow\n"
10640
"in recursive mode, with files larger than this value being skipped. You "
10641
"may \n"
10642
"specify this value as an integer (in which case it is interpreted as "
10643
"bytes), \n"
10644
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10645
"0 \n"
10646
"will disable skipping."
10647
msgstr ""
10648
10649
#: en/help_topics/configuration.txt:692
10650
msgid ""
10651
"External Merge Tools\n"
10652
"--------------------"
10653
msgstr ""
10654
10655
#: en/help_topics/configuration.txt:695
10656
msgid ""
10657
"bzr.mergetool.<name>\n"
10658
"~~~~~~~~~~~~~~~~~~~~"
10659
msgstr ""
10660
10661
#: en/help_topics/configuration.txt:698
10662
msgid ""
10663
"Defines an external merge tool called <name> with the given command-line.\n"
10664
"Arguments containing spaces should be quoted using single or double quotes. "
10665
"The\n"
10666
"executable may omit its path if it can be found on the PATH."
10667
msgstr ""
10668
10669
#: en/help_topics/configuration.txt:702
10670
msgid ""
10671
"The following markers can be used in the command-line to substitute "
10672
"filenames\n"
10673
"involved in the merge conflict::"
10674
msgstr ""
10675
10676
#: en/help_topics/configuration.txt:705
10677
msgid ""
10678
" {base} file.BASE\n"
10679
" {this} file.THIS\n"
10680
" {other} file.OTHER\n"
10681
" {result} output file\n"
10682
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10683
"merge\n"
10684
" succeeds."
10685
msgstr ""
10686
10687
#: en/help_topics/configuration.txt:714
10688
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10689
msgstr ""
10690
10691
#: en/help_topics/configuration.txt:716
10692
msgid ""
10693
"bzr.default_mergetool\n"
10694
"~~~~~~~~~~~~~~~~~~~~~"
10695
msgstr ""
10696
10697
#: en/help_topics/configuration.txt:719
10698
msgid ""
10699
"Specifies which external merge tool (as defined above) should be selected "
10700
"by\n"
10701
"default in tools such as ``bzr qconflicts``."
10702
msgstr ""
10703
10704
#: en/help_topics/configuration.txt:724
10705
msgid " bzr.default_mergetool = kdiff3\n"
10706
msgstr ""
10707
10708
#: en/help_topics/conflict-types.txt:1
10709
msgid ""
10710
"Conflict Types\n"
10711
"=============="
10712
msgstr ""
10713
10714
#: en/help_topics/conflict-types.txt:4
10715
msgid ""
10716
"Some operations, like merge, revert and pull, modify the contents of your\n"
10717
"working tree. These modifications are programmatically generated, and so "
10718
"they\n"
10719
"may conflict with the current state of your working tree. "
10720
msgstr ""
10721
10722
#: en/help_topics/conflict-types.txt:8
10723
msgid ""
10724
"When conflicts are present in your working tree (as shown by ``bzr\n"
10725
"conflicts``), you should resolve them and then inform bzr that the "
10726
"conflicts\n"
10727
"have been resolved."
10728
msgstr ""
10729
10730
#: en/help_topics/conflict-types.txt:12
10731
msgid ""
10732
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10733
"should resolve them is not the one responsible for their occurrence, as is "
10734
"the\n"
10735
"case when merging other people's work or because some conflicts are "
10736
"presented\n"
10737
"in a way that is not easy to understand."
10738
msgstr ""
10739
10740
#: en/help_topics/conflict-types.txt:17
10741
msgid ""
10742
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10743
"conflict if and only if there's an actual conceptual conflict in the source\n"
10744
"tree. Because Bazaar doesn't understand the real meaning of the files "
10745
"being\n"
10746
"versioned, it can, when faced with ambiguities, fall short in either "
10747
"direction\n"
10748
"trying to resolve the conflict itself. Many kinds of changes can be "
10749
"combined\n"
10750
"programmatically, but sometimes only a human can determine the right thing "
10751
"to\n"
10752
"do."
10753
msgstr ""
10754
10755
#: en/help_topics/conflict-types.txt:25
10756
msgid ""
10757
"When Bazaar generates a conflict, it adds information into the working tree "
10758
"to\n"
10759
"present the conflicting versions, and it's up to you to find the correct\n"
10760
"resolution."
10761
msgstr ""
10762
10763
#: en/help_topics/conflict-types.txt:29
10764
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10765
msgstr ""
10766
10767
#: en/help_topics/conflict-types.txt:31
10768
msgid ""
10769
"1. Modify the working tree content so that the conflicted item is now in "
10770
"the\n"
10771
" state you want to keep, then"
10772
msgstr ""
10773
10774
#: en/help_topics/conflict-types.txt:34
10775
msgid ""
10776
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10777
" remaining generated information (``bzr resolve <item>``)."
10778
msgstr ""
10779
10780
#: en/help_topics/conflict-types.txt:37
10781
msgid ""
10782
"For most conflict types, there are some obvious ways to modify the working\n"
10783
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10784
"itself already made a choice, when possible."
10785
msgstr ""
10786
10787
#: en/help_topics/conflict-types.txt:41
10788
msgid ""
10789
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10790
"different ways to resolve the conflict."
10791
msgstr ""
10792
10793
#: en/help_topics/conflict-types.txt:44
10794
msgid ""
10795
"Each type of conflict is explained below, and the action which must be done "
10796
"to\n"
10797
"resolve the conflict is outlined."
10798
msgstr ""
10799
10800
#: en/help_topics/conflict-types.txt:47
10801
msgid ""
10802
"Various actions are available depending on the kind of conflict, for some "
10803
"of\n"
10804
"these actions, Bazaar can provide some help. In the end you should at least\n"
10805
"inform Bazaar that you're done with the conflict with::"
10806
msgstr ""
10807
10808
#: en/help_topics/conflict-types.txt:51
10809
msgid " ``bzr resolve FILE --action=done'"
10810
msgstr ""
10811
10812
#: en/help_topics/conflict-types.txt:53
10813
msgid ""
10814
"Note that this is the default action when a single file is involved so you "
10815
"can\n"
10816
"simply use::"
10817
msgstr ""
10818
10819
#: en/help_topics/conflict-types.txt:56
10820
msgid " ``bzr resolve FILE``"
10821
msgstr ""
10822
10823
#: en/help_topics/conflict-types.txt:58
10824
msgid "See ``bzr help resolve`` for more details."
10825
msgstr ""
10826
10827
#: en/help_topics/conflict-types.txt:60
10828
msgid ""
10829
"Text conflicts\n"
10830
"--------------"
10831
msgstr ""
10832
10833
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10834
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10835
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10836
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10837
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10838
msgid "Typical message::"
10839
msgstr ""
10840
10841
#: en/help_topics/conflict-types.txt:65
10842
msgid " Text conflict in FILE"
10843
msgstr ""
10844
10845
#: en/help_topics/conflict-types.txt:67
10846
msgid ""
10847
"These are produced when a text merge cannot completely reconcile two sets "
10848
"of\n"
10849
"text changes. Bazaar will emit files for each version with the extensions\n"
10850
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10851
"tree,\n"
10852
"i.e. the tree that you are merging changes into. OTHER is the version that "
10853
"you\n"
10854
"are merging into the target. BASE is an older version that is used as a "
10855
"basis\n"
10856
"for comparison."
10857
msgstr ""
10858
10859
#: en/help_topics/conflict-types.txt:74
10860
msgid ""
10861
"In the main copy of the file, Bazaar will include all the changes that it\n"
10862
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10863
"\"herringbone\" markers like ``<<<<<<<``."
10864
msgstr ""
10865
10866
#: en/help_topics/conflict-types.txt:78
10867
msgid ""
10868
"Say the initial text is \"The project leader released it.\", and THIS "
10869
"modifies it\n"
10870
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10871
"leader\n"
10872
"released Bazaar.\" A conflict would look like this::"
10873
msgstr ""
10874
10875
#: en/help_topics/conflict-types.txt:82
10876
msgid ""
10877
" <<<<<<< TREE\n"
10878
" Martin Pool released it.\n"
10879
" =======\n"
10880
" The project leader released Bazaar.\n"
10881
" >>>>>>> MERGE-SOURCE"
10882
msgstr ""
10883
10884
#: en/help_topics/conflict-types.txt:88
10885
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10886
msgstr ""
10887
10888
#: en/help_topics/conflict-types.txt:90
10889
msgid ""
10890
"You can handle text conflicts either by editing the main copy of the file,\n"
10891
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10892
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10893
"set of changes over the other (but see below when you encounter these\n"
10894
"cases). More often, the two sets of changes must be intelligently combined."
10895
msgstr ""
10896
10897
#: en/help_topics/conflict-types.txt:96
10898
msgid ""
10899
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10900
"you are done editing, the file should look like it never had a conflict, and "
10901
"be\n"
10902
"ready to commit."
10903
msgstr ""
10904
10905
#: en/help_topics/conflict-types.txt:100
10906
msgid ""
10907
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10908
"Bazaar will auto-detect which conflicts you have resolved."
10909
msgstr ""
10910
10911
#: en/help_topics/conflict-types.txt:103
10912
msgid ""
10913
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10914
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10915
"working tree."
10916
msgstr ""
10917
10918
#: en/help_topics/conflict-types.txt:107
10919
msgid ""
10920
"\n"
10921
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10922
"resolve`` with one of the following actions:"
10923
msgstr ""
10924
10925
#: en/help_topics/conflict-types.txt:111
10926
msgid ""
10927
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10928
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10929
msgstr ""
10930
10931
#: en/help_topics/conflict-types.txt:114
10932
msgid ""
10933
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10934
"modifications will be taken into account."
10935
msgstr ""
10936
10937
#: en/help_topics/conflict-types.txt:117
10938
msgid ""
10939
"Content conflicts\n"
10940
"-----------------"
10941
msgstr ""
10942
10943
#: en/help_topics/conflict-types.txt:122
10944
msgid " Contents conflict in FILE"
10945
msgstr ""
10946
10947
#: en/help_topics/conflict-types.txt:124
10948
msgid ""
10949
"This conflict happens when there are conflicting changes in the working "
10950
"tree\n"
10951
"and the merge source, but the conflicted items are not text files. They "
10952
"may\n"
10953
"be binary files, or symlinks, or directories. It can even happen with "
10954
"files\n"
10955
"that are deleted on one side, and modified on the other."
10956
msgstr ""
10957
10958
#: en/help_topics/conflict-types.txt:129
10959
msgid ""
10960
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10961
"be\n"
10962
"regular files, symlinks or directories). But it will not include a \"main "
10963
"copy\"\n"
10964
"of the file with herringbone conflict markers. It will appear that the "
10965
"\"main\n"
10966
"copy\" has been renamed to THIS or OTHER."
10967
msgstr ""
10968
10969
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10970
msgid ""
10971
"To resolve that kind of conflict, you should rebuild FILE from either "
10972
"version\n"
10973
"or a combination of both."
10974
msgstr ""
10975
10976
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10977
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10978
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10979
#: en/help_topics/conflict-types.txt:361
10980
msgid "``bzr resolve`` recognizes the following actions:"
10981
msgstr ""
10982
10983
#: en/help_topics/conflict-types.txt:139
10984
msgid ""
10985
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10986
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10987
"* ``--action=done`` will just mark the conflict as resolved."
10988
msgstr ""
10989
10990
#: en/help_topics/conflict-types.txt:143
10991
msgid ""
10992
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10993
"and\n"
10994
"``.OTHER`` files if they are still present in the working tree."
10995
msgstr ""
10996
10997
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10998
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10999
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11000
#: en/help_topics/conflict-types.txt:369
11001
msgid ""
11002
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11003
msgstr ""
11004
11005
#: en/help_topics/conflict-types.txt:148
11006
msgid ""
11007
"Tag conflicts\n"
11008
"-------------"
11009
msgstr ""
11010
11011
#: en/help_topics/conflict-types.txt:153
11012
msgid ""
11013
" Conflicting tags:\n"
11014
" version-0.1"
11015
msgstr ""
11016
11017
#: en/help_topics/conflict-types.txt:156
11018
msgid ""
11019
"When pulling from or pushing to another branch, Bazaar informs you about "
11020
"tags\n"
11021
"that conflict between the two branches; that is the same tag points to two\n"
11022
"different revisions. You need not resolve these conflicts, but subsequent\n"
11023
"uses of pull or push will result in the same message."
11024
msgstr ""
11025
11026
#: en/help_topics/conflict-types.txt:161
11027
msgid ""
11028
"To resolve the conflict, you must apply the correct tags to either the "
11029
"target\n"
11030
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11031
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11032
"target branch's tags match the source branch, then in the target branch do\n"
11033
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11034
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11035
"source\n"
11036
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11037
"favor of the target branch, you need to similarly use ``tag --force`` in "
11038
"the\n"
11039
"source branch. (Note that pulling or pushing using --overwrite will "
11040
"overwrite\n"
11041
"all tags as well.)"
11042
msgstr ""
11043
11044
#: en/help_topics/conflict-types.txt:172
11045
msgid ""
11046
"Duplicate paths\n"
11047
"---------------"
11048
msgstr ""
11049
11050
#: en/help_topics/conflict-types.txt:177
11051
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11052
msgstr ""
11053
11054
#: en/help_topics/conflict-types.txt:179
11055
msgid ""
11056
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11057
"already been used. The existing file will be renamed to \"FILE.moved\". "
11058
msgstr ""
11059
11060
#: en/help_topics/conflict-types.txt:187
11061
msgid ""
11062
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11063
"FILE``,\n"
11064
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11065
"* ``--action=done`` will just mark the conflict as resolved."
11066
msgstr ""
11067
11068
#: en/help_topics/conflict-types.txt:191
11069
msgid ""
11070
"Note that you must get rid of FILE.moved before using ``--action=done``."
11071
msgstr ""
11072
11073
#: en/help_topics/conflict-types.txt:195
11074
msgid ""
11075
"Unversioned parent\n"
11076
"------------------"
11077
msgstr ""
11078
11079
#: en/help_topics/conflict-types.txt:200
11080
msgid " Conflict because FILE is not versioned, but has versioned children."
11081
msgstr ""
11082
11083
#: en/help_topics/conflict-types.txt:202
11084
msgid ""
11085
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11086
"not\n"
11087
"versioned. This happens when the directory has been deleted in the target,\n"
11088
"but has a new child in the source, or vice versa. In this situation, "
11089
"Bazaar\n"
11090
"will version the parent directory as well. Resolving this issue depends\n"
11091
"very much on the particular scenario. You may wish to rename or delete "
11092
"either\n"
11093
"the file or the directory. When you are satisfied, you can run \"bzr "
11094
"resolve\n"
11095
"FILE\" to mark the conflict as resolved."
11096
msgstr ""
11097
11098
#: en/help_topics/conflict-types.txt:210
11099
msgid ""
11100
"Missing parent\n"
11101
"--------------"
11102
msgstr ""
11103
11104
#: en/help_topics/conflict-types.txt:215
11105
msgid " Conflict adding files to FILE. Created directory."
11106
msgstr ""
11107
11108
#: en/help_topics/conflict-types.txt:217
11109
msgid ""
11110
"This happens when a directory has been deleted in the target, but has new\n"
11111
"children in the source. This is similar to the \"unversioned parent\" "
11112
"conflict,\n"
11113
"except that the parent directory does not *exist*, instead of just being\n"
11114
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11115
"Resolving this issue depends very much on the particular scenario."
11116
msgstr ""
11117
11118
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11119
msgid ""
11120
"To resolve that kind of conflict, you should either remove or rename the\n"
11121
"children or the directory or a combination of both."
11122
msgstr ""
11123
11124
#: en/help_topics/conflict-types.txt:228
11125
msgid ""
11126
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11127
" children,\n"
11128
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11129
"children\n"
11130
" and restoring the directory,\n"
11131
"* ``--action=done`` will just mark the conflict as resolved."
11132
msgstr ""
11133
11134
#: en/help_topics/conflict-types.txt:236
11135
msgid ""
11136
"Deleting parent\n"
11137
"---------------"
11138
msgstr ""
11139
11140
#: en/help_topics/conflict-types.txt:241
11141
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11142
msgstr ""
11143
11144
#: en/help_topics/conflict-types.txt:243
11145
msgid ""
11146
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11147
"source, but has new children in the target (either because a directory\n"
11148
"deletion is merged or because the merge introduce new children). Bazaar\n"
11149
"will retain the directory. Resolving this issue depends very much on the\n"
11150
"particular scenario."
11151
msgstr ""
11152
11153
#: en/help_topics/conflict-types.txt:254
11154
msgid ""
11155
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11156
"directory,"
11157
msgstr ""
11158
11159
#: en/help_topics/conflict-types.txt:256
11160
msgid ""
11161
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11162
" children,"
11163
msgstr ""
11164
11165
#: en/help_topics/conflict-types.txt:259
11166
msgid "* ``--action=done`` will just mark the conflict as resolved."
11167
msgstr ""
11168
11169
#: en/help_topics/conflict-types.txt:261
11170
msgid ""
11171
"Note that when merging a directory deletion, if unversioned files are\n"
11172
"present, they become potential orphans has they don't have a directory\n"
11173
"parent anymore."
11174
msgstr ""
11175
11176
#: en/help_topics/conflict-types.txt:265
11177
msgid ""
11178
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11179
"setting the ``bzr.transform.orphan_policy`` configuration option."
11180
msgstr ""
11181
11182
#: en/help_topics/conflict-types.txt:268
11183
msgid "There are two possible values for this option:"
11184
msgstr ""
11185
11186
#: en/help_topics/conflict-types.txt:270
11187
msgid ""
11188
"* ``conflict`` (the default): will leave the orphans in place and\n"
11189
" generate a conflicts,"
11190
msgstr ""
11191
11192
#: en/help_topics/conflict-types.txt:273
11193
msgid ""
11194
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11195
"root\n"
11196
" of the working tree with names like ``<file>.~#~``."
11197
msgstr ""
11198
11199
#: en/help_topics/conflict-types.txt:278
11200
msgid ""
11201
"Path conflict\n"
11202
"-------------"
11203
msgstr ""
11204
11205
#: en/help_topics/conflict-types.txt:283
11206
msgid " Path conflict: PATH1 / PATH2"
11207
msgstr ""
11208
11209
#: en/help_topics/conflict-types.txt:285
11210
msgid ""
11211
"This happens when the source and target have each modified the name or "
11212
"parent\n"
11213
"directory of a file. Bazaar will use the path elements from the source."
11214
msgstr ""
11215
11216
#: en/help_topics/conflict-types.txt:288
11217
msgid ""
11218
"To resolve that kind of conflict, you just have to decide what name should "
11219
"be\n"
11220
"retained for the file involved."
11221
msgstr ""
11222
11223
#: en/help_topics/conflict-types.txt:293
11224
msgid ""
11225
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11226
" issuing ``bzr mv PATH2 PATH1``,\n"
11227
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11228
"``PATH2``,\n"
11229
"* ``--action=done`` will just mark the conflict as resolved."
11230
msgstr ""
11231
11232
#: en/help_topics/conflict-types.txt:300
11233
msgid ""
11234
"Parent loop\n"
11235
"-----------"
11236
msgstr ""
11237
11238
#: en/help_topics/conflict-types.txt:305
11239
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11240
msgstr ""
11241
11242
#: en/help_topics/conflict-types.txt:307
11243
msgid ""
11244
"This happens when the source and the target have each moved directories, so\n"
11245
"that, if the change could be applied, a directory would be contained by "
11246
"itself.\n"
11247
"For example::"
11248
msgstr ""
11249
11250
#: en/help_topics/conflict-types.txt:311
11251
msgid ""
11252
" $ bzr init\n"
11253
" $ bzr mkdir white\n"
11254
" $ bzr mkdir black\n"
11255
" $ bzr commit -m \"BASE\"\n"
11256
" $ bzr branch . ../other\n"
11257
" $ bzr mv white black\n"
11258
" $ bzr commit -m \"THIS\"\n"
11259
" $ bzr mv ../other/black ../other/white\n"
11260
" $ bzr commit ../other -m \"OTHER\"\n"
11261
" $ bzr merge ../other"
11262
msgstr ""
11263
11264
#: en/help_topics/conflict-types.txt:322
11265
msgid ""
11266
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11267
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11268
"name should be retained for the directories involved."
11269
msgstr ""
11270
11271
#: en/help_topics/conflict-types.txt:328
11272
msgid ""
11273
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
11274
"``white`` \n"
11275
" in ``black``,\n"
11276
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11277
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11278
"* ``--action=done`` will just mark the conflict as resolved."
11279
msgstr ""
11280
11281
#: en/help_topics/conflict-types.txt:336
11282
msgid ""
11283
"Non-directory parent\n"
11284
"--------------------"
11285
msgstr ""
11286
11287
#: en/help_topics/conflict-types.txt:341
11288
msgid ""
11289
" Conflict: foo.new is not a directory, but has files in it.\n"
11290
" Created directory."
11291
msgstr ""
11292
11293
#: en/help_topics/conflict-types.txt:344
11294
msgid ""
11295
"This happens when one side has added files to a directory, and the other "
11296
"side\n"
11297
"has changed the directory into a file or symlink. For example::"
11298
msgstr ""
11299
11300
#: en/help_topics/conflict-types.txt:347
11301
msgid ""
11302
" $ bzr init\n"
11303
" $ bzr mkdir foo\n"
11304
" $ bzr commit -m \"BASE\"\n"
11305
" $ bzr branch . ../other\n"
11306
" $ rmdir foo\n"
11307
" $ touch foo\n"
11308
" $ bzr commit -m \"THIS\"\n"
11309
" $ bzr mkdir ../other/foo/bar\n"
11310
" $ bzr commit ../other -m \"OTHER\"\n"
11311
" $ bzr merge ../other"
11312
msgstr ""
11313
11314
#: en/help_topics/conflict-types.txt:358
11315
msgid ""
11316
"To resolve that kind of conflict, you have to decide what name should be\n"
11317
"retained for the file, directory or symlink involved."
11318
msgstr ""
11319
11320
#: en/help_topics/conflict-types.txt:363
11321
msgid ""
11322
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11323
" ``bzr add foo``,\n"
11324
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11325
" ``bzr mv foo.new foo``,\n"
11326
"* ``--action=done`` will just mark the conflict as resolved."
11327
msgstr ""
11328
11329
#: en/help_topics/conflict-types.txt:371
11330
msgid ""
11331
"MalformedTransform\n"
11332
"------------------"
11333
msgstr ""
11334
11335
#: en/help_topics/conflict-types.txt:374
11336
msgid ""
11337
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11338
"exception. This means that Bazaar encountered a filesystem conflict that it "
11339
"was\n"
11340
"unable to resolve. This usually indicates a bug. Please let us know if "
11341
"you\n"
11342
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11343
msgstr ""
11344
11345
#: en/help_topics/content-filters.txt:1
11346
msgid ""
11347
"Content Filters\n"
11348
"==============="
11349
msgstr ""
11350
11351
#: en/help_topics/content-filters.txt:4
11352
msgid ""
11353
"Content formats\n"
11354
"---------------"
11355
msgstr ""
11356
11357
#: en/help_topics/content-filters.txt:7
11358
msgid ""
11359
"Bazaar's content filtering allows you to store files in a different\n"
11360
"format from the copy in your working tree. This lets you, or your\n"
11361
"co-developers, use Windows development tools that expect CRLF files\n"
11362
"on projects that use other line-ending conventions. Among other things,\n"
11363
"content filters also let Unix developers more easily work on projects\n"
11364
"using Windows line-ending conventions, keyword expansion/compression,\n"
11365
"and trailing spaces on lines in text files to be implicitly stripped\n"
11366
"when committed."
11367
msgstr ""
11368
11369
#: en/help_topics/content-filters.txt:16
11370
msgid "To generalize, there are two content formats supported by Bazaar:"
11371
msgstr ""
11372
11373
#: en/help_topics/content-filters.txt:18
11374
msgid ""
11375
"* a canonical format - how files are stored internally\n"
11376
"* a convenience format - how files are created in a working tree."
11377
msgstr ""
11378
11379
#: en/help_topics/content-filters.txt:21
11380
msgid ""
11381
"\n"
11382
"Format conversion\n"
11383
"-----------------"
11384
msgstr ""
11385
11386
#: en/help_topics/content-filters.txt:25
11387
msgid ""
11388
"The conversion between these formats is done by content filters.\n"
11389
"A content filter has two parts:"
11390
msgstr ""
11391
11392
#: en/help_topics/content-filters.txt:28
11393
msgid ""
11394
"* a read converter - converts from convenience to canonical format\n"
11395
"* a write converter - converts from canonical to convenience format."
11396
msgstr ""
11397
11398
#: en/help_topics/content-filters.txt:31
11399
msgid ""
11400
"Many of these converters will provide *round-trip* conversion,\n"
11401
"i.e. applying the read converter followed by the write converter\n"
11402
"gives back the original content. However, others may provide an\n"
11403
"asymmetric conversion. For example, a read converter might strip\n"
11404
"trailing whitespace off lines in source code while the matching\n"
11405
"write converter might pass content through unchanged."
11406
msgstr ""
11407
11408
#: en/help_topics/content-filters.txt:38
11409
msgid ""
11410
"\n"
11411
"Enabling content filters\n"
11412
"------------------------"
11413
msgstr ""
11414
11415
#: en/help_topics/content-filters.txt:42
11416
msgid ""
11417
"Content filters are typically provided by plugins, so the first step\n"
11418
"in using them is to install the relevant plugins and read their\n"
11419
"documentation. Some plugins may be very specific about which files\n"
11420
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11421
"In other cases, the plugin may leave it in the user's hands to\n"
11422
"define which files are to be filtered. This is typically done\n"
11423
"using rule-based preferences. See ``bzr help rules`` for general\n"
11424
"information about defining these."
11425
msgstr ""
11426
11427
#: en/help_topics/content-filters.txt:51
11428
msgid ""
11429
"\n"
11430
"Impact on commands\n"
11431
"------------------"
11432
msgstr ""
11433
11434
#: en/help_topics/content-filters.txt:55
11435
msgid ""
11436
"Read converters are only applied to commands that read content from\n"
11437
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11438
"will apply read converters to files in the working tree, then compare\n"
11439
"the results to the content last committed."
11440
msgstr ""
11441
11442
#: en/help_topics/content-filters.txt:60
11443
msgid ""
11444
"Write converters are only applied by commands that **create files in a\n"
11445
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11446
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11447
"respectively."
11448
msgstr ""
11449
11450
#: en/help_topics/content-filters.txt:65
11451
msgid ""
11452
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11453
"comitting files. If this makes sense for a given plugin providing\n"
11454
"a content filter, the plugin can usually achieve this effect by using a\n"
11455
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11456
"for more information on hooks."
11457
msgstr ""
11458
11459
#: en/help_topics/content-filters.txt:71
11460
msgid ""
11461
"\n"
11462
"Refreshing your working tree\n"
11463
"----------------------------"
11464
msgstr ""
11465
11466
#: en/help_topics/content-filters.txt:75
11467
msgid ""
11468
"For performance reasons, Bazaar caches the timestamps of files in\n"
11469
"a working tree, and assumes files are unchanged if their timestamps\n"
11470
"match the cached values. As a consequence, there are times when\n"
11471
"you may need to explicitly ask for content filtering to be reapplied\n"
11472
"in one or both directions, e.g. after installing or reconfiguring\n"
11473
"plugins providing it."
11474
msgstr ""
11475
11476
#: en/help_topics/content-filters.txt:82
11477
msgid "Here are some general guidelines for doing this:"
11478
msgstr ""
11479
11480
#: en/help_topics/content-filters.txt:84
11481
msgid ""
11482
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11483
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11484
" relevant read converters and compare the end result with the\n"
11485
" canonical format."
11486
msgstr ""
11487
11488
#: en/help_topics/content-filters.txt:89
11489
msgid ""
11490
" * To reapply write converters, ensure there are no local changes,\n"
11491
" delete the relevant files and run ``bzr revert`` on those files."
11492
msgstr ""
11493
11494
#: en/help_topics/content-filters.txt:92
11495
msgid ""
11496
"Note: In the future, it is likely that additional options will be added\n"
11497
"to commands to make this refreshing process faster and safer.\n"
11498
msgstr ""
11499
11500
#: en/help_topics/current-formats.txt:1
11501
msgid "Current Storage Formats"
11502
msgstr ""
11503
11504
#: en/help_topics/current-formats.txt:3
11505
msgid ""
11506
":2a:\n"
11507
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11508
" compress storage. Provides rich roots which are a one-way\n"
11509
" transition."
11510
msgstr ""
11511
11512
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11513
msgid ""
11514
"\n"
11515
"See :doc:`formats-help` for more about storage formats."
11516
msgstr ""
11517
11518
#: en/help_topics/debug-flags.txt:1
11519
msgid ""
11520
"Debug Flags\n"
11521
"==========="
11522
msgstr ""
11523
11524
#: en/help_topics/debug-flags.txt:4
11525
msgid ""
11526
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11527
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11528
msgstr ""
11529
11530
#: en/help_topics/debug-flags.txt:7
11531
msgid ""
11532
"-Dauth Trace authentication sections used.\n"
11533
"-Dbytes Print out how many bytes were transferred\n"
11534
"-Ddirstate Trace dirstate activity (verbose!)\n"
11535
"-Derror Instead of normal error handling, always print a "
11536
"traceback\n"
11537
" on error.\n"
11538
"-Devil Capture call sites that do expensive or badly-scaling\n"
11539
" operations.\n"
11540
"-Dfetch Trace history copying between repositories.\n"
11541
"-Dfilters Emit information for debugging content filtering.\n"
11542
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11543
"fetch.\n"
11544
"-Dgraph Trace graph traversal.\n"
11545
"-Dhashcache Log every time a working file is read to determine its "
11546
"hash.\n"
11547
"-Dhooks Trace hook execution.\n"
11548
"-Dhpss Trace smart protocol requests and responses.\n"
11549
"-Dhpssdetail More hpss details.\n"
11550
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11551
"-Dhttp Trace http connections, requests and responses.\n"
11552
"-Dindex Trace major index operations.\n"
11553
"-Dknit Trace knit operations.\n"
11554
"-Dlock Trace when lockdir locks are taken or released.\n"
11555
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11556
" retrying the request.\n"
11557
"-Dprogress Trace progress bar operations.\n"
11558
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11559
"-Dmerge Emit information for debugging merges.\n"
11560
"-Dno_apport Don't use apport to report crashes.\n"
11561
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11562
"-Dpack Emit information about pack operations.\n"
11563
"-Drelock Emit a message every time a branch or repository object "
11564
"is\n"
11565
" unlocked then relocked the same way.\n"
11566
"-Dsftp Trace SFTP internals.\n"
11567
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11568
"expected\n"
11569
"-Dstream Trace fetch streams.\n"
11570
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11571
"portable\n"
11572
" manner.\n"
11573
"-Dunlock Some errors during unlock are treated as warnings.\n"
11574
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11575
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11576
"appropriate\n"
11577
" for the format, even for non-local fetches.\n"
11578
msgstr ""
11579
11580
#: en/help_topics/diverged-branches.txt:1
11581
msgid ""
11582
"Diverged Branches\n"
11583
"================="
11584
msgstr ""
11585
11586
#: en/help_topics/diverged-branches.txt:4
11587
msgid ""
11588
"When Bazaar tries to push one branch onto another, it requires that the\n"
11589
"destination branch must be ready to receive the source branch. If this "
11590
"isn't\n"
11591
"the case, then we say that the branches have ``diverged``. Branches are\n"
11592
"considered diverged if the destination branch's most recent commit is one "
11593
"that\n"
11594
"has not been merged (directly or indirectly) by the source branch. To "
11595
"recover\n"
11596
"from diverged branches, one must merge the missing revisions into the "
11597
"source\n"
11598
"branch."
11599
msgstr ""
11600
11601
#: en/help_topics/diverged-branches.txt:12
11602
msgid ""
11603
"This situation commonly arises when using a centralized workflow with local\n"
11604
"commits. If someone else has committed new work to the mainline since your\n"
11605
"last pull and you have local commits that have not yet been pushed to the\n"
11606
"mainline, then your local branch and the mainline have diverged."
11607
msgstr ""
11608
11609
#: en/help_topics/diverged-branches.txt:17
11610
msgid ""
11611
"Discovering What Has Diverged\n"
11612
"-----------------------------"
11613
msgstr ""
11614
11615
#: en/help_topics/diverged-branches.txt:20
11616
msgid ""
11617
"The ``bzr missing`` command is used to find out what revisions are in "
11618
"another\n"
11619
"branch that are not present in the current branch, and vice-versa. It shows "
11620
"a\n"
11621
"summary of which extra revisions exist in each branch. If you want to see "
11622
"the\n"
11623
"precise effects of those revisions, you can use ``bzr diff --"
11624
"old=other_branch``\n"
11625
"to show the differences between other_branch and your current branch."
11626
msgstr ""
11627
11628
#: en/help_topics/diverged-branches.txt:26
11629
msgid ""
11630
"A Solution\n"
11631
"----------"
11632
msgstr ""
11633
11634
#: en/help_topics/diverged-branches.txt:29
11635
msgid ""
11636
"The solution is to merge the revisions from the mainline into your local\n"
11637
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11638
"mainline. This merge may result in conflicts if the other developer's "
11639
"changes\n"
11640
"overlap with your changes. These conflicts should be resolved before\n"
11641
"continuing. After any conflicts have been resolved, or even if there were "
11642
"no\n"
11643
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11644
"to your local branch. This requirement gives you an opportunity to test "
11645
"the\n"
11646
"resulting working tree for correctness, since the merged revisions could "
11647
"have\n"
11648
"made arbitrary changes. After testing, you should commit the merge using\n"
11649
"``bzr commit``. This clears up the diverged branches situation. Your "
11650
"local\n"
11651
"branch can now be pushed to the mainline.\n"
11652
msgstr ""
11653
11654
#: en/help_topics/env-variables.txt:1
11655
msgid "Environment Variables"
11656
msgstr ""
11657
11658
#: en/help_topics/env-variables.txt:3
11659
msgid ""
11660
"=================== "
11661
"===========================================================\n"
11662
"BZRPATH Path where bzr is to look for shell plugin external\n"
11663
" commands.\n"
11664
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11665
"EMAIL E-Mail address of the user.\n"
11666
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11667
"EDITOR Editor for editing commit messages.\n"
11668
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11669
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11670
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11671
"BZR_PLUGIN_PATH.\n"
11672
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11673
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11674
"and\n"
11675
" HOME.\n"
11676
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11677
"URLs).\n"
11678
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11679
"sshcorp,\n"
11680
" plink or lsh.\n"
11681
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11682
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11683
"BZR_COLUMNS Override implicit terminal width.\n"
11684
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11685
"(selftest)\n"
11686
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11687
"'text'.\n"
11688
"BZR_PDB Control whether to launch a debugger on error.\n"
11689
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11690
" breakin debugger.\n"
11691
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11692
"(instead\n"
11693
" of char-based).\n"
11694
"=================== "
11695
"===========================================================\n"
11696
msgstr ""
11697
11698
#: en/help_topics/eol.txt:1
11699
msgid ""
11700
"End of Line Conversion\n"
11701
"======================"
11702
msgstr ""
11703
11704
#: en/help_topics/eol.txt:4
11705
msgid ""
11706
"EOL conversion is provided as a content filter where Bazaar internally\n"
11707
"stores a canonical format but outputs a convenience format. See\n"
11708
"``bzr help content-filters`` for general information about using these."
11709
msgstr ""
11710
11711
#: en/help_topics/eol.txt:8
11712
msgid ""
11713
"Note: Content filtering is only supported in recently added formats,\n"
11714
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11715
"in a recent format. (Just setting the format on the repository\n"
11716
"is not enough.) If content filtering does not appear to be working, use\n"
11717
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11718
"or later."
11719
msgstr ""
11720
11721
#: en/help_topics/eol.txt:15
11722
msgid ""
11723
"EOL conversion needs to be enabled for selected file patterns using\n"
11724
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11725
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11726
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11727
"supported in a future verison of Bazaar."
11728
msgstr ""
11729
11730
#: en/help_topics/eol.txt:21
11731
msgid ""
11732
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11733
"(If a value is not set, ``exact`` is the default.)"
11734
msgstr ""
11735
11736
#: en/help_topics/eol.txt:24
11737
msgid ""
11738
" ========== ===================================== ======================\n"
11739
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11740
" ========== ===================================== ======================\n"
11741
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11742
" ---------- ------------------------------------- ----------------------\n"
11743
" ``lf`` ``lf`` ``lf``\n"
11744
" ---------- ------------------------------------- ----------------------\n"
11745
" ``crlf`` ``crlf`` ``lf``\n"
11746
" ---------- ------------------------------------- ----------------------\n"
11747
" ``exact`` No conversion Exactly as in file\n"
11748
" ========== ===================================== ======================"
11749
msgstr ""
11750
11751
#: en/help_topics/eol.txt:36
11752
msgid ""
11753
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11754
"byte is detected in the file."
11755
msgstr ""
11756
11757
#: en/help_topics/eol.txt:39
11758
msgid ""
11759
"For users working on a cross-platform project, here is a suggested rule\n"
11760
"to use as a starting point::"
11761
msgstr ""
11762
11763
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11764
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11765
msgid ""
11766
" [name *]\n"
11767
" eol = native"
11768
msgstr ""
11769
11770
#: en/help_topics/eol.txt:45
11771
msgid ""
11772
"If you have binary files that do not contain a null byte though, be\n"
11773
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11774
"by giving more explicit patterns earlier in the rules file. For example::"
11775
msgstr ""
11776
11777
#: en/help_topics/eol.txt:49
11778
msgid ""
11779
" [name *.png]\n"
11780
" eol = exact"
11781
msgstr ""
11782
11783
#: en/help_topics/eol.txt:55
11784
msgid ""
11785
"If your working tree is on a network drive shared by users on different\n"
11786
"operating systems, you typically want to force certain conventions for\n"
11787
"certain files. In that way, if a file is created with the wrong line\n"
11788
"endings or line endings get mixed during editing, it gets committed\n"
11789
"correctly and gets checked out correctly. For example::"
11790
msgstr ""
11791
11792
#: en/help_topics/eol.txt:61
11793
msgid ""
11794
" [name *.bat]\n"
11795
" eol = crlf"
11796
msgstr ""
11797
11798
#: en/help_topics/eol.txt:64
11799
msgid ""
11800
" [name *.sh]\n"
11801
" eol = lf"
11802
msgstr ""
11803
11804
#: en/help_topics/eol.txt:70
11805
msgid ""
11806
"If you take the care to create files with their required endings, you can\n"
11807
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11808
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11809
"introducing mixed line endings will be corrected during commit for files\n"
11810
"with those settings."
11811
msgstr ""
11812
11813
#: en/help_topics/eol.txt:76
11814
msgid ""
11815
"If you have sample test data that deliberately has text files with mixed\n"
11816
"newline conventions, you can ask for those to be left alone like this::"
11817
msgstr ""
11818
11819
#: en/help_topics/eol.txt:79
11820
msgid ""
11821
" [name test_data/]\n"
11822
" eol = exact"
11823
msgstr ""
11824
11825
#: en/help_topics/eol.txt:85
11826
msgid ""
11827
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11828
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11829
"of content analysis to detect binary files for commands like ``diff``.\n"
11830
"In the future, a ``binary = true`` rule may be added but it is not\n"
11831
"supported yet.)"
11832
msgstr ""
11833
11834
#: en/help_topics/eol.txt:91
11835
msgid ""
11836
"If you have an existing repository with text files already stored using\n"
11837
"Windows newline conventions (``crlf``), then you may want to keep using "
11838
"that\n"
11839
"convention in the repository. Forcing certain files to this convention\n"
11840
"may also help users who do not have rules configured. To do this, set\n"
11841
"``eol`` to one of the values below."
11842
msgstr ""
11843
11844
#: en/help_topics/eol.txt:97
11845
msgid ""
11846
" ============================ ======================== "
11847
"======================\n"
11848
" Value Checkout end-of-lines as Commit end-of-lines "
11849
"as\n"
11850
" ============================ ======================== "
11851
"======================\n"
11852
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11853
" ``lf`` otherwise\n"
11854
" ---------------------------- ------------------------ "
11855
"----------------------\n"
11856
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11857
" ---------------------------- ------------------------ "
11858
"----------------------\n"
11859
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11860
" ============================ ======================== ======================"
11861
msgstr ""
11862
11863
#: en/help_topics/eol.txt:108
11864
msgid ""
11865
"For users working on an existing project that uses Windows newline\n"
11866
"conventions in their Bazaar repository, this rule is suggested as a\n"
11867
"starting point::"
11868
msgstr ""
11869
11870
#: en/help_topics/eol.txt:112
11871
msgid ""
11872
" [name *]\n"
11873
" eol = native-with-crlf-in-repo"
11874
msgstr ""
11875
11876
#: en/help_topics/eol.txt:115
11877
msgid ""
11878
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11879
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11880
"``crlf`` and ``exact``."
11881
msgstr ""
11882
11883
#: en/help_topics/eol.txt:119
11884
msgid ""
11885
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11886
"never reject files because a given line ending or mixed line endings\n"
11887
"are found. A precommit hook should be used if you wish to validate\n"
11888
"(and not just convert) content before committing.\n"
11889
msgstr ""
11890
11891
#: en/help_topics/hidden-commands.txt:1
11892
msgid ""
11893
"added List files added in working tree.\n"
11894
"ancestry List all revisions merged into this branch.\n"
11895
"assert-fail Test reporting of assertion failures\n"
11896
"bundle-info Output interesting stats about a bundle\n"
11897
"bundle-revisions Create a merge-directive for submitting changes.\n"
11898
"cat-revision Write out metadata for a revision.\n"
11899
"dump-btree Dump the contents of a btree index file to stdout.\n"
11900
"export-pot Export command helps and error messages in po format.\n"
11901
"file-id Print file_id of a particular file or directory.\n"
11902
"file-path Print path of file_ids to a file or directory.\n"
11903
"find-merge-base Find and print a base revision for merging two "
11904
"branches.\n"
11905
"hooks Show hooks.\n"
11906
"inventory Show inventory of the current working copy or a "
11907
"revision.\n"
11908
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11909
"lookup-revision Lookup the revision-id from a revision-number\n"
11910
"merge-directive Generate a merge directive for auto-merge tools.\n"
11911
"modified List files modified in working tree.\n"
11912
"re-sign Create a digital signature for an existing revision.\n"
11913
"reference list, view and set branch locations for nested trees.\n"
11914
"relpath Show path of a file relative to root\n"
11915
"repair-workingtree Reset the working tree state file.\n"
11916
"revision-history Display the list of revision ids on a branch.\n"
11917
"revision-info Show revision number and revision id for a given "
11918
"revision\n"
11919
" identifier.\n"
11920
"rocks Statement of optimism.\n"
11921
"selftest Run internal test suite.\n"
11922
"shell-complete Show appropriate completions for context.\n"
11923
"test-script Run a shell-like test from a file.\n"
11924
"touching-revisions Return revision-ids which affected a particular file.\n"
11925
"unknowns List unknown files.\n"
11926
"wait-until-signalled Test helper for\n"
11927
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11928
msgstr ""
11929
11930
#: en/help_topics/hooks.txt:1
11931
msgid ""
11932
"\n"
11933
"Hooks\n"
11934
"====="
11935
msgstr ""
11936
11937
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11938
msgid ""
11939
"Introduction\n"
11940
"------------"
11941
msgstr ""
11942
11943
#: en/help_topics/hooks.txt:8
11944
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11945
msgstr ""
11946
11947
#: en/help_topics/hooks.txt:10
11948
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11949
msgstr ""
11950
11951
#: en/help_topics/hooks.txt:12
11952
msgid ""
11953
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11954
msgstr ""
11955
11956
#: en/help_topics/hooks.txt:14
11957
msgid ""
11958
"The class that contains each hook is given before the hooks it supplies. "
11959
"For\n"
11960
"instance, BranchHooks as the class is the hooks class for\n"
11961
"`bzrlib.branch.Branch.hooks`."
11962
msgstr ""
11963
11964
#: en/help_topics/hooks.txt:18
11965
msgid ""
11966
"Each description also indicates whether the hook runs on the client (the\n"
11967
"machine where bzr was invoked) or the server (the machine addressed by\n"
11968
"the branch URL). These may be, but are not necessarily, the same machine."
11969
msgstr ""
11970
11971
#: en/help_topics/hooks.txt:22
11972
msgid ""
11973
"Plugins (including hooks) are run on the server if all of these is true:"
11974
msgstr ""
11975
11976
#: en/help_topics/hooks.txt:24
11977
msgid ""
11978
" * The connection is via a smart server (accessed with a URL starting with\n"
11979
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11980
"\"http://\"\n"
11981
" URL when a smart server is available via HTTP)."
11982
msgstr ""
11983
11984
#: en/help_topics/hooks.txt:28
11985
msgid ""
11986
" * The hook is either server specific or part of general infrastructure "
11987
"rather\n"
11988
" than client specific code (such as commit)."
11989
msgstr ""
11990
11991
#: en/help_topics/hooks.txt:31
11992
msgid ""
11993
"\n"
11994
"BranchHooks\n"
11995
"-----------"
11996
msgstr ""
11997
11998
#: en/help_topics/hooks.txt:35
11999
msgid ""
12000
"automatic_tag_name\n"
12001
"~~~~~~~~~~~~~~~~~~"
12002
msgstr ""
12003
12004
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12005
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
12006
msgid "Introduced in: 2.2"
12007
msgstr ""
12008
12009
#: en/help_topics/hooks.txt:40
12010
msgid ""
12011
"Called to determine an automatic tag name for a revision.\n"
12012
"automatic_tag_name is called with (branch, revision_id) and should\n"
12013
"return a tag name or None if no tag name could be determined. The\n"
12014
"first non-None tag name returned will be used."
12015
msgstr ""
12016
12017
#: en/help_topics/hooks.txt:45
12018
msgid ""
12019
"open\n"
12020
"~~~~"
12021
msgstr ""
12022
12023
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12024
#: en/help_topics/hooks.txt:307
12025
msgid "Introduced in: 1.8"
12026
msgstr ""
12027
12028
#: en/help_topics/hooks.txt:50
12029
msgid ""
12030
"Called with the Branch object that has been opened after a branch is\n"
12031
"opened."
12032
msgstr ""
12033
12034
#: en/help_topics/hooks.txt:53
12035
msgid ""
12036
"post_branch_init\n"
12037
"~~~~~~~~~~~~~~~~"
12038
msgstr ""
12039
12040
#: en/help_topics/hooks.txt:58
12041
msgid ""
12042
"Called after new branch initialization completes. post_branch_init is\n"
12043
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12044
"branch and checkout (both heavyweight and lightweight) will all\n"
12045
"trigger this hook."
12046
msgstr ""
12047
12048
#: en/help_topics/hooks.txt:63
12049
msgid ""
12050
"post_change_branch_tip\n"
12051
"~~~~~~~~~~~~~~~~~~~~~~"
12052
msgstr ""
12053
12054
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
12055
msgid "Introduced in: 1.4"
12056
msgstr ""
12057
12058
#: en/help_topics/hooks.txt:68
12059
msgid ""
12060
"Called in bzr client and server after a change to the tip of a branch\n"
12061
"is made. post_change_branch_tip is called with a\n"
12062
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12063
"uncommit will all trigger this hook."
12064
msgstr ""
12065
12066
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
12067
msgid ""
12068
"post_commit\n"
12069
"~~~~~~~~~~~"
12070
msgstr ""
12071
12072
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12073
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12074
msgid "Introduced in: 0.15"
12075
msgstr ""
12076
12077
#: en/help_topics/hooks.txt:78
12078
msgid ""
12079
"Called in the bzr client after a commit has completed. post_commit is\n"
12080
"called with (local, master, old_revno, old_revid, new_revno,\n"
12081
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12082
"branch."
12083
msgstr ""
12084
12085
#: en/help_topics/hooks.txt:83
12086
msgid ""
12087
"post_pull\n"
12088
"~~~~~~~~~"
12089
msgstr ""
12090
12091
#: en/help_topics/hooks.txt:88
12092
msgid ""
12093
"Called after a pull operation completes. post_pull is called with a\n"
12094
"bzrlib.branch.PullResult object and only runs in the bzr client."
12095
msgstr ""
12096
12097
#: en/help_topics/hooks.txt:91
12098
msgid ""
12099
"post_push\n"
12100
"~~~~~~~~~"
12101
msgstr ""
12102
12103
#: en/help_topics/hooks.txt:96
12104
msgid ""
12105
"Called after a push operation completes. post_push is called with a\n"
12106
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12107
msgstr ""
12108
12109
#: en/help_topics/hooks.txt:99
12110
msgid ""
12111
"post_switch\n"
12112
"~~~~~~~~~~~"
12113
msgstr ""
12114
12115
#: en/help_topics/hooks.txt:104
12116
msgid ""
12117
"Called after a checkout switches branch. post_switch is called with a\n"
12118
"bzrlib.branch.SwitchHookParams."
12119
msgstr ""
12120
12121
#: en/help_topics/hooks.txt:107
12122
msgid ""
12123
"post_uncommit\n"
12124
"~~~~~~~~~~~~~"
12125
msgstr ""
12126
12127
#: en/help_topics/hooks.txt:112
12128
msgid ""
12129
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12130
"called with (local, master, old_revno, old_revid, new_revno,\n"
12131
"new_revid) where local is the local branch or None, master is the\n"
12132
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12133
"of None."
12134
msgstr ""
12135
12136
#: en/help_topics/hooks.txt:118
12137
msgid ""
12138
"pre_change_branch_tip\n"
12139
"~~~~~~~~~~~~~~~~~~~~~"
12140
msgstr ""
12141
12142
#: en/help_topics/hooks.txt:121
12143
msgid "Introduced in: 1.6"
12144
msgstr ""
12145
12146
#: en/help_topics/hooks.txt:123
12147
msgid ""
12148
"Called in bzr client and server before a change to the tip of a branch\n"
12149
"is made. pre_change_branch_tip is called with a\n"
12150
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12151
"uncommit will all trigger this hook."
12152
msgstr ""
12153
12154
#: en/help_topics/hooks.txt:128
12155
msgid ""
12156
"pre_commit\n"
12157
"~~~~~~~~~~"
12158
msgstr ""
12159
12160
#: en/help_topics/hooks.txt:131
12161
msgid "Introduced in: 0.91"
12162
msgstr ""
12163
12164
#: en/help_topics/hooks.txt:133
12165
msgid ""
12166
"Called after a commit is calculated but before it is completed.\n"
12167
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12168
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12169
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12170
"TreeDelta object describing changes from the basis revision. hooks\n"
12171
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12172
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12173
"tree."
12174
msgstr ""
12175
12176
#: en/help_topics/hooks.txt:142
12177
msgid ""
12178
"transform_fallback_location\n"
12179
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12180
msgstr ""
12181
12182
#: en/help_topics/hooks.txt:145
12183
msgid "Introduced in: 1.9"
12184
msgstr ""
12185
12186
#: en/help_topics/hooks.txt:147
12187
msgid ""
12188
"Called when a stacked branch is activating its fallback locations.\n"
12189
"transform_fallback_location is called with (branch, url), and should\n"
12190
"return a new url. Returning the same url allows it to be used as-is,\n"
12191
"returning a different one can be used to cause the branch to stack on\n"
12192
"a closer copy of that fallback_location. Note that the branch cannot\n"
12193
"have history accessing methods called on it during this hook because\n"
12194
"the fallback locations have not been activated. When there are\n"
12195
"multiple hooks installed for transform_fallback_location, all are\n"
12196
"called with the url returned from the previous hook.The order is\n"
12197
"however undefined."
12198
msgstr ""
12199
12200
#: en/help_topics/hooks.txt:158
12201
msgid ""
12202
"CommandHooks\n"
12203
"------------"
12204
msgstr ""
12205
12206
#: en/help_topics/hooks.txt:161
12207
msgid ""
12208
"extend_command\n"
12209
"~~~~~~~~~~~~~~"
12210
msgstr ""
12211
12212
#: en/help_topics/hooks.txt:164
12213
msgid "Introduced in: 1.13"
12214
msgstr ""
12215
12216
#: en/help_topics/hooks.txt:166
12217
msgid ""
12218
"Called after creating a command object to allow modifications such as\n"
12219
"adding or removing options, docs etc. Called with the new\n"
12220
"bzrlib.commands.Command object."
12221
msgstr ""
12222
12223
#: en/help_topics/hooks.txt:170
12224
msgid ""
12225
"get_command\n"
12226
"~~~~~~~~~~~"
12227
msgstr ""
12228
12229
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12230
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12231
msgid "Introduced in: 1.17"
12232
msgstr ""
12233
12234
#: en/help_topics/hooks.txt:175
12235
msgid ""
12236
"Called when creating a single command. Called with (cmd_or_None,\n"
12237
"command_name). get_command should either return the cmd_or_None\n"
12238
"parameter, or a replacement Command object that should be used for the\n"
12239
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12240
"Many users will prefer to use bzrlib.commands.register_command or\n"
12241
"plugin_cmds.register_lazy."
12242
msgstr ""
12243
12244
#: en/help_topics/hooks.txt:182
12245
msgid ""
12246
"get_missing_command\n"
12247
"~~~~~~~~~~~~~~~~~~~"
12248
msgstr ""
12249
12250
#: en/help_topics/hooks.txt:187
12251
msgid ""
12252
"Called when creating a single command if no command could be found.\n"
12253
"Called with (command_name). get_missing_command should either return\n"
12254
"None, or a Command object to be used for the command."
12255
msgstr ""
12256
12257
#: en/help_topics/hooks.txt:191
12258
msgid ""
12259
"list_commands\n"
12260
"~~~~~~~~~~~~~"
12261
msgstr ""
12262
12263
#: en/help_topics/hooks.txt:196
12264
msgid ""
12265
"Called when enumerating commands. Called with a set of cmd_name\n"
12266
"strings for all the commands found so far. This set is safe to mutate\n"
12267
"- e.g. to remove a command. list_commands should return the updated\n"
12268
"set of command names."
12269
msgstr ""
12270
12271
#: en/help_topics/hooks.txt:201
12272
msgid ""
12273
"post_command\n"
12274
"~~~~~~~~~~~~"
12275
msgstr ""
12276
12277
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12278
msgid "Introduced in: 2.6"
12279
msgstr ""
12280
12281
#: en/help_topics/hooks.txt:206
12282
msgid "Called after executing a command. Called with the command object."
12283
msgstr ""
12284
12285
#: en/help_topics/hooks.txt:208
12286
msgid ""
12287
"pre_command\n"
12288
"~~~~~~~~~~~"
12289
msgstr ""
12290
12291
#: en/help_topics/hooks.txt:213
12292
msgid "Called prior to executing a command. Called with the command object."
12293
msgstr ""
12294
12295
#: en/help_topics/hooks.txt:215
12296
msgid ""
12297
"_ConfigHooks\n"
12298
"------------"
12299
msgstr ""
12300
12301
#: en/help_topics/hooks.txt:218
12302
msgid ""
12303
"get\n"
12304
"~~~"
12305
msgstr ""
12306
12307
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12308
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12309
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12310
#: en/help_topics/hooks.txt:446
12311
msgid "Introduced in: 2.4"
12312
msgstr ""
12313
12314
#: en/help_topics/hooks.txt:223
12315
msgid ""
12316
"Invoked when a config option is read. The signature is (stack, name,\n"
12317
"value)."
12318
msgstr ""
12319
12320
#: en/help_topics/hooks.txt:226
12321
msgid ""
12322
"load\n"
12323
"~~~~"
12324
msgstr ""
12325
12326
#: en/help_topics/hooks.txt:231
12327
msgid "Invoked when a config store is loaded. The signature is (store)."
12328
msgstr ""
12329
12330
#: en/help_topics/hooks.txt:233
12331
msgid ""
12332
"remove\n"
12333
"~~~~~~"
12334
msgstr ""
12335
12336
#: en/help_topics/hooks.txt:238
12337
msgid ""
12338
"Invoked when a config option is removed. The signature is (stack,\n"
12339
"name)."
12340
msgstr ""
12341
12342
#: en/help_topics/hooks.txt:241
12343
msgid ""
12344
"save\n"
12345
"~~~~"
12346
msgstr ""
12347
12348
#: en/help_topics/hooks.txt:246
12349
msgid "Invoked when a config store is saved. The signature is (store)."
12350
msgstr ""
12351
12352
#: en/help_topics/hooks.txt:248
12353
msgid ""
12354
"set\n"
12355
"~~~"
12356
msgstr ""
12357
12358
#: en/help_topics/hooks.txt:253
12359
msgid ""
12360
"Invoked when a config option is set. The signature is (stack, name,\n"
12361
"value)."
12362
msgstr ""
12363
12364
#: en/help_topics/hooks.txt:256
12365
msgid ""
12366
"ControlDirHooks\n"
12367
"---------------"
12368
msgstr ""
12369
12370
#: en/help_topics/hooks.txt:259
12371
msgid ""
12372
"post_repo_init\n"
12373
"~~~~~~~~~~~~~~"
12374
msgstr ""
12375
12376
#: en/help_topics/hooks.txt:264
12377
msgid ""
12378
"Invoked after a repository has been initialized. post_repo_init is\n"
12379
"called with a bzrlib.controldir.RepoInitHookParams."
12380
msgstr ""
12381
12382
#: en/help_topics/hooks.txt:267
12383
msgid ""
12384
"pre_open\n"
12385
"~~~~~~~~"
12386
msgstr ""
12387
12388
#: en/help_topics/hooks.txt:270
12389
msgid "Introduced in: 1.14"
12390
msgstr ""
12391
12392
#: en/help_topics/hooks.txt:272
12393
msgid ""
12394
"Invoked before attempting to open a ControlDir with the transport that\n"
12395
"the open will use."
12396
msgstr ""
12397
12398
#: en/help_topics/hooks.txt:275
12399
msgid ""
12400
"InfoHooks\n"
12401
"---------"
12402
msgstr ""
12403
12404
#: en/help_topics/hooks.txt:278
12405
msgid ""
12406
"repository\n"
12407
"~~~~~~~~~~"
12408
msgstr ""
12409
12410
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12411
#: en/help_topics/hooks.txt:524
12412
msgid "Introduced in: 1.15"
12413
msgstr ""
12414
12415
#: en/help_topics/hooks.txt:283
12416
msgid ""
12417
"Invoked when displaying the statistics for a repository. repository is\n"
12418
"called with a statistics dictionary as returned by the repository and\n"
12419
"a file-like object to write to."
12420
msgstr ""
12421
12422
#: en/help_topics/hooks.txt:287
12423
msgid ""
12424
"LockHooks\n"
12425
"---------"
12426
msgstr ""
12427
12428
#: en/help_topics/hooks.txt:290
12429
msgid ""
12430
"lock_acquired\n"
12431
"~~~~~~~~~~~~~"
12432
msgstr ""
12433
12434
#: en/help_topics/hooks.txt:295
12435
msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12436
msgstr ""
12437
12438
#: en/help_topics/hooks.txt:297
12439
msgid ""
12440
"lock_broken\n"
12441
"~~~~~~~~~~~"
12442
msgstr ""
12443
12444
#: en/help_topics/hooks.txt:302
12445
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12446
msgstr ""
12447
12448
#: en/help_topics/hooks.txt:304
12449
msgid ""
12450
"lock_released\n"
12451
"~~~~~~~~~~~~~"
12452
msgstr ""
12453
12454
#: en/help_topics/hooks.txt:309
12455
msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."
12456
msgstr ""
12457
12458
#: en/help_topics/hooks.txt:311
12459
msgid ""
12460
"MergeHooks\n"
12461
"----------"
12462
msgstr ""
12463
12464
#: en/help_topics/hooks.txt:314
12465
msgid ""
12466
"merge_file_content\n"
12467
"~~~~~~~~~~~~~~~~~~"
12468
msgstr ""
12469
12470
#: en/help_topics/hooks.txt:317
12471
msgid "Introduced in: 2.1"
12472
msgstr ""
12473
12474
#: en/help_topics/hooks.txt:319
12475
msgid ""
12476
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12477
"object when starting a merge. Should return either None or a subclass\n"
12478
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12479
"called per file that needs to be merged (including when one side has\n"
12480
"deleted the file and the other has changed it). See the\n"
12481
"AbstractPerFileMerger API docs for details on how it is used by merge."
12482
msgstr ""
12483
12484
#: en/help_topics/hooks.txt:326
12485
msgid ""
12486
"post_merge\n"
12487
"~~~~~~~~~~"
12488
msgstr ""
12489
12490
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12491
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12492
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12493
msgid "Introduced in: 2.5"
12494
msgstr ""
12495
12496
#: en/help_topics/hooks.txt:331
12497
msgid ""
12498
"Called after a merge. Receives a Merger object as the single argument.\n"
12499
"The return value is ignored."
12500
msgstr ""
12501
12502
#: en/help_topics/hooks.txt:334
12503
msgid ""
12504
"pre_merge\n"
12505
"~~~~~~~~~"
12506
msgstr ""
12507
12508
#: en/help_topics/hooks.txt:339
12509
msgid ""
12510
"Called before a merge. Receives a Merger object as the single\n"
12511
"argument."
12512
msgstr ""
12513
12514
#: en/help_topics/hooks.txt:342
12515
msgid ""
12516
"MergeDirectiveHooks\n"
12517
"-------------------"
12518
msgstr ""
12519
12520
#: en/help_topics/hooks.txt:345
12521
msgid ""
12522
"merge_request_body\n"
12523
"~~~~~~~~~~~~~~~~~~"
12524
msgstr ""
12525
12526
#: en/help_topics/hooks.txt:348
12527
msgid "Introduced in: 1.15.0"
12528
msgstr ""
12529
12530
#: en/help_topics/hooks.txt:350
12531
msgid ""
12532
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12533
"request. Callbacks must return a body. If more than one callback is\n"
12534
"registered, the output of one callback is provided to the next."
12535
msgstr ""
12536
12537
#: en/help_topics/hooks.txt:354
12538
msgid ""
12539
"MessageEditorHooks\n"
12540
"------------------"
12541
msgstr ""
12542
12543
#: en/help_topics/hooks.txt:357
12544
msgid ""
12545
"commit_message_template\n"
12546
"~~~~~~~~~~~~~~~~~~~~~~~"
12547
msgstr ""
12548
12549
#: en/help_topics/hooks.txt:360
12550
msgid "Introduced in: 1.10"
12551
msgstr ""
12552
12553
#: en/help_topics/hooks.txt:362
12554
msgid ""
12555
"Called when a commit message is being generated.\n"
12556
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12557
"and the message that is known so far. commit_message_template must\n"
12558
"return a new message to use (which could be the same as it was given).\n"
12559
"When there are multiple hooks registered for commit_message_template,\n"
12560
"they are chained with the result from the first passed into the\n"
12561
"second, and so on."
12562
msgstr ""
12563
12564
#: en/help_topics/hooks.txt:370
12565
msgid ""
12566
"set_commit_message\n"
12567
"~~~~~~~~~~~~~~~~~~"
12568
msgstr ""
12569
12570
#: en/help_topics/hooks.txt:375
12571
msgid ""
12572
"Set a fixed commit message. set_commit_message is called with the\n"
12573
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12574
"properties by editing commit.builder._revprops) and the message so\n"
12575
"far. set_commit_message must return the message to use or None if it\n"
12576
"should use the message editor as normal."
12577
msgstr ""
12578
12579
#: en/help_topics/hooks.txt:381
12580
msgid ""
12581
"MutableTreeHooks\n"
12582
"----------------"
12583
msgstr ""
12584
12585
#: en/help_topics/hooks.txt:384
12586
msgid ""
12587
"post_build_tree\n"
12588
"~~~~~~~~~~~~~~~"
12589
msgstr ""
12590
12591
#: en/help_topics/hooks.txt:389
12592
msgid ""
12593
"Called after a completely new tree is built. The hook is called with\n"
12594
"the tree as its only argument."
12595
msgstr ""
12596
12597
#: en/help_topics/hooks.txt:395
12598
msgid "Introduced in: 2.0"
12599
msgstr ""
12600
12601
#: en/help_topics/hooks.txt:397
12602
msgid ""
12603
"Called after a commit is performed on a tree. The hook is called with\n"
12604
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12605
"commit was performed on is available via the mutable_tree attribute of\n"
12606
"that object."
12607
msgstr ""
12608
12609
#: en/help_topics/hooks.txt:402
12610
msgid ""
12611
"post_transform\n"
12612
"~~~~~~~~~~~~~~"
12613
msgstr ""
12614
12615
#: en/help_topics/hooks.txt:407
12616
msgid ""
12617
"Called after a tree transform has been performed on a tree. The hook\n"
12618
"is called with the tree that is being transformed and the transform."
12619
msgstr ""
12620
12621
#: en/help_topics/hooks.txt:410
12622
msgid ""
12623
"pre_transform\n"
12624
"~~~~~~~~~~~~~"
12625
msgstr ""
12626
12627
#: en/help_topics/hooks.txt:415
12628
msgid ""
12629
"Called before a tree transform on this tree. The hook is called with\n"
12630
"the tree that is being transformed and the transform."
12631
msgstr ""
12632
12633
#: en/help_topics/hooks.txt:418
12634
msgid ""
12635
"start_commit\n"
12636
"~~~~~~~~~~~~"
12637
msgstr ""
12638
12639
#: en/help_topics/hooks.txt:423
12640
msgid ""
12641
"Called before a commit is performed on a tree. The start commit hook\n"
12642
"is able to change the tree before the commit takes place. start_commit\n"
12643
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12644
"being performed on."
12645
msgstr ""
12646
12647
#: en/help_topics/hooks.txt:428
12648
msgid ""
12649
"SmartClientHooks\n"
12650
"----------------"
12651
msgstr ""
12652
12653
#: en/help_topics/hooks.txt:431
12654
msgid ""
12655
"call\n"
12656
"~~~~"
12657
msgstr ""
12658
12659
#: en/help_topics/hooks.txt:434
12660
msgid "Introduced in: unknown"
12661
msgstr ""
12662
12663
#: en/help_topics/hooks.txt:436
12664
msgid ""
12665
"Called when the smart client is submitting a request to the smart\n"
12666
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12667
"Streaming request bodies, and responses, are not accessible."
12668
msgstr ""
12669
12670
#: en/help_topics/hooks.txt:440
12671
msgid ""
12672
"SmartServerHooks\n"
12673
"----------------"
12674
msgstr ""
12675
12676
#: en/help_topics/hooks.txt:443
12677
msgid ""
12678
"server_exception\n"
12679
"~~~~~~~~~~~~~~~~"
12680
msgstr ""
12681
12682
#: en/help_topics/hooks.txt:448
12683
msgid ""
12684
"Called by the bzr server when an exception occurs. server_exception is\n"
12685
"called with the sys.exc_info() tuple return true for the hook if the\n"
12686
"exception has been handled, in which case the server will exit\n"
12687
"normally."
12688
msgstr ""
12689
12690
#: en/help_topics/hooks.txt:453
12691
msgid ""
12692
"server_started\n"
12693
"~~~~~~~~~~~~~~"
12694
msgstr ""
12695
12696
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12697
msgid "Introduced in: 0.16"
12698
msgstr ""
12699
12700
#: en/help_topics/hooks.txt:458
12701
msgid ""
12702
"Called by the bzr server when it starts serving a directory.\n"
12703
"server_started is called with (backing urls, public url), where\n"
12704
"backing_url is a list of URLs giving the server-specific directory\n"
12705
"locations, and public_url is the public URL for the directory being\n"
12706
"served."
12707
msgstr ""
12708
12709
#: en/help_topics/hooks.txt:464
12710
msgid ""
12711
"server_started_ex\n"
12712
"~~~~~~~~~~~~~~~~~"
12713
msgstr ""
12714
12715
#: en/help_topics/hooks.txt:469
12716
msgid ""
12717
"Called by the bzr server when it starts serving a directory.\n"
12718
"server_started is called with (backing_urls, server_obj)."
12719
msgstr ""
12720
12721
#: en/help_topics/hooks.txt:472
12722
msgid ""
12723
"server_stopped\n"
12724
"~~~~~~~~~~~~~~"
12725
msgstr ""
12726
12727
#: en/help_topics/hooks.txt:477
12728
msgid ""
12729
"Called by the bzr server when it stops serving a directory.\n"
12730
"server_stopped is called with the same parameters as the\n"
12731
"server_started hook: (backing_urls, public_url)."
12732
msgstr ""
12733
12734
#: en/help_topics/hooks.txt:481
12735
msgid ""
12736
"StatusHooks\n"
12737
"-----------"
12738
msgstr ""
12739
12740
#: en/help_topics/hooks.txt:484
12741
msgid ""
12742
"post_status\n"
12743
"~~~~~~~~~~~"
12744
msgstr ""
12745
12746
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12747
msgid "Introduced in: 2.3"
12748
msgstr ""
12749
12750
#: en/help_topics/hooks.txt:489
12751
msgid ""
12752
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12753
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12754
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12755
"correspond to the command line options specified by the user for the\n"
12756
"status command. to_file is the output stream for writing."
12757
msgstr ""
12758
12759
#: en/help_topics/hooks.txt:495
12760
msgid ""
12761
"pre_status\n"
12762
"~~~~~~~~~~"
12763
msgstr ""
12764
12765
#: en/help_topics/hooks.txt:500
12766
msgid ""
12767
"Called with argument StatusHookParams before Bazaar displays the\n"
12768
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12769
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12770
"correspond to the command line options specified by the user for the\n"
12771
"status command. to_file is the output stream for writing."
12772
msgstr ""
12773
12774
#: en/help_topics/hooks.txt:506
12775
msgid ""
12776
"TransportHooks\n"
12777
"--------------"
12778
msgstr ""
12779
12780
#: en/help_topics/hooks.txt:509
12781
msgid ""
12782
"post_connect\n"
12783
"~~~~~~~~~~~~"
12784
msgstr ""
12785
12786
#: en/help_topics/hooks.txt:514
12787
msgid ""
12788
"Called after a new connection is established or a reconnect occurs.\n"
12789
"The sole argument passed is either the connected transport or smart\n"
12790
"medium instance."
12791
msgstr ""
12792
12793
#: en/help_topics/hooks.txt:518
12794
msgid ""
12795
"RioVersionInfoBuilderHooks\n"
12796
"--------------------------"
12797
msgstr ""
12798
12799
#: en/help_topics/hooks.txt:521
12800
msgid ""
12801
"revision\n"
12802
"~~~~~~~~"
12803
msgstr ""
12804
12805
#: en/help_topics/hooks.txt:526
12806
msgid ""
12807
"Invoked when adding information about a revision to the RIO stanza\n"
12808
"that is printed. revision is called with a revision object and a RIO\n"
12809
"stanza.\n"
12810
msgstr ""
12811
12812
#: en/help_topics/location-alias.txt:1
12813
msgid ""
12814
"Location aliases\n"
12815
"================"
12816
msgstr ""
12817
12818
#: en/help_topics/location-alias.txt:4
12819
msgid ""
12820
"Bazaar defines several aliases for locations associated with a branch. "
12821
"These\n"
12822
"can be used with most commands that expect a location, such as `bzr push`."
12823
msgstr ""
12824
12825
#: en/help_topics/location-alias.txt:7
12826
msgid "The aliases are::"
12827
msgstr ""
12828
12829
#: en/help_topics/location-alias.txt:9
12830
msgid ""
12831
" :bound The branch this branch is bound to, for bound branches.\n"
12832
" :parent The parent of this branch.\n"
12833
" :public The public location of this branch.\n"
12834
" :push The saved location used for `bzr push` with no arguments.\n"
12835
" :submit The submit branch for this branch.\n"
12836
" :this This branch."
12837
msgstr ""
12838
12839
#: en/help_topics/location-alias.txt:16
12840
msgid "For example, to push to the parent location::"
12841
msgstr ""
12842
12843
#: en/help_topics/location-alias.txt:18
12844
msgid " bzr push :parent\n"
12845
msgstr ""
12846
12847
#: en/help_topics/log-formats.txt:1
12848
msgid ""
12849
"Log Formats\n"
12850
"==========="
12851
msgstr ""
12852
12853
#: en/help_topics/log-formats.txt:4
12854
msgid ""
12855
"A log format controls how information about each revision is displayed.\n"
12856
"The standard log formats are compared below::"
12857
msgstr ""
12858
12859
#: en/help_topics/log-formats.txt:7
12860
msgid ""
12861
" Feature long short line\n"
12862
" ---------------------- ------------- ------------ -------------------\n"
12863
" design goal detailed view concise view 1 revision per line\n"
12864
" committer name+email name only name only\n"
12865
" author name+email - -\n"
12866
" date-time format full date only date only\n"
12867
" commit message full full top line\n"
12868
" tags yes yes yes\n"
12869
" merges indicator - yes -\n"
12870
" status/delta optional optional -\n"
12871
" diff/patch optional optional -\n"
12872
" revision-id optional optional -\n"
12873
" branch nick yes - -\n"
12874
" foreign vcs properties yes yes -\n"
12875
" preferred levels all 1 1\n"
12876
" digital signature optional - -"
12877
msgstr ""
12878
12879
#: en/help_topics/log-formats.txt:24
12880
msgid ""
12881
"The default format is ``long``. To change this, define the ``log_format``\n"
12882
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12883
msgstr ""
12884
12885
#: en/help_topics/log-formats.txt:27
12886
msgid ""
12887
" [DEFAULT]\n"
12888
" log_format = short"
12889
msgstr ""
12890
12891
#: en/help_topics/log-formats.txt:30
12892
msgid ""
12893
"Alternatively, to change the log format used for a given query, use the\n"
12894
"--long, --short or --line options."
12895
msgstr ""
12896
12897
#: en/help_topics/log-formats.txt:33
12898
msgid ""
12899
"If one of the standard log formats does not meet your needs, additional\n"
12900
"formats can be provided by plugins.\n"
12901
msgstr ""
12902
12903
#: en/help_topics/other-formats.txt:1
12904
msgid "Other Storage Formats"
12905
msgstr ""
12906
12907
#: en/help_topics/other-formats.txt:3
12908
msgid "Experimental formats are shown below."
12909
msgstr ""
12910
12911
#: en/help_topics/other-formats.txt:5
12912
msgid ""
12913
":development-colo:\n"
12914
" (native) The 2a format with experimental support for colocated\n"
12915
" branches."
12916
msgstr ""
12917
12918
#: en/help_topics/other-formats.txt:9
12919
msgid ""
12920
"\n"
12921
"Deprecated formats are shown below."
12922
msgstr ""
12923
12924
#: en/help_topics/other-formats.txt:12
12925
msgid ""
12926
":pack-0.92:\n"
12927
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12928
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12929
" by bzr < 0.92."
12930
msgstr ""
12931
12932
#: en/help_topics/patterns.txt:1
12933
msgid ""
12934
"Patterns\n"
12935
"========"
12936
msgstr ""
12937
12938
#: en/help_topics/patterns.txt:4
12939
msgid ""
12940
"Bazaar uses patterns to match files at various times. For example,\n"
12941
"the ``add`` command skips over files that match ignore patterns\n"
12942
"and preferences can be associated with files using rule patterns.\n"
12943
"The pattern syntax is described below."
12944
msgstr ""
12945
12946
#: en/help_topics/patterns.txt:9
12947
msgid ""
12948
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12949
"slash or is a regular expression, it is compared to the whole path\n"
12950
"from the branch root. Otherwise, it is compared to only the last\n"
12951
"component of the path. To match a file only in the root directory,\n"
12952
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12953
msgstr ""
12954
12955
#: en/help_topics/patterns.txt:15
12956
msgid "Patterns may include globbing wildcards such as::"
12957
msgstr ""
12958
12959
#: en/help_topics/patterns.txt:17
12960
msgid ""
12961
" ? - Matches any single character except '/'\n"
12962
" * - Matches 0 or more characters except '/'\n"
12963
" /**/ - Matches 0 or more directories in a path\n"
12964
" [a-z] - Matches a single character from within a group of characters"
12965
msgstr ""
12966
12967
#: en/help_topics/patterns.txt:22
12968
msgid ""
12969
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12970
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12971
"expression. Regular expression patterns may not include named or\n"
12972
"numbered groups."
12973
msgstr ""
12974
12975
#: en/help_topics/patterns.txt:27
12976
msgid ""
12977
"Case insensitive ignore patterns can be specified with regular expressions\n"
12978
"by using the ``i`` (for ignore case) flag in the pattern."
12979
msgstr ""
12980
12981
#: en/help_topics/patterns.txt:30
12982
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
12983
msgstr ""
12984
12985
#: en/help_topics/patterns.txt:32
12986
msgid " RE:(?i)foo"
12987
msgstr ""
12988
12989
#: en/help_topics/patterns.txt:34
12990
msgid ""
12991
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12992
"matched by that pattern will not be ignored."
12993
msgstr ""
12994
12995
#: en/help_topics/patterns.txt:37
12996
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
12997
msgstr ""
12998
12999
#: en/help_topics/revisionspec.txt:1
13000
msgid "Revision Identifiers"
13001
msgstr ""
13002
13003
#: en/help_topics/revisionspec.txt:3
13004
msgid ""
13005
"A revision identifier refers to a specific state of a branch's history. It\n"
13006
"can be expressed in several ways. It can begin with a keyword to\n"
13007
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13008
"'before:yesterday' and 'submit:'."
13009
msgstr ""
13010
13011
#: en/help_topics/revisionspec.txt:8
13012
msgid ""
13013
"Alternately, it can be given without a keyword, in which case it will be\n"
13014
"checked as a revision number, a tag, a revision id, a date specification, or "
13015
"a\n"
13016
"branch specification, in that order. For example, 'date:today' could be\n"
13017
"written as simply 'today', though if you have a tag called 'today' that "
13018
"will\n"
13019
"be found first."
13020
msgstr ""
13021
13022
#: en/help_topics/revisionspec.txt:14
13023
msgid ""
13024
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13025
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13026
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13027
"or\n"
13028
"spaces around the '..')."
13029
msgstr ""
13030
13031
#: en/help_topics/revisionspec.txt:19
13032
msgid ""
13033
"Ranges are interpreted differently by different commands. To the \"log\" "
13034
"command,\n"
13035
"a range is a sequence of log messages, but to the \"diff\" command, the "
13036
"range\n"
13037
"denotes a change between revisions (and not a sequence of changes). In\n"
13038
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13039
"consider it\n"
13040
"to be open-ended, that is, they include one end but not the other. For "
13041
"example:\n"
13042
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13043
"3649,\n"
13044
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13045
"and\n"
13046
"3649, but not 3647."
13047
msgstr ""
13048
13049
#: en/help_topics/revisionspec.txt:28
13050
msgid "The keywords used as revision selection methods are the following:"
13051
msgstr ""
13052
13053
#: en/help_topics/revisionspec.txt:30
13054
msgid ""
13055
":revid:\n"
13056
"\tSelects a revision using the revision id.\n"
13057
":submit:\n"
13058
"\tSelects a common ancestor with the submit branch.\n"
13059
":ancestor:\n"
13060
"\tSelects a common ancestor with a second branch.\n"
13061
":date:\n"
13062
"\tSelects a revision on the basis of a datestamp.\n"
13063
":branch:\n"
13064
"\tSelects the last revision of a specified branch.\n"
13065
":tag:\n"
13066
"\tSelects a revision identified by a tag name.\n"
13067
":revno:\n"
13068
"\tSelects a revision using a number.\n"
13069
":before:\n"
13070
"\tSelects the parent of the revision specified.\n"
13071
":annotate:\n"
13072
"\tSelect the revision that last modified the specified line.\n"
13073
":mainline:\n"
13074
"\tSelect mainline revision that merged the specified revision.\n"
13075
":last:\n"
13076
"\tSelects the nth revision from the end."
13077
msgstr ""
13078
13079
#: en/help_topics/revisionspec.txt:53
13080
msgid "In addition, plugins can provide other keywords."
13081
msgstr ""
13082
13083
#: en/help_topics/revisionspec.txt:55
13084
msgid "A detailed description of each keyword is given below."
13085
msgstr ""
13086
13087
#: en/help_topics/revisionspec.txt:57
13088
msgid ":revid:"
13089
msgstr ""
13090
13091
#: en/help_topics/revisionspec.txt:59
13092
msgid ""
13093
" Supply a specific revision id, that can be used to specify any\n"
13094
" revision id in the ancestry of the branch.\n"
13095
" Including merges, and pending merges.\n"
13096
" Examples::"
13097
msgstr ""
13098
13099
#: en/help_topics/revisionspec.txt:64
13100
msgid ""
13101
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13102
msgstr ""
13103
13104
#: en/help_topics/revisionspec.txt:66
13105
msgid ":submit:"
13106
msgstr ""
13107
13108
#: en/help_topics/revisionspec.txt:68
13109
msgid ""
13110
" Diffing against this shows all the changes that were made in this "
13111
"branch,\n"
13112
" and is a good predictor of what merge will do. The submit branch is\n"
13113
" used by the bundle and merge directive commands. If no submit branch\n"
13114
" is specified, the parent branch is used instead."
13115
msgstr ""
13116
13117
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13118
msgid ""
13119
" The common ancestor is the last revision that existed in both\n"
13120
" branches. Usually this is the branch point, but it could also be\n"
13121
" a revision that was merged."
13122
msgstr ""
13123
13124
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13125
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13126
#: en/help_topics/revisionspec.txt:153
13127
msgid " Examples::"
13128
msgstr ""
13129
13130
#: en/help_topics/revisionspec.txt:79
13131
msgid " $ bzr diff -r submit:"
13132
msgstr ""
13133
13134
#: en/help_topics/revisionspec.txt:81
13135
msgid ":ancestor:"
13136
msgstr ""
13137
13138
#: en/help_topics/revisionspec.txt:83
13139
msgid " Supply the path to a branch to select the common ancestor."
13140
msgstr ""
13141
13142
#: en/help_topics/revisionspec.txt:89
13143
msgid ""
13144
" This is frequently used with 'diff' to return all of the changes\n"
13145
" that your branch introduces, while excluding the changes that you\n"
13146
" have not merged from the remote branch."
13147
msgstr ""
13148
13149
#: en/help_topics/revisionspec.txt:95
13150
msgid ""
13151
" ancestor:/path/to/branch\n"
13152
" $ bzr diff -r ancestor:../../mainline/branch"
13153
msgstr ""
13154
13155
#: en/help_topics/revisionspec.txt:98
13156
msgid ":date:"
13157
msgstr ""
13158
13159
#: en/help_topics/revisionspec.txt:100
13160
msgid ""
13161
" Supply a datestamp to select the first revision that matches the date.\n"
13162
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13163
" Matches the first entry after a given date (either at midnight or\n"
13164
" at a specified time)."
13165
msgstr ""
13166
13167
#: en/help_topics/revisionspec.txt:105
13168
msgid " One way to display all the changes since yesterday would be::"
13169
msgstr ""
13170
13171
#: en/help_topics/revisionspec.txt:107
13172
msgid " bzr log -r date:yesterday.."
13173
msgstr ""
13174
13175
#: en/help_topics/revisionspec.txt:111
13176
msgid ""
13177
" date:yesterday -> select the first revision since "
13178
"yesterday\n"
13179
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13180
" August 14th, 2006 at 5:10pm."
13181
msgstr ""
13182
13183
#: en/help_topics/revisionspec.txt:115
13184
msgid ":branch:"
13185
msgstr ""
13186
13187
#: en/help_topics/revisionspec.txt:117
13188
msgid " Supply the path to a branch to select its last revision."
13189
msgstr ""
13190
13191
#: en/help_topics/revisionspec.txt:121
13192
msgid " branch:/path/to/branch"
13193
msgstr ""
13194
13195
#: en/help_topics/revisionspec.txt:123
13196
msgid ":tag:"
13197
msgstr ""
13198
13199
#: en/help_topics/revisionspec.txt:125
13200
msgid " Tags are stored in the branch and created by the 'tag' command."
13201
msgstr ""
13202
13203
#: en/help_topics/revisionspec.txt:127
13204
msgid ":revno:"
13205
msgstr ""
13206
13207
#: en/help_topics/revisionspec.txt:129
13208
msgid ""
13209
" Use an integer to specify a revision in the history of the branch.\n"
13210
" Optionally a branch can be specified. A negative number will count\n"
13211
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13212
" one). If the negative number is larger than the branch's history, the\n"
13213
" first revision is returned.\n"
13214
" Examples::"
13215
msgstr ""
13216
13217
#: en/help_topics/revisionspec.txt:136
13218
msgid ""
13219
" revno:1 -> return the first revision of this branch\n"
13220
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13221
" the branch '/path/to/branch'\n"
13222
" revno:-1 -> The last revision in a branch.\n"
13223
" -2:http://other/branch -> The second to last revision in the\n"
13224
" remote branch.\n"
13225
" -1000000 -> Most likely the first revision, unless\n"
13226
" your history is very long."
13227
msgstr ""
13228
13229
#: en/help_topics/revisionspec.txt:145
13230
msgid ":before:"
13231
msgstr ""
13232
13233
#: en/help_topics/revisionspec.txt:147
13234
msgid ""
13235
" Supply any revision spec to return the parent of that revision. This "
13236
"is\n"
13237
" mostly useful when inspecting revisions that are not in the revision "
13238
"history\n"
13239
" of a branch."
13240
msgstr ""
13241
13242
#: en/help_topics/revisionspec.txt:151
13243
msgid ""
13244
" It is an error to request the parent of the null revision (before:0)."
13245
msgstr ""
13246
13247
#: en/help_topics/revisionspec.txt:155
13248
msgid ""
13249
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13250
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13251
" aaaa@bbbb-1234567890\n"
13252
" bzr diff -r before:1913..1913\n"
13253
" -> Find the changes between revision 1913 and its parent "
13254
"(1912).\n"
13255
" (What changes did revision 1913 introduce).\n"
13256
" This is equivalent to: bzr diff -c 1913"
13257
msgstr ""
13258
13259
#: en/help_topics/revisionspec.txt:163
13260
msgid ":annotate:"
13261
msgstr ""
13262
13263
#: en/help_topics/revisionspec.txt:165
13264
msgid ""
13265
" Select the revision that last modified the specified line. Line is\n"
13266
" specified as path:number. Path is a relative path to the file. "
13267
"Numbers\n"
13268
" start at 1, and are relative to the current version, not the last-\n"
13269
" committed version of the file."
13270
msgstr ""
13271
13272
#: en/help_topics/revisionspec.txt:170
13273
msgid ":mainline:"
13274
msgstr ""
13275
13276
#: en/help_topics/revisionspec.txt:172
13277
msgid ""
13278
" Select the revision that merged the specified revision into mainline."
13279
msgstr ""
13280
13281
#: en/help_topics/revisionspec.txt:174
13282
msgid ":last:"
13283
msgstr ""
13284
13285
#: en/help_topics/revisionspec.txt:176
13286
msgid ""
13287
" Supply a positive number to get the nth revision from the end.\n"
13288
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13289
" Examples::"
13290
msgstr ""
13291
13292
#: en/help_topics/revisionspec.txt:180
13293
msgid ""
13294
" last:1 -> return the last revision\n"
13295
" last:3 -> return the revision 2 before the end.\n"
13296
msgstr ""
13297
13298
#: en/help_topics/rules.txt:1
13299
msgid ""
13300
"Rules\n"
13301
"====="
13302
msgstr ""
13303
13304
#: en/help_topics/rules.txt:7
13305
msgid ""
13306
"Rules are defined in ini file format where the sections are file glob\n"
13307
"patterns and the contents of each section are the preferences for files\n"
13308
"matching that pattern(s). For example::"
13309
msgstr ""
13310
13311
#: en/help_topics/rules.txt:11
13312
msgid ""
13313
" [name *.bat]\n"
13314
" eol = native"
13315
msgstr ""
13316
13317
#: en/help_topics/rules.txt:14
13318
msgid ""
13319
" [name *.html *.xml]\n"
13320
" keywords = xml_escape"
13321
msgstr ""
13322
13323
#: en/help_topics/rules.txt:17
13324
msgid ""
13325
"Preferences like these are useful for commands and plugins wishing to\n"
13326
"provide custom behaviour for selected files. For more information on \n"
13327
"end of line conversion see :doc:`eol-help`.\n"
13328
"Keyword support is provided by the `keywords plugin\n"
13329
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13330
msgstr ""
13331
13332
#: en/help_topics/rules.txt:23
13333
msgid ""
13334
"Files\n"
13335
"-----"
13336
msgstr ""
13337
13338
#: en/help_topics/rules.txt:26
13339
msgid ""
13340
"Default rules for all branches are defined in the optional file\n"
13341
"``BZR_HOME/rules``. "
13342
msgstr ""
13343
13344
#: en/help_topics/rules.txt:29
13345
msgid ""
13346
"Rule Patterns\n"
13347
"-------------"
13348
msgstr ""
13349
13350
#: en/help_topics/rules.txt:32
13351
msgid ""
13352
"Patterns are ordered and searching stops as soon as one matches.\n"
13353
"As a consequence, more explicit patterns should be placed towards\n"
13354
"the top of the file. Rule patterns use exactly the same conventions\n"
13355
"as ignore patterns. See :doc:`patterns-help` for details."
13356
msgstr ""
13357
13358
#: en/help_topics/rules.txt:37
13359
msgid ".. note::"
13360
msgstr ""
13361
13362
#: en/help_topics/rules.txt:39
13363
msgid ""
13364
" Patterns containing square brackets or spaces should be\n"
13365
" surrounded in quotes to ensure they are correctly parsed.\n"
13366
msgstr ""
13367
13368
#: en/help_topics/topics.txt:1
13369
msgid ""
13370
"authentication Information on configuring authentication\n"
13371
"basic Basic commands\n"
13372
"branches Information on what a branch is\n"
13373
"bugs Bug tracker settings\n"
13374
"checkouts Information on what a checkout is\n"
13375
"commands Basic help for all commands\n"
13376
"configuration Details on the configuration settings available\n"
13377
"conflict-types Types of conflicts and what to do about them\n"
13378
"content-filters Conversion of content into/from working trees\n"
13379
"criss-cross Information on criss-cross merging\n"
13380
"current-formats Current storage formats\n"
13381
"debug-flags Options to show or record debug information\n"
13382
"diverged-branches How to fix diverged branches\n"
13383
"env-variables Environment variable names and values\n"
13384
"eol Information on end-of-line handling\n"
13385
"files Information on configuration and log files\n"
13386
"formats Information on choosing a storage format\n"
13387
"global-options Options that control how Bazaar runs\n"
13388
"hidden-commands All hidden commands\n"
13389
"hooks Points at which custom processing can be added\n"
13390
"launchpad Using Bazaar with Launchpad.net\n"
13391
"location-alias Aliases for remembered locations\n"
13392
"log-formats Details on the logging formats available\n"
13393
"other-formats Experimental and deprecated storage formats\n"
13394
"patterns Information on the pattern syntax\n"
13395
"repositories Basic information on shared repositories.\n"
13396
"revisionspec Explain how to use --revision\n"
13397
"rules Information on defining rule-based preferences\n"
13398
"standalone-trees Information on what a standalone tree is\n"
13399
"standard-options Options that can be used with any command\n"
13400
"status-flags Help on status flags\n"
13401
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13402
"topics Topics list\n"
13403
"url-special-chars Special character handling in URLs\n"
13404
"urlspec Supported transport protocols\n"
13405
"working-trees Information on working trees\n"
13406
msgstr ""
13407
13408
#: en/help_topics/url-special-chars.txt:1
13409
msgid ""
13410
"Special character handling in URLs\n"
13411
"=================================="
13412
msgstr ""
13413
13414
#: en/help_topics/url-special-chars.txt:4
13415
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13416
msgstr ""
13417
13418
#: en/help_topics/url-special-chars.txt:6
13419
msgid " * Fully qualified URLs"
13420
msgstr ""
13421
13422
#: en/help_topics/url-special-chars.txt:8
13423
msgid " * File system paths, relative or absolute"
13424
msgstr ""
13425
13426
#: en/help_topics/url-special-chars.txt:10
13427
msgid ""
13428
"Internally bzr treats all locations as URLs. For any file system paths\n"
13429
"that are specified it will automatically determine the appropriate URL\n"
13430
"representation, and escape special characters where necessary."
13431
msgstr ""
13432
13433
#: en/help_topics/url-special-chars.txt:14
13434
msgid ""
13435
"There are a few characters which have special meaning in URLs and need "
13436
"careful\n"
13437
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13438
"value in URLs. Any non-ASCII characters in a file path will automatically "
13439
"be\n"
13440
"urlencoded when the path is converted to a URL."
13441
msgstr ""
13442
13443
#: en/help_topics/url-special-chars.txt:19
13444
msgid ""
13445
"URLs represent non-ASCII characters in an encoding defined by the server, "
13446
"but\n"
13447
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13448
"be\n"
13449
"generous in what it accepts as a URL and to print them in a way that\n"
13450
"will be readable."
13451
msgstr ""
13452
13453
#: en/help_topics/url-special-chars.txt:24
13454
msgid ""
13455
"For example, if you have a directory named '/tmp/%2False' these are all "
13456
"valid\n"
13457
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13458
"slash)::"
13459
msgstr ""
13460
13461
#: en/help_topics/url-special-chars.txt:27
13462
msgid ""
13463
" cd /tmp\n"
13464
" bzr log /tmp/%2False\n"
13465
" bzr log %2False\n"
13466
" bzr log file:///tmp/%252False\n"
13467
" bzr log file://localhost/tmp/%252False\n"
13468
" bzr log file:%252False"
13469
msgstr ""
13470
13471
#: en/help_topics/url-special-chars.txt:34
13472
msgid "These are valid but do not refer to the same file::"
13473
msgstr ""
13474
13475
#: en/help_topics/url-special-chars.txt:36
13476
msgid ""
13477
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13478
" bzr log %252False (refers to a file called /tmp/%252False)"
13479
msgstr ""
13480
13481
#: en/help_topics/url-special-chars.txt:39
13482
msgid ""
13483
"Comma also has special meaning in URLs, because it denotes `segment "
13484
"parameters`_"
13485
msgstr ""
13486
13487
#: en/help_topics/url-special-chars.txt:41
13488
msgid ""
13489
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13490
msgstr ""
13491
13492
#: en/help_topics/url-special-chars.txt:43
13493
msgid ""
13494
"Comma is also special in any file system paths that are specified. To use a "
13495
"literal\n"
13496
"comma in a file system path, specify a URL and URL encode the comma::"
13497
msgstr ""
13498
13499
#: en/help_topics/url-special-chars.txt:46
13500
msgid ""
13501
" bzr log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
13502
"\" set to \"bla\"\n"
13503
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13504
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
13505
"\" set to \"bla\"\n"
13506
msgstr ""
13507
13508
#: en/help_topics/urlspec.txt:1
13509
msgid "URL Identifiers"
13510
msgstr ""
13511
13512
#: en/help_topics/urlspec.txt:3
13513
msgid "Supported URL prefixes::"
13514
msgstr ""
13515
13516
#: en/help_topics/urlspec.txt:5
13517
msgid ""
13518
" aftp:// Access using active FTP.\n"
13519
" bzr:// Fast access using the Bazaar smart server.\n"
13520
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13521
" file:// Access using the standard filesystem (default)\n"
13522
" ftp:// Access using passive FTP.\n"
13523
" http:// Read-only access of branches exported on the web.\n"
13524
" https:// Read-only access of branches exported on the web using "
13525
"SSL.\n"
13526
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13527
msgstr ""
13528
13529
#: en/help_topics/urlspec.txt:14
13530
msgid "Supported modifiers::"
13531
msgstr ""
13532
13533
#: en/help_topics/urlspec.txt:16
13534
msgid " gio+ Access using any GIO supported protocols."
13535
msgstr ""
13536
13537
#: en/help_topics/urlspec.txt:18
13538
msgid "Bazaar supports all of the standard parts within the URL::"
13539
msgstr ""
13540
13541
#: en/help_topics/urlspec.txt:20
13542
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13543
msgstr ""
13544
13545
#: en/help_topics/urlspec.txt:22
13546
msgid "allowing URLs such as::"
13547
msgstr ""
13548
13549
#: en/help_topics/urlspec.txt:24
13550
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13551
msgstr ""
13552
13553
#: en/help_topics/urlspec.txt:26
13554
msgid ""
13555
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13556
"with '~' as meaning that the rest of the path should be interpreted\n"
13557
"relative to the remote user's home directory. For example if the user\n"
13558
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13559
"shell.example.com, then::"
13560
msgstr ""
13561
13562
#: en/help_topics/urlspec.txt:32
13563
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13564
msgstr ""
13565
13566
#: en/help_topics/urlspec.txt:34
13567
msgid "would refer to ``/home/remote/myproject/trunk``."
13568
msgstr ""
13569
13570
#: en/help_topics/urlspec.txt:36
13571
msgid ""
13572
"Many commands that accept URLs also accept location aliases too.\n"
13573
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13574
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1