« back to all changes in this revision
Viewing changes to po/ast.po
- browse files at revision 6449.6.6
- compare with another revision
- compare with revision 2425.1.1
- download diff
- download tarball
- view history from revision 6449.6.6
- Committer: Jelmer Vernooij
- Date: 2012-02-06 11:36:02 UTC
- mfrom: (6462 +trunk)
- mto: This revision was merged to the branch mainline in revision 6463.
- Revision ID: jelmer@samba.org-20120206113602-yu3j0xe7qbk1szw9
Merge bzr.dev.
- files added:
- po/ast.po
- files modified:
- bzrlib/builtins.py
added
removed
po/ast.po
1
# Asturian translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-01-16 15:18+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: Asturian <ast@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-01-17 05:15+0000\n"
19
"X-Generator: Launchpad (build 14676)\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "saltando {0} (mayor que {1} de {2} bytes)"
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:3183
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:3185
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:3188
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:3190
46
msgid "No new revisions to push."
47
msgstr ""
48
49
#: bzrlib/branch.py:3210
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3213
54
#, python-format
55
msgid "found error:%s"
56
msgstr "error alcontráu: %s"
57
58
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:130
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision toma exactamente un identificador de revisión"
67
68
#: bzrlib/builtins.py:215
69
msgid "Display status summary."
70
msgstr "Amosar resume d'estáu."
71
72
#: bzrlib/builtins.py:217
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"Esto ye un informe de ficheros con versiones y desconocíos,\n"
78
"presentándolos agrupaos pol estáu. Los estaos posibles son:"
79
80
#: bzrlib/builtins.py:220
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"amestáu\n"
86
" Con versión na copia de trabayu pero non na revisión anterior."
87
88
#: bzrlib/builtins.py:223
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"desaniciáu\n"
95
" Con versión na revisión anterior pero quitáu o desaniciáu\n"
96
" na copia de trabayu."
97
98
#: bzrlib/builtins.py:227
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renomáu\n"
106
" El camín a esti ficheru camudó dende la revisión anterior;\n"
107
" seique camudara tamién el testu. Esto incluye los ficheros\n"
108
" pa los que camudó'l nome del direutoriu pá."
109
110
#: bzrlib/builtins.py:232
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"camudáu\n"
116
" El testu camudó dende la cabera revisión."
117
118
#: bzrlib/builtins.py:235
119
msgid ""
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"camudó la clase\n"
124
" La clase de ficheru camudó (p.ex. de ficheru a direutoriu)."
125
126
#: bzrlib/builtins.py:238
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
132
#: bzrlib/builtins.py:241
133
msgid ""
134
"Additionally for directories, symlinks and files with a changed\n"
135
"executable bit, Bazaar indicates their type using a trailing\n"
136
"character: '/', '@' or '*' respectively. These decorations can be\n"
137
"disabled using the '--no-classify' option."
138
msgstr ""
139
140
#: bzrlib/builtins.py:246
141
msgid ""
142
"To see ignored files use 'bzr ignored'. For details on the\n"
143
"changes to file texts, use 'bzr diff'."
144
msgstr ""
145
146
#: bzrlib/builtins.py:249
147
msgid ""
148
"Note that --short or -S gives status flags for each item, similar\n"
149
"to Subversion's status command. To get output similar to svn -q,\n"
150
"use bzr status -SV."
151
msgstr ""
152
153
#: bzrlib/builtins.py:253
154
msgid ""
155
"If no arguments are specified, the status of the entire working\n"
156
"directory is shown. Otherwise, only the status of the specified\n"
157
"files or directories is reported. If a directory is given, status\n"
158
"is reported for everything inside that directory."
159
msgstr ""
160
161
#: bzrlib/builtins.py:258
162
msgid ""
163
"Before merges are committed, the pending merge tip revisions are\n"
164
"shown. To see all pending merge revisions, use the -v option.\n"
165
"To skip the display of pending merge information altogether, use\n"
166
"the no-pending option or specify a file/directory."
167
msgstr ""
168
169
#: bzrlib/builtins.py:263
170
msgid ""
171
"To compare the working directory to a specific revision, pass a\n"
172
"single revision to the revision argument."
173
msgstr ""
174
175
#: bzrlib/builtins.py:266
176
msgid ""
177
"To see which files have changed in a specific revision, or between\n"
178
"two revisions, pass a revision range to the revision argument.\n"
179
"This will produce the same results as calling 'bzr diff --summarize'."
180
msgstr ""
181
182
#: bzrlib/builtins.py:275
183
msgid "Use short status indicators."
184
msgstr ""
185
186
#: bzrlib/builtins.py:277
187
msgid "Only show versioned files."
188
msgstr ""
189
190
#: bzrlib/builtins.py:279
191
msgid "Don't show pending merges."
192
msgstr ""
193
194
#: bzrlib/builtins.py:282
195
msgid "Do not mark object type using indicator."
196
msgstr ""
197
198
#: bzrlib/builtins.py:297
199
msgid "bzr status --revision takes exactly one or two revision specifiers"
200
msgstr ""
201
202
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
203
msgid "You can only supply one of revision_id or --revision"
204
msgstr ""
205
206
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
207
msgid "You must supply either --revision or a revision_id"
208
msgstr ""
209
210
#: bzrlib/builtins.py:351
211
#, python-format
212
msgid "Repository %r does not support access to raw revision texts"
213
msgstr ""
214
215
#: bzrlib/builtins.py:362
216
msgid "The repository {0} contains no revision {1}."
217
msgstr ""
218
219
#: bzrlib/builtins.py:369
220
msgid "You cannot specify a NULL revision."
221
msgstr ""
222
223
#: bzrlib/builtins.py:461
224
msgid "Remove the working tree from a given branch/checkout."
225
msgstr ""
226
227
#: bzrlib/builtins.py:463
228
msgid ""
229
"Since a lightweight checkout is little more than a working tree\n"
230
"this will refuse to run against one."
231
msgstr ""
232
233
#: bzrlib/builtins.py:466
234
msgid "To re-create the working tree, use \"bzr checkout\"."
235
msgstr ""
236
237
#: bzrlib/builtins.py:472
238
msgid ""
239
"Remove the working tree even if it has uncommitted or shelved changes."
240
msgstr ""
241
242
#: bzrlib/builtins.py:486
243
msgid "No working tree to remove"
244
msgstr ""
245
246
#: bzrlib/builtins.py:488
247
msgid "You cannot remove the working tree of a remote path"
248
msgstr ""
249
250
#: bzrlib/builtins.py:497
251
msgid "You cannot remove the working tree from a lightweight checkout"
252
msgstr ""
253
254
#: bzrlib/builtins.py:537
255
msgid ""
256
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
257
"instead. Use \"--force\" if you are sure you want to reset the working tree."
258
msgstr ""
259
260
#: bzrlib/builtins.py:548
261
msgid ""
262
", the header appears corrupt, try passing -r -1 to set the state to the last "
263
"commit"
264
msgstr ""
265
266
#: bzrlib/builtins.py:552
267
msgid "failed to reset the tree state{0}"
268
msgstr ""
269
270
#: bzrlib/builtins.py:556
271
msgid "Show current revision number."
272
msgstr ""
273
274
#: bzrlib/builtins.py:558
275
msgid "This is equal to the number of revisions on this branch."
276
msgstr ""
277
278
#: bzrlib/builtins.py:571
279
msgid "--tree and --revision can not be used together"
280
msgstr ""
281
282
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
283
msgid "Tags can only be placed on a single revision, not on a range"
284
msgstr ""
285
286
#: bzrlib/builtins.py:612
287
msgid "Show revno of working tree."
288
msgstr ""
289
290
#: bzrlib/builtins.py:660
291
msgid "Add specified files or directories."
292
msgstr ""
293
294
#: bzrlib/builtins.py:662
295
msgid ""
296
"In non-recursive mode, all the named items are added, regardless\n"
297
"of whether they were previously ignored. A warning is given if\n"
298
"any of the named files are already versioned."
299
msgstr ""
300
301
#: bzrlib/builtins.py:666
302
msgid ""
303
"In recursive mode (the default), files are treated the same way\n"
304
"but the behaviour for directories is different. Directories that\n"
305
"are already versioned do not give a warning. All directories,\n"
306
"whether already versioned or not, are searched for files or\n"
307
"subdirectories that are neither versioned or ignored, and these\n"
308
"are added. This search proceeds recursively into versioned\n"
309
"directories. If no names are given '.' is assumed."
310
msgstr ""
311
312
#: bzrlib/builtins.py:674
313
msgid ""
314
"A warning will be printed when nested trees are encountered,\n"
315
"unless they are explicitly ignored."
316
msgstr ""
317
318
#: bzrlib/builtins.py:677
319
msgid ""
320
"Therefore simply saying 'bzr add' will version all files that\n"
321
"are currently unknown."
322
msgstr ""
323
324
#: bzrlib/builtins.py:680
325
msgid ""
326
"Adding a file whose parent directory is not versioned will\n"
327
"implicitly add the parent, and so on up to the root. This means\n"
328
"you should never need to explicitly add a directory, they'll just\n"
329
"get added when you add a file in the directory."
330
msgstr ""
331
332
#: bzrlib/builtins.py:685
333
msgid ""
334
"--dry-run will show which files would be added, but not actually\n"
335
"add them."
336
msgstr ""
337
338
#: bzrlib/builtins.py:688
339
msgid ""
340
"--file-ids-from will try to use the file ids from the supplied path.\n"
341
"It looks up ids trying to find a matching parent directory with the\n"
342
"same filename, and then by pure path. This option is rarely needed\n"
343
"but can be useful when adding the same logical file into two\n"
344
"branches that will be merged later (without showing the two different\n"
345
"adds as a conflict). It is also useful when merging another project\n"
346
"into a subdirectory of this one."
347
msgstr ""
348
349
#: bzrlib/builtins.py:696
350
msgid ""
351
"Any files matching patterns in the ignore list will not be added\n"
352
"unless they are explicitly mentioned."
353
msgstr ""
354
355
#: bzrlib/builtins.py:699
356
msgid ""
357
"In recursive mode, files larger than the configuration option \n"
358
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
359
"to file size."
360
msgstr ""
361
362
#: bzrlib/builtins.py:706
363
msgid "Don't recursively add the contents of directories."
364
msgstr ""
365
366
#: bzrlib/builtins.py:712
367
msgid "Lookup file ids from this tree."
368
msgstr ""
369
370
#: bzrlib/builtins.py:748
371
msgid "ignored {0} matching \"{1}\"\n"
372
msgstr ""
373
374
#: bzrlib/builtins.py:753
375
msgid "Create a new versioned directory."
376
msgstr ""
377
378
#: bzrlib/builtins.py:755
379
msgid "This is equivalent to creating the directory and then adding it."
380
msgstr ""
381
382
#: bzrlib/builtins.py:762
383
msgid "No error if existing, make parent directories as needed."
384
msgstr ""
385
386
#: bzrlib/builtins.py:796
387
#, python-format
388
msgid "added %s\n"
389
msgstr ""
390
391
#: bzrlib/builtins.py:838
392
#, python-format
393
msgid "invalid kind %r specified"
394
msgstr ""
395
396
#: bzrlib/builtins.py:875
397
msgid "Move or rename a file."
398
msgstr ""
399
400
#: bzrlib/builtins.py:877
401
msgid " bzr mv SOURCE... DESTINATION"
402
msgstr ""
403
404
#: bzrlib/builtins.py:879
405
msgid ""
406
"If the last argument is a versioned directory, all the other names\n"
407
"are moved into it. Otherwise, there must be exactly two arguments\n"
408
"and the file is changed to a new name."
409
msgstr ""
410
411
#: bzrlib/builtins.py:883
412
msgid ""
413
"If OLDNAME does not exist on the filesystem but is versioned and\n"
414
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
415
"assumes that the file has been manually moved and only updates\n"
416
"its internal inventory to reflect that change.\n"
417
"The same is valid when moving many SOURCE files to a DESTINATION."
418
msgstr ""
419
420
#: bzrlib/builtins.py:889
421
msgid "Files cannot be moved between branches."
422
msgstr ""
423
424
#: bzrlib/builtins.py:896
425
msgid ""
426
"Move only the bzr identifier of the file, because the file has already been "
427
"moved."
428
msgstr ""
429
430
#: bzrlib/builtins.py:898
431
msgid "Automatically guess renames."
432
msgstr ""
433
434
#: bzrlib/builtins.py:899
435
msgid "Avoid making changes when guessing renames."
436
msgstr ""
437
438
#: bzrlib/builtins.py:908
439
msgid "--dry-run requires --auto."
440
msgstr ""
441
442
#: bzrlib/builtins.py:912
443
msgid "missing file argument"
444
msgstr ""
445
446
#: bzrlib/builtins.py:916
447
msgid "can not move root of branch"
448
msgstr ""
449
450
#: bzrlib/builtins.py:922
451
msgid "Only one path may be specified to --auto."
452
msgstr ""
453
454
#: bzrlib/builtins.py:925
455
msgid "--after cannot be specified with --auto."
456
msgstr ""
457
458
#: bzrlib/builtins.py:962
459
msgid "to mv multiple files the destination must be a versioned directory"
460
msgstr ""
461
462
#: bzrlib/builtins.py:1014
463
msgid "Turn this branch into a mirror of another branch."
464
msgstr ""
465
466
#: bzrlib/builtins.py:1016
467
msgid ""
468
"By default, this command only works on branches that have not diverged.\n"
469
"Branches are considered diverged if the destination branch's most recent \n"
470
"commit is one that has not been merged (directly or indirectly) into the \n"
471
"parent."
472
msgstr ""
473
474
#: bzrlib/builtins.py:1021
475
msgid ""
476
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
477
"from one into the other. Once one branch has merged, the other should\n"
478
"be able to pull it again."
479
msgstr ""
480
481
#: bzrlib/builtins.py:1025
482
msgid ""
483
"If you want to replace your local changes and just want your branch to\n"
484
"match the remote one, use pull --overwrite. This will work even if the two\n"
485
"branches have diverged."
486
msgstr ""
487
488
#: bzrlib/builtins.py:1029
489
msgid ""
490
"If there is no default location set, the first pull will set it (use\n"
491
"--no-remember to avoid setting it). After that, you can omit the\n"
492
"location to use the default. To change the default, use --remember. The\n"
493
"value will only be saved if the remote location can be accessed."
494
msgstr ""
495
496
#: bzrlib/builtins.py:1034
497
msgid ""
498
"The --verbose option will display the revisions pulled using the log_format\n"
499
"configuration option. You can use a different format by overriding it with\n"
500
"-Olog_format=<other_format>."
501
msgstr ""
502
503
#: bzrlib/builtins.py:1038
504
msgid ""
505
"Note: The location can be specified either in the form of a branch,\n"
506
"or in the form of a path to a file containing a merge directive generated\n"
507
"with bzr send."
508
msgstr ""
509
510
#: bzrlib/builtins.py:1046
511
msgid "Show logs of pulled revisions."
512
msgstr ""
513
514
#: bzrlib/builtins.py:1048
515
msgid ""
516
"Branch to pull into, rather than the one containing the working directory."
517
msgstr ""
518
519
#: bzrlib/builtins.py:1051
520
msgid ""
521
"Perform a local pull in a bound branch. Local pulls are not applied to the "
522
"master branch."
523
msgstr ""
524
525
#: bzrlib/builtins.py:1080
526
msgid "Need working tree for --show-base."
527
msgstr ""
528
529
#: bzrlib/builtins.py:1096
530
msgid "No pull location known or specified."
531
msgstr ""
532
533
#: bzrlib/builtins.py:1102
534
#, python-format
535
msgid "Using saved parent location: %s\n"
536
msgstr ""
537
538
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
539
msgid "Cannot use -r with merge directives or bundles"
540
msgstr ""
541
542
#: bzrlib/builtins.py:1150
543
msgid "Update a mirror of this branch."
544
msgstr ""
545
546
#: bzrlib/builtins.py:1152
547
msgid ""
548
"The target branch will not have its working tree populated because this\n"
549
"is both expensive, and is not supported on remote file systems."
550
msgstr ""
551
552
#: bzrlib/builtins.py:1155
553
msgid ""
554
"Some smart servers or protocols *may* put the working tree in place in\n"
555
"the future."
556
msgstr ""
557
558
#: bzrlib/builtins.py:1158
559
msgid ""
560
"This command only works on branches that have not diverged. Branches are\n"
561
"considered diverged if the destination branch's most recent commit is one\n"
562
"that has not been merged (directly or indirectly) by the source branch."
563
msgstr ""
564
565
#: bzrlib/builtins.py:1162
566
msgid ""
567
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
568
"the other branch completely, discarding its unmerged changes."
569
msgstr ""
570
571
#: bzrlib/builtins.py:1165
572
msgid ""
573
"If you want to ensure you have the different changes in the other branch,\n"
574
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
575
"After that you will be able to do a push without '--overwrite'."
576
msgstr ""
577
578
#: bzrlib/builtins.py:1169
579
msgid ""
580
"If there is no default push location set, the first push will set it (use\n"
581
"--no-remember to avoid setting it). After that, you can omit the\n"
582
"location to use the default. To change the default, use --remember. The\n"
583
"value will only be saved if the remote location can be accessed."
584
msgstr ""
585
586
#: bzrlib/builtins.py:1174
587
msgid ""
588
"The --verbose option will display the revisions pushed using the log_format\n"
589
"configuration option. You can use a different format by overriding it with\n"
590
"-Olog_format=<other_format>."
591
msgstr ""
592
593
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
594
msgid ""
595
"Branch to push from, rather than the one containing the working directory."
596
msgstr ""
597
598
#: bzrlib/builtins.py:1188
599
msgid ""
600
"By default push will fail if the target directory exists, but does not "
601
"already have a control directory. This flag will allow push to proceed."
602
msgstr ""
603
604
#: bzrlib/builtins.py:1193
605
msgid ""
606
"Create a stacked branch that references the public location of the parent "
607
"branch."
608
msgstr ""
609
610
#: bzrlib/builtins.py:1196
611
msgid ""
612
"Create a stacked branch that refers to another branch for the commit "
613
"history. Only the work not present in the referenced branch is included in "
614
"the branch created."
615
msgstr ""
616
617
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
618
msgid ""
619
"Refuse to push if there are uncommitted changes in the working tree, --no-"
620
"strict disables the check."
621
msgstr ""
622
623
#: bzrlib/builtins.py:1204
624
msgid "Don't populate the working tree, even for protocols that support it."
625
msgstr ""
626
627
#: bzrlib/builtins.py:1248
628
msgid "Could not determine branch to refer to."
629
msgstr ""
630
631
#: bzrlib/builtins.py:1257
632
#, python-format
633
msgid ""
634
"No push location known or specified. To push to the parent branch (at %s), "
635
"use 'bzr push :parent'."
636
msgstr ""
637
638
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
639
msgid "No push location known or specified."
640
msgstr ""
641
642
#: bzrlib/builtins.py:1267
643
#, python-format
644
msgid "Using saved push location: %s"
645
msgstr ""
646
647
#: bzrlib/builtins.py:1277
648
msgid "Create a new branch that is a copy of an existing branch."
649
msgstr ""
650
651
#: bzrlib/builtins.py:1279
652
msgid ""
653
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
654
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
655
"./bar.\n"
656
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
657
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
658
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
659
"create ./foo-bar."
660
msgstr ""
661
662
#: bzrlib/builtins.py:1286
663
msgid ""
664
"To retrieve the branch as of a particular revision, supply the --revision\n"
665
"parameter, as in \"branch foo/bar -r 5\"."
666
msgstr ""
667
668
#: bzrlib/builtins.py:1289
669
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
670
msgstr ""
671
672
#: bzrlib/builtins.py:1299
673
msgid "Create a branch without a working-tree."
674
msgstr ""
675
676
#: bzrlib/builtins.py:1301
677
msgid "Switch the checkout in the current directory to the new branch."
678
msgstr ""
679
680
#: bzrlib/builtins.py:1304
681
msgid ""
682
"Create a stacked branch referring to the source branch. The new branch will "
683
"depend on the availability of the source branch for all operations."
684
msgstr ""
685
686
#: bzrlib/builtins.py:1308
687
msgid "Do not use a shared repository, even if available."
688
msgstr ""
689
690
#: bzrlib/builtins.py:1310
691
msgid ""
692
"By default branch will fail if the target directory exists, but does not "
693
"already have a control directory. This flag will allow branch to proceed."
694
msgstr ""
695
696
#: bzrlib/builtins.py:1315
697
msgid "Bind new branch to from location."
698
msgstr ""
699
700
#: bzrlib/builtins.py:1362
701
#, python-format
702
msgid "Target directory \"%s\" already exists."
703
msgstr ""
704
705
#: bzrlib/builtins.py:1374
706
#, python-format
707
msgid "Parent of \"%s\" does not exist."
708
msgstr ""
709
710
#: bzrlib/builtins.py:1393
711
msgid "The branch {0} has no revision {1}."
712
msgstr ""
713
714
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
715
#, python-format
716
msgid "Created new stacked branch referring to %s."
717
msgstr ""
718
719
#: bzrlib/builtins.py:1407
720
#, python-format
721
msgid "Branched %d revision."
722
msgid_plural "Branched %d revisions."
723
msgstr[0] ""
724
msgstr[1] ""
725
726
#: bzrlib/builtins.py:1412
727
#, python-format
728
msgid "New branch bound to %s"
729
msgstr ""
730
731
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
732
#, python-format
733
msgid "Switched to branch: %s"
734
msgstr ""
735
736
#: bzrlib/builtins.py:1422
737
msgid "List the branches available at the current location."
738
msgstr ""
739
740
#: bzrlib/builtins.py:1424
741
msgid ""
742
"This command will print the names of all the branches at the current\n"
743
"location."
744
msgstr ""
745
746
#: bzrlib/builtins.py:1431
747
msgid ""
748
"Recursively scan for branches rather than just looking in the specified "
749
"location."
750
msgstr ""
751
752
#: bzrlib/builtins.py:1461
753
msgid "(default)"
754
msgstr ""
755
756
#: bzrlib/builtins.py:1473
757
msgid "Create a new checkout of an existing branch."
758
msgstr ""
759
760
#: bzrlib/builtins.py:1475
761
msgid ""
762
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
763
"for\n"
764
"the branch found in '.'. This is useful if you have removed the working "
765
"tree\n"
766
"or if it was never created - i.e. if you pushed the branch to its current\n"
767
"location using SFTP."
768
msgstr ""
769
770
#: bzrlib/builtins.py:1480
771
msgid ""
772
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
773
"will\n"
774
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
775
"./bar.\n"
776
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
777
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
778
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
779
"create ./foo-bar."
780
msgstr ""
781
782
#: bzrlib/builtins.py:1487
783
msgid ""
784
"To retrieve the branch as of a particular revision, supply the --revision\n"
785
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
786
"immediately\n"
787
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
788
"old\n"
789
"code.)"
790
msgstr ""
791
792
#: bzrlib/builtins.py:1497
793
msgid ""
794
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
795
"the branch for every operation. Normal checkouts can perform common "
796
"operations like diff and status without such access, and also support local "
797
"commits."
798
msgstr ""
799
800
#: bzrlib/builtins.py:1504
801
msgid "Get file contents from this tree."
802
msgstr ""
803
804
#: bzrlib/builtins.py:1506
805
msgid "Hard-link working tree files where possible."
806
msgstr ""
807
808
#: bzrlib/builtins.py:1547
809
msgid ""
810
"Show list of renamed files.\n"
811
" "
812
msgstr ""
813
814
#: bzrlib/builtins.py:1577
815
msgid "Update a working tree to a new revision."
816
msgstr ""
817
818
#: bzrlib/builtins.py:1579
819
msgid ""
820
"This will perform a merge of the destination revision (the tip of the\n"
821
"branch, or the specified revision) into the working tree, and then make\n"
822
"that revision the basis revision for the working tree. "
823
msgstr ""
824
825
#: bzrlib/builtins.py:1583
826
msgid ""
827
"You can use this to visit an older revision, or to update a working tree\n"
828
"that is out of date from its branch."
829
msgstr ""
830
831
#: bzrlib/builtins.py:1586
832
msgid ""
833
"If there are any uncommitted changes in the tree, they will be carried\n"
834
"across and remain as uncommitted changes after the update. To discard\n"
835
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
836
"with the changes brought in by the change in basis revision."
837
msgstr ""
838
839
#: bzrlib/builtins.py:1591
840
msgid ""
841
"If the tree's branch is bound to a master branch, bzr will also update\n"
842
"the branch from the master."
843
msgstr ""
844
845
#: bzrlib/builtins.py:1594
846
msgid ""
847
"You cannot update just a single file or directory, because each Bazaar\n"
848
"working tree has just a single basis revision. If you want to restore a\n"
849
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
850
"update'. If you want to restore a file to its state in a previous\n"
851
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
852
"out the old content of that file to a new location."
853
msgstr ""
854
855
#: bzrlib/builtins.py:1601
856
msgid ""
857
"The 'dir' argument, if given, must be the location of the root of a\n"
858
"working tree to update. By default, the working tree that contains the \n"
859
"current working directory is used."
860
msgstr ""
861
862
#: bzrlib/builtins.py:1617
863
msgid "bzr update --revision takes exactly one revision"
864
msgstr ""
865
866
#: bzrlib/builtins.py:1625
867
msgid "bzr update can only update a whole tree, not a file or subdirectory"
868
msgstr ""
869
870
#: bzrlib/builtins.py:1656
871
msgid "Tree is up to date at revision {0} of branch {1}"
872
msgstr ""
873
874
#: bzrlib/builtins.py:1672
875
#, python-format
876
msgid ""
877
"branch has no revision %s\n"
878
"bzr update --revision only works for a revision in the branch history"
879
msgstr ""
880
881
#: bzrlib/builtins.py:1678
882
msgid "Updated to revision {0} of branch {1}"
883
msgstr ""
884
885
#: bzrlib/builtins.py:1682
886
msgid ""
887
"Your local commits will now show as pending merges with 'bzr status', and "
888
"can be committed with 'bzr commit'."
889
msgstr ""
890
891
#: bzrlib/builtins.py:1691
892
msgid "Show information about a working tree, branch or repository."
893
msgstr ""
894
895
#: bzrlib/builtins.py:1693
896
msgid ""
897
"This command will show all known locations and formats associated to the\n"
898
"tree, branch or repository."
899
msgstr ""
900
901
#: bzrlib/builtins.py:1696
902
msgid ""
903
"In verbose mode, statistical information is included with each report.\n"
904
"To see extended statistic information, use a verbosity level of 2 or\n"
905
"higher by specifying the verbose option multiple times, e.g. -vv."
906
msgstr ""
907
908
#: bzrlib/builtins.py:1700
909
msgid "Branches and working trees will also report any missing revisions."
910
msgstr ""
911
912
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
913
#: bzrlib/builtins.py:6389
914
msgid ":Examples:"
915
msgstr ""
916
917
#: bzrlib/builtins.py:1704
918
msgid " Display information on the format and related locations:"
919
msgstr ""
920
921
#: bzrlib/builtins.py:1706
922
msgid " bzr info"
923
msgstr ""
924
925
#: bzrlib/builtins.py:1708
926
msgid ""
927
" Display the above together with extended format information and\n"
928
" basic statistics (like the number of files in the working tree and\n"
929
" number of revisions in the branch and repository):"
930
msgstr ""
931
932
#: bzrlib/builtins.py:1712
933
msgid " bzr info -v"
934
msgstr ""
935
936
#: bzrlib/builtins.py:1714
937
msgid " Display the above together with number of committers to the branch:"
938
msgstr ""
939
940
#: bzrlib/builtins.py:1716
941
msgid " bzr info -vv"
942
msgstr ""
943
944
#: bzrlib/builtins.py:1735
945
msgid "Remove files or directories."
946
msgstr ""
947
948
#: bzrlib/builtins.py:1737
949
msgid ""
950
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
951
"delete them if they can easily be recovered using revert otherwise they\n"
952
"will be backed up (adding an extention of the form .~#~). If no options or\n"
953
"parameters are given Bazaar will scan for files that are being tracked by\n"
954
"Bazaar but missing in your tree and stop tracking them for you."
955
msgstr ""
956
957
#: bzrlib/builtins.py:1745
958
msgid "Only remove files that have never been committed."
959
msgstr ""
960
961
#: bzrlib/builtins.py:1747
962
msgid "The file deletion mode to be used."
963
msgstr ""
964
965
#: bzrlib/builtins.py:1748
966
msgid "Deletion Strategy"
967
msgstr ""
968
969
#: bzrlib/builtins.py:1749
970
msgid "Backup changed files (default)."
971
msgstr ""
972
973
#: bzrlib/builtins.py:1750
974
msgid "Delete from bzr but leave the working copy."
975
msgstr ""
976
977
#: bzrlib/builtins.py:1751
978
msgid "Don't backup changed files."
979
msgstr ""
980
981
#: bzrlib/builtins.py:1752
982
msgid ""
983
"Delete all the specified files, even if they can not be recovered and even "
984
"if they are non-empty directories. (deprecated, use no-backup)"
985
msgstr ""
986
987
#: bzrlib/builtins.py:1761
988
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
989
msgstr ""
990
991
#: bzrlib/builtins.py:1778
992
msgid "No matching files."
993
msgstr ""
994
995
#: bzrlib/builtins.py:1839
996
msgid "Reconcile bzr metadata in a branch."
997
msgstr ""
998
999
#: bzrlib/builtins.py:1841
1000
msgid ""
1001
"This can correct data mismatches that may have been caused by\n"
1002
"previous ghost operations or bzr upgrades. You should only\n"
1003
"need to run this command if 'bzr check' or a bzr developer\n"
1004
"advises you to run it."
1005
msgstr ""
1006
1007
#: bzrlib/builtins.py:1846
1008
msgid ""
1009
"If a second branch is provided, cross-branch reconciliation is\n"
1010
"also attempted, which will check that data like the tree root\n"
1011
"id which was not present in very early bzr versions is represented\n"
1012
"correctly in both branches."
1013
msgstr ""
1014
1015
#: bzrlib/builtins.py:1851
1016
msgid ""
1017
"At the same time it is run it may recompress data resulting in\n"
1018
"a potential saving in disk space or performance gain."
1019
msgstr ""
1020
1021
#: bzrlib/builtins.py:1854
1022
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1023
msgstr ""
1024
1025
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1026
msgid ""
1027
"Format for the bzr 2.0 series.\n"
1028
"Uses group-compress storage.\n"
1029
"Provides rich roots which are a one-way transition.\n"
1030
msgstr ""
1031
1032
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1033
msgid ""
1034
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1035
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1036
msgstr ""
1037
1038
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1039
msgid "The 2a format with experimental support for colocated branches.\n"
1040
msgstr ""
1041
1042
#: bzrlib/builtins.py:1922
1043
msgid "Make a directory into a versioned branch."
1044
msgstr ""
1045
1046
#: bzrlib/builtins.py:1924
1047
msgid ""
1048
"Use this to create an empty branch, or before importing an\n"
1049
"existing project."
1050
msgstr ""
1051
1052
#: bzrlib/builtins.py:1927
1053
msgid ""
1054
"If there is a repository in a parent directory of the location, then\n"
1055
"the history of the branch will be stored in the repository. Otherwise\n"
1056
"init creates a standalone branch which carries its own history\n"
1057
"in the .bzr directory."
1058
msgstr ""
1059
1060
#: bzrlib/builtins.py:1932
1061
msgid ""
1062
"If there is already a branch at the location but it has no working tree,\n"
1063
"the tree can be populated with 'bzr checkout'."
1064
msgstr ""
1065
1066
#: bzrlib/builtins.py:1935
1067
msgid "Recipe for importing a tree of files::"
1068
msgstr ""
1069
1070
#: bzrlib/builtins.py:1937
1071
msgid ""
1072
" cd ~/project\n"
1073
" bzr init\n"
1074
" bzr add .\n"
1075
" bzr status\n"
1076
" bzr commit -m \"imported project\""
1077
msgstr ""
1078
1079
#: bzrlib/builtins.py:1948
1080
msgid ""
1081
"Create the path leading up to the branch if it does not already exist."
1082
msgstr ""
1083
1084
#: bzrlib/builtins.py:1951
1085
msgid "Specify a format for this branch. See \"help formats\"."
1086
msgstr ""
1087
1088
#: bzrlib/builtins.py:1959
1089
msgid ""
1090
"Never change revnos or the existing log. Append revisions to it only."
1091
msgstr ""
1092
1093
#: bzrlib/builtins.py:1962
1094
msgid "Create a branch without a working tree."
1095
msgstr ""
1096
1097
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1098
#, python-format
1099
msgid ""
1100
"Parent directory of %s does not exist.\n"
1101
"You may supply --create-prefix to create all leading parent directories."
1102
msgstr ""
1103
1104
#: bzrlib/builtins.py:2016
1105
msgid ""
1106
"This branch format cannot be set to append-revisions-only. Try --default."
1107
msgstr ""
1108
1109
#: bzrlib/builtins.py:2027
1110
msgid "Created a {0} (format: {1})\n"
1111
msgstr ""
1112
1113
#: bzrlib/builtins.py:2036
1114
#, python-format
1115
msgid "Using shared repository: %s\n"
1116
msgstr ""
1117
1118
#: bzrlib/builtins.py:2040
1119
msgid "Create a shared repository for branches to share storage space."
1120
msgstr ""
1121
1122
#: bzrlib/builtins.py:2042
1123
msgid ""
1124
"New branches created under the repository directory will store their\n"
1125
"revisions in the repository, not in the branch directory. For branches\n"
1126
"with shared history, this reduces the amount of storage needed and \n"
1127
"speeds up the creation of new branches."
1128
msgstr ""
1129
1130
#: bzrlib/builtins.py:2047
1131
msgid ""
1132
"If the --no-trees option is given then the branches in the repository\n"
1133
"will not have working trees by default. They will still exist as \n"
1134
"directories on disk, but they will not have separate copies of the \n"
1135
"files at a certain revision. This can be useful for repositories that\n"
1136
"store branches which are interacted with through checkouts or remote\n"
1137
"branches, such as on a server."
1138
msgstr ""
1139
1140
#: bzrlib/builtins.py:2054
1141
msgid ""
1142
":Examples:\n"
1143
" Create a shared repository holding just branches::"
1144
msgstr ""
1145
1146
#: bzrlib/builtins.py:2057
1147
msgid ""
1148
" bzr init-repo --no-trees repo\n"
1149
" bzr init repo/trunk"
1150
msgstr ""
1151
1152
#: bzrlib/builtins.py:2060
1153
msgid " Make a lightweight checkout elsewhere::"
1154
msgstr ""
1155
1156
#: bzrlib/builtins.py:2062
1157
msgid ""
1158
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1159
" cd trunk-checkout\n"
1160
" (add files here)"
1161
msgstr ""
1162
1163
#: bzrlib/builtins.py:2070
1164
msgid ""
1165
"Specify a format for this repository. See \"bzr help formats\" for details."
1166
msgstr ""
1167
1168
#: bzrlib/builtins.py:2074
1169
msgid "Repository format"
1170
msgstr ""
1171
1172
#: bzrlib/builtins.py:2076
1173
msgid "Branches in the repository will default to not having a working tree."
1174
msgstr ""
1175
1176
#: bzrlib/builtins.py:2102
1177
msgid "Show differences in the working tree, between revisions or branches."
1178
msgstr ""
1179
1180
#: bzrlib/builtins.py:2104
1181
msgid ""
1182
"If no arguments are given, all changes for the current tree are listed.\n"
1183
"If files are given, only the changes in those files are listed.\n"
1184
"Remote and multiple branches can be compared by using the --old and\n"
1185
"--new options. If not provided, the default for both is derived from\n"
1186
"the first argument, if any, or the current tree if no arguments are\n"
1187
"given."
1188
msgstr ""
1189
1190
#: bzrlib/builtins.py:2111
1191
msgid ""
1192
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1193
"produces patches suitable for \"patch -p1\"."
1194
msgstr ""
1195
1196
#: bzrlib/builtins.py:2114
1197
msgid ""
1198
"Note that when using the -r argument with a range of revisions, the\n"
1199
"differences are computed between the two specified revisions. That\n"
1200
"is, the command does not show the changes introduced by the first \n"
1201
"revision in the range. This differs from the interpretation of \n"
1202
"revision ranges used by \"bzr log\" which includes the first revision\n"
1203
"in the range."
1204
msgstr ""
1205
1206
#: bzrlib/builtins.py:2121
1207
msgid ""
1208
":Exit values:\n"
1209
" 1 - changed\n"
1210
" 2 - unrepresentable changes\n"
1211
" 3 - error\n"
1212
" 0 - no change"
1213
msgstr ""
1214
1215
#: bzrlib/builtins.py:2127
1216
msgid ""
1217
":Examples:\n"
1218
" Shows the difference in the working tree versus the last commit::"
1219
msgstr ""
1220
1221
#: bzrlib/builtins.py:2130
1222
msgid " bzr diff"
1223
msgstr ""
1224
1225
#: bzrlib/builtins.py:2132
1226
msgid " Difference between the working tree and revision 1::"
1227
msgstr ""
1228
1229
#: bzrlib/builtins.py:2134
1230
msgid " bzr diff -r1"
1231
msgstr ""
1232
1233
#: bzrlib/builtins.py:2136
1234
msgid " Difference between revision 3 and revision 1::"
1235
msgstr ""
1236
1237
#: bzrlib/builtins.py:2138
1238
msgid " bzr diff -r1..3"
1239
msgstr ""
1240
1241
#: bzrlib/builtins.py:2140
1242
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1243
msgstr ""
1244
1245
#: bzrlib/builtins.py:2142
1246
msgid " bzr diff -r1..3 xxx"
1247
msgstr ""
1248
1249
#: bzrlib/builtins.py:2144
1250
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1251
msgstr ""
1252
1253
#: bzrlib/builtins.py:2146
1254
msgid " bzr diff -c2"
1255
msgstr ""
1256
1257
#: bzrlib/builtins.py:2148
1258
msgid ""
1259
" To see the changes introduced by revision X::\n"
1260
" \n"
1261
" bzr diff -cX"
1262
msgstr ""
1263
1264
#: bzrlib/builtins.py:2152
1265
msgid ""
1266
" Note that in the case of a merge, the -c option shows the changes\n"
1267
" compared to the left hand parent. To see the changes against\n"
1268
" another parent, use::"
1269
msgstr ""
1270
1271
#: bzrlib/builtins.py:2156
1272
msgid " bzr diff -r<chosen_parent>..X"
1273
msgstr ""
1274
1275
#: bzrlib/builtins.py:2158
1276
msgid ""
1277
" The changes between the current revision and the previous revision\n"
1278
" (equivalent to -c-1 and -r-2..-1)"
1279
msgstr ""
1280
1281
#: bzrlib/builtins.py:2161
1282
msgid " bzr diff -r-2.."
1283
msgstr ""
1284
1285
#: bzrlib/builtins.py:2163
1286
msgid " Show just the differences for file NEWS::"
1287
msgstr ""
1288
1289
#: bzrlib/builtins.py:2165
1290
msgid " bzr diff NEWS"
1291
msgstr ""
1292
1293
#: bzrlib/builtins.py:2167
1294
msgid " Show the differences in working tree xxx for file NEWS::"
1295
msgstr ""
1296
1297
#: bzrlib/builtins.py:2169
1298
msgid " bzr diff xxx/NEWS"
1299
msgstr ""
1300
1301
#: bzrlib/builtins.py:2171
1302
msgid " Show the differences from branch xxx to this working tree:"
1303
msgstr ""
1304
1305
#: bzrlib/builtins.py:2173
1306
msgid " bzr diff --old xxx"
1307
msgstr ""
1308
1309
#: bzrlib/builtins.py:2175
1310
msgid " Show the differences between two branches for file NEWS::"
1311
msgstr ""
1312
1313
#: bzrlib/builtins.py:2177
1314
msgid " bzr diff --old xxx --new yyy NEWS"
1315
msgstr ""
1316
1317
#: bzrlib/builtins.py:2179
1318
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1319
msgstr ""
1320
1321
#: bzrlib/builtins.py:2181
1322
msgid ""
1323
" bzr diff --prefix old/:new/\n"
1324
" \n"
1325
" Show the differences using a custom diff program with options::\n"
1326
" \n"
1327
" bzr diff --using /usr/bin/diff --diff-options -wu"
1328
msgstr ""
1329
1330
#: bzrlib/builtins.py:2191
1331
msgid "Pass these options to the external diff program."
1332
msgstr ""
1333
1334
#: bzrlib/builtins.py:2194
1335
msgid ""
1336
"Set prefixes added to old and new filenames, as two values separated by a "
1337
"colon. (eg \"old/:new/\")."
1338
msgstr ""
1339
1340
#: bzrlib/builtins.py:2197
1341
msgid "Branch/tree to compare from."
1342
msgstr ""
1343
1344
#: bzrlib/builtins.py:2201
1345
msgid "Branch/tree to compare to."
1346
msgstr ""
1347
1348
#: bzrlib/builtins.py:2207
1349
msgid "Use this command to compare files."
1350
msgstr ""
1351
1352
#: bzrlib/builtins.py:2212
1353
msgid "Diff format to use."
1354
msgstr ""
1355
1356
#: bzrlib/builtins.py:2214
1357
msgid "Diff format"
1358
msgstr ""
1359
1360
#: bzrlib/builtins.py:2236
1361
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1362
msgstr ""
1363
1364
#: bzrlib/builtins.py:2240
1365
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1366
msgstr ""
1367
1368
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1369
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1370
msgid "{0} and {1} are mutually exclusive"
1371
msgstr ""
1372
1373
#: bzrlib/builtins.py:2265
1374
msgid ""
1375
"List files deleted in the working tree.\n"
1376
" "
1377
msgstr ""
1378
1379
#: bzrlib/builtins.py:2343
1380
msgid "Show the tree root directory."
1381
msgstr ""
1382
1383
#: bzrlib/builtins.py:2345
1384
msgid ""
1385
"The root is the nearest enclosing directory with a .bzr control\n"
1386
"directory."
1387
msgstr ""
1388
1389
#: bzrlib/builtins.py:2360
1390
msgid "The limit argument must be an integer."
1391
msgstr ""
1392
1393
#: bzrlib/builtins.py:2368
1394
msgid "The levels argument must be an integer."
1395
msgstr ""
1396
1397
#: bzrlib/builtins.py:2373
1398
msgid "Show historical log for a branch or subset of a branch."
1399
msgstr ""
1400
1401
#: bzrlib/builtins.py:2375
1402
msgid ""
1403
"log is bzr's default tool for exploring the history of a branch.\n"
1404
"The branch to use is taken from the first parameter. If no parameters\n"
1405
"are given, the branch containing the working directory is logged.\n"
1406
"Here are some simple examples::"
1407
msgstr ""
1408
1409
#: bzrlib/builtins.py:2380
1410
msgid ""
1411
" bzr log log the current branch\n"
1412
" bzr log foo.py log a file in its branch\n"
1413
" bzr log http://server/branch log a branch on a server"
1414
msgstr ""
1415
1416
#: bzrlib/builtins.py:2384
1417
msgid ""
1418
"The filtering, ordering and information shown for each revision can\n"
1419
"be controlled as explained below. By default, all revisions are\n"
1420
"shown sorted (topologically) so that newer revisions appear before\n"
1421
"older ones and descendants always appear before ancestors. If displayed,\n"
1422
"merged revisions are shown indented under the revision in which they\n"
1423
"were merged."
1424
msgstr ""
1425
1426
#: bzrlib/builtins.py:2391
1427
msgid ":Output control:"
1428
msgstr ""
1429
1430
#: bzrlib/builtins.py:2393
1431
msgid ""
1432
" The log format controls how information about each revision is\n"
1433
" displayed. The standard log formats are called ``long``, ``short``\n"
1434
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1435
" for more details on log formats."
1436
msgstr ""
1437
1438
#: bzrlib/builtins.py:2398
1439
msgid ""
1440
" The following options can be used to control what information is\n"
1441
" displayed::"
1442
msgstr ""
1443
1444
#: bzrlib/builtins.py:2401
1445
msgid ""
1446
" -l N display a maximum of N revisions\n"
1447
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1448
" -v display a status summary (delta) for each revision\n"
1449
" -p display a diff (patch) for each revision\n"
1450
" --show-ids display revision-ids (and file-ids), not just revnos"
1451
msgstr ""
1452
1453
#: bzrlib/builtins.py:2407
1454
msgid ""
1455
" Note that the default number of levels to display is a function of the\n"
1456
" log format. If the -n option is not used, the standard log formats show\n"
1457
" just the top level (mainline)."
1458
msgstr ""
1459
1460
#: bzrlib/builtins.py:2411
1461
msgid ""
1462
" Status summaries are shown using status flags like A, M, etc. To see\n"
1463
" the changes explained using words like ``added`` and ``modified``\n"
1464
" instead, use the -vv option."
1465
msgstr ""
1466
1467
#: bzrlib/builtins.py:2415
1468
msgid ":Ordering control:"
1469
msgstr ""
1470
1471
#: bzrlib/builtins.py:2417
1472
msgid ""
1473
" To display revisions from oldest to newest, use the --forward option.\n"
1474
" In most cases, using this option will have little impact on the total\n"
1475
" time taken to produce a log, though --forward does not incrementally\n"
1476
" display revisions like --reverse does when it can."
1477
msgstr ""
1478
1479
#: bzrlib/builtins.py:2422
1480
msgid ":Revision filtering:"
1481
msgstr ""
1482
1483
#: bzrlib/builtins.py:2424
1484
msgid ""
1485
" The -r option can be used to specify what revision or range of revisions\n"
1486
" to filter against. The various forms are shown below::"
1487
msgstr ""
1488
1489
#: bzrlib/builtins.py:2427
1490
msgid ""
1491
" -rX display revision X\n"
1492
" -rX.. display revision X and later\n"
1493
" -r..Y display up to and including revision Y\n"
1494
" -rX..Y display from X to Y inclusive"
1495
msgstr ""
1496
1497
#: bzrlib/builtins.py:2432
1498
msgid ""
1499
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1500
" Some common examples are given below::"
1501
msgstr ""
1502
1503
#: bzrlib/builtins.py:2435
1504
msgid ""
1505
" -r-1 show just the tip\n"
1506
" -r-10.. show the last 10 mainline revisions\n"
1507
" -rsubmit:.. show what's new on this branch\n"
1508
" -rancestor:path.. show changes since the common ancestor of this\n"
1509
" branch and the one at location path\n"
1510
" -rdate:yesterday.. show changes since yesterday"
1511
msgstr ""
1512
1513
#: bzrlib/builtins.py:2442
1514
msgid ""
1515
" When logging a range of revisions using -rX..Y, log starts at\n"
1516
" revision Y and searches back in history through the primary\n"
1517
" (\"left-hand\") parents until it finds X. When logging just the\n"
1518
" top level (using -n1), an error is reported if X is not found\n"
1519
" along the way. If multi-level logging is used (-n0), X may be\n"
1520
" a nested merge revision and the log will be truncated accordingly."
1521
msgstr ""
1522
1523
#: bzrlib/builtins.py:2449
1524
msgid ":Path filtering:"
1525
msgstr ""
1526
1527
#: bzrlib/builtins.py:2451
1528
msgid ""
1529
" If parameters are given and the first one is not a branch, the log\n"
1530
" will be filtered to show only those revisions that changed the\n"
1531
" nominated files or directories."
1532
msgstr ""
1533
1534
#: bzrlib/builtins.py:2455
1535
msgid ""
1536
" Filenames are interpreted within their historical context. To log a\n"
1537
" deleted file, specify a revision range so that the file existed at\n"
1538
" the end or start of the range."
1539
msgstr ""
1540
1541
#: bzrlib/builtins.py:2459
1542
msgid ""
1543
" Historical context is also important when interpreting pathnames of\n"
1544
" renamed files/directories. Consider the following example:"
1545
msgstr ""
1546
1547
#: bzrlib/builtins.py:2462
1548
msgid ""
1549
" * revision 1: add tutorial.txt\n"
1550
" * revision 2: modify tutorial.txt\n"
1551
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1552
msgstr ""
1553
1554
#: bzrlib/builtins.py:2466
1555
msgid " In this case:"
1556
msgstr ""
1557
1558
#: bzrlib/builtins.py:2468
1559
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1560
msgstr ""
1561
1562
#: bzrlib/builtins.py:2470
1563
msgid ""
1564
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1565
msgstr ""
1566
1567
#: bzrlib/builtins.py:2472
1568
msgid ""
1569
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1570
" the original file in revision 2."
1571
msgstr ""
1572
1573
#: bzrlib/builtins.py:2475
1574
msgid ""
1575
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1576
" was no file called guide.txt in revision 2."
1577
msgstr ""
1578
1579
#: bzrlib/builtins.py:2478
1580
msgid ""
1581
" Renames are always followed by log. By design, there is no need to\n"
1582
" explicitly ask for this (and no way to stop logging a file back\n"
1583
" until it was last renamed)."
1584
msgstr ""
1585
1586
#: bzrlib/builtins.py:2482
1587
msgid ":Other filtering:"
1588
msgstr ""
1589
1590
#: bzrlib/builtins.py:2484
1591
msgid ""
1592
" The --match option can be used for finding revisions that match a\n"
1593
" regular expression in a commit message, committer, author or bug.\n"
1594
" Specifying the option several times will match any of the supplied\n"
1595
" expressions. --match-author, --match-bugs, --match-committer and\n"
1596
" --match-message can be used to only match a specific field."
1597
msgstr ""
1598
1599
#: bzrlib/builtins.py:2490
1600
msgid ":Tips & tricks:"
1601
msgstr ""
1602
1603
#: bzrlib/builtins.py:2492
1604
msgid ""
1605
" GUI tools and IDEs are often better at exploring history than command\n"
1606
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1607
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1608
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1609
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1610
msgstr ""
1611
1612
#: bzrlib/builtins.py:2498
1613
msgid ""
1614
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1615
msgstr ""
1616
1617
#: bzrlib/builtins.py:2500
1618
msgid ""
1619
" [ALIASES]\n"
1620
" tip = log -r-1\n"
1621
" top = log -l10 --line\n"
1622
" show = log -v -p"
1623
msgstr ""
1624
1625
#: bzrlib/builtins.py:2505
1626
msgid ""
1627
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1628
" will show the last 10 mainline revisions. To see the details of a\n"
1629
" particular revision X, ``bzr show -rX``."
1630
msgstr ""
1631
1632
#: bzrlib/builtins.py:2509
1633
msgid ""
1634
" If you are interested in looking deeper into a particular merge X,\n"
1635
" use ``bzr log -n0 -rX``."
1636
msgstr ""
1637
1638
#: bzrlib/builtins.py:2512
1639
msgid ""
1640
" ``bzr log -v`` on a branch with lots of history is currently\n"
1641
" very slow. A fix for this issue is currently under development.\n"
1642
" With or without that fix, it is recommended that a revision range\n"
1643
" be given when using the -v option."
1644
msgstr ""
1645
1646
#: bzrlib/builtins.py:2517
1647
msgid ""
1648
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1649
" used to find revisions matching user names, commit messages, etc.\n"
1650
" Among other features, this plugin can find all revisions containing\n"
1651
" a list of words but not others."
1652
msgstr ""
1653
1654
#: bzrlib/builtins.py:2522
1655
msgid ""
1656
" When exploring non-mainline history on large projects with deep\n"
1657
" history, the performance of log can be greatly improved by installing\n"
1658
" the historycache plugin. This plugin buffers historical information\n"
1659
" trading disk space for faster speed."
1660
msgstr ""
1661
1662
#: bzrlib/builtins.py:2531
1663
msgid "Show from oldest to newest."
1664
msgstr ""
1665
1666
#: bzrlib/builtins.py:2534
1667
msgid "Show files changed in each revision."
1668
msgstr ""
1669
1670
#: bzrlib/builtins.py:2540
1671
msgid "Show just the specified revision. See also \"help revisionspec\"."
1672
msgstr ""
1673
1674
#: bzrlib/builtins.py:2544
1675
msgid "What names to list as authors - first, all or committer."
1676
msgstr ""
1677
1678
#: bzrlib/builtins.py:2545
1679
msgid "Authors"
1680
msgstr ""
1681
1682
#: bzrlib/builtins.py:2550
1683
msgid "Number of levels to display - 0 for all, 1 for flat."
1684
msgstr ""
1685
1686
#: bzrlib/builtins.py:2560
1687
msgid "Limit the output to the first N revisions."
1688
msgstr ""
1689
1690
#: bzrlib/builtins.py:2565
1691
msgid "Show changes made in each revision as a patch."
1692
msgstr ""
1693
1694
#: bzrlib/builtins.py:2567
1695
msgid "Show merged revisions like --levels 0 does."
1696
msgstr ""
1697
1698
#: bzrlib/builtins.py:2571
1699
msgid "Do not report commits with more than one parent."
1700
msgstr ""
1701
1702
#: bzrlib/builtins.py:2573
1703
msgid ""
1704
"Display only the revisions that are not part of both ancestries (require -"
1705
"rX..Y)."
1706
msgstr ""
1707
1708
#: bzrlib/builtins.py:2577
1709
msgid "Show digital signature validity."
1710
msgstr ""
1711
1712
#: bzrlib/builtins.py:2580
1713
msgid "Show revisions whose properties match this expression."
1714
msgstr ""
1715
1716
#: bzrlib/builtins.py:2584
1717
msgid "Show revisions whose message matches this expression."
1718
msgstr ""
1719
1720
#: bzrlib/builtins.py:2588
1721
msgid "Show revisions whose committer matches this expression."
1722
msgstr ""
1723
1724
#: bzrlib/builtins.py:2592
1725
msgid "Show revisions whose authors match this expression."
1726
msgstr ""
1727
1728
#: bzrlib/builtins.py:2596
1729
msgid "Show revisions whose bugs match this expression."
1730
msgstr ""
1731
1732
#: bzrlib/builtins.py:2650
1733
msgid "--exclude-common-ancestry requires -r with two revisions"
1734
msgstr ""
1735
1736
#: bzrlib/builtins.py:2678
1737
#, python-format
1738
msgid "Path unknown at end or start of revision range: %s"
1739
msgstr ""
1740
1741
#: bzrlib/builtins.py:2795
1742
#, python-format
1743
msgid "bzr %s doesn't accept two revisions in different branches."
1744
msgstr ""
1745
1746
#: bzrlib/builtins.py:2811
1747
#, python-format
1748
msgid "bzr %s --revision takes one or two values."
1749
msgstr ""
1750
1751
#: bzrlib/builtins.py:2856
1752
msgid ""
1753
"List files in a tree.\n"
1754
" "
1755
msgstr ""
1756
1757
#: bzrlib/builtins.py:2865
1758
msgid "Recurse into subdirectories."
1759
msgstr ""
1760
1761
#: bzrlib/builtins.py:2867
1762
msgid "Print paths relative to the root of the branch."
1763
msgstr ""
1764
1765
#: bzrlib/builtins.py:2869
1766
msgid "Print unknown files."
1767
msgstr ""
1768
1769
#: bzrlib/builtins.py:2870
1770
msgid "Print versioned files."
1771
msgstr ""
1772
1773
#: bzrlib/builtins.py:2873
1774
msgid "Print ignored files."
1775
msgstr ""
1776
1777
#: bzrlib/builtins.py:2875
1778
msgid "List entries of a particular kind: file, directory, symlink."
1779
msgstr ""
1780
1781
#: bzrlib/builtins.py:2888
1782
msgid "invalid kind specified"
1783
msgstr ""
1784
1785
#: bzrlib/builtins.py:2891
1786
msgid "Cannot set both --verbose and --null"
1787
msgstr ""
1788
1789
#: bzrlib/builtins.py:2900
1790
msgid "cannot specify both --from-root and PATH"
1791
msgstr ""
1792
1793
#: bzrlib/builtins.py:2987
1794
msgid "Ignore specified files or patterns."
1795
msgstr ""
1796
1797
#: bzrlib/builtins.py:2989
1798
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1799
msgstr ""
1800
1801
#: bzrlib/builtins.py:2991
1802
msgid ""
1803
"If a .bzrignore file does not exist, the ignore command\n"
1804
"will create one and add the specified files or patterns to the newly\n"
1805
"created file. The ignore command will also automatically add the \n"
1806
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1807
"the use of the ignore command will require an explicit add command."
1808
msgstr ""
1809
1810
#: bzrlib/builtins.py:2997
1811
msgid ""
1812
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1813
"After adding, editing or deleting that file either indirectly by\n"
1814
"using this command or directly by using an editor, be sure to commit\n"
1815
"it."
1816
msgstr ""
1817
1818
#: bzrlib/builtins.py:3002
1819
msgid ""
1820
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1821
"the global ignore file can be found in the application data directory as\n"
1822
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1823
"Global ignores are not touched by this command. The global ignore file\n"
1824
"can be edited directly using an editor."
1825
msgstr ""
1826
1827
#: bzrlib/builtins.py:3008
1828
msgid ""
1829
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1830
"precedence over regular ignores. Such exceptions are used to specify\n"
1831
"files that should be versioned which would otherwise be ignored."
1832
msgstr ""
1833
1834
#: bzrlib/builtins.py:3012
1835
msgid ""
1836
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1837
"precedence over the '!' exception patterns."
1838
msgstr ""
1839
1840
#: bzrlib/builtins.py:3015
1841
msgid ""
1842
":Notes: \n"
1843
" \n"
1844
"* Ignore patterns containing shell wildcards must be quoted from\n"
1845
" the shell on Unix."
1846
msgstr ""
1847
1848
#: bzrlib/builtins.py:3020
1849
msgid ""
1850
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1851
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1852
msgstr ""
1853
1854
#: bzrlib/builtins.py:3023
1855
msgid ""
1856
":Examples:\n"
1857
" Ignore the top level Makefile::"
1858
msgstr ""
1859
1860
#: bzrlib/builtins.py:3026
1861
msgid " bzr ignore ./Makefile"
1862
msgstr ""
1863
1864
#: bzrlib/builtins.py:3028
1865
msgid " Ignore .class files in all directories...::"
1866
msgstr ""
1867
1868
#: bzrlib/builtins.py:3030
1869
msgid " bzr ignore \"*.class\""
1870
msgstr ""
1871
1872
#: bzrlib/builtins.py:3032
1873
msgid " ...but do not ignore \"special.class\"::"
1874
msgstr ""
1875
1876
#: bzrlib/builtins.py:3034
1877
msgid " bzr ignore \"!special.class\""
1878
msgstr ""
1879
1880
#: bzrlib/builtins.py:3036
1881
msgid " Ignore files whose name begins with the \"#\" character::"
1882
msgstr ""
1883
1884
#: bzrlib/builtins.py:3038
1885
msgid " bzr ignore \"RE:^#\""
1886
msgstr ""
1887
1888
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
1889
msgid " Ignore .o files under the lib directory::"
1890
msgstr ""
1891
1892
#: bzrlib/builtins.py:3042
1893
msgid " bzr ignore \"lib/**/*.o\""
1894
msgstr ""
1895
1896
#: bzrlib/builtins.py:3046
1897
msgid " bzr ignore \"RE:lib/.*\\.o\""
1898
msgstr ""
1899
1900
#: bzrlib/builtins.py:3048
1901
msgid " Ignore everything but the \"debian\" toplevel directory::"
1902
msgstr ""
1903
1904
#: bzrlib/builtins.py:3050
1905
msgid ""
1906
" bzr ignore \"RE:(?!debian/).*\"\n"
1907
" \n"
1908
" Ignore everything except the \"local\" toplevel directory,\n"
1909
" but always ignore autosave files ending in ~, even under local/::\n"
1910
" \n"
1911
" bzr ignore \"*\"\n"
1912
" bzr ignore \"!./local\"\n"
1913
" bzr ignore \"!!*~\""
1914
msgstr ""
1915
1916
#: bzrlib/builtins.py:3064
1917
msgid "Display the default ignore rules that bzr uses."
1918
msgstr ""
1919
1920
#: bzrlib/builtins.py:3076
1921
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1922
msgstr ""
1923
1924
#: bzrlib/builtins.py:3087
1925
#, python-format
1926
msgid "Invalid ignore pattern found. %s"
1927
msgid_plural "Invalid ignore patterns found. %s"
1928
msgstr[0] ""
1929
msgstr[1] ""
1930
1931
#: bzrlib/builtins.py:3096
1932
msgid "NAME_PATTERN should not be an absolute path"
1933
msgstr ""
1934
1935
#: bzrlib/builtins.py:3109
1936
#, python-format
1937
msgid ""
1938
"Warning: the following files are version controlled and match your ignore "
1939
"pattern:\n"
1940
"%s\n"
1941
"These files will continue to be version controlled unless you 'bzr remove' "
1942
"them.\n"
1943
msgstr ""
1944
1945
#: bzrlib/builtins.py:3116
1946
msgid "List ignored files and the patterns that matched them."
1947
msgstr ""
1948
1949
#: bzrlib/builtins.py:3118
1950
msgid ""
1951
"List all the ignored files and the ignore pattern that caused the file to\n"
1952
"be ignored."
1953
msgstr ""
1954
1955
#: bzrlib/builtins.py:3121
1956
msgid "Alternatively, to list just the files::"
1957
msgstr ""
1958
1959
#: bzrlib/builtins.py:3123
1960
msgid " bzr ls --ignored"
1961
msgstr ""
1962
1963
#: bzrlib/builtins.py:3157
1964
#, python-format
1965
msgid "not a valid revision-number: %r"
1966
msgstr ""
1967
1968
#: bzrlib/builtins.py:3164
1969
msgid ""
1970
"Export current or past revision to a destination directory or archive."
1971
msgstr ""
1972
1973
#: bzrlib/builtins.py:3166
1974
msgid "If no revision is specified this exports the last committed revision."
1975
msgstr ""
1976
1977
#: bzrlib/builtins.py:3168
1978
msgid ""
1979
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1980
"given, try to find the format with the extension. If no extension\n"
1981
"is found exports to a directory (equivalent to --format=dir)."
1982
msgstr ""
1983
1984
#: bzrlib/builtins.py:3172
1985
msgid ""
1986
"If root is supplied, it will be used as the root directory inside\n"
1987
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1988
"to the exported filename. The root option has no effect for 'dir' format."
1989
msgstr ""
1990
1991
#: bzrlib/builtins.py:3176
1992
msgid ""
1993
"If branch is omitted then the branch containing the current working\n"
1994
"directory will be used."
1995
msgstr ""
1996
1997
#: bzrlib/builtins.py:3179
1998
msgid ""
1999
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2000
msgstr ""
2001
2002
#: bzrlib/builtins.py:3181
2003
msgid ""
2004
" ================= =========================\n"
2005
" Supported formats Autodetected by extension\n"
2006
" ================= =========================\n"
2007
" dir (none)\n"
2008
" tar .tar\n"
2009
" tbz2 .tar.bz2, .tbz2\n"
2010
" tgz .tar.gz, .tgz\n"
2011
" zip .zip\n"
2012
" ================= ========================="
2013
msgstr ""
2014
2015
#: bzrlib/builtins.py:3195
2016
msgid "Type of file to export to."
2017
msgstr ""
2018
2019
#: bzrlib/builtins.py:3198
2020
msgid "Apply content filters to export the convenient form."
2021
msgstr ""
2022
2023
#: bzrlib/builtins.py:3202
2024
msgid "Name of the root directory inside the exported file."
2025
msgstr ""
2026
2027
#: bzrlib/builtins.py:3204
2028
msgid ""
2029
"Set modification time of files to that of the last revision in which it was "
2030
"changed."
2031
msgstr ""
2032
2033
#: bzrlib/builtins.py:3207
2034
msgid ""
2035
"Export the working tree contents rather than that of the last revision."
2036
msgstr ""
2037
2038
#: bzrlib/builtins.py:3226
2039
msgid "--uncommitted requires a working tree"
2040
msgstr ""
2041
2042
#: bzrlib/builtins.py:3235
2043
#, python-format
2044
msgid "Unsupported export format: %s"
2045
msgstr ""
2046
2047
#: bzrlib/builtins.py:3239
2048
msgid ""
2049
"Write the contents of a file as of a given revision to standard output."
2050
msgstr ""
2051
2052
#: bzrlib/builtins.py:3241
2053
msgid "If no revision is nominated, the last revision is used."
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3243
2057
msgid ""
2058
"Note: Take care to redirect standard output when using this command on a\n"
2059
"binary file."
2060
msgstr ""
2061
2062
#: bzrlib/builtins.py:3249
2063
msgid "The path name in the old tree."
2064
msgstr ""
2065
2066
#: bzrlib/builtins.py:3250
2067
msgid "Apply content filters to display the convenience form."
2068
msgstr ""
2069
2070
#: bzrlib/builtins.py:3261
2071
msgid "bzr cat --revision takes exactly one revision specifier"
2072
msgstr ""
2073
2074
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2075
msgid "{0!r} is not present in revision {1}"
2076
msgstr ""
2077
2078
#: bzrlib/builtins.py:3321
2079
msgid "Commit changes into a new revision."
2080
msgstr ""
2081
2082
#: bzrlib/builtins.py:3323
2083
msgid ""
2084
"An explanatory message needs to be given for each commit. This is\n"
2085
"often done by using the --message option (getting the message from the\n"
2086
"command line) or by using the --file option (getting the message from\n"
2087
"a file). If neither of these options is given, an editor is opened for\n"
2088
"the user to enter the message. To see the changed files in the\n"
2089
"boilerplate text loaded into the editor, use the --show-diff option."
2090
msgstr ""
2091
2092
#: bzrlib/builtins.py:3330
2093
msgid ""
2094
"By default, the entire tree is committed and the person doing the\n"
2095
"commit is assumed to be the author. These defaults can be overridden\n"
2096
"as explained below."
2097
msgstr ""
2098
2099
#: bzrlib/builtins.py:3334
2100
msgid ":Selective commits:"
2101
msgstr ""
2102
2103
#: bzrlib/builtins.py:3336
2104
msgid ""
2105
" If selected files are specified, only changes to those files are\n"
2106
" committed. If a directory is specified then the directory and\n"
2107
" everything within it is committed."
2108
msgstr ""
2109
2110
#: bzrlib/builtins.py:3340
2111
msgid ""
2112
" When excludes are given, they take precedence over selected files.\n"
2113
" For example, to commit only changes within foo, but not changes\n"
2114
" within foo/bar::"
2115
msgstr ""
2116
2117
#: bzrlib/builtins.py:3344
2118
msgid " bzr commit foo -x foo/bar"
2119
msgstr ""
2120
2121
#: bzrlib/builtins.py:3346
2122
msgid " A selective commit after a merge is not yet supported."
2123
msgstr ""
2124
2125
#: bzrlib/builtins.py:3348
2126
msgid ":Custom authors:"
2127
msgstr ""
2128
2129
#: bzrlib/builtins.py:3350
2130
msgid ""
2131
" If the author of the change is not the same person as the committer,\n"
2132
" you can specify the author's name using the --author option. The\n"
2133
" name should be in the same format as a committer-id, e.g.\n"
2134
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2135
" the change you can specify the option multiple times, once for each\n"
2136
" author."
2137
msgstr ""
2138
2139
#: bzrlib/builtins.py:3357
2140
msgid ":Checks:"
2141
msgstr ""
2142
2143
#: bzrlib/builtins.py:3359
2144
msgid ""
2145
" A common mistake is to forget to add a new file or directory before\n"
2146
" running the commit command. The --strict option checks for unknown\n"
2147
" files and aborts the commit if any are found. More advanced pre-commit\n"
2148
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2149
" for details."
2150
msgstr ""
2151
2152
#: bzrlib/builtins.py:3365
2153
msgid ":Things to note:"
2154
msgstr ""
2155
2156
#: bzrlib/builtins.py:3367
2157
msgid ""
2158
" If you accidentially commit the wrong changes or make a spelling\n"
2159
" mistake in the commit message say, you can use the uncommit command\n"
2160
" to undo it. See ``bzr help uncommit`` for details."
2161
msgstr ""
2162
2163
#: bzrlib/builtins.py:3371
2164
msgid ""
2165
" Hooks can also be configured to run after a commit. This allows you\n"
2166
" to trigger updates to external systems like bug trackers. The --fixes\n"
2167
" option can be used to record the association between a revision and\n"
2168
" one or more bugs. See ``bzr help bugs`` for details."
2169
msgstr ""
2170
2171
#: bzrlib/builtins.py:3381
2172
msgid "Do not consider changes made to a given path."
2173
msgstr ""
2174
2175
#: bzrlib/builtins.py:3384
2176
msgid "Description of the new revision."
2177
msgstr ""
2178
2179
#: bzrlib/builtins.py:3387
2180
msgid "Commit even if nothing has changed."
2181
msgstr ""
2182
2183
#: bzrlib/builtins.py:3391
2184
msgid "Take commit message from this file."
2185
msgstr ""
2186
2187
#: bzrlib/builtins.py:3393
2188
msgid "Refuse to commit if there are unknown files in the working tree."
2189
msgstr ""
2190
2191
#: bzrlib/builtins.py:3396
2192
msgid ""
2193
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2194
"08:00:00 +0100'."
2195
msgstr ""
2196
2197
#: bzrlib/builtins.py:3399
2198
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2199
msgstr ""
2200
2201
#: bzrlib/builtins.py:3402
2202
msgid "Set the author's name, if it's different from the committer."
2203
msgstr ""
2204
2205
#: bzrlib/builtins.py:3405
2206
msgid ""
2207
"Perform a local commit in a bound branch. Local commits are not pushed to "
2208
"the master branch until a normal commit is performed."
2209
msgstr ""
2210
2211
#: bzrlib/builtins.py:3411
2212
msgid ""
2213
"When no message is supplied, show the diff along with the status summary in "
2214
"the message editor."
2215
msgstr ""
2216
2217
#: bzrlib/builtins.py:3414
2218
msgid ""
2219
"When committing to a foreign version control system do not push data that "
2220
"can not be natively represented."
2221
msgstr ""
2222
2223
#: bzrlib/builtins.py:3432
2224
#, python-format
2225
msgid ""
2226
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2227
"default bug tracker using the `bugtracker` option.\n"
2228
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2229
msgstr ""
2230
2231
#: bzrlib/builtins.py:3441
2232
#, python-format
2233
msgid ""
2234
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2235
"for more information on this feature.\n"
2236
"Commit refused."
2237
msgstr ""
2238
2239
#: bzrlib/builtins.py:3450
2240
#, python-format
2241
msgid "Unrecognized bug %s. Commit refused."
2242
msgstr ""
2243
2244
#: bzrlib/builtins.py:3453
2245
#, python-format
2246
msgid ""
2247
"%s\n"
2248
"Commit refused."
2249
msgstr ""
2250
2251
#: bzrlib/builtins.py:3477
2252
msgid "Could not parse --commit-time: "
2253
msgstr ""
2254
2255
#: bzrlib/builtins.py:3517
2256
msgid "please specify either --message or --file"
2257
msgstr ""
2258
2259
#: bzrlib/builtins.py:3546
2260
msgid "please specify a commit message with either --message or --file"
2261
msgstr ""
2262
2263
#: bzrlib/builtins.py:3549
2264
msgid ""
2265
"Empty commit message specified. Please specify a commit message with either -"
2266
"-message or --file or leave a blank message with --message \"\"."
2267
msgstr ""
2268
2269
#: bzrlib/builtins.py:3569
2270
msgid ""
2271
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2272
"-unchanged to force an empty commit."
2273
msgstr ""
2274
2275
#: bzrlib/builtins.py:3573
2276
msgid ""
2277
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2278
"resolve FILE\" to resolve."
2279
msgstr ""
2280
2281
#: bzrlib/builtins.py:3577
2282
msgid "Commit refused because there are unknown files in the working tree."
2283
msgstr ""
2284
2285
#: bzrlib/builtins.py:3580
2286
msgid ""
2287
"\n"
2288
"To commit to master branch, run update and then commit.\n"
2289
"You can also pass --local to commit to continue working disconnected."
2290
msgstr ""
2291
2292
#: bzrlib/builtins.py:3588
2293
msgid ""
2294
"Validate working tree structure, branch consistency and repository history."
2295
msgstr ""
2296
2297
#: bzrlib/builtins.py:3590
2298
msgid ""
2299
"This command checks various invariants about branch and repository storage\n"
2300
"to detect data corruption or bzr bugs."
2301
msgstr ""
2302
2303
#: bzrlib/builtins.py:3593
2304
msgid ""
2305
"The working tree and branch checks will only give output if a problem is\n"
2306
"detected. The output fields of the repository check are:"
2307
msgstr ""
2308
2309
#: bzrlib/builtins.py:3596
2310
msgid ""
2311
"revisions\n"
2312
" This is just the number of revisions checked. It doesn't\n"
2313
" indicate a problem."
2314
msgstr ""
2315
2316
#: bzrlib/builtins.py:3600
2317
msgid ""
2318
"versionedfiles\n"
2319
" This is just the number of versionedfiles checked. It\n"
2320
" doesn't indicate a problem."
2321
msgstr ""
2322
2323
#: bzrlib/builtins.py:3604
2324
msgid ""
2325
"unreferenced ancestors\n"
2326
" Texts that are ancestors of other texts, but\n"
2327
" are not properly referenced by the revision ancestry. This is a\n"
2328
" subtle problem that Bazaar can work around."
2329
msgstr ""
2330
2331
#: bzrlib/builtins.py:3609
2332
msgid ""
2333
"unique file texts\n"
2334
" This is the total number of unique file contents\n"
2335
" seen in the checked revisions. It does not indicate a problem."
2336
msgstr ""
2337
2338
#: bzrlib/builtins.py:3613
2339
msgid ""
2340
"repeated file texts\n"
2341
" This is the total number of repeated texts seen\n"
2342
" in the checked revisions. Texts can be repeated when their file\n"
2343
" entries are modified, but the file contents are not. It does not\n"
2344
" indicate a problem."
2345
msgstr ""
2346
2347
#: bzrlib/builtins.py:3619
2348
msgid ""
2349
"If no restrictions are specified, all Bazaar data that is found at the "
2350
"given\n"
2351
"location will be checked."
2352
msgstr ""
2353
2354
#: bzrlib/builtins.py:3624
2355
msgid " Check the tree and branch at 'foo'::"
2356
msgstr ""
2357
2358
#: bzrlib/builtins.py:3626
2359
msgid " bzr check --tree --branch foo"
2360
msgstr ""
2361
2362
#: bzrlib/builtins.py:3628
2363
msgid " Check only the repository at 'bar'::"
2364
msgstr ""
2365
2366
#: bzrlib/builtins.py:3630
2367
msgid " bzr check --repo bar"
2368
msgstr ""
2369
2370
#: bzrlib/builtins.py:3632
2371
msgid " Check everything at 'baz'::"
2372
msgstr ""
2373
2374
#: bzrlib/builtins.py:3634
2375
msgid " bzr check baz"
2376
msgstr ""
2377
2378
#: bzrlib/builtins.py:3640
2379
msgid "Check the branch related to the current directory."
2380
msgstr ""
2381
2382
#: bzrlib/builtins.py:3642
2383
msgid "Check the repository related to the current directory."
2384
msgstr ""
2385
2386
#: bzrlib/builtins.py:3644
2387
msgid "Check the working tree related to the current directory."
2388
msgstr ""
2389
2390
#: bzrlib/builtins.py:3658
2391
msgid "Upgrade a repository, branch or working tree to a newer format."
2392
msgstr ""
2393
2394
#: bzrlib/builtins.py:3660
2395
msgid ""
2396
"When the default format has changed after a major new release of\n"
2397
"Bazaar, you may be informed during certain operations that you\n"
2398
"should upgrade. Upgrading to a newer format may improve performance\n"
2399
"or make new features available. It may however limit interoperability\n"
2400
"with older repositories or with older versions of Bazaar."
2401
msgstr ""
2402
2403
#: bzrlib/builtins.py:3666
2404
msgid ""
2405
"If you wish to upgrade to a particular format rather than the\n"
2406
"current default, that can be specified using the --format option.\n"
2407
"As a consequence, you can use the upgrade command this way to\n"
2408
"\"downgrade\" to an earlier format, though some conversions are\n"
2409
"a one way process (e.g. changing from the 1.x default to the\n"
2410
"2.x default) so downgrading is not always possible."
2411
msgstr ""
2412
2413
#: bzrlib/builtins.py:3673
2414
msgid ""
2415
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2416
"process (where # is a number). By default, this is left there on\n"
2417
"completion. If the conversion fails, delete the new .bzr directory\n"
2418
"and rename this one back in its place. Use the --clean option to ask\n"
2419
"for the backup.bzr directory to be removed on successful conversion.\n"
2420
"Alternatively, you can delete it by hand if everything looks good\n"
2421
"afterwards."
2422
msgstr ""
2423
2424
#: bzrlib/builtins.py:3681
2425
msgid ""
2426
"If the location given is a shared repository, dependent branches\n"
2427
"are also converted provided the repository converts successfully.\n"
2428
"If the conversion of a branch fails, remaining branches are still\n"
2429
"tried."
2430
msgstr ""
2431
2432
#: bzrlib/builtins.py:3686
2433
msgid ""
2434
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2435
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2436
msgstr ""
2437
2438
#: bzrlib/builtins.py:3694
2439
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2440
msgstr ""
2441
2442
#: bzrlib/builtins.py:3698
2443
msgid "Branch format"
2444
msgstr ""
2445
2446
#: bzrlib/builtins.py:3700
2447
msgid "Remove the backup.bzr directory if successful."
2448
msgstr ""
2449
2450
#: bzrlib/builtins.py:3702
2451
msgid "Show what would be done, but don't actually do anything."
2452
msgstr ""
2453
2454
#: bzrlib/builtins.py:3717
2455
msgid "Show or set bzr user id."
2456
msgstr ""
2457
2458
#: bzrlib/builtins.py:3719
2459
msgid ""
2460
":Examples:\n"
2461
" Show the email of the current user::"
2462
msgstr ""
2463
2464
#: bzrlib/builtins.py:3722
2465
msgid " bzr whoami --email"
2466
msgstr ""
2467
2468
#: bzrlib/builtins.py:3724
2469
msgid " Set the current user::"
2470
msgstr ""
2471
2472
#: bzrlib/builtins.py:3726
2473
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2474
msgstr ""
2475
2476
#: bzrlib/builtins.py:3730
2477
msgid "Display email address only."
2478
msgstr ""
2479
2480
#: bzrlib/builtins.py:3732
2481
msgid "Set identity for the current branch instead of globally."
2482
msgstr ""
2483
2484
#: bzrlib/builtins.py:3758
2485
msgid "--email can only be used to display existing identity"
2486
msgstr ""
2487
2488
#: bzrlib/builtins.py:3780
2489
msgid "Print or set the branch nickname."
2490
msgstr ""
2491
2492
#: bzrlib/builtins.py:3782
2493
msgid ""
2494
"If unset, the tree root directory name is used as the nickname.\n"
2495
"To print the current nickname, execute with no argument."
2496
msgstr ""
2497
2498
#: bzrlib/builtins.py:3785
2499
msgid ""
2500
"Bound branches use the nickname of its master branch unless it is set\n"
2501
"locally."
2502
msgstr ""
2503
2504
#: bzrlib/builtins.py:3805
2505
msgid "Set/unset and display aliases."
2506
msgstr ""
2507
2508
#: bzrlib/builtins.py:3807
2509
msgid ""
2510
":Examples:\n"
2511
" Show the current aliases::"
2512
msgstr ""
2513
2514
#: bzrlib/builtins.py:3810
2515
msgid " bzr alias"
2516
msgstr ""
2517
2518
#: bzrlib/builtins.py:3812
2519
msgid " Show the alias specified for 'll'::"
2520
msgstr ""
2521
2522
#: bzrlib/builtins.py:3814
2523
msgid " bzr alias ll"
2524
msgstr ""
2525
2526
#: bzrlib/builtins.py:3816
2527
msgid " Set an alias for 'll'::"
2528
msgstr ""
2529
2530
#: bzrlib/builtins.py:3818
2531
msgid " bzr alias ll=\"log --line -r-10..-1\""
2532
msgstr ""
2533
2534
#: bzrlib/builtins.py:3820
2535
msgid " To remove an alias for 'll'::"
2536
msgstr ""
2537
2538
#: bzrlib/builtins.py:3822
2539
msgid " bzr alias --remove ll"
2540
msgstr ""
2541
2542
#: bzrlib/builtins.py:3827
2543
msgid "Remove the alias."
2544
msgstr ""
2545
2546
#: bzrlib/builtins.py:3845
2547
msgid "bzr alias --remove expects an alias to remove."
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:4026
2551
msgid ""
2552
"subunit not available. subunit needs to be installed to use --subunit."
2553
msgstr ""
2554
2555
#: bzrlib/builtins.py:4043
2556
msgid ""
2557
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2558
msgstr ""
2559
2560
#: bzrlib/builtins.py:4090
2561
msgid "Show version of bzr."
2562
msgstr ""
2563
2564
#: bzrlib/builtins.py:4094
2565
msgid "Print just the version number."
2566
msgstr ""
2567
2568
#: bzrlib/builtins.py:4113
2569
msgid "It sure does!\n"
2570
msgstr ""
2571
2572
#: bzrlib/builtins.py:4137
2573
#, python-format
2574
msgid "merge base is revision %s\n"
2575
msgstr ""
2576
2577
#: bzrlib/builtins.py:4141
2578
msgid "Perform a three-way merge."
2579
msgstr ""
2580
2581
#: bzrlib/builtins.py:4143
2582
msgid ""
2583
"The source of the merge can be specified either in the form of a branch,\n"
2584
"or in the form of a path to a file containing a merge directive generated\n"
2585
"with bzr send. If neither is specified, the default is the upstream branch\n"
2586
"or the branch most recently merged using --remember. The source of the\n"
2587
"merge may also be specified in the form of a path to a file in another\n"
2588
"branch: in this case, only the modifications to that file are merged into\n"
2589
"the current working tree."
2590
msgstr ""
2591
2592
#: bzrlib/builtins.py:4151
2593
msgid ""
2594
"When merging from a branch, by default bzr will try to merge in all new\n"
2595
"work from the other branch, automatically determining an appropriate base\n"
2596
"revision. If this fails, you may need to give an explicit base."
2597
msgstr ""
2598
2599
#: bzrlib/builtins.py:4155
2600
msgid ""
2601
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2602
"try to merge in all new work up to and including revision OTHER."
2603
msgstr ""
2604
2605
#: bzrlib/builtins.py:4158
2606
msgid ""
2607
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2608
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2609
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2610
"not already contain revision BASE, such a merge is commonly referred to as\n"
2611
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2612
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2613
"changes from the other branch is not stored in the commit."
2614
msgstr ""
2615
2616
#: bzrlib/builtins.py:4166
2617
msgid "Revision numbers are always relative to the source branch."
2618
msgstr ""
2619
2620
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2621
msgid ""
2622
"Merge will do its best to combine the changes in two branches, but there\n"
2623
"are some kinds of problems only a human can fix. When it encounters those,\n"
2624
"it will mark a conflict. A conflict means that you need to fix something,\n"
2625
"before you should commit."
2626
msgstr ""
2627
2628
#: bzrlib/builtins.py:4173
2629
msgid ""
2630
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2631
msgstr ""
2632
2633
#: bzrlib/builtins.py:4175
2634
msgid ""
2635
"If there is no default branch set, the first merge will set it (use\n"
2636
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2637
"to use the default. To change the default, use --remember. The value will\n"
2638
"only be saved if the remote location can be accessed."
2639
msgstr ""
2640
2641
#: bzrlib/builtins.py:4180
2642
msgid ""
2643
"The results of the merge are placed into the destination working\n"
2644
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2645
"committed to record the result of the merge."
2646
msgstr ""
2647
2648
#: bzrlib/builtins.py:4184
2649
msgid ""
2650
"merge refuses to run if there are any uncommitted changes, unless\n"
2651
"--force is given. If --force is given, then the changes from the source \n"
2652
"will be merged with the current working tree, including any uncommitted\n"
2653
"changes in the tree. The --force option can also be used to create a\n"
2654
"merge revision which has more than two parents."
2655
msgstr ""
2656
2657
#: bzrlib/builtins.py:4190
2658
msgid ""
2659
"If one would like to merge changes from the working tree of the other\n"
2660
"branch without merging any committed revisions, the --uncommitted option\n"
2661
"can be given."
2662
msgstr ""
2663
2664
#: bzrlib/builtins.py:4194
2665
msgid ""
2666
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2667
"you to apply each diff hunk and file change, similar to \"shelve\"."
2668
msgstr ""
2669
2670
#: bzrlib/builtins.py:4197
2671
msgid ""
2672
":Examples:\n"
2673
" To merge all new revisions from bzr.dev::"
2674
msgstr ""
2675
2676
#: bzrlib/builtins.py:4200
2677
msgid " bzr merge ../bzr.dev"
2678
msgstr ""
2679
2680
#: bzrlib/builtins.py:4202
2681
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2682
msgstr ""
2683
2684
#: bzrlib/builtins.py:4204
2685
msgid " bzr merge -r 82 ../bzr.dev"
2686
msgstr ""
2687
2688
#: bzrlib/builtins.py:4206
2689
msgid " To merge the changes introduced by 82, without previous changes::"
2690
msgstr ""
2691
2692
#: bzrlib/builtins.py:4208
2693
msgid " bzr merge -r 81..82 ../bzr.dev"
2694
msgstr ""
2695
2696
#: bzrlib/builtins.py:4210
2697
msgid " To apply a merge directive contained in /tmp/merge::"
2698
msgstr ""
2699
2700
#: bzrlib/builtins.py:4212
2701
msgid " bzr merge /tmp/merge"
2702
msgstr ""
2703
2704
#: bzrlib/builtins.py:4214
2705
msgid ""
2706
" To create a merge revision with three parents from two branches\n"
2707
" feature1a and feature1b:"
2708
msgstr ""
2709
2710
#: bzrlib/builtins.py:4217
2711
msgid ""
2712
" bzr merge ../feature1a\n"
2713
" bzr merge ../feature1b --force\n"
2714
" bzr commit -m 'revision with three parents'"
2715
msgstr ""
2716
2717
#: bzrlib/builtins.py:4229
2718
msgid "Merge even if the destination tree has uncommitted changes."
2719
msgstr ""
2720
2721
#: bzrlib/builtins.py:4235
2722
msgid ""
2723
"Apply uncommitted changes from a working copy, instead of branch changes."
2724
msgstr ""
2725
2726
#: bzrlib/builtins.py:4237
2727
msgid ""
2728
"If the destination is already completely merged into the source, pull from "
2729
"the source rather than merging. When this happens, you do not need to "
2730
"commit the result."
2731
msgstr ""
2732
2733
#: bzrlib/builtins.py:4242
2734
msgid ""
2735
"Branch to merge into, rather than the one containing the working directory."
2736
msgstr ""
2737
2738
#: bzrlib/builtins.py:4244
2739
msgid "Instead of merging, show a diff of the merge."
2740
msgstr ""
2741
2742
#: bzrlib/builtins.py:4246
2743
msgid "Select changes interactively."
2744
msgstr ""
2745
2746
#: bzrlib/builtins.py:4268
2747
msgid ""
2748
"Merging into empty branches not currently supported, "
2749
"https://bugs.launchpad.net/bzr/+bug/308562"
2750
msgstr ""
2751
2752
#: bzrlib/builtins.py:4295
2753
msgid "Cannot use --uncommitted with bundles or merge directives."
2754
msgstr ""
2755
2756
#: bzrlib/builtins.py:4306
2757
msgid "Cannot use --uncommitted and --revision at the same time."
2758
msgstr ""
2759
2760
#: bzrlib/builtins.py:4326
2761
msgid "merger: "
2762
msgstr ""
2763
2764
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2765
msgid "Nothing to do."
2766
msgstr ""
2767
2768
#: bzrlib/builtins.py:4332
2769
msgid "Cannot pull individual files"
2770
msgstr ""
2771
2772
#: bzrlib/builtins.py:4340
2773
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2774
msgstr ""
2775
2776
#: bzrlib/builtins.py:4398
2777
#, python-format
2778
msgid "Show-base is not supported for this merge type. %s"
2779
msgstr ""
2780
2781
#: bzrlib/builtins.py:4407
2782
#, python-format
2783
msgid "Conflict reduction is not supported for merge type %s."
2784
msgstr ""
2785
2786
#: bzrlib/builtins.py:4411
2787
msgid "Cannot do conflict reduction and show base."
2788
msgstr ""
2789
2790
#: bzrlib/builtins.py:4522
2791
msgid "No location specified or remembered"
2792
msgstr ""
2793
2794
#: bzrlib/builtins.py:4524
2795
msgid "{0} remembered {1} location {2}"
2796
msgstr ""
2797
2798
#: bzrlib/builtins.py:4530
2799
msgid "Redo a merge."
2800
msgstr ""
2801
2802
#: bzrlib/builtins.py:4532
2803
msgid ""
2804
"Use this if you want to try a different merge technique while resolving\n"
2805
"conflicts. Some merge techniques are better than others, and remerge\n"
2806
"lets you try different ones on different files."
2807
msgstr ""
2808
2809
#: bzrlib/builtins.py:4536
2810
msgid ""
2811
"The options for remerge have the same meaning and defaults as the ones for\n"
2812
"merge. The difference is that remerge can (only) be run when there is a\n"
2813
"pending merge, and it lets you specify particular files."
2814
msgstr ""
2815
2816
#: bzrlib/builtins.py:4540
2817
msgid ""
2818
":Examples:\n"
2819
" Re-do the merge of all conflicted files, and show the base text in\n"
2820
" conflict regions, in addition to the usual THIS and OTHER texts::"
2821
msgstr ""
2822
2823
#: bzrlib/builtins.py:4544
2824
msgid " bzr remerge --show-base"
2825
msgstr ""
2826
2827
#: bzrlib/builtins.py:4546
2828
msgid ""
2829
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2830
" additional processing to reduce the size of conflict regions::"
2831
msgstr ""
2832
2833
#: bzrlib/builtins.py:4549
2834
msgid " bzr remerge --merge-type weave --reprocess foobar"
2835
msgstr ""
2836
2837
#: bzrlib/builtins.py:4556
2838
msgid "Show base revision text in conflicts."
2839
msgstr ""
2840
2841
#: bzrlib/builtins.py:4568
2842
msgid ""
2843
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2844
"merges."
2845
msgstr ""
2846
2847
#: bzrlib/builtins.py:4624
2848
msgid "Revert files to a previous revision."
2849
msgstr ""
2850
2851
#: bzrlib/builtins.py:4626
2852
msgid ""
2853
"Giving a list of files will revert only those files. Otherwise, all files\n"
2854
"will be reverted. If the revision is not specified with '--revision', the\n"
2855
"last committed revision is used."
2856
msgstr ""
2857
2858
#: bzrlib/builtins.py:4630
2859
msgid ""
2860
"To remove only some changes, without reverting to a prior version, use\n"
2861
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2862
"will remove the changes introduced by the second last commit (-2), without\n"
2863
"affecting the changes introduced by the last commit (-1). To remove\n"
2864
"certain changes on a hunk-by-hunk basis, see the shelve command."
2865
msgstr ""
2866
2867
#: bzrlib/builtins.py:4636
2868
msgid ""
2869
"By default, any files that have been manually changed will be backed up\n"
2870
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2871
"'.~#~' appended to their name, where # is a number."
2872
msgstr ""
2873
2874
#: bzrlib/builtins.py:4640
2875
msgid ""
2876
"When you provide files, you can use their current pathname or the pathname\n"
2877
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2878
"name. If you name a directory, all the contents of that directory will be\n"
2879
"reverted."
2880
msgstr ""
2881
2882
#: bzrlib/builtins.py:4645
2883
msgid ""
2884
"If you have newly added files since the target revision, they will be\n"
2885
"removed. If the files to be removed have been changed, backups will be\n"
2886
"created as above. Directories containing unknown files will not be\n"
2887
"deleted."
2888
msgstr ""
2889
2890
#: bzrlib/builtins.py:4650
2891
msgid ""
2892
"The working tree contains a list of revisions that have been merged but\n"
2893
"not yet committed. These revisions will be included as additional parents\n"
2894
"of the next commit. Normally, using revert clears that list as well as\n"
2895
"reverting the files. If any files are specified, revert leaves the list\n"
2896
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2897
".`` in the tree root to revert all files but keep the recorded merges,\n"
2898
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2899
"reverting any files."
2900
msgstr ""
2901
2902
#: bzrlib/builtins.py:4659
2903
msgid ""
2904
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2905
"changes from a branch in a single revision. To do this, perform the merge\n"
2906
"as desired. Then doing revert with the \"--forget-merges\" option will "
2907
"keep\n"
2908
"the content of the tree as it was, but it will clear the list of pending\n"
2909
"merges. The next commit will then contain all of the changes that are\n"
2910
"present in the other branch, but without any other parent revisions.\n"
2911
"Because this technique forgets where these changes originated, it may\n"
2912
"cause additional conflicts on later merges involving the same source and\n"
2913
"target branches."
2914
msgstr ""
2915
2916
#: bzrlib/builtins.py:4673
2917
msgid "Do not save backups of reverted files."
2918
msgstr ""
2919
2920
#: bzrlib/builtins.py:4675
2921
msgid "Remove pending merge marker, without changing any files."
2922
msgstr ""
2923
2924
#: bzrlib/builtins.py:4706
2925
msgid ""
2926
"Show help on a command or other topic.\n"
2927
" "
2928
msgstr ""
2929
2930
#: bzrlib/builtins.py:4711
2931
msgid "Show help on all commands."
2932
msgstr ""
2933
2934
#: bzrlib/builtins.py:4740
2935
msgid "Show unmerged/unpulled revisions between two branches."
2936
msgstr ""
2937
2938
#: bzrlib/builtins.py:4742
2939
msgid "OTHER_BRANCH may be local or remote."
2940
msgstr ""
2941
2942
#: bzrlib/builtins.py:4744
2943
msgid ""
2944
"To filter on a range of revisions, you can use the command -r begin..end\n"
2945
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2946
"also valid.\n"
2947
" \n"
2948
":Exit values:\n"
2949
" 1 - some missing revisions\n"
2950
" 0 - no missing revisions"
2951
msgstr ""
2952
2953
#: bzrlib/builtins.py:4754
2954
msgid ""
2955
" Determine the missing revisions between this and the branch at the\n"
2956
" remembered pull location::"
2957
msgstr ""
2958
2959
#: bzrlib/builtins.py:4757
2960
msgid " bzr missing"
2961
msgstr ""
2962
2963
#: bzrlib/builtins.py:4759
2964
msgid " Determine the missing revisions between this and another branch::"
2965
msgstr ""
2966
2967
#: bzrlib/builtins.py:4761
2968
msgid " bzr missing http://server/branch"
2969
msgstr ""
2970
2971
#: bzrlib/builtins.py:4763
2972
msgid ""
2973
" Determine the missing revisions up to a specific revision on the other\n"
2974
" branch::"
2975
msgstr ""
2976
2977
#: bzrlib/builtins.py:4766
2978
msgid " bzr missing -r ..-10"
2979
msgstr ""
2980
2981
#: bzrlib/builtins.py:4768
2982
msgid ""
2983
" Determine the missing revisions up to a specific revision on this\n"
2984
" branch::"
2985
msgstr ""
2986
2987
#: bzrlib/builtins.py:4771
2988
msgid " bzr missing --my-revision ..-10"
2989
msgstr ""
2990
2991
#: bzrlib/builtins.py:4778
2992
msgid "Reverse the order of revisions."
2993
msgstr ""
2994
2995
#: bzrlib/builtins.py:4780
2996
msgid "Display changes in the local branch only."
2997
msgstr ""
2998
2999
#: bzrlib/builtins.py:4781
3000
msgid "Same as --mine-only."
3001
msgstr ""
3002
3003
#: bzrlib/builtins.py:4783
3004
msgid "Display changes in the remote branch only."
3005
msgstr ""
3006
3007
#: bzrlib/builtins.py:4784
3008
msgid "Same as --theirs-only."
3009
msgstr ""
3010
3011
#: bzrlib/builtins.py:4789
3012
msgid ""
3013
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3014
"details."
3015
msgstr ""
3016
3017
#: bzrlib/builtins.py:4793
3018
msgid ""
3019
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3020
"details."
3021
msgstr ""
3022
3023
#: bzrlib/builtins.py:4796
3024
msgid "Show all revisions in addition to the mainline ones."
3025
msgstr ""
3026
3027
#: bzrlib/builtins.py:4850
3028
msgid "No peer location known or specified."
3029
msgstr ""
3030
3031
#: bzrlib/builtins.py:4854
3032
msgid "Using saved parent location: {0}\n"
3033
msgstr ""
3034
3035
#: bzrlib/builtins.py:4887
3036
#, python-format
3037
msgid "You have %d extra revision:\n"
3038
msgid_plural "You have %d extra revisions:\n"
3039
msgstr[0] ""
3040
msgstr[1] ""
3041
3042
#: bzrlib/builtins.py:4903
3043
#, python-format
3044
msgid "You are missing %d revision:\n"
3045
msgid_plural "You are missing %d revisions:\n"
3046
msgstr[0] ""
3047
msgstr[1] ""
3048
3049
#: bzrlib/builtins.py:4915
3050
msgid "This branch has no new revisions.\n"
3051
msgstr ""
3052
3053
#: bzrlib/builtins.py:4918
3054
msgid "Other branch has no new revisions.\n"
3055
msgstr ""
3056
3057
#: bzrlib/builtins.py:4923
3058
msgid "Branches are up to date.\n"
3059
msgstr ""
3060
3061
#: bzrlib/builtins.py:4934
3062
msgid "Compress the data within a repository."
3063
msgstr ""
3064
3065
#: bzrlib/builtins.py:4936
3066
msgid ""
3067
"This operation compresses the data within a bazaar repository. As\n"
3068
"bazaar supports automatic packing of repository, this operation is\n"
3069
"normally not required to be done manually."
3070
msgstr ""
3071
3072
#: bzrlib/builtins.py:4940
3073
msgid ""
3074
"During the pack operation, bazaar takes a backup of existing repository\n"
3075
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3076
"automatically when it is safe to do so. To save disk space by removing\n"
3077
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3078
"used."
3079
msgstr ""
3080
3081
#: bzrlib/builtins.py:4946
3082
msgid ""
3083
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3084
"during or immediately after repacking, you may be left with a state\n"
3085
"where the deletion has been written to disk but the new packs have not\n"
3086
"been. In this case the repository may be unusable."
3087
msgstr ""
3088
3089
#: bzrlib/builtins.py:4955
3090
msgid "Delete obsolete packs to save disk space."
3091
msgstr ""
3092
3093
#: bzrlib/builtins.py:4969
3094
msgid "List the installed plugins."
3095
msgstr ""
3096
3097
#: bzrlib/builtins.py:4971
3098
msgid ""
3099
"This command displays the list of installed plugins including\n"
3100
"version of plugin and a short description of each."
3101
msgstr ""
3102
3103
#: bzrlib/builtins.py:4974
3104
msgid "--verbose shows the path where each plugin is located."
3105
msgstr ""
3106
3107
#: bzrlib/builtins.py:4976
3108
msgid ""
3109
"A plugin is an external component for Bazaar that extends the\n"
3110
"revision control system, by adding or replacing code in Bazaar.\n"
3111
"Plugins can do a variety of things, including overriding commands,\n"
3112
"adding new commands, providing additional network transports and\n"
3113
"customizing log output."
3114
msgstr ""
3115
3116
#: bzrlib/builtins.py:4982
3117
msgid ""
3118
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3119
"for further information on plugins including where to find them and how to\n"
3120
"install them. Instructions are also provided there on how to write new\n"
3121
"plugins using the Python programming language."
3122
msgstr ""
3123
3124
#: bzrlib/builtins.py:4998
3125
msgid "Show testament (signing-form) of a revision."
3126
msgstr ""
3127
3128
#: bzrlib/builtins.py:5001
3129
msgid "Produce long-format testament."
3130
msgstr ""
3131
3132
#: bzrlib/builtins.py:5003
3133
msgid "Produce a strict-format testament."
3134
msgstr ""
3135
3136
#: bzrlib/builtins.py:5029
3137
msgid "Show the origin of each line in a file."
3138
msgstr ""
3139
3140
#: bzrlib/builtins.py:5031
3141
msgid ""
3142
"This prints out the given file with an annotation on the left side\n"
3143
"indicating which revision, author and date introduced the change."
3144
msgstr ""
3145
3146
#: bzrlib/builtins.py:5034
3147
msgid ""
3148
"If the origin is the same for a run of consecutive lines, it is\n"
3149
"shown only at the top, unless the --all option is given."
3150
msgstr ""
3151
3152
#: bzrlib/builtins.py:5042
3153
msgid "Show annotations on all lines."
3154
msgstr ""
3155
3156
#: bzrlib/builtins.py:5043
3157
msgid "Show commit date in annotations."
3158
msgstr ""
3159
3160
#: bzrlib/builtins.py:5130
3161
msgid "Cannot sign a range of non-revision-history revisions"
3162
msgstr ""
3163
3164
#: bzrlib/builtins.py:5142
3165
msgid "Please supply either one revision, or a range."
3166
msgstr ""
3167
3168
#: bzrlib/builtins.py:5146
3169
msgid ""
3170
"Convert the current branch into a checkout of the supplied branch.\n"
3171
"If no branch is supplied, rebind to the last bound location."
3172
msgstr ""
3173
3174
#: bzrlib/builtins.py:5149
3175
msgid ""
3176
"Once converted into a checkout, commits must succeed on the master branch\n"
3177
"before they will be applied to the local branch."
3178
msgstr ""
3179
3180
#: bzrlib/builtins.py:5152
3181
msgid ""
3182
"Bound branches use the nickname of its master branch unless it is set\n"
3183
"locally, in which case binding will update the local nickname to be\n"
3184
"that of the master."
3185
msgstr ""
3186
3187
#: bzrlib/builtins.py:5167
3188
msgid "No location supplied. This format does not remember old locations."
3189
msgstr ""
3190
3191
#: bzrlib/builtins.py:5172
3192
msgid "Branch is already bound"
3193
msgstr ""
3194
3195
#: bzrlib/builtins.py:5174
3196
msgid "No location supplied and no previous location known"
3197
msgstr ""
3198
3199
#: bzrlib/builtins.py:5180
3200
msgid "These branches have diverged. Try merging, and then bind again."
3201
msgstr ""
3202
3203
#: bzrlib/builtins.py:5187
3204
msgid "Convert the current checkout into a regular branch."
3205
msgstr ""
3206
3207
#: bzrlib/builtins.py:5189
3208
msgid ""
3209
"After unbinding, the local branch is considered independent and subsequent\n"
3210
"commits will be local only."
3211
msgstr ""
3212
3213
#: bzrlib/builtins.py:5200
3214
msgid "Local branch is not bound"
3215
msgstr ""
3216
3217
#: bzrlib/builtins.py:5204
3218
msgid "Remove the last committed revision."
3219
msgstr ""
3220
3221
#: bzrlib/builtins.py:5206
3222
msgid ""
3223
"--verbose will print out what is being removed.\n"
3224
"--dry-run will go through all the motions, but not actually\n"
3225
"remove anything."
3226
msgstr ""
3227
3228
#: bzrlib/builtins.py:5210
3229
msgid ""
3230
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3231
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3232
"branch at revision 15."
3233
msgstr ""
3234
3235
#: bzrlib/builtins.py:5214
3236
msgid ""
3237
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3238
"it may make is to restore any pending merges that were present before\n"
3239
"the commit."
3240
msgstr ""
3241
3242
#: bzrlib/builtins.py:5225
3243
msgid "Don't actually make changes."
3244
msgstr ""
3245
3246
#: bzrlib/builtins.py:5226
3247
msgid "Say yes to all questions."
3248
msgstr ""
3249
3250
#: bzrlib/builtins.py:5228
3251
msgid "Keep tags that point to removed revisions."
3252
msgstr ""
3253
3254
#: bzrlib/builtins.py:5230
3255
msgid "Only remove the commits from the local branch when in a checkout."
3256
msgstr ""
3257
3258
#: bzrlib/builtins.py:5279
3259
msgid "No revisions to uncommit.\n"
3260
msgstr ""
3261
3262
#: bzrlib/builtins.py:5294
3263
msgid "Dry-run, pretending to remove the above revisions.\n"
3264
msgstr ""
3265
3266
#: bzrlib/builtins.py:5297
3267
msgid "The above revision(s) will be removed.\n"
3268
msgstr ""
3269
3270
#: bzrlib/builtins.py:5301
3271
msgid "Uncommit these revisions"
3272
msgstr ""
3273
3274
#: bzrlib/builtins.py:5304
3275
msgid "Canceled\n"
3276
msgstr ""
3277
3278
#: bzrlib/builtins.py:5311
3279
#, python-format
3280
msgid ""
3281
"You can restore the old tip by running:\n"
3282
" bzr pull . -r revid:%s\n"
3283
msgstr ""
3284
3285
#: bzrlib/builtins.py:5316
3286
msgid "Break a dead lock."
3287
msgstr ""
3288
3289
#: bzrlib/builtins.py:5318
3290
msgid ""
3291
"This command breaks a lock on a repository, branch, working directory or\n"
3292
"config file."
3293
msgstr ""
3294
3295
#: bzrlib/builtins.py:5321
3296
msgid ""
3297
"CAUTION: Locks should only be broken when you are sure that the process\n"
3298
"holding the lock has been stopped."
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5324
3302
msgid ""
3303
"You can get information on what locks are open via the 'bzr info\n"
3304
"[location]' command."
3305
msgstr ""
3306
3307
#: bzrlib/builtins.py:5327
3308
msgid ""
3309
":Examples:\n"
3310
" bzr break-lock\n"
3311
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3312
" bzr break-lock --conf ~/.bazaar"
3313
msgstr ""
3314
3315
#: bzrlib/builtins.py:5336
3316
msgid "LOCATION is the directory where the config lock is."
3317
msgstr ""
3318
3319
#: bzrlib/builtins.py:5338
3320
msgid "Do not ask for confirmation before breaking the lock."
3321
msgstr ""
3322
3323
#: bzrlib/builtins.py:5373
3324
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3325
msgstr ""
3326
3327
#: bzrlib/builtins.py:5374
3328
msgid "Run the bzr server."
3329
msgstr ""
3330
3331
#: bzrlib/builtins.py:5380
3332
msgid "Serve on stdin/out for use from inetd or sshd."
3333
msgstr ""
3334
3335
#: bzrlib/builtins.py:5381
3336
msgid "protocol"
3337
msgstr ""
3338
3339
#: bzrlib/builtins.py:5382
3340
msgid "Protocol to serve."
3341
msgstr ""
3342
3343
#: bzrlib/builtins.py:5386
3344
msgid ""
3345
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3346
"Passing 0 as the port number will result in a dynamically allocated port. "
3347
"The default port depends on the protocol."
3348
msgstr ""
3349
3350
#: bzrlib/builtins.py:5392
3351
msgid "Serve contents of this directory."
3352
msgstr ""
3353
3354
#: bzrlib/builtins.py:5394
3355
msgid ""
3356
"By default the server is a readonly server. Supplying --allow-writes "
3357
"enables write access to the contents of the served directory and below. "
3358
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3359
"of external authentication is arranged supplying this option leads to global "
3360
"uncontrolled write access to your file system."
3361
msgstr ""
3362
3363
#: bzrlib/builtins.py:5403
3364
msgid "Override the default idle client timeout (5min)."
3365
msgstr ""
3366
3367
#: bzrlib/builtins.py:5453
3368
msgid "Combine a tree into its containing tree."
3369
msgstr ""
3370
3371
#: bzrlib/builtins.py:5455
3372
msgid "This command requires the target tree to be in a rich-root format."
3373
msgstr ""
3374
3375
#: bzrlib/builtins.py:5457
3376
msgid ""
3377
"The TREE argument should be an independent tree, inside another tree, but\n"
3378
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3379
"running \"bzr branch\" with the target inside a tree.)"
3380
msgstr ""
3381
3382
#: bzrlib/builtins.py:5461
3383
msgid ""
3384
"The result is a combined tree, with the subtree no longer an independent\n"
3385
"part. This is marked as a merge of the subtree into the containing tree,\n"
3386
"and all history is preserved."
3387
msgstr ""
3388
3389
#: bzrlib/builtins.py:5479
3390
#, python-format
3391
msgid ""
3392
"Can't join trees because %s doesn't support rich root data.\n"
3393
"You can use bzr upgrade on the repository."
3394
msgstr ""
3395
3396
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3397
msgid "Cannot join {0}. {1}"
3398
msgstr ""
3399
3400
#: bzrlib/builtins.py:5499
3401
msgid "Split a subdirectory of a tree into a separate tree."
3402
msgstr ""
3403
3404
#: bzrlib/builtins.py:5501
3405
msgid ""
3406
"This command will produce a target tree in a format that supports\n"
3407
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3408
"converted into earlier formats like 'dirstate-tags'."
3409
msgstr ""
3410
3411
#: bzrlib/builtins.py:5505
3412
msgid ""
3413
"The TREE argument should be a subdirectory of a working tree. That\n"
3414
"subdirectory will be converted into an independent tree, with its own\n"
3415
"branch. Commits in the top-level tree will not apply to the new subtree."
3416
msgstr ""
3417
3418
#: bzrlib/builtins.py:5585
3419
msgid "No submit branch specified or known"
3420
msgstr ""
3421
3422
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3423
msgid "No public branch specified or known"
3424
msgstr ""
3425
3426
#: bzrlib/builtins.py:5598
3427
msgid "bzr merge-directive takes at most two one revision identifiers"
3428
msgstr ""
3429
3430
#: bzrlib/builtins.py:5607
3431
msgid "No revisions to bundle."
3432
msgstr ""
3433
3434
#: bzrlib/builtins.py:5626
3435
msgid "Mail or create a merge-directive for submitting changes."
3436
msgstr ""
3437
3438
#: bzrlib/builtins.py:5628
3439
msgid "A merge directive provides many things needed for requesting merges:"
3440
msgstr ""
3441
3442
#: bzrlib/builtins.py:5630
3443
msgid "* A machine-readable description of the merge to perform"
3444
msgstr ""
3445
3446
#: bzrlib/builtins.py:5632
3447
msgid "* An optional patch that is a preview of the changes requested"
3448
msgstr ""
3449
3450
#: bzrlib/builtins.py:5634
3451
msgid ""
3452
"* An optional bundle of revision data, so that the changes can be applied\n"
3453
" directly from the merge directive, without retrieving data from a\n"
3454
" branch."
3455
msgstr ""
3456
3457
#: bzrlib/builtins.py:5638
3458
msgid ""
3459
"`bzr send` creates a compact data set that, when applied using bzr\n"
3460
"merge, has the same effect as merging from the source branch. "
3461
msgstr ""
3462
3463
#: bzrlib/builtins.py:5641
3464
msgid ""
3465
"By default the merge directive is self-contained and can be applied to any\n"
3466
"branch containing submit_branch in its ancestory without needing access to\n"
3467
"the source branch."
3468
msgstr ""
3469
3470
#: bzrlib/builtins.py:5645
3471
msgid ""
3472
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3473
"revisions, but only a structured request to merge from the\n"
3474
"public_location. In that case the public_branch is needed and it must be\n"
3475
"up-to-date and accessible to the recipient. The public_branch is always\n"
3476
"included if known, so that people can check it later."
3477
msgstr ""
3478
3479
#: bzrlib/builtins.py:5651
3480
msgid ""
3481
"The submit branch defaults to the parent of the source branch, but can be\n"
3482
"overridden. Both submit branch and public branch will be remembered in\n"
3483
"branch.conf the first time they are used for a particular branch. The\n"
3484
"source branch defaults to that containing the working directory, but can\n"
3485
"be changed using --from."
3486
msgstr ""
3487
3488
#: bzrlib/builtins.py:5657
3489
msgid ""
3490
"Both the submit branch and the public branch follow the usual behavior with\n"
3491
"respect to --remember: If there is no default location set, the first send\n"
3492
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3493
"omit the location to use the default. To change the default, use\n"
3494
"--remember. The value will only be saved if the location can be accessed."
3495
msgstr ""
3496
3497
#: bzrlib/builtins.py:5663
3498
msgid ""
3499
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3500
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3501
"If a public location is known for the submit_branch, that location is used\n"
3502
"in the merge directive."
3503
msgstr ""
3504
3505
#: bzrlib/builtins.py:5668
3506
msgid ""
3507
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3508
"given, in which case it is sent to a file."
3509
msgstr ""
3510
3511
#: bzrlib/builtins.py:5671
3512
msgid ""
3513
"Mail is sent using your preferred mail program. This should be transparent\n"
3514
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3515
"If the preferred client can't be found (or used), your editor will be used."
3516
msgstr ""
3517
3518
#: bzrlib/builtins.py:5675
3519
msgid ""
3520
"To use a specific mail program, set the mail_client configuration option.\n"
3521
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3522
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3523
"(MacOS X's\n"
3524
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3525
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3526
"add\n"
3527
"supported clients."
3528
msgstr ""
3529
3530
#: bzrlib/builtins.py:5682
3531
msgid ""
3532
"If mail is being sent, a to address is required. This can be supplied\n"
3533
"either on the commandline, by setting the submit_to configuration\n"
3534
"option in the branch itself or the child_submit_to configuration option\n"
3535
"in the submit branch."
3536
msgstr ""
3537
3538
#: bzrlib/builtins.py:5687
3539
msgid ""
3540
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3541
"and\n"
3542
"merge directive format 2. It is significantly faster and smaller than\n"
3543
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3544
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3545
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3546
msgstr ""
3547
3548
#: bzrlib/builtins.py:5693
3549
msgid ""
3550
"The merge directives created by bzr send may be applied using bzr merge or\n"
3551
"bzr pull by specifying a file containing a merge directive as the location."
3552
msgstr ""
3553
3554
#: bzrlib/builtins.py:5696
3555
msgid ""
3556
"bzr send makes extensive use of public locations to map local locations "
3557
"into\n"
3558
"URLs that can be used by other people. See `bzr help configuration` to\n"
3559
"set them, and use `bzr info` to display them."
3560
msgstr ""
3561
3562
#: bzrlib/builtins.py:5720
3563
msgid "Write merge directive to this file or directory; use - for stdout."
3564
msgstr ""
3565
3566
#: bzrlib/builtins.py:5724
3567
msgid ""
3568
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3569
"strict disables the check."
3570
msgstr ""
3571
3572
#: bzrlib/builtins.py:5726
3573
msgid "Mail the request to this address."
3574
msgstr ""
3575
3576
#: bzrlib/builtins.py:5730
3577
msgid "Body for the email."
3578
msgstr ""
3579
3580
#: bzrlib/builtins.py:5783
3581
msgid "Do not include a bundle in the merge directive."
3582
msgstr ""
3583
3584
#: bzrlib/builtins.py:5784
3585
msgid "Do not include a preview patch in the merge directive."
3586
msgstr ""
3587
3588
#: bzrlib/builtins.py:5787
3589
msgid "Remember submit and public branch."
3590
msgstr ""
3591
3592
#: bzrlib/builtins.py:5789
3593
msgid ""
3594
"Branch to generate the submission from, rather than the one containing the "
3595
"working directory."
3596
msgstr ""
3597
3598
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3599
msgid "format"
3600
msgstr ""
3601
3602
#: bzrlib/builtins.py:5800
3603
msgid "Use the specified output format."
3604
msgstr ""
3605
3606
#: bzrlib/builtins.py:5822
3607
msgid "Create, remove or modify a tag naming a revision."
3608
msgstr ""
3609
3610
#: bzrlib/builtins.py:5824
3611
msgid ""
3612
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3613
"(--revision) option can be given -rtag:X, where X is any previously\n"
3614
"created tag."
3615
msgstr ""
3616
3617
#: bzrlib/builtins.py:5828
3618
msgid ""
3619
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3620
"along when you branch, push, pull or merge."
3621
msgstr ""
3622
3623
#: bzrlib/builtins.py:5831
3624
msgid ""
3625
"It is an error to give a tag name that already exists unless you pass\n"
3626
"--force, in which case the tag is moved to point to the new revision."
3627
msgstr ""
3628
3629
#: bzrlib/builtins.py:5834
3630
msgid ""
3631
"To rename a tag (change the name but keep it on the same revsion), run "
3632
"``bzr\n"
3633
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3634
msgstr ""
3635
3636
#: bzrlib/builtins.py:5837
3637
msgid ""
3638
"If no tag name is specified it will be determined through the \n"
3639
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3640
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3641
"details."
3642
msgstr ""
3643
3644
#: bzrlib/builtins.py:5847
3645
msgid "Delete this tag rather than placing it."
3646
msgstr ""
3647
3648
#: bzrlib/builtins.py:5850
3649
msgid "Branch in which to place the tag."
3650
msgstr ""
3651
3652
#: bzrlib/builtins.py:5852
3653
msgid "Replace existing tags."
3654
msgstr ""
3655
3656
#: bzrlib/builtins.py:5867
3657
msgid "No tag specified to delete."
3658
msgstr ""
3659
3660
#: bzrlib/builtins.py:5869
3661
#, python-format
3662
msgid "Deleted tag %s."
3663
msgstr ""
3664
3665
#: bzrlib/builtins.py:5883
3666
msgid "Please specify a tag name."
3667
msgstr ""
3668
3669
#: bzrlib/builtins.py:5891
3670
#, python-format
3671
msgid "Tag %s already exists for that revision."
3672
msgstr ""
3673
3674
#: bzrlib/builtins.py:5895
3675
#, python-format
3676
msgid "Created tag %s."
3677
msgstr ""
3678
3679
#: bzrlib/builtins.py:5897
3680
#, python-format
3681
msgid "Updated tag %s."
3682
msgstr ""
3683
3684
#: bzrlib/builtins.py:5901
3685
msgid "List tags."
3686
msgstr ""
3687
3688
#: bzrlib/builtins.py:5903
3689
msgid ""
3690
"This command shows a table of tag names and the revisions they reference."
3691
msgstr ""
3692
3693
#: bzrlib/builtins.py:5909
3694
msgid "Branch whose tags should be displayed."
3695
msgstr ""
3696
3697
#: bzrlib/builtins.py:5911
3698
msgid "Sort tags by different criteria."
3699
msgstr ""
3700
3701
#: bzrlib/builtins.py:5911
3702
msgid "Sorting"
3703
msgstr ""
3704
3705
#: bzrlib/builtins.py:5980
3706
msgid "Reconfigure the type of a bzr directory."
3707
msgstr ""
3708
3709
#: bzrlib/builtins.py:5982
3710
msgid "A target configuration must be specified."
3711
msgstr ""
3712
3713
#: bzrlib/builtins.py:5984
3714
msgid ""
3715
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3716
"The order of preference is\n"
3717
"1. For a lightweight checkout, the current bound location.\n"
3718
"2. For branches that used to be checkouts, the previously-bound location.\n"
3719
"3. The push location.\n"
3720
"4. The parent location.\n"
3721
"If none of these is available, --bind-to must be specified."
3722
msgstr ""
3723
3724
#: bzrlib/builtins.py:5998
3725
msgid "Tree type"
3726
msgstr ""
3727
3728
#: bzrlib/builtins.py:5999
3729
msgid "The relation between branch and tree."
3730
msgstr ""
3731
3732
#: bzrlib/builtins.py:6001
3733
msgid "Reconfigure to be an unbound branch with no working tree."
3734
msgstr ""
3735
3736
#: bzrlib/builtins.py:6002
3737
msgid "Reconfigure to be an unbound branch with a working tree."
3738
msgstr ""
3739
3740
#: bzrlib/builtins.py:6003
3741
msgid "Reconfigure to be a bound branch with a working tree."
3742
msgstr ""
3743
3744
#: bzrlib/builtins.py:6004
3745
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3746
msgstr ""
3747
3748
#: bzrlib/builtins.py:6009
3749
msgid "Repository type"
3750
msgstr ""
3751
3752
#: bzrlib/builtins.py:6010
3753
msgid "Location fo the repository."
3754
msgstr ""
3755
3756
#: bzrlib/builtins.py:6012
3757
msgid ""
3758
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3759
msgstr ""
3760
3761
#: bzrlib/builtins.py:6014
3762
msgid "Reconfigure to use a shared repository."
3763
msgstr ""
3764
3765
#: bzrlib/builtins.py:6018
3766
msgid "Trees in Repository"
3767
msgstr ""
3768
3769
#: bzrlib/builtins.py:6019
3770
msgid "Whether new branches in the repository have trees."
3771
msgstr ""
3772
3773
#: bzrlib/builtins.py:6021
3774
msgid ""
3775
"Reconfigure repository to create working trees on branches by default."
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:6023
3779
msgid ""
3780
"Reconfigure repository to not create working trees on branches by default."
3781
msgstr ""
3782
3783
#: bzrlib/builtins.py:6026
3784
msgid "Branch to bind checkout to."
3785
msgstr ""
3786
3787
#: bzrlib/builtins.py:6028
3788
msgid "Perform reconfiguration even if local changes will be lost."
3789
msgstr ""
3790
3791
#: bzrlib/builtins.py:6031
3792
msgid "Reconfigure a branch to be stacked on another branch."
3793
msgstr ""
3794
3795
#: bzrlib/builtins.py:6035
3796
msgid ""
3797
"Reconfigure a branch to be unstacked. This may require copying substantial "
3798
"data into it."
3799
msgstr ""
3800
3801
#: bzrlib/builtins.py:6045
3802
msgid "Can't use both --stacked-on and --unstacked"
3803
msgstr ""
3804
3805
#: bzrlib/builtins.py:6059
3806
msgid "No target configuration specified"
3807
msgstr ""
3808
3809
#: bzrlib/builtins.py:6094
3810
msgid "Set the branch of a checkout and update."
3811
msgstr ""
3812
3813
#: bzrlib/builtins.py:6096
3814
msgid ""
3815
"For lightweight checkouts, this changes the branch being referenced.\n"
3816
"For heavyweight checkouts, this checks that there are no local commits\n"
3817
"versus the current bound branch, then it makes the local branch a mirror\n"
3818
"of the new location and binds to it."
3819
msgstr ""
3820
3821
#: bzrlib/builtins.py:6101
3822
msgid ""
3823
"In both cases, the working tree is updated and uncommitted changes\n"
3824
"are merged. The user can commit or revert these as they desire."
3825
msgstr ""
3826
3827
#: bzrlib/builtins.py:6104
3828
msgid "Pending merges need to be committed or reverted before using switch."
3829
msgstr ""
3830
3831
#: bzrlib/builtins.py:6106
3832
msgid ""
3833
"The path to the branch to switch to can be specified relative to the parent\n"
3834
"directory of the current branch. For example, if you are currently in a\n"
3835
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3836
"/path/to/newbranch."
3837
msgstr ""
3838
3839
#: bzrlib/builtins.py:6111
3840
msgid ""
3841
"Bound branches use the nickname of its master branch unless it is set\n"
3842
"locally, in which case switching will update the local nickname to be\n"
3843
"that of the master."
3844
msgstr ""
3845
3846
#: bzrlib/builtins.py:6119
3847
msgid "Switch even if local commits will be lost."
3848
msgstr ""
3849
3850
#: bzrlib/builtins.py:6122
3851
msgid "Create the target branch from this one before switching to it."
3852
msgstr ""
3853
3854
#: bzrlib/builtins.py:6134
3855
msgid "You must supply either a revision or a location"
3856
msgstr ""
3857
3858
#: bzrlib/builtins.py:6145
3859
msgid "cannot create branch without source branch"
3860
msgstr ""
3861
3862
#: bzrlib/builtins.py:6209
3863
msgid "Manage filtered views."
3864
msgstr ""
3865
3866
#: bzrlib/builtins.py:6211
3867
msgid ""
3868
"Views provide a mask over the tree so that users can focus on\n"
3869
"a subset of a tree when doing their work. After creating a view,\n"
3870
"commands that support a list of files - status, diff, commit, etc -\n"
3871
"effectively have that list of files implicitly given each time.\n"
3872
"An explicit list of files can still be given but those files\n"
3873
"must be within the current view."
3874
msgstr ""
3875
3876
#: bzrlib/builtins.py:6218
3877
msgid ""
3878
"In most cases, a view has a short life-span: it is created to make\n"
3879
"a selected change and is deleted once that change is committed.\n"
3880
"At other times, you may wish to create one or more named views\n"
3881
"and switch between them."
3882
msgstr ""
3883
3884
#: bzrlib/builtins.py:6223
3885
msgid ""
3886
"To disable the current view without deleting it, you can switch to\n"
3887
"the pseudo view called ``off``. This can be useful when you need\n"
3888
"to see the whole tree for an operation or two (e.g. merge) but\n"
3889
"want to switch back to your view after that."
3890
msgstr ""
3891
3892
#: bzrlib/builtins.py:6228
3893
msgid ""
3894
":Examples:\n"
3895
" To define the current view::"
3896
msgstr ""
3897
3898
#: bzrlib/builtins.py:6231
3899
msgid " bzr view file1 dir1 ..."
3900
msgstr ""
3901
3902
#: bzrlib/builtins.py:6233
3903
msgid " To list the current view::"
3904
msgstr ""
3905
3906
#: bzrlib/builtins.py:6235
3907
msgid " bzr view"
3908
msgstr ""
3909
3910
#: bzrlib/builtins.py:6237
3911
msgid " To delete the current view::"
3912
msgstr ""
3913
3914
#: bzrlib/builtins.py:6239
3915
msgid " bzr view --delete"
3916
msgstr ""
3917
3918
#: bzrlib/builtins.py:6241
3919
msgid " To disable the current view without deleting it::"
3920
msgstr ""
3921
3922
#: bzrlib/builtins.py:6243
3923
msgid " bzr view --switch off"
3924
msgstr ""
3925
3926
#: bzrlib/builtins.py:6245
3927
msgid " To define a named view and switch to it::"
3928
msgstr ""
3929
3930
#: bzrlib/builtins.py:6247
3931
msgid " bzr view --name view-name file1 dir1 ..."
3932
msgstr ""
3933
3934
#: bzrlib/builtins.py:6249
3935
msgid " To list a named view::"
3936
msgstr ""
3937
3938
#: bzrlib/builtins.py:6251
3939
msgid " bzr view --name view-name"
3940
msgstr ""
3941
3942
#: bzrlib/builtins.py:6253
3943
msgid " To delete a named view::"
3944
msgstr ""
3945
3946
#: bzrlib/builtins.py:6255
3947
msgid " bzr view --name view-name --delete"
3948
msgstr ""
3949
3950
#: bzrlib/builtins.py:6257
3951
msgid " To switch to a named view::"
3952
msgstr ""
3953
3954
#: bzrlib/builtins.py:6259
3955
msgid " bzr view --switch view-name"
3956
msgstr ""
3957
3958
#: bzrlib/builtins.py:6261
3959
msgid " To list all views defined::"
3960
msgstr ""
3961
3962
#: bzrlib/builtins.py:6263
3963
msgid " bzr view --all"
3964
msgstr ""
3965
3966
#: bzrlib/builtins.py:6265
3967
msgid " To delete all views::"
3968
msgstr ""
3969
3970
#: bzrlib/builtins.py:6267
3971
msgid " bzr view --delete --all"
3972
msgstr ""
3973
3974
#: bzrlib/builtins.py:6274
3975
msgid "Apply list or delete action to all views."
3976
msgstr ""
3977
3978
#: bzrlib/builtins.py:6277
3979
msgid "Delete the view."
3980
msgstr ""
3981
3982
#: bzrlib/builtins.py:6280
3983
msgid "Name of the view to define, list or delete."
3984
msgstr ""
3985
3986
#: bzrlib/builtins.py:6284
3987
msgid "Name of the view to switch to."
3988
msgstr ""
3989
3990
#: bzrlib/builtins.py:6303
3991
msgid "Both --delete and a file list specified"
3992
msgstr ""
3993
3994
#: bzrlib/builtins.py:6306
3995
msgid "Both --delete and --switch specified"
3996
msgstr ""
3997
3998
#: bzrlib/builtins.py:6309
3999
msgid "Deleted all views.\n"
4000
msgstr ""
4001
4002
#: bzrlib/builtins.py:6311
4003
msgid "No current view to delete"
4004
msgstr ""
4005
4006
#: bzrlib/builtins.py:6314
4007
#, python-format
4008
msgid "Deleted '%s' view.\n"
4009
msgstr ""
4010
4011
#: bzrlib/builtins.py:6318
4012
msgid "Both --switch and a file list specified"
4013
msgstr ""
4014
4015
#: bzrlib/builtins.py:6321
4016
msgid "Both --switch and --all specified"
4017
msgstr ""
4018
4019
#: bzrlib/builtins.py:6324
4020
msgid "No current view to disable"
4021
msgstr ""
4022
4023
#: bzrlib/builtins.py:6326
4024
#, python-format
4025
msgid "Disabled '%s' view.\n"
4026
msgstr ""
4027
4028
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4029
msgid "Using '{0}' view: {1}\n"
4030
msgstr ""
4031
4032
#: bzrlib/builtins.py:6333
4033
msgid "Views defined:\n"
4034
msgstr ""
4035
4036
#: bzrlib/builtins.py:6342
4037
msgid "No views defined.\n"
4038
msgstr ""
4039
4040
#: bzrlib/builtins.py:6349
4041
msgid "Cannot change the 'off' pseudo view"
4042
msgstr ""
4043
4044
#: bzrlib/builtins.py:6357
4045
msgid "No current view.\n"
4046
msgstr ""
4047
4048
#: bzrlib/builtins.py:6360
4049
msgid "'{0}' view is: {1}\n"
4050
msgstr ""
4051
4052
#: bzrlib/builtins.py:6380
4053
msgid " <no hooks installed>\n"
4054
msgstr ""
4055
4056
#: bzrlib/builtins.py:6384
4057
msgid "Remove a branch."
4058
msgstr ""
4059
4060
#: bzrlib/builtins.py:6386
4061
msgid ""
4062
"This will remove the branch from the specified location but \n"
4063
"will keep any working tree or repository in place."
4064
msgstr ""
4065
4066
#: bzrlib/builtins.py:6391
4067
msgid " Remove the branch at repo/trunk::"
4068
msgstr ""
4069
4070
#: bzrlib/builtins.py:6393
4071
msgid " bzr remove-branch repo/trunk"
4072
msgstr ""
4073
4074
#: bzrlib/builtins.py:6408
4075
msgid "Plaintext diff output."
4076
msgstr ""
4077
4078
#: bzrlib/builtins.py:6409
4079
msgid "Temporarily set aside some changes from the current tree."
4080
msgstr ""
4081
4082
#: bzrlib/builtins.py:6411
4083
msgid ""
4084
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4085
"ie. out of the way, until a later time when you can bring them back from\n"
4086
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4087
"your working tree, and so they aren't propagated along with your branch nor\n"
4088
"will they survive its deletion."
4089
msgstr ""
4090
4091
#: bzrlib/builtins.py:6417
4092
msgid "If shelve --list is specified, previously-shelved changes are listed."
4093
msgstr ""
4094
4095
#: bzrlib/builtins.py:6419
4096
msgid ""
4097
"Shelve is intended to help separate several sets of changes that have\n"
4098
"been inappropriately mingled. If you just want to get rid of all changes\n"
4099
"and you don't need to restore them later, use revert. If you want to\n"
4100
"shelve all text changes at once, use shelve --all."
4101
msgstr ""
4102
4103
#: bzrlib/builtins.py:6424
4104
msgid ""
4105
"If filenames are specified, only the changes to those files will be\n"
4106
"shelved. Other files will be left untouched."
4107
msgstr ""
4108
4109
#: bzrlib/builtins.py:6427
4110
msgid ""
4111
"If a revision is specified, changes since that revision will be shelved."
4112
msgstr ""
4113
4114
#: bzrlib/builtins.py:6429
4115
msgid ""
4116
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4117
"restore the most recently shelved changes."
4118
msgstr ""
4119
4120
#: bzrlib/builtins.py:6432
4121
msgid ""
4122
"For complicated changes, it is possible to edit the changes in a separate\n"
4123
"editor program to decide what the file remaining in the working copy\n"
4124
"should look like. To do this, add the configuration option"
4125
msgstr ""
4126
4127
#: bzrlib/builtins.py:6436
4128
msgid " change_editor = PROGRAM @new_path @old_path"
4129
msgstr ""
4130
4131
#: bzrlib/builtins.py:6438
4132
msgid ""
4133
"where @new_path is replaced with the path of the new version of the \n"
4134
"file and @old_path is replaced with the path of the old version of \n"
4135
"the file. The PROGRAM should save the new file with the desired \n"
4136
"contents of the file in the working tree.\n"
4137
" "
4138
msgstr ""
4139
4140
#: bzrlib/builtins.py:6450
4141
msgid "Shelve all changes."
4142
msgstr ""
4143
4144
#: bzrlib/builtins.py:6452
4145
msgid "Method to use for writing diffs."
4146
msgstr ""
4147
4148
#: bzrlib/builtins.py:6452
4149
msgid "writer"
4150
msgstr ""
4151
4152
#: bzrlib/builtins.py:6456
4153
msgid "List shelved changes."
4154
msgstr ""
4155
4156
#: bzrlib/builtins.py:6458
4157
msgid "Destroy removed changes instead of shelving them."
4158
msgstr ""
4159
4160
#: bzrlib/builtins.py:6487
4161
msgid "No shelved changes."
4162
msgstr ""
4163
4164
#: bzrlib/builtins.py:6498
4165
msgid "Restore shelved changes."
4166
msgstr ""
4167
4168
#: bzrlib/builtins.py:6500
4169
msgid ""
4170
"By default, the most recently shelved changes are restored. However if you\n"
4171
"specify a shelf by id those changes will be restored instead. This works\n"
4172
"best when the changes don't depend on each other."
4173
msgstr ""
4174
4175
#: bzrlib/builtins.py:6509
4176
msgid "The action to perform."
4177
msgstr ""
4178
4179
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4180
msgid "action"
4181
msgstr ""
4182
4183
#: bzrlib/builtins.py:6511
4184
msgid "Apply changes and remove from the shelf."
4185
msgstr ""
4186
4187
#: bzrlib/builtins.py:6512
4188
msgid "Show changes, but do not apply or remove them."
4189
msgstr ""
4190
4191
#: bzrlib/builtins.py:6513
4192
msgid ""
4193
"Instead of unshelving the changes, show the diff that would result from "
4194
"unshelving."
4195
msgstr ""
4196
4197
#: bzrlib/builtins.py:6515
4198
msgid "Delete changes without applying them."
4199
msgstr ""
4200
4201
#: bzrlib/builtins.py:6516
4202
msgid "Apply changes but don't delete them."
4203
msgstr ""
4204
4205
#: bzrlib/builtins.py:6531
4206
msgid "Remove unwanted files from working tree."
4207
msgstr ""
4208
4209
#: bzrlib/builtins.py:6533
4210
msgid ""
4211
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4212
"files are never deleted."
4213
msgstr ""
4214
4215
#: bzrlib/builtins.py:6536
4216
msgid ""
4217
"Another class is 'detritus', which includes files emitted by bzr during\n"
4218
"normal operations and selftests. (The value of these files decreases with\n"
4219
"time.)"
4220
msgstr ""
4221
4222
#: bzrlib/builtins.py:6540
4223
msgid ""
4224
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4225
"flags are respected, and may be combined."
4226
msgstr ""
4227
4228
#: bzrlib/builtins.py:6543
4229
msgid "To check what clean-tree will do, use --dry-run."
4230
msgstr ""
4231
4232
#: bzrlib/builtins.py:6546
4233
msgid "Delete all ignored files."
4234
msgstr ""
4235
4236
#: bzrlib/builtins.py:6547
4237
msgid ""
4238
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4239
msgstr ""
4240
4241
#: bzrlib/builtins.py:6550
4242
msgid "Delete files unknown to bzr (default)."
4243
msgstr ""
4244
4245
#: bzrlib/builtins.py:6551
4246
msgid "Show files to delete instead of deleting them."
4247
msgstr ""
4248
4249
#: bzrlib/builtins.py:6553
4250
msgid "Do not prompt before deleting."
4251
msgstr ""
4252
4253
#: bzrlib/bundle/__init__.py:59
4254
msgid "A directory cannot be a bundle"
4255
msgstr ""
4256
4257
#: bzrlib/bundle/apply_bundle.py:40
4258
msgid "Install revisions"
4259
msgstr ""
4260
4261
#: bzrlib/bundle/commands.py:64
4262
msgid "--verbose requires a merge directive"
4263
msgstr ""
4264
4265
#: bzrlib/bundle/commands.py:67
4266
msgid "Bundle format not supported"
4267
msgstr ""
4268
4269
#: bzrlib/bundle/commands.py:77
4270
msgid "Records\n"
4271
msgstr ""
4272
4273
#: bzrlib/bundle/commands.py:81
4274
msgid "{0}: {1} ({2} multiparent)\n"
4275
msgstr ""
4276
4277
#: bzrlib/bundle/commands.py:83
4278
#, python-format
4279
msgid "unique files: %d\n"
4280
msgstr ""
4281
4282
#: bzrlib/bundle/commands.py:92
4283
msgid "Revisions\n"
4284
msgstr ""
4285
4286
#: bzrlib/bundle/commands.py:93
4287
#, python-format
4288
msgid "nicks: %s\n"
4289
msgstr ""
4290
4291
#: bzrlib/bundle/commands.py:95
4292
#, python-format
4293
msgid ""
4294
"committers: \n"
4295
"%s\n"
4296
msgstr ""
4297
4298
#: bzrlib/bundle/commands.py:103
4299
msgid "Decoded contents\n"
4300
msgstr ""
4301
4302
#: bzrlib/bundle/serializer/v4.py:327
4303
#, python-format
4304
msgid "Bundling %d revision."
4305
msgid_plural "Bundling %d revisions."
4306
msgstr[0] ""
4307
msgstr[1] ""
4308
4309
#: bzrlib/bzrdir.py:489
4310
msgid ""
4311
"making backup of {0}\n"
4312
" to {1}"
4313
msgstr ""
4314
4315
#: bzrlib/bzrdir.py:512
4316
msgid "renamed {0} to {1}"
4317
msgstr ""
4318
4319
#: bzrlib/bzrdir.py:1663
4320
#, python-format
4321
msgid ""
4322
"Source repository format does not support stacking, using format:\n"
4323
" %s"
4324
msgstr ""
4325
4326
#: bzrlib/bzrdir.py:1683
4327
#, python-format
4328
msgid ""
4329
"Source branch format does not support stacking, using format:\n"
4330
" %s"
4331
msgstr ""
4332
4333
#: bzrlib/bzrdir.py:1829
4334
msgid "starting repository conversion"
4335
msgstr ""
4336
4337
#: bzrlib/bzrdir.py:2058
4338
msgid "Using default stacking branch {0} at {1}"
4339
msgstr ""
4340
4341
#: bzrlib/check.py:108
4342
msgid "check"
4343
msgstr ""
4344
4345
#: bzrlib/check.py:110
4346
msgid "checking revisions"
4347
msgstr ""
4348
4349
#: bzrlib/check.py:112
4350
msgid "checking commit contents"
4351
msgstr ""
4352
4353
#: bzrlib/check.py:114
4354
msgid "checking file graphs"
4355
msgstr ""
4356
4357
#: bzrlib/check.py:118
4358
msgid "checking branches and trees"
4359
msgstr ""
4360
4361
#: bzrlib/check.py:205
4362
msgid "checked repository {0} format {1}"
4363
msgstr ""
4364
4365
#: bzrlib/check.py:208
4366
#, python-format
4367
msgid "%6d revisions"
4368
msgstr ""
4369
4370
#: bzrlib/check.py:209
4371
#, python-format
4372
msgid "%6d file-ids"
4373
msgstr ""
4374
4375
#: bzrlib/check.py:211
4376
#, python-format
4377
msgid "%6d unreferenced text versions"
4378
msgstr ""
4379
4380
#: bzrlib/check.py:215
4381
msgid "unreferenced version: {{{0}}} in {1}"
4382
msgstr ""
4383
4384
#: bzrlib/check.py:218
4385
#, python-format
4386
msgid "%6d revisions are missing inventory_sha1"
4387
msgstr ""
4388
4389
#: bzrlib/check.py:221
4390
#, python-format
4391
msgid "%6d revisions are mentioned but not present"
4392
msgstr ""
4393
4394
#: bzrlib/check.py:224
4395
#, python-format
4396
msgid "%6d ghost revisions"
4397
msgstr ""
4398
4399
#: bzrlib/check.py:229
4400
#, python-format
4401
msgid "%6d revisions missing parents in ancestry"
4402
msgstr ""
4403
4404
#: bzrlib/check.py:233
4405
#, python-format
4406
msgid " %s should be in the ancestry for:"
4407
msgstr ""
4408
4409
#: bzrlib/check.py:237
4410
#, python-format
4411
msgid "%6d inconsistent parents"
4412
msgstr ""
4413
4414
#: bzrlib/check.py:241
4415
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4416
msgstr ""
4417
4418
#: bzrlib/check.py:247
4419
#, python-format
4420
msgid "%6d revisions have incorrect parents in the revision index"
4421
msgstr ""
4422
4423
#: bzrlib/check.py:253
4424
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4425
msgstr ""
4426
4427
#: bzrlib/check.py:267
4428
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4429
msgstr ""
4430
4431
#: bzrlib/check.py:296
4432
msgid ""
4433
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4434
"{{{4}}}"
4435
msgstr ""
4436
4437
#: bzrlib/check.py:354
4438
#, python-format
4439
msgid "Checking branch at '%s'."
4440
msgstr ""
4441
4442
#: bzrlib/check.py:374
4443
#, python-format
4444
msgid "Checking working tree at '%s'."
4445
msgstr ""
4446
4447
#: bzrlib/check.py:427 bzrlib/check.py:441
4448
msgid "No branch found at specified location."
4449
msgstr ""
4450
4451
#: bzrlib/check.py:429 bzrlib/check.py:439
4452
msgid "No working tree found at specified location."
4453
msgstr ""
4454
4455
#: bzrlib/check.py:432
4456
#, python-format
4457
msgid "Checking repository at '%s'."
4458
msgstr ""
4459
4460
#: bzrlib/check.py:443
4461
msgid "No repository found at specified location."
4462
msgstr ""
4463
4464
#: bzrlib/clean_tree.py:63
4465
msgid "Nothing to delete."
4466
msgstr ""
4467
4468
#: bzrlib/clean_tree.py:68
4469
msgid "Are you sure you wish to delete these"
4470
msgstr ""
4471
4472
#: bzrlib/clean_tree.py:70
4473
msgid "Canceled"
4474
msgstr ""
4475
4476
#: bzrlib/clean_tree.py:107
4477
#, python-format
4478
msgid "unable to remove %s"
4479
msgstr ""
4480
4481
#: bzrlib/clean_tree.py:111
4482
msgid "deleting paths:"
4483
msgstr ""
4484
4485
#: bzrlib/clean_tree.py:125
4486
msgid "unable to remove \"{0}\": {1}."
4487
msgstr ""
4488
4489
#: bzrlib/clean_tree.py:130
4490
msgid "No files deleted."
4491
msgstr ""
4492
4493
#: bzrlib/cmd_version_info.py:47
4494
msgid "No known version info format {0}. Supported types are: {1}"
4495
msgstr ""
4496
4497
#: bzrlib/cmd_version_info.py:52
4498
msgid "Version info in Custom template-based format."
4499
msgstr ""
4500
4501
#: bzrlib/cmd_version_info.py:52
4502
msgid "Version info in Python format."
4503
msgstr ""
4504
4505
#: bzrlib/cmd_version_info.py:52
4506
msgid "Version info in RIO (simple text) format (default)."
4507
msgstr ""
4508
4509
#: bzrlib/cmd_version_info.py:53
4510
msgid "Show version information about this tree."
4511
msgstr ""
4512
4513
#: bzrlib/cmd_version_info.py:55
4514
msgid ""
4515
"You can use this command to add information about version into\n"
4516
"source code of an application. The output can be in one of the\n"
4517
"supported formats or in a custom format based on a template."
4518
msgstr ""
4519
4520
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4521
#: en/help_topics/configuration.txt:710
4522
msgid "For example::"
4523
msgstr ""
4524
4525
#: bzrlib/cmd_version_info.py:61
4526
msgid ""
4527
" bzr version-info --custom \\\n"
4528
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4529
msgstr ""
4530
4531
#: bzrlib/cmd_version_info.py:64
4532
msgid ""
4533
"will produce a C header file with formatted string containing the\n"
4534
"current revision number. Other supported variables in templates are:"
4535
msgstr ""
4536
4537
#: bzrlib/cmd_version_info.py:67
4538
msgid ""
4539
" * {date} - date of the last revision\n"
4540
" * {build_date} - current date\n"
4541
" * {revno} - revision number\n"
4542
" * {revision_id} - revision id\n"
4543
" * {branch_nick} - branch nickname\n"
4544
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4545
" otherwise 1"
4546
msgstr ""
4547
4548
#: bzrlib/cmd_version_info.py:77
4549
msgid "Select the output format."
4550
msgstr ""
4551
4552
#: bzrlib/cmd_version_info.py:81
4553
msgid "Include all possible information."
4554
msgstr ""
4555
4556
#: bzrlib/cmd_version_info.py:82
4557
msgid "Check if tree is clean."
4558
msgstr ""
4559
4560
#: bzrlib/cmd_version_info.py:84
4561
msgid "Include the revision-history."
4562
msgstr ""
4563
4564
#: bzrlib/cmd_version_info.py:86
4565
msgid "Include the last revision for each file."
4566
msgstr ""
4567
4568
#: bzrlib/cmd_version_info.py:87
4569
msgid "Template for the output."
4570
msgstr ""
4571
4572
#: bzrlib/cmd_version_info.py:101
4573
msgid "bzr version-info --revision takes exactly one revision specifier"
4574
msgstr ""
4575
4576
#: bzrlib/commands.py:228
4577
#, python-format
4578
msgid "unknown command \"%s\""
4579
msgstr ""
4580
4581
#: bzrlib/commands.py:475
4582
msgid "No help for this command."
4583
msgstr ""
4584
4585
#: bzrlib/commands.py:488
4586
#, python-format
4587
msgid ":Purpose: %s\n"
4588
msgstr ""
4589
4590
#: bzrlib/commands.py:490
4591
#, python-format
4592
msgid ""
4593
":Usage:\n"
4594
"%s\n"
4595
msgstr ""
4596
4597
#: bzrlib/commands.py:492
4598
#, python-format
4599
msgid ":Usage: %s\n"
4600
msgstr ""
4601
4602
#: bzrlib/commands.py:511
4603
#, python-format
4604
msgid ":Options:%s"
4605
msgstr ""
4606
4607
#: bzrlib/commands.py:522
4608
#, python-format
4609
msgid ""
4610
":Description:\n"
4611
" %s\n"
4612
"\n"
4613
msgstr ""
4614
4615
#: bzrlib/commands.py:532
4616
#, python-format
4617
msgid ""
4618
"See bzr help %s for more details and examples.\n"
4619
"\n"
4620
msgstr ""
4621
4622
#: bzrlib/commands.py:537
4623
msgid ":Aliases: "
4624
msgstr ""
4625
4626
#: bzrlib/commands.py:541
4627
#, python-format
4628
msgid ":From: plugin \"%s\"\n"
4629
msgstr ""
4630
4631
#: bzrlib/commands.py:553
4632
msgid ":doc:`{0} <{1}-help>`"
4633
msgstr ""
4634
4635
#: bzrlib/commands.py:557
4636
#, python-format
4637
msgid ":See also: %s"
4638
msgstr ""
4639
4640
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4641
msgid "Only ASCII permitted in option names"
4642
msgstr ""
4643
4644
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4645
msgid "command {0!r} needs one or more {1}"
4646
msgstr ""
4647
4648
#: bzrlib/commands.py:857
4649
msgid "command {0!r} requires argument {1}"
4650
msgstr ""
4651
4652
#: bzrlib/commands.py:864
4653
msgid "extra argument to command {0}: {1}"
4654
msgstr ""
4655
4656
#: bzrlib/commands.py:961
4657
#, python-format
4658
msgid "Profile data written to \"%s\"."
4659
msgstr ""
4660
4661
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4662
msgid "added"
4663
msgstr ""
4664
4665
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4666
msgid "modified"
4667
msgstr ""
4668
4669
#: bzrlib/commit.py:131
4670
#, python-format
4671
msgid "Committing%s"
4672
msgstr ""
4673
4674
#: bzrlib/commit.py:134
4675
#, python-format
4676
msgid "Committed revision %d."
4677
msgstr ""
4678
4679
#: bzrlib/commit.py:143
4680
#, python-format
4681
msgid "deleted %s"
4682
msgstr ""
4683
4684
#: bzrlib/commit.py:146
4685
#, python-format
4686
msgid "missing %s"
4687
msgstr ""
4688
4689
#: bzrlib/commit.py:511
4690
msgid ""
4691
"Conflicting tags in bound branch:\n"
4692
"{0}"
4693
msgstr ""
4694
4695
#: bzrlib/commit.py:742
4696
msgid "renamed"
4697
msgstr ""
4698
4699
#: bzrlib/commit.py:977
4700
msgid "unchanged"
4701
msgstr ""
4702
4703
#: bzrlib/commit.py:999
4704
msgid "{0} [{1}] - Stage"
4705
msgstr ""
4706
4707
#: bzrlib/commit.py:1002
4708
#, python-format
4709
msgid "%s - Stage"
4710
msgstr ""
4711
4712
#: bzrlib/commit_signature_commands.py:36
4713
msgid "Sign all commits by a given committer."
4714
msgstr ""
4715
4716
#: bzrlib/commit_signature_commands.py:38
4717
msgid ""
4718
"If location is not specified the local tree is used.\n"
4719
"If committer is not specified the default committer is used."
4720
msgstr ""
4721
4722
#: bzrlib/commit_signature_commands.py:41
4723
msgid "This does not sign commits that already have signatures."
4724
msgstr ""
4725
4726
#: bzrlib/commit_signature_commands.py:49
4727
msgid ""
4728
"Don't actually sign anything, just print the revisions that would be signed."
4729
msgstr ""
4730
4731
#: bzrlib/commit_signature_commands.py:103
4732
msgid "Verify all commit signatures."
4733
msgstr ""
4734
4735
#: bzrlib/commit_signature_commands.py:105
4736
msgid ""
4737
"Verifies that all commits in the branch are signed by known GnuPG keys."
4738
msgstr ""
4739
4740
#: bzrlib/commit_signature_commands.py:110
4741
msgid ""
4742
"Comma separated list of GPG key patterns which are acceptable for "
4743
"verification."
4744
msgstr ""
4745
4746
#: bzrlib/commit_signature_commands.py:147
4747
msgid "Cannot verify a range of non-revision-history revisions"
4748
msgstr ""
4749
4750
#: bzrlib/commit_signature_commands.py:168
4751
msgid "All commits signed with verifiable keys"
4752
msgstr ""
4753
4754
#: bzrlib/config.py:475
4755
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4756
msgstr ""
4757
4758
#: bzrlib/config.py:2499
4759
msgid "{0} is not an SI unit."
4760
msgstr ""
4761
4762
#: bzrlib/config.py:2956
4763
msgid ""
4764
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4765
"will be saved."
4766
msgstr ""
4767
4768
#: bzrlib/config.py:3100
4769
#, python-format
4770
msgid "Invalid '%s', should be of the form 'name=value'"
4771
msgstr ""
4772
4773
#: bzrlib/config.py:3969
4774
msgid "Display, set or remove a configuration option."
4775
msgstr ""
4776
4777
#: bzrlib/config.py:3971
4778
msgid "Display the active value for a given option."
4779
msgstr ""
4780
4781
#: bzrlib/config.py:3973
4782
msgid ""
4783
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4784
"matching options are displayed mentioning their scope. The active value\n"
4785
"that bzr will take into account is the first one displayed for each option."
4786
msgstr ""
4787
4788
#: bzrlib/config.py:3977
4789
msgid "If no NAME is given, --all .* is implied."
4790
msgstr ""
4791
4792
#: bzrlib/config.py:3979
4793
msgid ""
4794
"Setting a value is achieved by using name=value without spaces. The value\n"
4795
"is set in the most relevant scope and can be checked by displaying the\n"
4796
"option again."
4797
msgstr ""
4798
4799
#: bzrlib/config.py:3991
4800
msgid "Reduce the scope to the specified configuration file."
4801
msgstr ""
4802
4803
#: bzrlib/config.py:3995
4804
msgid "Display all the defined values for the matching options."
4805
msgstr ""
4806
4807
#: bzrlib/config.py:3997
4808
msgid "Remove the option from the configuration file."
4809
msgstr ""
4810
4811
#: bzrlib/conflicts.py:50
4812
msgid "List files with conflicts."
4813
msgstr ""
4814
4815
#: bzrlib/conflicts.py:57
4816
msgid ""
4817
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4818
"is supplied, the pathnames of files with text conflicts are listed,\n"
4819
"instead. (This is useful for editing all files with text conflicts.)"
4820
msgstr ""
4821
4822
#: bzrlib/conflicts.py:61
4823
msgid "Use bzr resolve when you have fixed a problem."
4824
msgstr ""
4825
4826
#: bzrlib/conflicts.py:66
4827
msgid "List paths of files with text conflicts."
4828
msgstr ""
4829
4830
#: bzrlib/conflicts.py:85
4831
msgid "Marks the conflict as resolved."
4832
msgstr ""
4833
4834
#: bzrlib/conflicts.py:88
4835
msgid "Resolve the conflict preserving the version in the working tree."
4836
msgstr ""
4837
4838
#: bzrlib/conflicts.py:91
4839
msgid "Resolve the conflict taking the merged version into account."
4840
msgstr ""
4841
4842
#: bzrlib/conflicts.py:98
4843
msgid "How to resolve the conflict."
4844
msgstr ""
4845
4846
#: bzrlib/conflicts.py:104
4847
msgid "Mark a conflict as resolved."
4848
msgstr ""
4849
4850
#: bzrlib/conflicts.py:111
4851
msgid ""
4852
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4853
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4854
"as\n"
4855
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4856
msgstr ""
4857
4858
#: bzrlib/conflicts.py:119
4859
msgid "Resolve all conflicts in this tree."
4860
msgstr ""
4861
4862
#: bzrlib/conflicts.py:126
4863
msgid "If --all is specified, no FILE may be provided"
4864
msgstr ""
4865
4866
#: bzrlib/conflicts.py:151
4867
#, python-format
4868
msgid "%d conflict auto-resolved."
4869
msgid_plural "%d conflicts auto-resolved."
4870
msgstr[0] ""
4871
msgstr[1] ""
4872
4873
#: bzrlib/conflicts.py:154
4874
msgid "Remaining conflicts:"
4875
msgstr ""
4876
4877
#: bzrlib/conflicts.py:159
4878
msgid "All conflicts resolved."
4879
msgstr ""
4880
4881
#: bzrlib/conflicts.py:168
4882
msgid "{0} conflict resolved, {1} remaining"
4883
msgid_plural "{0} conflicts resolved, {1} remaining"
4884
msgstr[0] ""
4885
msgstr[1] ""
4886
4887
#: bzrlib/controldir.py:698
4888
msgid "{0} is{1} redirected to {2}"
4889
msgstr ""
4890
4891
#: bzrlib/diff.py:399
4892
#, python-format
4893
msgid "*** Ignoring files outside view. View is %s"
4894
msgstr ""
4895
4896
#: bzrlib/errors.py:157
4897
msgid "The tree builder is already building a tree."
4898
msgstr ""
4899
4900
#: bzrlib/errors.py:178
4901
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4902
msgstr ""
4903
4904
#: bzrlib/errors.py:197
4905
msgid ""
4906
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4907
"versions \"%(minimum)s\" to \"%(current)s\"."
4908
msgstr ""
4909
4910
#: bzrlib/errors.py:209
4911
msgid "The transport '%(transport)s' is only accessible within this process."
4912
msgstr ""
4913
4914
#: bzrlib/errors.py:227
4915
msgid "Invalid revision number %(revno)s"
4916
msgstr ""
4917
4918
#: bzrlib/errors.py:236
4919
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4920
msgstr ""
4921
4922
#: bzrlib/errors.py:247
4923
msgid "Reserved revision-id {%(revision_id)s}"
4924
msgstr ""
4925
4926
#: bzrlib/errors.py:261
4927
msgid "There is no public branch set for \"%(branch_url)s\"."
4928
msgstr ""
4929
4930
#: bzrlib/errors.py:271
4931
msgid ""
4932
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4933
"obtain a list of topics."
4934
msgstr ""
4935
4936
#: bzrlib/errors.py:280
4937
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4938
msgstr ""
4939
4940
#: bzrlib/errors.py:290
4941
msgid ""
4942
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4943
msgstr ""
4944
4945
#: bzrlib/errors.py:299
4946
msgid "The branch '%(branch)s' is not stacked."
4947
msgstr ""
4948
4949
#: bzrlib/errors.py:313
4950
msgid "No WorkingTree exists for \"%(base)s\"."
4951
msgstr ""
4952
4953
#: bzrlib/errors.py:322
4954
msgid "Not currently building a tree."
4955
msgstr ""
4956
4957
#: bzrlib/errors.py:327
4958
msgid "%(url)s is not a local path."
4959
msgstr ""
4960
4961
#: bzrlib/errors.py:355
4962
msgid "%(not_locked)r is not write locked but needs to be."
4963
msgstr ""
4964
4965
#: bzrlib/errors.py:363
4966
msgid "Error in command line options"
4967
msgstr ""
4968
4969
#: bzrlib/errors.py:368
4970
msgid "%(value)s is not an index of type %(_type)s."
4971
msgstr ""
4972
4973
#: bzrlib/errors.py:378
4974
msgid "Error in data for index %(value)s."
4975
msgstr ""
4976
4977
#: bzrlib/errors.py:387
4978
msgid "The key '%(key)s' is already in index '%(index)s'."
4979
msgstr ""
4980
4981
#: bzrlib/errors.py:397
4982
msgid "The key '%(key)s' is not a valid key."
4983
msgstr ""
4984
4985
#: bzrlib/errors.py:406
4986
msgid "Could not parse options for index %(value)s."
4987
msgstr ""
4988
4989
#: bzrlib/errors.py:415
4990
msgid "The value '%(value)s' is not a valid value."
4991
msgstr ""
4992
4993
#: bzrlib/errors.py:443
4994
msgid "Generic path error: %(path)r%(extra)s)"
4995
msgstr ""
4996
4997
#: bzrlib/errors.py:456
4998
msgid "No such file: %(path)r%(extra)s"
4999
msgstr ""
5000
5001
#: bzrlib/errors.py:461
5002
msgid "File exists: %(path)r%(extra)s"
5003
msgstr ""
5004
5005
#: bzrlib/errors.py:467
5006
msgid ""
5007
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5008
"after to tell bzr about a rename that has already happened)%(extra)s"
5009
msgstr ""
5010
5011
#: bzrlib/errors.py:483
5012
msgid "\"%(path)s\" is not a directory %(extra)s"
5013
msgstr ""
5014
5015
#: bzrlib/errors.py:488
5016
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5017
msgstr ""
5018
5019
#: bzrlib/errors.py:493
5020
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5021
msgstr ""
5022
5023
#: bzrlib/errors.py:498
5024
msgid "Hard-linking \"%(path)s\" is not supported"
5025
msgstr ""
5026
5027
#: bzrlib/errors.py:513
5028
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5029
msgstr ""
5030
5031
#: bzrlib/errors.py:518
5032
msgid "Permission denied: \"%(path)s\"%(extra)s"
5033
msgstr ""
5034
5035
#: bzrlib/errors.py:523
5036
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5037
msgstr ""
5038
5039
#: bzrlib/errors.py:528
5040
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5041
msgstr ""
5042
5043
#: bzrlib/errors.py:539
5044
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5045
msgstr ""
5046
5047
#: bzrlib/errors.py:561
5048
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5049
msgstr ""
5050
5051
#: bzrlib/errors.py:571
5052
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5053
msgstr ""
5054
5055
#: bzrlib/errors.py:579
5056
msgid ""
5057
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5058
"upgrade the branch to permit branch stacking."
5059
msgstr ""
5060
5061
#: bzrlib/errors.py:590
5062
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5063
msgstr ""
5064
5065
#: bzrlib/errors.py:600
5066
msgid ""
5067
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5068
"need to upgrade the repository to permit branch stacking."
5069
msgstr ""
5070
5071
#: bzrlib/errors.py:611
5072
msgid "Error reading from %(path)r."
5073
msgstr ""
5074
5075
#: bzrlib/errors.py:630
5076
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5077
msgstr ""
5078
5079
#: bzrlib/errors.py:646
5080
msgid "Path \"%(path)s\" is not unicode normalized"
5081
msgstr ""
5082
5083
#: bzrlib/errors.py:654
5084
msgid "Not a branch: \"%(path)s\"%(detail)s."
5085
msgstr ""
5086
5087
#: bzrlib/errors.py:696
5088
msgid "No submit branch available for branch \"%(path)s\""
5089
msgstr ""
5090
5091
#: bzrlib/errors.py:705
5092
msgid "Already a branch: \"%(path)s\"."
5093
msgstr ""
5094
5095
#: bzrlib/errors.py:711
5096
msgid ""
5097
"Directory contains a branch, but no working tree (use bzr checkout if you "
5098
"wish to build a working tree): \"%(path)s\""
5099
msgstr ""
5100
5101
#: bzrlib/errors.py:716
5102
msgid ""
5103
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5104
msgstr ""
5105
5106
#: bzrlib/errors.py:726
5107
msgid ""
5108
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5109
msgstr ""
5110
5111
#: bzrlib/errors.py:736
5112
msgid "No repository present: \"%(path)s\""
5113
msgstr ""
5114
5115
#: bzrlib/errors.py:743
5116
msgid ""
5117
"Unsupported branch format: %(format)s\n"
5118
"Please run 'bzr upgrade'"
5119
msgstr ""
5120
5121
#: bzrlib/errors.py:749
5122
msgid "Unknown %(kind)s format: %(format)r"
5123
msgstr ""
5124
5125
#: bzrlib/errors.py:758
5126
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5127
msgstr ""
5128
5129
#: bzrlib/errors.py:768
5130
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5131
msgstr ""
5132
5133
#: bzrlib/errors.py:783
5134
msgid ""
5135
"%(target)s\n"
5136
"is not compatible with\n"
5137
"%(source)s\n"
5138
"%(details)s"
5139
msgstr ""
5140
5141
#: bzrlib/errors.py:799
5142
msgid "Revision is not compatible with %(repo_format)s"
5143
msgstr ""
5144
5145
#: bzrlib/errors.py:809
5146
msgid "%(context_info)s%(path)s is already versioned."
5147
msgstr ""
5148
5149
#: bzrlib/errors.py:830
5150
msgid "%(context_info)s%(path)s is not versioned."
5151
msgstr ""
5152
5153
#: bzrlib/errors.py:851
5154
msgid "Path(s) are not versioned: %(paths_as_string)s"
5155
msgstr ""
5156
5157
#: bzrlib/errors.py:862
5158
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5159
msgstr ""
5160
5161
#: bzrlib/errors.py:881
5162
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5163
msgstr ""
5164
5165
#: bzrlib/errors.py:889
5166
msgid ""
5167
"Filename %(filename)r is not valid in your current filesystem encoding "
5168
"%(fs_encoding)s"
5169
msgstr ""
5170
5171
#: bzrlib/errors.py:900
5172
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5173
msgstr ""
5174
5175
#: bzrlib/errors.py:918
5176
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5177
msgstr ""
5178
5179
#: bzrlib/errors.py:957
5180
msgid "Cannot lock %(lock)s: %(why)s"
5181
msgstr ""
5182
5183
#: bzrlib/errors.py:967
5184
msgid ""
5185
"A transaction related operation was attempted after the transaction finished."
5186
msgstr ""
5187
5188
#: bzrlib/errors.py:994
5189
msgid "Cannot lock: transport is read only: %(transport)s"
5190
msgstr ""
5191
5192
#: bzrlib/errors.py:1002
5193
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5194
msgstr ""
5195
5196
#: bzrlib/errors.py:1013
5197
msgid ""
5198
"Lock was broken while still open: %(lock)s - check storage consistency!"
5199
msgstr ""
5200
5201
#: bzrlib/errors.py:1024
5202
msgid ""
5203
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5204
"%(holder)r, wanted to break %(target)r"
5205
msgstr ""
5206
5207
#: bzrlib/errors.py:1036
5208
msgid ""
5209
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5210
"Use 'bzr break-lock' to clear it"
5211
msgstr ""
5212
5213
#: bzrlib/errors.py:1049
5214
msgid "Lock not held: %(lock)s"
5215
msgstr ""
5216
5217
#: bzrlib/errors.py:1078
5218
msgid "No changes to commit"
5219
msgstr ""
5220
5221
#: bzrlib/errors.py:1083
5222
msgid ""
5223
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5224
msgstr ""
5225
5226
#: bzrlib/errors.py:1093
5227
msgid ""
5228
"Excluding paths during commit is not supported by repository at "
5229
"%(repository)r."
5230
msgstr ""
5231
5232
#: bzrlib/errors.py:1102
5233
msgid ""
5234
"The specified commit message contains characters unsupported by the current "
5235
"encoding."
5236
msgstr ""
5237
5238
#: bzrlib/errors.py:1108
5239
msgid "Upgrade URL cannot work with readonly URLs."
5240
msgstr ""
5241
5242
#: bzrlib/errors.py:1113
5243
msgid "The branch format %(format)s is already at the most recent format."
5244
msgstr ""
5245
5246
#: bzrlib/errors.py:1136
5247
msgid "Option --change does not accept revision ranges"
5248
msgstr ""
5249
5250
#: bzrlib/errors.py:1141
5251
msgid "No namespace registered for string: %(spec)r"
5252
msgstr ""
5253
5254
#: bzrlib/errors.py:1160
5255
msgid ""
5256
"Requested revision: '%(spec)s' does not exist in branch: "
5257
"%(branch_url)s%(extra)s"
5258
msgstr ""
5259
5260
#: bzrlib/errors.py:1174
5261
msgid ""
5262
"Operation denied because it would change the main history, which is not "
5263
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5264
msgstr ""
5265
5266
#: bzrlib/errors.py:1185
5267
msgid ""
5268
"These branches have diverged. Use the missing command to see how.\n"
5269
"Use the merge command to reconcile them."
5270
msgstr ""
5271
5272
#: bzrlib/errors.py:1205
5273
msgid ""
5274
"Branches have no common ancestor, and no merge base revision was specified."
5275
msgstr ""
5276
5277
#: bzrlib/errors.py:1211
5278
msgid ""
5279
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5280
msgstr ""
5281
5282
#: bzrlib/errors.py:1217
5283
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5284
msgstr ""
5285
5286
#: bzrlib/errors.py:1226
5287
msgid ""
5288
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5289
msgstr ""
5290
5291
#: bzrlib/errors.py:1235
5292
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5293
msgstr ""
5294
5295
#: bzrlib/errors.py:1244
5296
msgid "Branch %(branch)s has no commits."
5297
msgstr ""
5298
5299
#: bzrlib/errors.py:1262
5300
msgid ""
5301
"Bound branch %(branch)s is out of date with master branch "
5302
"%(master)s.%(extra_help)s"
5303
msgstr ""
5304
5305
#: bzrlib/errors.py:1274
5306
msgid ""
5307
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5308
"bound to %(remote)s."
5309
msgstr ""
5310
5311
#: bzrlib/errors.py:1286
5312
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5313
msgstr ""
5314
5315
#: bzrlib/errors.py:1295
5316
msgid ""
5317
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5318
"%(error)s"
5319
msgstr ""
5320
5321
#: bzrlib/errors.py:1307
5322
msgid "Error in processing weave: %(msg)s"
5323
msgstr ""
5324
5325
#: bzrlib/errors.py:1316
5326
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5327
msgstr ""
5328
5329
#: bzrlib/errors.py:1327
5330
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5331
msgstr ""
5332
5333
#: bzrlib/errors.py:1337
5334
msgid "Weave invariant violated: %(what)s"
5335
msgstr ""
5336
5337
#: bzrlib/errors.py:1346
5338
msgid "Parents are mismatched between two revisions. %(msg)s"
5339
msgstr ""
5340
5341
#: bzrlib/errors.py:1368
5342
msgid ""
5343
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5344
"%(weave_b)s"
5345
msgstr ""
5346
5347
#: bzrlib/errors.py:1380
5348
msgid "Versioned file error"
5349
msgstr ""
5350
5351
#: bzrlib/errors.py:1385
5352
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5353
msgstr ""
5354
5355
#: bzrlib/errors.py:1395
5356
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5357
msgstr ""
5358
5359
#: bzrlib/errors.py:1405
5360
msgid "Text did not match its checksum: %(msg)s"
5361
msgstr ""
5362
5363
#: bzrlib/errors.py:1531
5364
msgid "Export format %(format)r not supported"
5365
msgstr ""
5366
5367
#: bzrlib/errors.py:1540
5368
msgid "Transport error: %(msg)s %(orig_error)s"
5369
msgstr ""
5370
5371
#: bzrlib/errors.py:1566
5372
msgid "Generic bzr smart protocol error: %(details)s"
5373
msgstr ""
5374
5375
#: bzrlib/errors.py:1574
5376
msgid "Received bad protocol version marker: %(marker)r"
5377
msgstr ""
5378
5379
#: bzrlib/errors.py:1606
5380
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5381
msgstr ""
5382
5383
#: bzrlib/errors.py:1611
5384
msgid "Connection error: %(msg)s %(orig_error)s"
5385
msgstr ""
5386
5387
#: bzrlib/errors.py:1616
5388
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5389
msgstr ""
5390
5391
#: bzrlib/errors.py:1637
5392
msgid "Connection closed: %(msg)s %(orig_error)s"
5393
msgstr ""
5394
5395
#: bzrlib/errors.py:1642
5396
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5397
msgstr ""
5398
5399
#: bzrlib/errors.py:1647
5400
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5401
msgstr ""
5402
5403
#: bzrlib/errors.py:1657
5404
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5405
msgstr ""
5406
5407
#: bzrlib/errors.py:1672
5408
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5409
msgstr ""
5410
5411
#: bzrlib/errors.py:1686
5412
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5413
msgstr ""
5414
5415
#: bzrlib/errors.py:1694
5416
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5417
msgstr ""
5418
5419
#: bzrlib/errors.py:1703
5420
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5421
msgstr ""
5422
5423
#: bzrlib/errors.py:1717
5424
msgid "Too many redirections"
5425
msgstr ""
5426
5427
#: bzrlib/errors.py:1722
5428
msgid "Working tree has conflicts."
5429
msgstr ""
5430
5431
#: bzrlib/errors.py:1726
5432
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5433
msgstr ""
5434
5435
#: bzrlib/errors.py:1735
5436
msgid ""
5437
"Error(s) parsing config file %(filename)s:\n"
5438
"%(errors)s"
5439
msgstr ""
5440
5441
#: bzrlib/errors.py:1746
5442
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5443
msgstr ""
5444
5445
#: bzrlib/errors.py:1754
5446
msgid "%(username)r does not seem to contain a reasonable email address"
5447
msgstr ""
5448
5449
#: bzrlib/errors.py:1763
5450
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5451
msgstr ""
5452
5453
#: bzrlib/errors.py:1771
5454
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5455
msgstr ""
5456
5457
#: bzrlib/errors.py:1779
5458
msgid "Unable to import library \"%(library)s\": %(error)s"
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:1787
5462
msgid "python-gpgme is not installed, it is needed to verify signatures"
5463
msgstr ""
5464
5465
#: bzrlib/errors.py:1795
5466
msgid ""
5467
"The working tree for %(basedir)s has changed since the last commit, but "
5468
"weave merge requires that it be unchanged"
5469
msgstr ""
5470
5471
#: bzrlib/errors.py:1805
5472
msgid ""
5473
"Can't reprocess and show base, because reprocessing obscures the "
5474
"relationship of conflicting lines to the base"
5475
msgstr ""
5476
5477
#: bzrlib/errors.py:1811
5478
msgid "Cycle in graph %(graph)r"
5479
msgstr ""
5480
5481
#: bzrlib/errors.py:1839
5482
msgid "File %(filename)s is not conflicted."
5483
msgstr ""
5484
5485
#: bzrlib/errors.py:1861
5486
msgid "No bundle was found in \"%(filename)s\"."
5487
msgstr ""
5488
5489
#: bzrlib/errors.py:1870
5490
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5491
msgstr ""
5492
5493
#: bzrlib/errors.py:1880
5494
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5495
msgstr ""
5496
5497
#: bzrlib/errors.py:1893
5498
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5499
msgstr ""
5500
5501
#: bzrlib/errors.py:1903
5502
msgid "Key %(key)s is already present in map"
5503
msgstr ""
5504
5505
#: bzrlib/errors.py:1908
5506
msgid "The prefix %(prefix)s is in the help search path twice."
5507
msgstr ""
5508
5509
#: bzrlib/errors.py:1918
5510
msgid ""
5511
"No final name for trans_id %(trans_id)r\n"
5512
"file-id: %(file_id)r\n"
5513
"root trans-id: %(root_trans_id)r\n"
5514
msgstr ""
5515
5516
#: bzrlib/errors.py:1950
5517
msgid "Attempt to reuse a transform that has already been applied."
5518
msgstr ""
5519
5520
#: bzrlib/errors.py:1955
5521
msgid "Moving the root directory is not supported at this time"
5522
msgstr ""
5523
5524
#: bzrlib/errors.py:1960
5525
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5526
msgstr ""
5527
5528
#: bzrlib/errors.py:1971
5529
msgid ""
5530
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5531
msgstr ""
5532
5533
#: bzrlib/errors.py:2007
5534
msgid ""
5535
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5536
msgstr ""
5537
5538
#: bzrlib/errors.py:2037
5539
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5540
msgstr ""
5541
5542
#: bzrlib/errors.py:2045
5543
msgid "Nothing to merge."
5544
msgstr ""
5545
5546
#: bzrlib/errors.py:2050
5547
msgid "Format %(format)s cannot be initialised by this version of bzr."
5548
msgstr ""
5549
5550
#: bzrlib/errors.py:2059
5551
msgid ""
5552
"Cannot convert from format %(from_format)s to format %(format)s. "
5553
"%(problem)s"
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:2071
5557
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5558
msgstr ""
5559
5560
#: bzrlib/errors.py:2079
5561
msgid "%(exe_name)s could not be found on this machine"
5562
msgstr ""
5563
5564
#: bzrlib/errors.py:2087
5565
msgid "Diff is not installed on this machine: %(msg)s"
5566
msgstr ""
5567
5568
#: bzrlib/errors.py:2095
5569
msgid "Diff3 is not installed on this machine."
5570
msgstr ""
5571
5572
#: bzrlib/errors.py:2101
5573
msgid "The content being inserted is already present."
5574
msgstr ""
5575
5576
#: bzrlib/errors.py:2106
5577
msgid ""
5578
"This tree contains left-over files from a failed operation.\n"
5579
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5580
"to\n"
5581
" keep, and delete it when you are done."
5582
msgstr ""
5583
5584
#: bzrlib/errors.py:2117
5585
msgid ""
5586
"This tree contains left-over files from a failed operation.\n"
5587
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5588
" wish to keep, and delete it when you are done."
5589
msgstr ""
5590
5591
#: bzrlib/errors.py:2127
5592
msgid ""
5593
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5594
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5595
"to\n"
5596
" keep, and delete it when you are done."
5597
msgstr ""
5598
5599
#: bzrlib/errors.py:2138
5600
msgid ""
5601
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5602
"examine %(pending_deletion)s to see if it contains any files you wish to "
5603
"keep, and delete it when you are done."
5604
msgstr ""
5605
5606
#: bzrlib/errors.py:2148
5607
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5608
msgstr ""
5609
5610
#: bzrlib/errors.py:2162
5611
msgid ""
5612
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5613
msgstr ""
5614
5615
#: bzrlib/errors.py:2175
5616
msgid "Error in merge modified format"
5617
msgstr ""
5618
5619
#: bzrlib/errors.py:2180
5620
msgid "Format error in conflict listings"
5621
msgstr ""
5622
5623
#: bzrlib/errors.py:2184
5624
msgid ""
5625
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5626
"Error: %(description)s"
5627
msgstr ""
5628
5629
#: bzrlib/errors.py:2195
5630
msgid ""
5631
"An error has been detected in the repository %(repo_path)s.\n"
5632
"Please run bzr reconcile on this repository."
5633
msgstr ""
5634
5635
#: bzrlib/errors.py:2206
5636
msgid ""
5637
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5638
"reason: %(reason)s"
5639
msgstr ""
5640
5641
#: bzrlib/errors.py:2219
5642
msgid ""
5643
"An inconsistent delta was supplied: %(delta)r\n"
5644
"reason: %(reason)s"
5645
msgstr ""
5646
5647
#: bzrlib/errors.py:2231
5648
msgid "To use this feature you must upgrade your branch at %(path)s."
5649
msgstr ""
5650
5651
#: bzrlib/errors.py:2240
5652
msgid "To use this feature you must upgrade your repository at %(path)s."
5653
msgstr ""
5654
5655
#: bzrlib/errors.py:2245
5656
msgid ""
5657
"To use this feature you must upgrade your branch at %(path)s to a format "
5658
"which supports rich roots."
5659
msgstr ""
5660
5661
#: bzrlib/errors.py:2251
5662
msgid "Cannot perform local-only commits on unbound branches."
5663
msgstr ""
5664
5665
#: bzrlib/errors.py:2256
5666
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5667
msgstr ""
5668
5669
#: bzrlib/errors.py:2277
5670
msgid "Ghost tags not supported by format %(format)r."
5671
msgstr ""
5672
5673
#: bzrlib/errors.py:2285
5674
msgid "File is binary but should be text."
5675
msgstr ""
5676
5677
#: bzrlib/errors.py:2290
5678
msgid "The path %(path)s is not permitted on this platform"
5679
msgstr ""
5680
5681
#: bzrlib/errors.py:2299
5682
msgid ""
5683
"Testament did not match expected value.\n"
5684
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5685
" {%(measured)s}"
5686
msgstr ""
5687
5688
#: bzrlib/errors.py:2311
5689
msgid "Not a bzr revision-bundle: %(text)r"
5690
msgstr ""
5691
5692
#: bzrlib/errors.py:2320
5693
msgid "Bad bzr revision-bundle: %(text)r"
5694
msgstr ""
5695
5696
#: bzrlib/errors.py:2329
5697
msgid "Malformed bzr revision-bundle header: %(text)r"
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:2334
5701
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5702
msgstr ""
5703
5704
#: bzrlib/errors.py:2339
5705
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5706
msgstr ""
5707
5708
#: bzrlib/errors.py:2344
5709
msgid "End of line marker was not \\n in bzr revision-bundle"
5710
msgstr ""
5711
5712
#: bzrlib/errors.py:2354
5713
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5714
msgstr ""
5715
5716
#: bzrlib/errors.py:2364
5717
msgid "Root class for inventory serialization errors"
5718
msgstr ""
5719
5720
#: bzrlib/errors.py:2368
5721
msgid ""
5722
"The inventory was not in the expected format:\n"
5723
" %(msg)s"
5724
msgstr ""
5725
5726
#: bzrlib/errors.py:2377
5727
msgid "This operation requires rich root data storage"
5728
msgstr ""
5729
5730
#: bzrlib/errors.py:2390
5731
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5732
msgstr ""
5733
5734
#: bzrlib/errors.py:2399
5735
msgid ""
5736
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5737
"variable."
5738
msgstr ""
5739
5740
#: bzrlib/errors.py:2406
5741
msgid ""
5742
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5743
"ghost at {%(ghost_revision_id)s}"
5744
msgstr ""
5745
5746
#: bzrlib/errors.py:2416
5747
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5748
msgstr ""
5749
5750
#: bzrlib/errors.py:2467
5751
msgid ""
5752
"A merge directive must provide either a bundle or a public branch location."
5753
msgstr ""
5754
5755
#: bzrlib/errors.py:2474
5756
msgid "Bad merge directive payload %(start)r"
5757
msgstr ""
5758
5759
#: bzrlib/errors.py:2484
5760
msgid "Preview patch does not match requested changes."
5761
msgstr ""
5762
5763
#: bzrlib/errors.py:2490
5764
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:2500
5768
msgid ""
5769
"Your branch does not have all of the revisions required in order to merge "
5770
"this merge directive and the target location specified in the merge "
5771
"directive is not a branch: %(location)s."
5772
msgstr ""
5773
5774
#: bzrlib/errors.py:2512
5775
msgid "Unsupported entry kind %(kind)s"
5776
msgstr ""
5777
5778
#: bzrlib/errors.py:2520
5779
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5780
msgstr ""
5781
5782
#: bzrlib/errors.py:2530
5783
msgid "Subsume target %(other_tree)s needs to be upgraded."
5784
msgstr ""
5785
5786
#: bzrlib/errors.py:2549
5787
msgid "No such tag: %(tag_name)s"
5788
msgstr ""
5789
5790
#: bzrlib/errors.py:2557
5791
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5792
msgstr ""
5793
5794
#: bzrlib/errors.py:2566
5795
msgid "Tag %(tag_name)s already exists."
5796
msgstr ""
5797
5798
#: bzrlib/errors.py:2574
5799
msgid ""
5800
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5801
"bugs\" for more information on this feature."
5802
msgstr ""
5803
5804
#: bzrlib/errors.py:2584
5805
msgid ""
5806
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5807
msgstr ""
5808
5809
#: bzrlib/errors.py:2594
5810
msgid ""
5811
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5812
msgstr ""
5813
5814
#: bzrlib/errors.py:2604
5815
msgid "Invalid line in bugs property: '%(line)s'"
5816
msgstr ""
5817
5818
#: bzrlib/errors.py:2612
5819
msgid "Invalid bug status: '%(status)s'"
5820
msgstr ""
5821
5822
#: bzrlib/errors.py:2620
5823
msgid "Could not understand response from smart server: %(response_tuple)r"
5824
msgstr ""
5825
5826
#: bzrlib/errors.py:2659
5827
msgid "Server sent an unexpected error: %(error_tuple)r"
5828
msgstr ""
5829
5830
#: bzrlib/errors.py:2678
5831
msgid "Unrecognised container format: %(container_format)r"
5832
msgstr ""
5833
5834
#: bzrlib/errors.py:2686
5835
msgid "Unexpected end of container stream"
5836
msgstr ""
5837
5838
#: bzrlib/errors.py:2691
5839
msgid "Unknown record type: %(record_type)r"
5840
msgstr ""
5841
5842
#: bzrlib/errors.py:2699
5843
msgid "Invalid record: %(reason)s"
5844
msgstr ""
5845
5846
#: bzrlib/errors.py:2707
5847
msgid "Container has data after end marker: %(excess)r"
5848
msgstr ""
5849
5850
#: bzrlib/errors.py:2715
5851
msgid "Container has multiple records with the same name: %(name)s"
5852
msgstr ""
5853
5854
#: bzrlib/errors.py:2728
5855
msgid "Corrupt or incompatible data stream: %(reason)s"
5856
msgstr ""
5857
5858
#: bzrlib/errors.py:2736
5859
msgid "SMTP error: %(error)s"
5860
msgstr ""
5861
5862
#: bzrlib/errors.py:2744
5863
msgid "No message supplied."
5864
msgstr ""
5865
5866
#: bzrlib/errors.py:2749
5867
msgid "No mail-to address (--mail-to) or output (-o) specified."
5868
msgstr ""
5869
5870
#: bzrlib/errors.py:2754
5871
msgid "Unknown mail client: %(mail_client)s"
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:2762
5875
msgid ""
5876
"Unable to find mail client with the following names: "
5877
"%(mail_command_list_string)s"
5878
msgstr ""
5879
5880
#: bzrlib/errors.py:2772
5881
msgid "SMTP connection to %(host)s refused"
5882
msgstr ""
5883
5884
#: bzrlib/errors.py:2781
5885
msgid "Please specify smtp_server. No server at default %(host)s."
5886
msgstr ""
5887
5888
#: bzrlib/errors.py:2795
5889
msgid ""
5890
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5891
"reconfigure."
5892
msgstr ""
5893
5894
#: bzrlib/errors.py:2807
5895
msgid "'%(display_url)s' is already a branch."
5896
msgstr ""
5897
5898
#: bzrlib/errors.py:2812
5899
msgid "'%(display_url)s' is already a tree."
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:2817
5903
msgid "'%(display_url)s' is already a checkout."
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:2822
5907
msgid "'%(display_url)s' is already a lightweight checkout."
5908
msgstr ""
5909
5910
#: bzrlib/errors.py:2827
5911
msgid "'%(display_url)s' is already using a shared repository."
5912
msgstr ""
5913
5914
#: bzrlib/errors.py:2832
5915
msgid "'%(display_url)s' is already standalone."
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:2837
5919
msgid "Shared repository '%(display_url)s' already creates working trees."
5920
msgstr ""
5921
5922
#: bzrlib/errors.py:2843
5923
msgid ""
5924
"Shared repository '%(display_url)s' already doesn't create working trees."
5925
msgstr ""
5926
5927
#: bzrlib/errors.py:2849
5928
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5929
msgstr ""
5930
5931
#: bzrlib/errors.py:2854
5932
msgid "No location could be found to bind to at %(display_url)s."
5933
msgstr ""
5934
5935
#: bzrlib/errors.py:2859
5936
msgid ""
5937
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5938
"status).%(more)s"
5939
msgstr ""
5940
5941
#: bzrlib/errors.py:2878
5942
msgid ""
5943
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5944
"list).%(more)s"
5945
msgstr ""
5946
5947
#: bzrlib/errors.py:2884
5948
msgid "Variable {%(name)s} is not available."
5949
msgstr ""
5950
5951
#: bzrlib/errors.py:2892
5952
msgid "No template specified."
5953
msgstr ""
5954
5955
#: bzrlib/errors.py:2897
5956
msgid "Unable to create symlink %(path_str)son this platform"
5957
msgstr ""
5958
5959
#: bzrlib/errors.py:2912
5960
msgid ""
5961
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5962
"\"original\", \"local\"."
5963
msgstr ""
5964
5965
#: bzrlib/errors.py:2946
5966
msgid ""
5967
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5968
msgstr ""
5969
5970
#: bzrlib/errors.py:2958
5971
msgid "The \"%(config_id)s\" configuration does not exist."
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:2966
5975
msgid "The \"%(option_name)s\" configuration option does not exist."
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:2974
5979
msgid "The alias \"%(alias_name)s\" does not exist."
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:2988
5983
msgid "\"%(alias_name)s\" is not a valid location alias."
5984
msgstr ""
5985
5986
#: bzrlib/errors.py:2996
5987
msgid "No %(alias_name)s location assigned."
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:3004
5991
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
5992
msgstr ""
5993
5994
#: bzrlib/errors.py:3014
5995
msgid "Unknown rules detected: %(unknowns_str)s."
5996
msgstr ""
5997
5998
#: bzrlib/errors.py:3025
5999
msgid "Tip change rejected: %(msg)s"
6000
msgstr ""
6001
6002
#: bzrlib/errors.py:3033
6003
msgid "Shelf corrupt."
6004
msgstr ""
6005
6006
#: bzrlib/errors.py:3038
6007
msgid "Corruption while decompressing repository file%(orig_error)s"
6008
msgstr ""
6009
6010
#: bzrlib/errors.py:3050
6011
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:3058
6015
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:3066
6019
msgid ""
6020
"An attempt to access a url outside the server jail was made: '%(url)s'."
6021
msgstr ""
6022
6023
#: bzrlib/errors.py:3074
6024
msgid "The user aborted the operation."
6025
msgstr ""
6026
6027
#: bzrlib/errors.py:3079
6028
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6029
msgstr ""
6030
6031
#: bzrlib/errors.py:3089
6032
msgid "No such view: %(view_name)s."
6033
msgstr ""
6034
6035
#: bzrlib/errors.py:3099
6036
msgid ""
6037
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6038
"to a later format."
6039
msgstr ""
6040
6041
#: bzrlib/errors.py:3108
6042
msgid ""
6043
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6044
msgstr ""
6045
6046
#: bzrlib/errors.py:3175
6047
msgid "%(bzrdir)r does not support co-located branches."
6048
msgstr ""
6049
6050
#: bzrlib/errors.py:3181
6051
msgid ""
6052
"Unable to determine your name.\n"
6053
"Please, set your name with the 'whoami' command.\n"
6054
"E.g. bzr whoami \"Your Name <name@example.com>\""
6055
msgstr ""
6056
6057
#: bzrlib/errors.py:3190
6058
msgid "Invalid pattern(s) found. %(msg)s"
6059
msgstr ""
6060
6061
#: bzrlib/errors.py:3198
6062
msgid ""
6063
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6064
"unbind` to fix."
6065
msgstr ""
6066
6067
#: bzrlib/errors.py:3209
6068
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6069
msgstr ""
6070
6071
#: bzrlib/errors.py:3218
6072
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6073
msgstr ""
6074
6075
#: bzrlib/errors.py:3227
6076
msgid ""
6077
"No compatible object available for operations from %(source)r to %(target)r."
6078
msgstr ""
6079
6080
#: bzrlib/errors.py:3237
6081
msgid ""
6082
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6083
"%(arguments)s."
6084
msgstr ""
6085
6086
#: bzrlib/errors.py:3247
6087
msgid ""
6088
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6089
"format %(format)r"
6090
msgstr ""
6091
6092
#: bzrlib/errors.py:3259
6093
msgid ""
6094
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6095
"plugin."
6096
msgstr ""
6097
6098
#: bzrlib/errors.py:3272
6099
msgid "Binary files section encountered."
6100
msgstr ""
6101
6102
#: bzrlib/errors.py:3280
6103
msgid ""
6104
"Malformed patch header. %(desc)s\n"
6105
"%(line)r"
6106
msgstr ""
6107
6108
#: bzrlib/errors.py:3289
6109
msgid ""
6110
"Malformed hunk header. %(desc)s\n"
6111
"%(line)r"
6112
msgstr ""
6113
6114
#: bzrlib/errors.py:3298
6115
msgid ""
6116
"Malformed line. %(desc)s\n"
6117
"%(line)r"
6118
msgstr ""
6119
6120
#: bzrlib/errors.py:3308
6121
msgid ""
6122
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6123
"but patch says it should be \"%(patch_line)s\""
6124
msgstr ""
6125
6126
#: bzrlib/errors.py:3319
6127
msgid "The feature %(feature)s has already been registered."
6128
msgstr ""
6129
6130
#: bzrlib/export_pot.py:252
6131
#, python-format
6132
msgid "Exporting messages from builtin command: %s"
6133
msgstr ""
6134
6135
#: bzrlib/export_pot.py:271
6136
msgid "Exporting messages from plugin command: {0} in {1}"
6137
msgstr ""
6138
6139
#: bzrlib/export_pot.py:292
6140
#, python-format
6141
msgid "Exporting message from error: %s"
6142
msgstr ""
6143
6144
#: bzrlib/fetch.py:98
6145
msgid "Finding revisions"
6146
msgstr ""
6147
6148
#: bzrlib/fetch.py:103
6149
msgid "Fetching revisions"
6150
msgstr ""
6151
6152
#: bzrlib/foreign.py:262
6153
msgid "Push into a different VCS without any custom bzr metadata."
6154
msgstr ""
6155
6156
#: bzrlib/foreign.py:264
6157
msgid ""
6158
"This will afterwards rebase the local branch on the remote\n"
6159
"branch unless the --no-rebase option is used, in which case \n"
6160
"the two branches will be out of sync after the push. "
6161
msgstr ""
6162
6163
#: bzrlib/foreign.py:277
6164
msgid "Do not rebase after push."
6165
msgstr ""
6166
6167
#: bzrlib/foreign.py:311
6168
#, python-format
6169
msgid "Using saved location: %s\n"
6170
msgstr ""
6171
6172
#: bzrlib/foreign.py:321
6173
msgid ""
6174
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6175
"regular push."
6176
msgstr ""
6177
6178
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6179
msgid "{0} commits with valid signatures"
6180
msgstr ""
6181
6182
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6183
msgid "{0} commit with unknown key"
6184
msgid_plural "{0} commits with unknown keys"
6185
msgstr[0] ""
6186
msgstr[1] ""
6187
6188
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6189
msgid "{0} commit not valid"
6190
msgid_plural "{0} commits not valid"
6191
msgstr[0] ""
6192
msgstr[1] ""
6193
6194
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6195
msgid "{0} commit not signed"
6196
msgid_plural "{0} commits not signed"
6197
msgstr[0] ""
6198
msgstr[1] ""
6199
6200
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6201
msgid "{0} commit with key now expired"
6202
msgid_plural "{0} commits with key now expired"
6203
msgstr[0] ""
6204
msgstr[1] ""
6205
6206
#: bzrlib/gpg.py:343
6207
msgid "No GnuPG key results for pattern: {0}"
6208
msgstr ""
6209
6210
#: bzrlib/gpg.py:386
6211
msgid "{0} signed {1} commit"
6212
msgid_plural "{0} signed {1} commits"
6213
msgstr[0] ""
6214
msgstr[1] ""
6215
6216
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6217
msgid "{0} commit by author {1}"
6218
msgid_plural "{0} commits by author {1}"
6219
msgstr[0] ""
6220
msgstr[1] ""
6221
6222
#: bzrlib/gpg.py:433
6223
msgid "Unknown key {0} signed {1} commit"
6224
msgid_plural "Unknown key {0} signed {1} commits"
6225
msgstr[0] ""
6226
msgstr[1] ""
6227
6228
#: bzrlib/gpg.py:452
6229
msgid "{0} commit by author {1} with key {2} now expired"
6230
msgid_plural "{0} commits by author {1} with key {2} now expired"
6231
msgstr[0] ""
6232
msgstr[1] ""
6233
6234
#: bzrlib/groupcompress.py:1739
6235
#, python-format
6236
msgid "Insert claimed random_id=True, but then inserted %r two times"
6237
msgstr ""
6238
6239
#: bzrlib/hooks.py:331
6240
#, python-format
6241
msgid "Introduced in: %s"
6242
msgstr ""
6243
6244
#: bzrlib/hooks.py:334
6245
#, python-format
6246
msgid "Deprecated in: %s"
6247
msgstr ""
6248
6249
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6250
msgid "Walking content"
6251
msgstr ""
6252
6253
#: bzrlib/knit.py:3330
6254
msgid "annotating"
6255
msgstr ""
6256
6257
#: bzrlib/lock.py:548
6258
msgid "{0!r} was {1} locked again"
6259
msgstr ""
6260
6261
#: bzrlib/lockdir.py:321
6262
#, python-format
6263
msgid "error removing pending lock: %s"
6264
msgstr ""
6265
6266
#: bzrlib/lockdir.py:616
6267
msgid "Unable to obtain"
6268
msgstr ""
6269
6270
#: bzrlib/lockdir.py:618
6271
msgid "Lock owner changed for"
6272
msgstr ""
6273
6274
#: bzrlib/lockdir.py:620
6275
msgid "{0} lock {1} {2}."
6276
msgstr ""
6277
6278
#: bzrlib/lockdir.py:627
6279
#, python-format
6280
msgid "Will continue to try until %s, unless you press Ctrl-C."
6281
msgstr ""
6282
6283
#: bzrlib/lockdir.py:629
6284
msgid "See \"bzr help break-lock\" for more."
6285
msgstr ""
6286
6287
#: bzrlib/lockdir.py:739
6288
#, python-format
6289
msgid ""
6290
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6291
msgstr ""
6292
6293
#: bzrlib/log.py:572
6294
msgid "--exclude-common-ancestry requires two different revisions"
6295
msgstr ""
6296
6297
#: bzrlib/log.py:574
6298
#, python-format
6299
msgid "invalid direction %r"
6300
msgstr ""
6301
6302
#: bzrlib/log.py:662
6303
msgid "Start revision not found in history of end revision."
6304
msgstr ""
6305
6306
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6307
msgid "Logging revision 0 is invalid."
6308
msgstr ""
6309
6310
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6311
msgid "Start revision must be older than the end revision."
6312
msgstr ""
6313
6314
#: bzrlib/log.py:1827
6315
#, python-format
6316
msgid "unknown log formatter: %r"
6317
msgstr ""
6318
6319
#: bzrlib/log.py:2123
6320
msgid "fixes bug"
6321
msgid_plural "fixes bugs"
6322
msgstr[0] ""
6323
msgstr[1] ""
6324
6325
#: bzrlib/merge.py:689
6326
msgid "All changes applied successfully."
6327
msgstr ""
6328
6329
#: bzrlib/merge.py:691
6330
#, python-format
6331
msgid "%d conflicts encountered."
6332
msgstr ""
6333
6334
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6335
msgid "Preparing file merge"
6336
msgstr ""
6337
6338
#: bzrlib/multiparent.py:426
6339
msgid "Importing revisions"
6340
msgstr ""
6341
6342
#: bzrlib/option.py:526
6343
msgid "Show help message."
6344
msgstr ""
6345
6346
#: bzrlib/option.py:528
6347
msgid "Only display errors and warnings."
6348
msgstr ""
6349
6350
#: bzrlib/option.py:531
6351
msgid "Show usage message and options."
6352
msgstr ""
6353
6354
#: bzrlib/option.py:533
6355
msgid "Display more information."
6356
msgstr ""
6357
6358
#: bzrlib/option.py:541
6359
msgid ""
6360
"Select changes introduced by the specified revision. See also \"help "
6361
"revisionspec\"."
6362
msgstr ""
6363
6364
#: bzrlib/option.py:543
6365
msgid "Branch to operate on, instead of working directory."
6366
msgstr ""
6367
6368
#: bzrlib/option.py:545
6369
msgid "Detailed log format."
6370
msgstr ""
6371
6372
#: bzrlib/option.py:545
6373
msgid "Format used by GNU ChangeLog files."
6374
msgstr ""
6375
6376
#: bzrlib/option.py:545
6377
msgid "Log format with one line per revision."
6378
msgstr ""
6379
6380
#: bzrlib/option.py:545
6381
msgid "Moderately short log format."
6382
msgstr ""
6383
6384
#: bzrlib/option.py:545
6385
msgid "Use specified log format."
6386
msgstr ""
6387
6388
#: bzrlib/option.py:547
6389
msgid "Log format"
6390
msgstr ""
6391
6392
#: bzrlib/option.py:549
6393
msgid "LCA-newness merge."
6394
msgstr ""
6395
6396
#: bzrlib/option.py:549
6397
msgid "Merge using external diff3."
6398
msgstr ""
6399
6400
#: bzrlib/option.py:549
6401
msgid "Native diff3-style merge."
6402
msgstr ""
6403
6404
#: bzrlib/option.py:549
6405
msgid "Select a particular merge algorithm."
6406
msgstr ""
6407
6408
#: bzrlib/option.py:549
6409
msgid "Weave-based merge."
6410
msgstr ""
6411
6412
#: bzrlib/option.py:551
6413
msgid "Merge algorithm"
6414
msgstr ""
6415
6416
#: bzrlib/option.py:554
6417
msgid "Message string."
6418
msgstr ""
6419
6420
#: bzrlib/option.py:556
6421
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6422
msgstr ""
6423
6424
#: bzrlib/option.py:558
6425
msgid "Ignore differences between branches and overwrite unconditionally."
6426
msgstr ""
6427
6428
#: bzrlib/option.py:560
6429
msgid "Remember the specified location as a default."
6430
msgstr ""
6431
6432
#: bzrlib/option.py:562
6433
msgid "Reprocess to reduce spurious conflicts."
6434
msgstr ""
6435
6436
#: bzrlib/option.py:566
6437
msgid "See \"help revisionspec\" for details."
6438
msgstr ""
6439
6440
#: bzrlib/option.py:568
6441
msgid "Show internal object ids."
6442
msgstr ""
6443
6444
#: bzrlib/option.py:571
6445
msgid "Display timezone as local, original, or utc."
6446
msgstr ""
6447
6448
#: bzrlib/osutils.py:100
6449
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6450
msgstr ""
6451
6452
#: bzrlib/osutils.py:220
6453
msgid "lstat/stat of ({0!r}): {1!r}"
6454
msgstr ""
6455
6456
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6457
#, python-format
6458
msgid "sorry, %r not allowed in path"
6459
msgstr ""
6460
6461
#: bzrlib/osutils.py:1226
6462
#, python-format
6463
msgid "%r is too short to calculate a relative path"
6464
msgstr ""
6465
6466
#: bzrlib/plugin.py:143
6467
#, python-format
6468
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6469
msgstr ""
6470
6471
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6472
msgid "Enable completions for the selected plugin (default: all plugins)"
6473
msgstr ""
6474
6475
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6476
msgid "Generate a shell function for bash command line completion."
6477
msgstr ""
6478
6479
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6480
msgid ""
6481
"This command generates a shell function which can be used by bash to\n"
6482
"automatically complete the currently typed command when the user presses\n"
6483
"the completion key (usually tab)."
6484
msgstr ""
6485
6486
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6487
msgid ""
6488
"Commonly used like this:\n"
6489
" eval \"`bzr bash-completion`\""
6490
msgstr ""
6491
6492
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6493
msgid "Name of the generated function (default: _bzr)"
6494
msgstr ""
6495
6496
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6497
msgid "Generate only the shell function, don't enable it"
6498
msgstr ""
6499
6500
#: bzrlib/plugins/launchpad/__init__.py:81
6501
msgid "Register a branch with launchpad.net."
6502
msgstr ""
6503
6504
#: bzrlib/plugins/launchpad/__init__.py:83
6505
msgid ""
6506
"This command lists a bzr branch in the directory of branches on\n"
6507
"launchpad.net. Registration allows the branch to be associated with\n"
6508
"bugs or specifications."
6509
msgstr ""
6510
6511
#: bzrlib/plugins/launchpad/__init__.py:87
6512
msgid ""
6513
"Before using this command you must register the project to which the\n"
6514
"branch belongs, and create an account for yourself on launchpad.net."
6515
msgstr ""
6516
6517
#: bzrlib/plugins/launchpad/__init__.py:90
6518
msgid ""
6519
"arguments:\n"
6520
" public_url: The publicly visible url for the branch to register.\n"
6521
" This must be an http or https url (which Launchpad can read\n"
6522
" from to access the branch). Local file urls, SFTP urls, and\n"
6523
" bzr+ssh urls will not work.\n"
6524
" If no public_url is provided, bzr will use the configured\n"
6525
" public_url if there is one for the current branch, and\n"
6526
" otherwise error."
6527
msgstr ""
6528
6529
#: bzrlib/plugins/launchpad/__init__.py:99
6530
msgid ""
6531
"example:\n"
6532
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6533
" --project fooproject"
6534
msgstr ""
6535
6536
#: bzrlib/plugins/launchpad/__init__.py:106
6537
msgid "Launchpad project short name to associate with the branch."
6538
msgstr ""
6539
6540
#: bzrlib/plugins/launchpad/__init__.py:113
6541
msgid ""
6542
"Short name for the branch; by default taken from the last component of the "
6543
"url."
6544
msgstr ""
6545
6546
#: bzrlib/plugins/launchpad/__init__.py:117
6547
msgid "One-sentence description of the branch."
6548
msgstr ""
6549
6550
#: bzrlib/plugins/launchpad/__init__.py:120
6551
msgid "Longer description of the purpose or contents of the branch."
6552
msgstr ""
6553
6554
#: bzrlib/plugins/launchpad/__init__.py:123
6555
msgid "Branch author's email address, if not yourself."
6556
msgstr ""
6557
6558
#: bzrlib/plugins/launchpad/__init__.py:126
6559
msgid "The bug this branch fixes."
6560
msgstr ""
6561
6562
#: bzrlib/plugins/launchpad/__init__.py:129
6563
msgid "Prepare the request but don't actually send it."
6564
msgstr ""
6565
6566
#: bzrlib/plugins/launchpad/__init__.py:151
6567
msgid ""
6568
"register-branch requires a public branch url - see bzr help register-branch."
6569
msgstr ""
6570
6571
#: bzrlib/plugins/launchpad/__init__.py:159
6572
msgid "--product is deprecated; please use --project."
6573
msgstr ""
6574
6575
#: bzrlib/plugins/launchpad/__init__.py:191
6576
msgid "Open a Launchpad branch page in your web browser."
6577
msgstr ""
6578
6579
#: bzrlib/plugins/launchpad/__init__.py:196
6580
msgid "Do not actually open the browser. Just say the URL we would use."
6581
msgstr ""
6582
6583
#: bzrlib/plugins/launchpad/__init__.py:231
6584
#, python-format
6585
msgid "Opening %s in web browser"
6586
msgstr ""
6587
6588
#: bzrlib/plugins/launchpad/__init__.py:241
6589
msgid "Show or set the Launchpad user ID."
6590
msgstr ""
6591
6592
#: bzrlib/plugins/launchpad/__init__.py:243
6593
msgid ""
6594
"When communicating with Launchpad, some commands need to know your\n"
6595
"Launchpad user ID. This command can be used to set or show the\n"
6596
"user ID that Bazaar will use for such communication."
6597
msgstr ""
6598
6599
#: bzrlib/plugins/launchpad/__init__.py:247
6600
msgid ""
6601
":Examples:\n"
6602
" Show the Launchpad ID of the current user::"
6603
msgstr ""
6604
6605
#: bzrlib/plugins/launchpad/__init__.py:250
6606
msgid " bzr launchpad-login"
6607
msgstr ""
6608
6609
#: bzrlib/plugins/launchpad/__init__.py:252
6610
msgid " Set the Launchpad ID of the current user to 'bob'::"
6611
msgstr ""
6612
6613
#: bzrlib/plugins/launchpad/__init__.py:254
6614
msgid " bzr launchpad-login bob"
6615
msgstr ""
6616
6617
#: bzrlib/plugins/launchpad/__init__.py:261
6618
msgid "Don't check that the user name is valid."
6619
msgstr ""
6620
6621
#: bzrlib/plugins/launchpad/__init__.py:276
6622
#: bzrlib/plugins/launchpad/__init__.py:287
6623
msgid "Launchpad user ID exists and has SSH keys.\n"
6624
msgstr ""
6625
6626
#: bzrlib/plugins/launchpad/__init__.py:279
6627
msgid "No Launchpad user ID configured.\n"
6628
msgstr ""
6629
6630
#: bzrlib/plugins/launchpad/__init__.py:290
6631
#, python-format
6632
msgid "Launchpad user ID set to '%s'.\n"
6633
msgstr ""
6634
6635
#: bzrlib/plugins/launchpad/__init__.py:298
6636
msgid "Ask Launchpad to mirror a branch now."
6637
msgstr ""
6638
6639
#: bzrlib/plugins/launchpad/__init__.py:318
6640
msgid "Propose merging a branch on Launchpad."
6641
msgstr ""
6642
6643
#: bzrlib/plugins/launchpad/__init__.py:320
6644
msgid ""
6645
"This will open your usual editor to provide the initial comment. When it\n"
6646
"has created the proposal, it will open it in your default web browser."
6647
msgstr ""
6648
6649
#: bzrlib/plugins/launchpad/__init__.py:323
6650
msgid ""
6651
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6652
"is not supplied, the remembered submit branch will be used. If no submit\n"
6653
"branch is remembered, the development focus will be used."
6654
msgstr ""
6655
6656
#: bzrlib/plugins/launchpad/__init__.py:327
6657
msgid ""
6658
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6659
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6660
"The parameter the launchpad account name of the desired reviewer. This\n"
6661
"may optionally be followed by '=' and the review type. For example:"
6662
msgstr ""
6663
6664
#: bzrlib/plugins/launchpad/__init__.py:332
6665
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6666
msgstr ""
6667
6668
#: bzrlib/plugins/launchpad/__init__.py:334
6669
msgid ""
6670
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6671
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6672
msgstr ""
6673
6674
#: bzrlib/plugins/launchpad/__init__.py:339
6675
msgid "Propose the merge on staging."
6676
msgstr ""
6677
6678
#: bzrlib/plugins/launchpad/__init__.py:341
6679
msgid "Commit message."
6680
msgstr ""
6681
6682
#: bzrlib/plugins/launchpad/__init__.py:343
6683
msgid "Mark the proposal as approved immediately."
6684
msgstr ""
6685
6686
#: bzrlib/plugins/launchpad/__init__.py:345
6687
msgid "Requested reviewer and optional type."
6688
msgstr ""
6689
6690
#: bzrlib/plugins/launchpad/__init__.py:382
6691
msgid "Find the proposal to merge this revision."
6692
msgstr ""
6693
6694
#: bzrlib/plugins/launchpad/__init__.py:384
6695
msgid ""
6696
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6697
"This works only if the selected branch was the merge proposal target, and\n"
6698
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6699
"are opened in a web browser."
6700
msgstr ""
6701
6702
#: bzrlib/plugins/launchpad/__init__.py:389
6703
msgid ""
6704
"Any revision involved in the merge may be specified-- the revision in\n"
6705
"which the merge was performed, or one of the revisions that was merged."
6706
msgstr ""
6707
6708
#: bzrlib/plugins/launchpad/__init__.py:392
6709
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6710
msgstr ""
6711
6712
#: bzrlib/plugins/launchpad/__init__.py:394
6713
msgid " bzr lp-find-proposal -r annotate:README:1"
6714
msgstr ""
6715
6716
#: bzrlib/plugins/launchpad/__init__.py:409
6717
msgid "No review found."
6718
msgstr ""
6719
6720
#: bzrlib/plugins/launchpad/__init__.py:410
6721
#, python-format
6722
msgid "%d proposals(s) found."
6723
msgstr ""
6724
6725
#: bzrlib/plugins/launchpad/__init__.py:420
6726
msgid "Finding revision-id"
6727
msgstr ""
6728
6729
#: bzrlib/plugins/launchpad/__init__.py:427
6730
msgid "Finding merge"
6731
msgstr ""
6732
6733
#: bzrlib/plugins/launchpad/__init__.py:432
6734
msgid "Finding revno"
6735
msgstr ""
6736
6737
#: bzrlib/plugins/launchpad/__init__.py:437
6738
msgid "Finding Launchpad branch"
6739
msgstr ""
6740
6741
#: bzrlib/plugins/launchpad/__init__.py:440
6742
msgid "Finding proposals"
6743
msgstr ""
6744
6745
#: bzrlib/plugins/launchpad/account.py:66
6746
msgid "Setting ssh/sftp usernames for launchpad.net."
6747
msgstr ""
6748
6749
#: bzrlib/plugins/launchpad/lp_api.py:241
6750
#: bzrlib/plugins/launchpad/lp_api.py:246
6751
#, python-format
6752
msgid "%s is not registered on Launchpad"
6753
msgstr ""
6754
6755
#: bzrlib/plugins/launchpad/lp_api.py:256
6756
#, python-format
6757
msgid "%s has no development focus."
6758
msgstr ""
6759
6760
#: bzrlib/plugins/launchpad/lp_api.py:261
6761
#, python-format
6762
msgid "development focus %s has no branch."
6763
msgstr ""
6764
6765
#: bzrlib/plugins/launchpad/lp_api.py:266
6766
#, python-format
6767
msgid "source package %s has no branch."
6768
msgstr ""
6769
6770
#: bzrlib/plugins/launchpad/lp_api.py:270
6771
#, python-format
6772
msgid "%s has no associated product or source package."
6773
msgstr ""
6774
6775
#: bzrlib/plugins/launchpad/lp_api.py:282
6776
#, python-format
6777
msgid "%s is already up-to-date."
6778
msgstr ""
6779
6780
#: bzrlib/plugins/launchpad/lp_api.py:289
6781
#, python-format
6782
msgid "Pushing to %s"
6783
msgstr ""
6784
6785
#: bzrlib/plugins/launchpad/lp_directory.py:170
6786
msgid ""
6787
"resolution for {0}\n"
6788
" local: {1}\n"
6789
" remote: {2}"
6790
msgstr ""
6791
6792
#: bzrlib/plugins/launchpad/lp_propose.py:149
6793
#, python-format
6794
msgid "There is already a branch merge proposal: %s"
6795
msgstr ""
6796
6797
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6798
msgid "pb parameter to convert() is deprecated"
6799
msgstr ""
6800
6801
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6802
msgid "starting upgrade from format 4 to 5"
6803
msgstr ""
6804
6805
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6806
msgid "note: upgrade may be faster if all store files are ungzipped first"
6807
msgstr ""
6808
6809
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6810
msgid "converting revision"
6811
msgstr ""
6812
6813
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6814
msgid "upgraded to weaves:"
6815
msgstr ""
6816
6817
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6818
#, python-format
6819
msgid "%6d revisions and inventories"
6820
msgstr ""
6821
6822
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6823
#, python-format
6824
msgid "%6d revisions not present"
6825
msgstr ""
6826
6827
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6828
#, python-format
6829
msgid "%6d texts"
6830
msgstr ""
6831
6832
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6833
msgid "writing weave"
6834
msgstr ""
6835
6836
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6837
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6838
msgid "inventory"
6839
msgstr ""
6840
6841
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6842
msgid "write revision"
6843
msgstr ""
6844
6845
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6846
msgid "loading revision"
6847
msgstr ""
6848
6849
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6850
#, python-format
6851
msgid "revision {%s} not present in branch; will be converted as a ghost"
6852
msgstr ""
6853
6854
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6855
msgid "starting upgrade from format 5 to 6"
6856
msgstr ""
6857
6858
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6859
#, python-format
6860
msgid "adding prefixes to %s"
6861
msgstr ""
6862
6863
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6864
msgid "starting upgrade from format 6 to metadir"
6865
msgstr ""
6866
6867
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6868
msgid "Removing ancestry.weave"
6869
msgstr ""
6870
6871
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6872
msgid "Finding branch files"
6873
msgstr ""
6874
6875
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6876
msgid "Upgrading repository"
6877
msgstr ""
6878
6879
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6880
msgid "Upgrading branch"
6881
msgstr ""
6882
6883
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6884
msgid "No working tree."
6885
msgstr ""
6886
6887
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6888
msgid "Upgrading working tree"
6889
msgstr ""
6890
6891
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6892
#, python-format
6893
msgid "Make %s lock"
6894
msgstr ""
6895
6896
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6897
#, python-format
6898
msgid "Moving %s"
6899
msgstr ""
6900
6901
#: bzrlib/push.py:56
6902
msgid "Created new branch."
6903
msgstr ""
6904
6905
#: bzrlib/push.py:98
6906
#, python-format
6907
msgid ""
6908
"Target directory %s already contains a .bzr directory, but it is not valid."
6909
msgstr ""
6910
6911
#: bzrlib/push.py:101
6912
#, python-format
6913
msgid ""
6914
"Target directory %s already exists, but does not have a .bzr directory. "
6915
"Supply --use-existing-dir to push there anyway."
6916
msgstr ""
6917
6918
#: bzrlib/push.py:122
6919
#, python-format
6920
msgid "Too many redirections trying to make %s."
6921
msgstr ""
6922
6923
#: bzrlib/push.py:147
6924
msgid ""
6925
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6926
"information."
6927
msgstr ""
6928
6929
#: bzrlib/push.py:151
6930
#, python-format
6931
msgid ""
6932
"It is not possible to losslessly push to %s. You may want to use dpush "
6933
"instead."
6934
msgstr ""
6935
6936
#: bzrlib/push.py:157
6937
#, python-format
6938
msgid ""
6939
"At %s you have a valid .bzr control directory, but not a branch or "
6940
"repository. This is an unsupported configuration. Please move the target "
6941
"directory out of the way and try again."
6942
msgstr ""
6943
6944
#: bzrlib/reconcile.py:97
6945
#, python-format
6946
msgid "Reconciling branch %s"
6947
msgstr ""
6948
6949
#: bzrlib/reconcile.py:103
6950
#, python-format
6951
msgid "Reconciling repository %s"
6952
msgstr ""
6953
6954
#: bzrlib/reconcile.py:105
6955
msgid "Reconciling repository"
6956
msgstr ""
6957
6958
#: bzrlib/reconcile.py:111
6959
#, python-format
6960
msgid "%s cannot canonicalize CHKs."
6961
msgstr ""
6962
6963
#: bzrlib/reconcile.py:119
6964
msgid "Reconcile aborted: revision index has inconsistent parents."
6965
msgstr ""
6966
6967
#: bzrlib/reconcile.py:121
6968
msgid "Run \"bzr check\" for more details."
6969
msgstr ""
6970
6971
#: bzrlib/reconcile.py:123
6972
msgid "Reconciliation complete."
6973
msgstr ""
6974
6975
#: bzrlib/reconcile.py:166
6976
msgid "Fixing last revision info {0} => {1}"
6977
msgstr ""
6978
6979
#: bzrlib/reconcile.py:173
6980
msgid "revision_history ok."
6981
msgstr ""
6982
6983
#: bzrlib/reconcile.py:234
6984
msgid "Reading inventory data"
6985
msgstr ""
6986
6987
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
6988
msgid "Inventory ok."
6989
msgstr ""
6990
6991
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
6992
msgid "Backing up inventory"
6993
msgstr ""
6994
6995
#: bzrlib/reconcile.py:258
6996
msgid "Backup inventory created."
6997
msgstr ""
6998
6999
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7000
msgid "Writing weave"
7001
msgstr ""
7002
7003
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7004
msgid "Inventory regenerated."
7005
msgstr ""
7006
7007
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7008
msgid "Reading indexes"
7009
msgstr ""
7010
7011
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7012
msgid "Checking unused inventories"
7013
msgstr ""
7014
7015
#: bzrlib/reconcile.py:388
7016
msgid "Backup Inventory created"
7017
msgstr ""
7018
7019
#: bzrlib/reconcile.py:446
7020
msgid "Fixing text parents"
7021
msgstr ""
7022
7023
#: bzrlib/reconfigure.py:54
7024
msgid "{0} is now stacked on {1}\n"
7025
msgstr ""
7026
7027
#: bzrlib/reconfigure.py:69
7028
#, python-format
7029
msgid "%s is now not stacked\n"
7030
msgstr ""
7031
7032
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7033
#, python-format
7034
msgid "bzr: ERROR (ignored): %s"
7035
msgstr ""
7036
7037
#: bzrlib/remote.py:2493
7038
msgid "Copying repository content as tarball..."
7039
msgstr ""
7040
7041
#: bzrlib/rename_map.py:69
7042
msgid "Calculating hashes"
7043
msgstr ""
7044
7045
#: bzrlib/rename_map.py:107
7046
msgid "Determining hash hits"
7047
msgstr ""
7048
7049
#: bzrlib/rename_map.py:242
7050
msgid "{0} => {1}"
7051
msgstr ""
7052
7053
#: bzrlib/repository.py:1787
7054
msgid "Moving repository to repository.backup"
7055
msgstr ""
7056
7057
#: bzrlib/repository.py:1794
7058
msgid "Creating new repository"
7059
msgstr ""
7060
7061
#: bzrlib/repository.py:1799
7062
msgid "Copying content"
7063
msgstr ""
7064
7065
#: bzrlib/repository.py:1803
7066
msgid "Deleting old repository content"
7067
msgstr ""
7068
7069
#: bzrlib/repository.py:1805
7070
msgid "repository converted"
7071
msgstr ""
7072
7073
#: bzrlib/revisionspec.py:903
7074
msgid "Using {0} {1}"
7075
msgstr ""
7076
7077
#: bzrlib/send.py:58
7078
#, python-format
7079
msgid "Mail client \"%s\" does not support specifying body"
7080
msgstr ""
7081
7082
#: bzrlib/send.py:62
7083
msgid "--remember requires a branch to be specified."
7084
msgstr ""
7085
7086
#: bzrlib/send.py:77
7087
msgid "No submit branch known or specified"
7088
msgstr ""
7089
7090
#: bzrlib/send.py:80
7091
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7092
msgstr ""
7093
7094
#: bzrlib/send.py:98
7095
#, python-format
7096
msgid "No such send format '%s'."
7097
msgstr ""
7098
7099
#: bzrlib/send.py:114
7100
msgid "bzr send takes at most two one revision identifiers"
7101
msgstr ""
7102
7103
#: bzrlib/send.py:127
7104
msgid "No revisions to submit."
7105
msgstr ""
7106
7107
#: bzrlib/send.py:139
7108
msgid ""
7109
"- not supported for merge directives that use more than one output file."
7110
msgstr ""
7111
7112
#: bzrlib/send.py:185
7113
msgid "Format 0.9 does not permit bundle with no patch"
7114
msgstr ""
7115
7116
#: bzrlib/shelf_ui.py:46
7117
#, python-format
7118
msgid "Shelve adding file \"%(path)s\"?"
7119
msgstr ""
7120
7121
#: bzrlib/shelf_ui.py:47
7122
msgid "Shelve binary changes?"
7123
msgstr ""
7124
7125
#: bzrlib/shelf_ui.py:48
7126
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7127
msgstr ""
7128
7129
#: bzrlib/shelf_ui.py:50
7130
#, python-format
7131
msgid "Shelve removing file \"%(path)s\"?"
7132
msgstr ""
7133
7134
#: bzrlib/shelf_ui.py:51
7135
#, python-format
7136
msgid "Shelve %d change(s)?"
7137
msgstr ""
7138
7139
#: bzrlib/shelf_ui.py:52
7140
msgid "Shelve?"
7141
msgstr ""
7142
7143
#: bzrlib/shelf_ui.py:53
7144
#, python-format
7145
msgid ""
7146
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7147
msgstr ""
7148
7149
#: bzrlib/shelf_ui.py:55
7150
#, python-format
7151
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7152
msgstr ""
7153
7154
#: bzrlib/shelf_ui.py:70
7155
#, python-format
7156
msgid "Changes shelved with id \"%d\"."
7157
msgstr ""
7158
7159
#: bzrlib/shelf_ui.py:74
7160
msgid "Selected changes destroyed."
7161
msgstr ""
7162
7163
#: bzrlib/shelf_ui.py:78
7164
msgid "Selected changes:"
7165
msgstr ""
7166
7167
#: bzrlib/shelf_ui.py:98
7168
#, python-format
7169
msgid "Delete file \"%(path)s\"?"
7170
msgstr ""
7171
7172
#: bzrlib/shelf_ui.py:99
7173
msgid "Apply binary changes?"
7174
msgstr ""
7175
7176
#: bzrlib/shelf_ui.py:100
7177
#, python-format
7178
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7179
msgstr ""
7180
7181
#: bzrlib/shelf_ui.py:102
7182
#, python-format
7183
msgid "Add file \"%(path)s\"?"
7184
msgstr ""
7185
7186
#: bzrlib/shelf_ui.py:103
7187
#, python-format
7188
msgid "Apply %d change(s)?"
7189
msgstr ""
7190
7191
#: bzrlib/shelf_ui.py:104
7192
msgid "Apply change?"
7193
msgstr ""
7194
7195
#: bzrlib/shelf_ui.py:105
7196
#, python-format
7197
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7198
msgstr ""
7199
7200
#: bzrlib/shelf_ui.py:107
7201
#, python-format
7202
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7203
msgstr ""
7204
7205
#: bzrlib/shelf_ui.py:402
7206
msgid "No changes are shelved."
7207
msgstr ""
7208
7209
#: bzrlib/shelf_ui.py:460
7210
#, python-format
7211
msgid "Using changes with id \"%d\"."
7212
msgstr ""
7213
7214
#: bzrlib/shelf_ui.py:464
7215
#, python-format
7216
msgid "Message: %s"
7217
msgstr ""
7218
7219
#: bzrlib/shelf_ui.py:476
7220
#, python-format
7221
msgid "Deleted changes with id \"%d\"."
7222
msgstr ""
7223
7224
#: bzrlib/smart/medium.py:714
7225
msgid "HPSS calls: {0} ({1} vfs) {2}"
7226
msgstr ""
7227
7228
#: bzrlib/smart/server.py:169
7229
msgid "Requested to stop gracefully"
7230
msgstr ""
7231
7232
#: bzrlib/smart/server.py:179
7233
#, python-format
7234
msgid "Waiting for %d client(s) to finish"
7235
msgstr ""
7236
7237
#: bzrlib/smart/server.py:185
7238
#, python-format
7239
msgid "Still waiting for %d client(s) to finish"
7240
msgstr ""
7241
7242
#: bzrlib/smart/server.py:219
7243
#, python-format
7244
msgid "listening socket error: %s"
7245
msgstr ""
7246
7247
#: bzrlib/smart/server.py:452
7248
#, python-format
7249
msgid "listening on port: %s"
7250
msgstr ""
7251
7252
#: bzrlib/switch.py:69
7253
msgid "Pending merges must be committed or reverted before using switch."
7254
msgstr ""
7255
7256
#: bzrlib/switch.py:96
7257
msgid ""
7258
"Cannot switch as local commits found in the checkout. Commit these to the "
7259
"bound branch or use --force to throw them away."
7260
msgstr ""
7261
7262
#: bzrlib/switch.py:101
7263
#, python-format
7264
msgid ""
7265
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7266
"anyway, use --force."
7267
msgstr ""
7268
7269
#: bzrlib/switch.py:110
7270
msgid "Cannot switch a branch, only a checkout."
7271
msgstr ""
7272
7273
#: bzrlib/switch.py:146
7274
#, python-format
7275
msgid "Tree is up to date at revision %d."
7276
msgstr ""
7277
7278
#: bzrlib/switch.py:152
7279
#, python-format
7280
msgid "Updated to revision %d."
7281
msgstr ""
7282
7283
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7284
msgid "Apply phase"
7285
msgstr ""
7286
7287
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7288
msgid "removing file"
7289
msgstr ""
7290
7291
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7292
msgid "adding file"
7293
msgstr ""
7294
7295
#: bzrlib/transform.py:2587
7296
msgid "Building tree"
7297
msgstr ""
7298
7299
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7300
msgid "Adding file contents"
7301
msgstr ""
7302
7303
#: bzrlib/transform.py:3024
7304
msgid "Resolution pass"
7305
msgstr ""
7306
7307
#: bzrlib/transport/ftp/_gssapi.py:88
7308
#, python-format
7309
msgid "Authenticated as %s"
7310
msgstr ""
7311
7312
#: bzrlib/tree.py:634
7313
msgid "*** {0} content-filter: {1} => {2!r}"
7314
msgstr ""
7315
7316
#: bzrlib/upgrade.py:77
7317
#, python-format
7318
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7319
msgstr ""
7320
7321
#: bzrlib/upgrade.py:100
7322
#, python-format
7323
msgid "cannot upgrade from bzrdir format %s"
7324
msgstr ""
7325
7326
#: bzrlib/upgrade.py:103
7327
#, python-format
7328
msgid "starting upgrade of %s"
7329
msgstr ""
7330
7331
#: bzrlib/upgrade.py:110
7332
msgid "finished"
7333
msgstr ""
7334
7335
#: bzrlib/upgrade.py:120
7336
msgid "Deleting backup.bzr"
7337
msgstr ""
7338
7339
#: bzrlib/upgrade.py:151
7340
msgid ""
7341
"\n"
7342
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7343
msgstr ""
7344
7345
#: bzrlib/upgrade.py:208
7346
#, python-format
7347
msgid "Found %d dependent branches - upgrading ..."
7348
msgstr ""
7349
7350
#: bzrlib/upgrade.py:276
7351
msgid "Upgrading bzrdirs"
7352
msgstr ""
7353
7354
#: bzrlib/upgrade.py:282
7355
#, python-format
7356
msgid "Upgrading %s"
7357
msgstr ""
7358
7359
#: bzrlib/upgrade.py:283
7360
msgid "Upgrading {0} {1} ..."
7361
msgstr ""
7362
7363
#: bzrlib/upgrade.py:301
7364
msgid "Removing backup ..."
7365
msgstr ""
7366
7367
#: bzrlib/upgrade.py:305
7368
msgid "failed to clean-up {0}: {1}"
7369
msgstr ""
7370
7371
#: bzrlib/vf_repository.py:1090
7372
msgid "inventories"
7373
msgstr ""
7374
7375
#: bzrlib/vf_repository.py:1116
7376
msgid "texts"
7377
msgstr ""
7378
7379
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7380
msgid "Calculating text parents"
7381
msgstr ""
7382
7383
#: bzrlib/vf_repository.py:1706
7384
msgid "Fetch texts"
7385
msgstr ""
7386
7387
#: bzrlib/vf_repository.py:2535
7388
msgid "loading text store"
7389
msgstr ""
7390
7391
#: bzrlib/vf_repository.py:2541
7392
msgid "checking text graph"
7393
msgstr ""
7394
7395
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7396
#: bzrlib/vf_repository.py:3124
7397
msgid "Transferring revisions"
7398
msgstr ""
7399
7400
#: bzrlib/win32utils.py:146
7401
msgid "Failed to GetProcessMemoryInfo()"
7402
msgstr ""
7403
7404
#: bzrlib/win32utils.py:167
7405
msgid "Cannot debug memory on win32 without ctypes or win32process"
7406
msgstr ""
7407
7408
#: bzrlib/win32utils.py:172
7409
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7410
msgstr ""
7411
7412
#: bzrlib/win32utils.py:180
7413
#, python-format
7414
msgid "WorkingSize %8d KiB"
7415
msgstr ""
7416
7417
#: bzrlib/win32utils.py:181
7418
#, python-format
7419
msgid "PeakWorking %8d KiB"
7420
msgstr ""
7421
7422
#: bzrlib/win32utils.py:182
7423
#, python-format
7424
msgid "PagefileUsage %8d KiB"
7425
msgstr ""
7426
7427
#: bzrlib/win32utils.py:183
7428
#, python-format
7429
msgid "PeakPagefileUsage %8d KiB"
7430
msgstr ""
7431
7432
#: bzrlib/win32utils.py:185
7433
#, python-format
7434
msgid "PrivateUsage %8d KiB"
7435
msgstr ""
7436
7437
#: bzrlib/win32utils.py:186
7438
#, python-format
7439
msgid "PageFaultCount %8d"
7440
msgstr ""
7441
7442
#: bzrlib/workingtree.py:1478
7443
msgid "Rerun update after fixing the conflicts."
7444
msgstr ""
7445
7446
#: dummy/help_topics/authentication/summary.txt:1
7447
msgid "Information on configuring authentication"
7448
msgstr ""
7449
7450
#: dummy/help_topics/basic/detail.txt:1
7451
msgid ""
7452
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7453
"http://bazaar.canonical.com/"
7454
msgstr ""
7455
7456
#: dummy/help_topics/basic/detail.txt:4
7457
msgid ""
7458
"Basic commands:\n"
7459
" bzr init makes this directory a versioned branch\n"
7460
" bzr branch make a copy of another branch"
7461
msgstr ""
7462
7463
#: dummy/help_topics/basic/detail.txt:8
7464
msgid ""
7465
" bzr add make files or directories versioned\n"
7466
" bzr ignore ignore a file or pattern\n"
7467
" bzr mv move or rename a versioned file"
7468
msgstr ""
7469
7470
#: dummy/help_topics/basic/detail.txt:12
7471
msgid ""
7472
" bzr status summarize changes in working copy\n"
7473
" bzr diff show detailed diffs"
7474
msgstr ""
7475
7476
#: dummy/help_topics/basic/detail.txt:15
7477
msgid ""
7478
" bzr merge pull in changes from another branch\n"
7479
" bzr commit save some or all changes\n"
7480
" bzr send send changes via email"
7481
msgstr ""
7482
7483
#: dummy/help_topics/basic/detail.txt:19
7484
msgid ""
7485
" bzr log show history of changes\n"
7486
" bzr check validate storage"
7487
msgstr ""
7488
7489
#: dummy/help_topics/basic/detail.txt:22
7490
msgid ""
7491
" bzr help init more help on e.g. init command\n"
7492
" bzr help commands list all commands\n"
7493
" bzr help topics list all help topics\n"
7494
msgstr ""
7495
7496
#: dummy/help_topics/basic/summary.txt:1
7497
msgid "Basic commands"
7498
msgstr ""
7499
7500
#: dummy/help_topics/branches/detail.txt:1
7501
msgid "Branches"
7502
msgstr ""
7503
7504
#: dummy/help_topics/branches/detail.txt:3
7505
msgid ""
7506
"A branch consists of the state of a project, including all of its\n"
7507
"history. All branches have a repository associated (which is where the\n"
7508
"branch history is stored), but multiple branches may share the same\n"
7509
"repository (a shared repository). Branches can be copied and merged."
7510
msgstr ""
7511
7512
#: dummy/help_topics/branches/detail.txt:8
7513
msgid ""
7514
"In addition, one branch may be bound to another one. Binding to another\n"
7515
"branch indicates that commits which happen in this branch must also \n"
7516
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7517
"commits when the two branches are out of date. In order for a commit \n"
7518
"to succeed, it may be necessary to update the current branch using \n"
7519
"``bzr update``."
7520
msgstr ""
7521
7522
#: dummy/help_topics/branches/detail.txt:15
7523
#: dummy/help_topics/checkouts/detail.txt:66
7524
#: dummy/help_topics/repositories/detail.txt:36
7525
msgid "Related commands::"
7526
msgstr ""
7527
7528
#: dummy/help_topics/branches/detail.txt:17
7529
msgid ""
7530
" init Change a directory into a versioned branch.\n"
7531
" branch Create a new branch that is a copy of an existing branch.\n"
7532
" merge Perform a three-way merge.\n"
7533
" bind Bind a branch to another one.\n"
7534
msgstr ""
7535
7536
#: dummy/help_topics/branches/summary.txt:1
7537
msgid "Information on what a branch is"
7538
msgstr ""
7539
7540
#: dummy/help_topics/bugs/summary.txt:1
7541
msgid "Bug tracker settings"
7542
msgstr ""
7543
7544
#: dummy/help_topics/checkouts/detail.txt:1
7545
msgid "Checkouts"
7546
msgstr ""
7547
7548
#: dummy/help_topics/checkouts/detail.txt:3
7549
msgid ""
7550
"Checkouts are source trees that are connected to a branch, so that when\n"
7551
"you commit in the source tree, the commit goes into that branch. They\n"
7552
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7553
"Bazaar's decentralized features until you want them. Using checkouts\n"
7554
"with shared repositories is very similar to working with SVN or CVS, but\n"
7555
"doesn't have the same restrictions. And using checkouts still allows\n"
7556
"others working on the project to use whatever workflow they like."
7557
msgstr ""
7558
7559
#: dummy/help_topics/checkouts/detail.txt:11
7560
msgid ""
7561
"A checkout is created with the bzr checkout command (see \"help "
7562
"checkout\").\n"
7563
"You pass it a reference to another branch, and it will create a local copy\n"
7564
"for you that still contains a reference to the branch you created the\n"
7565
"checkout from (the master branch). Then if you make any commits they will "
7566
"be\n"
7567
"made on the other branch first. This creates an instant mirror of your work, "
7568
"or\n"
7569
"facilitates lockstep development, where each developer is working together,\n"
7570
"continuously integrating the changes of others."
7571
msgstr ""
7572
7573
#: dummy/help_topics/checkouts/detail.txt:19
7574
msgid ""
7575
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7576
"you have the full history locally. As you have a first class branch you "
7577
"can\n"
7578
"also commit locally if you want, for instance due to the temporary loss af "
7579
"a\n"
7580
"network connection. Use the --local option to commit to do this. All the "
7581
"local\n"
7582
"commits will then be made on the master branch the next time you do a non-"
7583
"local\n"
7584
"commit."
7585
msgstr ""
7586
7587
#: dummy/help_topics/checkouts/detail.txt:26
7588
msgid ""
7589
"If you are using a checkout from a shared branch you will periodically want "
7590
"to\n"
7591
"pull in all the changes made by others. This is done using the \"update\"\n"
7592
"command. The changes need to be applied before any non-local commit, but\n"
7593
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7594
"command when needed."
7595
msgstr ""
7596
7597
#: dummy/help_topics/checkouts/detail.txt:32
7598
msgid ""
7599
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7600
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7601
"SVN checkout in that it is not a first class branch, it mainly consists of "
7602
"the\n"
7603
"working tree. This means that any history operations must query the master\n"
7604
"branch, which could be slow if a network connection is involved. Also, as "
7605
"you\n"
7606
"don't have a local branch, then you cannot commit locally."
7607
msgstr ""
7608
7609
#: dummy/help_topics/checkouts/detail.txt:39
7610
msgid ""
7611
"Lightweight checkouts work best when you have fast reliable access to the\n"
7612
"master branch. This means that if the master branch is on the same disk or "
7613
"LAN\n"
7614
"a lightweight checkout will be faster than a heavyweight one for any "
7615
"commands\n"
7616
"that modify the revision history (as only one copy of the branch needs to\n"
7617
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7618
"that uses the history but does not change it, but if the master branch is "
7619
"on\n"
7620
"the same disk then there won't be a noticeable difference."
7621
msgstr ""
7622
7623
#: dummy/help_topics/checkouts/detail.txt:47
7624
msgid ""
7625
"Another possible use for a checkout is to use it with a treeless repository\n"
7626
"containing your branches, where you maintain only one working tree by\n"
7627
"switching the master branch that the checkout points to when you want to\n"
7628
"work on a different branch."
7629
msgstr ""
7630
7631
#: dummy/help_topics/checkouts/detail.txt:52
7632
msgid ""
7633
"Obviously to commit on a checkout you need to be able to write to the "
7634
"master\n"
7635
"branch. This means that the master branch must be accessible over a "
7636
"writeable\n"
7637
"protocol , such as sftp://, and that you have write permissions at the "
7638
"other\n"
7639
"end. Checkouts also work on the local file system, so that all that matters "
7640
"is\n"
7641
"file permissions."
7642
msgstr ""
7643
7644
#: dummy/help_topics/checkouts/detail.txt:58
7645
msgid ""
7646
"You can change the master of a checkout by using the \"switch\" command "
7647
"(see\n"
7648
"\"help switch\"). This will change the location that the commits are sent "
7649
"to.\n"
7650
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7651
"checkout. If you would like to convert your heavy checkout into a normal\n"
7652
"branch so that every commit is local, you can use the \"unbind\" command. To "
7653
"see\n"
7654
"whether or not a branch is bound or not you can use the \"info\" command. If "
7655
"the\n"
7656
"branch is bound it will tell you the location of the bound branch."
7657
msgstr ""
7658
7659
#: dummy/help_topics/checkouts/detail.txt:68
7660
msgid ""
7661
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7662
" checkout\n"
7663
" update Pull any changes in the master branch in to your checkout\n"
7664
" commit Make a commit that is sent to the master branch. If you have\n"
7665
" a heavy checkout then the --local option will commit to the\n"
7666
" checkout without sending the commit to the master\n"
7667
" switch Change the master branch that the commits in the checkout "
7668
"will\n"
7669
" be sent to\n"
7670
" bind Turn a standalone branch into a heavy checkout so that any\n"
7671
" commits will be sent to the master branch\n"
7672
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7673
" commits are only made locally\n"
7674
" info Displays whether a branch is bound or unbound. If the branch "
7675
"is\n"
7676
" bound, then it will also display the location of the bound "
7677
"branch\n"
7678
msgstr ""
7679
7680
#: dummy/help_topics/checkouts/summary.txt:1
7681
msgid "Information on what a checkout is"
7682
msgstr ""
7683
7684
#: dummy/help_topics/commands/summary.txt:1
7685
msgid "Basic help for all commands"
7686
msgstr ""
7687
7688
#: dummy/help_topics/configuration/summary.txt:1
7689
msgid "Details on the configuration settings available"
7690
msgstr ""
7691
7692
#: dummy/help_topics/conflict-types/summary.txt:1
7693
msgid "Types of conflicts and what to do about them"
7694
msgstr ""
7695
7696
#: dummy/help_topics/content-filters/summary.txt:1
7697
msgid "Conversion of content into/from working trees"
7698
msgstr ""
7699
7700
#: dummy/help_topics/criss-cross/detail.txt:1
7701
msgid "Criss-Cross"
7702
msgstr ""
7703
7704
#: dummy/help_topics/criss-cross/detail.txt:3
7705
msgid ""
7706
"A criss-cross in the branch history can cause the default merge technique\n"
7707
"to emit more conflicts than would normally be expected."
7708
msgstr ""
7709
7710
#: dummy/help_topics/criss-cross/detail.txt:6
7711
msgid ""
7712
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7713
"give\n"
7714
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7715
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7716
msgstr ""
7717
7718
#: dummy/help_topics/criss-cross/detail.txt:10
7719
msgid ""
7720
"Criss-crosses occur in a branch's history if two branches merge the same "
7721
"thing\n"
7722
"and then merge one another, or if two branches merge one another at the "
7723
"same\n"
7724
"time. They can be avoided by having each branch only merge from or into a\n"
7725
"designated central branch (a \"star topology\")."
7726
msgstr ""
7727
7728
#: dummy/help_topics/criss-cross/detail.txt:15
7729
msgid ""
7730
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7731
"default\n"
7732
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7733
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7734
"differences between THIS and OTHER are due to one side adding lines, or\n"
7735
"from another side removing lines."
7736
msgstr ""
7737
7738
#: dummy/help_topics/criss-cross/detail.txt:21
7739
msgid ""
7740
"Criss-crosses mean there is no good choice for a base. Selecting the "
7741
"recent\n"
7742
"merge points could cause one side's changes to be silently discarded.\n"
7743
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7744
"are emitted."
7745
msgstr ""
7746
7747
#: dummy/help_topics/criss-cross/detail.txt:26
7748
msgid ""
7749
"The ``weave`` merge type is not affected by this problem because it uses\n"
7750
"line-origin detection instead of a basis revision to determine the cause of\n"
7751
"differences.\n"
7752
msgstr ""
7753
7754
#: dummy/help_topics/criss-cross/summary.txt:1
7755
msgid "Information on criss-cross merging"
7756
msgstr ""
7757
7758
#: dummy/help_topics/current-formats/summary.txt:1
7759
msgid "Current storage formats"
7760
msgstr ""
7761
7762
#: dummy/help_topics/debug-flags/summary.txt:1
7763
msgid "Options to show or record debug information"
7764
msgstr ""
7765
7766
#: dummy/help_topics/diverged-branches/summary.txt:1
7767
msgid "How to fix diverged branches"
7768
msgstr ""
7769
7770
#: dummy/help_topics/env-variables/detail.txt:1
7771
msgid "Environment Variables"
7772
msgstr ""
7773
7774
#: dummy/help_topics/env-variables/detail.txt:3
7775
msgid ""
7776
"=================== "
7777
"===========================================================\n"
7778
"BZRPATH Path where bzr is to look for shell plugin external\n"
7779
" commands.\n"
7780
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7781
"EMAIL E-Mail address of the user.\n"
7782
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7783
"EDITOR Editor for editing commit messages.\n"
7784
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7785
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7786
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7787
"BZR_PLUGIN_PATH.\n"
7788
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7789
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7790
"and\n"
7791
" HOME.\n"
7792
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7793
"URLs).\n"
7794
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7795
"sshcorp,\n"
7796
" plink or lsh.\n"
7797
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7798
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7799
"BZR_COLUMNS Override implicit terminal width.\n"
7800
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7801
"(selftest)\n"
7802
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7803
"'text'.\n"
7804
"BZR_PDB Control whether to launch a debugger on error.\n"
7805
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7806
" breakin debugger.\n"
7807
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7808
"(instead\n"
7809
" of char-based).\n"
7810
"=================== "
7811
"===========================================================\n"
7812
msgstr ""
7813
7814
#: dummy/help_topics/env-variables/summary.txt:1
7815
msgid "Environment variable names and values"
7816
msgstr ""
7817
7818
#: dummy/help_topics/eol/summary.txt:1
7819
msgid "Information on end-of-line handling"
7820
msgstr ""
7821
7822
#: dummy/help_topics/files/detail.txt:1
7823
msgid "Files"
7824
msgstr ""
7825
7826
#: dummy/help_topics/files/detail.txt:3
7827
msgid ""
7828
":On Unix: ~/.bazaar/bazaar.conf\n"
7829
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7830
"bazaar\\\\2.0\\\\bazaar.conf"
7831
msgstr ""
7832
7833
#: dummy/help_topics/files/detail.txt:6
7834
msgid ""
7835
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7836
"used to define general configuration that will be applied everywhere.\n"
7837
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7838
"commonly used options."
7839
msgstr ""
7840
7841
#: dummy/help_topics/files/detail.txt:11
7842
msgid "A typical config file might look something like::"
7843
msgstr ""
7844
7845
#: dummy/help_topics/files/detail.txt:13
7846
msgid ""
7847
" [DEFAULT]\n"
7848
" email=John Doe <jdoe@isp.com>"
7849
msgstr ""
7850
7851
#: dummy/help_topics/files/detail.txt:16
7852
msgid ""
7853
" [ALIASES]\n"
7854
" commit = commit --strict\n"
7855
" log10 = log --short -r -10..-1\n"
7856
msgstr ""
7857
7858
#: dummy/help_topics/files/summary.txt:1
7859
msgid "Information on configuration and log files"
7860
msgstr ""
7861
7862
#: dummy/help_topics/formats/detail.txt:1
7863
msgid "Storage Formats"
7864
msgstr ""
7865
7866
#: dummy/help_topics/formats/detail.txt:3
7867
msgid ""
7868
"To ensure that older clients do not access data incorrectly,\n"
7869
"Bazaar's policy is to introduce a new storage format whenever\n"
7870
"new features requiring new metadata are added. New storage\n"
7871
"formats may also be introduced to improve performance and\n"
7872
"scalability."
7873
msgstr ""
7874
7875
#: dummy/help_topics/formats/detail.txt:9
7876
msgid ""
7877
"The newest format, 2a, is highly recommended. If your\n"
7878
"project is not using 2a, then you should suggest to the\n"
7879
"project owner to upgrade."
7880
msgstr ""
7881
7882
#: dummy/help_topics/formats/detail.txt:13
7883
msgid ""
7884
"\n"
7885
".. note::"
7886
msgstr ""
7887
7888
#: dummy/help_topics/formats/detail.txt:16
7889
msgid ""
7890
" Some of the older formats have two variants:\n"
7891
" a plain one and a rich-root one. The latter include an additional\n"
7892
" field about the root of the tree. There is no performance cost\n"
7893
" for using a rich-root format but you cannot easily merge changes\n"
7894
" from a rich-root format into a plain format. As a consequence,\n"
7895
" moving a project to a rich-root format takes some co-ordination\n"
7896
" in that all contributors need to upgrade their repositories\n"
7897
" around the same time. 2a and all future formats will be\n"
7898
" implicitly rich-root."
7899
msgstr ""
7900
7901
#: dummy/help_topics/formats/detail.txt:26
7902
msgid ""
7903
"See :doc:`current-formats-help` for the complete list of\n"
7904
"currently supported formats. See :doc:`other-formats-help` for\n"
7905
"descriptions of any available experimental and deprecated formats.\n"
7906
msgstr ""
7907
7908
#: dummy/help_topics/formats/summary.txt:1
7909
msgid "Information on choosing a storage format"
7910
msgstr ""
7911
7912
#: dummy/help_topics/global-options/detail.txt:1
7913
msgid "Global Options"
7914
msgstr ""
7915
7916
#: dummy/help_topics/global-options/detail.txt:3
7917
msgid ""
7918
"These options may be used with any command, and may appear in front of any\n"
7919
"command. (e.g. ``bzr --profile help``)."
7920
msgstr ""
7921
7922
#: dummy/help_topics/global-options/detail.txt:6
7923
msgid ""
7924
"--version Print the version number. Must be supplied before the "
7925
"command.\n"
7926
"--no-aliases Do not process command aliases when running this command.\n"
7927
"--builtin Use the built-in version of a command, not the plugin "
7928
"version.\n"
7929
" This does not suppress other plugin effects.\n"
7930
"--no-plugins Do not process any plugins.\n"
7931
"--no-l10n Do not translate messages.\n"
7932
"--concurrency Number of processes that can be run concurrently (selftest)."
7933
msgstr ""
7934
7935
#: dummy/help_topics/global-options/detail.txt:14
7936
msgid ""
7937
"--profile Profile execution using the hotshot profiler.\n"
7938
"--lsprof Profile execution using the lsprof profiler.\n"
7939
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7940
" results to a specified file. If the filename ends with "
7941
"\".txt\",\n"
7942
" text format will be used. If the filename either starts "
7943
"with\n"
7944
" \"callgrind.out\" or end with \".callgrind\", the output will "
7945
"be\n"
7946
" formatted for use with KCacheGrind. Otherwise, the output\n"
7947
" will be a pickle.\n"
7948
"--coverage Generate line coverage report in the specified directory."
7949
msgstr ""
7950
7951
#: dummy/help_topics/global-options/detail.txt:24
7952
msgid ""
7953
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7954
"for\n"
7955
" the duration of the command. This can be used multiple times "
7956
"if\n"
7957
" several options need to be overridden."
7958
msgstr ""
7959
7960
#: dummy/help_topics/global-options/detail.txt:28
7961
msgid ""
7962
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7963
"information on profiling."
7964
msgstr ""
7965
7966
#: dummy/help_topics/global-options/detail.txt:31
7967
msgid ""
7968
"A number of debug flags are also available to assist troubleshooting and\n"
7969
"development. See :doc:`debug-flags-help`.\n"
7970
msgstr ""
7971
7972
#: dummy/help_topics/global-options/summary.txt:1
7973
msgid "Options that control how Bazaar runs"
7974
msgstr ""
7975
7976
#: dummy/help_topics/hidden-commands/summary.txt:1
7977
msgid "All hidden commands"
7978
msgstr ""
7979
7980
#: dummy/help_topics/hooks/summary.txt:1
7981
msgid "Points at which custom processing can be added"
7982
msgstr ""
7983
7984
#: dummy/help_topics/launchpad/detail.txt:1
7985
msgid "Integration with Launchpad.net"
7986
msgstr ""
7987
7988
#: dummy/help_topics/launchpad/detail.txt:3
7989
msgid ""
7990
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
7991
"specification tracking."
7992
msgstr ""
7993
7994
#: dummy/help_topics/launchpad/detail.txt:6
7995
msgid ""
7996
"The bzr client (through the plugin called 'launchpad') has special\n"
7997
"features to communicate with Launchpad:"
7998
msgstr ""
7999
8000
#: dummy/help_topics/launchpad/detail.txt:9
8001
msgid ""
8002
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8003
"This\n"
8004
" is then used by the 'lp:' transport to download your branches using\n"
8005
" bzr+ssh://."
8006
msgstr ""
8007
8008
#: dummy/help_topics/launchpad/detail.txt:13
8009
msgid ""
8010
" * The 'lp:' transport uses Launchpad as a directory service: for "
8011
"example\n"
8012
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8013
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8014
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8015
msgstr ""
8016
8017
#: dummy/help_topics/launchpad/detail.txt:18
8018
msgid ""
8019
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8020
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8021
"lp:12345'\n"
8022
" will record a revision property that marks that revision as fixing\n"
8023
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8024
" automatically be linked to the bug report."
8025
msgstr ""
8026
8027
#: dummy/help_topics/launchpad/detail.txt:24
8028
msgid ""
8029
" * The register-branch command tells Launchpad about the url of a\n"
8030
" public branch. Launchpad will then mirror the branch, display\n"
8031
" its contents and allow it to be attached to bugs and other\n"
8032
" objects."
8033
msgstr ""
8034
8035
#: dummy/help_topics/launchpad/detail.txt:29
8036
msgid "For more information see http://help.launchpad.net/\n"
8037
msgstr ""
8038
8039
#: dummy/help_topics/launchpad/summary.txt:1
8040
msgid "Using Bazaar with Launchpad.net"
8041
msgstr ""
8042
8043
#: dummy/help_topics/location-alias/summary.txt:1
8044
msgid "Aliases for remembered locations"
8045
msgstr ""
8046
8047
#: dummy/help_topics/log-formats/summary.txt:1
8048
msgid "Details on the logging formats available"
8049
msgstr ""
8050
8051
#: dummy/help_topics/other-formats/summary.txt:1
8052
msgid "Experimental and deprecated storage formats"
8053
msgstr ""
8054
8055
#: dummy/help_topics/patterns/summary.txt:1
8056
msgid "Information on the pattern syntax"
8057
msgstr ""
8058
8059
#: dummy/help_topics/repositories/detail.txt:1
8060
msgid "Repositories"
8061
msgstr ""
8062
8063
#: dummy/help_topics/repositories/detail.txt:3
8064
msgid ""
8065
"Repositories in Bazaar are where committed information is stored. There is\n"
8066
"a repository associated with every branch."
8067
msgstr ""
8068
8069
#: dummy/help_topics/repositories/detail.txt:6
8070
msgid ""
8071
"Repositories are a form of database. Bzr will usually maintain this for\n"
8072
"good performance automatically, but in some situations (e.g. when doing\n"
8073
"very many commits in a short time period) you may want to ask bzr to\n"
8074
"optimise the database indices. This can be done by the 'bzr pack' command."
8075
msgstr ""
8076
8077
#: dummy/help_topics/repositories/detail.txt:11
8078
msgid ""
8079
"By default just running 'bzr init' will create a repository within the new\n"
8080
"branch but it is possible to create a shared repository which allows "
8081
"multiple\n"
8082
"branches to share their information in the same location. When a new branch "
8083
"is\n"
8084
"created it will first look to see if there is a containing shared repository "
8085
"it\n"
8086
"can use."
8087
msgstr ""
8088
8089
#: dummy/help_topics/repositories/detail.txt:17
8090
msgid ""
8091
"When two branches of the same project share a repository, there is\n"
8092
"generally a large space saving. For some operations (e.g. branching\n"
8093
"within the repository) this translates in to a large time saving."
8094
msgstr ""
8095
8096
#: dummy/help_topics/repositories/detail.txt:21
8097
msgid ""
8098
"To create a shared repository use the init-repository command (or the alias\n"
8099
"init-repo). This command takes the location of the repository to create. "
8100
"This\n"
8101
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8102
"which contains a shared repository. Any new branches that are created in "
8103
"this\n"
8104
"directory will then use it for storage."
8105
msgstr ""
8106
8107
#: dummy/help_topics/repositories/detail.txt:27
8108
msgid ""
8109
"It is a good idea to create a repository whenever you might create more\n"
8110
"than one branch of a project. This is true for both working areas where you\n"
8111
"are doing the development, and any server areas that you use for hosting\n"
8112
"projects. In the latter case, it is common to want branches without working\n"
8113
"trees. Since the files in the branch will not be edited directly there is "
8114
"no\n"
8115
"need to use up disk space for a working tree. To create a repository in "
8116
"which\n"
8117
"the branches will not have working trees pass the '--no-trees' option to\n"
8118
"'init-repository'."
8119
msgstr ""
8120
8121
#: dummy/help_topics/repositories/detail.txt:38
8122
msgid ""
8123
" init-repository Create a shared repository. Use --no-trees to create "
8124
"one\n"
8125
" in which new branches won't get a working tree.\n"
8126
msgstr ""
8127
8128
#: dummy/help_topics/repositories/summary.txt:1
8129
msgid "Basic information on shared repositories."
8130
msgstr ""
8131
8132
#: dummy/help_topics/revisionspec/summary.txt:1
8133
msgid "Explain how to use --revision"
8134
msgstr ""
8135
8136
#: dummy/help_topics/rules/summary.txt:1
8137
msgid "Information on defining rule-based preferences"
8138
msgstr ""
8139
8140
#: dummy/help_topics/standalone-trees/detail.txt:1
8141
msgid "Standalone Trees"
8142
msgstr ""
8143
8144
#: dummy/help_topics/standalone-trees/detail.txt:3
8145
msgid ""
8146
"A standalone tree is a working tree with an associated repository. It\n"
8147
"is an independently usable branch, with no dependencies on any other.\n"
8148
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8149
"an existing project under version control."
8150
msgstr ""
8151
8152
#: dummy/help_topics/standalone-trees/detail.txt:8
8153
msgid "Related Commands::"
8154
msgstr ""
8155
8156
#: dummy/help_topics/standalone-trees/detail.txt:10
8157
msgid " init Make a directory into a versioned branch.\n"
8158
msgstr ""
8159
8160
#: dummy/help_topics/standalone-trees/summary.txt:1
8161
msgid "Information on what a standalone tree is"
8162
msgstr ""
8163
8164
#: dummy/help_topics/standard-options/detail.txt:1
8165
msgid "Standard Options"
8166
msgstr ""
8167
8168
#: dummy/help_topics/standard-options/detail.txt:3
8169
msgid "Standard options are legal for all commands."
8170
msgstr ""
8171
8172
#: dummy/help_topics/standard-options/detail.txt:5
8173
msgid ""
8174
"--help, -h Show help message.\n"
8175
"--verbose, -v Display more information.\n"
8176
"--quiet, -q Only display errors and warnings."
8177
msgstr ""
8178
8179
#: dummy/help_topics/standard-options/detail.txt:9
8180
msgid "Unlike global options, standard options can be used in aliases.\n"
8181
msgstr ""
8182
8183
#: dummy/help_topics/standard-options/summary.txt:1
8184
msgid "Options that can be used with any command"
8185
msgstr ""
8186
8187
#: dummy/help_topics/status-flags/detail.txt:1
8188
msgid "Status Flags"
8189
msgstr ""
8190
8191
#: dummy/help_topics/status-flags/detail.txt:3
8192
msgid ""
8193
"Status flags are used to summarise changes to the working tree in a concise\n"
8194
"manner. They are in the form::"
8195
msgstr ""
8196
8197
#: dummy/help_topics/status-flags/detail.txt:6
8198
msgid " xxx <filename>"
8199
msgstr ""
8200
8201
#: dummy/help_topics/status-flags/detail.txt:8
8202
msgid "where the columns' meanings are as follows."
8203
msgstr ""
8204
8205
#: dummy/help_topics/status-flags/detail.txt:10
8206
msgid "Column 1 - versioning/renames::"
8207
msgstr ""
8208
8209
#: dummy/help_topics/status-flags/detail.txt:12
8210
msgid ""
8211
" + File versioned\n"
8212
" - File unversioned\n"
8213
" R File renamed\n"
8214
" ? File unknown\n"
8215
" X File nonexistent (and unknown to bzr)\n"
8216
" C File has conflicts\n"
8217
" P Entry for a pending merge (not a file)"
8218
msgstr ""
8219
8220
#: dummy/help_topics/status-flags/detail.txt:20
8221
msgid "Column 2 - contents::"
8222
msgstr ""
8223
8224
#: dummy/help_topics/status-flags/detail.txt:22
8225
msgid ""
8226
" N File created\n"
8227
" D File deleted\n"
8228
" K File kind changed\n"
8229
" M File modified"
8230
msgstr ""
8231
8232
#: dummy/help_topics/status-flags/detail.txt:27
8233
msgid "Column 3 - execute::"
8234
msgstr ""
8235
8236
#: dummy/help_topics/status-flags/detail.txt:29
8237
msgid " * The execute bit was changed\n"
8238
msgstr ""
8239
8240
#: dummy/help_topics/status-flags/summary.txt:1
8241
msgid "Help on status flags"
8242
msgstr ""
8243
8244
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8245
msgid "Branches Out of Sync"
8246
msgstr ""
8247
8248
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8249
msgid ""
8250
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8251
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8252
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8253
"have the same last revision as the new reference branch for the lightweight\n"
8254
"checkout, data could be lost, so Bazaar refuses."
8255
msgstr ""
8256
8257
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8258
msgid "How you deal with this depends on *why* the branches are out of sync."
8259
msgstr ""
8260
8261
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8262
msgid ""
8263
"If you have a checkout and have done local commits, you can get back in "
8264
"sync\n"
8265
"by running \"bzr update\" (and possibly \"bzr commit\")."
8266
msgstr ""
8267
8268
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8269
msgid ""
8270
"If you have a branch and the remote branch is out-of-date, you can push\n"
8271
"the local changes using \"bzr push\". If the local branch is out of date, "
8272
"you\n"
8273
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8274
"commit\n"
8275
"and then push your changes. If you decide that some of the changes aren't\n"
8276
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8277
msgstr ""
8278
8279
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8280
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8281
msgstr ""
8282
8283
#: dummy/help_topics/topics/summary.txt:1
8284
msgid "Topics list"
8285
msgstr ""
8286
8287
#: dummy/help_topics/url-special-chars/summary.txt:1
8288
msgid "Special character handling in URLs"
8289
msgstr ""
8290
8291
#: dummy/help_topics/urlspec/summary.txt:1
8292
msgid "Supported transport protocols"
8293
msgstr ""
8294
8295
#: dummy/help_topics/working-trees/detail.txt:1
8296
msgid "Working Trees"
8297
msgstr ""
8298
8299
#: dummy/help_topics/working-trees/detail.txt:3
8300
msgid ""
8301
"A working tree is the contents of a branch placed on disk so that you can\n"
8302
"see the files and edit them. The working tree is where you make changes to "
8303
"a\n"
8304
"branch, and when you commit the current state of the working tree is the\n"
8305
"snapshot that is recorded in the commit."
8306
msgstr ""
8307
8308
#: dummy/help_topics/working-trees/detail.txt:8
8309
msgid ""
8310
"When you push a branch to a remote system, a working tree will not be\n"
8311
"created. If one is already present the files will not be updated. The\n"
8312
"branch information will be updated and the working tree will be marked\n"
8313
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8314
"may be uncommitted changes or the update may cause content conflicts that "
8315
"are\n"
8316
"difficult to deal with remotely."
8317
msgstr ""
8318
8319
#: dummy/help_topics/working-trees/detail.txt:15
8320
msgid ""
8321
"If you have a branch with no working tree you can use the 'checkout' "
8322
"command\n"
8323
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8324
"will\n"
8325
"create the working tree. If the branch is updated remotely, you can update "
8326
"the\n"
8327
"working tree by running 'bzr update' in that directory."
8328
msgstr ""
8329
8330
#: dummy/help_topics/working-trees/detail.txt:20
8331
msgid ""
8332
"If you have a branch with a working tree that you do not want the 'remove-"
8333
"tree'\n"
8334
"command will remove the tree if it is safe. This can be done to avoid the\n"
8335
"warning about the remote working tree not being updated when pushing to the\n"
8336
"branch. It can also be useful when working with a '--no-trees' repository\n"
8337
"(see 'bzr help repositories')."
8338
msgstr ""
8339
8340
#: dummy/help_topics/working-trees/detail.txt:26
8341
msgid ""
8342
"If you want to have a working tree on a remote machine that you push to you\n"
8343
"can either run 'bzr update' in the remote branch after each push, or use "
8344
"some\n"
8345
"other method to update the tree during the push. There is an 'rspush' "
8346
"plugin\n"
8347
"that will update the working tree using rsync as well as doing a push. "
8348
"There\n"
8349
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8350
"SSH\n"
8351
"after each push."
8352
msgstr ""
8353
8354
#: dummy/help_topics/working-trees/detail.txt:33
8355
msgid "Useful commands::"
8356
msgstr ""
8357
8358
#: dummy/help_topics/working-trees/detail.txt:35
8359
msgid ""
8360
" checkout Create a working tree when a branch does not have one.\n"
8361
" remove-tree Removes the working tree from a branch when it is safe to do "
8362
"so.\n"
8363
" update When a working tree is out of sync with its associated "
8364
"branch\n"
8365
" this will update the tree to match the branch.\n"
8366
msgstr ""
8367
8368
#: dummy/help_topics/working-trees/summary.txt:1
8369
msgid "Information on working trees"
8370
msgstr ""
8371
8372
#: en/help_topics/authentication.txt:1
8373
msgid ""
8374
"Authentication Settings\n"
8375
"======================="
8376
msgstr ""
8377
8378
#: en/help_topics/authentication.txt:4
8379
msgid ""
8380
"\n"
8381
"Intent\n"
8382
"------"
8383
msgstr ""
8384
8385
#: en/help_topics/authentication.txt:8
8386
msgid ""
8387
"Many different authentication policies can be described in the\n"
8388
"``authentication.conf`` file but a particular user should need only a few\n"
8389
"definitions to cover his needs without having to specify a user and a "
8390
"password\n"
8391
"for every branch he uses."
8392
msgstr ""
8393
8394
#: en/help_topics/authentication.txt:13
8395
msgid ""
8396
"The definitions found in this file are used to find the credentials to use "
8397
"for\n"
8398
"a given url. The same credentials can generally be used for as many branches "
8399
"as\n"
8400
"possible by grouping their declaration around the remote servers that need\n"
8401
"them. It's even possible to declare credentials that will be used by "
8402
"different\n"
8403
"servers."
8404
msgstr ""
8405
8406
#: en/help_topics/authentication.txt:19
8407
msgid ""
8408
"The intent is to make this file as small as possible to minimize maintenance."
8409
msgstr ""
8410
8411
#: en/help_topics/authentication.txt:21
8412
msgid ""
8413
"Once the relevant credentials are declared in this file you may use branch "
8414
"urls\n"
8415
"without embedding passwords (security hazard) or even users (enabling "
8416
"sharing\n"
8417
"of your urls with others)."
8418
msgstr ""
8419
8420
#: en/help_topics/authentication.txt:25
8421
msgid "Instead of using::"
8422
msgstr ""
8423
8424
#: en/help_topics/authentication.txt:27
8425
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8426
msgstr ""
8427
8428
#: en/help_topics/authentication.txt:29
8429
msgid "you simply use::"
8430
msgstr ""
8431
8432
#: en/help_topics/authentication.txt:31
8433
msgid " bzr branch ftp://host.com/path/to/my/branch"
8434
msgstr ""
8435
8436
#: en/help_topics/authentication.txt:33
8437
msgid ""
8438
"provided you have created the following ``authentication.conf`` file::"
8439
msgstr ""
8440
8441
#: en/help_topics/authentication.txt:35
8442
msgid ""
8443
" [myprojects]\n"
8444
" scheme=ftp\n"
8445
" host=host.com\n"
8446
" user=joe\n"
8447
" password=secret\n"
8448
" "
8449
msgstr ""
8450
8451
#: en/help_topics/authentication.txt:42
8452
msgid ""
8453
"Authentication definitions\n"
8454
"--------------------------"
8455
msgstr ""
8456
8457
#: en/help_topics/authentication.txt:45
8458
msgid ""
8459
"There are two kinds of authentication used by the various schemes supported "
8460
"by\n"
8461
"bzr:"
8462
msgstr ""
8463
8464
#: en/help_topics/authentication.txt:48
8465
msgid "1. user and password"
8466
msgstr ""
8467
8468
#: en/help_topics/authentication.txt:50
8469
msgid ""
8470
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8471
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8472
"ssh agents are a better, more secure solution. So we have chosen to not "
8473
"provide\n"
8474
"our own less secure method."
8475
msgstr ""
8476
8477
#: en/help_topics/authentication.txt:55
8478
msgid "2. user, realm and password"
8479
msgstr ""
8480
8481
#: en/help_topics/authentication.txt:57
8482
msgid ""
8483
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8484
"against a host. But, by using ``.htaccess`` files, for example, it is "
8485
"possible\n"
8486
"to define several (``user, realm, password``) for a given ``host``. So what "
8487
"is\n"
8488
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8489
"is\n"
8490
"not taken into account in the definitions, but will displayed if bzr "
8491
"prompts\n"
8492
"you for a password."
8493
msgstr ""
8494
8495
#: en/help_topics/authentication.txt:64
8496
msgid ""
8497
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8498
"specifying the appropriate port."
8499
msgstr ""
8500
8501
#: en/help_topics/authentication.txt:67
8502
msgid ""
8503
"To take all schemes into account, the password will be deduced from a set "
8504
"of\n"
8505
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8506
"``user``,\n"
8507
"``password``)."
8508
msgstr ""
8509
8510
#: en/help_topics/authentication.txt:71
8511
msgid ""
8512
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8513
"used\n"
8514
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8515
"``ssh``\n"
8516
" should be used instead since this is the real scheme regarding\n"
8517
" authentication,"
8518
msgstr ""
8519
8520
#: en/help_topics/authentication.txt:76
8521
msgid " * ``host``: can be empty (to act as a default for any host),"
8522
msgstr ""
8523
8524
#: en/help_topics/authentication.txt:78
8525
msgid ""
8526
" * ``port`` can be empty (useful when an host provides several servers for "
8527
"the\n"
8528
" same scheme), only numerical values are allowed, this should be used "
8529
"only\n"
8530
" when the server uses a port different than the scheme standard port,"
8531
msgstr ""
8532
8533
#: en/help_topics/authentication.txt:82
8534
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8535
msgstr ""
8536
8537
#: en/help_topics/authentication.txt:84
8538
msgid ""
8539
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8540
" ``getpass.get_user()``),"
8541
msgstr ""
8542
8543
#: en/help_topics/authentication.txt:87
8544
msgid ""
8545
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8546
" password."
8547
msgstr ""
8548
8549
#: en/help_topics/authentication.txt:90
8550
msgid ""
8551
"Multiple definitions can be provided and, for a given URL, bzr will select "
8552
"a\n"
8553
"(``user`` [, ``password``]) based on the following rules :"
8554
msgstr ""
8555
8556
#: en/help_topics/authentication.txt:93
8557
msgid " 1. the first match wins,"
8558
msgstr ""
8559
8560
#: en/help_topics/authentication.txt:95
8561
msgid " 2. empty fields match everything,"
8562
msgstr ""
8563
8564
#: en/help_topics/authentication.txt:97
8565
msgid ""
8566
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8567
msgstr ""
8568
8569
#: en/help_topics/authentication.txt:99
8570
msgid ""
8571
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8572
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8573
"``projectbzr.sf.net``\n"
8574
" will not match ``bzr.sf.net``)."
8575
msgstr ""
8576
8577
#: en/help_topics/authentication.txt:103
8578
msgid ""
8579
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8580
msgstr ""
8581
8582
#: en/help_topics/authentication.txt:105
8583
msgid ""
8584
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8585
"above,\n"
8586
" empty paths will match any provided path)."
8587
msgstr ""
8588
8589
#: en/help_topics/authentication.txt:110
8590
msgid ""
8591
"File format\n"
8592
"-----------"
8593
msgstr ""
8594
8595
#: en/help_topics/authentication.txt:113
8596
msgid ""
8597
"The general rules for :doc:`configuration files <configuration-help>`\n"
8598
"apply except for the variable policies."
8599
msgstr ""
8600
8601
#: en/help_topics/authentication.txt:116
8602
msgid "Each section describes an authentication definition."
8603
msgstr ""
8604
8605
#: en/help_topics/authentication.txt:118
8606
msgid ""
8607
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8608
"reserved\n"
8609
"and should appear as the *last* section."
8610
msgstr ""
8611
8612
#: en/help_topics/authentication.txt:121
8613
msgid "Each section should define:"
8614
msgstr ""
8615
8616
#: en/help_topics/authentication.txt:123
8617
msgid "* ``user``: the login to be used,"
8618
msgstr ""
8619
8620
#: en/help_topics/authentication.txt:125
8621
msgid "Each section could define:"
8622
msgstr ""
8623
8624
#: en/help_topics/authentication.txt:127
8625
msgid "* ``host``: the remote server,"
8626
msgstr ""
8627
8628
#: en/help_topics/authentication.txt:129
8629
msgid "* ``port``: the port the server is listening,"
8630
msgstr ""
8631
8632
#: en/help_topics/authentication.txt:131
8633
msgid "* ``path``: the branch location,"
8634
msgstr ""
8635
8636
#: en/help_topics/authentication.txt:133
8637
msgid "* ``password``: the password."
8638
msgstr ""
8639
8640
#: en/help_topics/authentication.txt:135
8641
msgid ""
8642
"\n"
8643
"Examples\n"
8644
"--------"
8645
msgstr ""
8646
8647
#: en/help_topics/authentication.txt:139
8648
msgid ""
8649
"\n"
8650
"Personal projects hosted outside\n"
8651
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8652
msgstr ""
8653
8654
#: en/help_topics/authentication.txt:143
8655
msgid ""
8656
"All connections are done with the same ``user`` (the remote one for which "
8657
"the\n"
8658
"default bzr one is not appropriate) and the password is always prompted "
8659
"with\n"
8660
"some exceptions::"
8661
msgstr ""
8662
8663
#: en/help_topics/authentication.txt:147
8664
msgid ""
8665
" # Pet projects on hobby.net\n"
8666
" [hobby]\n"
8667
" host=r.hobby.net\n"
8668
" user=jim\n"
8669
" password=obvious1234\n"
8670
" \n"
8671
" # Home server\n"
8672
" [home]\n"
8673
" scheme=https\n"
8674
" host=home.net\n"
8675
" user=joe\n"
8676
" password=1essobV10us\n"
8677
" \n"
8678
" [DEFAULT]\n"
8679
" # Our local user is barbaz, on all remote sites we're known as "
8680
"foobar\n"
8681
" user=foobar"
8682
msgstr ""
8683
8684
#: en/help_topics/authentication.txt:164
8685
msgid ""
8686
"\n"
8687
"Source hosting provider\n"
8688
"~~~~~~~~~~~~~~~~~~~~~~~"
8689
msgstr ""
8690
8691
#: en/help_topics/authentication.txt:168
8692
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8693
msgstr ""
8694
8695
#: en/help_topics/authentication.txt:170
8696
msgid ""
8697
" [shpnet domain]\n"
8698
" # we use sftp, but ssh is the scheme used for authentication\n"
8699
" scheme=ssh\n"
8700
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8701
" host=.shp.net\n"
8702
" user=joe\n"
8703
" # bzr don't support supplying a password for sftp,\n"
8704
" # consider using an ssh agent if you don't want to supply\n"
8705
" # a password interactively. (pageant, ssh-agent, etc)"
8706
msgstr ""
8707
8708
#: en/help_topics/authentication.txt:180
8709
msgid ""
8710
"HTTPS, SFTP servers and their proxy\n"
8711
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8712
msgstr ""
8713
8714
#: en/help_topics/authentication.txt:183
8715
msgid ""
8716
"At company.com, the server hosting release and integration branches is "
8717
"behind a\n"
8718
"proxy, and the two branches use different authentication policies::"
8719
msgstr ""
8720
8721
#: en/help_topics/authentication.txt:186
8722
msgid ""
8723
" [reference code]\n"
8724
" scheme=https\n"
8725
" host=dev.company.com\n"
8726
" path=/dev\n"
8727
" user=user1\n"
8728
" password=pass1"
8729
msgstr ""
8730
8731
#: en/help_topics/authentication.txt:193
8732
msgid ""
8733
" # development branches on dev server\n"
8734
" [dev]\n"
8735
" scheme=ssh # bzr+ssh and sftp are available here\n"
8736
" host=dev.company.com\n"
8737
" path=/dev/integration\n"
8738
" user=user2\n"
8739
" \n"
8740
" # proxy\n"
8741
" [proxy]\n"
8742
" scheme=http\n"
8743
" host=proxy.company.com\n"
8744
" port=3128\n"
8745
" user=proxyuser1\n"
8746
" password=proxypass1"
8747
msgstr ""
8748
8749
#: en/help_topics/authentication.txt:208
8750
msgid ""
8751
"\n"
8752
"Planned enhancements\n"
8753
"--------------------"
8754
msgstr ""
8755
8756
#: en/help_topics/authentication.txt:212
8757
msgid ""
8758
"The following are not yet implemented but planned as parts of a work in\n"
8759
"progress:"
8760
msgstr ""
8761
8762
#: en/help_topics/authentication.txt:215
8763
msgid "* add a ``password_encoding`` field allowing:"
8764
msgstr ""
8765
8766
#: en/help_topics/authentication.txt:217
8767
msgid ""
8768
" - storing the passwords in various obfuscating encodings (base64 for one),"
8769
msgstr ""
8770
8771
#: en/help_topics/authentication.txt:219
8772
msgid " - delegate password storage to plugins (.netrc for example)."
8773
msgstr ""
8774
8775
#: en/help_topics/authentication.txt:221
8776
msgid ""
8777
"* update the credentials when the user is prompted for user or password,"
8778
msgstr ""
8779
8780
#: en/help_topics/authentication.txt:223
8781
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8782
msgstr ""
8783
8784
#: en/help_topics/authentication.txt:225
8785
msgid ""
8786
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8787
"but\n"
8788
"ignored in the actual implementation.\n"
8789
msgstr ""
8790
8791
#: en/help_topics/bugs.txt:1
8792
msgid "Bug Tracker Settings"
8793
msgstr ""
8794
8795
#: en/help_topics/bugs.txt:3
8796
msgid ""
8797
"When making a commit, metadata about bugs fixed by that change can be\n"
8798
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8799
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8800
"(The only ``status`` value currently supported is ``fixed.``)"
8801
msgstr ""
8802
8803
#: en/help_topics/bugs.txt:8
8804
msgid ""
8805
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8806
"identifier\n"
8807
"rather than a full URL. This looks like::"
8808
msgstr ""
8809
8810
#: en/help_topics/bugs.txt:11
8811
msgid " bzr commit --fixes <tracker>:<id>"
8812
msgstr ""
8813
8814
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8815
msgid "or::"
8816
msgstr ""
8817
8818
#: en/help_topics/bugs.txt:15
8819
msgid " bzr commit --fixes <id>"
8820
msgstr ""
8821
8822
#: en/help_topics/bugs.txt:17
8823
msgid ""
8824
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8825
"the\n"
8826
"identifier for that bug within the bugtracker, usually the bug number.\n"
8827
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8828
"or global configuration is used."
8829
msgstr ""
8830
8831
#: en/help_topics/bugs.txt:22
8832
msgid ""
8833
"Bazaar knows about a few bug trackers that have many users. If\n"
8834
"you use one of these bug trackers then there is no setup required to\n"
8835
"use this feature, you just need to know the tracker identifier to use.\n"
8836
"These are the bugtrackers that are built in:"
8837
msgstr ""
8838
8839
#: en/help_topics/bugs.txt:27
8840
msgid ""
8841
" ============================ ============ ============\n"
8842
" URL Abbreviation Example\n"
8843
" ============================ ============ ============\n"
8844
" https://bugs.launchpad.net/ lp lp:12345\n"
8845
" http://bugs.debian.org/ deb deb:12345\n"
8846
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8847
" ============================ ============ ============"
8848
msgstr ""
8849
8850
#: en/help_topics/bugs.txt:35
8851
msgid ""
8852
"For the bug trackers not listed above configuration is required.\n"
8853
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8854
"is built in, along with a template mechanism for other bugtrackers with\n"
8855
"simple URL schemes. If your bug tracker can't be described by one\n"
8856
"of the schemes described below then you can write a plugin to support\n"
8857
"it."
8858
msgstr ""
8859
8860
#: en/help_topics/bugs.txt:42
8861
msgid ""
8862
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8863
"variable which contains the base URL of the bug tracker. These options\n"
8864
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8865
"configuration section in ``locations.conf``. You can set up these values\n"
8866
"for each of the projects you work on."
8867
msgstr ""
8868
8869
#: en/help_topics/bugs.txt:48
8870
msgid ""
8871
"Note: As you provide a short name for each tracker, you can specify one or\n"
8872
"more bugs in one or more trackers at commit time if you wish."
8873
msgstr ""
8874
8875
#: en/help_topics/bugs.txt:51
8876
msgid ""
8877
"Launchpad\n"
8878
"---------"
8879
msgstr ""
8880
8881
#: en/help_topics/bugs.txt:54
8882
msgid ""
8883
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8884
msgstr ""
8885
8886
#: en/help_topics/bugs.txt:56
8887
msgid ""
8888
"bugzilla_<tracker>_url\n"
8889
"----------------------"
8890
msgstr ""
8891
8892
#: en/help_topics/bugs.txt:59
8893
msgid ""
8894
"If present, the location of the Bugzilla bug tracker referred to by\n"
8895
"<tracker>. This option can then be used together with ``bzr commit\n"
8896
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8897
"example::"
8898
msgstr ""
8899
8900
#: en/help_topics/bugs.txt:64
8901
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8902
msgstr ""
8903
8904
#: en/help_topics/bugs.txt:66
8905
msgid ""
8906
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8907
"fixed."
8908
msgstr ""
8909
8910
#: en/help_topics/bugs.txt:69
8911
msgid ""
8912
"trac_<tracker>_url\n"
8913
"------------------"
8914
msgstr ""
8915
8916
#: en/help_topics/bugs.txt:72
8917
msgid ""
8918
"If present, the location of the Trac instance referred to by\n"
8919
"<tracker>. This option can then be used together with ``bzr commit\n"
8920
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8921
"example::"
8922
msgstr ""
8923
8924
#: en/help_topics/bugs.txt:77
8925
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8926
msgstr ""
8927
8928
#: en/help_topics/bugs.txt:79
8929
msgid ""
8930
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8931
"as\n"
8932
"fixed."
8933
msgstr ""
8934
8935
#: en/help_topics/bugs.txt:82
8936
msgid ""
8937
"bugtracker_<tracker>_url\n"
8938
"------------------------"
8939
msgstr ""
8940
8941
#: en/help_topics/bugs.txt:85
8942
msgid ""
8943
"If present, the location of a generic bug tracker instance referred to by\n"
8944
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8945
"which will be replaced by a specific bug ID. This option can then be used\n"
8946
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8947
"fixed by that commit. For example::"
8948
msgstr ""
8949
8950
#: en/help_topics/bugs.txt:91
8951
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8952
msgstr ""
8953
8954
#: en/help_topics/bugs.txt:93
8955
msgid ""
8956
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8957
"Roundup bug tracker as fixed, or::"
8958
msgstr ""
8959
8960
#: en/help_topics/bugs.txt:96
8961
msgid ""
8962
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8963
msgstr ""
8964
8965
#: en/help_topics/bugs.txt:98
8966
msgid ""
8967
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8968
"RT bug tracker as fixed, or::"
8969
msgstr ""
8970
8971
#: en/help_topics/bugs.txt:101
8972
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8973
msgstr ""
8974
8975
#: en/help_topics/bugs.txt:103
8976
msgid ""
8977
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8978
"1234\n"
8979
"in Hudson's JIRA bug tracker as fixed.\n"
8980
msgstr ""
8981
8982
#: en/help_topics/commands.txt:1
8983
msgid ""
8984
"add Add specified files or directories.\n"
8985
"alias Set/unset and display aliases.\n"
8986
"annotate Show the origin of each line in a file.\n"
8987
"bash-completion Generate a shell function for bash command line "
8988
"completion.\n"
8989
" [bash_completion]\n"
8990
"bind Convert the current branch into a checkout of the "
8991
"supplied\n"
8992
" branch.\n"
8993
"branch Create a new branch that is a copy of an existing branch.\n"
8994
"branches List the branches available at the current location.\n"
8995
"break-lock Break a dead lock.\n"
8996
"cat Write the contents of a file as of a given revision to\n"
8997
" standard output.\n"
8998
"check Validate working tree structure, branch consistency and\n"
8999
" repository history.\n"
9000
"checkout Create a new checkout of an existing branch.\n"
9001
"clean-tree Remove unwanted files from working tree.\n"
9002
"commit Commit changes into a new revision.\n"
9003
"config Display, set or remove a configuration option.\n"
9004
"conflicts List files with conflicts.\n"
9005
"deleted List files deleted in the working tree.\n"
9006
"diff Show differences in the working tree, between revisions "
9007
"or\n"
9008
" branches.\n"
9009
"dpush Push into a different VCS without any custom bzr "
9010
"metadata.\n"
9011
"export Export current or past revision to a destination directory "
9012
"or\n"
9013
" archive.\n"
9014
"help Show help on a command or other topic.\n"
9015
"ignore Ignore specified files or patterns.\n"
9016
"ignored List ignored files and the patterns that matched them.\n"
9017
"info Show information about a working tree, branch or "
9018
"repository.\n"
9019
"init Make a directory into a versioned branch.\n"
9020
"init-repository Create a shared repository for branches to share storage\n"
9021
" space.\n"
9022
"join Combine a tree into its containing tree.\n"
9023
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9024
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9025
"launchpad-open Open a Launchpad branch page in your web browser. "
9026
"[launchpad]\n"
9027
"log Show historical log for a branch or subset of a branch.\n"
9028
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9029
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9030
"ls List files in a tree.\n"
9031
"merge Perform a three-way merge.\n"
9032
"missing Show unmerged/unpulled revisions between two branches.\n"
9033
"mkdir Create a new versioned directory.\n"
9034
"mv Move or rename a file.\n"
9035
"nick Print or set the branch nickname.\n"
9036
"pack Compress the data within a repository.\n"
9037
"plugins List the installed plugins.\n"
9038
"pull Turn this branch into a mirror of another branch.\n"
9039
"push Update a mirror of this branch.\n"
9040
"reconcile Reconcile bzr metadata in a branch.\n"
9041
"reconfigure Reconfigure the type of a bzr directory.\n"
9042
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9043
"remerge Redo a merge.\n"
9044
"remove Remove files or directories.\n"
9045
"remove-branch Remove a branch.\n"
9046
"remove-tree Remove the working tree from a given branch/checkout.\n"
9047
"renames Show list of renamed files.\n"
9048
"resolve Mark a conflict as resolved.\n"
9049
"revert Revert files to a previous revision.\n"
9050
"revno Show current revision number.\n"
9051
"root Show the tree root directory.\n"
9052
"send Mail or create a merge-directive for submitting changes.\n"
9053
"serve Run the bzr server.\n"
9054
"shelve Temporarily set aside some changes from the current tree.\n"
9055
"sign-my-commits Sign all commits by a given committer.\n"
9056
"split Split a subdirectory of a tree into a separate tree.\n"
9057
"status Display status summary.\n"
9058
"switch Set the branch of a checkout and update.\n"
9059
"tag Create, remove or modify a tag naming a revision.\n"
9060
"tags List tags.\n"
9061
"testament Show testament (signing-form) of a revision.\n"
9062
"unbind Convert the current checkout into a regular branch.\n"
9063
"uncommit Remove the last committed revision.\n"
9064
"unshelve Restore shelved changes.\n"
9065
"update Update a working tree to a new revision.\n"
9066
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9067
" format.\n"
9068
"verify-signatures Verify all commit signatures.\n"
9069
"version Show version of bzr.\n"
9070
"version-info Show version information about this tree.\n"
9071
"view Manage filtered views.\n"
9072
"whoami Show or set bzr user id.\n"
9073
msgstr ""
9074
9075
#: en/help_topics/configuration.txt:1
9076
msgid ""
9077
"Configuration Settings\n"
9078
"======================="
9079
msgstr ""
9080
9081
#: en/help_topics/configuration.txt:4
9082
msgid ""
9083
"Environment settings\n"
9084
"---------------------"
9085
msgstr ""
9086
9087
#: en/help_topics/configuration.txt:7
9088
msgid ""
9089
"While most configuration is handled by configuration files, some options\n"
9090
"which may be semi-permanent can also be controlled through the environment."
9091
msgstr ""
9092
9093
#: en/help_topics/configuration.txt:10
9094
msgid ""
9095
"BZR_EMAIL\n"
9096
"~~~~~~~~~"
9097
msgstr ""
9098
9099
#: en/help_topics/configuration.txt:13
9100
msgid "Override the email id used by Bazaar. Typical format::"
9101
msgstr ""
9102
9103
#: en/help_topics/configuration.txt:15
9104
msgid " \"John Doe <jdoe@example.com>\""
9105
msgstr ""
9106
9107
#: en/help_topics/configuration.txt:17
9108
msgid "See also the ``email`` configuration option."
9109
msgstr ""
9110
9111
#: en/help_topics/configuration.txt:19
9112
msgid ""
9113
"BZR_PROGRESS_BAR\n"
9114
"~~~~~~~~~~~~~~~~"
9115
msgstr ""
9116
9117
#: en/help_topics/configuration.txt:22
9118
msgid ""
9119
"Override the progress display. Possible values are \"none\" or \"text\". "
9120
"If\n"
9121
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9122
"draws\n"
9123
"the ordinary command line progress bar."
9124
msgstr ""
9125
9126
#: en/help_topics/configuration.txt:26
9127
msgid ""
9128
"BZR_SIGQUIT_PDB\n"
9129
"~~~~~~~~~~~~~~~"
9130
msgstr ""
9131
9132
#: en/help_topics/configuration.txt:29
9133
msgid ""
9134
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9135
msgstr ""
9136
9137
#: en/help_topics/configuration.txt:31
9138
msgid ""
9139
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9140
"* 1 = Invoke breakin debugger (default)"
9141
msgstr ""
9142
9143
#: en/help_topics/configuration.txt:34
9144
msgid ""
9145
"BZR_HOME\n"
9146
"~~~~~~~~"
9147
msgstr ""
9148
9149
#: en/help_topics/configuration.txt:37
9150
msgid "Override the home directory used by Bazaar."
9151
msgstr ""
9152
9153
#: en/help_topics/configuration.txt:39
9154
msgid ""
9155
"BZR_SSH\n"
9156
"~~~~~~~"
9157
msgstr ""
9158
9159
#: en/help_topics/configuration.txt:42
9160
msgid "Select a different SSH implementation."
9161
msgstr ""
9162
9163
#: en/help_topics/configuration.txt:44
9164
msgid ""
9165
"BZR_PDB\n"
9166
"~~~~~~~"
9167
msgstr ""
9168
9169
#: en/help_topics/configuration.txt:47
9170
msgid "Control whether to launch a debugger on error."
9171
msgstr ""
9172
9173
#: en/help_topics/configuration.txt:49
9174
msgid ""
9175
"* 0 = Standard behavior\n"
9176
"* 1 = Launch debugger"
9177
msgstr ""
9178
9179
#: en/help_topics/configuration.txt:52
9180
msgid ""
9181
"BZR_REMOTE_PATH\n"
9182
"~~~~~~~~~~~~~~~"
9183
msgstr ""
9184
9185
#: en/help_topics/configuration.txt:55
9186
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9187
msgstr ""
9188
9189
#: en/help_topics/configuration.txt:57
9190
msgid "See also the ``bzr_remote_path`` configuration option."
9191
msgstr ""
9192
9193
#: en/help_topics/configuration.txt:59
9194
msgid ""
9195
"BZR_EDITOR\n"
9196
"~~~~~~~~~~"
9197
msgstr ""
9198
9199
#: en/help_topics/configuration.txt:62
9200
msgid "Path to the editor Bazaar should use for commit messages, etc."
9201
msgstr ""
9202
9203
#: en/help_topics/configuration.txt:64
9204
msgid ""
9205
"BZR_LOG\n"
9206
"~~~~~~~"
9207
msgstr ""
9208
9209
#: en/help_topics/configuration.txt:67
9210
msgid ""
9211
"Location of the Bazaar log file. You can check the current location by\n"
9212
"running ``bzr version``."
9213
msgstr ""
9214
9215
#: en/help_topics/configuration.txt:70
9216
msgid ""
9217
"The log file contains debug information that is useful for diagnosing or\n"
9218
"reporting problems with Bazaar."
9219
msgstr ""
9220
9221
#: en/help_topics/configuration.txt:73
9222
msgid ""
9223
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9224
"will disable logging."
9225
msgstr ""
9226
9227
#: en/help_topics/configuration.txt:76
9228
msgid ""
9229
"\n"
9230
"BZR_PLUGIN_PATH\n"
9231
"~~~~~~~~~~~~~~~"
9232
msgstr ""
9233
9234
#: en/help_topics/configuration.txt:80
9235
msgid ""
9236
"The path to the plugins directory that Bazaar should use.\n"
9237
"If not set, Bazaar will search for plugins in:"
9238
msgstr ""
9239
9240
#: en/help_topics/configuration.txt:83
9241
msgid ""
9242
"* the user specific plugin directory (containing the ``user`` plugins),"
9243
msgstr ""
9244
9245
#: en/help_topics/configuration.txt:85
9246
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9247
msgstr ""
9248
9249
#: en/help_topics/configuration.txt:87
9250
msgid ""
9251
"* the site specific plugin directory if applicable (containing\n"
9252
" the ``site`` plugins)."
9253
msgstr ""
9254
9255
#: en/help_topics/configuration.txt:90
9256
msgid ""
9257
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9258
"the way the plugin are searched. "
9259
msgstr ""
9260
9261
#: en/help_topics/configuration.txt:93
9262
msgid ""
9263
"As for the ``PATH`` variables, if multiple directories are\n"
9264
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9265
"platform specific appropriate character (':' on Unix,\n"
9266
"';' on windows)"
9267
msgstr ""
9268
9269
#: en/help_topics/configuration.txt:98
9270
msgid ""
9271
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9272
"in ``user``. However it will continue to search in ``core`` and\n"
9273
"``site`` unless they are explicitly removed."
9274
msgstr ""
9275
9276
#: en/help_topics/configuration.txt:102
9277
msgid ""
9278
"If you need to change the order or remove one of these\n"
9279
"directories, you should use special values:"
9280
msgstr ""
9281
9282
#: en/help_topics/configuration.txt:105
9283
msgid ""
9284
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9285
" path from the default values,"
9286
msgstr ""
9287
9288
#: en/help_topics/configuration.txt:108
9289
msgid ""
9290
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9291
" before the remaining default values (and also remove it from\n"
9292
" the default values)."
9293
msgstr ""
9294
9295
#: en/help_topics/configuration.txt:112
9296
msgid ""
9297
"Note that the special values 'user', 'core' and 'site' should be\n"
9298
"used literally, they will be substituted by the corresponding,\n"
9299
"platform specific, values."
9300
msgstr ""
9301
9302
#: en/help_topics/configuration.txt:116
9303
msgid ""
9304
"The examples below use ':' as the separator, windows users\n"
9305
"should use ';'."
9306
msgstr ""
9307
9308
#: en/help_topics/configuration.txt:119
9309
msgid "Overriding the default user plugin directory::"
9310
msgstr ""
9311
9312
#: en/help_topics/configuration.txt:121
9313
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9314
msgstr ""
9315
9316
#: en/help_topics/configuration.txt:123
9317
msgid "Disabling the site directory while retaining the user directory::"
9318
msgstr ""
9319
9320
#: en/help_topics/configuration.txt:125
9321
msgid " BZR_PLUGIN_PATH='-site:+user'"
9322
msgstr ""
9323
9324
#: en/help_topics/configuration.txt:127
9325
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9326
msgstr ""
9327
9328
#: en/help_topics/configuration.txt:129
9329
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9330
msgstr ""
9331
9332
#: en/help_topics/configuration.txt:131
9333
msgid "Overriding the default site plugin directory::"
9334
msgstr ""
9335
9336
#: en/help_topics/configuration.txt:133
9337
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9338
msgstr ""
9339
9340
#: en/help_topics/configuration.txt:135
9341
msgid ""
9342
"BZR_DISABLE_PLUGINS\n"
9343
"~~~~~~~~~~~~~~~~~~~"
9344
msgstr ""
9345
9346
#: en/help_topics/configuration.txt:138
9347
msgid ""
9348
"Under special circumstances (mostly when trying to diagnose a\n"
9349
"bug), it's better to disable a plugin (or several) rather than\n"
9350
"uninstalling them completely. Such plugins can be specified in\n"
9351
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9352
msgstr ""
9353
9354
#: en/help_topics/configuration.txt:143
9355
msgid ""
9356
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9357
"will raise an import error if they are explicitly imported (by\n"
9358
"another plugin that depends on them for example)."
9359
msgstr ""
9360
9361
#: en/help_topics/configuration.txt:147
9362
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9363
msgstr ""
9364
9365
#: en/help_topics/configuration.txt:149
9366
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9367
msgstr ""
9368
9369
#: en/help_topics/configuration.txt:151
9370
msgid ""
9371
"BZR_PLUGINS_AT\n"
9372
"~~~~~~~~~~~~~~"
9373
msgstr ""
9374
9375
#: en/help_topics/configuration.txt:154
9376
msgid ""
9377
"When adding a new feature or working on a bug in a plugin,\n"
9378
"developers often need to use a specific version of a given\n"
9379
"plugin. Since python requires that the directory containing the\n"
9380
"code is named like the plugin itself this make it impossible to\n"
9381
"use arbitrary directory names (using a two-level directory scheme\n"
9382
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9383
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9384
msgstr ""
9385
9386
#: en/help_topics/configuration.txt:162
9387
msgid ""
9388
"Plugins specified in this environment variable takes precedence\n"
9389
"over the ones in ``BZR_PLUGIN_PATH``."
9390
msgstr ""
9391
9392
#: en/help_topics/configuration.txt:165
9393
msgid ""
9394
"The variable specified a list of ``plugin_name@plugin path``,\n"
9395
"``plugin_name`` being the name of the plugin as it appears in\n"
9396
"python module paths, ``plugin_path`` being the path to the\n"
9397
"directory containing the plugin code itself\n"
9398
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9399
"separator, use ';' on windows."
9400
msgstr ""
9401
9402
#: en/help_topics/configuration.txt:172
9403
msgid ""
9404
"Example:\n"
9405
"~~~~~~~~"
9406
msgstr ""
9407
9408
#: en/help_topics/configuration.txt:175
9409
msgid ""
9410
"Using a specific version of ``myplugin``:\n"
9411
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9412
msgstr ""
9413
9414
#: en/help_topics/configuration.txt:178
9415
msgid ""
9416
"BZRPATH\n"
9417
"~~~~~~~"
9418
msgstr ""
9419
9420
#: en/help_topics/configuration.txt:181
9421
msgid "The path where Bazaar should look for shell plugin external commands."
9422
msgstr ""
9423
9424
#: en/help_topics/configuration.txt:183
9425
msgid ""
9426
"\n"
9427
"http_proxy, https_proxy\n"
9428
"~~~~~~~~~~~~~~~~~~~~~~~"
9429
msgstr ""
9430
9431
#: en/help_topics/configuration.txt:187
9432
msgid "Specifies the network proxy for outgoing connections, for example::"
9433
msgstr ""
9434
9435
#: en/help_topics/configuration.txt:189
9436
msgid ""
9437
" http_proxy=http://proxy.example.com:3128/ \n"
9438
" https_proxy=http://proxy.example.com:3128/"
9439
msgstr ""
9440
9441
#: en/help_topics/configuration.txt:192
9442
msgid ""
9443
"\n"
9444
"Configuration files\n"
9445
"-------------------"
9446
msgstr ""
9447
9448
#: en/help_topics/configuration.txt:196
9449
msgid ""
9450
"Location\n"
9451
"~~~~~~~~"
9452
msgstr ""
9453
9454
#: en/help_topics/configuration.txt:199
9455
msgid ""
9456
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9457
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9458
"on\n"
9459
"Windows. (You can check the location for your system by using\n"
9460
"``bzr version``.)"
9461
msgstr ""
9462
9463
#: en/help_topics/configuration.txt:204
9464
msgid "There are three primary configuration files in this location:"
9465
msgstr ""
9466
9467
#: en/help_topics/configuration.txt:206
9468
msgid "* ``bazaar.conf`` describes default configuration options,"
9469
msgstr ""
9470
9471
#: en/help_topics/configuration.txt:208
9472
msgid ""
9473
"* ``locations.conf`` describes configuration information for\n"
9474
" specific branch locations,"
9475
msgstr ""
9476
9477
#: en/help_topics/configuration.txt:211
9478
msgid ""
9479
"* ``authentication.conf`` describes credential information for\n"
9480
" remote servers."
9481
msgstr ""
9482
9483
#: en/help_topics/configuration.txt:214
9484
msgid ""
9485
"Each branch can also contain a configuration file that sets values specific\n"
9486
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9487
"the\n"
9488
"branch. This file is visible to all users of a branch, if you wish to "
9489
"override\n"
9490
"one of the values for a branch with a setting that is specific to you then "
9491
"you\n"
9492
"can do so in ``locations.conf``."
9493
msgstr ""
9494
9495
#: en/help_topics/configuration.txt:220
9496
msgid ""
9497
"General format\n"
9498
"~~~~~~~~~~~~~~"
9499
msgstr ""
9500
9501
#: en/help_topics/configuration.txt:223
9502
msgid ""
9503
"An ini file has three types of contructs: section headers, section\n"
9504
"options and comments."
9505
msgstr ""
9506
9507
#: en/help_topics/configuration.txt:226
9508
msgid ""
9509
"Comments\n"
9510
"^^^^^^^^"
9511
msgstr ""
9512
9513
#: en/help_topics/configuration.txt:229
9514
msgid ""
9515
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9516
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9517
"Bazaar when parsing ini files."
9518
msgstr ""
9519
9520
#: en/help_topics/configuration.txt:233
9521
msgid ""
9522
"Section headers\n"
9523
"^^^^^^^^^^^^^^^"
9524
msgstr ""
9525
9526
#: en/help_topics/configuration.txt:236
9527
msgid ""
9528
"A section header is a word enclosed in brackets that starts at the begining\n"
9529
"of a line. A typical section header looks like this::"
9530
msgstr ""
9531
9532
#: en/help_topics/configuration.txt:239
9533
msgid " [DEFAULT]"
9534
msgstr ""
9535
9536
#: en/help_topics/configuration.txt:241
9537
msgid ""
9538
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9539
"[ALIASES]. Section headers are case sensitive. The default section provides "
9540
"for\n"
9541
"setting options which can be overridden with the branch config file."
9542
msgstr ""
9543
9544
#: en/help_topics/configuration.txt:245
9545
msgid ""
9546
"For ``locations.conf``, the options from the section with the\n"
9547
"longest matching section header are used to the exclusion of other\n"
9548
"potentially valid section headers. A section header uses the path for\n"
9549
"the branch as the section header. Some examples include::"
9550
msgstr ""
9551
9552
#: en/help_topics/configuration.txt:250
9553
msgid ""
9554
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9555
" [/home/jdoe/branches/]"
9556
msgstr ""
9557
9558
#: en/help_topics/configuration.txt:253
9559
msgid ""
9560
"\n"
9561
"Section options\n"
9562
"^^^^^^^^^^^^^^^"
9563
msgstr ""
9564
9565
#: en/help_topics/configuration.txt:257
9566
msgid ""
9567
"A section option resides within a section. A section option contains an\n"
9568
"option name, an equals sign and a value. For example::"
9569
msgstr ""
9570
9571
#: en/help_topics/configuration.txt:260
9572
msgid ""
9573
" email = John Doe <jdoe@isp.com>\n"
9574
" gpg_signing_key = Amy Pond <amy@example.com>"
9575
msgstr ""
9576
9577
#: en/help_topics/configuration.txt:263
9578
msgid ""
9579
"A option can reference other options by enclosing them in curly brackets::"
9580
msgstr ""
9581
9582
#: en/help_topics/configuration.txt:265
9583
msgid ""
9584
" my_branch_name = feature_x\n"
9585
" my_server = bzr+ssh://example.com\n"
9586
" push_location = {my_server}/project/{my_branch_name}"
9587
msgstr ""
9588
9589
#: en/help_topics/configuration.txt:269
9590
msgid ""
9591
"Option policies\n"
9592
"^^^^^^^^^^^^^^^"
9593
msgstr ""
9594
9595
#: en/help_topics/configuration.txt:272
9596
msgid ""
9597
"Options defined in a section affect the named directory or URL plus\n"
9598
"any locations they contain. Policies can be used to change how an\n"
9599
"option value is interpreted for contained locations. Currently\n"
9600
"there are three policies available:"
9601
msgstr ""
9602
9603
#: en/help_topics/configuration.txt:277
9604
msgid ""
9605
" none:\n"
9606
" the value is interpreted the same for contained locations. This is\n"
9607
" the default behaviour.\n"
9608
" norecurse:\n"
9609
" the value is only used for the exact location specified by the\n"
9610
" section name.\n"
9611
" appendpath:\n"
9612
" for contained locations, any additional path components are\n"
9613
" appended to the value."
9614
msgstr ""
9615
9616
#: en/help_topics/configuration.txt:287
9617
msgid ""
9618
"Policies are specified by keys with names of the form "
9619
"\"<option_name>:policy\".\n"
9620
"For example, to define the push location for a tree of branches, the\n"
9621
"following could be used::"
9622
msgstr ""
9623
9624
#: en/help_topics/configuration.txt:291
9625
msgid ""
9626
" [/top/location]\n"
9627
" push_location = sftp://example.com/location\n"
9628
" push_location:policy = appendpath"
9629
msgstr ""
9630
9631
#: en/help_topics/configuration.txt:295
9632
msgid ""
9633
"With this configuration, the push location for ``/top/location/branch1``\n"
9634
"would be ``sftp://example.com/location/branch1``."
9635
msgstr ""
9636
9637
#: en/help_topics/configuration.txt:298
9638
msgid ""
9639
"Section local options\n"
9640
"^^^^^^^^^^^^^^^^^^^^^"
9641
msgstr ""
9642
9643
#: en/help_topics/configuration.txt:301
9644
msgid ""
9645
"Some options are defined automatically inside a given section and can be\n"
9646
"refered to in this section only. "
9647
msgstr ""
9648
9649
#: en/help_topics/configuration.txt:304
9650
msgid "For example, the ``appendpath`` policy can be used like this::"
9651
msgstr ""
9652
9653
#: en/help_topics/configuration.txt:306
9654
msgid ""
9655
" [/home/vila/src/bzr/bugs]\n"
9656
" mypush = lp:~vila/bzr\n"
9657
" mypush:policy=appendpath"
9658
msgstr ""
9659
9660
#: en/help_topics/configuration.txt:310
9661
msgid "Using ``relpath`` to achieve the same result is done like this::"
9662
msgstr ""
9663
9664
#: en/help_topics/configuration.txt:312
9665
msgid ""
9666
" [/home/vila/src/bzr/bugs]\n"
9667
" mypush = lp:~vila/bzr/{relpath}"
9668
msgstr ""
9669
9670
#: en/help_topics/configuration.txt:315
9671
msgid ""
9672
"In both cases, when used in a directory like\n"
9673
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9674
msgstr ""
9675
9676
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9677
msgid ""
9678
" $ bzr config mypush\n"
9679
" lp:~vila/bzr/832013-expand-in-stack"
9680
msgstr ""
9681
9682
#: en/help_topics/configuration.txt:321
9683
msgid "Another such option is ``basename`` which can be used like this::"
9684
msgstr ""
9685
9686
#: en/help_topics/configuration.txt:323
9687
msgid ""
9688
" [/home/vila/src/bzr]\n"
9689
" mypush = lp:~vila/bzr/{basename}"
9690
msgstr ""
9691
9692
#: en/help_topics/configuration.txt:326
9693
msgid ""
9694
"When used in a directory like\n"
9695
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9696
msgstr ""
9697
9698
#: en/help_topics/configuration.txt:332
9699
msgid ""
9700
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9701
"itself is defined as the relative path between the section name and the\n"
9702
"location it matches."
9703
msgstr ""
9704
9705
#: en/help_topics/configuration.txt:336
9706
msgid ""
9707
"When an option is local to a Section, it cannot be referred to from option\n"
9708
"values in any other section from the same ``Store`` nor from any other\n"
9709
"``Store``."
9710
msgstr ""
9711
9712
#: en/help_topics/configuration.txt:340
9713
msgid ""
9714
"\n"
9715
"The main configuration file, bazaar.conf\n"
9716
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9717
msgstr ""
9718
9719
#: en/help_topics/configuration.txt:344
9720
msgid ""
9721
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9722
"The default section contains the default\n"
9723
"configuration options for all branches. The default section can be\n"
9724
"overriden by providing a branch-specific section in ``locations.conf``."
9725
msgstr ""
9726
9727
#: en/help_topics/configuration.txt:349
9728
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9729
msgstr ""
9730
9731
#: en/help_topics/configuration.txt:351
9732
msgid ""
9733
" [DEFAULT]\n"
9734
" email = John Doe <jdoe@isp.com>\n"
9735
" editor = /usr/bin/vim\n"
9736
" create_signatures = when-required"
9737
msgstr ""
9738
9739
#: en/help_topics/configuration.txt:356
9740
msgid ""
9741
"\n"
9742
"The branch location configuration file, locations.conf\n"
9743
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9744
msgstr ""
9745
9746
#: en/help_topics/configuration.txt:360
9747
msgid ""
9748
"``locations.conf`` allows one to specify overriding settings for\n"
9749
"a specific branch. The format is almost identical to the default section in\n"
9750
"bazaar.conf with one significant change: The section header, instead of "
9751
"saying\n"
9752
"default, will be the path to a branch that you wish to override a value\n"
9753
"for. The '?' and '*' wildcards are supported::"
9754
msgstr ""
9755
9756
#: en/help_topics/configuration.txt:366
9757
msgid ""
9758
" [/home/jdoe/branches/nethack]\n"
9759
" email = Nethack Admin <nethack@nethack.com>"
9760
msgstr ""
9761
9762
#: en/help_topics/configuration.txt:369
9763
msgid ""
9764
" [http://hypothetical.site.com/branches/devel-branch]\n"
9765
" create_signatures = always"
9766
msgstr ""
9767
9768
#: en/help_topics/configuration.txt:372
9769
msgid ""
9770
"The authentication configuration file, authentication.conf\n"
9771
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9772
msgstr ""
9773
9774
#: en/help_topics/configuration.txt:375
9775
msgid ""
9776
"``authentication.conf`` allows one to specify credentials for\n"
9777
"remote servers. This can be used for all the supported transports and any "
9778
"part\n"
9779
"of bzr that requires authentication (smtp for example)."
9780
msgstr ""
9781
9782
#: en/help_topics/configuration.txt:379
9783
msgid ""
9784
"The syntax of the file obeys the same rules as the others except for the\n"
9785
"option policies which don't apply."
9786
msgstr ""
9787
9788
#: en/help_topics/configuration.txt:382
9789
msgid ""
9790
"For more information on the possible uses of the authentication "
9791
"configuration\n"
9792
"file see :doc:`authentication-help`."
9793
msgstr ""
9794
9795
#: en/help_topics/configuration.txt:385
9796
msgid ""
9797
"\n"
9798
"Common options\n"
9799
"--------------"
9800
msgstr ""
9801
9802
#: en/help_topics/configuration.txt:389
9803
msgid ""
9804
"debug_flags\n"
9805
"~~~~~~~~~~~"
9806
msgstr ""
9807
9808
#: en/help_topics/configuration.txt:392
9809
msgid ""
9810
"A comma-separated list of debugging options to turn on. The same values\n"
9811
"can be used as with the -D command-line option (see `help global-options`).\n"
9812
"For example::"
9813
msgstr ""
9814
9815
#: en/help_topics/configuration.txt:396
9816
msgid " debug_flags = hpss"
9817
msgstr ""
9818
9819
#: en/help_topics/configuration.txt:400
9820
msgid " debug_flags = hpss,evil"
9821
msgstr ""
9822
9823
#: en/help_topics/configuration.txt:402
9824
msgid ""
9825
"email\n"
9826
"~~~~~"
9827
msgstr ""
9828
9829
#: en/help_topics/configuration.txt:405
9830
msgid ""
9831
"The email address to use when committing a branch. Typically takes the form\n"
9832
"of::"
9833
msgstr ""
9834
9835
#: en/help_topics/configuration.txt:408
9836
msgid " email = Full Name <account@hostname.tld>"
9837
msgstr ""
9838
9839
#: en/help_topics/configuration.txt:410
9840
msgid ""
9841
"editor\n"
9842
"~~~~~~"
9843
msgstr ""
9844
9845
#: en/help_topics/configuration.txt:413
9846
msgid ""
9847
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9848
"a commit message. This setting is trumped by the environment variable\n"
9849
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9850
"variables."
9851
msgstr ""
9852
9853
#: en/help_topics/configuration.txt:418
9854
msgid ""
9855
"log_format\n"
9856
"~~~~~~~~~~"
9857
msgstr ""
9858
9859
#: en/help_topics/configuration.txt:421
9860
msgid ""
9861
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9862
"and ``line``. Additional formats may be provided by plugins. The default\n"
9863
"value is ``long``."
9864
msgstr ""
9865
9866
#: en/help_topics/configuration.txt:425
9867
msgid ""
9868
"check_signatures\n"
9869
"~~~~~~~~~~~~~~~~"
9870
msgstr ""
9871
9872
#: en/help_topics/configuration.txt:428
9873
msgid ""
9874
"Reserved for future use. These options will allow a policy for branches to\n"
9875
"require signatures."
9876
msgstr ""
9877
9878
#: en/help_topics/configuration.txt:431
9879
msgid ""
9880
"require\n"
9881
" The gnupg signature for revisions must be present and must be valid."
9882
msgstr ""
9883
9884
#: en/help_topics/configuration.txt:434
9885
msgid ""
9886
"ignore\n"
9887
" Do not check gnupg signatures of revisions."
9888
msgstr ""
9889
9890
#: en/help_topics/configuration.txt:437
9891
msgid ""
9892
"check-available\n"
9893
" (default) If gnupg signatures for revisions are present, check them.\n"
9894
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9895
" no signature is present."
9896
msgstr ""
9897
9898
#: en/help_topics/configuration.txt:442
9899
msgid ""
9900
"create_signatures\n"
9901
"~~~~~~~~~~~~~~~~~"
9902
msgstr ""
9903
9904
#: en/help_topics/configuration.txt:445
9905
msgid ""
9906
"Defines the behaviour of signing revisions on commits. By default bzr will "
9907
"not\n"
9908
"sign new commits."
9909
msgstr ""
9910
9911
#: en/help_topics/configuration.txt:448
9912
msgid ""
9913
"always\n"
9914
" Sign every new revision that is committed. If the signing fails then "
9915
"the\n"
9916
" commit will not be made."
9917
msgstr ""
9918
9919
#: en/help_topics/configuration.txt:452
9920
msgid ""
9921
"when-required\n"
9922
" Reserved for future use."
9923
msgstr ""
9924
9925
#: en/help_topics/configuration.txt:455
9926
msgid ""
9927
"never\n"
9928
" Reserved for future use."
9929
msgstr ""
9930
9931
#: en/help_topics/configuration.txt:458
9932
msgid ""
9933
"In future it is planned that ``when-required`` will sign newly\n"
9934
"committed revisions only when the branch requires them. ``never`` will "
9935
"refuse\n"
9936
"to sign newly committed revisions, even if the branch requires signatures."
9937
msgstr ""
9938
9939
#: en/help_topics/configuration.txt:462
9940
msgid ""
9941
"dirstate.fdatasync\n"
9942
"~~~~~~~~~~~~~~~~~~"
9943
msgstr ""
9944
9945
#: en/help_topics/configuration.txt:465
9946
msgid ""
9947
"If true (default), working tree metadata changes are flushed through the\n"
9948
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9949
"should not be lost if the machine crashes. See also repository.fdatasync."
9950
msgstr ""
9951
9952
#: en/help_topics/configuration.txt:469
9953
msgid ""
9954
"gpg_signing_key\n"
9955
"~~~~~~~~~~~~~~~"
9956
msgstr ""
9957
9958
#: en/help_topics/configuration.txt:472
9959
msgid ""
9960
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9961
"address, key fingerprint or full key ID. When unset or when set to\n"
9962
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9963
msgstr ""
9964
9965
#: en/help_topics/configuration.txt:476
9966
msgid ""
9967
"recurse\n"
9968
"~~~~~~~"
9969
msgstr ""
9970
9971
#: en/help_topics/configuration.txt:479
9972
msgid ""
9973
"Only useful in ``locations.conf``. Defines whether or not the\n"
9974
"configuration for this section applies to subdirectories:"
9975
msgstr ""
9976
9977
#: en/help_topics/configuration.txt:482
9978
msgid ""
9979
"true\n"
9980
" (default) This section applies to subdirectories as well."
9981
msgstr ""
9982
9983
#: en/help_topics/configuration.txt:485
9984
msgid ""
9985
"false\n"
9986
" This section only applies to the branch at this directory and not\n"
9987
" branches below it."
9988
msgstr ""
9989
9990
#: en/help_topics/configuration.txt:489
9991
msgid ""
9992
"gpg_signing_command\n"
9993
"~~~~~~~~~~~~~~~~~~~"
9994
msgstr ""
9995
9996
#: en/help_topics/configuration.txt:492
9997
msgid ""
9998
"(Default: \"gpg\"). Which program should be used to sign and check "
9999
"revisions.\n"
10000
"For example::"
10001
msgstr ""
10002
10003
#: en/help_topics/configuration.txt:495
10004
msgid " gpg_signing_command = /usr/bin/gnpg"
10005
msgstr ""
10006
10007
#: en/help_topics/configuration.txt:497
10008
msgid ""
10009
"The specified command must accept the options \"--clearsign\" and \"-u "
10010
"<email>\"."
10011
msgstr ""
10012
10013
#: en/help_topics/configuration.txt:499
10014
msgid ""
10015
"bzr_remote_path\n"
10016
"~~~~~~~~~~~~~~~"
10017
msgstr ""
10018
10019
#: en/help_topics/configuration.txt:502
10020
msgid ""
10021
"(Default: \"bzr\"). The path to the command that should be used to run the "
10022
"smart\n"
10023
"server for bzr. This value may only be specified in locations.conf, because:"
10024
msgstr ""
10025
10026
#: en/help_topics/configuration.txt:505
10027
msgid ""
10028
"- it's needed before branch.conf is accessible\n"
10029
"- allowing remote branch.conf files to specify commands would be a security\n"
10030
" risk"
10031
msgstr ""
10032
10033
#: en/help_topics/configuration.txt:509
10034
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10035
msgstr ""
10036
10037
#: en/help_topics/configuration.txt:511
10038
msgid ""
10039
"smtp_server\n"
10040
"~~~~~~~~~~~"
10041
msgstr ""
10042
10043
#: en/help_topics/configuration.txt:514
10044
msgid ""
10045
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10046
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10047
msgstr ""
10048
10049
#: en/help_topics/configuration.txt:517
10050
msgid ""
10051
"smtp_username, smtp_password\n"
10052
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:520
10056
msgid ""
10057
"User and password to authenticate to the SMTP server. If smtp_username\n"
10058
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10059
"These settings are only needed if the SMTP server requires authentication\n"
10060
"to send mail."
10061
msgstr ""
10062
10063
#: en/help_topics/configuration.txt:525
10064
msgid ""
10065
"locks.steal_dead\n"
10066
"~~~~~~~~~~~~~~~~"
10067
msgstr ""
10068
10069
#: en/help_topics/configuration.txt:528
10070
msgid ""
10071
"If set to true, bzr will automatically break locks held by processes from\n"
10072
"the same machine and user that are no longer alive. Otherwise, it will\n"
10073
"print a message and you can break the lock manually, if you are satisfied\n"
10074
"the object is no longer in use."
10075
msgstr ""
10076
10077
#: en/help_topics/configuration.txt:533
10078
msgid ""
10079
"mail_client\n"
10080
"~~~~~~~~~~~"
10081
msgstr ""
10082
10083
#: en/help_topics/configuration.txt:536
10084
msgid ""
10085
"A mail client to use for sending merge requests.\n"
10086
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10087
"it\n"
10088
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10089
"``editor``."
10090
msgstr ""
10091
10092
#: en/help_topics/configuration.txt:541
10093
msgid "Supported values for specific clients:"
10094
msgstr ""
10095
10096
#: en/help_topics/configuration.txt:543
10097
msgid ""
10098
":claws: Use Claws. This skips a dialog for attaching files.\n"
10099
":evolution: Use Evolution.\n"
10100
":kmail: Use KMail.\n"
10101
":mutt: Use Mutt.\n"
10102
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10103
"1.5,\n"
10104
" this works around some bugs that xdg-email doesn't handle."
10105
msgstr ""
10106
10107
#: en/help_topics/configuration.txt:550
10108
msgid "Supported generic values are:"
10109
msgstr ""
10110
10111
#: en/help_topics/configuration.txt:552
10112
msgid ""
10113
":default: See above.\n"
10114
":editor: Use your editor to compose the merge request. This also uses\n"
10115
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10116
" smtp_username and smtp_password.\n"
10117
":mapi: Use your preferred e-mail client on Windows.\n"
10118
":xdg-email: Use xdg-email to run your preferred mail program"
10119
msgstr ""
10120
10121
#: en/help_topics/configuration.txt:559
10122
msgid ""
10123
"repository.fdatasync\n"
10124
"~~~~~~~~~~~~~~~~~~~~"
10125
msgstr ""
10126
10127
#: en/help_topics/configuration.txt:562
10128
msgid ""
10129
"If true (default), repository changes are flushed through the OS buffers\n"
10130
"to physical disk. This is somewhat slower, but means data should not be\n"
10131
"lost if the machine crashes. See also dirstate.fdatasync."
10132
msgstr ""
10133
10134
#: en/help_topics/configuration.txt:566
10135
msgid ""
10136
"submit_branch\n"
10137
"~~~~~~~~~~~~~"
10138
msgstr ""
10139
10140
#: en/help_topics/configuration.txt:569
10141
msgid ""
10142
"The branch you intend to submit your current work to. This is "
10143
"automatically\n"
10144
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10145
"This\n"
10146
"should usually be set on a per-branch or per-location basis."
10147
msgstr ""
10148
10149
#: en/help_topics/configuration.txt:573
10150
msgid ""
10151
"public_branch\n"
10152
"~~~~~~~~~~~~~"
10153
msgstr ""
10154
10155
#: en/help_topics/configuration.txt:576
10156
msgid ""
10157
"A publically-accessible version of this branch (implying that this version "
10158
"is\n"
10159
"not publically-accessible). Used (and set) by ``bzr send``."
10160
msgstr ""
10161
10162
#: en/help_topics/configuration.txt:579
10163
msgid ""
10164
"suppress_warnings\n"
10165
"~~~~~~~~~~~~~~~~~"
10166
msgstr ""
10167
10168
#: en/help_topics/configuration.txt:582
10169
msgid ""
10170
"A list of strings, each string represent a warning that can be emitted by\n"
10171
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10172
msgstr ""
10173
10174
#: en/help_topics/configuration.txt:585
10175
msgid "Valid values:"
10176
msgstr ""
10177
10178
#: en/help_topics/configuration.txt:587
10179
msgid ""
10180
"* ``format_deprecation``:\n"
10181
" whether the format deprecation warning is shown on repositories that "
10182
"are\n"
10183
" using deprecated formats."
10184
msgstr ""
10185
10186
#: en/help_topics/configuration.txt:591
10187
msgid ""
10188
"default_format\n"
10189
"~~~~~~~~~~~~~~"
10190
msgstr ""
10191
10192
#: en/help_topics/configuration.txt:594
10193
msgid ""
10194
"A format name for the default format used when creating branches. See "
10195
"``bzr\n"
10196
"help formats`` for possible values."
10197
msgstr ""
10198
10199
#: en/help_topics/configuration.txt:597
10200
msgid ""
10201
"\n"
10202
"Unicode options\n"
10203
"---------------"
10204
msgstr ""
10205
10206
#: en/help_topics/configuration.txt:601
10207
msgid ""
10208
"output_encoding\n"
10209
"~~~~~~~~~~~~~~~"
10210
msgstr ""
10211
10212
#: en/help_topics/configuration.txt:604
10213
msgid ""
10214
"A Python unicode encoding name for text output from bzr, such as log\n"
10215
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10216
"is the terminal encoding prefered by the operating system."
10217
msgstr ""
10218
10219
#: en/help_topics/configuration.txt:608
10220
msgid ""
10221
"\n"
10222
"Branch type specific options\n"
10223
"----------------------------"
10224
msgstr ""
10225
10226
#: en/help_topics/configuration.txt:612
10227
msgid ""
10228
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10229
"later format. They\n"
10230
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10231
"manually set in ``locations.conf`` or ``bazaar.conf``."
10232
msgstr ""
10233
10234
#: en/help_topics/configuration.txt:617
10235
msgid ""
10236
"append_revisions_only\n"
10237
"~~~~~~~~~~~~~~~~~~~~~"
10238
msgstr ""
10239
10240
#: en/help_topics/configuration.txt:620
10241
msgid ""
10242
"If set to \"True\" then revisions can only be appended to the log, not\n"
10243
"removed. A branch with this setting enabled can only pull from another\n"
10244
"branch if the other branch's log is a longer version of its own. This is\n"
10245
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10246
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10247
"compatibility with previous bzr versions (older than 2.2)."
10248
msgstr ""
10249
10250
#: en/help_topics/configuration.txt:627
10251
msgid ""
10252
"parent_location\n"
10253
"~~~~~~~~~~~~~~~"
10254
msgstr ""
10255
10256
#: en/help_topics/configuration.txt:630
10257
msgid ""
10258
"If present, the location of the default branch for pull or merge. This "
10259
"option\n"
10260
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10261
"--remember``."
10262
msgstr ""
10263
10264
#: en/help_topics/configuration.txt:634
10265
msgid ""
10266
"push_location\n"
10267
"~~~~~~~~~~~~~"
10268
msgstr ""
10269
10270
#: en/help_topics/configuration.txt:637
10271
msgid ""
10272
"If present, the location of the default branch for push. This option\n"
10273
"is normally set by the first ``push`` or ``push --remember``."
10274
msgstr ""
10275
10276
#: en/help_topics/configuration.txt:640
10277
msgid ""
10278
"push_strict\n"
10279
"~~~~~~~~~~~"
10280
msgstr ""
10281
10282
#: en/help_topics/configuration.txt:643
10283
msgid ""
10284
"If present, defines the ``--strict`` option default value for checking\n"
10285
"uncommitted changes before pushing."
10286
msgstr ""
10287
10288
#: en/help_topics/configuration.txt:646
10289
msgid ""
10290
"dpush_strict\n"
10291
"~~~~~~~~~~~~"
10292
msgstr ""
10293
10294
#: en/help_topics/configuration.txt:649
10295
msgid ""
10296
"If present, defines the ``--strict`` option default value for checking\n"
10297
"uncommitted changes before pushing into a different VCS without any\n"
10298
"custom bzr metadata."
10299
msgstr ""
10300
10301
#: en/help_topics/configuration.txt:653
10302
msgid ""
10303
"bound_location\n"
10304
"~~~~~~~~~~~~~~"
10305
msgstr ""
10306
10307
#: en/help_topics/configuration.txt:656
10308
msgid ""
10309
"The location that commits should go to when acting as a checkout.\n"
10310
"This option is normally set by ``bind``."
10311
msgstr ""
10312
10313
#: en/help_topics/configuration.txt:659
10314
msgid ""
10315
"bound\n"
10316
"~~~~~"
10317
msgstr ""
10318
10319
#: en/help_topics/configuration.txt:662
10320
msgid ""
10321
"If set to \"True\", the branch should act as a checkout, and push each "
10322
"commit to\n"
10323
"the bound_location. This option is normally set by ``bind``/``unbind``."
10324
msgstr ""
10325
10326
#: en/help_topics/configuration.txt:665
10327
msgid ""
10328
"send_strict\n"
10329
"~~~~~~~~~~~"
10330
msgstr ""
10331
10332
#: en/help_topics/configuration.txt:668
10333
msgid ""
10334
"If present, defines the ``--strict`` option default value for checking\n"
10335
"uncommitted changes before sending a merge directive."
10336
msgstr ""
10337
10338
#: en/help_topics/configuration.txt:671
10339
msgid ""
10340
"add.maximum_file_size\n"
10341
"~~~~~~~~~~~~~~~~~~~~~"
10342
msgstr ""
10343
10344
#: en/help_topics/configuration.txt:674
10345
msgid ""
10346
"Defines the maximum file size the command line \"add\" operation will allow\n"
10347
"in recursive mode, with files larger than this value being skipped. You may "
10348
"\n"
10349
"specify this value as an integer (in which case it is interpreted as bytes), "
10350
"\n"
10351
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10352
"0 \n"
10353
"will disable skipping."
10354
msgstr ""
10355
10356
#: en/help_topics/configuration.txt:680
10357
msgid ""
10358
"External Merge Tools\n"
10359
"--------------------"
10360
msgstr ""
10361
10362
#: en/help_topics/configuration.txt:683
10363
msgid ""
10364
"bzr.mergetool.<name>\n"
10365
"~~~~~~~~~~~~~~~~~~~~"
10366
msgstr ""
10367
10368
#: en/help_topics/configuration.txt:686
10369
msgid ""
10370
"Defines an external merge tool called <name> with the given command-line.\n"
10371
"Arguments containing spaces should be quoted using single or double quotes. "
10372
"The\n"
10373
"executable may omit its path if it can be found on the PATH."
10374
msgstr ""
10375
10376
#: en/help_topics/configuration.txt:690
10377
msgid ""
10378
"The following markers can be used in the command-line to substitute "
10379
"filenames\n"
10380
"involved in the merge conflict::"
10381
msgstr ""
10382
10383
#: en/help_topics/configuration.txt:693
10384
msgid ""
10385
" {base} file.BASE\n"
10386
" {this} file.THIS\n"
10387
" {other} file.OTHER\n"
10388
" {result} output file\n"
10389
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10390
"merge\n"
10391
" succeeds."
10392
msgstr ""
10393
10394
#: en/help_topics/configuration.txt:702
10395
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10396
msgstr ""
10397
10398
#: en/help_topics/configuration.txt:704
10399
msgid ""
10400
"bzr.default_mergetool\n"
10401
"~~~~~~~~~~~~~~~~~~~~~"
10402
msgstr ""
10403
10404
#: en/help_topics/configuration.txt:707
10405
msgid ""
10406
"Specifies which external merge tool (as defined above) should be selected "
10407
"by\n"
10408
"default in tools such as ``bzr qconflicts``."
10409
msgstr ""
10410
10411
#: en/help_topics/configuration.txt:712
10412
msgid " bzr.default_mergetool = kdiff3\n"
10413
msgstr ""
10414
10415
#: en/help_topics/conflict-types.txt:1
10416
msgid ""
10417
"Conflict Types\n"
10418
"=============="
10419
msgstr ""
10420
10421
#: en/help_topics/conflict-types.txt:4
10422
msgid ""
10423
"Some operations, like merge, revert and pull, modify the contents of your\n"
10424
"working tree. These modifications are programmatically generated, and so "
10425
"they\n"
10426
"may conflict with the current state of your working tree. "
10427
msgstr ""
10428
10429
#: en/help_topics/conflict-types.txt:8
10430
msgid ""
10431
"When conflicts are present in your working tree (as shown by ``bzr\n"
10432
"conflicts``), you should resolve them and then inform bzr that the "
10433
"conflicts\n"
10434
"have been resolved."
10435
msgstr ""
10436
10437
#: en/help_topics/conflict-types.txt:12
10438
msgid ""
10439
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10440
"should resolve them is not the one responsible for their occurrence, as is "
10441
"the\n"
10442
"case when merging other people's work or because some conflicts are "
10443
"presented\n"
10444
"in a way that is not easy to understand."
10445
msgstr ""
10446
10447
#: en/help_topics/conflict-types.txt:17
10448
msgid ""
10449
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10450
"conflict if and only if there's an actual conceptual conflict in the source\n"
10451
"tree. Because Bazaar doesn't understand the real meaning of the files "
10452
"being\n"
10453
"versioned, it can, when faced with ambiguities, fall short in either "
10454
"direction\n"
10455
"trying to resolve the conflict itself. Many kinds of changes can be "
10456
"combined\n"
10457
"programmatically, but sometimes only a human can determine the right thing "
10458
"to\n"
10459
"do."
10460
msgstr ""
10461
10462
#: en/help_topics/conflict-types.txt:25
10463
msgid ""
10464
"When Bazaar generates a conflict, it adds information into the working tree "
10465
"to\n"
10466
"present the conflicting versions, and it's up to you to find the correct\n"
10467
"resolution."
10468
msgstr ""
10469
10470
#: en/help_topics/conflict-types.txt:29
10471
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10472
msgstr ""
10473
10474
#: en/help_topics/conflict-types.txt:31
10475
msgid ""
10476
"1. Modify the working tree content so that the conflicted item is now in "
10477
"the\n"
10478
" state you want to keep, then"
10479
msgstr ""
10480
10481
#: en/help_topics/conflict-types.txt:34
10482
msgid ""
10483
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10484
" remaining generated information (``bzr resolve <item>``)."
10485
msgstr ""
10486
10487
#: en/help_topics/conflict-types.txt:37
10488
msgid ""
10489
"For most conflict types, there are some obvious ways to modify the working\n"
10490
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10491
"itself already made a choice, when possible."
10492
msgstr ""
10493
10494
#: en/help_topics/conflict-types.txt:41
10495
msgid ""
10496
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10497
"different ways to resolve the conflict."
10498
msgstr ""
10499
10500
#: en/help_topics/conflict-types.txt:44
10501
msgid ""
10502
"Each type of conflict is explained below, and the action which must be done "
10503
"to\n"
10504
"resolve the conflict is outlined."
10505
msgstr ""
10506
10507
#: en/help_topics/conflict-types.txt:47
10508
msgid ""
10509
"Various actions are available depending on the kind of conflict, for some "
10510
"of\n"
10511
"these actions, Bazaar can provide some help. In the end you should at least\n"
10512
"inform Bazaar that you're done with the conflict with::"
10513
msgstr ""
10514
10515
#: en/help_topics/conflict-types.txt:51
10516
msgid " ``bzr resolve FILE --action=done'"
10517
msgstr ""
10518
10519
#: en/help_topics/conflict-types.txt:53
10520
msgid ""
10521
"Note that this is the default action when a single file is involved so you "
10522
"can\n"
10523
"simply use::"
10524
msgstr ""
10525
10526
#: en/help_topics/conflict-types.txt:56
10527
msgid " ``bzr resolve FILE``"
10528
msgstr ""
10529
10530
#: en/help_topics/conflict-types.txt:58
10531
msgid "See ``bzr help resolve`` for more details."
10532
msgstr ""
10533
10534
#: en/help_topics/conflict-types.txt:60
10535
msgid ""
10536
"Text conflicts\n"
10537
"--------------"
10538
msgstr ""
10539
10540
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10541
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10542
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10543
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10544
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10545
msgid "Typical message::"
10546
msgstr ""
10547
10548
#: en/help_topics/conflict-types.txt:65
10549
msgid " Text conflict in FILE"
10550
msgstr ""
10551
10552
#: en/help_topics/conflict-types.txt:67
10553
msgid ""
10554
"These are produced when a text merge cannot completely reconcile two sets "
10555
"of\n"
10556
"text changes. Bazaar will emit files for each version with the extensions\n"
10557
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10558
"tree,\n"
10559
"i.e. the tree that you are merging changes into. OTHER is the version that "
10560
"you\n"
10561
"are merging into the target. BASE is an older version that is used as a "
10562
"basis\n"
10563
"for comparison."
10564
msgstr ""
10565
10566
#: en/help_topics/conflict-types.txt:74
10567
msgid ""
10568
"In the main copy of the file, Bazaar will include all the changes that it\n"
10569
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10570
"\"herringbone\" markers like ``<<<<<<<``."
10571
msgstr ""
10572
10573
#: en/help_topics/conflict-types.txt:78
10574
msgid ""
10575
"Say the initial text is \"The project leader released it.\", and THIS "
10576
"modifies it\n"
10577
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10578
"leader\n"
10579
"released Bazaar.\" A conflict would look like this::"
10580
msgstr ""
10581
10582
#: en/help_topics/conflict-types.txt:82
10583
msgid ""
10584
" <<<<<<< TREE\n"
10585
" Martin Pool released it.\n"
10586
" =======\n"
10587
" The project leader released Bazaar.\n"
10588
" >>>>>>> MERGE-SOURCE"
10589
msgstr ""
10590
10591
#: en/help_topics/conflict-types.txt:88
10592
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10593
msgstr ""
10594
10595
#: en/help_topics/conflict-types.txt:90
10596
msgid ""
10597
"You can handle text conflicts either by editing the main copy of the file,\n"
10598
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10599
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10600
"set of changes over the other (but see below when you encounter these\n"
10601
"cases). More often, the two sets of changes must be intelligently combined."
10602
msgstr ""
10603
10604
#: en/help_topics/conflict-types.txt:96
10605
msgid ""
10606
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10607
"you are done editing, the file should look like it never had a conflict, and "
10608
"be\n"
10609
"ready to commit."
10610
msgstr ""
10611
10612
#: en/help_topics/conflict-types.txt:100
10613
msgid ""
10614
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10615
"Bazaar will auto-detect which conflicts you have resolved."
10616
msgstr ""
10617
10618
#: en/help_topics/conflict-types.txt:103
10619
msgid ""
10620
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10621
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10622
"working tree."
10623
msgstr ""
10624
10625
#: en/help_topics/conflict-types.txt:107
10626
msgid ""
10627
"\n"
10628
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10629
"resolve`` with one of the following actions:"
10630
msgstr ""
10631
10632
#: en/help_topics/conflict-types.txt:111
10633
msgid ""
10634
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10635
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10636
msgstr ""
10637
10638
#: en/help_topics/conflict-types.txt:114
10639
msgid ""
10640
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10641
"modifications will be taken into account."
10642
msgstr ""
10643
10644
#: en/help_topics/conflict-types.txt:117
10645
msgid ""
10646
"Content conflicts\n"
10647
"-----------------"
10648
msgstr ""
10649
10650
#: en/help_topics/conflict-types.txt:122
10651
msgid " Contents conflict in FILE"
10652
msgstr ""
10653
10654
#: en/help_topics/conflict-types.txt:124
10655
msgid ""
10656
"This conflict happens when there are conflicting changes in the working "
10657
"tree\n"
10658
"and the merge source, but the conflicted items are not text files. They "
10659
"may\n"
10660
"be binary files, or symlinks, or directories. It can even happen with "
10661
"files\n"
10662
"that are deleted on one side, and modified on the other."
10663
msgstr ""
10664
10665
#: en/help_topics/conflict-types.txt:129
10666
msgid ""
10667
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10668
"be\n"
10669
"regular files, symlinks or directories). But it will not include a \"main "
10670
"copy\"\n"
10671
"of the file with herringbone conflict markers. It will appear that the "
10672
"\"main\n"
10673
"copy\" has been renamed to THIS or OTHER."
10674
msgstr ""
10675
10676
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10677
msgid ""
10678
"To resolve that kind of conflict, you should rebuild FILE from either "
10679
"version\n"
10680
"or a combination of both."
10681
msgstr ""
10682
10683
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10684
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10685
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10686
#: en/help_topics/conflict-types.txt:361
10687
msgid "``bzr resolve`` recognizes the following actions:"
10688
msgstr ""
10689
10690
#: en/help_topics/conflict-types.txt:139
10691
msgid ""
10692
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10693
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10694
"* ``--action=done`` will just mark the conflict as resolved."
10695
msgstr ""
10696
10697
#: en/help_topics/conflict-types.txt:143
10698
msgid ""
10699
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10700
"and\n"
10701
"``.OTHER`` files if they are still present in the working tree."
10702
msgstr ""
10703
10704
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10705
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10706
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10707
#: en/help_topics/conflict-types.txt:369
10708
msgid ""
10709
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10710
msgstr ""
10711
10712
#: en/help_topics/conflict-types.txt:148
10713
msgid ""
10714
"Tag conflicts\n"
10715
"-------------"
10716
msgstr ""
10717
10718
#: en/help_topics/conflict-types.txt:153
10719
msgid ""
10720
" Conflicting tags:\n"
10721
" version-0.1"
10722
msgstr ""
10723
10724
#: en/help_topics/conflict-types.txt:156
10725
msgid ""
10726
"When pulling from or pushing to another branch, Bazaar informs you about "
10727
"tags\n"
10728
"that conflict between the two branches; that is the same tag points to two\n"
10729
"different revisions. You need not resolve these conflicts, but subsequent\n"
10730
"uses of pull or push will result in the same message."
10731
msgstr ""
10732
10733
#: en/help_topics/conflict-types.txt:161
10734
msgid ""
10735
"To resolve the conflict, you must apply the correct tags to either the "
10736
"target\n"
10737
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10738
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10739
"target branch's tags match the source branch, then in the target branch do\n"
10740
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10741
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10742
"source\n"
10743
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10744
"favor of the target branch, you need to similarly use ``tag --force`` in "
10745
"the\n"
10746
"source branch. (Note that pulling or pushing using --overwrite will "
10747
"overwrite\n"
10748
"all tags as well.)"
10749
msgstr ""
10750
10751
#: en/help_topics/conflict-types.txt:172
10752
msgid ""
10753
"Duplicate paths\n"
10754
"---------------"
10755
msgstr ""
10756
10757
#: en/help_topics/conflict-types.txt:177
10758
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10759
msgstr ""
10760
10761
#: en/help_topics/conflict-types.txt:179
10762
msgid ""
10763
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10764
"already been used. The existing file will be renamed to \"FILE.moved\". "
10765
msgstr ""
10766
10767
#: en/help_topics/conflict-types.txt:187
10768
msgid ""
10769
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10770
"FILE``,\n"
10771
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10772
"* ``--action=done`` will just mark the conflict as resolved."
10773
msgstr ""
10774
10775
#: en/help_topics/conflict-types.txt:191
10776
msgid ""
10777
"Note that you must get rid of FILE.moved before using ``--action=done``."
10778
msgstr ""
10779
10780
#: en/help_topics/conflict-types.txt:195
10781
msgid ""
10782
"Unversioned parent\n"
10783
"------------------"
10784
msgstr ""
10785
10786
#: en/help_topics/conflict-types.txt:200
10787
msgid ""
10788
" Conflict because FILE is not versioned, but has versioned children."
10789
msgstr ""
10790
10791
#: en/help_topics/conflict-types.txt:202
10792
msgid ""
10793
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10794
"not\n"
10795
"versioned. This happens when the directory has been deleted in the target,\n"
10796
"but has a new child in the source, or vice versa. In this situation, "
10797
"Bazaar\n"
10798
"will version the parent directory as well. Resolving this issue depends\n"
10799
"very much on the particular scenario. You may wish to rename or delete "
10800
"either\n"
10801
"the file or the directory. When you are satisfied, you can run \"bzr "
10802
"resolve\n"
10803
"FILE\" to mark the conflict as resolved."
10804
msgstr ""
10805
10806
#: en/help_topics/conflict-types.txt:210
10807
msgid ""
10808
"Missing parent\n"
10809
"--------------"
10810
msgstr ""
10811
10812
#: en/help_topics/conflict-types.txt:215
10813
msgid " Conflict adding files to FILE. Created directory."
10814
msgstr ""
10815
10816
#: en/help_topics/conflict-types.txt:217
10817
msgid ""
10818
"This happens when a directory has been deleted in the target, but has new\n"
10819
"children in the source. This is similar to the \"unversioned parent\" "
10820
"conflict,\n"
10821
"except that the parent directory does not *exist*, instead of just being\n"
10822
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10823
"Resolving this issue depends very much on the particular scenario."
10824
msgstr ""
10825
10826
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10827
msgid ""
10828
"To resolve that kind of conflict, you should either remove or rename the\n"
10829
"children or the directory or a combination of both."
10830
msgstr ""
10831
10832
#: en/help_topics/conflict-types.txt:228
10833
msgid ""
10834
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10835
" children,\n"
10836
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10837
"children\n"
10838
" and restoring the directory,\n"
10839
"* ``--action=done`` will just mark the conflict as resolved."
10840
msgstr ""
10841
10842
#: en/help_topics/conflict-types.txt:236
10843
msgid ""
10844
"Deleting parent\n"
10845
"---------------"
10846
msgstr ""
10847
10848
#: en/help_topics/conflict-types.txt:241
10849
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10850
msgstr ""
10851
10852
#: en/help_topics/conflict-types.txt:243
10853
msgid ""
10854
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10855
"source, but has new children in the target (either because a directory\n"
10856
"deletion is merged or because the merge introduce new children). Bazaar\n"
10857
"will retain the directory. Resolving this issue depends very much on the\n"
10858
"particular scenario."
10859
msgstr ""
10860
10861
#: en/help_topics/conflict-types.txt:254
10862
msgid ""
10863
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10864
"directory,"
10865
msgstr ""
10866
10867
#: en/help_topics/conflict-types.txt:256
10868
msgid ""
10869
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10870
" children,"
10871
msgstr ""
10872
10873
#: en/help_topics/conflict-types.txt:259
10874
msgid "* ``--action=done`` will just mark the conflict as resolved."
10875
msgstr ""
10876
10877
#: en/help_topics/conflict-types.txt:261
10878
msgid ""
10879
"Note that when merging a directory deletion, if unversioned files are\n"
10880
"present, they become potential orphans has they don't have a directory\n"
10881
"parent anymore."
10882
msgstr ""
10883
10884
#: en/help_topics/conflict-types.txt:265
10885
msgid ""
10886
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10887
"setting the ``bzr.transform.orphan_policy`` configuration option."
10888
msgstr ""
10889
10890
#: en/help_topics/conflict-types.txt:268
10891
msgid "There are two possible values for this option:"
10892
msgstr ""
10893
10894
#: en/help_topics/conflict-types.txt:270
10895
msgid ""
10896
"* ``conflict`` (the default): will leave the orphans in place and\n"
10897
" generate a conflicts,"
10898
msgstr ""
10899
10900
#: en/help_topics/conflict-types.txt:273
10901
msgid ""
10902
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10903
"root\n"
10904
" of the working tree with names like ``<file>.~#~``."
10905
msgstr ""
10906
10907
#: en/help_topics/conflict-types.txt:278
10908
msgid ""
10909
"Path conflict\n"
10910
"-------------"
10911
msgstr ""
10912
10913
#: en/help_topics/conflict-types.txt:283
10914
msgid " Path conflict: PATH1 / PATH2"
10915
msgstr ""
10916
10917
#: en/help_topics/conflict-types.txt:285
10918
msgid ""
10919
"This happens when the source and target have each modified the name or "
10920
"parent\n"
10921
"directory of a file. Bazaar will use the path elements from the source."
10922
msgstr ""
10923
10924
#: en/help_topics/conflict-types.txt:288
10925
msgid ""
10926
"To resolve that kind of conflict, you just have to decide what name should "
10927
"be\n"
10928
"retained for the file involved."
10929
msgstr ""
10930
10931
#: en/help_topics/conflict-types.txt:293
10932
msgid ""
10933
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10934
" issuing ``bzr mv PATH2 PATH1``,\n"
10935
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10936
"``PATH2``,\n"
10937
"* ``--action=done`` will just mark the conflict as resolved."
10938
msgstr ""
10939
10940
#: en/help_topics/conflict-types.txt:300
10941
msgid ""
10942
"Parent loop\n"
10943
"-----------"
10944
msgstr ""
10945
10946
#: en/help_topics/conflict-types.txt:305
10947
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10948
msgstr ""
10949
10950
#: en/help_topics/conflict-types.txt:307
10951
msgid ""
10952
"This happens when the source and the target have each moved directories, so\n"
10953
"that, if the change could be applied, a directory would be contained by "
10954
"itself.\n"
10955
"For example::"
10956
msgstr ""
10957
10958
#: en/help_topics/conflict-types.txt:311
10959
msgid ""
10960
" $ bzr init\n"
10961
" $ bzr mkdir white\n"
10962
" $ bzr mkdir black\n"
10963
" $ bzr commit -m \"BASE\"\n"
10964
" $ bzr branch . ../other\n"
10965
" $ bzr mv white black\n"
10966
" $ bzr commit -m \"THIS\"\n"
10967
" $ bzr mv ../other/black ../other/white\n"
10968
" $ bzr commit ../other -m \"OTHER\"\n"
10969
" $ bzr merge ../other"
10970
msgstr ""
10971
10972
#: en/help_topics/conflict-types.txt:322
10973
msgid ""
10974
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
10975
"``black``. To resolve that kind of conflict, you just have to decide what\n"
10976
"name should be retained for the directories involved."
10977
msgstr ""
10978
10979
#: en/help_topics/conflict-types.txt:328
10980
msgid ""
10981
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
10982
"\n"
10983
" in ``black``,\n"
10984
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
10985
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
10986
"* ``--action=done`` will just mark the conflict as resolved."
10987
msgstr ""
10988
10989
#: en/help_topics/conflict-types.txt:336
10990
msgid ""
10991
"Non-directory parent\n"
10992
"--------------------"
10993
msgstr ""
10994
10995
#: en/help_topics/conflict-types.txt:341
10996
msgid ""
10997
" Conflict: foo.new is not a directory, but has files in it.\n"
10998
" Created directory."
10999
msgstr ""
11000
11001
#: en/help_topics/conflict-types.txt:344
11002
msgid ""
11003
"This happens when one side has added files to a directory, and the other "
11004
"side\n"
11005
"has changed the directory into a file or symlink. For example::"
11006
msgstr ""
11007
11008
#: en/help_topics/conflict-types.txt:347
11009
msgid ""
11010
" $ bzr init\n"
11011
" $ bzr mkdir foo\n"
11012
" $ bzr commit -m \"BASE\"\n"
11013
" $ bzr branch . ../other\n"
11014
" $ rmdir foo\n"
11015
" $ touch foo\n"
11016
" $ bzr commit -m \"THIS\"\n"
11017
" $ bzr mkdir ../other/foo/bar\n"
11018
" $ bzr commit ../other -m \"OTHER\"\n"
11019
" $ bzr merge ../other"
11020
msgstr ""
11021
11022
#: en/help_topics/conflict-types.txt:358
11023
msgid ""
11024
"To resolve that kind of conflict, you have to decide what name should be\n"
11025
"retained for the file, directory or symlink involved."
11026
msgstr ""
11027
11028
#: en/help_topics/conflict-types.txt:363
11029
msgid ""
11030
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11031
" ``bzr add foo``,\n"
11032
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11033
" ``bzr mv foo.new foo``,\n"
11034
"* ``--action=done`` will just mark the conflict as resolved."
11035
msgstr ""
11036
11037
#: en/help_topics/conflict-types.txt:371
11038
msgid ""
11039
"MalformedTransform\n"
11040
"------------------"
11041
msgstr ""
11042
11043
#: en/help_topics/conflict-types.txt:374
11044
msgid ""
11045
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11046
"exception. This means that Bazaar encountered a filesystem conflict that it "
11047
"was\n"
11048
"unable to resolve. This usually indicates a bug. Please let us know if "
11049
"you\n"
11050
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11051
msgstr ""
11052
11053
#: en/help_topics/content-filters.txt:1
11054
msgid ""
11055
"Content Filters\n"
11056
"==============="
11057
msgstr ""
11058
11059
#: en/help_topics/content-filters.txt:4
11060
msgid ""
11061
"Content formats\n"
11062
"---------------"
11063
msgstr ""
11064
11065
#: en/help_topics/content-filters.txt:7
11066
msgid ""
11067
"Bazaar's content filtering allows you to store files in a different\n"
11068
"format from the copy in your working tree. This lets you, or your\n"
11069
"co-developers, use Windows development tools that expect CRLF files\n"
11070
"on projects that use other line-ending conventions. Among other things,\n"
11071
"content filters also let Unix developers more easily work on projects\n"
11072
"using Windows line-ending conventions, keyword expansion/compression,\n"
11073
"and trailing spaces on lines in text files to be implicitly stripped\n"
11074
"when committed."
11075
msgstr ""
11076
11077
#: en/help_topics/content-filters.txt:16
11078
msgid "To generalize, there are two content formats supported by Bazaar:"
11079
msgstr ""
11080
11081
#: en/help_topics/content-filters.txt:18
11082
msgid ""
11083
"* a canonical format - how files are stored internally\n"
11084
"* a convenience format - how files are created in a working tree."
11085
msgstr ""
11086
11087
#: en/help_topics/content-filters.txt:21
11088
msgid ""
11089
"\n"
11090
"Format conversion\n"
11091
"-----------------"
11092
msgstr ""
11093
11094
#: en/help_topics/content-filters.txt:25
11095
msgid ""
11096
"The conversion between these formats is done by content filters.\n"
11097
"A content filter has two parts:"
11098
msgstr ""
11099
11100
#: en/help_topics/content-filters.txt:28
11101
msgid ""
11102
"* a read converter - converts from convenience to canonical format\n"
11103
"* a write converter - converts from canonical to convenience format."
11104
msgstr ""
11105
11106
#: en/help_topics/content-filters.txt:31
11107
msgid ""
11108
"Many of these converters will provide *round-trip* conversion,\n"
11109
"i.e. applying the read converter followed by the write converter\n"
11110
"gives back the original content. However, others may provide an\n"
11111
"asymmetric conversion. For example, a read converter might strip\n"
11112
"trailing whitespace off lines in source code while the matching\n"
11113
"write converter might pass content through unchanged."
11114
msgstr ""
11115
11116
#: en/help_topics/content-filters.txt:38
11117
msgid ""
11118
"\n"
11119
"Enabling content filters\n"
11120
"------------------------"
11121
msgstr ""
11122
11123
#: en/help_topics/content-filters.txt:42
11124
msgid ""
11125
"Content filters are typically provided by plugins, so the first step\n"
11126
"in using them is to install the relevant plugins and read their\n"
11127
"documentation. Some plugins may be very specific about which files\n"
11128
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11129
"In other cases, the plugin may leave it in the user's hands to\n"
11130
"define which files are to be filtered. This is typically done\n"
11131
"using rule-based preferences. See ``bzr help rules`` for general\n"
11132
"information about defining these."
11133
msgstr ""
11134
11135
#: en/help_topics/content-filters.txt:51
11136
msgid ""
11137
"\n"
11138
"Impact on commands\n"
11139
"------------------"
11140
msgstr ""
11141
11142
#: en/help_topics/content-filters.txt:55
11143
msgid ""
11144
"Read converters are only applied to commands that read content from\n"
11145
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11146
"will apply read converters to files in the working tree, then compare\n"
11147
"the results to the content last committed."
11148
msgstr ""
11149
11150
#: en/help_topics/content-filters.txt:60
11151
msgid ""
11152
"Write converters are only applied by commands that **create files in a\n"
11153
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11154
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11155
"respectively."
11156
msgstr ""
11157
11158
#: en/help_topics/content-filters.txt:65
11159
msgid ""
11160
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11161
"comitting files. If this makes sense for a given plugin providing\n"
11162
"a content filter, the plugin can usually achieve this effect by using a\n"
11163
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11164
"for more information on hooks."
11165
msgstr ""
11166
11167
#: en/help_topics/content-filters.txt:71
11168
msgid ""
11169
"\n"
11170
"Refreshing your working tree\n"
11171
"----------------------------"
11172
msgstr ""
11173
11174
#: en/help_topics/content-filters.txt:75
11175
msgid ""
11176
"For performance reasons, Bazaar caches the timestamps of files in\n"
11177
"a working tree, and assumes files are unchanged if their timestamps\n"
11178
"match the cached values. As a consequence, there are times when\n"
11179
"you may need to explicitly ask for content filtering to be reapplied\n"
11180
"in one or both directions, e.g. after installing or reconfiguring\n"
11181
"plugins providing it."
11182
msgstr ""
11183
11184
#: en/help_topics/content-filters.txt:82
11185
msgid "Here are some general guidelines for doing this:"
11186
msgstr ""
11187
11188
#: en/help_topics/content-filters.txt:84
11189
msgid ""
11190
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11191
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11192
" relevant read converters and compare the end result with the\n"
11193
" canonical format."
11194
msgstr ""
11195
11196
#: en/help_topics/content-filters.txt:89
11197
msgid ""
11198
" * To reapply write converters, ensure there are no local changes,\n"
11199
" delete the relevant files and run ``bzr revert`` on those files."
11200
msgstr ""
11201
11202
#: en/help_topics/content-filters.txt:92
11203
msgid ""
11204
"Note: In the future, it is likely that additional options will be added\n"
11205
"to commands to make this refreshing process faster and safer.\n"
11206
msgstr ""
11207
11208
#: en/help_topics/current-formats.txt:1
11209
msgid "Current Storage Formats"
11210
msgstr ""
11211
11212
#: en/help_topics/current-formats.txt:3
11213
msgid ""
11214
":2a:\n"
11215
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11216
" compress storage. Provides rich roots which are a one-way\n"
11217
" transition."
11218
msgstr ""
11219
11220
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11221
msgid ""
11222
"\n"
11223
"See :doc:`formats-help` for more about storage formats."
11224
msgstr ""
11225
11226
#: en/help_topics/debug-flags.txt:1
11227
msgid ""
11228
"Debug Flags\n"
11229
"==========="
11230
msgstr ""
11231
11232
#: en/help_topics/debug-flags.txt:4
11233
msgid ""
11234
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11235
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11236
msgstr ""
11237
11238
#: en/help_topics/debug-flags.txt:7
11239
msgid ""
11240
"-Dauth Trace authentication sections used.\n"
11241
"-Dbytes Print out how many bytes were transferred\n"
11242
"-Ddirstate Trace dirstate activity (verbose!)\n"
11243
"-Derror Instead of normal error handling, always print a "
11244
"traceback\n"
11245
" on error.\n"
11246
"-Devil Capture call sites that do expensive or badly-scaling\n"
11247
" operations.\n"
11248
"-Dfetch Trace history copying between repositories.\n"
11249
"-Dfilters Emit information for debugging content filtering.\n"
11250
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11251
"fetch.\n"
11252
"-Dgraph Trace graph traversal.\n"
11253
"-Dhashcache Log every time a working file is read to determine its "
11254
"hash.\n"
11255
"-Dhooks Trace hook execution.\n"
11256
"-Dhpss Trace smart protocol requests and responses.\n"
11257
"-Dhpssdetail More hpss details.\n"
11258
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11259
"-Dhttp Trace http connections, requests and responses.\n"
11260
"-Dindex Trace major index operations.\n"
11261
"-Dknit Trace knit operations.\n"
11262
"-Dlock Trace when lockdir locks are taken or released.\n"
11263
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11264
" retrying the request.\n"
11265
"-Dprogress Trace progress bar operations.\n"
11266
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11267
"-Dmerge Emit information for debugging merges.\n"
11268
"-Dno_apport Don't use apport to report crashes.\n"
11269
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11270
"-Dpack Emit information about pack operations.\n"
11271
"-Drelock Emit a message every time a branch or repository object "
11272
"is\n"
11273
" unlocked then relocked the same way.\n"
11274
"-Dsftp Trace SFTP internals.\n"
11275
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11276
"expected\n"
11277
"-Dstream Trace fetch streams.\n"
11278
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11279
"portable\n"
11280
" manner.\n"
11281
"-Dunlock Some errors during unlock are treated as warnings.\n"
11282
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11283
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11284
"appropriate\n"
11285
" for the format, even for non-local fetches.\n"
11286
msgstr ""
11287
11288
#: en/help_topics/diverged-branches.txt:1
11289
msgid ""
11290
"Diverged Branches\n"
11291
"================="
11292
msgstr ""
11293
11294
#: en/help_topics/diverged-branches.txt:4
11295
msgid ""
11296
"When Bazaar tries to push one branch onto another, it requires that the\n"
11297
"destination branch must be ready to receive the source branch. If this "
11298
"isn't\n"
11299
"the case, then we say that the branches have ``diverged``. Branches are\n"
11300
"considered diverged if the destination branch's most recent commit is one "
11301
"that\n"
11302
"has not been merged (directly or indirectly) by the source branch. To "
11303
"recover\n"
11304
"from diverged branches, one must merge the missing revisions into the "
11305
"source\n"
11306
"branch."
11307
msgstr ""
11308
11309
#: en/help_topics/diverged-branches.txt:12
11310
msgid ""
11311
"This situation commonly arises when using a centralized workflow with local\n"
11312
"commits. If someone else has committed new work to the mainline since your\n"
11313
"last pull and you have local commits that have not yet been pushed to the\n"
11314
"mainline, then your local branch and the mainline have diverged."
11315
msgstr ""
11316
11317
#: en/help_topics/diverged-branches.txt:17
11318
msgid ""
11319
"Discovering What Has Diverged\n"
11320
"-----------------------------"
11321
msgstr ""
11322
11323
#: en/help_topics/diverged-branches.txt:20
11324
msgid ""
11325
"The ``bzr missing`` command is used to find out what revisions are in "
11326
"another\n"
11327
"branch that are not present in the current branch, and vice-versa. It shows "
11328
"a\n"
11329
"summary of which extra revisions exist in each branch. If you want to see "
11330
"the\n"
11331
"precise effects of those revisions, you can use ``bzr diff --"
11332
"old=other_branch``\n"
11333
"to show the differences between other_branch and your current branch."
11334
msgstr ""
11335
11336
#: en/help_topics/diverged-branches.txt:26
11337
msgid ""
11338
"A Solution\n"
11339
"----------"
11340
msgstr ""
11341
11342
#: en/help_topics/diverged-branches.txt:29
11343
msgid ""
11344
"The solution is to merge the revisions from the mainline into your local\n"
11345
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11346
"mainline. This merge may result in conflicts if the other developer's "
11347
"changes\n"
11348
"overlap with your changes. These conflicts should be resolved before\n"
11349
"continuing. After any conflicts have been resolved, or even if there were "
11350
"no\n"
11351
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11352
"to your local branch. This requirement gives you an opportunity to test "
11353
"the\n"
11354
"resulting working tree for correctness, since the merged revisions could "
11355
"have\n"
11356
"made arbitrary changes. After testing, you should commit the merge using\n"
11357
"``bzr commit``. This clears up the diverged branches situation. Your "
11358
"local\n"
11359
"branch can now be pushed to the mainline.\n"
11360
msgstr ""
11361
11362
#: en/help_topics/eol.txt:1
11363
msgid ""
11364
"End of Line Conversion\n"
11365
"======================"
11366
msgstr ""
11367
11368
#: en/help_topics/eol.txt:4
11369
msgid ""
11370
"EOL conversion is provided as a content filter where Bazaar internally\n"
11371
"stores a canonical format but outputs a convenience format. See\n"
11372
"``bzr help content-filters`` for general information about using these."
11373
msgstr ""
11374
11375
#: en/help_topics/eol.txt:8
11376
msgid ""
11377
"Note: Content filtering is only supported in recently added formats,\n"
11378
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11379
"in a recent format. (Just setting the format on the repository\n"
11380
"is not enough.) If content filtering does not appear to be working, use\n"
11381
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11382
"or later."
11383
msgstr ""
11384
11385
#: en/help_topics/eol.txt:15
11386
msgid ""
11387
"EOL conversion needs to be enabled for selected file patterns using\n"
11388
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11389
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11390
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11391
"supported in a future verison of Bazaar."
11392
msgstr ""
11393
11394
#: en/help_topics/eol.txt:21
11395
msgid ""
11396
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11397
"(If a value is not set, ``exact`` is the default.)"
11398
msgstr ""
11399
11400
#: en/help_topics/eol.txt:24
11401
msgid ""
11402
" ========== ===================================== ======================\n"
11403
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11404
" ========== ===================================== ======================\n"
11405
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11406
" ---------- ------------------------------------- ----------------------\n"
11407
" ``lf`` ``lf`` ``lf``\n"
11408
" ---------- ------------------------------------- ----------------------\n"
11409
" ``crlf`` ``crlf`` ``lf``\n"
11410
" ---------- ------------------------------------- ----------------------\n"
11411
" ``exact`` No conversion Exactly as in file\n"
11412
" ========== ===================================== ======================"
11413
msgstr ""
11414
11415
#: en/help_topics/eol.txt:36
11416
msgid ""
11417
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11418
"byte is detected in the file."
11419
msgstr ""
11420
11421
#: en/help_topics/eol.txt:39
11422
msgid ""
11423
"For users working on a cross-platform project, here is a suggested rule\n"
11424
"to use as a starting point::"
11425
msgstr ""
11426
11427
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11428
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11429
msgid ""
11430
" [name *]\n"
11431
" eol = native"
11432
msgstr ""
11433
11434
#: en/help_topics/eol.txt:45
11435
msgid ""
11436
"If you have binary files that do not contain a null byte though, be\n"
11437
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11438
"by giving more explicit patterns earlier in the rules file. For example::"
11439
msgstr ""
11440
11441
#: en/help_topics/eol.txt:49
11442
msgid ""
11443
" [name *.png]\n"
11444
" eol = exact"
11445
msgstr ""
11446
11447
#: en/help_topics/eol.txt:55
11448
msgid ""
11449
"If your working tree is on a network drive shared by users on different\n"
11450
"operating systems, you typically want to force certain conventions for\n"
11451
"certain files. In that way, if a file is created with the wrong line\n"
11452
"endings or line endings get mixed during editing, it gets committed\n"
11453
"correctly and gets checked out correctly. For example::"
11454
msgstr ""
11455
11456
#: en/help_topics/eol.txt:61
11457
msgid ""
11458
" [name *.bat]\n"
11459
" eol = crlf"
11460
msgstr ""
11461
11462
#: en/help_topics/eol.txt:64
11463
msgid ""
11464
" [name *.sh]\n"
11465
" eol = lf"
11466
msgstr ""
11467
11468
#: en/help_topics/eol.txt:70
11469
msgid ""
11470
"If you take the care to create files with their required endings, you can\n"
11471
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11472
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11473
"introducing mixed line endings will be corrected during commit for files\n"
11474
"with those settings."
11475
msgstr ""
11476
11477
#: en/help_topics/eol.txt:76
11478
msgid ""
11479
"If you have sample test data that deliberately has text files with mixed\n"
11480
"newline conventions, you can ask for those to be left alone like this::"
11481
msgstr ""
11482
11483
#: en/help_topics/eol.txt:79
11484
msgid ""
11485
" [name test_data/]\n"
11486
" eol = exact"
11487
msgstr ""
11488
11489
#: en/help_topics/eol.txt:85
11490
msgid ""
11491
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11492
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11493
"of content analysis to detect binary files for commands like ``diff``.\n"
11494
"In the future, a ``binary = true`` rule may be added but it is not\n"
11495
"supported yet.)"
11496
msgstr ""
11497
11498
#: en/help_topics/eol.txt:91
11499
msgid ""
11500
"If you have an existing repository with text files already stored using\n"
11501
"Windows newline conventions (``crlf``), then you may want to keep using "
11502
"that\n"
11503
"convention in the repository. Forcing certain files to this convention\n"
11504
"may also help users who do not have rules configured. To do this, set\n"
11505
"``eol`` to one of the values below."
11506
msgstr ""
11507
11508
#: en/help_topics/eol.txt:97
11509
msgid ""
11510
" ============================ ======================== "
11511
"======================\n"
11512
" Value Checkout end-of-lines as Commit end-of-lines "
11513
"as\n"
11514
" ============================ ======================== "
11515
"======================\n"
11516
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11517
" ``lf`` otherwise\n"
11518
" ---------------------------- ------------------------ ----------------------"
11519
"\n"
11520
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11521
" ---------------------------- ------------------------ ----------------------"
11522
"\n"
11523
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11524
" ============================ ======================== ======================"
11525
msgstr ""
11526
11527
#: en/help_topics/eol.txt:108
11528
msgid ""
11529
"For users working on an existing project that uses Windows newline\n"
11530
"conventions in their Bazaar repository, this rule is suggested as a\n"
11531
"starting point::"
11532
msgstr ""
11533
11534
#: en/help_topics/eol.txt:112
11535
msgid ""
11536
" [name *]\n"
11537
" eol = native-with-crlf-in-repo"
11538
msgstr ""
11539
11540
#: en/help_topics/eol.txt:115
11541
msgid ""
11542
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11543
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11544
"``crlf`` and ``exact``."
11545
msgstr ""
11546
11547
#: en/help_topics/eol.txt:119
11548
msgid ""
11549
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11550
"never reject files because a given line ending or mixed line endings\n"
11551
"are found. A precommit hook should be used if you wish to validate\n"
11552
"(and not just convert) content before committing.\n"
11553
msgstr ""
11554
11555
#: en/help_topics/hidden-commands.txt:1
11556
msgid ""
11557
"added List files added in working tree.\n"
11558
"ancestry List all revisions merged into this branch.\n"
11559
"assert-fail Test reporting of assertion failures\n"
11560
"bundle-info Output interesting stats about a bundle\n"
11561
"bundle-revisions Create a merge-directive for submitting changes.\n"
11562
"cat-revision Write out metadata for a revision.\n"
11563
"dump-btree Dump the contents of a btree index file to stdout.\n"
11564
"export-pot Export command helps and error messages in po format.\n"
11565
"file-id Print file_id of a particular file or directory.\n"
11566
"file-path Print path of file_ids to a file or directory.\n"
11567
"find-merge-base Find and print a base revision for merging two "
11568
"branches.\n"
11569
"hooks Show hooks.\n"
11570
"inventory Show inventory of the current working copy or a "
11571
"revision.\n"
11572
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11573
"lookup-revision Lookup the revision-id from a revision-number\n"
11574
"merge-directive Generate a merge directive for auto-merge tools.\n"
11575
"modified List files modified in working tree.\n"
11576
"re-sign Create a digital signature for an existing revision.\n"
11577
"reference list, view and set branch locations for nested trees.\n"
11578
"relpath Show path of a file relative to root\n"
11579
"repair-workingtree Reset the working tree state file.\n"
11580
"revision-history Display the list of revision ids on a branch.\n"
11581
"revision-info Show revision number and revision id for a given "
11582
"revision\n"
11583
" identifier.\n"
11584
"rocks Statement of optimism.\n"
11585
"selftest Run internal test suite.\n"
11586
"shell-complete Show appropriate completions for context.\n"
11587
"test-script Run a shell-like test from a file.\n"
11588
"touching-revisions Return revision-ids which affected a particular file.\n"
11589
"unknowns List unknown files.\n"
11590
"wait-until-signalled Test helper for\n"
11591
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11592
msgstr ""
11593
11594
#: en/help_topics/hooks.txt:1
11595
msgid ""
11596
"\n"
11597
"Hooks\n"
11598
"====="
11599
msgstr ""
11600
11601
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11602
msgid ""
11603
"Introduction\n"
11604
"------------"
11605
msgstr ""
11606
11607
#: en/help_topics/hooks.txt:8
11608
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11609
msgstr ""
11610
11611
#: en/help_topics/hooks.txt:10
11612
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11613
msgstr ""
11614
11615
#: en/help_topics/hooks.txt:12
11616
msgid ""
11617
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11618
msgstr ""
11619
11620
#: en/help_topics/hooks.txt:14
11621
msgid ""
11622
"The class that contains each hook is given before the hooks it supplies. "
11623
"For\n"
11624
"instance, BranchHooks as the class is the hooks class for\n"
11625
"`bzrlib.branch.Branch.hooks`."
11626
msgstr ""
11627
11628
#: en/help_topics/hooks.txt:18
11629
msgid ""
11630
"Each description also indicates whether the hook runs on the client (the\n"
11631
"machine where bzr was invoked) or the server (the machine addressed by\n"
11632
"the branch URL). These may be, but are not necessarily, the same machine."
11633
msgstr ""
11634
11635
#: en/help_topics/hooks.txt:22
11636
msgid ""
11637
"Plugins (including hooks) are run on the server if all of these is true:"
11638
msgstr ""
11639
11640
#: en/help_topics/hooks.txt:24
11641
msgid ""
11642
" * The connection is via a smart server (accessed with a URL starting with\n"
11643
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11644
"\"http://\"\n"
11645
" URL when a smart server is available via HTTP)."
11646
msgstr ""
11647
11648
#: en/help_topics/hooks.txt:28
11649
msgid ""
11650
" * The hook is either server specific or part of general infrastructure "
11651
"rather\n"
11652
" than client specific code (such as commit)."
11653
msgstr ""
11654
11655
#: en/help_topics/hooks.txt:31
11656
msgid ""
11657
"\n"
11658
"BranchHooks\n"
11659
"-----------"
11660
msgstr ""
11661
11662
#: en/help_topics/hooks.txt:35
11663
msgid ""
11664
"automatic_tag_name\n"
11665
"~~~~~~~~~~~~~~~~~~"
11666
msgstr ""
11667
11668
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11669
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11670
msgid "Introduced in: 2.2"
11671
msgstr ""
11672
11673
#: en/help_topics/hooks.txt:40
11674
msgid ""
11675
"Called to determine an automatic tag name for a revision.\n"
11676
"automatic_tag_name is called with (branch, revision_id) and should\n"
11677
"return a tag name or None if no tag name could be determined. The\n"
11678
"first non-None tag name returned will be used."
11679
msgstr ""
11680
11681
#: en/help_topics/hooks.txt:45
11682
msgid ""
11683
"open\n"
11684
"~~~~"
11685
msgstr ""
11686
11687
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11688
#: en/help_topics/hooks.txt:304
11689
msgid "Introduced in: 1.8"
11690
msgstr ""
11691
11692
#: en/help_topics/hooks.txt:50
11693
msgid ""
11694
"Called with the Branch object that has been opened after a branch is\n"
11695
"opened."
11696
msgstr ""
11697
11698
#: en/help_topics/hooks.txt:53
11699
msgid ""
11700
"post_branch_init\n"
11701
"~~~~~~~~~~~~~~~~"
11702
msgstr ""
11703
11704
#: en/help_topics/hooks.txt:58
11705
msgid ""
11706
"Called after new branch initialization completes. post_branch_init is\n"
11707
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11708
"branch and checkout (both heavyweight and lightweight) will all\n"
11709
"trigger this hook."
11710
msgstr ""
11711
11712
#: en/help_topics/hooks.txt:63
11713
msgid ""
11714
"post_change_branch_tip\n"
11715
"~~~~~~~~~~~~~~~~~~~~~~"
11716
msgstr ""
11717
11718
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
11719
msgid "Introduced in: 1.4"
11720
msgstr ""
11721
11722
#: en/help_topics/hooks.txt:68
11723
msgid ""
11724
"Called in bzr client and server after a change to the tip of a branch\n"
11725
"is made. post_change_branch_tip is called with a\n"
11726
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11727
"uncommit will all trigger this hook."
11728
msgstr ""
11729
11730
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11731
msgid ""
11732
"post_commit\n"
11733
"~~~~~~~~~~~"
11734
msgstr ""
11735
11736
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11737
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11738
#: en/help_topics/hooks.txt:145
11739
msgid "Introduced in: 0.15"
11740
msgstr ""
11741
11742
#: en/help_topics/hooks.txt:78
11743
msgid ""
11744
"Called in the bzr client after a commit has completed. post_commit is\n"
11745
"called with (local, master, old_revno, old_revid, new_revno,\n"
11746
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11747
"branch."
11748
msgstr ""
11749
11750
#: en/help_topics/hooks.txt:83
11751
msgid ""
11752
"post_pull\n"
11753
"~~~~~~~~~"
11754
msgstr ""
11755
11756
#: en/help_topics/hooks.txt:88
11757
msgid ""
11758
"Called after a pull operation completes. post_pull is called with a\n"
11759
"bzrlib.branch.PullResult object and only runs in the bzr client."
11760
msgstr ""
11761
11762
#: en/help_topics/hooks.txt:91
11763
msgid ""
11764
"post_push\n"
11765
"~~~~~~~~~"
11766
msgstr ""
11767
11768
#: en/help_topics/hooks.txt:96
11769
msgid ""
11770
"Called after a push operation completes. post_push is called with a\n"
11771
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11772
msgstr ""
11773
11774
#: en/help_topics/hooks.txt:99
11775
msgid ""
11776
"post_switch\n"
11777
"~~~~~~~~~~~"
11778
msgstr ""
11779
11780
#: en/help_topics/hooks.txt:104
11781
msgid ""
11782
"Called after a checkout switches branch. post_switch is called with a\n"
11783
"bzrlib.branch.SwitchHookParams."
11784
msgstr ""
11785
11786
#: en/help_topics/hooks.txt:107
11787
msgid ""
11788
"post_uncommit\n"
11789
"~~~~~~~~~~~~~"
11790
msgstr ""
11791
11792
#: en/help_topics/hooks.txt:112
11793
msgid ""
11794
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11795
"called with (local, master, old_revno, old_revid, new_revno,\n"
11796
"new_revid) where local is the local branch or None, master is the\n"
11797
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11798
"of None."
11799
msgstr ""
11800
11801
#: en/help_topics/hooks.txt:118
11802
msgid ""
11803
"pre_change_branch_tip\n"
11804
"~~~~~~~~~~~~~~~~~~~~~"
11805
msgstr ""
11806
11807
#: en/help_topics/hooks.txt:121
11808
msgid "Introduced in: 1.6"
11809
msgstr ""
11810
11811
#: en/help_topics/hooks.txt:123
11812
msgid ""
11813
"Called in bzr client and server before a change to the tip of a branch\n"
11814
"is made. pre_change_branch_tip is called with a\n"
11815
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11816
"uncommit will all trigger this hook."
11817
msgstr ""
11818
11819
#: en/help_topics/hooks.txt:128
11820
msgid ""
11821
"pre_commit\n"
11822
"~~~~~~~~~~"
11823
msgstr ""
11824
11825
#: en/help_topics/hooks.txt:131
11826
msgid "Introduced in: 0.91"
11827
msgstr ""
11828
11829
#: en/help_topics/hooks.txt:133
11830
msgid ""
11831
"Called after a commit is calculated but before it is completed.\n"
11832
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11833
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11834
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11835
"TreeDelta object describing changes from the basis revision. hooks\n"
11836
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11837
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11838
"tree."
11839
msgstr ""
11840
11841
#: en/help_topics/hooks.txt:142
11842
msgid ""
11843
"set_rh\n"
11844
"~~~~~~"
11845
msgstr ""
11846
11847
#: en/help_topics/hooks.txt:147
11848
msgid ""
11849
"Invoked whenever the revision history has been set via\n"
11850
"set_revision_history. The api signature is (branch, revision_history),\n"
11851
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11852
"for bzr to trigger, a better hook to use is\n"
11853
"Branch.post_change_branch_tip."
11854
msgstr ""
11855
11856
#: en/help_topics/hooks.txt:153
11857
msgid ""
11858
"transform_fallback_location\n"
11859
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11860
msgstr ""
11861
11862
#: en/help_topics/hooks.txt:156
11863
msgid "Introduced in: 1.9"
11864
msgstr ""
11865
11866
#: en/help_topics/hooks.txt:158
11867
msgid ""
11868
"Called when a stacked branch is activating its fallback locations.\n"
11869
"transform_fallback_location is called with (branch, url), and should\n"
11870
"return a new url. Returning the same url allows it to be used as-is,\n"
11871
"returning a different one can be used to cause the branch to stack on\n"
11872
"a closer copy of that fallback_location. Note that the branch cannot\n"
11873
"have history accessing methods called on it during this hook because\n"
11874
"the fallback locations have not been activated. When there are\n"
11875
"multiple hooks installed for transform_fallback_location, all are\n"
11876
"called with the url returned from the previous hook.The order is\n"
11877
"however undefined."
11878
msgstr ""
11879
11880
#: en/help_topics/hooks.txt:169
11881
msgid ""
11882
"CommandHooks\n"
11883
"------------"
11884
msgstr ""
11885
11886
#: en/help_topics/hooks.txt:172
11887
msgid ""
11888
"extend_command\n"
11889
"~~~~~~~~~~~~~~"
11890
msgstr ""
11891
11892
#: en/help_topics/hooks.txt:175
11893
msgid "Introduced in: 1.13"
11894
msgstr ""
11895
11896
#: en/help_topics/hooks.txt:177
11897
msgid ""
11898
"Called after creating a command object to allow modifications such as\n"
11899
"adding or removing options, docs etc. Called with the new\n"
11900
"bzrlib.commands.Command object."
11901
msgstr ""
11902
11903
#: en/help_topics/hooks.txt:181
11904
msgid ""
11905
"get_command\n"
11906
"~~~~~~~~~~~"
11907
msgstr ""
11908
11909
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11910
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
11911
msgid "Introduced in: 1.17"
11912
msgstr ""
11913
11914
#: en/help_topics/hooks.txt:186
11915
msgid ""
11916
"Called when creating a single command. Called with (cmd_or_None,\n"
11917
"command_name). get_command should either return the cmd_or_None\n"
11918
"parameter, or a replacement Command object that should be used for the\n"
11919
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11920
"Many users will prefer to use bzrlib.commands.register_command or\n"
11921
"plugin_cmds.register_lazy."
11922
msgstr ""
11923
11924
#: en/help_topics/hooks.txt:193
11925
msgid ""
11926
"get_missing_command\n"
11927
"~~~~~~~~~~~~~~~~~~~"
11928
msgstr ""
11929
11930
#: en/help_topics/hooks.txt:198
11931
msgid ""
11932
"Called when creating a single command if no command could be found.\n"
11933
"Called with (command_name). get_missing_command should either return\n"
11934
"None, or a Command object to be used for the command."
11935
msgstr ""
11936
11937
#: en/help_topics/hooks.txt:202
11938
msgid ""
11939
"list_commands\n"
11940
"~~~~~~~~~~~~~"
11941
msgstr ""
11942
11943
#: en/help_topics/hooks.txt:207
11944
msgid ""
11945
"Called when enumerating commands. Called with a set of cmd_name\n"
11946
"strings for all the commands found so far. This set is safe to mutate\n"
11947
"- e.g. to remove a command. list_commands should return the updated\n"
11948
"set of command names."
11949
msgstr ""
11950
11951
#: en/help_topics/hooks.txt:212
11952
msgid ""
11953
"_ConfigHooks\n"
11954
"------------"
11955
msgstr ""
11956
11957
#: en/help_topics/hooks.txt:215
11958
msgid ""
11959
"get\n"
11960
"~~~"
11961
msgstr ""
11962
11963
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11964
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11965
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11966
#: en/help_topics/hooks.txt:427
11967
msgid "Introduced in: 2.4"
11968
msgstr ""
11969
11970
#: en/help_topics/hooks.txt:220
11971
msgid ""
11972
"Invoked when a config option is read. The signature is (stack, name,\n"
11973
"value)."
11974
msgstr ""
11975
11976
#: en/help_topics/hooks.txt:223
11977
msgid ""
11978
"load\n"
11979
"~~~~"
11980
msgstr ""
11981
11982
#: en/help_topics/hooks.txt:228
11983
msgid "Invoked when a config store is loaded. The signature is (store)."
11984
msgstr ""
11985
11986
#: en/help_topics/hooks.txt:230
11987
msgid ""
11988
"remove\n"
11989
"~~~~~~"
11990
msgstr ""
11991
11992
#: en/help_topics/hooks.txt:235
11993
msgid ""
11994
"Invoked when a config option is removed. The signature is (stack,\n"
11995
"name)."
11996
msgstr ""
11997
11998
#: en/help_topics/hooks.txt:238
11999
msgid ""
12000
"save\n"
12001
"~~~~"
12002
msgstr ""
12003
12004
#: en/help_topics/hooks.txt:243
12005
msgid "Invoked when a config store is saved. The signature is (store)."
12006
msgstr ""
12007
12008
#: en/help_topics/hooks.txt:245
12009
msgid ""
12010
"set\n"
12011
"~~~"
12012
msgstr ""
12013
12014
#: en/help_topics/hooks.txt:250
12015
msgid ""
12016
"Invoked when a config option is set. The signature is (stack, name,\n"
12017
"value)."
12018
msgstr ""
12019
12020
#: en/help_topics/hooks.txt:253
12021
msgid ""
12022
"ControlDirHooks\n"
12023
"---------------"
12024
msgstr ""
12025
12026
#: en/help_topics/hooks.txt:256
12027
msgid ""
12028
"post_repo_init\n"
12029
"~~~~~~~~~~~~~~"
12030
msgstr ""
12031
12032
#: en/help_topics/hooks.txt:261
12033
msgid ""
12034
"Invoked after a repository has been initialized. post_repo_init is\n"
12035
"called with a bzrlib.controldir.RepoInitHookParams."
12036
msgstr ""
12037
12038
#: en/help_topics/hooks.txt:264
12039
msgid ""
12040
"pre_open\n"
12041
"~~~~~~~~"
12042
msgstr ""
12043
12044
#: en/help_topics/hooks.txt:267
12045
msgid "Introduced in: 1.14"
12046
msgstr ""
12047
12048
#: en/help_topics/hooks.txt:269
12049
msgid ""
12050
"Invoked before attempting to open a ControlDir with the transport that\n"
12051
"the open will use."
12052
msgstr ""
12053
12054
#: en/help_topics/hooks.txt:272
12055
msgid ""
12056
"InfoHooks\n"
12057
"---------"
12058
msgstr ""
12059
12060
#: en/help_topics/hooks.txt:275
12061
msgid ""
12062
"repository\n"
12063
"~~~~~~~~~~"
12064
msgstr ""
12065
12066
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12067
#: en/help_topics/hooks.txt:505
12068
msgid "Introduced in: 1.15"
12069
msgstr ""
12070
12071
#: en/help_topics/hooks.txt:280
12072
msgid ""
12073
"Invoked when displaying the statistics for a repository. repository is\n"
12074
"called with a statistics dictionary as returned by the repository and\n"
12075
"a file-like object to write to."
12076
msgstr ""
12077
12078
#: en/help_topics/hooks.txt:284
12079
msgid ""
12080
"LockHooks\n"
12081
"---------"
12082
msgstr ""
12083
12084
#: en/help_topics/hooks.txt:287
12085
msgid ""
12086
"lock_acquired\n"
12087
"~~~~~~~~~~~~~"
12088
msgstr ""
12089
12090
#: en/help_topics/hooks.txt:292
12091
msgid ""
12092
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12093
msgstr ""
12094
12095
#: en/help_topics/hooks.txt:294
12096
msgid ""
12097
"lock_broken\n"
12098
"~~~~~~~~~~~"
12099
msgstr ""
12100
12101
#: en/help_topics/hooks.txt:299
12102
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12103
msgstr ""
12104
12105
#: en/help_topics/hooks.txt:301
12106
msgid ""
12107
"lock_released\n"
12108
"~~~~~~~~~~~~~"
12109
msgstr ""
12110
12111
#: en/help_topics/hooks.txt:306
12112
msgid ""
12113
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12114
msgstr ""
12115
12116
#: en/help_topics/hooks.txt:308
12117
msgid ""
12118
"MergeHooks\n"
12119
"----------"
12120
msgstr ""
12121
12122
#: en/help_topics/hooks.txt:311
12123
msgid ""
12124
"merge_file_content\n"
12125
"~~~~~~~~~~~~~~~~~~"
12126
msgstr ""
12127
12128
#: en/help_topics/hooks.txt:314
12129
msgid "Introduced in: 2.1"
12130
msgstr ""
12131
12132
#: en/help_topics/hooks.txt:316
12133
msgid ""
12134
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12135
"object when starting a merge. Should return either None or a subclass\n"
12136
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12137
"called per file that needs to be merged (including when one side has\n"
12138
"deleted the file and the other has changed it). See the\n"
12139
"AbstractPerFileMerger API docs for details on how it is used by merge."
12140
msgstr ""
12141
12142
#: en/help_topics/hooks.txt:323
12143
msgid ""
12144
"post_merge\n"
12145
"~~~~~~~~~~"
12146
msgstr ""
12147
12148
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12149
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
12150
msgid "Introduced in: 2.5"
12151
msgstr ""
12152
12153
#: en/help_topics/hooks.txt:328
12154
msgid ""
12155
"Called after a merge. Receives a Merger object as the single argument.\n"
12156
"The return value is ignored."
12157
msgstr ""
12158
12159
#: en/help_topics/hooks.txt:331
12160
msgid ""
12161
"pre_merge\n"
12162
"~~~~~~~~~"
12163
msgstr ""
12164
12165
#: en/help_topics/hooks.txt:336
12166
msgid ""
12167
"Called before a merge. Receives a Merger object as the single\n"
12168
"argument."
12169
msgstr ""
12170
12171
#: en/help_topics/hooks.txt:339
12172
msgid ""
12173
"MergeDirectiveHooks\n"
12174
"-------------------"
12175
msgstr ""
12176
12177
#: en/help_topics/hooks.txt:342
12178
msgid ""
12179
"merge_request_body\n"
12180
"~~~~~~~~~~~~~~~~~~"
12181
msgstr ""
12182
12183
#: en/help_topics/hooks.txt:345
12184
msgid "Introduced in: 1.15.0"
12185
msgstr ""
12186
12187
#: en/help_topics/hooks.txt:347
12188
msgid ""
12189
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12190
"request. Callbacks must return a body. If more than one callback is\n"
12191
"registered, the output of one callback is provided to the next."
12192
msgstr ""
12193
12194
#: en/help_topics/hooks.txt:351
12195
msgid ""
12196
"MessageEditorHooks\n"
12197
"------------------"
12198
msgstr ""
12199
12200
#: en/help_topics/hooks.txt:354
12201
msgid ""
12202
"commit_message_template\n"
12203
"~~~~~~~~~~~~~~~~~~~~~~~"
12204
msgstr ""
12205
12206
#: en/help_topics/hooks.txt:357
12207
msgid "Introduced in: 1.10"
12208
msgstr ""
12209
12210
#: en/help_topics/hooks.txt:359
12211
msgid ""
12212
"Called when a commit message is being generated.\n"
12213
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12214
"and the message that is known so far. commit_message_template must\n"
12215
"return a new message to use (which could be the same as it was given).\n"
12216
"When there are multiple hooks registered for commit_message_template,\n"
12217
"they are chained with the result from the first passed into the\n"
12218
"second, and so on."
12219
msgstr ""
12220
12221
#: en/help_topics/hooks.txt:367
12222
msgid ""
12223
"set_commit_message\n"
12224
"~~~~~~~~~~~~~~~~~~"
12225
msgstr ""
12226
12227
#: en/help_topics/hooks.txt:372
12228
msgid ""
12229
"Set a fixed commit message. set_commit_message is called with the\n"
12230
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12231
"properties by editing commit.builder._revprops) and the message so\n"
12232
"far. set_commit_message must return the message to use or None if it\n"
12233
"should use the message editor as normal."
12234
msgstr ""
12235
12236
#: en/help_topics/hooks.txt:378
12237
msgid ""
12238
"MutableTreeHooks\n"
12239
"----------------"
12240
msgstr ""
12241
12242
#: en/help_topics/hooks.txt:381
12243
msgid ""
12244
"post_build_tree\n"
12245
"~~~~~~~~~~~~~~~"
12246
msgstr ""
12247
12248
#: en/help_topics/hooks.txt:386
12249
msgid ""
12250
"Called after a completely new tree is built. The hook is called with\n"
12251
"the tree as its only argument."
12252
msgstr ""
12253
12254
#: en/help_topics/hooks.txt:392
12255
msgid "Introduced in: 2.0"
12256
msgstr ""
12257
12258
#: en/help_topics/hooks.txt:394
12259
msgid ""
12260
"Called after a commit is performed on a tree. The hook is called with\n"
12261
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12262
"commit was performed on is available via the mutable_tree attribute of\n"
12263
"that object."
12264
msgstr ""
12265
12266
#: en/help_topics/hooks.txt:399
12267
msgid ""
12268
"start_commit\n"
12269
"~~~~~~~~~~~~"
12270
msgstr ""
12271
12272
#: en/help_topics/hooks.txt:404
12273
msgid ""
12274
"Called before a commit is performed on a tree. The start commit hook\n"
12275
"is able to change the tree before the commit takes place. start_commit\n"
12276
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12277
"being performed on."
12278
msgstr ""
12279
12280
#: en/help_topics/hooks.txt:409
12281
msgid ""
12282
"SmartClientHooks\n"
12283
"----------------"
12284
msgstr ""
12285
12286
#: en/help_topics/hooks.txt:412
12287
msgid ""
12288
"call\n"
12289
"~~~~"
12290
msgstr ""
12291
12292
#: en/help_topics/hooks.txt:415
12293
msgid "Introduced in: unknown"
12294
msgstr ""
12295
12296
#: en/help_topics/hooks.txt:417
12297
msgid ""
12298
"Called when the smart client is submitting a request to the smart\n"
12299
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12300
"Streaming request bodies, and responses, are not accessible."
12301
msgstr ""
12302
12303
#: en/help_topics/hooks.txt:421
12304
msgid ""
12305
"SmartServerHooks\n"
12306
"----------------"
12307
msgstr ""
12308
12309
#: en/help_topics/hooks.txt:424
12310
msgid ""
12311
"server_exception\n"
12312
"~~~~~~~~~~~~~~~~"
12313
msgstr ""
12314
12315
#: en/help_topics/hooks.txt:429
12316
msgid ""
12317
"Called by the bzr server when an exception occurs. server_exception is\n"
12318
"called with the sys.exc_info() tuple return true for the hook if the\n"
12319
"exception has been handled, in which case the server will exit\n"
12320
"normally."
12321
msgstr ""
12322
12323
#: en/help_topics/hooks.txt:434
12324
msgid ""
12325
"server_started\n"
12326
"~~~~~~~~~~~~~~"
12327
msgstr ""
12328
12329
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12330
msgid "Introduced in: 0.16"
12331
msgstr ""
12332
12333
#: en/help_topics/hooks.txt:439
12334
msgid ""
12335
"Called by the bzr server when it starts serving a directory.\n"
12336
"server_started is called with (backing urls, public url), where\n"
12337
"backing_url is a list of URLs giving the server-specific directory\n"
12338
"locations, and public_url is the public URL for the directory being\n"
12339
"served."
12340
msgstr ""
12341
12342
#: en/help_topics/hooks.txt:445
12343
msgid ""
12344
"server_started_ex\n"
12345
"~~~~~~~~~~~~~~~~~"
12346
msgstr ""
12347
12348
#: en/help_topics/hooks.txt:450
12349
msgid ""
12350
"Called by the bzr server when it starts serving a directory.\n"
12351
"server_started is called with (backing_urls, server_obj)."
12352
msgstr ""
12353
12354
#: en/help_topics/hooks.txt:453
12355
msgid ""
12356
"server_stopped\n"
12357
"~~~~~~~~~~~~~~"
12358
msgstr ""
12359
12360
#: en/help_topics/hooks.txt:458
12361
msgid ""
12362
"Called by the bzr server when it stops serving a directory.\n"
12363
"server_stopped is called with the same parameters as the\n"
12364
"server_started hook: (backing_urls, public_url)."
12365
msgstr ""
12366
12367
#: en/help_topics/hooks.txt:462
12368
msgid ""
12369
"StatusHooks\n"
12370
"-----------"
12371
msgstr ""
12372
12373
#: en/help_topics/hooks.txt:465
12374
msgid ""
12375
"post_status\n"
12376
"~~~~~~~~~~~"
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
12380
msgid "Introduced in: 2.3"
12381
msgstr ""
12382
12383
#: en/help_topics/hooks.txt:470
12384
msgid ""
12385
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12386
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12387
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12388
"correspond to the command line options specified by the user for the\n"
12389
"status command. to_file is the output stream for writing."
12390
msgstr ""
12391
12392
#: en/help_topics/hooks.txt:476
12393
msgid ""
12394
"pre_status\n"
12395
"~~~~~~~~~~"
12396
msgstr ""
12397
12398
#: en/help_topics/hooks.txt:481
12399
msgid ""
12400
"Called with argument StatusHookParams before Bazaar displays the\n"
12401
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12402
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12403
"correspond to the command line options specified by the user for the\n"
12404
"status command. to_file is the output stream for writing."
12405
msgstr ""
12406
12407
#: en/help_topics/hooks.txt:487
12408
msgid ""
12409
"TransportHooks\n"
12410
"--------------"
12411
msgstr ""
12412
12413
#: en/help_topics/hooks.txt:490
12414
msgid ""
12415
"post_connect\n"
12416
"~~~~~~~~~~~~"
12417
msgstr ""
12418
12419
#: en/help_topics/hooks.txt:495
12420
msgid ""
12421
"Called after a new connection is established or a reconnect occurs.\n"
12422
"The sole argument passed is either the connected transport or smart\n"
12423
"medium instance."
12424
msgstr ""
12425
12426
#: en/help_topics/hooks.txt:499
12427
msgid ""
12428
"RioVersionInfoBuilderHooks\n"
12429
"--------------------------"
12430
msgstr ""
12431
12432
#: en/help_topics/hooks.txt:502
12433
msgid ""
12434
"revision\n"
12435
"~~~~~~~~"
12436
msgstr ""
12437
12438
#: en/help_topics/hooks.txt:507
12439
msgid ""
12440
"Invoked when adding information about a revision to the RIO stanza\n"
12441
"that is printed. revision is called with a revision object and a RIO\n"
12442
"stanza.\n"
12443
msgstr ""
12444
12445
#: en/help_topics/location-alias.txt:1
12446
msgid ""
12447
"Location aliases\n"
12448
"================"
12449
msgstr ""
12450
12451
#: en/help_topics/location-alias.txt:4
12452
msgid ""
12453
"Bazaar defines several aliases for locations associated with a branch. "
12454
"These\n"
12455
"can be used with most commands that expect a location, such as `bzr push`."
12456
msgstr ""
12457
12458
#: en/help_topics/location-alias.txt:7
12459
msgid "The aliases are::"
12460
msgstr ""
12461
12462
#: en/help_topics/location-alias.txt:9
12463
msgid ""
12464
" :bound The branch this branch is bound to, for bound branches.\n"
12465
" :parent The parent of this branch.\n"
12466
" :public The public location of this branch.\n"
12467
" :push The saved location used for `bzr push` with no arguments.\n"
12468
" :submit The submit branch for this branch.\n"
12469
" :this This branch."
12470
msgstr ""
12471
12472
#: en/help_topics/location-alias.txt:16
12473
msgid "For example, to push to the parent location::"
12474
msgstr ""
12475
12476
#: en/help_topics/location-alias.txt:18
12477
msgid " bzr push :parent\n"
12478
msgstr ""
12479
12480
#: en/help_topics/log-formats.txt:1
12481
msgid ""
12482
"Log Formats\n"
12483
"==========="
12484
msgstr ""
12485
12486
#: en/help_topics/log-formats.txt:4
12487
msgid ""
12488
"A log format controls how information about each revision is displayed.\n"
12489
"The standard log formats are compared below::"
12490
msgstr ""
12491
12492
#: en/help_topics/log-formats.txt:7
12493
msgid ""
12494
" Feature long short line\n"
12495
" ---------------------- ------------- ------------ -------------------\n"
12496
" design goal detailed view concise view 1 revision per line\n"
12497
" committer name+email name only name only\n"
12498
" author name+email - -\n"
12499
" date-time format full date only date only\n"
12500
" commit message full full top line\n"
12501
" tags yes yes yes\n"
12502
" merges indicator - yes -\n"
12503
" status/delta optional optional -\n"
12504
" diff/patch optional optional -\n"
12505
" revision-id optional optional -\n"
12506
" branch nick yes - -\n"
12507
" foreign vcs properties yes yes -\n"
12508
" preferred levels all 1 1\n"
12509
" digital signature optional - -"
12510
msgstr ""
12511
12512
#: en/help_topics/log-formats.txt:24
12513
msgid ""
12514
"The default format is ``long``. To change this, define the ``log_format``\n"
12515
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12516
msgstr ""
12517
12518
#: en/help_topics/log-formats.txt:27
12519
msgid ""
12520
" [DEFAULT]\n"
12521
" log_format = short"
12522
msgstr ""
12523
12524
#: en/help_topics/log-formats.txt:30
12525
msgid ""
12526
"Alternatively, to change the log format used for a given query, use the\n"
12527
"--long, --short or --line options."
12528
msgstr ""
12529
12530
#: en/help_topics/log-formats.txt:33
12531
msgid ""
12532
"If one of the standard log formats does not meet your needs, additional\n"
12533
"formats can be provided by plugins.\n"
12534
msgstr ""
12535
12536
#: en/help_topics/other-formats.txt:1
12537
msgid "Other Storage Formats"
12538
msgstr ""
12539
12540
#: en/help_topics/other-formats.txt:3
12541
msgid "Experimental formats are shown below."
12542
msgstr ""
12543
12544
#: en/help_topics/other-formats.txt:5
12545
msgid ""
12546
":development-colo:\n"
12547
" (native) The 2a format with experimental support for colocated\n"
12548
" branches."
12549
msgstr ""
12550
12551
#: en/help_topics/other-formats.txt:9
12552
msgid ""
12553
"\n"
12554
"Deprecated formats are shown below."
12555
msgstr ""
12556
12557
#: en/help_topics/other-formats.txt:12
12558
msgid ""
12559
":pack-0.92:\n"
12560
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12561
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12562
" by bzr < 0.92."
12563
msgstr ""
12564
12565
#: en/help_topics/patterns.txt:1
12566
msgid ""
12567
"Patterns\n"
12568
"========"
12569
msgstr ""
12570
12571
#: en/help_topics/patterns.txt:4
12572
msgid ""
12573
"Bazaar uses patterns to match files at various times. For example,\n"
12574
"the ``add`` command skips over files that match ignore patterns\n"
12575
"and preferences can be associated with files using rule patterns.\n"
12576
"The pattern syntax is described below."
12577
msgstr ""
12578
12579
#: en/help_topics/patterns.txt:9
12580
msgid ""
12581
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12582
"slash or is a regular expression, it is compared to the whole path\n"
12583
"from the branch root. Otherwise, it is compared to only the last\n"
12584
"component of the path. To match a file only in the root directory,\n"
12585
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12586
msgstr ""
12587
12588
#: en/help_topics/patterns.txt:15
12589
msgid "Patterns may include globbing wildcards such as::"
12590
msgstr ""
12591
12592
#: en/help_topics/patterns.txt:17
12593
msgid ""
12594
" ? - Matches any single character except '/'\n"
12595
" * - Matches 0 or more characters except '/'\n"
12596
" /**/ - Matches 0 or more directories in a path\n"
12597
" [a-z] - Matches a single character from within a group of characters"
12598
msgstr ""
12599
12600
#: en/help_topics/patterns.txt:22
12601
msgid ""
12602
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12603
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12604
"expression. Regular expression patterns may not include named or\n"
12605
"numbered groups."
12606
msgstr ""
12607
12608
#: en/help_topics/patterns.txt:27
12609
msgid ""
12610
"Case insensitive ignore patterns can be specified with regular expressions\n"
12611
"by using the ``i`` (for ignore case) flag in the pattern."
12612
msgstr ""
12613
12614
#: en/help_topics/patterns.txt:30
12615
msgid ""
12616
"For example, a case insensitive match for ``foo`` may be specified as::"
12617
msgstr ""
12618
12619
#: en/help_topics/patterns.txt:32
12620
msgid " RE:(?i)foo"
12621
msgstr ""
12622
12623
#: en/help_topics/patterns.txt:34
12624
msgid ""
12625
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12626
"matched by that pattern will not be ignored."
12627
msgstr ""
12628
12629
#: en/help_topics/patterns.txt:37
12630
msgid ""
12631
".. _Python regular expressions: http://docs.python.org/library/re.html"
12632
msgstr ""
12633
12634
#: en/help_topics/revisionspec.txt:1
12635
msgid "Revision Identifiers"
12636
msgstr ""
12637
12638
#: en/help_topics/revisionspec.txt:3
12639
msgid ""
12640
"A revision identifier refers to a specific state of a branch's history. It\n"
12641
"can be expressed in several ways. It can begin with a keyword to\n"
12642
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12643
"'before:yesterday' and 'submit:'."
12644
msgstr ""
12645
12646
#: en/help_topics/revisionspec.txt:8
12647
msgid ""
12648
"Alternately, it can be given without a keyword, in which case it will be\n"
12649
"checked as a revision number, a tag, a revision id, a date specification, or "
12650
"a\n"
12651
"branch specification, in that order. For example, 'date:today' could be\n"
12652
"written as simply 'today', though if you have a tag called 'today' that "
12653
"will\n"
12654
"be found first."
12655
msgstr ""
12656
12657
#: en/help_topics/revisionspec.txt:14
12658
msgid ""
12659
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12660
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12661
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12662
"or\n"
12663
"spaces around the '..')."
12664
msgstr ""
12665
12666
#: en/help_topics/revisionspec.txt:19
12667
msgid ""
12668
"Ranges are interpreted differently by different commands. To the \"log\" "
12669
"command,\n"
12670
"a range is a sequence of log messages, but to the \"diff\" command, the "
12671
"range\n"
12672
"denotes a change between revisions (and not a sequence of changes). In\n"
12673
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12674
"consider it\n"
12675
"to be open-ended, that is, they include one end but not the other. For "
12676
"example:\n"
12677
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12678
"3649,\n"
12679
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12680
"and\n"
12681
"3649, but not 3647."
12682
msgstr ""
12683
12684
#: en/help_topics/revisionspec.txt:28
12685
msgid "The keywords used as revision selection methods are the following:"
12686
msgstr ""
12687
12688
#: en/help_topics/revisionspec.txt:30
12689
msgid ""
12690
":revid:\n"
12691
"\tSelects a revision using the revision id.\n"
12692
":submit:\n"
12693
"\tSelects a common ancestor with the submit branch.\n"
12694
":ancestor:\n"
12695
"\tSelects a common ancestor with a second branch.\n"
12696
":date:\n"
12697
"\tSelects a revision on the basis of a datestamp.\n"
12698
":branch:\n"
12699
"\tSelects the last revision of a specified branch.\n"
12700
":tag:\n"
12701
"\tSelects a revision identified by a tag name.\n"
12702
":revno:\n"
12703
"\tSelects a revision using a number.\n"
12704
":before:\n"
12705
"\tSelects the parent of the revision specified.\n"
12706
":annotate:\n"
12707
"\tSelect the revision that last modified the specified line.\n"
12708
":mainline:\n"
12709
"\tSelect mainline revision that merged the specified revision.\n"
12710
":last:\n"
12711
"\tSelects the nth revision from the end."
12712
msgstr ""
12713
12714
#: en/help_topics/revisionspec.txt:53
12715
msgid "In addition, plugins can provide other keywords."
12716
msgstr ""
12717
12718
#: en/help_topics/revisionspec.txt:55
12719
msgid "A detailed description of each keyword is given below."
12720
msgstr ""
12721
12722
#: en/help_topics/revisionspec.txt:57
12723
msgid ":revid:"
12724
msgstr ""
12725
12726
#: en/help_topics/revisionspec.txt:59
12727
msgid ""
12728
" Supply a specific revision id, that can be used to specify any\n"
12729
" revision id in the ancestry of the branch.\n"
12730
" Including merges, and pending merges.\n"
12731
" Examples::"
12732
msgstr ""
12733
12734
#: en/help_topics/revisionspec.txt:64
12735
msgid ""
12736
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12737
msgstr ""
12738
12739
#: en/help_topics/revisionspec.txt:66
12740
msgid ":submit:"
12741
msgstr ""
12742
12743
#: en/help_topics/revisionspec.txt:68
12744
msgid ""
12745
" Diffing against this shows all the changes that were made in this "
12746
"branch,\n"
12747
" and is a good predictor of what merge will do. The submit branch is\n"
12748
" used by the bundle and merge directive commands. If no submit branch\n"
12749
" is specified, the parent branch is used instead."
12750
msgstr ""
12751
12752
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12753
msgid ""
12754
" The common ancestor is the last revision that existed in both\n"
12755
" branches. Usually this is the branch point, but it could also be\n"
12756
" a revision that was merged."
12757
msgstr ""
12758
12759
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12760
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12761
#: en/help_topics/revisionspec.txt:153
12762
msgid " Examples::"
12763
msgstr ""
12764
12765
#: en/help_topics/revisionspec.txt:79
12766
msgid " $ bzr diff -r submit:"
12767
msgstr ""
12768
12769
#: en/help_topics/revisionspec.txt:81
12770
msgid ":ancestor:"
12771
msgstr ""
12772
12773
#: en/help_topics/revisionspec.txt:83
12774
msgid " Supply the path to a branch to select the common ancestor."
12775
msgstr ""
12776
12777
#: en/help_topics/revisionspec.txt:89
12778
msgid ""
12779
" This is frequently used with 'diff' to return all of the changes\n"
12780
" that your branch introduces, while excluding the changes that you\n"
12781
" have not merged from the remote branch."
12782
msgstr ""
12783
12784
#: en/help_topics/revisionspec.txt:95
12785
msgid ""
12786
" ancestor:/path/to/branch\n"
12787
" $ bzr diff -r ancestor:../../mainline/branch"
12788
msgstr ""
12789
12790
#: en/help_topics/revisionspec.txt:98
12791
msgid ":date:"
12792
msgstr ""
12793
12794
#: en/help_topics/revisionspec.txt:100
12795
msgid ""
12796
" Supply a datestamp to select the first revision that matches the date.\n"
12797
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12798
" Matches the first entry after a given date (either at midnight or\n"
12799
" at a specified time)."
12800
msgstr ""
12801
12802
#: en/help_topics/revisionspec.txt:105
12803
msgid " One way to display all the changes since yesterday would be::"
12804
msgstr ""
12805
12806
#: en/help_topics/revisionspec.txt:107
12807
msgid " bzr log -r date:yesterday.."
12808
msgstr ""
12809
12810
#: en/help_topics/revisionspec.txt:111
12811
msgid ""
12812
" date:yesterday -> select the first revision since "
12813
"yesterday\n"
12814
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12815
" August 14th, 2006 at 5:10pm."
12816
msgstr ""
12817
12818
#: en/help_topics/revisionspec.txt:115
12819
msgid ":branch:"
12820
msgstr ""
12821
12822
#: en/help_topics/revisionspec.txt:117
12823
msgid " Supply the path to a branch to select its last revision."
12824
msgstr ""
12825
12826
#: en/help_topics/revisionspec.txt:121
12827
msgid " branch:/path/to/branch"
12828
msgstr ""
12829
12830
#: en/help_topics/revisionspec.txt:123
12831
msgid ":tag:"
12832
msgstr ""
12833
12834
#: en/help_topics/revisionspec.txt:125
12835
msgid " Tags are stored in the branch and created by the 'tag' command."
12836
msgstr ""
12837
12838
#: en/help_topics/revisionspec.txt:127
12839
msgid ":revno:"
12840
msgstr ""
12841
12842
#: en/help_topics/revisionspec.txt:129
12843
msgid ""
12844
" Use an integer to specify a revision in the history of the branch.\n"
12845
" Optionally a branch can be specified. A negative number will count\n"
12846
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12847
" one). If the negative number is larger than the branch's history, the\n"
12848
" first revision is returned.\n"
12849
" Examples::"
12850
msgstr ""
12851
12852
#: en/help_topics/revisionspec.txt:136
12853
msgid ""
12854
" revno:1 -> return the first revision of this branch\n"
12855
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12856
" the branch '/path/to/branch'\n"
12857
" revno:-1 -> The last revision in a branch.\n"
12858
" -2:http://other/branch -> The second to last revision in the\n"
12859
" remote branch.\n"
12860
" -1000000 -> Most likely the first revision, unless\n"
12861
" your history is very long."
12862
msgstr ""
12863
12864
#: en/help_topics/revisionspec.txt:145
12865
msgid ":before:"
12866
msgstr ""
12867
12868
#: en/help_topics/revisionspec.txt:147
12869
msgid ""
12870
" Supply any revision spec to return the parent of that revision. This "
12871
"is\n"
12872
" mostly useful when inspecting revisions that are not in the revision "
12873
"history\n"
12874
" of a branch."
12875
msgstr ""
12876
12877
#: en/help_topics/revisionspec.txt:151
12878
msgid ""
12879
" It is an error to request the parent of the null revision (before:0)."
12880
msgstr ""
12881
12882
#: en/help_topics/revisionspec.txt:155
12883
msgid ""
12884
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12885
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12886
" aaaa@bbbb-1234567890\n"
12887
" bzr diff -r before:1913..1913\n"
12888
" -> Find the changes between revision 1913 and its parent "
12889
"(1912).\n"
12890
" (What changes did revision 1913 introduce).\n"
12891
" This is equivalent to: bzr diff -c 1913"
12892
msgstr ""
12893
12894
#: en/help_topics/revisionspec.txt:163
12895
msgid ":annotate:"
12896
msgstr ""
12897
12898
#: en/help_topics/revisionspec.txt:165
12899
msgid ""
12900
" Select the revision that last modified the specified line. Line is\n"
12901
" specified as path:number. Path is a relative path to the file. "
12902
"Numbers\n"
12903
" start at 1, and are relative to the current version, not the last-\n"
12904
" committed version of the file."
12905
msgstr ""
12906
12907
#: en/help_topics/revisionspec.txt:170
12908
msgid ":mainline:"
12909
msgstr ""
12910
12911
#: en/help_topics/revisionspec.txt:172
12912
msgid ""
12913
" Select the revision that merged the specified revision into mainline."
12914
msgstr ""
12915
12916
#: en/help_topics/revisionspec.txt:174
12917
msgid ":last:"
12918
msgstr ""
12919
12920
#: en/help_topics/revisionspec.txt:176
12921
msgid ""
12922
" Supply a positive number to get the nth revision from the end.\n"
12923
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12924
" Examples::"
12925
msgstr ""
12926
12927
#: en/help_topics/revisionspec.txt:180
12928
msgid ""
12929
" last:1 -> return the last revision\n"
12930
" last:3 -> return the revision 2 before the end.\n"
12931
msgstr ""
12932
12933
#: en/help_topics/rules.txt:1
12934
msgid ""
12935
"Rules\n"
12936
"====="
12937
msgstr ""
12938
12939
#: en/help_topics/rules.txt:7
12940
msgid ""
12941
"Rules are defined in ini file format where the sections are file glob\n"
12942
"patterns and the contents of each section are the preferences for files\n"
12943
"matching that pattern(s). For example::"
12944
msgstr ""
12945
12946
#: en/help_topics/rules.txt:11
12947
msgid ""
12948
" [name *.bat]\n"
12949
" eol = native"
12950
msgstr ""
12951
12952
#: en/help_topics/rules.txt:14
12953
msgid ""
12954
" [name *.html *.xml]\n"
12955
" keywords = xml_escape"
12956
msgstr ""
12957
12958
#: en/help_topics/rules.txt:17
12959
msgid ""
12960
"Preferences like these are useful for commands and plugins wishing to\n"
12961
"provide custom behaviour for selected files. For more information on \n"
12962
"end of line conversion see :doc:`eol-help`.\n"
12963
"Keyword support is provided by the `keywords plugin\n"
12964
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
12965
msgstr ""
12966
12967
#: en/help_topics/rules.txt:23
12968
msgid ""
12969
"Files\n"
12970
"-----"
12971
msgstr ""
12972
12973
#: en/help_topics/rules.txt:26
12974
msgid ""
12975
"Default rules for all branches are defined in the optional file\n"
12976
"``BZR_HOME/rules``. "
12977
msgstr ""
12978
12979
#: en/help_topics/rules.txt:29
12980
msgid ""
12981
"Rule Patterns\n"
12982
"-------------"
12983
msgstr ""
12984
12985
#: en/help_topics/rules.txt:32
12986
msgid ""
12987
"Patterns are ordered and searching stops as soon as one matches.\n"
12988
"As a consequence, more explicit patterns should be placed towards\n"
12989
"the top of the file. Rule patterns use exactly the same conventions\n"
12990
"as ignore patterns. See :doc:`patterns-help` for details."
12991
msgstr ""
12992
12993
#: en/help_topics/rules.txt:37
12994
msgid ".. note::"
12995
msgstr ""
12996
12997
#: en/help_topics/rules.txt:39
12998
msgid ""
12999
" Patterns containing square brackets or spaces should be\n"
13000
" surrounded in quotes to ensure they are correctly parsed.\n"
13001
msgstr ""
13002
13003
#: en/help_topics/topics.txt:1
13004
msgid ""
13005
"authentication Information on configuring authentication\n"
13006
"basic Basic commands\n"
13007
"branches Information on what a branch is\n"
13008
"bugs Bug tracker settings\n"
13009
"checkouts Information on what a checkout is\n"
13010
"commands Basic help for all commands\n"
13011
"configuration Details on the configuration settings available\n"
13012
"conflict-types Types of conflicts and what to do about them\n"
13013
"content-filters Conversion of content into/from working trees\n"
13014
"criss-cross Information on criss-cross merging\n"
13015
"current-formats Current storage formats\n"
13016
"debug-flags Options to show or record debug information\n"
13017
"diverged-branches How to fix diverged branches\n"
13018
"env-variables Environment variable names and values\n"
13019
"eol Information on end-of-line handling\n"
13020
"files Information on configuration and log files\n"
13021
"formats Information on choosing a storage format\n"
13022
"global-options Options that control how Bazaar runs\n"
13023
"hidden-commands All hidden commands\n"
13024
"hooks Points at which custom processing can be added\n"
13025
"launchpad Using Bazaar with Launchpad.net\n"
13026
"location-alias Aliases for remembered locations\n"
13027
"log-formats Details on the logging formats available\n"
13028
"other-formats Experimental and deprecated storage formats\n"
13029
"patterns Information on the pattern syntax\n"
13030
"repositories Basic information on shared repositories.\n"
13031
"revisionspec Explain how to use --revision\n"
13032
"rules Information on defining rule-based preferences\n"
13033
"standalone-trees Information on what a standalone tree is\n"
13034
"standard-options Options that can be used with any command\n"
13035
"status-flags Help on status flags\n"
13036
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13037
"topics Topics list\n"
13038
"url-special-chars Special character handling in URLs\n"
13039
"urlspec Supported transport protocols\n"
13040
"working-trees Information on working trees\n"
13041
msgstr ""
13042
13043
#: en/help_topics/url-special-chars.txt:1
13044
msgid ""
13045
"Special character handling in URLs\n"
13046
"=================================="
13047
msgstr ""
13048
13049
#: en/help_topics/url-special-chars.txt:4
13050
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13051
msgstr ""
13052
13053
#: en/help_topics/url-special-chars.txt:6
13054
msgid " * Fully qualified URLs"
13055
msgstr ""
13056
13057
#: en/help_topics/url-special-chars.txt:8
13058
msgid " * File system paths, relative or absolute"
13059
msgstr ""
13060
13061
#: en/help_topics/url-special-chars.txt:10
13062
msgid ""
13063
"Internally bzr treats all locations as URLs. For any file system paths\n"
13064
"that are specified it will automatically determine the appropriate URL\n"
13065
"representation, and escape special characters where necessary."
13066
msgstr ""
13067
13068
#: en/help_topics/url-special-chars.txt:14
13069
msgid ""
13070
"There are a few characters which have special meaning in URLs and need "
13071
"careful\n"
13072
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13073
"value in URLs. Any non-ASCII characters in a file path will automatically "
13074
"be\n"
13075
"urlencoded when the path is converted to a URL."
13076
msgstr ""
13077
13078
#: en/help_topics/url-special-chars.txt:19
13079
msgid ""
13080
"URLs represent non-ASCII characters in an encoding defined by the server, "
13081
"but\n"
13082
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13083
"be\n"
13084
"generous in what it accepts as a URL and to print them in a way that\n"
13085
"will be readable."
13086
msgstr ""
13087
13088
#: en/help_topics/url-special-chars.txt:24
13089
msgid ""
13090
"For example, if you have a directory named '/tmp/%2False' these are all "
13091
"valid\n"
13092
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13093
"slash)::"
13094
msgstr ""
13095
13096
#: en/help_topics/url-special-chars.txt:27
13097
msgid ""
13098
" cd /tmp\n"
13099
" bzr log /tmp/%2False\n"
13100
" bzr log %2False\n"
13101
" bzr log file:///tmp/%252False\n"
13102
" bzr log file://localhost/tmp/%252False\n"
13103
" bzr log file:%252False"
13104
msgstr ""
13105
13106
#: en/help_topics/url-special-chars.txt:34
13107
msgid "These are valid but do not refer to the same file::"
13108
msgstr ""
13109
13110
#: en/help_topics/url-special-chars.txt:36
13111
msgid ""
13112
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13113
" bzr log %252False (refers to a file called /tmp/%252False)"
13114
msgstr ""
13115
13116
#: en/help_topics/url-special-chars.txt:39
13117
msgid ""
13118
"Comma also has special meaning in URLs, because it denotes `segment "
13119
"parameters`_"
13120
msgstr ""
13121
13122
#: en/help_topics/url-special-chars.txt:41
13123
msgid ""
13124
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13125
msgstr ""
13126
13127
#: en/help_topics/url-special-chars.txt:43
13128
msgid ""
13129
"Comma is also special in any file system paths that are specified. To use a "
13130
"literal\n"
13131
"comma in a file system path, specify a URL and URL encode the comma::"
13132
msgstr ""
13133
13134
#: en/help_topics/url-special-chars.txt:46
13135
msgid ""
13136
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13137
"\"branch\" set to \"bla\"\n"
13138
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13139
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13140
"\"branch\" set to \"bla\"\n"
13141
msgstr ""
13142
13143
#: en/help_topics/urlspec.txt:1
13144
msgid "URL Identifiers"
13145
msgstr ""
13146
13147
#: en/help_topics/urlspec.txt:3
13148
msgid "Supported URL prefixes::"
13149
msgstr ""
13150
13151
#: en/help_topics/urlspec.txt:5
13152
msgid ""
13153
" aftp:// Access using active FTP.\n"
13154
" bzr:// Fast access using the Bazaar smart server.\n"
13155
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13156
" file:// Access using the standard filesystem (default)\n"
13157
" ftp:// Access using passive FTP.\n"
13158
" http:// Read-only access of branches exported on the web.\n"
13159
" https:// Read-only access of branches exported on the web using "
13160
"SSL.\n"
13161
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13162
msgstr ""
13163
13164
#: en/help_topics/urlspec.txt:14
13165
msgid "Supported modifiers::"
13166
msgstr ""
13167
13168
#: en/help_topics/urlspec.txt:16
13169
msgid " gio+ Access using any GIO supported protocols."
13170
msgstr ""
13171
13172
#: en/help_topics/urlspec.txt:18
13173
msgid "Bazaar supports all of the standard parts within the URL::"
13174
msgstr ""
13175
13176
#: en/help_topics/urlspec.txt:20
13177
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13178
msgstr ""
13179
13180
#: en/help_topics/urlspec.txt:22
13181
msgid "allowing URLs such as::"
13182
msgstr ""
13183
13184
#: en/help_topics/urlspec.txt:24
13185
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13186
msgstr ""
13187
13188
#: en/help_topics/urlspec.txt:26
13189
msgid ""
13190
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13191
"with '~' as meaning that the rest of the path should be interpreted\n"
13192
"relative to the remote user's home directory. For example if the user\n"
13193
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13194
"shell.example.com, then::"
13195
msgstr ""
13196
13197
#: en/help_topics/urlspec.txt:32
13198
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13199
msgstr ""
13200
13201
#: en/help_topics/urlspec.txt:34
13202
msgid "would refer to ``/home/remote/myproject/trunk``."
13203
msgstr ""
13204
13205
#: en/help_topics/urlspec.txt:36
13206
msgid ""
13207
"Many commands that accept URLs also accept location aliases too.\n"
13208
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13209
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1