« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6027.1.12
- compare with another revision
- compare with revision 5401
- download diff
- download tarball
- view history from revision 6027.1.12
- Committer: Vincent Ladeuil
- Date: 2012-03-13 17:25:29 UTC
- mfrom: (6499 +trunk)
- mto: This revision was merged to the branch mainline in revision 6501.
- Revision ID: v.ladeuil+lp@free.fr-20120313172529-i0suyjnepsor25i7
Merge trunk
- files added:
- bzrlib/estimate_compressed_size.py
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files removed:
- 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 renamed:
- tools/build_mo.py => bzrlib/bzr_distutils.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- files modified:
- Makefile
added
removed
po/bzr.pot
1
# SOME DESCRIPTIVE TITLE.
2
# Copyright (C) YEAR Canonical
3
# This file is distributed under the same license as the PACKAGE package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5
#
6
#, fuzzy
7
msgid ""
8
msgstr ""
9
"Project-Id-Version: bzr\n"
10
"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
11
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
15
"Language: \n"
16
"MIME-Version: 1.0\n"
17
"Content-Type: text/plain; charset=CHARSET\n"
18
"Content-Transfer-Encoding: 8bit\n"
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:3205
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:3207
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] ""
39
msgstr[1] ""
40
41
#: bzrlib/branch.py:3210
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:3212
46
msgid "No new revisions to push."
47
msgstr ""
48
49
#: bzrlib/branch.py:3232
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3235
54
#, python-format
55
msgid "found error:%s"
56
msgstr ""
57
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:218
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:303
69
msgid "Display status summary."
70
msgstr ""
71
72
#: bzrlib/builtins.py:305
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
78
#: bzrlib/builtins.py:308
79
msgid ""
80
"added\n"
81
" Versioned in the working copy but not in the previous revision."
82
msgstr ""
83
84
#: bzrlib/builtins.py:311
85
msgid ""
86
"removed\n"
87
" Versioned in the previous revision but removed or deleted\n"
88
" in the working copy."
89
msgstr ""
90
91
#: bzrlib/builtins.py:315
92
msgid ""
93
"renamed\n"
94
" Path of this file changed from the previous revision;\n"
95
" the text may also have changed. This includes files whose\n"
96
" parent directory was renamed."
97
msgstr ""
98
99
#: bzrlib/builtins.py:320
100
msgid ""
101
"modified\n"
102
" Text has changed since the previous revision."
103
msgstr ""
104
105
#: bzrlib/builtins.py:323
106
msgid ""
107
"kind changed\n"
108
" File kind has been changed (e.g. from file to directory)."
109
msgstr ""
110
111
#: bzrlib/builtins.py:326
112
msgid ""
113
"unknown\n"
114
" Not versioned and not matching an ignore pattern."
115
msgstr ""
116
117
#: bzrlib/builtins.py:329
118
msgid ""
119
"Additionally for directories, symlinks and files with a changed\n"
120
"executable bit, Bazaar indicates their type using a trailing\n"
121
"character: '/', '@' or '*' respectively. These decorations can be\n"
122
"disabled using the '--no-classify' option."
123
msgstr ""
124
125
#: bzrlib/builtins.py:334
126
msgid ""
127
"To see ignored files use 'bzr ignored'. For details on the\n"
128
"changes to file texts, use 'bzr diff'."
129
msgstr ""
130
131
#: bzrlib/builtins.py:337
132
msgid ""
133
"Note that --short or -S gives status flags for each item, similar\n"
134
"to Subversion's status command. To get output similar to svn -q,\n"
135
"use bzr status -SV."
136
msgstr ""
137
138
#: bzrlib/builtins.py:341
139
msgid ""
140
"If no arguments are specified, the status of the entire working\n"
141
"directory is shown. Otherwise, only the status of the specified\n"
142
"files or directories is reported. If a directory is given, status\n"
143
"is reported for everything inside that directory."
144
msgstr ""
145
146
#: bzrlib/builtins.py:346
147
msgid ""
148
"Before merges are committed, the pending merge tip revisions are\n"
149
"shown. To see all pending merge revisions, use the -v option.\n"
150
"To skip the display of pending merge information altogether, use\n"
151
"the no-pending option or specify a file/directory."
152
msgstr ""
153
154
#: bzrlib/builtins.py:351
155
msgid ""
156
"To compare the working directory to a specific revision, pass a\n"
157
"single revision to the revision argument."
158
msgstr ""
159
160
#: bzrlib/builtins.py:354
161
msgid ""
162
"To see which files have changed in a specific revision, or between\n"
163
"two revisions, pass a revision range to the revision argument.\n"
164
"This will produce the same results as calling 'bzr diff --summarize'."
165
msgstr ""
166
167
# help of 'short' option of 'status' command
168
#: bzrlib/builtins.py:363
169
msgid "Use short status indicators."
170
msgstr ""
171
172
# help of 'versioned' option of 'status' command
173
#: bzrlib/builtins.py:365
174
msgid "Only show versioned files."
175
msgstr ""
176
177
# help of 'no-pending' option of 'status' command
178
#: bzrlib/builtins.py:367
179
msgid "Don't show pending merges."
180
msgstr ""
181
182
# help of 'no-classify' option of 'status' command
183
#: bzrlib/builtins.py:370
184
msgid "Do not mark object type using indicator."
185
msgstr ""
186
187
#: bzrlib/builtins.py:385
188
msgid "bzr status --revision takes exactly one or two revision specifiers"
189
msgstr ""
190
191
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
192
msgid "You can only supply one of revision_id or --revision"
193
msgstr ""
194
195
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
196
msgid "You must supply either --revision or a revision_id"
197
msgstr ""
198
199
#: bzrlib/builtins.py:439
200
#, python-format
201
msgid "Repository %r does not support access to raw revision texts"
202
msgstr ""
203
204
#: bzrlib/builtins.py:450
205
msgid "The repository {0} contains no revision {1}."
206
msgstr ""
207
208
#: bzrlib/builtins.py:457
209
msgid "You cannot specify a NULL revision."
210
msgstr ""
211
212
#: bzrlib/builtins.py:549
213
msgid "Remove the working tree from a given branch/checkout."
214
msgstr ""
215
216
#: bzrlib/builtins.py:551
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:554
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:560
228
msgid "Remove the working tree even if it has uncommitted or shelved changes."
229
msgstr ""
230
231
#: bzrlib/builtins.py:574
232
msgid "No working tree to remove"
233
msgstr ""
234
235
#: bzrlib/builtins.py:576
236
msgid "You cannot remove the working tree of a remote path"
237
msgstr ""
238
239
#: bzrlib/builtins.py:585
240
msgid "You cannot remove the working tree from a lightweight checkout"
241
msgstr ""
242
243
#: bzrlib/builtins.py:625
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:636
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:640
256
msgid "failed to reset the tree state{0}"
257
msgstr ""
258
259
#: bzrlib/builtins.py:644
260
msgid "Show current revision number."
261
msgstr ""
262
263
#: bzrlib/builtins.py:646
264
msgid "This is equal to the number of revisions on this branch."
265
msgstr ""
266
267
#: bzrlib/builtins.py:659
268
msgid "--tree and --revision can not be used together"
269
msgstr ""
270
271
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
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:700
277
msgid "Show revno of working tree."
278
msgstr ""
279
280
#: bzrlib/builtins.py:748
281
msgid "Add specified files or directories."
282
msgstr ""
283
284
#: bzrlib/builtins.py:750
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:754
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:762
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:765
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:768
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:773
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:776
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:784
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:787
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:794
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:800
359
msgid "Lookup file ids from this tree."
360
msgstr ""
361
362
#: bzrlib/builtins.py:836
363
msgid "ignored {0} matching \"{1}\"\n"
364
msgstr ""
365
366
#: bzrlib/builtins.py:841
367
msgid "Create a new versioned directory."
368
msgstr ""
369
370
#: bzrlib/builtins.py:843
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:850
376
msgid "No error if existing, make parent directories as needed."
377
msgstr ""
378
379
#: bzrlib/builtins.py:884
380
#, python-format
381
msgid "added %s\n"
382
msgstr ""
383
384
#: bzrlib/builtins.py:926
385
#, python-format
386
msgid "invalid kind %r specified"
387
msgstr ""
388
389
#: bzrlib/builtins.py:963
390
msgid "Move or rename a file."
391
msgstr ""
392
393
#: bzrlib/builtins.py:965
394
msgid " bzr mv SOURCE... DESTINATION"
395
msgstr ""
396
397
#: bzrlib/builtins.py:967
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:971
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:977
414
msgid "Files cannot be moved between branches."
415
msgstr ""
416
417
# help of 'after' option of 'mv' command
418
#: bzrlib/builtins.py:984
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:986
426
msgid "Automatically guess renames."
427
msgstr ""
428
429
# help of 'dry-run' option of 'mv' command
430
#: bzrlib/builtins.py:987
431
msgid "Avoid making changes when guessing renames."
432
msgstr ""
433
434
#: bzrlib/builtins.py:996
435
msgid "--dry-run requires --auto."
436
msgstr ""
437
438
#: bzrlib/builtins.py:1000
439
msgid "missing file argument"
440
msgstr ""
441
442
#: bzrlib/builtins.py:1004
443
msgid "can not move root of branch"
444
msgstr ""
445
446
#: bzrlib/builtins.py:1010
447
msgid "Only one path may be specified to --auto."
448
msgstr ""
449
450
#: bzrlib/builtins.py:1013
451
msgid "--after cannot be specified with --auto."
452
msgstr ""
453
454
#: bzrlib/builtins.py:1050
455
msgid "to mv multiple files the destination must be a versioned directory"
456
msgstr ""
457
458
#: bzrlib/builtins.py:1102
459
msgid "Turn this branch into a mirror of another branch."
460
msgstr ""
461
462
#: bzrlib/builtins.py:1104
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:1109
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:1113
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:1117
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:1122
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:1126
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:1134
508
msgid "Show logs of pulled revisions."
509
msgstr ""
510
511
# help of 'directory' option of 'pull' command
512
#: bzrlib/builtins.py:1136
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:1139
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:1168
525
msgid "Need working tree for --show-base."
526
msgstr ""
527
528
#: bzrlib/builtins.py:1184
529
msgid "No pull location known or specified."
530
msgstr ""
531
532
#: bzrlib/builtins.py:1190
533
#, python-format
534
msgid "Using saved parent location: %s\n"
535
msgstr ""
536
537
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
538
msgid "Cannot use -r with merge directives or bundles"
539
msgstr ""
540
541
#: bzrlib/builtins.py:1238
542
msgid "Update a mirror of this branch."
543
msgstr ""
544
545
#: bzrlib/builtins.py:1240
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:1243
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:1246
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:1250
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:1253
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:1257
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:1262
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:1273 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:1276
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:1281
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:1284
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:1289 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:1292
631
msgid "Don't populate the working tree, even for protocols that support it."
632
msgstr ""
633
634
#: bzrlib/builtins.py:1336
635
msgid "Could not determine branch to refer to."
636
msgstr ""
637
638
#: bzrlib/builtins.py:1345
639
#, python-format
640
msgid ""
641
"No push location known or specified. To push to the parent branch (at %s), "
642
"use 'bzr push :parent'."
643
msgstr ""
644
645
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
646
msgid "No push location known or specified."
647
msgstr ""
648
649
#: bzrlib/builtins.py:1355
650
#, python-format
651
msgid "Using saved push location: %s"
652
msgstr ""
653
654
#: bzrlib/builtins.py:1365
655
msgid "Create a new branch that is a copy of an existing branch."
656
msgstr ""
657
658
#: bzrlib/builtins.py:1367
659
msgid ""
660
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
661
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
662
"bar.\n"
663
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
664
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
665
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
666
"create ./foo-bar."
667
msgstr ""
668
669
#: bzrlib/builtins.py:1374
670
msgid ""
671
"To retrieve the branch as of a particular revision, supply the --revision\n"
672
"parameter, as in \"branch foo/bar -r 5\"."
673
msgstr ""
674
675
#: bzrlib/builtins.py:1377
676
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
677
msgstr ""
678
679
# help of 'no-tree' option of 'branch' command
680
#: bzrlib/builtins.py:1387
681
msgid "Create a branch without a working-tree."
682
msgstr ""
683
684
# help of 'switch' option of 'branch' command
685
#: bzrlib/builtins.py:1389
686
msgid "Switch the checkout in the current directory to the new branch."
687
msgstr ""
688
689
# help of 'stacked' option of 'branch' command
690
#: bzrlib/builtins.py:1392
691
msgid ""
692
"Create a stacked branch referring to the source branch. The new branch will "
693
"depend on the availability of the source branch for all operations."
694
msgstr ""
695
696
# help of 'standalone' option of 'branch' command
697
#: bzrlib/builtins.py:1396
698
msgid "Do not use a shared repository, even if available."
699
msgstr ""
700
701
# help of 'use-existing-dir' option of 'branch' command
702
#: bzrlib/builtins.py:1398
703
msgid ""
704
"By default branch will fail if the target directory exists, but does not "
705
"already have a control directory. This flag will allow branch to proceed."
706
msgstr ""
707
708
# help of 'bind' option of 'branch' command
709
#: bzrlib/builtins.py:1403
710
msgid "Bind new branch to from location."
711
msgstr ""
712
713
#: bzrlib/builtins.py:1450
714
#, python-format
715
msgid "Target directory \"%s\" already exists."
716
msgstr ""
717
718
#: bzrlib/builtins.py:1462
719
#, python-format
720
msgid "Parent of \"%s\" does not exist."
721
msgstr ""
722
723
#: bzrlib/builtins.py:1481
724
msgid "The branch {0} has no revision {1}."
725
msgstr ""
726
727
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
728
#, python-format
729
msgid "Created new stacked branch referring to %s."
730
msgstr ""
731
732
#: bzrlib/builtins.py:1500
733
#, python-format
734
msgid "Branched %d revision."
735
msgid_plural "Branched %d revisions."
736
msgstr[0] ""
737
msgstr[1] ""
738
739
#: bzrlib/builtins.py:1505
740
#, python-format
741
msgid "New branch bound to %s"
742
msgstr ""
743
744
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
745
#, python-format
746
msgid "Switched to branch: %s"
747
msgstr ""
748
749
#: bzrlib/builtins.py:1515
750
msgid "List the branches available at the current location."
751
msgstr ""
752
753
#: bzrlib/builtins.py:1517
754
msgid ""
755
"This command will print the names of all the branches at the current\n"
756
"location."
757
msgstr ""
758
759
# help of 'recursive' option of 'branches' command
760
#: bzrlib/builtins.py:1524
761
msgid ""
762
"Recursively scan for branches rather than just looking in the specified "
763
"location."
764
msgstr ""
765
766
#: bzrlib/builtins.py:1554
767
msgid "(default)"
768
msgstr ""
769
770
#: bzrlib/builtins.py:1566
771
msgid "Create a new checkout of an existing branch."
772
msgstr ""
773
774
#: bzrlib/builtins.py:1568
775
msgid ""
776
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
777
"for\n"
778
"the branch found in '.'. This is useful if you have removed the working "
779
"tree\n"
780
"or if it was never created - i.e. if you pushed the branch to its current\n"
781
"location using SFTP."
782
msgstr ""
783
784
#: bzrlib/builtins.py:1573
785
msgid ""
786
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
787
"will\n"
788
"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./"
789
"bar.\n"
790
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
791
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
792
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
793
"create ./foo-bar."
794
msgstr ""
795
796
#: bzrlib/builtins.py:1580
797
msgid ""
798
"To retrieve the branch as of a particular revision, supply the --revision\n"
799
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
800
"immediately\n"
801
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
802
"old\n"
803
"code.)"
804
msgstr ""
805
806
# help of 'lightweight' option of 'checkout' command
807
#: bzrlib/builtins.py:1590
808
msgid ""
809
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
810
"the branch for every operation. Normal checkouts can perform common "
811
"operations like diff and status without such access, and also support local "
812
"commits."
813
msgstr ""
814
815
# help of 'files-from' option of 'branch' command
816
# help of 'files-from' option of 'checkout' command
817
#: bzrlib/builtins.py:1597
818
msgid "Get file contents from this tree."
819
msgstr ""
820
821
# help of 'hardlink' option of 'branch' command
822
# help of 'hardlink' option of 'checkout' command
823
#: bzrlib/builtins.py:1599
824
msgid "Hard-link working tree files where possible."
825
msgstr ""
826
827
#: bzrlib/builtins.py:1640
828
msgid ""
829
"Show list of renamed files.\n"
830
" "
831
msgstr ""
832
833
#: bzrlib/builtins.py:1670
834
msgid "Update a working tree to a new revision."
835
msgstr ""
836
837
#: bzrlib/builtins.py:1672
838
msgid ""
839
"This will perform a merge of the destination revision (the tip of the\n"
840
"branch, or the specified revision) into the working tree, and then make\n"
841
"that revision the basis revision for the working tree. "
842
msgstr ""
843
844
#: bzrlib/builtins.py:1676
845
msgid ""
846
"You can use this to visit an older revision, or to update a working tree\n"
847
"that is out of date from its branch."
848
msgstr ""
849
850
#: bzrlib/builtins.py:1679
851
msgid ""
852
"If there are any uncommitted changes in the tree, they will be carried\n"
853
"across and remain as uncommitted changes after the update. To discard\n"
854
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
855
"with the changes brought in by the change in basis revision."
856
msgstr ""
857
858
#: bzrlib/builtins.py:1684
859
msgid ""
860
"If the tree's branch is bound to a master branch, bzr will also update\n"
861
"the branch from the master."
862
msgstr ""
863
864
#: bzrlib/builtins.py:1687
865
msgid ""
866
"You cannot update just a single file or directory, because each Bazaar\n"
867
"working tree has just a single basis revision. If you want to restore a\n"
868
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
869
"update'. If you want to restore a file to its state in a previous\n"
870
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
871
"out the old content of that file to a new location."
872
msgstr ""
873
874
#: bzrlib/builtins.py:1694
875
msgid ""
876
"The 'dir' argument, if given, must be the location of the root of a\n"
877
"working tree to update. By default, the working tree that contains the \n"
878
"current working directory is used."
879
msgstr ""
880
881
#: bzrlib/builtins.py:1710
882
msgid "bzr update --revision takes exactly one revision"
883
msgstr ""
884
885
#: bzrlib/builtins.py:1718
886
msgid "bzr update can only update a whole tree, not a file or subdirectory"
887
msgstr ""
888
889
#: bzrlib/builtins.py:1749
890
msgid "Tree is up to date at revision {0} of branch {1}"
891
msgstr ""
892
893
#: bzrlib/builtins.py:1765
894
#, python-format
895
msgid ""
896
"branch has no revision %s\n"
897
"bzr update --revision only works for a revision in the branch history"
898
msgstr ""
899
900
#: bzrlib/builtins.py:1771
901
msgid "Updated to revision {0} of branch {1}"
902
msgstr ""
903
904
#: bzrlib/builtins.py:1775
905
msgid ""
906
"Your local commits will now show as pending merges with 'bzr status', and "
907
"can be committed with 'bzr commit'."
908
msgstr ""
909
910
#: bzrlib/builtins.py:1784
911
msgid "Show information about a working tree, branch or repository."
912
msgstr ""
913
914
#: bzrlib/builtins.py:1786
915
msgid ""
916
"This command will show all known locations and formats associated to the\n"
917
"tree, branch or repository."
918
msgstr ""
919
920
#: bzrlib/builtins.py:1789
921
msgid ""
922
"In verbose mode, statistical information is included with each report.\n"
923
"To see extended statistic information, use a verbosity level of 2 or\n"
924
"higher by specifying the verbose option multiple times, e.g. -vv."
925
msgstr ""
926
927
#: bzrlib/builtins.py:1793
928
msgid "Branches and working trees will also report any missing revisions."
929
msgstr ""
930
931
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
932
#: bzrlib/builtins.py:6442
933
msgid ":Examples:"
934
msgstr ""
935
936
#: bzrlib/builtins.py:1797
937
msgid " Display information on the format and related locations:"
938
msgstr ""
939
940
#: bzrlib/builtins.py:1799
941
msgid " bzr info"
942
msgstr ""
943
944
#: bzrlib/builtins.py:1801
945
msgid ""
946
" Display the above together with extended format information and\n"
947
" basic statistics (like the number of files in the working tree and\n"
948
" number of revisions in the branch and repository):"
949
msgstr ""
950
951
#: bzrlib/builtins.py:1805
952
msgid " bzr info -v"
953
msgstr ""
954
955
#: bzrlib/builtins.py:1807
956
msgid " Display the above together with number of committers to the branch:"
957
msgstr ""
958
959
#: bzrlib/builtins.py:1809
960
msgid " bzr info -vv"
961
msgstr ""
962
963
#: bzrlib/builtins.py:1828
964
msgid "Remove files or directories."
965
msgstr ""
966
967
#: bzrlib/builtins.py:1830
968
msgid ""
969
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
970
"delete them if they can easily be recovered using revert otherwise they\n"
971
"will be backed up (adding an extention of the form .~#~). If no options or\n"
972
"parameters are given Bazaar will scan for files that are being tracked by\n"
973
"Bazaar but missing in your tree and stop tracking them for you."
974
msgstr ""
975
976
# help of 'new' option of 'remove' command
977
#: bzrlib/builtins.py:1838
978
msgid "Only remove files that have never been committed."
979
msgstr ""
980
981
# help of 'file-deletion-strategy' option of 'remove' command
982
#: bzrlib/builtins.py:1840
983
msgid "The file deletion mode to be used."
984
msgstr ""
985
986
# title of 'file-deletion-strategy' option of 'remove' command
987
#: bzrlib/builtins.py:1841
988
msgid "Deletion Strategy"
989
msgstr ""
990
991
# help of 'file-deletion-strategy=safe' option of 'remove' command
992
#: bzrlib/builtins.py:1842
993
msgid "Backup changed files (default)."
994
msgstr ""
995
996
# help of 'file-deletion-strategy=keep' option of 'remove' command
997
#: bzrlib/builtins.py:1843
998
msgid "Delete from bzr but leave the working copy."
999
msgstr ""
1000
1001
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
1002
#: bzrlib/builtins.py:1844
1003
msgid "Don't backup changed files."
1004
msgstr ""
1005
1006
# help of 'file-deletion-strategy=force' option of 'remove' command
1007
#: bzrlib/builtins.py:1845
1008
msgid ""
1009
"Delete all the specified files, even if they can not be recovered and even "
1010
"if they are non-empty directories. (deprecated, use no-backup)"
1011
msgstr ""
1012
1013
#: bzrlib/builtins.py:1854
1014
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1015
msgstr ""
1016
1017
#: bzrlib/builtins.py:1871
1018
msgid "No matching files."
1019
msgstr ""
1020
1021
#: bzrlib/builtins.py:1932
1022
msgid "Reconcile bzr metadata in a branch."
1023
msgstr ""
1024
1025
#: bzrlib/builtins.py:1934
1026
msgid ""
1027
"This can correct data mismatches that may have been caused by\n"
1028
"previous ghost operations or bzr upgrades. You should only\n"
1029
"need to run this command if 'bzr check' or a bzr developer\n"
1030
"advises you to run it."
1031
msgstr ""
1032
1033
#: bzrlib/builtins.py:1939
1034
msgid ""
1035
"If a second branch is provided, cross-branch reconciliation is\n"
1036
"also attempted, which will check that data like the tree root\n"
1037
"id which was not present in very early bzr versions is represented\n"
1038
"correctly in both branches."
1039
msgstr ""
1040
1041
#: bzrlib/builtins.py:1944
1042
msgid ""
1043
"At the same time it is run it may recompress data resulting in\n"
1044
"a potential saving in disk space or performance gain."
1045
msgstr ""
1046
1047
#: bzrlib/builtins.py:1947
1048
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1049
msgstr ""
1050
1051
# help of 'format=2a' option of 'init' command
1052
# help of 'format=default' option of 'init' command
1053
# help of 'format=2a' option of 'init-repository' command
1054
# help of 'format=default' option of 'init-repository' command
1055
# help of 'format=2a' option of 'upgrade' command
1056
# help of 'format=default' option of 'upgrade' command
1057
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1058
msgid ""
1059
"Format for the bzr 2.0 series.\n"
1060
"Uses group-compress storage.\n"
1061
"Provides rich roots which are a one-way transition.\n"
1062
msgstr ""
1063
1064
# help of 'format=pack-0.92' option of 'init' command
1065
# help of 'format=pack-0.92' option of 'init-repository' command
1066
# help of 'format=pack-0.92' option of 'upgrade' command
1067
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1068
msgid ""
1069
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1070
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1071
msgstr ""
1072
1073
# help of 'format=development-colo' option of 'init' command
1074
# help of 'format=development-colo' option of 'init-repository' command
1075
# help of 'format=development-colo' option of 'upgrade' command
1076
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1077
msgid "The 2a format with experimental support for colocated branches.\n"
1078
msgstr ""
1079
1080
#: bzrlib/builtins.py:2015
1081
msgid "Make a directory into a versioned branch."
1082
msgstr ""
1083
1084
#: bzrlib/builtins.py:2017
1085
msgid ""
1086
"Use this to create an empty branch, or before importing an\n"
1087
"existing project."
1088
msgstr ""
1089
1090
#: bzrlib/builtins.py:2020
1091
msgid ""
1092
"If there is a repository in a parent directory of the location, then\n"
1093
"the history of the branch will be stored in the repository. Otherwise\n"
1094
"init creates a standalone branch which carries its own history\n"
1095
"in the .bzr directory."
1096
msgstr ""
1097
1098
#: bzrlib/builtins.py:2025
1099
msgid ""
1100
"If there is already a branch at the location but it has no working tree,\n"
1101
"the tree can be populated with 'bzr checkout'."
1102
msgstr ""
1103
1104
#: bzrlib/builtins.py:2028
1105
msgid "Recipe for importing a tree of files::"
1106
msgstr ""
1107
1108
#: bzrlib/builtins.py:2030
1109
msgid ""
1110
" cd ~/project\n"
1111
" bzr init\n"
1112
" bzr add .\n"
1113
" bzr status\n"
1114
" bzr commit -m \"imported project\""
1115
msgstr ""
1116
1117
# help of 'create-prefix' option of 'init' command
1118
# help of 'create-prefix' option of 'push' command
1119
#: bzrlib/builtins.py:2041
1120
msgid "Create the path leading up to the branch if it does not already exist."
1121
msgstr ""
1122
1123
# help of 'format' option of 'init' command
1124
#: bzrlib/builtins.py:2044
1125
msgid "Specify a format for this branch. See \"help formats\"."
1126
msgstr ""
1127
1128
# help of 'append-revisions-only' option of 'init' command
1129
#: bzrlib/builtins.py:2052
1130
msgid "Never change revnos or the existing log. Append revisions to it only."
1131
msgstr ""
1132
1133
# help of 'no-tree' option of 'init' command
1134
#: bzrlib/builtins.py:2055
1135
msgid "Create a branch without a working tree."
1136
msgstr ""
1137
1138
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1139
#, python-format
1140
msgid ""
1141
"Parent directory of %s does not exist.\n"
1142
"You may supply --create-prefix to create all leading parent directories."
1143
msgstr ""
1144
1145
#: bzrlib/builtins.py:2109
1146
msgid ""
1147
"This branch format cannot be set to append-revisions-only. Try --default."
1148
msgstr ""
1149
1150
#: bzrlib/builtins.py:2120
1151
msgid "Created a {0} (format: {1})\n"
1152
msgstr ""
1153
1154
#: bzrlib/builtins.py:2129
1155
#, python-format
1156
msgid "Using shared repository: %s\n"
1157
msgstr ""
1158
1159
#: bzrlib/builtins.py:2133
1160
msgid "Create a shared repository for branches to share storage space."
1161
msgstr ""
1162
1163
#: bzrlib/builtins.py:2135
1164
msgid ""
1165
"New branches created under the repository directory will store their\n"
1166
"revisions in the repository, not in the branch directory. For branches\n"
1167
"with shared history, this reduces the amount of storage needed and \n"
1168
"speeds up the creation of new branches."
1169
msgstr ""
1170
1171
#: bzrlib/builtins.py:2140
1172
msgid ""
1173
"If the --no-trees option is given then the branches in the repository\n"
1174
"will not have working trees by default. They will still exist as \n"
1175
"directories on disk, but they will not have separate copies of the \n"
1176
"files at a certain revision. This can be useful for repositories that\n"
1177
"store branches which are interacted with through checkouts or remote\n"
1178
"branches, such as on a server."
1179
msgstr ""
1180
1181
#: bzrlib/builtins.py:2147
1182
msgid ""
1183
":Examples:\n"
1184
" Create a shared repository holding just branches::"
1185
msgstr ""
1186
1187
#: bzrlib/builtins.py:2150
1188
msgid ""
1189
" bzr init-repo --no-trees repo\n"
1190
" bzr init repo/trunk"
1191
msgstr ""
1192
1193
#: bzrlib/builtins.py:2153
1194
msgid " Make a lightweight checkout elsewhere::"
1195
msgstr ""
1196
1197
#: bzrlib/builtins.py:2155
1198
msgid ""
1199
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1200
" cd trunk-checkout\n"
1201
" (add files here)"
1202
msgstr ""
1203
1204
# help of 'format' option of 'init-repository' command
1205
#: bzrlib/builtins.py:2163
1206
msgid ""
1207
"Specify a format for this repository. See \"bzr help formats\" for details."
1208
msgstr ""
1209
1210
# title of 'format' option of 'init-repository' command
1211
#: bzrlib/builtins.py:2167
1212
msgid "Repository format"
1213
msgstr ""
1214
1215
# help of 'no-trees' option of 'init-repository' command
1216
#: bzrlib/builtins.py:2169
1217
msgid "Branches in the repository will default to not having a working tree."
1218
msgstr ""
1219
1220
#: bzrlib/builtins.py:2195
1221
msgid "Show differences in the working tree, between revisions or branches."
1222
msgstr ""
1223
1224
#: bzrlib/builtins.py:2197
1225
msgid ""
1226
"If no arguments are given, all changes for the current tree are listed.\n"
1227
"If files are given, only the changes in those files are listed.\n"
1228
"Remote and multiple branches can be compared by using the --old and\n"
1229
"--new options. If not provided, the default for both is derived from\n"
1230
"the first argument, if any, or the current tree if no arguments are\n"
1231
"given."
1232
msgstr ""
1233
1234
#: bzrlib/builtins.py:2204
1235
msgid ""
1236
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1237
"produces patches suitable for \"patch -p1\"."
1238
msgstr ""
1239
1240
#: bzrlib/builtins.py:2207
1241
msgid ""
1242
"Note that when using the -r argument with a range of revisions, the\n"
1243
"differences are computed between the two specified revisions. That\n"
1244
"is, the command does not show the changes introduced by the first \n"
1245
"revision in the range. This differs from the interpretation of \n"
1246
"revision ranges used by \"bzr log\" which includes the first revision\n"
1247
"in the range."
1248
msgstr ""
1249
1250
#: bzrlib/builtins.py:2214
1251
msgid ""
1252
":Exit values:\n"
1253
" 1 - changed\n"
1254
" 2 - unrepresentable changes\n"
1255
" 3 - error\n"
1256
" 0 - no change"
1257
msgstr ""
1258
1259
#: bzrlib/builtins.py:2220
1260
msgid ""
1261
":Examples:\n"
1262
" Shows the difference in the working tree versus the last commit::"
1263
msgstr ""
1264
1265
#: bzrlib/builtins.py:2223
1266
msgid " bzr diff"
1267
msgstr ""
1268
1269
#: bzrlib/builtins.py:2225
1270
msgid " Difference between the working tree and revision 1::"
1271
msgstr ""
1272
1273
#: bzrlib/builtins.py:2227
1274
msgid " bzr diff -r1"
1275
msgstr ""
1276
1277
#: bzrlib/builtins.py:2229
1278
msgid " Difference between revision 3 and revision 1::"
1279
msgstr ""
1280
1281
#: bzrlib/builtins.py:2231
1282
msgid " bzr diff -r1..3"
1283
msgstr ""
1284
1285
#: bzrlib/builtins.py:2233
1286
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1287
msgstr ""
1288
1289
#: bzrlib/builtins.py:2235
1290
msgid " bzr diff -r1..3 xxx"
1291
msgstr ""
1292
1293
#: bzrlib/builtins.py:2237
1294
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1295
msgstr ""
1296
1297
#: bzrlib/builtins.py:2239
1298
msgid " bzr diff -c2"
1299
msgstr ""
1300
1301
#: bzrlib/builtins.py:2241
1302
msgid ""
1303
" To see the changes introduced by revision X::\n"
1304
" \n"
1305
" bzr diff -cX"
1306
msgstr ""
1307
1308
#: bzrlib/builtins.py:2245
1309
msgid ""
1310
" Note that in the case of a merge, the -c option shows the changes\n"
1311
" compared to the left hand parent. To see the changes against\n"
1312
" another parent, use::"
1313
msgstr ""
1314
1315
#: bzrlib/builtins.py:2249
1316
msgid " bzr diff -r<chosen_parent>..X"
1317
msgstr ""
1318
1319
#: bzrlib/builtins.py:2251
1320
msgid ""
1321
" The changes between the current revision and the previous revision\n"
1322
" (equivalent to -c-1 and -r-2..-1)"
1323
msgstr ""
1324
1325
#: bzrlib/builtins.py:2254
1326
msgid " bzr diff -r-2.."
1327
msgstr ""
1328
1329
#: bzrlib/builtins.py:2256
1330
msgid " Show just the differences for file NEWS::"
1331
msgstr ""
1332
1333
#: bzrlib/builtins.py:2258
1334
msgid " bzr diff NEWS"
1335
msgstr ""
1336
1337
#: bzrlib/builtins.py:2260
1338
msgid " Show the differences in working tree xxx for file NEWS::"
1339
msgstr ""
1340
1341
#: bzrlib/builtins.py:2262
1342
msgid " bzr diff xxx/NEWS"
1343
msgstr ""
1344
1345
#: bzrlib/builtins.py:2264
1346
msgid " Show the differences from branch xxx to this working tree:"
1347
msgstr ""
1348
1349
#: bzrlib/builtins.py:2266
1350
msgid " bzr diff --old xxx"
1351
msgstr ""
1352
1353
#: bzrlib/builtins.py:2268
1354
msgid " Show the differences between two branches for file NEWS::"
1355
msgstr ""
1356
1357
#: bzrlib/builtins.py:2270
1358
msgid " bzr diff --old xxx --new yyy NEWS"
1359
msgstr ""
1360
1361
#: bzrlib/builtins.py:2272
1362
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1363
msgstr ""
1364
1365
#: bzrlib/builtins.py:2274
1366
msgid ""
1367
" bzr diff --prefix old/:new/\n"
1368
" \n"
1369
" Show the differences using a custom diff program with options::\n"
1370
" \n"
1371
" bzr diff --using /usr/bin/diff --diff-options -wu"
1372
msgstr ""
1373
1374
# help of 'diff-options' option of 'diff' command
1375
#: bzrlib/builtins.py:2284
1376
msgid "Pass these options to the external diff program."
1377
msgstr ""
1378
1379
# help of 'prefix' option of 'diff' command
1380
#: bzrlib/builtins.py:2287
1381
msgid ""
1382
"Set prefixes added to old and new filenames, as two values separated by a "
1383
"colon. (eg \"old/:new/\")."
1384
msgstr ""
1385
1386
# help of 'old' option of 'diff' command
1387
#: bzrlib/builtins.py:2290
1388
msgid "Branch/tree to compare from."
1389
msgstr ""
1390
1391
# help of 'new' option of 'diff' command
1392
#: bzrlib/builtins.py:2294
1393
msgid "Branch/tree to compare to."
1394
msgstr ""
1395
1396
# help of 'using' option of 'diff' command
1397
#: bzrlib/builtins.py:2300
1398
msgid "Use this command to compare files."
1399
msgstr ""
1400
1401
# help of 'format' option of 'diff' command
1402
#: bzrlib/builtins.py:2305
1403
msgid "Diff format to use."
1404
msgstr ""
1405
1406
# title of 'format' option of 'diff' command
1407
#: bzrlib/builtins.py:2307
1408
msgid "Diff format"
1409
msgstr ""
1410
1411
#: bzrlib/builtins.py:2329
1412
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1413
msgstr ""
1414
1415
#: bzrlib/builtins.py:2333
1416
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1417
msgstr ""
1418
1419
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1420
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1421
msgid "{0} and {1} are mutually exclusive"
1422
msgstr ""
1423
1424
#: bzrlib/builtins.py:2358
1425
msgid ""
1426
"List files deleted in the working tree.\n"
1427
" "
1428
msgstr ""
1429
1430
#: bzrlib/builtins.py:2436
1431
msgid "Show the tree root directory."
1432
msgstr ""
1433
1434
#: bzrlib/builtins.py:2438
1435
msgid ""
1436
"The root is the nearest enclosing directory with a .bzr control\n"
1437
"directory."
1438
msgstr ""
1439
1440
#: bzrlib/builtins.py:2453
1441
msgid "The limit argument must be an integer."
1442
msgstr ""
1443
1444
#: bzrlib/builtins.py:2461
1445
msgid "The levels argument must be an integer."
1446
msgstr ""
1447
1448
#: bzrlib/builtins.py:2466
1449
msgid "Show historical log for a branch or subset of a branch."
1450
msgstr ""
1451
1452
#: bzrlib/builtins.py:2468
1453
msgid ""
1454
"log is bzr's default tool for exploring the history of a branch.\n"
1455
"The branch to use is taken from the first parameter. If no parameters\n"
1456
"are given, the branch containing the working directory is logged.\n"
1457
"Here are some simple examples::"
1458
msgstr ""
1459
1460
#: bzrlib/builtins.py:2473
1461
msgid ""
1462
" bzr log log the current branch\n"
1463
" bzr log foo.py log a file in its branch\n"
1464
" bzr log http://server/branch log a branch on a server"
1465
msgstr ""
1466
1467
#: bzrlib/builtins.py:2477
1468
msgid ""
1469
"The filtering, ordering and information shown for each revision can\n"
1470
"be controlled as explained below. By default, all revisions are\n"
1471
"shown sorted (topologically) so that newer revisions appear before\n"
1472
"older ones and descendants always appear before ancestors. If displayed,\n"
1473
"merged revisions are shown indented under the revision in which they\n"
1474
"were merged."
1475
msgstr ""
1476
1477
#: bzrlib/builtins.py:2484
1478
msgid ":Output control:"
1479
msgstr ""
1480
1481
#: bzrlib/builtins.py:2486
1482
msgid ""
1483
" The log format controls how information about each revision is\n"
1484
" displayed. The standard log formats are called ``long``, ``short``\n"
1485
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1486
" for more details on log formats."
1487
msgstr ""
1488
1489
#: bzrlib/builtins.py:2491
1490
msgid ""
1491
" The following options can be used to control what information is\n"
1492
" displayed::"
1493
msgstr ""
1494
1495
#: bzrlib/builtins.py:2494
1496
msgid ""
1497
" -l N display a maximum of N revisions\n"
1498
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1499
" -v display a status summary (delta) for each revision\n"
1500
" -p display a diff (patch) for each revision\n"
1501
" --show-ids display revision-ids (and file-ids), not just revnos"
1502
msgstr ""
1503
1504
#: bzrlib/builtins.py:2500
1505
msgid ""
1506
" Note that the default number of levels to display is a function of the\n"
1507
" log format. If the -n option is not used, the standard log formats show\n"
1508
" just the top level (mainline)."
1509
msgstr ""
1510
1511
#: bzrlib/builtins.py:2504
1512
msgid ""
1513
" Status summaries are shown using status flags like A, M, etc. To see\n"
1514
" the changes explained using words like ``added`` and ``modified``\n"
1515
" instead, use the -vv option."
1516
msgstr ""
1517
1518
#: bzrlib/builtins.py:2508
1519
msgid ":Ordering control:"
1520
msgstr ""
1521
1522
#: bzrlib/builtins.py:2510
1523
msgid ""
1524
" To display revisions from oldest to newest, use the --forward option.\n"
1525
" In most cases, using this option will have little impact on the total\n"
1526
" time taken to produce a log, though --forward does not incrementally\n"
1527
" display revisions like --reverse does when it can."
1528
msgstr ""
1529
1530
#: bzrlib/builtins.py:2515
1531
msgid ":Revision filtering:"
1532
msgstr ""
1533
1534
#: bzrlib/builtins.py:2517
1535
msgid ""
1536
" The -r option can be used to specify what revision or range of revisions\n"
1537
" to filter against. The various forms are shown below::"
1538
msgstr ""
1539
1540
#: bzrlib/builtins.py:2520
1541
msgid ""
1542
" -rX display revision X\n"
1543
" -rX.. display revision X and later\n"
1544
" -r..Y display up to and including revision Y\n"
1545
" -rX..Y display from X to Y inclusive"
1546
msgstr ""
1547
1548
#: bzrlib/builtins.py:2525
1549
msgid ""
1550
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1551
" Some common examples are given below::"
1552
msgstr ""
1553
1554
#: bzrlib/builtins.py:2528
1555
msgid ""
1556
" -r-1 show just the tip\n"
1557
" -r-10.. show the last 10 mainline revisions\n"
1558
" -rsubmit:.. show what's new on this branch\n"
1559
" -rancestor:path.. show changes since the common ancestor of this\n"
1560
" branch and the one at location path\n"
1561
" -rdate:yesterday.. show changes since yesterday"
1562
msgstr ""
1563
1564
#: bzrlib/builtins.py:2535
1565
msgid ""
1566
" When logging a range of revisions using -rX..Y, log starts at\n"
1567
" revision Y and searches back in history through the primary\n"
1568
" (\"left-hand\") parents until it finds X. When logging just the\n"
1569
" top level (using -n1), an error is reported if X is not found\n"
1570
" along the way. If multi-level logging is used (-n0), X may be\n"
1571
" a nested merge revision and the log will be truncated accordingly."
1572
msgstr ""
1573
1574
#: bzrlib/builtins.py:2542
1575
msgid ":Path filtering:"
1576
msgstr ""
1577
1578
#: bzrlib/builtins.py:2544
1579
msgid ""
1580
" If parameters are given and the first one is not a branch, the log\n"
1581
" will be filtered to show only those revisions that changed the\n"
1582
" nominated files or directories."
1583
msgstr ""
1584
1585
#: bzrlib/builtins.py:2548
1586
msgid ""
1587
" Filenames are interpreted within their historical context. To log a\n"
1588
" deleted file, specify a revision range so that the file existed at\n"
1589
" the end or start of the range."
1590
msgstr ""
1591
1592
#: bzrlib/builtins.py:2552
1593
msgid ""
1594
" Historical context is also important when interpreting pathnames of\n"
1595
" renamed files/directories. Consider the following example:"
1596
msgstr ""
1597
1598
#: bzrlib/builtins.py:2555
1599
msgid ""
1600
" * revision 1: add tutorial.txt\n"
1601
" * revision 2: modify tutorial.txt\n"
1602
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1603
msgstr ""
1604
1605
#: bzrlib/builtins.py:2559
1606
msgid " In this case:"
1607
msgstr ""
1608
1609
#: bzrlib/builtins.py:2561
1610
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1611
msgstr ""
1612
1613
#: bzrlib/builtins.py:2563
1614
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1615
msgstr ""
1616
1617
#: bzrlib/builtins.py:2565
1618
msgid ""
1619
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1620
" the original file in revision 2."
1621
msgstr ""
1622
1623
#: bzrlib/builtins.py:2568
1624
msgid ""
1625
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1626
" was no file called guide.txt in revision 2."
1627
msgstr ""
1628
1629
#: bzrlib/builtins.py:2571
1630
msgid ""
1631
" Renames are always followed by log. By design, there is no need to\n"
1632
" explicitly ask for this (and no way to stop logging a file back\n"
1633
" until it was last renamed)."
1634
msgstr ""
1635
1636
#: bzrlib/builtins.py:2575
1637
msgid ":Other filtering:"
1638
msgstr ""
1639
1640
#: bzrlib/builtins.py:2577
1641
msgid ""
1642
" The --match option can be used for finding revisions that match a\n"
1643
" regular expression in a commit message, committer, author or bug.\n"
1644
" Specifying the option several times will match any of the supplied\n"
1645
" expressions. --match-author, --match-bugs, --match-committer and\n"
1646
" --match-message can be used to only match a specific field."
1647
msgstr ""
1648
1649
#: bzrlib/builtins.py:2583
1650
msgid ":Tips & tricks:"
1651
msgstr ""
1652
1653
#: bzrlib/builtins.py:2585
1654
msgid ""
1655
" GUI tools and IDEs are often better at exploring history than command\n"
1656
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1657
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1658
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1659
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1660
msgstr ""
1661
1662
#: bzrlib/builtins.py:2591
1663
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1664
msgstr ""
1665
1666
#: bzrlib/builtins.py:2593
1667
msgid ""
1668
" [ALIASES]\n"
1669
" tip = log -r-1\n"
1670
" top = log -l10 --line\n"
1671
" show = log -v -p"
1672
msgstr ""
1673
1674
#: bzrlib/builtins.py:2598
1675
msgid ""
1676
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1677
" will show the last 10 mainline revisions. To see the details of a\n"
1678
" particular revision X, ``bzr show -rX``."
1679
msgstr ""
1680
1681
#: bzrlib/builtins.py:2602
1682
msgid ""
1683
" If you are interested in looking deeper into a particular merge X,\n"
1684
" use ``bzr log -n0 -rX``."
1685
msgstr ""
1686
1687
#: bzrlib/builtins.py:2605
1688
msgid ""
1689
" ``bzr log -v`` on a branch with lots of history is currently\n"
1690
" very slow. A fix for this issue is currently under development.\n"
1691
" With or without that fix, it is recommended that a revision range\n"
1692
" be given when using the -v option."
1693
msgstr ""
1694
1695
#: bzrlib/builtins.py:2610
1696
msgid ""
1697
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1698
" used to find revisions matching user names, commit messages, etc.\n"
1699
" Among other features, this plugin can find all revisions containing\n"
1700
" a list of words but not others."
1701
msgstr ""
1702
1703
#: bzrlib/builtins.py:2615
1704
msgid ""
1705
" When exploring non-mainline history on large projects with deep\n"
1706
" history, the performance of log can be greatly improved by installing\n"
1707
" the historycache plugin. This plugin buffers historical information\n"
1708
" trading disk space for faster speed."
1709
msgstr ""
1710
1711
# help of 'forward' option of 'log' command
1712
#: bzrlib/builtins.py:2624
1713
msgid "Show from oldest to newest."
1714
msgstr ""
1715
1716
# help of 'verbose' option of 'log' command
1717
#: bzrlib/builtins.py:2627
1718
msgid "Show files changed in each revision."
1719
msgstr ""
1720
1721
# help of 'change' option of 'log' command
1722
#: bzrlib/builtins.py:2633
1723
msgid "Show just the specified revision. See also \"help revisionspec\"."
1724
msgstr ""
1725
1726
# help of 'authors' option of 'log' command
1727
#: bzrlib/builtins.py:2637
1728
msgid "What names to list as authors - first, all or committer."
1729
msgstr ""
1730
1731
# title of 'authors' option of 'log' command
1732
#: bzrlib/builtins.py:2638
1733
msgid "Authors"
1734
msgstr ""
1735
1736
# help of 'levels' option of 'log' command
1737
#: bzrlib/builtins.py:2643
1738
msgid "Number of levels to display - 0 for all, 1 for flat."
1739
msgstr ""
1740
1741
# help of 'limit' option of 'log' command
1742
#: bzrlib/builtins.py:2653
1743
msgid "Limit the output to the first N revisions."
1744
msgstr ""
1745
1746
# help of 'show-diff' option of 'log' command
1747
#: bzrlib/builtins.py:2658
1748
msgid "Show changes made in each revision as a patch."
1749
msgstr ""
1750
1751
# help of 'include-merged' option of 'log' command
1752
#: bzrlib/builtins.py:2660
1753
msgid "Show merged revisions like --levels 0 does."
1754
msgstr ""
1755
1756
# help of 'omit-merges' option of 'log' command
1757
#: bzrlib/builtins.py:2664
1758
msgid "Do not report commits with more than one parent."
1759
msgstr ""
1760
1761
# help of 'exclude-common-ancestry' option of 'log' command
1762
#: bzrlib/builtins.py:2666
1763
msgid ""
1764
"Display only the revisions that are not part of both ancestries (require -"
1765
"rX..Y)."
1766
msgstr ""
1767
1768
# help of 'signatures' option of 'log' command
1769
#: bzrlib/builtins.py:2670
1770
msgid "Show digital signature validity."
1771
msgstr ""
1772
1773
# help of 'match' option of 'log' command
1774
#: bzrlib/builtins.py:2673
1775
msgid "Show revisions whose properties match this expression."
1776
msgstr ""
1777
1778
# help of 'match-message' option of 'log' command
1779
#: bzrlib/builtins.py:2677
1780
msgid "Show revisions whose message matches this expression."
1781
msgstr ""
1782
1783
# help of 'match-committer' option of 'log' command
1784
#: bzrlib/builtins.py:2681
1785
msgid "Show revisions whose committer matches this expression."
1786
msgstr ""
1787
1788
# help of 'match-author' option of 'log' command
1789
#: bzrlib/builtins.py:2685
1790
msgid "Show revisions whose authors match this expression."
1791
msgstr ""
1792
1793
# help of 'match-bugs' option of 'log' command
1794
#: bzrlib/builtins.py:2689
1795
msgid "Show revisions whose bugs match this expression."
1796
msgstr ""
1797
1798
#: bzrlib/builtins.py:2743
1799
msgid "--exclude-common-ancestry requires -r with two revisions"
1800
msgstr ""
1801
1802
#: bzrlib/builtins.py:2771
1803
#, python-format
1804
msgid "Path unknown at end or start of revision range: %s"
1805
msgstr ""
1806
1807
#: bzrlib/builtins.py:2888
1808
#, python-format
1809
msgid "bzr %s doesn't accept two revisions in different branches."
1810
msgstr ""
1811
1812
#: bzrlib/builtins.py:2904
1813
#, python-format
1814
msgid "bzr %s --revision takes one or two values."
1815
msgstr ""
1816
1817
#: bzrlib/builtins.py:2949
1818
msgid ""
1819
"List files in a tree.\n"
1820
" "
1821
msgstr ""
1822
1823
# help of 'recursive' option of 'ls' command
1824
#: bzrlib/builtins.py:2958
1825
msgid "Recurse into subdirectories."
1826
msgstr ""
1827
1828
# help of 'from-root' option of 'ls' command
1829
#: bzrlib/builtins.py:2960
1830
msgid "Print paths relative to the root of the branch."
1831
msgstr ""
1832
1833
# help of 'unknown' option of 'ls' command
1834
#: bzrlib/builtins.py:2962
1835
msgid "Print unknown files."
1836
msgstr ""
1837
1838
# help of 'versioned' option of 'ls' command
1839
#: bzrlib/builtins.py:2963
1840
msgid "Print versioned files."
1841
msgstr ""
1842
1843
# help of 'ignored' option of 'ls' command
1844
#: bzrlib/builtins.py:2966
1845
msgid "Print ignored files."
1846
msgstr ""
1847
1848
# help of 'kind' option of 'ls' command
1849
#: bzrlib/builtins.py:2968
1850
msgid "List entries of a particular kind: file, directory, symlink."
1851
msgstr ""
1852
1853
#: bzrlib/builtins.py:2981
1854
msgid "invalid kind specified"
1855
msgstr ""
1856
1857
#: bzrlib/builtins.py:2984
1858
msgid "Cannot set both --verbose and --null"
1859
msgstr ""
1860
1861
#: bzrlib/builtins.py:2993
1862
msgid "cannot specify both --from-root and PATH"
1863
msgstr ""
1864
1865
#: bzrlib/builtins.py:3080
1866
msgid "Ignore specified files or patterns."
1867
msgstr ""
1868
1869
#: bzrlib/builtins.py:3082
1870
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1871
msgstr ""
1872
1873
#: bzrlib/builtins.py:3084
1874
msgid ""
1875
"If a .bzrignore file does not exist, the ignore command\n"
1876
"will create one and add the specified files or patterns to the newly\n"
1877
"created file. The ignore command will also automatically add the \n"
1878
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1879
"the use of the ignore command will require an explicit add command."
1880
msgstr ""
1881
1882
#: bzrlib/builtins.py:3090
1883
msgid ""
1884
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1885
"After adding, editing or deleting that file either indirectly by\n"
1886
"using this command or directly by using an editor, be sure to commit\n"
1887
"it."
1888
msgstr ""
1889
1890
#: bzrlib/builtins.py:3095
1891
msgid ""
1892
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1893
"the global ignore file can be found in the application data directory as\n"
1894
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1895
"Global ignores are not touched by this command. The global ignore file\n"
1896
"can be edited directly using an editor."
1897
msgstr ""
1898
1899
#: bzrlib/builtins.py:3101
1900
msgid ""
1901
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1902
"precedence over regular ignores. Such exceptions are used to specify\n"
1903
"files that should be versioned which would otherwise be ignored."
1904
msgstr ""
1905
1906
#: bzrlib/builtins.py:3105
1907
msgid ""
1908
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1909
"precedence over the '!' exception patterns."
1910
msgstr ""
1911
1912
#: bzrlib/builtins.py:3108
1913
msgid ""
1914
":Notes: \n"
1915
" \n"
1916
"* Ignore patterns containing shell wildcards must be quoted from\n"
1917
" the shell on Unix."
1918
msgstr ""
1919
1920
#: bzrlib/builtins.py:3113
1921
msgid ""
1922
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1923
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1924
msgstr ""
1925
1926
#: bzrlib/builtins.py:3116
1927
msgid ""
1928
":Examples:\n"
1929
" Ignore the top level Makefile::"
1930
msgstr ""
1931
1932
#: bzrlib/builtins.py:3119
1933
msgid " bzr ignore ./Makefile"
1934
msgstr ""
1935
1936
#: bzrlib/builtins.py:3121
1937
msgid " Ignore .class files in all directories...::"
1938
msgstr ""
1939
1940
#: bzrlib/builtins.py:3123
1941
msgid " bzr ignore \"*.class\""
1942
msgstr ""
1943
1944
#: bzrlib/builtins.py:3125
1945
msgid " ...but do not ignore \"special.class\"::"
1946
msgstr ""
1947
1948
#: bzrlib/builtins.py:3127
1949
msgid " bzr ignore \"!special.class\""
1950
msgstr ""
1951
1952
#: bzrlib/builtins.py:3129
1953
msgid " Ignore files whose name begins with the \"#\" character::"
1954
msgstr ""
1955
1956
#: bzrlib/builtins.py:3131
1957
msgid " bzr ignore \"RE:^#\""
1958
msgstr ""
1959
1960
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1961
msgid " Ignore .o files under the lib directory::"
1962
msgstr ""
1963
1964
#: bzrlib/builtins.py:3135
1965
msgid " bzr ignore \"lib/**/*.o\""
1966
msgstr ""
1967
1968
#: bzrlib/builtins.py:3139
1969
msgid " bzr ignore \"RE:lib/.*\\.o\""
1970
msgstr ""
1971
1972
#: bzrlib/builtins.py:3141
1973
msgid " Ignore everything but the \"debian\" toplevel directory::"
1974
msgstr ""
1975
1976
#: bzrlib/builtins.py:3143
1977
msgid ""
1978
" bzr ignore \"RE:(?!debian/).*\"\n"
1979
" \n"
1980
" Ignore everything except the \"local\" toplevel directory,\n"
1981
" but always ignore autosave files ending in ~, even under local/::\n"
1982
" \n"
1983
" bzr ignore \"*\"\n"
1984
" bzr ignore \"!./local\"\n"
1985
" bzr ignore \"!!*~\""
1986
msgstr ""
1987
1988
# help of 'default-rules' option of 'ignore' command
1989
#: bzrlib/builtins.py:3157
1990
msgid "Display the default ignore rules that bzr uses."
1991
msgstr ""
1992
1993
#: bzrlib/builtins.py:3169
1994
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1995
msgstr ""
1996
1997
#: bzrlib/builtins.py:3180
1998
#, python-format
1999
msgid "Invalid ignore pattern found. %s"
2000
msgid_plural "Invalid ignore patterns found. %s"
2001
msgstr[0] ""
2002
msgstr[1] ""
2003
2004
#: bzrlib/builtins.py:3189
2005
msgid "NAME_PATTERN should not be an absolute path"
2006
msgstr ""
2007
2008
#: bzrlib/builtins.py:3202
2009
#, python-format
2010
msgid ""
2011
"Warning: the following files are version controlled and match your ignore "
2012
"pattern:\n"
2013
"%s\n"
2014
"These files will continue to be version controlled unless you 'bzr remove' "
2015
"them.\n"
2016
msgstr ""
2017
2018
#: bzrlib/builtins.py:3209
2019
msgid "List ignored files and the patterns that matched them."
2020
msgstr ""
2021
2022
#: bzrlib/builtins.py:3211
2023
msgid ""
2024
"List all the ignored files and the ignore pattern that caused the file to\n"
2025
"be ignored."
2026
msgstr ""
2027
2028
#: bzrlib/builtins.py:3214
2029
msgid "Alternatively, to list just the files::"
2030
msgstr ""
2031
2032
#: bzrlib/builtins.py:3216
2033
msgid " bzr ls --ignored"
2034
msgstr ""
2035
2036
#: bzrlib/builtins.py:3250
2037
#, python-format
2038
msgid "not a valid revision-number: %r"
2039
msgstr ""
2040
2041
#: bzrlib/builtins.py:3257
2042
msgid "Export current or past revision to a destination directory or archive."
2043
msgstr ""
2044
2045
#: bzrlib/builtins.py:3259
2046
msgid "If no revision is specified this exports the last committed revision."
2047
msgstr ""
2048
2049
#: bzrlib/builtins.py:3261
2050
msgid ""
2051
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2052
"given, try to find the format with the extension. If no extension\n"
2053
"is found exports to a directory (equivalent to --format=dir)."
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3265
2057
msgid ""
2058
"If root is supplied, it will be used as the root directory inside\n"
2059
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2060
"to the exported filename. The root option has no effect for 'dir' format."
2061
msgstr ""
2062
2063
#: bzrlib/builtins.py:3269
2064
msgid ""
2065
"If branch is omitted then the branch containing the current working\n"
2066
"directory will be used."
2067
msgstr ""
2068
2069
#: bzrlib/builtins.py:3272
2070
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2071
msgstr ""
2072
2073
#: bzrlib/builtins.py:3274
2074
msgid ""
2075
" ================= =========================\n"
2076
" Supported formats Autodetected by extension\n"
2077
" ================= =========================\n"
2078
" dir (none)\n"
2079
" tar .tar\n"
2080
" tbz2 .tar.bz2, .tbz2\n"
2081
" tgz .tar.gz, .tgz\n"
2082
" zip .zip\n"
2083
" ================= ========================="
2084
msgstr ""
2085
2086
# help of 'format' option of 'export' command
2087
#: bzrlib/builtins.py:3288
2088
msgid "Type of file to export to."
2089
msgstr ""
2090
2091
# help of 'filters' option of 'export' command
2092
#: bzrlib/builtins.py:3291
2093
msgid "Apply content filters to export the convenient form."
2094
msgstr ""
2095
2096
# help of 'root' option of 'export' command
2097
#: bzrlib/builtins.py:3295
2098
msgid "Name of the root directory inside the exported file."
2099
msgstr ""
2100
2101
# help of 'per-file-timestamps' option of 'export' command
2102
#: bzrlib/builtins.py:3297
2103
msgid ""
2104
"Set modification time of files to that of the last revision in which it was "
2105
"changed."
2106
msgstr ""
2107
2108
# help of 'uncommitted' option of 'export' command
2109
#: bzrlib/builtins.py:3300
2110
msgid "Export the working tree contents rather than that of the last revision."
2111
msgstr ""
2112
2113
#: bzrlib/builtins.py:3319
2114
msgid "--uncommitted requires a working tree"
2115
msgstr ""
2116
2117
#: bzrlib/builtins.py:3328
2118
#, python-format
2119
msgid "Unsupported export format: %s"
2120
msgstr ""
2121
2122
#: bzrlib/builtins.py:3332
2123
msgid "Write the contents of a file as of a given revision to standard output."
2124
msgstr ""
2125
2126
#: bzrlib/builtins.py:3334
2127
msgid "If no revision is nominated, the last revision is used."
2128
msgstr ""
2129
2130
#: bzrlib/builtins.py:3336
2131
msgid ""
2132
"Note: Take care to redirect standard output when using this command on a\n"
2133
"binary file."
2134
msgstr ""
2135
2136
# help of 'name-from-revision' option of 'cat' command
2137
#: bzrlib/builtins.py:3342
2138
msgid "The path name in the old tree."
2139
msgstr ""
2140
2141
# help of 'filters' option of 'cat' command
2142
#: bzrlib/builtins.py:3343
2143
msgid "Apply content filters to display the convenience form."
2144
msgstr ""
2145
2146
#: bzrlib/builtins.py:3354
2147
msgid "bzr cat --revision takes exactly one revision specifier"
2148
msgstr ""
2149
2150
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2151
msgid "{0!r} is not present in revision {1}"
2152
msgstr ""
2153
2154
#: bzrlib/builtins.py:3414
2155
msgid "Commit changes into a new revision."
2156
msgstr ""
2157
2158
#: bzrlib/builtins.py:3416
2159
msgid ""
2160
"An explanatory message needs to be given for each commit. This is\n"
2161
"often done by using the --message option (getting the message from the\n"
2162
"command line) or by using the --file option (getting the message from\n"
2163
"a file). If neither of these options is given, an editor is opened for\n"
2164
"the user to enter the message. To see the changed files in the\n"
2165
"boilerplate text loaded into the editor, use the --show-diff option."
2166
msgstr ""
2167
2168
#: bzrlib/builtins.py:3423
2169
msgid ""
2170
"By default, the entire tree is committed and the person doing the\n"
2171
"commit is assumed to be the author. These defaults can be overridden\n"
2172
"as explained below."
2173
msgstr ""
2174
2175
#: bzrlib/builtins.py:3427
2176
msgid ":Selective commits:"
2177
msgstr ""
2178
2179
#: bzrlib/builtins.py:3429
2180
msgid ""
2181
" If selected files are specified, only changes to those files are\n"
2182
" committed. If a directory is specified then the directory and\n"
2183
" everything within it is committed."
2184
msgstr ""
2185
2186
#: bzrlib/builtins.py:3433
2187
msgid ""
2188
" When excludes are given, they take precedence over selected files.\n"
2189
" For example, to commit only changes within foo, but not changes\n"
2190
" within foo/bar::"
2191
msgstr ""
2192
2193
#: bzrlib/builtins.py:3437
2194
msgid " bzr commit foo -x foo/bar"
2195
msgstr ""
2196
2197
#: bzrlib/builtins.py:3439
2198
msgid " A selective commit after a merge is not yet supported."
2199
msgstr ""
2200
2201
#: bzrlib/builtins.py:3441
2202
msgid ":Custom authors:"
2203
msgstr ""
2204
2205
#: bzrlib/builtins.py:3443
2206
msgid ""
2207
" If the author of the change is not the same person as the committer,\n"
2208
" you can specify the author's name using the --author option. The\n"
2209
" name should be in the same format as a committer-id, e.g.\n"
2210
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2211
" the change you can specify the option multiple times, once for each\n"
2212
" author."
2213
msgstr ""
2214
2215
#: bzrlib/builtins.py:3450
2216
msgid ":Checks:"
2217
msgstr ""
2218
2219
#: bzrlib/builtins.py:3452
2220
msgid ""
2221
" A common mistake is to forget to add a new file or directory before\n"
2222
" running the commit command. The --strict option checks for unknown\n"
2223
" files and aborts the commit if any are found. More advanced pre-commit\n"
2224
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2225
" for details."
2226
msgstr ""
2227
2228
#: bzrlib/builtins.py:3458
2229
msgid ":Things to note:"
2230
msgstr ""
2231
2232
#: bzrlib/builtins.py:3460
2233
msgid ""
2234
" If you accidentially commit the wrong changes or make a spelling\n"
2235
" mistake in the commit message say, you can use the uncommit command\n"
2236
" to undo it. See ``bzr help uncommit`` for details."
2237
msgstr ""
2238
2239
#: bzrlib/builtins.py:3464
2240
msgid ""
2241
" Hooks can also be configured to run after a commit. This allows you\n"
2242
" to trigger updates to external systems like bug trackers. The --fixes\n"
2243
" option can be used to record the association between a revision and\n"
2244
" one or more bugs. See ``bzr help bugs`` for details."
2245
msgstr ""
2246
2247
# help of 'exclude' option of 'commit' command
2248
#: bzrlib/builtins.py:3474
2249
msgid "Do not consider changes made to a given path."
2250
msgstr ""
2251
2252
# help of 'message' option of 'commit' command
2253
#: bzrlib/builtins.py:3477
2254
msgid "Description of the new revision."
2255
msgstr ""
2256
2257
# help of 'unchanged' option of 'commit' command
2258
#: bzrlib/builtins.py:3480
2259
msgid "Commit even if nothing has changed."
2260
msgstr ""
2261
2262
# help of 'file' option of 'commit' command
2263
#: bzrlib/builtins.py:3484
2264
msgid "Take commit message from this file."
2265
msgstr ""
2266
2267
# help of 'strict' option of 'commit' command
2268
#: bzrlib/builtins.py:3486
2269
msgid "Refuse to commit if there are unknown files in the working tree."
2270
msgstr ""
2271
2272
# help of 'commit-time' option of 'commit' command
2273
#: bzrlib/builtins.py:3489
2274
msgid ""
2275
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2276
"08:00:00 +0100'."
2277
msgstr ""
2278
2279
# help of 'fixes' option of 'commit' command
2280
#: bzrlib/builtins.py:3492
2281
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2282
msgstr ""
2283
2284
# help of 'author' option of 'commit' command
2285
#: bzrlib/builtins.py:3495
2286
msgid "Set the author's name, if it's different from the committer."
2287
msgstr ""
2288
2289
# help of 'local' option of 'commit' command
2290
#: bzrlib/builtins.py:3498
2291
msgid ""
2292
"Perform a local commit in a bound branch. Local commits are not pushed to "
2293
"the master branch until a normal commit is performed."
2294
msgstr ""
2295
2296
# help of 'show-diff' option of 'commit' command
2297
#: bzrlib/builtins.py:3504
2298
msgid ""
2299
"When no message is supplied, show the diff along with the status summary in "
2300
"the message editor."
2301
msgstr ""
2302
2303
# help of 'lossy' option of 'commit' command
2304
#: bzrlib/builtins.py:3507
2305
msgid ""
2306
"When committing to a foreign version control system do not push data that "
2307
"can not be natively represented."
2308
msgstr ""
2309
2310
#: bzrlib/builtins.py:3525
2311
#, python-format
2312
msgid ""
2313
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2314
"default bug tracker using the `bugtracker` option.\n"
2315
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2316
msgstr ""
2317
2318
#: bzrlib/builtins.py:3534
2319
#, python-format
2320
msgid ""
2321
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2322
"for more information on this feature.\n"
2323
"Commit refused."
2324
msgstr ""
2325
2326
#: bzrlib/builtins.py:3543
2327
#, python-format
2328
msgid "Unrecognized bug %s. Commit refused."
2329
msgstr ""
2330
2331
#: bzrlib/builtins.py:3546
2332
#, python-format
2333
msgid ""
2334
"%s\n"
2335
"Commit refused."
2336
msgstr ""
2337
2338
#: bzrlib/builtins.py:3570
2339
msgid "Could not parse --commit-time: "
2340
msgstr ""
2341
2342
#: bzrlib/builtins.py:3610
2343
msgid "please specify either --message or --file"
2344
msgstr ""
2345
2346
#: bzrlib/builtins.py:3639
2347
msgid "please specify a commit message with either --message or --file"
2348
msgstr ""
2349
2350
#: bzrlib/builtins.py:3642
2351
msgid ""
2352
"Empty commit message specified. Please specify a commit message with either "
2353
"--message or --file or leave a blank message with --message \"\"."
2354
msgstr ""
2355
2356
#: bzrlib/builtins.py:3662
2357
msgid ""
2358
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2359
"--unchanged to force an empty commit."
2360
msgstr ""
2361
2362
#: bzrlib/builtins.py:3666
2363
msgid ""
2364
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2365
"resolve FILE\" to resolve."
2366
msgstr ""
2367
2368
#: bzrlib/builtins.py:3670
2369
msgid "Commit refused because there are unknown files in the working tree."
2370
msgstr ""
2371
2372
#: bzrlib/builtins.py:3673
2373
msgid ""
2374
"\n"
2375
"To commit to master branch, run update and then commit.\n"
2376
"You can also pass --local to commit to continue working disconnected."
2377
msgstr ""
2378
2379
#: bzrlib/builtins.py:3681
2380
msgid ""
2381
"Validate working tree structure, branch consistency and repository history."
2382
msgstr ""
2383
2384
#: bzrlib/builtins.py:3683
2385
msgid ""
2386
"This command checks various invariants about branch and repository storage\n"
2387
"to detect data corruption or bzr bugs."
2388
msgstr ""
2389
2390
#: bzrlib/builtins.py:3686
2391
msgid ""
2392
"The working tree and branch checks will only give output if a problem is\n"
2393
"detected. The output fields of the repository check are:"
2394
msgstr ""
2395
2396
#: bzrlib/builtins.py:3689
2397
msgid ""
2398
"revisions\n"
2399
" This is just the number of revisions checked. It doesn't\n"
2400
" indicate a problem."
2401
msgstr ""
2402
2403
#: bzrlib/builtins.py:3693
2404
msgid ""
2405
"versionedfiles\n"
2406
" This is just the number of versionedfiles checked. It\n"
2407
" doesn't indicate a problem."
2408
msgstr ""
2409
2410
#: bzrlib/builtins.py:3697
2411
msgid ""
2412
"unreferenced ancestors\n"
2413
" Texts that are ancestors of other texts, but\n"
2414
" are not properly referenced by the revision ancestry. This is a\n"
2415
" subtle problem that Bazaar can work around."
2416
msgstr ""
2417
2418
#: bzrlib/builtins.py:3702
2419
msgid ""
2420
"unique file texts\n"
2421
" This is the total number of unique file contents\n"
2422
" seen in the checked revisions. It does not indicate a problem."
2423
msgstr ""
2424
2425
#: bzrlib/builtins.py:3706
2426
msgid ""
2427
"repeated file texts\n"
2428
" This is the total number of repeated texts seen\n"
2429
" in the checked revisions. Texts can be repeated when their file\n"
2430
" entries are modified, but the file contents are not. It does not\n"
2431
" indicate a problem."
2432
msgstr ""
2433
2434
#: bzrlib/builtins.py:3712
2435
msgid ""
2436
"If no restrictions are specified, all Bazaar data that is found at the "
2437
"given\n"
2438
"location will be checked."
2439
msgstr ""
2440
2441
#: bzrlib/builtins.py:3717
2442
msgid " Check the tree and branch at 'foo'::"
2443
msgstr ""
2444
2445
#: bzrlib/builtins.py:3719
2446
msgid " bzr check --tree --branch foo"
2447
msgstr ""
2448
2449
#: bzrlib/builtins.py:3721
2450
msgid " Check only the repository at 'bar'::"
2451
msgstr ""
2452
2453
#: bzrlib/builtins.py:3723
2454
msgid " bzr check --repo bar"
2455
msgstr ""
2456
2457
#: bzrlib/builtins.py:3725
2458
msgid " Check everything at 'baz'::"
2459
msgstr ""
2460
2461
#: bzrlib/builtins.py:3727
2462
msgid " bzr check baz"
2463
msgstr ""
2464
2465
# help of 'branch' option of 'check' command
2466
#: bzrlib/builtins.py:3733
2467
msgid "Check the branch related to the current directory."
2468
msgstr ""
2469
2470
# help of 'repo' option of 'check' command
2471
#: bzrlib/builtins.py:3735
2472
msgid "Check the repository related to the current directory."
2473
msgstr ""
2474
2475
# help of 'tree' option of 'check' command
2476
#: bzrlib/builtins.py:3737
2477
msgid "Check the working tree related to the current directory."
2478
msgstr ""
2479
2480
#: bzrlib/builtins.py:3751
2481
msgid "Upgrade a repository, branch or working tree to a newer format."
2482
msgstr ""
2483
2484
#: bzrlib/builtins.py:3753
2485
msgid ""
2486
"When the default format has changed after a major new release of\n"
2487
"Bazaar, you may be informed during certain operations that you\n"
2488
"should upgrade. Upgrading to a newer format may improve performance\n"
2489
"or make new features available. It may however limit interoperability\n"
2490
"with older repositories or with older versions of Bazaar."
2491
msgstr ""
2492
2493
#: bzrlib/builtins.py:3759
2494
msgid ""
2495
"If you wish to upgrade to a particular format rather than the\n"
2496
"current default, that can be specified using the --format option.\n"
2497
"As a consequence, you can use the upgrade command this way to\n"
2498
"\"downgrade\" to an earlier format, though some conversions are\n"
2499
"a one way process (e.g. changing from the 1.x default to the\n"
2500
"2.x default) so downgrading is not always possible."
2501
msgstr ""
2502
2503
#: bzrlib/builtins.py:3766
2504
msgid ""
2505
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2506
"process (where # is a number). By default, this is left there on\n"
2507
"completion. If the conversion fails, delete the new .bzr directory\n"
2508
"and rename this one back in its place. Use the --clean option to ask\n"
2509
"for the backup.bzr directory to be removed on successful conversion.\n"
2510
"Alternatively, you can delete it by hand if everything looks good\n"
2511
"afterwards."
2512
msgstr ""
2513
2514
#: bzrlib/builtins.py:3774
2515
msgid ""
2516
"If the location given is a shared repository, dependent branches\n"
2517
"are also converted provided the repository converts successfully.\n"
2518
"If the conversion of a branch fails, remaining branches are still\n"
2519
"tried."
2520
msgstr ""
2521
2522
#: bzrlib/builtins.py:3779
2523
msgid ""
2524
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2525
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2526
msgstr ""
2527
2528
# help of 'format' option of 'upgrade' command
2529
#: bzrlib/builtins.py:3787
2530
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2531
msgstr ""
2532
2533
# title of 'format' option of 'init' command
2534
# title of 'format' option of 'upgrade' command
2535
#: bzrlib/builtins.py:3791
2536
msgid "Branch format"
2537
msgstr ""
2538
2539
# help of 'clean' option of 'upgrade' command
2540
#: bzrlib/builtins.py:3793
2541
msgid "Remove the backup.bzr directory if successful."
2542
msgstr ""
2543
2544
# help of 'dry-run' option of 'add' command
2545
# help of 'dry-run' option of 'upgrade' command
2546
#: bzrlib/builtins.py:3795
2547
msgid "Show what would be done, but don't actually do anything."
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:3810
2551
msgid "Show or set bzr user id."
2552
msgstr ""
2553
2554
#: bzrlib/builtins.py:3812
2555
msgid ""
2556
":Examples:\n"
2557
" Show the email of the current user::"
2558
msgstr ""
2559
2560
#: bzrlib/builtins.py:3815
2561
msgid " bzr whoami --email"
2562
msgstr ""
2563
2564
#: bzrlib/builtins.py:3817
2565
msgid " Set the current user::"
2566
msgstr ""
2567
2568
#: bzrlib/builtins.py:3819
2569
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2570
msgstr ""
2571
2572
# help of 'email' option of 'whoami' command
2573
#: bzrlib/builtins.py:3823
2574
msgid "Display email address only."
2575
msgstr ""
2576
2577
# help of 'branch' option of 'whoami' command
2578
#: bzrlib/builtins.py:3825
2579
msgid "Set identity for the current branch instead of globally."
2580
msgstr ""
2581
2582
#: bzrlib/builtins.py:3851
2583
msgid "--email can only be used to display existing identity"
2584
msgstr ""
2585
2586
#: bzrlib/builtins.py:3873
2587
msgid "Print or set the branch nickname."
2588
msgstr ""
2589
2590
#: bzrlib/builtins.py:3875
2591
msgid ""
2592
"If unset, the tree root directory name is used as the nickname.\n"
2593
"To print the current nickname, execute with no argument."
2594
msgstr ""
2595
2596
#: bzrlib/builtins.py:3878
2597
msgid ""
2598
"Bound branches use the nickname of its master branch unless it is set\n"
2599
"locally."
2600
msgstr ""
2601
2602
#: bzrlib/builtins.py:3898
2603
msgid "Set/unset and display aliases."
2604
msgstr ""
2605
2606
#: bzrlib/builtins.py:3900
2607
msgid ""
2608
":Examples:\n"
2609
" Show the current aliases::"
2610
msgstr ""
2611
2612
#: bzrlib/builtins.py:3903
2613
msgid " bzr alias"
2614
msgstr ""
2615
2616
#: bzrlib/builtins.py:3905
2617
msgid " Show the alias specified for 'll'::"
2618
msgstr ""
2619
2620
#: bzrlib/builtins.py:3907
2621
msgid " bzr alias ll"
2622
msgstr ""
2623
2624
#: bzrlib/builtins.py:3909
2625
msgid " Set an alias for 'll'::"
2626
msgstr ""
2627
2628
#: bzrlib/builtins.py:3911
2629
msgid " bzr alias ll=\"log --line -r-10..-1\""
2630
msgstr ""
2631
2632
#: bzrlib/builtins.py:3913
2633
msgid " To remove an alias for 'll'::"
2634
msgstr ""
2635
2636
#: bzrlib/builtins.py:3915
2637
msgid " bzr alias --remove ll"
2638
msgstr ""
2639
2640
# help of 'remove' option of 'alias' command
2641
#: bzrlib/builtins.py:3920
2642
msgid "Remove the alias."
2643
msgstr ""
2644
2645
#: bzrlib/builtins.py:3938
2646
msgid "bzr alias --remove expects an alias to remove."
2647
msgstr ""
2648
2649
#: bzrlib/builtins.py:4119
2650
msgid "subunit not available. subunit needs to be installed to use --subunit."
2651
msgstr ""
2652
2653
#: bzrlib/builtins.py:4136
2654
msgid ""
2655
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2656
msgstr ""
2657
2658
#: bzrlib/builtins.py:4183
2659
msgid "Show version of bzr."
2660
msgstr ""
2661
2662
# help of 'short' option of 'version' command
2663
#: bzrlib/builtins.py:4187
2664
msgid "Print just the version number."
2665
msgstr ""
2666
2667
#: bzrlib/builtins.py:4206
2668
msgid "It sure does!\n"
2669
msgstr ""
2670
2671
#: bzrlib/builtins.py:4230
2672
#, python-format
2673
msgid "merge base is revision %s\n"
2674
msgstr ""
2675
2676
#: bzrlib/builtins.py:4234
2677
msgid "Perform a three-way merge."
2678
msgstr ""
2679
2680
#: bzrlib/builtins.py:4236
2681
msgid ""
2682
"The source of the merge can be specified either in the form of a branch,\n"
2683
"or in the form of a path to a file containing a merge directive generated\n"
2684
"with bzr send. If neither is specified, the default is the upstream branch\n"
2685
"or the branch most recently merged using --remember. The source of the\n"
2686
"merge may also be specified in the form of a path to a file in another\n"
2687
"branch: in this case, only the modifications to that file are merged into\n"
2688
"the current working tree."
2689
msgstr ""
2690
2691
#: bzrlib/builtins.py:4244
2692
msgid ""
2693
"When merging from a branch, by default bzr will try to merge in all new\n"
2694
"work from the other branch, automatically determining an appropriate base\n"
2695
"revision. If this fails, you may need to give an explicit base."
2696
msgstr ""
2697
2698
#: bzrlib/builtins.py:4248
2699
msgid ""
2700
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2701
"try to merge in all new work up to and including revision OTHER."
2702
msgstr ""
2703
2704
#: bzrlib/builtins.py:4251
2705
msgid ""
2706
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2707
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2708
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2709
"not already contain revision BASE, such a merge is commonly referred to as\n"
2710
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2711
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2712
"changes from the other branch is not stored in the commit."
2713
msgstr ""
2714
2715
#: bzrlib/builtins.py:4259
2716
msgid "Revision numbers are always relative to the source branch."
2717
msgstr ""
2718
2719
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2720
msgid ""
2721
"Merge will do its best to combine the changes in two branches, but there\n"
2722
"are some kinds of problems only a human can fix. When it encounters those,\n"
2723
"it will mark a conflict. A conflict means that you need to fix something,\n"
2724
"before you can commit."
2725
msgstr ""
2726
2727
#: bzrlib/builtins.py:4266
2728
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2729
msgstr ""
2730
2731
#: bzrlib/builtins.py:4268
2732
msgid ""
2733
"If there is no default branch set, the first merge will set it (use\n"
2734
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2735
"to use the default. To change the default, use --remember. The value will\n"
2736
"only be saved if the remote location can be accessed."
2737
msgstr ""
2738
2739
#: bzrlib/builtins.py:4273
2740
msgid ""
2741
"The results of the merge are placed into the destination working\n"
2742
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2743
"committed to record the result of the merge."
2744
msgstr ""
2745
2746
#: bzrlib/builtins.py:4277
2747
msgid ""
2748
"merge refuses to run if there are any uncommitted changes, unless\n"
2749
"--force is given. If --force is given, then the changes from the source \n"
2750
"will be merged with the current working tree, including any uncommitted\n"
2751
"changes in the tree. The --force option can also be used to create a\n"
2752
"merge revision which has more than two parents."
2753
msgstr ""
2754
2755
#: bzrlib/builtins.py:4283
2756
msgid ""
2757
"If one would like to merge changes from the working tree of the other\n"
2758
"branch without merging any committed revisions, the --uncommitted option\n"
2759
"can be given."
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4287
2763
msgid ""
2764
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2765
"you to apply each diff hunk and file change, similar to \"shelve\"."
2766
msgstr ""
2767
2768
#: bzrlib/builtins.py:4290
2769
msgid ""
2770
":Examples:\n"
2771
" To merge all new revisions from bzr.dev::"
2772
msgstr ""
2773
2774
#: bzrlib/builtins.py:4293
2775
msgid " bzr merge ../bzr.dev"
2776
msgstr ""
2777
2778
#: bzrlib/builtins.py:4295
2779
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2780
msgstr ""
2781
2782
#: bzrlib/builtins.py:4297
2783
msgid " bzr merge -r 82 ../bzr.dev"
2784
msgstr ""
2785
2786
#: bzrlib/builtins.py:4299
2787
msgid " To merge the changes introduced by 82, without previous changes::"
2788
msgstr ""
2789
2790
#: bzrlib/builtins.py:4301
2791
msgid " bzr merge -r 81..82 ../bzr.dev"
2792
msgstr ""
2793
2794
#: bzrlib/builtins.py:4303
2795
msgid " To apply a merge directive contained in /tmp/merge::"
2796
msgstr ""
2797
2798
#: bzrlib/builtins.py:4305
2799
msgid " bzr merge /tmp/merge"
2800
msgstr ""
2801
2802
#: bzrlib/builtins.py:4307
2803
msgid ""
2804
" To create a merge revision with three parents from two branches\n"
2805
" feature1a and feature1b:"
2806
msgstr ""
2807
2808
#: bzrlib/builtins.py:4310
2809
msgid ""
2810
" bzr merge ../feature1a\n"
2811
" bzr merge ../feature1b --force\n"
2812
" bzr commit -m 'revision with three parents'"
2813
msgstr ""
2814
2815
# help of 'force' option of 'merge' command
2816
#: bzrlib/builtins.py:4322
2817
msgid "Merge even if the destination tree has uncommitted changes."
2818
msgstr ""
2819
2820
# help of 'uncommitted' option of 'merge' command
2821
#: bzrlib/builtins.py:4328
2822
msgid ""
2823
"Apply uncommitted changes from a working copy, instead of branch changes."
2824
msgstr ""
2825
2826
# help of 'pull' option of 'merge' command
2827
#: bzrlib/builtins.py:4330
2828
msgid ""
2829
"If the destination is already completely merged into the source, pull from "
2830
"the source rather than merging. When this happens, you do not need to "
2831
"commit the result."
2832
msgstr ""
2833
2834
# help of 'directory' option of 'merge' command
2835
#: bzrlib/builtins.py:4335
2836
msgid ""
2837
"Branch to merge into, rather than the one containing the working directory."
2838
msgstr ""
2839
2840
# help of 'preview' option of 'merge' command
2841
#: bzrlib/builtins.py:4337
2842
msgid "Instead of merging, show a diff of the merge."
2843
msgstr ""
2844
2845
# help of 'interactive' option of 'merge' command
2846
#: bzrlib/builtins.py:4339
2847
msgid "Select changes interactively."
2848
msgstr ""
2849
2850
#: bzrlib/builtins.py:4361
2851
msgid ""
2852
"Merging into empty branches not currently supported, https://bugs.launchpad."
2853
"net/bzr/+bug/308562"
2854
msgstr ""
2855
2856
#: bzrlib/builtins.py:4388
2857
msgid "Cannot use --uncommitted with bundles or merge directives."
2858
msgstr ""
2859
2860
#: bzrlib/builtins.py:4399
2861
msgid "Cannot use --uncommitted and --revision at the same time."
2862
msgstr ""
2863
2864
#: bzrlib/builtins.py:4419
2865
msgid "merger: "
2866
msgstr ""
2867
2868
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2869
msgid "Nothing to do."
2870
msgstr ""
2871
2872
#: bzrlib/builtins.py:4425
2873
msgid "Cannot pull individual files"
2874
msgstr ""
2875
2876
#: bzrlib/builtins.py:4433
2877
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2878
msgstr ""
2879
2880
#: bzrlib/builtins.py:4491
2881
#, python-format
2882
msgid "Show-base is not supported for this merge type. %s"
2883
msgstr ""
2884
2885
#: bzrlib/builtins.py:4500
2886
#, python-format
2887
msgid "Conflict reduction is not supported for merge type %s."
2888
msgstr ""
2889
2890
#: bzrlib/builtins.py:4504
2891
msgid "Cannot do conflict reduction and show base."
2892
msgstr ""
2893
2894
#: bzrlib/builtins.py:4615
2895
msgid "No location specified or remembered"
2896
msgstr ""
2897
2898
#: bzrlib/builtins.py:4617
2899
msgid "{0} remembered {1} location {2}"
2900
msgstr ""
2901
2902
#: bzrlib/builtins.py:4623
2903
msgid "Redo a merge."
2904
msgstr ""
2905
2906
#: bzrlib/builtins.py:4625
2907
msgid ""
2908
"Use this if you want to try a different merge technique while resolving\n"
2909
"conflicts. Some merge techniques are better than others, and remerge\n"
2910
"lets you try different ones on different files."
2911
msgstr ""
2912
2913
#: bzrlib/builtins.py:4629
2914
msgid ""
2915
"The options for remerge have the same meaning and defaults as the ones for\n"
2916
"merge. The difference is that remerge can (only) be run when there is a\n"
2917
"pending merge, and it lets you specify particular files."
2918
msgstr ""
2919
2920
#: bzrlib/builtins.py:4633
2921
msgid ""
2922
":Examples:\n"
2923
" Re-do the merge of all conflicted files, and show the base text in\n"
2924
" conflict regions, in addition to the usual THIS and OTHER texts::"
2925
msgstr ""
2926
2927
#: bzrlib/builtins.py:4637
2928
msgid " bzr remerge --show-base"
2929
msgstr ""
2930
2931
#: bzrlib/builtins.py:4639
2932
msgid ""
2933
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2934
" additional processing to reduce the size of conflict regions::"
2935
msgstr ""
2936
2937
#: bzrlib/builtins.py:4642
2938
msgid " bzr remerge --merge-type weave --reprocess foobar"
2939
msgstr ""
2940
2941
# help of 'show-base' option of 'merge' command
2942
# help of 'show-base' option of 'pull' command
2943
# help of 'show-base' option of 'remerge' command
2944
# help of 'show-base' option of 'update' command
2945
#: bzrlib/builtins.py:4649
2946
msgid "Show base revision text in conflicts."
2947
msgstr ""
2948
2949
#: bzrlib/builtins.py:4661
2950
msgid ""
2951
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2952
"merges."
2953
msgstr ""
2954
2955
#: bzrlib/builtins.py:4717
2956
msgid "Revert files to a previous revision."
2957
msgstr ""
2958
2959
#: bzrlib/builtins.py:4719
2960
msgid ""
2961
"Giving a list of files will revert only those files. Otherwise, all files\n"
2962
"will be reverted. If the revision is not specified with '--revision', the\n"
2963
"last committed revision is used."
2964
msgstr ""
2965
2966
#: bzrlib/builtins.py:4723
2967
msgid ""
2968
"To remove only some changes, without reverting to a prior version, use\n"
2969
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2970
"will remove the changes introduced by the second last commit (-2), without\n"
2971
"affecting the changes introduced by the last commit (-1). To remove\n"
2972
"certain changes on a hunk-by-hunk basis, see the shelve command."
2973
msgstr ""
2974
2975
#: bzrlib/builtins.py:4729
2976
msgid ""
2977
"By default, any files that have been manually changed will be backed up\n"
2978
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2979
"'.~#~' appended to their name, where # is a number."
2980
msgstr ""
2981
2982
#: bzrlib/builtins.py:4733
2983
msgid ""
2984
"When you provide files, you can use their current pathname or the pathname\n"
2985
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2986
"name. If you name a directory, all the contents of that directory will be\n"
2987
"reverted."
2988
msgstr ""
2989
2990
#: bzrlib/builtins.py:4738
2991
msgid ""
2992
"If you have newly added files since the target revision, they will be\n"
2993
"removed. If the files to be removed have been changed, backups will be\n"
2994
"created as above. Directories containing unknown files will not be\n"
2995
"deleted."
2996
msgstr ""
2997
2998
#: bzrlib/builtins.py:4743
2999
msgid ""
3000
"The working tree contains a list of revisions that have been merged but\n"
3001
"not yet committed. These revisions will be included as additional parents\n"
3002
"of the next commit. Normally, using revert clears that list as well as\n"
3003
"reverting the files. If any files are specified, revert leaves the list\n"
3004
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3005
".`` in the tree root to revert all files but keep the recorded merges,\n"
3006
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3007
"reverting any files."
3008
msgstr ""
3009
3010
#: bzrlib/builtins.py:4752
3011
msgid ""
3012
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3013
"changes from a branch in a single revision. To do this, perform the merge\n"
3014
"as desired. Then doing revert with the \"--forget-merges\" option will "
3015
"keep\n"
3016
"the content of the tree as it was, but it will clear the list of pending\n"
3017
"merges. The next commit will then contain all of the changes that are\n"
3018
"present in the other branch, but without any other parent revisions.\n"
3019
"Because this technique forgets where these changes originated, it may\n"
3020
"cause additional conflicts on later merges involving the same source and\n"
3021
"target branches."
3022
msgstr ""
3023
3024
# help of 'no-backup' option of 'revert' command
3025
#: bzrlib/builtins.py:4766
3026
msgid "Do not save backups of reverted files."
3027
msgstr ""
3028
3029
# help of 'forget-merges' option of 'revert' command
3030
#: bzrlib/builtins.py:4768
3031
msgid "Remove pending merge marker, without changing any files."
3032
msgstr ""
3033
3034
#: bzrlib/builtins.py:4799
3035
msgid ""
3036
"Show help on a command or other topic.\n"
3037
" "
3038
msgstr ""
3039
3040
# help of 'long' option of 'help' command
3041
#: bzrlib/builtins.py:4804
3042
msgid "Show help on all commands."
3043
msgstr ""
3044
3045
#: bzrlib/builtins.py:4833
3046
msgid "Show unmerged/unpulled revisions between two branches."
3047
msgstr ""
3048
3049
#: bzrlib/builtins.py:4835
3050
msgid "OTHER_BRANCH may be local or remote."
3051
msgstr ""
3052
3053
#: bzrlib/builtins.py:4837
3054
msgid ""
3055
"To filter on a range of revisions, you can use the command -r begin..end\n"
3056
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3057
"also valid.\n"
3058
" \n"
3059
":Exit values:\n"
3060
" 1 - some missing revisions\n"
3061
" 0 - no missing revisions"
3062
msgstr ""
3063
3064
#: bzrlib/builtins.py:4847
3065
msgid ""
3066
" Determine the missing revisions between this and the branch at the\n"
3067
" remembered pull location::"
3068
msgstr ""
3069
3070
#: bzrlib/builtins.py:4850
3071
msgid " bzr missing"
3072
msgstr ""
3073
3074
#: bzrlib/builtins.py:4852
3075
msgid " Determine the missing revisions between this and another branch::"
3076
msgstr ""
3077
3078
#: bzrlib/builtins.py:4854
3079
msgid " bzr missing http://server/branch"
3080
msgstr ""
3081
3082
#: bzrlib/builtins.py:4856
3083
msgid ""
3084
" Determine the missing revisions up to a specific revision on the other\n"
3085
" branch::"
3086
msgstr ""
3087
3088
#: bzrlib/builtins.py:4859
3089
msgid " bzr missing -r ..-10"
3090
msgstr ""
3091
3092
#: bzrlib/builtins.py:4861
3093
msgid ""
3094
" Determine the missing revisions up to a specific revision on this\n"
3095
" branch::"
3096
msgstr ""
3097
3098
#: bzrlib/builtins.py:4864
3099
msgid " bzr missing --my-revision ..-10"
3100
msgstr ""
3101
3102
# help of 'reverse' option of 'missing' command
3103
#: bzrlib/builtins.py:4871
3104
msgid "Reverse the order of revisions."
3105
msgstr ""
3106
3107
# help of 'mine-only' option of 'missing' command
3108
#: bzrlib/builtins.py:4873
3109
msgid "Display changes in the local branch only."
3110
msgstr ""
3111
3112
# help of 'this' option of 'missing' command
3113
#: bzrlib/builtins.py:4874
3114
msgid "Same as --mine-only."
3115
msgstr ""
3116
3117
# help of 'theirs-only' option of 'missing' command
3118
#: bzrlib/builtins.py:4876
3119
msgid "Display changes in the remote branch only."
3120
msgstr ""
3121
3122
# help of 'other' option of 'missing' command
3123
#: bzrlib/builtins.py:4877
3124
msgid "Same as --theirs-only."
3125
msgstr ""
3126
3127
# help of 'revision' option of 'missing' command
3128
#: bzrlib/builtins.py:4882
3129
msgid ""
3130
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3131
"details."
3132
msgstr ""
3133
3134
# help of 'my-revision' option of 'missing' command
3135
#: bzrlib/builtins.py:4886
3136
msgid ""
3137
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3138
"details."
3139
msgstr ""
3140
3141
# help of 'include-merged' option of 'missing' command
3142
#: bzrlib/builtins.py:4889
3143
msgid "Show all revisions in addition to the mainline ones."
3144
msgstr ""
3145
3146
#: bzrlib/builtins.py:4943
3147
msgid "No peer location known or specified."
3148
msgstr ""
3149
3150
#: bzrlib/builtins.py:4947
3151
msgid "Using saved parent location: {0}\n"
3152
msgstr ""
3153
3154
#: bzrlib/builtins.py:4980
3155
#, python-format
3156
msgid "You have %d extra revision:\n"
3157
msgid_plural "You have %d extra revisions:\n"
3158
msgstr[0] ""
3159
msgstr[1] ""
3160
3161
#: bzrlib/builtins.py:4996
3162
#, python-format
3163
msgid "You are missing %d revision:\n"
3164
msgid_plural "You are missing %d revisions:\n"
3165
msgstr[0] ""
3166
msgstr[1] ""
3167
3168
#: bzrlib/builtins.py:5008
3169
msgid "This branch has no new revisions.\n"
3170
msgstr ""
3171
3172
#: bzrlib/builtins.py:5011
3173
msgid "Other branch has no new revisions.\n"
3174
msgstr ""
3175
3176
#: bzrlib/builtins.py:5016
3177
msgid "Branches are up to date.\n"
3178
msgstr ""
3179
3180
#: bzrlib/builtins.py:5027
3181
msgid "Compress the data within a repository."
3182
msgstr ""
3183
3184
#: bzrlib/builtins.py:5029
3185
msgid ""
3186
"This operation compresses the data within a bazaar repository. As\n"
3187
"bazaar supports automatic packing of repository, this operation is\n"
3188
"normally not required to be done manually."
3189
msgstr ""
3190
3191
#: bzrlib/builtins.py:5033
3192
msgid ""
3193
"During the pack operation, bazaar takes a backup of existing repository\n"
3194
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3195
"automatically when it is safe to do so. To save disk space by removing\n"
3196
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3197
"used."
3198
msgstr ""
3199
3200
#: bzrlib/builtins.py:5039
3201
msgid ""
3202
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3203
"during or immediately after repacking, you may be left with a state\n"
3204
"where the deletion has been written to disk but the new packs have not\n"
3205
"been. In this case the repository may be unusable."
3206
msgstr ""
3207
3208
# help of 'clean-obsolete-packs' option of 'pack' command
3209
#: bzrlib/builtins.py:5048
3210
msgid "Delete obsolete packs to save disk space."
3211
msgstr ""
3212
3213
#: bzrlib/builtins.py:5062
3214
msgid "List the installed plugins."
3215
msgstr ""
3216
3217
#: bzrlib/builtins.py:5064
3218
msgid ""
3219
"This command displays the list of installed plugins including\n"
3220
"version of plugin and a short description of each."
3221
msgstr ""
3222
3223
#: bzrlib/builtins.py:5067
3224
msgid "--verbose shows the path where each plugin is located."
3225
msgstr ""
3226
3227
#: bzrlib/builtins.py:5069
3228
msgid ""
3229
"A plugin is an external component for Bazaar that extends the\n"
3230
"revision control system, by adding or replacing code in Bazaar.\n"
3231
"Plugins can do a variety of things, including overriding commands,\n"
3232
"adding new commands, providing additional network transports and\n"
3233
"customizing log output."
3234
msgstr ""
3235
3236
#: bzrlib/builtins.py:5075
3237
msgid ""
3238
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3239
"for further information on plugins including where to find them and how to\n"
3240
"install them. Instructions are also provided there on how to write new\n"
3241
"plugins using the Python programming language."
3242
msgstr ""
3243
3244
#: bzrlib/builtins.py:5091
3245
msgid "Show testament (signing-form) of a revision."
3246
msgstr ""
3247
3248
# help of 'long' option of 'testament' command
3249
#: bzrlib/builtins.py:5094
3250
msgid "Produce long-format testament."
3251
msgstr ""
3252
3253
# help of 'strict' option of 'testament' command
3254
#: bzrlib/builtins.py:5096
3255
msgid "Produce a strict-format testament."
3256
msgstr ""
3257
3258
#: bzrlib/builtins.py:5122
3259
msgid "Show the origin of each line in a file."
3260
msgstr ""
3261
3262
#: bzrlib/builtins.py:5124
3263
msgid ""
3264
"This prints out the given file with an annotation on the left side\n"
3265
"indicating which revision, author and date introduced the change."
3266
msgstr ""
3267
3268
#: bzrlib/builtins.py:5127
3269
msgid ""
3270
"If the origin is the same for a run of consecutive lines, it is\n"
3271
"shown only at the top, unless the --all option is given."
3272
msgstr ""
3273
3274
# help of 'all' option of 'annotate' command
3275
#: bzrlib/builtins.py:5135
3276
msgid "Show annotations on all lines."
3277
msgstr ""
3278
3279
# help of 'long' option of 'annotate' command
3280
#: bzrlib/builtins.py:5136
3281
msgid "Show commit date in annotations."
3282
msgstr ""
3283
3284
#: bzrlib/builtins.py:5223
3285
msgid "Cannot sign a range of non-revision-history revisions"
3286
msgstr ""
3287
3288
#: bzrlib/builtins.py:5235
3289
msgid "Please supply either one revision, or a range."
3290
msgstr ""
3291
3292
#: bzrlib/builtins.py:5239
3293
msgid ""
3294
"Convert the current branch into a checkout of the supplied branch.\n"
3295
"If no branch is supplied, rebind to the last bound location."
3296
msgstr ""
3297
3298
#: bzrlib/builtins.py:5242
3299
msgid ""
3300
"Once converted into a checkout, commits must succeed on the master branch\n"
3301
"before they will be applied to the local branch."
3302
msgstr ""
3303
3304
#: bzrlib/builtins.py:5245
3305
msgid ""
3306
"Bound branches use the nickname of its master branch unless it is set\n"
3307
"locally, in which case binding will update the local nickname to be\n"
3308
"that of the master."
3309
msgstr ""
3310
3311
#: bzrlib/builtins.py:5260
3312
msgid "No location supplied. This format does not remember old locations."
3313
msgstr ""
3314
3315
#: bzrlib/builtins.py:5265
3316
msgid "Branch is already bound"
3317
msgstr ""
3318
3319
#: bzrlib/builtins.py:5267
3320
msgid "No location supplied and no previous location known"
3321
msgstr ""
3322
3323
#: bzrlib/builtins.py:5273
3324
msgid "These branches have diverged. Try merging, and then bind again."
3325
msgstr ""
3326
3327
#: bzrlib/builtins.py:5280
3328
msgid "Convert the current checkout into a regular branch."
3329
msgstr ""
3330
3331
#: bzrlib/builtins.py:5282
3332
msgid ""
3333
"After unbinding, the local branch is considered independent and subsequent\n"
3334
"commits will be local only."
3335
msgstr ""
3336
3337
#: bzrlib/builtins.py:5293
3338
msgid "Local branch is not bound"
3339
msgstr ""
3340
3341
#: bzrlib/builtins.py:5297
3342
msgid "Remove the last committed revision."
3343
msgstr ""
3344
3345
#: bzrlib/builtins.py:5299
3346
msgid ""
3347
"--verbose will print out what is being removed.\n"
3348
"--dry-run will go through all the motions, but not actually\n"
3349
"remove anything."
3350
msgstr ""
3351
3352
#: bzrlib/builtins.py:5303
3353
msgid ""
3354
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3355
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3356
"branch at revision 15."
3357
msgstr ""
3358
3359
#: bzrlib/builtins.py:5307
3360
msgid ""
3361
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3362
"it may make is to restore any pending merges that were present before\n"
3363
"the commit."
3364
msgstr ""
3365
3366
# help of 'dry-run' option of 'uncommit' command
3367
#: bzrlib/builtins.py:5318
3368
msgid "Don't actually make changes."
3369
msgstr ""
3370
3371
# help of 'force' option of 'uncommit' command
3372
#: bzrlib/builtins.py:5319
3373
msgid "Say yes to all questions."
3374
msgstr ""
3375
3376
# help of 'keep-tags' option of 'uncommit' command
3377
#: bzrlib/builtins.py:5321
3378
msgid "Keep tags that point to removed revisions."
3379
msgstr ""
3380
3381
# help of 'local' option of 'uncommit' command
3382
#: bzrlib/builtins.py:5323
3383
msgid "Only remove the commits from the local branch when in a checkout."
3384
msgstr ""
3385
3386
#: bzrlib/builtins.py:5372
3387
msgid "No revisions to uncommit.\n"
3388
msgstr ""
3389
3390
#: bzrlib/builtins.py:5387
3391
msgid "Dry-run, pretending to remove the above revisions.\n"
3392
msgstr ""
3393
3394
#: bzrlib/builtins.py:5390
3395
msgid "The above revision(s) will be removed.\n"
3396
msgstr ""
3397
3398
#: bzrlib/builtins.py:5394
3399
msgid "Uncommit these revisions"
3400
msgstr ""
3401
3402
#: bzrlib/builtins.py:5397
3403
msgid "Canceled\n"
3404
msgstr ""
3405
3406
#: bzrlib/builtins.py:5404
3407
#, python-format
3408
msgid ""
3409
"You can restore the old tip by running:\n"
3410
" bzr pull . -r revid:%s\n"
3411
msgstr ""
3412
3413
#: bzrlib/builtins.py:5409
3414
msgid "Break a dead lock."
3415
msgstr ""
3416
3417
#: bzrlib/builtins.py:5411
3418
msgid ""
3419
"This command breaks a lock on a repository, branch, working directory or\n"
3420
"config file."
3421
msgstr ""
3422
3423
#: bzrlib/builtins.py:5414
3424
msgid ""
3425
"CAUTION: Locks should only be broken when you are sure that the process\n"
3426
"holding the lock has been stopped."
3427
msgstr ""
3428
3429
#: bzrlib/builtins.py:5417
3430
msgid ""
3431
"You can get information on what locks are open via the 'bzr info\n"
3432
"[location]' command."
3433
msgstr ""
3434
3435
#: bzrlib/builtins.py:5420
3436
msgid ""
3437
":Examples:\n"
3438
" bzr break-lock\n"
3439
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3440
" bzr break-lock --conf ~/.bazaar"
3441
msgstr ""
3442
3443
# help of 'config' option of 'break-lock' command
3444
#: bzrlib/builtins.py:5429
3445
msgid "LOCATION is the directory where the config lock is."
3446
msgstr ""
3447
3448
# help of 'force' option of 'break-lock' command
3449
#: bzrlib/builtins.py:5431
3450
msgid "Do not ask for confirmation before breaking the lock."
3451
msgstr ""
3452
3453
# help of 'protocol=bzr' option of 'serve' command
3454
#: bzrlib/builtins.py:5466
3455
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3456
msgstr ""
3457
3458
#: bzrlib/builtins.py:5467
3459
msgid "Run the bzr server."
3460
msgstr ""
3461
3462
# help of 'inet' option of 'serve' command
3463
#: bzrlib/builtins.py:5473
3464
msgid "Serve on stdin/out for use from inetd or sshd."
3465
msgstr ""
3466
3467
# title of 'protocol' option of 'serve' command
3468
#: bzrlib/builtins.py:5474
3469
msgid "protocol"
3470
msgstr ""
3471
3472
# help of 'protocol' option of 'serve' command
3473
#: bzrlib/builtins.py:5475
3474
msgid "Protocol to serve."
3475
msgstr ""
3476
3477
# help of 'port' option of 'serve' command
3478
#: bzrlib/builtins.py:5479
3479
msgid ""
3480
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3481
"Passing 0 as the port number will result in a dynamically allocated port. "
3482
"The default port depends on the protocol."
3483
msgstr ""
3484
3485
# help of 'directory' option of 'serve' command
3486
#: bzrlib/builtins.py:5485
3487
msgid "Serve contents of this directory."
3488
msgstr ""
3489
3490
# help of 'allow-writes' option of 'serve' command
3491
#: bzrlib/builtins.py:5487
3492
msgid ""
3493
"By default the server is a readonly server. Supplying --allow-writes "
3494
"enables write access to the contents of the served directory and below. "
3495
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3496
"of external authentication is arranged supplying this option leads to global "
3497
"uncontrolled write access to your file system."
3498
msgstr ""
3499
3500
# help of 'client-timeout' option of 'serve' command
3501
#: bzrlib/builtins.py:5496
3502
msgid "Override the default idle client timeout (5min)."
3503
msgstr ""
3504
3505
#: bzrlib/builtins.py:5546
3506
msgid "Combine a tree into its containing tree."
3507
msgstr ""
3508
3509
#: bzrlib/builtins.py:5548
3510
msgid "This command requires the target tree to be in a rich-root format."
3511
msgstr ""
3512
3513
#: bzrlib/builtins.py:5550
3514
msgid ""
3515
"The TREE argument should be an independent tree, inside another tree, but\n"
3516
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3517
"running \"bzr branch\" with the target inside a tree.)"
3518
msgstr ""
3519
3520
#: bzrlib/builtins.py:5554
3521
msgid ""
3522
"The result is a combined tree, with the subtree no longer an independent\n"
3523
"part. This is marked as a merge of the subtree into the containing tree,\n"
3524
"and all history is preserved."
3525
msgstr ""
3526
3527
#: bzrlib/builtins.py:5572
3528
#, python-format
3529
msgid ""
3530
"Can't join trees because %s doesn't support rich root data.\n"
3531
"You can use bzr upgrade on the repository."
3532
msgstr ""
3533
3534
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3535
msgid "Cannot join {0}. {1}"
3536
msgstr ""
3537
3538
#: bzrlib/builtins.py:5592
3539
msgid "Split a subdirectory of a tree into a separate tree."
3540
msgstr ""
3541
3542
#: bzrlib/builtins.py:5594
3543
msgid ""
3544
"This command will produce a target tree in a format that supports\n"
3545
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3546
"converted into earlier formats like 'dirstate-tags'."
3547
msgstr ""
3548
3549
#: bzrlib/builtins.py:5598
3550
msgid ""
3551
"The TREE argument should be a subdirectory of a working tree. That\n"
3552
"subdirectory will be converted into an independent tree, with its own\n"
3553
"branch. Commits in the top-level tree will not apply to the new subtree."
3554
msgstr ""
3555
3556
#: bzrlib/builtins.py:5678
3557
msgid "No submit branch specified or known"
3558
msgstr ""
3559
3560
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3561
msgid "No public branch specified or known"
3562
msgstr ""
3563
3564
#: bzrlib/builtins.py:5691
3565
msgid "bzr merge-directive takes at most two one revision identifiers"
3566
msgstr ""
3567
3568
#: bzrlib/builtins.py:5700
3569
msgid "No revisions to bundle."
3570
msgstr ""
3571
3572
#: bzrlib/builtins.py:5719
3573
msgid "Mail or create a merge-directive for submitting changes."
3574
msgstr ""
3575
3576
#: bzrlib/builtins.py:5721
3577
msgid "A merge directive provides many things needed for requesting merges:"
3578
msgstr ""
3579
3580
#: bzrlib/builtins.py:5723
3581
msgid "* A machine-readable description of the merge to perform"
3582
msgstr ""
3583
3584
#: bzrlib/builtins.py:5725
3585
msgid "* An optional patch that is a preview of the changes requested"
3586
msgstr ""
3587
3588
#: bzrlib/builtins.py:5727
3589
msgid ""
3590
"* An optional bundle of revision data, so that the changes can be applied\n"
3591
" directly from the merge directive, without retrieving data from a\n"
3592
" branch."
3593
msgstr ""
3594
3595
#: bzrlib/builtins.py:5731
3596
msgid ""
3597
"`bzr send` creates a compact data set that, when applied using bzr\n"
3598
"merge, has the same effect as merging from the source branch. "
3599
msgstr ""
3600
3601
#: bzrlib/builtins.py:5734
3602
msgid ""
3603
"By default the merge directive is self-contained and can be applied to any\n"
3604
"branch containing submit_branch in its ancestory without needing access to\n"
3605
"the source branch."
3606
msgstr ""
3607
3608
#: bzrlib/builtins.py:5738
3609
msgid ""
3610
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3611
"revisions, but only a structured request to merge from the\n"
3612
"public_location. In that case the public_branch is needed and it must be\n"
3613
"up-to-date and accessible to the recipient. The public_branch is always\n"
3614
"included if known, so that people can check it later."
3615
msgstr ""
3616
3617
#: bzrlib/builtins.py:5744
3618
msgid ""
3619
"The submit branch defaults to the parent of the source branch, but can be\n"
3620
"overridden. Both submit branch and public branch will be remembered in\n"
3621
"branch.conf the first time they are used for a particular branch. The\n"
3622
"source branch defaults to that containing the working directory, but can\n"
3623
"be changed using --from."
3624
msgstr ""
3625
3626
#: bzrlib/builtins.py:5750
3627
msgid ""
3628
"Both the submit branch and the public branch follow the usual behavior with\n"
3629
"respect to --remember: If there is no default location set, the first send\n"
3630
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3631
"omit the location to use the default. To change the default, use\n"
3632
"--remember. The value will only be saved if the location can be accessed."
3633
msgstr ""
3634
3635
#: bzrlib/builtins.py:5756
3636
msgid ""
3637
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3638
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3639
"If a public location is known for the submit_branch, that location is used\n"
3640
"in the merge directive."
3641
msgstr ""
3642
3643
#: bzrlib/builtins.py:5761
3644
msgid ""
3645
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3646
"given, in which case it is sent to a file."
3647
msgstr ""
3648
3649
#: bzrlib/builtins.py:5764
3650
msgid ""
3651
"Mail is sent using your preferred mail program. This should be transparent\n"
3652
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3653
"If the preferred client can't be found (or used), your editor will be used."
3654
msgstr ""
3655
3656
#: bzrlib/builtins.py:5768
3657
msgid ""
3658
"To use a specific mail program, set the mail_client configuration option.\n"
3659
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3660
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
3661
"\" (MacOS X's\n"
3662
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3663
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3664
"add\n"
3665
"supported clients."
3666
msgstr ""
3667
3668
#: bzrlib/builtins.py:5775
3669
msgid ""
3670
"If mail is being sent, a to address is required. This can be supplied\n"
3671
"either on the commandline, by setting the submit_to configuration\n"
3672
"option in the branch itself or the child_submit_to configuration option\n"
3673
"in the submit branch."
3674
msgstr ""
3675
3676
#: bzrlib/builtins.py:5780
3677
msgid ""
3678
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3679
"and\n"
3680
"merge directive format 2. It is significantly faster and smaller than\n"
3681
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3682
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3683
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3684
msgstr ""
3685
3686
#: bzrlib/builtins.py:5786
3687
msgid ""
3688
"The merge directives created by bzr send may be applied using bzr merge or\n"
3689
"bzr pull by specifying a file containing a merge directive as the location."
3690
msgstr ""
3691
3692
#: bzrlib/builtins.py:5789
3693
msgid ""
3694
"bzr send makes extensive use of public locations to map local locations "
3695
"into\n"
3696
"URLs that can be used by other people. See `bzr help configuration` to\n"
3697
"set them, and use `bzr info` to display them."
3698
msgstr ""
3699
3700
# help of 'output' option of 'send' command
3701
#: bzrlib/builtins.py:5813
3702
msgid "Write merge directive to this file or directory; use - for stdout."
3703
msgstr ""
3704
3705
# help of 'strict' option of 'send' command
3706
#: bzrlib/builtins.py:5817
3707
msgid ""
3708
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3709
"strict disables the check."
3710
msgstr ""
3711
3712
# help of 'mail-to' option of 'send' command
3713
#: bzrlib/builtins.py:5819
3714
msgid "Mail the request to this address."
3715
msgstr ""
3716
3717
# help of 'body' option of 'send' command
3718
#: bzrlib/builtins.py:5823
3719
msgid "Body for the email."
3720
msgstr ""
3721
3722
# help of 'no-bundle' option of 'send' command
3723
#: bzrlib/builtins.py:5876
3724
msgid "Do not include a bundle in the merge directive."
3725
msgstr ""
3726
3727
# help of 'no-patch' option of 'send' command
3728
#: bzrlib/builtins.py:5877
3729
msgid "Do not include a preview patch in the merge directive."
3730
msgstr ""
3731
3732
# help of 'remember' option of 'send' command
3733
#: bzrlib/builtins.py:5880
3734
msgid "Remember submit and public branch."
3735
msgstr ""
3736
3737
# help of 'from' option of 'send' command
3738
#: bzrlib/builtins.py:5882
3739
msgid ""
3740
"Branch to generate the submission from, rather than the one containing the "
3741
"working directory."
3742
msgstr ""
3743
3744
# title of 'format' option of 'send' command
3745
# title of 'format' option of 'version-info' command
3746
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3747
msgid "format"
3748
msgstr ""
3749
3750
# help of 'format' option of 'send' command
3751
#: bzrlib/builtins.py:5893
3752
msgid "Use the specified output format."
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:5915
3756
msgid "Create, remove or modify a tag naming a revision."
3757
msgstr ""
3758
3759
#: bzrlib/builtins.py:5917
3760
msgid ""
3761
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3762
"(--revision) option can be given -rtag:X, where X is any previously\n"
3763
"created tag."
3764
msgstr ""
3765
3766
#: bzrlib/builtins.py:5921
3767
msgid ""
3768
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3769
"along when you branch, push, pull or merge."
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:5924
3773
msgid ""
3774
"It is an error to give a tag name that already exists unless you pass\n"
3775
"--force, in which case the tag is moved to point to the new revision."
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:5927
3779
msgid ""
3780
"To rename a tag (change the name but keep it on the same revsion), run "
3781
"``bzr\n"
3782
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3783
msgstr ""
3784
3785
#: bzrlib/builtins.py:5930
3786
msgid ""
3787
"If no tag name is specified it will be determined through the \n"
3788
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3789
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3790
"details."
3791
msgstr ""
3792
3793
# help of 'delete' option of 'tag' command
3794
#: bzrlib/builtins.py:5940
3795
msgid "Delete this tag rather than placing it."
3796
msgstr ""
3797
3798
# help of 'directory' option of 'tag' command
3799
#: bzrlib/builtins.py:5943
3800
msgid "Branch in which to place the tag."
3801
msgstr ""
3802
3803
# help of 'force' option of 'tag' command
3804
#: bzrlib/builtins.py:5945
3805
msgid "Replace existing tags."
3806
msgstr ""
3807
3808
#: bzrlib/builtins.py:5960
3809
msgid "No tag specified to delete."
3810
msgstr ""
3811
3812
#: bzrlib/builtins.py:5962
3813
#, python-format
3814
msgid "Deleted tag %s."
3815
msgstr ""
3816
3817
#: bzrlib/builtins.py:5976
3818
msgid "Please specify a tag name."
3819
msgstr ""
3820
3821
#: bzrlib/builtins.py:5984
3822
#, python-format
3823
msgid "Tag %s already exists for that revision."
3824
msgstr ""
3825
3826
#: bzrlib/builtins.py:5988
3827
#, python-format
3828
msgid "Created tag %s."
3829
msgstr ""
3830
3831
#: bzrlib/builtins.py:5990
3832
#, python-format
3833
msgid "Updated tag %s."
3834
msgstr ""
3835
3836
#: bzrlib/builtins.py:5994
3837
msgid "List tags."
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:5996
3841
msgid ""
3842
"This command shows a table of tag names and the revisions they reference."
3843
msgstr ""
3844
3845
# help of 'directory' option of 'tags' command
3846
#: bzrlib/builtins.py:6002
3847
msgid "Branch whose tags should be displayed."
3848
msgstr ""
3849
3850
# help of 'sort' option of 'tags' command
3851
#: bzrlib/builtins.py:6004
3852
msgid "Sort tags by different criteria."
3853
msgstr ""
3854
3855
# title of 'sort' option of 'tags' command
3856
#: bzrlib/builtins.py:6004
3857
msgid "Sorting"
3858
msgstr ""
3859
3860
#: bzrlib/builtins.py:6073
3861
msgid "Reconfigure the type of a bzr directory."
3862
msgstr ""
3863
3864
#: bzrlib/builtins.py:6075
3865
msgid "A target configuration must be specified."
3866
msgstr ""
3867
3868
#: bzrlib/builtins.py:6077
3869
msgid ""
3870
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3871
"The order of preference is\n"
3872
"1. For a lightweight checkout, the current bound location.\n"
3873
"2. For branches that used to be checkouts, the previously-bound location.\n"
3874
"3. The push location.\n"
3875
"4. The parent location.\n"
3876
"If none of these is available, --bind-to must be specified."
3877
msgstr ""
3878
3879
# title of 'tree_type' option of 'reconfigure' command
3880
#: bzrlib/builtins.py:6091
3881
msgid "Tree type"
3882
msgstr ""
3883
3884
# help of 'tree_type' option of 'reconfigure' command
3885
#: bzrlib/builtins.py:6092
3886
msgid "The relation between branch and tree."
3887
msgstr ""
3888
3889
# help of 'tree_type=branch' option of 'reconfigure' command
3890
#: bzrlib/builtins.py:6094
3891
msgid "Reconfigure to be an unbound branch with no working tree."
3892
msgstr ""
3893
3894
# help of 'tree_type=tree' option of 'reconfigure' command
3895
#: bzrlib/builtins.py:6095
3896
msgid "Reconfigure to be an unbound branch with a working tree."
3897
msgstr ""
3898
3899
# help of 'tree_type=checkout' option of 'reconfigure' command
3900
#: bzrlib/builtins.py:6096
3901
msgid "Reconfigure to be a bound branch with a working tree."
3902
msgstr ""
3903
3904
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3905
#: bzrlib/builtins.py:6097
3906
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3907
msgstr ""
3908
3909
# title of 'repository_type' option of 'reconfigure' command
3910
#: bzrlib/builtins.py:6102
3911
msgid "Repository type"
3912
msgstr ""
3913
3914
# help of 'repository_type' option of 'reconfigure' command
3915
#: bzrlib/builtins.py:6103
3916
msgid "Location fo the repository."
3917
msgstr ""
3918
3919
# help of 'repository_type=standalone' option of 'reconfigure' command
3920
#: bzrlib/builtins.py:6105
3921
msgid ""
3922
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3923
msgstr ""
3924
3925
# help of 'repository_type=use-shared' option of 'reconfigure' command
3926
#: bzrlib/builtins.py:6107
3927
msgid "Reconfigure to use a shared repository."
3928
msgstr ""
3929
3930
# title of 'repository_trees' option of 'reconfigure' command
3931
#: bzrlib/builtins.py:6111
3932
msgid "Trees in Repository"
3933
msgstr ""
3934
3935
# help of 'repository_trees' option of 'reconfigure' command
3936
#: bzrlib/builtins.py:6112
3937
msgid "Whether new branches in the repository have trees."
3938
msgstr ""
3939
3940
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3941
#: bzrlib/builtins.py:6114
3942
msgid "Reconfigure repository to create working trees on branches by default."
3943
msgstr ""
3944
3945
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3946
#: bzrlib/builtins.py:6116
3947
msgid ""
3948
"Reconfigure repository to not create working trees on branches by default."
3949
msgstr ""
3950
3951
# help of 'bind-to' option of 'reconfigure' command
3952
#: bzrlib/builtins.py:6119
3953
msgid "Branch to bind checkout to."
3954
msgstr ""
3955
3956
# help of 'force' option of 'reconfigure' command
3957
#: bzrlib/builtins.py:6121
3958
msgid "Perform reconfiguration even if local changes will be lost."
3959
msgstr ""
3960
3961
# help of 'stacked-on' option of 'reconfigure' command
3962
#: bzrlib/builtins.py:6124
3963
msgid "Reconfigure a branch to be stacked on another branch."
3964
msgstr ""
3965
3966
# help of 'unstacked' option of 'reconfigure' command
3967
#: bzrlib/builtins.py:6128
3968
msgid ""
3969
"Reconfigure a branch to be unstacked. This may require copying substantial "
3970
"data into it."
3971
msgstr ""
3972
3973
#: bzrlib/builtins.py:6138
3974
msgid "Can't use both --stacked-on and --unstacked"
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:6152
3978
msgid "No target configuration specified"
3979
msgstr ""
3980
3981
#: bzrlib/builtins.py:6187
3982
msgid "Set the branch of a checkout and update."
3983
msgstr ""
3984
3985
#: bzrlib/builtins.py:6189
3986
msgid ""
3987
"For lightweight checkouts, this changes the branch being referenced.\n"
3988
"For heavyweight checkouts, this checks that there are no local commits\n"
3989
"versus the current bound branch, then it makes the local branch a mirror\n"
3990
"of the new location and binds to it."
3991
msgstr ""
3992
3993
#: bzrlib/builtins.py:6194
3994
msgid ""
3995
"In both cases, the working tree is updated and uncommitted changes\n"
3996
"are merged. The user can commit or revert these as they desire."
3997
msgstr ""
3998
3999
#: bzrlib/builtins.py:6197
4000
msgid "Pending merges need to be committed or reverted before using switch."
4001
msgstr ""
4002
4003
#: bzrlib/builtins.py:6199
4004
msgid ""
4005
"The path to the branch to switch to can be specified relative to the parent\n"
4006
"directory of the current branch. For example, if you are currently in a\n"
4007
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4008
"/path/to/newbranch."
4009
msgstr ""
4010
4011
#: bzrlib/builtins.py:6204
4012
msgid ""
4013
"Bound branches use the nickname of its master branch unless it is set\n"
4014
"locally, in which case switching will update the local nickname to be\n"
4015
"that of the master."
4016
msgstr ""
4017
4018
# help of 'force' option of 'switch' command
4019
#: bzrlib/builtins.py:6212
4020
msgid "Switch even if local commits will be lost."
4021
msgstr ""
4022
4023
# help of 'create-branch' option of 'switch' command
4024
#: bzrlib/builtins.py:6215
4025
msgid "Create the target branch from this one before switching to it."
4026
msgstr ""
4027
4028
#: bzrlib/builtins.py:6229
4029
msgid "You must supply either a revision or a location"
4030
msgstr ""
4031
4032
#: bzrlib/builtins.py:6242
4033
msgid "cannot create branch without source branch"
4034
msgstr ""
4035
4036
#: bzrlib/builtins.py:6262
4037
msgid "Manage filtered views."
4038
msgstr ""
4039
4040
#: bzrlib/builtins.py:6264
4041
msgid ""
4042
"Views provide a mask over the tree so that users can focus on\n"
4043
"a subset of a tree when doing their work. After creating a view,\n"
4044
"commands that support a list of files - status, diff, commit, etc -\n"
4045
"effectively have that list of files implicitly given each time.\n"
4046
"An explicit list of files can still be given but those files\n"
4047
"must be within the current view."
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6271
4051
msgid ""
4052
"In most cases, a view has a short life-span: it is created to make\n"
4053
"a selected change and is deleted once that change is committed.\n"
4054
"At other times, you may wish to create one or more named views\n"
4055
"and switch between them."
4056
msgstr ""
4057
4058
#: bzrlib/builtins.py:6276
4059
msgid ""
4060
"To disable the current view without deleting it, you can switch to\n"
4061
"the pseudo view called ``off``. This can be useful when you need\n"
4062
"to see the whole tree for an operation or two (e.g. merge) but\n"
4063
"want to switch back to your view after that."
4064
msgstr ""
4065
4066
#: bzrlib/builtins.py:6281
4067
msgid ""
4068
":Examples:\n"
4069
" To define the current view::"
4070
msgstr ""
4071
4072
#: bzrlib/builtins.py:6284
4073
msgid " bzr view file1 dir1 ..."
4074
msgstr ""
4075
4076
#: bzrlib/builtins.py:6286
4077
msgid " To list the current view::"
4078
msgstr ""
4079
4080
#: bzrlib/builtins.py:6288
4081
msgid " bzr view"
4082
msgstr ""
4083
4084
#: bzrlib/builtins.py:6290
4085
msgid " To delete the current view::"
4086
msgstr ""
4087
4088
#: bzrlib/builtins.py:6292
4089
msgid " bzr view --delete"
4090
msgstr ""
4091
4092
#: bzrlib/builtins.py:6294
4093
msgid " To disable the current view without deleting it::"
4094
msgstr ""
4095
4096
#: bzrlib/builtins.py:6296
4097
msgid " bzr view --switch off"
4098
msgstr ""
4099
4100
#: bzrlib/builtins.py:6298
4101
msgid " To define a named view and switch to it::"
4102
msgstr ""
4103
4104
#: bzrlib/builtins.py:6300
4105
msgid " bzr view --name view-name file1 dir1 ..."
4106
msgstr ""
4107
4108
#: bzrlib/builtins.py:6302
4109
msgid " To list a named view::"
4110
msgstr ""
4111
4112
#: bzrlib/builtins.py:6304
4113
msgid " bzr view --name view-name"
4114
msgstr ""
4115
4116
#: bzrlib/builtins.py:6306
4117
msgid " To delete a named view::"
4118
msgstr ""
4119
4120
#: bzrlib/builtins.py:6308
4121
msgid " bzr view --name view-name --delete"
4122
msgstr ""
4123
4124
#: bzrlib/builtins.py:6310
4125
msgid " To switch to a named view::"
4126
msgstr ""
4127
4128
#: bzrlib/builtins.py:6312
4129
msgid " bzr view --switch view-name"
4130
msgstr ""
4131
4132
#: bzrlib/builtins.py:6314
4133
msgid " To list all views defined::"
4134
msgstr ""
4135
4136
#: bzrlib/builtins.py:6316
4137
msgid " bzr view --all"
4138
msgstr ""
4139
4140
#: bzrlib/builtins.py:6318
4141
msgid " To delete all views::"
4142
msgstr ""
4143
4144
#: bzrlib/builtins.py:6320
4145
msgid " bzr view --delete --all"
4146
msgstr ""
4147
4148
# help of 'all' option of 'view' command
4149
#: bzrlib/builtins.py:6327
4150
msgid "Apply list or delete action to all views."
4151
msgstr ""
4152
4153
# help of 'delete' option of 'view' command
4154
#: bzrlib/builtins.py:6330
4155
msgid "Delete the view."
4156
msgstr ""
4157
4158
# help of 'name' option of 'view' command
4159
#: bzrlib/builtins.py:6333
4160
msgid "Name of the view to define, list or delete."
4161
msgstr ""
4162
4163
# help of 'switch' option of 'view' command
4164
#: bzrlib/builtins.py:6337
4165
msgid "Name of the view to switch to."
4166
msgstr ""
4167
4168
#: bzrlib/builtins.py:6356
4169
msgid "Both --delete and a file list specified"
4170
msgstr ""
4171
4172
#: bzrlib/builtins.py:6359
4173
msgid "Both --delete and --switch specified"
4174
msgstr ""
4175
4176
#: bzrlib/builtins.py:6362
4177
msgid "Deleted all views.\n"
4178
msgstr ""
4179
4180
#: bzrlib/builtins.py:6364
4181
msgid "No current view to delete"
4182
msgstr ""
4183
4184
#: bzrlib/builtins.py:6367
4185
#, python-format
4186
msgid "Deleted '%s' view.\n"
4187
msgstr ""
4188
4189
#: bzrlib/builtins.py:6371
4190
msgid "Both --switch and a file list specified"
4191
msgstr ""
4192
4193
#: bzrlib/builtins.py:6374
4194
msgid "Both --switch and --all specified"
4195
msgstr ""
4196
4197
#: bzrlib/builtins.py:6377
4198
msgid "No current view to disable"
4199
msgstr ""
4200
4201
#: bzrlib/builtins.py:6379
4202
#, python-format
4203
msgid "Disabled '%s' view.\n"
4204
msgstr ""
4205
4206
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4207
msgid "Using '{0}' view: {1}\n"
4208
msgstr ""
4209
4210
#: bzrlib/builtins.py:6386
4211
msgid "Views defined:\n"
4212
msgstr ""
4213
4214
#: bzrlib/builtins.py:6395
4215
msgid "No views defined.\n"
4216
msgstr ""
4217
4218
#: bzrlib/builtins.py:6402
4219
msgid "Cannot change the 'off' pseudo view"
4220
msgstr ""
4221
4222
#: bzrlib/builtins.py:6410
4223
msgid "No current view.\n"
4224
msgstr ""
4225
4226
#: bzrlib/builtins.py:6413
4227
msgid "'{0}' view is: {1}\n"
4228
msgstr ""
4229
4230
#: bzrlib/builtins.py:6433
4231
msgid " <no hooks installed>\n"
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:6437
4235
msgid "Remove a branch."
4236
msgstr ""
4237
4238
#: bzrlib/builtins.py:6439
4239
msgid ""
4240
"This will remove the branch from the specified location but \n"
4241
"will keep any working tree or repository in place."
4242
msgstr ""
4243
4244
#: bzrlib/builtins.py:6444
4245
msgid " Remove the branch at repo/trunk::"
4246
msgstr ""
4247
4248
#: bzrlib/builtins.py:6446
4249
msgid " bzr remove-branch repo/trunk"
4250
msgstr ""
4251
4252
# help of 'writer=plain' option of 'shelve' command
4253
#: bzrlib/builtins.py:6461
4254
msgid "Plaintext diff output."
4255
msgstr ""
4256
4257
#: bzrlib/builtins.py:6462
4258
msgid "Temporarily set aside some changes from the current tree."
4259
msgstr ""
4260
4261
#: bzrlib/builtins.py:6464
4262
msgid ""
4263
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4264
"ie. out of the way, until a later time when you can bring them back from\n"
4265
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4266
"your working tree, and so they aren't propagated along with your branch nor\n"
4267
"will they survive its deletion."
4268
msgstr ""
4269
4270
#: bzrlib/builtins.py:6470
4271
msgid "If shelve --list is specified, previously-shelved changes are listed."
4272
msgstr ""
4273
4274
#: bzrlib/builtins.py:6472
4275
msgid ""
4276
"Shelve is intended to help separate several sets of changes that have\n"
4277
"been inappropriately mingled. If you just want to get rid of all changes\n"
4278
"and you don't need to restore them later, use revert. If you want to\n"
4279
"shelve all text changes at once, use shelve --all."
4280
msgstr ""
4281
4282
#: bzrlib/builtins.py:6477
4283
msgid ""
4284
"If filenames are specified, only the changes to those files will be\n"
4285
"shelved. Other files will be left untouched."
4286
msgstr ""
4287
4288
#: bzrlib/builtins.py:6480
4289
msgid ""
4290
"If a revision is specified, changes since that revision will be shelved."
4291
msgstr ""
4292
4293
#: bzrlib/builtins.py:6482
4294
msgid ""
4295
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4296
"restore the most recently shelved changes."
4297
msgstr ""
4298
4299
#: bzrlib/builtins.py:6485
4300
msgid ""
4301
"For complicated changes, it is possible to edit the changes in a separate\n"
4302
"editor program to decide what the file remaining in the working copy\n"
4303
"should look like. To do this, add the configuration option"
4304
msgstr ""
4305
4306
#: bzrlib/builtins.py:6489
4307
msgid " change_editor = PROGRAM @new_path @old_path"
4308
msgstr ""
4309
4310
#: bzrlib/builtins.py:6491
4311
msgid ""
4312
"where @new_path is replaced with the path of the new version of the \n"
4313
"file and @old_path is replaced with the path of the old version of \n"
4314
"the file. The PROGRAM should save the new file with the desired \n"
4315
"contents of the file in the working tree.\n"
4316
" "
4317
msgstr ""
4318
4319
# help of 'all' option of 'shelve' command
4320
#: bzrlib/builtins.py:6503
4321
msgid "Shelve all changes."
4322
msgstr ""
4323
4324
# help of 'writer' option of 'shelve' command
4325
#: bzrlib/builtins.py:6505
4326
msgid "Method to use for writing diffs."
4327
msgstr ""
4328
4329
# title of 'writer' option of 'shelve' command
4330
#: bzrlib/builtins.py:6505
4331
msgid "writer"
4332
msgstr ""
4333
4334
# help of 'list' option of 'shelve' command
4335
#: bzrlib/builtins.py:6509
4336
msgid "List shelved changes."
4337
msgstr ""
4338
4339
# help of 'destroy' option of 'shelve' command
4340
#: bzrlib/builtins.py:6511
4341
msgid "Destroy removed changes instead of shelving them."
4342
msgstr ""
4343
4344
#: bzrlib/builtins.py:6540
4345
msgid "No shelved changes."
4346
msgstr ""
4347
4348
#: bzrlib/builtins.py:6551
4349
msgid "Restore shelved changes."
4350
msgstr ""
4351
4352
#: bzrlib/builtins.py:6553
4353
msgid ""
4354
"By default, the most recently shelved changes are restored. However if you\n"
4355
"specify a shelf by id those changes will be restored instead. This works\n"
4356
"best when the changes don't depend on each other."
4357
msgstr ""
4358
4359
# help of 'action' option of 'unshelve' command
4360
#: bzrlib/builtins.py:6562
4361
msgid "The action to perform."
4362
msgstr ""
4363
4364
# title of 'action' option of 'resolve' command
4365
# title of 'action' option of 'unshelve' command
4366
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4367
msgid "action"
4368
msgstr ""
4369
4370
# help of 'action=apply' option of 'unshelve' command
4371
#: bzrlib/builtins.py:6564
4372
msgid "Apply changes and remove from the shelf."
4373
msgstr ""
4374
4375
# help of 'action=dry-run' option of 'unshelve' command
4376
#: bzrlib/builtins.py:6565
4377
msgid "Show changes, but do not apply or remove them."
4378
msgstr ""
4379
4380
# help of 'action=preview' option of 'unshelve' command
4381
#: bzrlib/builtins.py:6566
4382
msgid ""
4383
"Instead of unshelving the changes, show the diff that would result from "
4384
"unshelving."
4385
msgstr ""
4386
4387
# help of 'action=delete-only' option of 'unshelve' command
4388
#: bzrlib/builtins.py:6568
4389
msgid "Delete changes without applying them."
4390
msgstr ""
4391
4392
# help of 'action=keep' option of 'unshelve' command
4393
#: bzrlib/builtins.py:6569
4394
msgid "Apply changes but don't delete them."
4395
msgstr ""
4396
4397
#: bzrlib/builtins.py:6584
4398
msgid "Remove unwanted files from working tree."
4399
msgstr ""
4400
4401
#: bzrlib/builtins.py:6586
4402
msgid ""
4403
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4404
"files are never deleted."
4405
msgstr ""
4406
4407
#: bzrlib/builtins.py:6589
4408
msgid ""
4409
"Another class is 'detritus', which includes files emitted by bzr during\n"
4410
"normal operations and selftests. (The value of these files decreases with\n"
4411
"time.)"
4412
msgstr ""
4413
4414
#: bzrlib/builtins.py:6593
4415
msgid ""
4416
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4417
"flags are respected, and may be combined."
4418
msgstr ""
4419
4420
#: bzrlib/builtins.py:6596
4421
msgid "To check what clean-tree will do, use --dry-run."
4422
msgstr ""
4423
4424
# help of 'ignored' option of 'clean-tree' command
4425
#: bzrlib/builtins.py:6599
4426
msgid "Delete all ignored files."
4427
msgstr ""
4428
4429
# help of 'detritus' option of 'clean-tree' command
4430
#: bzrlib/builtins.py:6600
4431
msgid ""
4432
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4433
msgstr ""
4434
4435
# help of 'unknown' option of 'clean-tree' command
4436
#: bzrlib/builtins.py:6603
4437
msgid "Delete files unknown to bzr (default)."
4438
msgstr ""
4439
4440
# help of 'dry-run' option of 'clean-tree' command
4441
#: bzrlib/builtins.py:6604
4442
msgid "Show files to delete instead of deleting them."
4443
msgstr ""
4444
4445
# help of 'force' option of 'clean-tree' command
4446
#: bzrlib/builtins.py:6606
4447
msgid "Do not prompt before deleting."
4448
msgstr ""
4449
4450
#: bzrlib/bundle/__init__.py:59
4451
msgid "A directory cannot be a bundle"
4452
msgstr ""
4453
4454
#: bzrlib/bundle/apply_bundle.py:40
4455
msgid "Install revisions"
4456
msgstr ""
4457
4458
#: bzrlib/bundle/commands.py:64
4459
msgid "--verbose requires a merge directive"
4460
msgstr ""
4461
4462
#: bzrlib/bundle/commands.py:67
4463
msgid "Bundle format not supported"
4464
msgstr ""
4465
4466
#: bzrlib/bundle/commands.py:77
4467
msgid "Records\n"
4468
msgstr ""
4469
4470
#: bzrlib/bundle/commands.py:81
4471
msgid "{0}: {1} ({2} multiparent)\n"
4472
msgstr ""
4473
4474
#: bzrlib/bundle/commands.py:83
4475
#, python-format
4476
msgid "unique files: %d\n"
4477
msgstr ""
4478
4479
#: bzrlib/bundle/commands.py:92
4480
msgid "Revisions\n"
4481
msgstr ""
4482
4483
#: bzrlib/bundle/commands.py:93
4484
#, python-format
4485
msgid "nicks: %s\n"
4486
msgstr ""
4487
4488
#: bzrlib/bundle/commands.py:95
4489
#, python-format
4490
msgid ""
4491
"committers: \n"
4492
"%s\n"
4493
msgstr ""
4494
4495
#: bzrlib/bundle/commands.py:103
4496
msgid "Decoded contents\n"
4497
msgstr ""
4498
4499
#: bzrlib/bundle/serializer/v4.py:327
4500
#, python-format
4501
msgid "Bundling %d revision."
4502
msgid_plural "Bundling %d revisions."
4503
msgstr[0] ""
4504
msgstr[1] ""
4505
4506
#: bzrlib/bzrdir.py:490
4507
msgid ""
4508
"making backup of {0}\n"
4509
" to {1}"
4510
msgstr ""
4511
4512
#: bzrlib/bzrdir.py:513
4513
msgid "renamed {0} to {1}"
4514
msgstr ""
4515
4516
#: bzrlib/bzrdir.py:1652
4517
#, python-format
4518
msgid ""
4519
"Source repository format does not support stacking, using format:\n"
4520
" %s"
4521
msgstr ""
4522
4523
#: bzrlib/bzrdir.py:1672
4524
#, python-format
4525
msgid ""
4526
"Source branch format does not support stacking, using format:\n"
4527
" %s"
4528
msgstr ""
4529
4530
#: bzrlib/bzrdir.py:1818
4531
msgid "starting repository conversion"
4532
msgstr ""
4533
4534
#: bzrlib/bzrdir.py:2039
4535
msgid "Using default stacking branch {0} at {1}"
4536
msgstr ""
4537
4538
#: bzrlib/check.py:108
4539
msgid "check"
4540
msgstr ""
4541
4542
#: bzrlib/check.py:110
4543
msgid "checking revisions"
4544
msgstr ""
4545
4546
#: bzrlib/check.py:112
4547
msgid "checking commit contents"
4548
msgstr ""
4549
4550
#: bzrlib/check.py:114
4551
msgid "checking file graphs"
4552
msgstr ""
4553
4554
#: bzrlib/check.py:118
4555
msgid "checking branches and trees"
4556
msgstr ""
4557
4558
#: bzrlib/check.py:205
4559
msgid "checked repository {0} format {1}"
4560
msgstr ""
4561
4562
#: bzrlib/check.py:208
4563
#, python-format
4564
msgid "%6d revisions"
4565
msgstr ""
4566
4567
#: bzrlib/check.py:209
4568
#, python-format
4569
msgid "%6d file-ids"
4570
msgstr ""
4571
4572
#: bzrlib/check.py:211
4573
#, python-format
4574
msgid "%6d unreferenced text versions"
4575
msgstr ""
4576
4577
#: bzrlib/check.py:215
4578
msgid "unreferenced version: {{{0}}} in {1}"
4579
msgstr ""
4580
4581
#: bzrlib/check.py:218
4582
#, python-format
4583
msgid "%6d revisions are missing inventory_sha1"
4584
msgstr ""
4585
4586
#: bzrlib/check.py:221
4587
#, python-format
4588
msgid "%6d revisions are mentioned but not present"
4589
msgstr ""
4590
4591
#: bzrlib/check.py:224
4592
#, python-format
4593
msgid "%6d ghost revisions"
4594
msgstr ""
4595
4596
#: bzrlib/check.py:229
4597
#, python-format
4598
msgid "%6d revisions missing parents in ancestry"
4599
msgstr ""
4600
4601
#: bzrlib/check.py:233
4602
#, python-format
4603
msgid " %s should be in the ancestry for:"
4604
msgstr ""
4605
4606
#: bzrlib/check.py:237
4607
#, python-format
4608
msgid "%6d inconsistent parents"
4609
msgstr ""
4610
4611
#: bzrlib/check.py:241
4612
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4613
msgstr ""
4614
4615
#: bzrlib/check.py:247
4616
#, python-format
4617
msgid "%6d revisions have incorrect parents in the revision index"
4618
msgstr ""
4619
4620
#: bzrlib/check.py:253
4621
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4622
msgstr ""
4623
4624
#: bzrlib/check.py:267
4625
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4626
msgstr ""
4627
4628
#: bzrlib/check.py:296
4629
msgid ""
4630
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4631
"{{{4}}}"
4632
msgstr ""
4633
4634
#: bzrlib/check.py:354
4635
#, python-format
4636
msgid "Checking branch at '%s'."
4637
msgstr ""
4638
4639
#: bzrlib/check.py:374
4640
#, python-format
4641
msgid "Checking working tree at '%s'."
4642
msgstr ""
4643
4644
#: bzrlib/check.py:427 bzrlib/check.py:441
4645
msgid "No branch found at specified location."
4646
msgstr ""
4647
4648
#: bzrlib/check.py:429 bzrlib/check.py:439
4649
msgid "No working tree found at specified location."
4650
msgstr ""
4651
4652
#: bzrlib/check.py:432
4653
#, python-format
4654
msgid "Checking repository at '%s'."
4655
msgstr ""
4656
4657
#: bzrlib/check.py:443
4658
msgid "No repository found at specified location."
4659
msgstr ""
4660
4661
#: bzrlib/clean_tree.py:63
4662
msgid "Nothing to delete."
4663
msgstr ""
4664
4665
#: bzrlib/clean_tree.py:68
4666
msgid "Are you sure you wish to delete these"
4667
msgstr ""
4668
4669
#: bzrlib/clean_tree.py:70
4670
msgid "Canceled"
4671
msgstr ""
4672
4673
#: bzrlib/clean_tree.py:107
4674
#, python-format
4675
msgid "unable to remove %s"
4676
msgstr ""
4677
4678
#: bzrlib/clean_tree.py:111
4679
msgid "deleting paths:"
4680
msgstr ""
4681
4682
#: bzrlib/clean_tree.py:125
4683
msgid "unable to remove \"{0}\": {1}."
4684
msgstr ""
4685
4686
#: bzrlib/clean_tree.py:130
4687
msgid "No files deleted."
4688
msgstr ""
4689
4690
#: bzrlib/cmd_version_info.py:47
4691
msgid "No known version info format {0}. Supported types are: {1}"
4692
msgstr ""
4693
4694
# help of 'format=custom' option of 'version-info' command
4695
#: bzrlib/cmd_version_info.py:52
4696
msgid "Version info in Custom template-based format."
4697
msgstr ""
4698
4699
# help of 'format=python' option of 'version-info' command
4700
#: bzrlib/cmd_version_info.py:52
4701
msgid "Version info in Python format."
4702
msgstr ""
4703
4704
# help of 'format=rio' option of 'version-info' command
4705
#: bzrlib/cmd_version_info.py:52
4706
msgid "Version info in RIO (simple text) format (default)."
4707
msgstr ""
4708
4709
#: bzrlib/cmd_version_info.py:53
4710
msgid "Show version information about this tree."
4711
msgstr ""
4712
4713
#: bzrlib/cmd_version_info.py:55
4714
msgid ""
4715
"You can use this command to add information about version into\n"
4716
"source code of an application. The output can be in one of the\n"
4717
"supported formats or in a custom format based on a template."
4718
msgstr ""
4719
4720
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4721
#: en/help_topics/configuration.txt:710
4722
msgid "For example::"
4723
msgstr ""
4724
4725
#: bzrlib/cmd_version_info.py:61
4726
msgid ""
4727
" bzr version-info --custom \\\n"
4728
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4729
msgstr ""
4730
4731
#: bzrlib/cmd_version_info.py:64
4732
msgid ""
4733
"will produce a C header file with formatted string containing the\n"
4734
"current revision number. Other supported variables in templates are:"
4735
msgstr ""
4736
4737
#: bzrlib/cmd_version_info.py:67
4738
msgid ""
4739
" * {date} - date of the last revision\n"
4740
" * {build_date} - current date\n"
4741
" * {revno} - revision number\n"
4742
" * {revision_id} - revision id\n"
4743
" * {branch_nick} - branch nickname\n"
4744
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4745
" otherwise 1"
4746
msgstr ""
4747
4748
# help of 'format' option of 'version-info' command
4749
#: bzrlib/cmd_version_info.py:77
4750
msgid "Select the output format."
4751
msgstr ""
4752
4753
# help of 'all' option of 'version-info' command
4754
#: bzrlib/cmd_version_info.py:81
4755
msgid "Include all possible information."
4756
msgstr ""
4757
4758
# help of 'check-clean' option of 'version-info' command
4759
#: bzrlib/cmd_version_info.py:82
4760
msgid "Check if tree is clean."
4761
msgstr ""
4762
4763
# help of 'include-history' option of 'version-info' command
4764
#: bzrlib/cmd_version_info.py:84
4765
msgid "Include the revision-history."
4766
msgstr ""
4767
4768
# help of 'include-file-revisions' option of 'version-info' command
4769
#: bzrlib/cmd_version_info.py:86
4770
msgid "Include the last revision for each file."
4771
msgstr ""
4772
4773
# help of 'template' option of 'version-info' command
4774
#: bzrlib/cmd_version_info.py:87
4775
msgid "Template for the output."
4776
msgstr ""
4777
4778
#: bzrlib/cmd_version_info.py:101
4779
msgid "bzr version-info --revision takes exactly one revision specifier"
4780
msgstr ""
4781
4782
#: bzrlib/commands.py:229
4783
#, python-format
4784
msgid "unknown command \"%s\""
4785
msgstr ""
4786
4787
#: bzrlib/commands.py:476
4788
msgid "No help for this command."
4789
msgstr ""
4790
4791
#: bzrlib/commands.py:489
4792
#, python-format
4793
msgid ":Purpose: %s\n"
4794
msgstr ""
4795
4796
#: bzrlib/commands.py:491
4797
#, python-format
4798
msgid ""
4799
":Usage:\n"
4800
"%s\n"
4801
msgstr ""
4802
4803
#: bzrlib/commands.py:493
4804
#, python-format
4805
msgid ":Usage: %s\n"
4806
msgstr ""
4807
4808
#: bzrlib/commands.py:512
4809
#, python-format
4810
msgid ":Options:%s"
4811
msgstr ""
4812
4813
#: bzrlib/commands.py:523
4814
#, python-format
4815
msgid ""
4816
":Description:\n"
4817
" %s\n"
4818
"\n"
4819
msgstr ""
4820
4821
#: bzrlib/commands.py:533
4822
#, python-format
4823
msgid ""
4824
"See bzr help %s for more details and examples.\n"
4825
"\n"
4826
msgstr ""
4827
4828
#: bzrlib/commands.py:538
4829
msgid ":Aliases: "
4830
msgstr ""
4831
4832
#: bzrlib/commands.py:542
4833
#, python-format
4834
msgid ":From: plugin \"%s\"\n"
4835
msgstr ""
4836
4837
#: bzrlib/commands.py:554
4838
msgid ":doc:`{0} <{1}-help>`"
4839
msgstr ""
4840
4841
#: bzrlib/commands.py:558
4842
#, python-format
4843
msgid ":See also: %s"
4844
msgstr ""
4845
4846
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4847
msgid "Only ASCII permitted in option names"
4848
msgstr ""
4849
4850
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4851
msgid "command {0!r} needs one or more {1}"
4852
msgstr ""
4853
4854
#: bzrlib/commands.py:858
4855
msgid "command {0!r} requires argument {1}"
4856
msgstr ""
4857
4858
#: bzrlib/commands.py:865
4859
msgid "extra argument to command {0}: {1}"
4860
msgstr ""
4861
4862
#: bzrlib/commands.py:962
4863
#, python-format
4864
msgid "Profile data written to \"%s\"."
4865
msgstr ""
4866
4867
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4868
msgid "added"
4869
msgstr ""
4870
4871
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4872
msgid "modified"
4873
msgstr ""
4874
4875
#: bzrlib/commit.py:131
4876
#, python-format
4877
msgid "Committing%s"
4878
msgstr ""
4879
4880
#: bzrlib/commit.py:134
4881
#, python-format
4882
msgid "Committed revision %d."
4883
msgstr ""
4884
4885
#: bzrlib/commit.py:143
4886
#, python-format
4887
msgid "deleted %s"
4888
msgstr ""
4889
4890
#: bzrlib/commit.py:146
4891
#, python-format
4892
msgid "missing %s"
4893
msgstr ""
4894
4895
#: bzrlib/commit.py:511
4896
msgid ""
4897
"Conflicting tags in bound branch:\n"
4898
"{0}"
4899
msgstr ""
4900
4901
#: bzrlib/commit.py:742
4902
msgid "renamed"
4903
msgstr ""
4904
4905
#: bzrlib/commit.py:977
4906
msgid "unchanged"
4907
msgstr ""
4908
4909
#: bzrlib/commit.py:999
4910
msgid "{0} [{1}] - Stage"
4911
msgstr ""
4912
4913
#: bzrlib/commit.py:1002
4914
#, python-format
4915
msgid "%s - Stage"
4916
msgstr ""
4917
4918
#: bzrlib/commit_signature_commands.py:36
4919
msgid "Sign all commits by a given committer."
4920
msgstr ""
4921
4922
#: bzrlib/commit_signature_commands.py:38
4923
msgid ""
4924
"If location is not specified the local tree is used.\n"
4925
"If committer is not specified the default committer is used."
4926
msgstr ""
4927
4928
#: bzrlib/commit_signature_commands.py:41
4929
msgid "This does not sign commits that already have signatures."
4930
msgstr ""
4931
4932
# help of 'dry-run' option of 'sign-my-commits' command
4933
#: bzrlib/commit_signature_commands.py:49
4934
msgid ""
4935
"Don't actually sign anything, just print the revisions that would be signed."
4936
msgstr ""
4937
4938
#: bzrlib/commit_signature_commands.py:103
4939
msgid "Verify all commit signatures."
4940
msgstr ""
4941
4942
#: bzrlib/commit_signature_commands.py:105
4943
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
4944
msgstr ""
4945
4946
# help of 'acceptable-keys' option of 'verify-signatures' command
4947
#: bzrlib/commit_signature_commands.py:110
4948
msgid ""
4949
"Comma separated list of GPG key patterns which are acceptable for "
4950
"verification."
4951
msgstr ""
4952
4953
#: bzrlib/commit_signature_commands.py:147
4954
msgid "Cannot verify a range of non-revision-history revisions"
4955
msgstr ""
4956
4957
#: bzrlib/commit_signature_commands.py:168
4958
msgid "All commits signed with verifiable keys"
4959
msgstr ""
4960
4961
#: bzrlib/config.py:475
4962
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4963
msgstr ""
4964
4965
#: bzrlib/config.py:2485
4966
msgid "{0} is not an SI unit."
4967
msgstr ""
4968
4969
#: bzrlib/config.py:2949
4970
msgid ""
4971
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4972
"will be saved."
4973
msgstr ""
4974
4975
#: bzrlib/config.py:3093
4976
#, python-format
4977
msgid "Invalid '%s', should be of the form 'name=value'"
4978
msgstr ""
4979
4980
#: bzrlib/config.py:3962
4981
msgid "Display, set or remove a configuration option."
4982
msgstr ""
4983
4984
#: bzrlib/config.py:3964
4985
msgid "Display the active value for a given option."
4986
msgstr ""
4987
4988
#: bzrlib/config.py:3966
4989
msgid ""
4990
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4991
"matching options are displayed mentioning their scope. The active value\n"
4992
"that bzr will take into account is the first one displayed for each option."
4993
msgstr ""
4994
4995
#: bzrlib/config.py:3970
4996
msgid "If no NAME is given, --all .* is implied."
4997
msgstr ""
4998
4999
#: bzrlib/config.py:3972
5000
msgid ""
5001
"Setting a value is achieved by using name=value without spaces. The value\n"
5002
"is set in the most relevant scope and can be checked by displaying the\n"
5003
"option again."
5004
msgstr ""
5005
5006
# help of 'scope' option of 'config' command
5007
#: bzrlib/config.py:3984
5008
msgid "Reduce the scope to the specified configuration file."
5009
msgstr ""
5010
5011
# help of 'all' option of 'config' command
5012
#: bzrlib/config.py:3988
5013
msgid "Display all the defined values for the matching options."
5014
msgstr ""
5015
5016
# help of 'remove' option of 'config' command
5017
#: bzrlib/config.py:3990
5018
msgid "Remove the option from the configuration file."
5019
msgstr ""
5020
5021
#: bzrlib/conflicts.py:50
5022
msgid "List files with conflicts."
5023
msgstr ""
5024
5025
#: bzrlib/conflicts.py:57
5026
msgid ""
5027
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5028
"is supplied, the pathnames of files with text conflicts are listed,\n"
5029
"instead. (This is useful for editing all files with text conflicts.)"
5030
msgstr ""
5031
5032
#: bzrlib/conflicts.py:61
5033
msgid "Use bzr resolve when you have fixed a problem."
5034
msgstr ""
5035
5036
# help of 'text' option of 'conflicts' command
5037
#: bzrlib/conflicts.py:66
5038
msgid "List paths of files with text conflicts."
5039
msgstr ""
5040
5041
# help of 'action=done' option of 'resolve' command
5042
#: bzrlib/conflicts.py:85
5043
msgid "Marks the conflict as resolved."
5044
msgstr ""
5045
5046
# help of 'action=take-this' option of 'resolve' command
5047
#: bzrlib/conflicts.py:88
5048
msgid "Resolve the conflict preserving the version in the working tree."
5049
msgstr ""
5050
5051
# help of 'action=take-other' option of 'resolve' command
5052
#: bzrlib/conflicts.py:91
5053
msgid "Resolve the conflict taking the merged version into account."
5054
msgstr ""
5055
5056
# help of 'action' option of 'resolve' command
5057
#: bzrlib/conflicts.py:98
5058
msgid "How to resolve the conflict."
5059
msgstr ""
5060
5061
#: bzrlib/conflicts.py:104
5062
msgid "Mark a conflict as resolved."
5063
msgstr ""
5064
5065
#: bzrlib/conflicts.py:111
5066
msgid ""
5067
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5068
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5069
"as\n"
5070
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5071
msgstr ""
5072
5073
# help of 'all' option of 'resolve' command
5074
#: bzrlib/conflicts.py:119
5075
msgid "Resolve all conflicts in this tree."
5076
msgstr ""
5077
5078
#: bzrlib/conflicts.py:126
5079
msgid "If --all is specified, no FILE may be provided"
5080
msgstr ""
5081
5082
#: bzrlib/conflicts.py:151
5083
#, python-format
5084
msgid "%d conflict auto-resolved."
5085
msgid_plural "%d conflicts auto-resolved."
5086
msgstr[0] ""
5087
msgstr[1] ""
5088
5089
#: bzrlib/conflicts.py:154
5090
msgid "Remaining conflicts:"
5091
msgstr ""
5092
5093
#: bzrlib/conflicts.py:159
5094
msgid "All conflicts resolved."
5095
msgstr ""
5096
5097
#: bzrlib/conflicts.py:168
5098
msgid "{0} conflict resolved, {1} remaining"
5099
msgid_plural "{0} conflicts resolved, {1} remaining"
5100
msgstr[0] ""
5101
msgstr[1] ""
5102
5103
#: bzrlib/controldir.py:710
5104
msgid "{0} is{1} redirected to {2}"
5105
msgstr ""
5106
5107
#: bzrlib/diff.py:399
5108
#, python-format
5109
msgid "*** Ignoring files outside view. View is %s"
5110
msgstr ""
5111
5112
#: bzrlib/errors.py:157
5113
msgid "The tree builder is already building a tree."
5114
msgstr ""
5115
5116
#: bzrlib/errors.py:178
5117
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5118
msgstr ""
5119
5120
#: bzrlib/errors.py:197
5121
msgid ""
5122
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5123
"versions \"%(minimum)s\" to \"%(current)s\"."
5124
msgstr ""
5125
5126
#: bzrlib/errors.py:209
5127
msgid "The transport '%(transport)s' is only accessible within this process."
5128
msgstr ""
5129
5130
#: bzrlib/errors.py:227
5131
msgid "Invalid revision number %(revno)s"
5132
msgstr ""
5133
5134
#: bzrlib/errors.py:236
5135
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5136
msgstr ""
5137
5138
#: bzrlib/errors.py:247
5139
msgid "Reserved revision-id {%(revision_id)s}"
5140
msgstr ""
5141
5142
#: bzrlib/errors.py:261
5143
msgid "There is no public branch set for \"%(branch_url)s\"."
5144
msgstr ""
5145
5146
#: bzrlib/errors.py:271
5147
msgid ""
5148
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5149
"obtain a list of topics."
5150
msgstr ""
5151
5152
#: bzrlib/errors.py:280
5153
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5154
msgstr ""
5155
5156
#: bzrlib/errors.py:290
5157
msgid ""
5158
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5159
msgstr ""
5160
5161
#: bzrlib/errors.py:299
5162
msgid "The branch '%(branch)s' is not stacked."
5163
msgstr ""
5164
5165
#: bzrlib/errors.py:313
5166
msgid "No WorkingTree exists for \"%(base)s\"."
5167
msgstr ""
5168
5169
#: bzrlib/errors.py:322
5170
msgid "Not currently building a tree."
5171
msgstr ""
5172
5173
#: bzrlib/errors.py:327
5174
msgid "%(url)s is not a local path."
5175
msgstr ""
5176
5177
#: bzrlib/errors.py:355
5178
msgid "%(not_locked)r is not write locked but needs to be."
5179
msgstr ""
5180
5181
#: bzrlib/errors.py:363
5182
msgid "Error in command line options"
5183
msgstr ""
5184
5185
#: bzrlib/errors.py:368
5186
msgid "%(value)s is not an index of type %(_type)s."
5187
msgstr ""
5188
5189
#: bzrlib/errors.py:378
5190
msgid "Error in data for index %(value)s."
5191
msgstr ""
5192
5193
#: bzrlib/errors.py:387
5194
msgid "The key '%(key)s' is already in index '%(index)s'."
5195
msgstr ""
5196
5197
#: bzrlib/errors.py:397
5198
msgid "The key '%(key)s' is not a valid key."
5199
msgstr ""
5200
5201
#: bzrlib/errors.py:406
5202
msgid "Could not parse options for index %(value)s."
5203
msgstr ""
5204
5205
#: bzrlib/errors.py:415
5206
msgid "The value '%(value)s' is not a valid value."
5207
msgstr ""
5208
5209
#: bzrlib/errors.py:424
5210
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5211
msgstr ""
5212
5213
#: bzrlib/errors.py:443
5214
msgid "Generic path error: %(path)r%(extra)s)"
5215
msgstr ""
5216
5217
#: bzrlib/errors.py:456
5218
msgid "No such file: %(path)r%(extra)s"
5219
msgstr ""
5220
5221
#: bzrlib/errors.py:461
5222
msgid "File exists: %(path)r%(extra)s"
5223
msgstr ""
5224
5225
#: bzrlib/errors.py:467
5226
msgid ""
5227
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5228
"after to tell bzr about a rename that has already happened)%(extra)s"
5229
msgstr ""
5230
5231
#: bzrlib/errors.py:483
5232
msgid "\"%(path)s\" is not a directory %(extra)s"
5233
msgstr ""
5234
5235
#: bzrlib/errors.py:488
5236
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5237
msgstr ""
5238
5239
#: bzrlib/errors.py:493
5240
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5241
msgstr ""
5242
5243
#: bzrlib/errors.py:498
5244
msgid "Hard-linking \"%(path)s\" is not supported"
5245
msgstr ""
5246
5247
#: bzrlib/errors.py:513
5248
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5249
msgstr ""
5250
5251
#: bzrlib/errors.py:518
5252
msgid "Permission denied: \"%(path)s\"%(extra)s"
5253
msgstr ""
5254
5255
#: bzrlib/errors.py:523
5256
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5257
msgstr ""
5258
5259
#: bzrlib/errors.py:528
5260
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5261
msgstr ""
5262
5263
#: bzrlib/errors.py:539
5264
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5265
msgstr ""
5266
5267
#: bzrlib/errors.py:561
5268
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5269
msgstr ""
5270
5271
#: bzrlib/errors.py:571
5272
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5273
msgstr ""
5274
5275
#: bzrlib/errors.py:579
5276
msgid ""
5277
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5278
"upgrade the branch to permit branch stacking."
5279
msgstr ""
5280
5281
#: bzrlib/errors.py:590
5282
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5283
msgstr ""
5284
5285
#: bzrlib/errors.py:600
5286
msgid ""
5287
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5288
"need to upgrade the repository to permit branch stacking."
5289
msgstr ""
5290
5291
#: bzrlib/errors.py:611
5292
msgid "Error reading from %(path)r."
5293
msgstr ""
5294
5295
#: bzrlib/errors.py:630
5296
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5297
msgstr ""
5298
5299
#: bzrlib/errors.py:646
5300
msgid "Path \"%(path)s\" is not unicode normalized"
5301
msgstr ""
5302
5303
#: bzrlib/errors.py:654
5304
msgid "Not a branch: \"%(path)s\"%(detail)s."
5305
msgstr ""
5306
5307
#: bzrlib/errors.py:696
5308
msgid "No submit branch available for branch \"%(path)s\""
5309
msgstr ""
5310
5311
#: bzrlib/errors.py:705
5312
msgid "A control directory already exists: \"%(path)s\"."
5313
msgstr ""
5314
5315
#: bzrlib/errors.py:710
5316
msgid "Already a branch: \"%(path)s\"."
5317
msgstr ""
5318
5319
#: bzrlib/errors.py:715
5320
msgid "Parent branch already exists: \"%(path)s\"."
5321
msgstr ""
5322
5323
#: bzrlib/errors.py:721
5324
msgid ""
5325
"Directory contains a branch, but no working tree (use bzr checkout if you "
5326
"wish to build a working tree): \"%(path)s\""
5327
msgstr ""
5328
5329
#: bzrlib/errors.py:726
5330
msgid ""
5331
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5332
msgstr ""
5333
5334
#: bzrlib/errors.py:736
5335
msgid ""
5336
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5337
msgstr ""
5338
5339
#: bzrlib/errors.py:746
5340
msgid "No repository present: \"%(path)s\""
5341
msgstr ""
5342
5343
#: bzrlib/errors.py:753
5344
msgid ""
5345
"Unsupported branch format: %(format)s\n"
5346
"Please run 'bzr upgrade'"
5347
msgstr ""
5348
5349
#: bzrlib/errors.py:759
5350
msgid "Unknown %(kind)s format: %(format)r"
5351
msgstr ""
5352
5353
#: bzrlib/errors.py:768
5354
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5355
msgstr ""
5356
5357
#: bzrlib/errors.py:778
5358
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5359
msgstr ""
5360
5361
#: bzrlib/errors.py:793
5362
msgid ""
5363
"%(target)s\n"
5364
"is not compatible with\n"
5365
"%(source)s\n"
5366
"%(details)s"
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:809
5370
msgid "Revision is not compatible with %(repo_format)s"
5371
msgstr ""
5372
5373
#: bzrlib/errors.py:819
5374
msgid "%(context_info)s%(path)s is already versioned."
5375
msgstr ""
5376
5377
#: bzrlib/errors.py:840
5378
msgid "%(context_info)s%(path)s is not versioned."
5379
msgstr ""
5380
5381
#: bzrlib/errors.py:861
5382
msgid "Path(s) are not versioned: %(paths_as_string)s"
5383
msgstr ""
5384
5385
#: bzrlib/errors.py:872
5386
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5387
msgstr ""
5388
5389
#: bzrlib/errors.py:891
5390
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5391
msgstr ""
5392
5393
#: bzrlib/errors.py:899
5394
msgid ""
5395
"Filename %(filename)r is not valid in your current filesystem encoding "
5396
"%(fs_encoding)s"
5397
msgstr ""
5398
5399
#: bzrlib/errors.py:910
5400
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5401
msgstr ""
5402
5403
#: bzrlib/errors.py:928
5404
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5405
msgstr ""
5406
5407
#: bzrlib/errors.py:967
5408
msgid "Cannot lock %(lock)s: %(why)s"
5409
msgstr ""
5410
5411
#: bzrlib/errors.py:977
5412
msgid ""
5413
"A transaction related operation was attempted after the transaction finished."
5414
msgstr ""
5415
5416
#: bzrlib/errors.py:1004
5417
msgid "Cannot lock: transport is read only: %(transport)s"
5418
msgstr ""
5419
5420
#: bzrlib/errors.py:1012
5421
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5422
msgstr ""
5423
5424
#: bzrlib/errors.py:1023
5425
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5426
msgstr ""
5427
5428
#: bzrlib/errors.py:1034
5429
msgid ""
5430
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5431
"%(holder)r, wanted to break %(target)r"
5432
msgstr ""
5433
5434
#: bzrlib/errors.py:1046
5435
msgid ""
5436
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5437
"Use 'bzr break-lock' to clear it"
5438
msgstr ""
5439
5440
#: bzrlib/errors.py:1059
5441
msgid "Lock not held: %(lock)s"
5442
msgstr ""
5443
5444
#: bzrlib/errors.py:1088
5445
msgid "No changes to commit"
5446
msgstr ""
5447
5448
#: bzrlib/errors.py:1093
5449
msgid ""
5450
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5451
msgstr ""
5452
5453
#: bzrlib/errors.py:1103
5454
msgid ""
5455
"Excluding paths during commit is not supported by repository at %(repository)"
5456
"r."
5457
msgstr ""
5458
5459
#: bzrlib/errors.py:1112
5460
msgid ""
5461
"The specified commit message contains characters unsupported by the current "
5462
"encoding."
5463
msgstr ""
5464
5465
#: bzrlib/errors.py:1118
5466
msgid "Upgrade URL cannot work with readonly URLs."
5467
msgstr ""
5468
5469
#: bzrlib/errors.py:1123
5470
msgid "The branch format %(format)s is already at the most recent format."
5471
msgstr ""
5472
5473
#: bzrlib/errors.py:1146
5474
msgid "Option --change does not accept revision ranges"
5475
msgstr ""
5476
5477
#: bzrlib/errors.py:1151
5478
msgid "No namespace registered for string: %(spec)r"
5479
msgstr ""
5480
5481
#: bzrlib/errors.py:1170
5482
msgid ""
5483
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5484
"%(extra)s"
5485
msgstr ""
5486
5487
#: bzrlib/errors.py:1184
5488
msgid ""
5489
"Operation denied because it would change the main history, which is not "
5490
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5491
msgstr ""
5492
5493
#: bzrlib/errors.py:1195
5494
msgid ""
5495
"These branches have diverged. Use the missing command to see how.\n"
5496
"Use the merge command to reconcile them."
5497
msgstr ""
5498
5499
#: bzrlib/errors.py:1215
5500
msgid ""
5501
"Branches have no common ancestor, and no merge base revision was specified."
5502
msgstr ""
5503
5504
#: bzrlib/errors.py:1221
5505
msgid ""
5506
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5507
msgstr ""
5508
5509
#: bzrlib/errors.py:1227
5510
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5511
msgstr ""
5512
5513
#: bzrlib/errors.py:1236
5514
msgid ""
5515
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5516
msgstr ""
5517
5518
#: bzrlib/errors.py:1245
5519
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5520
msgstr ""
5521
5522
#: bzrlib/errors.py:1254
5523
msgid "Branch %(branch)s has no commits."
5524
msgstr ""
5525
5526
#: bzrlib/errors.py:1272
5527
msgid ""
5528
"Bound branch %(branch)s is out of date with master branch %(master)s."
5529
"%(extra_help)s"
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:1284
5533
msgid ""
5534
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5535
"bound to %(remote)s."
5536
msgstr ""
5537
5538
#: bzrlib/errors.py:1296
5539
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5540
msgstr ""
5541
5542
#: bzrlib/errors.py:1305
5543
msgid ""
5544
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5545
"%(error)s"
5546
msgstr ""
5547
5548
#: bzrlib/errors.py:1317
5549
msgid "Error in processing weave: %(msg)s"
5550
msgstr ""
5551
5552
#: bzrlib/errors.py:1326
5553
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:1337
5557
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5558
msgstr ""
5559
5560
#: bzrlib/errors.py:1347
5561
msgid "Weave invariant violated: %(what)s"
5562
msgstr ""
5563
5564
#: bzrlib/errors.py:1356
5565
msgid "Parents are mismatched between two revisions. %(msg)s"
5566
msgstr ""
5567
5568
#: bzrlib/errors.py:1378
5569
msgid ""
5570
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5571
"%(weave_b)s"
5572
msgstr ""
5573
5574
#: bzrlib/errors.py:1390
5575
msgid "Versioned file error"
5576
msgstr ""
5577
5578
#: bzrlib/errors.py:1395
5579
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5580
msgstr ""
5581
5582
#: bzrlib/errors.py:1405
5583
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5584
msgstr ""
5585
5586
#: bzrlib/errors.py:1415
5587
msgid "Text did not match its checksum: %(msg)s"
5588
msgstr ""
5589
5590
#: bzrlib/errors.py:1541
5591
msgid "Export format %(format)r not supported"
5592
msgstr ""
5593
5594
#: bzrlib/errors.py:1550
5595
msgid "Transport error: %(msg)s %(orig_error)s"
5596
msgstr ""
5597
5598
#: bzrlib/errors.py:1576
5599
msgid "Generic bzr smart protocol error: %(details)s"
5600
msgstr ""
5601
5602
#: bzrlib/errors.py:1584
5603
msgid "Received bad protocol version marker: %(marker)r"
5604
msgstr ""
5605
5606
#: bzrlib/errors.py:1616
5607
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5608
msgstr ""
5609
5610
#: bzrlib/errors.py:1621
5611
msgid "Connection error: %(msg)s %(orig_error)s"
5612
msgstr ""
5613
5614
#: bzrlib/errors.py:1626
5615
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5616
msgstr ""
5617
5618
#: bzrlib/errors.py:1647
5619
msgid "Connection closed: %(msg)s %(orig_error)s"
5620
msgstr ""
5621
5622
#: bzrlib/errors.py:1652
5623
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5624
msgstr ""
5625
5626
#: bzrlib/errors.py:1657
5627
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5628
msgstr ""
5629
5630
#: bzrlib/errors.py:1667
5631
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5632
msgstr ""
5633
5634
#: bzrlib/errors.py:1682
5635
msgid "Certificate error: %(error)s"
5636
msgstr ""
5637
5638
#: bzrlib/errors.py:1690
5639
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5640
msgstr ""
5641
5642
#: bzrlib/errors.py:1704
5643
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:1712
5647
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:1721
5651
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5652
msgstr ""
5653
5654
#: bzrlib/errors.py:1735
5655
msgid "Too many redirections"
5656
msgstr ""
5657
5658
#: bzrlib/errors.py:1740
5659
msgid "Working tree has conflicts."
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:1744
5663
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5664
msgstr ""
5665
5666
#: bzrlib/errors.py:1753
5667
msgid ""
5668
"Error(s) parsing config file %(filename)s:\n"
5669
"%(errors)s"
5670
msgstr ""
5671
5672
#: bzrlib/errors.py:1763
5673
msgid ""
5674
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5675
"See ``bzr help %(name)s``"
5676
msgstr ""
5677
5678
#: bzrlib/errors.py:1773
5679
msgid "%(username)r does not seem to contain a reasonable email address"
5680
msgstr ""
5681
5682
#: bzrlib/errors.py:1782
5683
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5684
msgstr ""
5685
5686
#: bzrlib/errors.py:1790
5687
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5688
msgstr ""
5689
5690
#: bzrlib/errors.py:1798
5691
msgid "Unable to import library \"%(library)s\": %(error)s"
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:1806
5695
msgid "python-gpgme is not installed, it is needed to verify signatures"
5696
msgstr ""
5697
5698
#: bzrlib/errors.py:1814
5699
msgid ""
5700
"The working tree for %(basedir)s has changed since the last commit, but "
5701
"weave merge requires that it be unchanged"
5702
msgstr ""
5703
5704
#: bzrlib/errors.py:1824
5705
msgid ""
5706
"Can't reprocess and show base, because reprocessing obscures the "
5707
"relationship of conflicting lines to the base"
5708
msgstr ""
5709
5710
#: bzrlib/errors.py:1830
5711
msgid "Cycle in graph %(graph)r"
5712
msgstr ""
5713
5714
#: bzrlib/errors.py:1858
5715
msgid "File %(filename)s is not conflicted."
5716
msgstr ""
5717
5718
#: bzrlib/errors.py:1880
5719
msgid "No bundle was found in \"%(filename)s\"."
5720
msgstr ""
5721
5722
#: bzrlib/errors.py:1889
5723
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5724
msgstr ""
5725
5726
#: bzrlib/errors.py:1899
5727
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5728
msgstr ""
5729
5730
#: bzrlib/errors.py:1912
5731
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5732
msgstr ""
5733
5734
#: bzrlib/errors.py:1922
5735
msgid "Key %(key)s is already present in map"
5736
msgstr ""
5737
5738
#: bzrlib/errors.py:1927
5739
msgid "The prefix %(prefix)s is in the help search path twice."
5740
msgstr ""
5741
5742
#: bzrlib/errors.py:1937
5743
msgid ""
5744
"No final name for trans_id %(trans_id)r\n"
5745
"file-id: %(file_id)r\n"
5746
"root trans-id: %(root_trans_id)r\n"
5747
msgstr ""
5748
5749
#: bzrlib/errors.py:1969
5750
msgid "Attempt to reuse a transform that has already been applied."
5751
msgstr ""
5752
5753
#: bzrlib/errors.py:1974
5754
msgid "Moving the root directory is not supported at this time"
5755
msgstr ""
5756
5757
#: bzrlib/errors.py:1979
5758
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5759
msgstr ""
5760
5761
#: bzrlib/errors.py:1990
5762
msgid ""
5763
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5764
msgstr ""
5765
5766
#: bzrlib/errors.py:2026
5767
msgid ""
5768
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5769
msgstr ""
5770
5771
#: bzrlib/errors.py:2056
5772
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5773
msgstr ""
5774
5775
#: bzrlib/errors.py:2064
5776
msgid "Nothing to merge."
5777
msgstr ""
5778
5779
#: bzrlib/errors.py:2069
5780
msgid "Format %(format)s cannot be initialised by this version of bzr."
5781
msgstr ""
5782
5783
#: bzrlib/errors.py:2078
5784
msgid ""
5785
"Cannot convert from format %(from_format)s to format %(format)s. "
5786
"%(problem)s"
5787
msgstr ""
5788
5789
#: bzrlib/errors.py:2090
5790
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5791
msgstr ""
5792
5793
#: bzrlib/errors.py:2098
5794
msgid "%(exe_name)s could not be found on this machine"
5795
msgstr ""
5796
5797
#: bzrlib/errors.py:2106
5798
msgid "Diff is not installed on this machine: %(msg)s"
5799
msgstr ""
5800
5801
#: bzrlib/errors.py:2114
5802
msgid "Diff3 is not installed on this machine."
5803
msgstr ""
5804
5805
#: bzrlib/errors.py:2120
5806
msgid "The content being inserted is already present."
5807
msgstr ""
5808
5809
#: bzrlib/errors.py:2125
5810
msgid ""
5811
"This tree contains left-over files from a failed operation.\n"
5812
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5813
"to\n"
5814
" keep, and delete it when you are done."
5815
msgstr ""
5816
5817
#: bzrlib/errors.py:2136
5818
msgid ""
5819
"This tree contains left-over files from a failed operation.\n"
5820
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5821
" wish to keep, and delete it when you are done."
5822
msgstr ""
5823
5824
#: bzrlib/errors.py:2146
5825
msgid ""
5826
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5827
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5828
"to\n"
5829
" keep, and delete it when you are done."
5830
msgstr ""
5831
5832
#: bzrlib/errors.py:2157
5833
msgid ""
5834
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5835
"examine %(pending_deletion)s to see if it contains any files you wish to "
5836
"keep, and delete it when you are done."
5837
msgstr ""
5838
5839
#: bzrlib/errors.py:2167
5840
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5841
msgstr ""
5842
5843
#: bzrlib/errors.py:2181
5844
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5845
msgstr ""
5846
5847
#: bzrlib/errors.py:2194
5848
msgid "Error in merge modified format"
5849
msgstr ""
5850
5851
#: bzrlib/errors.py:2199
5852
msgid "Format error in conflict listings"
5853
msgstr ""
5854
5855
#: bzrlib/errors.py:2203
5856
msgid ""
5857
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5858
"Error: %(description)s"
5859
msgstr ""
5860
5861
#: bzrlib/errors.py:2214
5862
msgid ""
5863
"An error has been detected in the repository %(repo_path)s.\n"
5864
"Please run bzr reconcile on this repository."
5865
msgstr ""
5866
5867
#: bzrlib/errors.py:2225
5868
msgid ""
5869
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5870
"reason: %(reason)s"
5871
msgstr ""
5872
5873
#: bzrlib/errors.py:2238
5874
msgid ""
5875
"An inconsistent delta was supplied: %(delta)r\n"
5876
"reason: %(reason)s"
5877
msgstr ""
5878
5879
#: bzrlib/errors.py:2250
5880
msgid "To use this feature you must upgrade your branch at %(path)s."
5881
msgstr ""
5882
5883
#: bzrlib/errors.py:2259
5884
msgid "To use this feature you must upgrade your repository at %(path)s."
5885
msgstr ""
5886
5887
#: bzrlib/errors.py:2264
5888
msgid ""
5889
"To use this feature you must upgrade your branch at %(path)s to a format "
5890
"which supports rich roots."
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:2270
5894
msgid "Cannot perform local-only commits on unbound branches."
5895
msgstr ""
5896
5897
#: bzrlib/errors.py:2275
5898
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5899
msgstr ""
5900
5901
#: bzrlib/errors.py:2296
5902
msgid "Ghost tags not supported by format %(format)r."
5903
msgstr ""
5904
5905
#: bzrlib/errors.py:2304
5906
msgid "File is binary but should be text."
5907
msgstr ""
5908
5909
#: bzrlib/errors.py:2309
5910
msgid "The path %(path)s is not permitted on this platform"
5911
msgstr ""
5912
5913
#: bzrlib/errors.py:2318
5914
msgid ""
5915
"Testament did not match expected value.\n"
5916
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5917
" {%(measured)s}"
5918
msgstr ""
5919
5920
#: bzrlib/errors.py:2330
5921
msgid "Not a bzr revision-bundle: %(text)r"
5922
msgstr ""
5923
5924
#: bzrlib/errors.py:2339
5925
msgid "Bad bzr revision-bundle: %(text)r"
5926
msgstr ""
5927
5928
#: bzrlib/errors.py:2348
5929
msgid "Malformed bzr revision-bundle header: %(text)r"
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:2353
5933
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5934
msgstr ""
5935
5936
#: bzrlib/errors.py:2358
5937
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5938
msgstr ""
5939
5940
#: bzrlib/errors.py:2363
5941
msgid "End of line marker was not \\n in bzr revision-bundle"
5942
msgstr ""
5943
5944
#: bzrlib/errors.py:2373
5945
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5946
msgstr ""
5947
5948
#: bzrlib/errors.py:2383
5949
msgid "Root class for inventory serialization errors"
5950
msgstr ""
5951
5952
#: bzrlib/errors.py:2387
5953
msgid ""
5954
"The inventory was not in the expected format:\n"
5955
" %(msg)s"
5956
msgstr ""
5957
5958
#: bzrlib/errors.py:2396
5959
msgid "This operation requires rich root data storage"
5960
msgstr ""
5961
5962
#: bzrlib/errors.py:2409
5963
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5964
msgstr ""
5965
5966
#: bzrlib/errors.py:2418
5967
msgid ""
5968
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5969
"variable."
5970
msgstr ""
5971
5972
#: bzrlib/errors.py:2425
5973
msgid ""
5974
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5975
"ghost at {%(ghost_revision_id)s}"
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:2435
5979
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:2486
5983
msgid ""
5984
"A merge directive must provide either a bundle or a public branch location."
5985
msgstr ""
5986
5987
#: bzrlib/errors.py:2493
5988
msgid "Bad merge directive payload %(start)r"
5989
msgstr ""
5990
5991
#: bzrlib/errors.py:2503
5992
msgid "Preview patch does not match requested changes."
5993
msgstr ""
5994
5995
#: bzrlib/errors.py:2509
5996
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5997
msgstr ""
5998
5999
#: bzrlib/errors.py:2519
6000
msgid ""
6001
"Your branch does not have all of the revisions required in order to merge "
6002
"this merge directive and the target location specified in the merge "
6003
"directive is not a branch: %(location)s."
6004
msgstr ""
6005
6006
#: bzrlib/errors.py:2531
6007
msgid "Unsupported entry kind %(kind)s"
6008
msgstr ""
6009
6010
#: bzrlib/errors.py:2539
6011
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:2549
6015
msgid "Subsume target %(other_tree)s needs to be upgraded."
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:2568
6019
msgid "No such tag: %(tag_name)s"
6020
msgstr ""
6021
6022
#: bzrlib/errors.py:2576
6023
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6024
msgstr ""
6025
6026
#: bzrlib/errors.py:2585
6027
msgid "Tag %(tag_name)s already exists."
6028
msgstr ""
6029
6030
#: bzrlib/errors.py:2593
6031
msgid ""
6032
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
6033
"\" for more information on this feature."
6034
msgstr ""
6035
6036
#: bzrlib/errors.py:2603
6037
msgid ""
6038
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6039
msgstr ""
6040
6041
#: bzrlib/errors.py:2613
6042
msgid ""
6043
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6044
msgstr ""
6045
6046
#: bzrlib/errors.py:2623
6047
msgid "Invalid line in bugs property: '%(line)s'"
6048
msgstr ""
6049
6050
#: bzrlib/errors.py:2631
6051
msgid "Invalid bug status: '%(status)s'"
6052
msgstr ""
6053
6054
#: bzrlib/errors.py:2639
6055
msgid "Could not understand response from smart server: %(response_tuple)r"
6056
msgstr ""
6057
6058
#: bzrlib/errors.py:2678
6059
msgid "Server sent an unexpected error: %(error_tuple)r"
6060
msgstr ""
6061
6062
#: bzrlib/errors.py:2697
6063
msgid "Unrecognised container format: %(container_format)r"
6064
msgstr ""
6065
6066
#: bzrlib/errors.py:2705
6067
msgid "Unexpected end of container stream"
6068
msgstr ""
6069
6070
#: bzrlib/errors.py:2710
6071
msgid "Unknown record type: %(record_type)r"
6072
msgstr ""
6073
6074
#: bzrlib/errors.py:2718
6075
msgid "Invalid record: %(reason)s"
6076
msgstr ""
6077
6078
#: bzrlib/errors.py:2726
6079
msgid "Container has data after end marker: %(excess)r"
6080
msgstr ""
6081
6082
#: bzrlib/errors.py:2734
6083
msgid "Container has multiple records with the same name: %(name)s"
6084
msgstr ""
6085
6086
#: bzrlib/errors.py:2747
6087
msgid "Corrupt or incompatible data stream: %(reason)s"
6088
msgstr ""
6089
6090
#: bzrlib/errors.py:2755
6091
msgid "SMTP error: %(error)s"
6092
msgstr ""
6093
6094
#: bzrlib/errors.py:2763
6095
msgid "No message supplied."
6096
msgstr ""
6097
6098
#: bzrlib/errors.py:2768
6099
msgid "No mail-to address (--mail-to) or output (-o) specified."
6100
msgstr ""
6101
6102
#: bzrlib/errors.py:2773
6103
msgid "Unknown mail client: %(mail_client)s"
6104
msgstr ""
6105
6106
#: bzrlib/errors.py:2781
6107
msgid ""
6108
"Unable to find mail client with the following names: "
6109
"%(mail_command_list_string)s"
6110
msgstr ""
6111
6112
#: bzrlib/errors.py:2791
6113
msgid "SMTP connection to %(host)s refused"
6114
msgstr ""
6115
6116
#: bzrlib/errors.py:2800
6117
msgid "Please specify smtp_server. No server at default %(host)s."
6118
msgstr ""
6119
6120
#: bzrlib/errors.py:2814
6121
msgid ""
6122
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6123
"reconfigure."
6124
msgstr ""
6125
6126
#: bzrlib/errors.py:2826
6127
msgid "'%(display_url)s' is already a branch."
6128
msgstr ""
6129
6130
#: bzrlib/errors.py:2831
6131
msgid "'%(display_url)s' is already a tree."
6132
msgstr ""
6133
6134
#: bzrlib/errors.py:2836
6135
msgid "'%(display_url)s' is already a checkout."
6136
msgstr ""
6137
6138
#: bzrlib/errors.py:2841
6139
msgid "'%(display_url)s' is already a lightweight checkout."
6140
msgstr ""
6141
6142
#: bzrlib/errors.py:2846
6143
msgid "'%(display_url)s' is already using a shared repository."
6144
msgstr ""
6145
6146
#: bzrlib/errors.py:2851
6147
msgid "'%(display_url)s' is already standalone."
6148
msgstr ""
6149
6150
#: bzrlib/errors.py:2856
6151
msgid "Shared repository '%(display_url)s' already creates working trees."
6152
msgstr ""
6153
6154
#: bzrlib/errors.py:2862
6155
msgid ""
6156
"Shared repository '%(display_url)s' already doesn't create working trees."
6157
msgstr ""
6158
6159
#: bzrlib/errors.py:2868
6160
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6161
msgstr ""
6162
6163
#: bzrlib/errors.py:2873
6164
msgid "No location could be found to bind to at %(display_url)s."
6165
msgstr ""
6166
6167
#: bzrlib/errors.py:2878
6168
msgid ""
6169
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
6170
"%(more)s"
6171
msgstr ""
6172
6173
#: bzrlib/errors.py:2897
6174
msgid ""
6175
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
6176
"%(more)s"
6177
msgstr ""
6178
6179
#: bzrlib/errors.py:2903
6180
msgid "Variable {%(name)s} is not available."
6181
msgstr ""
6182
6183
#: bzrlib/errors.py:2911
6184
msgid "No template specified."
6185
msgstr ""
6186
6187
#: bzrlib/errors.py:2916
6188
msgid "Unable to create symlink %(path_str)son this platform"
6189
msgstr ""
6190
6191
#: bzrlib/errors.py:2931
6192
msgid ""
6193
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6194
"\", \"local\"."
6195
msgstr ""
6196
6197
#: bzrlib/errors.py:2965
6198
msgid ""
6199
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6200
msgstr ""
6201
6202
#: bzrlib/errors.py:2977
6203
msgid "The \"%(config_id)s\" configuration does not exist."
6204
msgstr ""
6205
6206
#: bzrlib/errors.py:2985
6207
msgid "The \"%(option_name)s\" configuration option does not exist."
6208
msgstr ""
6209
6210
#: bzrlib/errors.py:2993
6211
msgid "The alias \"%(alias_name)s\" does not exist."
6212
msgstr ""
6213
6214
#: bzrlib/errors.py:3007
6215
msgid "\"%(alias_name)s\" is not a valid location alias."
6216
msgstr ""
6217
6218
#: bzrlib/errors.py:3015
6219
msgid "No %(alias_name)s location assigned."
6220
msgstr ""
6221
6222
#: bzrlib/errors.py:3023
6223
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6224
msgstr ""
6225
6226
#: bzrlib/errors.py:3033
6227
msgid "Unknown rules detected: %(unknowns_str)s."
6228
msgstr ""
6229
6230
#: bzrlib/errors.py:3044
6231
msgid "Tip change rejected: %(msg)s"
6232
msgstr ""
6233
6234
#: bzrlib/errors.py:3052
6235
msgid "Shelf corrupt."
6236
msgstr ""
6237
6238
#: bzrlib/errors.py:3057
6239
msgid "Corruption while decompressing repository file%(orig_error)s"
6240
msgstr ""
6241
6242
#: bzrlib/errors.py:3069
6243
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6244
msgstr ""
6245
6246
#: bzrlib/errors.py:3077
6247
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6248
msgstr ""
6249
6250
#: bzrlib/errors.py:3085
6251
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6252
msgstr ""
6253
6254
#: bzrlib/errors.py:3093
6255
msgid "The user aborted the operation."
6256
msgstr ""
6257
6258
#: bzrlib/errors.py:3098
6259
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6260
msgstr ""
6261
6262
#: bzrlib/errors.py:3108
6263
msgid "No such view: %(view_name)s."
6264
msgstr ""
6265
6266
#: bzrlib/errors.py:3118
6267
msgid ""
6268
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6269
"to a later format."
6270
msgstr ""
6271
6272
#: bzrlib/errors.py:3127
6273
msgid ""
6274
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6275
msgstr ""
6276
6277
#: bzrlib/errors.py:3194
6278
msgid "%(bzrdir)r does not support co-located branches."
6279
msgstr ""
6280
6281
#: bzrlib/errors.py:3200
6282
msgid ""
6283
"Unable to determine your name.\n"
6284
"Please, set your name with the 'whoami' command.\n"
6285
"E.g. bzr whoami \"Your Name <name@example.com>\""
6286
msgstr ""
6287
6288
#: bzrlib/errors.py:3209
6289
msgid "Invalid pattern(s) found. %(msg)s"
6290
msgstr ""
6291
6292
#: bzrlib/errors.py:3217
6293
msgid ""
6294
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6295
"unbind` to fix."
6296
msgstr ""
6297
6298
#: bzrlib/errors.py:3228
6299
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6300
msgstr ""
6301
6302
#: bzrlib/errors.py:3237
6303
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6304
msgstr ""
6305
6306
#: bzrlib/errors.py:3246
6307
msgid ""
6308
"No compatible object available for operations from %(source)r to %(target)r."
6309
msgstr ""
6310
6311
#: bzrlib/errors.py:3256
6312
msgid ""
6313
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6314
"%(arguments)s."
6315
msgstr ""
6316
6317
#: bzrlib/errors.py:3266
6318
msgid ""
6319
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6320
"format %(format)r"
6321
msgstr ""
6322
6323
#: bzrlib/errors.py:3278
6324
msgid ""
6325
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6326
"plugin."
6327
msgstr ""
6328
6329
#: bzrlib/errors.py:3291
6330
msgid "Binary files section encountered."
6331
msgstr ""
6332
6333
#: bzrlib/errors.py:3299
6334
msgid ""
6335
"Malformed patch header. %(desc)s\n"
6336
"%(line)r"
6337
msgstr ""
6338
6339
#: bzrlib/errors.py:3308
6340
msgid ""
6341
"Malformed hunk header. %(desc)s\n"
6342
"%(line)r"
6343
msgstr ""
6344
6345
#: bzrlib/errors.py:3317
6346
msgid ""
6347
"Malformed line. %(desc)s\n"
6348
"%(line)r"
6349
msgstr ""
6350
6351
#: bzrlib/errors.py:3327
6352
msgid ""
6353
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6354
"but patch says it should be \"%(patch_line)s\""
6355
msgstr ""
6356
6357
#: bzrlib/errors.py:3338
6358
msgid "The feature %(feature)s has already been registered."
6359
msgstr ""
6360
6361
#: bzrlib/export_pot.py:252
6362
#, python-format
6363
msgid "Exporting messages from builtin command: %s"
6364
msgstr ""
6365
6366
#: bzrlib/export_pot.py:271
6367
msgid "Exporting messages from plugin command: {0} in {1}"
6368
msgstr ""
6369
6370
#: bzrlib/export_pot.py:292
6371
#, python-format
6372
msgid "Exporting message from error: %s"
6373
msgstr ""
6374
6375
#: bzrlib/fetch.py:98
6376
msgid "Finding revisions"
6377
msgstr ""
6378
6379
#: bzrlib/fetch.py:103
6380
msgid "Fetching revisions"
6381
msgstr ""
6382
6383
#: bzrlib/foreign.py:262
6384
msgid "Push into a different VCS without any custom bzr metadata."
6385
msgstr ""
6386
6387
#: bzrlib/foreign.py:264
6388
msgid ""
6389
"This will afterwards rebase the local branch on the remote\n"
6390
"branch unless the --no-rebase option is used, in which case \n"
6391
"the two branches will be out of sync after the push. "
6392
msgstr ""
6393
6394
# help of 'no-rebase' option of 'dpush' command
6395
#: bzrlib/foreign.py:277
6396
msgid "Do not rebase after push."
6397
msgstr ""
6398
6399
#: bzrlib/foreign.py:311
6400
#, python-format
6401
msgid "Using saved location: %s\n"
6402
msgstr ""
6403
6404
#: bzrlib/foreign.py:321
6405
msgid ""
6406
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6407
"regular push."
6408
msgstr ""
6409
6410
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6411
msgid "{0} commits with valid signatures"
6412
msgstr ""
6413
6414
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6415
msgid "{0} commit with unknown key"
6416
msgid_plural "{0} commits with unknown keys"
6417
msgstr[0] ""
6418
msgstr[1] ""
6419
6420
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6421
msgid "{0} commit not valid"
6422
msgid_plural "{0} commits not valid"
6423
msgstr[0] ""
6424
msgstr[1] ""
6425
6426
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6427
msgid "{0} commit not signed"
6428
msgid_plural "{0} commits not signed"
6429
msgstr[0] ""
6430
msgstr[1] ""
6431
6432
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6433
msgid "{0} commit with key now expired"
6434
msgid_plural "{0} commits with key now expired"
6435
msgstr[0] ""
6436
msgstr[1] ""
6437
6438
#: bzrlib/gpg.py:343
6439
msgid "No GnuPG key results for pattern: {0}"
6440
msgstr ""
6441
6442
#: bzrlib/gpg.py:386
6443
msgid "{0} signed {1} commit"
6444
msgid_plural "{0} signed {1} commits"
6445
msgstr[0] ""
6446
msgstr[1] ""
6447
6448
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6449
msgid "{0} commit by author {1}"
6450
msgid_plural "{0} commits by author {1}"
6451
msgstr[0] ""
6452
msgstr[1] ""
6453
6454
#: bzrlib/gpg.py:433
6455
msgid "Unknown key {0} signed {1} commit"
6456
msgid_plural "Unknown key {0} signed {1} commits"
6457
msgstr[0] ""
6458
msgstr[1] ""
6459
6460
#: bzrlib/gpg.py:452
6461
msgid "{0} commit by author {1} with key {2} now expired"
6462
msgid_plural "{0} commits by author {1} with key {2} now expired"
6463
msgstr[0] ""
6464
msgstr[1] ""
6465
6466
#: bzrlib/groupcompress.py:1739
6467
#, python-format
6468
msgid "Insert claimed random_id=True, but then inserted %r two times"
6469
msgstr ""
6470
6471
#: bzrlib/hooks.py:331
6472
#, python-format
6473
msgid "Introduced in: %s"
6474
msgstr ""
6475
6476
#: bzrlib/hooks.py:334
6477
#, python-format
6478
msgid "Deprecated in: %s"
6479
msgstr ""
6480
6481
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6482
msgid "Walking content"
6483
msgstr ""
6484
6485
#: bzrlib/knit.py:3330
6486
msgid "annotating"
6487
msgstr ""
6488
6489
#: bzrlib/lock.py:548
6490
msgid "{0!r} was {1} locked again"
6491
msgstr ""
6492
6493
#: bzrlib/lockdir.py:321
6494
#, python-format
6495
msgid "error removing pending lock: %s"
6496
msgstr ""
6497
6498
#: bzrlib/lockdir.py:616
6499
msgid "Unable to obtain"
6500
msgstr ""
6501
6502
#: bzrlib/lockdir.py:618
6503
msgid "Lock owner changed for"
6504
msgstr ""
6505
6506
#: bzrlib/lockdir.py:620
6507
msgid "{0} lock {1} {2}."
6508
msgstr ""
6509
6510
#: bzrlib/lockdir.py:627
6511
#, python-format
6512
msgid "Will continue to try until %s, unless you press Ctrl-C."
6513
msgstr ""
6514
6515
#: bzrlib/lockdir.py:629
6516
msgid "See \"bzr help break-lock\" for more."
6517
msgstr ""
6518
6519
#: bzrlib/lockdir.py:739
6520
#, python-format
6521
msgid ""
6522
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6523
msgstr ""
6524
6525
#: bzrlib/log.py:572
6526
msgid "--exclude-common-ancestry requires two different revisions"
6527
msgstr ""
6528
6529
#: bzrlib/log.py:574
6530
#, python-format
6531
msgid "invalid direction %r"
6532
msgstr ""
6533
6534
#: bzrlib/log.py:662
6535
msgid "Start revision not found in history of end revision."
6536
msgstr ""
6537
6538
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6539
msgid "Logging revision 0 is invalid."
6540
msgstr ""
6541
6542
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6543
msgid "Start revision must be older than the end revision."
6544
msgstr ""
6545
6546
#: bzrlib/log.py:1827
6547
#, python-format
6548
msgid "unknown log formatter: %r"
6549
msgstr ""
6550
6551
#: bzrlib/log.py:2123
6552
msgid "fixes bug"
6553
msgid_plural "fixes bugs"
6554
msgstr[0] ""
6555
msgstr[1] ""
6556
6557
#: bzrlib/merge.py:689
6558
msgid "All changes applied successfully."
6559
msgstr ""
6560
6561
#: bzrlib/merge.py:691
6562
#, python-format
6563
msgid "%d conflicts encountered."
6564
msgstr ""
6565
6566
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6567
msgid "Preparing file merge"
6568
msgstr ""
6569
6570
#: bzrlib/multiparent.py:426
6571
msgid "Importing revisions"
6572
msgstr ""
6573
6574
# help of 'help' option
6575
#: bzrlib/option.py:526
6576
msgid "Show help message."
6577
msgstr ""
6578
6579
# help of 'quiet' option
6580
#: bzrlib/option.py:528
6581
msgid "Only display errors and warnings."
6582
msgstr ""
6583
6584
# help of 'usage' option
6585
#: bzrlib/option.py:531
6586
msgid "Show usage message and options."
6587
msgstr ""
6588
6589
# help of 'verbose' option
6590
#: bzrlib/option.py:533
6591
msgid "Display more information."
6592
msgstr ""
6593
6594
# help of 'change' option
6595
#: bzrlib/option.py:541
6596
msgid ""
6597
"Select changes introduced by the specified revision. See also \"help "
6598
"revisionspec\"."
6599
msgstr ""
6600
6601
# help of 'directory' option
6602
#: bzrlib/option.py:543
6603
msgid "Branch to operate on, instead of working directory."
6604
msgstr ""
6605
6606
# help of 'log-format=long' option
6607
#: bzrlib/option.py:545
6608
msgid "Detailed log format."
6609
msgstr ""
6610
6611
# help of 'log-format=gnu-changelog' option
6612
#: bzrlib/option.py:545
6613
msgid "Format used by GNU ChangeLog files."
6614
msgstr ""
6615
6616
# help of 'log-format=line' option
6617
#: bzrlib/option.py:545
6618
msgid "Log format with one line per revision."
6619
msgstr ""
6620
6621
# help of 'log-format=short' option
6622
#: bzrlib/option.py:545
6623
msgid "Moderately short log format."
6624
msgstr ""
6625
6626
# help of 'log-format' option
6627
#: bzrlib/option.py:545
6628
msgid "Use specified log format."
6629
msgstr ""
6630
6631
# title of 'log-format' option
6632
#: bzrlib/option.py:547
6633
msgid "Log format"
6634
msgstr ""
6635
6636
# help of 'merge-type=lca' option
6637
#: bzrlib/option.py:549
6638
msgid "LCA-newness merge."
6639
msgstr ""
6640
6641
# help of 'merge-type=diff3' option
6642
#: bzrlib/option.py:549
6643
msgid "Merge using external diff3."
6644
msgstr ""
6645
6646
# help of 'merge-type=merge3' option
6647
#: bzrlib/option.py:549
6648
msgid "Native diff3-style merge."
6649
msgstr ""
6650
6651
# help of 'merge-type' option
6652
#: bzrlib/option.py:549
6653
msgid "Select a particular merge algorithm."
6654
msgstr ""
6655
6656
# help of 'merge-type=weave' option
6657
#: bzrlib/option.py:549
6658
msgid "Weave-based merge."
6659
msgstr ""
6660
6661
# title of 'merge-type' option
6662
#: bzrlib/option.py:551
6663
msgid "Merge algorithm"
6664
msgstr ""
6665
6666
# help of 'message' option
6667
#: bzrlib/option.py:554
6668
msgid "Message string."
6669
msgstr ""
6670
6671
# help of 'null' option
6672
#: bzrlib/option.py:556
6673
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6674
msgstr ""
6675
6676
# help of 'overwrite' option
6677
#: bzrlib/option.py:558
6678
msgid "Ignore differences between branches and overwrite unconditionally."
6679
msgstr ""
6680
6681
# help of 'remember' option
6682
#: bzrlib/option.py:560
6683
msgid "Remember the specified location as a default."
6684
msgstr ""
6685
6686
# help of 'reprocess' option
6687
#: bzrlib/option.py:562
6688
msgid "Reprocess to reduce spurious conflicts."
6689
msgstr ""
6690
6691
# help of 'revision' option
6692
#: bzrlib/option.py:566
6693
msgid "See \"help revisionspec\" for details."
6694
msgstr ""
6695
6696
# help of 'show-ids' option
6697
#: bzrlib/option.py:568
6698
msgid "Show internal object ids."
6699
msgstr ""
6700
6701
# help of 'timezone' option
6702
#: bzrlib/option.py:571
6703
msgid "Display timezone as local, original, or utc."
6704
msgstr ""
6705
6706
#: bzrlib/osutils.py:100
6707
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6708
msgstr ""
6709
6710
#: bzrlib/osutils.py:220
6711
msgid "lstat/stat of ({0!r}): {1!r}"
6712
msgstr ""
6713
6714
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6715
#, python-format
6716
msgid "sorry, %r not allowed in path"
6717
msgstr ""
6718
6719
#: bzrlib/osutils.py:1237
6720
#, python-format
6721
msgid "%r is too short to calculate a relative path"
6722
msgstr ""
6723
6724
#: bzrlib/plugin.py:143
6725
#, python-format
6726
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6727
msgstr ""
6728
6729
# help of 'plugin' option of 'bash-completion' command
6730
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6731
msgid "Enable completions for the selected plugin (default: all plugins)"
6732
msgstr ""
6733
6734
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6735
msgid "Generate a shell function for bash command line completion."
6736
msgstr ""
6737
6738
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6739
msgid ""
6740
"This command generates a shell function which can be used by bash to\n"
6741
"automatically complete the currently typed command when the user presses\n"
6742
"the completion key (usually tab)."
6743
msgstr ""
6744
6745
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6746
msgid ""
6747
"Commonly used like this:\n"
6748
" eval \"`bzr bash-completion`\""
6749
msgstr ""
6750
6751
# help of 'function-name' option of 'bash-completion' command
6752
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6753
msgid "Name of the generated function (default: _bzr)"
6754
msgstr ""
6755
6756
# help of 'function-only' option of 'bash-completion' command
6757
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6758
msgid "Generate only the shell function, don't enable it"
6759
msgstr ""
6760
6761
#: bzrlib/plugins/launchpad/__init__.py:81
6762
msgid "Register a branch with launchpad.net."
6763
msgstr ""
6764
6765
#: bzrlib/plugins/launchpad/__init__.py:83
6766
msgid ""
6767
"This command lists a bzr branch in the directory of branches on\n"
6768
"launchpad.net. Registration allows the branch to be associated with\n"
6769
"bugs or specifications."
6770
msgstr ""
6771
6772
#: bzrlib/plugins/launchpad/__init__.py:87
6773
msgid ""
6774
"Before using this command you must register the project to which the\n"
6775
"branch belongs, and create an account for yourself on launchpad.net."
6776
msgstr ""
6777
6778
#: bzrlib/plugins/launchpad/__init__.py:90
6779
msgid ""
6780
"arguments:\n"
6781
" public_url: The publicly visible url for the branch to register.\n"
6782
" This must be an http or https url (which Launchpad can read\n"
6783
" from to access the branch). Local file urls, SFTP urls, and\n"
6784
" bzr+ssh urls will not work.\n"
6785
" If no public_url is provided, bzr will use the configured\n"
6786
" public_url if there is one for the current branch, and\n"
6787
" otherwise error."
6788
msgstr ""
6789
6790
#: bzrlib/plugins/launchpad/__init__.py:99
6791
msgid ""
6792
"example:\n"
6793
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6794
" --project fooproject"
6795
msgstr ""
6796
6797
# help of 'project' option of 'register-branch' command
6798
#: bzrlib/plugins/launchpad/__init__.py:106
6799
msgid "Launchpad project short name to associate with the branch."
6800
msgstr ""
6801
6802
# help of 'branch-name' option of 'register-branch' command
6803
#: bzrlib/plugins/launchpad/__init__.py:113
6804
msgid ""
6805
"Short name for the branch; by default taken from the last component of the "
6806
"url."
6807
msgstr ""
6808
6809
# help of 'branch-title' option of 'register-branch' command
6810
#: bzrlib/plugins/launchpad/__init__.py:117
6811
msgid "One-sentence description of the branch."
6812
msgstr ""
6813
6814
# help of 'branch-description' option of 'register-branch' command
6815
#: bzrlib/plugins/launchpad/__init__.py:120
6816
msgid "Longer description of the purpose or contents of the branch."
6817
msgstr ""
6818
6819
# help of 'author' option of 'register-branch' command
6820
#: bzrlib/plugins/launchpad/__init__.py:123
6821
msgid "Branch author's email address, if not yourself."
6822
msgstr ""
6823
6824
# help of 'link-bug' option of 'register-branch' command
6825
#: bzrlib/plugins/launchpad/__init__.py:126
6826
msgid "The bug this branch fixes."
6827
msgstr ""
6828
6829
# help of 'dry-run' option of 'register-branch' command
6830
#: bzrlib/plugins/launchpad/__init__.py:129
6831
msgid "Prepare the request but don't actually send it."
6832
msgstr ""
6833
6834
#: bzrlib/plugins/launchpad/__init__.py:151
6835
msgid ""
6836
"register-branch requires a public branch url - see bzr help register-branch."
6837
msgstr ""
6838
6839
#: bzrlib/plugins/launchpad/__init__.py:159
6840
msgid "--product is deprecated; please use --project."
6841
msgstr ""
6842
6843
#: bzrlib/plugins/launchpad/__init__.py:191
6844
msgid "Open a Launchpad branch page in your web browser."
6845
msgstr ""
6846
6847
# help of 'dry-run' option of 'launchpad-open' command
6848
#: bzrlib/plugins/launchpad/__init__.py:196
6849
msgid "Do not actually open the browser. Just say the URL we would use."
6850
msgstr ""
6851
6852
#: bzrlib/plugins/launchpad/__init__.py:231
6853
#, python-format
6854
msgid "Opening %s in web browser"
6855
msgstr ""
6856
6857
#: bzrlib/plugins/launchpad/__init__.py:241
6858
msgid "Show or set the Launchpad user ID."
6859
msgstr ""
6860
6861
#: bzrlib/plugins/launchpad/__init__.py:243
6862
msgid ""
6863
"When communicating with Launchpad, some commands need to know your\n"
6864
"Launchpad user ID. This command can be used to set or show the\n"
6865
"user ID that Bazaar will use for such communication."
6866
msgstr ""
6867
6868
#: bzrlib/plugins/launchpad/__init__.py:247
6869
msgid ""
6870
":Examples:\n"
6871
" Show the Launchpad ID of the current user::"
6872
msgstr ""
6873
6874
#: bzrlib/plugins/launchpad/__init__.py:250
6875
msgid " bzr launchpad-login"
6876
msgstr ""
6877
6878
#: bzrlib/plugins/launchpad/__init__.py:252
6879
msgid " Set the Launchpad ID of the current user to 'bob'::"
6880
msgstr ""
6881
6882
#: bzrlib/plugins/launchpad/__init__.py:254
6883
msgid " bzr launchpad-login bob"
6884
msgstr ""
6885
6886
# help of 'no-check' option of 'launchpad-login' command
6887
#: bzrlib/plugins/launchpad/__init__.py:261
6888
msgid "Don't check that the user name is valid."
6889
msgstr ""
6890
6891
#: bzrlib/plugins/launchpad/__init__.py:276
6892
#: bzrlib/plugins/launchpad/__init__.py:287
6893
msgid "Launchpad user ID exists and has SSH keys.\n"
6894
msgstr ""
6895
6896
#: bzrlib/plugins/launchpad/__init__.py:279
6897
msgid "No Launchpad user ID configured.\n"
6898
msgstr ""
6899
6900
#: bzrlib/plugins/launchpad/__init__.py:290
6901
#, python-format
6902
msgid "Launchpad user ID set to '%s'.\n"
6903
msgstr ""
6904
6905
#: bzrlib/plugins/launchpad/__init__.py:298
6906
msgid "Ask Launchpad to mirror a branch now."
6907
msgstr ""
6908
6909
#: bzrlib/plugins/launchpad/__init__.py:318
6910
msgid "Propose merging a branch on Launchpad."
6911
msgstr ""
6912
6913
#: bzrlib/plugins/launchpad/__init__.py:320
6914
msgid ""
6915
"This will open your usual editor to provide the initial comment. When it\n"
6916
"has created the proposal, it will open it in your default web browser."
6917
msgstr ""
6918
6919
#: bzrlib/plugins/launchpad/__init__.py:323
6920
msgid ""
6921
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6922
"is not supplied, the remembered submit branch will be used. If no submit\n"
6923
"branch is remembered, the development focus will be used."
6924
msgstr ""
6925
6926
#: bzrlib/plugins/launchpad/__init__.py:327
6927
msgid ""
6928
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6929
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6930
"The parameter the launchpad account name of the desired reviewer. This\n"
6931
"may optionally be followed by '=' and the review type. For example:"
6932
msgstr ""
6933
6934
#: bzrlib/plugins/launchpad/__init__.py:332
6935
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6936
msgstr ""
6937
6938
#: bzrlib/plugins/launchpad/__init__.py:334
6939
msgid ""
6940
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6941
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6942
msgstr ""
6943
6944
# help of 'staging' option of 'lp-propose-merge' command
6945
#: bzrlib/plugins/launchpad/__init__.py:339
6946
msgid "Propose the merge on staging."
6947
msgstr ""
6948
6949
# help of 'message' option of 'lp-propose-merge' command
6950
#: bzrlib/plugins/launchpad/__init__.py:341
6951
msgid "Commit message."
6952
msgstr ""
6953
6954
# help of 'approve' option of 'lp-propose-merge' command
6955
#: bzrlib/plugins/launchpad/__init__.py:343
6956
msgid "Mark the proposal as approved immediately."
6957
msgstr ""
6958
6959
# help of 'review' option of 'lp-propose-merge' command
6960
#: bzrlib/plugins/launchpad/__init__.py:345
6961
msgid "Requested reviewer and optional type."
6962
msgstr ""
6963
6964
#: bzrlib/plugins/launchpad/__init__.py:382
6965
msgid "Find the proposal to merge this revision."
6966
msgstr ""
6967
6968
#: bzrlib/plugins/launchpad/__init__.py:384
6969
msgid ""
6970
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6971
"This works only if the selected branch was the merge proposal target, and\n"
6972
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6973
"are opened in a web browser."
6974
msgstr ""
6975
6976
#: bzrlib/plugins/launchpad/__init__.py:389
6977
msgid ""
6978
"Any revision involved in the merge may be specified-- the revision in\n"
6979
"which the merge was performed, or one of the revisions that was merged."
6980
msgstr ""
6981
6982
#: bzrlib/plugins/launchpad/__init__.py:392
6983
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6984
msgstr ""
6985
6986
#: bzrlib/plugins/launchpad/__init__.py:394
6987
msgid " bzr lp-find-proposal -r annotate:README:1"
6988
msgstr ""
6989
6990
#: bzrlib/plugins/launchpad/__init__.py:409
6991
msgid "No review found."
6992
msgstr ""
6993
6994
#: bzrlib/plugins/launchpad/__init__.py:410
6995
#, python-format
6996
msgid "%d proposals(s) found."
6997
msgstr ""
6998
6999
#: bzrlib/plugins/launchpad/__init__.py:420
7000
msgid "Finding revision-id"
7001
msgstr ""
7002
7003
#: bzrlib/plugins/launchpad/__init__.py:427
7004
msgid "Finding merge"
7005
msgstr ""
7006
7007
#: bzrlib/plugins/launchpad/__init__.py:432
7008
msgid "Finding revno"
7009
msgstr ""
7010
7011
#: bzrlib/plugins/launchpad/__init__.py:437
7012
msgid "Finding Launchpad branch"
7013
msgstr ""
7014
7015
#: bzrlib/plugins/launchpad/__init__.py:440
7016
msgid "Finding proposals"
7017
msgstr ""
7018
7019
#: bzrlib/plugins/launchpad/account.py:66
7020
msgid "Setting ssh/sftp usernames for launchpad.net."
7021
msgstr ""
7022
7023
#: bzrlib/plugins/launchpad/lp_api.py:241
7024
#: bzrlib/plugins/launchpad/lp_api.py:246
7025
#, python-format
7026
msgid "%s is not registered on Launchpad"
7027
msgstr ""
7028
7029
#: bzrlib/plugins/launchpad/lp_api.py:256
7030
#, python-format
7031
msgid "%s has no development focus."
7032
msgstr ""
7033
7034
#: bzrlib/plugins/launchpad/lp_api.py:261
7035
#, python-format
7036
msgid "development focus %s has no branch."
7037
msgstr ""
7038
7039
#: bzrlib/plugins/launchpad/lp_api.py:266
7040
#, python-format
7041
msgid "source package %s has no branch."
7042
msgstr ""
7043
7044
#: bzrlib/plugins/launchpad/lp_api.py:270
7045
#, python-format
7046
msgid "%s has no associated product or source package."
7047
msgstr ""
7048
7049
#: bzrlib/plugins/launchpad/lp_api.py:282
7050
#, python-format
7051
msgid "%s is already up-to-date."
7052
msgstr ""
7053
7054
#: bzrlib/plugins/launchpad/lp_api.py:289
7055
#, python-format
7056
msgid "Pushing to %s"
7057
msgstr ""
7058
7059
#: bzrlib/plugins/launchpad/lp_directory.py:170
7060
msgid ""
7061
"resolution for {0}\n"
7062
" local: {1}\n"
7063
" remote: {2}"
7064
msgstr ""
7065
7066
#: bzrlib/plugins/launchpad/lp_propose.py:149
7067
#, python-format
7068
msgid "There is already a branch merge proposal: %s"
7069
msgstr ""
7070
7071
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7072
msgid "pb parameter to convert() is deprecated"
7073
msgstr ""
7074
7075
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7076
msgid "starting upgrade from format 4 to 5"
7077
msgstr ""
7078
7079
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7080
msgid "note: upgrade may be faster if all store files are ungzipped first"
7081
msgstr ""
7082
7083
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7084
msgid "converting revision"
7085
msgstr ""
7086
7087
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7088
msgid "upgraded to weaves:"
7089
msgstr ""
7090
7091
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7092
#, python-format
7093
msgid "%6d revisions and inventories"
7094
msgstr ""
7095
7096
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7097
#, python-format
7098
msgid "%6d revisions not present"
7099
msgstr ""
7100
7101
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7102
#, python-format
7103
msgid "%6d texts"
7104
msgstr ""
7105
7106
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7107
msgid "writing weave"
7108
msgstr ""
7109
7110
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7111
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7112
msgid "inventory"
7113
msgstr ""
7114
7115
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7116
msgid "write revision"
7117
msgstr ""
7118
7119
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7120
msgid "loading revision"
7121
msgstr ""
7122
7123
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7124
#, python-format
7125
msgid "revision {%s} not present in branch; will be converted as a ghost"
7126
msgstr ""
7127
7128
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7129
msgid "starting upgrade from format 5 to 6"
7130
msgstr ""
7131
7132
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7133
#, python-format
7134
msgid "adding prefixes to %s"
7135
msgstr ""
7136
7137
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7138
msgid "starting upgrade from format 6 to metadir"
7139
msgstr ""
7140
7141
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7142
msgid "Removing ancestry.weave"
7143
msgstr ""
7144
7145
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7146
msgid "Finding branch files"
7147
msgstr ""
7148
7149
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7150
msgid "Upgrading repository"
7151
msgstr ""
7152
7153
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7154
msgid "Upgrading branch"
7155
msgstr ""
7156
7157
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7158
msgid "No working tree."
7159
msgstr ""
7160
7161
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7162
msgid "Upgrading working tree"
7163
msgstr ""
7164
7165
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7166
#, python-format
7167
msgid "Make %s lock"
7168
msgstr ""
7169
7170
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7171
#, python-format
7172
msgid "Moving %s"
7173
msgstr ""
7174
7175
#: bzrlib/push.py:56
7176
msgid "Created new branch."
7177
msgstr ""
7178
7179
#: bzrlib/push.py:97
7180
#, python-format
7181
msgid ""
7182
"Target directory %s already contains a .bzr directory, but it is not valid."
7183
msgstr ""
7184
7185
#: bzrlib/push.py:101
7186
#, python-format
7187
msgid ""
7188
"Target directory %s already exists, but does not have a .bzr directory. "
7189
"Supply --use-existing-dir to push there anyway."
7190
msgstr ""
7191
7192
#: bzrlib/push.py:122
7193
#, python-format
7194
msgid "Too many redirections trying to make %s."
7195
msgstr ""
7196
7197
#: bzrlib/push.py:147
7198
msgid ""
7199
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7200
"information."
7201
msgstr ""
7202
7203
#: bzrlib/push.py:151
7204
#, python-format
7205
msgid ""
7206
"It is not possible to losslessly push to %s. You may want to use dpush "
7207
"instead."
7208
msgstr ""
7209
7210
#: bzrlib/push.py:157
7211
#, python-format
7212
msgid ""
7213
"At %s you have a valid .bzr control directory, but not a branch or "
7214
"repository. This is an unsupported configuration. Please move the target "
7215
"directory out of the way and try again."
7216
msgstr ""
7217
7218
#: bzrlib/reconcile.py:97
7219
#, python-format
7220
msgid "Reconciling branch %s"
7221
msgstr ""
7222
7223
#: bzrlib/reconcile.py:103
7224
#, python-format
7225
msgid "Reconciling repository %s"
7226
msgstr ""
7227
7228
#: bzrlib/reconcile.py:105
7229
msgid "Reconciling repository"
7230
msgstr ""
7231
7232
#: bzrlib/reconcile.py:111
7233
#, python-format
7234
msgid "%s cannot canonicalize CHKs."
7235
msgstr ""
7236
7237
#: bzrlib/reconcile.py:119
7238
msgid "Reconcile aborted: revision index has inconsistent parents."
7239
msgstr ""
7240
7241
#: bzrlib/reconcile.py:121
7242
msgid "Run \"bzr check\" for more details."
7243
msgstr ""
7244
7245
#: bzrlib/reconcile.py:123
7246
msgid "Reconciliation complete."
7247
msgstr ""
7248
7249
#: bzrlib/reconcile.py:166
7250
msgid "Fixing last revision info {0} => {1}"
7251
msgstr ""
7252
7253
#: bzrlib/reconcile.py:173
7254
msgid "revision_history ok."
7255
msgstr ""
7256
7257
#: bzrlib/reconcile.py:234
7258
msgid "Reading inventory data"
7259
msgstr ""
7260
7261
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7262
msgid "Inventory ok."
7263
msgstr ""
7264
7265
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7266
msgid "Backing up inventory"
7267
msgstr ""
7268
7269
#: bzrlib/reconcile.py:258
7270
msgid "Backup inventory created."
7271
msgstr ""
7272
7273
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7274
msgid "Writing weave"
7275
msgstr ""
7276
7277
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7278
msgid "Inventory regenerated."
7279
msgstr ""
7280
7281
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7282
msgid "Reading indexes"
7283
msgstr ""
7284
7285
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7286
msgid "Checking unused inventories"
7287
msgstr ""
7288
7289
#: bzrlib/reconcile.py:388
7290
msgid "Backup Inventory created"
7291
msgstr ""
7292
7293
#: bzrlib/reconcile.py:446
7294
msgid "Fixing text parents"
7295
msgstr ""
7296
7297
#: bzrlib/reconfigure.py:54
7298
msgid "{0} is now stacked on {1}\n"
7299
msgstr ""
7300
7301
#: bzrlib/reconfigure.py:69
7302
#, python-format
7303
msgid "%s is now not stacked\n"
7304
msgstr ""
7305
7306
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7307
#, python-format
7308
msgid "bzr: ERROR (ignored): %s"
7309
msgstr ""
7310
7311
#: bzrlib/remote.py:2541
7312
msgid "Copying repository content as tarball..."
7313
msgstr ""
7314
7315
#: bzrlib/rename_map.py:69
7316
msgid "Calculating hashes"
7317
msgstr ""
7318
7319
#: bzrlib/rename_map.py:107
7320
msgid "Determining hash hits"
7321
msgstr ""
7322
7323
#: bzrlib/rename_map.py:242
7324
msgid "{0} => {1}"
7325
msgstr ""
7326
7327
#: bzrlib/repository.py:1787
7328
msgid "Moving repository to repository.backup"
7329
msgstr ""
7330
7331
#: bzrlib/repository.py:1794
7332
msgid "Creating new repository"
7333
msgstr ""
7334
7335
#: bzrlib/repository.py:1799
7336
msgid "Copying content"
7337
msgstr ""
7338
7339
#: bzrlib/repository.py:1803
7340
msgid "Deleting old repository content"
7341
msgstr ""
7342
7343
#: bzrlib/repository.py:1805
7344
msgid "repository converted"
7345
msgstr ""
7346
7347
#: bzrlib/revisionspec.py:903
7348
msgid "Using {0} {1}"
7349
msgstr ""
7350
7351
#: bzrlib/send.py:58
7352
#, python-format
7353
msgid "Mail client \"%s\" does not support specifying body"
7354
msgstr ""
7355
7356
#: bzrlib/send.py:62
7357
msgid "--remember requires a branch to be specified."
7358
msgstr ""
7359
7360
#: bzrlib/send.py:77
7361
msgid "No submit branch known or specified"
7362
msgstr ""
7363
7364
#: bzrlib/send.py:80
7365
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7366
msgstr ""
7367
7368
#: bzrlib/send.py:98
7369
#, python-format
7370
msgid "No such send format '%s'."
7371
msgstr ""
7372
7373
#: bzrlib/send.py:114
7374
msgid "bzr send takes at most two one revision identifiers"
7375
msgstr ""
7376
7377
#: bzrlib/send.py:127
7378
msgid "No revisions to submit."
7379
msgstr ""
7380
7381
#: bzrlib/send.py:139
7382
msgid ""
7383
"- not supported for merge directives that use more than one output file."
7384
msgstr ""
7385
7386
#: bzrlib/send.py:185
7387
msgid "Format 0.9 does not permit bundle with no patch"
7388
msgstr ""
7389
7390
#: bzrlib/shelf_ui.py:46
7391
#, python-format
7392
msgid "Shelve adding file \"%(path)s\"?"
7393
msgstr ""
7394
7395
#: bzrlib/shelf_ui.py:47
7396
msgid "Shelve binary changes?"
7397
msgstr ""
7398
7399
#: bzrlib/shelf_ui.py:48
7400
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7401
msgstr ""
7402
7403
#: bzrlib/shelf_ui.py:50
7404
#, python-format
7405
msgid "Shelve removing file \"%(path)s\"?"
7406
msgstr ""
7407
7408
#: bzrlib/shelf_ui.py:51
7409
#, python-format
7410
msgid "Shelve %d change(s)?"
7411
msgstr ""
7412
7413
#: bzrlib/shelf_ui.py:52
7414
msgid "Shelve?"
7415
msgstr ""
7416
7417
#: bzrlib/shelf_ui.py:53
7418
#, python-format
7419
msgid ""
7420
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7421
msgstr ""
7422
7423
#: bzrlib/shelf_ui.py:55
7424
#, python-format
7425
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7426
msgstr ""
7427
7428
#: bzrlib/shelf_ui.py:70
7429
#, python-format
7430
msgid "Changes shelved with id \"%d\"."
7431
msgstr ""
7432
7433
#: bzrlib/shelf_ui.py:74
7434
msgid "Selected changes destroyed."
7435
msgstr ""
7436
7437
#: bzrlib/shelf_ui.py:78
7438
msgid "Selected changes:"
7439
msgstr ""
7440
7441
#: bzrlib/shelf_ui.py:98
7442
#, python-format
7443
msgid "Delete file \"%(path)s\"?"
7444
msgstr ""
7445
7446
#: bzrlib/shelf_ui.py:99
7447
msgid "Apply binary changes?"
7448
msgstr ""
7449
7450
#: bzrlib/shelf_ui.py:100
7451
#, python-format
7452
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7453
msgstr ""
7454
7455
#: bzrlib/shelf_ui.py:102
7456
#, python-format
7457
msgid "Add file \"%(path)s\"?"
7458
msgstr ""
7459
7460
#: bzrlib/shelf_ui.py:103
7461
#, python-format
7462
msgid "Apply %d change(s)?"
7463
msgstr ""
7464
7465
#: bzrlib/shelf_ui.py:104
7466
msgid "Apply change?"
7467
msgstr ""
7468
7469
#: bzrlib/shelf_ui.py:105
7470
#, python-format
7471
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7472
msgstr ""
7473
7474
#: bzrlib/shelf_ui.py:107
7475
#, python-format
7476
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7477
msgstr ""
7478
7479
#: bzrlib/shelf_ui.py:402
7480
msgid "No changes are shelved."
7481
msgstr ""
7482
7483
#: bzrlib/shelf_ui.py:460
7484
#, python-format
7485
msgid "Using changes with id \"%d\"."
7486
msgstr ""
7487
7488
#: bzrlib/shelf_ui.py:464
7489
#, python-format
7490
msgid "Message: %s"
7491
msgstr ""
7492
7493
#: bzrlib/shelf_ui.py:476
7494
#, python-format
7495
msgid "Deleted changes with id \"%d\"."
7496
msgstr ""
7497
7498
#: bzrlib/smart/medium.py:714
7499
msgid "HPSS calls: {0} ({1} vfs) {2}"
7500
msgstr ""
7501
7502
#: bzrlib/smart/server.py:169
7503
msgid "Requested to stop gracefully"
7504
msgstr ""
7505
7506
#: bzrlib/smart/server.py:179
7507
#, python-format
7508
msgid "Waiting for %d client(s) to finish"
7509
msgstr ""
7510
7511
#: bzrlib/smart/server.py:185
7512
#, python-format
7513
msgid "Still waiting for %d client(s) to finish"
7514
msgstr ""
7515
7516
#: bzrlib/smart/server.py:219
7517
#, python-format
7518
msgid "listening socket error: %s"
7519
msgstr ""
7520
7521
#: bzrlib/smart/server.py:452
7522
#, python-format
7523
msgid "listening on port: %s"
7524
msgstr ""
7525
7526
#: bzrlib/switch.py:73
7527
msgid "Pending merges must be committed or reverted before using switch."
7528
msgstr ""
7529
7530
#: bzrlib/switch.py:100
7531
msgid ""
7532
"Cannot switch as local commits found in the checkout. Commit these to the "
7533
"bound branch or use --force to throw them away."
7534
msgstr ""
7535
7536
#: bzrlib/switch.py:105
7537
#, python-format
7538
msgid ""
7539
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7540
"anyway, use --force."
7541
msgstr ""
7542
7543
#: bzrlib/switch.py:125
7544
msgid "Cannot switch a branch, only a checkout."
7545
msgstr ""
7546
7547
#: bzrlib/switch.py:163
7548
#, python-format
7549
msgid "Tree is up to date at revision %d."
7550
msgstr ""
7551
7552
#: bzrlib/switch.py:169
7553
#, python-format
7554
msgid "Updated to revision %d."
7555
msgstr ""
7556
7557
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7558
msgid "Apply phase"
7559
msgstr ""
7560
7561
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7562
msgid "removing file"
7563
msgstr ""
7564
7565
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7566
msgid "adding file"
7567
msgstr ""
7568
7569
#: bzrlib/transform.py:2591
7570
msgid "Building tree"
7571
msgstr ""
7572
7573
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7574
msgid "Adding file contents"
7575
msgstr ""
7576
7577
#: bzrlib/transform.py:3028
7578
msgid "Resolution pass"
7579
msgstr ""
7580
7581
#: bzrlib/transport/ftp/_gssapi.py:88
7582
#, python-format
7583
msgid "Authenticated as %s"
7584
msgstr ""
7585
7586
#: bzrlib/tree.py:634
7587
msgid "*** {0} content-filter: {1} => {2!r}"
7588
msgstr ""
7589
7590
#: bzrlib/upgrade.py:77
7591
#, python-format
7592
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7593
msgstr ""
7594
7595
#: bzrlib/upgrade.py:100
7596
#, python-format
7597
msgid "cannot upgrade from bzrdir format %s"
7598
msgstr ""
7599
7600
#: bzrlib/upgrade.py:103
7601
#, python-format
7602
msgid "starting upgrade of %s"
7603
msgstr ""
7604
7605
#: bzrlib/upgrade.py:110
7606
msgid "finished"
7607
msgstr ""
7608
7609
#: bzrlib/upgrade.py:120
7610
msgid "Deleting backup.bzr"
7611
msgstr ""
7612
7613
#: bzrlib/upgrade.py:151
7614
msgid ""
7615
"\n"
7616
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7617
msgstr ""
7618
7619
#: bzrlib/upgrade.py:208
7620
#, python-format
7621
msgid "Found %d dependent branches - upgrading ..."
7622
msgstr ""
7623
7624
#: bzrlib/upgrade.py:276
7625
msgid "Upgrading bzrdirs"
7626
msgstr ""
7627
7628
#: bzrlib/upgrade.py:282
7629
#, python-format
7630
msgid "Upgrading %s"
7631
msgstr ""
7632
7633
#: bzrlib/upgrade.py:283
7634
msgid "Upgrading {0} {1} ..."
7635
msgstr ""
7636
7637
#: bzrlib/upgrade.py:301
7638
msgid "Removing backup ..."
7639
msgstr ""
7640
7641
#: bzrlib/upgrade.py:305
7642
msgid "failed to clean-up {0}: {1}"
7643
msgstr ""
7644
7645
#: bzrlib/vf_repository.py:1090
7646
msgid "inventories"
7647
msgstr ""
7648
7649
#: bzrlib/vf_repository.py:1116
7650
msgid "texts"
7651
msgstr ""
7652
7653
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7654
msgid "Calculating text parents"
7655
msgstr ""
7656
7657
#: bzrlib/vf_repository.py:1706
7658
msgid "Fetch texts"
7659
msgstr ""
7660
7661
#: bzrlib/vf_repository.py:2535
7662
msgid "loading text store"
7663
msgstr ""
7664
7665
#: bzrlib/vf_repository.py:2541
7666
msgid "checking text graph"
7667
msgstr ""
7668
7669
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7670
#: bzrlib/vf_repository.py:3124
7671
msgid "Transferring revisions"
7672
msgstr ""
7673
7674
#: bzrlib/win32utils.py:146
7675
msgid "Failed to GetProcessMemoryInfo()"
7676
msgstr ""
7677
7678
#: bzrlib/win32utils.py:167
7679
msgid "Cannot debug memory on win32 without ctypes or win32process"
7680
msgstr ""
7681
7682
#: bzrlib/win32utils.py:172
7683
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7684
msgstr ""
7685
7686
#: bzrlib/win32utils.py:180
7687
#, python-format
7688
msgid "WorkingSize %8d KiB"
7689
msgstr ""
7690
7691
#: bzrlib/win32utils.py:181
7692
#, python-format
7693
msgid "PeakWorking %8d KiB"
7694
msgstr ""
7695
7696
#: bzrlib/win32utils.py:182
7697
#, python-format
7698
msgid "PagefileUsage %8d KiB"
7699
msgstr ""
7700
7701
#: bzrlib/win32utils.py:183
7702
#, python-format
7703
msgid "PeakPagefileUsage %8d KiB"
7704
msgstr ""
7705
7706
#: bzrlib/win32utils.py:185
7707
#, python-format
7708
msgid "PrivateUsage %8d KiB"
7709
msgstr ""
7710
7711
#: bzrlib/win32utils.py:186
7712
#, python-format
7713
msgid "PageFaultCount %8d"
7714
msgstr ""
7715
7716
#: bzrlib/workingtree.py:1478
7717
msgid "Rerun update after fixing the conflicts."
7718
msgstr ""
7719
7720
#: dummy/help_topics/authentication/summary.txt:1
7721
msgid "Information on configuring authentication"
7722
msgstr ""
7723
7724
#: dummy/help_topics/basic/detail.txt:1
7725
msgid ""
7726
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7727
"http://bazaar.canonical.com/"
7728
msgstr ""
7729
7730
#: dummy/help_topics/basic/detail.txt:4
7731
msgid ""
7732
"Basic commands:\n"
7733
" bzr init makes this directory a versioned branch\n"
7734
" bzr branch make a copy of another branch"
7735
msgstr ""
7736
7737
#: dummy/help_topics/basic/detail.txt:8
7738
msgid ""
7739
" bzr add make files or directories versioned\n"
7740
" bzr ignore ignore a file or pattern\n"
7741
" bzr mv move or rename a versioned file"
7742
msgstr ""
7743
7744
#: dummy/help_topics/basic/detail.txt:12
7745
msgid ""
7746
" bzr status summarize changes in working copy\n"
7747
" bzr diff show detailed diffs"
7748
msgstr ""
7749
7750
#: dummy/help_topics/basic/detail.txt:15
7751
msgid ""
7752
" bzr merge pull in changes from another branch\n"
7753
" bzr commit save some or all changes\n"
7754
" bzr send send changes via email"
7755
msgstr ""
7756
7757
#: dummy/help_topics/basic/detail.txt:19
7758
msgid ""
7759
" bzr log show history of changes\n"
7760
" bzr check validate storage"
7761
msgstr ""
7762
7763
#: dummy/help_topics/basic/detail.txt:22
7764
msgid ""
7765
" bzr help init more help on e.g. init command\n"
7766
" bzr help commands list all commands\n"
7767
" bzr help topics list all help topics\n"
7768
msgstr ""
7769
7770
#: dummy/help_topics/basic/summary.txt:1
7771
msgid "Basic commands"
7772
msgstr ""
7773
7774
#: dummy/help_topics/branches/detail.txt:1
7775
msgid "Branches"
7776
msgstr ""
7777
7778
#: dummy/help_topics/branches/detail.txt:3
7779
msgid ""
7780
"A branch consists of the state of a project, including all of its\n"
7781
"history. All branches have a repository associated (which is where the\n"
7782
"branch history is stored), but multiple branches may share the same\n"
7783
"repository (a shared repository). Branches can be copied and merged."
7784
msgstr ""
7785
7786
#: dummy/help_topics/branches/detail.txt:8
7787
msgid ""
7788
"In addition, one branch may be bound to another one. Binding to another\n"
7789
"branch indicates that commits which happen in this branch must also \n"
7790
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7791
"commits when the two branches are out of date. In order for a commit \n"
7792
"to succeed, it may be necessary to update the current branch using \n"
7793
"``bzr update``."
7794
msgstr ""
7795
7796
#: dummy/help_topics/branches/detail.txt:15
7797
#: dummy/help_topics/checkouts/detail.txt:66
7798
#: dummy/help_topics/repositories/detail.txt:36
7799
msgid "Related commands::"
7800
msgstr ""
7801
7802
#: dummy/help_topics/branches/detail.txt:17
7803
msgid ""
7804
" init Change a directory into a versioned branch.\n"
7805
" branch Create a new branch that is a copy of an existing branch.\n"
7806
" merge Perform a three-way merge.\n"
7807
" bind Bind a branch to another one.\n"
7808
msgstr ""
7809
7810
#: dummy/help_topics/branches/summary.txt:1
7811
msgid "Information on what a branch is"
7812
msgstr ""
7813
7814
#: dummy/help_topics/bugs/summary.txt:1
7815
msgid "Bug tracker settings"
7816
msgstr ""
7817
7818
#: dummy/help_topics/checkouts/detail.txt:1
7819
msgid "Checkouts"
7820
msgstr ""
7821
7822
#: dummy/help_topics/checkouts/detail.txt:3
7823
msgid ""
7824
"Checkouts are source trees that are connected to a branch, so that when\n"
7825
"you commit in the source tree, the commit goes into that branch. They\n"
7826
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7827
"Bazaar's decentralized features until you want them. Using checkouts\n"
7828
"with shared repositories is very similar to working with SVN or CVS, but\n"
7829
"doesn't have the same restrictions. And using checkouts still allows\n"
7830
"others working on the project to use whatever workflow they like."
7831
msgstr ""
7832
7833
#: dummy/help_topics/checkouts/detail.txt:11
7834
msgid ""
7835
"A checkout is created with the bzr checkout command (see \"help checkout"
7836
"\").\n"
7837
"You pass it a reference to another branch, and it will create a local copy\n"
7838
"for you that still contains a reference to the branch you created the\n"
7839
"checkout from (the master branch). Then if you make any commits they will "
7840
"be\n"
7841
"made on the other branch first. This creates an instant mirror of your work, "
7842
"or\n"
7843
"facilitates lockstep development, where each developer is working together,\n"
7844
"continuously integrating the changes of others."
7845
msgstr ""
7846
7847
#: dummy/help_topics/checkouts/detail.txt:19
7848
msgid ""
7849
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7850
"you have the full history locally. As you have a first class branch you "
7851
"can\n"
7852
"also commit locally if you want, for instance due to the temporary loss af "
7853
"a\n"
7854
"network connection. Use the --local option to commit to do this. All the "
7855
"local\n"
7856
"commits will then be made on the master branch the next time you do a non-"
7857
"local\n"
7858
"commit."
7859
msgstr ""
7860
7861
#: dummy/help_topics/checkouts/detail.txt:26
7862
msgid ""
7863
"If you are using a checkout from a shared branch you will periodically want "
7864
"to\n"
7865
"pull in all the changes made by others. This is done using the \"update\"\n"
7866
"command. The changes need to be applied before any non-local commit, but\n"
7867
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7868
"command when needed."
7869
msgstr ""
7870
7871
#: dummy/help_topics/checkouts/detail.txt:32
7872
msgid ""
7873
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7874
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7875
"SVN checkout in that it is not a first class branch, it mainly consists of "
7876
"the\n"
7877
"working tree. This means that any history operations must query the master\n"
7878
"branch, which could be slow if a network connection is involved. Also, as "
7879
"you\n"
7880
"don't have a local branch, then you cannot commit locally."
7881
msgstr ""
7882
7883
#: dummy/help_topics/checkouts/detail.txt:39
7884
msgid ""
7885
"Lightweight checkouts work best when you have fast reliable access to the\n"
7886
"master branch. This means that if the master branch is on the same disk or "
7887
"LAN\n"
7888
"a lightweight checkout will be faster than a heavyweight one for any "
7889
"commands\n"
7890
"that modify the revision history (as only one copy of the branch needs to\n"
7891
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7892
"that uses the history but does not change it, but if the master branch is "
7893
"on\n"
7894
"the same disk then there won't be a noticeable difference."
7895
msgstr ""
7896
7897
#: dummy/help_topics/checkouts/detail.txt:47
7898
msgid ""
7899
"Another possible use for a checkout is to use it with a treeless repository\n"
7900
"containing your branches, where you maintain only one working tree by\n"
7901
"switching the master branch that the checkout points to when you want to\n"
7902
"work on a different branch."
7903
msgstr ""
7904
7905
#: dummy/help_topics/checkouts/detail.txt:52
7906
msgid ""
7907
"Obviously to commit on a checkout you need to be able to write to the "
7908
"master\n"
7909
"branch. This means that the master branch must be accessible over a "
7910
"writeable\n"
7911
"protocol , such as sftp://, and that you have write permissions at the "
7912
"other\n"
7913
"end. Checkouts also work on the local file system, so that all that matters "
7914
"is\n"
7915
"file permissions."
7916
msgstr ""
7917
7918
#: dummy/help_topics/checkouts/detail.txt:58
7919
msgid ""
7920
"You can change the master of a checkout by using the \"switch\" command "
7921
"(see\n"
7922
"\"help switch\"). This will change the location that the commits are sent "
7923
"to.\n"
7924
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7925
"checkout. If you would like to convert your heavy checkout into a normal\n"
7926
"branch so that every commit is local, you can use the \"unbind\" command. To "
7927
"see\n"
7928
"whether or not a branch is bound or not you can use the \"info\" command. If "
7929
"the\n"
7930
"branch is bound it will tell you the location of the bound branch."
7931
msgstr ""
7932
7933
#: dummy/help_topics/checkouts/detail.txt:68
7934
msgid ""
7935
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7936
" checkout\n"
7937
" update Pull any changes in the master branch in to your checkout\n"
7938
" commit Make a commit that is sent to the master branch. If you have\n"
7939
" a heavy checkout then the --local option will commit to the\n"
7940
" checkout without sending the commit to the master\n"
7941
" switch Change the master branch that the commits in the checkout "
7942
"will\n"
7943
" be sent to\n"
7944
" bind Turn a standalone branch into a heavy checkout so that any\n"
7945
" commits will be sent to the master branch\n"
7946
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7947
" commits are only made locally\n"
7948
" info Displays whether a branch is bound or unbound. If the branch "
7949
"is\n"
7950
" bound, then it will also display the location of the bound "
7951
"branch\n"
7952
msgstr ""
7953
7954
#: dummy/help_topics/checkouts/summary.txt:1
7955
msgid "Information on what a checkout is"
7956
msgstr ""
7957
7958
#: dummy/help_topics/commands/summary.txt:1
7959
msgid "Basic help for all commands"
7960
msgstr ""
7961
7962
#: dummy/help_topics/configuration/summary.txt:1
7963
msgid "Details on the configuration settings available"
7964
msgstr ""
7965
7966
#: dummy/help_topics/conflict-types/summary.txt:1
7967
msgid "Types of conflicts and what to do about them"
7968
msgstr ""
7969
7970
#: dummy/help_topics/content-filters/summary.txt:1
7971
msgid "Conversion of content into/from working trees"
7972
msgstr ""
7973
7974
#: dummy/help_topics/criss-cross/detail.txt:1
7975
msgid "Criss-Cross"
7976
msgstr ""
7977
7978
#: dummy/help_topics/criss-cross/detail.txt:3
7979
msgid ""
7980
"A criss-cross in the branch history can cause the default merge technique\n"
7981
"to emit more conflicts than would normally be expected."
7982
msgstr ""
7983
7984
#: dummy/help_topics/criss-cross/detail.txt:6
7985
msgid ""
7986
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7987
"give\n"
7988
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7989
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7990
msgstr ""
7991
7992
#: dummy/help_topics/criss-cross/detail.txt:10
7993
msgid ""
7994
"Criss-crosses occur in a branch's history if two branches merge the same "
7995
"thing\n"
7996
"and then merge one another, or if two branches merge one another at the "
7997
"same\n"
7998
"time. They can be avoided by having each branch only merge from or into a\n"
7999
"designated central branch (a \"star topology\")."
8000
msgstr ""
8001
8002
#: dummy/help_topics/criss-cross/detail.txt:15
8003
msgid ""
8004
"Criss-crosses cause problems because of the way merge works. Bazaar's "
8005
"default\n"
8006
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8007
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
8008
"differences between THIS and OTHER are due to one side adding lines, or\n"
8009
"from another side removing lines."
8010
msgstr ""
8011
8012
#: dummy/help_topics/criss-cross/detail.txt:21
8013
msgid ""
8014
"Criss-crosses mean there is no good choice for a base. Selecting the "
8015
"recent\n"
8016
"merge points could cause one side's changes to be silently discarded.\n"
8017
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8018
"are emitted."
8019
msgstr ""
8020
8021
#: dummy/help_topics/criss-cross/detail.txt:26
8022
msgid ""
8023
"The ``weave`` merge type is not affected by this problem because it uses\n"
8024
"line-origin detection instead of a basis revision to determine the cause of\n"
8025
"differences.\n"
8026
msgstr ""
8027
8028
#: dummy/help_topics/criss-cross/summary.txt:1
8029
msgid "Information on criss-cross merging"
8030
msgstr ""
8031
8032
#: dummy/help_topics/current-formats/summary.txt:1
8033
msgid "Current storage formats"
8034
msgstr ""
8035
8036
#: dummy/help_topics/debug-flags/summary.txt:1
8037
msgid "Options to show or record debug information"
8038
msgstr ""
8039
8040
#: dummy/help_topics/diverged-branches/summary.txt:1
8041
msgid "How to fix diverged branches"
8042
msgstr ""
8043
8044
#: dummy/help_topics/env-variables/detail.txt:1
8045
msgid "Environment Variables"
8046
msgstr ""
8047
8048
#: dummy/help_topics/env-variables/detail.txt:3
8049
msgid ""
8050
"=================== "
8051
"===========================================================\n"
8052
"BZRPATH Path where bzr is to look for shell plugin external\n"
8053
" commands.\n"
8054
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8055
"EMAIL E-Mail address of the user.\n"
8056
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8057
"EDITOR Editor for editing commit messages.\n"
8058
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8059
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8060
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8061
"BZR_PLUGIN_PATH.\n"
8062
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8063
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8064
"and\n"
8065
" HOME.\n"
8066
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8067
"URLs).\n"
8068
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8069
"sshcorp,\n"
8070
" plink or lsh.\n"
8071
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8072
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8073
"BZR_COLUMNS Override implicit terminal width.\n"
8074
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8075
"(selftest)\n"
8076
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8077
"'text'.\n"
8078
"BZR_PDB Control whether to launch a debugger on error.\n"
8079
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8080
" breakin debugger.\n"
8081
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8082
"(instead\n"
8083
" of char-based).\n"
8084
"=================== "
8085
"===========================================================\n"
8086
msgstr ""
8087
8088
#: dummy/help_topics/env-variables/summary.txt:1
8089
msgid "Environment variable names and values"
8090
msgstr ""
8091
8092
#: dummy/help_topics/eol/summary.txt:1
8093
msgid "Information on end-of-line handling"
8094
msgstr ""
8095
8096
#: dummy/help_topics/files/detail.txt:1
8097
msgid "Files"
8098
msgstr ""
8099
8100
#: dummy/help_topics/files/detail.txt:3
8101
msgid ""
8102
":On Unix: ~/.bazaar/bazaar.conf\n"
8103
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
8104
"\\bazaar\\\\2.0\\\\bazaar.conf"
8105
msgstr ""
8106
8107
#: dummy/help_topics/files/detail.txt:6
8108
msgid ""
8109
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8110
"used to define general configuration that will be applied everywhere.\n"
8111
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8112
"commonly used options."
8113
msgstr ""
8114
8115
#: dummy/help_topics/files/detail.txt:11
8116
msgid "A typical config file might look something like::"
8117
msgstr ""
8118
8119
#: dummy/help_topics/files/detail.txt:13
8120
msgid ""
8121
" [DEFAULT]\n"
8122
" email=John Doe <jdoe@isp.com>"
8123
msgstr ""
8124
8125
#: dummy/help_topics/files/detail.txt:16
8126
msgid ""
8127
" [ALIASES]\n"
8128
" commit = commit --strict\n"
8129
" log10 = log --short -r -10..-1\n"
8130
msgstr ""
8131
8132
#: dummy/help_topics/files/summary.txt:1
8133
msgid "Information on configuration and log files"
8134
msgstr ""
8135
8136
#: dummy/help_topics/formats/detail.txt:1
8137
msgid "Storage Formats"
8138
msgstr ""
8139
8140
#: dummy/help_topics/formats/detail.txt:3
8141
msgid ""
8142
"To ensure that older clients do not access data incorrectly,\n"
8143
"Bazaar's policy is to introduce a new storage format whenever\n"
8144
"new features requiring new metadata are added. New storage\n"
8145
"formats may also be introduced to improve performance and\n"
8146
"scalability."
8147
msgstr ""
8148
8149
#: dummy/help_topics/formats/detail.txt:9
8150
msgid ""
8151
"The newest format, 2a, is highly recommended. If your\n"
8152
"project is not using 2a, then you should suggest to the\n"
8153
"project owner to upgrade."
8154
msgstr ""
8155
8156
#: dummy/help_topics/formats/detail.txt:13
8157
msgid ""
8158
"\n"
8159
".. note::"
8160
msgstr ""
8161
8162
#: dummy/help_topics/formats/detail.txt:16
8163
msgid ""
8164
" Some of the older formats have two variants:\n"
8165
" a plain one and a rich-root one. The latter include an additional\n"
8166
" field about the root of the tree. There is no performance cost\n"
8167
" for using a rich-root format but you cannot easily merge changes\n"
8168
" from a rich-root format into a plain format. As a consequence,\n"
8169
" moving a project to a rich-root format takes some co-ordination\n"
8170
" in that all contributors need to upgrade their repositories\n"
8171
" around the same time. 2a and all future formats will be\n"
8172
" implicitly rich-root."
8173
msgstr ""
8174
8175
#: dummy/help_topics/formats/detail.txt:26
8176
msgid ""
8177
"See :doc:`current-formats-help` for the complete list of\n"
8178
"currently supported formats. See :doc:`other-formats-help` for\n"
8179
"descriptions of any available experimental and deprecated formats.\n"
8180
msgstr ""
8181
8182
#: dummy/help_topics/formats/summary.txt:1
8183
msgid "Information on choosing a storage format"
8184
msgstr ""
8185
8186
#: dummy/help_topics/global-options/detail.txt:1
8187
msgid "Global Options"
8188
msgstr ""
8189
8190
#: dummy/help_topics/global-options/detail.txt:3
8191
msgid ""
8192
"These options may be used with any command, and may appear in front of any\n"
8193
"command. (e.g. ``bzr --profile help``)."
8194
msgstr ""
8195
8196
#: dummy/help_topics/global-options/detail.txt:6
8197
msgid ""
8198
"--version Print the version number. Must be supplied before the "
8199
"command.\n"
8200
"--no-aliases Do not process command aliases when running this command.\n"
8201
"--builtin Use the built-in version of a command, not the plugin "
8202
"version.\n"
8203
" This does not suppress other plugin effects.\n"
8204
"--no-plugins Do not process any plugins.\n"
8205
"--no-l10n Do not translate messages.\n"
8206
"--concurrency Number of processes that can be run concurrently (selftest)."
8207
msgstr ""
8208
8209
#: dummy/help_topics/global-options/detail.txt:14
8210
msgid ""
8211
"--profile Profile execution using the hotshot profiler.\n"
8212
"--lsprof Profile execution using the lsprof profiler.\n"
8213
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8214
" results to a specified file. If the filename ends with \".txt"
8215
"\",\n"
8216
" text format will be used. If the filename either starts "
8217
"with\n"
8218
" \"callgrind.out\" or end with \".callgrind\", the output will "
8219
"be\n"
8220
" formatted for use with KCacheGrind. Otherwise, the output\n"
8221
" will be a pickle.\n"
8222
"--coverage Generate line coverage report in the specified directory."
8223
msgstr ""
8224
8225
#: dummy/help_topics/global-options/detail.txt:24
8226
msgid ""
8227
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8228
"for\n"
8229
" the duration of the command. This can be used multiple times "
8230
"if\n"
8231
" several options need to be overridden."
8232
msgstr ""
8233
8234
#: dummy/help_topics/global-options/detail.txt:28
8235
msgid ""
8236
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8237
"information on profiling."
8238
msgstr ""
8239
8240
#: dummy/help_topics/global-options/detail.txt:31
8241
msgid ""
8242
"A number of debug flags are also available to assist troubleshooting and\n"
8243
"development. See :doc:`debug-flags-help`.\n"
8244
msgstr ""
8245
8246
#: dummy/help_topics/global-options/summary.txt:1
8247
msgid "Options that control how Bazaar runs"
8248
msgstr ""
8249
8250
#: dummy/help_topics/hidden-commands/summary.txt:1
8251
msgid "All hidden commands"
8252
msgstr ""
8253
8254
#: dummy/help_topics/hooks/summary.txt:1
8255
msgid "Points at which custom processing can be added"
8256
msgstr ""
8257
8258
#: dummy/help_topics/launchpad/detail.txt:1
8259
msgid "Integration with Launchpad.net"
8260
msgstr ""
8261
8262
#: dummy/help_topics/launchpad/detail.txt:3
8263
msgid ""
8264
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8265
"specification tracking."
8266
msgstr ""
8267
8268
#: dummy/help_topics/launchpad/detail.txt:6
8269
msgid ""
8270
"The bzr client (through the plugin called 'launchpad') has special\n"
8271
"features to communicate with Launchpad:"
8272
msgstr ""
8273
8274
#: dummy/help_topics/launchpad/detail.txt:9
8275
msgid ""
8276
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8277
"This\n"
8278
" is then used by the 'lp:' transport to download your branches using\n"
8279
" bzr+ssh://."
8280
msgstr ""
8281
8282
#: dummy/help_topics/launchpad/detail.txt:13
8283
msgid ""
8284
" * The 'lp:' transport uses Launchpad as a directory service: for "
8285
"example\n"
8286
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8287
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8288
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8289
msgstr ""
8290
8291
#: dummy/help_topics/launchpad/detail.txt:18
8292
msgid ""
8293
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8294
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8295
"lp:12345'\n"
8296
" will record a revision property that marks that revision as fixing\n"
8297
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8298
" automatically be linked to the bug report."
8299
msgstr ""
8300
8301
#: dummy/help_topics/launchpad/detail.txt:24
8302
msgid ""
8303
" * The register-branch command tells Launchpad about the url of a\n"
8304
" public branch. Launchpad will then mirror the branch, display\n"
8305
" its contents and allow it to be attached to bugs and other\n"
8306
" objects."
8307
msgstr ""
8308
8309
#: dummy/help_topics/launchpad/detail.txt:29
8310
msgid "For more information see http://help.launchpad.net/\n"
8311
msgstr ""
8312
8313
#: dummy/help_topics/launchpad/summary.txt:1
8314
msgid "Using Bazaar with Launchpad.net"
8315
msgstr ""
8316
8317
#: dummy/help_topics/location-alias/summary.txt:1
8318
msgid "Aliases for remembered locations"
8319
msgstr ""
8320
8321
#: dummy/help_topics/log-formats/summary.txt:1
8322
msgid "Details on the logging formats available"
8323
msgstr ""
8324
8325
#: dummy/help_topics/other-formats/summary.txt:1
8326
msgid "Experimental and deprecated storage formats"
8327
msgstr ""
8328
8329
#: dummy/help_topics/patterns/summary.txt:1
8330
msgid "Information on the pattern syntax"
8331
msgstr ""
8332
8333
#: dummy/help_topics/repositories/detail.txt:1
8334
msgid "Repositories"
8335
msgstr ""
8336
8337
#: dummy/help_topics/repositories/detail.txt:3
8338
msgid ""
8339
"Repositories in Bazaar are where committed information is stored. There is\n"
8340
"a repository associated with every branch."
8341
msgstr ""
8342
8343
#: dummy/help_topics/repositories/detail.txt:6
8344
msgid ""
8345
"Repositories are a form of database. Bzr will usually maintain this for\n"
8346
"good performance automatically, but in some situations (e.g. when doing\n"
8347
"very many commits in a short time period) you may want to ask bzr to\n"
8348
"optimise the database indices. This can be done by the 'bzr pack' command."
8349
msgstr ""
8350
8351
#: dummy/help_topics/repositories/detail.txt:11
8352
msgid ""
8353
"By default just running 'bzr init' will create a repository within the new\n"
8354
"branch but it is possible to create a shared repository which allows "
8355
"multiple\n"
8356
"branches to share their information in the same location. When a new branch "
8357
"is\n"
8358
"created it will first look to see if there is a containing shared repository "
8359
"it\n"
8360
"can use."
8361
msgstr ""
8362
8363
#: dummy/help_topics/repositories/detail.txt:17
8364
msgid ""
8365
"When two branches of the same project share a repository, there is\n"
8366
"generally a large space saving. For some operations (e.g. branching\n"
8367
"within the repository) this translates in to a large time saving."
8368
msgstr ""
8369
8370
#: dummy/help_topics/repositories/detail.txt:21
8371
msgid ""
8372
"To create a shared repository use the init-repository command (or the alias\n"
8373
"init-repo). This command takes the location of the repository to create. "
8374
"This\n"
8375
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8376
"which contains a shared repository. Any new branches that are created in "
8377
"this\n"
8378
"directory will then use it for storage."
8379
msgstr ""
8380
8381
#: dummy/help_topics/repositories/detail.txt:27
8382
msgid ""
8383
"It is a good idea to create a repository whenever you might create more\n"
8384
"than one branch of a project. This is true for both working areas where you\n"
8385
"are doing the development, and any server areas that you use for hosting\n"
8386
"projects. In the latter case, it is common to want branches without working\n"
8387
"trees. Since the files in the branch will not be edited directly there is "
8388
"no\n"
8389
"need to use up disk space for a working tree. To create a repository in "
8390
"which\n"
8391
"the branches will not have working trees pass the '--no-trees' option to\n"
8392
"'init-repository'."
8393
msgstr ""
8394
8395
#: dummy/help_topics/repositories/detail.txt:38
8396
msgid ""
8397
" init-repository Create a shared repository. Use --no-trees to create "
8398
"one\n"
8399
" in which new branches won't get a working tree.\n"
8400
msgstr ""
8401
8402
#: dummy/help_topics/repositories/summary.txt:1
8403
msgid "Basic information on shared repositories."
8404
msgstr ""
8405
8406
#: dummy/help_topics/revisionspec/summary.txt:1
8407
msgid "Explain how to use --revision"
8408
msgstr ""
8409
8410
#: dummy/help_topics/rules/summary.txt:1
8411
msgid "Information on defining rule-based preferences"
8412
msgstr ""
8413
8414
#: dummy/help_topics/standalone-trees/detail.txt:1
8415
msgid "Standalone Trees"
8416
msgstr ""
8417
8418
#: dummy/help_topics/standalone-trees/detail.txt:3
8419
msgid ""
8420
"A standalone tree is a working tree with an associated repository. It\n"
8421
"is an independently usable branch, with no dependencies on any other.\n"
8422
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8423
"an existing project under version control."
8424
msgstr ""
8425
8426
#: dummy/help_topics/standalone-trees/detail.txt:8
8427
msgid "Related Commands::"
8428
msgstr ""
8429
8430
#: dummy/help_topics/standalone-trees/detail.txt:10
8431
msgid " init Make a directory into a versioned branch.\n"
8432
msgstr ""
8433
8434
#: dummy/help_topics/standalone-trees/summary.txt:1
8435
msgid "Information on what a standalone tree is"
8436
msgstr ""
8437
8438
#: dummy/help_topics/standard-options/detail.txt:1
8439
msgid "Standard Options"
8440
msgstr ""
8441
8442
#: dummy/help_topics/standard-options/detail.txt:3
8443
msgid "Standard options are legal for all commands."
8444
msgstr ""
8445
8446
#: dummy/help_topics/standard-options/detail.txt:5
8447
msgid ""
8448
"--help, -h Show help message.\n"
8449
"--verbose, -v Display more information.\n"
8450
"--quiet, -q Only display errors and warnings."
8451
msgstr ""
8452
8453
#: dummy/help_topics/standard-options/detail.txt:9
8454
msgid "Unlike global options, standard options can be used in aliases.\n"
8455
msgstr ""
8456
8457
#: dummy/help_topics/standard-options/summary.txt:1
8458
msgid "Options that can be used with any command"
8459
msgstr ""
8460
8461
#: dummy/help_topics/status-flags/detail.txt:1
8462
msgid "Status Flags"
8463
msgstr ""
8464
8465
#: dummy/help_topics/status-flags/detail.txt:3
8466
msgid ""
8467
"Status flags are used to summarise changes to the working tree in a concise\n"
8468
"manner. They are in the form::"
8469
msgstr ""
8470
8471
#: dummy/help_topics/status-flags/detail.txt:6
8472
msgid " xxx <filename>"
8473
msgstr ""
8474
8475
#: dummy/help_topics/status-flags/detail.txt:8
8476
msgid "where the columns' meanings are as follows."
8477
msgstr ""
8478
8479
#: dummy/help_topics/status-flags/detail.txt:10
8480
msgid "Column 1 - versioning/renames::"
8481
msgstr ""
8482
8483
#: dummy/help_topics/status-flags/detail.txt:12
8484
msgid ""
8485
" + File versioned\n"
8486
" - File unversioned\n"
8487
" R File renamed\n"
8488
" ? File unknown\n"
8489
" X File nonexistent (and unknown to bzr)\n"
8490
" C File has conflicts\n"
8491
" P Entry for a pending merge (not a file)"
8492
msgstr ""
8493
8494
#: dummy/help_topics/status-flags/detail.txt:20
8495
msgid "Column 2 - contents::"
8496
msgstr ""
8497
8498
#: dummy/help_topics/status-flags/detail.txt:22
8499
msgid ""
8500
" N File created\n"
8501
" D File deleted\n"
8502
" K File kind changed\n"
8503
" M File modified"
8504
msgstr ""
8505
8506
#: dummy/help_topics/status-flags/detail.txt:27
8507
msgid "Column 3 - execute::"
8508
msgstr ""
8509
8510
#: dummy/help_topics/status-flags/detail.txt:29
8511
msgid " * The execute bit was changed\n"
8512
msgstr ""
8513
8514
#: dummy/help_topics/status-flags/summary.txt:1
8515
msgid "Help on status flags"
8516
msgstr ""
8517
8518
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8519
msgid "Branches Out of Sync"
8520
msgstr ""
8521
8522
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8523
msgid ""
8524
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8525
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8526
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8527
"have the same last revision as the new reference branch for the lightweight\n"
8528
"checkout, data could be lost, so Bazaar refuses."
8529
msgstr ""
8530
8531
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8532
msgid "How you deal with this depends on *why* the branches are out of sync."
8533
msgstr ""
8534
8535
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8536
msgid ""
8537
"If you have a checkout and have done local commits, you can get back in "
8538
"sync\n"
8539
"by running \"bzr update\" (and possibly \"bzr commit\")."
8540
msgstr ""
8541
8542
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8543
msgid ""
8544
"If you have a branch and the remote branch is out-of-date, you can push\n"
8545
"the local changes using \"bzr push\". If the local branch is out of date, "
8546
"you\n"
8547
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8548
"commit\n"
8549
"and then push your changes. If you decide that some of the changes aren't\n"
8550
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8551
msgstr ""
8552
8553
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8554
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8555
msgstr ""
8556
8557
#: dummy/help_topics/topics/summary.txt:1
8558
msgid "Topics list"
8559
msgstr ""
8560
8561
#: dummy/help_topics/url-special-chars/summary.txt:1
8562
msgid "Special character handling in URLs"
8563
msgstr ""
8564
8565
#: dummy/help_topics/urlspec/summary.txt:1
8566
msgid "Supported transport protocols"
8567
msgstr ""
8568
8569
#: dummy/help_topics/working-trees/detail.txt:1
8570
msgid "Working Trees"
8571
msgstr ""
8572
8573
#: dummy/help_topics/working-trees/detail.txt:3
8574
msgid ""
8575
"A working tree is the contents of a branch placed on disk so that you can\n"
8576
"see the files and edit them. The working tree is where you make changes to "
8577
"a\n"
8578
"branch, and when you commit the current state of the working tree is the\n"
8579
"snapshot that is recorded in the commit."
8580
msgstr ""
8581
8582
#: dummy/help_topics/working-trees/detail.txt:8
8583
msgid ""
8584
"When you push a branch to a remote system, a working tree will not be\n"
8585
"created. If one is already present the files will not be updated. The\n"
8586
"branch information will be updated and the working tree will be marked\n"
8587
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8588
"may be uncommitted changes or the update may cause content conflicts that "
8589
"are\n"
8590
"difficult to deal with remotely."
8591
msgstr ""
8592
8593
#: dummy/help_topics/working-trees/detail.txt:15
8594
msgid ""
8595
"If you have a branch with no working tree you can use the 'checkout' "
8596
"command\n"
8597
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8598
"will\n"
8599
"create the working tree. If the branch is updated remotely, you can update "
8600
"the\n"
8601
"working tree by running 'bzr update' in that directory."
8602
msgstr ""
8603
8604
#: dummy/help_topics/working-trees/detail.txt:20
8605
msgid ""
8606
"If you have a branch with a working tree that you do not want the 'remove-"
8607
"tree'\n"
8608
"command will remove the tree if it is safe. This can be done to avoid the\n"
8609
"warning about the remote working tree not being updated when pushing to the\n"
8610
"branch. It can also be useful when working with a '--no-trees' repository\n"
8611
"(see 'bzr help repositories')."
8612
msgstr ""
8613
8614
#: dummy/help_topics/working-trees/detail.txt:26
8615
msgid ""
8616
"If you want to have a working tree on a remote machine that you push to you\n"
8617
"can either run 'bzr update' in the remote branch after each push, or use "
8618
"some\n"
8619
"other method to update the tree during the push. There is an 'rspush' "
8620
"plugin\n"
8621
"that will update the working tree using rsync as well as doing a push. "
8622
"There\n"
8623
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8624
"SSH\n"
8625
"after each push."
8626
msgstr ""
8627
8628
#: dummy/help_topics/working-trees/detail.txt:33
8629
msgid "Useful commands::"
8630
msgstr ""
8631
8632
#: dummy/help_topics/working-trees/detail.txt:35
8633
msgid ""
8634
" checkout Create a working tree when a branch does not have one.\n"
8635
" remove-tree Removes the working tree from a branch when it is safe to do "
8636
"so.\n"
8637
" update When a working tree is out of sync with its associated "
8638
"branch\n"
8639
" this will update the tree to match the branch.\n"
8640
msgstr ""
8641
8642
#: dummy/help_topics/working-trees/summary.txt:1
8643
msgid "Information on working trees"
8644
msgstr ""
8645
8646
#: en/help_topics/authentication.txt:1
8647
msgid ""
8648
"Authentication Settings\n"
8649
"======================="
8650
msgstr ""
8651
8652
#: en/help_topics/authentication.txt:4
8653
msgid ""
8654
"\n"
8655
"Intent\n"
8656
"------"
8657
msgstr ""
8658
8659
#: en/help_topics/authentication.txt:8
8660
msgid ""
8661
"Many different authentication policies can be described in the\n"
8662
"``authentication.conf`` file but a particular user should need only a few\n"
8663
"definitions to cover his needs without having to specify a user and a "
8664
"password\n"
8665
"for every branch he uses."
8666
msgstr ""
8667
8668
#: en/help_topics/authentication.txt:13
8669
msgid ""
8670
"The definitions found in this file are used to find the credentials to use "
8671
"for\n"
8672
"a given url. The same credentials can generally be used for as many branches "
8673
"as\n"
8674
"possible by grouping their declaration around the remote servers that need\n"
8675
"them. It's even possible to declare credentials that will be used by "
8676
"different\n"
8677
"servers."
8678
msgstr ""
8679
8680
#: en/help_topics/authentication.txt:19
8681
msgid ""
8682
"The intent is to make this file as small as possible to minimize maintenance."
8683
msgstr ""
8684
8685
#: en/help_topics/authentication.txt:21
8686
msgid ""
8687
"Once the relevant credentials are declared in this file you may use branch "
8688
"urls\n"
8689
"without embedding passwords (security hazard) or even users (enabling "
8690
"sharing\n"
8691
"of your urls with others)."
8692
msgstr ""
8693
8694
#: en/help_topics/authentication.txt:25
8695
msgid "Instead of using::"
8696
msgstr ""
8697
8698
#: en/help_topics/authentication.txt:27
8699
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8700
msgstr ""
8701
8702
#: en/help_topics/authentication.txt:29
8703
msgid "you simply use::"
8704
msgstr ""
8705
8706
#: en/help_topics/authentication.txt:31
8707
msgid " bzr branch ftp://host.com/path/to/my/branch"
8708
msgstr ""
8709
8710
#: en/help_topics/authentication.txt:33
8711
msgid "provided you have created the following ``authentication.conf`` file::"
8712
msgstr ""
8713
8714
#: en/help_topics/authentication.txt:35
8715
msgid ""
8716
" [myprojects]\n"
8717
" scheme=ftp\n"
8718
" host=host.com\n"
8719
" user=joe\n"
8720
" password=secret\n"
8721
" "
8722
msgstr ""
8723
8724
#: en/help_topics/authentication.txt:42
8725
msgid ""
8726
"Authentication definitions\n"
8727
"--------------------------"
8728
msgstr ""
8729
8730
#: en/help_topics/authentication.txt:45
8731
msgid ""
8732
"There are two kinds of authentication used by the various schemes supported "
8733
"by\n"
8734
"bzr:"
8735
msgstr ""
8736
8737
#: en/help_topics/authentication.txt:48
8738
msgid "1. user and password"
8739
msgstr ""
8740
8741
#: en/help_topics/authentication.txt:50
8742
msgid ""
8743
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8744
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8745
"ssh agents are a better, more secure solution. So we have chosen to not "
8746
"provide\n"
8747
"our own less secure method."
8748
msgstr ""
8749
8750
#: en/help_topics/authentication.txt:55
8751
msgid "2. user, realm and password"
8752
msgstr ""
8753
8754
#: en/help_topics/authentication.txt:57
8755
msgid ""
8756
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8757
"against a host. But, by using ``.htaccess`` files, for example, it is "
8758
"possible\n"
8759
"to define several (``user, realm, password``) for a given ``host``. So what "
8760
"is\n"
8761
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8762
"is\n"
8763
"not taken into account in the definitions, but will displayed if bzr "
8764
"prompts\n"
8765
"you for a password."
8766
msgstr ""
8767
8768
#: en/help_topics/authentication.txt:64
8769
msgid ""
8770
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8771
"specifying the appropriate port."
8772
msgstr ""
8773
8774
#: en/help_topics/authentication.txt:67
8775
msgid ""
8776
"To take all schemes into account, the password will be deduced from a set "
8777
"of\n"
8778
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8779
"``user``,\n"
8780
"``password``)."
8781
msgstr ""
8782
8783
#: en/help_topics/authentication.txt:71
8784
msgid ""
8785
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8786
"used\n"
8787
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8788
"``ssh``\n"
8789
" should be used instead since this is the real scheme regarding\n"
8790
" authentication,"
8791
msgstr ""
8792
8793
#: en/help_topics/authentication.txt:76
8794
msgid " * ``host``: can be empty (to act as a default for any host),"
8795
msgstr ""
8796
8797
#: en/help_topics/authentication.txt:78
8798
msgid ""
8799
" * ``port`` can be empty (useful when an host provides several servers for "
8800
"the\n"
8801
" same scheme), only numerical values are allowed, this should be used "
8802
"only\n"
8803
" when the server uses a port different than the scheme standard port,"
8804
msgstr ""
8805
8806
#: en/help_topics/authentication.txt:82
8807
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8808
msgstr ""
8809
8810
#: en/help_topics/authentication.txt:84
8811
msgid ""
8812
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8813
" ``getpass.get_user()``),"
8814
msgstr ""
8815
8816
#: en/help_topics/authentication.txt:87
8817
msgid ""
8818
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8819
" password."
8820
msgstr ""
8821
8822
#: en/help_topics/authentication.txt:90
8823
msgid ""
8824
"Multiple definitions can be provided and, for a given URL, bzr will select "
8825
"a\n"
8826
"(``user`` [, ``password``]) based on the following rules :"
8827
msgstr ""
8828
8829
#: en/help_topics/authentication.txt:93
8830
msgid " 1. the first match wins,"
8831
msgstr ""
8832
8833
#: en/help_topics/authentication.txt:95
8834
msgid " 2. empty fields match everything,"
8835
msgstr ""
8836
8837
#: en/help_topics/authentication.txt:97
8838
msgid ""
8839
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8840
msgstr ""
8841
8842
#: en/help_topics/authentication.txt:99
8843
msgid ""
8844
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8845
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
8846
"net``\n"
8847
" will not match ``bzr.sf.net``)."
8848
msgstr ""
8849
8850
#: en/help_topics/authentication.txt:103
8851
msgid ""
8852
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8853
msgstr ""
8854
8855
#: en/help_topics/authentication.txt:105
8856
msgid ""
8857
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8858
"above,\n"
8859
" empty paths will match any provided path)."
8860
msgstr ""
8861
8862
#: en/help_topics/authentication.txt:110
8863
msgid ""
8864
"File format\n"
8865
"-----------"
8866
msgstr ""
8867
8868
#: en/help_topics/authentication.txt:113
8869
msgid ""
8870
"The general rules for :doc:`configuration files <configuration-help>`\n"
8871
"apply except for the variable policies."
8872
msgstr ""
8873
8874
#: en/help_topics/authentication.txt:116
8875
msgid "Each section describes an authentication definition."
8876
msgstr ""
8877
8878
#: en/help_topics/authentication.txt:118
8879
msgid ""
8880
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8881
"reserved\n"
8882
"and should appear as the *last* section."
8883
msgstr ""
8884
8885
#: en/help_topics/authentication.txt:121
8886
msgid "Each section should define:"
8887
msgstr ""
8888
8889
#: en/help_topics/authentication.txt:123
8890
msgid "* ``user``: the login to be used,"
8891
msgstr ""
8892
8893
#: en/help_topics/authentication.txt:125
8894
msgid "Each section could define:"
8895
msgstr ""
8896
8897
#: en/help_topics/authentication.txt:127
8898
msgid "* ``host``: the remote server,"
8899
msgstr ""
8900
8901
#: en/help_topics/authentication.txt:129
8902
msgid "* ``port``: the port the server is listening,"
8903
msgstr ""
8904
8905
#: en/help_topics/authentication.txt:131
8906
msgid "* ``path``: the branch location,"
8907
msgstr ""
8908
8909
#: en/help_topics/authentication.txt:133
8910
msgid "* ``password``: the password."
8911
msgstr ""
8912
8913
#: en/help_topics/authentication.txt:135
8914
msgid ""
8915
"\n"
8916
"Examples\n"
8917
"--------"
8918
msgstr ""
8919
8920
#: en/help_topics/authentication.txt:139
8921
msgid ""
8922
"\n"
8923
"Personal projects hosted outside\n"
8924
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8925
msgstr ""
8926
8927
#: en/help_topics/authentication.txt:143
8928
msgid ""
8929
"All connections are done with the same ``user`` (the remote one for which "
8930
"the\n"
8931
"default bzr one is not appropriate) and the password is always prompted "
8932
"with\n"
8933
"some exceptions::"
8934
msgstr ""
8935
8936
#: en/help_topics/authentication.txt:147
8937
msgid ""
8938
" # Pet projects on hobby.net\n"
8939
" [hobby]\n"
8940
" host=r.hobby.net\n"
8941
" user=jim\n"
8942
" password=obvious1234\n"
8943
" \n"
8944
" # Home server\n"
8945
" [home]\n"
8946
" scheme=https\n"
8947
" host=home.net\n"
8948
" user=joe\n"
8949
" password=1essobV10us\n"
8950
" \n"
8951
" [DEFAULT]\n"
8952
" # Our local user is barbaz, on all remote sites we're known as "
8953
"foobar\n"
8954
" user=foobar"
8955
msgstr ""
8956
8957
#: en/help_topics/authentication.txt:164
8958
msgid ""
8959
"\n"
8960
"Source hosting provider\n"
8961
"~~~~~~~~~~~~~~~~~~~~~~~"
8962
msgstr ""
8963
8964
#: en/help_topics/authentication.txt:168
8965
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8966
msgstr ""
8967
8968
#: en/help_topics/authentication.txt:170
8969
msgid ""
8970
" [shpnet domain]\n"
8971
" # we use sftp, but ssh is the scheme used for authentication\n"
8972
" scheme=ssh\n"
8973
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8974
" host=.shp.net\n"
8975
" user=joe\n"
8976
" # bzr don't support supplying a password for sftp,\n"
8977
" # consider using an ssh agent if you don't want to supply\n"
8978
" # a password interactively. (pageant, ssh-agent, etc)"
8979
msgstr ""
8980
8981
#: en/help_topics/authentication.txt:180
8982
msgid ""
8983
"HTTPS, SFTP servers and their proxy\n"
8984
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8985
msgstr ""
8986
8987
#: en/help_topics/authentication.txt:183
8988
msgid ""
8989
"At company.com, the server hosting release and integration branches is "
8990
"behind a\n"
8991
"proxy, and the two branches use different authentication policies::"
8992
msgstr ""
8993
8994
#: en/help_topics/authentication.txt:186
8995
msgid ""
8996
" [reference code]\n"
8997
" scheme=https\n"
8998
" host=dev.company.com\n"
8999
" path=/dev\n"
9000
" user=user1\n"
9001
" password=pass1"
9002
msgstr ""
9003
9004
#: en/help_topics/authentication.txt:193
9005
msgid ""
9006
" # development branches on dev server\n"
9007
" [dev]\n"
9008
" scheme=ssh # bzr+ssh and sftp are available here\n"
9009
" host=dev.company.com\n"
9010
" path=/dev/integration\n"
9011
" user=user2\n"
9012
" \n"
9013
" # proxy\n"
9014
" [proxy]\n"
9015
" scheme=http\n"
9016
" host=proxy.company.com\n"
9017
" port=3128\n"
9018
" user=proxyuser1\n"
9019
" password=proxypass1"
9020
msgstr ""
9021
9022
#: en/help_topics/authentication.txt:208
9023
msgid ""
9024
"\n"
9025
"Planned enhancements\n"
9026
"--------------------"
9027
msgstr ""
9028
9029
#: en/help_topics/authentication.txt:212
9030
msgid ""
9031
"The following are not yet implemented but planned as parts of a work in\n"
9032
"progress:"
9033
msgstr ""
9034
9035
#: en/help_topics/authentication.txt:215
9036
msgid "* add a ``password_encoding`` field allowing:"
9037
msgstr ""
9038
9039
#: en/help_topics/authentication.txt:217
9040
msgid ""
9041
" - storing the passwords in various obfuscating encodings (base64 for one),"
9042
msgstr ""
9043
9044
#: en/help_topics/authentication.txt:219
9045
msgid " - delegate password storage to plugins (.netrc for example)."
9046
msgstr ""
9047
9048
#: en/help_topics/authentication.txt:221
9049
msgid ""
9050
"* update the credentials when the user is prompted for user or password,"
9051
msgstr ""
9052
9053
#: en/help_topics/authentication.txt:223
9054
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9055
msgstr ""
9056
9057
#: en/help_topics/authentication.txt:225
9058
msgid ""
9059
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9060
"but\n"
9061
"ignored in the actual implementation.\n"
9062
msgstr ""
9063
9064
#: en/help_topics/bugs.txt:1
9065
msgid "Bug Tracker Settings"
9066
msgstr ""
9067
9068
#: en/help_topics/bugs.txt:3
9069
msgid ""
9070
"When making a commit, metadata about bugs fixed by that change can be\n"
9071
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9072
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9073
"(The only ``status`` value currently supported is ``fixed.``)"
9074
msgstr ""
9075
9076
#: en/help_topics/bugs.txt:8
9077
msgid ""
9078
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9079
"identifier\n"
9080
"rather than a full URL. This looks like::"
9081
msgstr ""
9082
9083
#: en/help_topics/bugs.txt:11
9084
msgid " bzr commit --fixes <tracker>:<id>"
9085
msgstr ""
9086
9087
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9088
msgid "or::"
9089
msgstr ""
9090
9091
#: en/help_topics/bugs.txt:15
9092
msgid " bzr commit --fixes <id>"
9093
msgstr ""
9094
9095
#: en/help_topics/bugs.txt:17
9096
msgid ""
9097
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9098
"the\n"
9099
"identifier for that bug within the bugtracker, usually the bug number.\n"
9100
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9101
"or global configuration is used."
9102
msgstr ""
9103
9104
#: en/help_topics/bugs.txt:22
9105
msgid ""
9106
"Bazaar knows about a few bug trackers that have many users. If\n"
9107
"you use one of these bug trackers then there is no setup required to\n"
9108
"use this feature, you just need to know the tracker identifier to use.\n"
9109
"These are the bugtrackers that are built in:"
9110
msgstr ""
9111
9112
#: en/help_topics/bugs.txt:27
9113
msgid ""
9114
" ============================ ============ ============\n"
9115
" URL Abbreviation Example\n"
9116
" ============================ ============ ============\n"
9117
" https://bugs.launchpad.net/ lp lp:12345\n"
9118
" http://bugs.debian.org/ deb deb:12345\n"
9119
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9120
" ============================ ============ ============"
9121
msgstr ""
9122
9123
#: en/help_topics/bugs.txt:35
9124
msgid ""
9125
"For the bug trackers not listed above configuration is required.\n"
9126
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9127
"is built in, along with a template mechanism for other bugtrackers with\n"
9128
"simple URL schemes. If your bug tracker can't be described by one\n"
9129
"of the schemes described below then you can write a plugin to support\n"
9130
"it."
9131
msgstr ""
9132
9133
#: en/help_topics/bugs.txt:42
9134
msgid ""
9135
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9136
"variable which contains the base URL of the bug tracker. These options\n"
9137
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9138
"configuration section in ``locations.conf``. You can set up these values\n"
9139
"for each of the projects you work on."
9140
msgstr ""
9141
9142
#: en/help_topics/bugs.txt:48
9143
msgid ""
9144
"Note: As you provide a short name for each tracker, you can specify one or\n"
9145
"more bugs in one or more trackers at commit time if you wish."
9146
msgstr ""
9147
9148
#: en/help_topics/bugs.txt:51
9149
msgid ""
9150
"Launchpad\n"
9151
"---------"
9152
msgstr ""
9153
9154
#: en/help_topics/bugs.txt:54
9155
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9156
msgstr ""
9157
9158
#: en/help_topics/bugs.txt:56
9159
msgid ""
9160
"bugzilla_<tracker>_url\n"
9161
"----------------------"
9162
msgstr ""
9163
9164
#: en/help_topics/bugs.txt:59
9165
msgid ""
9166
"If present, the location of the Bugzilla bug tracker referred to by\n"
9167
"<tracker>. This option can then be used together with ``bzr commit\n"
9168
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9169
"example::"
9170
msgstr ""
9171
9172
#: en/help_topics/bugs.txt:64
9173
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9174
msgstr ""
9175
9176
#: en/help_topics/bugs.txt:66
9177
msgid ""
9178
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9179
"fixed."
9180
msgstr ""
9181
9182
#: en/help_topics/bugs.txt:69
9183
msgid ""
9184
"trac_<tracker>_url\n"
9185
"------------------"
9186
msgstr ""
9187
9188
#: en/help_topics/bugs.txt:72
9189
msgid ""
9190
"If present, the location of the Trac instance referred to by\n"
9191
"<tracker>. This option can then be used together with ``bzr commit\n"
9192
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9193
"example::"
9194
msgstr ""
9195
9196
#: en/help_topics/bugs.txt:77
9197
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9198
msgstr ""
9199
9200
#: en/help_topics/bugs.txt:79
9201
msgid ""
9202
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9203
"as\n"
9204
"fixed."
9205
msgstr ""
9206
9207
#: en/help_topics/bugs.txt:82
9208
msgid ""
9209
"bugtracker_<tracker>_url\n"
9210
"------------------------"
9211
msgstr ""
9212
9213
#: en/help_topics/bugs.txt:85
9214
msgid ""
9215
"If present, the location of a generic bug tracker instance referred to by\n"
9216
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9217
"which will be replaced by a specific bug ID. This option can then be used\n"
9218
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9219
"fixed by that commit. For example::"
9220
msgstr ""
9221
9222
#: en/help_topics/bugs.txt:91
9223
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9224
msgstr ""
9225
9226
#: en/help_topics/bugs.txt:93
9227
msgid ""
9228
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9229
"Roundup bug tracker as fixed, or::"
9230
msgstr ""
9231
9232
#: en/help_topics/bugs.txt:96
9233
msgid ""
9234
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9235
msgstr ""
9236
9237
#: en/help_topics/bugs.txt:98
9238
msgid ""
9239
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9240
"RT bug tracker as fixed, or::"
9241
msgstr ""
9242
9243
#: en/help_topics/bugs.txt:101
9244
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9245
msgstr ""
9246
9247
#: en/help_topics/bugs.txt:103
9248
msgid ""
9249
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
9250
"HUDSON-1234\n"
9251
"in Hudson's JIRA bug tracker as fixed.\n"
9252
msgstr ""
9253
9254
#: en/help_topics/commands.txt:1
9255
msgid ""
9256
"add Add specified files or directories.\n"
9257
"alias Set/unset and display aliases.\n"
9258
"annotate Show the origin of each line in a file.\n"
9259
"bash-completion Generate a shell function for bash command line "
9260
"completion.\n"
9261
" [bash_completion]\n"
9262
"bind Convert the current branch into a checkout of the "
9263
"supplied\n"
9264
" branch.\n"
9265
"branch Create a new branch that is a copy of an existing branch.\n"
9266
"branches List the branches available at the current location.\n"
9267
"break-lock Break a dead lock.\n"
9268
"cat Write the contents of a file as of a given revision to\n"
9269
" standard output.\n"
9270
"check Validate working tree structure, branch consistency and\n"
9271
" repository history.\n"
9272
"checkout Create a new checkout of an existing branch.\n"
9273
"clean-tree Remove unwanted files from working tree.\n"
9274
"commit Commit changes into a new revision.\n"
9275
"config Display, set or remove a configuration option.\n"
9276
"conflicts List files with conflicts.\n"
9277
"deleted List files deleted in the working tree.\n"
9278
"diff Show differences in the working tree, between revisions "
9279
"or\n"
9280
" branches.\n"
9281
"dpush Push into a different VCS without any custom bzr "
9282
"metadata.\n"
9283
"export Export current or past revision to a destination directory "
9284
"or\n"
9285
" archive.\n"
9286
"help Show help on a command or other topic.\n"
9287
"ignore Ignore specified files or patterns.\n"
9288
"ignored List ignored files and the patterns that matched them.\n"
9289
"info Show information about a working tree, branch or "
9290
"repository.\n"
9291
"init Make a directory into a versioned branch.\n"
9292
"init-repository Create a shared repository for branches to share storage\n"
9293
" space.\n"
9294
"join Combine a tree into its containing tree.\n"
9295
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9296
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9297
"launchpad-open Open a Launchpad branch page in your web browser. "
9298
"[launchpad]\n"
9299
"log Show historical log for a branch or subset of a branch.\n"
9300
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9301
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9302
"ls List files in a tree.\n"
9303
"merge Perform a three-way merge.\n"
9304
"missing Show unmerged/unpulled revisions between two branches.\n"
9305
"mkdir Create a new versioned directory.\n"
9306
"mv Move or rename a file.\n"
9307
"nick Print or set the branch nickname.\n"
9308
"pack Compress the data within a repository.\n"
9309
"plugins List the installed plugins.\n"
9310
"pull Turn this branch into a mirror of another branch.\n"
9311
"push Update a mirror of this branch.\n"
9312
"reconcile Reconcile bzr metadata in a branch.\n"
9313
"reconfigure Reconfigure the type of a bzr directory.\n"
9314
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9315
"remerge Redo a merge.\n"
9316
"remove Remove files or directories.\n"
9317
"remove-branch Remove a branch.\n"
9318
"remove-tree Remove the working tree from a given branch/checkout.\n"
9319
"renames Show list of renamed files.\n"
9320
"resolve Mark a conflict as resolved.\n"
9321
"revert Revert files to a previous revision.\n"
9322
"revno Show current revision number.\n"
9323
"root Show the tree root directory.\n"
9324
"send Mail or create a merge-directive for submitting changes.\n"
9325
"serve Run the bzr server.\n"
9326
"shelve Temporarily set aside some changes from the current tree.\n"
9327
"sign-my-commits Sign all commits by a given committer.\n"
9328
"split Split a subdirectory of a tree into a separate tree.\n"
9329
"status Display status summary.\n"
9330
"switch Set the branch of a checkout and update.\n"
9331
"tag Create, remove or modify a tag naming a revision.\n"
9332
"tags List tags.\n"
9333
"testament Show testament (signing-form) of a revision.\n"
9334
"unbind Convert the current checkout into a regular branch.\n"
9335
"uncommit Remove the last committed revision.\n"
9336
"unshelve Restore shelved changes.\n"
9337
"update Update a working tree to a new revision.\n"
9338
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9339
" format.\n"
9340
"verify-signatures Verify all commit signatures.\n"
9341
"version Show version of bzr.\n"
9342
"version-info Show version information about this tree.\n"
9343
"view Manage filtered views.\n"
9344
"whoami Show or set bzr user id.\n"
9345
msgstr ""
9346
9347
#: en/help_topics/configuration.txt:1
9348
msgid ""
9349
"Configuration Settings\n"
9350
"======================="
9351
msgstr ""
9352
9353
#: en/help_topics/configuration.txt:4
9354
msgid ""
9355
"Environment settings\n"
9356
"---------------------"
9357
msgstr ""
9358
9359
#: en/help_topics/configuration.txt:7
9360
msgid ""
9361
"While most configuration is handled by configuration files, some options\n"
9362
"which may be semi-permanent can also be controlled through the environment."
9363
msgstr ""
9364
9365
#: en/help_topics/configuration.txt:10
9366
msgid ""
9367
"BZR_EMAIL\n"
9368
"~~~~~~~~~"
9369
msgstr ""
9370
9371
#: en/help_topics/configuration.txt:13
9372
msgid "Override the email id used by Bazaar. Typical format::"
9373
msgstr ""
9374
9375
#: en/help_topics/configuration.txt:15
9376
msgid " \"John Doe <jdoe@example.com>\""
9377
msgstr ""
9378
9379
#: en/help_topics/configuration.txt:17
9380
msgid "See also the ``email`` configuration option."
9381
msgstr ""
9382
9383
#: en/help_topics/configuration.txt:19
9384
msgid ""
9385
"BZR_PROGRESS_BAR\n"
9386
"~~~~~~~~~~~~~~~~"
9387
msgstr ""
9388
9389
#: en/help_topics/configuration.txt:22
9390
msgid ""
9391
"Override the progress display. Possible values are \"none\" or \"text\". "
9392
"If\n"
9393
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9394
"draws\n"
9395
"the ordinary command line progress bar."
9396
msgstr ""
9397
9398
#: en/help_topics/configuration.txt:26
9399
msgid ""
9400
"BZR_SIGQUIT_PDB\n"
9401
"~~~~~~~~~~~~~~~"
9402
msgstr ""
9403
9404
#: en/help_topics/configuration.txt:29
9405
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9406
msgstr ""
9407
9408
#: en/help_topics/configuration.txt:31
9409
msgid ""
9410
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9411
"* 1 = Invoke breakin debugger (default)"
9412
msgstr ""
9413
9414
#: en/help_topics/configuration.txt:34
9415
msgid ""
9416
"BZR_HOME\n"
9417
"~~~~~~~~"
9418
msgstr ""
9419
9420
#: en/help_topics/configuration.txt:37
9421
msgid "Override the home directory used by Bazaar."
9422
msgstr ""
9423
9424
#: en/help_topics/configuration.txt:39
9425
msgid ""
9426
"BZR_SSH\n"
9427
"~~~~~~~"
9428
msgstr ""
9429
9430
#: en/help_topics/configuration.txt:42
9431
msgid "Select a different SSH implementation."
9432
msgstr ""
9433
9434
#: en/help_topics/configuration.txt:44
9435
msgid ""
9436
"BZR_PDB\n"
9437
"~~~~~~~"
9438
msgstr ""
9439
9440
#: en/help_topics/configuration.txt:47
9441
msgid "Control whether to launch a debugger on error."
9442
msgstr ""
9443
9444
#: en/help_topics/configuration.txt:49
9445
msgid ""
9446
"* 0 = Standard behavior\n"
9447
"* 1 = Launch debugger"
9448
msgstr ""
9449
9450
#: en/help_topics/configuration.txt:52
9451
msgid ""
9452
"BZR_REMOTE_PATH\n"
9453
"~~~~~~~~~~~~~~~"
9454
msgstr ""
9455
9456
#: en/help_topics/configuration.txt:55
9457
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9458
msgstr ""
9459
9460
#: en/help_topics/configuration.txt:57
9461
msgid "See also the ``bzr_remote_path`` configuration option."
9462
msgstr ""
9463
9464
#: en/help_topics/configuration.txt:59
9465
msgid ""
9466
"BZR_EDITOR\n"
9467
"~~~~~~~~~~"
9468
msgstr ""
9469
9470
#: en/help_topics/configuration.txt:62
9471
msgid "Path to the editor Bazaar should use for commit messages, etc."
9472
msgstr ""
9473
9474
#: en/help_topics/configuration.txt:64
9475
msgid ""
9476
"BZR_LOG\n"
9477
"~~~~~~~"
9478
msgstr ""
9479
9480
#: en/help_topics/configuration.txt:67
9481
msgid ""
9482
"Location of the Bazaar log file. You can check the current location by\n"
9483
"running ``bzr version``."
9484
msgstr ""
9485
9486
#: en/help_topics/configuration.txt:70
9487
msgid ""
9488
"The log file contains debug information that is useful for diagnosing or\n"
9489
"reporting problems with Bazaar."
9490
msgstr ""
9491
9492
#: en/help_topics/configuration.txt:73
9493
msgid ""
9494
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9495
"will disable logging."
9496
msgstr ""
9497
9498
#: en/help_topics/configuration.txt:76
9499
msgid ""
9500
"\n"
9501
"BZR_PLUGIN_PATH\n"
9502
"~~~~~~~~~~~~~~~"
9503
msgstr ""
9504
9505
#: en/help_topics/configuration.txt:80
9506
msgid ""
9507
"The path to the plugins directory that Bazaar should use.\n"
9508
"If not set, Bazaar will search for plugins in:"
9509
msgstr ""
9510
9511
#: en/help_topics/configuration.txt:83
9512
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
9513
msgstr ""
9514
9515
#: en/help_topics/configuration.txt:85
9516
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9517
msgstr ""
9518
9519
#: en/help_topics/configuration.txt:87
9520
msgid ""
9521
"* the site specific plugin directory if applicable (containing\n"
9522
" the ``site`` plugins)."
9523
msgstr ""
9524
9525
#: en/help_topics/configuration.txt:90
9526
msgid ""
9527
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9528
"the way the plugin are searched. "
9529
msgstr ""
9530
9531
#: en/help_topics/configuration.txt:93
9532
msgid ""
9533
"As for the ``PATH`` variables, if multiple directories are\n"
9534
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9535
"platform specific appropriate character (':' on Unix,\n"
9536
"';' on windows)"
9537
msgstr ""
9538
9539
#: en/help_topics/configuration.txt:98
9540
msgid ""
9541
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9542
"in ``user``. However it will continue to search in ``core`` and\n"
9543
"``site`` unless they are explicitly removed."
9544
msgstr ""
9545
9546
#: en/help_topics/configuration.txt:102
9547
msgid ""
9548
"If you need to change the order or remove one of these\n"
9549
"directories, you should use special values:"
9550
msgstr ""
9551
9552
#: en/help_topics/configuration.txt:105
9553
msgid ""
9554
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9555
" path from the default values,"
9556
msgstr ""
9557
9558
#: en/help_topics/configuration.txt:108
9559
msgid ""
9560
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9561
" before the remaining default values (and also remove it from\n"
9562
" the default values)."
9563
msgstr ""
9564
9565
#: en/help_topics/configuration.txt:112
9566
msgid ""
9567
"Note that the special values 'user', 'core' and 'site' should be\n"
9568
"used literally, they will be substituted by the corresponding,\n"
9569
"platform specific, values."
9570
msgstr ""
9571
9572
#: en/help_topics/configuration.txt:116
9573
msgid ""
9574
"The examples below use ':' as the separator, windows users\n"
9575
"should use ';'."
9576
msgstr ""
9577
9578
#: en/help_topics/configuration.txt:119
9579
msgid "Overriding the default user plugin directory::"
9580
msgstr ""
9581
9582
#: en/help_topics/configuration.txt:121
9583
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9584
msgstr ""
9585
9586
#: en/help_topics/configuration.txt:123
9587
msgid "Disabling the site directory while retaining the user directory::"
9588
msgstr ""
9589
9590
#: en/help_topics/configuration.txt:125
9591
msgid " BZR_PLUGIN_PATH='-site:+user'"
9592
msgstr ""
9593
9594
#: en/help_topics/configuration.txt:127
9595
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9596
msgstr ""
9597
9598
#: en/help_topics/configuration.txt:129
9599
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9600
msgstr ""
9601
9602
#: en/help_topics/configuration.txt:131
9603
msgid "Overriding the default site plugin directory::"
9604
msgstr ""
9605
9606
#: en/help_topics/configuration.txt:133
9607
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9608
msgstr ""
9609
9610
#: en/help_topics/configuration.txt:135
9611
msgid ""
9612
"BZR_DISABLE_PLUGINS\n"
9613
"~~~~~~~~~~~~~~~~~~~"
9614
msgstr ""
9615
9616
#: en/help_topics/configuration.txt:138
9617
msgid ""
9618
"Under special circumstances (mostly when trying to diagnose a\n"
9619
"bug), it's better to disable a plugin (or several) rather than\n"
9620
"uninstalling them completely. Such plugins can be specified in\n"
9621
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9622
msgstr ""
9623
9624
#: en/help_topics/configuration.txt:143
9625
msgid ""
9626
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9627
"will raise an import error if they are explicitly imported (by\n"
9628
"another plugin that depends on them for example)."
9629
msgstr ""
9630
9631
#: en/help_topics/configuration.txt:147
9632
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9633
msgstr ""
9634
9635
#: en/help_topics/configuration.txt:149
9636
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9637
msgstr ""
9638
9639
#: en/help_topics/configuration.txt:151
9640
msgid ""
9641
"BZR_PLUGINS_AT\n"
9642
"~~~~~~~~~~~~~~"
9643
msgstr ""
9644
9645
#: en/help_topics/configuration.txt:154
9646
msgid ""
9647
"When adding a new feature or working on a bug in a plugin,\n"
9648
"developers often need to use a specific version of a given\n"
9649
"plugin. Since python requires that the directory containing the\n"
9650
"code is named like the plugin itself this make it impossible to\n"
9651
"use arbitrary directory names (using a two-level directory scheme\n"
9652
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9653
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9654
msgstr ""
9655
9656
#: en/help_topics/configuration.txt:162
9657
msgid ""
9658
"Plugins specified in this environment variable takes precedence\n"
9659
"over the ones in ``BZR_PLUGIN_PATH``."
9660
msgstr ""
9661
9662
#: en/help_topics/configuration.txt:165
9663
msgid ""
9664
"The variable specified a list of ``plugin_name@plugin path``,\n"
9665
"``plugin_name`` being the name of the plugin as it appears in\n"
9666
"python module paths, ``plugin_path`` being the path to the\n"
9667
"directory containing the plugin code itself\n"
9668
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9669
"separator, use ';' on windows."
9670
msgstr ""
9671
9672
#: en/help_topics/configuration.txt:172
9673
msgid ""
9674
"Example:\n"
9675
"~~~~~~~~"
9676
msgstr ""
9677
9678
#: en/help_topics/configuration.txt:175
9679
msgid ""
9680
"Using a specific version of ``myplugin``:\n"
9681
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9682
msgstr ""
9683
9684
#: en/help_topics/configuration.txt:178
9685
msgid ""
9686
"BZRPATH\n"
9687
"~~~~~~~"
9688
msgstr ""
9689
9690
#: en/help_topics/configuration.txt:181
9691
msgid "The path where Bazaar should look for shell plugin external commands."
9692
msgstr ""
9693
9694
#: en/help_topics/configuration.txt:183
9695
msgid ""
9696
"\n"
9697
"http_proxy, https_proxy\n"
9698
"~~~~~~~~~~~~~~~~~~~~~~~"
9699
msgstr ""
9700
9701
#: en/help_topics/configuration.txt:187
9702
msgid "Specifies the network proxy for outgoing connections, for example::"
9703
msgstr ""
9704
9705
#: en/help_topics/configuration.txt:189
9706
msgid ""
9707
" http_proxy=http://proxy.example.com:3128/ \n"
9708
" https_proxy=http://proxy.example.com:3128/"
9709
msgstr ""
9710
9711
#: en/help_topics/configuration.txt:192
9712
msgid ""
9713
"\n"
9714
"Configuration files\n"
9715
"-------------------"
9716
msgstr ""
9717
9718
#: en/help_topics/configuration.txt:196
9719
msgid ""
9720
"Location\n"
9721
"~~~~~~~~"
9722
msgstr ""
9723
9724
#: en/help_topics/configuration.txt:199
9725
msgid ""
9726
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9727
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9728
"on\n"
9729
"Windows. (You can check the location for your system by using\n"
9730
"``bzr version``.)"
9731
msgstr ""
9732
9733
#: en/help_topics/configuration.txt:204
9734
msgid "There are three primary configuration files in this location:"
9735
msgstr ""
9736
9737
#: en/help_topics/configuration.txt:206
9738
msgid "* ``bazaar.conf`` describes default configuration options,"
9739
msgstr ""
9740
9741
#: en/help_topics/configuration.txt:208
9742
msgid ""
9743
"* ``locations.conf`` describes configuration information for\n"
9744
" specific branch locations,"
9745
msgstr ""
9746
9747
#: en/help_topics/configuration.txt:211
9748
msgid ""
9749
"* ``authentication.conf`` describes credential information for\n"
9750
" remote servers."
9751
msgstr ""
9752
9753
#: en/help_topics/configuration.txt:214
9754
msgid ""
9755
"Each branch can also contain a configuration file that sets values specific\n"
9756
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9757
"the\n"
9758
"branch. This file is visible to all users of a branch, if you wish to "
9759
"override\n"
9760
"one of the values for a branch with a setting that is specific to you then "
9761
"you\n"
9762
"can do so in ``locations.conf``."
9763
msgstr ""
9764
9765
#: en/help_topics/configuration.txt:220
9766
msgid ""
9767
"General format\n"
9768
"~~~~~~~~~~~~~~"
9769
msgstr ""
9770
9771
#: en/help_topics/configuration.txt:223
9772
msgid ""
9773
"An ini file has three types of contructs: section headers, section\n"
9774
"options and comments."
9775
msgstr ""
9776
9777
#: en/help_topics/configuration.txt:226
9778
msgid ""
9779
"Comments\n"
9780
"^^^^^^^^"
9781
msgstr ""
9782
9783
#: en/help_topics/configuration.txt:229
9784
msgid ""
9785
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9786
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9787
"Bazaar when parsing ini files."
9788
msgstr ""
9789
9790
#: en/help_topics/configuration.txt:233
9791
msgid ""
9792
"Section headers\n"
9793
"^^^^^^^^^^^^^^^"
9794
msgstr ""
9795
9796
#: en/help_topics/configuration.txt:236
9797
msgid ""
9798
"A section header is a word enclosed in brackets that starts at the begining\n"
9799
"of a line. A typical section header looks like this::"
9800
msgstr ""
9801
9802
#: en/help_topics/configuration.txt:239
9803
msgid " [DEFAULT]"
9804
msgstr ""
9805
9806
#: en/help_topics/configuration.txt:241
9807
msgid ""
9808
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9809
"[ALIASES]. Section headers are case sensitive. The default section provides "
9810
"for\n"
9811
"setting options which can be overridden with the branch config file."
9812
msgstr ""
9813
9814
#: en/help_topics/configuration.txt:245
9815
msgid ""
9816
"For ``locations.conf``, the options from the section with the\n"
9817
"longest matching section header are used to the exclusion of other\n"
9818
"potentially valid section headers. A section header uses the path for\n"
9819
"the branch as the section header. Some examples include::"
9820
msgstr ""
9821
9822
#: en/help_topics/configuration.txt:250
9823
msgid ""
9824
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9825
" [/home/jdoe/branches/]"
9826
msgstr ""
9827
9828
#: en/help_topics/configuration.txt:253
9829
msgid ""
9830
"\n"
9831
"Section options\n"
9832
"^^^^^^^^^^^^^^^"
9833
msgstr ""
9834
9835
#: en/help_topics/configuration.txt:257
9836
msgid ""
9837
"A section option resides within a section. A section option contains an\n"
9838
"option name, an equals sign and a value. For example::"
9839
msgstr ""
9840
9841
#: en/help_topics/configuration.txt:260
9842
msgid ""
9843
" email = John Doe <jdoe@isp.com>\n"
9844
" gpg_signing_key = Amy Pond <amy@example.com>"
9845
msgstr ""
9846
9847
#: en/help_topics/configuration.txt:263
9848
msgid ""
9849
"A option can reference other options by enclosing them in curly brackets::"
9850
msgstr ""
9851
9852
#: en/help_topics/configuration.txt:265
9853
msgid ""
9854
" my_branch_name = feature_x\n"
9855
" my_server = bzr+ssh://example.com\n"
9856
" push_location = {my_server}/project/{my_branch_name}"
9857
msgstr ""
9858
9859
#: en/help_topics/configuration.txt:269
9860
msgid ""
9861
"Option policies\n"
9862
"^^^^^^^^^^^^^^^"
9863
msgstr ""
9864
9865
#: en/help_topics/configuration.txt:272
9866
msgid ""
9867
"Options defined in a section affect the named directory or URL plus\n"
9868
"any locations they contain. Policies can be used to change how an\n"
9869
"option value is interpreted for contained locations. Currently\n"
9870
"there are three policies available:"
9871
msgstr ""
9872
9873
#: en/help_topics/configuration.txt:277
9874
msgid ""
9875
" none:\n"
9876
" the value is interpreted the same for contained locations. This is\n"
9877
" the default behaviour.\n"
9878
" norecurse:\n"
9879
" the value is only used for the exact location specified by the\n"
9880
" section name.\n"
9881
" appendpath:\n"
9882
" for contained locations, any additional path components are\n"
9883
" appended to the value."
9884
msgstr ""
9885
9886
#: en/help_topics/configuration.txt:287
9887
msgid ""
9888
"Policies are specified by keys with names of the form \"<option_name>:policy"
9889
"\".\n"
9890
"For example, to define the push location for a tree of branches, the\n"
9891
"following could be used::"
9892
msgstr ""
9893
9894
#: en/help_topics/configuration.txt:291
9895
msgid ""
9896
" [/top/location]\n"
9897
" push_location = sftp://example.com/location\n"
9898
" push_location:policy = appendpath"
9899
msgstr ""
9900
9901
#: en/help_topics/configuration.txt:295
9902
msgid ""
9903
"With this configuration, the push location for ``/top/location/branch1``\n"
9904
"would be ``sftp://example.com/location/branch1``."
9905
msgstr ""
9906
9907
#: en/help_topics/configuration.txt:298
9908
msgid ""
9909
"Section local options\n"
9910
"^^^^^^^^^^^^^^^^^^^^^"
9911
msgstr ""
9912
9913
#: en/help_topics/configuration.txt:301
9914
msgid ""
9915
"Some options are defined automatically inside a given section and can be\n"
9916
"refered to in this section only. "
9917
msgstr ""
9918
9919
#: en/help_topics/configuration.txt:304
9920
msgid "For example, the ``appendpath`` policy can be used like this::"
9921
msgstr ""
9922
9923
#: en/help_topics/configuration.txt:306
9924
msgid ""
9925
" [/home/vila/src/bzr/bugs]\n"
9926
" mypush = lp:~vila/bzr\n"
9927
" mypush:policy=appendpath"
9928
msgstr ""
9929
9930
#: en/help_topics/configuration.txt:310
9931
msgid "Using ``relpath`` to achieve the same result is done like this::"
9932
msgstr ""
9933
9934
#: en/help_topics/configuration.txt:312
9935
msgid ""
9936
" [/home/vila/src/bzr/bugs]\n"
9937
" mypush = lp:~vila/bzr/{relpath}"
9938
msgstr ""
9939
9940
#: en/help_topics/configuration.txt:315
9941
msgid ""
9942
"In both cases, when used in a directory like\n"
9943
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9944
msgstr ""
9945
9946
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9947
msgid ""
9948
" $ bzr config mypush\n"
9949
" lp:~vila/bzr/832013-expand-in-stack"
9950
msgstr ""
9951
9952
#: en/help_topics/configuration.txt:321
9953
msgid "Another such option is ``basename`` which can be used like this::"
9954
msgstr ""
9955
9956
#: en/help_topics/configuration.txt:323
9957
msgid ""
9958
" [/home/vila/src/bzr]\n"
9959
" mypush = lp:~vila/bzr/{basename}"
9960
msgstr ""
9961
9962
#: en/help_topics/configuration.txt:326
9963
msgid ""
9964
"When used in a directory like\n"
9965
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9966
msgstr ""
9967
9968
#: en/help_topics/configuration.txt:332
9969
msgid ""
9970
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9971
"itself is defined as the relative path between the section name and the\n"
9972
"location it matches."
9973
msgstr ""
9974
9975
#: en/help_topics/configuration.txt:336
9976
msgid ""
9977
"When an option is local to a Section, it cannot be referred to from option\n"
9978
"values in any other section from the same ``Store`` nor from any other\n"
9979
"``Store``."
9980
msgstr ""
9981
9982
#: en/help_topics/configuration.txt:340
9983
msgid ""
9984
"\n"
9985
"The main configuration file, bazaar.conf\n"
9986
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9987
msgstr ""
9988
9989
#: en/help_topics/configuration.txt:344
9990
msgid ""
9991
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9992
"The default section contains the default\n"
9993
"configuration options for all branches. The default section can be\n"
9994
"overriden by providing a branch-specific section in ``locations.conf``."
9995
msgstr ""
9996
9997
#: en/help_topics/configuration.txt:349
9998
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9999
msgstr ""
10000
10001
#: en/help_topics/configuration.txt:351
10002
msgid ""
10003
" [DEFAULT]\n"
10004
" email = John Doe <jdoe@isp.com>\n"
10005
" editor = /usr/bin/vim\n"
10006
" create_signatures = when-required"
10007
msgstr ""
10008
10009
#: en/help_topics/configuration.txt:356
10010
msgid ""
10011
"\n"
10012
"The branch location configuration file, locations.conf\n"
10013
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10014
msgstr ""
10015
10016
#: en/help_topics/configuration.txt:360
10017
msgid ""
10018
"``locations.conf`` allows one to specify overriding settings for\n"
10019
"a specific branch. The format is almost identical to the default section in\n"
10020
"bazaar.conf with one significant change: The section header, instead of "
10021
"saying\n"
10022
"default, will be the path to a branch that you wish to override a value\n"
10023
"for. The '?' and '*' wildcards are supported::"
10024
msgstr ""
10025
10026
#: en/help_topics/configuration.txt:366
10027
msgid ""
10028
" [/home/jdoe/branches/nethack]\n"
10029
" email = Nethack Admin <nethack@nethack.com>"
10030
msgstr ""
10031
10032
#: en/help_topics/configuration.txt:369
10033
msgid ""
10034
" [http://hypothetical.site.com/branches/devel-branch]\n"
10035
" create_signatures = always"
10036
msgstr ""
10037
10038
#: en/help_topics/configuration.txt:372
10039
msgid ""
10040
"The authentication configuration file, authentication.conf\n"
10041
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10042
msgstr ""
10043
10044
#: en/help_topics/configuration.txt:375
10045
msgid ""
10046
"``authentication.conf`` allows one to specify credentials for\n"
10047
"remote servers. This can be used for all the supported transports and any "
10048
"part\n"
10049
"of bzr that requires authentication (smtp for example)."
10050
msgstr ""
10051
10052
#: en/help_topics/configuration.txt:379
10053
msgid ""
10054
"The syntax of the file obeys the same rules as the others except for the\n"
10055
"option policies which don't apply."
10056
msgstr ""
10057
10058
#: en/help_topics/configuration.txt:382
10059
msgid ""
10060
"For more information on the possible uses of the authentication "
10061
"configuration\n"
10062
"file see :doc:`authentication-help`."
10063
msgstr ""
10064
10065
#: en/help_topics/configuration.txt:385
10066
msgid ""
10067
"\n"
10068
"Common options\n"
10069
"--------------"
10070
msgstr ""
10071
10072
#: en/help_topics/configuration.txt:389
10073
msgid ""
10074
"debug_flags\n"
10075
"~~~~~~~~~~~"
10076
msgstr ""
10077
10078
#: en/help_topics/configuration.txt:392
10079
msgid ""
10080
"A comma-separated list of debugging options to turn on. The same values\n"
10081
"can be used as with the -D command-line option (see `help global-options`).\n"
10082
"For example::"
10083
msgstr ""
10084
10085
#: en/help_topics/configuration.txt:396
10086
msgid " debug_flags = hpss"
10087
msgstr ""
10088
10089
#: en/help_topics/configuration.txt:400
10090
msgid " debug_flags = hpss,evil"
10091
msgstr ""
10092
10093
#: en/help_topics/configuration.txt:402
10094
msgid ""
10095
"email\n"
10096
"~~~~~"
10097
msgstr ""
10098
10099
#: en/help_topics/configuration.txt:405
10100
msgid ""
10101
"The email address to use when committing a branch. Typically takes the form\n"
10102
"of::"
10103
msgstr ""
10104
10105
#: en/help_topics/configuration.txt:408
10106
msgid " email = Full Name <account@hostname.tld>"
10107
msgstr ""
10108
10109
#: en/help_topics/configuration.txt:410
10110
msgid ""
10111
"editor\n"
10112
"~~~~~~"
10113
msgstr ""
10114
10115
#: en/help_topics/configuration.txt:413
10116
msgid ""
10117
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10118
"a commit message. This setting is trumped by the environment variable\n"
10119
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10120
"variables."
10121
msgstr ""
10122
10123
#: en/help_topics/configuration.txt:418
10124
msgid ""
10125
"log_format\n"
10126
"~~~~~~~~~~"
10127
msgstr ""
10128
10129
#: en/help_topics/configuration.txt:421
10130
msgid ""
10131
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10132
"and ``line``. Additional formats may be provided by plugins. The default\n"
10133
"value is ``long``."
10134
msgstr ""
10135
10136
#: en/help_topics/configuration.txt:425
10137
msgid ""
10138
"check_signatures\n"
10139
"~~~~~~~~~~~~~~~~"
10140
msgstr ""
10141
10142
#: en/help_topics/configuration.txt:428
10143
msgid ""
10144
"Reserved for future use. These options will allow a policy for branches to\n"
10145
"require signatures."
10146
msgstr ""
10147
10148
#: en/help_topics/configuration.txt:431
10149
msgid ""
10150
"require\n"
10151
" The gnupg signature for revisions must be present and must be valid."
10152
msgstr ""
10153
10154
#: en/help_topics/configuration.txt:434
10155
msgid ""
10156
"ignore\n"
10157
" Do not check gnupg signatures of revisions."
10158
msgstr ""
10159
10160
#: en/help_topics/configuration.txt:437
10161
msgid ""
10162
"check-available\n"
10163
" (default) If gnupg signatures for revisions are present, check them.\n"
10164
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10165
" no signature is present."
10166
msgstr ""
10167
10168
#: en/help_topics/configuration.txt:442
10169
msgid ""
10170
"create_signatures\n"
10171
"~~~~~~~~~~~~~~~~~"
10172
msgstr ""
10173
10174
#: en/help_topics/configuration.txt:445
10175
msgid ""
10176
"Defines the behaviour of signing revisions on commits. By default bzr will "
10177
"not\n"
10178
"sign new commits."
10179
msgstr ""
10180
10181
#: en/help_topics/configuration.txt:448
10182
msgid ""
10183
"always\n"
10184
" Sign every new revision that is committed. If the signing fails then "
10185
"the\n"
10186
" commit will not be made."
10187
msgstr ""
10188
10189
#: en/help_topics/configuration.txt:452
10190
msgid ""
10191
"when-required\n"
10192
" Reserved for future use."
10193
msgstr ""
10194
10195
#: en/help_topics/configuration.txt:455
10196
msgid ""
10197
"never\n"
10198
" Reserved for future use."
10199
msgstr ""
10200
10201
#: en/help_topics/configuration.txt:458
10202
msgid ""
10203
"In future it is planned that ``when-required`` will sign newly\n"
10204
"committed revisions only when the branch requires them. ``never`` will "
10205
"refuse\n"
10206
"to sign newly committed revisions, even if the branch requires signatures."
10207
msgstr ""
10208
10209
#: en/help_topics/configuration.txt:462
10210
msgid ""
10211
"dirstate.fdatasync\n"
10212
"~~~~~~~~~~~~~~~~~~"
10213
msgstr ""
10214
10215
#: en/help_topics/configuration.txt:465
10216
msgid ""
10217
"If true (default), working tree metadata changes are flushed through the\n"
10218
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10219
"should not be lost if the machine crashes. See also repository.fdatasync."
10220
msgstr ""
10221
10222
#: en/help_topics/configuration.txt:469
10223
msgid ""
10224
"gpg_signing_key\n"
10225
"~~~~~~~~~~~~~~~"
10226
msgstr ""
10227
10228
#: en/help_topics/configuration.txt:472
10229
msgid ""
10230
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10231
"address, key fingerprint or full key ID. When unset or when set to\n"
10232
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10233
msgstr ""
10234
10235
#: en/help_topics/configuration.txt:476
10236
msgid ""
10237
"recurse\n"
10238
"~~~~~~~"
10239
msgstr ""
10240
10241
#: en/help_topics/configuration.txt:479
10242
msgid ""
10243
"Only useful in ``locations.conf``. Defines whether or not the\n"
10244
"configuration for this section applies to subdirectories:"
10245
msgstr ""
10246
10247
#: en/help_topics/configuration.txt:482
10248
msgid ""
10249
"true\n"
10250
" (default) This section applies to subdirectories as well."
10251
msgstr ""
10252
10253
#: en/help_topics/configuration.txt:485
10254
msgid ""
10255
"false\n"
10256
" This section only applies to the branch at this directory and not\n"
10257
" branches below it."
10258
msgstr ""
10259
10260
#: en/help_topics/configuration.txt:489
10261
msgid ""
10262
"gpg_signing_command\n"
10263
"~~~~~~~~~~~~~~~~~~~"
10264
msgstr ""
10265
10266
#: en/help_topics/configuration.txt:492
10267
msgid ""
10268
"(Default: \"gpg\"). Which program should be used to sign and check "
10269
"revisions.\n"
10270
"For example::"
10271
msgstr ""
10272
10273
#: en/help_topics/configuration.txt:495
10274
msgid " gpg_signing_command = /usr/bin/gnpg"
10275
msgstr ""
10276
10277
#: en/help_topics/configuration.txt:497
10278
msgid ""
10279
"The specified command must accept the options \"--clearsign\" and \"-u "
10280
"<email>\"."
10281
msgstr ""
10282
10283
#: en/help_topics/configuration.txt:499
10284
msgid ""
10285
"bzr_remote_path\n"
10286
"~~~~~~~~~~~~~~~"
10287
msgstr ""
10288
10289
#: en/help_topics/configuration.txt:502
10290
msgid ""
10291
"(Default: \"bzr\"). The path to the command that should be used to run the "
10292
"smart\n"
10293
"server for bzr. This value may only be specified in locations.conf, because:"
10294
msgstr ""
10295
10296
#: en/help_topics/configuration.txt:505
10297
msgid ""
10298
"- it's needed before branch.conf is accessible\n"
10299
"- allowing remote branch.conf files to specify commands would be a security\n"
10300
" risk"
10301
msgstr ""
10302
10303
#: en/help_topics/configuration.txt:509
10304
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10305
msgstr ""
10306
10307
#: en/help_topics/configuration.txt:511
10308
msgid ""
10309
"smtp_server\n"
10310
"~~~~~~~~~~~"
10311
msgstr ""
10312
10313
#: en/help_topics/configuration.txt:514
10314
msgid ""
10315
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10316
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10317
msgstr ""
10318
10319
#: en/help_topics/configuration.txt:517
10320
msgid ""
10321
"smtp_username, smtp_password\n"
10322
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10323
msgstr ""
10324
10325
#: en/help_topics/configuration.txt:520
10326
msgid ""
10327
"User and password to authenticate to the SMTP server. If smtp_username\n"
10328
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10329
"These settings are only needed if the SMTP server requires authentication\n"
10330
"to send mail."
10331
msgstr ""
10332
10333
#: en/help_topics/configuration.txt:525
10334
msgid ""
10335
"locks.steal_dead\n"
10336
"~~~~~~~~~~~~~~~~"
10337
msgstr ""
10338
10339
#: en/help_topics/configuration.txt:528
10340
msgid ""
10341
"If set to true, bzr will automatically break locks held by processes from\n"
10342
"the same machine and user that are no longer alive. Otherwise, it will\n"
10343
"print a message and you can break the lock manually, if you are satisfied\n"
10344
"the object is no longer in use."
10345
msgstr ""
10346
10347
#: en/help_topics/configuration.txt:533
10348
msgid ""
10349
"mail_client\n"
10350
"~~~~~~~~~~~"
10351
msgstr ""
10352
10353
#: en/help_topics/configuration.txt:536
10354
msgid ""
10355
"A mail client to use for sending merge requests.\n"
10356
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10357
"it\n"
10358
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10359
"``editor``."
10360
msgstr ""
10361
10362
#: en/help_topics/configuration.txt:541
10363
msgid "Supported values for specific clients:"
10364
msgstr ""
10365
10366
#: en/help_topics/configuration.txt:543
10367
msgid ""
10368
":claws: Use Claws. This skips a dialog for attaching files.\n"
10369
":evolution: Use Evolution.\n"
10370
":kmail: Use KMail.\n"
10371
":mutt: Use Mutt.\n"
10372
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10373
"1.5,\n"
10374
" this works around some bugs that xdg-email doesn't handle."
10375
msgstr ""
10376
10377
#: en/help_topics/configuration.txt:550
10378
msgid "Supported generic values are:"
10379
msgstr ""
10380
10381
#: en/help_topics/configuration.txt:552
10382
msgid ""
10383
":default: See above.\n"
10384
":editor: Use your editor to compose the merge request. This also uses\n"
10385
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10386
" smtp_username and smtp_password.\n"
10387
":mapi: Use your preferred e-mail client on Windows.\n"
10388
":xdg-email: Use xdg-email to run your preferred mail program"
10389
msgstr ""
10390
10391
#: en/help_topics/configuration.txt:559
10392
msgid ""
10393
"repository.fdatasync\n"
10394
"~~~~~~~~~~~~~~~~~~~~"
10395
msgstr ""
10396
10397
#: en/help_topics/configuration.txt:562
10398
msgid ""
10399
"If true (default), repository changes are flushed through the OS buffers\n"
10400
"to physical disk. This is somewhat slower, but means data should not be\n"
10401
"lost if the machine crashes. See also dirstate.fdatasync."
10402
msgstr ""
10403
10404
#: en/help_topics/configuration.txt:566
10405
msgid ""
10406
"submit_branch\n"
10407
"~~~~~~~~~~~~~"
10408
msgstr ""
10409
10410
#: en/help_topics/configuration.txt:569
10411
msgid ""
10412
"The branch you intend to submit your current work to. This is "
10413
"automatically\n"
10414
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10415
"This\n"
10416
"should usually be set on a per-branch or per-location basis."
10417
msgstr ""
10418
10419
#: en/help_topics/configuration.txt:573
10420
msgid ""
10421
"public_branch\n"
10422
"~~~~~~~~~~~~~"
10423
msgstr ""
10424
10425
#: en/help_topics/configuration.txt:576
10426
msgid ""
10427
"A publically-accessible version of this branch (implying that this version "
10428
"is\n"
10429
"not publically-accessible). Used (and set) by ``bzr send``."
10430
msgstr ""
10431
10432
#: en/help_topics/configuration.txt:579
10433
msgid ""
10434
"suppress_warnings\n"
10435
"~~~~~~~~~~~~~~~~~"
10436
msgstr ""
10437
10438
#: en/help_topics/configuration.txt:582
10439
msgid ""
10440
"A list of strings, each string represent a warning that can be emitted by\n"
10441
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10442
msgstr ""
10443
10444
#: en/help_topics/configuration.txt:585
10445
msgid "Valid values:"
10446
msgstr ""
10447
10448
#: en/help_topics/configuration.txt:587
10449
msgid ""
10450
"* ``format_deprecation``:\n"
10451
" whether the format deprecation warning is shown on repositories that "
10452
"are\n"
10453
" using deprecated formats."
10454
msgstr ""
10455
10456
#: en/help_topics/configuration.txt:591
10457
msgid ""
10458
"default_format\n"
10459
"~~~~~~~~~~~~~~"
10460
msgstr ""
10461
10462
#: en/help_topics/configuration.txt:594
10463
msgid ""
10464
"A format name for the default format used when creating branches. See "
10465
"``bzr\n"
10466
"help formats`` for possible values."
10467
msgstr ""
10468
10469
#: en/help_topics/configuration.txt:597
10470
msgid ""
10471
"\n"
10472
"Unicode options\n"
10473
"---------------"
10474
msgstr ""
10475
10476
#: en/help_topics/configuration.txt:601
10477
msgid ""
10478
"output_encoding\n"
10479
"~~~~~~~~~~~~~~~"
10480
msgstr ""
10481
10482
#: en/help_topics/configuration.txt:604
10483
msgid ""
10484
"A Python unicode encoding name for text output from bzr, such as log\n"
10485
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10486
"is the terminal encoding prefered by the operating system."
10487
msgstr ""
10488
10489
#: en/help_topics/configuration.txt:608
10490
msgid ""
10491
"\n"
10492
"Branch type specific options\n"
10493
"----------------------------"
10494
msgstr ""
10495
10496
#: en/help_topics/configuration.txt:612
10497
msgid ""
10498
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10499
"later format. They\n"
10500
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10501
"manually set in ``locations.conf`` or ``bazaar.conf``."
10502
msgstr ""
10503
10504
#: en/help_topics/configuration.txt:617
10505
msgid ""
10506
"append_revisions_only\n"
10507
"~~~~~~~~~~~~~~~~~~~~~"
10508
msgstr ""
10509
10510
#: en/help_topics/configuration.txt:620
10511
msgid ""
10512
"If set to \"True\" then revisions can only be appended to the log, not\n"
10513
"removed. A branch with this setting enabled can only pull from another\n"
10514
"branch if the other branch's log is a longer version of its own. This is\n"
10515
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10516
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10517
"compatibility with previous bzr versions (older than 2.2)."
10518
msgstr ""
10519
10520
#: en/help_topics/configuration.txt:627
10521
msgid ""
10522
"parent_location\n"
10523
"~~~~~~~~~~~~~~~"
10524
msgstr ""
10525
10526
#: en/help_topics/configuration.txt:630
10527
msgid ""
10528
"If present, the location of the default branch for pull or merge. This "
10529
"option\n"
10530
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10531
"--remember``."
10532
msgstr ""
10533
10534
#: en/help_topics/configuration.txt:634
10535
msgid ""
10536
"push_location\n"
10537
"~~~~~~~~~~~~~"
10538
msgstr ""
10539
10540
#: en/help_topics/configuration.txt:637
10541
msgid ""
10542
"If present, the location of the default branch for push. This option\n"
10543
"is normally set by the first ``push`` or ``push --remember``."
10544
msgstr ""
10545
10546
#: en/help_topics/configuration.txt:640
10547
msgid ""
10548
"push_strict\n"
10549
"~~~~~~~~~~~"
10550
msgstr ""
10551
10552
#: en/help_topics/configuration.txt:643
10553
msgid ""
10554
"If present, defines the ``--strict`` option default value for checking\n"
10555
"uncommitted changes before pushing."
10556
msgstr ""
10557
10558
#: en/help_topics/configuration.txt:646
10559
msgid ""
10560
"dpush_strict\n"
10561
"~~~~~~~~~~~~"
10562
msgstr ""
10563
10564
#: en/help_topics/configuration.txt:649
10565
msgid ""
10566
"If present, defines the ``--strict`` option default value for checking\n"
10567
"uncommitted changes before pushing into a different VCS without any\n"
10568
"custom bzr metadata."
10569
msgstr ""
10570
10571
#: en/help_topics/configuration.txt:653
10572
msgid ""
10573
"bound_location\n"
10574
"~~~~~~~~~~~~~~"
10575
msgstr ""
10576
10577
#: en/help_topics/configuration.txt:656
10578
msgid ""
10579
"The location that commits should go to when acting as a checkout.\n"
10580
"This option is normally set by ``bind``."
10581
msgstr ""
10582
10583
#: en/help_topics/configuration.txt:659
10584
msgid ""
10585
"bound\n"
10586
"~~~~~"
10587
msgstr ""
10588
10589
#: en/help_topics/configuration.txt:662
10590
msgid ""
10591
"If set to \"True\", the branch should act as a checkout, and push each "
10592
"commit to\n"
10593
"the bound_location. This option is normally set by ``bind``/``unbind``."
10594
msgstr ""
10595
10596
#: en/help_topics/configuration.txt:665
10597
msgid ""
10598
"send_strict\n"
10599
"~~~~~~~~~~~"
10600
msgstr ""
10601
10602
#: en/help_topics/configuration.txt:668
10603
msgid ""
10604
"If present, defines the ``--strict`` option default value for checking\n"
10605
"uncommitted changes before sending a merge directive."
10606
msgstr ""
10607
10608
#: en/help_topics/configuration.txt:671
10609
msgid ""
10610
"add.maximum_file_size\n"
10611
"~~~~~~~~~~~~~~~~~~~~~"
10612
msgstr ""
10613
10614
#: en/help_topics/configuration.txt:674
10615
msgid ""
10616
"Defines the maximum file size the command line \"add\" operation will allow\n"
10617
"in recursive mode, with files larger than this value being skipped. You "
10618
"may \n"
10619
"specify this value as an integer (in which case it is interpreted as "
10620
"bytes), \n"
10621
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10622
"0 \n"
10623
"will disable skipping."
10624
msgstr ""
10625
10626
#: en/help_topics/configuration.txt:680
10627
msgid ""
10628
"External Merge Tools\n"
10629
"--------------------"
10630
msgstr ""
10631
10632
#: en/help_topics/configuration.txt:683
10633
msgid ""
10634
"bzr.mergetool.<name>\n"
10635
"~~~~~~~~~~~~~~~~~~~~"
10636
msgstr ""
10637
10638
#: en/help_topics/configuration.txt:686
10639
msgid ""
10640
"Defines an external merge tool called <name> with the given command-line.\n"
10641
"Arguments containing spaces should be quoted using single or double quotes. "
10642
"The\n"
10643
"executable may omit its path if it can be found on the PATH."
10644
msgstr ""
10645
10646
#: en/help_topics/configuration.txt:690
10647
msgid ""
10648
"The following markers can be used in the command-line to substitute "
10649
"filenames\n"
10650
"involved in the merge conflict::"
10651
msgstr ""
10652
10653
#: en/help_topics/configuration.txt:693
10654
msgid ""
10655
" {base} file.BASE\n"
10656
" {this} file.THIS\n"
10657
" {other} file.OTHER\n"
10658
" {result} output file\n"
10659
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10660
"merge\n"
10661
" succeeds."
10662
msgstr ""
10663
10664
#: en/help_topics/configuration.txt:702
10665
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10666
msgstr ""
10667
10668
#: en/help_topics/configuration.txt:704
10669
msgid ""
10670
"bzr.default_mergetool\n"
10671
"~~~~~~~~~~~~~~~~~~~~~"
10672
msgstr ""
10673
10674
#: en/help_topics/configuration.txt:707
10675
msgid ""
10676
"Specifies which external merge tool (as defined above) should be selected "
10677
"by\n"
10678
"default in tools such as ``bzr qconflicts``."
10679
msgstr ""
10680
10681
#: en/help_topics/configuration.txt:712
10682
msgid " bzr.default_mergetool = kdiff3\n"
10683
msgstr ""
10684
10685
#: en/help_topics/conflict-types.txt:1
10686
msgid ""
10687
"Conflict Types\n"
10688
"=============="
10689
msgstr ""
10690
10691
#: en/help_topics/conflict-types.txt:4
10692
msgid ""
10693
"Some operations, like merge, revert and pull, modify the contents of your\n"
10694
"working tree. These modifications are programmatically generated, and so "
10695
"they\n"
10696
"may conflict with the current state of your working tree. "
10697
msgstr ""
10698
10699
#: en/help_topics/conflict-types.txt:8
10700
msgid ""
10701
"When conflicts are present in your working tree (as shown by ``bzr\n"
10702
"conflicts``), you should resolve them and then inform bzr that the "
10703
"conflicts\n"
10704
"have been resolved."
10705
msgstr ""
10706
10707
#: en/help_topics/conflict-types.txt:12
10708
msgid ""
10709
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10710
"should resolve them is not the one responsible for their occurrence, as is "
10711
"the\n"
10712
"case when merging other people's work or because some conflicts are "
10713
"presented\n"
10714
"in a way that is not easy to understand."
10715
msgstr ""
10716
10717
#: en/help_topics/conflict-types.txt:17
10718
msgid ""
10719
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10720
"conflict if and only if there's an actual conceptual conflict in the source\n"
10721
"tree. Because Bazaar doesn't understand the real meaning of the files "
10722
"being\n"
10723
"versioned, it can, when faced with ambiguities, fall short in either "
10724
"direction\n"
10725
"trying to resolve the conflict itself. Many kinds of changes can be "
10726
"combined\n"
10727
"programmatically, but sometimes only a human can determine the right thing "
10728
"to\n"
10729
"do."
10730
msgstr ""
10731
10732
#: en/help_topics/conflict-types.txt:25
10733
msgid ""
10734
"When Bazaar generates a conflict, it adds information into the working tree "
10735
"to\n"
10736
"present the conflicting versions, and it's up to you to find the correct\n"
10737
"resolution."
10738
msgstr ""
10739
10740
#: en/help_topics/conflict-types.txt:29
10741
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10742
msgstr ""
10743
10744
#: en/help_topics/conflict-types.txt:31
10745
msgid ""
10746
"1. Modify the working tree content so that the conflicted item is now in "
10747
"the\n"
10748
" state you want to keep, then"
10749
msgstr ""
10750
10751
#: en/help_topics/conflict-types.txt:34
10752
msgid ""
10753
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10754
" remaining generated information (``bzr resolve <item>``)."
10755
msgstr ""
10756
10757
#: en/help_topics/conflict-types.txt:37
10758
msgid ""
10759
"For most conflict types, there are some obvious ways to modify the working\n"
10760
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10761
"itself already made a choice, when possible."
10762
msgstr ""
10763
10764
#: en/help_topics/conflict-types.txt:41
10765
msgid ""
10766
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10767
"different ways to resolve the conflict."
10768
msgstr ""
10769
10770
#: en/help_topics/conflict-types.txt:44
10771
msgid ""
10772
"Each type of conflict is explained below, and the action which must be done "
10773
"to\n"
10774
"resolve the conflict is outlined."
10775
msgstr ""
10776
10777
#: en/help_topics/conflict-types.txt:47
10778
msgid ""
10779
"Various actions are available depending on the kind of conflict, for some "
10780
"of\n"
10781
"these actions, Bazaar can provide some help. In the end you should at least\n"
10782
"inform Bazaar that you're done with the conflict with::"
10783
msgstr ""
10784
10785
#: en/help_topics/conflict-types.txt:51
10786
msgid " ``bzr resolve FILE --action=done'"
10787
msgstr ""
10788
10789
#: en/help_topics/conflict-types.txt:53
10790
msgid ""
10791
"Note that this is the default action when a single file is involved so you "
10792
"can\n"
10793
"simply use::"
10794
msgstr ""
10795
10796
#: en/help_topics/conflict-types.txt:56
10797
msgid " ``bzr resolve FILE``"
10798
msgstr ""
10799
10800
#: en/help_topics/conflict-types.txt:58
10801
msgid "See ``bzr help resolve`` for more details."
10802
msgstr ""
10803
10804
#: en/help_topics/conflict-types.txt:60
10805
msgid ""
10806
"Text conflicts\n"
10807
"--------------"
10808
msgstr ""
10809
10810
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10811
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10812
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10813
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10814
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10815
msgid "Typical message::"
10816
msgstr ""
10817
10818
#: en/help_topics/conflict-types.txt:65
10819
msgid " Text conflict in FILE"
10820
msgstr ""
10821
10822
#: en/help_topics/conflict-types.txt:67
10823
msgid ""
10824
"These are produced when a text merge cannot completely reconcile two sets "
10825
"of\n"
10826
"text changes. Bazaar will emit files for each version with the extensions\n"
10827
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10828
"tree,\n"
10829
"i.e. the tree that you are merging changes into. OTHER is the version that "
10830
"you\n"
10831
"are merging into the target. BASE is an older version that is used as a "
10832
"basis\n"
10833
"for comparison."
10834
msgstr ""
10835
10836
#: en/help_topics/conflict-types.txt:74
10837
msgid ""
10838
"In the main copy of the file, Bazaar will include all the changes that it\n"
10839
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10840
"\"herringbone\" markers like ``<<<<<<<``."
10841
msgstr ""
10842
10843
#: en/help_topics/conflict-types.txt:78
10844
msgid ""
10845
"Say the initial text is \"The project leader released it.\", and THIS "
10846
"modifies it\n"
10847
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10848
"leader\n"
10849
"released Bazaar.\" A conflict would look like this::"
10850
msgstr ""
10851
10852
#: en/help_topics/conflict-types.txt:82
10853
msgid ""
10854
" <<<<<<< TREE\n"
10855
" Martin Pool released it.\n"
10856
" =======\n"
10857
" The project leader released Bazaar.\n"
10858
" >>>>>>> MERGE-SOURCE"
10859
msgstr ""
10860
10861
#: en/help_topics/conflict-types.txt:88
10862
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10863
msgstr ""
10864
10865
#: en/help_topics/conflict-types.txt:90
10866
msgid ""
10867
"You can handle text conflicts either by editing the main copy of the file,\n"
10868
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10869
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10870
"set of changes over the other (but see below when you encounter these\n"
10871
"cases). More often, the two sets of changes must be intelligently combined."
10872
msgstr ""
10873
10874
#: en/help_topics/conflict-types.txt:96
10875
msgid ""
10876
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10877
"you are done editing, the file should look like it never had a conflict, and "
10878
"be\n"
10879
"ready to commit."
10880
msgstr ""
10881
10882
#: en/help_topics/conflict-types.txt:100
10883
msgid ""
10884
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10885
"Bazaar will auto-detect which conflicts you have resolved."
10886
msgstr ""
10887
10888
#: en/help_topics/conflict-types.txt:103
10889
msgid ""
10890
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10891
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10892
"working tree."
10893
msgstr ""
10894
10895
#: en/help_topics/conflict-types.txt:107
10896
msgid ""
10897
"\n"
10898
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10899
"resolve`` with one of the following actions:"
10900
msgstr ""
10901
10902
#: en/help_topics/conflict-types.txt:111
10903
msgid ""
10904
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10905
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10906
msgstr ""
10907
10908
#: en/help_topics/conflict-types.txt:114
10909
msgid ""
10910
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10911
"modifications will be taken into account."
10912
msgstr ""
10913
10914
#: en/help_topics/conflict-types.txt:117
10915
msgid ""
10916
"Content conflicts\n"
10917
"-----------------"
10918
msgstr ""
10919
10920
#: en/help_topics/conflict-types.txt:122
10921
msgid " Contents conflict in FILE"
10922
msgstr ""
10923
10924
#: en/help_topics/conflict-types.txt:124
10925
msgid ""
10926
"This conflict happens when there are conflicting changes in the working "
10927
"tree\n"
10928
"and the merge source, but the conflicted items are not text files. They "
10929
"may\n"
10930
"be binary files, or symlinks, or directories. It can even happen with "
10931
"files\n"
10932
"that are deleted on one side, and modified on the other."
10933
msgstr ""
10934
10935
#: en/help_topics/conflict-types.txt:129
10936
msgid ""
10937
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10938
"be\n"
10939
"regular files, symlinks or directories). But it will not include a \"main "
10940
"copy\"\n"
10941
"of the file with herringbone conflict markers. It will appear that the "
10942
"\"main\n"
10943
"copy\" has been renamed to THIS or OTHER."
10944
msgstr ""
10945
10946
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10947
msgid ""
10948
"To resolve that kind of conflict, you should rebuild FILE from either "
10949
"version\n"
10950
"or a combination of both."
10951
msgstr ""
10952
10953
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10954
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10955
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10956
#: en/help_topics/conflict-types.txt:361
10957
msgid "``bzr resolve`` recognizes the following actions:"
10958
msgstr ""
10959
10960
#: en/help_topics/conflict-types.txt:139
10961
msgid ""
10962
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10963
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10964
"* ``--action=done`` will just mark the conflict as resolved."
10965
msgstr ""
10966
10967
#: en/help_topics/conflict-types.txt:143
10968
msgid ""
10969
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10970
"and\n"
10971
"``.OTHER`` files if they are still present in the working tree."
10972
msgstr ""
10973
10974
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10975
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10976
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10977
#: en/help_topics/conflict-types.txt:369
10978
msgid ""
10979
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10980
msgstr ""
10981
10982
#: en/help_topics/conflict-types.txt:148
10983
msgid ""
10984
"Tag conflicts\n"
10985
"-------------"
10986
msgstr ""
10987
10988
#: en/help_topics/conflict-types.txt:153
10989
msgid ""
10990
" Conflicting tags:\n"
10991
" version-0.1"
10992
msgstr ""
10993
10994
#: en/help_topics/conflict-types.txt:156
10995
msgid ""
10996
"When pulling from or pushing to another branch, Bazaar informs you about "
10997
"tags\n"
10998
"that conflict between the two branches; that is the same tag points to two\n"
10999
"different revisions. You need not resolve these conflicts, but subsequent\n"
11000
"uses of pull or push will result in the same message."
11001
msgstr ""
11002
11003
#: en/help_topics/conflict-types.txt:161
11004
msgid ""
11005
"To resolve the conflict, you must apply the correct tags to either the "
11006
"target\n"
11007
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11008
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11009
"target branch's tags match the source branch, then in the target branch do\n"
11010
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11011
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11012
"source\n"
11013
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11014
"favor of the target branch, you need to similarly use ``tag --force`` in "
11015
"the\n"
11016
"source branch. (Note that pulling or pushing using --overwrite will "
11017
"overwrite\n"
11018
"all tags as well.)"
11019
msgstr ""
11020
11021
#: en/help_topics/conflict-types.txt:172
11022
msgid ""
11023
"Duplicate paths\n"
11024
"---------------"
11025
msgstr ""
11026
11027
#: en/help_topics/conflict-types.txt:177
11028
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11029
msgstr ""
11030
11031
#: en/help_topics/conflict-types.txt:179
11032
msgid ""
11033
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11034
"already been used. The existing file will be renamed to \"FILE.moved\". "
11035
msgstr ""
11036
11037
#: en/help_topics/conflict-types.txt:187
11038
msgid ""
11039
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11040
"FILE``,\n"
11041
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11042
"* ``--action=done`` will just mark the conflict as resolved."
11043
msgstr ""
11044
11045
#: en/help_topics/conflict-types.txt:191
11046
msgid ""
11047
"Note that you must get rid of FILE.moved before using ``--action=done``."
11048
msgstr ""
11049
11050
#: en/help_topics/conflict-types.txt:195
11051
msgid ""
11052
"Unversioned parent\n"
11053
"------------------"
11054
msgstr ""
11055
11056
#: en/help_topics/conflict-types.txt:200
11057
msgid " Conflict because FILE is not versioned, but has versioned children."
11058
msgstr ""
11059
11060
#: en/help_topics/conflict-types.txt:202
11061
msgid ""
11062
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11063
"not\n"
11064
"versioned. This happens when the directory has been deleted in the target,\n"
11065
"but has a new child in the source, or vice versa. In this situation, "
11066
"Bazaar\n"
11067
"will version the parent directory as well. Resolving this issue depends\n"
11068
"very much on the particular scenario. You may wish to rename or delete "
11069
"either\n"
11070
"the file or the directory. When you are satisfied, you can run \"bzr "
11071
"resolve\n"
11072
"FILE\" to mark the conflict as resolved."
11073
msgstr ""
11074
11075
#: en/help_topics/conflict-types.txt:210
11076
msgid ""
11077
"Missing parent\n"
11078
"--------------"
11079
msgstr ""
11080
11081
#: en/help_topics/conflict-types.txt:215
11082
msgid " Conflict adding files to FILE. Created directory."
11083
msgstr ""
11084
11085
#: en/help_topics/conflict-types.txt:217
11086
msgid ""
11087
"This happens when a directory has been deleted in the target, but has new\n"
11088
"children in the source. This is similar to the \"unversioned parent\" "
11089
"conflict,\n"
11090
"except that the parent directory does not *exist*, instead of just being\n"
11091
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11092
"Resolving this issue depends very much on the particular scenario."
11093
msgstr ""
11094
11095
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11096
msgid ""
11097
"To resolve that kind of conflict, you should either remove or rename the\n"
11098
"children or the directory or a combination of both."
11099
msgstr ""
11100
11101
#: en/help_topics/conflict-types.txt:228
11102
msgid ""
11103
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11104
" children,\n"
11105
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11106
"children\n"
11107
" and restoring the directory,\n"
11108
"* ``--action=done`` will just mark the conflict as resolved."
11109
msgstr ""
11110
11111
#: en/help_topics/conflict-types.txt:236
11112
msgid ""
11113
"Deleting parent\n"
11114
"---------------"
11115
msgstr ""
11116
11117
#: en/help_topics/conflict-types.txt:241
11118
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11119
msgstr ""
11120
11121
#: en/help_topics/conflict-types.txt:243
11122
msgid ""
11123
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11124
"source, but has new children in the target (either because a directory\n"
11125
"deletion is merged or because the merge introduce new children). Bazaar\n"
11126
"will retain the directory. Resolving this issue depends very much on the\n"
11127
"particular scenario."
11128
msgstr ""
11129
11130
#: en/help_topics/conflict-types.txt:254
11131
msgid ""
11132
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11133
"directory,"
11134
msgstr ""
11135
11136
#: en/help_topics/conflict-types.txt:256
11137
msgid ""
11138
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11139
" children,"
11140
msgstr ""
11141
11142
#: en/help_topics/conflict-types.txt:259
11143
msgid "* ``--action=done`` will just mark the conflict as resolved."
11144
msgstr ""
11145
11146
#: en/help_topics/conflict-types.txt:261
11147
msgid ""
11148
"Note that when merging a directory deletion, if unversioned files are\n"
11149
"present, they become potential orphans has they don't have a directory\n"
11150
"parent anymore."
11151
msgstr ""
11152
11153
#: en/help_topics/conflict-types.txt:265
11154
msgid ""
11155
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11156
"setting the ``bzr.transform.orphan_policy`` configuration option."
11157
msgstr ""
11158
11159
#: en/help_topics/conflict-types.txt:268
11160
msgid "There are two possible values for this option:"
11161
msgstr ""
11162
11163
#: en/help_topics/conflict-types.txt:270
11164
msgid ""
11165
"* ``conflict`` (the default): will leave the orphans in place and\n"
11166
" generate a conflicts,"
11167
msgstr ""
11168
11169
#: en/help_topics/conflict-types.txt:273
11170
msgid ""
11171
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11172
"root\n"
11173
" of the working tree with names like ``<file>.~#~``."
11174
msgstr ""
11175
11176
#: en/help_topics/conflict-types.txt:278
11177
msgid ""
11178
"Path conflict\n"
11179
"-------------"
11180
msgstr ""
11181
11182
#: en/help_topics/conflict-types.txt:283
11183
msgid " Path conflict: PATH1 / PATH2"
11184
msgstr ""
11185
11186
#: en/help_topics/conflict-types.txt:285
11187
msgid ""
11188
"This happens when the source and target have each modified the name or "
11189
"parent\n"
11190
"directory of a file. Bazaar will use the path elements from the source."
11191
msgstr ""
11192
11193
#: en/help_topics/conflict-types.txt:288
11194
msgid ""
11195
"To resolve that kind of conflict, you just have to decide what name should "
11196
"be\n"
11197
"retained for the file involved."
11198
msgstr ""
11199
11200
#: en/help_topics/conflict-types.txt:293
11201
msgid ""
11202
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11203
" issuing ``bzr mv PATH2 PATH1``,\n"
11204
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11205
"``PATH2``,\n"
11206
"* ``--action=done`` will just mark the conflict as resolved."
11207
msgstr ""
11208
11209
#: en/help_topics/conflict-types.txt:300
11210
msgid ""
11211
"Parent loop\n"
11212
"-----------"
11213
msgstr ""
11214
11215
#: en/help_topics/conflict-types.txt:305
11216
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11217
msgstr ""
11218
11219
#: en/help_topics/conflict-types.txt:307
11220
msgid ""
11221
"This happens when the source and the target have each moved directories, so\n"
11222
"that, if the change could be applied, a directory would be contained by "
11223
"itself.\n"
11224
"For example::"
11225
msgstr ""
11226
11227
#: en/help_topics/conflict-types.txt:311
11228
msgid ""
11229
" $ bzr init\n"
11230
" $ bzr mkdir white\n"
11231
" $ bzr mkdir black\n"
11232
" $ bzr commit -m \"BASE\"\n"
11233
" $ bzr branch . ../other\n"
11234
" $ bzr mv white black\n"
11235
" $ bzr commit -m \"THIS\"\n"
11236
" $ bzr mv ../other/black ../other/white\n"
11237
" $ bzr commit ../other -m \"OTHER\"\n"
11238
" $ bzr merge ../other"
11239
msgstr ""
11240
11241
#: en/help_topics/conflict-types.txt:322
11242
msgid ""
11243
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11244
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11245
"name should be retained for the directories involved."
11246
msgstr ""
11247
11248
#: en/help_topics/conflict-types.txt:328
11249
msgid ""
11250
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
11251
"``white`` \n"
11252
" in ``black``,\n"
11253
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11254
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11255
"* ``--action=done`` will just mark the conflict as resolved."
11256
msgstr ""
11257
11258
#: en/help_topics/conflict-types.txt:336
11259
msgid ""
11260
"Non-directory parent\n"
11261
"--------------------"
11262
msgstr ""
11263
11264
#: en/help_topics/conflict-types.txt:341
11265
msgid ""
11266
" Conflict: foo.new is not a directory, but has files in it.\n"
11267
" Created directory."
11268
msgstr ""
11269
11270
#: en/help_topics/conflict-types.txt:344
11271
msgid ""
11272
"This happens when one side has added files to a directory, and the other "
11273
"side\n"
11274
"has changed the directory into a file or symlink. For example::"
11275
msgstr ""
11276
11277
#: en/help_topics/conflict-types.txt:347
11278
msgid ""
11279
" $ bzr init\n"
11280
" $ bzr mkdir foo\n"
11281
" $ bzr commit -m \"BASE\"\n"
11282
" $ bzr branch . ../other\n"
11283
" $ rmdir foo\n"
11284
" $ touch foo\n"
11285
" $ bzr commit -m \"THIS\"\n"
11286
" $ bzr mkdir ../other/foo/bar\n"
11287
" $ bzr commit ../other -m \"OTHER\"\n"
11288
" $ bzr merge ../other"
11289
msgstr ""
11290
11291
#: en/help_topics/conflict-types.txt:358
11292
msgid ""
11293
"To resolve that kind of conflict, you have to decide what name should be\n"
11294
"retained for the file, directory or symlink involved."
11295
msgstr ""
11296
11297
#: en/help_topics/conflict-types.txt:363
11298
msgid ""
11299
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11300
" ``bzr add foo``,\n"
11301
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11302
" ``bzr mv foo.new foo``,\n"
11303
"* ``--action=done`` will just mark the conflict as resolved."
11304
msgstr ""
11305
11306
#: en/help_topics/conflict-types.txt:371
11307
msgid ""
11308
"MalformedTransform\n"
11309
"------------------"
11310
msgstr ""
11311
11312
#: en/help_topics/conflict-types.txt:374
11313
msgid ""
11314
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11315
"exception. This means that Bazaar encountered a filesystem conflict that it "
11316
"was\n"
11317
"unable to resolve. This usually indicates a bug. Please let us know if "
11318
"you\n"
11319
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11320
msgstr ""
11321
11322
#: en/help_topics/content-filters.txt:1
11323
msgid ""
11324
"Content Filters\n"
11325
"==============="
11326
msgstr ""
11327
11328
#: en/help_topics/content-filters.txt:4
11329
msgid ""
11330
"Content formats\n"
11331
"---------------"
11332
msgstr ""
11333
11334
#: en/help_topics/content-filters.txt:7
11335
msgid ""
11336
"Bazaar's content filtering allows you to store files in a different\n"
11337
"format from the copy in your working tree. This lets you, or your\n"
11338
"co-developers, use Windows development tools that expect CRLF files\n"
11339
"on projects that use other line-ending conventions. Among other things,\n"
11340
"content filters also let Unix developers more easily work on projects\n"
11341
"using Windows line-ending conventions, keyword expansion/compression,\n"
11342
"and trailing spaces on lines in text files to be implicitly stripped\n"
11343
"when committed."
11344
msgstr ""
11345
11346
#: en/help_topics/content-filters.txt:16
11347
msgid "To generalize, there are two content formats supported by Bazaar:"
11348
msgstr ""
11349
11350
#: en/help_topics/content-filters.txt:18
11351
msgid ""
11352
"* a canonical format - how files are stored internally\n"
11353
"* a convenience format - how files are created in a working tree."
11354
msgstr ""
11355
11356
#: en/help_topics/content-filters.txt:21
11357
msgid ""
11358
"\n"
11359
"Format conversion\n"
11360
"-----------------"
11361
msgstr ""
11362
11363
#: en/help_topics/content-filters.txt:25
11364
msgid ""
11365
"The conversion between these formats is done by content filters.\n"
11366
"A content filter has two parts:"
11367
msgstr ""
11368
11369
#: en/help_topics/content-filters.txt:28
11370
msgid ""
11371
"* a read converter - converts from convenience to canonical format\n"
11372
"* a write converter - converts from canonical to convenience format."
11373
msgstr ""
11374
11375
#: en/help_topics/content-filters.txt:31
11376
msgid ""
11377
"Many of these converters will provide *round-trip* conversion,\n"
11378
"i.e. applying the read converter followed by the write converter\n"
11379
"gives back the original content. However, others may provide an\n"
11380
"asymmetric conversion. For example, a read converter might strip\n"
11381
"trailing whitespace off lines in source code while the matching\n"
11382
"write converter might pass content through unchanged."
11383
msgstr ""
11384
11385
#: en/help_topics/content-filters.txt:38
11386
msgid ""
11387
"\n"
11388
"Enabling content filters\n"
11389
"------------------------"
11390
msgstr ""
11391
11392
#: en/help_topics/content-filters.txt:42
11393
msgid ""
11394
"Content filters are typically provided by plugins, so the first step\n"
11395
"in using them is to install the relevant plugins and read their\n"
11396
"documentation. Some plugins may be very specific about which files\n"
11397
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11398
"In other cases, the plugin may leave it in the user's hands to\n"
11399
"define which files are to be filtered. This is typically done\n"
11400
"using rule-based preferences. See ``bzr help rules`` for general\n"
11401
"information about defining these."
11402
msgstr ""
11403
11404
#: en/help_topics/content-filters.txt:51
11405
msgid ""
11406
"\n"
11407
"Impact on commands\n"
11408
"------------------"
11409
msgstr ""
11410
11411
#: en/help_topics/content-filters.txt:55
11412
msgid ""
11413
"Read converters are only applied to commands that read content from\n"
11414
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11415
"will apply read converters to files in the working tree, then compare\n"
11416
"the results to the content last committed."
11417
msgstr ""
11418
11419
#: en/help_topics/content-filters.txt:60
11420
msgid ""
11421
"Write converters are only applied by commands that **create files in a\n"
11422
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11423
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11424
"respectively."
11425
msgstr ""
11426
11427
#: en/help_topics/content-filters.txt:65
11428
msgid ""
11429
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11430
"comitting files. If this makes sense for a given plugin providing\n"
11431
"a content filter, the plugin can usually achieve this effect by using a\n"
11432
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11433
"for more information on hooks."
11434
msgstr ""
11435
11436
#: en/help_topics/content-filters.txt:71
11437
msgid ""
11438
"\n"
11439
"Refreshing your working tree\n"
11440
"----------------------------"
11441
msgstr ""
11442
11443
#: en/help_topics/content-filters.txt:75
11444
msgid ""
11445
"For performance reasons, Bazaar caches the timestamps of files in\n"
11446
"a working tree, and assumes files are unchanged if their timestamps\n"
11447
"match the cached values. As a consequence, there are times when\n"
11448
"you may need to explicitly ask for content filtering to be reapplied\n"
11449
"in one or both directions, e.g. after installing or reconfiguring\n"
11450
"plugins providing it."
11451
msgstr ""
11452
11453
#: en/help_topics/content-filters.txt:82
11454
msgid "Here are some general guidelines for doing this:"
11455
msgstr ""
11456
11457
#: en/help_topics/content-filters.txt:84
11458
msgid ""
11459
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11460
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11461
" relevant read converters and compare the end result with the\n"
11462
" canonical format."
11463
msgstr ""
11464
11465
#: en/help_topics/content-filters.txt:89
11466
msgid ""
11467
" * To reapply write converters, ensure there are no local changes,\n"
11468
" delete the relevant files and run ``bzr revert`` on those files."
11469
msgstr ""
11470
11471
#: en/help_topics/content-filters.txt:92
11472
msgid ""
11473
"Note: In the future, it is likely that additional options will be added\n"
11474
"to commands to make this refreshing process faster and safer.\n"
11475
msgstr ""
11476
11477
#: en/help_topics/current-formats.txt:1
11478
msgid "Current Storage Formats"
11479
msgstr ""
11480
11481
#: en/help_topics/current-formats.txt:3
11482
msgid ""
11483
":2a:\n"
11484
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11485
" compress storage. Provides rich roots which are a one-way\n"
11486
" transition."
11487
msgstr ""
11488
11489
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11490
msgid ""
11491
"\n"
11492
"See :doc:`formats-help` for more about storage formats."
11493
msgstr ""
11494
11495
#: en/help_topics/debug-flags.txt:1
11496
msgid ""
11497
"Debug Flags\n"
11498
"==========="
11499
msgstr ""
11500
11501
#: en/help_topics/debug-flags.txt:4
11502
msgid ""
11503
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11504
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11505
msgstr ""
11506
11507
#: en/help_topics/debug-flags.txt:7
11508
msgid ""
11509
"-Dauth Trace authentication sections used.\n"
11510
"-Dbytes Print out how many bytes were transferred\n"
11511
"-Ddirstate Trace dirstate activity (verbose!)\n"
11512
"-Derror Instead of normal error handling, always print a "
11513
"traceback\n"
11514
" on error.\n"
11515
"-Devil Capture call sites that do expensive or badly-scaling\n"
11516
" operations.\n"
11517
"-Dfetch Trace history copying between repositories.\n"
11518
"-Dfilters Emit information for debugging content filtering.\n"
11519
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11520
"fetch.\n"
11521
"-Dgraph Trace graph traversal.\n"
11522
"-Dhashcache Log every time a working file is read to determine its "
11523
"hash.\n"
11524
"-Dhooks Trace hook execution.\n"
11525
"-Dhpss Trace smart protocol requests and responses.\n"
11526
"-Dhpssdetail More hpss details.\n"
11527
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11528
"-Dhttp Trace http connections, requests and responses.\n"
11529
"-Dindex Trace major index operations.\n"
11530
"-Dknit Trace knit operations.\n"
11531
"-Dlock Trace when lockdir locks are taken or released.\n"
11532
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11533
" retrying the request.\n"
11534
"-Dprogress Trace progress bar operations.\n"
11535
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11536
"-Dmerge Emit information for debugging merges.\n"
11537
"-Dno_apport Don't use apport to report crashes.\n"
11538
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11539
"-Dpack Emit information about pack operations.\n"
11540
"-Drelock Emit a message every time a branch or repository object "
11541
"is\n"
11542
" unlocked then relocked the same way.\n"
11543
"-Dsftp Trace SFTP internals.\n"
11544
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11545
"expected\n"
11546
"-Dstream Trace fetch streams.\n"
11547
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11548
"portable\n"
11549
" manner.\n"
11550
"-Dunlock Some errors during unlock are treated as warnings.\n"
11551
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11552
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11553
"appropriate\n"
11554
" for the format, even for non-local fetches.\n"
11555
msgstr ""
11556
11557
#: en/help_topics/diverged-branches.txt:1
11558
msgid ""
11559
"Diverged Branches\n"
11560
"================="
11561
msgstr ""
11562
11563
#: en/help_topics/diverged-branches.txt:4
11564
msgid ""
11565
"When Bazaar tries to push one branch onto another, it requires that the\n"
11566
"destination branch must be ready to receive the source branch. If this "
11567
"isn't\n"
11568
"the case, then we say that the branches have ``diverged``. Branches are\n"
11569
"considered diverged if the destination branch's most recent commit is one "
11570
"that\n"
11571
"has not been merged (directly or indirectly) by the source branch. To "
11572
"recover\n"
11573
"from diverged branches, one must merge the missing revisions into the "
11574
"source\n"
11575
"branch."
11576
msgstr ""
11577
11578
#: en/help_topics/diverged-branches.txt:12
11579
msgid ""
11580
"This situation commonly arises when using a centralized workflow with local\n"
11581
"commits. If someone else has committed new work to the mainline since your\n"
11582
"last pull and you have local commits that have not yet been pushed to the\n"
11583
"mainline, then your local branch and the mainline have diverged."
11584
msgstr ""
11585
11586
#: en/help_topics/diverged-branches.txt:17
11587
msgid ""
11588
"Discovering What Has Diverged\n"
11589
"-----------------------------"
11590
msgstr ""
11591
11592
#: en/help_topics/diverged-branches.txt:20
11593
msgid ""
11594
"The ``bzr missing`` command is used to find out what revisions are in "
11595
"another\n"
11596
"branch that are not present in the current branch, and vice-versa. It shows "
11597
"a\n"
11598
"summary of which extra revisions exist in each branch. If you want to see "
11599
"the\n"
11600
"precise effects of those revisions, you can use ``bzr diff --"
11601
"old=other_branch``\n"
11602
"to show the differences between other_branch and your current branch."
11603
msgstr ""
11604
11605
#: en/help_topics/diverged-branches.txt:26
11606
msgid ""
11607
"A Solution\n"
11608
"----------"
11609
msgstr ""
11610
11611
#: en/help_topics/diverged-branches.txt:29
11612
msgid ""
11613
"The solution is to merge the revisions from the mainline into your local\n"
11614
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11615
"mainline. This merge may result in conflicts if the other developer's "
11616
"changes\n"
11617
"overlap with your changes. These conflicts should be resolved before\n"
11618
"continuing. After any conflicts have been resolved, or even if there were "
11619
"no\n"
11620
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11621
"to your local branch. This requirement gives you an opportunity to test "
11622
"the\n"
11623
"resulting working tree for correctness, since the merged revisions could "
11624
"have\n"
11625
"made arbitrary changes. After testing, you should commit the merge using\n"
11626
"``bzr commit``. This clears up the diverged branches situation. Your "
11627
"local\n"
11628
"branch can now be pushed to the mainline.\n"
11629
msgstr ""
11630
11631
#: en/help_topics/eol.txt:1
11632
msgid ""
11633
"End of Line Conversion\n"
11634
"======================"
11635
msgstr ""
11636
11637
#: en/help_topics/eol.txt:4
11638
msgid ""
11639
"EOL conversion is provided as a content filter where Bazaar internally\n"
11640
"stores a canonical format but outputs a convenience format. See\n"
11641
"``bzr help content-filters`` for general information about using these."
11642
msgstr ""
11643
11644
#: en/help_topics/eol.txt:8
11645
msgid ""
11646
"Note: Content filtering is only supported in recently added formats,\n"
11647
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11648
"in a recent format. (Just setting the format on the repository\n"
11649
"is not enough.) If content filtering does not appear to be working, use\n"
11650
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11651
"or later."
11652
msgstr ""
11653
11654
#: en/help_topics/eol.txt:15
11655
msgid ""
11656
"EOL conversion needs to be enabled for selected file patterns using\n"
11657
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11658
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11659
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11660
"supported in a future verison of Bazaar."
11661
msgstr ""
11662
11663
#: en/help_topics/eol.txt:21
11664
msgid ""
11665
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11666
"(If a value is not set, ``exact`` is the default.)"
11667
msgstr ""
11668
11669
#: en/help_topics/eol.txt:24
11670
msgid ""
11671
" ========== ===================================== ======================\n"
11672
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11673
" ========== ===================================== ======================\n"
11674
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11675
" ---------- ------------------------------------- ----------------------\n"
11676
" ``lf`` ``lf`` ``lf``\n"
11677
" ---------- ------------------------------------- ----------------------\n"
11678
" ``crlf`` ``crlf`` ``lf``\n"
11679
" ---------- ------------------------------------- ----------------------\n"
11680
" ``exact`` No conversion Exactly as in file\n"
11681
" ========== ===================================== ======================"
11682
msgstr ""
11683
11684
#: en/help_topics/eol.txt:36
11685
msgid ""
11686
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11687
"byte is detected in the file."
11688
msgstr ""
11689
11690
#: en/help_topics/eol.txt:39
11691
msgid ""
11692
"For users working on a cross-platform project, here is a suggested rule\n"
11693
"to use as a starting point::"
11694
msgstr ""
11695
11696
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11697
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11698
msgid ""
11699
" [name *]\n"
11700
" eol = native"
11701
msgstr ""
11702
11703
#: en/help_topics/eol.txt:45
11704
msgid ""
11705
"If you have binary files that do not contain a null byte though, be\n"
11706
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11707
"by giving more explicit patterns earlier in the rules file. For example::"
11708
msgstr ""
11709
11710
#: en/help_topics/eol.txt:49
11711
msgid ""
11712
" [name *.png]\n"
11713
" eol = exact"
11714
msgstr ""
11715
11716
#: en/help_topics/eol.txt:55
11717
msgid ""
11718
"If your working tree is on a network drive shared by users on different\n"
11719
"operating systems, you typically want to force certain conventions for\n"
11720
"certain files. In that way, if a file is created with the wrong line\n"
11721
"endings or line endings get mixed during editing, it gets committed\n"
11722
"correctly and gets checked out correctly. For example::"
11723
msgstr ""
11724
11725
#: en/help_topics/eol.txt:61
11726
msgid ""
11727
" [name *.bat]\n"
11728
" eol = crlf"
11729
msgstr ""
11730
11731
#: en/help_topics/eol.txt:64
11732
msgid ""
11733
" [name *.sh]\n"
11734
" eol = lf"
11735
msgstr ""
11736
11737
#: en/help_topics/eol.txt:70
11738
msgid ""
11739
"If you take the care to create files with their required endings, you can\n"
11740
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11741
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11742
"introducing mixed line endings will be corrected during commit for files\n"
11743
"with those settings."
11744
msgstr ""
11745
11746
#: en/help_topics/eol.txt:76
11747
msgid ""
11748
"If you have sample test data that deliberately has text files with mixed\n"
11749
"newline conventions, you can ask for those to be left alone like this::"
11750
msgstr ""
11751
11752
#: en/help_topics/eol.txt:79
11753
msgid ""
11754
" [name test_data/]\n"
11755
" eol = exact"
11756
msgstr ""
11757
11758
#: en/help_topics/eol.txt:85
11759
msgid ""
11760
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11761
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11762
"of content analysis to detect binary files for commands like ``diff``.\n"
11763
"In the future, a ``binary = true`` rule may be added but it is not\n"
11764
"supported yet.)"
11765
msgstr ""
11766
11767
#: en/help_topics/eol.txt:91
11768
msgid ""
11769
"If you have an existing repository with text files already stored using\n"
11770
"Windows newline conventions (``crlf``), then you may want to keep using "
11771
"that\n"
11772
"convention in the repository. Forcing certain files to this convention\n"
11773
"may also help users who do not have rules configured. To do this, set\n"
11774
"``eol`` to one of the values below."
11775
msgstr ""
11776
11777
#: en/help_topics/eol.txt:97
11778
msgid ""
11779
" ============================ ======================== "
11780
"======================\n"
11781
" Value Checkout end-of-lines as Commit end-of-lines "
11782
"as\n"
11783
" ============================ ======================== "
11784
"======================\n"
11785
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11786
" ``lf`` otherwise\n"
11787
" ---------------------------- ------------------------ "
11788
"----------------------\n"
11789
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11790
" ---------------------------- ------------------------ "
11791
"----------------------\n"
11792
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11793
" ============================ ======================== ======================"
11794
msgstr ""
11795
11796
#: en/help_topics/eol.txt:108
11797
msgid ""
11798
"For users working on an existing project that uses Windows newline\n"
11799
"conventions in their Bazaar repository, this rule is suggested as a\n"
11800
"starting point::"
11801
msgstr ""
11802
11803
#: en/help_topics/eol.txt:112
11804
msgid ""
11805
" [name *]\n"
11806
" eol = native-with-crlf-in-repo"
11807
msgstr ""
11808
11809
#: en/help_topics/eol.txt:115
11810
msgid ""
11811
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11812
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11813
"``crlf`` and ``exact``."
11814
msgstr ""
11815
11816
#: en/help_topics/eol.txt:119
11817
msgid ""
11818
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11819
"never reject files because a given line ending or mixed line endings\n"
11820
"are found. A precommit hook should be used if you wish to validate\n"
11821
"(and not just convert) content before committing.\n"
11822
msgstr ""
11823
11824
#: en/help_topics/hidden-commands.txt:1
11825
msgid ""
11826
"added List files added in working tree.\n"
11827
"ancestry List all revisions merged into this branch.\n"
11828
"assert-fail Test reporting of assertion failures\n"
11829
"bundle-info Output interesting stats about a bundle\n"
11830
"bundle-revisions Create a merge-directive for submitting changes.\n"
11831
"cat-revision Write out metadata for a revision.\n"
11832
"dump-btree Dump the contents of a btree index file to stdout.\n"
11833
"export-pot Export command helps and error messages in po format.\n"
11834
"file-id Print file_id of a particular file or directory.\n"
11835
"file-path Print path of file_ids to a file or directory.\n"
11836
"find-merge-base Find and print a base revision for merging two "
11837
"branches.\n"
11838
"hooks Show hooks.\n"
11839
"inventory Show inventory of the current working copy or a "
11840
"revision.\n"
11841
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11842
"lookup-revision Lookup the revision-id from a revision-number\n"
11843
"merge-directive Generate a merge directive for auto-merge tools.\n"
11844
"modified List files modified in working tree.\n"
11845
"re-sign Create a digital signature for an existing revision.\n"
11846
"reference list, view and set branch locations for nested trees.\n"
11847
"relpath Show path of a file relative to root\n"
11848
"repair-workingtree Reset the working tree state file.\n"
11849
"revision-history Display the list of revision ids on a branch.\n"
11850
"revision-info Show revision number and revision id for a given "
11851
"revision\n"
11852
" identifier.\n"
11853
"rocks Statement of optimism.\n"
11854
"selftest Run internal test suite.\n"
11855
"shell-complete Show appropriate completions for context.\n"
11856
"test-script Run a shell-like test from a file.\n"
11857
"touching-revisions Return revision-ids which affected a particular file.\n"
11858
"unknowns List unknown files.\n"
11859
"wait-until-signalled Test helper for\n"
11860
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11861
msgstr ""
11862
11863
#: en/help_topics/hooks.txt:1
11864
msgid ""
11865
"\n"
11866
"Hooks\n"
11867
"====="
11868
msgstr ""
11869
11870
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11871
msgid ""
11872
"Introduction\n"
11873
"------------"
11874
msgstr ""
11875
11876
#: en/help_topics/hooks.txt:8
11877
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11878
msgstr ""
11879
11880
#: en/help_topics/hooks.txt:10
11881
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11882
msgstr ""
11883
11884
#: en/help_topics/hooks.txt:12
11885
msgid ""
11886
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11887
msgstr ""
11888
11889
#: en/help_topics/hooks.txt:14
11890
msgid ""
11891
"The class that contains each hook is given before the hooks it supplies. "
11892
"For\n"
11893
"instance, BranchHooks as the class is the hooks class for\n"
11894
"`bzrlib.branch.Branch.hooks`."
11895
msgstr ""
11896
11897
#: en/help_topics/hooks.txt:18
11898
msgid ""
11899
"Each description also indicates whether the hook runs on the client (the\n"
11900
"machine where bzr was invoked) or the server (the machine addressed by\n"
11901
"the branch URL). These may be, but are not necessarily, the same machine."
11902
msgstr ""
11903
11904
#: en/help_topics/hooks.txt:22
11905
msgid ""
11906
"Plugins (including hooks) are run on the server if all of these is true:"
11907
msgstr ""
11908
11909
#: en/help_topics/hooks.txt:24
11910
msgid ""
11911
" * The connection is via a smart server (accessed with a URL starting with\n"
11912
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11913
"\"http://\"\n"
11914
" URL when a smart server is available via HTTP)."
11915
msgstr ""
11916
11917
#: en/help_topics/hooks.txt:28
11918
msgid ""
11919
" * The hook is either server specific or part of general infrastructure "
11920
"rather\n"
11921
" than client specific code (such as commit)."
11922
msgstr ""
11923
11924
#: en/help_topics/hooks.txt:31
11925
msgid ""
11926
"\n"
11927
"BranchHooks\n"
11928
"-----------"
11929
msgstr ""
11930
11931
#: en/help_topics/hooks.txt:35
11932
msgid ""
11933
"automatic_tag_name\n"
11934
"~~~~~~~~~~~~~~~~~~"
11935
msgstr ""
11936
11937
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11938
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11939
msgid "Introduced in: 2.2"
11940
msgstr ""
11941
11942
#: en/help_topics/hooks.txt:40
11943
msgid ""
11944
"Called to determine an automatic tag name for a revision.\n"
11945
"automatic_tag_name is called with (branch, revision_id) and should\n"
11946
"return a tag name or None if no tag name could be determined. The\n"
11947
"first non-None tag name returned will be used."
11948
msgstr ""
11949
11950
#: en/help_topics/hooks.txt:45
11951
msgid ""
11952
"open\n"
11953
"~~~~"
11954
msgstr ""
11955
11956
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11957
#: en/help_topics/hooks.txt:304
11958
msgid "Introduced in: 1.8"
11959
msgstr ""
11960
11961
#: en/help_topics/hooks.txt:50
11962
msgid ""
11963
"Called with the Branch object that has been opened after a branch is\n"
11964
"opened."
11965
msgstr ""
11966
11967
#: en/help_topics/hooks.txt:53
11968
msgid ""
11969
"post_branch_init\n"
11970
"~~~~~~~~~~~~~~~~"
11971
msgstr ""
11972
11973
#: en/help_topics/hooks.txt:58
11974
msgid ""
11975
"Called after new branch initialization completes. post_branch_init is\n"
11976
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11977
"branch and checkout (both heavyweight and lightweight) will all\n"
11978
"trigger this hook."
11979
msgstr ""
11980
11981
#: en/help_topics/hooks.txt:63
11982
msgid ""
11983
"post_change_branch_tip\n"
11984
"~~~~~~~~~~~~~~~~~~~~~~"
11985
msgstr ""
11986
11987
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11988
msgid "Introduced in: 1.4"
11989
msgstr ""
11990
11991
#: en/help_topics/hooks.txt:68
11992
msgid ""
11993
"Called in bzr client and server after a change to the tip of a branch\n"
11994
"is made. post_change_branch_tip is called with a\n"
11995
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11996
"uncommit will all trigger this hook."
11997
msgstr ""
11998
11999
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12000
msgid ""
12001
"post_commit\n"
12002
"~~~~~~~~~~~"
12003
msgstr ""
12004
12005
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12006
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12007
#: en/help_topics/hooks.txt:145
12008
msgid "Introduced in: 0.15"
12009
msgstr ""
12010
12011
#: en/help_topics/hooks.txt:78
12012
msgid ""
12013
"Called in the bzr client after a commit has completed. post_commit is\n"
12014
"called with (local, master, old_revno, old_revid, new_revno,\n"
12015
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12016
"branch."
12017
msgstr ""
12018
12019
#: en/help_topics/hooks.txt:83
12020
msgid ""
12021
"post_pull\n"
12022
"~~~~~~~~~"
12023
msgstr ""
12024
12025
#: en/help_topics/hooks.txt:88
12026
msgid ""
12027
"Called after a pull operation completes. post_pull is called with a\n"
12028
"bzrlib.branch.PullResult object and only runs in the bzr client."
12029
msgstr ""
12030
12031
#: en/help_topics/hooks.txt:91
12032
msgid ""
12033
"post_push\n"
12034
"~~~~~~~~~"
12035
msgstr ""
12036
12037
#: en/help_topics/hooks.txt:96
12038
msgid ""
12039
"Called after a push operation completes. post_push is called with a\n"
12040
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12041
msgstr ""
12042
12043
#: en/help_topics/hooks.txt:99
12044
msgid ""
12045
"post_switch\n"
12046
"~~~~~~~~~~~"
12047
msgstr ""
12048
12049
#: en/help_topics/hooks.txt:104
12050
msgid ""
12051
"Called after a checkout switches branch. post_switch is called with a\n"
12052
"bzrlib.branch.SwitchHookParams."
12053
msgstr ""
12054
12055
#: en/help_topics/hooks.txt:107
12056
msgid ""
12057
"post_uncommit\n"
12058
"~~~~~~~~~~~~~"
12059
msgstr ""
12060
12061
#: en/help_topics/hooks.txt:112
12062
msgid ""
12063
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12064
"called with (local, master, old_revno, old_revid, new_revno,\n"
12065
"new_revid) where local is the local branch or None, master is the\n"
12066
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12067
"of None."
12068
msgstr ""
12069
12070
#: en/help_topics/hooks.txt:118
12071
msgid ""
12072
"pre_change_branch_tip\n"
12073
"~~~~~~~~~~~~~~~~~~~~~"
12074
msgstr ""
12075
12076
#: en/help_topics/hooks.txt:121
12077
msgid "Introduced in: 1.6"
12078
msgstr ""
12079
12080
#: en/help_topics/hooks.txt:123
12081
msgid ""
12082
"Called in bzr client and server before a change to the tip of a branch\n"
12083
"is made. pre_change_branch_tip is called with a\n"
12084
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12085
"uncommit will all trigger this hook."
12086
msgstr ""
12087
12088
#: en/help_topics/hooks.txt:128
12089
msgid ""
12090
"pre_commit\n"
12091
"~~~~~~~~~~"
12092
msgstr ""
12093
12094
#: en/help_topics/hooks.txt:131
12095
msgid "Introduced in: 0.91"
12096
msgstr ""
12097
12098
#: en/help_topics/hooks.txt:133
12099
msgid ""
12100
"Called after a commit is calculated but before it is completed.\n"
12101
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12102
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12103
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12104
"TreeDelta object describing changes from the basis revision. hooks\n"
12105
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12106
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12107
"tree."
12108
msgstr ""
12109
12110
#: en/help_topics/hooks.txt:142
12111
msgid ""
12112
"set_rh\n"
12113
"~~~~~~"
12114
msgstr ""
12115
12116
#: en/help_topics/hooks.txt:147
12117
msgid ""
12118
"Invoked whenever the revision history has been set via\n"
12119
"set_revision_history. The api signature is (branch, revision_history),\n"
12120
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12121
"for bzr to trigger, a better hook to use is\n"
12122
"Branch.post_change_branch_tip."
12123
msgstr ""
12124
12125
#: en/help_topics/hooks.txt:153
12126
msgid ""
12127
"transform_fallback_location\n"
12128
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12129
msgstr ""
12130
12131
#: en/help_topics/hooks.txt:156
12132
msgid "Introduced in: 1.9"
12133
msgstr ""
12134
12135
#: en/help_topics/hooks.txt:158
12136
msgid ""
12137
"Called when a stacked branch is activating its fallback locations.\n"
12138
"transform_fallback_location is called with (branch, url), and should\n"
12139
"return a new url. Returning the same url allows it to be used as-is,\n"
12140
"returning a different one can be used to cause the branch to stack on\n"
12141
"a closer copy of that fallback_location. Note that the branch cannot\n"
12142
"have history accessing methods called on it during this hook because\n"
12143
"the fallback locations have not been activated. When there are\n"
12144
"multiple hooks installed for transform_fallback_location, all are\n"
12145
"called with the url returned from the previous hook.The order is\n"
12146
"however undefined."
12147
msgstr ""
12148
12149
#: en/help_topics/hooks.txt:169
12150
msgid ""
12151
"CommandHooks\n"
12152
"------------"
12153
msgstr ""
12154
12155
#: en/help_topics/hooks.txt:172
12156
msgid ""
12157
"extend_command\n"
12158
"~~~~~~~~~~~~~~"
12159
msgstr ""
12160
12161
#: en/help_topics/hooks.txt:175
12162
msgid "Introduced in: 1.13"
12163
msgstr ""
12164
12165
#: en/help_topics/hooks.txt:177
12166
msgid ""
12167
"Called after creating a command object to allow modifications such as\n"
12168
"adding or removing options, docs etc. Called with the new\n"
12169
"bzrlib.commands.Command object."
12170
msgstr ""
12171
12172
#: en/help_topics/hooks.txt:181
12173
msgid ""
12174
"get_command\n"
12175
"~~~~~~~~~~~"
12176
msgstr ""
12177
12178
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12179
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12180
msgid "Introduced in: 1.17"
12181
msgstr ""
12182
12183
#: en/help_topics/hooks.txt:186
12184
msgid ""
12185
"Called when creating a single command. Called with (cmd_or_None,\n"
12186
"command_name). get_command should either return the cmd_or_None\n"
12187
"parameter, or a replacement Command object that should be used for the\n"
12188
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12189
"Many users will prefer to use bzrlib.commands.register_command or\n"
12190
"plugin_cmds.register_lazy."
12191
msgstr ""
12192
12193
#: en/help_topics/hooks.txt:193
12194
msgid ""
12195
"get_missing_command\n"
12196
"~~~~~~~~~~~~~~~~~~~"
12197
msgstr ""
12198
12199
#: en/help_topics/hooks.txt:198
12200
msgid ""
12201
"Called when creating a single command if no command could be found.\n"
12202
"Called with (command_name). get_missing_command should either return\n"
12203
"None, or a Command object to be used for the command."
12204
msgstr ""
12205
12206
#: en/help_topics/hooks.txt:202
12207
msgid ""
12208
"list_commands\n"
12209
"~~~~~~~~~~~~~"
12210
msgstr ""
12211
12212
#: en/help_topics/hooks.txt:207
12213
msgid ""
12214
"Called when enumerating commands. Called with a set of cmd_name\n"
12215
"strings for all the commands found so far. This set is safe to mutate\n"
12216
"- e.g. to remove a command. list_commands should return the updated\n"
12217
"set of command names."
12218
msgstr ""
12219
12220
#: en/help_topics/hooks.txt:212
12221
msgid ""
12222
"_ConfigHooks\n"
12223
"------------"
12224
msgstr ""
12225
12226
#: en/help_topics/hooks.txt:215
12227
msgid ""
12228
"get\n"
12229
"~~~"
12230
msgstr ""
12231
12232
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12233
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12234
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12235
#: en/help_topics/hooks.txt:443
12236
msgid "Introduced in: 2.4"
12237
msgstr ""
12238
12239
#: en/help_topics/hooks.txt:220
12240
msgid ""
12241
"Invoked when a config option is read. The signature is (stack, name,\n"
12242
"value)."
12243
msgstr ""
12244
12245
#: en/help_topics/hooks.txt:223
12246
msgid ""
12247
"load\n"
12248
"~~~~"
12249
msgstr ""
12250
12251
#: en/help_topics/hooks.txt:228
12252
msgid "Invoked when a config store is loaded. The signature is (store)."
12253
msgstr ""
12254
12255
#: en/help_topics/hooks.txt:230
12256
msgid ""
12257
"remove\n"
12258
"~~~~~~"
12259
msgstr ""
12260
12261
#: en/help_topics/hooks.txt:235
12262
msgid ""
12263
"Invoked when a config option is removed. The signature is (stack,\n"
12264
"name)."
12265
msgstr ""
12266
12267
#: en/help_topics/hooks.txt:238
12268
msgid ""
12269
"save\n"
12270
"~~~~"
12271
msgstr ""
12272
12273
#: en/help_topics/hooks.txt:243
12274
msgid "Invoked when a config store is saved. The signature is (store)."
12275
msgstr ""
12276
12277
#: en/help_topics/hooks.txt:245
12278
msgid ""
12279
"set\n"
12280
"~~~"
12281
msgstr ""
12282
12283
#: en/help_topics/hooks.txt:250
12284
msgid ""
12285
"Invoked when a config option is set. The signature is (stack, name,\n"
12286
"value)."
12287
msgstr ""
12288
12289
#: en/help_topics/hooks.txt:253
12290
msgid ""
12291
"ControlDirHooks\n"
12292
"---------------"
12293
msgstr ""
12294
12295
#: en/help_topics/hooks.txt:256
12296
msgid ""
12297
"post_repo_init\n"
12298
"~~~~~~~~~~~~~~"
12299
msgstr ""
12300
12301
#: en/help_topics/hooks.txt:261
12302
msgid ""
12303
"Invoked after a repository has been initialized. post_repo_init is\n"
12304
"called with a bzrlib.controldir.RepoInitHookParams."
12305
msgstr ""
12306
12307
#: en/help_topics/hooks.txt:264
12308
msgid ""
12309
"pre_open\n"
12310
"~~~~~~~~"
12311
msgstr ""
12312
12313
#: en/help_topics/hooks.txt:267
12314
msgid "Introduced in: 1.14"
12315
msgstr ""
12316
12317
#: en/help_topics/hooks.txt:269
12318
msgid ""
12319
"Invoked before attempting to open a ControlDir with the transport that\n"
12320
"the open will use."
12321
msgstr ""
12322
12323
#: en/help_topics/hooks.txt:272
12324
msgid ""
12325
"InfoHooks\n"
12326
"---------"
12327
msgstr ""
12328
12329
#: en/help_topics/hooks.txt:275
12330
msgid ""
12331
"repository\n"
12332
"~~~~~~~~~~"
12333
msgstr ""
12334
12335
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12336
#: en/help_topics/hooks.txt:521
12337
msgid "Introduced in: 1.15"
12338
msgstr ""
12339
12340
#: en/help_topics/hooks.txt:280
12341
msgid ""
12342
"Invoked when displaying the statistics for a repository. repository is\n"
12343
"called with a statistics dictionary as returned by the repository and\n"
12344
"a file-like object to write to."
12345
msgstr ""
12346
12347
#: en/help_topics/hooks.txt:284
12348
msgid ""
12349
"LockHooks\n"
12350
"---------"
12351
msgstr ""
12352
12353
#: en/help_topics/hooks.txt:287
12354
msgid ""
12355
"lock_acquired\n"
12356
"~~~~~~~~~~~~~"
12357
msgstr ""
12358
12359
#: en/help_topics/hooks.txt:292
12360
msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12361
msgstr ""
12362
12363
#: en/help_topics/hooks.txt:294
12364
msgid ""
12365
"lock_broken\n"
12366
"~~~~~~~~~~~"
12367
msgstr ""
12368
12369
#: en/help_topics/hooks.txt:299
12370
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12371
msgstr ""
12372
12373
#: en/help_topics/hooks.txt:301
12374
msgid ""
12375
"lock_released\n"
12376
"~~~~~~~~~~~~~"
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:306
12380
msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."
12381
msgstr ""
12382
12383
#: en/help_topics/hooks.txt:308
12384
msgid ""
12385
"MergeHooks\n"
12386
"----------"
12387
msgstr ""
12388
12389
#: en/help_topics/hooks.txt:311
12390
msgid ""
12391
"merge_file_content\n"
12392
"~~~~~~~~~~~~~~~~~~"
12393
msgstr ""
12394
12395
#: en/help_topics/hooks.txt:314
12396
msgid "Introduced in: 2.1"
12397
msgstr ""
12398
12399
#: en/help_topics/hooks.txt:316
12400
msgid ""
12401
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12402
"object when starting a merge. Should return either None or a subclass\n"
12403
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12404
"called per file that needs to be merged (including when one side has\n"
12405
"deleted the file and the other has changed it). See the\n"
12406
"AbstractPerFileMerger API docs for details on how it is used by merge."
12407
msgstr ""
12408
12409
#: en/help_topics/hooks.txt:323
12410
msgid ""
12411
"post_merge\n"
12412
"~~~~~~~~~~"
12413
msgstr ""
12414
12415
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12416
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12417
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12418
msgid "Introduced in: 2.5"
12419
msgstr ""
12420
12421
#: en/help_topics/hooks.txt:328
12422
msgid ""
12423
"Called after a merge. Receives a Merger object as the single argument.\n"
12424
"The return value is ignored."
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:331
12428
msgid ""
12429
"pre_merge\n"
12430
"~~~~~~~~~"
12431
msgstr ""
12432
12433
#: en/help_topics/hooks.txt:336
12434
msgid ""
12435
"Called before a merge. Receives a Merger object as the single\n"
12436
"argument."
12437
msgstr ""
12438
12439
#: en/help_topics/hooks.txt:339
12440
msgid ""
12441
"MergeDirectiveHooks\n"
12442
"-------------------"
12443
msgstr ""
12444
12445
#: en/help_topics/hooks.txt:342
12446
msgid ""
12447
"merge_request_body\n"
12448
"~~~~~~~~~~~~~~~~~~"
12449
msgstr ""
12450
12451
#: en/help_topics/hooks.txt:345
12452
msgid "Introduced in: 1.15.0"
12453
msgstr ""
12454
12455
#: en/help_topics/hooks.txt:347
12456
msgid ""
12457
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12458
"request. Callbacks must return a body. If more than one callback is\n"
12459
"registered, the output of one callback is provided to the next."
12460
msgstr ""
12461
12462
#: en/help_topics/hooks.txt:351
12463
msgid ""
12464
"MessageEditorHooks\n"
12465
"------------------"
12466
msgstr ""
12467
12468
#: en/help_topics/hooks.txt:354
12469
msgid ""
12470
"commit_message_template\n"
12471
"~~~~~~~~~~~~~~~~~~~~~~~"
12472
msgstr ""
12473
12474
#: en/help_topics/hooks.txt:357
12475
msgid "Introduced in: 1.10"
12476
msgstr ""
12477
12478
#: en/help_topics/hooks.txt:359
12479
msgid ""
12480
"Called when a commit message is being generated.\n"
12481
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12482
"and the message that is known so far. commit_message_template must\n"
12483
"return a new message to use (which could be the same as it was given).\n"
12484
"When there are multiple hooks registered for commit_message_template,\n"
12485
"they are chained with the result from the first passed into the\n"
12486
"second, and so on."
12487
msgstr ""
12488
12489
#: en/help_topics/hooks.txt:367
12490
msgid ""
12491
"set_commit_message\n"
12492
"~~~~~~~~~~~~~~~~~~"
12493
msgstr ""
12494
12495
#: en/help_topics/hooks.txt:372
12496
msgid ""
12497
"Set a fixed commit message. set_commit_message is called with the\n"
12498
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12499
"properties by editing commit.builder._revprops) and the message so\n"
12500
"far. set_commit_message must return the message to use or None if it\n"
12501
"should use the message editor as normal."
12502
msgstr ""
12503
12504
#: en/help_topics/hooks.txt:378
12505
msgid ""
12506
"MutableTreeHooks\n"
12507
"----------------"
12508
msgstr ""
12509
12510
#: en/help_topics/hooks.txt:381
12511
msgid ""
12512
"post_build_tree\n"
12513
"~~~~~~~~~~~~~~~"
12514
msgstr ""
12515
12516
#: en/help_topics/hooks.txt:386
12517
msgid ""
12518
"Called after a completely new tree is built. The hook is called with\n"
12519
"the tree as its only argument."
12520
msgstr ""
12521
12522
#: en/help_topics/hooks.txt:392
12523
msgid "Introduced in: 2.0"
12524
msgstr ""
12525
12526
#: en/help_topics/hooks.txt:394
12527
msgid ""
12528
"Called after a commit is performed on a tree. The hook is called with\n"
12529
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12530
"commit was performed on is available via the mutable_tree attribute of\n"
12531
"that object."
12532
msgstr ""
12533
12534
#: en/help_topics/hooks.txt:399
12535
msgid ""
12536
"post_transform\n"
12537
"~~~~~~~~~~~~~~"
12538
msgstr ""
12539
12540
#: en/help_topics/hooks.txt:404
12541
msgid ""
12542
"Called after a tree transform has been performed on a tree. The hook\n"
12543
"is called with the tree that is being transformed and the transform."
12544
msgstr ""
12545
12546
#: en/help_topics/hooks.txt:407
12547
msgid ""
12548
"pre_transform\n"
12549
"~~~~~~~~~~~~~"
12550
msgstr ""
12551
12552
#: en/help_topics/hooks.txt:412
12553
msgid ""
12554
"Called before a tree transform on this tree. The hook is called with\n"
12555
"the tree that is being transformed and the transform."
12556
msgstr ""
12557
12558
#: en/help_topics/hooks.txt:415
12559
msgid ""
12560
"start_commit\n"
12561
"~~~~~~~~~~~~"
12562
msgstr ""
12563
12564
#: en/help_topics/hooks.txt:420
12565
msgid ""
12566
"Called before a commit is performed on a tree. The start commit hook\n"
12567
"is able to change the tree before the commit takes place. start_commit\n"
12568
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12569
"being performed on."
12570
msgstr ""
12571
12572
#: en/help_topics/hooks.txt:425
12573
msgid ""
12574
"SmartClientHooks\n"
12575
"----------------"
12576
msgstr ""
12577
12578
#: en/help_topics/hooks.txt:428
12579
msgid ""
12580
"call\n"
12581
"~~~~"
12582
msgstr ""
12583
12584
#: en/help_topics/hooks.txt:431
12585
msgid "Introduced in: unknown"
12586
msgstr ""
12587
12588
#: en/help_topics/hooks.txt:433
12589
msgid ""
12590
"Called when the smart client is submitting a request to the smart\n"
12591
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12592
"Streaming request bodies, and responses, are not accessible."
12593
msgstr ""
12594
12595
#: en/help_topics/hooks.txt:437
12596
msgid ""
12597
"SmartServerHooks\n"
12598
"----------------"
12599
msgstr ""
12600
12601
#: en/help_topics/hooks.txt:440
12602
msgid ""
12603
"server_exception\n"
12604
"~~~~~~~~~~~~~~~~"
12605
msgstr ""
12606
12607
#: en/help_topics/hooks.txt:445
12608
msgid ""
12609
"Called by the bzr server when an exception occurs. server_exception is\n"
12610
"called with the sys.exc_info() tuple return true for the hook if the\n"
12611
"exception has been handled, in which case the server will exit\n"
12612
"normally."
12613
msgstr ""
12614
12615
#: en/help_topics/hooks.txt:450
12616
msgid ""
12617
"server_started\n"
12618
"~~~~~~~~~~~~~~"
12619
msgstr ""
12620
12621
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12622
msgid "Introduced in: 0.16"
12623
msgstr ""
12624
12625
#: en/help_topics/hooks.txt:455
12626
msgid ""
12627
"Called by the bzr server when it starts serving a directory.\n"
12628
"server_started is called with (backing urls, public url), where\n"
12629
"backing_url is a list of URLs giving the server-specific directory\n"
12630
"locations, and public_url is the public URL for the directory being\n"
12631
"served."
12632
msgstr ""
12633
12634
#: en/help_topics/hooks.txt:461
12635
msgid ""
12636
"server_started_ex\n"
12637
"~~~~~~~~~~~~~~~~~"
12638
msgstr ""
12639
12640
#: en/help_topics/hooks.txt:466
12641
msgid ""
12642
"Called by the bzr server when it starts serving a directory.\n"
12643
"server_started is called with (backing_urls, server_obj)."
12644
msgstr ""
12645
12646
#: en/help_topics/hooks.txt:469
12647
msgid ""
12648
"server_stopped\n"
12649
"~~~~~~~~~~~~~~"
12650
msgstr ""
12651
12652
#: en/help_topics/hooks.txt:474
12653
msgid ""
12654
"Called by the bzr server when it stops serving a directory.\n"
12655
"server_stopped is called with the same parameters as the\n"
12656
"server_started hook: (backing_urls, public_url)."
12657
msgstr ""
12658
12659
#: en/help_topics/hooks.txt:478
12660
msgid ""
12661
"StatusHooks\n"
12662
"-----------"
12663
msgstr ""
12664
12665
#: en/help_topics/hooks.txt:481
12666
msgid ""
12667
"post_status\n"
12668
"~~~~~~~~~~~"
12669
msgstr ""
12670
12671
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12672
msgid "Introduced in: 2.3"
12673
msgstr ""
12674
12675
#: en/help_topics/hooks.txt:486
12676
msgid ""
12677
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12678
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12679
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12680
"correspond to the command line options specified by the user for the\n"
12681
"status command. to_file is the output stream for writing."
12682
msgstr ""
12683
12684
#: en/help_topics/hooks.txt:492
12685
msgid ""
12686
"pre_status\n"
12687
"~~~~~~~~~~"
12688
msgstr ""
12689
12690
#: en/help_topics/hooks.txt:497
12691
msgid ""
12692
"Called with argument StatusHookParams before Bazaar displays the\n"
12693
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12694
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12695
"correspond to the command line options specified by the user for the\n"
12696
"status command. to_file is the output stream for writing."
12697
msgstr ""
12698
12699
#: en/help_topics/hooks.txt:503
12700
msgid ""
12701
"TransportHooks\n"
12702
"--------------"
12703
msgstr ""
12704
12705
#: en/help_topics/hooks.txt:506
12706
msgid ""
12707
"post_connect\n"
12708
"~~~~~~~~~~~~"
12709
msgstr ""
12710
12711
#: en/help_topics/hooks.txt:511
12712
msgid ""
12713
"Called after a new connection is established or a reconnect occurs.\n"
12714
"The sole argument passed is either the connected transport or smart\n"
12715
"medium instance."
12716
msgstr ""
12717
12718
#: en/help_topics/hooks.txt:515
12719
msgid ""
12720
"RioVersionInfoBuilderHooks\n"
12721
"--------------------------"
12722
msgstr ""
12723
12724
#: en/help_topics/hooks.txt:518
12725
msgid ""
12726
"revision\n"
12727
"~~~~~~~~"
12728
msgstr ""
12729
12730
#: en/help_topics/hooks.txt:523
12731
msgid ""
12732
"Invoked when adding information about a revision to the RIO stanza\n"
12733
"that is printed. revision is called with a revision object and a RIO\n"
12734
"stanza.\n"
12735
msgstr ""
12736
12737
#: en/help_topics/location-alias.txt:1
12738
msgid ""
12739
"Location aliases\n"
12740
"================"
12741
msgstr ""
12742
12743
#: en/help_topics/location-alias.txt:4
12744
msgid ""
12745
"Bazaar defines several aliases for locations associated with a branch. "
12746
"These\n"
12747
"can be used with most commands that expect a location, such as `bzr push`."
12748
msgstr ""
12749
12750
#: en/help_topics/location-alias.txt:7
12751
msgid "The aliases are::"
12752
msgstr ""
12753
12754
#: en/help_topics/location-alias.txt:9
12755
msgid ""
12756
" :bound The branch this branch is bound to, for bound branches.\n"
12757
" :parent The parent of this branch.\n"
12758
" :public The public location of this branch.\n"
12759
" :push The saved location used for `bzr push` with no arguments.\n"
12760
" :submit The submit branch for this branch.\n"
12761
" :this This branch."
12762
msgstr ""
12763
12764
#: en/help_topics/location-alias.txt:16
12765
msgid "For example, to push to the parent location::"
12766
msgstr ""
12767
12768
#: en/help_topics/location-alias.txt:18
12769
msgid " bzr push :parent\n"
12770
msgstr ""
12771
12772
#: en/help_topics/log-formats.txt:1
12773
msgid ""
12774
"Log Formats\n"
12775
"==========="
12776
msgstr ""
12777
12778
#: en/help_topics/log-formats.txt:4
12779
msgid ""
12780
"A log format controls how information about each revision is displayed.\n"
12781
"The standard log formats are compared below::"
12782
msgstr ""
12783
12784
#: en/help_topics/log-formats.txt:7
12785
msgid ""
12786
" Feature long short line\n"
12787
" ---------------------- ------------- ------------ -------------------\n"
12788
" design goal detailed view concise view 1 revision per line\n"
12789
" committer name+email name only name only\n"
12790
" author name+email - -\n"
12791
" date-time format full date only date only\n"
12792
" commit message full full top line\n"
12793
" tags yes yes yes\n"
12794
" merges indicator - yes -\n"
12795
" status/delta optional optional -\n"
12796
" diff/patch optional optional -\n"
12797
" revision-id optional optional -\n"
12798
" branch nick yes - -\n"
12799
" foreign vcs properties yes yes -\n"
12800
" preferred levels all 1 1\n"
12801
" digital signature optional - -"
12802
msgstr ""
12803
12804
#: en/help_topics/log-formats.txt:24
12805
msgid ""
12806
"The default format is ``long``. To change this, define the ``log_format``\n"
12807
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12808
msgstr ""
12809
12810
#: en/help_topics/log-formats.txt:27
12811
msgid ""
12812
" [DEFAULT]\n"
12813
" log_format = short"
12814
msgstr ""
12815
12816
#: en/help_topics/log-formats.txt:30
12817
msgid ""
12818
"Alternatively, to change the log format used for a given query, use the\n"
12819
"--long, --short or --line options."
12820
msgstr ""
12821
12822
#: en/help_topics/log-formats.txt:33
12823
msgid ""
12824
"If one of the standard log formats does not meet your needs, additional\n"
12825
"formats can be provided by plugins.\n"
12826
msgstr ""
12827
12828
#: en/help_topics/other-formats.txt:1
12829
msgid "Other Storage Formats"
12830
msgstr ""
12831
12832
#: en/help_topics/other-formats.txt:3
12833
msgid "Experimental formats are shown below."
12834
msgstr ""
12835
12836
#: en/help_topics/other-formats.txt:5
12837
msgid ""
12838
":development-colo:\n"
12839
" (native) The 2a format with experimental support for colocated\n"
12840
" branches."
12841
msgstr ""
12842
12843
#: en/help_topics/other-formats.txt:9
12844
msgid ""
12845
"\n"
12846
"Deprecated formats are shown below."
12847
msgstr ""
12848
12849
#: en/help_topics/other-formats.txt:12
12850
msgid ""
12851
":pack-0.92:\n"
12852
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12853
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12854
" by bzr < 0.92."
12855
msgstr ""
12856
12857
#: en/help_topics/patterns.txt:1
12858
msgid ""
12859
"Patterns\n"
12860
"========"
12861
msgstr ""
12862
12863
#: en/help_topics/patterns.txt:4
12864
msgid ""
12865
"Bazaar uses patterns to match files at various times. For example,\n"
12866
"the ``add`` command skips over files that match ignore patterns\n"
12867
"and preferences can be associated with files using rule patterns.\n"
12868
"The pattern syntax is described below."
12869
msgstr ""
12870
12871
#: en/help_topics/patterns.txt:9
12872
msgid ""
12873
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12874
"slash or is a regular expression, it is compared to the whole path\n"
12875
"from the branch root. Otherwise, it is compared to only the last\n"
12876
"component of the path. To match a file only in the root directory,\n"
12877
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12878
msgstr ""
12879
12880
#: en/help_topics/patterns.txt:15
12881
msgid "Patterns may include globbing wildcards such as::"
12882
msgstr ""
12883
12884
#: en/help_topics/patterns.txt:17
12885
msgid ""
12886
" ? - Matches any single character except '/'\n"
12887
" * - Matches 0 or more characters except '/'\n"
12888
" /**/ - Matches 0 or more directories in a path\n"
12889
" [a-z] - Matches a single character from within a group of characters"
12890
msgstr ""
12891
12892
#: en/help_topics/patterns.txt:22
12893
msgid ""
12894
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12895
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12896
"expression. Regular expression patterns may not include named or\n"
12897
"numbered groups."
12898
msgstr ""
12899
12900
#: en/help_topics/patterns.txt:27
12901
msgid ""
12902
"Case insensitive ignore patterns can be specified with regular expressions\n"
12903
"by using the ``i`` (for ignore case) flag in the pattern."
12904
msgstr ""
12905
12906
#: en/help_topics/patterns.txt:30
12907
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
12908
msgstr ""
12909
12910
#: en/help_topics/patterns.txt:32
12911
msgid " RE:(?i)foo"
12912
msgstr ""
12913
12914
#: en/help_topics/patterns.txt:34
12915
msgid ""
12916
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12917
"matched by that pattern will not be ignored."
12918
msgstr ""
12919
12920
#: en/help_topics/patterns.txt:37
12921
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
12922
msgstr ""
12923
12924
#: en/help_topics/revisionspec.txt:1
12925
msgid "Revision Identifiers"
12926
msgstr ""
12927
12928
#: en/help_topics/revisionspec.txt:3
12929
msgid ""
12930
"A revision identifier refers to a specific state of a branch's history. It\n"
12931
"can be expressed in several ways. It can begin with a keyword to\n"
12932
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12933
"'before:yesterday' and 'submit:'."
12934
msgstr ""
12935
12936
#: en/help_topics/revisionspec.txt:8
12937
msgid ""
12938
"Alternately, it can be given without a keyword, in which case it will be\n"
12939
"checked as a revision number, a tag, a revision id, a date specification, or "
12940
"a\n"
12941
"branch specification, in that order. For example, 'date:today' could be\n"
12942
"written as simply 'today', though if you have a tag called 'today' that "
12943
"will\n"
12944
"be found first."
12945
msgstr ""
12946
12947
#: en/help_topics/revisionspec.txt:14
12948
msgid ""
12949
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12950
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12951
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12952
"or\n"
12953
"spaces around the '..')."
12954
msgstr ""
12955
12956
#: en/help_topics/revisionspec.txt:19
12957
msgid ""
12958
"Ranges are interpreted differently by different commands. To the \"log\" "
12959
"command,\n"
12960
"a range is a sequence of log messages, but to the \"diff\" command, the "
12961
"range\n"
12962
"denotes a change between revisions (and not a sequence of changes). In\n"
12963
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12964
"consider it\n"
12965
"to be open-ended, that is, they include one end but not the other. For "
12966
"example:\n"
12967
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12968
"3649,\n"
12969
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12970
"and\n"
12971
"3649, but not 3647."
12972
msgstr ""
12973
12974
#: en/help_topics/revisionspec.txt:28
12975
msgid "The keywords used as revision selection methods are the following:"
12976
msgstr ""
12977
12978
#: en/help_topics/revisionspec.txt:30
12979
msgid ""
12980
":revid:\n"
12981
"\tSelects a revision using the revision id.\n"
12982
":submit:\n"
12983
"\tSelects a common ancestor with the submit branch.\n"
12984
":ancestor:\n"
12985
"\tSelects a common ancestor with a second branch.\n"
12986
":date:\n"
12987
"\tSelects a revision on the basis of a datestamp.\n"
12988
":branch:\n"
12989
"\tSelects the last revision of a specified branch.\n"
12990
":tag:\n"
12991
"\tSelects a revision identified by a tag name.\n"
12992
":revno:\n"
12993
"\tSelects a revision using a number.\n"
12994
":before:\n"
12995
"\tSelects the parent of the revision specified.\n"
12996
":annotate:\n"
12997
"\tSelect the revision that last modified the specified line.\n"
12998
":mainline:\n"
12999
"\tSelect mainline revision that merged the specified revision.\n"
13000
":last:\n"
13001
"\tSelects the nth revision from the end."
13002
msgstr ""
13003
13004
#: en/help_topics/revisionspec.txt:53
13005
msgid "In addition, plugins can provide other keywords."
13006
msgstr ""
13007
13008
#: en/help_topics/revisionspec.txt:55
13009
msgid "A detailed description of each keyword is given below."
13010
msgstr ""
13011
13012
#: en/help_topics/revisionspec.txt:57
13013
msgid ":revid:"
13014
msgstr ""
13015
13016
#: en/help_topics/revisionspec.txt:59
13017
msgid ""
13018
" Supply a specific revision id, that can be used to specify any\n"
13019
" revision id in the ancestry of the branch.\n"
13020
" Including merges, and pending merges.\n"
13021
" Examples::"
13022
msgstr ""
13023
13024
#: en/help_topics/revisionspec.txt:64
13025
msgid ""
13026
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13027
msgstr ""
13028
13029
#: en/help_topics/revisionspec.txt:66
13030
msgid ":submit:"
13031
msgstr ""
13032
13033
#: en/help_topics/revisionspec.txt:68
13034
msgid ""
13035
" Diffing against this shows all the changes that were made in this "
13036
"branch,\n"
13037
" and is a good predictor of what merge will do. The submit branch is\n"
13038
" used by the bundle and merge directive commands. If no submit branch\n"
13039
" is specified, the parent branch is used instead."
13040
msgstr ""
13041
13042
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13043
msgid ""
13044
" The common ancestor is the last revision that existed in both\n"
13045
" branches. Usually this is the branch point, but it could also be\n"
13046
" a revision that was merged."
13047
msgstr ""
13048
13049
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13050
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13051
#: en/help_topics/revisionspec.txt:153
13052
msgid " Examples::"
13053
msgstr ""
13054
13055
#: en/help_topics/revisionspec.txt:79
13056
msgid " $ bzr diff -r submit:"
13057
msgstr ""
13058
13059
#: en/help_topics/revisionspec.txt:81
13060
msgid ":ancestor:"
13061
msgstr ""
13062
13063
#: en/help_topics/revisionspec.txt:83
13064
msgid " Supply the path to a branch to select the common ancestor."
13065
msgstr ""
13066
13067
#: en/help_topics/revisionspec.txt:89
13068
msgid ""
13069
" This is frequently used with 'diff' to return all of the changes\n"
13070
" that your branch introduces, while excluding the changes that you\n"
13071
" have not merged from the remote branch."
13072
msgstr ""
13073
13074
#: en/help_topics/revisionspec.txt:95
13075
msgid ""
13076
" ancestor:/path/to/branch\n"
13077
" $ bzr diff -r ancestor:../../mainline/branch"
13078
msgstr ""
13079
13080
#: en/help_topics/revisionspec.txt:98
13081
msgid ":date:"
13082
msgstr ""
13083
13084
#: en/help_topics/revisionspec.txt:100
13085
msgid ""
13086
" Supply a datestamp to select the first revision that matches the date.\n"
13087
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13088
" Matches the first entry after a given date (either at midnight or\n"
13089
" at a specified time)."
13090
msgstr ""
13091
13092
#: en/help_topics/revisionspec.txt:105
13093
msgid " One way to display all the changes since yesterday would be::"
13094
msgstr ""
13095
13096
#: en/help_topics/revisionspec.txt:107
13097
msgid " bzr log -r date:yesterday.."
13098
msgstr ""
13099
13100
#: en/help_topics/revisionspec.txt:111
13101
msgid ""
13102
" date:yesterday -> select the first revision since "
13103
"yesterday\n"
13104
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13105
" August 14th, 2006 at 5:10pm."
13106
msgstr ""
13107
13108
#: en/help_topics/revisionspec.txt:115
13109
msgid ":branch:"
13110
msgstr ""
13111
13112
#: en/help_topics/revisionspec.txt:117
13113
msgid " Supply the path to a branch to select its last revision."
13114
msgstr ""
13115
13116
#: en/help_topics/revisionspec.txt:121
13117
msgid " branch:/path/to/branch"
13118
msgstr ""
13119
13120
#: en/help_topics/revisionspec.txt:123
13121
msgid ":tag:"
13122
msgstr ""
13123
13124
#: en/help_topics/revisionspec.txt:125
13125
msgid " Tags are stored in the branch and created by the 'tag' command."
13126
msgstr ""
13127
13128
#: en/help_topics/revisionspec.txt:127
13129
msgid ":revno:"
13130
msgstr ""
13131
13132
#: en/help_topics/revisionspec.txt:129
13133
msgid ""
13134
" Use an integer to specify a revision in the history of the branch.\n"
13135
" Optionally a branch can be specified. A negative number will count\n"
13136
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13137
" one). If the negative number is larger than the branch's history, the\n"
13138
" first revision is returned.\n"
13139
" Examples::"
13140
msgstr ""
13141
13142
#: en/help_topics/revisionspec.txt:136
13143
msgid ""
13144
" revno:1 -> return the first revision of this branch\n"
13145
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13146
" the branch '/path/to/branch'\n"
13147
" revno:-1 -> The last revision in a branch.\n"
13148
" -2:http://other/branch -> The second to last revision in the\n"
13149
" remote branch.\n"
13150
" -1000000 -> Most likely the first revision, unless\n"
13151
" your history is very long."
13152
msgstr ""
13153
13154
#: en/help_topics/revisionspec.txt:145
13155
msgid ":before:"
13156
msgstr ""
13157
13158
#: en/help_topics/revisionspec.txt:147
13159
msgid ""
13160
" Supply any revision spec to return the parent of that revision. This "
13161
"is\n"
13162
" mostly useful when inspecting revisions that are not in the revision "
13163
"history\n"
13164
" of a branch."
13165
msgstr ""
13166
13167
#: en/help_topics/revisionspec.txt:151
13168
msgid ""
13169
" It is an error to request the parent of the null revision (before:0)."
13170
msgstr ""
13171
13172
#: en/help_topics/revisionspec.txt:155
13173
msgid ""
13174
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13175
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13176
" aaaa@bbbb-1234567890\n"
13177
" bzr diff -r before:1913..1913\n"
13178
" -> Find the changes between revision 1913 and its parent "
13179
"(1912).\n"
13180
" (What changes did revision 1913 introduce).\n"
13181
" This is equivalent to: bzr diff -c 1913"
13182
msgstr ""
13183
13184
#: en/help_topics/revisionspec.txt:163
13185
msgid ":annotate:"
13186
msgstr ""
13187
13188
#: en/help_topics/revisionspec.txt:165
13189
msgid ""
13190
" Select the revision that last modified the specified line. Line is\n"
13191
" specified as path:number. Path is a relative path to the file. "
13192
"Numbers\n"
13193
" start at 1, and are relative to the current version, not the last-\n"
13194
" committed version of the file."
13195
msgstr ""
13196
13197
#: en/help_topics/revisionspec.txt:170
13198
msgid ":mainline:"
13199
msgstr ""
13200
13201
#: en/help_topics/revisionspec.txt:172
13202
msgid ""
13203
" Select the revision that merged the specified revision into mainline."
13204
msgstr ""
13205
13206
#: en/help_topics/revisionspec.txt:174
13207
msgid ":last:"
13208
msgstr ""
13209
13210
#: en/help_topics/revisionspec.txt:176
13211
msgid ""
13212
" Supply a positive number to get the nth revision from the end.\n"
13213
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13214
" Examples::"
13215
msgstr ""
13216
13217
#: en/help_topics/revisionspec.txt:180
13218
msgid ""
13219
" last:1 -> return the last revision\n"
13220
" last:3 -> return the revision 2 before the end.\n"
13221
msgstr ""
13222
13223
#: en/help_topics/rules.txt:1
13224
msgid ""
13225
"Rules\n"
13226
"====="
13227
msgstr ""
13228
13229
#: en/help_topics/rules.txt:7
13230
msgid ""
13231
"Rules are defined in ini file format where the sections are file glob\n"
13232
"patterns and the contents of each section are the preferences for files\n"
13233
"matching that pattern(s). For example::"
13234
msgstr ""
13235
13236
#: en/help_topics/rules.txt:11
13237
msgid ""
13238
" [name *.bat]\n"
13239
" eol = native"
13240
msgstr ""
13241
13242
#: en/help_topics/rules.txt:14
13243
msgid ""
13244
" [name *.html *.xml]\n"
13245
" keywords = xml_escape"
13246
msgstr ""
13247
13248
#: en/help_topics/rules.txt:17
13249
msgid ""
13250
"Preferences like these are useful for commands and plugins wishing to\n"
13251
"provide custom behaviour for selected files. For more information on \n"
13252
"end of line conversion see :doc:`eol-help`.\n"
13253
"Keyword support is provided by the `keywords plugin\n"
13254
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13255
msgstr ""
13256
13257
#: en/help_topics/rules.txt:23
13258
msgid ""
13259
"Files\n"
13260
"-----"
13261
msgstr ""
13262
13263
#: en/help_topics/rules.txt:26
13264
msgid ""
13265
"Default rules for all branches are defined in the optional file\n"
13266
"``BZR_HOME/rules``. "
13267
msgstr ""
13268
13269
#: en/help_topics/rules.txt:29
13270
msgid ""
13271
"Rule Patterns\n"
13272
"-------------"
13273
msgstr ""
13274
13275
#: en/help_topics/rules.txt:32
13276
msgid ""
13277
"Patterns are ordered and searching stops as soon as one matches.\n"
13278
"As a consequence, more explicit patterns should be placed towards\n"
13279
"the top of the file. Rule patterns use exactly the same conventions\n"
13280
"as ignore patterns. See :doc:`patterns-help` for details."
13281
msgstr ""
13282
13283
#: en/help_topics/rules.txt:37
13284
msgid ".. note::"
13285
msgstr ""
13286
13287
#: en/help_topics/rules.txt:39
13288
msgid ""
13289
" Patterns containing square brackets or spaces should be\n"
13290
" surrounded in quotes to ensure they are correctly parsed.\n"
13291
msgstr ""
13292
13293
#: en/help_topics/topics.txt:1
13294
msgid ""
13295
"authentication Information on configuring authentication\n"
13296
"basic Basic commands\n"
13297
"branches Information on what a branch is\n"
13298
"bugs Bug tracker settings\n"
13299
"checkouts Information on what a checkout is\n"
13300
"commands Basic help for all commands\n"
13301
"configuration Details on the configuration settings available\n"
13302
"conflict-types Types of conflicts and what to do about them\n"
13303
"content-filters Conversion of content into/from working trees\n"
13304
"criss-cross Information on criss-cross merging\n"
13305
"current-formats Current storage formats\n"
13306
"debug-flags Options to show or record debug information\n"
13307
"diverged-branches How to fix diverged branches\n"
13308
"env-variables Environment variable names and values\n"
13309
"eol Information on end-of-line handling\n"
13310
"files Information on configuration and log files\n"
13311
"formats Information on choosing a storage format\n"
13312
"global-options Options that control how Bazaar runs\n"
13313
"hidden-commands All hidden commands\n"
13314
"hooks Points at which custom processing can be added\n"
13315
"launchpad Using Bazaar with Launchpad.net\n"
13316
"location-alias Aliases for remembered locations\n"
13317
"log-formats Details on the logging formats available\n"
13318
"other-formats Experimental and deprecated storage formats\n"
13319
"patterns Information on the pattern syntax\n"
13320
"repositories Basic information on shared repositories.\n"
13321
"revisionspec Explain how to use --revision\n"
13322
"rules Information on defining rule-based preferences\n"
13323
"standalone-trees Information on what a standalone tree is\n"
13324
"standard-options Options that can be used with any command\n"
13325
"status-flags Help on status flags\n"
13326
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13327
"topics Topics list\n"
13328
"url-special-chars Special character handling in URLs\n"
13329
"urlspec Supported transport protocols\n"
13330
"working-trees Information on working trees\n"
13331
msgstr ""
13332
13333
#: en/help_topics/url-special-chars.txt:1
13334
msgid ""
13335
"Special character handling in URLs\n"
13336
"=================================="
13337
msgstr ""
13338
13339
#: en/help_topics/url-special-chars.txt:4
13340
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13341
msgstr ""
13342
13343
#: en/help_topics/url-special-chars.txt:6
13344
msgid " * Fully qualified URLs"
13345
msgstr ""
13346
13347
#: en/help_topics/url-special-chars.txt:8
13348
msgid " * File system paths, relative or absolute"
13349
msgstr ""
13350
13351
#: en/help_topics/url-special-chars.txt:10
13352
msgid ""
13353
"Internally bzr treats all locations as URLs. For any file system paths\n"
13354
"that are specified it will automatically determine the appropriate URL\n"
13355
"representation, and escape special characters where necessary."
13356
msgstr ""
13357
13358
#: en/help_topics/url-special-chars.txt:14
13359
msgid ""
13360
"There are a few characters which have special meaning in URLs and need "
13361
"careful\n"
13362
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13363
"value in URLs. Any non-ASCII characters in a file path will automatically "
13364
"be\n"
13365
"urlencoded when the path is converted to a URL."
13366
msgstr ""
13367
13368
#: en/help_topics/url-special-chars.txt:19
13369
msgid ""
13370
"URLs represent non-ASCII characters in an encoding defined by the server, "
13371
"but\n"
13372
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13373
"be\n"
13374
"generous in what it accepts as a URL and to print them in a way that\n"
13375
"will be readable."
13376
msgstr ""
13377
13378
#: en/help_topics/url-special-chars.txt:24
13379
msgid ""
13380
"For example, if you have a directory named '/tmp/%2False' these are all "
13381
"valid\n"
13382
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13383
"slash)::"
13384
msgstr ""
13385
13386
#: en/help_topics/url-special-chars.txt:27
13387
msgid ""
13388
" cd /tmp\n"
13389
" bzr log /tmp/%2False\n"
13390
" bzr log %2False\n"
13391
" bzr log file:///tmp/%252False\n"
13392
" bzr log file://localhost/tmp/%252False\n"
13393
" bzr log file:%252False"
13394
msgstr ""
13395
13396
#: en/help_topics/url-special-chars.txt:34
13397
msgid "These are valid but do not refer to the same file::"
13398
msgstr ""
13399
13400
#: en/help_topics/url-special-chars.txt:36
13401
msgid ""
13402
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13403
" bzr log %252False (refers to a file called /tmp/%252False)"
13404
msgstr ""
13405
13406
#: en/help_topics/url-special-chars.txt:39
13407
msgid ""
13408
"Comma also has special meaning in URLs, because it denotes `segment "
13409
"parameters`_"
13410
msgstr ""
13411
13412
#: en/help_topics/url-special-chars.txt:41
13413
msgid ""
13414
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13415
msgstr ""
13416
13417
#: en/help_topics/url-special-chars.txt:43
13418
msgid ""
13419
"Comma is also special in any file system paths that are specified. To use a "
13420
"literal\n"
13421
"comma in a file system path, specify a URL and URL encode the comma::"
13422
msgstr ""
13423
13424
#: en/help_topics/url-special-chars.txt:46
13425
msgid ""
13426
" bzr log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
13427
"\" set to \"bla\"\n"
13428
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13429
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
13430
"\" set to \"bla\"\n"
13431
msgstr ""
13432
13433
#: en/help_topics/urlspec.txt:1
13434
msgid "URL Identifiers"
13435
msgstr ""
13436
13437
#: en/help_topics/urlspec.txt:3
13438
msgid "Supported URL prefixes::"
13439
msgstr ""
13440
13441
#: en/help_topics/urlspec.txt:5
13442
msgid ""
13443
" aftp:// Access using active FTP.\n"
13444
" bzr:// Fast access using the Bazaar smart server.\n"
13445
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13446
" file:// Access using the standard filesystem (default)\n"
13447
" ftp:// Access using passive FTP.\n"
13448
" http:// Read-only access of branches exported on the web.\n"
13449
" https:// Read-only access of branches exported on the web using "
13450
"SSL.\n"
13451
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13452
msgstr ""
13453
13454
#: en/help_topics/urlspec.txt:14
13455
msgid "Supported modifiers::"
13456
msgstr ""
13457
13458
#: en/help_topics/urlspec.txt:16
13459
msgid " gio+ Access using any GIO supported protocols."
13460
msgstr ""
13461
13462
#: en/help_topics/urlspec.txt:18
13463
msgid "Bazaar supports all of the standard parts within the URL::"
13464
msgstr ""
13465
13466
#: en/help_topics/urlspec.txt:20
13467
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13468
msgstr ""
13469
13470
#: en/help_topics/urlspec.txt:22
13471
msgid "allowing URLs such as::"
13472
msgstr ""
13473
13474
#: en/help_topics/urlspec.txt:24
13475
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13476
msgstr ""
13477
13478
#: en/help_topics/urlspec.txt:26
13479
msgid ""
13480
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13481
"with '~' as meaning that the rest of the path should be interpreted\n"
13482
"relative to the remote user's home directory. For example if the user\n"
13483
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13484
"shell.example.com, then::"
13485
msgstr ""
13486
13487
#: en/help_topics/urlspec.txt:32
13488
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13489
msgstr ""
13490
13491
#: en/help_topics/urlspec.txt:34
13492
msgid "would refer to ``/home/remote/myproject/trunk``."
13493
msgstr ""
13494
13495
#: en/help_topics/urlspec.txt:36
13496
msgid ""
13497
"Many commands that accept URLs also accept location aliases too.\n"
13498
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13499
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1